From 8e1fa41e24b87d7a48d057ef92287aab44058399 Mon Sep 17 00:00:00 2001 From: russell Date: Fri, 9 Jul 2010 22:01:01 +0000 Subject: Merged revisions 275424 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r275424 | russell | 2010-07-09 16:57:21 -0500 (Fri, 09 Jul 2010) | 27 lines Fix some issues related to dynamic feature groups in features.conf. The bridge handling code did not properly consider feature groups when setting parameters that would affect whether or not a native bridge would be attempted. If DYNAMIC_FEATURES only include a feature group, a native bridge would occur that may prevent features from working. Fix a bug in verbose output that would show the key mapping as empty if it was using the default mapping and not a custom mapping in the feature group. Add feature groups to the output of "features show". Adjust the feature execution logic to match that of the logic when executing a feature that was not configured through a feature group. Update features.conf.sample to show that an '=' is still required if using the default key mapping from [applicationmap]. Finally, clean up a little bit of formatting to better coform to coding guidelines while in the area. (closes issue #17589) Reported by: lmadsen Patches: issue_17589.rev4.txt uploaded by russell (license 2) Tested by: russell, lmadsen ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275425 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/features.conf.sample | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'configs') diff --git a/configs/features.conf.sample b/configs/features.conf.sample index 9d6fa43d6..f70185035 100644 --- a/configs/features.conf.sample +++ b/configs/features.conf.sample @@ -92,6 +92,7 @@ context => parkedcalls ; Which context parked calls are in (default parking lot ; => ,[/],[,[,MOH_Class]] ; => ,[/],[,""[,MOH_Class]] ; => ,[/],([])[,MOH_Class] + ; ; FeatureName -> This is the name of the feature used in when setting the ; DYNAMIC_FEATURES variable to enable usage of this feature. @@ -139,11 +140,13 @@ context => parkedcalls ; Which context parked calls are in (default parking lot ;unpauseMonitor => #3,self/callee,UnPauseMonitor ;Allow the callee to unpause monitoring ; ;on their channel -; GROUPS -; Groups are groupings of features defined in [applicationmap] -; that can have their own key mappings. +; Dynamic Feature Groups: +; Dynamic feature groups are groupings of features defined in [applicationmap] +; that can have their own custom key mappings. To give a channel access to a dynamic +; feature group, add the group name to the value of the DYNAMIC_FEATURES variable. ; ; example: ; [myGroupName] ; defines the group named myGroupName -; testfeature => #9 ; associates testfeature with the group and the keycode #9 -; pauseMonitor ; associates pauseMonitor with the group and the keycode +; testfeature => #9 ; associates testfeature with the group and the keycode '#9'. +; pauseMonitor => ; associates pauseMonitor with the group and uses the keycode specified +; ; in the [applicationmap]. -- cgit v1.2.3