Changeset 5283 for pjproject

Timestamp:

May 9, 2016 6:58:29 AM (9 years ago)

Author:

riza

Message:

Fixed #1914: Ignore STUN error after pjstun_get_mapped_addr2().

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -1578 +1578 @@
 
     /**
-     * This specifies if the library startup should ignore failure with the
+     * This specifies if the library should ignore failure with the
      * STUN servers. If this is set to PJ_FALSE, the library will refuse to
      * start if it fails to resolve or contact any of the STUN servers.

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

@@ -2053 +2053 @@
         status = pjstun_get_mapped_addr2(&pjsua_var.cp.factory, &stun_opt,
                                          1, &sock, &p_pub_addr->ipv4);
-        if (status != PJ_SUCCESS) {
+        if (status != PJ_SUCCESS && !pjsua_var.ua_cfg.stun_ignore_failure) {
             pjsua_perror(THIS_FILE, "Error contacting STUN server", status);
             pj_sock_close(sock);

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

@@ -391 +391 @@
 #endif
             if (status != PJ_SUCCESS) {
-                pjsua_perror(THIS_FILE, "STUN resolve error", status);
-                goto on_error;
+                if (!pjsua_var.ua_cfg.stun_ignore_failure) {
+                    pjsua_perror(THIS_FILE, "STUN resolve error", status);
+                    goto on_error;
+                }
+
+                PJ_LOG(4,(THIS_FILE, "Ignoring STUN resolve error %d", 
+                          status));
+
+                if (!pj_sockaddr_has_addr(&bound_addr)) {
+                    pj_sockaddr addr;
+
+                    /* Get local IP address. */
+                    status = pj_gethostip(af, &addr);
+                    if (status != PJ_SUCCESS)
+                        goto on_error;
+
+                    pj_sockaddr_copy_addr(&bound_addr, &addr);
+                }
+
+                for (i=0; i<2; ++i) {
+                    pj_sockaddr_init(af, &mapped_addr[i], NULL, 0);
+                    pj_sockaddr_copy_addr(&mapped_addr[i], &bound_addr);
+                    pj_sockaddr_set_port(&mapped_addr[i],
+                                         (pj_uint16_t)(acc->next_rtp_port+i));
+                }
+                break;
             }