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
1.4
Joshua Colp 19 years ago
parent 4f5689f95f
commit 49749e44a2

@ -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;

Loading…
Cancel
Save