[asterisk-commits] file: trunk r417706 - in /trunk: ./ res/res_rtp_asterisk.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Jul  1 09:42:46 2014
New Revision: 417706

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=417706
Log:
res_rtp_asterisk: Don't leak memory or reset state if DTLS configuration is set multiple times.
........

Merged revisions 417705 from http://svn.asterisk.org/svn/asterisk/branches/12

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

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

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=417706&r1=417705&r2=417706
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Tue Jul  1 09:42:46 2014
@@ -900,6 +900,10 @@
 
 	if (!ast_rtp_engine_srtp_is_registered()) {
 		return -1;
+	}
+
+	if (rtp->ssl_ctx) {
+		return 0;
 	}
 
 	if (!(rtp->ssl_ctx = SSL_CTX_new(DTLSv1_method()))) {