Ticket #458: ticket 458.patch

pjlib/src/pj/ip_helper_win32.c

@@ -220 +220 @@
         (*p_cnt)++;
     }
 
+    if (*p_cnt == 0)
+        return PJ_ENOTFOUND;
+
     return PJ_SUCCESS;
 }
 

pjlib/src/pj/addr_resolv_sock.c

@@ -118 +118 @@
 
 #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 = af;
+    if (pj_inet_pton(af, nodename, pj_sockaddr_get_addr(&ai[0].ai_addr)) == 
+        PJ_SUCCESS) 
+    {
+        pj_str_t tmp = {ai[0].ai_canonname, PJ_MAX_HOSTNAME};
+
+        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_hostent he;
         unsigned i, max_count;