From ebe2d9d872c5482e02508f1d3e9c3a56e8a41d44 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 8 Dec 2014 12:43:33 +0100
Subject: First draft of Whisper messages relaying

---
 whisper/peer.go | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 whisper/peer.go

(limited to 'whisper/peer.go')

diff --git a/whisper/peer.go b/whisper/peer.go
new file mode 100644
index 000000000..5fe50ba59
--- /dev/null
+++ b/whisper/peer.go
@@ -0,0 +1,114 @@
+package whisper
+
+import (
+	"fmt"
+	"io/ioutil"
+	"time"
+
+	"github.com/ethereum/go-ethereum/p2p"
+	"gopkg.in/fatih/set.v0"
+)
+
+const (
+	protocolVersion = 0x02
+)
+
+type peer struct {
+	host *Whisper
+	peer *p2p.Peer
+	ws   p2p.MsgReadWriter
+
+	// XXX Eventually this is going to reach exceptional large space. We need an expiry here
+	known *set.Set
+
+	quit chan struct{}
+}
+
+func NewPeer(host *Whisper, p *p2p.Peer, ws p2p.MsgReadWriter) *peer {
+	return &peer{host, p, ws, set.New(), make(chan struct{})}
+}
+
+func (self *peer) init() error {
+	if err := self.handleStatus(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (self *peer) start() {
+	go self.update()
+}
+
+func (self *peer) update() {
+	relay := time.NewTicker(300 * time.Millisecond)
+out:
+	for {
+		select {
+		case <-relay.C:
+			err := self.broadcast(self.host.envelopes())
+			if err != nil {
+				self.peer.Infoln(err)
+				break out
+			}
+
+		case <-self.quit:
+			break out
+		}
+	}
+}
+
+func (self *peer) broadcast(envelopes []*Envelope) error {
+	envs := make([]interface{}, len(envelopes))
+	i := 0
+	for _, envelope := range envelopes {
+		if !self.known.Has(envelope.Hash()) {
+			envs[i] = envelope
+			self.known.Add(envelope.Hash())
+			i++
+		}
+	}
+
+	msg := p2p.NewMsg(envelopesMsg, envs[:i]...)
+	if err := self.ws.WriteMsg(msg); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+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
+	}
+
+	if len(data) == 0 {
+		return fmt.Errorf("malformed status. data len = 0")
+	}
+
+	if pv := data[0]; pv != protocolVersion {
+		return fmt.Errorf("protocol version mismatch %d != %d", pv, protocolVersion)
+	}
+
+	return nil
+}
+
+func (self *peer) statusMsg() p2p.Msg {
+	return p2p.NewMsg(statusMsg, protocolVersion)
+}
-- 
cgit v1.2.3


From e3a8412df3fe75fe498a3fce64fd2fd691a18183 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 8 Dec 2014 13:16:50 +0100
Subject: Proper start/stoping wpeers

---
 whisper/peer.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'whisper/peer.go')

diff --git a/whisper/peer.go b/whisper/peer.go
index 5fe50ba59..3471ddb2f 100644
--- a/whisper/peer.go
+++ b/whisper/peer.go
@@ -38,6 +38,13 @@ func (self *peer) init() error {
 
 func (self *peer) start() {
 	go self.update()
+	self.peer.Infoln("whisper started")
+}
+
+func (self *peer) stop() {
+	self.peer.Infoln("whisper stopped")
+
+	close(self.quit)
 }
 
 func (self *peer) update() {
@@ -69,9 +76,11 @@ func (self *peer) broadcast(envelopes []*Envelope) error {
 		}
 	}
 
-	msg := p2p.NewMsg(envelopesMsg, envs[:i]...)
-	if err := self.ws.WriteMsg(msg); err != nil {
-		return err
+	if i > 0 {
+		msg := p2p.NewMsg(envelopesMsg, envs[:i]...)
+		if err := self.ws.WriteMsg(msg); err != nil {
+			return err
+		}
 	}
 
 	return nil
-- 
cgit v1.2.3


From 76842b0df8b5605682362bd57fbd6eb315bcaf1f Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 8 Dec 2014 14:25:52 +0100
Subject: Additional checks and debug output

---
 whisper/peer.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'whisper/peer.go')

diff --git a/whisper/peer.go b/whisper/peer.go
index 3471ddb2f..d42b374b5 100644
--- a/whisper/peer.go
+++ b/whisper/peer.go
@@ -81,11 +81,16 @@ func (self *peer) broadcast(envelopes []*Envelope) error {
 		if err := self.ws.WriteMsg(msg); err != nil {
 			return err
 		}
+		self.peer.Infoln("broadcasted", i, "message(s)")
 	}
 
 	return nil
 }
 
+func (self *peer) addKnown(envelope *Envelope) {
+	self.known.Add(envelope.Hash())
+}
+
 func (self *peer) handleStatus() error {
 	ws := self.ws
 
-- 
cgit v1.2.3