[svn-commits] oej: branch oej/pinedanish-copybridgeflags-1.6.0 r253709 - in /team/oej/pined...

[SVN commits to the Digium repositories]

Author: oej
Date: Mon Mar 22 05:48:08 2010
New Revision: 253709

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253709
Log:
Small updates

Modified:
    team/oej/pinedanish-copybridgeflags-1.6.0/   (props changed)
    team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c
    team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c
    team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c

Propchange: team/oej/pinedanish-copybridgeflags-1.6.0/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Modified: team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c?view=diff&rev=253709&r1=253708&r2=253709
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c Mon Mar 22 05:48:08 2010
@@ -2008,7 +2008,8 @@
 
 				ast_channel_setoption(chan, AST_OPTION_OPRMODE, &oprmode, sizeof(oprmode), 0);
 			}
-			ast_copy_flags(&peer->bridgeflags, &config.features_callee,
+			ast_debug(1, "--- Settings bridgeflags on %s\n", chan->name);
+			ast_copy_flags(&chan->bridgeflags, &config.features_callee,
 				AST_FEATURE_REDIRECT | AST_FEATURE_DISCONNECT |
 				AST_FEATURE_AUTOMON | AST_FEATURE_PARKCALL | AST_FEATURE_AUTOMIXMON);
 			res = ast_bridge_call(chan, peer, &config);

Modified: team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c?view=diff&rev=253709&r1=253708&r2=253709
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c Mon Mar 22 05:48:08 2010
@@ -295,6 +295,8 @@
 					/* Now, tell the owner's bridge that we had some interesting parameters in the bridge that
 					   will disappear soon, so that we don't drop them */
 					ast_queue_control_data(p->owner, AST_CONTROL_BRIDGEPARAM, &p->chan->bridgeflags, sizeof(p->chan->bridgeflags));
+					ast_debug(1, "----- Sending bridge flags from channel %s upstream\n", p->chan->name);
+					ast_debug(1, "----- We have these channels to play with: 1: %s 2: %s \n", p->chan->name, p->owner->name);
 					ast_channel_unlock(p->owner);
 				}
 				ast_channel_unlock(p->chan->_bridge);

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=253709&r1=253708&r2=253709
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c Mon Mar 22 05:48:08 2010
@@ -1734,7 +1734,7 @@
 		    !ast_strlen_zero(builtin_features[x].exten)) {
 			/* Feature is up for consideration */
 			if (!strcmp(builtin_features[x].exten, code)) {
-				ast_debug(3, "Feature detected: fname=%s sname=%s exten=%s\n", builtin_features[x].fname, builtin_features[x].sname, builtin_features[x].exten);
+				ast_debug(1, "Feature detected: fname=%s sname=%s exten=%s\n", builtin_features[x].fname, builtin_features[x].sname, builtin_features[x].exten);
 				if (operation) {
 					res = builtin_features[x].operation(chan, peer, config, code, sense, NULL);
 				}
@@ -2451,6 +2451,7 @@
 				if (ast_test_flag(param, AST_FEATURE_REDIRECT)) {
                                 	ast_set_flag(&(config->features_callee), AST_FEATURE_REDIRECT);
 					ast_debug(2, "--- Setting Transfer flag on callee in bridge! \n");
+					hasfeatures = 1;
 				}
 				if (ast_test_flag(param, AST_FEATURE_DISCONNECT))
                                 	ast_set_flag(&(config->features_callee), AST_FEATURE_DISCONNECT);
@@ -2460,7 +2461,7 @@
                                 	ast_set_flag(&(config->features_callee), AST_FEATURE_AUTOMIXMON);
 				if (ast_test_flag(param, AST_FEATURE_PARKCALL))
                                 	ast_set_flag(&(config->features_callee), AST_FEATURE_PARKCALL);
-				ast_debug(2, "--- Setting updated bridge flags from chan_local in this bridge for incoming channel %s\n", chan->name);
+				ast_debug(2, "--- Setting updated bridge flags from chan_local in this bridge for incoming channel %s Peer %s\n", chan->name, peer->name);
 				break;
 			case AST_CONTROL_OPTION:
 				aoh = f->data;
@@ -2495,6 +2496,7 @@
 			ast_frfree(f);
 			f = NULL;
 			config->feature_timer = backup_config.feature_timer;
+			ast_debug(2, "------ Trying to understand DTMF character and see if we can have some fun. Chan %s Peer %s\n", chan->name, peer->name);
 			res = ast_feature_interpret(chan, peer, config, featurecode, sense);
 			switch(res) {
 			case FEATURE_RETURN_PASSDIGITS: