[asterisk-commits] oej: branch oej/pinedanish-copybridgeflags-1.6.0 r313099 - /team/oej/pinedani...

[SVN commits to the Asterisk project]

Author: oej
Date: Fri Apr  8 06:57:20 2011
New Revision: 313099

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=313099
Log:
Copy flags to proper call leg, stupid. And be nice, idiot. It's Friday after all.

Modified:
    team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c

Modified: team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c?view=diff&rev=313099&r1=313098&r2=313099
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c Fri Apr  8 06:57:20 2011
@@ -2485,13 +2485,13 @@
 				
 				/* First set the calle side of things */
 				ast_debug(2, "--- Checking callee bridgeflags on %s\n", chan->name);
-				bridge_set_feature_flags(&config->features_callee, &message_upstream->chan_bridgeflags);
+				bridge_set_feature_flags(&config->features_callee, &message_upstream->peer_bridgeflags);
 				if (ast_test_flag(&(message_upstream->chan_bridgeflags), AST_FEATURE_PARKCALL | AST_FEATURE_DISCONNECT | AST_FEATURE_AUTOMON | AST_FEATURE_AUTOMIXMON | AST_FEATURE_PARKCALL)) {
 					ast_debug(2, "--- Got flags for callee! (%s) \n", chan->name);
 					ast_set_flag(config, AST_BRIDGE_DTMF_CHANNEL_1);
 				}
 				ast_debug(2, "--- Checking caller bridgeflags on %s\n", peer->name);
-				bridge_set_feature_flags(&config->features_caller, &message_upstream->peer_bridgeflags);
+				bridge_set_feature_flags(&config->features_caller, &message_upstream->chan_bridgeflags);
 				if (ast_test_flag(&(message_upstream->peer_bridgeflags), AST_FEATURE_PARKCALL | AST_FEATURE_DISCONNECT | AST_FEATURE_AUTOMON | AST_FEATURE_AUTOMIXMON | AST_FEATURE_PARKCALL)) {
 					ast_debug(2, "--- Got flags for caller! (%s)\n", peer->name);
 					ast_set_flag(config, AST_BRIDGE_DTMF_CHANNEL_0);