[asterisk-commits] branch oej/securertp-trunk r24294 - in /team/oej/securertp-trunk: ./ apps/ do...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue May 2 12:38:12 MST 2006


Author: oej
Date: Tue May  2 14:38:12 2006
New Revision: 24294

URL: http://svn.digium.com/view/asterisk?rev=24294&view=rev
Log:
Reset, resolve, go

Modified:
    team/oej/securertp-trunk/   (props changed)
    team/oej/securertp-trunk/UPGRADE.txt
    team/oej/securertp-trunk/apps/app_queue.c
    team/oej/securertp-trunk/doc/queuelog.txt
    team/oej/securertp-trunk/pbx/ael/ael.tab.c
    team/oej/securertp-trunk/pbx/ael/ael.y

Propchange: team/oej/securertp-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May  2 14:38:12 2006
@@ -1,1 +1,1 @@
-/trunk:1-24279
+/trunk:1-24293

Modified: team/oej/securertp-trunk/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/UPGRADE.txt?rev=24294&r1=24293&r2=24294&view=diff
==============================================================================
--- team/oej/securertp-trunk/UPGRADE.txt (original)
+++ team/oej/securertp-trunk/UPGRADE.txt Tue May  2 14:38:12 2006
@@ -68,6 +68,11 @@
 
 * OSPAuth is added to authenticate OSP tokens in in_bound call setup messages.
 
+* The CONNECT event in the queue_log from app_queue now has a second field 
+  in addition to the holdtime field. It contains the unique ID of the 
+  queue member channel that is taking the call. This is useful when trying 
+  to link recording filenames back to a particular call from the queue.  
+
 Manager:
 
 * After executing the 'status' manager action, the "Status" manager events
@@ -76,6 +81,11 @@
   "CallerIDNum".  For compatibility purposes, the CallerID parameter will remain
   until after the release of 1.4, when it will be removed.  Please use the time
   during the 1.4 release to make this transition.
+
+* The AgentConnect event now has an additional field called "BridgedChannel" 
+  which contains the unique ID of the queue member channel that is taking the 
+  call. This is useful when trying to link recording filenames back to 
+  a particular call from the queue.
 
 Variables:
 

Modified: team/oej/securertp-trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/apps/app_queue.c?rev=24294&r1=24293&r2=24294&view=diff
==============================================================================
--- team/oej/securertp-trunk/apps/app_queue.c (original)
+++ team/oej/securertp-trunk/apps/app_queue.c Tue May  2 14:38:12 2006
@@ -2241,16 +2241,17 @@
 	 			ast_log(LOG_DEBUG, "app_queue: sendurl=%s.\n", url);
  			ast_channel_sendurl(peer, url);
  		}
-		ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "CONNECT", "%ld", (long)time(NULL) - qe->start);
+		ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "CONNECT", "%ld|%s", (long)time(NULL) - qe->start, peer->uniqueid);
 		if (qe->parent->eventwhencalled)
 			manager_event(EVENT_FLAG_AGENT, "AgentConnect",
 				      "Queue: %s\r\n"
 				      "Uniqueid: %s\r\n"
 				      "Channel: %s\r\n"
 				      "Member: %s\r\n"
-				      "Holdtime: %ld\r\n",
+				      "Holdtime: %ld\r\n"
+				      "BridgedChannel: %s\r\n",
 				      queuename, qe->chan->uniqueid, peer->name, member->interface,
-				      (long)time(NULL) - qe->start);
+				      (long)time(NULL) - qe->start,peer->uniqueid);
 		ast_copy_string(oldcontext, qe->chan->context, sizeof(oldcontext));
 		ast_copy_string(oldexten, qe->chan->exten, sizeof(oldexten));
 		time(&callstart);

Modified: team/oej/securertp-trunk/doc/queuelog.txt
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/doc/queuelog.txt?rev=24294&r1=24293&r2=24294&view=diff
==============================================================================
--- team/oej/securertp-trunk/doc/queuelog.txt (original)
+++ team/oej/securertp-trunk/doc/queuelog.txt Tue May  2 14:38:12 2006
@@ -50,9 +50,12 @@
 CONFIGRELOAD
 The configuration has been reloaded (e.g. with asterisk -rx reload)
 
-CONNECT(holdtime)
+CONNECT(holdtime|bridgedchanneluniqueid)
 The caller was connected to an agent.  Hold time represents the amount
-of time the caller was on hold.
+of time the caller was on hold. The bridged channel unique ID contains
+the unique ID of the queue member channel that is taking the call. This
+is useful when trying to link recording filenames to a particular
+call in the queue.
 
 ENTERQUEUE(url|callerid)
 A call has entered the queue.  URL (if specified) and Caller*ID are placed

Modified: team/oej/securertp-trunk/pbx/ael/ael.tab.c
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/pbx/ael/ael.tab.c?rev=24294&r1=24293&r2=24294&view=diff
==============================================================================
--- team/oej/securertp-trunk/pbx/ael/ael.tab.c (original)
+++ team/oej/securertp-trunk/pbx/ael/ael.tab.c Tue May  2 14:38:12 2006
@@ -420,16 +420,16 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  14
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   407
+#define YYLAST   390
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  42
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  58
+#define YYNNTS  56
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  145
+#define YYNRULES  143
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  282
+#define YYNSTATES  274
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -483,16 +483,16 @@
       56,    59,    60,    66,    67,    69,    73,    76,    79,    83,
       85,    87,    90,    93,    95,    97,    99,   101,   103,   104,
      110,   113,   115,   120,   124,   129,   137,   146,   148,   151,
-     154,   160,   162,   170,   171,   177,   178,   184,   189,   191,
-     194,   196,   199,   203,   205,   208,   212,   213,   220,   224,
-     225,   231,   235,   239,   242,   243,   244,   245,   258,   259,
-     266,   269,   273,   277,   280,   283,   284,   290,   293,   296,
-     299,   303,   305,   308,   309,   311,   315,   319,   325,   331,
-     337,   343,   345,   349,   355,   359,   365,   369,   370,   376,
-     380,   381,   385,   389,   392,   394,   395,   397,   398,   402,
-     404,   407,   412,   416,   421,   425,   428,   432,   433,   435,
-     438,   440,   446,   449,   452,   456,   459,   462,   466,   469,
-     472,   477,   479,   482,   485,   490
+     154,   160,   162,   170,   171,   176,   179,   182,   187,   189,
+     192,   194,   197,   201,   203,   206,   210,   214,   218,   219,
+     225,   229,   233,   236,   237,   238,   239,   252,   256,   259,
+     263,   267,   270,   273,   274,   280,   283,   286,   289,   293,
+     295,   298,   299,   301,   305,   309,   315,   321,   327,   333,
+     335,   339,   345,   349,   355,   359,   360,   366,   370,   371,
+     375,   379,   382,   384,   385,   387,   388,   392,   394,   397,
+     402,   406,   411,   415,   418,   422,   423,   425,   428,   430,
+     436,   439,   442,   446,   449,   452,   456,   459,   462,   467,
+     469,   472,   475,   480
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -501,73 +501,72 @@
       43,     0,    -1,    44,    -1,    45,    -1,    44,    45,    -1,
       44,     1,    -1,    47,    -1,    49,    -1,    50,    -1,     8,
       -1,    41,    -1,    36,    -1,    48,     3,    46,    55,    -1,
-      23,    -1,    -1,    15,    41,     6,    54,     7,     4,    91,
+      23,    -1,    -1,    15,    41,     6,    54,     7,     4,    89,
        5,    -1,    16,     4,    51,     5,    -1,    16,     4,     5,
       -1,    52,    -1,    51,    52,    -1,    51,     1,    -1,    -1,
       41,     9,    53,    41,     8,    -1,    -1,    41,    -1,    54,
       10,    41,    -1,    54,     1,    -1,     4,     5,    -1,     4,
       56,     5,    -1,    57,    -1,     1,    -1,    56,    57,    -1,
-      56,     1,    -1,    60,    -1,    99,    -1,    93,    -1,    94,
+      56,     1,    -1,    60,    -1,    97,    -1,    91,    -1,    92,
       -1,    59,    -1,    -1,    41,     9,    58,    41,     8,    -1,
       41,     1,    -1,     8,    -1,    17,    24,    41,     8,    -1,
-      41,    24,    72,    -1,    30,    41,    24,    72,    -1,    31,
-       6,    68,     7,    41,    24,    72,    -1,    30,    31,     6,
-      68,     7,    41,    24,    72,    -1,    72,    -1,    61,    72,
+      41,    24,    71,    -1,    30,    41,    24,    71,    -1,    31,
+       6,    68,     7,    41,    24,    71,    -1,    30,    31,     6,
+      68,     7,    41,    24,    71,    -1,    71,    -1,    61,    71,
       -1,    61,     1,    -1,    68,    11,    68,    11,    68,    -1,
       41,    -1,    62,    13,    68,    13,    68,    13,    68,    -1,
-      -1,    19,     6,    65,    67,     7,    -1,    -1,    22,     6,
-      66,    67,     7,    -1,    20,     6,    63,     7,    -1,    41,
-      -1,    41,    41,    -1,    41,    -1,    41,    41,    -1,    41,
-      41,    41,    -1,    41,    -1,    41,    41,    -1,    41,    11,
-      41,    -1,    -1,    18,     6,    71,    41,     7,     4,    -1,
-       4,    61,     5,    -1,    -1,    41,     9,    73,    41,     8,
-      -1,    25,    80,     8,    -1,    26,    81,     8,    -1,    41,
-      11,    -1,    -1,    -1,    -1,    32,     6,    74,    41,     8,
-      75,    41,     8,    76,    41,     7,    72,    -1,    -1,    33,
-       6,    77,    41,     7,    72,    -1,    70,     5,    -1,    70,
-      89,     5,    -1,    12,    82,     8,    -1,    86,     8,    -1,
-      41,     8,    -1,    -1,    86,     9,    78,    41,     8,    -1,
-      28,     8,    -1,    27,     8,    -1,    29,     8,    -1,    64,
-      72,    79,    -1,     8,    -1,    21,    72,    -1,    -1,    69,
+      -1,     6,    65,    67,     7,    -1,    19,    64,    -1,    22,
+      64,    -1,    20,     6,    63,     7,    -1,    41,    -1,    41,
+      41,    -1,    41,    -1,    41,    41,    -1,    41,    41,    41,
+      -1,    41,    -1,    41,    41,    -1,    41,    11,    41,    -1,
+      18,    64,     4,    -1,     4,    61,     5,    -1,    -1,    41,
+       9,    72,    41,     8,    -1,    25,    78,     8,    -1,    26,
+      79,     8,    -1,    41,    11,    -1,    -1,    -1,    -1,    32,
+       6,    73,    41,     8,    74,    41,     8,    75,    41,     7,
+      71,    -1,    33,    64,    71,    -1,    70,     5,    -1,    70,
+      87,     5,    -1,    12,    80,     8,    -1,    84,     8,    -1,
+      41,     8,    -1,    -1,    84,     9,    76,    41,     8,    -1,
+      28,     8,    -1,    27,     8,    -1,    29,     8,    -1,    66,
+      71,    77,    -1,     8,    -1,    21,    71,    -1,    -1,    69,
       -1,    69,    13,    69,    -1,    69,    10,    69,    -1,    69,
       13,    69,    13,    69,    -1,    69,    10,    69,    10,    69,
       -1,    36,    13,    69,    13,    69,    -1,    36,    10,    69,
       10,    69,    -1,    69,    -1,    69,    10,    69,    -1,    69,
       10,    41,    14,    41,    -1,    69,    14,    69,    -1,    69,
       10,    41,    14,    36,    -1,    69,    14,    36,    -1,    -1,
-      41,     6,    83,    88,     7,    -1,    41,     6,     7,    -1,
-      -1,    41,     6,    85,    -1,    84,    88,     7,    -1,    84,
-       7,    -1,    41,    -1,    -1,    67,    -1,    -1,    88,    10,
-      87,    -1,    90,    -1,    89,    90,    -1,    34,    41,    11,
+      41,     6,    81,    86,     7,    -1,    41,     6,     7,    -1,
+      -1,    41,     6,    83,    -1,    82,    86,     7,    -1,    82,
+       7,    -1,    41,    -1,    -1,    67,    -1,    -1,    86,    10,
+      85,    -1,    88,    -1,    87,    88,    -1,    34,    41,    11,
       61,    -1,    36,    11,    61,    -1,    35,    41,    11,    61,
       -1,    34,    41,    11,    -1,    36,    11,    -1,    35,    41,
-      11,    -1,    -1,    92,    -1,    91,    92,    -1,    72,    -1,
-      37,    41,     4,    61,     5,    -1,    38,    95,    -1,    39,
-      95,    -1,     4,    96,     5,    -1,     4,     5,    -1,    41,
-       8,    -1,    96,    41,     8,    -1,    96,     1,    -1,    46,
-       8,    -1,    46,    13,    63,     8,    -1,    97,    -1,    98,
-      97,    -1,    98,     1,    -1,    40,     4,    98,     5,    -1,
+      11,    -1,    -1,    90,    -1,    89,    90,    -1,    71,    -1,
+      37,    41,     4,    61,     5,    -1,    38,    93,    -1,    39,
+      93,    -1,     4,    94,     5,    -1,     4,     5,    -1,    41,
+       8,    -1,    94,    41,     8,    -1,    94,     1,    -1,    46,
+       8,    -1,    46,    13,    63,     8,    -1,    95,    -1,    96,
+      95,    -1,    96,     1,    -1,    40,     4,    96,     5,    -1,
       40,     4,     5,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   178,   178,   181,   182,   183,   186,   187,   188,   189,
-     192,   193,   196,   204,   205,   208,   213,   216,   220,   221,
-     222,   225,   225,   231,   232,   233,   234,   237,   238,   241,
-     242,   243,   244,   247,   248,   249,   250,   251,   252,   252,
-     256,   257,   260,   265,   269,   274,   279,   288,   289,   290,
-     296,   301,   305,   313,   313,   316,   316,   319,   330,   331,
-     338,   339,   344,   352,   353,   357,   363,   363,   371,   374,
-     374,   378,   381,   384,   387,   388,   389,   387,   395,   395,
-     399,   401,   404,   406,   408,   411,   411,   444,   445,   446,
-     447,   451,   454,   455,   460,   461,   464,   467,   471,   475,
-     479,   486,   489,   492,   496,   500,   504,   510,   510,   515,
-     523,   523,   534,   541,   544,   545,   548,   549,   552,   555,
-     556,   559,   563,   567,   571,   574,   577,   582,   583,   584,
-     587,   588,   594,   599,   604,   605,   608,   609,   610,   613,
-     614,   621,   622,   623,   626,   629
+       0,   180,   180,   183,   184,   185,   188,   189,   190,   191,
+     194,   195,   198,   206,   207,   210,   215,   218,   222,   223,
+     224,   227,   227,   233,   234,   235,   236,   239,   240,   243,
+     244,   245,   246,   249,   250,   251,   252,   253,   254,   254,
+     258,   259,   262,   267,   271,   276,   281,   290,   291,   292,
+     298,   303,   307,   315,   315,   320,   323,   326,   337,   338,
+     345,   346,   351,   359,   360,   364,   370,   378,   381,   381,
+     385,   388,   391,   394,   395,   396,   394,   402,   406,   408,
+     411,   413,   415,   418,   418,   451,   452,   453,   454,   458,
+     461,   462,   467,   468,   471,   474,   478,   482,   486,   493,
+     496,   499,   503,   507,   511,   517,   517,   522,   530,   530,
+     541,   548,   551,   552,   555,   556,   559,   562,   563,   566,
+     570,   574,   578,   581,   584,   589,   590,   591,   594,   595,
+     601,   606,   611,   612,   615,   616,   617,   620,   621,   628,
+     629,   630,   633,   636
 };
 #endif
 
@@ -586,14 +585,13 @@
   "objects", "object", "context_name", "context", "opt_abstract", "macro",
   "globals", "global_statements", "global_statement", "@1", "arglist",
   "elements_block", "elements", "element", "@2", "ignorepat", "extension",
-  "statements", "timerange", "timespec", "if_like_head", "@3", "@4",
-  "word_list", "word3_list", "goto_word", "switch_head", "@5", "statement",
-  "@6", "@7", "@8", "@9", "@10", "@11", "opt_else", "target", "jumptarget",
-  "macro_call", "@12", "application_call_head", "@13", "application_call",
-  "opt_word", "eval_arglist", "case_statements", "case_statement",
-  "macro_statements", "macro_statement", "switches", "eswitches",
-  "switchlist_block", "switchlist", "included_entry", "includeslist",
-  "includes", 0
+  "statements", "timerange", "timespec", "test_expr", "@3", "if_like_head",
+  "word_list", "word3_list", "goto_word", "switch_head", "statement", "@4",
+  "@5", "@6", "@7", "@8", "opt_else", "target", "jumptarget", "macro_call",
+  "@9", "application_call_head", "@10", "application_call", "opt_word",
+  "eval_arglist", "case_statements", "case_statement", "macro_statements",
+  "macro_statement", "switches", "eswitches", "switchlist_block",
+  "switchlist", "included_entry", "includeslist", "includes", 0
 };
 #endif
 
@@ -618,16 +616,16 @@
       51,    53,    52,    54,    54,    54,    54,    55,    55,    56,
       56,    56,    56,    57,    57,    57,    57,    57,    58,    57,
       57,    57,    59,    60,    60,    60,    60,    61,    61,    61,
-      62,    62,    63,    65,    64,    66,    64,    64,    67,    67,
-      68,    68,    68,    69,    69,    69,    71,    70,    72,    73,
-      72,    72,    72,    72,    74,    75,    76,    72,    77,    72,
-      72,    72,    72,    72,    72,    78,    72,    72,    72,    72,
-      72,    72,    79,    79,    80,    80,    80,    80,    80,    80,
-      80,    81,    81,    81,    81,    81,    81,    83,    82,    82,
-      85,    84,    86,    86,    87,    87,    88,    88,    88,    89,
-      89,    90,    90,    90,    90,    90,    90,    91,    91,    91,
-      92,    92,    93,    94,    95,    95,    96,    96,    96,    97,
-      97,    98,    98,    98,    99,    99
+      62,    62,    63,    65,    64,    66,    66,    66,    67,    67,
+      68,    68,    68,    69,    69,    69,    70,    71,    72,    71,
+      71,    71,    71,    73,    74,    75,    71,    71,    71,    71,
+      71,    71,    71,    76,    71,    71,    71,    71,    71,    71,
+      77,    77,    78,    78,    78,    78,    78,    78,    78,    79,
+      79,    79,    79,    79,    79,    81,    80,    80,    83,    82,
+      84,    84,    85,    85,    86,    86,    86,    87,    87,    88,
+      88,    88,    88,    88,    88,    89,    89,    89,    90,    90,
+      91,    92,    93,    93,    94,    94,    94,    95,    95,    96,
+      96,    96,    97,    97
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -638,16 +636,16 @@
        2,     0,     5,     0,     1,     3,     2,     2,     3,     1,
        1,     2,     2,     1,     1,     1,     1,     1,     0,     5,
        2,     1,     4,     3,     4,     7,     8,     1,     2,     2,
-       5,     1,     7,     0,     5,     0,     5,     4,     1,     2,
-       1,     2,     3,     1,     2,     3,     0,     6,     3,     0,
-       5,     3,     3,     2,     0,     0,     0,    12,     0,     6,
-       2,     3,     3,     2,     2,     0,     5,     2,     2,     2,
-       3,     1,     2,     0,     1,     3,     3,     5,     5,     5,
-       5,     1,     3,     5,     3,     5,     3,     0,     5,     3,
-       0,     3,     3,     2,     1,     0,     1,     0,     3,     1,
-       2,     4,     3,     4,     3,     2,     3,     0,     1,     2,
-       1,     5,     2,     2,     3,     2,     2,     3,     2,     2,
-       4,     1,     2,     2,     4,     3
+       5,     1,     7,     0,     4,     2,     2,     4,     1,     2,
+       1,     2,     3,     1,     2,     3,     3,     3,     0,     5,
+       3,     3,     2,     0,     0,     0,    12,     3,     2,     3,
+       3,     2,     2,     0,     5,     2,     2,     2,     3,     1,
+       2,     0,     1,     3,     3,     5,     5,     5,     5,     1,
+       3,     5,     3,     5,     3,     0,     5,     3,     0,     3,
+       3,     2,     1,     0,     1,     0,     3,     1,     2,     4,
+       3,     4,     3,     2,     3,     0,     1,     2,     1,     5,
+       2,     2,     3,     2,     2,     3,     2,     2,     4,     1,
+       2,     2,     4,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -660,30 +658,29 @@
        0,     0,    18,    11,    10,     0,    24,     0,    21,    20,
       16,    19,     0,    12,    26,     0,     0,     0,    30,    27,
       41,     0,     0,     0,     0,     0,     0,     0,     0,    29,
-      37,    33,    35,    36,    34,   127,    25,     0,     0,     0,
-       0,     0,     0,   132,   133,     0,    40,    38,     0,    32,
-      28,    31,     0,    91,     0,     0,     0,     0,     0,     0,
+      37,    33,    35,    36,    34,   125,    25,     0,     0,     0,
+       0,     0,     0,   130,   131,     0,    40,    38,     0,    32,
+      28,    31,     0,    89,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     130,   117,     0,     0,   128,    22,     0,     0,     0,    60,
-       0,   135,     0,     0,   145,     0,   141,     0,     0,    43,
-       0,    47,     0,     0,    66,    53,     0,    55,     0,    63,
-      94,     0,   101,     0,    88,    87,    89,    74,    78,     0,
-     110,    84,    69,    73,    93,    80,     0,     0,     0,     0,
-     119,   113,    58,   116,     0,    83,    85,    15,   129,    42,
-       0,    44,    61,     0,   136,   138,   134,     0,   139,     0,
-     143,   144,   142,     0,    49,    68,    48,   107,    82,     0,
-       0,    51,     0,     0,     0,     0,     0,     0,     0,    64,
-       0,     0,    71,     0,     0,    72,     0,     0,     0,   111,
-       0,     0,    90,     0,     0,   125,    81,   120,    59,   112,
-     115,     0,     0,    62,     0,   137,     0,    39,   109,   117,
-       0,     0,     0,    57,     0,     0,     0,     0,    65,    96,
-      95,    63,   102,   106,   104,     0,     0,     0,     0,    92,
-     124,   126,     0,   114,   118,     0,     0,     0,   140,     0,
-       0,    54,     0,     0,    56,     0,     0,     0,     0,     0,
-      75,     0,   131,    70,     0,     0,    86,     0,    45,   108,
-      67,     0,     0,   100,    99,    98,    97,   105,   103,     0,
-      79,    46,     0,    50,     0,     0,    76,    52,     0,     0,
-       0,    77
+     128,   115,     0,     0,   126,    22,     0,     0,     0,    60,
+       0,   133,     0,     0,   143,     0,   139,     0,     0,    43,
+       0,    47,     0,     0,    53,     0,    55,     0,    56,     0,
+      63,    92,     0,    99,     0,    86,    85,    87,    73,     0,
+       0,   108,    82,    68,    72,    91,    78,     0,     0,     0,
+       0,   117,   111,    58,   114,     0,    81,    83,    15,   127,
+      42,     0,    44,    61,     0,   134,   136,   132,     0,   137,
+       0,   141,   142,   140,     0,    49,    67,    48,   105,    80,
+       0,    66,    51,     0,     0,     0,     0,     0,     0,    64,
+       0,     0,    70,     0,     0,    71,     0,    77,     0,   109,
+       0,     0,    88,     0,     0,   123,    79,   118,    59,   110,
+     113,     0,     0,    62,     0,   135,     0,    39,   107,   115,
+       0,     0,    57,     0,     0,     0,    65,    94,    93,    63,
+     100,   104,   102,     0,     0,     0,    90,   122,   124,     0,
+     112,   116,     0,     0,     0,   138,     0,    54,     0,     0,
+       0,     0,     0,     0,     0,    74,   129,    69,     0,     0,
+      84,     0,    45,   106,     0,     0,    98,    97,    96,    95,
+     103,   101,     0,    46,     0,    50,     0,     0,    75,    52,
+       0,     0,     0,    76
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
@@ -691,152 +688,149 @@
 {
       -1,     5,     6,     7,   105,     8,     9,    10,    11,    21,
       22,    37,    27,    33,    48,    49,   108,    50,    51,   110,
-     172,   173,    88,   170,   175,   143,   174,   120,    89,   169,
-     111,   190,   186,   269,   278,   187,   201,   192,   121,   123,
-     113,   209,    91,   189,    92,   234,   144,   139,   140,    93,
-      94,    52,    53,    63,   103,   106,   107,    54
+     173,   174,   115,   170,    88,   144,   175,   121,    89,   111,
+     190,   186,   262,   270,   201,   192,   122,   124,   113,   209,
+      91,   189,    92,   231,   145,   140,   141,    93,    94,    52,
+      53,    63,   103,   106,   107,    54
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -187
+#define YYPACT_NINF -142
 static const short int yypact[] =
 {
-     103,  -187,    -4,    48,  -187,    75,   384,  -187,  -187,    81,
-    -187,  -187,    89,     0,  -187,  -187,  -187,   -20,    96,  -187,
-     121,     7,  -187,  -187,  -187,   138,  -187,    16,  -187,  -187,
-    -187,  -187,   140,  -187,  -187,   139,   106,   108,  -187,  -187,
-    -187,   120,   -21,   146,   147,   147,   151,    67,   145,  -187,
-    -187,  -187,  -187,  -187,  -187,   324,  -187,   150,   119,   153,
-     137,   122,    10,  -187,  -187,    -1,  -187,  -187,   350,  -187,
-    -187,  -187,   350,  -187,   123,   159,   167,   168,   181,   -17,
-     148,   180,   182,   183,   186,   187,   154,    19,   350,    24,
-    -187,    15,   131,   298,  -187,  -187,   189,   122,   350,   157,
-     194,  -187,   198,    13,  -187,    74,  -187,     6,   166,  -187,
-     242,  -187,   188,   202,  -187,  -187,   170,  -187,    56,    -5,
-      99,   205,   117,   206,  -187,  -187,  -187,  -187,  -187,   211,
-    -187,  -187,  -187,  -187,   197,  -187,   178,   179,   210,    98,
-    -187,  -187,   193,  -187,   118,  -187,  -187,  -187,  -187,  -187,
-     220,  -187,   200,   201,  -187,  -187,  -187,   227,  -187,   170,
-    -187,  -187,  -187,   236,  -187,  -187,  -187,   221,  -187,   207,
-     208,    21,   238,   245,   244,   208,   148,   148,   212,  -187,
-     148,   148,  -187,   215,    47,  -187,   216,   217,   350,  -187,
-     218,   350,  -187,   252,   254,   350,  -187,  -187,  -187,  -187,
-     225,   231,   237,  -187,   255,  -187,   273,  -187,  -187,   208,
-     275,   278,   122,  -187,   122,   279,   277,   276,  -187,   283,
-     282,    20,  -187,  -187,  -187,   280,   289,   272,   299,  -187,
-     350,   350,    45,  -187,  -187,   300,   285,   350,  -187,   128,
-     307,  -187,   301,   304,  -187,   148,   148,   148,   148,    49,
-    -187,   350,  -187,  -187,    88,   204,  -187,   350,  -187,  -187,
-    -187,   122,   122,  -187,  -187,  -187,  -187,  -187,  -187,   271,
-    -187,  -187,   306,  -187,   313,   122,  -187,  -187,   281,   322,
-     350,  -187
+     111,  -142,   -36,    28,  -142,     7,   367,  -142,  -142,    27,
+    -142,  -142,    10,     3,  -142,  -142,  -142,   -12,    -7,  -142,
+      48,    26,  -142,  -142,  -142,    64,  -142,    13,  -142,  -142,
+    -142,  -142,    20,  -142,  -142,    86,    58,    62,  -142,  -142,
+    -142,    94,   -22,   125,   129,   129,   133,     2,   127,  -142,
+    -142,  -142,  -142,  -142,  -142,   307,  -142,   145,   118,   165,
+     148,   143,    12,  -142,  -142,    89,  -142,  -142,   333,  -142,
+    -142,  -142,   333,  -142,   144,   180,   180,   181,   180,    47,
+     149,   192,   193,   194,   183,   180,   162,   139,   333,   104,
+    -142,    -5,   174,   281,  -142,  -142,   196,   143,   333,   170,
+     201,  -142,   210,    34,  -142,   138,  -142,     5,   184,  -142,
+     225,  -142,   218,   219,  -142,   227,  -142,   191,  -142,   163,
+      54,   167,   226,     8,   228,  -142,  -142,  -142,  -142,   333,
+     231,  -142,  -142,  -142,  -142,   217,  -142,   198,   199,   230,
+     107,  -142,  -142,   205,  -142,   142,  -142,  -142,  -142,  -142,
+    -142,   235,  -142,   207,   208,  -142,  -142,  -142,   247,  -142,
+     191,  -142,  -142,  -142,   253,  -142,  -142,  -142,   257,  -142,
+     221,  -142,    70,   252,   261,   258,   149,   149,   229,  -142,
+     149,   149,  -142,   237,   119,  -142,   238,  -142,   333,  -142,
+     249,   333,  -142,   260,   265,   333,  -142,  -142,  -142,  -142,
+     250,   251,   254,  -142,   248,  -142,   286,  -142,  -142,   221,
+     290,   143,  -142,   143,   288,   289,  -142,   294,   292,     1,
+    -142,  -142,  -142,   304,   255,   308,  -142,   333,   333,    44,
+    -142,  -142,   309,   296,   333,  -142,   171,  -142,   310,   313,
+     149,   149,   149,   149,   134,  -142,  -142,  -142,    88,   187,
+    -142,   333,  -142,  -142,   143,   143,  -142,  -142,  -142,  -142,
+    -142,  -142,   280,  -142,   315,  -142,   322,   143,  -142,  -142,
+     297,   324,   333,  -142
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -187,  -187,  -187,   327,   317,  -187,  -187,  -187,  -187,  -187,
-     316,  -187,  -187,  -187,  -187,   290,  -187,  -187,  -187,  -186,
-    -187,   196,  -187,  -187,  -187,   -76,   -58,   -79,  -187,  -187,
-     -55,  -187,  -187,  -187,  -187,  -187,  -187,  -187,  -187,  -187,
-    -187,  -187,  -187,  -187,  -187,  -187,   132,  -187,   209,  -187,
-     247,  -187,  -187,   302,  -187,   253,  -187,  -187
+    -142,  -142,  -142,   336,   326,  -142,  -142,  -142,  -142,  -142,
+     325,  -142,  -142,  -142,  -142,   299,  -142,  -142,  -142,  -141,
+    -142,   189,     6,  -142,  -142,   186,   -57,   -79,  -142,   -55,
+    -142,  -142,  -142,  -142,  -142,  -142,  -142,  -142,  -142,  -142,
+    -142,  -142,  -142,  -142,   141,  -142,   214,  -142,   264,  -142,
+    -142,   318,  -142,   262,  -142,  -142
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -124
+#define YYTABLE_NINF -122
 static const short int yytable[] =
 {
-      90,   122,   227,   100,   104,    19,   178,   160,    29,   232,
-      59,   161,    30,   109,   155,   101,    23,    34,   156,   118,
-      60,    24,   141,    35,   119,   130,    36,   131,   132,   135,
-     133,   178,   -60,   134,   249,    23,   179,    12,    90,   150,
-      24,    20,    23,   151,   254,   255,   164,    24,    20,    72,
-    -122,   102,    13,    73,   157,   166,   142,    74,   136,   137,
-     138,   179,   152,    75,    76,    77,   176,    78,    66,   177,
-      79,    80,    81,    82,    83,    14,    67,    84,    85,  -122,
-    -122,  -122,   158,   223,    17,   267,    87,   159,   119,   164,
-     268,    68,    72,  -121,   211,    18,    73,   216,   217,   215,
-      74,   219,   220,   196,   222,   224,    75,    76,    77,   180,
-      78,     1,   181,    79,    80,    81,    82,    83,     2,     3,
-      84,    85,  -121,  -121,  -121,   199,     4,   183,   200,    87,
-      28,   184,   136,   137,   138,   259,   229,    26,   200,   145,
-     146,    38,    32,    55,    58,    39,    69,    56,    40,    57,
-      70,    62,    61,    40,   242,    65,   243,    41,    95,    97,
-      96,    98,    41,    99,   112,   114,   263,   264,   265,   266,
-      42,    43,   166,   115,   116,    42,    43,   166,    44,    45,
-      46,    47,   258,    44,    45,    46,    47,   117,   124,   119,
-     125,   126,   127,   128,   167,   129,   270,   149,   152,   166,
-     166,   153,   271,   272,   273,   164,   154,   163,    72,  -123,
-     168,   171,    73,   182,   185,   188,    74,   277,   191,   193,
-     194,   195,    75,    76,    77,   281,    78,   202,   208,    79,
-      80,    81,    82,    83,   198,   205,    84,    85,  -123,  -123,
-    -123,   203,   204,   164,   207,    87,    72,   165,   210,   142,
-      73,   212,   213,   218,    74,   214,   221,   225,   226,   228,
-      75,    76,    77,   230,    78,   231,   233,    79,    80,    81,
-      82,    83,   235,   164,    84,    85,    72,   252,   236,   237,
-      73,   238,   240,    87,    74,   241,   244,   245,   250,   246,
-      75,    76,    77,   247,    78,   248,   251,    79,    80,    81,
-      82,    83,    72,   147,    84,    85,    73,   253,   256,   257,
-      74,   260,   274,    87,   261,   262,    75,    76,    77,   275,
-      78,   276,   279,    79,    80,    81,    82,    83,    72,   280,
-      84,    85,    73,    16,    25,    86,    74,    31,    71,    87,
-     148,   239,    75,    76,    77,     0,    78,    64,   197,    79,
-      80,    81,    82,    83,    72,   206,    84,    85,    73,     0,
-     162,    86,    74,     0,     0,    87,     0,     0,    75,    76,
-      77,     0,    78,     0,     0,    79,    80,    81,    82,    83,
-       0,     0,    84,    85,    -2,    15,     0,   -14,     0,     0,
-       0,    87,     1,     0,     0,     0,     0,     0,     0,     2,
-       3,     0,     0,     0,     0,     0,     0,     4
+      90,   123,   142,    66,   100,    12,   161,    14,    19,    59,
+     162,    67,   178,   109,    34,   244,    18,   101,   183,    60,
+      35,    38,   184,    36,    23,    39,    68,    29,    40,    24,
+      17,    30,    13,   135,    26,   156,   143,    41,    90,   157,
+     151,    23,   179,   152,    20,   165,    24,   224,    72,  -120,
+      42,    43,    73,   102,   229,   167,    74,    28,    44,    45,
+      46,    47,    75,    76,    77,   178,    78,    20,    32,    79,
+      80,    81,    82,    83,   187,   158,    84,    85,  -120,  -120,
+    -120,   -60,   116,   119,   118,    87,   248,   249,   120,   165,
+      55,   129,    72,  -119,   104,   179,    73,   214,   215,    56,
+      74,   217,   218,    57,   220,   222,    75,    76,    77,   136,
+      78,   153,   196,    79,    80,    81,    82,    83,    58,     1,
+      84,    85,  -119,  -119,  -119,    23,     2,     3,    69,    87,
+      24,    61,    70,    62,     4,    40,   226,    65,   137,   138,
+     139,   137,   138,   139,    41,   131,   159,   132,   133,   199,
+     134,   160,   200,    95,   238,   221,   239,    42,    43,    96,
+     120,   256,   257,   258,   259,    44,    45,    46,    47,   167,
+     260,    97,    98,   176,   167,   261,   177,   180,   253,   252,
+     181,   200,   146,   147,    99,   112,   114,   117,   165,   128,
+     120,    72,  -121,   167,   167,    73,   263,   264,   265,    74,
+     125,   126,   127,   130,   150,    75,    76,    77,   154,    78,
+     269,   153,    79,    80,    81,    82,    83,   273,   155,    84,
+      85,  -121,  -121,  -121,   168,   164,   165,   169,    87,    72,
+     166,   171,   172,    73,   182,   188,   185,    74,   191,   193,
+     194,   195,   202,    75,    76,    77,   198,    78,   203,   204,
+      79,    80,    81,    82,    83,   205,   165,    84,    85,    72,
+     246,   207,   143,    73,   208,   211,    87,    74,   212,   213,
+     216,   227,   234,    75,    76,    77,   228,    78,   219,   223,
+      79,    80,    81,    82,    83,    72,   148,    84,    85,    73,
+     225,   230,   232,    74,   235,   233,    87,   237,   240,    75,
+      76,    77,   241,    78,   242,   243,    79,    80,    81,    82,
+      83,    72,   245,    84,    85,    73,   247,   250,    86,    74,
+     251,   266,    87,   254,   255,    75,    76,    77,   267,    78,
+     268,   272,    79,    80,    81,    82,    83,    72,   271,    84,
+      85,    73,    16,    25,    86,    74,    31,    71,    87,   206,
+     236,    75,    76,    77,   197,    78,   210,   149,    79,    80,
+      81,    82,    83,    64,     0,    84,    85,    -2,    15,   163,
+     -14,     0,     0,     0,    87,     1,     0,     0,     0,     0,
+       0,     0,     2,     3,     0,     0,     0,     0,     0,     0,
+       4
 };
 
 static const short int yycheck[] =
 {
-      55,    80,   188,    61,     5,     5,    11,     1,     1,   195,
-      31,     5,     5,    68,     1,     5,    36,     1,     5,    36,
-      41,    41,     7,     7,    41,     6,    10,     8,     9,     5,
-      11,    11,    11,    88,    14,    36,    41,    41,    93,    97,
-      41,    41,    36,    98,   230,   231,     1,    41,    41,     4,
-       5,    41,     4,     8,    41,   110,    41,    12,    34,    35,
-      36,    41,    41,    18,    19,    20,    10,    22,     1,    13,
-      25,    26,    27,    28,    29,     0,     9,    32,    33,    34,
-      35,    36,     8,    36,     3,    36,    41,    13,    41,     1,
-      41,    24,     4,     5,   170,     6,     8,   176,   177,   175,
-      12,   180,   181,     5,   183,   184,    18,    19,    20,    10,
-      22,     8,    13,    25,    26,    27,    28,    29,    15,    16,
-      32,    33,    34,    35,    36,     7,    23,    10,    10,    41,
-       9,    14,    34,    35,    36,     7,   191,    41,    10,     8,
-       9,     1,     4,     4,    24,     5,     1,    41,     8,    41,
-       5,     4,     6,     8,   212,     4,   214,    17,     8,     6,
-      41,    24,    17,    41,    41,     6,   245,   246,   247,   248,
-      30,    31,   227,     6,     6,    30,    31,   232,    38,    39,
-      40,    41,   237,    38,    39,    40,    41,     6,     8,    41,
-       8,     8,     6,     6,     6,    41,   251,     8,    41,   254,
-     255,     7,   257,   261,   262,     1,     8,    41,     4,     5,
-       8,    41,     8,     8,     8,     4,    12,   275,    21,    41,
-      41,    11,    18,    19,    20,   280,    22,     7,     7,    25,
-      26,    27,    28,    29,    41,     8,    32,    33,    34,    35,
-      36,    41,    41,     1,     8,    41,     4,     5,    41,    41,
-       8,    13,     7,    41,    12,    11,    41,    41,    41,    41,
-      18,    19,    20,    11,    22,    11,    41,    25,    26,    27,
-      28,    29,    41,     1,    32,    33,     4,     5,    41,    24,
-       8,     8,     7,    41,    12,     7,     7,    10,     8,    13,
-      18,    19,    20,    10,    22,    13,     7,    25,    26,    27,
-      28,    29,     4,     5,    32,    33,     8,     8,     8,    24,
-      12,     4,    41,    41,    13,    11,    18,    19,    20,    13,
-      22,     8,    41,    25,    26,    27,    28,    29,     4,     7,
-      32,    33,     8,     6,    17,    37,    12,    21,    48,    41,
-      93,   209,    18,    19,    20,    -1,    22,    45,   139,    25,
-      26,    27,    28,    29,     4,   159,    32,    33,     8,    -1,
-     107,    37,    12,    -1,    -1,    41,    -1,    -1,    18,    19,
-      20,    -1,    22,    -1,    -1,    25,    26,    27,    28,    29,
-      -1,    -1,    32,    33,     0,     1,    -1,     3,    -1,    -1,
-      -1,    41,     8,    -1,    -1,    -1,    -1,    -1,    -1,    15,
-      16,    -1,    -1,    -1,    -1,    -1,    -1,    23
+      55,    80,     7,     1,    61,    41,     1,     0,     5,    31,
+       5,     9,    11,    68,     1,    14,     6,     5,    10,    41,
+       7,     1,    14,    10,    36,     5,    24,     1,     8,    41,
+       3,     5,     4,    88,    41,     1,    41,    17,    93,     5,
+      97,    36,    41,    98,    41,     1,    41,   188,     4,     5,
+      30,    31,     8,    41,   195,   110,    12,     9,    38,    39,
+      40,    41,    18,    19,    20,    11,    22,    41,     4,    25,
+      26,    27,    28,    29,   129,    41,    32,    33,    34,    35,
+      36,    11,    76,    36,    78,    41,   227,   228,    41,     1,
+       4,    85,     4,     5,     5,    41,     8,   176,   177,    41,
+      12,   180,   181,    41,   183,   184,    18,    19,    20,     5,
+      22,    41,     5,    25,    26,    27,    28,    29,    24,     8,
+      32,    33,    34,    35,    36,    36,    15,    16,     1,    41,
+      41,     6,     5,     4,    23,     8,   191,     4,    34,    35,
+      36,    34,    35,    36,    17,     6,     8,     8,     9,     7,
+      11,    13,    10,     8,   211,    36,   213,    30,    31,    41,

[... 1972 lines stripped ...]


More information about the asterisk-commits mailing list