Changeset 5475

Timestamp:

Oct 28, 2016 6:25:03 AM (8 years ago)

Author:

ming

Message:

Re #1974: Remove DNS cache entry from resolver's hash table when app callback has a reference.

Thanks to Richard Mudgett for the patch.

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

@@ -1472 +1472 @@
         ttl = resolver->settings.cache_max_ttl;
 
+    /* Get a cache response entry */
+    cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key,
+                                              sizeof(*key), &hval);
+
     /* If TTL is zero, clear the same entry in the hash table */
     if (ttl == 0) {
-        cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key, 
-                                                  sizeof(*key), &hval);
         /* Remove the entry before releasing its pool (see ticket #1710) */
         pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
@@ -1485 +1487 @@
     }
 
-    /* Get a cache response entry */
-    cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key, 
-                                              sizeof(*key), &hval);
     if (cache == NULL) {
-        cache = alloc_entry(resolver);
-    } else if (cache->ref_cnt > 1) {
-        /* When cache entry is being used by callback (to app), just decrement
-         * ref_cnt so it will be freed after the callback returns and allocate
-         * new entry.
-         */
-        cache->ref_cnt--;
         cache = alloc_entry(resolver);
     } else {
@@ -1501 +1493 @@
         pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
 
-        /* Reset cache to avoid bloated cache pool */
-        reset_entry(&cache);
+        if (cache->ref_cnt > 1) {
+            /* When cache entry is being used by callback (to app),
+             * just decrement ref_cnt so it will be freed after
+             * the callback returns and allocate new entry.
+             */
+            cache->ref_cnt--;
+            cache = alloc_entry(resolver);
+        } else {
+            /* Reset cache to avoid bloated cache pool */
+            reset_entry(&cache);
+        }
     }