mocknet: bugfix on opening conns + printer
Juan Batiz-Benet committed
Dec 17, 2014 at 11:15 UTC
b0a36aabcb64b265f90b0351afa9bd3bed0812b9
2 files changed
+9
-3
net/mock/mock_link.go
+6
-2
@@ -23,7 +23,7 @@ func newLink(mn *mocknet, opts LinkOptions) *link {
23
return &link{mock: mn, opts: opts}
24
}
25
26
-func (l *link) newConnPair() (*conn, *conn) {
26
+func (l *link) newConnPair(dialer *peernet) (*conn, *conn) {
27
l.RLock()
28
defer l.RUnlock()
29
@@ -43,7 +43,11 @@ func (l *link) newConnPair() (*conn, *conn) {
43
c2 := mkconn(l.nets[1], l.nets[0].peer.ID())
44
c1.rconn = c2
45
c2.rconn = c1
46
- return c1, c2
46
+
47
+ if dialer == c1.net {
48
+ return c1, c2
49
+ }
50
+ return c2, c1
51
}
52
53
func (l *link) newStreamPair() (*stream, *stream) {
net/mock/mock_peernet.go
+3
-1
@@ -137,13 +137,15 @@ func (pn *peernet) connect(p peer.Peer) error {
137
}
138
139
func (pn *peernet) openConn(r peer.Peer, l *link) *conn {
140
- lc, rc := l.newConnPair()
140
+ lc, rc := l.newConnPair(pn)
141
+ log.Debugf("%s opening connection to %s", pn.LocalPeer(), lc.RemotePeer())
142
pn.addConn(lc)
143
rc.net.remoteOpenedConn(rc)
144
return lc
145
}
146
147
func (pn *peernet) remoteOpenedConn(c *conn) {
148
+ log.Debugf("%s accepting connection from %s", pn.LocalPeer(), c.RemotePeer())
149
pn.addConn(c)
150
}
151