From 387c0508fe6530af1ca35a0ada9c9e8e4d54e632 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Sun, 11 Jan 2015 11:59:03 -0800
Subject: [PATCH] p2p/net/conn/dialer: added Dialer field

---
 p2p/net/conn/dial.go      | 5 ++---
 p2p/net/conn/interface.go | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/p2p/net/conn/dial.go b/p2p/net/conn/dial.go
index d63fb0258..a56d3d545 100644
--- a/p2p/net/conn/dial.go
+++ b/p2p/net/conn/dial.go
@@ -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.
-	// madialer := manet.Dialer{LocalAddr: laddr}
-	madialer := manet.Dialer{}
+	// d.Dialer.LocalAddr = laddr
 
 	log.Debugf("%s dialing %s %s", d.LocalPeer, remote, raddr)
-	maconn, err := madialer.Dial(raddr)
+	maconn, err := d.Dialer.Dial(raddr)
 	if err != nil {
 		return nil, err
 	}
diff --git a/p2p/net/conn/interface.go b/p2p/net/conn/interface.go
index 1601da1aa..558402fdd 100644
--- a/p2p/net/conn/interface.go
+++ b/p2p/net/conn/interface.go
@@ -11,6 +11,7 @@ import (
 
 	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"
+	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
 )
 
 // 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)
 type Dialer struct {
 
+	// Dialer is an optional manet.Dialer to use.
+	Dialer manet.Dialer
+
 	// LocalPeer is the identity of the local Peer.
 	LocalPeer peer.ID