[asterisk-commits] murf: branch murf/AEL2-1.2 r62944 - in
/team/murf/AEL2-1.2: patches/ pbx/ pbx...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu May 3 08:34:30 MST 2007
Author: murf
Date: Thu May 3 10:34:29 2007
New Revision: 62944
URL: http://svn.digium.com/view/asterisk?view=rev&rev=62944
Log:
update to the backport (AEL2 in 1.2)
Added:
team/murf/AEL2-1.2/pbx/ael-test/ael-test18/
team/murf/AEL2-1.2/pbx/ael-test/ael-test18/extensions.ael2 (with props)
team/murf/AEL2-1.2/pbx/ael-test/ael-test19/
team/murf/AEL2-1.2/pbx/ael-test/ael-test19/extensions.ael2 (with props)
team/murf/AEL2-1.2/pbx/ael-test/ael-test20/
team/murf/AEL2-1.2/pbx/ael-test/ael-test20/extensions.ael2 (with props)
team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test18 (with props)
team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test19 (with props)
team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test20 (with props)
Modified:
team/murf/AEL2-1.2/patches/diffs.AEL2.patch
team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test7
team/murf/AEL2-1.2/pbx/ael.tab.c
team/murf/AEL2-1.2/pbx/ael.y
Modified: team/murf/AEL2-1.2/patches/diffs.AEL2.patch
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/patches/diffs.AEL2.patch?view=diff&rev=62944&r1=62943&r2=62944
==============================================================================
--- team/murf/AEL2-1.2/patches/diffs.AEL2.patch (original)
+++ team/murf/AEL2-1.2/patches/diffs.AEL2.patch Thu May 3 10:34:29 2007
@@ -1,7 +1,7 @@
Index: pbx/argdesc.y
===================================================================
--- pbx/argdesc.y (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,268 @@
+%{
+#include <stdio.h>
@@ -284,7 +284,7 @@
Index: pbx/ael.tab.c
===================================================================
--- pbx/ael.tab.c (.../branches/1.2) (revision 0)
-+++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,3334 @@
+/* A Bison parser, made by GNU Bison 2.1a. */
+
@@ -3633,7 +3633,7 @@
Index: pbx/ael_lex.c
===================================================================
--- pbx/ael_lex.c (.../branches/1.2) (revision 0)
-+++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,3015 @@
+#line 2 "ael_lex.c"
+
@@ -6662,8 +6662,8 @@
Index: pbx/pbx_ael.c
===================================================================
---- pbx/pbx_ael.c (.../branches/1.2) (revision 59237)
-+++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 59237)
+--- pbx/pbx_ael.c (.../branches/1.2) (revision 62941)
++++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 62941)
@@ -1258,7 +1258,6 @@
static int ael_reload(int fd, int argc, char *argv[])
@@ -6683,7 +6683,7 @@
Index: pbx/ael.tab.h
===================================================================
--- pbx/ael.tab.h (.../branches/1.2) (revision 0)
-+++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,150 @@
+/* A Bison parser, made by GNU Bison 2.1a. */
+
@@ -6848,7 +6848,7 @@
Index: pbx/argdesc.tab.c
===================================================================
--- pbx/argdesc.tab.c (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,1730 @@
+/* A Bison parser, made by GNU Bison 2.0. */
+
@@ -8593,7 +8593,7 @@
Index: pbx/ael.flex
===================================================================
--- pbx/ael.flex (.../branches/1.2) (revision 0)
-+++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,594 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
@@ -9202,7 +9202,7 @@
Index: pbx/argdesc_lex.c
===================================================================
--- pbx/argdesc_lex.c (.../branches/1.2) (revision 0)
-+++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,2141 @@
+#line 2 "argdesc_lex.c"
+
@@ -11358,7 +11358,7 @@
Index: pbx/argdesc.l
===================================================================
--- pbx/argdesc.l (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,88 @@
+%{
+#include <sys/types.h>
@@ -11461,7 +11461,7 @@
Index: pbx/argdesc.tab.h
===================================================================
--- pbx/argdesc.tab.h (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,115 @@
+/* A Bison parser, made by GNU Bison 2.0. */
+
@@ -11591,7 +11591,7 @@
Index: pbx/ael.y
===================================================================
--- pbx/ael.y (.../branches/1.2) (revision 0)
-+++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,820 @@
+%{
+/*
@@ -12426,7 +12426,7 @@
Index: pbx/applist
===================================================================
--- pbx/applist (.../branches/1.2) (revision 0)
-+++ pbx/applist (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/applist (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,142 @@
+ AddQueueMember: "Dynamically adds queue members"; args=queuename|[interface]|[:penalty#i]|[:options]; options=j; Chanvars=AQMSTATUS:ADDED | MEMBERALREADY | NOSUCHQUEUE;
+ ADSIProg: "Load Asterisk ADSI Scripts into phone"; args=scriptfile;
@@ -12582,8 +12582,8 @@
Index: pbx/Makefile
===================================================================
---- pbx/Makefile (.../branches/1.2) (revision 59237)
-+++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 59237)
+--- pbx/Makefile (.../branches/1.2) (revision 62941)
++++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 62941)
@@ -12,7 +12,7 @@
#
@@ -12641,7 +12641,7 @@
Index: pbx/pbx_ael2.c
===================================================================
--- pbx/pbx_ael2.c (.../branches/1.2) (revision 0)
-+++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,4383 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
@@ -15639,7 +15639,7 @@
+
+ /* now, put the body of the for loop here */
+ exten->loop_break = for_end;
-+ exten->loop_continue = for_test;
++ exten->loop_continue = for_inc;
+
+ gen_prios(exten, new_label, p->u4.for_statements, mother_exten, this_context); /* this will link in all the statements here */
+
@@ -17039,7 +17039,7 @@
Index: pbx/ael-test/ref.ael-test6
===================================================================
--- pbx/ael-test/ref.ael-test6 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,45 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17099,7 +17099,7 @@
Index: pbx/ael-test/ref.ael-test7
===================================================================
--- pbx/ael-test/ref.ael-test7 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,15 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17129,7 +17129,7 @@
Index: pbx/ael-test/ref.ael-test8
===================================================================
--- pbx/ael-test/ref.ael-test8 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17169,7 +17169,7 @@
Index: pbx/ael-test/ael-ntest9/extensions.ael2
===================================================================
--- pbx/ael-test/ael-ntest9/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-ntest9/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-ntest9/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,12 @@
+
+context workext {
@@ -17198,7 +17198,7 @@
Index: pbx/ael-test/ref.ael-vtest17
===================================================================
--- pbx/ael-test/ref.ael-vtest17 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-vtest17 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-vtest17 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,68 @@
+
+
@@ -17281,7 +17281,7 @@
Index: pbx/ael-test/setref
===================================================================
--- pbx/ael-test/setref (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/setref (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/setref (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
@@ -17305,7 +17305,7 @@
Index: pbx/ael-test/ref.ael-test11
===================================================================
--- pbx/ael-test/ref.ael-test11 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test11 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test11 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,12 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17332,7 +17332,7 @@
Index: pbx/ael-test/ref.ael-test14
===================================================================
--- pbx/ael-test/ref.ael-test14 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test14 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test14 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,11 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17358,7 +17358,7 @@
Index: pbx/ael-test/ref.ael-test15
===================================================================
--- pbx/ael-test/ref.ael-test15 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test15 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test15 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17386,7 +17386,7 @@
Index: pbx/ael-test/ael-test11/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test11/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test11/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test11/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,56 @@
+context test1
+{
@@ -17457,7 +17457,7 @@
Index: pbx/ael-test/ael-test14/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test14/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test14/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test14/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,20 @@
+context test1
+{
@@ -17492,7 +17492,7 @@
Index: pbx/ael-test/ael-test15/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test15/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test15/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test15/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,17 @@
+/* and some comments
+ would make a nice touch */
@@ -17524,7 +17524,7 @@
Index: pbx/ael-test/runtests
===================================================================
--- pbx/ael-test/runtests (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/runtests (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/runtests (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,56 @@
+#!/bin/bash
+ORIG=`mktemp /tmp/mytest.XXXXXX`
@@ -17597,7 +17597,7 @@
Index: pbx/ael-test/ael-ntest10/extensions.ael2
===================================================================
--- pbx/ael-test/ael-ntest10/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-ntest10/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-ntest10/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,131 @@
+macro endsess()
+{
@@ -17743,7 +17743,7 @@
Index: pbx/ael-test/ael-ntest12/extensions.ael2
===================================================================
--- pbx/ael-test/ael-ntest12/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-ntest12/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-ntest12/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,13 @@
+context test1
+{
@@ -17771,7 +17771,7 @@
Index: pbx/ael-test/ael-test1/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test1/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test1/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test1/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,163 @@
+
+macro testdial(number, timeout) {
@@ -17949,7 +17949,7 @@
Index: pbx/ael-test/ref.ael-ntest9
===================================================================
--- pbx/ael-test/ref.ael-ntest9 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-ntest9 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-ntest9 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,25 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17989,7 +17989,7 @@
Index: pbx/ael-test/ael-test2/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test2/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test2/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test2/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -18012,7 +18012,7 @@
Index: pbx/ael-test/ael-test2/apptest.ael2
===================================================================
--- pbx/ael-test/ael-test2/apptest.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test2/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test2/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,146 @@
+// this is a quick test to see how many of the apps we can spot j options in
+// include this in a macro or extension
@@ -18173,7 +18173,7 @@
Index: pbx/ael-test/ael-test3/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test3/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test3/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -21373,7 +21373,7 @@
Index: pbx/ael-test/ael-test3/telemarket_torture.ael2
===================================================================
--- pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -22202,7 +22202,7 @@
Index: pbx/ael-test/ael-test3/include1.ael2
===================================================================
--- pbx/ael-test/ael-test3/include1.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include1.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test3/include1.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -22220,7 +22220,7 @@
Index: pbx/ael-test/ael-test3/include2.ael2
===================================================================
--- pbx/ael-test/ael-test3/include2.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include2.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test3/include2.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -22239,7 +22239,7 @@
Index: pbx/ael-test/ael-test3/include3.ael2
===================================================================
--- pbx/ael-test/ael-test3/include3.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include3.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test3/include3.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -22256,7 +22256,7 @@
Index: pbx/ael-test/ael-test3/include4.ael2
===================================================================
--- pbx/ael-test/ael-test3/include4.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include4.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test3/include4.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -22273,7 +22273,7 @@
Index: pbx/ael-test/ael-test3/include5.ael2
===================================================================
--- pbx/ael-test/ael-test3/include5.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include5.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test3/include5.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -22289,7 +22289,7 @@
Index: pbx/ael-test/ael-test4/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test4/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test4/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test4/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -22312,7 +22312,7 @@
Index: pbx/ael-test/ael-test4/apptest.ael2
===================================================================
--- pbx/ael-test/ael-test4/apptest.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test4/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test4/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,146 @@
+// this is a quick test to see how many of the apps we can spot j options in
+// include this in a macro or extension
@@ -22473,7 +22473,7 @@
Index: pbx/ael-test/ael-test5/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test5/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test5/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test5/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -23321,7 +23321,7 @@
Index: pbx/ael-test/ael-test5/extensions.ael.orig
===================================================================
--- pbx/ael-test/ael-test5/extensions.ael.orig (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test5/extensions.ael.orig (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test5/extensions.ael.orig (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -24169,7 +24169,7 @@
Index: pbx/ael-test/ael-test6/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test6/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test6/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test6/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -25017,7 +25017,7 @@
Index: pbx/ael-test/ael-test7/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test7/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test7/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test7/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,460 @@
+//
+// Example AEL config file
@@ -25492,7 +25492,7 @@
Index: pbx/ael-test/ael-test8/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test8/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test8/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-test8/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,27 @@
+context default
+{
@@ -25534,7 +25534,7 @@
Index: pbx/ael-test/ref.ael-ntest10
===================================================================
--- pbx/ael-test/ref.ael-ntest10 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-ntest10 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-ntest10 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,129 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -25678,7 +25678,7 @@
Index: pbx/ael-test/ael-vtest13/extensions.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-vtest13/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -28878,7 +28878,7 @@
Index: pbx/ael-test/ael-vtest13/telemarket_torture.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -29707,7 +29707,7 @@
Index: pbx/ael-test/ael-vtest13/include1.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include1.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include1.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-vtest13/include1.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -29725,7 +29725,7 @@
Index: pbx/ael-test/ael-vtest13/include2.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include2.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include2.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-vtest13/include2.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -29744,7 +29744,7 @@
Index: pbx/ael-test/ael-vtest13/include3.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include3.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include3.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-vtest13/include3.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -29761,7 +29761,7 @@
Index: pbx/ael-test/ael-vtest13/include4.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include4.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include4.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-vtest13/include4.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -29778,7 +29778,7 @@
Index: pbx/ael-test/ael-vtest13/include5.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include5.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include5.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-vtest13/include5.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -29794,7 +29794,7 @@
Index: pbx/ael-test/ref.ael-test1
===================================================================
--- pbx/ael-test/ref.ael-test1 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test1 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test1 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,21 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -29830,7 +29830,7 @@
Index: pbx/ael-test/ref.ael-ntest12
===================================================================
--- pbx/ael-test/ref.ael-ntest12 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-ntest12 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-ntest12 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,32 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -29877,7 +29877,7 @@
Index: pbx/ael-test/ref.ael-test2
===================================================================
--- pbx/ael-test/ref.ael-test2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,38 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -29930,7 +29930,7 @@
Index: pbx/ael-test/ref.ael-test3
===================================================================
--- pbx/ael-test/ref.ael-test3 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test3 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test3 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,18 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -29963,7 +29963,7 @@
Index: pbx/ael-test/ael-vtest17/extensions.ael2
===================================================================
--- pbx/ael-test/ael-vtest17/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest17/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ael-vtest17/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,116 @@
+context dialextens
+{
@@ -30094,7 +30094,7 @@
Index: pbx/ael-test/ref.ael-test4
===================================================================
--- pbx/ael-test/ref.ael-test4 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test4 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test4 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,38 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -30147,7 +30147,7 @@
Index: pbx/ael-test/ref.ael-test5
===================================================================
--- pbx/ael-test/ref.ael-test5 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test5 (.../team/murf/AEL2-1.2) (revision 59237)
++++ pbx/ael-test/ref.ael-test5 (.../team/murf/AEL2-1.2) (revision 62941)
@@ -0,0 +1,23 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -30182,353 +30182,10 @@
Name: svn:eol-style
+ native
-Index: channels/misdn_config.c
-===================================================================
---- channels/misdn_config.c (.../branches/1.2) (revision 59237)
-+++ channels/misdn_config.c (.../team/murf/AEL2-1.2) (revision 59237)
-@@ -113,9 +113,6 @@
- { "early_bconnect", MISDN_CFG_EARLY_BCONNECT, MISDN_CTYPE_BOOL, "yes", NONE },
- { "incoming_early_audio", MISDN_CFG_INCOMING_EARLY_AUDIO, MISDN_CTYPE_BOOL, "no", NONE },
- { "echocancel", MISDN_CFG_ECHOCANCEL, MISDN_CTYPE_BOOLINT, "0", 128 },
--#ifdef MISDN_1_2
-- { "pipeline", MISDN_CFG_PIPELINE, MISDN_CTYPE_STR, NO_DEFAULT, NONE },
--#endif
- { "need_more_infos", MISDN_CFG_NEED_MORE_INFOS, MISDN_CTYPE_BOOL, "0", NONE },
- { "nttimeout", MISDN_CFG_NTTIMEOUT, MISDN_CTYPE_BOOL, "no", NONE },
- { "jitterbuffer", MISDN_CFG_JITTERBUFFER, MISDN_CTYPE_INT, "4000", NONE },
-Index: channels/chan_sip.c
-===================================================================
---- channels/chan_sip.c (.../branches/1.2) (revision 59237)
-+++ channels/chan_sip.c (.../team/murf/AEL2-1.2) (revision 59237)
-@@ -11295,17 +11295,17 @@
- /* ignore means "don't do anything with it" but still have to
- respond appropriately */
- ignore=1;
-- } else if (e) {
-- e = ast_skip_blanks(e);
-- if (sscanf(e, "%d %n", &respid, &len) != 1) {
-- ast_log(LOG_WARNING, "Invalid response: '%s'\n", e);
-- } else {
-- /* More SIP ridiculousness, we have to ignore bogus contacts in 100 etc responses */
-- if ((respid == 200) || ((respid >= 300) && (respid <= 399)))
-- extract_uri(p, req);
-- handle_response(p, respid, e + len, req, ignore, seqno);
-- }
- }
-+
-+ e = ast_skip_blanks(e);
-+ if (sscanf(e, "%d %n", &respid, &len) != 1) {
-+ ast_log(LOG_WARNING, "Invalid response: '%s'\n", e);
-+ } else {
-+ /* More SIP ridiculousness, we have to ignore bogus contacts in 100 etc responses */
-+ if ((respid == 200) || ((respid >= 300) && (respid <= 399)))
-+ extract_uri(p, req);
-+ handle_response(p, respid, e + len, req, ignore, seqno);
-+ }
- return 0;
- }
-
-Index: channels/Makefile
-===================================================================
---- channels/Makefile (.../branches/1.2) (revision 59237)
-+++ channels/Makefile (.../team/murf/AEL2-1.2) (revision 59237)
-@@ -88,10 +88,6 @@
- CFLAGS+=-Imisdn
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/mISDNdsp.h),)
-- CFLAGS+=-DMISDN_1_2
--endif
--
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
-
- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
-@@ -242,7 +238,7 @@
- endif
-
- misdn/chan_misdn_lib.a:
-- make CROSS_COMPILE_TARGET=$(CROSS_COMPILE_TARGET) -C misdn
-+ make -C misdn
-
- chan_misdn.so: chan_misdn.o misdn_config.o misdn/chan_misdn_lib.a
- $(CC) -shared -Xlinker -x -L/usr/lib -o $@ $^ -lisdnnet -lmISDN
-Index: channels/chan_misdn.c
-===================================================================
---- channels/chan_misdn.c (.../branches/1.2) (revision 59237)
-+++ channels/chan_misdn.c (.../team/murf/AEL2-1.2) (revision 59237)
-@@ -283,6 +283,9 @@
-
- static int usecnt=0;
-
-+static char **misdn_key_vector=NULL;
-+static int misdn_key_vector_size=0;
-+
- /* Only alaw and mulaw is allowed for now */
- static int prefformat = AST_FORMAT_ALAW ; /* AST_FORMAT_SLINEAR ; AST_FORMAT_ULAW | */
-
-@@ -322,11 +325,7 @@
-
- int chan_misdn_jb_empty(struct misdn_bchannel *bc, char *buf, int len);
-
--#ifdef MISDN_1_2
--static int update_pipeline_config(struct misdn_bchannel *bc);
--#else
- static int update_ec_config(struct misdn_bchannel *bc);
--#endif
-
- /*************** Helpers *****************/
-
-@@ -774,11 +773,7 @@
- " --> activated: %d\n"
- " --> state: %s\n"
- " --> capability: %s\n"
--#ifdef MISDN_1_2
-- " --> pipeline: %s\n"
--#else
- " --> echo_cancel: %d\n"
--#endif
- " --> notone : rx %d tx:%d\n"
- " --> bc_hold: %d\n",
- help->ast->name,
-@@ -791,11 +786,7 @@
- bc->active,
- bc_state2str(bc->bc_state),
- bearer2str(bc->capability),
--#ifdef MISDN_1_2
-- bc->pipeline,
--#else
- bc->ec_enable,
--#endif
-
- help->norxtone,help->notxtone,
- bc->holded
-@@ -1014,11 +1005,7 @@
- tmp->toggle_ec=tmp->toggle_ec?0:1;
-
- if (tmp->toggle_ec) {
--#ifdef MISDN_1_2
-- update_pipeline_config(tmp->bc);
--#else
- update_ec_config(tmp->bc);
--#endif
- manager_ec_enable(tmp->bc);
- } else {
- manager_ec_disable(tmp->bc);
-@@ -1417,25 +1404,9 @@
- }
- }
-
--#ifdef MISDN_1_2
--static int update_pipeline_config(struct misdn_bchannel *bc)
--{
-- int ec;
-
-- misdn_cfg_get(bc->port, MISDN_CFG_PIPELINE, bc->pipeline, sizeof(bc->pipeline));
-
-- if (*bc->pipeline)
-- return 0;
-
-- misdn_cfg_get(bc->port, MISDN_CFG_ECHOCANCEL, &ec, sizeof(int));
-- if (ec == 1)
-- snprintf(bc->pipeline, sizeof(bc->pipeline) - 1, "mg2ec");
-- else if (ec > 1)
-- snprintf(bc->pipeline, sizeof(bc->pipeline) - 1, "mg2ec(deftaps=%d)", ec);
--
-- return 0;
--}
--#else
- static int update_ec_config(struct misdn_bchannel *bc)
- {
- int ec;
-@@ -1452,8 +1423,8 @@
-
- return 0;
- }
--#endif
-
-+
- static int read_config(struct chan_list *ch, int orig) {
-
- if (!ch) {
-@@ -1522,11 +1493,7 @@
-
- ast_copy_string (ast->context,ch->context,sizeof(ast->context));
-
--#ifdef MISDN_1_2
-- update_pipeline_config(bc);
--#else
- update_ec_config(bc);
--#endif
-
- {
- int eb3;
-@@ -1754,15 +1721,9 @@
- int bridging;
- misdn_cfg_get( 0, MISDN_GEN_BRIDGING, &bridging, sizeof(int));
- if (bridging && ch->other_ch) {
--#ifdef MISDN_1_2
-- chan_misdn_log(0, port, "Disabling EC (aka Pipeline) on both Sides\n");
-- *ch->bc->pipeline=0;
-- *ch->other_ch->bc->pipeline=0;
--#else
-- chan_misdn_log(0, port, "Disabling EC on both Sides\n");
-+ chan_misdn_log(0, port, "Disabling EC on both Sides\n");
- ch->bc->ec_enable=0;
- ch->other_ch->bc->ec_enable=0;
--#endif
- }
-
- r=misdn_lib_send_event( newbc, EVENT_SETUP );
-@@ -4602,22 +4563,15 @@
-
- if (neglect) {
- chan_misdn_log(1, ch->bc->port, " --> disabled\n");
--#ifdef MISDN_1_2
-- *ch->bc->pipeline=0;
--#else
- ch->bc->ec_enable=0;
--#endif
-+
- } else {
--#ifdef MISDN_1_2
-- update_pipeline_config(ch->bc);
--#else
- ch->bc->ec_enable=1;
- ch->bc->orig=ch->orginator;
- tok++;
-- if (*tok) {
-+ if (tok) {
- ch->bc->ec_deftaps=atoi(tok);
- }
--#endif
- }
-
- break;
-Index: channels/misdn/isdn_lib.c
-===================================================================
---- channels/misdn/isdn_lib.c (.../branches/1.2) (revision 59237)
-+++ channels/misdn/isdn_lib.c (.../team/murf/AEL2-1.2) (revision 59237)
-@@ -573,17 +573,14 @@
- bc->active = 0;
-
- bc->early_bconnect = 1;
--
--#ifdef MISDN_1_2
-- *bc->pipeline = 0;
--#else
-+
- bc->ec_enable = 0;
- bc->ec_deftaps = 128;
-+ bc->ec_whenbridged = 0;
-
- #ifdef EC_TRAIN
- bc->ec_training = 1;
- #endif
--#endif
-
- bc->orig=0;
-
-@@ -4243,21 +4240,16 @@
-
- void manager_ec_enable(struct misdn_bchannel *bc)
- {
-+ int ec_arr[2];
-+
- struct misdn_stack *stack=get_stack_by_bc(bc);
-
- cb_log(4, stack?stack->port:0,"ec_enable\n");
-
- if (!misdn_cap_is_speech(bc->capability)) {
- cb_log(1, stack?stack->port:0, " --> no speech? cannot enable EC\n");
-- } else {
--
--#ifdef MISDN_1_2
-- if (*bc->pipeline) {
-- cb_log(3, stack?stack->port:0,"Sending Control PIPELINE_CFG %s\n",bc->pipeline);
-- manager_ph_control_block(bc, PIPELINE_CFG, bc->pipeline, strlen(bc->pipeline) + 1);
-+ return;
- }
--#else
-- int ec_arr[2];
-
- if (bc->ec_enable) {
- cb_log(3, stack?stack->port:0,"Sending Control ECHOCAN_ON taps:%d training:%d\n",bc->ec_deftaps, bc->ec_training);
-@@ -4284,8 +4276,6 @@
-
- manager_ph_control_block(bc, ECHOCAN_ON, ec_arr, sizeof(ec_arr));
- }
--#endif
-- }
- }
-
-
-@@ -4301,14 +4291,10 @@
- return;
- }
-
--#ifdef MISDN_1_2
-- manager_ph_control_block(bc, PIPELINE_CFG, "", 0);
--#else
- if ( ! bc->ec_enable) {
- cb_log(3, stack?stack->port:0, "Sending Control ECHOCAN_OFF\n");
- manager_ph_control(bc, ECHOCAN_OFF, 0);
- }
--#endif
- }
-
- struct misdn_stack* get_misdn_stack() {
-Index: channels/misdn/isdn_lib.h
-===================================================================
---- channels/misdn/isdn_lib.h (.../branches/1.2) (revision 59237)
-+++ channels/misdn/isdn_lib.h (.../team/murf/AEL2-1.2) (revision 59237)
-@@ -354,13 +354,10 @@
-
- /** list stuf **/
-
--#ifdef MISDN_1_2
-- char pipeline[128];
--#else
- int ec_enable;
- int ec_deftaps;
-+ int ec_whenbridged;
- int ec_training;
--#endif
-
- #ifdef WITH_BEROEC
- beroec_t *ec;
-Index: channels/misdn/Makefile
-===================================================================
---- channels/misdn/Makefile (.../branches/1.2) (revision 59237)
-+++ channels/misdn/Makefile (.../team/murf/AEL2-1.2) (revision 59237)
-@@ -9,9 +9,6 @@
- ifeq ($(shell uname -m),x86_64)
- CFLAGS += -fPIC
- endif
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/mISDNdsp.h),)
--CFLAGS+=-DMISDN_1_2
--endif
- SOURCES = isdn_lib.c isdn_msg_parser.c
- OBJDIR = .
- OBJS = isdn_lib.o isdn_msg_parser.o fac.o
-Index: channels/misdn/chan_misdn_config.h
-===================================================================
---- channels/misdn/chan_misdn_config.h (.../branches/1.2) (revision 59237)
-+++ channels/misdn/chan_misdn_config.h (.../team/murf/AEL2-1.2) (revision 59237)
-@@ -52,9 +52,7 @@
- MISDN_CFG_EARLY_BCONNECT, /* int (bool) */
- MISDN_CFG_INCOMING_EARLY_AUDIO, /* int (bool) */
- MISDN_CFG_ECHOCANCEL, /* int */
--#ifdef MISDN_1_2
-- MISDN_CFG_PIPELINE, /* char[] */
--#endif
-+ MISDN_CFG_ECHOCANCELWHENBRIDGED, /* int (bool) */
- MISDN_CFG_NEED_MORE_INFOS, /* bool */
- MISDN_CFG_NTTIMEOUT, /* bool */
- MISDN_CFG_JITTERBUFFER, /* int */
Index: ast_expr2f.c
===================================================================
---- ast_expr2f.c (.../branches/1.2) (revision 59237)
-+++ ast_expr2f.c (.../team/murf/AEL2-1.2) (revision 59237)
+--- ast_expr2f.c (.../branches/1.2) (revision 62941)
++++ ast_expr2f.c (.../team/murf/AEL2-1.2) (revision 62941)
@@ -523,34 +523,34 @@
7, -11, -11, -11, -11, -11, -11, -11, -11, -11,
-11, -11, -11, -11, -11, -11, -11, -11, -11, -11,
@@ -31700,26 +31357,10 @@
return(0);
}
-Index: apps/app_macro.c
-===================================================================
---- apps/app_macro.c (.../branches/1.2) (revision 59237)
-+++ apps/app_macro.c (.../team/murf/AEL2-1.2) (revision 59237)
-@@ -61,11 +61,6 @@
- "will be returned at the location of the Goto.\n"
- "If ${MACRO_OFFSET} is set at termination, Macro will attempt to continue\n"
- "at priority MACRO_OFFSET + N + 1 if such a step exists, and N + 1 otherwise.\n"
--"Extensions: While a macro is being executed, it becomes the current context.\n"
--" This means that if a hangup occurs, for instance, that the macro\n"
[... 1634 lines stripped ...]
More information about the asterisk-commits
mailing list