Changeset 5765

Timestamp:

Apr 2, 2018 5:43:58 AM (7 years ago)

Author:

riza

Message:

Re #2104: Make sure that STUN session is destroyed and prevent new timer for
STUN destruction on pjsua_destroy2().

File:

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

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

@@ -1234 +1234 @@
 
 
-static void destroy_stun_resolve_cb(pj_timer_heap_t *t, pj_timer_entry *e)
-{
-    pjsua_stun_resolve *sess = (pjsua_stun_resolve*)e->user_data;
-    PJ_UNUSED_ARG(t);
-
+static void release_stun_session(pjsua_stun_resolve *sess)
+{
     PJSUA_LOCK();
     pj_list_erase(sess);
@@ -1247 +1244 @@
 }
 
-
-static void destroy_stun_resolve(pjsua_stun_resolve *sess)
+static void destroy_stun_resolve_cb(pj_timer_heap_t *t, pj_timer_entry *e)
+{
+    pjsua_stun_resolve *sess = (pjsua_stun_resolve*)e->user_data;
+    PJ_UNUSED_ARG(t);
+
+    release_stun_session(sess);
+}
+
+
+static void destroy_stun_resolve(pjsua_stun_resolve *sess, pj_bool_t forced)
 {
     pj_time_val timeout = {0, 0};
@@ -1266 +1271 @@
         pjsua_var.stun_status = PJNATH_ESTUNDESTROYED;
     }
-    
-    /* Schedule session clean up, it needs PJSUA lock and locking it here
-     * may cause deadlock as this function may be called by STUN socket
-     * while holding STUN socket lock, while application may wait for STUN
-     * resolution while holding PJSUA lock.
-     */
-    pj_timer_entry_init(&sess->timer, 0, (void*)sess,
-                        &destroy_stun_resolve_cb);
-    pjsua_schedule_timer(&sess->timer, &timeout);
+
+    if (forced) {
+        release_stun_session(sess);
+    } else {
+        /* Schedule session clean up, it needs PJSUA lock and locking it here
+         * may cause deadlock as this function may be called by STUN socket
+         * while holding STUN socket lock, while application may wait for STUN
+         * resolution while holding PJSUA lock.
+         */
+        pj_timer_entry_init(&sess->timer, 0, (void*)sess,
+                            &destroy_stun_resolve_cb);
+        pjsua_schedule_timer(&sess->timer, &timeout);
+    }
 }
 
@@ -1289 +1298 @@
     }
 
-    destroy_stun_resolve(sess);
+    destroy_stun_resolve(sess, PJ_FALSE);
 }
 
@@ -1849 +1858 @@
         }
 
-        /* Terminate any pending STUN resolution */
-        if (!pj_list_empty(&pjsua_var.stun_res)) {
-            pjsua_stun_resolve *sess = pjsua_var.stun_res.next;
-            while (sess != &pjsua_var.stun_res) {
-                pjsua_stun_resolve *next = sess->next;
-                destroy_stun_resolve(sess);
-                sess = next;
-            }
-        }
-
         /* Wait until all unregistrations are done (ticket #364) */
         /* First stage, get the maximum wait time */
@@ -1899 +1898 @@
 
         PJ_LOG(4,(THIS_FILE, "Destroying..."));
+        
+        /* Terminate any pending STUN resolution */
+        if (!pj_list_empty(&pjsua_var.stun_res)) {
+            pjsua_stun_resolve *sess = pjsua_var.stun_res.next;
+            while (sess != &pjsua_var.stun_res) {
+                pjsua_stun_resolve *next = sess->next;
+                destroy_stun_resolve(sess, PJ_TRUE);
+                sess = next;
+            }
+        }
 
         /* Destroy media (to shutdown media endpoint, etc) */