mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-22 22:20:39 +00:00
Code Issues Releases Wiki Activity

(trunk libT) fix DNS timing issue reported by gn0s1s in irc

Browse source
This commit is contained in:
Charles Kerr 2010-01-28 18:25:18 +00:00
parent dd41b5c257
commit 931558aea3
1 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
libtransmission/web.c
View file

@ -132,10 +132,13 @@ struct dns_cache_item
static void static void
dns_cache_item_free( struct dns_cache_item * item ) dns_cache_item_free( struct dns_cache_item * item )
{ {
tr_free( item->host ); if( item != NULL )
tr_free( item->resolved_host ); {
memset( item, TR_MEMORY_TRASH, sizeof( struct dns_cache_item ) ); tr_free( item->host );
tr_free( item ); tr_free( item->resolved_host );
memset( item, TR_MEMORY_TRASH, sizeof( struct dns_cache_item ) );
tr_free( item );
}
} }
static int static int
@ -146,13 +149,6 @@ dns_cache_compare( const void * va, const void * vb )
return strcmp( a->host, b->host ); return strcmp( a->host, b->host );
} }
static int
dns_cache_compare_key( const void * va, const void * key )
{
const struct dns_cache_item * a = va;
return strcmp( a->host, key );
}
typedef enum typedef enum
{ {
TR_DNS_OK, TR_DNS_OK,
@ -161,6 +157,14 @@ typedef enum
} }
tr_dns_result; tr_dns_result;
static void
dns_cache_clear_entry( struct tr_ptrArray * cache, const char * host )
{
struct dns_cache_item key;
key.host = (char*) host;
dns_cache_item_free( tr_ptrArrayRemoveSorted( cache, &key, dns_cache_compare ) );
}
static tr_dns_result static tr_dns_result
dns_cache_lookup( struct tr_web_task * task, const char * host, const char ** resolved ) dns_cache_lookup( struct tr_web_task * task, const char * host, const char ** resolved )
{ {
@ -168,16 +172,17 @@ dns_cache_lookup( struct tr_web_task * task, const char * host, const char ** re
if( task->session->web != NULL ) if( task->session->web != NULL )
{ {
struct dns_cache_item key;
struct dns_cache_item * item;
tr_ptrArray * cache = &task->session->web->dns_cache; tr_ptrArray * cache = &task->session->web->dns_cache;
struct dns_cache_item * item = tr_ptrArrayFindSorted( cache, host, key.host = (char*) host;
dns_cache_compare_key ); item = tr_ptrArrayFindSorted( cache, &key, dns_cache_compare );
/* has the ttl expired? */ /* has the ttl expired? */
if( ( item != NULL ) && ( item->expiration <= tr_time( ) ) ) if( ( item != NULL ) && ( item->expiration <= tr_time( ) ) )
{ {
tr_ptrArrayRemoveSorted( cache, host, dns_cache_compare_key ); dns_cache_clear_entry( cache, host );
dns_cache_item_free( item );
item = NULL; item = NULL;
} }
@ -202,12 +207,17 @@ dns_cache_set_fail( struct tr_web_task * task, const char * host )
{ {
if( task->session->web != NULL ) if( task->session->web != NULL )
{ {
struct dns_cache_item * item = tr_new( struct dns_cache_item, 1 ); struct dns_cache_item * item;
tr_ptrArray * cache = &task->session->web->dns_cache;
dns_cache_clear_entry( cache, host );
item = tr_new( struct dns_cache_item, 1 );
item->host = tr_strdup( host ); item->host = tr_strdup( host );
item->resolved_host = NULL; item->resolved_host = NULL;
item->expiration = tr_time( ) + MIN_DNS_CACHE_TIME; item->expiration = tr_time( ) + MIN_DNS_CACHE_TIME;
item->success = FALSE; item->success = FALSE;
tr_ptrArrayInsertSorted( &task->session->web->dns_cache, item, dns_cache_compare ); tr_ptrArrayInsertSorted( cache, item, dns_cache_compare );
} }
} }
@ -221,12 +231,17 @@ dns_cache_set_name( struct tr_web_task * task, const char * host,
if( task->session->web != NULL ) if( task->session->web != NULL )
{ {
struct dns_cache_item * item = tr_new( struct dns_cache_item, 1 ); struct dns_cache_item * item;
tr_ptrArray * cache = &task->session->web->dns_cache;
dns_cache_clear_entry( cache, host );
item = tr_new( struct dns_cache_item, 1 );
item->host = tr_strdup( host ); item->host = tr_strdup( host );
item->resolved_host = tr_strdup( resolved ); item->resolved_host = tr_strdup( resolved );
item->expiration = tr_time( ) + ttl; item->expiration = tr_time( ) + ttl;
item->success = TRUE; item->success = TRUE;
tr_ptrArrayInsertSorted( &task->session->web->dns_cache, item, dns_cache_compare ); tr_ptrArrayInsertSorted( cache, item, dns_cache_compare );
ret = item->resolved_host; ret = item->resolved_host;
dbgmsg( "adding dns cache entry for \"%s\": %s", host, resolved ); dbgmsg( "adding dns cache entry for \"%s\": %s", host, resolved );
} }