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

Timestamp:

Mar 22, 2012 11:29:20 AM (12 years ago)

Author:

nanang

Message:

Close #1466 (using PJLIB outside PJSUA-LIB context):

• static reference counter for PJLIB init/shutdown.
• implemented atexit() in PJMEDIA and PJSIP level: pjmedia_endpt_atexit() & pjsip_endpt_atexit().
• updated pjmedia/transport_srtp.c, pjsip/sip_timer.c, and pjsip/sip_replaces.c to use the new atexit() functions.
• API change: pjmedia_srtp_init_lib() now requires 'pjmedia_endpt' param.

File:

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

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

@@ -41 +41 @@
 #define MAX_METHODS   32
 
+
+/* List of SIP endpoint exit callback. */
+typedef struct exit_cb
+{
+    PJ_DECL_LIST_MEMBER             (struct exit_cb);
+    pjsip_endpt_exit_callback       func;
+} exit_cb;
+
+
 /**
  * The SIP endpoint.
@@ -87 +96 @@
     /** Additional request headers. */
     pjsip_hdr            req_hdr;
+
+    /** List of exit callback. */
+    exit_cb              exit_cb_list;
 };
 
@@ -446 +458 @@
     pj_list_init(&endpt->module_list);
 
+    /* Initialize exit callback list. */
+    pj_list_init(&endpt->exit_cb_list);
+
     /* Create R/W mutex for module manipulation. */
     status = pj_rwmutex_create(endpt->pool, "ept%p", &endpt->mod_mutex);
@@ -560 +575 @@
 {
     pjsip_module *mod;
+    exit_cb *ecb;
 
     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 */
@@ -1179 +1202 @@
 }
 
+
+PJ_DEF(pj_status_t) pjsip_endpt_atexit( pjsip_endpoint *endpt,
+                                        pjsip_endpt_exit_callback func)
+{
+    exit_cb *new_cb;
+
+    PJ_ASSERT_RETURN(endpt && func, PJ_EINVAL);
+
+    new_cb = PJ_POOL_ZALLOC_T(endpt->pool, exit_cb);
+    new_cb->func = func;
+
+    pj_mutex_lock(endpt->mutex);
+    pj_list_push_back(&endpt->exit_cb_list, new_cb);
+    pj_mutex_unlock(endpt->mutex);
+
+    return PJ_SUCCESS;
+}