summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2011-09-21 09:06:22 +0000
committerOlle Johansson <oej@edvina.net>2011-09-21 09:06:22 +0000
commit2ae7ae00c804936dbc5c8b391398dc0a2933ce4e (patch)
tree07a0272b5ca1d7224f4e5cdec3bf00950802251b
parente218748ac1ef5158b110e7549152ab11e1418273 (diff)
Merged revisions 337178 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ........ 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
-rw-r--r--CHANGES5
-rw-r--r--configs/rtp.conf.sample2
-rw-r--r--res/res_rtp_asterisk.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 9aa178cfa..32b2719b9 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 224dc2abe..6609530c1 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 f4e8299bd..4621d2cc6 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);