[asterisk-commits] tilghman: branch 1.8 r299449 - in /branches/1.8: ./ pbx/ael/ael-test/ res/ael/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Dec 22 20:05:07 UTC 2010
Author: tilghman
Date: Wed Dec 22 14:05:02 2010
New Revision: 299449
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=299449
Log:
Merged revisions 299448 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r299448 | tilghman | 2010-12-22 14:03:30 -0600 (Wed, 22 Dec 2010) | 8 lines
Resolve warnings by disambiguating the "s" extension as used by chan_dahdi from the "s" extension as used by the AEL macros.
(closes issue #18480)
Reported by: nivek
Patches:
20101215__issue18480__2.diff.txt uploaded by tilghman (license 14)
Tested by: nivek
........
Modified:
branches/1.8/ (props changed)
branches/1.8/pbx/ael/ael-test/ref.ael-test19
branches/1.8/pbx/ael/ael-test/ref.ael-test3
branches/1.8/pbx/ael/ael-test/ref.ael-vtest13
branches/1.8/pbx/ael/ael-test/ref.ael-vtest17
branches/1.8/pbx/ael/ael-test/ref.ael-vtest25
branches/1.8/res/ael/pval.c
Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.
Modified: branches/1.8/pbx/ael/ael-test/ref.ael-test19
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/pbx/ael/ael-test/ref.ael-test19?view=diff&rev=299449&r1=299448&r2=299449
==============================================================================
--- branches/1.8/pbx/ael/ael-test/ref.ael-test19 (original)
+++ branches/1.8/pbx/ael/ael-test/ref.ael-test19 Wed Dec 22 14:05:02 2010
@@ -15,4 +15,4 @@
LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse line:516 func: main 13 contexts, 57 extensions, 191 priorities
+LOG: lev:4 file:ael2_parse line:516 func: main 13 contexts, 58 extensions, 191 priorities
Modified: branches/1.8/pbx/ael/ael-test/ref.ael-test3
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/pbx/ael/ael-test/ref.ael-test3?view=diff&rev=299449&r1=299448&r2=299449
==============================================================================
--- branches/1.8/pbx/ael/ael-test/ref.ael-test3 (original)
+++ branches/1.8/pbx/ael/ael-test/ref.ael-test3 Wed Dec 22 14:05:02 2010
@@ -3,12 +3,12 @@
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
LOG: lev:2 file:pbx_ael.c line:122 func: pbx_load_module Starting AEL load process.
-LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include1.ael2, 78 chars
-LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include2.ael2, 98 chars
-LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include3.ael2, 57 chars
-LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include5.ael2, 56 chars
-LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include4.ael2, 87 chars
-LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././telemarket_torture.ael2, 28036 chars
+LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include1.ael2, 78 chars
+LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include2.ael2, 98 chars
+LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include3.ael2, 57 chars
+LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include5.ael2, 56 chars
+LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include4.ael2, 87 chars
+LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././telemarket_torture.ael2, 28036 chars
LOG: lev:2 file:pbx_ael.c line:135 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 14-34: The macro std-exten does not end with a return; I will insert one.
LOG: lev:3 file:pval.c line:1365 func: check_goto Warning: file ./extensions.ael, line 17-17: It's bad form to have a goto in a macro to a target outside the macro!
@@ -96,4 +96,4 @@
LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse line:516 func: main 172 contexts, 934 extensions, 2634 priorities
+LOG: lev:4 file:ael2_parse line:516 func: main 172 contexts, 935 extensions, 2633 priorities
Modified: branches/1.8/pbx/ael/ael-test/ref.ael-vtest13
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/pbx/ael/ael-test/ref.ael-vtest13?view=diff&rev=299449&r1=299448&r2=299449
==============================================================================
--- branches/1.8/pbx/ael/ael-test/ref.ael-vtest13 (original)
+++ branches/1.8/pbx/ael/ael-test/ref.ael-vtest13 Wed Dec 22 14:05:02 2010
@@ -11,2188 +11,2188 @@
[std-exten]
-exten => s,1,Set(LOCAL(ext)=${ARG1})
-exten => s,2,Set(LOCAL(dev)=${ARG2})
-exten => s,3,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,4,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,5,Dial(${dev}/${ext},20)
-exten => s,6,Goto(sw_1_${DIALSTATUS},10)
-exten => s,7,NoOp(Finish switch_std-exten_1)
-exten => s,8,Return()
+exten => ~~s~~,1,Set(LOCAL(ext)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(dev)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,4,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,5,Dial(${dev}/${ext},20)
+exten => ~~s~~,6,Goto(sw_1_${DIALSTATUS},10)
+exten => ~~s~~,7,NoOp(Finish switch_std-exten_1)
+exten => ~~s~~,8,Return()
exten => a,1,VoiceMailMain(${ext})
exten => _sw_1_.,10,Voicemail(u${ext})
-exten => _sw_1_.,11,Goto(s,7)
+exten => _sw_1_.,11,Goto(~~s~~,7)
exten => sw_1_,10,Goto(sw_1_.,10)
-exten => sw_1_ANSWER,10,Goto(s,7)
+exten => sw_1_ANSWER,10,Goto(~~s~~,7)
exten => sw_1_NOANSWER,10,Voicemail(u${ext})
-exten => sw_1_NOANSWER,11,Goto(s,7)
+exten => sw_1_NOANSWER,11,Goto(~~s~~,7)
exten => sw_1_BUSY,10,Voicemail(b${ext})
-exten => sw_1_BUSY,11,Goto(s,7)
+exten => sw_1_BUSY,11,Goto(~~s~~,7)
[std-priv-exten_1]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_3_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_1_3)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_3_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_1_3)
+exten => ~~s~~,13,Return()
exten => _sw_3_.,10,Voicemail(u${ext})
-exten => _sw_3_.,11,Goto(s,12)
+exten => _sw_3_.,11,Goto(~~s~~,12)
exten => sw_3_,10,Goto(sw_3_.,10)
exten => sw_3_NOANSWER,10,Voicemail(u${ext})
-exten => sw_3_NOANSWER,11,Goto(s,12)
-exten => sw_3_ANSWER,10,Goto(s,12)
+exten => sw_3_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_3_ANSWER,10,Goto(~~s~~,12)
exten => sw_3_BUSY,10,Voicemail(b${ext})
-exten => sw_3_BUSY,11,Goto(s,12)
+exten => sw_3_BUSY,11,Goto(~~s~~,12)
exten => sw_3_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_3_DONTCALL,11,Goto(s,12)
+exten => sw_3_DONTCALL,11,Goto(~~s~~,12)
exten => sw_3_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_3_TORTURE,11,Goto(s,12)
+exten => sw_3_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_2]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_4_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_2_4)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_4_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_2_4)
+exten => ~~s~~,13,Return()
exten => _sw_4_.,10,Voicemail(u${ext})
-exten => _sw_4_.,11,Goto(s,12)
+exten => _sw_4_.,11,Goto(~~s~~,12)
exten => sw_4_,10,Goto(sw_4_.,10)
exten => sw_4_NOANSWER,10,Voicemail(u${ext})
-exten => sw_4_NOANSWER,11,Goto(s,12)
-exten => sw_4_ANSWER,10,Goto(s,12)
+exten => sw_4_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_4_ANSWER,10,Goto(~~s~~,12)
exten => sw_4_BUSY,10,Voicemail(b${ext})
-exten => sw_4_BUSY,11,Goto(s,12)
+exten => sw_4_BUSY,11,Goto(~~s~~,12)
exten => sw_4_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_4_DONTCALL,11,Goto(s,12)
+exten => sw_4_DONTCALL,11,Goto(~~s~~,12)
exten => sw_4_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_4_TORTURE,11,Goto(s,12)
+exten => sw_4_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_3]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_5_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_3_5)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_5_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_3_5)
+exten => ~~s~~,13,Return()
exten => _sw_5_.,10,Voicemail(u${ext})
-exten => _sw_5_.,11,Goto(s,12)
+exten => _sw_5_.,11,Goto(~~s~~,12)
exten => sw_5_,10,Goto(sw_5_.,10)
exten => sw_5_NOANSWER,10,Voicemail(u${ext})
-exten => sw_5_NOANSWER,11,Goto(s,12)
-exten => sw_5_ANSWER,10,Goto(s,12)
+exten => sw_5_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_5_ANSWER,10,Goto(~~s~~,12)
exten => sw_5_BUSY,10,Voicemail(b${ext})
-exten => sw_5_BUSY,11,Goto(s,12)
+exten => sw_5_BUSY,11,Goto(~~s~~,12)
exten => sw_5_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_5_DONTCALL,11,Goto(s,12)
+exten => sw_5_DONTCALL,11,Goto(~~s~~,12)
exten => sw_5_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_5_TORTURE,11,Goto(s,12)
+exten => sw_5_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_4]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_6_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_4_6)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_6_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_4_6)
+exten => ~~s~~,13,Return()
exten => _sw_6_.,10,Voicemail(u${ext})
-exten => _sw_6_.,11,Goto(s,12)
+exten => _sw_6_.,11,Goto(~~s~~,12)
exten => sw_6_,10,Goto(sw_6_.,10)
exten => sw_6_NOANSWER,10,Voicemail(u${ext})
-exten => sw_6_NOANSWER,11,Goto(s,12)
-exten => sw_6_ANSWER,10,Goto(s,12)
+exten => sw_6_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_6_ANSWER,10,Goto(~~s~~,12)
exten => sw_6_BUSY,10,Voicemail(b${ext})
-exten => sw_6_BUSY,11,Goto(s,12)
+exten => sw_6_BUSY,11,Goto(~~s~~,12)
exten => sw_6_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_6_DONTCALL,11,Goto(s,12)
+exten => sw_6_DONTCALL,11,Goto(~~s~~,12)
exten => sw_6_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_6_TORTURE,11,Goto(s,12)
+exten => sw_6_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_5]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_7_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_5_7)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_7_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_5_7)
+exten => ~~s~~,13,Return()
exten => _sw_7_.,10,Voicemail(u${ext})
-exten => _sw_7_.,11,Goto(s,12)
+exten => _sw_7_.,11,Goto(~~s~~,12)
exten => sw_7_,10,Goto(sw_7_.,10)
exten => sw_7_NOANSWER,10,Voicemail(u${ext})
-exten => sw_7_NOANSWER,11,Goto(s,12)
-exten => sw_7_ANSWER,10,Goto(s,12)
+exten => sw_7_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_7_ANSWER,10,Goto(~~s~~,12)
exten => sw_7_BUSY,10,Voicemail(b${ext})
-exten => sw_7_BUSY,11,Goto(s,12)
+exten => sw_7_BUSY,11,Goto(~~s~~,12)
exten => sw_7_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_7_DONTCALL,11,Goto(s,12)
+exten => sw_7_DONTCALL,11,Goto(~~s~~,12)
exten => sw_7_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_7_TORTURE,11,Goto(s,12)
+exten => sw_7_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_6]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_8_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_6_8)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_8_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_6_8)
+exten => ~~s~~,13,Return()
exten => _sw_8_.,10,Voicemail(u${ext})
-exten => _sw_8_.,11,Goto(s,12)
+exten => _sw_8_.,11,Goto(~~s~~,12)
exten => sw_8_,10,Goto(sw_8_.,10)
exten => sw_8_NOANSWER,10,Voicemail(u${ext})
-exten => sw_8_NOANSWER,11,Goto(s,12)
-exten => sw_8_ANSWER,10,Goto(s,12)
+exten => sw_8_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_8_ANSWER,10,Goto(~~s~~,12)
exten => sw_8_BUSY,10,Voicemail(b${ext})
-exten => sw_8_BUSY,11,Goto(s,12)
+exten => sw_8_BUSY,11,Goto(~~s~~,12)
exten => sw_8_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_8_DONTCALL,11,Goto(s,12)
+exten => sw_8_DONTCALL,11,Goto(~~s~~,12)
exten => sw_8_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_8_TORTURE,11,Goto(s,12)
+exten => sw_8_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_7]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_9_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_7_9)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_9_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_7_9)
+exten => ~~s~~,13,Return()
exten => _sw_9_.,10,Voicemail(u${ext})
-exten => _sw_9_.,11,Goto(s,12)
+exten => _sw_9_.,11,Goto(~~s~~,12)
exten => sw_9_,10,Goto(sw_9_.,10)
exten => sw_9_NOANSWER,10,Voicemail(u${ext})
-exten => sw_9_NOANSWER,11,Goto(s,12)
-exten => sw_9_ANSWER,10,Goto(s,12)
+exten => sw_9_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_9_ANSWER,10,Goto(~~s~~,12)
exten => sw_9_BUSY,10,Voicemail(b${ext})
-exten => sw_9_BUSY,11,Goto(s,12)
+exten => sw_9_BUSY,11,Goto(~~s~~,12)
exten => sw_9_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_9_DONTCALL,11,Goto(s,12)
+exten => sw_9_DONTCALL,11,Goto(~~s~~,12)
exten => sw_9_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_9_TORTURE,11,Goto(s,12)
+exten => sw_9_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_8]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_10_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_8_10)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_10_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_8_10)
+exten => ~~s~~,13,Return()
exten => _sw_10_.,10,Voicemail(u${ext})
-exten => _sw_10_.,11,Goto(s,12)
+exten => _sw_10_.,11,Goto(~~s~~,12)
exten => sw_10_,10,Goto(sw_10_.,10)
exten => sw_10_NOANSWER,10,Voicemail(u${ext})
-exten => sw_10_NOANSWER,11,Goto(s,12)
-exten => sw_10_ANSWER,10,Goto(s,12)
+exten => sw_10_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_10_ANSWER,10,Goto(~~s~~,12)
exten => sw_10_BUSY,10,Voicemail(b${ext})
-exten => sw_10_BUSY,11,Goto(s,12)
+exten => sw_10_BUSY,11,Goto(~~s~~,12)
exten => sw_10_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_10_DONTCALL,11,Goto(s,12)
+exten => sw_10_DONTCALL,11,Goto(~~s~~,12)
exten => sw_10_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_10_TORTURE,11,Goto(s,12)
+exten => sw_10_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_9]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_11_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_9_11)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_11_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_9_11)
+exten => ~~s~~,13,Return()
exten => _sw_11_.,10,Voicemail(u${ext})
-exten => _sw_11_.,11,Goto(s,12)
+exten => _sw_11_.,11,Goto(~~s~~,12)
exten => sw_11_,10,Goto(sw_11_.,10)
exten => sw_11_NOANSWER,10,Voicemail(u${ext})
-exten => sw_11_NOANSWER,11,Goto(s,12)
-exten => sw_11_ANSWER,10,Goto(s,12)
+exten => sw_11_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_11_ANSWER,10,Goto(~~s~~,12)
exten => sw_11_BUSY,10,Voicemail(b${ext})
-exten => sw_11_BUSY,11,Goto(s,12)
+exten => sw_11_BUSY,11,Goto(~~s~~,12)
exten => sw_11_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_11_DONTCALL,11,Goto(s,12)
+exten => sw_11_DONTCALL,11,Goto(~~s~~,12)
exten => sw_11_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_11_TORTURE,11,Goto(s,12)
+exten => sw_11_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_10]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_12_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_10_12)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_12_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_10_12)
+exten => ~~s~~,13,Return()
exten => _sw_12_.,10,Voicemail(u${ext})
-exten => _sw_12_.,11,Goto(s,12)
+exten => _sw_12_.,11,Goto(~~s~~,12)
exten => sw_12_,10,Goto(sw_12_.,10)
exten => sw_12_NOANSWER,10,Voicemail(u${ext})
-exten => sw_12_NOANSWER,11,Goto(s,12)
-exten => sw_12_ANSWER,10,Goto(s,12)
+exten => sw_12_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_12_ANSWER,10,Goto(~~s~~,12)
exten => sw_12_BUSY,10,Voicemail(b${ext})
-exten => sw_12_BUSY,11,Goto(s,12)
+exten => sw_12_BUSY,11,Goto(~~s~~,12)
exten => sw_12_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_12_DONTCALL,11,Goto(s,12)
+exten => sw_12_DONTCALL,11,Goto(~~s~~,12)
exten => sw_12_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_12_TORTURE,11,Goto(s,12)
+exten => sw_12_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_11]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_13_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_11_13)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_13_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_11_13)
+exten => ~~s~~,13,Return()
exten => _sw_13_.,10,Voicemail(u${ext})
-exten => _sw_13_.,11,Goto(s,12)
+exten => _sw_13_.,11,Goto(~~s~~,12)
exten => sw_13_,10,Goto(sw_13_.,10)
exten => sw_13_NOANSWER,10,Voicemail(u${ext})
-exten => sw_13_NOANSWER,11,Goto(s,12)
-exten => sw_13_ANSWER,10,Goto(s,12)
+exten => sw_13_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_13_ANSWER,10,Goto(~~s~~,12)
exten => sw_13_BUSY,10,Voicemail(b${ext})
-exten => sw_13_BUSY,11,Goto(s,12)
+exten => sw_13_BUSY,11,Goto(~~s~~,12)
exten => sw_13_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_13_DONTCALL,11,Goto(s,12)
+exten => sw_13_DONTCALL,11,Goto(~~s~~,12)
exten => sw_13_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_13_TORTURE,11,Goto(s,12)
+exten => sw_13_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_12]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_14_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_12_14)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_14_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_12_14)
+exten => ~~s~~,13,Return()
exten => _sw_14_.,10,Voicemail(u${ext})
-exten => _sw_14_.,11,Goto(s,12)
+exten => _sw_14_.,11,Goto(~~s~~,12)
exten => sw_14_,10,Goto(sw_14_.,10)
exten => sw_14_NOANSWER,10,Voicemail(u${ext})
-exten => sw_14_NOANSWER,11,Goto(s,12)
-exten => sw_14_ANSWER,10,Goto(s,12)
+exten => sw_14_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_14_ANSWER,10,Goto(~~s~~,12)
exten => sw_14_BUSY,10,Voicemail(b${ext})
-exten => sw_14_BUSY,11,Goto(s,12)
+exten => sw_14_BUSY,11,Goto(~~s~~,12)
exten => sw_14_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_14_DONTCALL,11,Goto(s,12)
+exten => sw_14_DONTCALL,11,Goto(~~s~~,12)
exten => sw_14_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_14_TORTURE,11,Goto(s,12)
+exten => sw_14_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_13]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_15_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_13_15)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_15_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_13_15)
+exten => ~~s~~,13,Return()
exten => _sw_15_.,10,Voicemail(u${ext})
-exten => _sw_15_.,11,Goto(s,12)
+exten => _sw_15_.,11,Goto(~~s~~,12)
exten => sw_15_,10,Goto(sw_15_.,10)
exten => sw_15_NOANSWER,10,Voicemail(u${ext})
-exten => sw_15_NOANSWER,11,Goto(s,12)
-exten => sw_15_ANSWER,10,Goto(s,12)
+exten => sw_15_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_15_ANSWER,10,Goto(~~s~~,12)
exten => sw_15_BUSY,10,Voicemail(b${ext})
-exten => sw_15_BUSY,11,Goto(s,12)
+exten => sw_15_BUSY,11,Goto(~~s~~,12)
exten => sw_15_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_15_DONTCALL,11,Goto(s,12)
+exten => sw_15_DONTCALL,11,Goto(~~s~~,12)
exten => sw_15_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_15_TORTURE,11,Goto(s,12)
+exten => sw_15_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_14]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_16_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_14_16)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_16_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_14_16)
+exten => ~~s~~,13,Return()
exten => _sw_16_.,10,Voicemail(u${ext})
-exten => _sw_16_.,11,Goto(s,12)
+exten => _sw_16_.,11,Goto(~~s~~,12)
exten => sw_16_,10,Goto(sw_16_.,10)
exten => sw_16_NOANSWER,10,Voicemail(u${ext})
-exten => sw_16_NOANSWER,11,Goto(s,12)
-exten => sw_16_ANSWER,10,Goto(s,12)
+exten => sw_16_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_16_ANSWER,10,Goto(~~s~~,12)
exten => sw_16_BUSY,10,Voicemail(b${ext})
-exten => sw_16_BUSY,11,Goto(s,12)
+exten => sw_16_BUSY,11,Goto(~~s~~,12)
exten => sw_16_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_16_DONTCALL,11,Goto(s,12)
+exten => sw_16_DONTCALL,11,Goto(~~s~~,12)
exten => sw_16_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_16_TORTURE,11,Goto(s,12)
+exten => sw_16_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_15]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_17_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_15_17)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_17_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_15_17)
+exten => ~~s~~,13,Return()
exten => _sw_17_.,10,Voicemail(u${ext})
-exten => _sw_17_.,11,Goto(s,12)
+exten => _sw_17_.,11,Goto(~~s~~,12)
exten => sw_17_,10,Goto(sw_17_.,10)
exten => sw_17_NOANSWER,10,Voicemail(u${ext})
-exten => sw_17_NOANSWER,11,Goto(s,12)
-exten => sw_17_ANSWER,10,Goto(s,12)
+exten => sw_17_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_17_ANSWER,10,Goto(~~s~~,12)
exten => sw_17_BUSY,10,Voicemail(b${ext})
-exten => sw_17_BUSY,11,Goto(s,12)
+exten => sw_17_BUSY,11,Goto(~~s~~,12)
exten => sw_17_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_17_DONTCALL,11,Goto(s,12)
+exten => sw_17_DONTCALL,11,Goto(~~s~~,12)
exten => sw_17_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_17_TORTURE,11,Goto(s,12)
+exten => sw_17_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_16]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_18_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_16_18)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_18_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_16_18)
+exten => ~~s~~,13,Return()
exten => _sw_18_.,10,Voicemail(u${ext})
-exten => _sw_18_.,11,Goto(s,12)
+exten => _sw_18_.,11,Goto(~~s~~,12)
exten => sw_18_,10,Goto(sw_18_.,10)
exten => sw_18_NOANSWER,10,Voicemail(u${ext})
-exten => sw_18_NOANSWER,11,Goto(s,12)
-exten => sw_18_ANSWER,10,Goto(s,12)
+exten => sw_18_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_18_ANSWER,10,Goto(~~s~~,12)
exten => sw_18_BUSY,10,Voicemail(b${ext})
-exten => sw_18_BUSY,11,Goto(s,12)
+exten => sw_18_BUSY,11,Goto(~~s~~,12)
exten => sw_18_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_18_DONTCALL,11,Goto(s,12)
+exten => sw_18_DONTCALL,11,Goto(~~s~~,12)
exten => sw_18_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_18_TORTURE,11,Goto(s,12)
+exten => sw_18_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_17]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_19_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_17_19)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
+exten => ~~s~~,6,Set(LOCAL(dontcont)=${ARG6})
+exten => ~~s~~,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => ~~s~~,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => ~~s~~,9,Dial(${dev},${timeout},${opts})
+exten => ~~s~~,10,NoOp(${DIALSTATUS} was chosen)
+exten => ~~s~~,11,Goto(sw_19_${DIALSTATUS},10)
+exten => ~~s~~,12,NoOp(Finish switch_std-priv-exten_17_19)
+exten => ~~s~~,13,Return()
exten => _sw_19_.,10,Voicemail(u${ext})
-exten => _sw_19_.,11,Goto(s,12)
+exten => _sw_19_.,11,Goto(~~s~~,12)
exten => sw_19_,10,Goto(sw_19_.,10)
exten => sw_19_NOANSWER,10,Voicemail(u${ext})
-exten => sw_19_NOANSWER,11,Goto(s,12)
-exten => sw_19_ANSWER,10,Goto(s,12)
+exten => sw_19_NOANSWER,11,Goto(~~s~~,12)
+exten => sw_19_ANSWER,10,Goto(~~s~~,12)
exten => sw_19_BUSY,10,Voicemail(b${ext})
-exten => sw_19_BUSY,11,Goto(s,12)
+exten => sw_19_BUSY,11,Goto(~~s~~,12)
exten => sw_19_DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw_19_DONTCALL,11,Goto(s,12)
+exten => sw_19_DONTCALL,11,Goto(~~s~~,12)
exten => sw_19_TORTURE,10,Goto(${torcont},s,begin)
-exten => sw_19_TORTURE,11,Goto(s,12)
+exten => sw_19_TORTURE,11,Goto(~~s~~,12)
[std-priv-exten_18]
-exten => s,1,Set(LOCAL(dev)=${ARG1})
-exten => s,2,Set(LOCAL(ext)=${ARG2})
-exten => s,3,Set(LOCAL(timeout)=${ARG3})
-exten => s,4,Set(LOCAL(opts)=${ARG4})
-exten => s,5,Set(LOCAL(torcont)=${ARG5})
-exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
-exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
-exten => s,9,Dial(${dev},${timeout},${opts})
-exten => s,10,NoOp(${DIALSTATUS} was chosen)
-exten => s,11,Goto(sw_20_${DIALSTATUS},10)
-exten => s,12,NoOp(Finish switch_std-priv-exten_18_20)
-exten => s,13,Return()
+exten => ~~s~~,1,Set(LOCAL(dev)=${ARG1})
+exten => ~~s~~,2,Set(LOCAL(ext)=${ARG2})
+exten => ~~s~~,3,Set(LOCAL(timeout)=${ARG3})
+exten => ~~s~~,4,Set(LOCAL(opts)=${ARG4})
+exten => ~~s~~,5,Set(LOCAL(torcont)=${ARG5})
[... 3409 lines stripped ...]
More information about the asterisk-commits
mailing list