Merged revisions 136746 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r136746 | murf | 2008-08-07 18:48:35 -0600 (Thu, 07 Aug 2008) | 40 lines

Merged revisions 136726 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r136726 | murf | 2008-08-07 18:15:34 -0600 (Thu, 07 Aug 2008) | 32 lines


(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.


........

................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@136778 f38db490-d61c-443f-a65b-d21fe96a405b

5 files changed, 317 insertions, 319 deletions

diff --git a/pbx/ael/ael-test/ref.ael-ntest10 b/pbx/ael/ael-test/ref.ael-ntest10
index d81a54d1a..1b72c5387 100644
--- a/pbx/ael/ael-test/ref.ael-ntest10
+++ b/pbx/ael/ael-test/ref.ael-ntest10
@@ -5,33 +5,33 @@
 
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:112 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:125 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:115 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
 LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1-4: The macro endsess does not end with a return; I will insert one.
 LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 6-9: The macro nullchk does not end with a return; I will insert one.
 LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 11-26: The macro endcall does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch.
 LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 28-44: The macro endcall2 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch.
 LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 46-68: The macro endcall3 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch.
 LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 70-96: The macro endcall4 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch.
 LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 98-131: The macro endcall5 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2284 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:128 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-Executed ast_context_create(conts, name=endsess, registrar=pbx_ael);
-Executed ast_context_create(conts, name=nullchk, registrar=pbx_ael);
-Executed ast_context_create(conts, name=endcall, registrar=pbx_ael);
-Executed ast_context_create(conts, name=endcall2, registrar=pbx_ael);
-Executed ast_context_create(conts, name=endcall3, registrar=pbx_ael);
-Executed ast_context_create(conts, name=endcall4, registrar=pbx_ael);
-Executed ast_context_create(conts, name=endcall5, registrar=pbx_ael);
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2297 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:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+Executed ast_context_find_or_create(conts, name=endsess, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=nullchk, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=endcall, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=endcall2, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=endcall3, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=endcall4, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=endcall5, registrar=pbx_ael);
 Executed ast_add_extension2(context=endsess, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=NoOp, data=hithere, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=endsess, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=nullchk, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael);
@@ -110,15 +110,14 @@ Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=9, label=
 Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=endcall4, rep=0, exten=sw-14-in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-14-.,10, FREE, registrar=pbx_ael);
@@ -143,15 +142,14 @@ Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=9, label=
 Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=endcall5, rep=0, exten=sw-21-in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-21-.,10, FREE, registrar=pbx_ael);
@@ -170,9 +168,9 @@ Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=1
 Executed ast_add_extension2(context=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=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=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:130 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:134 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:133 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:139 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:136 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:516 func: main  7 contexts, 37 extensions, 138 priorities
+LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:518 func: main  7 contexts, 37 extensions, 136 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test18 b/pbx/ael/ael-test/ref.ael-test18
index 25ba51b4f..d5a07770c 100644
--- a/pbx/ael/ael-test/ref.ael-test18
+++ b/pbx/ael/ael-test/ref.ael-test18
@@ -2,10 +2,10 @@
 (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:112 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:125 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:130 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:133 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:136 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:516 func: main  1 contexts, 7 extensions, 29 priorities
+LOG: lev:2 file:pbx_ael.c  line:115 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:518 func: main  1 contexts, 7 extensions, 28 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test19 b/pbx/ael/ael-test/ref.ael-test19
index 4d9df63b7..67519dafd 100644
--- a/pbx/ael/ael-test/ref.ael-test19
+++ b/pbx/ael/ael-test/ref.ael-test19
@@ -2,17 +2,17 @@
 (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:112 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:125 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c  line:2300 func: check_context_names  Warning: file ./extensions.ael, line 49-62: The context name (incoming) is also declared in file ./extensions.ael, line 62-69! (and neither is marked 'extend')
+LOG: lev:2 file:pbx_ael.c  line:115 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pval.c  line:2313 func: check_context_names  Warning: file ./extensions.ael, line 49-62: The context name (incoming) is also declared in file ./extensions.ael, line 62-69! (and neither is marked 'extend')
 LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 71-175: The macro std-priv-exten does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 245-246: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2426 func: check_pval_item  Warning: file ./extensions.ael, line 312-312: macro call to non-existent funcA! (Not even in the extensions.conf stuff!)
-LOG: lev:3 file:pval.c  line:2426 func: check_pval_item  Warning: file ./extensions.ael, line 313-313: macro call to non-existent funcD! (Not even in the extensions.conf stuff!)
+LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 245-246: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2439 func: check_pval_item  Warning: file ./extensions.ael, line 312-312: macro call to non-existent funcA! (Not even in the extensions.conf stuff!)
+LOG: lev:3 file:pval.c  line:2439 func: check_pval_item  Warning: file ./extensions.ael, line 313-313: macro call to non-existent funcD! (Not even in the extensions.conf stuff!)
 LOG: lev:3 file:pval.c  line:1346 func: check_goto  Warning: file ./extensions.ael, line 319-319: goto:  Couldn't find goto target test5|s|1, not even in extensions.conf!
 LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 363-366: The macro dialoutpstn does not end with a return; I will insert one.
-LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:130 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:133 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:136 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:516 func: main  13 contexts, 57 extensions, 194 priorities
+LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:518 func: main  13 contexts, 57 extensions, 190 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test8 b/pbx/ael/ael-test/ref.ael-test8
index 2338d9bdb..970f483c1 100644
--- a/pbx/ael/ael-test/ref.ael-test8
+++ b/pbx/ael/ael-test/ref.ael-test8
@@ -2,10 +2,10 @@
 (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:112 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:125 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:130 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:133 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:136 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:516 func: main  1 contexts, 7 extensions, 19 priorities
+LOG: lev:2 file:pbx_ael.c  line:115 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:518 func: main  1 contexts, 7 extensions, 18 priorities
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
index 58f9c7fa6..79a5e48fd 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
@@ -13,8 +13,8 @@ FWDVMBOX=1
 [std-exten]
 exten => s,1,Set(LOCAL(ext)=${ARG1})
 exten => s,2,Set(LOCAL(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 => s,7,Return()
@@ -36,9 +36,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -63,9 +63,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -90,9 +90,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -117,9 +117,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -144,9 +144,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -171,9 +171,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -198,9 +198,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -225,9 +225,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -252,9 +252,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -279,9 +279,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -306,9 +306,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -333,9 +333,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -360,9 +360,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -387,9 +387,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -414,9 +414,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -441,9 +441,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -468,9 +468,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -495,9 +495,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -522,9 +522,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -549,9 +549,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -576,9 +576,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -603,9 +603,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -630,9 +630,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -657,9 +657,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -684,9 +684,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -711,9 +711,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -738,9 +738,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -765,9 +765,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -792,9 +792,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -819,9 +819,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -846,9 +846,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -873,9 +873,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -900,9 +900,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -927,9 +927,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -954,9 +954,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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 => s,12,Return()
@@ -981,9 +981,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-38-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_36-38)
 exten => s,12,Return()
@@ -1008,9 +1008,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-39-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_37-39)
 exten => s,12,Return()
@@ -1035,9 +1035,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-40-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_38-40)
 exten => s,12,Return()
@@ -1062,9 +1062,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-41-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_39-41)
 exten => s,12,Return()
@@ -1089,9 +1089,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-42-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_40-42)
 exten => s,12,Return()
@@ -1116,9 +1116,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-43-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_41-43)
 exten => s,12,Return()
@@ -1143,9 +1143,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-44-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_42-44)
 exten => s,12,Return()
@@ -1170,9 +1170,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-45-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_43-45)
 exten => s,12,Return()
@@ -1197,9 +1197,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-46-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_44-46)
 exten => s,12,Return()
@@ -1224,9 +1224,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-47-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_45-47)
 exten => s,12,Return()
@@ -1251,9 +1251,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-48-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_46-48)
 exten => s,12,Return()
@@ -1278,9 +1278,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-49-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_47-49)
 exten => s,12,Return()
@@ -1305,9 +1305,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-50-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_48-50)
 exten => s,12,Return()
@@ -1332,9 +1332,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-51-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_49-51)
 exten => s,12,Return()
@@ -1359,9 +1359,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-52-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_50-52)
 exten => s,12,Return()
@@ -1386,9 +1386,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-53-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_51-53)
 exten => s,12,Return()
@@ -1413,9 +1413,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-54-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_52-54)
 exten => s,12,Return()
@@ -1440,9 +1440,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-55-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_53-55)
 exten => s,12,Return()
@@ -1467,9 +1467,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-56-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_54-56)
 exten => s,12,Return()
@@ -1494,9 +1494,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-57-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_55-57)
 exten => s,12,Return()
@@ -1521,9 +1521,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-58-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_56-58)
 exten => s,12,Return()
@@ -1548,9 +1548,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-59-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_57-59)
 exten => s,12,Return()
@@ -1575,9 +1575,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-60-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_58-60)
 exten => s,12,Return()
@@ -1602,9 +1602,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-61-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_59-61)
 exten => s,12,Return()
@@ -1629,9 +1629,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-62-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_60-62)
 exten => s,12,Return()
@@ -1656,9 +1656,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-63-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_61-63)
 exten => s,12,Return()
@@ -1683,9 +1683,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-64-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_62-64)
 exten => s,12,Return()
@@ -1710,9 +1710,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-65-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_63-65)
 exten => s,12,Return()
@@ -1737,9 +1737,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-66-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_64-66)
 exten => s,12,Return()
@@ -1764,9 +1764,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-67-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_65-67)
 exten => s,12,Return()
@@ -1791,9 +1791,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-68-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_66-68)
 exten => s,12,Return()
@@ -1818,9 +1818,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-69-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_67-69)
 exten => s,12,Return()
@@ -1845,9 +1845,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-70-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_68-70)
 exten => s,12,Return()
@@ -1872,9 +1872,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-71-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_69-71)
 exten => s,12,Return()
@@ -1899,9 +1899,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-72-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_70-72)
 exten => s,12,Return()
@@ -1926,9 +1926,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-73-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_71-73)
 exten => s,12,Return()
@@ -1953,9 +1953,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-74-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_72-74)
 exten => s,12,Return()
@@ -1980,9 +1980,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-75-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten_73-75)
 exten => s,12,Return()
@@ -2007,9 +2007,9 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,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-76-${DIALSTATUS},10)
 exten => s,11,NoOp(Finish switch-std-priv-exten-76)
 exten => s,12,Return()
@@ -2136,40 +2136,40 @@ exten => s,12,NoOp(Finish if-privacyManagerFailed-86)
 
 
 [homeline]
-exten => s,1(begin),Answer()
-exten => s,2,Set(repeatcount=0)
-exten => s,3,Zapateller(nocallerid)
-exten => s,4,PrivacyManager()
-exten => s,5,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?6:10)
-exten => s,6,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
-exten => s,7,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
-exten => s,8,Hangup()
-exten => s,9,Return()
-exten => s,10,NoOp(Finish if-homeline-87)
-exten => s,11(postPriv),Gosub(fillcidname,s,1)
-exten => s,12,Set(CONFCIDNA=${CALLERID(name)})
-exten => s,13,Set(CONFCIDNU=${CALLERID(num)})
-exten => s,14,AGI(callall)
-exten => s,15,AGI(submit-announce.agi)
-exten => s,16,GotoIf($["${CALLERID(num)}" : "1" ]?17:18)
-exten => s,17,Gosub(callerid-bad,s,1)
-exten => s,18,NoOp(Finish if-homeline-88)
-exten => s,19,GotoIf($["${CALLERID(num)}"  = "7077577685" & "${CALLERID(name)}" : "Privacy Manager" ]?20:21)
-exten => s,20,Gosub(callerid-liar,s,1)
-exten => s,21,NoOp(Finish if-homeline-89)
-exten => s,22,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
-exten => s,23,Set(lds=${DB(playlds/${CALLERID(num)})})
-exten => s,24,GotoIf($["${lds}" = "1" ]?25:26)
-exten => s,25,SetMusicOnHold(mohlds)
-exten => s,26,NoOp(Finish if-homeline-90)
-exten => s,27,Set(direct=$[${DB(DirectCall/${CALLERID(num)})}])
-exten => s,28,GotoIf($["${direct}" != "" & ${direct} != 0 ]?29:37)
-exten => s,29,verbose(direct is XXX#${direct}XXXX)
-exten => s,30,Playback(greetings/direct)
-exten => s,31,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
-exten => s,32,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-exten => s,33,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
-exten => s,34,Set(~~EXTEN~~=${EXTEN})
+exten => s,1,Set(~~EXTEN~~=${EXTEN})
+exten => s,2(begin),Answer()
+exten => s,3,Set(repeatcount=0)
+exten => s,4,Zapateller(nocallerid)
+exten => s,5,PrivacyManager()
+exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
+exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
+exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+exten => s,9,Hangup()
+exten => s,10,Return()
+exten => s,11,NoOp(Finish if-homeline-87)
+exten => s,12(postPriv),Gosub(fillcidname,s,1)
+exten => s,13,Set(CONFCIDNA=${CALLERID(name)})
+exten => s,14,Set(CONFCIDNU=${CALLERID(num)})
+exten => s,15,AGI(callall)
+exten => s,16,AGI(submit-announce.agi)
+exten => s,17,GotoIf($["${CALLERID(num)}" : "1" ]?18:19)
+exten => s,18,Gosub(callerid-bad,s,1)
+exten => s,19,NoOp(Finish if-homeline-88)
+exten => s,20,GotoIf($["${CALLERID(num)}"  = "7077577685" & "${CALLERID(name)}" : "Privacy Manager" ]?21:22)
+exten => s,21,Gosub(callerid-liar,s,1)
+exten => s,22,NoOp(Finish if-homeline-89)
+exten => s,23,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
+exten => s,24,Set(lds=${DB(playlds/${CALLERID(num)})})
+exten => s,25,GotoIf($["${lds}" = "1" ]?26:27)
+exten => s,26,SetMusicOnHold(mohlds)
+exten => s,27,NoOp(Finish if-homeline-90)
+exten => s,28,Set(direct=$[${DB(DirectCall/${CALLERID(num)})}])
+exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
+exten => s,30,verbose(direct is XXX#${direct}XXXX)
+exten => s,31,Playback(greetings/direct)
+exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
+exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
 exten => s,35,Goto(sw-92-${direct},10)
 exten => s,36,NoOp(Finish switch-if-homeline-91-92)
 exten => s,37,NoOp(Finish if-homeline-91)