[svn-commits] murf: branch 1.4 r136726 - in /branches/1.4: include/asterisk/ pbx/ pbx/ael/a...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Thu Aug 7 19:15:34 CDT 2008


Author: murf
Date: Thu Aug  7 19:15:34 2008
New Revision: 136726

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136726
Log:

(closes issue #13236)
Reported by: korihor

Wow, this one was a challenge!

I regrouped and ran a new strategy for
setting the ~~MACRO~~ value; I set it once
per extension, up near the top. It is only
set if there is a switch in the extension.

So, I had to put in a chunk of code to detect
a switch in the pval tree.

I moved the code to insert the set of ~~exten~~
up to the beginning of the gen_prios routine, 
instead of down in the switch code.

I learned that I have to push the detection
of the switches down into the code, so everywhere
I create a new exten in gen_prios, I make sure
to pass onto it the values of the mother_exten
first, and the exten next.

I had to add a couple fields to the exten
struct to accomplish this, in the ael_structs.h
file. The checked field makes it so we don't
repeat the switch search if it's been done.

I also updated the regressions.


Modified:
    branches/1.4/include/asterisk/ael_structs.h
    branches/1.4/pbx/ael/ael-test/ref.ael-ntest10
    branches/1.4/pbx/ael/ael-test/ref.ael-test18
    branches/1.4/pbx/ael/ael-test/ref.ael-test8
    branches/1.4/pbx/ael/ael-test/ref.ael-vtest13
    branches/1.4/pbx/pbx_ael.c

Modified: branches/1.4/include/asterisk/ael_structs.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/ael_structs.h?view=diff&rev=136726&r1=136725&r2=136726
==============================================================================
--- branches/1.4/include/asterisk/ael_structs.h (original)
+++ branches/1.4/include/asterisk/ael_structs.h Thu Aug  7 19:15:34 2008
@@ -178,7 +178,8 @@
 	char *hints;
 	int regexten;
 	int is_switch;
-	int has_switch;
+	int has_switch; /* set if a switch exists in the extension */
+	int checked_switch; /* set if we checked for a switch in the extension -- so we don't have to do it again */
 	
 	struct ast_context *context;
 	

Modified: branches/1.4/pbx/ael/ael-test/ref.ael-ntest10
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/ael/ael-test/ref.ael-ntest10?view=diff&rev=136726&r1=136725&r2=136726
==============================================================================
--- branches/1.4/pbx/ael/ael-test/ref.ael-ntest10 (original)
+++ branches/1.4/pbx/ael/ael-test/ref.ael-ntest10 Thu Aug  7 19:15:34 2008
@@ -5,20 +5,20 @@
 
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:4131 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 122-122: A default case was automatically added to the switch.
-LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4468 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4475 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4483 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2248 func: check_switch_expr  Warning: file ./extensions.ael, line 122-122: A default case was automatically added to the switch.
+LOG: lev:2 file:pbx_ael.c  line:4486 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
 Executed ast_context_create(conts, name=macro-endsess, registrar=pbx_ael);
 Executed ast_context_create(conts, name=macro-nullchk, registrar=pbx_ael);
 Executed ast_context_create(conts, name=macro-endcall, registrar=pbx_ael);
@@ -98,15 +98,14 @@
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall4-13, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=_sw-13-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|9, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-13-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=10, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=11, label=(null), callerid=(null), appl=Goto, data=sw-14-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=12, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall4-out-13-14, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-13-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=_sw-14-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-13-out|12, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-14-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=11, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall4-out-13-14, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-13-.|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=_sw-14-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-13-out|11, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-14-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-13-out|12, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-13-out|11, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-sw-endcall4-out-13-in-14-15, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-14-.|10, FREE, registrar=pbx_ael);
@@ -130,15 +129,14 @@
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall5-20, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=_sw-20-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|9, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-20-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=10, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=11, label=(null), callerid=(null), appl=Goto, data=sw-21-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=12, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall5-out-20-21, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-20-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=_sw-21-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-20-out|12, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-21-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=11, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall5-out-20-21, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-20-.|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=_sw-21-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-20-out|11, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-21-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-20-out|12, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-20-out|11, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-sw-endcall5-out-20-in-21-22, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-21-.|10, FREE, registrar=pbx_ael);
@@ -157,9 +155,9 @@
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-21-in|ptr1, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall5-out-16-17, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-16-in|10, FREE, registrar=pbx_ael);
-LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4488 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
 Executed ast_merge_contexts_and_delete();
-LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4491 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
 Executed ast_walk_contexts();
-LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:543 func: main  7 contexts, 37 extensions, 131 priorities
+LOG: lev:2 file:pbx_ael.c  line:4494 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  7 contexts, 37 extensions, 129 priorities

Modified: 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=diff&rev=136726&r1=136725&r2=136726
==============================================================================
--- branches/1.4/pbx/ael/ael-test/ref.ael-test18 (original)
+++ branches/1.4/pbx/ael/ael-test/ref.ael-test18 Thu Aug  7 19:15:34 2008
@@ -2,11 +2,11 @@
 (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:4131 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:543 func: main  1 contexts, 7 extensions, 29 priorities
+LOG: lev:2 file:pbx_ael.c  line:4468 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4475 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4483 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4486 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4488 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4491 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4494 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  1 contexts, 7 extensions, 28 priorities

Modified: branches/1.4/pbx/ael/ael-test/ref.ael-test8
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/ael/ael-test/ref.ael-test8?view=diff&rev=136726&r1=136725&r2=136726
==============================================================================
--- branches/1.4/pbx/ael/ael-test/ref.ael-test8 (original)
+++ branches/1.4/pbx/ael/ael-test/ref.ael-test8 Thu Aug  7 19:15:34 2008
@@ -2,11 +2,11 @@
 (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:4131 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:543 func: main  1 contexts, 7 extensions, 19 priorities
+LOG: lev:2 file:pbx_ael.c  line:4468 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4475 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4483 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4486 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4488 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4491 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4494 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  1 contexts, 7 extensions, 18 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=136726&r1=136725&r2=136726
==============================================================================
--- branches/1.4/pbx/ael/ael-test/ref.ael-vtest13 (original)
+++ branches/1.4/pbx/ael/ael-test/ref.ael-vtest13 Thu Aug  7 19:15:34 2008
@@ -13,8 +13,8 @@
 [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,Set(~~EXTEN~~=${EXTEN})
+exten => s,3,Set(~~EXTEN~~=${EXTEN})
+exten => s,4,Dial(${dev}/${ext}|20)
 exten => s,5,Goto(sw-1-${DIALSTATUS}|10)
 exten => s,6,NoOp(Finish switch-std-exten-1)
 exten => a,1,VoiceMailMain(${ext})
@@ -35,9 +35,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-3-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_1-3)
 exten => _sw-3-.,10,Voicemail(u${ext})
@@ -61,9 +61,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-4-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_2-4)
 exten => _sw-4-.,10,Voicemail(u${ext})
@@ -87,9 +87,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-5-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_3-5)
 exten => _sw-5-.,10,Voicemail(u${ext})
@@ -113,9 +113,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-6-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_4-6)
 exten => _sw-6-.,10,Voicemail(u${ext})
@@ -139,9 +139,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-7-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_5-7)
 exten => _sw-7-.,10,Voicemail(u${ext})
@@ -165,9 +165,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-8-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_6-8)
 exten => _sw-8-.,10,Voicemail(u${ext})
@@ -191,9 +191,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-9-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_7-9)
 exten => _sw-9-.,10,Voicemail(u${ext})
@@ -217,9 +217,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-10-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_8-10)
 exten => _sw-10-.,10,Voicemail(u${ext})
@@ -243,9 +243,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-11-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_9-11)
 exten => _sw-11-.,10,Voicemail(u${ext})
@@ -269,9 +269,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-12-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_10-12)
 exten => _sw-12-.,10,Voicemail(u${ext})
@@ -295,9 +295,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-13-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_11-13)
 exten => _sw-13-.,10,Voicemail(u${ext})
@@ -321,9 +321,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-14-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_12-14)
 exten => _sw-14-.,10,Voicemail(u${ext})
@@ -347,9 +347,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-15-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_13-15)
 exten => _sw-15-.,10,Voicemail(u${ext})
@@ -373,9 +373,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-16-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_14-16)
 exten => _sw-16-.,10,Voicemail(u${ext})
@@ -399,9 +399,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-17-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_15-17)
 exten => _sw-17-.,10,Voicemail(u${ext})
@@ -425,9 +425,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-18-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_16-18)
 exten => _sw-18-.,10,Voicemail(u${ext})
@@ -451,9 +451,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-19-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_17-19)
 exten => _sw-19-.,10,Voicemail(u${ext})
@@ -477,9 +477,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-20-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_18-20)
 exten => _sw-20-.,10,Voicemail(u${ext})
@@ -503,9 +503,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-21-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_19-21)
 exten => _sw-21-.,10,Voicemail(u${ext})
@@ -529,9 +529,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-22-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_20-22)
 exten => _sw-22-.,10,Voicemail(u${ext})
@@ -555,9 +555,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-23-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_21-23)
 exten => _sw-23-.,10,Voicemail(u${ext})
@@ -581,9 +581,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-24-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_22-24)
 exten => _sw-24-.,10,Voicemail(u${ext})
@@ -607,9 +607,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-25-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_23-25)
 exten => _sw-25-.,10,Voicemail(u${ext})
@@ -633,9 +633,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-26-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_24-26)
 exten => _sw-26-.,10,Voicemail(u${ext})
@@ -659,9 +659,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-27-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_25-27)
 exten => _sw-27-.,10,Voicemail(u${ext})
@@ -685,9 +685,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-28-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_26-28)
 exten => _sw-28-.,10,Voicemail(u${ext})
@@ -711,9 +711,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-29-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_27-29)
 exten => _sw-29-.,10,Voicemail(u${ext})
@@ -737,9 +737,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-30-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_28-30)
 exten => _sw-30-.,10,Voicemail(u${ext})
@@ -763,9 +763,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-31-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_29-31)
 exten => _sw-31-.,10,Voicemail(u${ext})
@@ -789,9 +789,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-32-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_30-32)
 exten => _sw-32-.,10,Voicemail(u${ext})
@@ -815,9 +815,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-33-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_31-33)
 exten => _sw-33-.,10,Voicemail(u${ext})
@@ -841,9 +841,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-34-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_32-34)
 exten => _sw-34-.,10,Voicemail(u${ext})
@@ -867,9 +867,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-35-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_33-35)
 exten => _sw-35-.,10,Voicemail(u${ext})
@@ -893,9 +893,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-36-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_34-36)
 exten => _sw-36-.,10,Voicemail(u${ext})
@@ -919,9 +919,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)
 exten => s,10,Goto(sw-37-${DIALSTATUS}|10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_35-37)
 exten => _sw-37-.,10,Voicemail(u${ext})
@@ -945,9 +945,9 @@
 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,Set(~~EXTEN~~=${EXTEN})
+exten => s,7,Set(~~EXTEN~~=${EXTEN})
+exten => s,8,Dial(${dev}|${timeout}|${opts})
+exten => s,9,NoOp(${DIALSTATUS} was chosen)

[... 1002 lines stripped ...]



More information about the svn-commits mailing list