Changeset 6757

Timestamp:

Sep 16, 2008, 4:46:18 PM (14 years ago)

Author:

charles

Message:

(1.3x libT) backport #1254 (r6700): "reconnecting too frequently to the same peer"

File:

• branches/1.3x/libtransmission/peer-mgr.c (modified) (10 diffs)

branches/1.3x/libtransmission/peer-mgr.c

@@ -74 +74 @@
 
     /* unreachable for now... but not banned.  if they try to connect to us it's okay */
-    MYFLAG_UNREACHABLE = 2
+    MYFLAG_UNREACHABLE = 2,
+
+    /* the absolute minimum we'll wait before attempting to reconnect to a peer */
+    MINIMUM_RECONNECT_INTERVAL_SECS = 5
 };
 
@@ -94 +97 @@
     uint16_t numFails;
     struct in_addr addr;
-    time_t time;
+    time_t time; /* the last time the peer's connection status changed */
     time_t piece_data_time;
 };
@@ -917 +920 @@
 
 static int
-getMaxPeerCount( const tr_torrent * tor UNUSED )
+getMaxPeerCount( const tr_torrent * tor )
 {
     return tor->maxConnectedPeers;
+}
+
+static int
+getPeerCount( const Torrent * t )
+{
+    return tr_ptrArraySize( t->peers ) + tr_ptrArraySize( t->outgoingHandshakes );
 }
 
@@ -976 +985 @@
         ensureAtomExists( t, addr, port, 0, TR_PEER_FROM_INCOMING );
         atom = getExistingAtom( t, addr );
+        atom->time = time( NULL );
 
         if( atom->myflags & MYFLAG_BANNED )
@@ -982 +992 @@
             tr_peerIoFree( io );
         }
-        else if( tr_ptrArraySize( t->peers ) >= getMaxPeerCount( t->tor ) )
+        else if( tr_peerIoIsIncoming( io )
+                 && ( getPeerCount( t ) >= getMaxPeerCount( t->tor ) ) )
+
         {
             tr_peerIoFree( io );
@@ -1009 +1021 @@
                 peer->io = io;
                 peer->msgs = tr_peerMsgsNew( t->tor, peer, peerCallbackFunc, t, &peer->msgsTag );
-                atom->time = time( NULL );
             }
         }
@@ -1760 +1771 @@
 {
     int sec;
-
-    switch( atom->numFails )
-    {
+    const time_t now = time( NULL );
+
+    /* if we were recently connected to this peer and transferring piece
+     * data, try to reconnect to them sooner rather that later -- we don't
+     * want network troubles to get in the way of a good peer. */
+    if( ( now - atom->piece_data_time ) <= ( MINIMUM_RECONNECT_INTERVAL_SECS * 2 ) )
+        sec = MINIMUM_RECONNECT_INTERVAL_SECS;
+
+    /* don't allow reconnects more often than our minimum */
+    else if( ( now - atom->time ) < MINIMUM_RECONNECT_INTERVAL_SECS )
+        sec = MINIMUM_RECONNECT_INTERVAL_SECS;
+
+    /* otherwise, the interval depends on how many times we've tried
+     * and failed to connect to the peer */
+    else switch( atom->numFails ) {
         case 0: sec = 0; break;
         case 1: sec = 5; break;
@@ -1790 +1813 @@
     for( i=retCount=0; i<atomCount; ++i )
     {
+        int interval;
         struct peer_atom * atom = atoms[i];
 
@@ -1811 +1835 @@
             continue;
 
-        /* If we were connected to this peer recently and transferring
-         * piece data, try to reconnect -- network troubles may have
-         * disconnected us.  but if we weren't sharing piece data,
-         * hold off on this peer to give another one a try instead */
-        if( ( now - atom->piece_data_time ) > 10 )
-        {
-            const int wait = getReconnectIntervalSecs( atom );
-            if( ( now - atom->time ) < wait ) {
-                tordbg( t, "RECONNECT peer %d (%s) is in its grace period of %d seconds..",
-                        i, tr_peerIoAddrStr(&atom->addr,atom->port), wait );
-                continue;
-            }
+        /* don't reconnect too often */
+        interval = getReconnectIntervalSecs( atom );
+        if( ( now - atom->time ) < interval ) {
+            tordbg( t, "RECONNECT peer %d (%s) is in its grace period of %d seconds..",
+                    i, tr_peerIoAddrStr(&atom->addr,atom->port), interval );
+            continue;
         }
 
@@ -1886 +1904 @@
 
         /* add some new ones */
-        for( i=0;    i < nCandidates
-                  && i < MAX_RECONNECTIONS_PER_PULSE
-                  && newConnectionsThisSecond < MAX_CONNECTIONS_PER_SECOND; ++i )
+        for( i=0;    ( i < nCandidates )
+                  && ( i < MAX_RECONNECTIONS_PER_PULSE )
+                  && ( getPeerCount( t ) < getMaxPeerCount( t->tor ) )
+                  && ( newConnectionsThisSecond < MAX_CONNECTIONS_PER_SECOND ); ++i )
         {
             tr_peerMgr * mgr = t->manager;