Changeset 12955

Timestamp:

Oct 9, 2011, 12:18:18 AM (11 years ago)

Author:

jordan

Message:

(trunk libT) #4526 "do not skip scrape unless all three scrape fields came with announce" -- fixed.

File:

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

trunk/libtransmission/announcer.c

@@ -1073 +1073 @@
             int i;
             const char * str;
-            bool got_scrape_info = false;
+            int scrape_fields = 0;
             const bool isStopped = event == TR_ANNOUNCE_EVENT_STOPPED;
 
@@ -1082 +1082 @@
                 tracker->consecutiveFailures = 0;
 
-                /* if the tracker included scrape fields in its announce response,
-                   then a separate scrape isn't needed */
-
-                got_scrape_info = response->seeders
-                               || response->leechers
-                               || response->downloads;
-
-                if( got_scrape_info )
+                if( response->seeders >= 0 )
                 {
                     tracker->seederCount = response->seeders;
+                    ++scrape_fields;
+                }
+
+                if( response->leechers >= 0 )
+                {
                     tracker->leecherCount = response->leechers;
+                    ++scrape_fields;
+                }
+                if( response->downloads >= 0 )
+                {
                     tracker->downloadCount = response->downloads;
+                    ++scrape_fields;
                 }
 
@@ -1131 +1134 @@
             tier->isRunning = data->isRunningOnSuccess;
 
-            if( got_scrape_info )
+            /* if the tracker included scrape fields in its announce response,
+               then a separate scrape isn't needed */
+            if( scrape_fields >= 3 )
             {
                 tr_tordbg( tier->tor, "Announce response contained scrape info; "