Changeset 2754

Timestamp:

Aug 14, 2007, 8:08:57 PM (15 years ago)

Author:

charles

Message:

(trunk) revert yesterday's tracker changes.

File:

• trunk/libtransmission/tracker.c (modified) (6 diffs)

trunk/libtransmission/tracker.c

@@ -92 +92 @@
     int            randOffset;
 
+    tr_flag_t      hasManyPeers;
     tr_flag_t      completelyUnconnectable;
     tr_flag_t      allUnreachIfError;
@@ -210 +211 @@
 static int shouldConnect( tr_tracker_t * tc )
 {
+    tr_torrent_t * tor = tc->tor;
     const uint64_t now = tr_date();
 
@@ -265 +267 @@
     {
         return 1;
+    }
+
+    /* If there is quite a lot of people on this torrent, stress
+       the tracker a bit until we get a decent number of peers */
+    if( tc->hasManyPeers &&
+        (tr_cpGetStatus ( tor->completion ) == TR_CP_INCOMPLETE ))
+    {
+        /* reannounce in 10 seconds if we have less than 5 peers */
+        if( tor->peerCount < 5 )
+        {
+            if( now > tc->dateOk + 1000 * MAX( 10, tc->minInterval ) )
+            {
+                return 1;
+            }
+        }
+        /* reannounce in 20 seconds if we have less than 10 peers */
+        else if( tor->peerCount < 10 )
+        {
+            if( now > tc->dateOk + 1000 * MAX( 20, tc->minInterval ) )
+            {
+                return 1;
+            }
+        }
+        /* reannounce in 30 seconds if we have less than 15 peers */
+        else if( tor->peerCount < 15 )
+        {
+            if( now > tc->dateOk + 1000 * MAX( 30, tc->minInterval ) )
+            {
+                return 1;
+            }
+        }
     }
 
@@ -779 +812 @@
 
     tc->scrapeNeeded = scrapeNeeded;
+    if( !scrapeNeeded )
+    {
+        tc->hasManyPeers = ( tc->seeders + tc->leechers >= 50 );
+    }
 
     beFoo = tr_bencDictFind( &beAll, "tracker id" );
@@ -822 +859 @@
     {
         tr_inf( "Tracker: got %d peers", peerCount );
+        if( peerCount >= 50 )
+        {
+            tc->hasManyPeers = 1;
+        }
         *_peerCount = peerCount;
         *_peerCompact = peerCompact;
@@ -965 +1006 @@
     }
     
+    tc->hasManyPeers = ( tc->seeders + tc->leechers >= 50 );
+    
     tr_bencFree( &scrape );
 }