Changeset 3999 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_transaction.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -715 +715 @@
 
     pj_mutex_unlock(mod_tsx_layer.mutex);
+
+    PJ_LOG(4,(THIS_FILE, "Stopped transaction layer module"));
+
     return PJ_SUCCESS;
+}
+
+
+/* Destroy this module */
+static void tsx_layer_destroy(pjsip_endpoint *endpt)
+{
+    PJ_UNUSED_ARG(endpt);
+
+    /* Destroy mutex. */
+    pj_mutex_destroy(mod_tsx_layer.mutex);
+
+    /* Release pool. */
+    pjsip_endpt_release_pool(mod_tsx_layer.endpt, mod_tsx_layer.pool);
+
+    /* Free TLS */
+    pj_thread_local_free(pjsip_tsx_lock_tls_id);
+
+    /* Mark as unregistered. */
+    mod_tsx_layer.endpt = NULL;
+
+    PJ_LOG(4,(THIS_FILE, "Transaction layer module destroyed"));
 }
 
@@ -730 +754 @@
      * from transport and when it tries to unregister itself.
      */
-    if (pj_hash_count(mod_tsx_layer.htable) != 0)
+    if (pj_hash_count(mod_tsx_layer.htable) != 0) {
+        if (pjsip_endpt_atexit(mod_tsx_layer.endpt, &tsx_layer_destroy) !=
+            PJ_SUCCESS)
+        {
+            PJ_LOG(3,(THIS_FILE, "Failed to register transaction layer "
+                                 "module destroy."));
+        }
         return PJ_EBUSY;
-
-    /* Destroy mutex. */
-    pj_mutex_destroy(mod_tsx_layer.mutex);
-
-    /* Release pool. */
-    pjsip_endpt_release_pool(mod_tsx_layer.endpt, mod_tsx_layer.pool);
-
-    /* Free TLS */
-    pj_thread_local_free(pjsip_tsx_lock_tls_id);
-
-    /* Mark as unregistered. */
-    mod_tsx_layer.endpt = NULL;
-
-    PJ_LOG(4,(THIS_FILE, "Transaction layer module destroyed"));
+    }
+
+    tsx_layer_destroy(mod_tsx_layer.endpt);
 
     return PJ_SUCCESS;
@@ -3240 +3259 @@
     PJ_UNUSED_ARG(tsx);
     PJ_UNUSED_ARG(event);
-    pj_assert(!"Not expecting any events!!");
-    return PJ_EBUG;
-}
-
+
+    // See https://trac.pjsip.org/repos/ticket/1432
+    //pj_assert(!"Not expecting any events!!");
+
+    return PJ_EIGNORED;
+}
+