p2p/net/conn/dialer: added Dialer field
Juan Batiz-Benet committed
Jan 11, 2015 at 11:59 UTC
387c0508fe6530af1ca35a0ada9c9e8e4d54e632
2 files changed
+6
-3
p2p/net/conn/dial.go
+2
-3
@@ -41,11 +41,10 @@ func (d *Dialer) Dial(ctx context.Context, raddr ma.Multiaddr, remote peer.ID) (
41
}
42
43
// TODO: try to get reusing addr/ports to work.
44
- // madialer := manet.Dialer{LocalAddr: laddr}
45
- madialer := manet.Dialer{}
44
+ // d.Dialer.LocalAddr = laddr
45
46
log.Debugf("%s dialing %s %s", d.LocalPeer, remote, raddr)
48
- maconn, err := madialer.Dial(raddr)
47
+ maconn, err := d.Dialer.Dial(raddr)
48
if err != nil {
49
return nil, err
50
}
p2p/net/conn/interface.go
+4
@@ -11,6 +11,7 @@ import (
11
12
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
13
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
14
+ manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
15
)
16
17
// Map maps Keys (Peer.IDs) to Connections.
@@ -52,6 +53,9 @@ type Conn interface {
53
// no longer simple (need a peerstore, a local peer, a context, a network, etc)
54
type Dialer struct {
55
56
+ // Dialer is an optional manet.Dialer to use.
57
+ Dialer manet.Dialer
58
+
59
// LocalPeer is the identity of the local Peer.
60
LocalPeer peer.ID
61