From a9194d288e6ae83dec90a1dd78148b83fdf70f3d Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 14 Apr 2009 13:18:10 +0000 Subject: [PATCH] Merged revisions 188247 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r188247 | file | 2009-04-14 10:14:21 -0300 (Tue, 14 Apr 2009) | 7 lines Fix a bug with the change I made yesterday to outbound proxy support. Per discussion with oej on IRC we need the actual IP address, not the outbound proxy IP address, in the sa field. Upon further inspection this should make the behaviour of all other uses of the outbound proxy in the code. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@188254 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 373841841d..791e7e547d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4485,11 +4485,7 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer, struct sockadd /* Get the outbound proxy information */ ref_proxy(dialog, obproxy_get(dialog, NULL)); - 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) { + if (sin) { /* This address should be updated using dnsmgr */ memcpy(&dialog->sa.sin_addr, &sin->sin_addr, sizeof(dialog->sa.sin_addr)); if (!sin->sin_port) { -- 2.47.2