Changeset 4066

Timestamp:

Dec 5, 2007, 2:09:12 AM (14 years ago)

Author:

charles

Message:

backport r4065 to 0.9x

File:

• branches/0.9x/libtransmission/tracker.c (modified) (5 diffs)

branches/0.9x/libtransmission/tracker.c

@@ -382 +382 @@
 }
 
-static void
-onTrackerResponse( struct evhttp_request * req, void * torrent_hash )
+static void onReqDone( tr_handle * handle );
+
+static void
+onTrackerResponse( struct evhttp_request * req, void * vhash )
 {
     const char * warning;
-    tr_tracker * t;
     int responseCode;
-
-    t = findTrackerFromHash( torrent_hash );
+    struct torrent_hash * torrent_hash = (struct torrent_hash*) vhash;
+    tr_tracker * t = findTrackerFromHash( torrent_hash );
+
+    onReqDone( torrent_hash->handle );
     tr_free( torrent_hash );
+
     if( t == NULL ) /* tracker has been closed */
         return;
@@ -542 +546 @@
     const char * warning;
     time_t nextScrapeSec = 60;
-    tr_tracker * t = findTrackerFromHash( vhash );
+    struct torrent_hash * torrent_hash = (struct torrent_hash*) vhash;
+    tr_tracker * t = findTrackerFromHash( torrent_hash );
+
+    onReqDone( torrent_hash->handle );
+    tr_free( torrent_hash );
 
     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 );
     if( t == NULL ) /* tracker's been closed... */
         return;
@@ -742 +749 @@
     req->req = evhttp_request_new( onScrapeResponse, torrentHashNew( handle, tracker ) );
     req->reqtype = TR_REQ_SCRAPE;
-    asprintf( &req->uri, "%s%cinfo_hash=%s", a->scrape, strchr(a->scrape,'?')?'&':'?', tracker->escaped );
+    tr_asprintf( &req->uri, "%s%cinfo_hash=%s", a->scrape, strchr(a->scrape,'?')?'&':'?', tracker->escaped );
     memcpy( req->torrent_hash, tracker->hash, SHA_DIGEST_LENGTH );
     addCommonHeaders( tracker, req->req );
@@ -820 +827 @@
     tr_handle * handle = vhandle;
 
-    assert( handle );
-    assert( handle->tracker );
-
     /* libevent references evcon right after calling this function,
        so we can't free it yet... defer it to after this call chain
        has played out */
     tr_timerNew( handle, freeConnection, evcon, 100 );
-
-    --handle->tracker->socketCount;
-    dbgmsg( NULL, "decrementing socket count to %d", handle->tracker->socketCount );
-    pulse( handle );
 }
 
@@ -932 +932 @@
 }
 
+static void
+onReqDone( tr_handle * handle )
+{
+    pulse( handle );
+    --handle->tracker->socketCount;
+    dbgmsg( NULL, "decrementing socket count to %d", handle->tracker->socketCount );
+}
+
 /***
 ****  LIFE CYCLE