Changeset 3053 for pjproject/trunk

Timestamp:

Jan 8, 2010 5:12:05 PM (15 years ago)

Author:

bennylp

Message:

More ticket #1013: PJSIP resolver should not try to resolve the target if IP address is given (thanks Emil Sturniolo for the report)

• fixed bug with IPv6
• also fixed bug with not fully initializing socket address, causing assertion on pjsip-test and also potentially will cause error on MacOS X due to sin_zero_len not being zeroed

File:

• pjproject/trunk/pjsip/src/pjsip/sip_resolve.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -232 +232 @@
             /* Target is an IP address, no need to resolve */
             if (ip_addr_ver == 4) {
-                svr_addr.entry[0].addr.addr.sa_family = pj_AF_INET();
+                pj_sockaddr_init(pj_AF_INET(), &svr_addr.entry[0].addr, 
+                                 NULL, 0);
                 pj_inet_aton(&target->addr.host,
                              &svr_addr.entry[0].addr.ipv4.sin_addr);
             } else {
-                svr_addr.entry[0].addr.addr.sa_family = pj_AF_INET6();
+                pj_sockaddr_init(pj_AF_INET6(), &svr_addr.entry[0].addr, 
+                                 NULL, 0);
                 pj_inet_pton(pj_AF_INET6(), &target->addr.host,
-                        &svr_addr.entry[0].addr.ipv4.sin_addr);
+                             &svr_addr.entry[0].addr.ipv6.sin6_addr);
             }
         } else {