This commit is contained in:
parent
e2e192cce1
commit
6bdc45f927
|
@ -373,8 +373,6 @@ func (s *ContentMessage) encodeMessage() []byte {
|
||||||
_, _ = s.Identifier.WriteBytes(message)
|
_, _ = s.Identifier.WriteBytes(message)
|
||||||
}
|
}
|
||||||
|
|
||||||
_, _ = s.Identifier.WriteBytes(message)
|
|
||||||
|
|
||||||
return message.Bytes()
|
return message.Bytes()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -411,22 +409,16 @@ func DecodeContentMessage(signatureBytes []byte) *ContentMessage {
|
||||||
message.PublicKey = make([]byte, ed25519.PublicKeySize)
|
message.PublicKey = make([]byte, ed25519.PublicKeySize)
|
||||||
_, err := buffer.Read(message.PublicKey)
|
_, err := buffer.Read(message.PublicKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Print(message.String())
|
|
||||||
log.Print(err)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
message.IssueTime, err = binary.ReadVarint(buffer)
|
message.IssueTime, err = binary.ReadVarint(buffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Print(message.String())
|
|
||||||
log.Print(err)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if message.Version == 1 {
|
if message.Version == 1 {
|
||||||
read, mh, err := multihash.MHFromBytes(buffer.Bytes())
|
read, mh, err := multihash.MHFromBytes(buffer.Bytes())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Print(message.String())
|
|
||||||
log.Print(err)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
buffer.Next(read)
|
buffer.Next(read)
|
||||||
|
@ -434,8 +426,6 @@ func DecodeContentMessage(signatureBytes []byte) *ContentMessage {
|
||||||
} else {
|
} else {
|
||||||
_, message.Identifier, err = cid.CidFromReader(buffer)
|
_, message.Identifier, err = cid.CidFromReader(buffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Print(message.String())
|
|
||||||
log.Print(err)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -443,14 +433,10 @@ func DecodeContentMessage(signatureBytes []byte) *ContentMessage {
|
||||||
message.Signature = make([]byte, ed25519.SignatureSize)
|
message.Signature = make([]byte, ed25519.SignatureSize)
|
||||||
_, err = buffer.Read(message.Signature)
|
_, err = buffer.Read(message.Signature)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Print(message.String())
|
|
||||||
log.Print(err)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if buffer.Len() != 0 { //Unknown extra data
|
if buffer.Len() != 0 { //Unknown extra data
|
||||||
log.Print(message.String())
|
|
||||||
log.Printf("%x", buffer.Bytes())
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue