Changeset 3044 for pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c

Timestamp:

Jan 4, 2010 4:54:50 PM (14 years ago)

Author:

nanang

Message:

Ticket #1010:

• Fixed bug in some APIs of address resolver and IP helper to reset sin_len member of sockaddr.
• Added purity test of sin_len member checking in pjlib test.
• Fixed bug in pj_getaddrinfo() when address family param set to PJ_AF_UNSPEC (assertion raised as it called pj_sockaddr_get_addr() with PJ_AF_UNSPEC too).

File:

• pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c

@@ -74 +74 @@
     /* Check if nodename is IP address */
     pj_bzero(&ai[0], sizeof(ai[0]));
-    ai[0].ai_addr.addr.sa_family = (pj_uint16_t)af;
-    if (pj_inet_pton(af, nodename, pj_sockaddr_get_addr(&ai[0].ai_addr)) 
-         == PJ_SUCCESS) 
-    {
-        pj_str_t tmp;
-
-        tmp.ptr = ai[0].ai_canonname;
-        pj_strncpy_with_null(&tmp, nodename, PJ_MAX_HOSTNAME);
-        ai[0].ai_addr.addr.sa_family = (pj_uint16_t)af;
-        *count = 1;
-
-        return PJ_SUCCESS;
+    if (af == PJ_AF_UNSPEC) {
+        if (pj_inet_pton(PJ_AF_INET, nodename, 
+                         &ai[0].ai_addr.ipv4.sin_addr) == PJ_SUCCESS)
+        {
+            af = PJ_AF_INET;
+        }
+        else if (pj_inet_pton(PJ_AF_INET6, nodename, 
+                              &ai[0].ai_addr.ipv6.sin6_addr) == PJ_SUCCESS)
+        {
+            af = PJ_AF_INET6;
+        }
+
+        if (af != PJ_AF_UNSPEC) {
+            pj_str_t tmp;
+
+            tmp.ptr = ai[0].ai_canonname;
+            pj_strncpy_with_null(&tmp, nodename, PJ_MAX_HOSTNAME);
+            ai[0].ai_addr.addr.sa_family = (pj_uint16_t)af;
+            *count = 1;
+
+            return PJ_SUCCESS;
+        }
     }
 
@@ -122 +132 @@
         PJ_ASSERT_ON_FAIL(res->ai_addrlen <= sizeof(pj_sockaddr), continue);
         pj_memcpy(&ai[i].ai_addr, res->ai_addr, res->ai_addrlen);
+        PJ_SOCKADDR_RESET_LEN(&ai[i].ai_addr);
 
         /* Next slot */
@@ -140 +151 @@
     /* Check if nodename is IP address */
     pj_bzero(&ai[0], sizeof(ai[0]));
-    ai[0].ai_addr.addr.sa_family = (pj_uint16_t)af;
-    if (pj_inet_pton(af, nodename, pj_sockaddr_get_addr(&ai[0].ai_addr)) 
-         == PJ_SUCCESS) 
-    {
-        pj_str_t tmp;
-
-        tmp.ptr = ai[0].ai_canonname;
-        pj_strncpy_with_null(&tmp, nodename, PJ_MAX_HOSTNAME);
-        ai[0].ai_addr.addr.sa_family = (pj_uint16_t)af;
-        *count = 1;
-
-        return PJ_SUCCESS;
+    if (af == PJ_AF_UNSPEC) {
+        if (pj_inet_pton(PJ_AF_INET, nodename, 
+                         &ai[0].ai_addr.ipv4.sin_addr) == PJ_SUCCESS)
+        {
+            af = PJ_AF_INET;
+        }
+        else if (pj_inet_pton(PJ_AF_INET6, nodename, 
+                              &ai[0].ai_addr.ipv6.sin6_addr) == PJ_SUCCESS)
+        {
+            af = PJ_AF_INET6;
+        }
+
+        if (af != PJ_AF_UNSPEC) {
+            pj_str_t tmp;
+
+            tmp.ptr = ai[0].ai_canonname;
+            pj_strncpy_with_null(&tmp, nodename, PJ_MAX_HOSTNAME);
+            ai[0].ai_addr.addr.sa_family = (pj_uint16_t)af;
+            *count = 1;
+
+            return PJ_SUCCESS;
+        }
     }
 
@@ -181 +202 @@
             pj_memcpy(&ai[*count].ai_addr.ipv4.sin_addr,
                       he.h_addr_list[i], he.h_length);
+            PJ_SOCKADDR_RESET_LEN(&ai[*count].ai_addr);
 
             (*count)++;