Changeset 3988 for pjproject/branches/1.x/pjsip/src/pjsip/sip_endpoint.c

Timestamp:

Mar 28, 2012 7:32:42 AM (12 years ago)

Author:

nanang

Message:

Re #1466: Moved down the atexit callbacks execution in pjmedia & pjsip endpoints to the very end of endpoint destroy sequence.

File:

• pjproject/branches/1.x/pjsip/src/pjsip/sip_endpoint.c (modified) (2 diffs)

pjproject/branches/1.x/pjsip/src/pjsip/sip_endpoint.c

@@ -579 +579 @@
     PJ_LOG(5, (THIS_FILE, "Destroying endpoing instance.."));
 
-    /* Call all registered exit callbacks */
-    ecb = endpt->exit_cb_list.next;
-    while (ecb != &endpt->exit_cb_list) {
-        (*ecb->func)(endpt);
-        ecb = ecb->next;
-    }
-
     /* Phase 1: stop all modules */
     mod = endpt->module_list.prev;
@@ -615 +608 @@
     /* Destroy timer heap */
     pj_timer_heap_destroy(endpt->timer_heap);
+
+    /* Call all registered exit callbacks */
+    ecb = endpt->exit_cb_list.next;
+    while (ecb != &endpt->exit_cb_list) {
+        (*ecb->func)(endpt);
+        ecb = ecb->next;
+    }
 
     /* Delete endpoint mutex. */