swarm: msg wrapping
Juan Batiz-Benet committed
Oct 18, 2014 at 04:05 UTC
d47115bca0a92a22bd8acdeeb3c7e07899c52cf9
1 file changed
+7
-7
net/swarm/conn.go
+7
-7
@@ -126,7 +126,7 @@ func (s *Swarm) connVersionExchange(r conn.Conn) error {
126
return err
127
}
128
129
- r.MsgOut() <- msg.New(rpeer, myVerBytes)
129
+ r.Out() <- myVerBytes
130
log.Debug("Sent my version(%s) [to = %s]", localH, rpeer)
131
132
select {
@@ -136,13 +136,13 @@ func (s *Swarm) connVersionExchange(r conn.Conn) error {
136
// case <-remote.Done():
137
// return errors.New("remote closed connection during version exchange")
138
139
- case data, ok := <-r.MsgIn():
139
+ case data, ok := <-r.In():
140
if !ok {
141
return fmt.Errorf("Error retrieving from conn: %v", rpeer)
142
}
143
144
remoteH = new(handshake.Handshake1)
145
- err = proto.Unmarshal(data.Data(), remoteH)
145
+ err = proto.Unmarshal(data, remoteH)
146
if err != nil {
147
s.Close()
148
return fmt.Errorf("connSetup: could not decode remote version: %q", err)
@@ -174,7 +174,7 @@ func (s *Swarm) fanOut() {
174
}
175
176
s.connsLock.RLock()
177
- conn, found := s.conns[msg.Peer().Key()]
177
+ c, found := s.conns[msg.Peer().Key()]
178
s.connsLock.RUnlock()
179
180
if !found {
@@ -187,7 +187,7 @@ func (s *Swarm) fanOut() {
187
// log.Debug("[peer: %s] Sent message [to = %s]", s.local, msg.Peer())
188
189
// queue it in the connection's buffer
190
- conn.MsgOut() <- msg
190
+ c.Out() <- msg.Data()
191
}
192
}
193
}
@@ -202,7 +202,7 @@ func (s *Swarm) fanIn(c conn.Conn) {
202
c.Close()
203
goto out
204
205
- case data, ok := <-c.MsgIn():
205
+ case data, ok := <-c.In():
206
if !ok {
207
e := fmt.Errorf("Error retrieving from conn: %v", c.RemotePeer())
208
s.errChan <- e
@@ -210,7 +210,7 @@ func (s *Swarm) fanIn(c conn.Conn) {
210
}
211
212
// log.Debug("[peer: %s] Received message [from = %s]", s.local, c.Peer)
213
- s.Incoming <- data
213
+ s.Incoming <- msg.New(c.RemotePeer(), data)
214
}
215
}
216