[svn-commits] murf: branch 1.4 r62883 - in /branches/1.4/pbx/ael:
./ ael-test/ ael-test/ael...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu May 3 06:54:56 MST 2007
Author: murf
Date: Thu May 3 08:54:56 2007
New Revision: 62883
URL: http://svn.digium.com/view/asterisk?view=rev&rev=62883
Log:
These mods fix bug 9623, where an '@' in the eswitch contents causes a syntax error. I also updated the regressions.
Added:
branches/1.4/pbx/ael/ael-test/ael-test18/
branches/1.4/pbx/ael/ael-test/ael-test18/extensions.ael (with props)
branches/1.4/pbx/ael/ael-test/ref.ael-test18 (with props)
Modified:
branches/1.4/pbx/ael/ael-test/ref.ael-test7
branches/1.4/pbx/ael/ael-test/ref.ael-vtest13
branches/1.4/pbx/ael/ael-test/ref.ael-vtest17
branches/1.4/pbx/ael/ael.tab.c
branches/1.4/pbx/ael/ael.tab.h
branches/1.4/pbx/ael/ael.y
Added: branches/1.4/pbx/ael/ael-test/ael-test18/extensions.ael
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/ael/ael-test/ael-test18/extensions.ael?view=auto&rev=62883
==============================================================================
--- branches/1.4/pbx/ael/ael-test/ael-test18/extensions.ael (added)
+++ branches/1.4/pbx/ael/ael-test/ael-test18/extensions.ael Thu May 3 08:54:56 2007
@@ -1,0 +1,8 @@
+context interesting {
+ eswitches {
+ Realtime/default at extensions;
+ IAX2/context@${CURSERVER};
+ }
+ 13 => NoOp(LuckyNumber!);
+}
+
Propchange: branches/1.4/pbx/ael/ael-test/ael-test18/extensions.ael
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/pbx/ael/ael-test/ael-test18/extensions.ael
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/pbx/ael/ael-test/ael-test18/extensions.ael
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: branches/1.4/pbx/ael/ael-test/ref.ael-test18
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/ael/ael-test/ref.ael-test18?view=auto&rev=62883
==============================================================================
--- branches/1.4/pbx/ael/ael-test/ref.ael-test18 (added)
+++ branches/1.4/pbx/ael/ael-test/ref.ael-test18 Thu May 3 08:54:56 2007
@@ -1,0 +1,12 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
+
+(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
+LOG: lev:2 file:pbx_ael.c line:3915 func: pbx_load_module Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c line:3922 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c line:3930 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c line:3933 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c line:3935 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c line:3938 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c line:3941 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse line:512 func: main 1 contexts, 1 extensions, 1 priorities
Propchange: branches/1.4/pbx/ael/ael-test/ref.ael-test18
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/pbx/ael/ael-test/ref.ael-test18
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/pbx/ael/ael-test/ref.ael-test18
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/1.4/pbx/ael/ael-test/ref.ael-test7
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/ael/ael-test/ref.ael-test7?view=diff&rev=62883&r1=62882&r2=62883
==============================================================================
--- branches/1.4/pbx/ael/ael-test/ref.ael-test7 (original)
+++ branches/1.4/pbx/ael/ael-test/ref.ael-test7 Thu May 3 08:54:56 2007
@@ -2,13 +2,13 @@
(If you find progress and other non-error messages irritating, you can use -q to suppress them)
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c line:3910 func: pbx_load_module Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c line:3917 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c line:3925 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c line:3915 func: pbx_load_module Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c line:3922 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c line:3930 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
LOG: lev:4 file:pbx_ael.c line:2339 func: check_pval_item Error: file ./extensions.ael, line 98-98: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
LOG: lev:4 file:pbx_ael.c line:2339 func: check_pval_item Error: file ./extensions.ael, line 107-107: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
LOG: lev:4 file:pbx_ael.c line:2339 func: check_pval_item Error: file ./extensions.ael, line 284-284: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
LOG: lev:4 file:pbx_ael.c line:2339 func: check_pval_item Error: file ./extensions.ael, line 287-287: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
-LOG: lev:3 file:pbx_ael.c line:2320 func: check_pval_item Error: file ./extensions.ael, line 452-452: macro call to non-existent std-exten-ael ! Hopefully it is present in extensions.conf!
-LOG: lev:4 file:pbx_ael.c line:3938 func: pbx_load_module Sorry, but 0 syntax errors and 4 semantic errors were detected. It doesn't make sense to compile.
+LOG: lev:3 file:pbx_ael.c line:2320 func: check_pval_item Warning: file ./extensions.ael, line 452-452: macro call to non-existent std-exten-ael ! Hopefully it is present in extensions.conf!
+LOG: lev:4 file:pbx_ael.c line:3943 func: pbx_load_module Sorry, but 0 syntax errors and 4 semantic errors were detected. It doesn't make sense to compile.
LOG: lev:4 file:ael2_parse line:512 func: main 0 contexts, 0 extensions, 0 priorities
Modified: branches/1.4/pbx/ael/ael-test/ref.ael-vtest13
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/ael/ael-test/ref.ael-vtest13?view=diff&rev=62883&r1=62882&r2=62883
==============================================================================
--- branches/1.4/pbx/ael/ael-test/ref.ael-vtest13 (original)
+++ branches/1.4/pbx/ael/ael-test/ref.ael-vtest13 Thu May 3 08:54:56 2007
@@ -14,16 +14,16 @@
exten => s,1,Set(ext=${ARG1})
exten => s,2,Set(dev=${ARG2})
exten => s,3,Dial(${dev}/${ext}|20)
-exten => s,4,Goto(sw-1-${DIALSTATUS}|1)
+exten => s,4,Goto(sw-1-${DIALSTATUS}|10)
exten => s,5,NoOp(Finish switch-std-exten-1)
exten => a,1,VoiceMailMain(${ext})
-exten => _sw-1-.,1,Voicemail(u${ext})
-exten => _sw-1-.,2,Goto(s|5)
-exten => sw-1-ANSWER,1,Goto(s|5)
-exten => sw-1-NOANSWER,1,Voicemail(u${ext})
-exten => sw-1-NOANSWER,2,Goto(s|5)
-exten => sw-1-BUSY,1,Voicemail(b${ext})
-exten => sw-1-BUSY,2,Goto(s|5)
+exten => _sw-1-.,10,Voicemail(u${ext})
+exten => _sw-1-.,11,Goto(s|5)
+exten => sw-1-ANSWER,10,Goto(s|5)
+exten => sw-1-NOANSWER,10,Voicemail(u${ext})
+exten => sw-1-NOANSWER,11,Goto(s|5)
+exten => sw-1-BUSY,10,Voicemail(b${ext})
+exten => sw-1-BUSY,11,Goto(s|5)
[macro-std-priv-exten_1]
@@ -35,19 +35,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-3-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-3-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_1-3)
-exten => _sw-3-.,1,Voicemail(u${ext})
-exten => _sw-3-.,2,Goto(s|10)
-exten => sw-3-NOANSWER,1,Voicemail(u${ext})
-exten => sw-3-NOANSWER,2,Goto(s|10)
-exten => sw-3-ANSWER,1,Goto(s|10)
-exten => sw-3-BUSY,1,Voicemail(b${ext})
-exten => sw-3-BUSY,2,Goto(s|10)
-exten => sw-3-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-3-DONTCALL,2,Goto(s|10)
-exten => sw-3-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-3-TORTURE,2,Goto(s|10)
+exten => _sw-3-.,10,Voicemail(u${ext})
+exten => _sw-3-.,11,Goto(s|10)
+exten => sw-3-NOANSWER,10,Voicemail(u${ext})
+exten => sw-3-NOANSWER,11,Goto(s|10)
+exten => sw-3-ANSWER,10,Goto(s|10)
+exten => sw-3-BUSY,10,Voicemail(b${ext})
+exten => sw-3-BUSY,11,Goto(s|10)
+exten => sw-3-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-3-DONTCALL,11,Goto(s|10)
+exten => sw-3-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-3-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_2]
@@ -59,19 +59,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-4-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-4-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_2-4)
-exten => _sw-4-.,1,Voicemail(u${ext})
-exten => _sw-4-.,2,Goto(s|10)
-exten => sw-4-NOANSWER,1,Voicemail(u${ext})
-exten => sw-4-NOANSWER,2,Goto(s|10)
-exten => sw-4-ANSWER,1,Goto(s|10)
-exten => sw-4-BUSY,1,Voicemail(b${ext})
-exten => sw-4-BUSY,2,Goto(s|10)
-exten => sw-4-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-4-DONTCALL,2,Goto(s|10)
-exten => sw-4-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-4-TORTURE,2,Goto(s|10)
+exten => _sw-4-.,10,Voicemail(u${ext})
+exten => _sw-4-.,11,Goto(s|10)
+exten => sw-4-NOANSWER,10,Voicemail(u${ext})
+exten => sw-4-NOANSWER,11,Goto(s|10)
+exten => sw-4-ANSWER,10,Goto(s|10)
+exten => sw-4-BUSY,10,Voicemail(b${ext})
+exten => sw-4-BUSY,11,Goto(s|10)
+exten => sw-4-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-4-DONTCALL,11,Goto(s|10)
+exten => sw-4-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-4-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_3]
@@ -83,19 +83,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-5-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-5-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_3-5)
-exten => _sw-5-.,1,Voicemail(u${ext})
-exten => _sw-5-.,2,Goto(s|10)
-exten => sw-5-NOANSWER,1,Voicemail(u${ext})
-exten => sw-5-NOANSWER,2,Goto(s|10)
-exten => sw-5-ANSWER,1,Goto(s|10)
-exten => sw-5-BUSY,1,Voicemail(b${ext})
-exten => sw-5-BUSY,2,Goto(s|10)
-exten => sw-5-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-5-DONTCALL,2,Goto(s|10)
-exten => sw-5-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-5-TORTURE,2,Goto(s|10)
+exten => _sw-5-.,10,Voicemail(u${ext})
+exten => _sw-5-.,11,Goto(s|10)
+exten => sw-5-NOANSWER,10,Voicemail(u${ext})
+exten => sw-5-NOANSWER,11,Goto(s|10)
+exten => sw-5-ANSWER,10,Goto(s|10)
+exten => sw-5-BUSY,10,Voicemail(b${ext})
+exten => sw-5-BUSY,11,Goto(s|10)
+exten => sw-5-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-5-DONTCALL,11,Goto(s|10)
+exten => sw-5-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-5-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_4]
@@ -107,19 +107,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-6-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-6-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_4-6)
-exten => _sw-6-.,1,Voicemail(u${ext})
-exten => _sw-6-.,2,Goto(s|10)
-exten => sw-6-NOANSWER,1,Voicemail(u${ext})
-exten => sw-6-NOANSWER,2,Goto(s|10)
-exten => sw-6-ANSWER,1,Goto(s|10)
-exten => sw-6-BUSY,1,Voicemail(b${ext})
-exten => sw-6-BUSY,2,Goto(s|10)
-exten => sw-6-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-6-DONTCALL,2,Goto(s|10)
-exten => sw-6-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-6-TORTURE,2,Goto(s|10)
+exten => _sw-6-.,10,Voicemail(u${ext})
+exten => _sw-6-.,11,Goto(s|10)
+exten => sw-6-NOANSWER,10,Voicemail(u${ext})
+exten => sw-6-NOANSWER,11,Goto(s|10)
+exten => sw-6-ANSWER,10,Goto(s|10)
+exten => sw-6-BUSY,10,Voicemail(b${ext})
+exten => sw-6-BUSY,11,Goto(s|10)
+exten => sw-6-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-6-DONTCALL,11,Goto(s|10)
+exten => sw-6-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-6-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_5]
@@ -131,19 +131,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-7-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-7-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_5-7)
-exten => _sw-7-.,1,Voicemail(u${ext})
-exten => _sw-7-.,2,Goto(s|10)
-exten => sw-7-NOANSWER,1,Voicemail(u${ext})
-exten => sw-7-NOANSWER,2,Goto(s|10)
-exten => sw-7-ANSWER,1,Goto(s|10)
-exten => sw-7-BUSY,1,Voicemail(b${ext})
-exten => sw-7-BUSY,2,Goto(s|10)
-exten => sw-7-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-7-DONTCALL,2,Goto(s|10)
-exten => sw-7-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-7-TORTURE,2,Goto(s|10)
+exten => _sw-7-.,10,Voicemail(u${ext})
+exten => _sw-7-.,11,Goto(s|10)
+exten => sw-7-NOANSWER,10,Voicemail(u${ext})
+exten => sw-7-NOANSWER,11,Goto(s|10)
+exten => sw-7-ANSWER,10,Goto(s|10)
+exten => sw-7-BUSY,10,Voicemail(b${ext})
+exten => sw-7-BUSY,11,Goto(s|10)
+exten => sw-7-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-7-DONTCALL,11,Goto(s|10)
+exten => sw-7-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-7-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_6]
@@ -155,19 +155,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-8-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-8-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_6-8)
-exten => _sw-8-.,1,Voicemail(u${ext})
-exten => _sw-8-.,2,Goto(s|10)
-exten => sw-8-NOANSWER,1,Voicemail(u${ext})
-exten => sw-8-NOANSWER,2,Goto(s|10)
-exten => sw-8-ANSWER,1,Goto(s|10)
-exten => sw-8-BUSY,1,Voicemail(b${ext})
-exten => sw-8-BUSY,2,Goto(s|10)
-exten => sw-8-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-8-DONTCALL,2,Goto(s|10)
-exten => sw-8-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-8-TORTURE,2,Goto(s|10)
+exten => _sw-8-.,10,Voicemail(u${ext})
+exten => _sw-8-.,11,Goto(s|10)
+exten => sw-8-NOANSWER,10,Voicemail(u${ext})
+exten => sw-8-NOANSWER,11,Goto(s|10)
+exten => sw-8-ANSWER,10,Goto(s|10)
+exten => sw-8-BUSY,10,Voicemail(b${ext})
+exten => sw-8-BUSY,11,Goto(s|10)
+exten => sw-8-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-8-DONTCALL,11,Goto(s|10)
+exten => sw-8-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-8-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_7]
@@ -179,19 +179,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-9-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-9-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_7-9)
-exten => _sw-9-.,1,Voicemail(u${ext})
-exten => _sw-9-.,2,Goto(s|10)
-exten => sw-9-NOANSWER,1,Voicemail(u${ext})
-exten => sw-9-NOANSWER,2,Goto(s|10)
-exten => sw-9-ANSWER,1,Goto(s|10)
-exten => sw-9-BUSY,1,Voicemail(b${ext})
-exten => sw-9-BUSY,2,Goto(s|10)
-exten => sw-9-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-9-DONTCALL,2,Goto(s|10)
-exten => sw-9-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-9-TORTURE,2,Goto(s|10)
+exten => _sw-9-.,10,Voicemail(u${ext})
+exten => _sw-9-.,11,Goto(s|10)
+exten => sw-9-NOANSWER,10,Voicemail(u${ext})
+exten => sw-9-NOANSWER,11,Goto(s|10)
+exten => sw-9-ANSWER,10,Goto(s|10)
+exten => sw-9-BUSY,10,Voicemail(b${ext})
+exten => sw-9-BUSY,11,Goto(s|10)
+exten => sw-9-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-9-DONTCALL,11,Goto(s|10)
+exten => sw-9-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-9-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_8]
@@ -203,19 +203,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-10-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-10-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_8-10)
-exten => _sw-10-.,1,Voicemail(u${ext})
-exten => _sw-10-.,2,Goto(s|10)
-exten => sw-10-NOANSWER,1,Voicemail(u${ext})
-exten => sw-10-NOANSWER,2,Goto(s|10)
-exten => sw-10-ANSWER,1,Goto(s|10)
-exten => sw-10-BUSY,1,Voicemail(b${ext})
-exten => sw-10-BUSY,2,Goto(s|10)
-exten => sw-10-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-10-DONTCALL,2,Goto(s|10)
-exten => sw-10-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-10-TORTURE,2,Goto(s|10)
+exten => _sw-10-.,10,Voicemail(u${ext})
+exten => _sw-10-.,11,Goto(s|10)
+exten => sw-10-NOANSWER,10,Voicemail(u${ext})
+exten => sw-10-NOANSWER,11,Goto(s|10)
+exten => sw-10-ANSWER,10,Goto(s|10)
+exten => sw-10-BUSY,10,Voicemail(b${ext})
+exten => sw-10-BUSY,11,Goto(s|10)
+exten => sw-10-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-10-DONTCALL,11,Goto(s|10)
+exten => sw-10-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-10-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_9]
@@ -227,19 +227,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-11-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-11-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_9-11)
-exten => _sw-11-.,1,Voicemail(u${ext})
-exten => _sw-11-.,2,Goto(s|10)
-exten => sw-11-NOANSWER,1,Voicemail(u${ext})
-exten => sw-11-NOANSWER,2,Goto(s|10)
-exten => sw-11-ANSWER,1,Goto(s|10)
-exten => sw-11-BUSY,1,Voicemail(b${ext})
-exten => sw-11-BUSY,2,Goto(s|10)
-exten => sw-11-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-11-DONTCALL,2,Goto(s|10)
-exten => sw-11-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-11-TORTURE,2,Goto(s|10)
+exten => _sw-11-.,10,Voicemail(u${ext})
+exten => _sw-11-.,11,Goto(s|10)
+exten => sw-11-NOANSWER,10,Voicemail(u${ext})
+exten => sw-11-NOANSWER,11,Goto(s|10)
+exten => sw-11-ANSWER,10,Goto(s|10)
+exten => sw-11-BUSY,10,Voicemail(b${ext})
+exten => sw-11-BUSY,11,Goto(s|10)
+exten => sw-11-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-11-DONTCALL,11,Goto(s|10)
+exten => sw-11-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-11-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_10]
@@ -251,19 +251,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-12-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-12-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_10-12)
-exten => _sw-12-.,1,Voicemail(u${ext})
-exten => _sw-12-.,2,Goto(s|10)
-exten => sw-12-NOANSWER,1,Voicemail(u${ext})
-exten => sw-12-NOANSWER,2,Goto(s|10)
-exten => sw-12-ANSWER,1,Goto(s|10)
-exten => sw-12-BUSY,1,Voicemail(b${ext})
-exten => sw-12-BUSY,2,Goto(s|10)
-exten => sw-12-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-12-DONTCALL,2,Goto(s|10)
-exten => sw-12-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-12-TORTURE,2,Goto(s|10)
+exten => _sw-12-.,10,Voicemail(u${ext})
+exten => _sw-12-.,11,Goto(s|10)
+exten => sw-12-NOANSWER,10,Voicemail(u${ext})
+exten => sw-12-NOANSWER,11,Goto(s|10)
+exten => sw-12-ANSWER,10,Goto(s|10)
+exten => sw-12-BUSY,10,Voicemail(b${ext})
+exten => sw-12-BUSY,11,Goto(s|10)
+exten => sw-12-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-12-DONTCALL,11,Goto(s|10)
+exten => sw-12-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-12-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_11]
@@ -275,19 +275,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-13-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-13-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_11-13)
-exten => _sw-13-.,1,Voicemail(u${ext})
-exten => _sw-13-.,2,Goto(s|10)
-exten => sw-13-NOANSWER,1,Voicemail(u${ext})
-exten => sw-13-NOANSWER,2,Goto(s|10)
-exten => sw-13-ANSWER,1,Goto(s|10)
-exten => sw-13-BUSY,1,Voicemail(b${ext})
-exten => sw-13-BUSY,2,Goto(s|10)
-exten => sw-13-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-13-DONTCALL,2,Goto(s|10)
-exten => sw-13-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-13-TORTURE,2,Goto(s|10)
+exten => _sw-13-.,10,Voicemail(u${ext})
+exten => _sw-13-.,11,Goto(s|10)
+exten => sw-13-NOANSWER,10,Voicemail(u${ext})
+exten => sw-13-NOANSWER,11,Goto(s|10)
+exten => sw-13-ANSWER,10,Goto(s|10)
+exten => sw-13-BUSY,10,Voicemail(b${ext})
+exten => sw-13-BUSY,11,Goto(s|10)
+exten => sw-13-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-13-DONTCALL,11,Goto(s|10)
+exten => sw-13-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-13-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_12]
@@ -299,19 +299,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-14-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-14-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_12-14)
-exten => _sw-14-.,1,Voicemail(u${ext})
-exten => _sw-14-.,2,Goto(s|10)
-exten => sw-14-NOANSWER,1,Voicemail(u${ext})
-exten => sw-14-NOANSWER,2,Goto(s|10)
-exten => sw-14-ANSWER,1,Goto(s|10)
-exten => sw-14-BUSY,1,Voicemail(b${ext})
-exten => sw-14-BUSY,2,Goto(s|10)
-exten => sw-14-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-14-DONTCALL,2,Goto(s|10)
-exten => sw-14-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-14-TORTURE,2,Goto(s|10)
+exten => _sw-14-.,10,Voicemail(u${ext})
+exten => _sw-14-.,11,Goto(s|10)
+exten => sw-14-NOANSWER,10,Voicemail(u${ext})
+exten => sw-14-NOANSWER,11,Goto(s|10)
+exten => sw-14-ANSWER,10,Goto(s|10)
+exten => sw-14-BUSY,10,Voicemail(b${ext})
+exten => sw-14-BUSY,11,Goto(s|10)
+exten => sw-14-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-14-DONTCALL,11,Goto(s|10)
+exten => sw-14-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-14-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_13]
@@ -323,19 +323,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-15-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-15-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_13-15)
-exten => _sw-15-.,1,Voicemail(u${ext})
-exten => _sw-15-.,2,Goto(s|10)
-exten => sw-15-NOANSWER,1,Voicemail(u${ext})
-exten => sw-15-NOANSWER,2,Goto(s|10)
-exten => sw-15-ANSWER,1,Goto(s|10)
-exten => sw-15-BUSY,1,Voicemail(b${ext})
-exten => sw-15-BUSY,2,Goto(s|10)
-exten => sw-15-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-15-DONTCALL,2,Goto(s|10)
-exten => sw-15-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-15-TORTURE,2,Goto(s|10)
+exten => _sw-15-.,10,Voicemail(u${ext})
+exten => _sw-15-.,11,Goto(s|10)
+exten => sw-15-NOANSWER,10,Voicemail(u${ext})
+exten => sw-15-NOANSWER,11,Goto(s|10)
+exten => sw-15-ANSWER,10,Goto(s|10)
+exten => sw-15-BUSY,10,Voicemail(b${ext})
+exten => sw-15-BUSY,11,Goto(s|10)
+exten => sw-15-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-15-DONTCALL,11,Goto(s|10)
+exten => sw-15-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-15-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_14]
@@ -347,19 +347,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-16-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-16-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_14-16)
-exten => _sw-16-.,1,Voicemail(u${ext})
-exten => _sw-16-.,2,Goto(s|10)
-exten => sw-16-NOANSWER,1,Voicemail(u${ext})
-exten => sw-16-NOANSWER,2,Goto(s|10)
-exten => sw-16-ANSWER,1,Goto(s|10)
-exten => sw-16-BUSY,1,Voicemail(b${ext})
-exten => sw-16-BUSY,2,Goto(s|10)
-exten => sw-16-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-16-DONTCALL,2,Goto(s|10)
-exten => sw-16-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-16-TORTURE,2,Goto(s|10)
+exten => _sw-16-.,10,Voicemail(u${ext})
+exten => _sw-16-.,11,Goto(s|10)
+exten => sw-16-NOANSWER,10,Voicemail(u${ext})
+exten => sw-16-NOANSWER,11,Goto(s|10)
+exten => sw-16-ANSWER,10,Goto(s|10)
+exten => sw-16-BUSY,10,Voicemail(b${ext})
+exten => sw-16-BUSY,11,Goto(s|10)
+exten => sw-16-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-16-DONTCALL,11,Goto(s|10)
+exten => sw-16-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-16-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_15]
@@ -371,19 +371,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-17-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-17-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_15-17)
-exten => _sw-17-.,1,Voicemail(u${ext})
-exten => _sw-17-.,2,Goto(s|10)
-exten => sw-17-NOANSWER,1,Voicemail(u${ext})
-exten => sw-17-NOANSWER,2,Goto(s|10)
-exten => sw-17-ANSWER,1,Goto(s|10)
-exten => sw-17-BUSY,1,Voicemail(b${ext})
-exten => sw-17-BUSY,2,Goto(s|10)
-exten => sw-17-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-17-DONTCALL,2,Goto(s|10)
-exten => sw-17-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-17-TORTURE,2,Goto(s|10)
+exten => _sw-17-.,10,Voicemail(u${ext})
+exten => _sw-17-.,11,Goto(s|10)
+exten => sw-17-NOANSWER,10,Voicemail(u${ext})
+exten => sw-17-NOANSWER,11,Goto(s|10)
+exten => sw-17-ANSWER,10,Goto(s|10)
+exten => sw-17-BUSY,10,Voicemail(b${ext})
+exten => sw-17-BUSY,11,Goto(s|10)
+exten => sw-17-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-17-DONTCALL,11,Goto(s|10)
+exten => sw-17-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-17-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_16]
@@ -395,19 +395,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-18-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-18-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_16-18)
-exten => _sw-18-.,1,Voicemail(u${ext})
-exten => _sw-18-.,2,Goto(s|10)
-exten => sw-18-NOANSWER,1,Voicemail(u${ext})
-exten => sw-18-NOANSWER,2,Goto(s|10)
-exten => sw-18-ANSWER,1,Goto(s|10)
-exten => sw-18-BUSY,1,Voicemail(b${ext})
-exten => sw-18-BUSY,2,Goto(s|10)
-exten => sw-18-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-18-DONTCALL,2,Goto(s|10)
-exten => sw-18-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-18-TORTURE,2,Goto(s|10)
+exten => _sw-18-.,10,Voicemail(u${ext})
+exten => _sw-18-.,11,Goto(s|10)
+exten => sw-18-NOANSWER,10,Voicemail(u${ext})
+exten => sw-18-NOANSWER,11,Goto(s|10)
+exten => sw-18-ANSWER,10,Goto(s|10)
+exten => sw-18-BUSY,10,Voicemail(b${ext})
+exten => sw-18-BUSY,11,Goto(s|10)
+exten => sw-18-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-18-DONTCALL,11,Goto(s|10)
+exten => sw-18-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-18-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_17]
@@ -419,19 +419,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-19-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-19-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_17-19)
-exten => _sw-19-.,1,Voicemail(u${ext})
-exten => _sw-19-.,2,Goto(s|10)
-exten => sw-19-NOANSWER,1,Voicemail(u${ext})
-exten => sw-19-NOANSWER,2,Goto(s|10)
-exten => sw-19-ANSWER,1,Goto(s|10)
-exten => sw-19-BUSY,1,Voicemail(b${ext})
-exten => sw-19-BUSY,2,Goto(s|10)
-exten => sw-19-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-19-DONTCALL,2,Goto(s|10)
-exten => sw-19-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-19-TORTURE,2,Goto(s|10)
+exten => _sw-19-.,10,Voicemail(u${ext})
+exten => _sw-19-.,11,Goto(s|10)
+exten => sw-19-NOANSWER,10,Voicemail(u${ext})
+exten => sw-19-NOANSWER,11,Goto(s|10)
+exten => sw-19-ANSWER,10,Goto(s|10)
+exten => sw-19-BUSY,10,Voicemail(b${ext})
+exten => sw-19-BUSY,11,Goto(s|10)
+exten => sw-19-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-19-DONTCALL,11,Goto(s|10)
+exten => sw-19-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-19-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_18]
@@ -443,19 +443,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-20-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-20-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_18-20)
-exten => _sw-20-.,1,Voicemail(u${ext})
-exten => _sw-20-.,2,Goto(s|10)
-exten => sw-20-NOANSWER,1,Voicemail(u${ext})
-exten => sw-20-NOANSWER,2,Goto(s|10)
-exten => sw-20-ANSWER,1,Goto(s|10)
-exten => sw-20-BUSY,1,Voicemail(b${ext})
-exten => sw-20-BUSY,2,Goto(s|10)
-exten => sw-20-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-20-DONTCALL,2,Goto(s|10)
-exten => sw-20-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-20-TORTURE,2,Goto(s|10)
+exten => _sw-20-.,10,Voicemail(u${ext})
+exten => _sw-20-.,11,Goto(s|10)
+exten => sw-20-NOANSWER,10,Voicemail(u${ext})
+exten => sw-20-NOANSWER,11,Goto(s|10)
+exten => sw-20-ANSWER,10,Goto(s|10)
+exten => sw-20-BUSY,10,Voicemail(b${ext})
+exten => sw-20-BUSY,11,Goto(s|10)
+exten => sw-20-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-20-DONTCALL,11,Goto(s|10)
+exten => sw-20-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-20-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_19]
@@ -467,19 +467,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-21-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-21-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_19-21)
-exten => _sw-21-.,1,Voicemail(u${ext})
-exten => _sw-21-.,2,Goto(s|10)
-exten => sw-21-NOANSWER,1,Voicemail(u${ext})
-exten => sw-21-NOANSWER,2,Goto(s|10)
-exten => sw-21-ANSWER,1,Goto(s|10)
-exten => sw-21-BUSY,1,Voicemail(b${ext})
-exten => sw-21-BUSY,2,Goto(s|10)
-exten => sw-21-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-21-DONTCALL,2,Goto(s|10)
-exten => sw-21-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-21-TORTURE,2,Goto(s|10)
+exten => _sw-21-.,10,Voicemail(u${ext})
+exten => _sw-21-.,11,Goto(s|10)
+exten => sw-21-NOANSWER,10,Voicemail(u${ext})
+exten => sw-21-NOANSWER,11,Goto(s|10)
+exten => sw-21-ANSWER,10,Goto(s|10)
+exten => sw-21-BUSY,10,Voicemail(b${ext})
+exten => sw-21-BUSY,11,Goto(s|10)
+exten => sw-21-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-21-DONTCALL,11,Goto(s|10)
+exten => sw-21-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-21-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_20]
@@ -491,19 +491,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-22-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-22-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_20-22)
-exten => _sw-22-.,1,Voicemail(u${ext})
-exten => _sw-22-.,2,Goto(s|10)
-exten => sw-22-NOANSWER,1,Voicemail(u${ext})
-exten => sw-22-NOANSWER,2,Goto(s|10)
-exten => sw-22-ANSWER,1,Goto(s|10)
-exten => sw-22-BUSY,1,Voicemail(b${ext})
-exten => sw-22-BUSY,2,Goto(s|10)
-exten => sw-22-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-22-DONTCALL,2,Goto(s|10)
-exten => sw-22-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-22-TORTURE,2,Goto(s|10)
+exten => _sw-22-.,10,Voicemail(u${ext})
+exten => _sw-22-.,11,Goto(s|10)
+exten => sw-22-NOANSWER,10,Voicemail(u${ext})
+exten => sw-22-NOANSWER,11,Goto(s|10)
+exten => sw-22-ANSWER,10,Goto(s|10)
+exten => sw-22-BUSY,10,Voicemail(b${ext})
+exten => sw-22-BUSY,11,Goto(s|10)
+exten => sw-22-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-22-DONTCALL,11,Goto(s|10)
+exten => sw-22-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-22-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_21]
@@ -515,19 +515,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-23-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-23-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_21-23)
-exten => _sw-23-.,1,Voicemail(u${ext})
-exten => _sw-23-.,2,Goto(s|10)
-exten => sw-23-NOANSWER,1,Voicemail(u${ext})
-exten => sw-23-NOANSWER,2,Goto(s|10)
-exten => sw-23-ANSWER,1,Goto(s|10)
-exten => sw-23-BUSY,1,Voicemail(b${ext})
-exten => sw-23-BUSY,2,Goto(s|10)
-exten => sw-23-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-23-DONTCALL,2,Goto(s|10)
-exten => sw-23-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-23-TORTURE,2,Goto(s|10)
+exten => _sw-23-.,10,Voicemail(u${ext})
+exten => _sw-23-.,11,Goto(s|10)
+exten => sw-23-NOANSWER,10,Voicemail(u${ext})
+exten => sw-23-NOANSWER,11,Goto(s|10)
+exten => sw-23-ANSWER,10,Goto(s|10)
+exten => sw-23-BUSY,10,Voicemail(b${ext})
+exten => sw-23-BUSY,11,Goto(s|10)
+exten => sw-23-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-23-DONTCALL,11,Goto(s|10)
+exten => sw-23-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-23-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_22]
@@ -539,19 +539,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-24-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-24-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_22-24)
-exten => _sw-24-.,1,Voicemail(u${ext})
-exten => _sw-24-.,2,Goto(s|10)
-exten => sw-24-NOANSWER,1,Voicemail(u${ext})
-exten => sw-24-NOANSWER,2,Goto(s|10)
-exten => sw-24-ANSWER,1,Goto(s|10)
-exten => sw-24-BUSY,1,Voicemail(b${ext})
-exten => sw-24-BUSY,2,Goto(s|10)
-exten => sw-24-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-24-DONTCALL,2,Goto(s|10)
-exten => sw-24-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-24-TORTURE,2,Goto(s|10)
+exten => _sw-24-.,10,Voicemail(u${ext})
+exten => _sw-24-.,11,Goto(s|10)
+exten => sw-24-NOANSWER,10,Voicemail(u${ext})
+exten => sw-24-NOANSWER,11,Goto(s|10)
+exten => sw-24-ANSWER,10,Goto(s|10)
+exten => sw-24-BUSY,10,Voicemail(b${ext})
+exten => sw-24-BUSY,11,Goto(s|10)
+exten => sw-24-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-24-DONTCALL,11,Goto(s|10)
+exten => sw-24-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-24-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_23]
@@ -563,19 +563,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-25-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-25-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_23-25)
-exten => _sw-25-.,1,Voicemail(u${ext})
-exten => _sw-25-.,2,Goto(s|10)
-exten => sw-25-NOANSWER,1,Voicemail(u${ext})
-exten => sw-25-NOANSWER,2,Goto(s|10)
-exten => sw-25-ANSWER,1,Goto(s|10)
-exten => sw-25-BUSY,1,Voicemail(b${ext})
-exten => sw-25-BUSY,2,Goto(s|10)
-exten => sw-25-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-25-DONTCALL,2,Goto(s|10)
-exten => sw-25-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-25-TORTURE,2,Goto(s|10)
+exten => _sw-25-.,10,Voicemail(u${ext})
+exten => _sw-25-.,11,Goto(s|10)
+exten => sw-25-NOANSWER,10,Voicemail(u${ext})
+exten => sw-25-NOANSWER,11,Goto(s|10)
+exten => sw-25-ANSWER,10,Goto(s|10)
+exten => sw-25-BUSY,10,Voicemail(b${ext})
+exten => sw-25-BUSY,11,Goto(s|10)
+exten => sw-25-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-25-DONTCALL,11,Goto(s|10)
+exten => sw-25-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-25-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_24]
@@ -587,19 +587,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-26-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-26-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_24-26)
-exten => _sw-26-.,1,Voicemail(u${ext})
-exten => _sw-26-.,2,Goto(s|10)
-exten => sw-26-NOANSWER,1,Voicemail(u${ext})
-exten => sw-26-NOANSWER,2,Goto(s|10)
-exten => sw-26-ANSWER,1,Goto(s|10)
-exten => sw-26-BUSY,1,Voicemail(b${ext})
-exten => sw-26-BUSY,2,Goto(s|10)
-exten => sw-26-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-26-DONTCALL,2,Goto(s|10)
-exten => sw-26-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-26-TORTURE,2,Goto(s|10)
+exten => _sw-26-.,10,Voicemail(u${ext})
+exten => _sw-26-.,11,Goto(s|10)
+exten => sw-26-NOANSWER,10,Voicemail(u${ext})
+exten => sw-26-NOANSWER,11,Goto(s|10)
+exten => sw-26-ANSWER,10,Goto(s|10)
+exten => sw-26-BUSY,10,Voicemail(b${ext})
+exten => sw-26-BUSY,11,Goto(s|10)
+exten => sw-26-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-26-DONTCALL,11,Goto(s|10)
+exten => sw-26-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-26-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_25]
@@ -611,19 +611,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-27-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-27-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_25-27)
-exten => _sw-27-.,1,Voicemail(u${ext})
-exten => _sw-27-.,2,Goto(s|10)
-exten => sw-27-NOANSWER,1,Voicemail(u${ext})
-exten => sw-27-NOANSWER,2,Goto(s|10)
-exten => sw-27-ANSWER,1,Goto(s|10)
-exten => sw-27-BUSY,1,Voicemail(b${ext})
-exten => sw-27-BUSY,2,Goto(s|10)
-exten => sw-27-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-27-DONTCALL,2,Goto(s|10)
-exten => sw-27-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-27-TORTURE,2,Goto(s|10)
+exten => _sw-27-.,10,Voicemail(u${ext})
+exten => _sw-27-.,11,Goto(s|10)
+exten => sw-27-NOANSWER,10,Voicemail(u${ext})
+exten => sw-27-NOANSWER,11,Goto(s|10)
+exten => sw-27-ANSWER,10,Goto(s|10)
+exten => sw-27-BUSY,10,Voicemail(b${ext})
+exten => sw-27-BUSY,11,Goto(s|10)
+exten => sw-27-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-27-DONTCALL,11,Goto(s|10)
+exten => sw-27-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-27-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_26]
@@ -635,19 +635,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-28-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-28-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_26-28)
-exten => _sw-28-.,1,Voicemail(u${ext})
-exten => _sw-28-.,2,Goto(s|10)
-exten => sw-28-NOANSWER,1,Voicemail(u${ext})
-exten => sw-28-NOANSWER,2,Goto(s|10)
-exten => sw-28-ANSWER,1,Goto(s|10)
-exten => sw-28-BUSY,1,Voicemail(b${ext})
-exten => sw-28-BUSY,2,Goto(s|10)
-exten => sw-28-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-28-DONTCALL,2,Goto(s|10)
-exten => sw-28-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-28-TORTURE,2,Goto(s|10)
+exten => _sw-28-.,10,Voicemail(u${ext})
+exten => _sw-28-.,11,Goto(s|10)
+exten => sw-28-NOANSWER,10,Voicemail(u${ext})
+exten => sw-28-NOANSWER,11,Goto(s|10)
+exten => sw-28-ANSWER,10,Goto(s|10)
+exten => sw-28-BUSY,10,Voicemail(b${ext})
+exten => sw-28-BUSY,11,Goto(s|10)
+exten => sw-28-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-28-DONTCALL,11,Goto(s|10)
+exten => sw-28-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-28-TORTURE,11,Goto(s|10)
[macro-std-priv-exten_27]
@@ -659,19 +659,19 @@
exten => s,6,Set(dontcont=${ARG6})
exten => s,7,Dial(${dev}|${timeout}|${opts})
exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-29-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-29-${DIALSTATUS}|10)
exten => s,10,NoOp(Finish switch-std-priv-exten_27-29)
-exten => _sw-29-.,1,Voicemail(u${ext})
-exten => _sw-29-.,2,Goto(s|10)
[... 2664 lines stripped ...]
More information about the svn-commits
mailing list