[svn-commits] murf: branch 1.6.0 r136778 - in /branches/1.6.0: ./ include/asterisk/ pbx/ael...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Aug 8 01:45:43 CDT 2008
Author: murf
Date: Fri Aug 8 01:45:43 2008
New Revision: 136778
URL: http://svn.digium.com/view/asterisk?view=rev&rev=136778
Log:
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.
........
................
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/include/asterisk/ael_structs.h
branches/1.6.0/pbx/ael/ael-test/ref.ael-ntest10
branches/1.6.0/pbx/ael/ael-test/ref.ael-test18
branches/1.6.0/pbx/ael/ael-test/ref.ael-test19
branches/1.6.0/pbx/ael/ael-test/ref.ael-test8
branches/1.6.0/pbx/ael/ael-test/ref.ael-vtest13
branches/1.6.0/res/ael/pval.c
branches/1.6.0/utils/ael_main.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
svnmerge-integrated = /trunk:1-132781
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/include/asterisk/ael_structs.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/ael_structs.h?view=diff&rev=136778&r1=136777&r2=136778
==============================================================================
--- branches/1.6.0/include/asterisk/ael_structs.h (original)
+++ branches/1.6.0/include/asterisk/ael_structs.h Fri Aug 8 01:45:43 2008
@@ -107,7 +107,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.6.0/pbx/ael/ael-test/ref.ael-ntest10
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/ael/ael-test/ref.ael-ntest10?view=diff&rev=136778&r1=136777&r2=136778
==============================================================================
--- branches/1.6.0/pbx/ael/ael-test/ref.ael-ntest10 (original)
+++ branches/1.6.0/pbx/ael/ael-test/ref.ael-ntest10 Fri Aug 8 01:45:43 2008
@@ -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=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=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=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
Modified: branches/1.6.0/pbx/ael/ael-test/ref.ael-test18
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/ael/ael-test/ref.ael-test18?view=diff&rev=136778&r1=136777&r2=136778
==============================================================================
--- branches/1.6.0/pbx/ael/ael-test/ref.ael-test18 (original)
+++ branches/1.6.0/pbx/ael/ael-test/ref.ael-test18 Fri Aug 8 01:45:43 2008
@@ -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
Modified: branches/1.6.0/pbx/ael/ael-test/ref.ael-test19
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/ael/ael-test/ref.ael-test19?view=diff&rev=136778&r1=136777&r2=136778
==============================================================================
--- branches/1.6.0/pbx/ael/ael-test/ref.ael-test19 (original)
+++ branches/1.6.0/pbx/ael/ael-test/ref.ael-test19 Fri Aug 8 01:45:43 2008
@@ -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
Modified: branches/1.6.0/pbx/ael/ael-test/ref.ael-test8
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/ael/ael-test/ref.ael-test8?view=diff&rev=136778&r1=136777&r2=136778
==============================================================================
--- branches/1.6.0/pbx/ael/ael-test/ref.ael-test8 (original)
+++ branches/1.6.0/pbx/ael/ael-test/ref.ael-test8 Fri Aug 8 01:45:43 2008
@@ -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
Modified: branches/1.6.0/pbx/ael/ael-test/ref.ael-vtest13
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/ael/ael-test/ref.ael-vtest13?view=diff&rev=136778&r1=136777&r2=136778
==============================================================================
--- branches/1.6.0/pbx/ael/ael-test/ref.ael-vtest13 (original)
+++ branches/1.6.0/pbx/ael/ael-test/ref.ael-vtest13 Fri Aug 8 01:45:43 2008
@@ -13,8 +13,8 @@
[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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,4,Set(LOCAL(opts)=${ARG4})
exten => s,5,Set(LOCAL(torcont)=${ARG5})
exten => s,6,Set(LOCAL(dontcont)=${ARG6})
[... 1183 lines stripped ...]
More information about the svn-commits
mailing list