Ticket #71: r555_ticket71.patch

libtransmission/tracker.c

@@ -35 +35 @@
     char           stopped;
 
     int            interval;
+    int            min_interval;
     int            seeders;
     int            leechers;
     int            hasManyPeers;
@@ -80 +81 @@
     tc->started  = 1;
 
     tc->interval = 300;
+    tc->min_interval = 0;
     tc->seeders  = -1;
     tc->leechers = -1;
 
@@ -133 +135 @@
        the tracker a bit until we get a decent number of peers */
     if( tc->hasManyPeers )
     {
-        if( tc->tor->peerCount < 5 && now > tc->dateOk + 10000 )
-        {
-            return 1;
+        /* If there is a min interval specified, respect it */
+        if( tc->min_interval > 0 ){
+                        if( tc->tor->peerCount < 30 && now > tc->dateOk + 1000 * tc->min_interval )
+                        {
+                                return 1;
+                        }
+        }
+        /* Gentle hammering */
+        else {
+                        if( tc->tor->peerCount < 10 && now > tc->dateOk + 60000 )
+                        {
+                                return 1;
+                        }
+                        if( tc->tor->peerCount < 20 && now > tc->dateOk + 120000 )
+                        {
+                                return 1;
+                        }                       
         }
-        if( tc->tor->peerCount < 10 && now > tc->dateOk + 20000 )
-        {
-            return 1;
-        }
-        if( tc->tor->peerCount < 15 && now > tc->dateOk + 30000 )
-        {
-            return 1;
-        }
     }
 
     return 0;
@@ -481 +489 @@
     tor->error &= ~TR_ETRACKER;
     tc->lastAttempt = TC_ATTEMPT_OK;
 
-    if( !tc->interval )
-    {
-        /* Get the tracker interval, ignore it if it is not between
-           10 sec and 5 mins */
-        if( !( beFoo = tr_bencDictFind( &beAll, "interval" ) ) ||
-            !( beFoo->type & TYPE_INT ) )
-        {
-            tr_err( "Tracker: no 'interval' field" );
-            goto cleanup;
-        }
 
-        tc->interval = beFoo->val.i;
-        tc->interval = MIN( tc->interval, 300 );
-        tc->interval = MAX( 10, tc->interval );
+        /* Get the tracker interval, ignore it if it is under
+           10 sec */
+        if( !( beFoo = tr_bencDictFind( &beAll, "interval" ) ) ||
+                !( beFoo->type & TYPE_INT ) )
+        {
+                tr_err( "Tracker: no 'interval' field" );
+                goto cleanup;
+        }
 
-        tr_inf( "Tracker: interval = %d seconds", tc->interval );
-    }
+        tc->interval = beFoo->val.i;
+        tc->interval = MAX( 10, tc->interval );
 
+        tr_inf( "Tracker: interval = %d seconds", tc->interval );
+
+
+        /* Get min interval */
+        if( ( beFoo = tr_bencDictFind( &beAll, "min interval" ) ) &&
+                ( beFoo->type & TYPE_INT ) )
+        {
+                 tc->min_interval = beFoo->val.i;
+                 tr_inf( "Tracker: minimum interval = %d seconds", tc->min_interval );
+                 //interval should not be less than min_interval
+                 if( tc->interval < tc->min_interval )
+                 {
+                        tc->interval = tc->min_interval;
+                        tr_inf( "Tracker: interval = %d seconds, adjusted by minimum interval", tc->interval );
+                 }
+        }           
+
     if( ( beFoo = tr_bencDictFind( &beAll, "complete" ) ) &&
         ( beFoo->type & TYPE_INT ) )
     {