diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-04-14 15:18:30 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-04-14 15:18:30 +0000 |
| commit | f373261af510a0bf0915533975977b7eaa8901c5 (patch) | |
| tree | e4ac437085c38bd44eb1d518ddcef3a7447a2be7 /pjmedia | |
| parent | 9c25ebcee78d76cbbd35fe28e0dd28acbc6f4960 (diff) | |
Ticket #788: Updated pjsua_media_subsys_init() to perform SRTP library initialization.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2597 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/include/pjmedia/transport_srtp.h | 10 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/transport_srtp.c | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pjmedia/include/pjmedia/transport_srtp.h b/pjmedia/include/pjmedia/transport_srtp.h index e0407f4a..4ac99dc7 100644 --- a/pjmedia/include/pjmedia/transport_srtp.h +++ b/pjmedia/include/pjmedia/transport_srtp.h @@ -195,6 +195,16 @@ typedef struct pjmedia_srtp_info /** + * 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. * * @param opt SRTP setting to be initialized. diff --git a/pjmedia/src/pjmedia/transport_srtp.c b/pjmedia/src/pjmedia/transport_srtp.c index d46d4fc0..cd9fb734 100644 --- a/pjmedia/src/pjmedia/transport_srtp.c +++ b/pjmedia/src/pjmedia/transport_srtp.c @@ -263,12 +263,13 @@ const char* get_libsrtp_errstr(int err) 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; if (initialized == PJ_FALSE) { err_status_t err; + err = srtp_init(); if (err != err_status_ok) { PJ_LOG(4, (THIS_FILE, "Failed to initialize libsrtp: %s", |