Changeset 5133

Timestamp:

Jul 14, 2015 1:18:19 AM (9 years ago)

Author:

ming

Message:

Fixed #1869: Destroy STUN session when cleaning up STUN server resolution

Thanks to Itay Bianco for the patch

Location:

pjproject/trunk

Files:

• pjnath/src/pjnath/stun_transaction.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjnath/src/pjnath/stun_transaction.c

@@ -263 +263 @@
         /* We've been destroyed, don't access the object. */
     } else if (status != PJ_SUCCESS) {
-        if (mod_count) {
+        if (mod_count || status == PJ_EINVALIDOP) {
                 pj_timer_heap_cancel_if_active( tsx->timer_heap,
                                                 &tsx->retransmit_timer,

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

@@ -1162 +1162 @@
 
     PJSUA_LOCK();
+
+    if (sess->stun_sock) {
+        pj_stun_sock_destroy(sess->stun_sock);
+        sess->stun_sock = NULL;
+    }
+
+    if (pjsua_var.stun_status == PJ_EUNKNOWN ||
+        pjsua_var.stun_status == PJ_EPENDING)
+    {
+        pjsua_var.stun_status = PJNATH_ESTUNDESTROYED;
+    }
+    
     pj_list_erase(sess);
+
     PJSUA_UNLOCK();