gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved code

Browse Source
This commit is contained in:
obscuren
2014-09-16 16:19:48 +02:00
parent 74de0f1f2a
commit fb528c47c0
2 changed files with 206 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ethwire/messaging.go
View File

@ -109,29 +109,24 @@ func ReadMessages(conn net.Conn) (msgs []*Msg, err error) {
}
}
if n == 0 {
if n == 0 && len(buff) == 0 {
continue
}
buff = append(buff, b[:n]...)
if msgLength == 0 {
// Check if the received 4 first bytes are the magic token
if bytes.Compare(MagicToken, b[:4]) != 0 {
return nil, fmt.Errorf("MagicToken mismatch. Received %v", b[:4])
if bytes.Compare(MagicToken, buff[:4]) != 0 {
return nil, fmt.Errorf("MagicToken mismatch. Received %v", buff[:4])
}
// Remove the token
b = b[4:]
// Read the length of the message
msgLength = int(ethutil.BytesToNumber(b[:4]))
msgLength = int(ethutil.BytesToNumber(buff[4:8]))
// Remove the length
b = b[4:]
n -= 8
// Remove the token and length
buff = buff[8:]
}
buff = append(buff, b[:n]...)
if len(buff) >= msgLength {
messages = append(messages, buff[:msgLength])
buff = buff[msgLength:]