Changeset 3543

Timestamp:

Apr 26, 2011 3:07:24 AM (14 years ago)

Author:

ming

Message:

Fixed #1246: Use CFHost for pj_getaddrinfo() on iOS

• Replace the fix for ticket #1104 with this fix
• Modify pjturn-client/client_main's shutdown() function which conflicts with an existing function

Re-run configure-iphone to use this fix automatically.

Location:

pjproject/trunk

Files:

• pjlib/include/pj/compat/os_auto.h.in (modified) (1 diff)
• pjlib/src/pj/addr_resolv_sock.c (modified) (4 diffs)
• pjlib/src/pj/sock_bsd.c (modified) (1 diff)
• pjnath/src/pjturn-client/client_main.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/compat/os_auto.h.in

@@ -176 +176 @@
 #    if TARGET_OS_IPHONE
 #       include "Availability.h"
+        /* Use CFHost API for pj_getaddrinfo() (see ticket #1246) */
+#       define PJ_GETADDRINFO_USE_CFHOST 1
 #       ifdef __IPHONE_4_0
-            /* Append ".local" suffix to the system's hostname? (see ticket #1104) */
-#           define PJ_GETHOSTNAME_APPEND_LOCAL_SUFFIX           1
             /* Is multitasking support available?  (see ticket #1107) */
 #           define PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT        1

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

@@ -25 +25 @@
 #include <pj/compat/socket.h>
 
+#if defined(PJ_GETADDRINFO_USE_CFHOST) && PJ_GETADDRINFO_USE_CFHOST!=0
+#   include <CoreFoundation/CFString.h>
+#   include <CFNetwork/CFHost.h>
+#endif
 
 PJ_DEF(pj_status_t) pj_gethostbyname(const pj_str_t *hostname, pj_hostent *phe)
@@ -63 +67 @@
 #if defined(PJ_SOCK_HAS_GETADDRINFO) && PJ_SOCK_HAS_GETADDRINFO!=0
     char nodecopy[PJ_MAX_HOSTNAME];
-    struct addrinfo hint, *res, *orig_res;
     pj_bool_t has_addr = PJ_FALSE;
     unsigned i;
+#if defined(PJ_GETADDRINFO_USE_CFHOST) && PJ_GETADDRINFO_USE_CFHOST!=0
+    CFStringRef hostname;
+    CFHostRef hostRef;
+    pj_status_t status = PJ_SUCCESS;
+#else
     int rc;
+    struct addrinfo hint, *res, *orig_res;
+#endif
 
     PJ_ASSERT_RETURN(nodename && count && *count && ai, PJ_EINVAL);
@@ -106 +116 @@
     nodecopy[nodename->slen] = '\0';
 
+#if defined(PJ_GETADDRINFO_USE_CFHOST) && PJ_GETADDRINFO_USE_CFHOST!=0
+    hostname =  CFStringCreateWithCStringNoCopy(kCFAllocatorDefault, nodecopy,
+                                                kCFStringEncodingASCII,
+                                                kCFAllocatorNull);
+    hostRef = CFHostCreateWithName(kCFAllocatorDefault, hostname);
+    if (CFHostStartInfoResolution(hostRef, kCFHostAddresses, nil)) {
+        CFArrayRef addrRef = CFHostGetAddressing(hostRef, nil);
+        i = 0;
+        if (addrRef != nil) {
+            CFIndex idx, naddr;
+            
+            naddr = CFArrayGetCount(addrRef);
+            for (idx = 0; idx < naddr && i < *count; idx++) {
+                struct sockaddr *addr;
+                
+                addr = (struct sockaddr *)
+                       CFDataGetBytePtr(CFArrayGetValueAtIndex(addrRef, idx));
+                /* This should not happen. */
+                pj_assert(addr);
+                
+                /* Ignore unwanted address families */
+                if (af!=PJ_AF_UNSPEC && addr->sa_family != af)
+                    continue;
+
+                /* Store canonical name */
+                pj_ansi_strcpy(ai[i].ai_canonname, nodecopy);
+                
+                /* Store address */
+                PJ_ASSERT_ON_FAIL(sizeof(*addr) <= sizeof(pj_sockaddr),
+                                  continue);
+                pj_memcpy(&ai[i].ai_addr, addr, sizeof(*addr));
+                PJ_SOCKADDR_RESET_LEN(&ai[i].ai_addr);
+                
+                i++;
+            }
+        }
+        
+        *count = i;
+    } else {
+        status = PJ_ERESOLVE;
+    }
+    
+    CFRelease(hostRef);
+    CFRelease(hostname);
+    
+    return status;
+#else
     /* Call getaddrinfo() */
     pj_bzero(&hint, sizeof(hint));
@@ -146 +203 @@
     /* Done */
     return PJ_SUCCESS;
+#endif
 
 #else   /* PJ_SOCK_HAS_GETADDRINFO */

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

@@ -457 +457 @@
         } else {
             hostname.slen = strlen(buf);
-#if defined(PJ_GETHOSTNAME_APPEND_LOCAL_SUFFIX) && \
-    PJ_GETHOSTNAME_APPEND_LOCAL_SUFFIX!=0
-            {
-                const pj_str_t suffix = {".local", 6};
-
-                if (hostname.slen < suffix.slen ||
-                    pj_ansi_strnicmp(hostname.ptr + hostname.slen -
-                                     suffix.slen, suffix.ptr, suffix.slen))
-                {
-                    if (hostname.slen + suffix.slen + 1 < sizeof(buf))
-                        pj_strcat(&hostname, &suffix);
-                    else
-                        hostname.slen = 0;
-                    hostname.ptr[hostname.slen] = '\0';
-                }
-            }
-#endif
         }
     }

pjproject/trunk/pjnath/src/pjturn-client/client_main.c

@@ -186 +186 @@
 
 
-static int shutdown()
+static int client_shutdown()
 {
     unsigned i;
@@ -626 +626 @@
 
 on_return:
-    shutdown();
+    client_shutdown();
     return status ? 1 : 0;
 }