Changeset 11981

Timestamp:

Feb 19, 2011, 12:30:18 PM (12 years ago)

Author:

jordan

Message:

(trunk libT) closeBadPeers() part 2 of 2: this function was serving two purposes, which wasn't clear from its name. refactor slightly to make the purpose and name match.

File:

• trunk/libtransmission/peer-mgr.c (modified) (2 diffs)

trunk/libtransmission/peer-mgr.c

@@ -3271 +3271 @@
 closeBadPeers( Torrent * t, const time_t now_sec )
 {
-    if( !t->isRunning )
-    {
-        removeAllPeers( t );
-    }
-    else
-    {
-        int i;
-        int mustCloseCount;
-        struct tr_peer ** mustClose;
-
-        /* disconnect the really bad peers */
-        mustClose = getPeersToClose( t, TR_MUST_CLOSE, now_sec, &mustCloseCount );
-        for( i=0; i<mustCloseCount; ++i )
-            closePeer( t, mustClose[i] );
-        tr_free( mustClose );
-    }
+    int i;
+    int mustCloseCount;
+    struct tr_peer ** mustClose = getPeersToClose( t, TR_MUST_CLOSE, now_sec, &mustCloseCount );
+    for( i=0; i<mustCloseCount; ++i )
+        closePeer( t, mustClose[i] );
+    tr_free( mustClose );
 }
 
@@ -3455 +3445 @@
     tor = NULL;
     while(( tor = tr_torrentNext( mgr->session, tor )))
-        closeBadPeers( tor->torrentPeers, now_sec );
+        if( !tor->torrentPeers->isRunning )
+            removeAllPeers( tor->torrentPeers );
+        else
+            closeBadPeers( tor->torrentPeers, now_sec );
 
     /* try to make new peer connections */