Changeset 1744 for pjproject/trunk

Timestamp:

Jan 24, 2008 7:59:41 PM (17 years ago)

Author:

bennylp

Message:

Related to ticket #458: pj_getaddrinfo() should return success if IP address is given

File:

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

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

@@ -71 +71 @@
                      af==PJ_AF_UNSPEC, PJ_EINVAL);
 
+    /* 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;
+    }
+
     /* Copy node name to null terminated string. */
     if (nodename->slen >= PJ_MAX_HOSTNAME)
@@ -119 +135 @@
 #else   /* PJ_SOCK_HAS_GETADDRINFO */
 
-    PJ_ASSERT_RETURN(count, PJ_EINVAL);
+    PJ_ASSERT_RETURN(count && *count, PJ_EINVAL);
+
+    /* 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_INET || af == PJ_AF_UNSPEC) {