[svn-commits] file: trunk r190421 - /trunk/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Apr 24 08:49:03 2009
New Revision: 190421

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=190421
Log:
Fix nat setting on RTP instances.

(closes issue #14827)
Reported by: pj

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=190421&r1=190420&r2=190421
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Apr 24 08:49:03 2009
@@ -4817,6 +4817,8 @@
 
 	ast_rtp_instance_set_qos(dialog->rtp, global_tos_audio, 0, "SIP RTP");
 
+	do_setnat(dialog, ast_test_flag(&dialog->flags[0], SIP_NAT) & SIP_NAT_ROUTE);
+
 	return 0;
 }
 
@@ -4860,7 +4862,6 @@
 		ast_udptl_destroy(dialog->udptl);
 		dialog->udptl = NULL;
 	}
-	do_setnat(dialog, ast_test_flag(&dialog->flags[0], SIP_NAT) & SIP_NAT_ROUTE);
 
 	ast_string_field_set(dialog, engine, peer->engine);
 
@@ -4999,8 +5000,6 @@
 	if (dialog_initialize_rtp(dialog)) {
 		return -1;
 	}
-
-	do_setnat(dialog, ast_test_flag(&dialog->flags[0], SIP_NAT) & SIP_NAT_ROUTE);
 
 	ast_string_field_set(dialog, tohost, peername);