[svn-commits] mjordan: trunk r374677 - in /trunk: ./ configs/ res/

[SVN commits to the Digium repositories]

Author: mjordan
Date: Mon Oct  8 15:39:26 2012
New Revision: 374677

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374677
Log:
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

Modified:
    trunk/   (props changed)
    trunk/configs/rtp.conf.sample
    trunk/res/res_rtp_asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/configs/rtp.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/rtp.conf.sample?view=diff&rev=374677&r1=374676&r2=374677
==============================================================================
--- trunk/configs/rtp.conf.sample (original)
+++ trunk/configs/rtp.conf.sample Mon Oct  8 15:39:26 2012
@@ -33,8 +33,8 @@
 ; 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

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=374677&r1=374676&r2=374677
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Mon Oct  8 15:39:26 2012
@@ -111,7 +111,7 @@
 };
 
 #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;