Changeset 10166 for trunk/libtransmission/announcer.c

Timestamp:

Feb 11, 2010, 3:12:03 AM (12 years ago)

Author:

charles

Message:

(trunk libT) revert part of r10064 at livings' request

File:

• trunk/libtransmission/announcer.c (modified) (8 diffs)

trunk/libtransmission/announcer.c

@@ -406 +406 @@
     t->announceIntervalSec = DEFAULT_ANNOUNCE_INTERVAL_SEC;
     t->announceMinIntervalSec = DEFAULT_ANNOUNCE_MIN_INTERVAL_SEC;
-    t->scrapeAt = now + tr_cryptoWeakRandInt( 60*10 );
+    t->scrapeAt = now + tr_cryptoWeakRandInt( 60*5 );
     t->tor = tor;
 
@@ -1118 +1118 @@
                        const char  * response,
                        size_t        responseLen,
-                       tr_bool       isStopped,
                        tr_bool     * gotScrape )
 {
@@ -1137 +1136 @@
         const char * str;
         const uint8_t * raw;
+        tr_bool gotPeers = FALSE;
 
         success = TRUE;
@@ -1197 +1197 @@
             const int allAreSeeds = incomplete == 0;
             peerCount += publishNewPeersCompact( tier, allAreSeeds, raw, rawlen );
+            gotPeers = TRUE;
         }
         else if( tr_bencDictFindList( &benc, "peers", &tmp ) )
@@ -1205 +1206 @@
             uint8_t * array = parseOldPeers( tmp, &byteCount );
             peerCount += publishNewPeers( tier, allAreSeeds, array, byteCount );
+            gotPeers = TRUE;
             tr_free( array );
         }
@@ -1213 +1215 @@
             const tr_bool allAreSeeds = incomplete == 0;
             peerCount += publishNewPeersCompact6( tier, allAreSeeds, raw, rawlen );
+            gotPeers = TRUE;
         }
 
@@ -1219 +1222 @@
                         sizeof( tier->lastAnnounceStr ) );
 
-        if( !isStopped )
+        if( gotPeers )
             tier->lastAnnouncePeerCount = peerCount;
     }
@@ -1271 +1274 @@
         if( responseCode == HTTP_OK )
         {
-            success = parseAnnounceResponse( tier, response, responseLen, isStopped, &gotScrape );
+            success = parseAnnounceResponse( tier, response, responseLen, &gotScrape );
             dbgmsg( tier, "success is %d", success );