Changeset 5307 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

May 19, 2016 4:30:05 AM (8 years ago)

Author:

riza

Message:

Re #1918: Fixed continous looping when trying to resolve STUN server due to lock handling.
Also move the unusable server to the least prioritize to be chosen on the fallback process.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (4 diffs)

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

@@ -1206 +1206 @@
     result.status = sess->status;
     result.name = sess->srv[sess->idx];
+    result.index = sess->idx;
     pj_memcpy(&result.addr, &sess->addr, sizeof(result.addr));
     sess->has_result = PJ_TRUE;
@@ -1509 +1510 @@
     if ((result->status == PJ_SUCCESS) && (pjsua_var.ua_cfg.stun_srv_cnt>0)) {
         pj_memcpy(&pjsua_var.stun_srv, &result->addr, sizeof(result->addr));
+        pjsua_var.stun_srv_idx = result->index;
 
         /* Perform NAT type detection if not yet */
@@ -1555 +1557 @@
          */
         if (wait) {
-            while (pjsua_var.stun_status == PJ_EPENDING) {
+            pj_bool_t has_pjsua_lock = PJSUA_LOCK_IS_LOCKED();
+
+            if (has_pjsua_lock)
+                PJSUA_UNLOCK();
+
+            while (pjsua_var.stun_status == PJ_EPENDING) {              
                 /* If there is no worker thread or
                  * the function is called from the only worker thread,
@@ -1569 +1576 @@
                 }
             }
+            if (has_pjsua_lock)
+                PJSUA_LOCK();
         }
     }