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 6ca5940a69f80126a773efab98966ea38bea7dc7..464f9dd71b943f7d54121b94a1e3fa60af4b6503 100644 (file)
--- 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 */