Changeset 3986 for pjproject/branches/1.x/pjmedia/src/pjmedia/transport_srtp.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/pjmedia/src/pjmedia/transport_srtp.c (modified) (4 diffs)

pjproject/branches/1.x/pjmedia/src/pjmedia/transport_srtp.c

@@ -271 +271 @@
 
 static pj_bool_t libsrtp_initialized;
-static void pjmedia_srtp_deinit_lib(void);
-
-PJ_DEF(pj_status_t) pjmedia_srtp_init_lib(void)
+static void pjmedia_srtp_deinit_lib(pjmedia_endpt *endpt);
+
+PJ_DEF(pj_status_t) pjmedia_srtp_init_lib(pjmedia_endpt *endpt)
 {
     if (libsrtp_initialized == PJ_FALSE) {
@@ -285 +285 @@
         }
 
-        if (pj_atexit(pjmedia_srtp_deinit_lib) != PJ_SUCCESS) {
+        if (pjmedia_endpt_atexit(endpt, pjmedia_srtp_deinit_lib) != PJ_SUCCESS)
+        {
             /* There will be memory leak when it fails to schedule libsrtp 
              * deinitialization, however the memory leak could be harmless,
@@ -300 +301 @@
 }
 
-static void pjmedia_srtp_deinit_lib(void)
+static void pjmedia_srtp_deinit_lib(pjmedia_endpt *endpt)
 {
     err_status_t err;
+
+    /* Note that currently this SRTP init/deinit is not equipped with
+     * reference counter, it should be safe as normally there is only
+     * one single instance of media endpoint and even if it isn't, the
+     * pjmedia_transport_srtp_create() will invoke SRTP init (the only
+     * drawback should be the delay described by #788).
+     */
+
+    PJ_UNUSED_ARG(endpt);
 
     err = srtp_deinit();
@@ -411 +421 @@
 
     /* Init libsrtp. */
-    status = pjmedia_srtp_init_lib();
+    status = pjmedia_srtp_init_lib(endpt);
     if (status != PJ_SUCCESS)
         return status;