[asterisk-commits] murf: branch murf/macrogosub r41615 - in
/team/murf/macrogosub/pbx: ./ ael/ae...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Aug 31 12:42:25 MST 2006
Author: murf
Date: Thu Aug 31 14:42:24 2006
New Revision: 41615
URL: http://svn.digium.com/view/asterisk?rev=41615&view=rev
Log:
Hmm, first pass. Looks good so far. Now for some live testing.
Modified:
team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test1
team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test3
team/murf/macrogosub/pbx/ael/ael-test/ref.ael-vtest13
team/murf/macrogosub/pbx/pbx_ael.c
Modified: team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test1
URL: http://svn.digium.com/view/asterisk/team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test1?rev=41615&r1=41614&r2=41615&view=diff
==============================================================================
--- team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test1 (original)
+++ team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test1 Thu Aug 31 14:42:24 2006
@@ -2,13 +2,13 @@
(If you find progress and other non-error messages irritating, you can use -q to suppress them)
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:../pbx/pbx_ael.c line:3747 func: pbx_load_module Starting AEL load process.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3754 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3757 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3788 func: pbx_load_module Starting AEL load process.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3795 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3798 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
LOG: lev:3 file:../pbx/pbx_ael.c line:899 func: check_dow Warning: file ./extensions.ael, line 67-67: The day (m0n) must be one of 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', or 'sat'!
LOG: lev:3 file:../pbx/pbx_ael.c line:857 func: check_timerange Warning: file ./extensions.ael, line 78-78: The end time (25:00) is out of range!
-LOG: lev:2 file:../pbx/pbx_ael.c line:3760 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3762 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3765 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3768 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse line:458 func: main 5 contexts, 13 extensions, 156 priorities
+LOG: lev:2 file:../pbx/pbx_ael.c line:3801 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3803 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3806 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3809 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse line:479 func: main 5 contexts, 13 extensions, 152 priorities
Modified: team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test3
URL: http://svn.digium.com/view/asterisk/team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test3?rev=41615&r1=41614&r2=41615&view=diff
==============================================================================
--- team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test3 (original)
+++ team/murf/macrogosub/pbx/ael/ael-test/ref.ael-test3 Thu Aug 31 14:42:24 2006
@@ -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/pbx_ael.c line:3797 func: pbx_load_module Starting AEL load process.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3804 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include1.ael2, 78 chars
-LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include2.ael2, 98 chars
-LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include3.ael2, 57 chars
-LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include5.ael2, 56 chars
-LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include4.ael2, 87 chars
-LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./telemarket_torture.ael2, 28036 chars
-LOG: lev:2 file:../pbx/pbx_ael.c line:3807 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3810 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3812 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3815 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3818 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse line:479 func: main 172 contexts, 858 extensions, 2326 priorities
+LOG: lev:2 file:../pbx/pbx_ael.c line:3788 func: pbx_load_module Starting AEL load process.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3795 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:ael.flex line:429 func: ael_yylex --Read in included file ./include1.ael2, 78 chars
+LOG: lev:2 file:ael.flex line:429 func: ael_yylex --Read in included file ./include2.ael2, 98 chars
+LOG: lev:2 file:ael.flex line:429 func: ael_yylex --Read in included file ./include3.ael2, 57 chars
+LOG: lev:2 file:ael.flex line:429 func: ael_yylex --Read in included file ./include5.ael2, 56 chars
+LOG: lev:2 file:ael.flex line:429 func: ael_yylex --Read in included file ./include4.ael2, 87 chars
+LOG: lev:2 file:ael.flex line:429 func: ael_yylex --Read in included file ./telemarket_torture.ael2, 28036 chars
+LOG: lev:2 file:../pbx/pbx_ael.c line:3798 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3801 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3803 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3806 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3809 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse line:479 func: main 172 contexts, 858 extensions, 2324 priorities
Modified: team/murf/macrogosub/pbx/ael/ael-test/ref.ael-vtest13
URL: http://svn.digium.com/view/asterisk/team/murf/macrogosub/pbx/ael/ael-test/ref.ael-vtest13?rev=41615&r1=41614&r2=41615&view=diff
==============================================================================
--- team/murf/macrogosub/pbx/ael/ael-test/ref.ael-vtest13 (original)
+++ team/murf/macrogosub/pbx/ael/ael-test/ref.ael-vtest13 Thu Aug 31 14:42:24 2006
@@ -10,7 +10,7 @@
FWDVMBOX=1
-[macro-std-exten]
+[std-exten]
exten => s,1,Set(ext=${ARG1})
exten => s,2,Set(dev=${ARG2})
exten => s,3,Dial(${dev}/${ext}|20)
@@ -26,7 +26,7 @@
exten => sw-1-BUSY,2,Goto(s|5)
-[macro-std-priv-exten_1]
+[std-priv-exten_1]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -50,7 +50,7 @@
exten => sw-3-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_2]
+[std-priv-exten_2]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -74,7 +74,7 @@
exten => sw-4-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_3]
+[std-priv-exten_3]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -98,7 +98,7 @@
exten => sw-5-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_4]
+[std-priv-exten_4]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -122,7 +122,7 @@
exten => sw-6-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_5]
+[std-priv-exten_5]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -146,7 +146,7 @@
exten => sw-7-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_6]
+[std-priv-exten_6]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -170,7 +170,7 @@
exten => sw-8-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_7]
+[std-priv-exten_7]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -194,7 +194,7 @@
exten => sw-9-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_8]
+[std-priv-exten_8]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -218,7 +218,7 @@
exten => sw-10-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_9]
+[std-priv-exten_9]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -242,7 +242,7 @@
exten => sw-11-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_10]
+[std-priv-exten_10]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -266,7 +266,7 @@
exten => sw-12-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_11]
+[std-priv-exten_11]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -290,7 +290,7 @@
exten => sw-13-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_12]
+[std-priv-exten_12]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -314,7 +314,7 @@
exten => sw-14-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_13]
+[std-priv-exten_13]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -338,7 +338,7 @@
exten => sw-15-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_14]
+[std-priv-exten_14]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -362,7 +362,7 @@
exten => sw-16-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_15]
+[std-priv-exten_15]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -386,7 +386,7 @@
exten => sw-17-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_16]
+[std-priv-exten_16]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -410,7 +410,7 @@
exten => sw-18-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_17]
+[std-priv-exten_17]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -434,7 +434,7 @@
exten => sw-19-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_18]
+[std-priv-exten_18]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -458,7 +458,7 @@
exten => sw-20-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_19]
+[std-priv-exten_19]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -482,7 +482,7 @@
exten => sw-21-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_20]
+[std-priv-exten_20]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -506,7 +506,7 @@
exten => sw-22-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_21]
+[std-priv-exten_21]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -530,7 +530,7 @@
exten => sw-23-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_22]
+[std-priv-exten_22]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -554,7 +554,7 @@
exten => sw-24-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_23]
+[std-priv-exten_23]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -578,7 +578,7 @@
exten => sw-25-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_24]
+[std-priv-exten_24]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -602,7 +602,7 @@
exten => sw-26-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_25]
+[std-priv-exten_25]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -626,7 +626,7 @@
exten => sw-27-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_26]
+[std-priv-exten_26]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -650,7 +650,7 @@
exten => sw-28-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_27]
+[std-priv-exten_27]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -674,7 +674,7 @@
exten => sw-29-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_28]
+[std-priv-exten_28]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -698,7 +698,7 @@
exten => sw-30-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_29]
+[std-priv-exten_29]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -722,7 +722,7 @@
exten => sw-31-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_30]
+[std-priv-exten_30]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -746,7 +746,7 @@
exten => sw-32-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_31]
+[std-priv-exten_31]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -770,7 +770,7 @@
exten => sw-33-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_32]
+[std-priv-exten_32]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -794,7 +794,7 @@
exten => sw-34-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_33]
+[std-priv-exten_33]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -818,7 +818,7 @@
exten => sw-35-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_34]
+[std-priv-exten_34]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -842,7 +842,7 @@
exten => sw-36-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_35]
+[std-priv-exten_35]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -866,7 +866,7 @@
exten => sw-37-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_36]
+[std-priv-exten_36]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -890,7 +890,7 @@
exten => sw-38-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_37]
+[std-priv-exten_37]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -914,7 +914,7 @@
exten => sw-39-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_38]
+[std-priv-exten_38]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -938,7 +938,7 @@
exten => sw-40-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_39]
+[std-priv-exten_39]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -962,7 +962,7 @@
exten => sw-41-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_40]
+[std-priv-exten_40]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -986,7 +986,7 @@
exten => sw-42-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_41]
+[std-priv-exten_41]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1010,7 +1010,7 @@
exten => sw-43-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_42]
+[std-priv-exten_42]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1034,7 +1034,7 @@
exten => sw-44-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_43]
+[std-priv-exten_43]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1058,7 +1058,7 @@
exten => sw-45-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_44]
+[std-priv-exten_44]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1082,7 +1082,7 @@
exten => sw-46-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_45]
+[std-priv-exten_45]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1106,7 +1106,7 @@
exten => sw-47-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_46]
+[std-priv-exten_46]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1130,7 +1130,7 @@
exten => sw-48-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_47]
+[std-priv-exten_47]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1154,7 +1154,7 @@
exten => sw-49-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_48]
+[std-priv-exten_48]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1178,7 +1178,7 @@
exten => sw-50-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_49]
+[std-priv-exten_49]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1202,7 +1202,7 @@
exten => sw-51-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_50]
+[std-priv-exten_50]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1226,7 +1226,7 @@
exten => sw-52-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_51]
+[std-priv-exten_51]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1250,7 +1250,7 @@
exten => sw-53-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_52]
+[std-priv-exten_52]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1274,7 +1274,7 @@
exten => sw-54-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_53]
+[std-priv-exten_53]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1298,7 +1298,7 @@
exten => sw-55-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_54]
+[std-priv-exten_54]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1322,7 +1322,7 @@
exten => sw-56-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_55]
+[std-priv-exten_55]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1346,7 +1346,7 @@
exten => sw-57-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_56]
+[std-priv-exten_56]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1370,7 +1370,7 @@
exten => sw-58-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_57]
+[std-priv-exten_57]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1394,7 +1394,7 @@
exten => sw-59-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_58]
+[std-priv-exten_58]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1418,7 +1418,7 @@
exten => sw-60-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_59]
+[std-priv-exten_59]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1442,7 +1442,7 @@
exten => sw-61-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_60]
+[std-priv-exten_60]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1466,7 +1466,7 @@
exten => sw-62-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_61]
+[std-priv-exten_61]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1490,7 +1490,7 @@
exten => sw-63-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_62]
+[std-priv-exten_62]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1514,7 +1514,7 @@
exten => sw-64-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_63]
+[std-priv-exten_63]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1538,7 +1538,7 @@
exten => sw-65-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_64]
+[std-priv-exten_64]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1562,7 +1562,7 @@
exten => sw-66-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_65]
+[std-priv-exten_65]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1586,7 +1586,7 @@
exten => sw-67-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_66]
+[std-priv-exten_66]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1610,7 +1610,7 @@
exten => sw-68-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_67]
+[std-priv-exten_67]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1634,7 +1634,7 @@
exten => sw-69-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_68]
+[std-priv-exten_68]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1658,7 +1658,7 @@
exten => sw-70-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_69]
+[std-priv-exten_69]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1682,7 +1682,7 @@
exten => sw-71-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_70]
+[std-priv-exten_70]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1706,7 +1706,7 @@
exten => sw-72-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_71]
+[std-priv-exten_71]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1730,7 +1730,7 @@
exten => sw-73-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_72]
+[std-priv-exten_72]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1754,7 +1754,7 @@
exten => sw-74-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten_73]
+[std-priv-exten_73]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1778,7 +1778,7 @@
exten => sw-75-TORTURE,2,Goto(s|10)
-[macro-std-priv-exten]
+[std-priv-exten]
exten => s,1,Set(dev=${ARG1})
exten => s,2,Set(ext=${ARG2})
exten => s,3,Set(timeout=${ARG3})
@@ -1802,9 +1802,9 @@
exten => sw-76-TORTURE,2,Goto(s|10)
-[macro-fillcidname]
+[fillcidname]
exten => s,1,GotoIf($["${CALLERID(number)}" = "" ]?2:3)
-exten => s,2,Goto(13)
+exten => s,2,Return()
exten => s,3,NoOp(Finish if-fillcidname-77)
exten => s,4,Set(cidn=${DB(cidname/${CALLERID(num)})})
exten => s,5,GotoIf($["${CALLERID(name)}" != "" ]?6:9)
@@ -1815,10 +1815,9 @@
exten => s,10,GotoIf($[( "${cidn}" != "" ) & ( "${CALLERID(name)}" = "" | "${CALLERID(name)}" = "CODY,WY " | "${CALLERID(name)}" = "POWELL,WY " | "${CALLERID(name)}" = "WIRELESS CALLER" | "${CALLERID(name)}" = "SUBSCRIBER,WIRE" | "${CALLERID(name)}" = "CELLULAR ONE" | "${CALLERID(name)}" = "Cellular One Customer" | "${CALLERID(name)}" = "CELLULAR ONE " | "${CALLERID(name)}" = "Privacy Manager" | "${CALLERID(name)}" = "RIVERTON,WY " | "${CALLERID(name)}" = "BASIN,WY " | "${CALLERID(name)}" = "BILLINGS,MT " | "${CALLERID(name)}" = "PROVO,UT " | "${CALLERID(name)}" = "TOLL FREE " ) ]?11:12)
exten => s,11,Set(CALLERID(name)=${cidn})
exten => s,12,NoOp(Finish if-fillcidname-80)
-exten => s,13,NoOp(End of Macro fillcidname-s)
-
-
-[macro-ciddial]
+
+
+[ciddial]
exten => s,1,Set(dialnum=${ARG1})
exten => s,2,Set(lookup=${ARG2})
exten => s,3,Set(waittime=${ARG3})
@@ -1840,7 +1839,7 @@
exten => s,19,NoOp(Finish if-ciddial-81)
-[macro-ciddial3]
+[ciddial3]
exten => s,1,Set(dialnum=${ARG1})
exten => s,2,Set(lookup=${ARG2})
exten => s,3,Set(waittime=${ARG3})
@@ -1856,7 +1855,7 @@
exten => s,13,NoOp(Finish if-ciddial3-83)
-[macro-ciddial2]
+[ciddial2]
exten => s,1,Set(dialnum=${ARG1})
exten => s,2,Set(lookup=${ARG2})
exten => s,3,Set(waittime=${ARG3})
@@ -1878,13 +1877,13 @@
exten => s,19,NoOp(Finish if-ciddial2-84)
-[macro-callerid-liar]
+[callerid-liar]
exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
exten => s,2,Background(priv-liar)
exten => s,3,Hangup()
-[macro-callerid-bad]
+[callerid-bad]
exten => s,1,Set(mycid=$[${CALLERID(num)}:"1([0-9]+)"])
exten => s,2,Set(CALLERID(num)=${mycid})
exten => s,3,Wait(0)
@@ -1912,20 +1911,20 @@
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,Macro(std-priv-exten|Zap/3r1&Zap/5r1|2|25|mtw|telemarket|telemarket)
+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,Goto(104)
+exten => s,9,Return()
exten => s,10,NoOp(Finish if-homeline-87)
-exten => s,11(postPriv),Macro(fillcidname)
+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,Macro(callerid-bad)
+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,Macro(callerid-liar)
+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)})})
@@ -2009,20 +2008,19 @@
exten => s,101,NoOp(Finish iftime-iftime-homeline-93-94)
exten => s,102,NoOp(Finish iftime-homeline-93)
exten => s,103,Background(murphy-homeline-intro1)
-exten => s,104,NoOp(End of Extension s)
exten => _sw-92-.,1,Set(z=${direct}-2)
exten => _sw-92-.,2,Goto(homeline-kids|${z}|1)
-exten => sw-92-2,1,Macro(std-priv-exten|Zap/3r1&Zap/5r1|2|25|mtw|telemarket|telemarket)
+exten => sw-92-2,1,Gosub(std-priv-exten|s|1:Zap/3r1&Zap/5r1|2|25|mtw|telemarket|telemarket)
exten => sw-92-2,2,Goto(s|loopback)
-exten => sw-92-1,1,Macro(std-priv-exten|Zap/6r3&Sip/murf|1|25|mpA(beep)tw|telemarket|telemarket)
+exten => sw-92-1,1,Gosub(std-priv-exten|s|1:Zap/6r3&Sip/murf|1|25|mpA(beep)tw|telemarket|telemarket)
exten => sw-92-1,2,Goto(s|loopback)
exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
-exten => 1,3,Macro(std-priv-exten|Zap/3r1&Zap/5r1|2|25|mtw|telemarket|telemarket)
+exten => 1,3,Gosub(std-priv-exten|s|1:Zap/3r1&Zap/5r1|2|25|mtw|telemarket|telemarket)
exten => 1,4,Goto(s|loopback)
exten => 2,1,Goto(homeline-kids|s|begin)
exten => 21,1,Dial(IAX2/seaniax|20|T)
-exten => 3,1,Macro(std-priv-exten|Zap/6r3&Sip/murf|1|25|mpA(beep)tw|telemarket|telemarket)
+exten => 3,1,Gosub(std-priv-exten|s|1:Zap/6r3&Sip/murf|1|25|mpA(beep)tw|telemarket|telemarket)
exten => 3,2,Goto(s|loopback)
exten => 4,1,VoicemailMain()
exten => 4,2,Goto(s|loopback)
@@ -2095,7 +2093,7 @@
exten => s,1(begin),Background(murphy-homeline-kids)
exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
-exten => 1,3,Macro(std-priv-exten|IAX2/seaniax&Zap/5r2|3|35|mtw|telemarket|telemarket)
+exten => 1,3,Gosub(std-priv-exten|s|1:IAX2/seaniax&Zap/5r2|3|35|mtw|telemarket|telemarket)
exten => 1,4,Goto(homeline|s|loopback)
exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
@@ -2103,23 +2101,23 @@
exten => 2,4,Goto(homeline|s|loopback)
exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
-exten => 3,3,Macro(std-priv-exten|Zap/3r2&Zap/5r2|5|35|mtw|telemarket|telemarket)
+exten => 3,3,Gosub(std-priv-exten|s|1:Zap/3r2&Zap/5r2|5|35|mtw|telemarket|telemarket)
exten => 3,4,Goto(homeline|s|loopback)
exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
-exten => 4,3,Macro(std-priv-exten|Zap/3r2&Zap/5r2|6|35|mtw|telemarket|telemarket)
+exten => 4,3,Gosub(std-priv-exten|s|1:Zap/3r2&Zap/5r2|6|35|mtw|telemarket|telemarket)
exten => 4,4,Goto(homeline|s|loopback)
exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
-exten => 5,3,Macro(std-priv-exten|Zap/3r2&Zap/5r2|7|35|mtw|telemarket|telemarket)
+exten => 5,3,Gosub(std-priv-exten|s|1:Zap/3r2&Zap/5r2|7|35|mtw|telemarket|telemarket)
exten => 5,4,Goto(homeline|s|loopback)
exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
-exten => 6,3,Macro(std-priv-exten|Zap/3r2&Zap/5r2|8|35|mtw|telemarket|telemarket)
+exten => 6,3,Gosub(std-priv-exten|s|1:Zap/3r2&Zap/5r2|8|35|mtw|telemarket|telemarket)
exten => 6,4,Goto(homeline|s|loopback)
exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
-exten => 7,3,Macro(std-priv-exten|Zap/3r2&Zap/5r2|9|35|mtw|telemarket|telemarket)
+exten => 7,3,Gosub(std-priv-exten|s|1:Zap/3r2&Zap/5r2|9|35|mtw|telemarket|telemarket)
exten => 7,4,Goto(homeline|s|loopback)
exten => t,1,Goto(s|begin)
exten => i,1,Background(invalid)
@@ -2141,13 +2139,13 @@
exten => s,2,Wait(1)
exten => s,3,Set(repeatcount=0)
exten => s,4,Zapateller(nocallerid)
-exten => s,5,Macro(fillcidname)
+exten => s,5,Gosub(fillcidname|s|1)
exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
exten => s,7(loopback),Background(greetings/greeting)
exten => s,8,Background(murphy-office-intro1)
exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
-exten => 1,3,Macro(std-priv-exten|Zap/6&Sip/murf|1|30|mtw|telemarket|telemarket)
+exten => 1,3,Gosub(std-priv-exten|s|1:Zap/6&Sip/murf|1|30|mtw|telemarket|telemarket)
exten => 1,4,Goto(s|loopback)
exten => 4,1,VoicemailMain()
exten => 4,2,Goto(s|loopback)
@@ -2198,57 +2196,57 @@
[homefirst]
ignorepat => 9
-exten => _91NXXNXXXXXX,1,Macro(ciddial|${EXTEN:1}|${EXTEN:2}|30|TW|Zap/1)
-exten => _9754XXXX,1,Macro(ciddial|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9574XXXX,1,Macro(ciddial|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9202XXXX,1,Macro(ciddial|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9219XXXX,1,Macro(ciddial|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9254XXXX,1,Macro(ciddial|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9716XXXX,1,Macro(ciddial|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9NXXXXXX,1,Macro(ciddial|1707${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9011.,1,Macro(ciddial|${EXTEN:1}|${EXTEN:1}|30|TW|Zap/1)
+exten => _91NXXNXXXXXX,1,Gosub(ciddial|s|1:${EXTEN:1}|${EXTEN:2}|30|TW|Zap/1)
+exten => _9754XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9574XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9202XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9219XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9254XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9716XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9NXXXXXX,1,Gosub(ciddial|s|1:1707${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9011.,1,Gosub(ciddial|s|1:${EXTEN:1}|${EXTEN:1}|30|TW|Zap/1)
exten => _9911,1,Dial(Zap/1/911|30|T)
exten => _9411,1,Dial(Zap/1/411|30|T)
[workfirst]
ignorepat => 9
-exten => _91NXXNXXXXXX,1,Macro(ciddial2|${EXTEN:1}|${EXTEN:2}|30|TW|Zap/1)
-exten => _9754XXXX,1,Macro(ciddial2|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9574XXXX,1,Macro(ciddial2|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9202XXXX,1,Macro(ciddial2|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9219XXXX,1,Macro(ciddial2|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9254XXXX,1,Macro(ciddial2|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9716XXXX,1,Macro(ciddial2|${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
-exten => _9NXXXXXX,1,Macro(ciddial2|1707${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _91NXXNXXXXXX,1,Gosub(ciddial2|s|1:${EXTEN:1}|${EXTEN:2}|30|TW|Zap/1)
+exten => _9754XXXX,1,Gosub(ciddial2|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9574XXXX,1,Gosub(ciddial2|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9202XXXX,1,Gosub(ciddial2|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9219XXXX,1,Gosub(ciddial2|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9254XXXX,1,Gosub(ciddial2|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9716XXXX,1,Gosub(ciddial2|s|1:${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
+exten => _9NXXXXXX,1,Gosub(ciddial2|s|1:1707${EXTEN:1}|707${EXTEN:1}|30|TW|Zap/1)
exten => _9911,1,Dial(Zap/1/911|30|T)
exten => _9411,1,Dial(Zap/1/411|30|T)
[force_cell]
ignorepat => 8
-exten => _81NXXNXXXXXX,1,Macro(ciddial|${EXTEN:1}#|${EXTEN:2}|30|TW|Zap/2)
-exten => _8754XXXX,1,Macro(ciddial|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
-exten => _8574XXXX,1,Macro(ciddial|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
-exten => _8202XXXX,1,Macro(ciddial|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
-exten => _8219XXXX,1,Macro(ciddial|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
-exten => _8254XXXX,1,Macro(ciddial|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
-exten => _8716XXXX,1,Macro(ciddial|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
-exten => _8NXXXXXX,1,Macro(ciddial|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
+exten => _81NXXNXXXXXX,1,Gosub(ciddial|s|1:${EXTEN:1}#|${EXTEN:2}|30|TW|Zap/2)
+exten => _8754XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
+exten => _8574XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
+exten => _8202XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
+exten => _8219XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
+exten => _8254XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
+exten => _8716XXXX,1,Gosub(ciddial|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
+exten => _8NXXXXXX,1,Gosub(ciddial|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/2)
exten => _8911,1,Dial(Zap/1/911|30|T)
exten => _8411,1,Dial(Zap/1/411|30|T)
[force_home]
ignorepat => 8
-exten => _81NXXNXXXXXX,1,Macro(ciddial3|${EXTEN:1}#|${EXTEN:2}|30|TW|Zap/1)
-exten => _8754XXXX,1,Macro(ciddial3|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
-exten => _8574XXXX,1,Macro(ciddial3|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
-exten => _8202XXXX,1,Macro(ciddial3|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
-exten => _8219XXXX,1,Macro(ciddial3|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
-exten => _8254XXXX,1,Macro(ciddial3|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
-exten => _8716XXXX,1,Macro(ciddial3|${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
-exten => _8NXXXXXX,1,Macro(ciddial3|1707${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
+exten => _81NXXNXXXXXX,1,Gosub(ciddial3|s|1:${EXTEN:1}#|${EXTEN:2}|30|TW|Zap/1)
+exten => _8754XXXX,1,Gosub(ciddial3|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
+exten => _8574XXXX,1,Gosub(ciddial3|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
+exten => _8202XXXX,1,Gosub(ciddial3|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
+exten => _8219XXXX,1,Gosub(ciddial3|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
+exten => _8254XXXX,1,Gosub(ciddial3|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
+exten => _8716XXXX,1,Gosub(ciddial3|s|1:${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
+exten => _8NXXXXXX,1,Gosub(ciddial3|s|1:1707${EXTEN:1}#|707${EXTEN:1}|30|TW|Zap/1)
exten => _8911,1,Dial(Zap/1/911|30|T)
exten => _8411,1,Dial(Zap/1/411|30|T)
@@ -2260,9 +2258,9 @@
include => homefirst
include => force_cell
exten => s,1(loopback),Wait(0)
-exten => 1,1,Macro(std-priv-exten|Zap/3&Zap/5|2|35|mtw|telemarket|telemarket)
+exten => 1,1,Gosub(std-priv-exten|s|1:Zap/3&Zap/5|2|35|mtw|telemarket|telemarket)
exten => 1,2,Goto(s|loopback)
-exten => 2,1,Macro(std-priv-exten|Zap/6&Zap/5|1|35|mpA(beep3)Tt|telemarket|telemarket)
+exten => 2,1,Gosub(std-priv-exten|s|1:Zap/6&Zap/5|1|35|mpA(beep3)Tt|telemarket|telemarket)
exten => 2,2,Goto(s|loopback)
exten => 4,1,VoicemailMain()
exten => 5,1,Record(recording:gsm)
@@ -2322,55 +2320,55 @@
[fromvmhome]
exten => 1,1,Dial(Zap/6&Sip/murf|20|Tt)
exten => 2,1,Dial(Zap/3&Zap/5|20|Tt)
-exten => _707202XXXX,1,Macro(ciddial|1${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
-exten => _707219XXXX,1,Macro(ciddial|1${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
-exten => _707254XXXX,1,Macro(ciddial|1${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
-exten => _707716XXXX,1,Macro(ciddial|1${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
-exten => _707754XXXX,1,Macro(ciddial|${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
-exten => _707574XXXX,1,Macro(ciddial|${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
-exten => _NXXNXXXXXX,1,Macro(ciddial|1${EXTEN}|${EXTEN}|30|TW|Zap/1)
-exten => _1NXXNXXXXXX,1,Macro(ciddial|${EXTEN}|${EXTEN:1}|30|TW|Zap/1)
-exten => _754XXXX,1,Macro(ciddial|${EXTEN}|707${EXTEN}|30|TW|Zap/1)
-exten => _574XXXX,1,Macro(ciddial|${EXTEN}|707${EXTEN}|30|TW|Zap/1)
-exten => _NXXXXXX,1,Macro(ciddial|1707${EXTEN}|707${EXTEN}|30|TW|Zap/1)
-exten => _911,1,Macro(ciddial|911|911|30|TW|Zap/1)
-exten => _411,1,Macro(ciddial|411|411|30|TW|Zap/1)
+exten => _707202XXXX,1,Gosub(ciddial|s|1:1${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
+exten => _707219XXXX,1,Gosub(ciddial|s|1:1${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
+exten => _707254XXXX,1,Gosub(ciddial|s|1:1${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
+exten => _707716XXXX,1,Gosub(ciddial|s|1:1${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
+exten => _707754XXXX,1,Gosub(ciddial|s|1:${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
+exten => _707574XXXX,1,Gosub(ciddial|s|1:${EXTEN:3}|${EXTEN}|30|TW|Zap/1)
+exten => _NXXNXXXXXX,1,Gosub(ciddial|s|1:1${EXTEN}|${EXTEN}|30|TW|Zap/1)
+exten => _1NXXNXXXXXX,1,Gosub(ciddial|s|1:${EXTEN}|${EXTEN:1}|30|TW|Zap/1)
+exten => _754XXXX,1,Gosub(ciddial|s|1:${EXTEN}|707${EXTEN}|30|TW|Zap/1)
+exten => _574XXXX,1,Gosub(ciddial|s|1:${EXTEN}|707${EXTEN}|30|TW|Zap/1)
[... 288 lines stripped ...]
More information about the asterisk-commits
mailing list