diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-14 13:18:10 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-14 13:18:10 +0000 |
| commit | f6ea6b1e923972f415d9f07ddd45dd5ff9790bcd (patch) | |
| tree | bb378fce082b3732137f81bacc59db64a953a437 | |
| parent | a43b9a8453ebbf9148f4ec436731271ad160d4c2 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@188254 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 373841841..791e7e547 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) { |