Merged revisions 128237 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r128237 | oej | 2008-07-05 22:39:54 +0200 (Lör, 05 Jul 2008) | 2 lines

Make TCP disabled by default (it's considered experimental)

........


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

channels/chan_sip.c

@@ -20285,7 +20285,9 @@ static int reload_config(enum channelreloadreason reason)
 	memset(&sip_tcp_desc.sin, 0, sizeof(sip_tcp_desc.sin));
 	memset(&sip_tls_desc.sin, 0, sizeof(sip_tls_desc.sin));
 
-	sip_tcp_desc.sin.sin_family = AF_INET;
+	/* sip_tcp_desc.sin.sin_family = AF_INET; Disabled, since TCP support in Asterisk is experimental */
+	sip_tcp_desc.sin.sin_family = 0;
+	default_tls_cfg.enabled = FALSE;
 
 	sip_tcp_desc.sin.sin_port = htons(STANDARD_SIP_PORT);
 	sip_tls_desc.sin.sin_port = htons(STANDARD_TLS_PORT);

configs/sip.conf.sample

@@ -75,9 +75,10 @@ allowoverlap=no			; Disable overlap dialing support. (Default is yes)
 				; asterisk.conf, it defaults to that system name
 				; Realms MUST be globally unique according to RFC 3261
 				; Set this to your host name or domain name
-bindport=5060			; UDP Port to bind to (SIP standard port is 5060)
+bindport=5060			; UDP Port to bind to (SIP standard port for unencrypted UDP 
+				; and TCP sessions is 5060)
 				; bindport is the local UDP port that Asterisk will listen on
-bindaddr=0.0.0.0		; IP address to bind to (0.0.0.0 binds to all)
+bindaddr=0.0.0.0		; IP address to bind UDP listen socket to (0.0.0.0 binds to all)
 
 ;
 ; Note that the TCP and TLS support for chan_sip is currently considered
@@ -85,7 +86,7 @@ bindaddr=0.0.0.0		; IP address to bind to (0.0.0.0 binds to all)
 ; subject to change in any release.  If they are changed, the changes will
 ; be reflected in this sample configuration file, as well as in the UPGRADE.txt file.
 ;
-tcpenable=yes                   ; Enable server for incoming TCP connections (default is yes)
+tcpenable=no                    ; Enable server for incoming TCP connections (default is yes)
 tcpbindaddr=0.0.0.0	        ; IP address for TCP server to bind to (0.0.0.0 binds to all interfaces)
                                 ; Optionally add a port number, 192.168.1.1:5062 (default is port 5060)