Changeset 9289

Timestamp:

Oct 11, 2009, 4:39:24 AM (13 years ago)

Author:

charles

Message:

(trunk libT) fix scrape status string error reporte by bmw

File:

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

trunk/libtransmission/announcer.c

@@ -1353 +1353 @@
 parseScrapeResponse( tr_tier     * tier,
                      const char  * response,
-                     size_t        responseLen )
+                     size_t        responseLen,
+                     char        * result,
+                     size_t        resultlen )
 {
     tr_bool success = FALSE;
@@ -1406 +1408 @@
         tr_bencFree( &benc );
 
+    if( success )
+        tr_strlcpy( result, _( "Success" ), resultlen );
+    else
+        tr_strlcpy( result, _( "Error parsing response" ), resultlen );
+
     return success;
 }
@@ -1437 +1444 @@
         }
 
-        if( responseCode == HTTP_OK )
-        {
-            success = parseScrapeResponse( tier, response, responseLen );
-        }
-
         if( 200 <= responseCode && responseCode <= 299 )
         {
@@ -1447 +1449 @@
             tier->scrapeAt = now + interval;
 
-            tr_strlcpy( tier->lastScrapeStr, _( "Success" ), sizeof( tier->lastScrapeStr ) );
-            tr_tordbg( tier->tor, "Request succeeded. Rescraping in %d seconds", interval );
+            if( responseCode == HTTP_OK )
+                success = parseScrapeResponse( tier, response, responseLen,
+                                               tier->lastScrapeStr, sizeof( tier->lastScrapeStr ) );
+            else
+                tr_snprintf( tier->lastScrapeStr, sizeof( tier->lastScrapeStr ),
+                             _( "tracker gave HTTP Response Code %1$ld (%2$s)" ),
+                             responseCode, tr_webGetResponseStr( responseCode ) );
+            tr_tordbg( tier->tor, "%s", tier->lastScrapeStr );
         }
         else if( 300 <= responseCode && responseCode <= 399 )