[svn-commits] mjordan: branch mjordan/1.8-srtp r372157 - /team/mjordan/1.8-srtp/res/

[SVN commits to the Digium repositories]

Author: mjordan
Date: Tue Sep  4 15:46:30 2012
New Revision: 372157

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372157
Log:
Disable changing the SSRC in res_srtp when a remote SSRC change occurs

Modified:
    team/mjordan/1.8-srtp/res/res_rtp_asterisk.c
    team/mjordan/1.8-srtp/res/res_srtp.c

Modified: team/mjordan/1.8-srtp/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8-srtp/res/res_rtp_asterisk.c?view=diff&rev=372157&r1=372156&r2=372157
==============================================================================
--- team/mjordan/1.8-srtp/res/res_rtp_asterisk.c (original)
+++ team/mjordan/1.8-srtp/res/res_rtp_asterisk.c Tue Sep  4 15:46:30 2012
@@ -849,7 +849,7 @@
 
 	if (srtp) {
 		ast_debug(3, "Changing ssrc for SRTP from %u to %u\n", rtp->ssrc, ssrc);
-		res_srtp->change_source(srtp, rtp->ssrc, ssrc);
+		/*res_srtp->change_source(srtp, rtp->ssrc, ssrc);*/
 	}
 
 	rtp->ssrc = ssrc;

Modified: team/mjordan/1.8-srtp/res/res_srtp.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8-srtp/res/res_srtp.c?view=diff&rev=372157&r1=372156&r2=372157
==============================================================================
--- team/mjordan/1.8-srtp/res/res_srtp.c (original)
+++ team/mjordan/1.8-srtp/res/res_srtp.c Tue Sep  4 15:46:30 2012
@@ -451,6 +451,7 @@
 
 static int ast_srtp_replace(struct ast_srtp **srtp, struct ast_rtp_instance *rtp, struct ast_srtp_policy *policy)
 {
+	ast_debug(1, "Replacing SRTP policy\n");
 	if ((*srtp) != NULL) {
 		ast_srtp_destroy(*srtp);
 	}
@@ -521,7 +522,7 @@
 		if (ast_srtp_add_stream(srtp, match)) {
 			ast_log(LOG_WARNING, "Couldn't add stream\n");
 		} else if ((status = srtp_remove_stream(srtp->session, from_ssrc))) {
-			ast_debug(3, "Couldn't remove stream (%d)\n", status);
+			ast_debug(3, "Couldn't remove stream  %ud (%d)\n", from_ssrc, status);
 		}
 		ao2_t_ref(match, -1, "Unreffing found policy in change_source");
 	}