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

fix crash reported by Waldorf in http://pastebin.ca/729980

This commit is contained in:
Charles Kerr 2007-10-08 19:09:20 +00:00
parent 7ff8284976
commit e10e44409a
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libtransmission/tracker.c
View File

@ -258,18 +258,21 @@ tr_trackerScrapeSoon( Tracker * t )
t->scrapeTimer = tr_timerNew( t->handle, onTrackerScrapeNow, t, 5000 );
}
static Tracker*
getExistingTracker( const char * primaryAddress )
{
tr_ptrArray * trackers = getTrackerLookupTable( );
Tracker tmp;
assert( primaryAddress && *primaryAddress );
tmp.primaryAddress = (char*) primaryAddress;
return tr_ptrArrayFindSorted( trackers, &tmp, trackerCompare );
}
static Tracker*
tr_trackerGet( const tr_torrent * tor )
{
const tr_info * info = &tor->info;
tr_ptrArray * trackers = getTrackerLookupTable( );
Tracker *t, tmp;
assert( info != NULL );
assert( info->primaryAddress && *info->primaryAddress );
tmp.primaryAddress = info->primaryAddress;
t = tr_ptrArrayFindSorted( trackers, &tmp, trackerCompare );
assert( t==NULL || !strcmp(t->primaryAddress,info->primaryAddress) );
Tracker * t = getExistingTracker( info->primaryAddress );
if( t == NULL ) /* no such tracker.... create one */
{
@ -316,7 +319,7 @@ tr_trackerGet( const tr_torrent * tor )
assert( nwalk - t->addresses == sum );
assert( iwalk - t->tierFronts == sum );
tr_ptrArrayInsertSorted( trackers, t, trackerCompare );
tr_ptrArrayInsertSorted( getTrackerLookupTable( ), t, trackerCompare );
}
return t;
@ -553,15 +556,20 @@ onTorrentScrapeNow( void * vtor )
}
static void
onScrapeResponse( struct evhttp_request * req, void * vt )
onScrapeResponse( struct evhttp_request * req, void * primaryAddress )
{
char * errmsg;
Tracker * t = (Tracker*) vt;
Tracker * t;
tr_inf( "Got scrape response from '%s': %s",
t->primaryAddress,
primaryAddress,
(req ? req->response_code_line : "(null)") );
t = getExistingTracker( primaryAddress );
tr_free( primaryAddress );
if( t == NULL ) /* tracker has been closed... */
return;
if( req && ( req->response_code == HTTP_OK ) )
{
int numResponses = 0;
@ -709,7 +717,7 @@ onTrackerScrapeNow( void * vt )
address->address, address->port, uri );
evcon = getConnection( t, address->address, address->port );
evhttp_connection_set_timeout( evcon, TIMEOUT_INTERVAL_SEC );
req = evhttp_request_new( onScrapeResponse, t );
req = evhttp_request_new( onScrapeResponse, tr_strdup(t->primaryAddress) );
assert( req );
addCommonHeaders( t, req );
tr_evhttp_make_request( t->handle, evcon, req, EVHTTP_REQ_GET, uri );