Changeset 4983

Timestamp:

Feb 13, 2015 11:34:26 AM (9 years ago)

Author:

ming

Message:

Fixed #1815: Race condition of STUN transaction destruction

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/stun_transaction.h (modified) (1 diff)
• src/pjnath/stun_session.c (modified) (1 diff)
• src/pjnath/stun_transaction.c (modified) (1 diff)

pjproject/trunk/pjnath/include/pjnath/stun_transaction.h

@@ -163 +163 @@
 
 /**
+ * Destroy the STUN transaction immediately after the transaction is complete.
+ * Application normally calls this function in the on_complete() callback.
+ *
+ * @param tsx           The STUN transaction.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pj_stun_client_tsx_destroy(pj_stun_client_tsx *tsx);
+
+
+/**
  * Stop the client transaction.
  *

pjproject/trunk/pjnath/src/pjnath/stun_session.c

@@ -150 +150 @@
     pj_stun_client_tsx_stop(tsx);
     if (tdata) {
-        tsx_erase(tdata->sess, tdata);
+        pj_stun_session *sess = tdata->sess;
+        
+        pj_grp_lock_acquire(sess->grp_lock);
+        tsx_erase(sess, tdata);
         pj_pool_release(tdata->pool);
-    }
+        pj_grp_lock_release(sess->grp_lock);
+    }
+
+    pj_stun_client_tsx_destroy(tsx);
 
     TRACE_((THIS_FILE, "STUN transaction %p destroyed", tsx));

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

@@ -139 +139 @@
 
 
+PJ_DEF(pj_status_t) pj_stun_client_tsx_destroy(pj_stun_client_tsx *tsx)
+{
+    /*
+     * Currently tsx has no objects to destroy so we don't need to do anything
+     * here.
+     */
+    /* pj_stun_client_tsx_stop(tsx); */
+    return PJ_SUCCESS;
+}
+
 /*
  * Destroy transaction immediately.