diff options
| author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 20:33:22 +0000 |
|---|---|---|
| committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 20:33:22 +0000 |
| commit | 808bfbab2b0aba6f110b9085c0c0c9d0173f88b4 (patch) | |
| tree | 35150c76e28df0a8c884e6f9273879b114aa9272 /channels | |
| parent | 5e846e20b2a63dd0d9571787746e35e91a904358 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@133197 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 1 insertions, 2 deletions
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); |