mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fix tracker connection error reported by Gimp_

This commit is contained in:
Charles Kerr 2007-12-05 02:06:05 +00:00
parent cb5ad53cfb
commit 481a210e82
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libtransmission/tracker.c
View File

@ -379,15 +379,19 @@ parseOldPeers( benc_val_t * bePeers, int * setmePeerCount )
return compact; return compact;
} }
static void onReqDone( tr_handle * handle );
static void static void
onTrackerResponse( struct evhttp_request * req, void * torrent_hash ) onTrackerResponse( struct evhttp_request * req, void * vhash )
{ {
const char * warning; const char * warning;
tr_tracker * t;
int responseCode; int responseCode;
struct torrent_hash * torrent_hash = (struct torrent_hash*) vhash;
tr_tracker * t = findTrackerFromHash( torrent_hash );
t = findTrackerFromHash( torrent_hash ); onReqDone( torrent_hash->handle );
tr_free( torrent_hash ); tr_free( torrent_hash );
if( t == NULL ) /* tracker has been closed */ if( t == NULL ) /* tracker has been closed */
return; return;
@ -539,11 +543,14 @@ onScrapeResponse( struct evhttp_request * req, void * vhash )
{ {
const char * warning; const char * warning;
time_t nextScrapeSec = 60; 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) ); 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... */ if( t == NULL ) /* tracker's been closed... */
return; return;
@ -817,17 +824,10 @@ connectionClosedCB( struct evhttp_connection * evcon, void * vhandle )
{ {
tr_handle * handle = vhandle; tr_handle * handle = vhandle;
assert( handle );
assert( handle->tracker );
/* libevent references evcon right after calling this function, /* libevent references evcon right after calling this function,
so we can't free it yet... defer it to after this call chain so we can't free it yet... defer it to after this call chain
has played out */ has played out */
tr_timerNew( handle, freeConnection, evcon, 100 ); tr_timerNew( handle, freeConnection, evcon, 100 );
--handle->tracker->socketCount;
dbgmsg( NULL, "decrementing socket count to %d", handle->tracker->socketCount );
pulse( handle );
} }
static struct evhttp_connection* static struct evhttp_connection*
@ -929,6 +929,14 @@ pulse( void * vhandle )
return maybeFreeGlobals( handle ); return maybeFreeGlobals( handle );
} }
static void
onReqDone( tr_handle * handle )
{
pulse( handle );
--handle->tracker->socketCount;
dbgmsg( NULL, "decrementing socket count to %d", handle->tracker->socketCount );
}
/*** /***
**** LIFE CYCLE **** LIFE CYCLE
***/ ***/