Changeset 6910

Timestamp:

Oct 15, 2008, 5:53:42 PM (13 years ago)

Author:

charles

Message:

(libT) if a tracker announce succeeds and the tracker's response is a superset of a scrape response, then treat it as a successful announce AND scrape.

Location:

trunk/libtransmission

Files:

• tracker.c (modified) (3 diffs)
• web.c (modified) (1 diff)

trunk/libtransmission/tracker.c

@@ -346 +346 @@
                    void *       torrent_hash )
 {
-    int          retry;
-    int          success = FALSE;
+    int retry;
+    int success = FALSE;
+    int scrapeFields = 0;
     tr_tracker * t;
 
@@ -401 +402 @@
 
             if( ( tr_bencDictFindInt( &benc, "complete", &i ) ) )
+            {
+                ++scrapeFields;
                 t->seederCount = i;
+            }
 
             if( ( tr_bencDictFindInt( &benc, "incomplete", &i ) ) )
+            {
+                ++scrapeFields;
                 t->leecherCount = incomplete = i;
+            }
 
             if( ( tr_bencDictFindInt( &benc, "downloaded", &i ) ) )
+            {
+                ++scrapeFields;
                 t->timesDownloaded = i;
+            }
 
             if( ( tmp = tr_bencDictFind( &benc, "peers" ) ) )
@@ -447 +457 @@
         dbgmsg( t->name, "request succeeded. reannouncing in %d seconds",
                 interval );
-        if( t->scrapeAt <= now )
+
+        /* if the announce response was a superset of the scrape response,
+           treat this as both a successful announce AND scrape. */
+        if( scrapeFields >= 3 ) {
+            t->lastScrapeResponse = responseCode;
+            t->lastScrapeTime = now;
             t->scrapeAt = now + t->scrapeIntervalSec + t->randOffset;
+        }
+
+        /* most trackers don't provide all the scrape responses, but do
+           provide most of them, so don't scrape too soon anyway */
+        if( ( scrapeFields == 2 ) && ( t->scrapeAt <= ( now + 120 ) ) ) {
+            t->scrapeAt = now + t->scrapeIntervalSec + t->randOffset;
+        }
+
         t->reannounceAt = now + interval;
         t->manualAnnounceAllowedAt = now + t->announceMinIntervalSec;

trunk/libtransmission/web.c

@@ -231 +231 @@
 
     do {
-        dbgmsg( stderr, "event_cb calling socket_action fd %d, mask %d", fd, mask );
+        dbgmsg( "event_cb calling socket_action fd %d, mask %d", fd, mask );
         rc = curl_multi_socket_action( g->multi, fd, mask, &g->still_running );
     } while( rc == CURLM_CALL_MULTI_PERFORM );