Changeset 1033 for pjproject/branches/pjproject-0.5-stable/pjlib-util/src/pjlib-util/resolver.c

Timestamp:

Mar 2, 2007 2:51:03 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #156: Not enough memory to parse DNS packets in resolver (thanks Frank Wiersma)

File:

• pjproject/branches/pjproject-0.5-stable/pjlib-util/src/pjlib-util/resolver.c (modified) (4 diffs)

pjproject/branches/pjproject-0.5-stable/pjlib-util/src/pjlib-util/resolver.c

@@ -52 +52 @@
 #define RES_BUF_SZ          PJ_DNS_RESOLVER_RES_BUF_SIZE
 #define UDPSZ               PJ_DNS_RESOLVER_MAX_UDP_SIZE
+#define TMP_SZ              PJ_DNS_RESOLVER_TMP_BUF_SIZE
 
 
@@ -162 +163 @@
     pj_bool_t            own_ioqueue;   /**< Do we own ioqueue?             */
     pj_ioqueue_t        *ioqueue;       /**< Ioqueue instance.              */
-    char                 tmp_pool[1500];/**< Temporary pool buffer.         */
+    char                 tmp_pool[TMP_SZ];/**< Temporary pool buffer.       */
 
     /* Socket */
@@ -994 +995 @@
     }
 
-    /* Duplicate the packet */
+    /* Duplicate the packet.
+     * We don't need to keep the query, NS, and AR sections from the packet,
+     * so exclude from duplication.
+     */
     res_pool = pj_pool_create_on_buf("respool", cache->buf, sizeof(cache->buf));
     PJ_TRY {
         cache->pkt = NULL;
-        pj_dns_packet_dup(res_pool, pkt, &cache->pkt);
+        pj_dns_packet_dup(res_pool, pkt, 
+                          PJ_DNS_NO_QD | PJ_DNS_NO_NS | PJ_DNS_NO_AR,
+                          &cache->pkt);
     }
     PJ_CATCH_ANY {
@@ -1223 +1229 @@
         }
     }
-
-    /* We don't need NS and query section in the packet, so trim them. */
-    dns_pkt->hdr.qdcount = 0;
-    dns_pkt->hdr.nscount = 0;
 
     /* Save/update response cache. */