Changeset 4024

Timestamp:

Nov 30, 2007, 11:37:44 PM (14 years ago)

Author:

charles

Message:

take inspiration from Solomon when handling odd tracker errors that confuse tracker's request queue: stop the torrent.
when the tracker gives us errors that confuse the tracker work queue,

Location:

trunk/libtransmission

Files:

• torrent.c (modified) (1 diff)
• tracker.c (modified) (13 diffs)

trunk/libtransmission/torrent.c

@@ -171 +171 @@
             tor->error = TR_ERROR_TC_ERROR;
             strlcpy( tor->errorString, event->text, sizeof(tor->errorString) );
+            tr_torrentStop( tor );
             break;
 

trunk/libtransmission/tracker.c

@@ -36 +36 @@
 {
     /* seconds between tracker pulses */
-    PULSE_INTERVAL_MSEC = 750,
+    PULSE_INTERVAL_MSEC = 1000,
 
     /* maximum number of concurrent tracker socket connections */
@@ -111 +111 @@
     time_t reannounceAt;
     time_t scrapeAt;
-
-    time_t resendRequestAt;
-    int resendRequestType;
 
     unsigned int isRunning     : 1;
@@ -216 +213 @@
 publishMessage( tr_tracker * t, const char * msg, int type )
 {
-    tr_tracker_event event = emptyEvent;
-    event.hash = t->hash;
-    event.messageType = type;
-    event.text = msg;
-    tr_publisherPublish( t->publisher, t, &event );
+    if( t != NULL )
+    {
+        tr_tracker_event event = emptyEvent;
+        event.hash = t->hash;
+        event.messageType = type;
+        event.text = msg;
+        tr_publisherPublish( t->publisher, t, &event );
+    }
 }
 
@@ -230 +230 @@
 
 static void
-publishErrorMessage( tr_tracker * t, const char * msg )
-{
+publishErrorMessageAndStop( tr_tracker * t, const char * msg )
+{
+    t->isRunning = 0;
     publishMessage( t, msg, TR_TRACKER_ERROR );
 }
@@ -412 +413 @@
             if(( tmp = tr_bencDictFind( &benc, "failure reason" ))) {
                 dbgmsg( t, "got failure message [%s]", tmp->val.s.s );
-                publishErrorMessage( t, tmp->val.s.s );
+                publishErrorMessageAndStop( t, tmp->val.s.s );
             }
 
@@ -497 +498 @@
     else if( 400<=responseCode && responseCode<=499 )
     {
-        dbgmsg( t, "got a 4xx error." );
+        const char * err = req && req->response_code_line
+            ? req->response_code_line
+            : "Unspecified 4xx error from tracker.";
+        dbgmsg( t, err );
 
         /* The request could not be understood by the server due to
          * malformed syntax. The client SHOULD NOT repeat the
          * request without modifications. */
-        if( req && req->response_code_line )
-            publishErrorMessage( t, req->response_code_line );
+        publishErrorMessageAndStop( t, err );
         t->manualAnnounceAllowedAt = ~(time_t)0;
         t->reannounceAt = 0;
@@ -526 +529 @@
         /* WTF did we get?? */
         if( req && req->response_code_line )
-            publishErrorMessage( t, req->response_code_line );
+            publishWarning( t, req->response_code_line );
         t->manualAnnounceAllowedAt = ~(time_t)0;
         t->reannounceAt = time(NULL) + 60;
@@ -539 +542 @@
     tr_tracker * t = findTrackerFromHash( vhash );
 
-    dbgmsg( t, "Got scrape response for '%s': %s", (t ? t->name : "(null)"), (req ? req->response_code_line : "(no line)") );
+    dbgmsg( t, "Got scrape response for '%s': %s (%d)", (t ? t->name : "(null)"), (req ? req->response_code_line : "(no line)"), (req ? req->response_code : -1) );
 
     tr_free( vhash );
@@ -825 +828 @@
     --handle->tracker->socketCount;
     dbgmsg( NULL, "decrementing socket count to %d", handle->tracker->socketCount );
+    pulse( handle );
 }
 
@@ -835 +839 @@
 }
 
-static int
+static void
 invokeRequest( tr_handle * handle, const struct tr_tracker_request * req )
 {
-    int err;
     struct evhttp_connection * evcon = getConnection( handle, req->address, req->port );
-    dbgmsg( NULL, "sending '%s' to tracker %s:%d, timeout is %d", req->uri, req->address, req->port, (int)req->timeout );
+    tr_tracker * t = findTracker( handle, req->torrent_hash );
+    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 );
-    err = evhttp_make_request( evcon, req->req, EVHTTP_REQ_GET, req->uri );
-    if( !err ) {
+    if( evhttp_make_request( evcon, req->req, EVHTTP_REQ_GET, req->uri ))
+        publishErrorMessageAndStop( t, "Tracker could not be reached." );
+    else {
         ++handle->tracker->socketCount;
-        dbgmsg( NULL, "incremented socket count to %d", handle->tracker->socketCount );
-    }
-    return err;
+        dbgmsg( t, "incremented socket count to %d", handle->tracker->socketCount );
+    }
 }
 
@@ -854 +858 @@
 {
     struct tr_tracker_request * req = tr_list_pop_front( list );
-    const int err = invokeRequest( handle, req );
-
-    if( err )
-    {
-        tr_tracker * t = findTracker( handle, req->torrent_hash );
-        if( t != NULL )
-        {
-            if( req->reqtype == TR_REQ_SCRAPE ) {
-                t->scrapeAt = time(NULL) + 30;
-                dbgmsg( t, "scrape failed... retrying in 30 seconds" );
-            }
-            else {
-                dbgmsg( t, "request [%s] failed... retrying in 30 seconds", req->uri );
-                t->resendRequestAt = time(NULL) + 30;
-                t->resendRequestType = req->reqtype;
-            }
-        }
-    }
-
+    invokeRequest( handle, req );
     freeRequest( req );
 }
@@ -902 +888 @@
 }
 
-/**
- * This function is called when there's been an error invoking a request,
- * or when the tracker has returned back a server error that might require
- * the request to be re-sent.
- */
-static void
-maybeRequeueRequest( tr_handle * handle, const tr_tracker * tracker, int reqtype )
-{
-    /* FIXME */
-    enqueueRequest( handle, tracker, reqtype );
-}
-
 static int
 pulse( void * vhandle )
@@ -929 +903 @@
     {
         tr_tracker * t = tor->tracker;
-
-        if( t->resendRequestAt && ( now >= t->resendRequestAt ) ) {
-            t->resendRequestAt = 0;
-            maybeRequeueRequest( handle, t, t->resendRequestType );
-        }
 
         if( t->scrapeAt && trackerSupportsScrape( t ) && ( now >= t->scrapeAt ) ) {