From: Joshua Colp Date: Mon, 13 Apr 2009 16:32:34 +0000 (+0000) Subject: Merged revisions 188067 via svnmerge from X-Git-Tag: 1.6.1.0-rc5~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fff7b320c9a3b6557bf84726148a7f2c242cadca;p=thirdparty%2Fasterisk.git Merged revisions 188067 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r188067 | file | 2009-04-13 13:28:06 -0300 (Mon, 13 Apr 2009) | 10 lines Fix a bug where using an outbound proxy would cause the local address to be 127.0.0.1. Copy the outbound proxy IP address into the SIP dialog structure as the IP address we will be sending to. This has to be done because the logic that determines what local IP address to use in the SIP messages is not aware of an outbound proxy being in place. It only knows what IP address we are sending to. (closes issue #12006) Reported by: mnicholson ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@188069 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1ed89df55d..373841841d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4488,6 +4488,7 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer, struct sockadd if (dialog->outboundproxy) { /* If we have an outbound proxy, don't bother with DNS resolution at all, but set the port */ portno = port ? atoi(port) : (dialog->socket.type & SIP_TRANSPORT_TLS) ? STANDARD_TLS_PORT : STANDARD_SIP_PORT; + memcpy(&dialog->sa.sin_addr, &dialog->outboundproxy->ip.sin_addr, sizeof(dialog->sa.sin_addr)); } else if (sin) { /* This address should be updated using dnsmgr */ memcpy(&dialog->sa.sin_addr, &sin->sin_addr, sizeof(dialog->sa.sin_addr));