From: Olle Johansson <oej@edvina.net>
Date: Thu, 3 Sep 2009 14:48:51 +0000 (+0000)
Subject: Merged revisions 215891 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e59bc4a849d2999e8fef91b71c82d140156bef0;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@215932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 362019c609..c034774663 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))