[asterisk-commits] mjordan: trunk r356652 - in /trunk: ./ res/res_srtp.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Fri Feb 24 11:43:26 2012
New Revision: 356652

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=356652
Log:
Remove srtp_shutdown from res_srtp

The patch for ASTERISK-19253 included properly shutting down the libsrtp
library in the case of module unload.  Unfortunately, not all distributions
have the srtp_shutdown call.  As such, this patch removes calling
srtp_shutdown.
........

Merged revisions 356650 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 356651 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/res/res_srtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/res/res_srtp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_srtp.c?view=diff&rev=356652&r1=356651&r2=356652
==============================================================================
--- trunk/res/res_srtp.c (original)
+++ trunk/res/res_srtp.c Fri Feb 24 11:43:26 2012
@@ -530,9 +530,6 @@
 static void res_srtp_shutdown(void)
 {
 	srtp_install_event_handler(NULL);
-	if (srtp_shutdown() != err_status_ok) {
-		ast_log(AST_LOG_WARNING, "Failed to de-initialize libsrtp\n");
-	}
 	ast_rtp_engine_unregister_srtp();
 	g_initialized = 0;
 }