Changeset 2597 for pjproject

Timestamp:

Apr 14, 2009 3:18:30 PM (16 years ago)

Author:

nanang

Message:

Ticket #788: Updated pjsua_media_subsys_init() to perform SRTP library initialization.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/transport_srtp.h (modified) (1 diff)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/transport_srtp.h

@@ -196 +196 @@
 
 /**
+ * Initialize SRTP library. This function should be called before
+ * any SRTP functions, however calling #pjmedia_transport_srtp_create() 
+ * will also invoke this function. This function will also register SRTP
+ * library deinitialization to #pj_atexit(), so the deinitialization
+ * of SRTP library will be performed automatically by PJLIB destructor.
+ */
+PJ_DECL(pj_status_t) pjmedia_srtp_init_lib(void);
+
+
+/**
  * Initialize SRTP setting with its default values.
  *

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

@@ -264 +264 @@
 static void pjmedia_srtp_deinit_lib(void);
 
-static pj_status_t pjmedia_srtp_init_lib(void)
+PJ_DEF(pj_status_t) pjmedia_srtp_init_lib(void)
 {
     static pj_bool_t initialized = PJ_FALSE;
@@ -270 +270 @@
     if (initialized == PJ_FALSE) {
         err_status_t err;
+
         err = srtp_init();
         if (err != err_status_ok) { 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -279 +279 @@
                                       &pjsua_var.null_port);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    /* Initialize SRTP library. */
+    status = pjmedia_srtp_init_lib();
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Error initializing SRTP library", 
+                     status);
+        return status;
+    }
+#endif
 
     /* Perform NAT detection */