Changeset 3234

Timestamp:

Jul 5, 2010 1:47:30 PM (14 years ago)

Author:

bennylp

Message:

Fixed #1101: Check and calculate IPv4/IPv6 address specified in pj_getaddrinfo()

File:

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

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

@@ -64 +64 @@
     char nodecopy[PJ_MAX_HOSTNAME];
     struct addrinfo hint, *res, *orig_res;
+    pj_bool_t has_addr = PJ_FALSE;
     unsigned i;
     int rc;
@@ -74 +75 @@
     /* Check if nodename is IP address */
     pj_bzero(&ai[0], sizeof(ai[0]));
-    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;
-        }
+    if ((af==PJ_AF_INET || af==PJ_AF_UNSPEC) &&
+        pj_inet_pton(PJ_AF_INET, nodename,
+                     &ai[0].ai_addr.ipv4.sin_addr) == PJ_SUCCESS)
+    {
+        af = PJ_AF_INET;
+        has_addr = PJ_TRUE;
+    } else if ((af==PJ_AF_INET6 || af==PJ_AF_UNSPEC) &&
+               pj_inet_pton(PJ_AF_INET6, nodename,
+                            &ai[0].ai_addr.ipv6.sin6_addr) == PJ_SUCCESS)
+    {
+        af = PJ_AF_INET6;
+        has_addr = PJ_TRUE;
+    }
+
+    if (has_addr) {
+        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;
     }
 
@@ -146 +148 @@
 
 #else   /* PJ_SOCK_HAS_GETADDRINFO */
+    pj_bool_t has_addr = PJ_FALSE;
 
     PJ_ASSERT_RETURN(count && *count, PJ_EINVAL);
@@ -151 +154 @@
     /* Check if nodename is IP address */
     pj_bzero(&ai[0], sizeof(ai[0]));
-    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;
-        }
+    if ((af==PJ_AF_INET || af==PJ_AF_UNSPEC) &&
+        pj_inet_pton(PJ_AF_INET, nodename,
+                     &ai[0].ai_addr.ipv4.sin_addr) == PJ_SUCCESS)
+    {
+        af = PJ_AF_INET;
+        has_addr = PJ_TRUE;
+    }
+    else if ((af==PJ_AF_INET6 || af==PJ_AF_UNSPEC) &&
+             pj_inet_pton(PJ_AF_INET6, nodename,
+                          &ai[0].ai_addr.ipv6.sin6_addr) == PJ_SUCCESS)
+    {
+        af = PJ_AF_INET6;
+        has_addr = PJ_TRUE;
+    }
+
+    if (has_addr) {
+        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;
     }