Changeset 10019

Timestamp:

Jan 26, 2010, 7:22:50 AM (12 years ago)

Author:

charles

Message:

(trunk libT) #2792 "since 1.80 update downloads failing" -- try to handle non-resolving tracker addresses without blocking in curl

Location:

trunk/libtransmission

Files:

• peer-msgs.c (modified) (1 diff)
• web.c (modified) (7 diffs)

trunk/libtransmission/peer-msgs.c

@@ -1706 +1706 @@
         int estimatedBlocksInPeriod;
         double rate;
-        const int floor = 8;
+        const int floor = 4;
         const int seconds = REQUEST_BUF_SECS;
 

trunk/libtransmission/web.c

@@ -100 +100 @@
     CURL * easy;
     CURLM * multi;
+    tr_bool timer_event_isSet;
 };
 
@@ -107 +108 @@
     if( task->slist != NULL )
         curl_slist_free_all( task->slist );
-    evtimer_del( &task->timer_event );
+    if( task->timer_event_isSet )
+        evtimer_del( &task->timer_event );
     evbuffer_free( task->response );
     tr_free( task->host );
@@ -247 +249 @@
 
 static void task_timeout_cb( int fd UNUSED, short what UNUSED, void * task );
+static void task_finish( struct tr_web_task * task, long response_code );
 
 static void
@@ -254 +257 @@
     const tr_session * session = task->session;
 
-    if( session && session->web )
+    if( ( session == NULL ) || ( session->web == NULL ) )
+        return;
+
+    if( task->resolved_host == NULL )
+    {
+        dbgmsg( "couldn't resolve host for \"%s\"... task failed", task->url );
+        task_finish( task, 0 );
+    }
+    else
     {
         CURL * e = curl_easy_init( );
@@ -263 +274 @@
         char * url = NULL;
 
-        /* If we've got a resolved host, insert it into the URL: replace
-         * "http://www.craptrackular.org/announce?key=val&key2=..." with
-         * "http://127.0.0.1/announce?key=val&key2=..."
-         * so that curl's DNS won't block */
-        if( task->resolved_host != NULL )
+        /* insert the resolved host into the URL s.t. curl's DNS won't block
+         * even if -- like on most OSes -- it wasn't built with C-Ares :(
+         * "http://www.craptrackular.org/announce?key=val&key2=..." becomes
+         * "http://127.0.0.1/announce?key=val&key2=..." */
         {
             char * host;
@@ -280 +290 @@
             evbuffer_free( buf );
 
+            /* Manually add a Host: argument that refers to the true URL */
             if( ( ( task->port <= 0 ) ) ||
                 ( ( task->port == 80 ) && !strncmp( task->url, "http://", 7 ) ) ||
@@ -313 +324 @@
         /* use our own timeout instead of CURLOPT_TIMEOUT because the latter
          * doesn't play nicely with curl_multi.  See curl bug #2501457 */
+        task->timer_event_isSet = TRUE;
         evtimer_set( &task->timer_event, task_timeout_cb, task );
         tr_timerAdd( &task->timer_event, timeout, 0 );