Changeset 5127

Timestamp:

Jul 6, 2015 8:51:45 AM (9 years ago)

Author:

nanang

Message:

Close #1865: Start NAT type detection after first STUN server resolution succeeds to avoid blocked main thread when STUN server is down.

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_core.c (modified) (1 diff)
• pjsua_media.c (modified) (1 diff)

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

@@ -1464 +1464 @@
     if ((result->status == PJ_SUCCESS) && (pjsua_var.ua_cfg.stun_srv_cnt>0)) {
         pj_memcpy(&pjsua_var.stun_srv, &result->addr, sizeof(result->addr));
+
+        /* Perform NAT type detection if not yet */
+        if (pjsua_var.nat_type == PJ_STUN_NAT_TYPE_UNKNOWN &&
+            pjsua_var.ua_cfg.nat_type_in_sdp)
+        {
+            pjsua_detect_nat_type();
+        }
     }
 }

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

@@ -165 +165 @@
 
     /* Perform NAT detection */
-    if (pjsua_var.ua_cfg.stun_srv_cnt) {
-        status = pjsua_detect_nat_type();
-        if (status != PJ_SUCCESS) {
-            PJ_PERROR(1,(THIS_FILE, status, "NAT type detection failed"));
-        }
-    }
+    // Performed only when STUN server resolution by pjsua_init() completed
+    // successfully (see ticket #1865).
+    //if (pjsua_var.ua_cfg.stun_srv_cnt) {
+        //status = pjsua_detect_nat_type();
+        //if (status != PJ_SUCCESS) {
+        //    PJ_PERROR(1,(THIS_FILE, status, "NAT type detection failed"));
+        //}
+    //}
 
     pj_log_pop_indent();