Changeset 5382

Timestamp:

Jul 14, 2016 4:37:37 AM (8 years ago)

Author:

nanang

Message:

Misc (re #1928): Use host IP for SIP UDP transport address when STUN resolution fails to avoid zero address.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -2152 +2152 @@
         status = pjstun_get_mapped_addr2(&pjsua_var.cp.factory, &stun_opt,
                                          1, &sock, &p_pub_addr->ipv4);
-        if (status != PJ_SUCCESS && !pjsua_var.ua_cfg.stun_ignore_failure) {
+        if (status != PJ_SUCCESS) {
+            /* Failed getting mapped address via STUN */
             pjsua_perror(THIS_FILE, "Error contacting STUN server", status);
-            pj_sock_close(sock);
-            return status;
+            
+            /* Return error if configured to not ignore STUN failure */
+            if (!pjsua_var.ua_cfg.stun_ignore_failure) {
+                pj_sock_close(sock);
+                return status;
+            }
+
+            /* Otherwise, just use host IP */
+            pj_sockaddr_init(af, p_pub_addr, NULL, (pj_uint16_t)port);
+            status = pj_gethostip(af, p_pub_addr);
+            if (status != PJ_SUCCESS) {
+                pjsua_perror(THIS_FILE, "Unable to get local host IP", status);
+                pj_sock_close(sock);
+                return status;
+            }
         }