Disable ICE support by default

Since there are a number of legacy devices out there that fail to handle ICE
candidates properly (which is a nice way of saying something much uglier),
disable it by default.

Support for ICE candidates can be enabled in rtp.conf using the icesupport
setting.
........

Merged revisions 374676 from http://svn.asterisk.org/svn/asterisk/branches/11

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374677 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/rtp.conf.sample b/configs/rtp.conf.sample
index 196e05e..c22acaa 100644 (file)
--- a/configs/rtp.conf.sample
+++ b/configs/rtp.conf.sample
@@ -33,8 +33,8 @@ rtpend=20000
 ; connected. This option is set to 4 by default.
 ; probation=8
 ;
-; Whether to enable or disable ICE support. This option is enabled by default.
-; icesupport=false
+; Whether to enable or disable ICE support. This option is disabled by default.
+; icesupport=true
 ;
 ; Hostname or address for the STUN server used when determining the external
 ; IP address and port an RTP session can be reached at. The port number is

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 25fd3d5..00f909f 100644 (file)
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -111,7 +111,7 @@ enum strict_rtp_state {
 };
 
 #define DEFAULT_STRICT_RTP STRICT_RTP_CLOSED
-#define DEFAULT_ICESUPPORT 1
+#define DEFAULT_ICESUPPORT 0
 
 extern struct ast_srtp_res *res_srtp;
 extern struct ast_srtp_policy_res *res_srtp_policy;