From 6db835bab14425528512d2f5e678bc498760af8a Mon Sep 17 00:00:00 2001 From: oej Date: Thu, 3 Sep 2009 14:48:51 +0000 Subject: 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 --- channels/chan_sip.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'channels') 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)) -- cgit v1.2.3