Changeset 3692 for pjproject

Timestamp:

Aug 11, 2011 8:45:38 AM (13 years ago)

Author:

ming

Message:

Fixed #1342: disable local host resolution on iPhone OS

Location:

pjproject/branches/1.x/pjlib

Files:

• include/pj/compat/os_auto.h.in (modified) (1 diff)
• src/pj/sock_common.c (modified) (2 diffs)

pjproject/branches/1.x/pjlib/include/pj/compat/os_auto.h.in

@@ -178 +178 @@
         /* Use CFHost API for pj_getaddrinfo() (see ticket #1246) */
 #       define PJ_GETADDRINFO_USE_CFHOST 1
+        /* Disable local host resolution in pj_gethostip() (see ticket #1342) */
+#       define PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION 1
 #       ifdef __IPHONE_4_0
             /* Is multitasking support available?  (see ticket #1107) */

pjproject/branches/1.x/pjlib/src/pj/sock_common.c

@@ -785 +785 @@
     PJ_SOCKADDR_RESET_LEN(addr);
 
+#if defined(PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION) && \
+    PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION == 1
     /* Get hostname's IP address */
     count = 1;
@@ -798 +800 @@
                 pj_sockaddr_print(&ai.ai_addr, strip, sizeof(strip), 0)));
     }
-
+#else
+    PJ_UNUSED_ARG(ai);
+    PJ_UNUSED_ARG(count);
+#endif
 
     /* Get default interface (interface for default route) */