Changeset 5029

Timestamp:

Feb 13, 2008, 5:18:29 PM (15 years ago)

Author:

charles

Message:

(1.0x) #690: get multitracker torrents working with the evhttp code

File:

• branches/1.0x/libtransmission/tracker.c (modified) (8 diffs)

branches/1.0x/libtransmission/tracker.c

@@ -283 +283 @@
 
 static const char*
-updateAddresses( tr_tracker * t, const struct evhttp_request * req )
+updateAddresses( tr_tracker * t, const struct evhttp_request * req, int * tryAgain )
 {
     const char * ret = NULL;
@@ -337 +337 @@
     }
 
+    *tryAgain = moveToNextAddress;
+
     if( moveToNextAddress )
-        if ( ++t->addressIndex >= t->addressCount )
+    {
+        if ( ++t->addressIndex >= t->addressCount ) /* we've tried them all */
+        {
+            *tryAgain = FALSE;
             t->addressIndex = 0;
+            ret = "Tracker hasn't responded yet.  Retrying...";
+            tr_inf( ret );
+        }
+    }
+
 
     return ret;
@@ -387 +397 @@
 {
     const char * warning;
+    int tryAgain;
     int responseCode;
     struct torrent_hash * torrent_hash = (struct torrent_hash*) vhash;
@@ -474 +485 @@
     }
 
-    if (( warning = updateAddresses( t, req ) )) {
+    if (( warning = updateAddresses( t, req, &tryAgain ) )) {
         publishWarning( t, warning );
         tr_err( warning );
@@ -483 +494 @@
     **/
 
-    responseCode = req ? req->response_code : 503;
+    if( tryAgain )
+        responseCode = 300;
+    else if( req )
+        responseCode = req->response_code;
+    else
+        responseCode = 503;
 
     if( 200<=responseCode && responseCode<=299 )
@@ -544 +560 @@
 {
     const char * warning;
+    int tryAgain;
     time_t nextScrapeSec = 60;
     struct torrent_hash * torrent_hash = (struct torrent_hash*) vhash;
@@ -607 +624 @@
     }
 
-    if (( warning = updateAddresses( t, req ) )) {
+    if (( warning = updateAddresses( t, req, &tryAgain ) ))
+    {
         tr_err( warning );
         publishWarning( t, warning );
     }
 
-    t->scrapeAt = time( NULL ) + t->randOffset + nextScrapeSec;
+    if( tryAgain ) 
+        t->scrapeAt = time( NULL );
+    else
+        t->scrapeAt = time( NULL ) + t->randOffset + nextScrapeSec;
 }
 
@@ -851 +872 @@
     dbgmsg( t, "sending '%s' to tracker %s:%d, timeout is %d", req->uri, req->address, req->port, (int)req->timeout );
     evhttp_connection_set_timeout( evcon, req->timeout );
+    ++handle->tracker->socketCount;
     if( evhttp_make_request( evcon, req->req, EVHTTP_REQ_GET, req->uri ))
-        publishErrorMessageAndStop( t, "Tracker could not be reached." );
-    else {
-        ++handle->tracker->socketCount;
+        (*req->req->cb)(req->req, req->req->cb_arg);
+    else
         dbgmsg( t, "incremented socket count to %d", handle->tracker->socketCount );
-    }
 }