Changeset 3238

Timestamp:

Jul 15, 2010 1:32:11 PM (14 years ago)

Author:

ming

Message:

Fixed #1104: Append ".local" to the system's hostname in IOS 4.

Location:

pjproject/trunk/pjlib

Files:

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

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

@@ -170 +170 @@
 #undef PJ_ATOMIC_VALUE_TYPE
 
+/* Append ".local" suffix to the system's hostname? */
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+#    include "TargetConditionals.h"
+#    if defined(__IPHONE_4_0) && \
+        __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0
+#       define PJ_GETHOSTNAME_APPEND_LOCAL_SUFFIX 1
+#    endif
+#endif
+
 /* If 1, use Read/Write mutex emulation for platforms that don't support it */
 #undef PJ_EMULATE_RWMUTEX

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

@@ -451 +451 @@
             hostname.slen = 0;
         } else {
-           hostname.slen = strlen(buf);
+            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
         }
     }