diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-20 23:08:45 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-20 23:08:45 +0000 |
| commit | e13cb3c32db308be26a733ebc93aabd911fb0d65 (patch) | |
| tree | 02a31a4137aa0e59038ec6ccea36ea4dc7b2b8eb /channels | |
| parent | 4c24c453cd50b0242849dd58f211b31dcb0544be (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@55688 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 0eb2c270c..08a33d887 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; |