Changeset 5376

Timestamp:

Jul 5, 2016 12:53:20 PM (8 years ago)

Author:

nanang

Message:

Misc (re #1928): pj_getaddrinfo() is better to return error when no address is found, some codes in the library seem to expect pj_getaddrinfo() to behave this way.

File:

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

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

@@ -155 +155 @@
                     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);
@@ -164 +164 @@
         
         *count = i;
+        if (*count == 0)
+            status = PJ_ERESOLVE;
+
     } else {
         status = PJ_ERESOLVE;
@@ -184 +187 @@
 
     /* Enumerate each item in the result */
+    rc = 0;
     for (i=0; i<*count && res; res=res->ai_next) {
         /* Ignore unwanted address families */
@@ -191 +195 @@
         /* Store canonical name (possibly truncating the name) */
         if (res->ai_canonname) {
-            pj_ansi_strncpy(ai[i].ai_canonname, res->ai_canonname,
-                            sizeof(ai[i].ai_canonname));
-            ai[i].ai_canonname[sizeof(ai[i].ai_canonname)-1] = '\0';
+            pj_ansi_strncpy(ai[rc].ai_canonname, res->ai_canonname,
+                            sizeof(ai[rc].ai_canonname));
+            ai[rc].ai_canonname[sizeof(ai[rc].ai_canonname)-1] = '\0';
         } else {
-            pj_ansi_strcpy(ai[i].ai_canonname, nodecopy);
+            pj_ansi_strcpy(ai[rc].ai_canonname, nodecopy);
         }
 
         /* Store address */
         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);
+        pj_memcpy(&ai[rc].ai_addr, res->ai_addr, res->ai_addrlen);
+        PJ_SOCKADDR_RESET_LEN(&ai[rc].ai_addr);
 
         /* Next slot */
-        ++i;
-    }
-
-    *count = i;
+        ++rc;
+    }
+
+    *count = rc;
 
     freeaddrinfo(orig_res);
 
     /* Done */
-    return PJ_SUCCESS;
+    return (*count > 0? PJ_SUCCESS : PJ_ERESOLVE);
 #endif
 
@@ -286 +290 @@
         }
 
-        return PJ_SUCCESS;
+        return (*count > 0? PJ_SUCCESS : PJ_ERESOLVE);
 
     } else {