[svn-commits] murf: branch murf/AEL2-1.2 r59239 -
/team/murf/AEL2-1.2/patches/diffs.AEL2.patch
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Mon Mar 26 15:49:43 MST 2007
Author: murf
Date: Mon Mar 26 17:49:42 2007
New Revision: 59239
URL: http://svn.digium.com/view/asterisk?view=rev&rev=59239
Log:
updated the patch.
Modified:
team/murf/AEL2-1.2/patches/diffs.AEL2.patch
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=59239&r1=59238&r2=59239
==============================================================================
--- team/murf/AEL2-1.2/patches/diffs.AEL2.patch (original)
+++ team/murf/AEL2-1.2/patches/diffs.AEL2.patch Mon Mar 26 17:49:42 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 59074)
++++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
-+++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 59074)
+--- pbx/pbx_ael.c (.../branches/1.2) (revision 59237)
++++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
++++ pbx/applist (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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 59074)
-+++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 59074)
+--- pbx/Makefile (.../branches/1.2) (revision 59237)
++++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 59237)
@@ -12,7 +12,7 @@
#
@@ -12641,8 +12641,8 @@
Index: pbx/pbx_ael2.c
===================================================================
--- pbx/pbx_ael2.c (.../branches/1.2) (revision 0)
-+++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 59074)
-@@ -0,0 +1,4378 @@
++++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 59237)
+@@ -0,0 +1,4383 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
@@ -14866,9 +14866,9 @@
+ if ( j->type == PV_CONTEXT || j->type == PV_MACRO ) {
+ if ( !strcmp(i->u1.str, j->u1.str) )
+ {
-+ ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: The context name (%s) is also declared in file %s, line %d-%d!\n",
++ ast_log(LOG_ERROR,"Error: file %s, line %d-%d: The context name (%s) is also declared in file %s, line %d-%d!\n",
+ i->filename, i->startline, i->endline, i->u1.str, j->filename, j->startline, j->endline);
-+ warns++;
++ errs++;
+ }
+ }
+ }
@@ -14963,7 +14963,7 @@
+ macro_def = find_macro(item->u1.str);
+ if (!macro_def) {
+ /* here is a good place to check to see if the definition is in extensions.conf! */
-+ ast_log(LOG_WARNING, "Error: file %s, line %d-%d: macro call to non-existent %s ! Hopefully it is present in extensions.conf! \n",
++ ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: macro call to non-existent %s ! Hopefully it is present in extensions.conf! \n",
+ item->filename, item->startline, item->endline, item->u1.str);
+ warns++;
+ } else if (macro_def->type != PV_MACRO) {
@@ -15701,7 +15701,7 @@
+ switch_end = new_prio();
+ switch_test->type = AEL_APPCALL;
+ switch_end->type = AEL_APPCALL;
-+ snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",control_statement_count, p->u1.str);
++ snprintf(buf1,sizeof(buf1),"sw-%d-%s|10",control_statement_count, p->u1.str);
+ switch_test->app = strdup("Goto");
+ switch_test->appargs = strdup(buf1);
+ snprintf(buf1,sizeof(buf1),"Finish switch-%s-%d", label, control_statement_count);
@@ -15723,6 +15723,7 @@
+ /* ok, generate a extension and link it in */
+ switch_case = new_exten();
+ switch_case->context = this_context;
++ switch_case->is_switch = 1;
+ /* the break/continue locations are inherited from parent */
+ switch_case->loop_break = exten->loop_break;
+ switch_case->loop_continue = exten->loop_continue;
@@ -15746,7 +15747,7 @@
+ fall_thru = new_prio();
+ fall_thru->type = AEL_APPCALL;
+ fall_thru->app = strdup("Goto");
-+ snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",local_control_statement_count, p2->next->u1.str);
++ snprintf(buf1,sizeof(buf1),"sw-%d-%s|10",local_control_statement_count, p2->next->u1.str);
+ fall_thru->appargs = strdup(buf1);
+ linkprio(switch_case, fall_thru);
+ } else if (p2->next && p2->next->type == PV_PATTERN) {
@@ -15754,14 +15755,14 @@
+ fall_thru->type = AEL_APPCALL;
+ fall_thru->app = strdup("Goto");
+ gen_match_to_pattern(p2->next->u1.str, buf2);
-+ snprintf(buf1,sizeof(buf1),"sw-%d-%s|1", local_control_statement_count, buf2);
++ snprintf(buf1,sizeof(buf1),"sw-%d-%s|10", local_control_statement_count, buf2);
+ fall_thru->appargs = strdup(buf1);
+ linkprio(switch_case, fall_thru);
+ } else if (p2->next && p2->next->type == PV_DEFAULT) {
+ fall_thru = new_prio();
+ fall_thru->type = AEL_APPCALL;
+ fall_thru->app = strdup("Goto");
-+ snprintf(buf1,sizeof(buf1),"sw-%d-.|1",local_control_statement_count);
++ snprintf(buf1,sizeof(buf1),"sw-%d-.|10",local_control_statement_count);
+ fall_thru->appargs = strdup(buf1);
+ linkprio(switch_case, fall_thru);
+ } else if (!p2->next) {
@@ -15786,6 +15787,7 @@
+ /* ok, generate a extension and link it in */
+ switch_case = new_exten();
+ switch_case->context = this_context;
++ switch_case->is_switch = 1;
+ /* the break/continue locations are inherited from parent */
+ switch_case->loop_break = exten->loop_break;
+ switch_case->loop_continue = exten->loop_continue;
@@ -15808,7 +15810,7 @@
+ fall_thru = new_prio();
+ fall_thru->type = AEL_APPCALL;
+ fall_thru->app = strdup("Goto");
-+ snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",local_control_statement_count, p2->next->u1.str);
++ snprintf(buf1,sizeof(buf1),"sw-%d-%s|10",local_control_statement_count, p2->next->u1.str);
+ fall_thru->appargs = strdup(buf1);
+ linkprio(switch_case, fall_thru);
+ } else if (p2->next && p2->next->type == PV_PATTERN) {
@@ -15816,14 +15818,14 @@
+ fall_thru->type = AEL_APPCALL;
+ fall_thru->app = strdup("Goto");
+ gen_match_to_pattern(p2->next->u1.str, buf2);
-+ snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",local_control_statement_count, buf2);
++ snprintf(buf1,sizeof(buf1),"sw-%d-%s|10",local_control_statement_count, buf2);
+ fall_thru->appargs = strdup(buf1);
+ linkprio(switch_case, fall_thru);
+ } else if (p2->next && p2->next->type == PV_DEFAULT) {
+ fall_thru = new_prio();
+ fall_thru->type = AEL_APPCALL;
+ fall_thru->app = strdup("Goto");
-+ snprintf(buf1,sizeof(buf1),"sw-%d-.|1",local_control_statement_count);
++ snprintf(buf1,sizeof(buf1),"sw-%d-.|10",local_control_statement_count);
+ fall_thru->appargs = strdup(buf1);
+ linkprio(switch_case, fall_thru);
+ } else if (!p2->next) {
@@ -15849,6 +15851,7 @@
+ /* ok, generate a extension and link it in */
+ switch_case = new_exten();
+ switch_case->context = this_context;
++ switch_case->is_switch = 1;
+ /* the break/continue locations are inherited from parent */
+ switch_case->loop_break = exten->loop_break;
+ switch_case->loop_continue = exten->loop_continue;
@@ -15872,7 +15875,7 @@
+ fall_thru = new_prio();
+ fall_thru->type = AEL_APPCALL;
+ fall_thru->app = strdup("Goto");
-+ snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",local_control_statement_count, p2->next->u1.str);
++ snprintf(buf1,sizeof(buf1),"sw-%d-%s|10",local_control_statement_count, p2->next->u1.str);
+ fall_thru->appargs = strdup(buf1);
+ linkprio(switch_case, fall_thru);
+ } else if (p2->next && p2->next->type == PV_PATTERN) {
@@ -15880,14 +15883,14 @@
+ fall_thru->type = AEL_APPCALL;
+ fall_thru->app = strdup("Goto");
+ gen_match_to_pattern(p2->next->u1.str, buf2);
-+ snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",local_control_statement_count, buf2);
++ snprintf(buf1,sizeof(buf1),"sw-%d-%s|10",local_control_statement_count, buf2);
+ fall_thru->appargs = strdup(buf1);
+ linkprio(switch_case, fall_thru);
+ } else if (p2->next && p2->next->type == PV_DEFAULT) {
+ fall_thru = new_prio();
+ fall_thru->type = AEL_APPCALL;
+ fall_thru->app = strdup("Goto");
-+ snprintf(buf1,sizeof(buf1),"sw-%d-.|1",local_control_statement_count);
++ snprintf(buf1,sizeof(buf1),"sw-%d-.|10",local_control_statement_count);
+ fall_thru->appargs = strdup(buf1);
+ linkprio(switch_case, fall_thru);
+ } else if (!p2->next) {
@@ -16159,7 +16162,9 @@
+ int i;
+ struct ael_priority *pr;
+ do {
-+ if (exten->regexten)
++ if (exten->is_switch)
++ i = 10;
++ else if (exten->regexten)
+ i=2;
+ else
+ i=1;
@@ -17034,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 59074)
++++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,45 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17094,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 59074)
++++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,15 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17124,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 59074)
++++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17164,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 59074)
++++ pbx/ael-test/ael-ntest9/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,12 @@
+
+context workext {
@@ -17193,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 59074)
++++ pbx/ael-test/ref.ael-vtest17 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,68 @@
+
+
@@ -17276,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 59074)
++++ pbx/ael-test/setref (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
@@ -17300,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 59074)
++++ pbx/ael-test/ref.ael-test11 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,12 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17327,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 59074)
++++ pbx/ael-test/ref.ael-test14 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,11 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17353,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 59074)
++++ pbx/ael-test/ref.ael-test15 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17381,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 59074)
++++ pbx/ael-test/ael-test11/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,56 @@
+context test1
+{
@@ -17452,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 59074)
++++ pbx/ael-test/ael-test14/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,20 @@
+context test1
+{
@@ -17487,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 59074)
++++ pbx/ael-test/ael-test15/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,17 @@
+/* and some comments
+ would make a nice touch */
@@ -17519,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 59074)
++++ pbx/ael-test/runtests (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,56 @@
+#!/bin/bash
+ORIG=`mktemp /tmp/mytest.XXXXXX`
@@ -17592,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 59074)
++++ pbx/ael-test/ael-ntest10/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,131 @@
+macro endsess()
+{
@@ -17738,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 59074)
++++ pbx/ael-test/ael-ntest12/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,13 @@
+context test1
+{
@@ -17766,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 59074)
++++ pbx/ael-test/ael-test1/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,163 @@
+
+macro testdial(number, timeout) {
@@ -17944,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 59074)
++++ pbx/ael-test/ref.ael-ntest9 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,25 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17984,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 59074)
++++ pbx/ael-test/ael-test2/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -18007,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 59074)
++++ pbx/ael-test/ael-test2/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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
@@ -18168,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 59074)
++++ pbx/ael-test/ael-test3/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -21368,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 59074)
++++ pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -22197,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 59074)
++++ pbx/ael-test/ael-test3/include1.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -22215,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 59074)
++++ pbx/ael-test/ael-test3/include2.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -22234,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 59074)
++++ pbx/ael-test/ael-test3/include3.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -22251,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 59074)
++++ pbx/ael-test/ael-test3/include4.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -22268,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 59074)
++++ pbx/ael-test/ael-test3/include5.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -22284,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 59074)
++++ pbx/ael-test/ael-test4/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -22307,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 59074)
++++ pbx/ael-test/ael-test4/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -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
@@ -22468,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 59074)
++++ pbx/ael-test/ael-test5/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -23316,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 59074)
++++ pbx/ael-test/ael-test5/extensions.ael.orig (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -24164,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 59074)
++++ pbx/ael-test/ael-test6/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -25012,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 59074)
++++ pbx/ael-test/ael-test7/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,460 @@
+//
+// Example AEL config file
@@ -25487,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 59074)
++++ pbx/ael-test/ael-test8/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,27 @@
+context default
+{
@@ -25529,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 59074)
++++ pbx/ael-test/ref.ael-ntest10 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,129 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -25673,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 59074)
++++ pbx/ael-test/ael-vtest13/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -28873,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 59074)
++++ pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -29702,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 59074)
++++ pbx/ael-test/ael-vtest13/include1.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -29720,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 59074)
++++ pbx/ael-test/ael-vtest13/include2.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -29739,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 59074)
++++ pbx/ael-test/ael-vtest13/include3.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -29756,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 59074)
++++ pbx/ael-test/ael-vtest13/include4.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -29773,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 59074)
++++ pbx/ael-test/ael-vtest13/include5.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -29789,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 59074)
++++ pbx/ael-test/ref.ael-test1 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,21 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -29825,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 59074)
++++ pbx/ael-test/ref.ael-ntest12 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,32 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -29872,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 59074)
++++ pbx/ael-test/ref.ael-test2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,38 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -29925,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 59074)
++++ pbx/ael-test/ref.ael-test3 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,18 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -29958,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 59074)
++++ pbx/ael-test/ael-vtest17/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,116 @@
+context dialextens
+{
@@ -30089,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 59074)
++++ pbx/ael-test/ref.ael-test4 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,38 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -30142,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 59074)
++++ pbx/ael-test/ref.ael-test5 (.../team/murf/AEL2-1.2) (revision 59237)
@@ -0,0 +1,23 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -30177,10 +30182,353 @@
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
+
++
[... 401 lines stripped ...]
More information about the svn-commits
mailing list