[asterisk-commits] murf: trunk r59234 - in /trunk/pbx/ael/ael-test: ./ ael-test19/

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Mon Mar 26 15:17:38 MST 2007


Author: murf
Date: Mon Mar 26 17:17:37 2007
New Revision: 59234

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59234
Log:
updated the regressions with regards to 9373, the crash on double contexts, and brought other regressions up to date

Added:
    trunk/pbx/ael/ael-test/ael-test19/
    trunk/pbx/ael/ael-test/ael-test19/extensions.ael   (with props)
    trunk/pbx/ael/ael-test/ref.ael-test19   (with props)
Modified:
    trunk/pbx/ael/ael-test/ref.ael-test7
    trunk/pbx/ael/ael-test/ref.ael-vtest13
    trunk/pbx/ael/ael-test/ref.ael-vtest17

Added: trunk/pbx/ael/ael-test/ael-test19/extensions.ael
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ael-test19/extensions.ael?view=auto&rev=59234
==============================================================================
--- trunk/pbx/ael/ael-test/ael-test19/extensions.ael (added)
+++ trunk/pbx/ael/ael-test/ael-test19/extensions.ael Mon Mar 26 17:17:37 2007
@@ -1,0 +1,377 @@
+context dialextens
+{
+	/* 
+		101 thru 123, 149 thru 152
+        */
+	_10X => Dial(Zap/${EXTEN:2},30,Ttw);
+	_1ZX => Dial(Zap/${EXTEN:1},30,Ttw);
+}
+/* 
+    Due to extenal wiring:
+
+  dialing 125 will ring 101
+  dialing 126 will ring 102
+   and so on until
+  dialing 147 will ring 123
+
+We can dial out on zap 69 thru 72; and 25-47
+
+*/
+
+context dialthrus
+{
+	/*  369-372; 325-347 */
+	_3XX => Dial(Zap/${EXTEN:1},30,Ttw);
+}
+
+context t1incoming
+{
+	includes
+	{
+		dialextens;
+		parkedcalls;
+	}
+	s => {
+		Answer();
+		Background(welcome-to-test-machine);
+	}
+
+}
+
+context t1extension
+{
+	includes
+	{
+		dialextens;
+		dialthrus;
+	}
+
+}
+
+context incoming
+{
+	includes
+	{
+		dialextens;
+		parkedcalls;
+	}
+	s => {
+		Answer();
+		Background(welcome-to-test-machine);
+	}
+}
+
+context incoming
+{
+	s => {
+		Answer();
+	}
+}
+
+macro std-priv-exten( dev, ext , timeout, opts, torcont, dontcont )
+{
+        // &increment_chosecount();
+        dial_again:
+        Dial(${dev},${timeout},${opts});
+        switch(${DIALSTATUS})
+                {
+        case TORTURE:
+                goto ${torcont}|s|begin;
+                break;
+
+        case DONTCALL:
+                goto ${dontcont}|s|begin;
+                break;
+
+        case BUSY:
+        label_busy:
+                Read(reply|work-exten-busy|1||2|15);
+		if ("${reply}"=="")
+			goto label_busy; // infinite loop if Read has probs!!
+                switch(${reply})
+                {
+                case 1:
+                       Set(time1=${EPOCH});
+
+                  label_redial:
+
+                       WaitMusicOnHold(5);
+                       Dial(${dev},${timeout},${opts});
+
+                       switch(${DIALSTATUS})
+                       {
+                       case BUSY:
+                                if(${EPOCH}-${time1} >= 20)
+                                        goto label_busy;
+                                goto label_redial;
+
+                       default:
+                                return;// goto work_line|s|loopback;
+                       }
+                       break;
+                case 2:
+                       Voicemail(${ext}|b);
+                       break;
+                case 3:
+                       return; // goto work_line|s|loopback;
+                default:
+                       Background(invalid);
+                        goto label_busy;
+                }
+                break;
+
+        case ANSWER:
+                break;
+
+        case NOANSWER:
+        noanswer_label:
+                Read(reply|work-exten-noanswer|1|skip|2|15);
+                switch(${reply})
+                {
+                case 1:
+                       switch(${ext})
+                       {
+                       case 10:
+                                Background(no-cell);
+                                break;
+                       case 11:
+                                // &ciddial(2729495,3072729495,30,tw,${GRAMS_TELCO},${WORK_TELCO});
+                                break;
+                       case 12:
+                                // &ciddial(2725560,3072725560,30,tw,${GRAMS_TELCO},${WORK_TELCO});
+                                break;
+                       case 13:
+                                // &ciddial(2720197,3072720197,30,tw,${GRAMS_TELCO},${WORK_TELCO});
+                                break;
+                       case 14:
+                                // &ciddial(2501174,3072501174,30,tw,${GRAMS_TELCO},${WORK_TELCO});
+                                break;
+                       case 15:
+                                Background(no-cell);
+                                break;
+                       case 16:
+                                Background(no-cell);
+                                break;
+                       default:
+                                Background(invalid);
+                                break;
+                       }
+                       goto noanswer_label;
+                       break;
+                case 2:
+                       Voicemail(${ext}|u);
+                       break;
+                case 3:
+                       return; // goto work_line|s|loopback;
+                default:
+                       Background(invalid);
+                       goto noanswer_label;
+                }
+                Voicemail(${ext}|u);
+                break;
+        default:
+                Voicemail(${ext}|u);
+        }
+}
+/* Putting these 3 funcs in extensions.conf!
+macro funcC(a,b)
+{
+	Set(Key=);
+      menu:
+	Read(Key,main-menu,1,n,1,5);
+	if("${Key}" = "2")
+		goto y,lab1;
+	catch y
+	{	lab1:
+		&funcB(${a},${b});	
+	}
+}
+
+macro funcB(a,b)
+{
+	Set(Key=);
+      menu:
+	Read(Key,tt-monkeys,1,n,1,5);
+	if("${Key}" = "2")
+		goto z,lab2;
+	catch z
+	{	lab2:
+		&funcC(${a},${b});	
+	}
+}
+
+macro funcA()
+{
+	&funcB(1,2);
+}
+*/
+
+context extension
+{
+	includes
+	{
+		dialextens;
+		dialthrus;
+		parkedcalls;
+	}
+	5 => {
+		Record(recording:wav);
+		Background(recording);
+	}
+
+	81 => {
+		iterations=1000000;
+		Set(time1=${EPOCH});
+		for(i=1; ${i}<${iterations}; i=${i}+1)
+		{
+			NoOp(Hello);
+		}
+		Set(time2=${EPOCH});
+		Verbose(The time diff is $[${time2} - ${time1} ] seconds);
+		Verbose(Which means that the priorities/sec = $[4* ${iterations} / (${time2} - ${time1}) ]);
+		SayNumber($[4 * ${iterations} / (${time2} - ${time1}) ]);
+	}
+	82 => {
+			&ndeep(100000);
+			Verbose(Finished 100000 levels deep call!);
+		}
+	83 => {
+		switch (${EXTEN}) 
+		{
+		pattern 8X:
+    			Verbose(do something to prepare it);
+		pattern 9X:
+    			Verbose(handle both 1xx and 2xx calls);
+		pattern [4-7]X:
+			Verbose(and this too!);
+		}
+		Set(junky=${RAND(0|99999)});
+		Verbose(Here is a random number: ${junky}.);
+	}
+	84 => {
+		agi(agi://192.168.134.252/|hello|goodbye|whatever|whoknows,hell2,hello3);
+	}
+	85 => {
+		&std-priv-exten( Zap/50, 150 , 25, mtw, torcont, dontcont );
+	}
+	86 => {
+		Verbose(The version is: ${VERSION()} );
+		Verbose(The versionnum is: ${VERSION(ASTERISK_VERSION_NUM)} );
+		Verbose(The user is: ${VERSION(BUILD_USER)} );
+		Verbose(The hostname is: ${VERSION(BUILD_HOSTNAME)} );
+		Verbose(The machine is: ${VERSION(BUILD_MACHINE)} );
+		Verbose(The OS is: ${VERSION(BUILD_OS)} );
+		Verbose(The date is: ${VERSION(BUILD_DATE)} );
+		Verbose(The kernel is: ${VERSION(BUILD_KERNEL)} );
+		Set(vinf=${VERSION()});
+		Set(vrand=${RAND()});
+		if( ${ISNULL(${vinf})} )
+		{
+			if( ${ISNULL(${vrand})} )
+				Verbose(Version 1.2 or earlier);
+			else
+				Verbose(Version 1.4!!!);
+		}
+		else
+			Verbose(${vinf} indicates version pre-1.6 or higher);
+	}
+	871 => {
+		NoOp(                                                                                                    1         1         1          1         1         1         1);
+		NoOp(          1         2         3         4         5         6         7         8         9         0         1         2          3         4         5         6);
+		NoOp(012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678890123456789012345678901234567890);
+		NoOp(${EXTEN:1:2}   ${EXTEN}   ${EXTEN:1}                                                                                                    1         1         1          1         1     1         1);
+		&dialoutpstn(${TDIRECTCALL-PST}/0${EXTEN},${E${CALLERID(num)}-OPT},${TDIRECTCALL-CID},${TDIRECTCALL-MAX},RotaPadrao) ;
+
+	}
+	872 => {
+		Set(ChannelOnly=${CUT(CHANNEL||1)});
+		Verbose(ChannelOnly=${ChannelOnly}; neat huh?);
+		Set(ChannelOnly=${CUT(CHANNEL,,1)});
+		Verbose(ChannelOnly=${ChannelOnly}; neat huh?);
+	}	
+	873 => {
+		NOOP(this is a forkcdr test);
+		Set(CALLERID(number)=1234567890);
+		Set(CALLERID(name)=before fork);
+		Forkcdr(v);
+		Set(CALLERID(number)=0987654321);
+		Set(CALLERID(name)=after fork);
+		Answer();
+		Echo();
+		Hangup();
+	}
+        874 => {
+		SayDigits(307-754-5675);
+                SayPhoneNumber(307-754-5675);
+                SayDigits(--);
+                SayPhoneNumber(123-456-7890);
+                SayDigits(++);
+                SayPhoneNumber(307-754-4454);
+        }
+	875 => {
+		&funcA();
+		&funcD();
+	}
+	876 => {
+		NoOp(Query resultid ${connid} SELECT var1\, var2 FROM did);
+		NoOp($["Query resultid ${connid} SELECT var1\, var2 FROM did"]);
+		NoOp($["Query resultid ${connid} SELECT var1, var2 FROM did"]);
+		goto test5,s,1;
+	}
+	88 => {
+		SET(LIMIT_PLAYAUDIO_CALLER=yes);
+		SET(LIMIT_PLAYAUDIO_CALLEE=no);
+		SET(LIMIT_TIMEOUT_FILE=timeup);
+		SET(LIMIT_CONNECT_FILE=limit60);
+		SET(LIMIT_WARNING_FILE=almostup);
+		Dial(Zap/51,20,L(60000:30000:8000));
+	}
+	89 => {
+		goto callbackmenu|100|1;
+	}
+}
+
+context income1
+{
+	s => {
+		Answer();
+		Dial(Zap/50,20,m);
+	}
+	150 => Dial(Zap/50,20,m);
+}
+
+context callbackmenu
+{
+	_X. => {
+			Answer();
+			Wait(1);
+			Set(TIMEOUT(digit)=5);
+			Set(TIMEOUT(response)=30);
+			DISA(no-password,callbackdialout);
+	}
+}
+
+context callbackdialout
+{
+	_X. => {
+			Dial(Zap/51,20,w);
+		}
+
+}
+
+
+macro dialoutpstn(something1, something2, something3, something4, something5)
+{
+	Verbose(${something1}--- ${something2}--- ${something3}--- ${something4}--- ${something5});
+}
+
+macro ndeep(level)
+{
+        if( ${level} == 0)
+        {
+                Verbose(2|Got to Level 0);
+                return;
+        }
+        &ndeep($[${level}-1]);
+        return;
+}

Propchange: trunk/pbx/ael/ael-test/ael-test19/extensions.ael
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/pbx/ael/ael-test/ael-test19/extensions.ael
------------------------------------------------------------------------------
    svn:keywords = Author Id Date Revision

Propchange: trunk/pbx/ael/ael-test/ael-test19/extensions.ael
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: trunk/pbx/ael/ael-test/ref.ael-test19
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ref.ael-test19?view=auto&rev=59234
==============================================================================
--- trunk/pbx/ael/ael-test/ref.ael-test19 (added)
+++ trunk/pbx/ael/ael-test/ref.ael-test19 Mon Mar 26 17:17:37 2007
@@ -1,0 +1,15 @@
+
+(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:4026 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4033 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4041 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:4 file:pbx_ael.c  line:2340 func: check_context_names  Error: file ./extensions.ael, line 49-62: The context name (incoming) is also declared in file ./extensions.ael, line 62-69!
+LOG: lev:3 file:pbx_ael.c  line:734 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:pbx_ael.c  line:2440 func: check_pval_item  Warning: file ./extensions.ael, line 312-312: macro call to non-existent funcA ! Hopefully it is present in extensions.conf! 
+LOG: lev:3 file:pbx_ael.c  line:2440 func: check_pval_item  Warning: file ./extensions.ael, line 313-313: macro call to non-existent funcD ! Hopefully it is present in extensions.conf! 
+LOG: lev:3 file:pbx_ael.c  line:1393 func: check_goto  Warning: file ./extensions.ael, line 319-319: goto:  no context test5 could be found that matches the goto target!
+LOG: lev:3 file:pbx_ael.c  line:734 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:4 file:pbx_ael.c  line:4054 func: pbx_load_module  Sorry, but 0 syntax errors and 1 semantic errors were detected. It doesn't make sense to compile.
+LOG: lev:4 file:ael2_parse  line:512 func: main  0 contexts, 0 extensions, 0 priorities

Propchange: trunk/pbx/ael/ael-test/ref.ael-test19
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/pbx/ael/ael-test/ref.ael-test19
------------------------------------------------------------------------------
    svn:keywords = Author Id Date Revision

Propchange: trunk/pbx/ael/ael-test/ref.ael-test19
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: trunk/pbx/ael/ael-test/ref.ael-test7
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ref.ael-test7?view=diff&rev=59234&r1=59233&r2=59234
==============================================================================
--- trunk/pbx/ael/ael-test/ref.ael-test7 (original)
+++ trunk/pbx/ael/ael-test/ref.ael-test7 Mon Mar 26 17:17:37 2007
@@ -2,9 +2,9 @@
 (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:4021 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4028 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4036 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4026 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4033 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4041 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
 LOG: lev:3 file:pbx_ael.c  line:734 func: check_macro_returns  Warning: file ./extensions.ael, line 22-42: The macro stdexten does not end with a return; I will insert one.
 LOG: lev:3 file:pbx_ael.c  line:734 func: check_macro_returns  Warning: file ./extensions.ael, line 44-49: The macro announce_minutes does not end with a return; I will insert one.
 LOG: lev:3 file:pbx_ael.c  line:734 func: check_macro_returns  Warning: file ./extensions.ael, line 59-89: The macro checkanddial does not end with a return; I will insert one.
@@ -15,6 +15,6 @@
 LOG: lev:3 file:pbx_ael.c  line:734 func: check_macro_returns  Warning: file ./extensions.ael, line 114-119: The macro autodial does not end with a return; I will insert one.
 LOG: lev:4 file:pbx_ael.c  line:2459 func: check_pval_item  Error: file ./extensions.ael, line 284-284: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
 LOG: lev:4 file:pbx_ael.c  line:2459 func: check_pval_item  Error: file ./extensions.ael, line 287-287: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
-LOG: lev:3 file:pbx_ael.c  line:2440 func: check_pval_item  Error: file ./extensions.ael, line 452-452: macro call to non-existent std-exten-ael ! Hopefully it is present in extensions.conf! 
-LOG: lev:4 file:pbx_ael.c  line:4049 func: pbx_load_module  Sorry, but 0 syntax errors and 4 semantic errors were detected. It doesn't make sense to compile.
+LOG: lev:3 file:pbx_ael.c  line:2440 func: check_pval_item  Warning: file ./extensions.ael, line 452-452: macro call to non-existent std-exten-ael ! Hopefully it is present in extensions.conf! 
+LOG: lev:4 file:pbx_ael.c  line:4054 func: pbx_load_module  Sorry, but 0 syntax errors and 4 semantic errors were detected. It doesn't make sense to compile.
 LOG: lev:4 file:ael2_parse  line:512 func: main  0 contexts, 0 extensions, 0 priorities

Modified: trunk/pbx/ael/ael-test/ref.ael-vtest13
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ref.ael-vtest13?view=diff&rev=59234&r1=59233&r2=59234
==============================================================================
--- trunk/pbx/ael/ael-test/ref.ael-vtest13 (original)
+++ trunk/pbx/ael/ael-test/ref.ael-vtest13 Mon Mar 26 17:17:37 2007
@@ -14,17 +14,17 @@
 exten => s,1,Set(ext=${ARG1})
 exten => s,2,Set(dev=${ARG2})
 exten => s,3,Dial(${dev}/${ext}|20)
-exten => s,4,Goto(sw-1-${DIALSTATUS}|1)
+exten => s,4,Goto(sw-1-${DIALSTATUS}|10)
 exten => s,5,NoOp(Finish switch-std-exten-1)
 exten => s,6,Return()
 exten => a,1,VoiceMailMain(${ext})
-exten => _sw-1-.,1,Voicemail(u${ext})
-exten => _sw-1-.,2,Goto(s|5)
-exten => sw-1-ANSWER,1,Goto(s|5)
-exten => sw-1-NOANSWER,1,Voicemail(u${ext})
-exten => sw-1-NOANSWER,2,Goto(s|5)
-exten => sw-1-BUSY,1,Voicemail(b${ext})
-exten => sw-1-BUSY,2,Goto(s|5)
+exten => _sw-1-.,10,Voicemail(u${ext})
+exten => _sw-1-.,11,Goto(s|5)
+exten => sw-1-ANSWER,10,Goto(s|5)
+exten => sw-1-NOANSWER,10,Voicemail(u${ext})
+exten => sw-1-NOANSWER,11,Goto(s|5)
+exten => sw-1-BUSY,10,Voicemail(b${ext})
+exten => sw-1-BUSY,11,Goto(s|5)
 
 
 [std-priv-exten_1]
@@ -36,20 +36,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-3-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-3-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_1-3)
 exten => s,11,Return()
-exten => _sw-3-.,1,Voicemail(u${ext})
-exten => _sw-3-.,2,Goto(s|10)
-exten => sw-3-NOANSWER,1,Voicemail(u${ext})
-exten => sw-3-NOANSWER,2,Goto(s|10)
-exten => sw-3-ANSWER,1,Goto(s|10)
-exten => sw-3-BUSY,1,Voicemail(b${ext})
-exten => sw-3-BUSY,2,Goto(s|10)
-exten => sw-3-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-3-DONTCALL,2,Goto(s|10)
-exten => sw-3-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-3-TORTURE,2,Goto(s|10)
+exten => _sw-3-.,10,Voicemail(u${ext})
+exten => _sw-3-.,11,Goto(s|10)
+exten => sw-3-NOANSWER,10,Voicemail(u${ext})
+exten => sw-3-NOANSWER,11,Goto(s|10)
+exten => sw-3-ANSWER,10,Goto(s|10)
+exten => sw-3-BUSY,10,Voicemail(b${ext})
+exten => sw-3-BUSY,11,Goto(s|10)
+exten => sw-3-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-3-DONTCALL,11,Goto(s|10)
+exten => sw-3-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-3-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_2]
@@ -61,20 +61,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-4-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-4-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_2-4)
 exten => s,11,Return()
-exten => _sw-4-.,1,Voicemail(u${ext})
-exten => _sw-4-.,2,Goto(s|10)
-exten => sw-4-NOANSWER,1,Voicemail(u${ext})
-exten => sw-4-NOANSWER,2,Goto(s|10)
-exten => sw-4-ANSWER,1,Goto(s|10)
-exten => sw-4-BUSY,1,Voicemail(b${ext})
-exten => sw-4-BUSY,2,Goto(s|10)
-exten => sw-4-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-4-DONTCALL,2,Goto(s|10)
-exten => sw-4-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-4-TORTURE,2,Goto(s|10)
+exten => _sw-4-.,10,Voicemail(u${ext})
+exten => _sw-4-.,11,Goto(s|10)
+exten => sw-4-NOANSWER,10,Voicemail(u${ext})
+exten => sw-4-NOANSWER,11,Goto(s|10)
+exten => sw-4-ANSWER,10,Goto(s|10)
+exten => sw-4-BUSY,10,Voicemail(b${ext})
+exten => sw-4-BUSY,11,Goto(s|10)
+exten => sw-4-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-4-DONTCALL,11,Goto(s|10)
+exten => sw-4-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-4-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_3]
@@ -86,20 +86,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-5-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-5-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_3-5)
 exten => s,11,Return()
-exten => _sw-5-.,1,Voicemail(u${ext})
-exten => _sw-5-.,2,Goto(s|10)
-exten => sw-5-NOANSWER,1,Voicemail(u${ext})
-exten => sw-5-NOANSWER,2,Goto(s|10)
-exten => sw-5-ANSWER,1,Goto(s|10)
-exten => sw-5-BUSY,1,Voicemail(b${ext})
-exten => sw-5-BUSY,2,Goto(s|10)
-exten => sw-5-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-5-DONTCALL,2,Goto(s|10)
-exten => sw-5-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-5-TORTURE,2,Goto(s|10)
+exten => _sw-5-.,10,Voicemail(u${ext})
+exten => _sw-5-.,11,Goto(s|10)
+exten => sw-5-NOANSWER,10,Voicemail(u${ext})
+exten => sw-5-NOANSWER,11,Goto(s|10)
+exten => sw-5-ANSWER,10,Goto(s|10)
+exten => sw-5-BUSY,10,Voicemail(b${ext})
+exten => sw-5-BUSY,11,Goto(s|10)
+exten => sw-5-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-5-DONTCALL,11,Goto(s|10)
+exten => sw-5-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-5-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_4]
@@ -111,20 +111,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-6-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-6-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_4-6)
 exten => s,11,Return()
-exten => _sw-6-.,1,Voicemail(u${ext})
-exten => _sw-6-.,2,Goto(s|10)
-exten => sw-6-NOANSWER,1,Voicemail(u${ext})
-exten => sw-6-NOANSWER,2,Goto(s|10)
-exten => sw-6-ANSWER,1,Goto(s|10)
-exten => sw-6-BUSY,1,Voicemail(b${ext})
-exten => sw-6-BUSY,2,Goto(s|10)
-exten => sw-6-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-6-DONTCALL,2,Goto(s|10)
-exten => sw-6-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-6-TORTURE,2,Goto(s|10)
+exten => _sw-6-.,10,Voicemail(u${ext})
+exten => _sw-6-.,11,Goto(s|10)
+exten => sw-6-NOANSWER,10,Voicemail(u${ext})
+exten => sw-6-NOANSWER,11,Goto(s|10)
+exten => sw-6-ANSWER,10,Goto(s|10)
+exten => sw-6-BUSY,10,Voicemail(b${ext})
+exten => sw-6-BUSY,11,Goto(s|10)
+exten => sw-6-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-6-DONTCALL,11,Goto(s|10)
+exten => sw-6-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-6-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_5]
@@ -136,20 +136,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-7-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-7-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_5-7)
 exten => s,11,Return()
-exten => _sw-7-.,1,Voicemail(u${ext})
-exten => _sw-7-.,2,Goto(s|10)
-exten => sw-7-NOANSWER,1,Voicemail(u${ext})
-exten => sw-7-NOANSWER,2,Goto(s|10)
-exten => sw-7-ANSWER,1,Goto(s|10)
-exten => sw-7-BUSY,1,Voicemail(b${ext})
-exten => sw-7-BUSY,2,Goto(s|10)
-exten => sw-7-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-7-DONTCALL,2,Goto(s|10)
-exten => sw-7-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-7-TORTURE,2,Goto(s|10)
+exten => _sw-7-.,10,Voicemail(u${ext})
+exten => _sw-7-.,11,Goto(s|10)
+exten => sw-7-NOANSWER,10,Voicemail(u${ext})
+exten => sw-7-NOANSWER,11,Goto(s|10)
+exten => sw-7-ANSWER,10,Goto(s|10)
+exten => sw-7-BUSY,10,Voicemail(b${ext})
+exten => sw-7-BUSY,11,Goto(s|10)
+exten => sw-7-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-7-DONTCALL,11,Goto(s|10)
+exten => sw-7-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-7-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_6]
@@ -161,20 +161,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-8-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-8-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_6-8)
 exten => s,11,Return()
-exten => _sw-8-.,1,Voicemail(u${ext})
-exten => _sw-8-.,2,Goto(s|10)
-exten => sw-8-NOANSWER,1,Voicemail(u${ext})
-exten => sw-8-NOANSWER,2,Goto(s|10)
-exten => sw-8-ANSWER,1,Goto(s|10)
-exten => sw-8-BUSY,1,Voicemail(b${ext})
-exten => sw-8-BUSY,2,Goto(s|10)
-exten => sw-8-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-8-DONTCALL,2,Goto(s|10)
-exten => sw-8-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-8-TORTURE,2,Goto(s|10)
+exten => _sw-8-.,10,Voicemail(u${ext})
+exten => _sw-8-.,11,Goto(s|10)
+exten => sw-8-NOANSWER,10,Voicemail(u${ext})
+exten => sw-8-NOANSWER,11,Goto(s|10)
+exten => sw-8-ANSWER,10,Goto(s|10)
+exten => sw-8-BUSY,10,Voicemail(b${ext})
+exten => sw-8-BUSY,11,Goto(s|10)
+exten => sw-8-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-8-DONTCALL,11,Goto(s|10)
+exten => sw-8-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-8-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_7]
@@ -186,20 +186,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-9-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-9-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_7-9)
 exten => s,11,Return()
-exten => _sw-9-.,1,Voicemail(u${ext})
-exten => _sw-9-.,2,Goto(s|10)
-exten => sw-9-NOANSWER,1,Voicemail(u${ext})
-exten => sw-9-NOANSWER,2,Goto(s|10)
-exten => sw-9-ANSWER,1,Goto(s|10)
-exten => sw-9-BUSY,1,Voicemail(b${ext})
-exten => sw-9-BUSY,2,Goto(s|10)
-exten => sw-9-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-9-DONTCALL,2,Goto(s|10)
-exten => sw-9-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-9-TORTURE,2,Goto(s|10)
+exten => _sw-9-.,10,Voicemail(u${ext})
+exten => _sw-9-.,11,Goto(s|10)
+exten => sw-9-NOANSWER,10,Voicemail(u${ext})
+exten => sw-9-NOANSWER,11,Goto(s|10)
+exten => sw-9-ANSWER,10,Goto(s|10)
+exten => sw-9-BUSY,10,Voicemail(b${ext})
+exten => sw-9-BUSY,11,Goto(s|10)
+exten => sw-9-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-9-DONTCALL,11,Goto(s|10)
+exten => sw-9-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-9-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_8]
@@ -211,20 +211,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-10-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-10-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_8-10)
 exten => s,11,Return()
-exten => _sw-10-.,1,Voicemail(u${ext})
-exten => _sw-10-.,2,Goto(s|10)
-exten => sw-10-NOANSWER,1,Voicemail(u${ext})
-exten => sw-10-NOANSWER,2,Goto(s|10)
-exten => sw-10-ANSWER,1,Goto(s|10)
-exten => sw-10-BUSY,1,Voicemail(b${ext})
-exten => sw-10-BUSY,2,Goto(s|10)
-exten => sw-10-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-10-DONTCALL,2,Goto(s|10)
-exten => sw-10-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-10-TORTURE,2,Goto(s|10)
+exten => _sw-10-.,10,Voicemail(u${ext})
+exten => _sw-10-.,11,Goto(s|10)
+exten => sw-10-NOANSWER,10,Voicemail(u${ext})
+exten => sw-10-NOANSWER,11,Goto(s|10)
+exten => sw-10-ANSWER,10,Goto(s|10)
+exten => sw-10-BUSY,10,Voicemail(b${ext})
+exten => sw-10-BUSY,11,Goto(s|10)
+exten => sw-10-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-10-DONTCALL,11,Goto(s|10)
+exten => sw-10-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-10-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_9]
@@ -236,20 +236,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-11-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-11-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_9-11)
 exten => s,11,Return()
-exten => _sw-11-.,1,Voicemail(u${ext})
-exten => _sw-11-.,2,Goto(s|10)
-exten => sw-11-NOANSWER,1,Voicemail(u${ext})
-exten => sw-11-NOANSWER,2,Goto(s|10)
-exten => sw-11-ANSWER,1,Goto(s|10)
-exten => sw-11-BUSY,1,Voicemail(b${ext})
-exten => sw-11-BUSY,2,Goto(s|10)
-exten => sw-11-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-11-DONTCALL,2,Goto(s|10)
-exten => sw-11-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-11-TORTURE,2,Goto(s|10)
+exten => _sw-11-.,10,Voicemail(u${ext})
+exten => _sw-11-.,11,Goto(s|10)
+exten => sw-11-NOANSWER,10,Voicemail(u${ext})
+exten => sw-11-NOANSWER,11,Goto(s|10)
+exten => sw-11-ANSWER,10,Goto(s|10)
+exten => sw-11-BUSY,10,Voicemail(b${ext})
+exten => sw-11-BUSY,11,Goto(s|10)
+exten => sw-11-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-11-DONTCALL,11,Goto(s|10)
+exten => sw-11-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-11-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_10]
@@ -261,20 +261,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-12-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-12-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_10-12)
 exten => s,11,Return()
-exten => _sw-12-.,1,Voicemail(u${ext})
-exten => _sw-12-.,2,Goto(s|10)
-exten => sw-12-NOANSWER,1,Voicemail(u${ext})
-exten => sw-12-NOANSWER,2,Goto(s|10)
-exten => sw-12-ANSWER,1,Goto(s|10)
-exten => sw-12-BUSY,1,Voicemail(b${ext})
-exten => sw-12-BUSY,2,Goto(s|10)
-exten => sw-12-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-12-DONTCALL,2,Goto(s|10)
-exten => sw-12-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-12-TORTURE,2,Goto(s|10)
+exten => _sw-12-.,10,Voicemail(u${ext})
+exten => _sw-12-.,11,Goto(s|10)
+exten => sw-12-NOANSWER,10,Voicemail(u${ext})
+exten => sw-12-NOANSWER,11,Goto(s|10)
+exten => sw-12-ANSWER,10,Goto(s|10)
+exten => sw-12-BUSY,10,Voicemail(b${ext})
+exten => sw-12-BUSY,11,Goto(s|10)
+exten => sw-12-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-12-DONTCALL,11,Goto(s|10)
+exten => sw-12-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-12-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_11]
@@ -286,20 +286,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-13-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-13-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_11-13)
 exten => s,11,Return()
-exten => _sw-13-.,1,Voicemail(u${ext})
-exten => _sw-13-.,2,Goto(s|10)
-exten => sw-13-NOANSWER,1,Voicemail(u${ext})
-exten => sw-13-NOANSWER,2,Goto(s|10)
-exten => sw-13-ANSWER,1,Goto(s|10)
-exten => sw-13-BUSY,1,Voicemail(b${ext})
-exten => sw-13-BUSY,2,Goto(s|10)
-exten => sw-13-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-13-DONTCALL,2,Goto(s|10)
-exten => sw-13-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-13-TORTURE,2,Goto(s|10)
+exten => _sw-13-.,10,Voicemail(u${ext})
+exten => _sw-13-.,11,Goto(s|10)
+exten => sw-13-NOANSWER,10,Voicemail(u${ext})
+exten => sw-13-NOANSWER,11,Goto(s|10)
+exten => sw-13-ANSWER,10,Goto(s|10)
+exten => sw-13-BUSY,10,Voicemail(b${ext})
+exten => sw-13-BUSY,11,Goto(s|10)
+exten => sw-13-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-13-DONTCALL,11,Goto(s|10)
+exten => sw-13-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-13-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_12]
@@ -311,20 +311,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-14-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-14-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_12-14)
 exten => s,11,Return()
-exten => _sw-14-.,1,Voicemail(u${ext})
-exten => _sw-14-.,2,Goto(s|10)
-exten => sw-14-NOANSWER,1,Voicemail(u${ext})
-exten => sw-14-NOANSWER,2,Goto(s|10)
-exten => sw-14-ANSWER,1,Goto(s|10)
-exten => sw-14-BUSY,1,Voicemail(b${ext})
-exten => sw-14-BUSY,2,Goto(s|10)
-exten => sw-14-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-14-DONTCALL,2,Goto(s|10)
-exten => sw-14-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-14-TORTURE,2,Goto(s|10)
+exten => _sw-14-.,10,Voicemail(u${ext})
+exten => _sw-14-.,11,Goto(s|10)
+exten => sw-14-NOANSWER,10,Voicemail(u${ext})
+exten => sw-14-NOANSWER,11,Goto(s|10)
+exten => sw-14-ANSWER,10,Goto(s|10)
+exten => sw-14-BUSY,10,Voicemail(b${ext})
+exten => sw-14-BUSY,11,Goto(s|10)
+exten => sw-14-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-14-DONTCALL,11,Goto(s|10)
+exten => sw-14-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-14-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_13]
@@ -336,20 +336,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-15-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-15-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_13-15)
 exten => s,11,Return()
-exten => _sw-15-.,1,Voicemail(u${ext})
-exten => _sw-15-.,2,Goto(s|10)
-exten => sw-15-NOANSWER,1,Voicemail(u${ext})
-exten => sw-15-NOANSWER,2,Goto(s|10)
-exten => sw-15-ANSWER,1,Goto(s|10)
-exten => sw-15-BUSY,1,Voicemail(b${ext})
-exten => sw-15-BUSY,2,Goto(s|10)
-exten => sw-15-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-15-DONTCALL,2,Goto(s|10)
-exten => sw-15-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-15-TORTURE,2,Goto(s|10)
+exten => _sw-15-.,10,Voicemail(u${ext})
+exten => _sw-15-.,11,Goto(s|10)
+exten => sw-15-NOANSWER,10,Voicemail(u${ext})
+exten => sw-15-NOANSWER,11,Goto(s|10)
+exten => sw-15-ANSWER,10,Goto(s|10)
+exten => sw-15-BUSY,10,Voicemail(b${ext})
+exten => sw-15-BUSY,11,Goto(s|10)
+exten => sw-15-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-15-DONTCALL,11,Goto(s|10)
+exten => sw-15-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-15-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_14]
@@ -361,20 +361,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-16-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-16-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_14-16)
 exten => s,11,Return()
-exten => _sw-16-.,1,Voicemail(u${ext})
-exten => _sw-16-.,2,Goto(s|10)
-exten => sw-16-NOANSWER,1,Voicemail(u${ext})
-exten => sw-16-NOANSWER,2,Goto(s|10)
-exten => sw-16-ANSWER,1,Goto(s|10)
-exten => sw-16-BUSY,1,Voicemail(b${ext})
-exten => sw-16-BUSY,2,Goto(s|10)
-exten => sw-16-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-16-DONTCALL,2,Goto(s|10)
-exten => sw-16-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-16-TORTURE,2,Goto(s|10)
+exten => _sw-16-.,10,Voicemail(u${ext})
+exten => _sw-16-.,11,Goto(s|10)
+exten => sw-16-NOANSWER,10,Voicemail(u${ext})
+exten => sw-16-NOANSWER,11,Goto(s|10)
+exten => sw-16-ANSWER,10,Goto(s|10)
+exten => sw-16-BUSY,10,Voicemail(b${ext})
+exten => sw-16-BUSY,11,Goto(s|10)
+exten => sw-16-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-16-DONTCALL,11,Goto(s|10)
+exten => sw-16-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-16-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_15]
@@ -386,20 +386,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-17-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-17-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_15-17)
 exten => s,11,Return()
-exten => _sw-17-.,1,Voicemail(u${ext})
-exten => _sw-17-.,2,Goto(s|10)
-exten => sw-17-NOANSWER,1,Voicemail(u${ext})
-exten => sw-17-NOANSWER,2,Goto(s|10)
-exten => sw-17-ANSWER,1,Goto(s|10)
-exten => sw-17-BUSY,1,Voicemail(b${ext})
-exten => sw-17-BUSY,2,Goto(s|10)
-exten => sw-17-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-17-DONTCALL,2,Goto(s|10)
-exten => sw-17-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-17-TORTURE,2,Goto(s|10)
+exten => _sw-17-.,10,Voicemail(u${ext})
+exten => _sw-17-.,11,Goto(s|10)
+exten => sw-17-NOANSWER,10,Voicemail(u${ext})
+exten => sw-17-NOANSWER,11,Goto(s|10)
+exten => sw-17-ANSWER,10,Goto(s|10)
+exten => sw-17-BUSY,10,Voicemail(b${ext})
+exten => sw-17-BUSY,11,Goto(s|10)
+exten => sw-17-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-17-DONTCALL,11,Goto(s|10)
+exten => sw-17-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-17-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_16]
@@ -411,20 +411,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-18-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-18-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_16-18)
 exten => s,11,Return()
-exten => _sw-18-.,1,Voicemail(u${ext})
-exten => _sw-18-.,2,Goto(s|10)
-exten => sw-18-NOANSWER,1,Voicemail(u${ext})
-exten => sw-18-NOANSWER,2,Goto(s|10)
-exten => sw-18-ANSWER,1,Goto(s|10)
-exten => sw-18-BUSY,1,Voicemail(b${ext})
-exten => sw-18-BUSY,2,Goto(s|10)
-exten => sw-18-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-18-DONTCALL,2,Goto(s|10)
-exten => sw-18-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-18-TORTURE,2,Goto(s|10)
+exten => _sw-18-.,10,Voicemail(u${ext})
+exten => _sw-18-.,11,Goto(s|10)
+exten => sw-18-NOANSWER,10,Voicemail(u${ext})
+exten => sw-18-NOANSWER,11,Goto(s|10)
+exten => sw-18-ANSWER,10,Goto(s|10)
+exten => sw-18-BUSY,10,Voicemail(b${ext})
+exten => sw-18-BUSY,11,Goto(s|10)
+exten => sw-18-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-18-DONTCALL,11,Goto(s|10)
+exten => sw-18-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-18-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_17]
@@ -436,20 +436,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-19-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-19-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_17-19)
 exten => s,11,Return()
-exten => _sw-19-.,1,Voicemail(u${ext})
-exten => _sw-19-.,2,Goto(s|10)
-exten => sw-19-NOANSWER,1,Voicemail(u${ext})
-exten => sw-19-NOANSWER,2,Goto(s|10)
-exten => sw-19-ANSWER,1,Goto(s|10)
-exten => sw-19-BUSY,1,Voicemail(b${ext})
-exten => sw-19-BUSY,2,Goto(s|10)
-exten => sw-19-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-19-DONTCALL,2,Goto(s|10)
-exten => sw-19-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-19-TORTURE,2,Goto(s|10)
+exten => _sw-19-.,10,Voicemail(u${ext})
+exten => _sw-19-.,11,Goto(s|10)
+exten => sw-19-NOANSWER,10,Voicemail(u${ext})
+exten => sw-19-NOANSWER,11,Goto(s|10)
+exten => sw-19-ANSWER,10,Goto(s|10)
+exten => sw-19-BUSY,10,Voicemail(b${ext})
+exten => sw-19-BUSY,11,Goto(s|10)
+exten => sw-19-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-19-DONTCALL,11,Goto(s|10)
+exten => sw-19-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-19-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_18]
@@ -461,20 +461,20 @@
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-20-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-20-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_18-20)
 exten => s,11,Return()
-exten => _sw-20-.,1,Voicemail(u${ext})
-exten => _sw-20-.,2,Goto(s|10)
-exten => sw-20-NOANSWER,1,Voicemail(u${ext})
-exten => sw-20-NOANSWER,2,Goto(s|10)
-exten => sw-20-ANSWER,1,Goto(s|10)
-exten => sw-20-BUSY,1,Voicemail(b${ext})
-exten => sw-20-BUSY,2,Goto(s|10)
-exten => sw-20-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-20-DONTCALL,2,Goto(s|10)
-exten => sw-20-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-20-TORTURE,2,Goto(s|10)
+exten => _sw-20-.,10,Voicemail(u${ext})
+exten => _sw-20-.,11,Goto(s|10)
+exten => sw-20-NOANSWER,10,Voicemail(u${ext})

[... 1916 lines stripped ...]


More information about the asterisk-commits mailing list