diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 14:48:51 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 14:48:51 +0000 |
| commit | 6db835bab14425528512d2f5e678bc498760af8a (patch) | |
| tree | 324160bac38915754fd2027123c4ef61c10e12a9 /channels | |
| parent | a8e1914e7265e720e07e0f357fa5861684c2ee31 (diff) | |
Merged revisions 215891 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r215891 | oej | 2009-09-03 15:02:41 +0200 (Tor, 03 Sep 2009) | 10 lines
Add known internal IP address when autodomain=yes
(closes issue #14573)
Reported by: pj
Patches:
sip-internip-autodomain1.diff uploaded by mnicholson (license 96)
modified by oej
Tested by: pj
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@215932 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 362019c60..c03477466 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -23348,10 +23348,14 @@ static int reload_config(enum channelreloadreason reason) char temp[MAXHOSTNAMELEN]; /* First our default IP address */ - if (bindaddr.sin_addr.s_addr) + if (bindaddr.sin_addr.s_addr) { add_sip_domain(ast_inet_ntoa(bindaddr.sin_addr), SIP_DOMAIN_AUTO, NULL); - else + } else if (internip.sin_addr.s_addr) { + /* Our internal IP address, if configured */ + add_sip_domain(ast_inet_ntoa(internip.sin_addr), SIP_DOMAIN_AUTO, NULL); + } else { ast_log(LOG_NOTICE, "Can't add wildcard IP address to domain list, please add IP address to domain manually.\n"); + } /* If TCP is running on a different IP than UDP, then add it too */ if (sip_tcp_desc.local_address.sin_addr.s_addr && !inaddrcmp(&bindaddr, &sip_tcp_desc.local_address)) |