[svn-commits] bbryant: branch 1.6.0 r133218 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Wed Jul 23 15:39:37 2008
New Revision: 133218

URL: http://svn.digium.com/view/asterisk?view=rev&rev=133218
Log:
Merged revisions 133197 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r133197 | bbryant | 2008-07-23 15:33:22 -0500 (Wed, 23 Jul 2008) | 2 lines

Fix issue where tcp in sip is enabled by default, despite what it says in the config sample file. Also fix "sip show settings" for tcp connections.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=133218&r1=133217&r2=133218
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Jul 23 15:39:37 2008
@@ -13011,7 +13011,7 @@
 	ast_cli(a->fd, "  UDP SIP Port:           %d\n", ntohs(bindaddr.sin_port));
 	ast_cli(a->fd, "  UDP Bindaddress:        %s\n", ast_inet_ntoa(bindaddr.sin_addr));
 	ast_cli(a->fd, "  TCP SIP Port:           ");
-	if (sip_tcp_desc.sin.sin_family != AF_INET) {
+	if (sip_tcp_desc.sin.sin_family == AF_INET) {
 		ast_cli(a->fd, "%d\n", ntohs(sip_tcp_desc.sin.sin_port));
 		ast_cli(a->fd, "  TCP Bindaddress:        %s\n", ast_inet_ntoa(sip_tcp_desc.sin.sin_addr));
 	} else {
@@ -20619,9 +20619,7 @@
 	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; Disabled, since TCP support in Asterisk is experimental */
-	sip_tcp_desc.sin.sin_family = 0;
-	default_tls_cfg.enabled = FALSE;
+	default_tls_cfg.enabled = FALSE;		/* Default: Disable TLS */
 
 	sip_tcp_desc.sin.sin_port = htons(STANDARD_SIP_PORT);
 	sip_tls_desc.sin.sin_port = htons(STANDARD_TLS_PORT);