summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-11-02 01:15:11 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-11-02 01:15:11 +0000
commit0721b1de836da3e91ac71d54c972caa80a9e2379 (patch)
treeeda35e14fae8ea28740bec3e7110f4fa68bb6ba2 /apps
parent5401b2bfbf9c31570439c62a3ed7165052610b51 (diff)
config: Allow ConfBridge DTMF menus to have '#' as the first digit.
ConfBridge allows custom DTMF menus to be created in the confbridge.conf file by assigning a DTMF key sequence to a sequence of actions as follows: DTMF-sequence = action,action... Unfortunately, the normal config file processing code interprets an initial '#' character as starting a directive such as #include. * Add the ability to escape the first non-blank character in a config line so the '#' character can be used without triggering the directive processing code. (closes issue AFS-2) (closes issue ASTERISK-22478) Reported by: Nicolas Tanski Patches: jira_asterisk_22478_v11.patch (license #5621) patch uploaded by rmudgett (modified) Review: https://reviewboard.asterisk.org/r/2969/ ........ Merged revisions 402407 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 402416 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402417 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/confbridge/conf_config_parser.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index 5c430ea3a..e7a18739c 100644
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -430,6 +430,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
is passed in to ConfBridge as an argument in the dialplan.</para>
<para>Below is a list of menu actions that can be assigned to a DTMF sequence.</para>
<note><para>
+ To have the first DTMF digit in a sequence be the '#' character, you need to
+ escape it. If it is not escaped then normal config file processing will
+ think it is a directive like #include. For example: The mute setting is
+ toggled when <literal>#1</literal> is pressed.</para>
+ <para><literal>\#1=toggle_mute</literal></para>
+ </note>
+ <note><para>
A single DTMF sequence can have multiple actions associated with it. This is
accomplished by stringing the actions together and using a <literal>,</literal> as the
delimiter. Example: Both listening and talking volume is reset when <literal>5</literal> is
@@ -453,7 +460,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<enum name="toggle_mute"><para>
Toggle turning on and off mute. Mute will make the user silent
to everyone else, but the user will still be able to listen in.
- continue to collect the dtmf sequence.</para></enum>
+ </para></enum>
<enum name="no_op"><para>
This action does nothing (No Operation). Its only real purpose exists for
being able to reserve a sequence in the config as a menu exit sequence.</para></enum>