[svn-commits] oej: branch oej/teapot-1.8 r417794 - in /team/oej/teapot-1.8: channels/ patches/

[SVN commits to the Digium repositories]

Author: oej
Date: Thu Jul  3 01:41:18 2014
New Revision: 417794

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=417794
Log:
Trying to accept offers with SDES crypto keys attached to a RTP/AVP offer (non-crypto)
This is a test. Don't do this at home. Not yet, anyway.

See issue ASTERISK-23989

Added:
    team/oej/teapot-1.8/patches/sdes-rtp-avp.diff   (with props)
Modified:
    team/oej/teapot-1.8/channels/chan_sip.c

Modified: team/oej/teapot-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/channels/chan_sip.c?view=diff&rev=417794&r1=417793&r2=417794
==============================================================================
--- team/oej/teapot-1.8/channels/chan_sip.c (original)
+++ team/oej/teapot-1.8/channels/chan_sip.c Thu Jul  3 01:41:18 2014
@@ -9621,7 +9621,7 @@
 				if (audio) {
 					if (process_sdp_a_sendonly(value, &sendonly)) {
 						processed = TRUE;
-					} else if (!processed_crypto && process_crypto(p, p->rtp, &p->srtp, value)) {
+					} else if (secure_audio && !processed_crypto && process_crypto(p, p->rtp, &p->srtp, value)) {
 						processed_crypto = TRUE;
 						processed = TRUE;
 					} else if (process_sdp_a_audio(value, p, &newaudiortp, &last_rtpmap_codec)) {

Added: team/oej/teapot-1.8/patches/sdes-rtp-avp.diff
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/patches/sdes-rtp-avp.diff?view=auto&rev=417794
==============================================================================
--- team/oej/teapot-1.8/patches/sdes-rtp-avp.diff (added)
+++ team/oej/teapot-1.8/patches/sdes-rtp-avp.diff Thu Jul  3 01:41:18 2014
@@ -1,0 +1,13 @@
+Index: channels/chan_sip.c
+===================================================================
+--- channels/chan_sip.c	(revision 417744)
++++ channels/chan_sip.c	(working copy)
+@@ -9603,7 +9603,7 @@
+ 				if (audio) {
+ 					if (process_sdp_a_sendonly(value, &sendonly)) {
+ 						processed = TRUE;
+-					} else if (!processed_crypto && process_crypto(p, p->rtp, &p->srtp, value)) {
++					} else if (secure_audio && !processed_crypto && process_crypto(p, p->rtp, &p->srtp, value)) {
+ 						processed_crypto = TRUE;
+ 						processed = TRUE;
+ 					} else if (process_sdp_a_audio(value, p, &newaudiortp, &last_rtpmap_codec)) {

Propchange: team/oej/teapot-1.8/patches/sdes-rtp-avp.diff
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/oej/teapot-1.8/patches/sdes-rtp-avp.diff
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/oej/teapot-1.8/patches/sdes-rtp-avp.diff
------------------------------------------------------------------------------
    svn:mime-type = text/plain