Changeset 5513 for pjproject/branches/projects/uwp/pjlib/src/pj/addr_resolv_sock.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjlib/src/pj/addr_resolv_sock.c (modified) (8 diffs)

pjproject/branches/projects/uwp/pjlib/src/pj/addr_resolv_sock.c

@@ -83 +83 @@
                      af==PJ_AF_UNSPEC, PJ_EINVAL);
 
+#if PJ_WIN32_WINCE
+
     /* Check if nodename is IP address */
     pj_bzero(&ai[0], sizeof(ai[0]));
@@ -109 +111 @@
         return PJ_SUCCESS;
     }
+
+#else /* PJ_WIN32_WINCE */
+    PJ_UNUSED_ARG(has_addr);
+#endif
 
     /* Copy node name to null terminated string. */
@@ -146 +152 @@
                 /* Store address */
                 addr_size = sizeof(*addr);
-                if (af == PJ_AF_INET6) {
+                if (addr->sa_family == PJ_AF_INET6) {
                     addr_size = addr->sa_len;
                 }
-                PJ_ASSERT_ON_FAIL(addr_size <= sizeof(pj_sockaddr),                               continue);
+                PJ_ASSERT_ON_FAIL(addr_size <= sizeof(pj_sockaddr), continue);
                 pj_memcpy(&ai[i].ai_addr, addr, addr_size);
                 PJ_SOCKADDR_RESET_LEN(&ai[i].ai_addr);
@@ -158 +164 @@
         
         *count = i;
+        if (*count == 0)
+            status = PJ_ERESOLVE;
+
     } else {
         status = PJ_ERESOLVE;
@@ -206 +215 @@
 
     /* Done */
-    return PJ_SUCCESS;
+    return (*count > 0? PJ_SUCCESS : PJ_ERESOLVE);
 #endif
 
@@ -213 +222 @@
 
     PJ_ASSERT_RETURN(count && *count, PJ_EINVAL);
+
+#if PJ_WIN32_WINCE
 
     /* Check if nodename is IP address */
@@ -241 +252 @@
         return PJ_SUCCESS;
     }
+
+#else /* PJ_WIN32_WINCE */
+    PJ_UNUSED_ARG(has_addr);
+#endif
 
     if (af == PJ_AF_INET || af == PJ_AF_UNSPEC) {
@@ -274 +289 @@
         }
 
-        return PJ_SUCCESS;
+        return (*count > 0? PJ_SUCCESS : PJ_ERESOLVE);
 
     } else {