From: Joshua Colp <jcolp@digium.com>
Date: Tue, 20 Feb 2007 23:08:45 +0000 (+0000)
Subject: Don't test our own address against the localnet settings. At least one person has... 
X-Git-Tag: 1.4.1~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49749e44a2a74ba0b2dbe1a1ca7d560f397dc993;p=thirdparty%2Fasterisk.git

Don't test our own address against the localnet settings. At least one person has had issues as a result of this from #7051 so I'm reversing it. (issue #8821 reported by kokoskarokoska)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@55688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0eb2c270c5..08a33d8876 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1771,16 +1771,14 @@ static void build_via(struct sip_pvt *p)
  */
 static enum sip_result ast_sip_ouraddrfor(struct in_addr *them, struct in_addr *us)
 {
-	struct sockaddr_in theirs, ours;
+	struct sockaddr_in theirs;
 
 	/* Get our local information */
 	ast_ouraddrfor(them, us);
 	theirs.sin_addr = *them;
-	ours.sin_addr = *us;
 
 	if (localaddr && externip.sin_addr.s_addr &&
-	    ast_apply_ha(localaddr, &theirs) &&
-	    !ast_apply_ha(localaddr, &ours)) {
+	    ast_apply_ha(localaddr, &theirs)) {
 		if (externexpire && time(NULL) >= externexpire) {
 			struct ast_hostent ahp;
 			struct hostent *hp;