opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-02 03:28:25 +08:00
Code Issues Projects Releases Wiki Activity

mocknet: bugfix on opening conns + printer

Browse Source
This commit is contained in:
Juan Batiz-Benet
2014-12-17 11:15:23 -08:00
parent f1fc09ccee
commit b0a36aabcb
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/mock/mock_link.go
View File

@ -23,7 +23,7 @@ func newLink(mn *mocknet, opts LinkOptions) *link {
return &link{mock: mn, opts: opts}
}
func (l *link) newConnPair() (*conn, *conn) {
func (l *link) newConnPair(dialer *peernet) (*conn, *conn) {
l.RLock()
defer l.RUnlock()
@ -43,7 +43,11 @@ func (l *link) newConnPair() (*conn, *conn) {
c2 := mkconn(l.nets[1], l.nets[0].peer.ID())
c1.rconn = c2
c2.rconn = c1
return c1, c2
if dialer == c1.net {
return c1, c2
}
return c2, c1
}
func (l *link) newStreamPair() (*stream, *stream) {

4
net/mock/mock_peernet.go
View File

@ -137,13 +137,15 @@ func (pn *peernet) connect(p peer.Peer) error {
}
func (pn *peernet) openConn(r peer.Peer, l *link) *conn {
lc, rc := l.newConnPair()
lc, rc := l.newConnPair(pn)
log.Debugf("%s opening connection to %s", pn.LocalPeer(), lc.RemotePeer())
pn.addConn(lc)
rc.net.remoteOpenedConn(rc)
return lc
}
func (pn *peernet) remoteOpenedConn(c *conn) {
log.Debugf("%s accepting connection from %s", pn.LocalPeer(), c.RemotePeer())
pn.addConn(c)
}