[asterisk-commits] oej: branch oej/obproxy r184908 - in /team/oej/obproxy: ./ apps/ channels/

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Mar 30 01:18:15 2009
New Revision: 184908

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184908
Log:
Reset automerge

Modified:
    team/oej/obproxy/   (props changed)
    team/oej/obproxy/apps/app_followme.c
    team/oej/obproxy/channels/chan_sip.c

Propchange: team/oej/obproxy/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/obproxy/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 30 01:18:15 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-184475
+/branches/1.4:1-184907

Modified: team/oej/obproxy/apps/app_followme.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/obproxy/apps/app_followme.c?view=diff&rev=184908&r1=184907&r2=184908
==============================================================================
--- team/oej/obproxy/apps/app_followme.c (original)
+++ team/oej/obproxy/apps/app_followme.c Mon Mar 30 01:18:15 2009
@@ -942,7 +942,7 @@
 
 static int app_exec(struct ast_channel *chan, void *data)
 {
-	struct fm_args targs;
+	struct fm_args targs = { 0, };
 	struct ast_bridge_config config;
 	struct call_followme *f;
 	struct number *nm, *newnm;

Modified: team/oej/obproxy/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/obproxy/channels/chan_sip.c?view=diff&rev=184908&r1=184907&r2=184908
==============================================================================
--- team/oej/obproxy/channels/chan_sip.c (original)
+++ team/oej/obproxy/channels/chan_sip.c Mon Mar 30 01:18:15 2009
@@ -3042,6 +3042,9 @@
 		ASTOBJ_UNREF(p, sip_destroy_peer);
 		return res;
 	}
+
+	do_setnat(dialog, ast_test_flag(&dialog->flags[0], SIP_NAT) & SIP_NAT_ROUTE);
+
 	ast_string_field_set(dialog, tohost, peer);
 
 	/* Get the outbound proxy information */