Changeset 2353 for pjproject/trunk

Timestamp:

Oct 21, 2008 2:29:47 PM (16 years ago)

Author:

nanang

Message:

Ticket #558: Added srtp_deinit() function and registered this with pj_atexit().

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_srtp.c (modified) (2 diffs)
• third_party/srtp/include/srtp.h (modified) (1 diff)
• third_party/srtp/srtp/srtp.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -261 +261 @@
 }
 
+static void pjmedia_srtp_deinit_lib(void);
+
 static pj_status_t pjmedia_srtp_init_lib(void)
 {
@@ -274 +276 @@
         }
 
+        if (pj_atexit(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,
+             * since in modern OS's memory used by an application is released 
+             * when the application terminates.
+             */
+            PJ_LOG(4, (THIS_FILE, "Failed to register libsrtp deinit."));
+        }
+
         initialized = PJ_TRUE;
     }
     
     return PJ_SUCCESS;
+}
+
+static void pjmedia_srtp_deinit_lib(void)
+{
+    err_status_t err;
+
+    err = srtp_deinit();
+    if (err != err_status_ok) {
+        PJ_LOG(4, (THIS_FILE, "Failed to deinitialize libsrtp: %s", 
+                   get_libsrtp_errstr(err)));
+    }
 }
 

pjproject/trunk/third_party/srtp/include/srtp.h

@@ -259 +259 @@
 
 /**
+ * @brief srtp_deinit() deinitializes the srtp library.  
+ *
+ * @warning This function @b must be called on quitting application or
+ * after srtp is no longer used.
+ */
+
+err_status_t
+srtp_deinit(void);
+
+/**
  * @brief srtp_protect() is the Secure RTP sender-side packet processing
  * function.

pjproject/trunk/third_party/srtp/srtp/srtp.c

@@ -1103 +1103 @@
 }
 
+err_status_t
+srtp_deinit() {
+  err_status_t status;
+
+  status = crypto_kernel_shutdown();
+
+  return status;
+}
+
 /* 
  * The following code is under consideration for removal.  See