[asterisk-commits] oej: branch oej/pinedanish-copybridgeflags-1.8 r335254 - in /team/oej/pinedan...

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Sep 12 04:00:25 2011
New Revision: 335254

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335254
Log:
Varioius fixes

Modified:
    team/oej/pinedanish-copybridgeflags-1.8/   (props changed)
    team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/frame.h
    team/oej/pinedanish-copybridgeflags-1.8/main/features.c

Propchange: team/oej/pinedanish-copybridgeflags-1.8/
------------------------------------------------------------------------------
    automerge = Is-there-life-off-net?

Modified: team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/frame.h
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/frame.h?view=diff&rev=335254&r1=335253&r2=335254
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/frame.h (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/frame.h Mon Sep 12 04:00:25 2011
@@ -335,7 +335,7 @@
 	AST_CONTROL_READ_ACTION = 27,	/*!< Tell ast_read to take a specific action */
 	AST_CONTROL_AOC = 28,			/*!< Advice of Charge with encoded generic AOC payload */
 	AST_CONTROL_END_OF_Q = 29,		/*!< Indicate that this position was the end of the channel queue for a softhangup. */
-	AST_CONTROL_BRIDGEPARAM = 26,   /*!< Bridge parameter update after masquerade */
+	AST_CONTROL_BRIDGEPARAM = 30,   /*!< Bridge parameter update after masquerade */
 };
 
 enum ast_frame_read_action {

Modified: team/oej/pinedanish-copybridgeflags-1.8/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/main/features.c?view=diff&rev=335254&r1=335253&r2=335254
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/main/features.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/main/features.c Mon Sep 12 04:00:25 2011
@@ -3992,7 +3992,7 @@
 			case AST_CONTROL_BRIDGEPARAM:
 				/* We are getting an bridge update from chan_local before masquerade, update this bridge with the params */
 				/* We want to update the peer side, the outbound channel, with it */
-				message_upstream = (struct ast_bridgeflags_envelope *) f->data;
+				message_upstream = (struct ast_bridgeflags_envelope *) f->data.ptr;
 				ast_debug(1, "--- Received bridge parameters sent from %s\n", message_upstream->secretmessage);
 				
 				/* First set the calle side of things */
@@ -4015,12 +4015,6 @@
 					AST_FEATURE_AUTOMON | AST_FEATURE_PARKCALL | AST_FEATURE_AUTOMIXMON);
 				ast_debug(2, "--- Setting bridgeflags on %s\n", peer->name);
 				ast_copy_flags(&peer->bridgeflags, &(config->features_caller),
-					AST_FEATURE_REDIRECT | AST_FEATURE_DISCONNECT |
-					AST_FEATURE_AUTOMON | AST_FEATURE_PARKCALL | AST_FEATURE_AUTOMIXMON);
-				ast_copy_flags(&(backup_config.features_caller), &(config->features_caller),
-					AST_FEATURE_REDIRECT | AST_FEATURE_DISCONNECT |
-					AST_FEATURE_AUTOMON | AST_FEATURE_PARKCALL | AST_FEATURE_AUTOMIXMON);
-				ast_copy_flags(&(backup_config.features_callee), &(config->features_callee),
 					AST_FEATURE_REDIRECT | AST_FEATURE_DISCONNECT |
 					AST_FEATURE_AUTOMON | AST_FEATURE_PARKCALL | AST_FEATURE_AUTOMIXMON);
 				set_config_flags(chan, peer, config);