status-im/torrent
2
0
Fork 0
mirror of synced 2025-02-23 22:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clarify EOF in message decoding

Browse Source
This commit is contained in:
Matt Joiner 2014-08-22 17:39:18 +10:00
parent 063e02cbfd
commit a2fabedfa2
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
peer_protocol/protocol.go
View File

@ -109,10 +109,14 @@ type Decoder struct {
MaxLength Integer // TODO: Should this include the length header or not? MaxLength Integer // TODO: Should this include the length header or not?
} }
// io.EOF is returned if the source terminates cleanly on a message boundary.
func (d *Decoder) Decode(msg *Message) (err error) { func (d *Decoder) Decode(msg *Message) (err error) {
var length Integer var length Integer
err = binary.Read(d.R, binary.BigEndian, &length) err = binary.Read(d.R, binary.BigEndian, &length)
if err != nil { if err != nil {
if err != io.EOF {
err = fmt.Errorf("error reading message length: %s", err)
}
return return
} }
if length > d.MaxLength { if length > d.MaxLength {
@ -125,10 +129,13 @@ func (d *Decoder) Decode(msg *Message) (err error) {
msg.Keepalive = false msg.Keepalive = false
b := make([]byte, length) b := make([]byte, length)
_, err = io.ReadFull(d.R, b) _, err = io.ReadFull(d.R, b)
if err != nil {
if err == io.EOF { if err == io.EOF {
err = io.ErrUnexpectedEOF err = io.ErrUnexpectedEOF
} }
if err != nil { if err != io.ErrUnexpectedEOF {
err = fmt.Errorf("error reading message: %s", err)
}
return return
} }
r := bytes.NewReader(b) r := bytes.NewReader(b)

5
peer_protocol/protocol_test.go
View File

@ -3,7 +3,6 @@ package peer_protocol
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"io"
"strings" "strings"
"testing" "testing"
) )
@ -103,8 +102,8 @@ func TestUnexpectedEOF(t *testing.T) {
MaxLength: 42, MaxLength: 42,
} }
err := dec.Decode(msg) err := dec.Decode(msg)
if err != io.ErrUnexpectedEOF { if err == nil {
t.Fatalf("expected ErrUnexpectedEOF decoding %q, got %s", stream, err) t.Fatalf("expected an error decoding %q", stream)
} }
} }
} }