Changeset 5307 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.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_media.c (modified) (1 diff)

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) {