[asterisk-commits] mmichelson: trunk r427335 - in /trunk: ./ configs/samples/ res/ res/res_pjsip/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Nov  5 13:53:29 2014
New Revision: 427335

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427335
Log:
Make the disable_tcp_switch PJSIP system object enabled by default.

Testing has shown repeatedly that PJSIP's default behavior of switching
automatically to TCP for large messages can cause issues. The most common
issues are that devices that we are communicating with do not handle the
switch to TCP gracefully, thus causing situations such as broken calls or
broken subscriptions. Now, in order to have this behavior happen, you must
opt into it. The sample file has been updated to warn that enabling the
TCP switch behavior may cause issues for you, so use at your own risk.
........

Merged revisions 427334 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/configs/samples/pjsip.conf.sample
    trunk/res/res_pjsip.c
    trunk/res/res_pjsip/config_system.c

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

Modified: trunk/configs/samples/pjsip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/samples/pjsip.conf.sample?view=diff&rev=427335&r1=427334&r2=427335
==============================================================================
--- trunk/configs/samples/pjsip.conf.sample (original)
+++ trunk/configs/samples/pjsip.conf.sample Wed Nov  5 13:53:29 2014
@@ -837,10 +837,12 @@
                                 ; should be disposed of (default: "60")
 ;threadpool_max_size=0  ; Maximum number of threads in the res_pjsip threadpool
                         ; A value of 0 indicates no maximum (default: "0")
-;disable_tcp_switch=no  ; Disable automatic switching from UDP to TCP transports
+;disable_tcp_switch=yes ; Disable automatic switching from UDP to TCP transports
                         ; if outgoing request is too large.
                         ; See RFC 3261 section 18.1.1.
-                        ; (default: "no")
+						; Disabling this option has been known to cause interoperability
+						; issues, so disable at your own risk.
+                        ; (default: "yes")
 ;type=  ; Must be of type system (default: "")
 
 ;==========================GLOBAL SECTION OPTIONS=========================

Modified: trunk/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=427335&r1=427334&r2=427335
==============================================================================
--- trunk/res/res_pjsip.c (original)
+++ trunk/res/res_pjsip.c Wed Nov  5 13:53:29 2014
@@ -1143,7 +1143,7 @@
 					<synopsis>Maximum number of threads in the res_pjsip threadpool.
 					A value of 0 indicates no maximum.</synopsis>
 				</configOption>
-				<configOption name="disable_tcp_switch" default="no">
+				<configOption name="disable_tcp_switch" default="yes">
 					<synopsis>Disable automatic switching from UDP to TCP transports.</synopsis>
 					<description><para>
 						Disable automatic switching from UDP to TCP transports if outgoing

Modified: trunk/res/res_pjsip/config_system.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/config_system.c?view=diff&rev=427335&r1=427334&r2=427335
==============================================================================
--- trunk/res/res_pjsip/config_system.c (original)
+++ trunk/res/res_pjsip/config_system.c Wed Nov  5 13:53:29 2014
@@ -147,7 +147,7 @@
 			OPT_UINT_T, 0, FLDSET(struct system_config, threadpool.idle_timeout));
 	ast_sorcery_object_field_register(system_sorcery, "system", "threadpool_max_size", "0",
 			OPT_UINT_T, 0, FLDSET(struct system_config, threadpool.max_size));
-	ast_sorcery_object_field_register(system_sorcery, "system", "disable_tcp_switch", "no",
+	ast_sorcery_object_field_register(system_sorcery, "system", "disable_tcp_switch", "yes",
 			OPT_BOOL_T, 1, FLDSET(struct system_config, disable_tcp_switch));
 
 	ast_sorcery_load(system_sorcery);