Changeset 5307

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.

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -2049 +2049 @@
     pj_sockaddr      addr;
 
+    /**
+     * The index of the usable STUN server.
+     */
+    unsigned         index;
 };
 

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

@@ -436 +436 @@
     pj_status_t          stun_status; /**< STUN server status.          */
     pjsua_stun_resolve   stun_res;  /**< List of pending STUN resolution*/
-    pj_dns_resolver     *resolver;  /**< DNS resolver.                  */
+    unsigned             stun_srv_idx; /**< Resolved STUN server index  */
+    pj_dns_resolver     *resolver;  /**< DNS resolver.                  */   
 
     /* Detected NAT type */

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();
         }
     }

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

@@ -394 +394 @@
                 ((acc->cfg.media_stun_use & PJSUA_STUN_RETRY_ON_FAILURE)!=0))
             {
-                PJ_LOG(4,(THIS_FILE, "Failed to get STUN mapped address, "
-                                     "retrying other STUN servers"));
+                pj_str_t srv = 
+                             pjsua_var.ua_cfg.stun_srv[pjsua_var.stun_srv_idx];
+
+                PJ_LOG(4,(THIS_FILE, "Failed to get STUN mapped address, "
+                       "retrying other STUN servers"));
+
+                if (pjsua_var.stun_srv_idx < pjsua_var.ua_cfg.stun_srv_cnt-1) {
+                    PJSUA_LOCK();
+                    /* Move the unusable STUN server to the last position
+                     * as the least prioritize.
+                     */
+                    pj_array_erase(pjsua_var.ua_cfg.stun_srv, 
+                                   sizeof(pj_str_t),
+                                   pjsua_var.ua_cfg.stun_srv_cnt,
+                                   pjsua_var.stun_srv_idx);
+
+                    pj_array_insert(pjsua_var.ua_cfg.stun_srv, 
+                                    sizeof(pj_str_t),
+                                    pjsua_var.ua_cfg.stun_srv_cnt-1,
+                                    pjsua_var.ua_cfg.stun_srv_cnt-1,
+                                    &srv);
+
+                    PJSUA_UNLOCK();
+                }
                 status=pjsua_update_stun_servers(pjsua_var.ua_cfg.stun_srv_cnt,
                                                  pjsua_var.ua_cfg.stun_srv,
-                                                 PJ_TRUE);
+                                                 PJ_FALSE);
+
+                if (status == PJ_SUCCESS)
+                    status = resolve_stun_server(PJ_TRUE);
+
                 if (status == PJ_SUCCESS) {
                     if (pjsua_var.stun_srv.addr.sa_family != 0) {