From: Joshua Colp <jcolp@digium.com>
Date: Fri, 27 Mar 2009 13:22:32 +0000 (+0000)
Subject: Merged revisions 184566 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abbc2a348393c3c350e07e62b7be9e625f40d84c;p=thirdparty%2Fasterisk.git

Merged revisions 184566 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r184566 | file | 2009-03-27 10:15:26 -0300 (Fri, 27 Mar 2009) | 16 lines

  Merged revisions 184565 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r184565 | file | 2009-03-27 10:06:45 -0300 (Fri, 27 Mar 2009) | 9 lines

    Fix an issue where nat=yes would not always take effect for the RTP session on outgoing calls.

    If calls were placed using an IP address or hostname the global nat setting was copied over
    but was not set on the RTP session itself. This caused the RTP stack to not perform symmetric RTP
    actions.

    (closes issue #14546)
    Reported by: acunningham
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@184587 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6ca5940a69..464f9dd71b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4471,6 +4471,8 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer, struct sockadd
 		return res;
 	}
 
+	do_setnat(dialog, ast_test_flag(&dialog->flags[0], SIP_NAT) & SIP_NAT_ROUTE);
+
 	ast_string_field_set(dialog, tohost, peername);
 
 	/* Get the outbound proxy information */