Changeset 4802 for pjproject/trunk/pjsip/src/pjsip/sip_transport.c

Timestamp:

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

Author:

riza

Message:

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

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport.c (modified) (1 diff)

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;
+        }
     }