Changeset 1033 for pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip/sip_resolve.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/pjsip/src/pjsip/sip_resolve.c (modified) (3 diffs)

pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip/sip_resolve.c

@@ -536 +536 @@
             if (pj_stricmp(&rr->name, &query->srv[j].target_name)==0) {
                 unsigned cnt = query->srv[j].addr_cnt;
-                query->srv[j].addr[cnt] = pj_inet_addr(&rr->rdata.a.ip_addr);
+                query->srv[j].addr[cnt].s_addr = rr->rdata.a.ip_addr.s_addr;
                 ++query->srv[j].addr_cnt;
                 ++query->host_resolved;
@@ -778 +778 @@
                 unsigned j;
 
-                query->srv[i].addr[query->srv[i].addr_cnt++] =
-                    pj_inet_addr(&pkt->ans[0].rdata.a.ip_addr);
+                query->srv[i].addr[query->srv[i].addr_cnt++].s_addr =
+                    pkt->ans[0].rdata.a.ip_addr.s_addr;
 
                 PJ_LOG(5,(query->objname, 
-                          "DNS A for %.*s: %.*s",
+                          "DNS A for %.*s: %s",
                           (int)query->srv[i].target_name.slen, 
                           query->srv[i].target_name.ptr,
-                          (int)pkt->ans[0].rdata.a.ip_addr.slen,
-                          pkt->ans[0].rdata.a.ip_addr.ptr));
+                          pj_inet_ntoa(pkt->ans[0].rdata.a.ip_addr)));
 
                 /* Check for multiple IP addresses */
@@ -792 +791 @@
                             query->srv[i].addr_cnt < ADDR_MAX_COUNT; ++j)
                 {
-                    query->srv[i].addr[query->srv[i].addr_cnt++] = 
-                        pj_inet_addr(&pkt->ans[j].rdata.a.ip_addr);
+                    query->srv[i].addr[query->srv[i].addr_cnt++].s_addr = 
+                        pkt->ans[j].rdata.a.ip_addr.s_addr;
 
                     PJ_LOG(5,(query->objname, 
-                              "Additional DNS A for %.*s: %.*s",
+                              "Additional DNS A for %.*s: %s",
                               (int)query->srv[i].target_name.slen, 
                               query->srv[i].target_name.ptr,
-                              (int)pkt->ans[j].rdata.a.ip_addr.slen,
-                              pkt->ans[j].rdata.a.ip_addr.ptr));
+                              pj_inet_ntoa(pkt->ans[j].rdata.a.ip_addr)));
                 }
             }