Reinstate the reduce dial timeout and update some values

Fixes #263

diff --git a/client.go b/client.go
index 664abb203a760170a87b2ae90916d90895ea117e..1f6119f5eae3fe4e43441cf77a041137af3735b0 100644 (file)
--- a/client.go
+++ b/client.go
@@ -597,7 +597,11 @@ func (cl *Client) establishOutgoingConnEx(t *Torrent, addr string, ctx context.C
 // Returns nil connection and nil error if no connection could be established
 // for valid reasons.
 func (cl *Client) establishOutgoingConn(t *Torrent, addr string) (c *connection, err error) {
-       ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+       ctx, cancel := context.WithTimeout(context.Background(), func() time.Duration {
+               cl.mu.RLock()
+               defer cl.mu.RUnlock()
+               return t.dialTimeout()
+       }())
        defer cancel()
        obfuscatedHeaderFirst := !cl.config.DisableEncryption && !cl.config.PreferNoEncryption
        c, err = cl.establishOutgoingConnEx(t, addr, ctx, obfuscatedHeaderFirst)

diff --git a/config.go b/config.go
index 6994a37ff7123db90da5ed9f720b003adb6c737a..af7b2c06ff63a5d1becb783373f25f276a04d686 100644 (file)
--- a/config.go
+++ b/config.go
@@ -93,17 +93,19 @@ type ClientConfig struct {
        // Also see `extendedHandshakeClientVersion`.
        Bep20 string // default "-GT0001-"
 
-       NominalDialTimeout         time.Duration // default  time.Second * 30
-       MinDialTimeout             time.Duration // default  5 * time.Second
-       EstablishedConnsPerTorrent int           // default 80
-       HalfOpenConnsPerTorrent    int           // default  80
-       TorrentPeersHighWater      int           // default 200
-       TorrentPeersLowWater       int           // default 50
+       // Peer dial timeout to use when there are limited peers.
+       NominalDialTimeout time.Duration
+       // Minimum peer dial timeout to use (even if we have lots of peers).
+       MinDialTimeout             time.Duration
+       EstablishedConnsPerTorrent int
+       HalfOpenConnsPerTorrent    int
+       TorrentPeersHighWater      int
+       TorrentPeersLowWater       int
 
        // Limit how long handshake can take. This is to reduce the lingering
        // impact of a few bad apples. 4s loses 1% of successful handshakes that
        // are obtained with 60s timeout, and 5% of unsuccessful handshakes.
-       HandshakesTimeout time.Duration // default  20 * time.Second
+       HandshakesTimeout time.Duration
 
        PublicIp4 net.IP
        PublicIp6 net.IP
@@ -133,18 +135,18 @@ func NewDefaultClientConfig() *ClientConfig {
                        }},
                HTTPUserAgent:                  DefaultHTTPUserAgent,
                ExtendedHandshakeClientVersion: "go.torrent dev 20150624",
-               Bep20:                      "-GT0001-",
-               NominalDialTimeout:         30 * time.Second,
-               MinDialTimeout:             5 * time.Second,
-               EstablishedConnsPerTorrent: 50,
-               HalfOpenConnsPerTorrent:    25,
-               TorrentPeersHighWater:      500,
-               TorrentPeersLowWater:       50,
-               HandshakesTimeout:          20 * time.Second,
-               DhtStartingNodes:           dht.GlobalBootstrapAddrs,
-               ListenHost:                 func(string) string { return "" },
-               UploadRateLimiter:          unlimited,
-               DownloadRateLimiter:        unlimited,
+               Bep20:                          "-GT0001-",
+               NominalDialTimeout:             20 * time.Second,
+               MinDialTimeout:                 5 * time.Second,
+               EstablishedConnsPerTorrent:     50,
+               HalfOpenConnsPerTorrent:        25,
+               TorrentPeersHighWater:          500,
+               TorrentPeersLowWater:           50,
+               HandshakesTimeout:              4 * time.Second,
+               DhtStartingNodes:               dht.GlobalBootstrapAddrs,
+               ListenHost:                     func(string) string { return "" },
+               UploadRateLimiter:              unlimited,
+               DownloadRateLimiter:            unlimited,
        }
 }
 

diff --git a/torrent.go b/torrent.go
index ff2f04cef1d6f0e7b21b914f95ebc4e1f20733ec..d7746586e90e8331c6881ab5bcbd4f9d13f97c2d 100644 (file)
--- a/torrent.go
+++ b/torrent.go
@@ -1793,3 +1793,7 @@ func (t *Torrent) hashingPiece(i pieceIndex) bool {
 func (t *Torrent) pieceQueuedForHash(i pieceIndex) bool {
        return t.piecesQueuedForHash.Get(bitmap.BitIndex(i))
 }
+
+func (t *Torrent) dialTimeout() time.Duration {
+       return reducedDialTimeout(t.cl.config.MinDialTimeout, t.cl.config.NominalDialTimeout, t.cl.halfOpenLimit, t.peers.Len())
+}