Changeset 1608 for pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c

Timestamp:

Dec 2, 2007 3:36:46 PM (16 years ago)

Author:

bennylp

Message:

More ticket #415: Added pj_sockaddr_get_len() and pj_inet_ntop2(), and fixed Symbian combilation warnings with gcce

File:

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

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

@@ -62 +62 @@
 #if defined(PJ_SOCK_HAS_GETADDRINFO) && PJ_SOCK_HAS_GETADDRINFO!=0
     char nodecopy[PJ_MAX_HOSTNAME];
-    struct addrinfo hint, *res;
+    struct addrinfo hint, *res, *orig_res;
     unsigned i;
     int rc;
@@ -85 +85 @@
         return PJ_ERESOLVE;
 
+    orig_res = res;
+
     /* Enumerate each item in the result */
     for (i=0; i<*count && res; res=res->ai_next) {
-        int len;
-
         /* Ignore unwanted address families */
         if (af!=PJ_AF_UNSPEC && res->ai_family != af)
@@ -94 +94 @@
 
         /* Store canonical name (possibly truncating the name) */
-        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';
+        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';
+        } else {
+            pj_ansi_strcpy(ai[i].ai_canonname, nodecopy);
+        }
 
         /* Store address */
@@ -107 +111 @@
 
     *count = i;
+
+    freeaddrinfo(orig_res);
 
     /* Done */