mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-16 23:08:32 +00:00
Use srtp_shutdown when available
This allows the SRTP library to be shut down properly when the functionality is offered by libsrtp. Review: https://reviewboard.asterisk.org/r/2538/ (closes issue ASTERISK-21719) ........ Merged revisions 388768 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@388769 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -466,6 +466,7 @@ AST_EXT_LIB_SETUP_DEPENDENT([SPEEX_PREPROCESS], [speex_preprocess_ctl], [], [spe
|
||||
AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
|
||||
AST_EXT_LIB_SETUP([SQLITE3], [SQLite], [sqlite3])
|
||||
AST_EXT_LIB_SETUP([SRTP], [Secure RTP], [srtp])
|
||||
AST_EXT_LIB_SETUP_OPTIONAL([SRTP_SHUTDOWN], [SRTP Library Shutdown Function], [SRTP], [srtp])
|
||||
AST_EXT_LIB_SETUP([OPENSSL], [OpenSSL Secure Sockets Layer], [ssl])
|
||||
AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv])
|
||||
AST_EXT_LIB_SETUP([FREETDS], [FreeTDS], [tds])
|
||||
@@ -2181,6 +2182,7 @@ then
|
||||
CFLAGS="${saved_cflags}"
|
||||
fi
|
||||
|
||||
AST_EXT_LIB_CHECK([SRTP_SHUTDOWN], [srtp], [srtp_shutdown], [srtp/srtp.h])
|
||||
|
||||
for ver in 2.0 2.2 2.4 2.6; do
|
||||
AST_PKG_CONFIG_CHECK([GMIME], gmime-$ver)
|
||||
|
||||
@@ -762,6 +762,9 @@
|
||||
/* Define to 1 if you have the Secure RTP library. */
|
||||
#undef HAVE_SRTP
|
||||
|
||||
/* Define to 1 if SRTP has the SRTP Library Shutdown Function feature. */
|
||||
#undef HAVE_SRTP_SHUTDOWN
|
||||
|
||||
/* Define to 1 if you have the ISDN SS7 library. */
|
||||
#undef HAVE_SS7
|
||||
|
||||
@@ -1229,6 +1232,11 @@
|
||||
/* Define to 1 if running on Darwin. */
|
||||
#undef _DARWIN_UNLIMITED_SELECT
|
||||
|
||||
/* Enable large inode numbers on Mac OS X 10.5. */
|
||||
#ifndef _DARWIN_USE_64_BIT_INODE
|
||||
# define _DARWIN_USE_64_BIT_INODE 1
|
||||
#endif
|
||||
|
||||
/* Number of bits in a file offset, on hosts where this is settable. */
|
||||
#undef _FILE_OFFSET_BITS
|
||||
|
||||
|
||||
@@ -546,6 +546,9 @@ static void res_srtp_shutdown(void)
|
||||
{
|
||||
srtp_install_event_handler(NULL);
|
||||
ast_rtp_engine_unregister_srtp();
|
||||
#ifdef HAVE_SRTP_SHUTDOWN
|
||||
srtp_shutdown();
|
||||
#endif
|
||||
g_initialized = 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user