aboutsummaryrefslogtreecommitdiffstats
path: root/whisper/peer.go
diff options
context:
space:
mode:
Diffstat (limited to 'whisper/peer.go')
-rw-r--r--whisper/peer.go27
1 files changed, 10 insertions, 17 deletions
diff --git a/whisper/peer.go b/whisper/peer.go
index 332ddd22a..66cfec88c 100644
--- a/whisper/peer.go
+++ b/whisper/peer.go
@@ -2,10 +2,10 @@ package whisper
import (
"fmt"
- "io/ioutil"
"time"
"github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rlp"
"gopkg.in/fatih/set.v0"
)
@@ -77,8 +77,7 @@ func (self *peer) broadcast(envelopes []*Envelope) error {
}
if i > 0 {
- msg := p2p.NewMsg(envelopesMsg, envs[:i]...)
- if err := self.ws.WriteMsg(msg); err != nil {
+ if err := p2p.EncodeMsg(self.ws, envelopesMsg, envs[:i]...); err != nil {
return err
}
self.peer.DebugDetailln("broadcasted", i, "message(s)")
@@ -93,34 +92,28 @@ func (self *peer) addKnown(envelope *Envelope) {
func (self *peer) handleStatus() error {
ws := self.ws
-
if err := ws.WriteMsg(self.statusMsg()); err != nil {
return err
}
-
msg, err := ws.ReadMsg()
if err != nil {
return err
}
-
if msg.Code != statusMsg {
return fmt.Errorf("peer send %x before status msg", msg.Code)
}
-
- data, err := ioutil.ReadAll(msg.Payload)
- if err != nil {
- return err
+ s := rlp.NewStream(msg.Payload)
+ if _, err := s.List(); err != nil {
+ return fmt.Errorf("bad status message: %v", err)
}
-
- if len(data) == 0 {
- return fmt.Errorf("malformed status. data len = 0")
+ pv, err := s.Uint()
+ if err != nil {
+ return fmt.Errorf("bad status message: %v", err)
}
-
- if pv := data[0]; pv != protocolVersion {
+ if pv != protocolVersion {
return fmt.Errorf("protocol version mismatch %d != %d", pv, protocolVersion)
}
-
- return nil
+ return msg.Discard() // ignore anything after protocol version
}
func (self *peer) statusMsg() p2p.Msg {