Changeset 10033 for trunk/libtransmission/web.c

Timestamp:

Jan 28, 2010, 6:25:18 PM (12 years ago)

Author:

charles

Message:

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

File:

• trunk/libtransmission/web.c (modified) (6 diffs)

trunk/libtransmission/web.c

@@ -133 +133 @@
 dns_cache_item_free( struct dns_cache_item * item )
 {
-    tr_free( item->host );
-    tr_free( item->resolved_host );
-    memset( item, TR_MEMORY_TRASH, sizeof( struct dns_cache_item ) );
-    tr_free( item );
+    if( item != NULL )
+    {
+        tr_free( item->host );
+        tr_free( item->resolved_host );
+        memset( item, TR_MEMORY_TRASH, sizeof( struct dns_cache_item ) );
+        tr_free( item );
+    }
 }
 
@@ -147 +150 @@
 }
 
-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
 {
@@ -162 +158 @@
 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
 dns_cache_lookup( struct tr_web_task * task, const char * host, const char ** resolved )
@@ -169 +173 @@
     if( task->session->web != NULL )
     {
+        struct dns_cache_item key;
+        struct dns_cache_item * item;
         tr_ptrArray * cache = &task->session->web->dns_cache;
 
-        struct dns_cache_item * item = tr_ptrArrayFindSorted( cache, host,
-                                                              dns_cache_compare_key );
+        key.host = (char*) host;
+        item = tr_ptrArrayFindSorted( cache, &key, dns_cache_compare );
 
         /* has the ttl expired? */
         if( ( item != NULL ) && ( item->expiration <= tr_time( ) ) )
         {
-            tr_ptrArrayRemoveSorted( cache, host, dns_cache_compare_key );
-            dns_cache_item_free( item );
+            dns_cache_clear_entry( cache, host );
             item = NULL;
         }
@@ -203 +208 @@
     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->resolved_host = NULL;
         item->expiration = tr_time( ) + MIN_DNS_CACHE_TIME;
         item->success = FALSE;
-        tr_ptrArrayInsertSorted( &task->session->web->dns_cache, item, dns_cache_compare );
+        tr_ptrArrayInsertSorted( cache, item, dns_cache_compare );
     }
 }
@@ -222 +232 @@
     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->resolved_host = tr_strdup( resolved );
         item->expiration = tr_time( ) + ttl;
         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;
         dbgmsg( "adding dns cache entry for \"%s\": %s", host, resolved );