Changeset 4802 for pjproject

Timestamp:

Mar 25, 2014 4:08:44 AM (11 years ago)

Author:

riza

Message:

Re #1752: Add option to resolve hostname when trying to get network interface.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (2 diffs)
• src/pjsip/sip_config.c (modified) (1 diff)
• src/pjsip/sip_transport.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -138 +138 @@
         pj_bool_t req_has_via_alias;
 
+        /**
+         * Resolve hostname when trying to get the network interface to be put 
+         * in Via or Contact header.
+         *
+         * Default is PJSIP_RESOLVE_HOSTNAME_TO_GET_INTERFACE.
+         */
+        pj_bool_t resolve_hostname_to_get_interface;
+
     } endpt;
 
@@ -364 +372 @@
 #endif
 
+/**
+ * Resolve hostname when trying to get the network interface to be put in Via 
+ * or Contact header.
+ *
+ * This option can also be controlled at run-time by the
+ * \a resolve_hostname_to_get_interface setting in pjsip_cfg_t.
+ *
+ * Default is PJ_FALSE.
+ */
+#ifndef PJSIP_RESOLVE_HOSTNAME_TO_GET_INTERFACE
+#   define PJSIP_RESOLVE_HOSTNAME_TO_GET_INTERFACE  PJ_FALSE
+#endif
 
 /**

pjproject/trunk/pjsip/src/pjsip/sip_config.c

@@ -33 +33 @@
        PJSIP_DONT_SWITCH_TO_TLS,
        PJSIP_FOLLOW_EARLY_MEDIA_FORK,
-       PJSIP_REQ_HAS_VIA_ALIAS
+       PJSIP_REQ_HAS_VIA_ALIAS,
+       PJSIP_RESOLVE_HOSTNAME_TO_GET_INTERFACE
     },
 

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -1292 +1292 @@
     int af;
     pj_sockaddr itf_addr;
-    pj_status_t status;
+    pj_status_t status = -1;
 
     af = (tp_type & PJSIP_TRANSPORT_IPV6)? PJ_AF_INET6 : PJ_AF_INET;
-    status = pj_getipinterface(af, dst, &itf_addr, PJ_FALSE, NULL);
-    if (status != PJ_SUCCESS) {
-        /* If it fails, e.g: on WM6 (http://support.microsoft.com/kb/129065),
-         * just fallback using pj_gethostip(), see ticket #1660.
-         */
-        PJ_LOG(5,(THIS_FILE,"Warning: unable to determine local "
-                            "interface, fallback to default interface!"));
-        status = pj_gethostip(af, &itf_addr);
-        if (status != PJ_SUCCESS)
-            return status;
+
+    if (pjsip_cfg()->endpt.resolve_hostname_to_get_interface) {
+        status = pj_getipinterface(af, dst, &itf_addr, PJ_TRUE, NULL);
+    }
+
+    if (status != PJ_SUCCESS) { 
+        status = pj_getipinterface(af, dst, &itf_addr, PJ_FALSE, NULL);
+        if (status != PJ_SUCCESS) {
+            /* If it fails, e.g: on WM6(http://support.microsoft.com/kb/129065),
+             * just fallback using pj_gethostip(), see ticket #1660.
+             */
+            PJ_LOG(5,(THIS_FILE,"Warning: unable to determine local "
+                                "interface, fallback to default interface!"));
+            status = pj_gethostip(af, &itf_addr);
+            if (status != PJ_SUCCESS)
+                return status;
+        }
     }