diff options
| author | Jason Parker <jparker@digium.com> | 2010-09-07 22:23:32 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2010-09-07 22:23:32 +0000 |
| commit | dc7e1c61831e6c5cc8a5d5d5ce901213ee506497 (patch) | |
| tree | a27211a0bd1bdc212cdda704c33fe0c741c871be | |
| parent | 9b6fac435b75988037b8756fd0a1a2b0d15b14e6 (diff) | |
Merged revisions 285455 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r285455 | qwell | 2010-09-07 17:22:14 -0500 (Tue, 07 Sep 2010) | 8 lines
Don't automatically add domains for wildcard bindaddrs.
(closes issue #17832)
Reported by: oej
Patches:
17832-wildcard.diff uploaded by qwell (license 4)
Tested by: qwell
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 658462a25..5baf84429 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -27230,10 +27230,10 @@ static int reload_config(enum channelreloadreason reason) char temp[MAXHOSTNAMELEN]; /* First our default IP address */ - if (!ast_sockaddr_isnull(&bindaddr)) { + if (!ast_sockaddr_isnull(&bindaddr) && !ast_sockaddr_is_any(&bindaddr)) { add_sip_domain(ast_sockaddr_stringify_addr(&bindaddr), SIP_DOMAIN_AUTO, NULL); - } else if (!ast_sockaddr_isnull(&internip)) { + } else if (!ast_sockaddr_isnull(&internip) && !ast_sockaddr_is_any(&internip)) { /* Our internal IP address, if configured */ add_sip_domain(ast_sockaddr_stringify_addr(&internip), SIP_DOMAIN_AUTO, NULL); |