From 3faa4aa4e02f608dd8945a70838b47a241079aea Mon Sep 17 00:00:00 2001 From: Brett Bryant Date: Wed, 23 Jul 2008 20:33:22 +0000 Subject: 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. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@133197 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'channels/chan_sip.c') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d867de97c..0789c2f6b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13481,7 +13481,7 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_ 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 @@ 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; /* Default: Enable TCP sessions */ default_tls_cfg.enabled = FALSE; /* Default: Disable TLS */ sip_tcp_desc.sin.sin_port = htons(STANDARD_SIP_PORT); -- cgit v1.2.3