[asterisk-commits] murf: branch murf/AEL2-1.2 r59075 - in
/team/murf/AEL2-1.2: include/asterisk/...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Mar 20 12:43:47 MST 2007
Author: murf
Date: Tue Mar 20 14:43:47 2007
New Revision: 59075
URL: http://svn.digium.com/view/asterisk?view=rev&rev=59075
Log:
Updated the patch
Modified:
team/murf/AEL2-1.2/include/asterisk/ael_structs.h
team/murf/AEL2-1.2/patches/diffs.AEL2.patch
team/murf/AEL2-1.2/pbx/pbx_ael2.c
Modified: team/murf/AEL2-1.2/include/asterisk/ael_structs.h
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/include/asterisk/ael_structs.h?view=diff&rev=59075&r1=59074&r2=59075
==============================================================================
--- team/murf/AEL2-1.2/include/asterisk/ael_structs.h (original)
+++ team/murf/AEL2-1.2/include/asterisk/ael_structs.h Tue Mar 20 14:43:47 2007
@@ -176,6 +176,7 @@
char *cidmatch;
char *hints;
int regexten;
+ int is_switch;
struct ast_context *context;
Modified: team/murf/AEL2-1.2/patches/diffs.AEL2.patch
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/patches/diffs.AEL2.patch?view=diff&rev=59075&r1=59074&r2=59075
==============================================================================
--- team/murf/AEL2-1.2/patches/diffs.AEL2.patch (original)
+++ team/murf/AEL2-1.2/patches/diffs.AEL2.patch Tue Mar 20 14:43:47 2007
@@ -1,7 +1,7 @@
Index: pbx/argdesc.y
===================================================================
--- pbx/argdesc.y (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,268 @@
+%{
+#include <stdio.h>
@@ -284,7 +284,7 @@
Index: pbx/ael.tab.c
===================================================================
--- pbx/ael.tab.c (.../branches/1.2) (revision 0)
-+++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,3334 @@
+/* A Bison parser, made by GNU Bison 2.1a. */
+
@@ -3633,7 +3633,7 @@
Index: pbx/ael_lex.c
===================================================================
--- pbx/ael_lex.c (.../branches/1.2) (revision 0)
-+++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,3015 @@
+#line 2 "ael_lex.c"
+
@@ -6662,8 +6662,8 @@
Index: pbx/pbx_ael.c
===================================================================
---- pbx/pbx_ael.c (.../branches/1.2) (revision 57439)
-+++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 57439)
+--- pbx/pbx_ael.c (.../branches/1.2) (revision 59074)
++++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 59074)
@@ -1258,7 +1258,6 @@
static int ael_reload(int fd, int argc, char *argv[])
@@ -6683,7 +6683,7 @@
Index: pbx/ael.tab.h
===================================================================
--- pbx/ael.tab.h (.../branches/1.2) (revision 0)
-+++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,150 @@
+/* A Bison parser, made by GNU Bison 2.1a. */
+
@@ -6848,7 +6848,7 @@
Index: pbx/argdesc.tab.c
===================================================================
--- pbx/argdesc.tab.c (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,1730 @@
+/* A Bison parser, made by GNU Bison 2.0. */
+
@@ -8593,7 +8593,7 @@
Index: pbx/ael.flex
===================================================================
--- pbx/ael.flex (.../branches/1.2) (revision 0)
-+++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,594 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
@@ -9202,7 +9202,7 @@
Index: pbx/argdesc_lex.c
===================================================================
--- pbx/argdesc_lex.c (.../branches/1.2) (revision 0)
-+++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,2141 @@
+#line 2 "argdesc_lex.c"
+
@@ -11358,7 +11358,7 @@
Index: pbx/argdesc.l
===================================================================
--- pbx/argdesc.l (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,88 @@
+%{
+#include <sys/types.h>
@@ -11461,7 +11461,7 @@
Index: pbx/argdesc.tab.h
===================================================================
--- pbx/argdesc.tab.h (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,115 @@
+/* A Bison parser, made by GNU Bison 2.0. */
+
@@ -11591,7 +11591,7 @@
Index: pbx/ael.y
===================================================================
--- pbx/ael.y (.../branches/1.2) (revision 0)
-+++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,820 @@
+%{
+/*
@@ -12426,7 +12426,7 @@
Index: pbx/applist
===================================================================
--- pbx/applist (.../branches/1.2) (revision 0)
-+++ pbx/applist (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/applist (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,142 @@
+ AddQueueMember: "Dynamically adds queue members"; args=queuename|[interface]|[:penalty#i]|[:options]; options=j; Chanvars=AQMSTATUS:ADDED | MEMBERALREADY | NOSUCHQUEUE;
+ ADSIProg: "Load Asterisk ADSI Scripts into phone"; args=scriptfile;
@@ -12582,8 +12582,8 @@
Index: pbx/Makefile
===================================================================
---- pbx/Makefile (.../branches/1.2) (revision 57439)
-+++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 57439)
+--- pbx/Makefile (.../branches/1.2) (revision 59074)
++++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 59074)
@@ -12,7 +12,7 @@
#
@@ -12641,7 +12641,7 @@
Index: pbx/pbx_ael2.c
===================================================================
--- pbx/pbx_ael2.c (.../branches/1.2) (revision 0)
-+++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,4378 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
@@ -17034,7 +17034,7 @@
Index: pbx/ael-test/ref.ael-test6
===================================================================
--- pbx/ael-test/ref.ael-test6 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,45 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17094,7 +17094,7 @@
Index: pbx/ael-test/ref.ael-test7
===================================================================
--- pbx/ael-test/ref.ael-test7 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,15 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17124,7 +17124,7 @@
Index: pbx/ael-test/ref.ael-test8
===================================================================
--- pbx/ael-test/ref.ael-test8 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 57439)
++++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 59074)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17151,2884 +17151,6 @@
Index: pbx/ael-test/ref.ael-vtest13
===================================================================
---- pbx/ael-test/ref.ael-vtest13 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-vtest13 (.../team/murf/AEL2-1.2) (revision 57439)
-@@ -0,0 +1,2875 @@
-+[globals]
-+static=yes
-+writeprotect=yes
-+CONSOLE=Console/dsp
-+IAXINFO=murf:tlhfckoct
-+FWDNUMBER=544788
-+FWDCIDNAME="Joe-Worker"
-+FWDPASSWORD=zingledoodle
-+FWDRINGS=Zap/6
-+FWDVMBOX=1
-+
-+
-+[macro-std-exten]
-+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,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)
-+
-+
-+[macro-std-priv-exten_1]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_2]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_3]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_4]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_5]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_6]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_7]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_8]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_9]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_10]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_11]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_12]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_13]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_14]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_15]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_16]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_17]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_18]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_19]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_20]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_21]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_22]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_23]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_24]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_25]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_26]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,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)
-+
-+
-+[macro-std-priv-exten_27]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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,10,NoOp(Finish switch-std-priv-exten_27-29)
-+exten => _sw-29-.,1,Voicemail(u${ext})
-+exten => _sw-29-.,2,Goto(s|10)
-+exten => sw-29-NOANSWER,1,Voicemail(u${ext})
-+exten => sw-29-NOANSWER,2,Goto(s|10)
-+exten => sw-29-ANSWER,1,Goto(s|10)
-+exten => sw-29-BUSY,1,Voicemail(b${ext})
-+exten => sw-29-BUSY,2,Goto(s|10)
-+exten => sw-29-DONTCALL,1,Goto(${dontcont}|s|begin)
-+exten => sw-29-DONTCALL,2,Goto(s|10)
-+exten => sw-29-TORTURE,1,Goto(${torcont}|s|begin)
-+exten => sw-29-TORTURE,2,Goto(s|10)
-+
-+
-+[macro-std-priv-exten_28]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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-30-${DIALSTATUS}|1)
-+exten => s,10,NoOp(Finish switch-std-priv-exten_28-30)
-+exten => _sw-30-.,1,Voicemail(u${ext})
-+exten => _sw-30-.,2,Goto(s|10)
-+exten => sw-30-NOANSWER,1,Voicemail(u${ext})
-+exten => sw-30-NOANSWER,2,Goto(s|10)
-+exten => sw-30-ANSWER,1,Goto(s|10)
-+exten => sw-30-BUSY,1,Voicemail(b${ext})
-+exten => sw-30-BUSY,2,Goto(s|10)
-+exten => sw-30-DONTCALL,1,Goto(${dontcont}|s|begin)
-+exten => sw-30-DONTCALL,2,Goto(s|10)
-+exten => sw-30-TORTURE,1,Goto(${torcont}|s|begin)
-+exten => sw-30-TORTURE,2,Goto(s|10)
-+
-+
-+[macro-std-priv-exten_29]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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-31-${DIALSTATUS}|1)
-+exten => s,10,NoOp(Finish switch-std-priv-exten_29-31)
-+exten => _sw-31-.,1,Voicemail(u${ext})
-+exten => _sw-31-.,2,Goto(s|10)
-+exten => sw-31-NOANSWER,1,Voicemail(u${ext})
-+exten => sw-31-NOANSWER,2,Goto(s|10)
-+exten => sw-31-ANSWER,1,Goto(s|10)
-+exten => sw-31-BUSY,1,Voicemail(b${ext})
-+exten => sw-31-BUSY,2,Goto(s|10)
-+exten => sw-31-DONTCALL,1,Goto(${dontcont}|s|begin)
-+exten => sw-31-DONTCALL,2,Goto(s|10)
-+exten => sw-31-TORTURE,1,Goto(${torcont}|s|begin)
-+exten => sw-31-TORTURE,2,Goto(s|10)
-+
-+
-+[macro-std-priv-exten_30]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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-32-${DIALSTATUS}|1)
-+exten => s,10,NoOp(Finish switch-std-priv-exten_30-32)
-+exten => _sw-32-.,1,Voicemail(u${ext})
-+exten => _sw-32-.,2,Goto(s|10)
-+exten => sw-32-NOANSWER,1,Voicemail(u${ext})
-+exten => sw-32-NOANSWER,2,Goto(s|10)
-+exten => sw-32-ANSWER,1,Goto(s|10)
-+exten => sw-32-BUSY,1,Voicemail(b${ext})
-+exten => sw-32-BUSY,2,Goto(s|10)
-+exten => sw-32-DONTCALL,1,Goto(${dontcont}|s|begin)
-+exten => sw-32-DONTCALL,2,Goto(s|10)
-+exten => sw-32-TORTURE,1,Goto(${torcont}|s|begin)
-+exten => sw-32-TORTURE,2,Goto(s|10)
-+
-+
-+[macro-std-priv-exten_31]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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-33-${DIALSTATUS}|1)
-+exten => s,10,NoOp(Finish switch-std-priv-exten_31-33)
-+exten => _sw-33-.,1,Voicemail(u${ext})
-+exten => _sw-33-.,2,Goto(s|10)
-+exten => sw-33-NOANSWER,1,Voicemail(u${ext})
-+exten => sw-33-NOANSWER,2,Goto(s|10)
-+exten => sw-33-ANSWER,1,Goto(s|10)
-+exten => sw-33-BUSY,1,Voicemail(b${ext})
-+exten => sw-33-BUSY,2,Goto(s|10)
-+exten => sw-33-DONTCALL,1,Goto(${dontcont}|s|begin)
-+exten => sw-33-DONTCALL,2,Goto(s|10)
-+exten => sw-33-TORTURE,1,Goto(${torcont}|s|begin)
-+exten => sw-33-TORTURE,2,Goto(s|10)
-+
-+
-+[macro-std-priv-exten_32]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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-34-${DIALSTATUS}|1)
-+exten => s,10,NoOp(Finish switch-std-priv-exten_32-34)
-+exten => _sw-34-.,1,Voicemail(u${ext})
-+exten => _sw-34-.,2,Goto(s|10)
-+exten => sw-34-NOANSWER,1,Voicemail(u${ext})
-+exten => sw-34-NOANSWER,2,Goto(s|10)
-+exten => sw-34-ANSWER,1,Goto(s|10)
-+exten => sw-34-BUSY,1,Voicemail(b${ext})
-+exten => sw-34-BUSY,2,Goto(s|10)
-+exten => sw-34-DONTCALL,1,Goto(${dontcont}|s|begin)
-+exten => sw-34-DONTCALL,2,Goto(s|10)
-+exten => sw-34-TORTURE,1,Goto(${torcont}|s|begin)
-+exten => sw-34-TORTURE,2,Goto(s|10)
-+
-+
-+[macro-std-priv-exten_33]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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-35-${DIALSTATUS}|1)
-+exten => s,10,NoOp(Finish switch-std-priv-exten_33-35)
-+exten => _sw-35-.,1,Voicemail(u${ext})
-+exten => _sw-35-.,2,Goto(s|10)
-+exten => sw-35-NOANSWER,1,Voicemail(u${ext})
-+exten => sw-35-NOANSWER,2,Goto(s|10)
-+exten => sw-35-ANSWER,1,Goto(s|10)
-+exten => sw-35-BUSY,1,Voicemail(b${ext})
-+exten => sw-35-BUSY,2,Goto(s|10)
-+exten => sw-35-DONTCALL,1,Goto(${dontcont}|s|begin)
-+exten => sw-35-DONTCALL,2,Goto(s|10)
-+exten => sw-35-TORTURE,1,Goto(${torcont}|s|begin)
-+exten => sw-35-TORTURE,2,Goto(s|10)
-+
-+
-+[macro-std-priv-exten_34]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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-36-${DIALSTATUS}|1)
-+exten => s,10,NoOp(Finish switch-std-priv-exten_34-36)
-+exten => _sw-36-.,1,Voicemail(u${ext})
-+exten => _sw-36-.,2,Goto(s|10)
-+exten => sw-36-NOANSWER,1,Voicemail(u${ext})
-+exten => sw-36-NOANSWER,2,Goto(s|10)
-+exten => sw-36-ANSWER,1,Goto(s|10)
-+exten => sw-36-BUSY,1,Voicemail(b${ext})
-+exten => sw-36-BUSY,2,Goto(s|10)
-+exten => sw-36-DONTCALL,1,Goto(${dontcont}|s|begin)
-+exten => sw-36-DONTCALL,2,Goto(s|10)
-+exten => sw-36-TORTURE,1,Goto(${torcont}|s|begin)
-+exten => sw-36-TORTURE,2,Goto(s|10)
-+
-+
-+[macro-std-priv-exten_35]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
-+exten => s,3,Set(timeout=${ARG3})
-+exten => s,4,Set(opts=${ARG4})
-+exten => s,5,Set(torcont=${ARG5})
-+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-37-${DIALSTATUS}|1)
-+exten => s,10,NoOp(Finish switch-std-priv-exten_35-37)
-+exten => _sw-37-.,1,Voicemail(u${ext})
-+exten => _sw-37-.,2,Goto(s|10)
-+exten => sw-37-NOANSWER,1,Voicemail(u${ext})
-+exten => sw-37-NOANSWER,2,Goto(s|10)
-+exten => sw-37-ANSWER,1,Goto(s|10)
-+exten => sw-37-BUSY,1,Voicemail(b${ext})
-+exten => sw-37-BUSY,2,Goto(s|10)
-+exten => sw-37-DONTCALL,1,Goto(${dontcont}|s|begin)
-+exten => sw-37-DONTCALL,2,Goto(s|10)
-+exten => sw-37-TORTURE,1,Goto(${torcont}|s|begin)
-+exten => sw-37-TORTURE,2,Goto(s|10)
-+
-+
-+[macro-std-priv-exten_36]
-+exten => s,1,Set(dev=${ARG1})
-+exten => s,2,Set(ext=${ARG2})
[... 2744 lines stripped ...]
More information about the asterisk-commits
mailing list