opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 01:52:26 +08:00
Code Issues Projects Releases Wiki Activity

p2p/net/conn/dialer: added Dialer field

Browse Source
This commit is contained in:
Juan Batiz-Benet
2015-01-11 11:59:03 -08:00
parent fd3e0bb37c
commit 387c0508fe
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
p2p/net/conn/dial.go
View File

@ -41,11 +41,10 @@ func (d *Dialer) Dial(ctx context.Context, raddr ma.Multiaddr, remote peer.ID) (
} }
// TODO: try to get reusing addr/ports to work. // TODO: try to get reusing addr/ports to work.
// madialer := manet.Dialer{LocalAddr: laddr} // d.Dialer.LocalAddr = laddr
madialer := manet.Dialer{}
log.Debugf("%s dialing %s %s", d.LocalPeer, remote, raddr) log.Debugf("%s dialing %s %s", d.LocalPeer, remote, raddr)
maconn, err := madialer.Dial(raddr) maconn, err := d.Dialer.Dial(raddr)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
p2p/net/conn/interface.go
View File

@ -11,6 +11,7 @@ import (
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
) )
// Map maps Keys (Peer.IDs) to Connections. // Map maps Keys (Peer.IDs) to Connections.
@ -52,6 +53,9 @@ type Conn interface {
// no longer simple (need a peerstore, a local peer, a context, a network, etc) // no longer simple (need a peerstore, a local peer, a context, a network, etc)
type Dialer struct { type Dialer struct {
// Dialer is an optional manet.Dialer to use.
Dialer manet.Dialer
// LocalPeer is the identity of the local Peer. // LocalPeer is the identity of the local Peer.
LocalPeer peer.ID LocalPeer peer.ID