[asterisk-commits] rmudgett: branch rmudgett/bridge_phase r386135 - in /team/rmudgett/bridge_pha...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Apr 19 12:01:18 2013
New Revision: 386135

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=386135
Log:
Update some documentation for dynamic features resulting from the basic bridge class.

Modified:
    team/rmudgett/bridge_phase/UPGRADE.txt
    team/rmudgett/bridge_phase/configs/features.conf.sample
    team/rmudgett/bridge_phase/main/features.c

Modified: team/rmudgett/bridge_phase/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/UPGRADE.txt?view=diff&rev=386135&r1=386134&r2=386135
==============================================================================
--- team/rmudgett/bridge_phase/UPGRADE.txt (original)
+++ team/rmudgett/bridge_phase/UPGRADE.txt Fri Apr 19 12:01:18 2013
@@ -80,6 +80,12 @@
  - BRIDGE_FEATURES channel variable is now casesensitive for feature letter codes.
    Uppercase variants apply them to the calling party while lowercase variants
    apply them to the called party.
+
+Features:
+ - The features.conf [applicationmap] <FeatureName>  ActivatedBy option is
+   no longer honored.  The feature is activated by which channel
+   DYNAMIC_FEATURES includes the feature is on.  Use predial to set different
+   values of DYNAMIC_FEATURES on the channels
 
 From 10 to 11:
 

Modified: team/rmudgett/bridge_phase/configs/features.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/configs/features.conf.sample?view=diff&rev=386135&r1=386134&r2=386135
==============================================================================
--- team/rmudgett/bridge_phase/configs/features.conf.sample (original)
+++ team/rmudgett/bridge_phase/configs/features.conf.sample Fri Apr 19 12:01:18 2013
@@ -176,13 +176,10 @@
 ;                   application on the same channel that activated the feature. "peer"
 ;                   means run the application on the opposite channel from the one that
 ;                   has activated the feature.
-;  ActivatedBy   -> This is which channel is allowed to activate this feature. Valid
-;                   values are "caller", "callee", and "both". "both" is the default.
-;                   The "caller" is the channel that executed the Dial application, while
-;                   the "callee" is the channel called by the Dial application.
-;BUGBUG ActivatedBy is no longer going to be honored.
-; It will only apply to the channel DYNAMIC_FEATURES is on.
-; Use predial to set different values of DYNAMIC_FEATURES on the channels.
+;  ActivatedBy   -> ActivatedBy is no longer honored.  The feature is activated by which
+;                   channel DYNAMIC_FEATURES includes the feature is on.  Use predial
+;                   to set different values of DYNAMIC_FEATURES on the channels.
+;                   Historic values are: "caller", "callee", and "both".
 ;  Application   -> This is the application to execute.
 ;  AppArguments  -> These are the arguments to be passed into the application.  If you need
 ;                   commas in your arguments, you should use either the second or third
@@ -197,8 +194,9 @@
 ;   applications. When applications are used in extensions.conf, they are executed
 ;   by the PBX core. In this case, these applications are executed outside of the
 ;   PBX core, so it does *not* make sense to use any application which has any
-;   concept of dialplan flow. Examples of this would be things like Macro, Goto,
-;   Background, WaitExten, and many more.
+;   concept of dialplan flow. Examples of this would be things like Goto,
+;   Background, WaitExten, and many more.  The exceptions to this are Gosub and
+;   Macro routines which must complete for the call to continue.
 ;
 ; Enabling these features means that the PBX needs to stay in the media flow and
 ; media will not be re-directed if DTMF is sent in the media stream.

Modified: team/rmudgett/bridge_phase/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/features.c?view=diff&rev=386135&r1=386134&r2=386135
==============================================================================
--- team/rmudgett/bridge_phase/main/features.c (original)
+++ team/rmudgett/bridge_phase/main/features.c Fri Apr 19 12:01:18 2013
@@ -4379,6 +4379,13 @@
 		run_it = ast_bridge_channel_run_app;
 	}
 
+/*
+ * BUGBUG need to pass to run_it the triggering channel name so DYNAMIC_WHO_TRIGGERED can be set on the channel when it is run.
+ *
+ * This would replace DYNAMIC_PEERNAME which is redundant with
+ * BRIDGEPEER anyway.  The value of DYNAMIC_WHO_TRIGGERED is
+ * really useful in the case of a multi-party bridge.
+ */
 	run_it(bridge_channel, pvt->app_name,
 		pvt->app_args_offset ? &pvt->app_name[pvt->app_args_offset] : NULL,
 		pvt->moh_offset ? &pvt->app_name[pvt->moh_offset] : NULL);
@@ -4456,6 +4463,7 @@
 		return 0;
 	}
 
+/* BUGBUG need to pass to add_dynamic_dtmf_hook the applicationmap name (feature->sname) so the DYNAMIC_FEATURENAME can be set on the channel when it is run. */
 	res = 0;
 	while ((tok = strsep(&dynamic_features, "#"))) {
 		struct feature_group *fg;
@@ -6041,6 +6049,10 @@
 		return;
 	}
 
+	/*
+	 * We will parse and require correct syntax for the ActivatedBy
+	 * option, but the ActivatedBy option is not honored anymore.
+	 */
 	if (ast_strlen_zero(args.activatedby)) {
 		ast_set_flag(feature, AST_FEATURE_FLAG_BYBOTH);
 	} else if (!strcasecmp(args.activatedby, "caller")) {