From 2ae7ae00c804936dbc5c8b391398dc0a2933ce4e Mon Sep 17 00:00:00 2001
From: Olle Johansson <oej@edvina.net>
Date: Wed, 21 Sep 2011 09:06:22 +0000
Subject: [PATCH] Merged revisions 337178 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r337178 | oej | 2011-09-21 10:51:41 +0200 (Ons, 21 Sep 2011) | 14 lines

  Change strictrtp option to default to yes in the RTP module

  Suggested by Kapejod on Facebook

  Review: https://reviewboard.asterisk.org/r/1448/
  (closes issue ASTERISK-18587)

  Thanks for quick feedback to kpfleming and Tilghman
  --Denna och nedanstående rader kommer inte med i loggmeddelandet--

  M    CHANGES
  M    configs/rtp.conf.sample
  M    res/res_rtp_asterisk.c
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337179 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 CHANGES                 | 5 +++++
 configs/rtp.conf.sample | 2 +-
 res/res_rtp_asterisk.c  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9aa178cfa0..32b2719b92 100644
--- a/CHANGES
+++ b/CHANGES
@@ -252,6 +252,11 @@ IAX2 Changes
 * authdebug is now disabled by default. To enable this functionaility again
    set authdebug = yes in iax.conf.
 
+RTP Changes
+-----------
+ * The rtp.conf setting "strictrtp" is now enabled by default. In previous
+   releases it was disabled.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
 ------------------------------------------------------------------------------
diff --git a/configs/rtp.conf.sample b/configs/rtp.conf.sample
index 224dc2abe2..6609530c1b 100644
--- a/configs/rtp.conf.sample
+++ b/configs/rtp.conf.sample
@@ -23,5 +23,5 @@ rtpend=20000
 ;
 ; Enable strict RTP protection. This will drop RTP packets that
 ; do not come from the source of the RTP stream. This option is
-; disabled by default.
+; enabled by default.
 ; strictrtp=yes
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index f4e8299bde..4621d2cc6e 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -2829,7 +2829,7 @@ static int rtp_reload(int reload)
 	rtpstart = DEFAULT_RTP_START;
 	rtpend = DEFAULT_RTP_END;
 	dtmftimeout = DEFAULT_DTMF_TIMEOUT;
-	strictrtp = STRICT_RTP_OPEN;
+	strictrtp = STRICT_RTP_CLOSED;
 	if (cfg) {
 		if ((s = ast_variable_retrieve(cfg, "general", "rtpstart"))) {
 			rtpstart = atoi(s);
-- 
GitLab