add timeout opt to transport dialer creation

whyrusleeping · whyrusleeping · commit 2bb574c99481 · 2015-11-03T09:48:07.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/p2p/net/conn/dial.go b/p2p/net/conn/dial.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"math/rand"
 	"strings"
-	"time"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
@@ -19,7 +18,7 @@ import (
 
 type WrapFunc func(transport.Conn) transport.Conn
 
-func NewDialer(p peer.ID, pk ci.PrivKey, tout time.Duration, wrap WrapFunc) *Dialer {
+func NewDialer(p peer.ID, pk ci.PrivKey, wrap WrapFunc) *Dialer {
 	return &Dialer{
 		LocalPeer:  p,
 		PrivateKey: pk,
diff --git a/p2p/net/swarm/swarm.go b/p2p/net/swarm/swarm.go
@@ -103,7 +103,7 @@ func NewSwarm(ctx context.Context, listenAddrs []ma.Multiaddr,
 		bwc:         bwc,
 		fdRateLimit: make(chan struct{}, concurrentFdDials),
 		Filters:     filter.NewFilters(),
-		dialer:      conn.NewDialer(local, peers.PrivKey(local), DialTimeout, wrap),
+		dialer:      conn.NewDialer(local, peers.PrivKey(local), wrap),
 	}
 
 	// configure Swarm
diff --git a/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go
@@ -22,7 +22,7 @@ func (s *Swarm) setupAddresses(addrs []ma.Multiaddr) error {
 			return fmt.Errorf("no transport for address: %s", a)
 		}
 
-		d, err := tpt.Dialer(a)
+		d, err := tpt.Dialer(a, transport.TimeoutOpt(DialTimeout))
 		if err != nil {
 			return err
 		}
diff --git a/p2p/net/transport/tcp.go b/p2p/net/transport/tcp.go
@@ -1,8 +1,10 @@
 package transport
 
 import (
+	"fmt"
 	"net"
 	"sync"
+	"time"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
@@ -26,16 +28,25 @@ func NewTCPTransport() *TcpTransport {
 	}
 }
 
-func (t *TcpTransport) Dialer(laddr ma.Multiaddr) (Dialer, error) {
+func (t *TcpTransport) Dialer(laddr ma.Multiaddr, opts ...DialOpt) (Dialer, error) {
 	t.dlock.Lock()
 	defer t.dlock.Unlock()
 	s := laddr.String()
 	d, found := t.dialers[s]
 	if found {
 		return d, nil
 	}
-
 	var base manet.Dialer
+
+	for _, o := range opts {
+		switch o := o.(type) {
+		case TimeoutOpt:
+			base.Timeout = o.(time.Duration)
+		default:
+			return nil, fmt.Errorf("unrecognized option: %#v", o)
+		}
+	}
+
 	tcpd, err := t.newTcpDialer(base, laddr)
 	if err != nil {
 		return nil, err
@@ -119,10 +130,17 @@ func (t *TcpTransport) newTcpDialer(base manet.Dialer, laddr ma.Multiaddr) (*tcp
 		}, nil
 	}
 
+	rd := reuseport.Dialer{
+		D: net.Dialer{
+			LocalAddr: la,
+			Timeout:   base.Timeout,
+		},
+	}
+
 	return &tcpDialer{
 		doReuse:   true,
 		laddr:     laddr,
-		rd:        reuseport.Dialer{D: net.Dialer{LocalAddr: la}},
+		rd:        rd,
 		madialer:  base,
 		transport: t,
 	}, nil
diff --git a/p2p/net/transport/transport.go b/p2p/net/transport/transport.go
@@ -17,7 +17,7 @@ type Conn interface {
 }
 
 type Transport interface {
-	Dialer(laddr ma.Multiaddr) (Dialer, error)
+	Dialer(laddr ma.Multiaddr, opts ...DialOpt) (Dialer, error)
 	Listener(laddr ma.Multiaddr) (Listener, error)
 	Matches(ma.Multiaddr) bool
 }
@@ -43,6 +43,9 @@ func (cw *connWrap) Transport() Transport {
 	return cw.transport
 }
 
+type DialOpt interface{}
+type TimeoutOpt interface{}
+
 func IsTcpMultiaddr(a ma.Multiaddr) bool {
 	p := a.Protocols()
 	return len(p) == 2 && (p[0].Name == "ip4" || p[0].Name == "ip6") && p[1].Name == "tcp"

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func NewSwarm(ctx context.Context, listenAddrs []ma.Multiaddr,`
`103`	`103`	`bwc: bwc,`
`104`	`104`	`fdRateLimit: make(chan struct{}, concurrentFdDials),`
`105`	`105`	`Filters: filter.NewFilters(),`
`106`		`- dialer: conn.NewDialer(local, peers.PrivKey(local), DialTimeout, wrap),`
	`106`	`+ dialer: conn.NewDialer(local, peers.PrivKey(local), wrap),`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`// configure Swarm`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func (s *Swarm) setupAddresses(addrs []ma.Multiaddr) error {`
`22`	`22`	`return fmt.Errorf("no transport for address: %s", a)`
`23`	`23`	`}`
`24`	`24`
`25`		`- d, err := tpt.Dialer(a)`
	`25`	`+ d, err := tpt.Dialer(a, transport.TimeoutOpt(DialTimeout))`
`26`	`26`	`if err != nil {`
`27`	`27`	`return err`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type Conn interface {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`type Transport interface {`
`20`		`- Dialer(laddr ma.Multiaddr) (Dialer, error)`
	`20`	`+ Dialer(laddr ma.Multiaddr, opts ...DialOpt) (Dialer, error)`
`21`	`21`	`Listener(laddr ma.Multiaddr) (Listener, error)`
`22`	`22`	`Matches(ma.Multiaddr) bool`
`23`	`23`	`}`
`@@ -43,6 +43,9 @@ func (cw *connWrap) Transport() Transport {`
`43`	`43`	`return cw.transport`
`44`	`44`	`}`
`45`	`45`
	`46`	`+type DialOpt interface{}`
	`47`	`+type TimeoutOpt interface{}`
	`48`	`+`
`46`	`49`	`func IsTcpMultiaddr(a ma.Multiaddr) bool {`
`47`	`50`	`p := a.Protocols()`
`48`	`51`	`return len(p) == 2 && (p[0].Name == "ip4" \|\| p[0].Name == "ip6") && p[1].Name == "tcp"`