[svn-commits] bbryant: trunk r133197 - /trunk/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Wed Jul 23 15:33:22 2008
New Revision: 133197

URL: http://svn.digium.com/view/asterisk?view=rev&rev=133197
Log:
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:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=133197&r1=133196&r2=133197
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jul 23 15:33:22 2008
@@ -13481,7 +13481,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 {
@@ -21084,7 +21084,6 @@
 	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;		/* Default: Enable TCP sessions */
 	default_tls_cfg.enabled = FALSE;		/* Default: Disable TLS */
 
 	sip_tcp_desc.sin.sin_port = htons(STANDARD_SIP_PORT);