diff options
| author | Michael Biebl <biebl@debian.org> | 2014-09-26 23:40:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-09-26 23:40:39 +0200 |
| commit | 60e92c23c214437f29dd66ba02ed4df9b013c570 (patch) | |
| tree | bd7f452e179be87dd3521fcf9f97870031284042 | |
| parent | 3ea299a7d2a9ccb9594039bde4838e10526d6def (diff) | |
| parent | 7bfd178d59a2c706d46092d745b54c61403cb44a (diff) | |
| download | rsyslog-60e92c23c214437f29dd66ba02ed4df9b013c570.tar.gz | |
Merge tag 'upstream/8.4.1'
Upstream version 8.4.1
63 files changed, 1351 insertions, 786 deletions
@@ -1,4 +1,38 @@ --------------------------------------------------------------------------- +Version 8.4.1 [v8-stable] 2014-09-30 +- imudp: add for bracketing mode, which makes parsing stats easier +- permit at-sign in variable names + closes: https://github.com/rsyslog/rsyslog/issues/110 +- bugfix: fix syntax error in anon_cc_numbers.py script + Thanks to github user anthcourtney for the patch. + closes: https://github.com/rsyslog/rsyslog/issues/109 +- bugfix: ompgsql: don't loose uncomitted data on retry + Thanks to Jared Johnson and Axel Rau for the patch. +- bugfix: imfile: if a state file for a different file name was set, + that different file (name) was monitored instead of the configured + one. Now, the state file is deleted and the correct file monitored. + closes: https://github.com/rsyslog/rsyslog/issues/103 +- bugfix: omudpspoof: source port was invalid + Thanks to Pavel Levshin for the patch +- bugfix: build failure on systems which don't have json_tokener_errors + Older versions of json-c need to use a different API (which don't exists + on newer versions, unfortunately...) + Thanks to Thomas D. for reporting this problem. +- bugfix: omelasticsearch does not work with broken/changed ES 1.0+ API + closes: https://github.com/rsyslog/rsyslog/issues/104 +- bugfix: mmanon did not properly anonymize IP addresses starting with '9' + Thanks to defa-at-so36.net for reporting this problem. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=529 +- bugfix: build problems on SuSe Linux + Thanks Andreas Stieger for the patch +- bugfix: omelasticsearch error file did not work correctly on ES 1.0+ + due to a breaking change in the ElasticSearch API. + see also: https://github.com/rsyslog/rsyslog/issues/104 +- bugfix: potential abort when a message with PRI > 191 was processed + if the "pri-text" property was used in active templates, this could + be abused to a remote denial of service from permitted senders + see also: CVE-2014-3634 +--------------------------------------------------------------------------- Version 8.4.0 [v8-stable] 2014-08-18 - this is the new stable branch, which incorporates all enhancements of rsyslog 8.3. @@ -388,7 +422,24 @@ Version 8.1.0 [experimental] 2013-11-15 statement. Also, it can still be build without problems, the option must just explicitely be given. --------------------------------------------------------------------------- -Version 7.6.4 [v7.6-stable] 2014-03-?? +Version 7.6.6 [v7.6-stable] 2014-09-30 +- bugfix: potential abort when a message with PRI > 191 was processed + if the "pri-text" property was used in active templates, this could + be abused to a remote denial of service from permitted senders + see also: CVE-2014-3634 +- bugfix: potential segfault on startup on 64 bit systems + This happened immediately on startup during config processing. Once + rsyslog got past this stage, it could not happen. +- bugfix: build problems on SuSe Linux + Thanks Andreas Stieger for the patch +--------------------------------------------------------------------------- +Version 7.6.5 [v7.6-stable] 2014-09-17 +- bugfix: in 7.6.4, pri-based filters did not work correctly + messages were distributed to the wrong bins. +- bugfix: build problems on systems without atomic instructons + e.g. RHEL 5; backport from v8 +--------------------------------------------------------------------------- +Version 7.6.4 [v7.6-stable] 2014-09-12 - add --enable-generate-man-pages configure switch (default: enabled) This forces generation of man pages, even if cached ones exists. This "fixes" a typical release tarball nit. While it is hackish, the @@ -417,6 +468,10 @@ Version 7.6.4 [v7.6-stable] 2014-03-?? * dirgroupnum Thanks to Karol Jurak for the patch. - bugfix: memory leak in TCP TLS mode +- bugfix: imfile: if a state file for a different file name was set, + that different file (name) was monitored instead of the configured + one. Now, the state file is deleted and the correct file monitored. + closes: https://github.com/rsyslog/rsyslog/issues/103 - bugfix: using UUID property could cause segfault - bugfix: mmutf8fix did not detect two invalid sequences Thanks to Axel Rau for the patch. @@ -450,6 +505,13 @@ Version 7.6.4 [v7.6-stable] 2014-03-?? shut down before the repetition was broken. Thanks to Tomas Heinrich for the patch. - bugfix: make dist failed when GUARDTIME or LIBGCRYPT feature was disabled +- bugfix: mmjsonparse did not build with json-c < 0.10 + This was a regression introduced some time in the past in order to + support API changes in json-c. Now we check for the version and use + proper code. +- bugfix: mmanon did not properly anonymize IP addresses starting with '9' + Thanks to defa-at-so36.net for reporting this problem. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=529 --------------------------------------------------------------------------- Version 7.6.3 [v7.6-stable] 2014-03-27 - add capability to override GnuTLS path in build process @@ -4513,6 +4575,8 @@ Version 3.22.4 [v3-stable] (rgerhards), 2010-??-?? closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271 - improved some code based on clang static analyzer results - bugfix: potential misadressing in property replacer +- bugfix: improper handling of invalid PRI values + references: CVE-2014-3634 --------------------------------------------------------------------------- Version 3.22.3 [v3-stable] (rgerhards), 2010-11-24 - bugfix(important): problem in TLS handling could cause rsyslog to loop diff --git a/config.h.in b/config.h.in index 751a95b..06da93a 100644 --- a/config.h.in +++ b/config.h.in @@ -118,7 +118,7 @@ /* Define to 1 if you have the `json_object_new_int64' function. */ #undef HAVE_JSON_OBJECT_NEW_INT64 -/* we have the newer JSON-C API */ +/* Define to 1 if you have the `json_tokener_error_desc' function. */ #undef HAVE_JSON_TOKENER_ERROR_DESC /* Define to 1 if you have the <libgen.h> header file. */ @@ -283,9 +283,6 @@ /* set define */ #undef HAVE_SYSINFO_UPTIME -/* Define to 1 if you have the <syslog.h> header file. */ -#undef HAVE_SYSLOG_H - /* Define to 1 if you have the <sys/epoll.h> header file. */ #undef HAVE_SYS_EPOLL_H @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for rsyslog 8.4.0. +# Generated by GNU Autoconf 2.68 for rsyslog 8.4.1. # # Report bugs to <rsyslog@lists.adiscon.com>. # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rsyslog' PACKAGE_TARNAME='rsyslog' -PACKAGE_VERSION='8.4.0' -PACKAGE_STRING='rsyslog 8.4.0' +PACKAGE_VERSION='8.4.1' +PACKAGE_STRING='rsyslog 8.4.1' PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com' PACKAGE_URL='' @@ -1621,7 +1621,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rsyslog 8.4.0 to adapt to many kinds of systems. +\`configure' configures rsyslog 8.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1691,7 +1691,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rsyslog 8.4.0:";; + short | recursive ) echo "Configuration of rsyslog 8.4.1:";; esac cat <<\_ACEOF @@ -1949,7 +1949,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rsyslog configure 8.4.0 +rsyslog configure 8.4.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2528,7 +2528,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rsyslog $as_me 8.4.0, which was +It was created by rsyslog $as_me 8.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3343,7 +3343,7 @@ fi # Define the identity of the package. PACKAGE='rsyslog' - VERSION='8.4.0' + VERSION='8.4.1' cat >>confdefs.h <<_ACEOF @@ -13571,8 +13571,6 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -$as_echo "#define HAVE_JSON_TOKENER_ERROR_DESC 1" >>confdefs.h - fi elif test $pkg_failed = untried; then @@ -13669,8 +13667,6 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -$as_echo "#define HAVE_JSON_TOKENER_ERROR_DESC 1" >>confdefs.h - fi else @@ -13739,6 +13735,19 @@ fi done +# look for newer API +for ac_func in json_tokener_error_desc +do : + ac_fn_c_check_func "$LINENO" "json_tokener_error_desc" "ac_cv_func_json_tokener_error_desc" +if test "x$ac_cv_func_json_tokener_error_desc" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_JSON_TOKENER_ERROR_DESC 1 +_ACEOF + +fi +done + + case "${host}" in *-*-linux*) @@ -14140,7 +14149,7 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi -for ac_header in arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h sys/inotify.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h +for ac_header in arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h sys/inotify.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -21322,7 +21331,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rsyslog $as_me 8.4.0, which was +This file was extended by rsyslog $as_me 8.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21388,7 +21397,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rsyslog config.status 8.4.0 +rsyslog config.status 8.4.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 6d8d76d..b6fc6e6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[8.4.0],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[8.4.1],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE([subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -32,14 +32,16 @@ PKG_PROG_PKG_CONFIG PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9) PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3) PKG_CHECK_MODULES([JSON_C], [json],, [ - PKG_CHECK_MODULES([JSON_C], [json-c], - [AC_DEFINE([HAVE_JSON_TOKENER_ERROR_DESC], [1], [we have the newer JSON-C API])]) + PKG_CHECK_MODULES([JSON_C], [json-c],,) ]) # if int64 is supported, use it AC_CHECK_LIB(json-c, json_object_new_object,,) AC_CHECK_FUNCS(json_object_new_int64,,) +# look for newer API +AC_CHECK_FUNCS(json_tokener_error_desc,,) + case "${host}" in *-*-linux*) AC_DEFINE([OS_LINUX], [1], [Indicator for a Linux OS]) @@ -88,7 +90,7 @@ AC_SUBST(DL_LIBS) AC_HEADER_RESOLV AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h sys/inotify.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h]) +AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h sys/inotify.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/grammar/lexer.c b/grammar/lexer.c index 0c004d3..a498352 100644 --- a/grammar/lexer.c +++ b/grammar/lexer.c @@ -464,11 +464,11 @@ static yyconst flex_int32_t yy_ec[256] = 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 29, 59, 1, 60, 61, 62, 63, + 56, 57, 58, 59, 60, 1, 61, 62, 63, 64, - 64, 65, 66, 67, 68, 39, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 51, 80, 81, - 82, 83, 84, 29, 85, 86, 1, 1, 1, 1, + 65, 66, 67, 68, 69, 39, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 51, 81, 82, + 83, 84, 85, 59, 86, 87, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -485,84 +485,84 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[87] = +static yyconst flex_int32_t yy_meta[88] = { 0, 1, 2, 3, 4, 5, 6, 1, 7, 1, 1, 6, 1, 1, 8, 9, 10, 11, 12, 13, 14, - 14, 15, 16, 17, 1, 18, 1, 19, 1, 20, - 21, 22, 22, 22, 20, 23, 23, 23, 23, 23, - 23, 23, 24, 23, 23, 23, 24, 23, 24, 23, - 25, 23, 26, 23, 23, 1, 6, 1, 27, 20, - 21, 22, 22, 22, 20, 23, 23, 23, 23, 23, - 23, 24, 23, 23, 23, 24, 23, 24, 23, 23, - 26, 23, 23, 1, 1, 1 + 14, 15, 16, 17, 1, 18, 1, 19, 20, 21, + 22, 23, 23, 23, 21, 24, 24, 24, 24, 24, + 24, 24, 25, 24, 24, 24, 25, 24, 25, 24, + 26, 24, 27, 24, 24, 1, 6, 1, 1, 28, + 21, 22, 23, 23, 23, 21, 24, 24, 24, 24, + 24, 24, 25, 24, 24, 24, 25, 24, 25, 24, + 24, 27, 24, 24, 1, 1, 1 } ; static yyconst flex_int16_t yy_base[580] = { 0, - 0, 86, 172, 0, 256, 257, 259, 262, 254, 259, - 281, 0, 367, 0, 1241, 3528, 3528, 3528, 0, 1185, - 0, 3528, 3528, 1171, 254, 0, 1161, 0, 0, 422, - 425, 416, 417, 424, 417, 432, 433, 415, 439, 436, - 423, 3528, 3528, 0, 495, 461, 1154, 518, 494, 534, - 547, 593, 556, 589, 604, 568, 594, 613, 601, 638, - 641, 640, 3528, 3528, 3528, 450, 1057, 3528, 3528, 1044, - 3528, 0, 3528, 3528, 1044, 1041, 965, 0, 3528, 3528, - 3528, 518, 3528, 3528, 3528, 0, 3528, 3528, 3528, 952, - 500, 565, 3528, 3528, 464, 3528, 3528, 3528, 3528, 3528, - - 3528, 960, 539, 558, 3528, 251, 945, 934, 429, 0, - 509, 528, 542, 572, 441, 3528, 3528, 688, 936, 3528, - 716, 692, 0, 801, 457, 0, 3528, 0, 902, 578, - 595, 635, 633, 762, 0, 762, 765, 445, 562, 763, - 777, 772, 765, 771, 774, 775, 770, 847, 804, 0, - 910, 810, 0, 836, 830, 870, 883, 583, 884, 898, - 845, 916, 927, 909, 874, 844, 915, 770, 916, 918, - 791, 920, 919, 936, 932, 809, 928, 940, 950, 955, - 575, 3528, 515, 865, 3528, 3528, 0, 809, 712, 3528, - 0, 888, 0, 3528, 636, 3528, 987, 0, 0, 583, - - 3528, 992, 3528, 683, 0, 995, 3528, 3528, 3528, 3528, - 0, 572, 847, 970, 0, 628, 789, 1020, 3528, 660, - 3528, 1073, 1023, 1032, 652, 1039, 641, 0, 0, 0, - 0, 799, 979, 989, 995, 1000, 1110, 1121, 1119, 1113, - 1116, 1120, 1121, 1133, 0, 1124, 1125, 1137, 1138, 0, - 1048, 3528, 1051, 898, 1052, 1191, 1162, 1211, 1166, 1140, - 1181, 1170, 1178, 1196, 1204, 1205, 1193, 1214, 1223, 1146, - 1215, 1220, 1228, 1237, 1252, 1042, 0, 0, 1044, 0, - 3528, 0, 1227, 0, 1230, 1236, 619, 3528, 582, 0, - 0, 0, 1242, 0, 1242, 1135, 0, 1250, 1246, 1246, - - 482, 1256, 1265, 1255, 1266, 1255, 0, 1263, 772, 1262, - 1065, 1067, 1312, 1277, 1271, 1273, 1296, 1272, 1297, 1295, - 1298, 1304, 1282, 1312, 1308, 1328, 1313, 1315, 1317, 1331, - 1330, 1374, 1203, 0, 1339, 0, 1345, 1321, 0, 1338, - 1358, 1348, 1352, 1400, 1351, 1351, 1355, 1359, 1363, 1362, - 1377, 1383, 1371, 0, 1412, 584, 1380, 1399, 1391, 1376, - 1445, 1392, 1417, 1398, 1383, 1413, 1430, 1435, 1426, 1414, - 640, 1404, 1425, 1476, 1432, 1427, 1489, 1505, 3528, 432, - 1432, 1510, 1516, 1465, 1454, 1461, 1467, 1478, 702, 854, - 1521, 1488, 1485, 1534, 1489, 1539, 1564, 1508, 1503, 1512, - - 1516, 1513, 1491, 883, 1585, 3528, 1520, 1513, 1598, 3528, - 1525, 1550, 1604, 3528, 1609, 3528, 1557, 1517, 1615, 1559, - 1561, 1573, 3528, 1590, 1579, 1590, 1591, 1588, 1633, 1599, - 1607, 1567, 1600, 1663, 0, 1613, 1600, 1608, 1678, 1681, - 3528, 1684, 1695, 1645, 1702, 1621, 1651, 1706, 1713, 1720, - 409, 1623, 1724, 3528, 1633, 1666, 1670, 1746, 3528, 1753, - 3528, 1765, 3528, 1671, 1691, 1696, 1672, 1776, 1700, 1711, - 0, 405, 1710, 1782, 3528, 1690, 1696, 1724, 1793, 1732, - 1760, 0, 1800, 3528, 1710, 1746, 1757, 1765, 1750, 1766, - 1758, 1769, 1769, 1772, 1784, 1786, 1786, 1790, 1776, 1785, - - 257, 1821, 3528, 3528, 1891, 1918, 1945, 1972, 1999, 2007, - 2033, 2060, 2079, 2093, 2118, 2137, 2156, 2182, 2203, 2222, - 2249, 2276, 2292, 2319, 2346, 2362, 2389, 2412, 2438, 2452, - 2479, 2506, 2533, 2560, 2579, 2593, 2618, 2637, 2653, 2673, - 2695, 2721, 2745, 2767, 2787, 2814, 2836, 2861, 2877, 2904, - 2931, 2947, 2974, 2996, 3003, 3025, 3052, 3074, 1837, 3087, - 3114, 3141, 3168, 3195, 3222, 3249, 3276, 3303, 3322, 3345, - 3368, 3390, 3410, 3437, 3451, 3460, 3469, 3478, 3500 + 0, 87, 174, 0, 259, 260, 262, 265, 257, 262, + 284, 0, 371, 0, 1310, 3608, 3608, 3608, 0, 1257, + 0, 3608, 3608, 1232, 257, 0, 1192, 0, 0, 427, + 430, 421, 422, 429, 422, 437, 438, 420, 445, 444, + 428, 3608, 3608, 0, 503, 468, 1191, 526, 539, 555, + 574, 621, 579, 586, 619, 519, 570, 622, 626, 654, + 674, 628, 3608, 3608, 3608, 455, 1198, 3608, 3608, 1062, + 3608, 0, 3608, 3608, 1059, 1057, 974, 0, 3608, 3608, + 3608, 455, 3608, 3608, 3608, 0, 3608, 3608, 3608, 894, + 459, 614, 3608, 3608, 462, 3608, 3608, 3608, 3608, 3608, + + 3608, 901, 544, 501, 3608, 254, 849, 822, 444, 0, + 470, 504, 527, 550, 580, 3608, 3608, 564, 834, 3608, + 748, 599, 0, 671, 466, 0, 3608, 0, 703, 576, + 620, 621, 619, 633, 0, 634, 642, 590, 657, 663, + 802, 670, 665, 673, 796, 797, 792, 839, 704, 0, + 715, 711, 0, 829, 734, 876, 705, 726, 890, 904, + 837, 923, 935, 875, 850, 849, 922, 793, 923, 925, + 937, 909, 930, 948, 929, 795, 936, 945, 963, 941, + 500, 3608, 587, 702, 3608, 3608, 0, 665, 643, 3608, + 0, 839, 0, 3608, 857, 3608, 1005, 0, 0, 472, + + 3608, 1008, 3608, 725, 0, 844, 3608, 3608, 3608, 3608, + 0, 884, 938, 942, 0, 973, 984, 1028, 3608, 621, + 3608, 1090, 1034, 1041, 618, 1048, 602, 0, 0, 0, + 0, 985, 992, 991, 1012, 1016, 1003, 1016, 1016, 1128, + 1131, 1135, 1136, 1023, 0, 1137, 1138, 1150, 1151, 0, + 1062, 3608, 1069, 542, 847, 1181, 1204, 1215, 1199, 1209, + 1214, 1173, 1211, 1216, 1208, 1156, 1220, 1221, 1249, 1146, + 1222, 1227, 1260, 1265, 1297, 1047, 0, 0, 1054, 0, + 3608, 0, 1205, 0, 1257, 1262, 559, 3608, 540, 0, + 0, 0, 1263, 0, 1259, 1200, 0, 1279, 1262, 1262, + + 465, 1272, 1281, 1272, 1282, 1273, 0, 1281, 526, 1274, + 1075, 1077, 1184, 1285, 1286, 1309, 1307, 1291, 1303, 1314, + 1319, 1324, 1320, 1332, 1330, 1341, 1331, 1327, 1329, 1353, + 1340, 1407, 1064, 0, 1170, 0, 1353, 1337, 0, 1344, + 1362, 1353, 1363, 1190, 1360, 1364, 1381, 1371, 1376, 1374, + 1388, 1395, 1385, 0, 892, 867, 1389, 1406, 1390, 1397, + 1440, 1400, 1424, 1408, 1413, 1425, 1435, 1452, 1447, 1432, + 919, 1401, 1426, 1495, 1435, 1430, 1512, 1523, 3608, 448, + 1440, 1526, 1529, 1454, 1443, 1460, 1463, 1476, 961, 1477, + 1541, 1505, 1506, 1548, 1495, 1555, 1559, 1532, 1531, 1534, + + 1538, 1547, 1497, 879, 1589, 3608, 1505, 1503, 1595, 3608, + 1525, 1551, 1619, 3608, 1625, 3608, 1559, 1217, 1630, 1574, + 1580, 1600, 3608, 1605, 1594, 1606, 1603, 1595, 1648, 1614, + 1622, 1576, 1577, 1678, 0, 1611, 1603, 1623, 1692, 1695, + 3608, 1698, 1709, 1652, 1712, 1634, 1665, 1723, 1726, 1729, + 443, 1639, 1740, 3608, 1655, 1657, 1679, 1743, 3608, 1754, + 3608, 1757, 3608, 1707, 1670, 1686, 1708, 1769, 1703, 1741, + 0, 437, 1728, 1783, 3608, 1733, 1736, 1727, 1786, 1742, + 1761, 0, 1806, 3608, 1741, 1760, 1757, 1779, 1762, 1774, + 1766, 1778, 1779, 1782, 1794, 1795, 1795, 1800, 1790, 1801, + + 260, 1827, 3608, 3608, 1898, 1926, 1954, 1982, 2010, 2018, + 2045, 2073, 2093, 2108, 2134, 2154, 2174, 2201, 2223, 2243, + 2271, 2299, 2316, 2344, 2372, 2389, 2417, 2441, 2468, 2483, + 2511, 2539, 2567, 2595, 2615, 2630, 2656, 2676, 2693, 2714, + 2737, 2764, 2789, 2812, 2833, 2861, 2884, 2910, 2927, 2955, + 2983, 3000, 3028, 3051, 3059, 3082, 3110, 3133, 1841, 3147, + 3175, 3203, 3231, 3259, 3287, 3315, 3343, 3371, 3391, 3415, + 3439, 3462, 3483, 3511, 3526, 3536, 3546, 3556, 3579 } ; static yyconst flex_int16_t yy_def[580] = @@ -632,395 +632,404 @@ static yyconst flex_int16_t yy_def[580] = 504, 504, 504, 504, 504, 504, 504, 504, 504 } ; -static yyconst flex_int16_t yy_nxt[3615] = +static yyconst flex_int16_t yy_nxt[3696] = { 0, 16, 17, 18, 17, 19, 16, 20, 21, 16, 22, 16, 16, 16, 23, 24, 16, 25, 26, 27, 28, 28, 28, 29, 16, 16, 16, 26, 26, 26, 30, 28, 31, 28, 32, 28, 33, 28, 34, 28, 28, 35, 36, 28, 28, 37, 28, 38, 39, 40, 41, - 28, 28, 28, 28, 28, 16, 16, 16, 28, 30, - 28, 31, 28, 32, 28, 33, 28, 34, 28, 35, - 36, 28, 28, 37, 28, 38, 39, 40, 41, 28, - 28, 28, 28, 42, 43, 44, 16, 45, 18, 45, - 19, 16, 20, 21, 16, 22, 16, 16, 16, 46, - - 47, 16, 48, 26, 27, 28, 28, 28, 49, 16, - 16, 16, 26, 26, 26, 50, 51, 52, 51, 53, - 51, 54, 51, 55, 51, 51, 56, 57, 51, 51, - 58, 51, 59, 60, 61, 62, 51, 51, 51, 51, - 51, 16, 16, 16, 28, 50, 51, 52, 51, 53, - 51, 54, 51, 55, 51, 56, 57, 51, 51, 58, - 51, 59, 60, 61, 62, 51, 51, 51, 51, 42, - 43, 44, 63, 64, 65, 64, 63, 66, 67, 63, - 63, 63, 63, 63, 68, 63, 63, 69, 63, 63, - 70, 63, 63, 63, 63, 63, 63, 71, 63, 63, - - 63, 72, 72, 72, 72, 72, 72, 72, 72, 72, + 28, 28, 28, 28, 28, 16, 16, 16, 26, 28, + 30, 28, 31, 28, 32, 28, 33, 28, 34, 28, + 35, 36, 28, 28, 37, 28, 38, 39, 40, 41, + 28, 28, 28, 28, 42, 43, 44, 16, 45, 18, + 45, 19, 16, 20, 21, 16, 22, 16, 16, 16, + + 46, 47, 16, 48, 26, 27, 28, 28, 28, 49, + 16, 16, 16, 26, 26, 26, 50, 51, 52, 51, + 53, 51, 54, 51, 55, 51, 51, 56, 57, 51, + 51, 58, 51, 59, 60, 61, 62, 51, 51, 51, + 51, 51, 16, 16, 16, 26, 28, 50, 51, 52, + 51, 53, 51, 54, 51, 55, 51, 56, 57, 51, + 51, 58, 51, 59, 60, 61, 62, 51, 51, 51, + 51, 42, 43, 44, 63, 64, 65, 64, 63, 66, + 67, 63, 63, 63, 63, 63, 68, 63, 63, 69, + 63, 63, 70, 63, 63, 63, 63, 63, 63, 71, + + 63, 63, 63, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, - 72, 72, 72, 72, 72, 72, 72, 73, 63, 74, - 63, 72, 72, 72, 72, 72, 72, 72, 72, 72, + 72, 72, 72, 72, 72, 72, 72, 72, 72, 73, + 63, 74, 63, 63, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, - 72, 72, 72, 72, 72, 63, 63, 63, 76, 76, - 79, 79, 79, 79, 79, 79, 81, 124, 503, 77, - 77, 81, 125, 82, 82, 82, 207, 208, 82, 82, - 82, 83, 84, 85, 84, 83, 83, 83, 83, 83, + 72, 72, 72, 72, 72, 72, 72, 72, 63, 63, + 63, 76, 76, 79, 79, 79, 79, 79, 79, 81, + 124, 503, 77, 77, 81, 125, 82, 82, 82, 207, + 208, 82, 82, 82, 83, 84, 85, 84, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 83, + 83, 83, 83, 83, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 83, 83, 83, 83, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 83, 83, 83, 87, 88, 89, - 88, 90, 91, 87, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 87, 102, 103, 104, 104, 87, - 105, 106, 107, 108, 87, 87, 109, 110, 111, 110, - - 110, 110, 110, 110, 110, 110, 110, 110, 110, 112, - 113, 110, 110, 110, 114, 115, 110, 110, 110, 110, - 110, 110, 116, 87, 117, 87, 109, 110, 111, 110, - 110, 110, 110, 110, 110, 110, 110, 110, 112, 113, - 110, 110, 110, 114, 115, 110, 110, 110, 110, 110, - 87, 87, 87, 130, 131, 182, 133, 134, 135, 229, - 137, 138, 140, 478, 142, 147, 136, 465, 132, 145, - 123, 212, 143, 146, 201, 139, 153, 217, 153, 141, - 154, 154, 239, 130, 131, 133, 134, 144, 135, 137, - 411, 138, 140, 142, 147, 136, 148, 132, 148, 145, - - 212, 157, 143, 146, 139, 196, 183, 217, 141, 150, - 158, 150, 239, 129, 129, 129, 144, 151, 123, 123, - 202, 123, 123, 123, 123, 123, 123, 123, 123, 123, - 123, 124, 123, 123, 275, 275, 125, 192, 192, 192, - 346, 123, 123, 123, 123, 123, 123, 152, 128, 160, - 128, 153, 213, 161, 161, 128, 197, 128, 204, 204, - 152, 128, 160, 128, 153, 163, 161, 161, 128, 198, - 128, 214, 198, 123, 123, 123, 123, 206, 206, 206, - 182, 213, 198, 198, 288, 162, 254, 389, 215, 390, - 504, 205, 128, 201, 240, 163, 166, 162, 255, 162, - - 214, 123, 123, 123, 282, 128, 152, 128, 160, 128, - 153, 170, 161, 161, 128, 162, 128, 215, 162, 205, - 216, 288, 164, 171, 240, 166, 232, 162, 162, 167, - 162, 183, 162, 162, 282, 233, 165, 172, 168, 202, - 170, 196, 173, 288, 162, 182, 169, 162, 162, 216, - 175, 128, 164, 171, 288, 232, 162, 285, 167, 174, - 162, 162, 221, 162, 233, 165, 172, 162, 168, 162, - 162, 176, 173, 162, 178, 169, 162, 234, 179, 175, - 235, 162, 180, 162, 162, 162, 177, 285, 174, 218, - 219, 218, 197, 223, 224, 223, 183, 162, 225, 162, - - 162, 176, 204, 204, 178, 389, 234, 390, 179, 235, - 162, 180, 162, 162, 189, 177, 220, 220, 221, 220, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 86, 86, 86, 86, 86, 86, 86, 86, 83, 83, + 83, 87, 88, 89, 88, 90, 91, 87, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 87, 102, + 103, 104, 104, 87, 105, 106, 107, 108, 87, 87, + + 109, 110, 111, 110, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 112, 113, 110, 110, 110, 114, 115, + 110, 110, 110, 110, 110, 110, 116, 87, 117, 87, + 87, 109, 110, 111, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 112, 113, 110, 110, 110, 114, 115, + 110, 110, 110, 110, 110, 87, 87, 87, 130, 131, + 182, 133, 134, 135, 196, 137, 138, 140, 229, 142, + 147, 136, 201, 132, 192, 192, 192, 145, 143, 123, + 139, 146, 201, 153, 141, 153, 212, 154, 154, 130, + 131, 133, 134, 144, 135, 137, 478, 138, 140, 142, + + 147, 136, 465, 132, 148, 182, 148, 411, 145, 143, + 139, 183, 146, 213, 141, 197, 212, 150, 202, 150, + 206, 206, 206, 144, 346, 151, 123, 123, 202, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 124, + 123, 123, 288, 213, 125, 254, 157, 214, 162, 123, + 123, 123, 123, 123, 123, 158, 183, 255, 129, 129, + 129, 288, 170, 204, 204, 218, 219, 218, 152, 128, + 160, 128, 153, 215, 161, 161, 128, 214, 128, 162, + 353, 123, 123, 123, 123, 123, 163, 152, 128, 160, + 128, 153, 170, 161, 161, 128, 205, 128, 216, 171, + + 223, 224, 223, 215, 288, 225, 275, 275, 162, 353, + 123, 123, 123, 172, 128, 162, 217, 163, 198, 166, + 288, 198, 162, 221, 232, 205, 167, 239, 216, 162, + 171, 198, 198, 128, 152, 128, 160, 128, 153, 162, + 161, 161, 128, 172, 128, 189, 162, 217, 162, 166, + 164, 173, 162, 168, 232, 162, 167, 162, 239, 162, + 233, 169, 162, 234, 165, 162, 235, 189, 174, 162, + 180, 162, 226, 224, 226, 175, 236, 227, 237, 162, + 128, 164, 173, 162, 168, 238, 162, 176, 162, 240, + 233, 169, 162, 234, 165, 162, 235, 162, 174, 162, + + 180, 162, 177, 162, 185, 175, 236, 178, 237, 241, + 244, 179, 504, 245, 162, 238, 246, 162, 176, 153, + 240, 153, 157, 154, 154, 231, 153, 162, 153, 254, + 154, 154, 177, 504, 162, 251, 252, 251, 178, 241, + 244, 255, 179, 245, 204, 204, 246, 162, 220, 220, + 221, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 222, 222, 222, 222, 222, + 220, 220, 220, 220, 220, 220, 220, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 220, 220, 220, 220, 222, 222, 222, 222, 222, + + 222, 222, 222, 220, 220, 220, 220, 220, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 220, - - 220, 220, 226, 224, 226, 236, 237, 227, 238, 241, - 242, 189, 244, 245, 246, 247, 248, 249, 162, 153, - 243, 153, 286, 154, 154, 153, 353, 153, 264, 154, - 154, 251, 252, 251, 236, 237, 293, 238, 241, 162, - 242, 244, 245, 246, 247, 248, 249, 162, 148, 243, - 148, 153, 286, 153, 353, 154, 154, 270, 264, 423, - 160, 150, 153, 150, 161, 161, 293, 185, 162, 151, - 123, 253, 252, 253, 123, 123, 123, 123, 123, 123, - 123, 123, 123, 123, 123, 123, 270, 254, 123, 283, - 504, 260, 162, 123, 123, 123, 123, 123, 123, 255, - - 158, 254, 250, 129, 129, 129, 231, 192, 192, 192, - 424, 250, 128, 255, 128, 250, 259, 157, 283, 128, - 260, 162, 162, 250, 231, 123, 123, 123, 123, 152, - 128, 160, 128, 153, 433, 161, 161, 128, 120, 128, - 152, 128, 160, 128, 153, 259, 161, 161, 128, 258, - 128, 162, 265, 123, 123, 123, 128, 162, 261, 210, - 262, 263, 433, 162, 162, 266, 162, 162, 162, 267, - 209, 271, 269, 203, 128, 257, 162, 194, 258, 268, - 162, 272, 265, 190, 162, 128, 162, 261, 162, 262, - 263, 273, 162, 162, 266, 162, 162, 162, 162, 267, - - 271, 269, 274, 162, 257, 162, 276, 276, 268, 162, - 272, 279, 279, 162, 206, 206, 206, 162, 284, 294, - 273, 218, 219, 218, 223, 224, 223, 162, 297, 225, - 298, 274, 162, 223, 224, 223, 295, 296, 225, 277, - 226, 224, 226, 189, 280, 227, 189, 284, 294, 251, - 252, 251, 253, 252, 253, 311, 312, 186, 297, 185, - 298, 333, 333, 335, 335, 295, 296, 277, 311, 312, - 504, 504, 280, 220, 220, 221, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 220, 220, 220, 242, 120, 247, 248, 249, + 148, 162, 148, 270, 153, 243, 153, 210, 154, 154, + 311, 312, 160, 150, 153, 150, 161, 161, 192, 192, + 192, 151, 196, 206, 206, 206, 242, 247, 248, 249, + 389, 162, 390, 270, 209, 243, 123, 253, 252, 253, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 259, 254, 123, 355, 260, 162, 162, 123, + + 123, 123, 123, 123, 123, 255, 158, 356, 250, 129, + 129, 129, 231, 197, 203, 258, 282, 250, 128, 194, + 128, 250, 259, 162, 182, 128, 260, 162, 162, 250, + 433, 123, 123, 123, 123, 123, 152, 128, 160, 128, + 153, 265, 161, 161, 128, 258, 128, 282, 152, 128, + 160, 128, 153, 162, 161, 161, 128, 162, 128, 433, + 123, 123, 123, 128, 389, 261, 390, 262, 263, 269, + 162, 162, 265, 162, 264, 183, 266, 162, 162, 271, + 283, 267, 128, 257, 162, 162, 272, 162, 274, 162, + 284, 268, 190, 162, 128, 261, 162, 262, 263, 269, + + 162, 162, 285, 162, 273, 264, 266, 162, 162, 271, + 283, 162, 267, 257, 162, 162, 272, 286, 274, 162, + 284, 268, 293, 162, 276, 276, 162, 279, 279, 218, + 219, 218, 294, 285, 273, 223, 224, 223, 295, 296, + 225, 162, 223, 224, 223, 297, 298, 225, 286, 226, + 224, 226, 299, 293, 227, 300, 306, 277, 301, 189, + 280, 189, 294, 251, 252, 251, 333, 333, 295, 296, + 253, 252, 253, 335, 335, 186, 297, 298, 311, 312, + 504, 504, 299, 195, 195, 300, 277, 306, 301, 280, + 220, 220, 221, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 222, 222, 222, 222, 222, 222, 222, 222, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 220, 220, - 220, 220, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 220, 220, 220, 299, - 300, 301, 302, 303, 304, 305, 306, 122, 307, 308, - 309, 310, 342, 318, 127, 152, 128, 160, 128, 153, - 162, 161, 161, 128, 122, 128, 162, 120, 299, 300, - 301, 302, 303, 304, 305, 250, 306, 307, 308, 314, - - 309, 310, 342, 318, 250, 128, 162, 128, 250, 162, - 162, 319, 128, 316, 317, 162, 250, 321, 162, 320, - 128, 162, 195, 195, 152, 128, 160, 128, 153, 314, - 161, 161, 128, 162, 128, 162, 162, 325, 322, 162, - 504, 319, 316, 317, 162, 162, 321, 162, 320, 128, - 162, 315, 324, 323, 162, 162, 327, 182, 326, 328, - 162, 330, 162, 162, 329, 162, 325, 322, 162, 128, - 331, 332, 332, 162, 162, 337, 338, 162, 339, 343, - 315, 324, 323, 162, 162, 340, 327, 326, 328, 162, - 341, 330, 162, 329, 344, 345, 347, 162, 348, 350, - - 331, 349, 351, 352, 337, 338, 162, 339, 183, 343, - 354, 162, 162, 162, 340, 355, 504, 162, 504, 341, - 357, 358, 363, 344, 345, 347, 360, 356, 348, 350, - 349, 351, 352, 359, 504, 162, 162, 162, 162, 354, - 162, 162, 162, 361, 162, 364, 162, 362, 162, 357, - 358, 363, 162, 162, 365, 162, 360, 368, 200, 200, - 367, 366, 346, 359, 162, 162, 162, 162, 162, 373, - 162, 162, 361, 162, 372, 364, 362, 162, 370, 182, - 374, 162, 162, 365, 162, 369, 368, 375, 382, 367, - 376, 366, 377, 371, 371, 380, 381, 162, 373, 162, - - 162, 378, 378, 378, 372, 383, 384, 370, 385, 374, - 386, 379, 387, 369, 388, 355, 394, 375, 382, 376, - 162, 377, 391, 162, 380, 381, 398, 356, 392, 504, - 183, 162, 162, 393, 383, 384, 395, 385, 162, 162, - 386, 403, 387, 388, 397, 394, 378, 378, 378, 162, - 396, 391, 162, 162, 162, 398, 379, 162, 392, 399, - 162, 162, 393, 400, 401, 395, 162, 162, 162, 402, - 162, 403, 404, 397, 407, 162, 408, 405, 405, 405, - 396, 412, 162, 162, 504, 162, 162, 406, 399, 504, - 409, 409, 409, 400, 401, 162, 417, 504, 402, 162, - - 410, 404, 418, 407, 162, 408, 378, 378, 378, 419, - 412, 413, 413, 413, 162, 420, 379, 415, 415, 415, - 421, 414, 405, 405, 405, 162, 417, 416, 162, 162, - 425, 418, 406, 432, 426, 409, 409, 409, 419, 427, - 413, 413, 413, 162, 420, 410, 435, 411, 162, 421, - 414, 428, 162, 162, 162, 431, 162, 162, 162, 425, - 429, 162, 432, 426, 430, 415, 415, 415, 434, 427, - 439, 504, 162, 436, 162, 416, 435, 162, 423, 162, - 428, 162, 162, 437, 431, 162, 405, 405, 405, 429, - 162, 438, 442, 430, 443, 444, 406, 434, 439, 409, - - 409, 409, 436, 162, 162, 413, 413, 413, 162, 410, - 415, 415, 415, 437, 451, 414, 440, 440, 440, 162, - 416, 438, 442, 446, 443, 447, 441, 445, 162, 424, - 162, 162, 449, 162, 440, 440, 440, 452, 504, 162, - 450, 448, 455, 451, 441, 457, 424, 162, 162, 456, - 423, 504, 504, 446, 504, 447, 445, 162, 504, 162, - 162, 162, 449, 467, 453, 453, 453, 452, 162, 448, - 450, 466, 455, 162, 454, 457, 162, 504, 456, 458, - 458, 458, 440, 440, 440, 460, 460, 460, 464, 459, - 162, 162, 441, 467, 504, 461, 462, 462, 462, 468, - - 466, 424, 162, 453, 453, 453, 463, 458, 458, 458, - 469, 470, 473, 454, 460, 460, 460, 459, 464, 504, - 162, 462, 462, 462, 461, 453, 453, 453, 471, 468, - 480, 463, 472, 476, 504, 454, 481, 504, 504, 469, - 470, 473, 162, 479, 477, 504, 162, 458, 458, 458, - 504, 162, 487, 162, 460, 460, 460, 459, 471, 480, - 162, 482, 472, 476, 461, 481, 462, 462, 462, 485, - 504, 162, 504, 479, 477, 162, 463, 474, 474, 474, - 162, 487, 162, 474, 474, 474, 162, 475, 488, 162, - 489, 482, 491, 475, 483, 483, 483, 486, 490, 485, - - 162, 483, 483, 483, 484, 162, 162, 493, 492, 162, - 495, 484, 162, 496, 497, 162, 498, 488, 494, 499, - 489, 491, 501, 500, 504, 162, 162, 486, 490, 162, - 162, 502, 503, 504, 162, 162, 493, 492, 162, 495, - 504, 162, 496, 504, 497, 504, 498, 494, 504, 499, - 281, 501, 504, 500, 162, 162, 281, 281, 281, 162, - 502, 162, 504, 504, 504, 504, 504, 504, 504, 504, - 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 222, 222, 222, 222, 222, 220, 220, 220, 220, 220, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 220, 220, 220, 302, 303, 304, + 305, 307, 308, 309, 310, 250, 162, 355, 504, 200, + 200, 378, 378, 378, 250, 128, 162, 128, 250, 356, + + 185, 379, 128, 324, 122, 127, 250, 302, 303, 304, + 305, 307, 308, 162, 309, 310, 162, 152, 128, 160, + 128, 153, 320, 161, 161, 128, 162, 128, 152, 128, + 160, 128, 153, 324, 161, 161, 128, 342, 128, 162, + 128, 314, 318, 162, 319, 122, 316, 317, 162, 162, + 321, 162, 320, 337, 162, 315, 162, 323, 322, 120, + 162, 162, 162, 128, 325, 326, 328, 162, 342, 162, + 439, 329, 314, 318, 128, 319, 316, 317, 162, 162, + 321, 162, 327, 337, 162, 315, 162, 323, 322, 162, + 162, 162, 162, 330, 325, 326, 328, 162, 331, 439, + + 162, 329, 182, 338, 339, 162, 340, 341, 343, 504, + 344, 345, 347, 327, 348, 350, 332, 332, 349, 162, + 351, 352, 354, 504, 330, 162, 162, 504, 357, 331, + 162, 162, 360, 338, 339, 162, 340, 341, 504, 343, + 344, 345, 347, 162, 359, 348, 350, 162, 349, 162, + 351, 352, 354, 183, 162, 162, 162, 358, 357, 162, + 363, 162, 361, 360, 162, 364, 504, 162, 362, 368, + 162, 162, 162, 162, 366, 359, 365, 162, 367, 162, + 162, 162, 372, 346, 162, 373, 374, 358, 370, 162, + 363, 375, 361, 162, 162, 376, 364, 162, 362, 368, + + 162, 162, 162, 377, 380, 366, 365, 369, 367, 381, + 162, 162, 182, 372, 382, 373, 374, 383, 370, 384, + 385, 386, 375, 162, 387, 376, 371, 371, 388, 162, + 162, 391, 393, 377, 380, 392, 369, 394, 403, 381, + 162, 378, 378, 378, 395, 382, 162, 383, 162, 384, + 385, 379, 386, 162, 397, 387, 398, 396, 388, 162, + 162, 391, 393, 183, 162, 162, 392, 394, 400, 403, + 162, 399, 162, 404, 395, 162, 162, 407, 162, 408, + 162, 401, 423, 162, 397, 417, 398, 162, 396, 412, + 402, 418, 162, 504, 162, 162, 405, 405, 405, 400, + + 504, 399, 162, 404, 504, 162, 406, 407, 419, 408, + 162, 420, 401, 409, 409, 409, 417, 162, 421, 412, + 402, 418, 162, 410, 378, 378, 378, 413, 413, 413, + 415, 415, 415, 424, 379, 162, 435, 414, 419, 432, + 416, 420, 405, 405, 405, 162, 162, 425, 421, 409, + 409, 409, 406, 434, 411, 426, 413, 413, 413, 410, + 415, 415, 415, 427, 504, 162, 414, 435, 504, 432, + 416, 162, 162, 436, 162, 162, 162, 425, 162, 428, + 504, 162, 429, 434, 437, 426, 430, 162, 162, 431, + 405, 405, 405, 438, 427, 162, 409, 409, 409, 162, + + 406, 162, 162, 436, 162, 423, 410, 442, 162, 428, + 444, 162, 429, 443, 452, 437, 430, 162, 162, 431, + 413, 413, 413, 451, 438, 162, 415, 415, 415, 162, + 414, 440, 440, 440, 162, 162, 416, 447, 442, 446, + 455, 441, 445, 162, 443, 452, 162, 449, 448, 440, + 440, 440, 456, 451, 162, 450, 424, 423, 504, 441, + 457, 424, 162, 504, 162, 162, 504, 504, 447, 504, + 446, 455, 445, 162, 162, 504, 162, 448, 449, 453, + 453, 453, 456, 504, 162, 467, 450, 466, 162, 454, + 468, 457, 162, 458, 458, 458, 440, 440, 440, 460, + + 460, 460, 464, 459, 162, 162, 441, 471, 424, 461, + 462, 462, 462, 453, 453, 453, 467, 466, 162, 469, + 463, 468, 472, 454, 458, 458, 458, 460, 460, 460, + 462, 462, 462, 464, 459, 162, 476, 461, 471, 504, + 463, 453, 453, 453, 458, 458, 458, 470, 473, 469, + 504, 454, 162, 472, 459, 460, 460, 460, 462, 462, + 462, 479, 504, 162, 482, 461, 162, 476, 463, 162, + 474, 474, 474, 480, 477, 504, 481, 470, 473, 485, + 475, 162, 162, 487, 474, 474, 474, 483, 483, 483, + 489, 504, 479, 162, 475, 482, 162, 484, 486, 162, + + 162, 162, 488, 480, 491, 477, 481, 483, 483, 483, + 485, 162, 490, 487, 162, 493, 492, 484, 162, 162, + 495, 489, 162, 496, 497, 498, 504, 494, 499, 486, + 162, 162, 488, 500, 491, 162, 501, 504, 503, 504, + 162, 162, 504, 490, 162, 493, 492, 502, 162, 162, + 495, 504, 162, 496, 281, 497, 498, 494, 504, 499, + 504, 281, 281, 281, 500, 162, 501, 162, 504, 504, + 162, 162, 504, 504, 504, 504, 504, 502, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, - 162, 75, 75, 75, 75, 75, 75, 75, 75, 75, + 504, 504, 504, 504, 504, 504, 504, 162, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, - 75, 75, 75, 75, 75, 75, 75, 75, 78, 78, + 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 75, 75, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 80, 80, 80, 80, 80, + 78, 78, 78, 78, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 118, 504, 504, 504, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 119, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 121, 121, 121, 121, - 121, 121, 121, 123, 123, 504, 123, 123, 123, 123, + 119, 119, 119, 119, 119, 119, 119, 119, 121, 121, + 121, 121, 121, 121, 121, 123, 123, 504, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 126, 126, 126, 126, 128, 128, 128, - 504, 504, 128, 128, 504, 128, 504, 504, 128, 128, - - 128, 128, 128, 128, 128, 128, 129, 129, 504, 504, - 504, 504, 129, 129, 129, 129, 129, 129, 129, 149, - 504, 149, 504, 504, 504, 149, 149, 504, 149, 504, - 504, 504, 504, 149, 504, 504, 504, 149, 149, 149, - 149, 149, 149, 149, 152, 504, 152, 504, 152, 504, - 152, 504, 504, 504, 504, 504, 152, 152, 152, 152, - 152, 152, 152, 155, 504, 504, 155, 155, 504, 155, - 155, 155, 504, 504, 504, 155, 155, 155, 155, 155, - 155, 155, 156, 156, 504, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 126, 128, 128, 128, 504, 504, 128, 128, 504, 128, + 504, 504, 504, 128, 128, 128, 128, 128, 128, 128, + 128, 129, 129, 504, 504, 504, 504, 504, 129, 129, + 129, 129, 129, 129, 129, 149, 504, 149, 504, 504, + 504, 149, 149, 504, 149, 504, 504, 504, 504, 149, + 504, 504, 504, 504, 149, 149, 149, 149, 149, 149, + 149, 152, 504, 152, 504, 152, 504, 152, 504, 504, + 504, 504, 504, 504, 152, 152, 152, 152, 152, 152, + 152, 155, 504, 504, 155, 155, 504, 155, 155, 155, + 504, 504, 504, 504, 155, 155, 155, 155, 155, 155, + + 155, 156, 156, 504, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 159, 504, 504, 504, 159, 504, 504, 159, 159, 504, 504, - 504, 504, 159, 159, 159, 159, 159, 159, 159, 162, - 162, 162, 162, 162, 504, 162, 162, 504, 162, 504, - 504, 162, 162, 162, 162, 162, 162, 162, 162, 181, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, + 504, 504, 504, 159, 159, 159, 159, 159, 159, 159, + 162, 162, 162, 162, 162, 504, 162, 162, 504, 162, + 504, 504, 504, 162, 162, 162, 162, 162, 162, 162, + 162, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 184, 184, 184, 184, + 181, 181, 181, 181, 181, 181, 181, 181, 181, 184, + 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - - 184, 184, 184, 187, 504, 187, 187, 504, 504, 504, - 504, 187, 187, 187, 187, 187, 187, 187, 187, 188, - 188, 188, 188, 188, 188, 188, 504, 188, 188, 188, + 184, 184, 184, 184, 184, 184, 184, 187, 504, 187, + 187, 504, 504, 504, 504, 504, 187, 187, 187, 187, + 187, 187, 187, 187, 188, 188, 188, 188, 188, 188, + 188, 504, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, - 188, 188, 188, 188, 188, 188, 191, 504, 504, 504, + 188, 188, 191, 504, 504, 504, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, - 191, 191, 191, 193, 504, 193, 193, 504, 504, 504, - 504, 193, 193, 193, 193, 193, 193, 193, 193, 195, - 195, 195, 195, 195, 195, 504, 195, 195, 195, 195, + 193, 504, 193, 193, 504, 504, 504, 504, 504, 193, + 193, 193, 193, 193, 193, 193, 193, 195, 195, 195, + 195, 195, 195, 504, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 199, 504, 199, 504, - 504, 504, 504, 199, 199, 504, 504, 504, 504, 504, - 504, 199, 199, 199, 199, 199, 199, 199, 200, 200, + 195, 195, 195, 195, 195, 199, 504, 199, 504, 504, + 504, 504, 199, 199, 504, 504, 504, 504, 504, 504, + 199, 199, 199, 199, 199, 199, 199, 199, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 211, 211, 504, 504, 504, - 504, 211, 211, 211, 211, 211, 211, 211, 211, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 200, 200, 200, 200, 200, 200, 211, 211, 504, 504, - 118, 118, 118, 118, 118, 118, 119, 119, 119, 119, + 504, 504, 504, 211, 211, 211, 211, 211, 211, 211, + 211, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 228, 228, 228, 228, 228, 228, 228, + 119, 119, 119, 119, 119, 119, 119, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, - 230, 230, 504, 230, 230, 230, 230, 230, 230, 230, + 228, 228, 228, 228, 228, 230, 230, 504, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, - 230, 230, 230, 230, 230, 230, 230, 128, 128, 128, - 504, 504, 128, 128, 504, 128, 504, 504, 128, 128, - - 128, 128, 128, 128, 128, 128, 129, 129, 129, 504, - 504, 504, 129, 129, 129, 129, 129, 129, 129, 149, - 504, 149, 504, 504, 504, 149, 149, 504, 149, 504, - 504, 504, 504, 149, 504, 504, 504, 149, 149, 149, - 149, 149, 149, 149, 152, 504, 152, 504, 152, 504, - 152, 504, 504, 504, 504, 504, 152, 152, 152, 152, - 152, 152, 152, 155, 155, 504, 155, 155, 155, 504, - 504, 504, 155, 155, 155, 155, 155, 155, 155, 158, - 504, 504, 504, 158, 504, 504, 504, 504, 504, 504, - 504, 504, 158, 158, 158, 158, 158, 158, 158, 250, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 128, 128, 128, 504, 504, 128, 128, + 504, 128, 504, 504, 504, 128, 128, 128, 128, 128, + 128, 128, 128, 129, 129, 129, 504, 504, 504, 504, + 129, 129, 129, 129, 129, 129, 129, 149, 504, 149, + 504, 504, 504, 149, 149, 504, 149, 504, 504, 504, + 504, 149, 504, 504, 504, 504, 149, 149, 149, 149, + 149, 149, 149, 152, 504, 152, 504, 152, 504, 152, + 504, 504, 504, 504, 504, 504, 152, 152, 152, 152, - 504, 504, 250, 504, 250, 504, 250, 504, 250, 504, - 504, 250, 250, 504, 250, 250, 250, 250, 250, 250, - 250, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 152, 152, 152, 155, 155, 504, 155, 155, 155, 504, + 504, 504, 504, 155, 155, 155, 155, 155, 155, 155, + 158, 504, 504, 504, 158, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 158, 158, 158, 158, 158, 158, + 158, 250, 504, 504, 250, 504, 250, 504, 250, 504, + 250, 504, 504, 250, 250, 504, 504, 250, 250, 250, + 250, 250, 250, 250, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 159, 504, - 504, 504, 504, 504, 159, 159, 504, 504, 159, 159, - 159, 504, 504, 504, 159, 159, 159, 159, 159, 159, - 159, 256, 504, 504, 256, 256, 256, 256, 256, 504, - 256, 256, 504, 256, 256, 504, 256, 256, 256, 256, - 256, 256, 256, 256, 162, 162, 162, 162, 162, 504, - - 162, 162, 504, 162, 504, 504, 162, 162, 162, 162, - 162, 162, 162, 162, 181, 181, 181, 181, 181, 181, + 156, 156, 159, 504, 504, 504, 504, 504, 159, 159, + + 504, 504, 159, 159, 159, 504, 504, 504, 504, 159, + 159, 159, 159, 159, 159, 159, 256, 504, 504, 256, + 256, 256, 256, 256, 504, 256, 256, 504, 256, 256, + 504, 504, 256, 256, 256, 256, 256, 256, 256, 256, + 162, 162, 162, 162, 162, 504, 162, 162, 504, 162, + 504, 504, 504, 162, 162, 162, 162, 162, 162, 162, + 162, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 504, 504, 504, 504, 504, 504, 504, 181, - 504, 504, 504, 504, 181, 181, 181, 504, 504, 181, - 181, 184, 184, 184, 184, 184, 184, 184, 184, 184, + 504, 504, 504, 504, 504, 504, 504, 181, 504, 504, + + 504, 504, 181, 504, 181, 181, 504, 504, 181, 181, + 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 187, 504, - 187, 187, 504, 504, 504, 504, 187, 187, 187, 187, - - 187, 187, 187, 187, 188, 188, 188, 188, 188, 188, - 188, 504, 188, 188, 188, 188, 188, 188, 188, 188, + 187, 187, 504, 504, 504, 504, 504, 187, 187, 187, + 187, 187, 187, 187, 187, 188, 188, 188, 188, 188, + 188, 188, 504, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, - 188, 191, 504, 504, 504, 191, 191, 191, 191, 191, + 188, 188, 188, 191, 504, 504, 504, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, - 191, 191, 191, 191, 191, 191, 191, 191, 193, 504, - 193, 193, 504, 504, 504, 504, 193, 193, 193, 193, - 193, 193, 193, 193, 195, 195, 195, 195, 195, 195, - 504, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 191, 193, 504, 193, 193, 504, 504, 504, 504, 504, + 193, 193, 193, 193, 193, 193, 193, 193, 195, 195, + 195, 195, 195, 195, 504, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 504, 504, + 504, 504, 504, 504, 195, 504, 504, 504, 504, 504, + 504, 504, 195, 504, 504, 195, 504, 195, 199, 199, + 199, 199, 199, 199, 199, 199, 278, 504, 504, 504, + 504, 504, 278, 278, 504, 278, 278, 504, 504, 504, - 195, 195, 195, 504, 504, 504, 504, 504, 504, 195, - 504, 504, 504, 504, 504, 504, 195, 504, 504, 195, - 504, 195, 199, 199, 199, 199, 199, 199, 199, 278, - 504, 504, 504, 504, 504, 278, 278, 504, 278, 278, - 504, 504, 504, 504, 278, 278, 278, 278, 278, 278, - 278, 278, 200, 200, 200, 200, 200, 200, 200, 200, + 504, 278, 278, 278, 278, 278, 278, 278, 278, 278, + 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 504, 504, 504, 504, 504, 504, 200, 504, 504, + 504, 504, 504, 504, 504, 504, 200, 504, 504, 504, 504, 504, 504, 504, 200, 504, 504, 200, 504, 200, - - 211, 211, 504, 504, 504, 504, 211, 211, 211, 211, - 211, 211, 211, 211, 220, 220, 220, 220, 220, 220, + 211, 211, 504, 504, 504, 504, 504, 211, 211, 211, + 211, 211, 211, 211, 211, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 287, 287, 287, 287, 287, 287, 287, 287, 287, + + 220, 220, 220, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, - 287, 287, 287, 287, 287, 287, 287, 287, 123, 123, - 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, + 287, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, - 123, 123, 123, 123, 123, 289, 289, 289, 289, 289, - + 123, 123, 123, 123, 123, 123, 123, 123, 123, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 290, 290, 504, 290, 290, 290, 290, 290, + 289, 289, 289, 289, 289, 289, 289, 290, 290, 504, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, - 290, 290, 290, 290, 290, 290, 290, 290, 290, 291, - 291, 504, 291, 291, 291, 291, 291, 291, 291, 291, + + 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + 290, 290, 290, 290, 290, 291, 291, 504, 291, 291, + 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 230, 230, 504, 230, + 291, 291, 291, 230, 230, 504, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, - - 230, 230, 230, 292, 292, 504, 292, 292, 292, 292, - 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 230, 292, 292, 504, 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, - 128, 128, 128, 504, 504, 128, 128, 504, 128, 504, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 128, + + 128, 128, 504, 504, 128, 128, 504, 128, 504, 504, 504, 128, 128, 128, 128, 128, 128, 128, 128, 250, 504, 504, 250, 504, 250, 504, 250, 504, 250, 504, - 504, 250, 250, 504, 250, 250, 250, 250, 250, 250, - 250, 313, 313, 504, 504, 504, 504, 504, 504, 504, - 504, 504, 504, 504, 504, 504, 504, 313, 313, 313, - 313, 313, 313, 313, 256, 504, 504, 256, 256, 256, - - 256, 256, 504, 256, 256, 504, 256, 256, 504, 256, - 256, 256, 256, 256, 256, 256, 256, 162, 162, 162, - 162, 162, 504, 162, 162, 504, 162, 504, 504, 162, - 162, 162, 162, 162, 162, 162, 162, 181, 181, 181, + 504, 250, 250, 504, 504, 250, 250, 250, 250, 250, + 250, 250, 313, 313, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 313, + 313, 313, 313, 313, 313, 313, 256, 504, 504, 256, + 256, 256, 256, 256, 504, 256, 256, 504, 256, 256, + 504, 504, 256, 256, 256, 256, 256, 256, 256, 256, + 162, 162, 162, 162, 162, 504, 162, 162, 504, 162, + + 504, 504, 504, 162, 162, 162, 162, 162, 162, 162, + 162, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 334, 334, 504, 504, 504, 504, - 334, 334, 334, 336, 336, 504, 504, 504, 504, 336, - 336, 336, 195, 195, 504, 504, 504, 504, 195, 195, - 195, 200, 200, 504, 504, 504, 504, 200, 200, 200, - + 181, 181, 181, 181, 181, 181, 181, 181, 181, 334, + 334, 504, 504, 504, 504, 504, 334, 334, 334, 336, + 336, 504, 504, 504, 504, 504, 336, 336, 336, 195, + 195, 504, 504, 504, 504, 504, 195, 195, 195, 200, + 200, 504, 504, 504, 504, 504, 200, 200, 200, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, + 422, 422, 422, 422, 422, 422, 422, 15, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, @@ -1029,12 +1038,12 @@ static yyconst flex_int16_t yy_nxt[3615] = 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, - 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, - 504, 504, 504, 504 + 504, 504, 504, 504, 504 + } ; -static yyconst flex_int16_t yy_chk[3615] = +static yyconst flex_int16_t yy_chk[3696] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1044,7 +1053,7 @@ static yyconst flex_int16_t yy_chk[3615] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1054,7 +1063,7 @@ static yyconst flex_int16_t yy_chk[3615] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, @@ -1063,10 +1072,10 @@ static yyconst flex_int16_t yy_chk[3615] = 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 5, 6, - 7, 7, 7, 8, 8, 8, 9, 25, 501, 5, - 6, 10, 25, 9, 9, 9, 106, 106, 10, 10, - 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 5, 6, 7, 7, 7, 8, 8, 8, 9, + 25, 501, 5, 6, 10, 25, 9, 9, 9, 106, + 106, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, @@ -1075,8 +1084,8 @@ static yyconst flex_int16_t yy_chk[3615] = 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, @@ -1085,76 +1094,76 @@ static yyconst flex_int16_t yy_chk[3615] = 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 30, 31, 66, 32, 33, 34, 125, - 35, 36, 37, 472, 38, 41, 34, 451, 31, 40, - 125, 109, 39, 40, 95, 36, 46, 115, 46, 37, - 46, 46, 138, 30, 31, 32, 33, 39, 34, 35, - 380, 36, 37, 38, 41, 34, 45, 31, 45, 40, - - 109, 49, 39, 40, 36, 91, 66, 115, 37, 45, - 49, 45, 138, 49, 49, 49, 39, 45, 48, 48, - 95, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 183, 183, 48, 82, 82, 82, - 301, 48, 48, 48, 48, 48, 48, 50, 50, 50, - 50, 50, 111, 50, 50, 50, 91, 50, 103, 103, - 51, 51, 51, 51, 51, 50, 51, 51, 51, 92, - 51, 112, 92, 48, 48, 48, 48, 104, 104, 104, - 181, 111, 92, 92, 289, 53, 158, 356, 113, 356, - 158, 103, 50, 200, 139, 50, 53, 56, 158, 53, - - 112, 48, 48, 48, 212, 51, 52, 52, 52, 52, - 52, 56, 52, 52, 52, 53, 52, 113, 54, 103, - 114, 287, 52, 57, 139, 53, 130, 56, 53, 54, - 59, 181, 54, 55, 212, 131, 52, 57, 55, 200, - 56, 195, 58, 227, 59, 371, 55, 55, 54, 114, - 59, 52, 52, 57, 225, 130, 58, 216, 54, 58, - 59, 54, 220, 55, 131, 52, 57, 60, 55, 62, - 61, 60, 58, 59, 61, 55, 55, 132, 61, 59, - 133, 60, 62, 62, 61, 58, 60, 216, 58, 118, - 118, 118, 195, 122, 122, 122, 371, 60, 122, 62, - - 61, 60, 204, 204, 61, 389, 132, 389, 61, 133, - 60, 62, 62, 61, 189, 60, 121, 121, 121, 121, + 13, 13, 13, 13, 13, 13, 13, 13, 30, 31, + 66, 32, 33, 34, 91, 35, 36, 37, 125, 38, + 41, 34, 95, 31, 82, 82, 82, 40, 39, 125, + 36, 40, 200, 46, 37, 46, 109, 46, 46, 30, + 31, 32, 33, 39, 34, 35, 472, 36, 37, 38, + + 41, 34, 451, 31, 45, 181, 45, 380, 40, 39, + 36, 66, 40, 111, 37, 91, 109, 45, 95, 45, + 104, 104, 104, 39, 301, 45, 48, 48, 200, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 289, 111, 48, 254, 49, 112, 56, 48, + 48, 48, 48, 48, 48, 49, 181, 254, 49, 49, + 49, 287, 56, 103, 103, 118, 118, 118, 50, 50, + 50, 50, 50, 113, 50, 50, 50, 112, 50, 56, + 309, 48, 48, 48, 48, 48, 50, 51, 51, 51, + 51, 51, 56, 51, 51, 51, 103, 51, 114, 57, + + 122, 122, 122, 113, 227, 122, 183, 183, 53, 309, + 48, 48, 48, 57, 50, 54, 115, 50, 92, 53, + 225, 92, 53, 220, 130, 103, 54, 138, 114, 54, + 57, 92, 92, 51, 52, 52, 52, 52, 52, 53, + 52, 52, 52, 57, 52, 189, 54, 115, 55, 53, + 52, 58, 53, 55, 130, 59, 54, 62, 138, 54, + 131, 55, 55, 132, 52, 58, 133, 188, 58, 59, + 62, 62, 124, 124, 124, 59, 134, 124, 136, 55, + 52, 52, 58, 60, 55, 137, 59, 60, 62, 139, + 131, 55, 55, 132, 52, 58, 133, 60, 58, 59, + + 62, 62, 60, 61, 184, 59, 134, 61, 136, 140, + 142, 61, 157, 143, 60, 137, 144, 61, 60, 149, + 139, 149, 151, 149, 149, 129, 152, 60, 152, 158, + 152, 152, 60, 158, 61, 155, 155, 155, 61, 140, + 142, 158, 61, 143, 204, 204, 144, 61, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - - 121, 121, 124, 124, 124, 134, 136, 124, 137, 140, - 141, 188, 142, 143, 144, 145, 146, 147, 168, 149, - 141, 149, 217, 149, 149, 152, 309, 152, 171, 152, - 152, 155, 155, 155, 134, 136, 232, 137, 140, 171, - 141, 142, 143, 144, 145, 146, 147, 168, 148, 141, - 148, 154, 217, 154, 309, 154, 154, 176, 171, 390, - 161, 148, 161, 148, 161, 161, 232, 184, 171, 148, + 121, 121, 121, 121, 121, 141, 119, 145, 146, 147, + 148, 168, 148, 176, 154, 141, 154, 108, 154, 154, + 255, 255, 161, 148, 161, 148, 161, 161, 192, 192, + 192, 148, 195, 206, 206, 206, 141, 145, 146, 147, + 356, 168, 356, 176, 107, 141, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 176, 159, 156, 213, - 157, 166, 166, 156, 156, 156, 156, 156, 156, 159, - - 159, 254, 160, 159, 159, 159, 159, 192, 192, 192, - 390, 160, 160, 254, 160, 160, 165, 151, 213, 160, - 166, 166, 165, 160, 129, 156, 156, 156, 156, 162, - 162, 162, 162, 162, 404, 162, 162, 162, 119, 162, - 163, 163, 163, 163, 163, 165, 163, 163, 163, 164, - 163, 165, 172, 156, 156, 156, 160, 164, 167, 108, - 169, 170, 404, 167, 169, 173, 170, 173, 172, 174, - 107, 177, 175, 102, 162, 163, 177, 90, 164, 174, - 175, 178, 172, 77, 174, 163, 164, 167, 178, 169, - 170, 179, 167, 169, 173, 170, 173, 172, 179, 174, - - 177, 175, 180, 180, 163, 177, 197, 197, 174, 175, - 178, 202, 202, 174, 206, 206, 206, 178, 214, 233, - 179, 218, 218, 218, 223, 223, 223, 179, 235, 223, - 236, 180, 180, 224, 224, 224, 234, 234, 224, 197, - 226, 226, 226, 76, 202, 226, 75, 214, 233, 251, - 251, 251, 253, 253, 253, 255, 255, 70, 235, 67, - 236, 276, 276, 279, 279, 234, 234, 197, 311, 311, - 312, 312, 202, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 156, 156, 165, 159, 156, 355, 166, 166, 165, 156, + + 156, 156, 156, 156, 156, 159, 159, 355, 160, 159, + 159, 159, 159, 195, 102, 164, 212, 160, 160, 90, + 160, 160, 165, 164, 371, 160, 166, 166, 165, 160, + 404, 156, 156, 156, 156, 156, 162, 162, 162, 162, + 162, 172, 162, 162, 162, 164, 162, 212, 163, 163, + 163, 163, 163, 164, 163, 163, 163, 172, 163, 404, + 156, 156, 156, 160, 389, 167, 389, 169, 170, 175, + 167, 169, 172, 170, 171, 371, 173, 175, 173, 177, + 213, 174, 162, 163, 177, 171, 178, 172, 180, 180, + 214, 174, 77, 178, 163, 167, 174, 169, 170, 175, + + 167, 169, 216, 170, 179, 171, 173, 175, 173, 177, + 213, 179, 174, 163, 177, 171, 178, 217, 180, 180, + 214, 174, 232, 178, 197, 197, 174, 202, 202, 218, + 218, 218, 233, 216, 179, 223, 223, 223, 234, 234, + 223, 179, 224, 224, 224, 235, 236, 224, 217, 226, + 226, 226, 237, 232, 226, 238, 244, 197, 239, 76, + 202, 75, 233, 251, 251, 251, 276, 276, 234, 234, + 253, 253, 253, 279, 279, 70, 235, 236, 311, 311, + 312, 312, 237, 333, 333, 238, 197, 244, 239, 202, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, @@ -1162,267 +1171,276 @@ static yyconst flex_int16_t yy_chk[3615] = 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 237, - 238, 239, 240, 241, 242, 243, 244, 47, 246, 247, - 248, 249, 296, 260, 27, 257, 257, 257, 257, 257, - 260, 257, 257, 257, 24, 257, 270, 20, 237, 238, - 239, 240, 241, 242, 243, 256, 244, 246, 247, 257, - - 248, 249, 296, 260, 256, 256, 259, 256, 256, 260, - 262, 261, 256, 259, 259, 270, 256, 263, 263, 262, - 257, 261, 333, 333, 258, 258, 258, 258, 258, 257, - 258, 258, 258, 267, 258, 259, 264, 267, 264, 262, - 15, 261, 259, 259, 265, 266, 263, 263, 262, 256, - 261, 258, 266, 265, 268, 271, 269, 275, 268, 271, - 272, 273, 267, 269, 272, 264, 267, 264, 273, 258, - 274, 275, 275, 265, 266, 283, 285, 274, 286, 298, - 258, 266, 265, 268, 271, 293, 269, 268, 271, 272, - 295, 273, 269, 272, 299, 300, 302, 273, 303, 305, - - 274, 304, 306, 308, 283, 285, 274, 286, 275, 298, - 310, 315, 318, 316, 293, 313, 313, 314, 0, 295, - 314, 316, 323, 299, 300, 302, 319, 313, 303, 305, - 304, 306, 308, 317, 0, 320, 317, 319, 321, 310, - 315, 318, 316, 320, 322, 324, 314, 321, 325, 314, - 316, 323, 324, 327, 325, 328, 319, 329, 335, 335, - 327, 326, 322, 317, 320, 317, 319, 321, 326, 338, - 331, 330, 320, 322, 337, 324, 321, 325, 331, 332, - 340, 324, 327, 325, 328, 330, 329, 341, 347, 327, - 342, 326, 343, 332, 332, 345, 346, 326, 338, 331, - - 330, 344, 344, 344, 337, 348, 349, 331, 350, 340, - 351, 344, 352, 330, 353, 355, 360, 341, 347, 342, - 357, 343, 357, 365, 345, 346, 365, 355, 358, 0, - 332, 359, 362, 359, 348, 349, 362, 350, 364, 358, - 351, 372, 352, 353, 364, 360, 361, 361, 361, 357, - 363, 357, 365, 366, 370, 365, 361, 363, 358, 366, - 359, 362, 359, 367, 368, 362, 369, 364, 358, 369, - 367, 372, 373, 364, 375, 368, 376, 374, 374, 374, - 363, 381, 366, 370, 0, 361, 363, 374, 366, 0, - 377, 377, 377, 367, 368, 369, 384, 0, 369, 367, - - 377, 373, 385, 375, 368, 376, 378, 378, 378, 386, - 381, 382, 382, 382, 361, 387, 378, 383, 383, 383, - 388, 382, 391, 391, 391, 393, 384, 383, 392, 395, - 392, 385, 391, 403, 393, 394, 394, 394, 386, 398, - 396, 396, 396, 399, 387, 394, 408, 395, 398, 388, - 396, 399, 400, 402, 393, 402, 401, 392, 395, 392, - 400, 391, 403, 393, 401, 397, 397, 397, 407, 398, - 418, 0, 399, 411, 394, 397, 408, 398, 422, 396, - 399, 400, 402, 412, 402, 401, 405, 405, 405, 400, - 391, 417, 420, 401, 421, 424, 405, 407, 418, 409, - - 409, 409, 411, 394, 397, 413, 413, 413, 396, 409, - 415, 415, 415, 412, 432, 413, 419, 419, 419, 425, - 415, 417, 420, 426, 421, 427, 419, 425, 428, 422, - 426, 427, 430, 397, 429, 429, 429, 433, 0, 430, - 431, 428, 436, 432, 429, 438, 424, 431, 425, 437, - 444, 0, 0, 426, 0, 427, 425, 428, 0, 426, - 427, 446, 430, 455, 434, 434, 434, 433, 430, 428, - 431, 452, 436, 429, 434, 438, 431, 0, 437, 439, - 439, 439, 440, 440, 440, 442, 442, 442, 447, 439, - 446, 447, 440, 455, 0, 442, 443, 443, 443, 456, - - 452, 444, 429, 445, 445, 445, 443, 448, 448, 448, - 457, 464, 467, 445, 449, 449, 449, 448, 447, 0, - 447, 450, 450, 450, 449, 453, 453, 453, 465, 456, - 476, 450, 466, 469, 0, 453, 477, 0, 0, 457, - 464, 467, 445, 473, 470, 0, 448, 458, 458, 458, - 0, 470, 485, 449, 460, 460, 460, 458, 465, 476, - 450, 478, 466, 469, 460, 477, 462, 462, 462, 480, - 0, 445, 0, 473, 470, 448, 462, 468, 468, 468, - 470, 485, 449, 474, 474, 474, 486, 468, 486, 450, - 487, 478, 489, 474, 479, 479, 479, 481, 488, 480, - - 481, 483, 483, 483, 479, 488, 490, 491, 490, 492, - 493, 483, 494, 494, 495, 486, 496, 486, 492, 497, - 487, 489, 499, 498, 0, 500, 496, 481, 488, 481, - 498, 500, 502, 0, 488, 490, 491, 490, 492, 493, - 0, 494, 494, 0, 495, 0, 496, 492, 0, 497, - 559, 499, 0, 498, 500, 496, 559, 559, 559, 498, - 500, 502, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 240, 241, 242, + 243, 246, 247, 248, 249, 256, 270, 313, 313, 335, + 335, 344, 344, 344, 256, 256, 266, 256, 256, 313, + + 67, 344, 256, 266, 47, 27, 256, 240, 241, 242, + 243, 246, 247, 262, 248, 249, 270, 257, 257, 257, + 257, 257, 262, 257, 257, 257, 266, 257, 258, 258, + 258, 258, 258, 266, 258, 258, 258, 296, 258, 259, + 256, 257, 260, 262, 261, 24, 259, 259, 265, 260, + 263, 263, 262, 283, 261, 258, 264, 265, 264, 20, + 267, 268, 271, 257, 267, 268, 271, 272, 296, 259, + 418, 272, 257, 260, 258, 261, 259, 259, 265, 260, + 263, 263, 269, 283, 261, 258, 264, 265, 264, 269, + 267, 268, 271, 273, 267, 268, 271, 272, 274, 418, + + 273, 272, 275, 285, 286, 274, 293, 295, 298, 15, + 299, 300, 302, 269, 303, 305, 275, 275, 304, 269, + 306, 308, 310, 0, 273, 314, 315, 0, 314, 274, + 273, 318, 319, 285, 286, 274, 293, 295, 0, 298, + 299, 300, 302, 319, 317, 303, 305, 317, 304, 316, + 306, 308, 310, 275, 320, 314, 315, 316, 314, 321, + 323, 318, 320, 319, 322, 324, 0, 328, 321, 329, + 325, 327, 324, 319, 326, 317, 325, 317, 327, 316, + 331, 326, 337, 322, 320, 338, 340, 316, 331, 321, + 323, 341, 320, 330, 322, 342, 324, 328, 321, 329, + + 325, 327, 324, 343, 345, 326, 325, 330, 327, 346, + 331, 326, 332, 337, 347, 338, 340, 348, 331, 349, + 350, 351, 341, 330, 352, 342, 332, 332, 353, 357, + 359, 357, 359, 343, 345, 358, 330, 360, 372, 346, + 362, 361, 361, 361, 362, 347, 358, 348, 364, 349, + 350, 361, 351, 365, 364, 352, 365, 363, 353, 357, + 359, 357, 359, 332, 363, 366, 358, 360, 367, 372, + 362, 366, 370, 373, 362, 367, 358, 375, 364, 376, + 361, 368, 390, 365, 364, 384, 365, 369, 363, 381, + 369, 385, 368, 0, 363, 366, 374, 374, 374, 367, + + 0, 366, 370, 373, 0, 367, 374, 375, 386, 376, + 361, 387, 368, 377, 377, 377, 384, 369, 388, 381, + 369, 385, 368, 377, 378, 378, 378, 382, 382, 382, + 383, 383, 383, 390, 378, 395, 408, 382, 386, 403, + 383, 387, 391, 391, 391, 392, 393, 392, 388, 394, + 394, 394, 391, 407, 395, 393, 396, 396, 396, 394, + 397, 397, 397, 398, 0, 395, 396, 408, 0, 403, + 397, 399, 398, 411, 400, 392, 393, 392, 401, 399, + 0, 391, 400, 407, 412, 393, 401, 402, 394, 402, + 405, 405, 405, 417, 398, 396, 409, 409, 409, 397, + + 405, 399, 398, 411, 400, 422, 409, 420, 401, 399, + 424, 391, 400, 421, 433, 412, 401, 402, 394, 402, + 413, 413, 413, 432, 417, 396, 415, 415, 415, 397, + 413, 419, 419, 419, 425, 428, 415, 427, 420, 426, + 436, 419, 425, 427, 421, 433, 426, 430, 428, 429, + 429, 429, 437, 432, 430, 431, 422, 444, 0, 429, + 438, 424, 431, 0, 425, 428, 0, 0, 427, 0, + 426, 436, 425, 427, 446, 0, 426, 428, 430, 434, + 434, 434, 437, 0, 430, 455, 431, 452, 429, 434, + 456, 438, 431, 439, 439, 439, 440, 440, 440, 442, + + 442, 442, 447, 439, 446, 447, 440, 465, 444, 442, + 443, 443, 443, 445, 445, 445, 455, 452, 429, 457, + 443, 456, 466, 445, 448, 448, 448, 449, 449, 449, + 450, 450, 450, 447, 448, 447, 469, 449, 465, 0, + 450, 453, 453, 453, 458, 458, 458, 464, 467, 457, + 0, 453, 445, 466, 458, 460, 460, 460, 462, 462, + 462, 473, 0, 448, 478, 460, 449, 469, 462, 450, + 468, 468, 468, 476, 470, 0, 477, 464, 467, 480, + 468, 470, 445, 485, 474, 474, 474, 479, 479, 479, + 487, 0, 473, 448, 474, 478, 449, 479, 481, 450, + + 486, 481, 486, 476, 489, 470, 477, 483, 483, 483, + 480, 470, 488, 485, 490, 491, 490, 483, 492, 488, + 493, 487, 494, 494, 495, 496, 0, 492, 497, 481, + 486, 481, 486, 498, 489, 496, 499, 0, 502, 0, + 498, 500, 0, 488, 490, 491, 490, 500, 492, 488, + 493, 0, 494, 494, 559, 495, 496, 492, 0, 497, + 0, 559, 559, 559, 498, 496, 499, 502, 0, 0, + 498, 500, 0, 0, 0, 0, 0, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 502, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 0, 0, 0, 0, 0, 0, 0, 502, 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, - 505, 505, 505, 505, 505, 505, 505, 505, 506, 506, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, - 506, 506, 506, 506, 506, 507, 507, 507, 507, 507, + 506, 506, 506, 506, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, 508, 0, 0, 0, 508, 508, 508, 508, 508, 508, 508, 508, 508, 508, 508, 508, 508, 508, - 508, 508, 508, 508, 508, 508, 508, 508, 508, 509, + 508, 508, 508, 508, 508, 508, 508, 508, 508, 508, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, - 509, 509, 509, 509, 509, 509, 510, 510, 510, 510, - 510, 510, 510, 511, 511, 0, 511, 511, 511, 511, + 509, 509, 509, 509, 509, 509, 509, 509, 510, 510, + 510, 510, 510, 510, 510, 511, 511, 0, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, + 511, 511, 511, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, - 512, 512, 512, 512, 512, 512, 512, 513, 513, 513, - 0, 0, 513, 513, 0, 513, 0, 0, 513, 513, - - 513, 513, 513, 513, 513, 513, 514, 514, 0, 0, - 0, 0, 514, 514, 514, 514, 514, 514, 514, 515, - 0, 515, 0, 0, 0, 515, 515, 0, 515, 0, - 0, 0, 0, 515, 0, 0, 0, 515, 515, 515, - 515, 515, 515, 515, 516, 0, 516, 0, 516, 0, - 516, 0, 0, 0, 0, 0, 516, 516, 516, 516, - 516, 516, 516, 517, 0, 0, 517, 517, 0, 517, - 517, 517, 0, 0, 0, 517, 517, 517, 517, 517, - 517, 517, 518, 518, 0, 518, 518, 518, 518, 518, - 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 512, 513, 513, 513, 0, 0, 513, 513, 0, 513, + 0, 0, 0, 513, 513, 513, 513, 513, 513, 513, + 513, 514, 514, 0, 0, 0, 0, 0, 514, 514, + 514, 514, 514, 514, 514, 515, 0, 515, 0, 0, + 0, 515, 515, 0, 515, 0, 0, 0, 0, 515, + 0, 0, 0, 0, 515, 515, 515, 515, 515, 515, + 515, 516, 0, 516, 0, 516, 0, 516, 0, 0, + 0, 0, 0, 0, 516, 516, 516, 516, 516, 516, + 516, 517, 0, 0, 517, 517, 0, 517, 517, 517, + 0, 0, 0, 0, 517, 517, 517, 517, 517, 517, + + 517, 518, 518, 0, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, 519, 0, 0, 0, 519, 0, 0, 519, 519, 0, 0, - 0, 0, 519, 519, 519, 519, 519, 519, 519, 520, - 520, 520, 520, 520, 0, 520, 520, 0, 520, 0, - 0, 520, 520, 520, 520, 520, 520, 520, 520, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, + 0, 0, 0, 519, 519, 519, 519, 519, 519, 519, + 520, 520, 520, 520, 520, 0, 520, 520, 0, 520, + 0, 0, 0, 520, 520, 520, 520, 520, 520, 520, + 520, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 522, 522, 522, 522, + 521, 521, 521, 521, 521, 521, 521, 521, 521, 522, + 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, - - 522, 522, 522, 523, 0, 523, 523, 0, 0, 0, - 0, 523, 523, 523, 523, 523, 523, 523, 523, 524, - 524, 524, 524, 524, 524, 524, 0, 524, 524, 524, + 522, 522, 522, 522, 522, 522, 522, 523, 0, 523, + 523, 0, 0, 0, 0, 0, 523, 523, 523, 523, + 523, 523, 523, 523, 524, 524, 524, 524, 524, 524, + 524, 0, 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, - 524, 524, 524, 524, 524, 524, 525, 0, 0, 0, + 524, 524, 525, 0, 0, 0, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, - 525, 525, 525, 526, 0, 526, 526, 0, 0, 0, - 0, 526, 526, 526, 526, 526, 526, 526, 526, 527, - 527, 527, 527, 527, 527, 0, 527, 527, 527, 527, + 526, 0, 526, 526, 0, 0, 0, 0, 0, 526, + 526, 526, 526, 526, 526, 526, 526, 527, 527, 527, + 527, 527, 527, 0, 527, 527, 527, 527, 527, 527, 527, 527, 527, 527, 527, 527, 527, 527, 527, 527, - 527, 527, 527, 527, 527, 527, 528, 0, 528, 0, - 0, 0, 0, 528, 528, 0, 0, 0, 0, 0, - 0, 528, 528, 528, 528, 528, 528, 528, 529, 529, + 527, 527, 527, 527, 527, 528, 0, 528, 0, 0, + 0, 0, 528, 528, 0, 0, 0, 0, 0, 0, + 528, 528, 528, 528, 528, 528, 528, 528, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, - 529, 529, 529, 529, 529, 530, 530, 0, 0, 0, - 0, 530, 530, 530, 530, 530, 530, 530, 530, 531, - 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, - 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, + 529, 529, 529, 529, 529, 529, 530, 530, 0, 0, - 531, 531, 531, 531, 531, 531, 532, 532, 532, 532, + 0, 0, 0, 530, 530, 530, 530, 530, 530, 530, + 530, 531, 531, 531, 531, 531, 531, 531, 531, 531, + 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, + 531, 531, 531, 531, 531, 531, 531, 531, 531, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, - 532, 532, 532, 533, 533, 533, 533, 533, 533, 533, + 532, 532, 532, 532, 532, 532, 532, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, - 534, 534, 0, 534, 534, 534, 534, 534, 534, 534, + 533, 533, 533, 533, 533, 534, 534, 0, 534, 534, + 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 535, 535, 535, - 0, 0, 535, 535, 0, 535, 0, 0, 535, 535, - - 535, 535, 535, 535, 535, 535, 536, 536, 536, 0, - 0, 0, 536, 536, 536, 536, 536, 536, 536, 537, - 0, 537, 0, 0, 0, 537, 537, 0, 537, 0, - 0, 0, 0, 537, 0, 0, 0, 537, 537, 537, - 537, 537, 537, 537, 538, 0, 538, 0, 538, 0, - 538, 0, 0, 0, 0, 0, 538, 538, 538, 538, - 538, 538, 538, 539, 539, 0, 539, 539, 539, 0, - 0, 0, 539, 539, 539, 539, 539, 539, 539, 540, - 0, 0, 0, 540, 0, 0, 0, 0, 0, 0, - 0, 0, 540, 540, 540, 540, 540, 540, 540, 541, + 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, + 534, 534, 534, 535, 535, 535, 0, 0, 535, 535, + 0, 535, 0, 0, 0, 535, 535, 535, 535, 535, + 535, 535, 535, 536, 536, 536, 0, 0, 0, 0, + 536, 536, 536, 536, 536, 536, 536, 537, 0, 537, + 0, 0, 0, 537, 537, 0, 537, 0, 0, 0, + 0, 537, 0, 0, 0, 0, 537, 537, 537, 537, + 537, 537, 537, 538, 0, 538, 0, 538, 0, 538, + 0, 0, 0, 0, 0, 0, 538, 538, 538, 538, - 0, 0, 541, 0, 541, 0, 541, 0, 541, 0, - 0, 541, 541, 0, 541, 541, 541, 541, 541, 541, - 541, 542, 542, 542, 542, 542, 542, 542, 542, 542, + 538, 538, 538, 539, 539, 0, 539, 539, 539, 0, + 0, 0, 0, 539, 539, 539, 539, 539, 539, 539, + 540, 0, 0, 0, 540, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 540, 540, 540, 540, 540, 540, + 540, 541, 0, 0, 541, 0, 541, 0, 541, 0, + 541, 0, 0, 541, 541, 0, 0, 541, 541, 541, + 541, 541, 541, 541, 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, - 542, 542, 542, 542, 542, 542, 542, 542, 543, 0, - 0, 0, 0, 0, 543, 543, 0, 0, 543, 543, - 543, 0, 0, 0, 543, 543, 543, 543, 543, 543, - 543, 544, 0, 0, 544, 544, 544, 544, 544, 0, - 544, 544, 0, 544, 544, 0, 544, 544, 544, 544, - 544, 544, 544, 544, 545, 545, 545, 545, 545, 0, - - 545, 545, 0, 545, 0, 0, 545, 545, 545, 545, - 545, 545, 545, 545, 546, 546, 546, 546, 546, 546, - 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, + 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, + 542, 542, 543, 0, 0, 0, 0, 0, 543, 543, + + 0, 0, 543, 543, 543, 0, 0, 0, 0, 543, + 543, 543, 543, 543, 543, 543, 544, 0, 0, 544, + 544, 544, 544, 544, 0, 544, 544, 0, 544, 544, + 0, 0, 544, 544, 544, 544, 544, 544, 544, 544, + 545, 545, 545, 545, 545, 0, 545, 545, 0, 545, + 0, 0, 0, 545, 545, 545, 545, 545, 545, 545, + 545, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, - 546, 547, 0, 0, 0, 0, 0, 0, 0, 547, - 0, 0, 0, 0, 547, 547, 547, 0, 0, 547, - 547, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 546, 546, 546, 546, 546, 546, 546, 546, 546, 547, + 0, 0, 0, 0, 0, 0, 0, 547, 0, 0, + + 0, 0, 547, 0, 547, 547, 0, 0, 547, 547, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 549, 0, - 549, 549, 0, 0, 0, 0, 549, 549, 549, 549, - - 549, 549, 549, 549, 550, 550, 550, 550, 550, 550, - 550, 0, 550, 550, 550, 550, 550, 550, 550, 550, + 549, 549, 0, 0, 0, 0, 0, 549, 549, 549, + 549, 549, 549, 549, 549, 550, 550, 550, 550, 550, + 550, 550, 0, 550, 550, 550, 550, 550, 550, 550, 550, 550, 550, 550, 550, 550, 550, 550, 550, 550, - 550, 551, 0, 0, 0, 551, 551, 551, 551, 551, + 550, 550, 550, 551, 0, 0, 0, 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, - 551, 551, 551, 551, 551, 551, 551, 551, 552, 0, - 552, 552, 0, 0, 0, 0, 552, 552, 552, 552, - 552, 552, 552, 552, 553, 553, 553, 553, 553, 553, - 0, 553, 553, 553, 553, 553, 553, 553, 553, 553, + + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 552, 0, 552, 552, 0, 0, 0, 0, 0, + 552, 552, 552, 552, 552, 552, 552, 552, 553, 553, + 553, 553, 553, 553, 0, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, + 553, 553, 553, 553, 553, 553, 554, 554, 0, 0, + 0, 0, 0, 0, 554, 0, 0, 0, 0, 0, + 0, 0, 554, 0, 0, 554, 0, 554, 555, 555, + 555, 555, 555, 555, 555, 555, 556, 0, 0, 0, + 0, 0, 556, 556, 0, 556, 556, 0, 0, 0, - 553, 554, 554, 0, 0, 0, 0, 0, 0, 554, - 0, 0, 0, 0, 0, 0, 554, 0, 0, 554, - 0, 554, 555, 555, 555, 555, 555, 555, 555, 556, - 0, 0, 0, 0, 0, 556, 556, 0, 556, 556, - 0, 0, 0, 0, 556, 556, 556, 556, 556, 556, - 556, 556, 557, 557, 557, 557, 557, 557, 557, 557, + 0, 556, 556, 556, 556, 556, 556, 556, 556, 556, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 558, - 558, 0, 0, 0, 0, 0, 0, 558, 0, 0, + 557, 557, 557, 557, 557, 557, 557, 557, 558, 558, + 0, 0, 0, 0, 0, 0, 558, 0, 0, 0, 0, 0, 0, 0, 558, 0, 0, 558, 0, 558, - - 560, 560, 0, 0, 0, 0, 560, 560, 560, 560, - 560, 560, 560, 560, 561, 561, 561, 561, 561, 561, + 560, 560, 0, 0, 0, 0, 0, 560, 560, 560, + 560, 560, 560, 560, 560, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 562, 562, 562, 562, 562, 562, 562, 562, 562, + + 561, 561, 561, 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 563, 563, - 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, + 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, + 562, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, - 563, 563, 563, 563, 563, 564, 564, 564, 564, 564, - + 563, 563, 563, 563, 563, 563, 563, 563, 563, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, - 564, 564, 565, 565, 0, 565, 565, 565, 565, 565, + 564, 564, 564, 564, 564, 564, 564, 565, 565, 0, + 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, + 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, - 565, 565, 565, 565, 565, 565, 565, 565, 565, 566, - 566, 0, 566, 566, 566, 566, 566, 566, 566, 566, + 565, 565, 565, 565, 565, 566, 566, 0, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, - 566, 566, 566, 566, 566, 566, 567, 567, 0, 567, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 567, 567, 0, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, - - 567, 567, 567, 568, 568, 0, 568, 568, 568, 568, - 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 567, 568, 568, 0, 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 569, 569, 569, 0, 0, 569, 569, 0, 569, 0, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 569, + + 569, 569, 0, 0, 569, 569, 0, 569, 0, 0, 0, 569, 569, 569, 569, 569, 569, 569, 569, 570, 0, 0, 570, 0, 570, 0, 570, 0, 570, 0, - 0, 570, 570, 0, 570, 570, 570, 570, 570, 570, - 570, 571, 571, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 571, 571, 571, - 571, 571, 571, 571, 572, 0, 0, 572, 572, 572, - - 572, 572, 0, 572, 572, 0, 572, 572, 0, 572, - 572, 572, 572, 572, 572, 572, 572, 573, 573, 573, - 573, 573, 0, 573, 573, 0, 573, 0, 0, 573, - 573, 573, 573, 573, 573, 573, 573, 574, 574, 574, - 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, + 0, 570, 570, 0, 0, 570, 570, 570, 570, 570, + 570, 570, 571, 571, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 571, + 571, 571, 571, 571, 571, 571, 572, 0, 0, 572, + 572, 572, 572, 572, 0, 572, 572, 0, 572, 572, + 0, 0, 572, 572, 572, 572, 572, 572, 572, 572, + 573, 573, 573, 573, 573, 0, 573, 573, 0, 573, + + 0, 0, 0, 573, 573, 573, 573, 573, 573, 573, + 573, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 574, 574, 574, 575, 575, 0, 0, 0, 0, - 575, 575, 575, 576, 576, 0, 0, 0, 0, 576, - 576, 576, 577, 577, 0, 0, 0, 0, 577, 577, - 577, 578, 578, 0, 0, 0, 0, 578, 578, 578, - + 574, 574, 574, 574, 574, 574, 574, 574, 574, 575, + 575, 0, 0, 0, 0, 0, 575, 575, 575, 576, + 576, 0, 0, 0, 0, 0, 576, 576, 576, 577, + 577, 0, 0, 0, 0, 0, 577, 577, 577, 578, + 578, 0, 0, 0, 0, 0, 578, 578, 578, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, + 579, 579, 579, 579, 579, 579, 579, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, @@ -1431,9 +1449,9 @@ static yyconst flex_int16_t yy_chk[3615] = 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, - 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, - 504, 504, 504, 504 + 504, 504, 504, 504, 504 + } ; /* Table of booleans, true if rule could match eol. */ @@ -1552,7 +1570,7 @@ extern int yydebug; int fileno(FILE *stream); #endif -#line 1556 "lexer.c" +#line 1574 "lexer.c" #define INITIAL 0 #define INOBJ 1 @@ -1750,7 +1768,7 @@ YY_DECL /* keywords */ -#line 1754 "lexer.c" +#line 1772 "lexer.c" if ( !(yy_init) ) { @@ -1810,7 +1828,7 @@ yy_match: yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 3528 ); + while ( yy_base[yy_current_state] != 3608 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2398,7 +2416,7 @@ YY_RULE_SETUP #line 265 "lexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2402 "lexer.c" +#line 2420 "lexer.c" case YY_END_OF_BUFFER: { diff --git a/grammar/lexer.l b/grammar/lexer.l index 52cb8eb..796815c 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -133,7 +133,7 @@ int fileno(FILE *stream); <EXPR>0[0-7]+ | /* octal number */ <EXPR>0x[0-7a-f] | /* hex number, following rule is dec; strtoll handles all! */ <EXPR>([1-9][0-9]*|0) { yylval.n = strtoll(yytext, NULL, 0); return NUMBER; } -<EXPR>\$[$!./]{0,1}[a-z][!a-z0-9\-_\.]* { yylval.s = strdup(yytext+1); return VAR; } +<EXPR>\$[$!./]{0,1}[@a-z][!@a-z0-9\-_\.]* { yylval.s = strdup(yytext+1); return VAR; } <EXPR>\'([^'\\]|\\['"\\$bntr]|\\x[0-9a-f][0-9a-f]|\\[0-7][0-7][0-7])*\' { yytext[yyleng-1] = '\0'; unescapeStr((uchar*)yytext+1, yyleng-2); diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h index 8742c75..453b0f3 100644 --- a/grammar/rainerscript.h +++ b/grammar/rainerscript.h @@ -25,7 +25,7 @@ #include <regex.h> #include "typedefs.h" -#define LOG_NFACILITIES 24 /* current number of syslog facilities */ +#define LOG_NFACILITIES 24+1 /* we copy&paste this as including rsyslog.h gets us in off64_t trouble... :-( */ #define CNFFUNC_MAX_ARGS 32 /**< maximum number of arguments that any function can have (among * others, this is used to size data structures). diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index f8272d4..d37cb03 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -376,8 +376,8 @@ static rsRetVal enqLine(fileInfo_t *pInfo, cstr_t *cstrLine) MsgSetMSGoffs(pMsg, 0); /* we do not have a header... */ MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName(), ustrlen(glbl.GetLocalHostName())); MsgSetTAG(pMsg, pInfo->pszTag, pInfo->lenTag); - pMsg->iFacility = LOG_FAC(pInfo->iFacility); - pMsg->iSeverity = LOG_PRI(pInfo->iSeverity); + pMsg->iFacility = pri2fac(pInfo->iFacility); + pMsg->iSeverity = pri2sev(pInfo->iSeverity); MsgSetRuleset(pMsg, pInfo->pRuleset); ratelimitAddMsg(pInfo->ratelimiter, &pInfo->multiSub, pMsg); finalize_it: @@ -422,6 +422,18 @@ openFile(fileInfo_t *pThis) /* read back in the object */ CHKiRet(obj.Deserialize(&pThis->pStrm, (uchar*) "strm", psSF, NULL, pThis)); + DBGPRINTF("imfile: deserialized state file, state file base name '%s', " + "configured base name '%s'\n", pThis->pStrm->pszFName, + pThis->pszFileName); + if(ustrcmp(pThis->pStrm->pszFName, pThis->pszFileName)) { + errmsg.LogError(0, RS_RET_STATEFILE_WRONG_FNAME, "imfile: state file '%s' " + "contains file name '%s', but is used for file '%s'. State " + "file deleted, starting from begin of file.", + pszSFNam, pThis->pStrm->pszFName, pThis->pszFileName); + + unlink((char*)pszSFNam); + ABORT_FINALIZE(RS_RET_STATEFILE_WRONG_FNAME); + } strm.CheckFileChange(pThis->pStrm); CHKiRet(strm.SeekCurrOffs(pThis->pStrm)); diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c index 51a4aa7..6a97b25 100644 --- a/plugins/imjournal/imjournal.c +++ b/plugins/imjournal/imjournal.c @@ -91,8 +91,8 @@ static struct cnfparamblk modpblk = }; #define DFLT_persiststateinterval 10 -#define DFLT_SEVERITY LOG_PRI(LOG_NOTICE) -#define DFLT_FACILITY LOG_FAC(LOG_USER) +#define DFLT_SEVERITY pr2fac(LOG_NOTICE) +#define DFLT_FACILITY pri2sev(LOG_USER) static int bLegacyCnfModGlobalsPermitted = 1;/* are legacy module-global config parameters permitted? */ @@ -125,7 +125,7 @@ static rsRetVal facilityHdlr(uchar **pp, void *pVal) /* noop */; for (c = syslogFacNames; c->c_name; c++) { if (!strncasecmp(p, (char *) c->c_name, len)) { - *((int *) pVal) = LOG_FAC(c->c_val); + *((int *) pVal) = pri2fac(c->c_val); break; } } diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c index 810ac26..4a76340 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -21,7 +21,7 @@ * To test under Linux: * echo test1 > /dev/kmsg * - * Copyright (C) 2008-2012 Adiscon GmbH + * Copyright (C) 2008-2014 Adiscon GmbH * * This file is part of rsyslog. * @@ -247,10 +247,10 @@ rsRetVal Syslog(int priority, uchar *pMsg, struct timeval *tp) /* if we don't get the pri, we use whatever we were supplied */ /* ignore non-kernel messages if not permitted */ - if(cs.bPermitNonKernel == 0 && LOG_FAC(priority) != LOG_KERN) + if(cs.bPermitNonKernel == 0 && pri2fac(priority) != LOG_KERN) FINALIZE; /* silently ignore */ - iRet = enqMsg((uchar*)pMsg, (uchar*) "kernel:", LOG_FAC(priority), LOG_PRI(priority), tp); + iRet = enqMsg((uchar*)pMsg, (uchar*) "kernel:", pri2fac(priority), pri2sev(priority), tp); finalize_it: RETiRet; diff --git a/plugins/imkmsg/imkmsg.c b/plugins/imkmsg/imkmsg.c index 2a97f82..8588223 100644 --- a/plugins/imkmsg/imkmsg.c +++ b/plugins/imkmsg/imkmsg.c @@ -144,7 +144,7 @@ rsRetVal imkmsgLogIntMsg(int priority, char *fmt, ...) rsRetVal Syslog(int priority, uchar *pMsg, struct timeval *tp, struct json_object *json) { DEFiRet; - iRet = enqMsg((uchar*)pMsg, (uchar*) "kernel:", LOG_FAC(priority), LOG_PRI(priority), tp, json); + iRet = enqMsg((uchar*)pMsg, (uchar*) "kernel:", pri2fac(priority), pri2sev(priority), tp, json); RETiRet; } diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c index 172ff4d..3d9b78e 100644 --- a/plugins/imkmsg/kmsg.c +++ b/plugins/imkmsg/kmsg.c @@ -34,6 +34,7 @@ #include <ctype.h> #include <sys/klog.h> #include <sys/sysinfo.h> +#include <sys/time.h> #include <json.h> #include "rsyslog.h" diff --git a/plugins/impstats/impstats.c b/plugins/impstats/impstats.c index 8d79fb2..ede7c60 100644 --- a/plugins/impstats/impstats.c +++ b/plugins/impstats/impstats.c @@ -83,6 +83,7 @@ struct modConfData_s { statsFmtType_t statsFmt; sbool bLogToSyslog; sbool bResetCtrs; + sbool bBracketing; char *logfile; sbool configSetViaV2Method; uchar *pszBindRuleset; /* name of ruleset to bind to */ @@ -99,6 +100,7 @@ static struct cnfparamdescr modpdescr[] = { { "interval", eCmdHdlrInt, 0 }, { "facility", eCmdHdlrInt, 0 }, { "severity", eCmdHdlrInt, 0 }, + { "bracketing", eCmdHdlrBinary, 0 }, { "log.syslog", eCmdHdlrBinary, 0 }, { "resetcounters", eCmdHdlrBinary, 0 }, { "log.file", eCmdHdlrGetWord, 0 }, @@ -186,7 +188,7 @@ finalize_it: /* log stats message to file; limited error handling done */ static inline void -doLogToFile(cstr_t *cstr) +doLogToFile(uchar *ln, size_t lenLn) { struct iovec iov[4]; ssize_t nwritten; @@ -194,7 +196,7 @@ doLogToFile(cstr_t *cstr) time_t t; char timebuf[32]; - if(cstrLen(cstr) == 0) + if(lenLn == 0) goto done; if(runModConf->logfd == -1) { runModConf->logfd = open(runModConf->logfile, O_WRONLY|O_CREAT|O_APPEND|O_CLOEXEC, S_IRUSR|S_IWUSR); @@ -210,9 +212,9 @@ doLogToFile(cstr_t *cstr) iov[1].iov_base = ": "; iov[1].iov_len = 2; nexpect += 2; - iov[2].iov_base = rsCStrGetSzStrNoNULL(cstr); - iov[2].iov_len = (size_t) cstrLen(cstr); - nexpect += cstrLen(cstr); + iov[2].iov_base = ln; + iov[2].iov_len = lenLn; + nexpect += lenLn; iov[3].iov_base = "\n"; iov[3].iov_len = 1; nexpect++; @@ -226,6 +228,20 @@ done: return; } +/* submit a line to our log destinations. Line must be fully formatted as + * required (but may be a simple verb like "BEGIN" and "END". + */ +static rsRetVal +submitLine(uchar *const ln, const size_t lenLn) +{ + DEFiRet; + if(runModConf->bLogToSyslog) + doSubmitMsg(ln); + if(runModConf->logfile != NULL) + doLogToFile(ln, lenLn); + RETiRet; +} + /* callback for statsobj * Note: usrptr exists only to satisfy requirements of statsobj callback interface! */ @@ -233,10 +249,7 @@ static rsRetVal doStatsLine(void __attribute__((unused)) *usrptr, cstr_t *cstr) { DEFiRet; - if(runModConf->bLogToSyslog) - doSubmitMsg(rsCStrGetSzStrNoNULL(cstr)); - if(runModConf->logfile != NULL) - doLogToFile(cstr); + iRet = submitLine(rsCStrGetSzStrNoNULL(cstr), cstrLen(cstr)); RETiRet; } @@ -281,6 +294,7 @@ CODESTARTbeginCnfLoad loadModConf->logfile = NULL; loadModConf->pszBindRuleset = NULL; loadModConf->bLogToSyslog = 1; + loadModConf->bBracketing = 0; loadModConf->bResetCtrs = 0; bLegacyCnfModGlobalsPermitted = 1; /* init legacy config vars */ @@ -314,6 +328,8 @@ CODESTARTsetModCnf loadModConf->iFacility = (int) pvals[i].val.d.n; } else if(!strcmp(modpblk.descr[i].name, "severity")) { loadModConf->iSeverity = (int) pvals[i].val.d.n; + } else if(!strcmp(modpblk.descr[i].name, "bracketing")) { + loadModConf->bBracketing = (sbool) pvals[i].val.d.n; } else if(!strcmp(modpblk.descr[i].name, "log.syslog")) { loadModConf->bLogToSyslog = (sbool) pvals[i].val.d.n; } else if(!strcmp(modpblk.descr[i].name, "resetcounters")) { @@ -464,7 +480,11 @@ CODESTARTrunInput while(glbl.GetGlobalInputTermState() == 0) { srSleep(runModConf->iStatsInterval, 0); /* seconds, micro seconds */ DBGPRINTF("impstats: woke up, generating messages\n"); + if(runModConf->bBracketing) + submitLine((uchar*)"BEGIN", sizeof("BEGIN")-1); generateStatsMsgs(); + if(runModConf->bBracketing) + submitLine((uchar*)"END", sizeof("END")-1); } ENDrunInput diff --git a/plugins/imsolaris/imsolaris.c b/plugins/imsolaris/imsolaris.c index a220e72..36677e7 100644 --- a/plugins/imsolaris/imsolaris.c +++ b/plugins/imsolaris/imsolaris.c @@ -209,8 +209,8 @@ readLog(int fd, uchar *pRcv, int iMaxLine) MsgSetInputName(pMsg, pInputName); MsgSetRawMsg(pMsg, (char*)pRcv, strlen((char*)pRcv)); MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName(), ustrlen(glbl.GetLocalHostName())); - pMsg->iFacility = LOG_FAC(hdr.pri); - pMsg->iSeverity = LOG_PRI(hdr.pri); + pMsg->iFacility = pri2fac(hdr.pri); + pMsg->iSeverity = pri2sev(hdr.pri); pMsg->msgFlags = NEEDS_PARSING | NO_PRI_IN_RAW; CHKiRet(submitMsg(pMsg)); } diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index a79fcc5..d99bed8 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -6,7 +6,7 @@ * * File begun on 2007-12-20 by RGerhards (extracted from syslogd.c) * - * Copyright 2007-2013 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2014 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -772,8 +772,8 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim ++parse; ++offs; } - facil = LOG_FAC(pri); - sever = LOG_PRI(pri); + facil = pri2fac(pri); + sever = pri2sev(pri); findRatelimiter(pLstn, cred, &ratelimiter); /* ignore error, better so than others... */ diff --git a/plugins/mmanon/mmanon.c b/plugins/mmanon/mmanon.c index 2879780..a85faa1 100644 --- a/plugins/mmanon/mmanon.c +++ b/plugins/mmanon/mmanon.c @@ -295,7 +295,7 @@ anonip(instanceData *pData, uchar *msg, int *pLenMsg, int *idx) int endpos; int lenMsg = *pLenMsg; - while(i < lenMsg && (msg[i] <= '0' || msg[i] >= '9')) { + while(i < lenMsg && (msg[i] <= '0' || msg[i] > '9')) { ++i; /* skip to first number */ } if(i >= lenMsg) diff --git a/plugins/mmfields/mmfields.c b/plugins/mmfields/mmfields.c index c408a6c..cdce199 100644 --- a/plugins/mmfields/mmfields.c +++ b/plugins/mmfields/mmfields.c @@ -43,7 +43,7 @@ MODULE_TYPE_NOKEEP MODULE_CNFNAME("mmfields") -DEFobjCurrIf(errmsg); +DEFobjCurrIf(errmsg) DEF_OMOD_STATIC_DATA /* config variables */ diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c index 9a33f85..68fb3c1 100644 --- a/plugins/omelasticsearch/omelasticsearch.c +++ b/plugins/omelasticsearch/omelasticsearch.c @@ -577,10 +577,10 @@ DBGPRINTF("omelasticsearch: %d items in reply\n", numitems); "cannot obtain 'create' item for #%d\n", i); ABORT_FINALIZE(RS_RET_DATAFAIL); } - ok = cJSON_GetObjectItem(create, "ok"); - if(ok == NULL || ok->type != cJSON_True) { + ok = cJSON_GetObjectItem(create, "status"); + if(ok == NULL || ok->type != cJSON_Number || ok->valueint < 0 || ok->valueint > 299) { DBGPRINTF("omelasticsearch: error in elasticsearch reply: " - "item %d, prop ok (%p) not ok\n", i, ok); + "item %d, status is %d\n", i, ok->valueint); ABORT_FINALIZE(RS_RET_DATAFAIL); } } @@ -594,7 +594,7 @@ static inline rsRetVal checkResult(wrkrInstanceData_t *pWrkrData, uchar *reqmsg) { cJSON *root; - cJSON *ok; + cJSON *status; DEFiRet; root = cJSON_Parse(pWrkrData->reply); @@ -606,8 +606,10 @@ checkResult(wrkrInstanceData_t *pWrkrData, uchar *reqmsg) if(pWrkrData->pData->bulkmode) { iRet = checkResultBulkmode(pWrkrData, root); } else { - ok = cJSON_GetObjectItem(root, "ok"); - if(ok == NULL || ok->type != cJSON_True) { + status = cJSON_GetObjectItem(root, "status"); + /* as far as we know, no "status" means all went well */ + if(status != NULL && + (status->type == cJSON_Number || status->valueint >= 0 || status->valueint <= 299)) { iRet = RS_RET_DATAFAIL; } } diff --git a/plugins/ompgsql/ompgsql.c b/plugins/ompgsql/ompgsql.c index 4da0949..6b89717 100644 --- a/plugins/ompgsql/ompgsql.c +++ b/plugins/ompgsql/ompgsql.c @@ -235,9 +235,18 @@ writePgSQL(uchar *psz, instanceData *pData) if(bHadError || (PQstatus(pData->f_hpgsql) != CONNECTION_OK)) { /* error occured, try to re-init connection and retry */ - closePgSQL(pData); /* close the current handle */ - CHKiRet(initPgSQL(pData, 0)); /* try to re-open */ - bHadError = tryExec(psz, pData); /* retry */ + int inTransaction = 0; + if(pData->f_hpgsql != NULL) { + PGTransactionStatusType xactStatus = PQtransactionStatus(pData->f_hpgsql); + if((xactStatus == PQTRANS_INTRANS) || (xactStatus == PQTRANS_ACTIVE)) { + inTransaction = 1; + } + } + if ( inTransaction == 0 ) { + closePgSQL(pData); /* close the current handle */ + CHKiRet(initPgSQL(pData, 0)); /* try to re-open */ + bHadError = tryExec(psz, pData); /* retry */ + } if(bHadError || (PQstatus(pData->f_hpgsql) != CONNECTION_OK)) { /* we failed, giving up for now */ reportDBError(pData, 0); diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c index 93dfbb4..2ba0b94 100644 --- a/plugins/omprog/omprog.c +++ b/plugins/omprog/omprog.c @@ -27,6 +27,7 @@ #include "config.h" #include "rsyslog.h" #include <stdio.h> +#include <syslog.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c index ad3508c..92fa48f 100644 --- a/plugins/omudpspoof/omudpspoof.c +++ b/plugins/omudpspoof/omudpspoof.c @@ -383,7 +383,7 @@ UDPSend(wrkrInstanceData_t *pWrkrData, uchar *pszSourcename, char *msg, size_t l if(len > 65528) { DBGPRINTF("omudpspoof: msg with length %d truncated to 64k: '%.768s'\n", - len, msg); + (int) len, msg); len = 65528; } @@ -417,7 +417,7 @@ UDPSend(wrkrInstanceData_t *pWrkrData, uchar *pszSourcename, char *msg, size_t l libnet_clear_packet(pWrkrData->libnet_handle); /* note: libnet does need ports in host order NOT in network byte order! -- rgerhards, 2009-11-12 */ udp = libnet_build_udp( - ntohs(pWrkrData->sourcePort),/* source port */ + pWrkrData->sourcePort, /* source port */ ntohs(tempaddr->sin_port),/* destination port */ pktLen+LIBNET_UDP_H, /* packet length */ 0, /* checksum */ @@ -455,7 +455,7 @@ UDPSend(wrkrInstanceData_t *pWrkrData, uchar *pszSourcename, char *msg, size_t l * it is useful for consolidating with strace output. */ DBGPRINTF("omudpspoof: write error (total len %d): pktLen %d, sent %d, fd %d: %s\n", - len, LIBNET_IPV4_H+LIBNET_UDP_H+pktLen, lsent, pWrkrData->libnet_handle->fd, + (int) len, LIBNET_IPV4_H+LIBNET_UDP_H+pktLen, lsent, pWrkrData->libnet_handle->fd, libnet_geterror(pWrkrData->libnet_handle)); if(lsent != -1) { bSendSuccess = RSTRUE; @@ -504,7 +504,7 @@ UDPSend(wrkrInstanceData_t *pWrkrData, uchar *pszSourcename, char *msg, size_t l lsent = libnet_write(pWrkrData->libnet_handle); if(lsent != (int) (LIBNET_IPV4_H+pktLen)) { DBGPRINTF("omudpspoof: fragment write error len %d, sent %d: %s\n", - LIBNET_IPV4_H+LIBNET_UDP_H+len, lsent, libnet_geterror(pWrkrData->libnet_handle)); + (int) (LIBNET_IPV4_H+LIBNET_UDP_H+len), lsent, libnet_geterror(pWrkrData->libnet_handle)); bSendSuccess = RSFALSE; continue; } diff --git a/plugins/sm_cust_bindcdr/Makefile.in b/plugins/sm_cust_bindcdr/Makefile.in index f363d43..a9e36aa 100644 --- a/plugins/sm_cust_bindcdr/Makefile.in +++ b/plugins/sm_cust_bindcdr/Makefile.in @@ -35,7 +35,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = plugins/sm_cust_bindcdr -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \ $(top_srcdir)/m4/atomic_operations_64bit.m4 \ diff --git a/plugins/sm_cust_bindcdr/README b/plugins/sm_cust_bindcdr/README new file mode 100644 index 0000000..b1d28c5 --- /dev/null +++ b/plugins/sm_cust_bindcdr/README @@ -0,0 +1,10 @@ +This module was created for a custom project with a very specific use +case. It was included into the source tree as a sample if someone +would like to create similar work. I strongly doubt it has any +value to the community other than serving as an example. Thus, +I do not intend to maintain this module, except if a sponsor +comes up that actually wants this to be done. I prefer to +leave it in the source tree even if it is broken starting with v8. +If that creates a problem, I would simply delete it. + +Rainer Gerhards diff --git a/rsyslog.service.in b/rsyslog.service.in index 8e2d64c..cb629ee 100644 --- a/rsyslog.service.in +++ b/rsyslog.service.in @@ -1,11 +1,14 @@ [Unit] Description=System Logging Service Requires=syslog.socket +Documentation=man:rsyslogd(8) +Documentation=http://www.rsyslog.com/doc/ [Service] Type=notify ExecStart=@sbindir@/rsyslogd -n StandardOutput=null +Restart=on-failure [Install] WantedBy=multi-user.target diff --git a/runtime/Makefile.am b/runtime/Makefile.am index a100938..d07409e 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -106,7 +106,7 @@ else librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar endif #librsyslog_la_LDFLAGS = -module -avoid-version -librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools +librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) ${LIBLOGGING_STDLOG_CFLAGS} -I\$(top_srcdir)/tools librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS) # diff --git a/runtime/Makefile.in b/runtime/Makefile.in index 79862c3..a3339d8 100644 --- a/runtime/Makefile.in +++ b/runtime/Makefile.in @@ -583,7 +583,9 @@ librsyslog_la_SOURCES = \ @WITH_MODDIRS_FALSE@ -D_PATH_MODDIR=\"$(pkglibdir)/\" \ @WITH_MODDIRS_FALSE@ -I\$(top_srcdir) -I\$(top_srcdir)/grammar \ @WITH_MODDIRS_FALSE@ $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) \ -@WITH_MODDIRS_FALSE@ $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools +@WITH_MODDIRS_FALSE@ $(JSON_C_CFLAGS) \ +@WITH_MODDIRS_FALSE@ ${LIBLOGGING_STDLOG_CFLAGS} \ +@WITH_MODDIRS_FALSE@ -I\$(top_srcdir)/tools # the files with ../ we need to work on - so that they either become part of the # runtime or will no longer be needed. -- rgerhards, 2008-06-13 # @@ -591,7 +593,9 @@ librsyslog_la_SOURCES = \ @WITH_MODDIRS_TRUE@librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS \ @WITH_MODDIRS_TRUE@ -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" \ @WITH_MODDIRS_TRUE@ $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) \ -@WITH_MODDIRS_TRUE@ $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools +@WITH_MODDIRS_TRUE@ $(JSON_C_CFLAGS) \ +@WITH_MODDIRS_TRUE@ ${LIBLOGGING_STDLOG_CFLAGS} \ +@WITH_MODDIRS_TRUE@ -I\$(top_srcdir)/tools librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS) @ENABLE_REGEXP_TRUE@lmregexp_la_SOURCES = regexp.c regexp.h @ENABLE_REGEXP_TRUE@lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) diff --git a/runtime/atomic.h b/runtime/atomic.h index 49c17d8..d59858a 100644 --- a/runtime/atomic.h +++ b/runtime/atomic.h @@ -221,7 +221,7 @@ return(val); } -# define DEF_ATOMIC_HELPER_MUT64(x) pthread_mutex_t x +# define DEF_ATOMIC_HELPER_MUT64(x) pthread_mutex_t x; # define INIT_ATOMIC_HELPER_MUT64(x) pthread_mutex_init(&(x), NULL) # define DESTROY_ATOMIC_HELPER_MUT64(x) pthread_mutex_destroy(&(x)) #endif /* #ifdef HAVE_ATOMIC_BUILTINS64 */ diff --git a/runtime/msg.c b/runtime/msg.c index 66c3b7b..d911b8b 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -125,7 +125,7 @@ static char *years[] = { static struct { uchar *pszName; short lenName; -} syslog_pri_names[192] = { +} syslog_pri_names[200] = { { UCHAR_CONSTANT("0"), 3}, { UCHAR_CONSTANT("1"), 3}, { UCHAR_CONSTANT("2"), 3}, @@ -317,22 +317,30 @@ static struct { { UCHAR_CONSTANT("188"), 5}, { UCHAR_CONSTANT("189"), 5}, { UCHAR_CONSTANT("190"), 5}, - { UCHAR_CONSTANT("191"), 5} + { UCHAR_CONSTANT("191"), 5}, + { UCHAR_CONSTANT("192"), 5}, + { UCHAR_CONSTANT("193"), 5}, + { UCHAR_CONSTANT("194"), 5}, + { UCHAR_CONSTANT("195"), 5}, + { UCHAR_CONSTANT("196"), 5}, + { UCHAR_CONSTANT("197"), 5}, + { UCHAR_CONSTANT("198"), 5}, + { UCHAR_CONSTANT("199"), 5} }; static char hexdigit[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; /*syslog facility names (as of RFC5424) */ -static char *syslog_fac_names[24] = { "kern", "user", "mail", "daemon", "auth", "syslog", "lpr", +static char *syslog_fac_names[LOG_NFACILITIES] = { "kern", "user", "mail", "daemon", "auth", "syslog", "lpr", "news", "uucp", "cron", "authpriv", "ftp", "ntp", "audit", "alert", "clock", "local0", "local1", "local2", "local3", - "local4", "local5", "local6", "local7" }; + "local4", "local5", "local6", "local7", "invld" }; /* length of the facility names string (for optimizatiions) */ -static short len_syslog_fac_names[24] = { 4, 4, 4, 6, 4, 6, 3, +static short len_syslog_fac_names[LOG_NFACILITIES] = { 4, 4, 4, 6, 4, 6, 3, 4, 4, 4, 8, 3, 3, 5, 5, 5, 6, 6, 6, 6, - 6, 6, 6, 6 }; + 6, 6, 6, 6, 5 }; /* table of severity names (in numerical order)*/ static char *syslog_severity_names[8] = { "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug" }; @@ -342,8 +350,8 @@ static short len_syslog_severity_names[8] = { 5, 5, 4, 3, 7, 6, 4, 5 }; * and facility values to a numerical string... -- rgerhars, 2009-06-17 */ -static char *syslog_number_names[24] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", - "15", "16", "17", "18", "19", "20", "21", "22", "23" }; +static char *syslog_number_names[LOG_NFACILITIES] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", + "15", "16", "17", "18", "19", "20", "21", "22", "23", "24" }; /* global variables */ #if defined(HAVE_MALLOC_TRIM) && !defined(HAVE_ATOMIC_BUILTINS) @@ -700,8 +708,8 @@ static inline rsRetVal msgBaseConstruct(msg_t **ppThis) pM->flowCtlType = 0; pM->bParseSuccess = 0; pM->iRefCount = 1; - pM->iSeverity = -1; - pM->iFacility = -1; + pM->iSeverity = LOG_DEBUG; + pM->iFacility = LOG_INVLD; pM->iLenPROGNAME = -1; pM->offAfterPRI = 0; pM->offMSG = -1; @@ -1544,7 +1552,10 @@ uchar *getMSG(msg_t * const pM) /* Get PRI value as integer */ static int getPRIi(msg_t * const pM) { - return (pM->iFacility << 3) + (pM->iSeverity); + int pri = (pM->iFacility << 3) + (pM->iSeverity); + if(pri > 191) + pri = LOG_PRI_INVLD; + return pri; } @@ -2626,11 +2637,11 @@ void MsgSetRawMsgWOSize(msg_t * const pMsg, char* pszRawMsg) char *textpri(char *pRes, int pri) { assert(pRes != NULL); - memcpy(pRes, syslog_fac_names[LOG_FAC(pri)], len_syslog_fac_names[LOG_FAC(pri)]); - pRes[len_syslog_fac_names[LOG_FAC(pri)]] = '.'; - memcpy(pRes+len_syslog_fac_names[LOG_FAC(pri)]+1, - syslog_severity_names[LOG_PRI(pri)], - len_syslog_severity_names[LOG_PRI(pri)]+1 /* for \0! */); + memcpy(pRes, syslog_fac_names[pri2fac(pri)], len_syslog_fac_names[pri2fac(pri)]); + pRes[len_syslog_fac_names[pri2fac(pri)]] = '.'; + memcpy(pRes+len_syslog_fac_names[pri2fac(pri)]+1, + syslog_severity_names[pri2sev(pri)], + len_syslog_severity_names[pri2sev(pri)]+1 /* for \0! */); return pRes; } @@ -4074,7 +4085,11 @@ MsgSetPropsViaJSON(msg_t *__restrict__ const pMsg, const uchar *__restrict__ con err = tokener->err; if(err != json_tokener_continue) - errMsg = json_tokener_errors[err]; +# if HAVE_JSON_TOKENER_ERROR_DESC + errMsg = json_tokener_error_desc(err); +# else + errMsg = json_tokener_errors[err]; +# endif else errMsg = "Unterminated input"; } else if(!json_object_is_type(json, json_type_object)) diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index 056699d..b2ecabd 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -1584,7 +1584,9 @@ finalize_it: static rsRetVal EnableKeepAlive(nsd_t *pNsd) { - return nsd_ptcp.EnableKeepAlive(pNsd); + nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd; + ISOBJ_TYPE_assert(pThis, nsd_gtls); + return nsd_ptcp.EnableKeepAlive(pThis->pTcp); } diff --git a/runtime/parser.c b/runtime/parser.c index 5607484..1baa502 100644 --- a/runtime/parser.c +++ b/runtime/parser.c @@ -620,11 +620,11 @@ ParsePRI(msg_t *pMsg) } if(*msg == '>') ++msg; - if(pri & ~(LOG_FACMASK|LOG_PRIMASK)) - pri = DEFUPRI; + if(pri > LOG_MAXPRI) + pri = LOG_PRI_INVLD; } - pMsg->iFacility = LOG_FAC(pri); - pMsg->iSeverity = LOG_PRI(pri); + pMsg->iFacility = pri2fac(pri); + pMsg->iSeverity = pri2sev(pri); MsgSetAfterPRIOffs(pMsg, msg - pMsg->pszRawMsg); } RETiRet; diff --git a/runtime/prop.h b/runtime/prop.h index 7cb2743..38d801d 100644 --- a/runtime/prop.h +++ b/runtime/prop.h @@ -33,7 +33,7 @@ struct prop_s { uchar sz[CONF_PROP_BUFSIZE]; } szVal; int len; /* we use int intentionally, otherwise we may get some troubles... */ - DEF_ATOMIC_HELPER_MUT(mutRefCount); + DEF_ATOMIC_HELPER_MUT(mutRefCount) }; /* interfaces */ diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 6711bd1..f7d5b8a 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -3,7 +3,7 @@ * * Begun 2005-09-15 RGerhards * - * Copyright (C) 2005-2013 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2005-2014 by Rainer Gerhards and Adiscon GmbH * * This file is part of the rsyslog runtime library. * @@ -77,19 +77,58 @@ * # End Config Settings # * * ############################################################# */ -/* portability: not all platforms have these defines, so we - * define them here if they are missing. -- rgerhards, 2008-03-04 +/* make sure we uses consistent macros, no matter what the + * platform gives us. */ -#ifndef LOG_MAKEPRI -# define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri)) -#endif -#ifndef LOG_PRI -# define LOG_PRI(p) ((p) & LOG_PRIMASK) -#endif -#ifndef LOG_FAC -# define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3) -#endif - +#define LOG_NFACILITIES 24+1 /* plus one for our special "invld" facility! */ +#define LOG_MAXPRI 191 /* highest supported valid PRI value --> RFC3164, RFC5424 */ +#undef LOG_MAKEPRI +#define LOG_PRI_INVLD LOG_INVLD|LOG_DEBUG /* PRI is invalid --> special "invld.=debug" PRI code (rsyslog-specific) */ + +#define LOG_EMERG 0 /* system is unusable */ +#define LOG_ALERT 1 /* action must be taken immediately */ +#define LOG_CRIT 2 /* critical conditions */ +#define LOG_ERR 3 /* error conditions */ +#define LOG_WARNING 4 /* warning conditions */ +#define LOG_NOTICE 5 /* normal but significant condition */ +#define LOG_INFO 6 /* informational */ +#define LOG_DEBUG 7 /* debug-level messages */ + +#define LOG_KERN (0<<3) /* kernel messages */ +#define LOG_USER (1<<3) /* random user-level messages */ +#define LOG_MAIL (2<<3) /* mail system */ +#define LOG_DAEMON (3<<3) /* system daemons */ +#define LOG_AUTH (4<<3) /* security/authorization messages */ +#define LOG_SYSLOG (5<<3) /* messages generated internally by syslogd */ +#define LOG_LPR (6<<3) /* line printer subsystem */ +#define LOG_NEWS (7<<3) /* network news subsystem */ +#define LOG_UUCP (8<<3) /* UUCP subsystem */ +#define LOG_CRON (9<<3) /* clock daemon */ +#define LOG_AUTHPRIV (10<<3) /* security/authorization messages (private) */ +#define LOG_FTP (11<<3) /* ftp daemon */ +#define LOG_LOCAL0 (16<<3) /* reserved for local use */ +#define LOG_LOCAL1 (17<<3) /* reserved for local use */ +#define LOG_LOCAL2 (18<<3) /* reserved for local use */ +#define LOG_LOCAL3 (19<<3) /* reserved for local use */ +#define LOG_LOCAL4 (20<<3) /* reserved for local use */ +#define LOG_LOCAL5 (21<<3) /* reserved for local use */ +#define LOG_LOCAL6 (22<<3) /* reserved for local use */ +#define LOG_LOCAL7 (23<<3) /* reserved for local use */ +#define LOG_FAC_INVLD 24 +#define LOG_INVLD (LOG_FAC_INVLD<<3) /* invalid facility/PRI code */ + +/* we need to use a function to avoid side-effects. This MUST guard + * against invalid facility values. rgerhards, 2014-09-16 + */ +static inline int pri2fac(const int pri) +{ + int fac = pri >> 3; + return (fac > 23) ? LOG_FAC_INVLD : fac; +} +static inline int pri2sev(const int pri) +{ + return pri & 0x07; +} /* the rsyslog core provides information about present feature to plugins * asking it. Below are feature-test macros which must be used to query @@ -386,6 +425,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_CONF_WRN_FULLDLY_BELOW_HIGHWTR = -2358,/**< warning queue full delay mark below high wtr mark */ RS_RET_RESUMED = -2359,/**< status: action was resumed (used for reporting) */ RS_RET_RELP_NO_TLS = -2360,/**< librel does not support TLS (but TLS requested) */ + RS_RET_STATEFILE_WRONG_FNAME = -2361,/**< state file is for wrong file */ /* up to 2400 reserved for 7.5 & 7.6 */ RS_RET_INVLD_OMOD = -2400, /**< invalid output module, does not provide proper interfaces */ diff --git a/runtime/srutils.c b/runtime/srutils.c index 6d842ab..d7e71ed 100644 --- a/runtime/srutils.c +++ b/runtime/srutils.c @@ -105,6 +105,7 @@ syslogName_t syslogFacNames[] = { {"local5", LOG_LOCAL5}, {"local6", LOG_LOCAL6}, {"local7", LOG_LOCAL7}, + {"invld", LOG_INVLD}, {NULL, -1}, }; diff --git a/runtime/syslogd-types.h b/runtime/syslogd-types.h index 4b5d135..fe9dfa9 100644 --- a/runtime/syslogd-types.h +++ b/runtime/syslogd-types.h @@ -4,7 +4,7 @@ * * File begun on 2007-07-13 by RGerhards (extracted from syslogd.c) * - * Copyright 2007-2012 Adiscon GmbH. + * Copyright 2007-2014 Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -27,9 +27,6 @@ #include "stringbuf.h" #include <sys/param.h> -#if HAVE_SYSLOG_H -#include <syslog.h> -#endif /* we use RSTRUE/FALSE to prevent name claches with other packages */ #define RSFALSE 0 diff --git a/runtime/typedefs.h b/runtime/typedefs.h index f2f5af6..bf92021 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -268,4 +268,8 @@ struct msgPropDescr_s { int nameLen; /* properties (JSON) */ }; +/* some forward-definitions from the grammar */ +struct nvlst; +struct cnfobj; + #endif /* multi-include protection */ diff --git a/runtime/wti.h b/runtime/wti.h index 487abb7..496ef23 100644 --- a/runtime/wti.h +++ b/runtime/wti.h @@ -72,7 +72,7 @@ struct wti_s { actWrkrInfo_t *actWrkrInfo; /* *array* of action wrkr infos for all actions (sized for max nbr of actions in config!) */ pthread_cond_t pcondBusy; /* condition to wake up the worker, protected by pmutUsr in wtp */ - DEF_ATOMIC_HELPER_MUT(mutIsRunning); + DEF_ATOMIC_HELPER_MUT(mutIsRunning) struct { uint8_t bPrevWasSuspended; uint8_t bDoAutoCommit; /* do a commit after each message diff --git a/runtime/wtp.h b/runtime/wtp.h index 4bc284c..531355f 100644 --- a/runtime/wtp.h +++ b/runtime/wtp.h @@ -63,8 +63,8 @@ struct wtp_s { rsRetVal (*pfDoWork)(void *pUsr, void *pWti); /* end user objects */ uchar *pszDbgHdr; /* header string for debug messages */ - DEF_ATOMIC_HELPER_MUT(mutCurNumWrkThrd); - DEF_ATOMIC_HELPER_MUT(mutWtpState); + DEF_ATOMIC_HELPER_MUT(mutCurNumWrkThrd) + DEF_ATOMIC_HELPER_MUT(mutWtpState) }; /* some symbolic constants for easier reference */ diff --git a/tests/Makefile.am b/tests/Makefile.am index b5d6f53..0fa5a36 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,6 +8,11 @@ if ENABLE_IMDIAG TESTS += \ stop-localvar.sh \ stop-msgvar.sh \ + fac_authpriv.sh \ + fac_local0.sh \ + fac_mail.sh \ + fac_news.sh \ + fac_uucp.sh \ rfc5424parser.sh \ arrayqueue.sh \ global_vars.sh \ @@ -128,6 +133,16 @@ TESTS += \ imptcp_conndrop.sh endif +if ENABLE_ELASTICSEARCH +TESTS += \ + elasticsearch-basic.sh \ + elasticsearch-basic-bulk.sh \ + elasticsearch-basic-errorfile-empty.sh \ + elasticsearch-basic-errorfile-populated.sh \ + elasticsearch-bulk-errorfile-empty.sh \ + elasticsearch-bulk-errorfile-populated.sh +endif + if ENABLE_MMPSTRUCDATA TESTS += \ mmpstrucdata.sh @@ -337,6 +352,16 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/global_vars.conf \ rfc5424parser.sh \ testsuites/rfc5424parser.conf \ + fac_authpriv.sh \ + testsuites/fac_authpriv.conf \ + fac_local0.sh \ + testsuites/fac_local0.conf \ + fac_mail.sh \ + testsuites/fac_mail.conf \ + fac_news.sh \ + testsuites/fac_news.conf \ + fac_uucp.sh \ + testsuites/fac_uucp.conf \ rs_optimizer_pri.sh \ testsuites/rs_optimizer_pri.conf \ rscript_prifilt.sh \ @@ -362,6 +387,18 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ incltest_dir_wildcard.sh \ testsuites/incltest_dir_wildcard.conf \ testsuites/incltest.d/include.conf \ + elasticsearch-basic.sh \ + testsuites/elasticsearch-basic.conf \ + elasticsearch-basic-bulk.sh \ + testsuites/elasticsearch-basic-bulk.conf \ + elasticsearch-basic-errorfile-empty.sh \ + testsuites/elasticsearch-basic-errorfile-empty.conf \ + elasticsearch-basic-errorfile-populated.sh \ + testsuites/elasticsearch-basic-errorfile-populated.conf \ + elasticsearch-bulk-errorfile-empty.sh \ + testsuites/elasticsearch-bulk-errorfile-empty.conf \ + elasticsearch-bulk-errorfile-populated.sh \ + testsuites/elasticsearch-bulk-errorfile-populated.conf \ linkedlistqueue.sh \ testsuites/linkedlistqueue.conf \ da-mainmsg-q.sh \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 807ea62..6524d86 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -49,11 +49,17 @@ host_triplet = @host@ @ENABLE_TESTBENCH_TRUE@ $(am__append_9) $(am__append_10) \ @ENABLE_TESTBENCH_TRUE@ $(am__append_11) $(am__append_12) \ @ENABLE_TESTBENCH_TRUE@ $(am__append_13) $(am__append_14) \ -@ENABLE_TESTBENCH_TRUE@ $(am__append_15) $(am__append_16) +@ENABLE_TESTBENCH_TRUE@ $(am__append_15) $(am__append_16) \ +@ENABLE_TESTBENCH_TRUE@ $(am__append_17) #TESTS = $(TESTRUNS) cfg.sh @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_1 = \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ stop-localvar.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ stop-msgvar.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_authpriv.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_local0.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_mail.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_news.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_uucp.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ rfc5424parser.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ arrayqueue.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ global_vars.sh \ @@ -164,10 +170,18 @@ host_triplet = @host@ @ENABLE_IMPTCP_TRUE@@ENABLE_TESTBENCH_TRUE@ imptcp_addtlframedelim.sh \ @ENABLE_IMPTCP_TRUE@@ENABLE_TESTBENCH_TRUE@ imptcp_conndrop.sh -@ENABLE_MMPSTRUCDATA_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_7 = \ +@ENABLE_ELASTICSEARCH_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_7 = \ +@ENABLE_ELASTICSEARCH_TRUE@@ENABLE_TESTBENCH_TRUE@ elasticsearch-basic.sh \ +@ENABLE_ELASTICSEARCH_TRUE@@ENABLE_TESTBENCH_TRUE@ elasticsearch-basic-bulk.sh \ +@ENABLE_ELASTICSEARCH_TRUE@@ENABLE_TESTBENCH_TRUE@ elasticsearch-basic-errorfile-empty.sh \ +@ENABLE_ELASTICSEARCH_TRUE@@ENABLE_TESTBENCH_TRUE@ elasticsearch-basic-errorfile-populated.sh \ +@ENABLE_ELASTICSEARCH_TRUE@@ENABLE_TESTBENCH_TRUE@ elasticsearch-bulk-errorfile-empty.sh \ +@ENABLE_ELASTICSEARCH_TRUE@@ENABLE_TESTBENCH_TRUE@ elasticsearch-bulk-errorfile-populated.sh + +@ENABLE_MMPSTRUCDATA_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_8 = \ @ENABLE_MMPSTRUCDATA_TRUE@@ENABLE_TESTBENCH_TRUE@ mmpstrucdata.sh -@ENABLE_MMJSONPARSE_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_8 = \ +@ENABLE_MMJSONPARSE_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_9 = \ @ENABLE_MMJSONPARSE_TRUE@@ENABLE_TESTBENCH_TRUE@ mmjsonparse_simple.sh \ @ENABLE_MMJSONPARSE_TRUE@@ENABLE_TESTBENCH_TRUE@ mmjsonparse_cim.sh @@ -177,15 +191,15 @@ host_triplet = @host@ # #sndrcv_tls_anon.sh \ # #sndrcv_tls_anon_rebind.sh \ # #imtcp-tls-basic.sh -@ENABLE_GNUTLS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_9 = imtcp-tls-basic-vg.sh \ +@ENABLE_GNUTLS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_10 = imtcp-tls-basic-vg.sh \ @ENABLE_GNUTLS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@ imtcp_conndrop_tls-vg.sh -@ENABLE_OMUXSOCK_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_10 = uxsock_simple.sh -@ENABLE_RELP_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_11 = sndrcv_relp.sh -@ENABLE_OMUDPSPOOF_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_12 = sndrcv_omudpspoof.sh \ +@ENABLE_OMUXSOCK_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_11 = uxsock_simple.sh +@ENABLE_RELP_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_12 = sndrcv_relp.sh +@ENABLE_OMUDPSPOOF_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_13 = sndrcv_omudpspoof.sh \ @ENABLE_OMUDPSPOOF_TRUE@@ENABLE_TESTBENCH_TRUE@ sndrcv_omudpspoof_nonstdpt.sh -@ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_13 = omod-if-array.sh \ +@ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_14 = omod-if-array.sh \ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ proprepltest.sh \ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ parsertest.sh \ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ timestamp.sh \ @@ -197,16 +211,16 @@ host_triplet = @host@ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ tabescape_off.sh \ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ fieldtest.sh -@ENABLE_IMDIAG_TRUE@@ENABLE_OMRULESET_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_14 = omruleset.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_OMRULESET_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_15 = omruleset.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_OMRULESET_TRUE@@ENABLE_TESTBENCH_TRUE@ omruleset-queue.sh # random.sh is temporarily disabled as it needs some work # to rsyslog core to complete in reasonable time #TESTS += random.sh -@ENABLE_IMFILE_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_15 = imfile-basic.sh -@ENABLE_IMFILE_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_16 = imfile-basic-vg.sh -@ENABLE_GNUTLS_TRUE@am__append_17 = -lgcrypt +@ENABLE_IMFILE_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_16 = imfile-basic.sh +@ENABLE_IMFILE_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_17 = imfile-basic-vg.sh +@ENABLE_GNUTLS_TRUE@am__append_18 = -lgcrypt subdir = tests DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -629,6 +643,16 @@ EXTRA_DIST = 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/global_vars.conf \ rfc5424parser.sh \ testsuites/rfc5424parser.conf \ + fac_authpriv.sh \ + testsuites/fac_authpriv.conf \ + fac_local0.sh \ + testsuites/fac_local0.conf \ + fac_mail.sh \ + testsuites/fac_mail.conf \ + fac_news.sh \ + testsuites/fac_news.conf \ + fac_uucp.sh \ + testsuites/fac_uucp.conf \ rs_optimizer_pri.sh \ testsuites/rs_optimizer_pri.conf \ rscript_prifilt.sh \ @@ -654,6 +678,18 @@ EXTRA_DIST = 1.rstest 2.rstest 3.rstest err1.rstest \ incltest_dir_wildcard.sh \ testsuites/incltest_dir_wildcard.conf \ testsuites/incltest.d/include.conf \ + elasticsearch-basic.sh \ + testsuites/elasticsearch-basic.conf \ + elasticsearch-basic-bulk.sh \ + testsuites/elasticsearch-basic-bulk.conf \ + elasticsearch-basic-errorfile-empty.sh \ + testsuites/elasticsearch-basic-errorfile-empty.conf \ + elasticsearch-basic-errorfile-populated.sh \ + testsuites/elasticsearch-basic-errorfile-populated.conf \ + elasticsearch-bulk-errorfile-empty.sh \ + testsuites/elasticsearch-bulk-errorfile-empty.conf \ + elasticsearch-bulk-errorfile-populated.sh \ + testsuites/elasticsearch-bulk-errorfile-populated.conf \ linkedlistqueue.sh \ testsuites/linkedlistqueue.conf \ da-mainmsg-q.sh \ @@ -889,7 +925,7 @@ uxsockrcvr_LDADD = $(SOL_LIBS) tcpflood_SOURCES = tcpflood.c tcpflood_CPPFLAGS = $(PTHREADS_CFLAGS) $(GNUTLS_CFLAGS) tcpflood_LDADD = $(SOL_LIBS) $(PTHREADS_LIBS) $(GNUTLS_LIBS) \ - $(am__append_17) + $(am__append_18) minitcpsrv_SOURCES = minitcpsrvr.c minitcpsrv_LDADD = $(SOL_LIBS) syslog_caller_SOURCES = syslog_caller.c diff --git a/tests/diag.sh b/tests/diag.sh index 1eae524..fd294ce 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -22,6 +22,7 @@ case $1 in rm -rf test-spool test-logdir stat-file1 rm -f rsyslog.out.*.log work-presort rsyslog.pipe rm -f rsyslog.input rsyslog.empty + rm -f rsyslog.errorfile rm -f core.* vgcore.* # Note: rsyslog.action.*.include must NOT be deleted, as it # is used to setup some parameters BEFORE calling init. This @@ -35,8 +36,20 @@ case $1 in rm -rf test-spool test-logdir stat-file1 rm -f rsyslog.out.*.log rsyslog.random.data work-presort rsyslog.pipe rm -f rsyslog.input rsyslog.conf.tlscert stat-file1 rsyslog.empty + rm -f rsyslog.errorfile echo ------------------------------------------------------------------------------- ;; + 'es-init') # initialize local Elasticsearch *testbench* instance for the next + # test. NOTE: do NOT put anything useful on that instance! + curl -XDELETE localhost:9200/rsyslog_testbench + ;; + 'es-getdata') # read data from ES to a local file so that we can process + # it with out regular tooling. + # Note: param 2 MUST be number of records to read (ES does + # not return the full set unless you tell it explicitely). + curl localhost:9200/rsyslog_testbench/_search?size=$2 > work + python $srcdir/es_response_get_msgnum.py > rsyslog.out.log + ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use # returns only after successful startup, $3 is the instance (blank or 2!) $valgrind ../tools/rsyslogd -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & diff --git a/tests/elasticsearch-basic-bulk.sh b/tests/elasticsearch-basic-bulk.sh new file mode 100755 index 0000000..f62db16 --- /dev/null +++ b/tests/elasticsearch-basic-bulk.sh @@ -0,0 +1,12 @@ +# This file is part of the rsyslog project, released under ASL 2.0 +echo =============================================================================== +echo \[elasticsearch-basic-bulk.sh\]: basic test for elasticsearch functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh es-init +source $srcdir/diag.sh startup elasticsearch-basic-bulk.conf +source $srcdir/diag.sh injectmsg 0 10000 +source $srcdir/diag.sh shutdown-when-empty +source $srcdir/diag.sh wait-shutdown +source $srcdir/diag.sh es-getdata 10000 +source $srcdir/diag.sh seq-check 0 9999 +source $srcdir/diag.sh exit diff --git a/tests/elasticsearch-basic-errorfile-empty.sh b/tests/elasticsearch-basic-errorfile-empty.sh new file mode 100755 index 0000000..6dbcde9 --- /dev/null +++ b/tests/elasticsearch-basic-errorfile-empty.sh @@ -0,0 +1,17 @@ +# This file is part of the rsyslog project, released under ASL 2.0 +echo =============================================================================== +echo \[elasticsearch-basic-errorfile-empty\]: basic test for elasticsearch functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh es-init +source $srcdir/diag.sh startup elasticsearch-basic-errorfile-empty.conf +source $srcdir/diag.sh injectmsg 0 10000 +source $srcdir/diag.sh shutdown-when-empty +source $srcdir/diag.sh wait-shutdown +source $srcdir/diag.sh es-getdata 10000 +if [ -f rsyslog.errorfile ] +then + echo "error: error file exists!" + exit 1 +fi +source $srcdir/diag.sh seq-check 0 9999 +source $srcdir/diag.sh exit diff --git a/tests/elasticsearch-basic-errorfile-populated.sh b/tests/elasticsearch-basic-errorfile-populated.sh new file mode 100755 index 0000000..7239a59 --- /dev/null +++ b/tests/elasticsearch-basic-errorfile-populated.sh @@ -0,0 +1,26 @@ +# This file is part of the rsyslog project, released under ASL 2.0 +echo =============================================================================== +echo \[elasticsearch-basic-errorfile-populated\]: basic test for elasticsearch functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh es-init +curl -XPUT localhost:9200/rsyslog_testbench/ -d '{ + "mappings": { + "test-type": { + "properties": { + "msgnum": { + "type": "integer" + } + } + } + } +}' +source $srcdir/diag.sh startup elasticsearch-basic-errorfile-populated.conf +source $srcdir/diag.sh injectmsg 0 1000 +source $srcdir/diag.sh shutdown-when-empty +source $srcdir/diag.sh wait-shutdown +if [ ! -f rsyslog.errorfile ] +then + echo "error: error file does not exist!" + exit 1 +fi +source $srcdir/diag.sh exit diff --git a/tests/elasticsearch-basic.sh b/tests/elasticsearch-basic.sh new file mode 100755 index 0000000..18c847c --- /dev/null +++ b/tests/elasticsearch-basic.sh @@ -0,0 +1,12 @@ +# This file is part of the rsyslog project, released under ASL 2.0 +echo =============================================================================== +echo \[elasticsearch-basic.sh\]: basic test for elasticsearch functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh es-init +source $srcdir/diag.sh startup elasticsearch-basic.conf +source $srcdir/diag.sh injectmsg 0 10000 +source $srcdir/diag.sh shutdown-when-empty +source $srcdir/diag.sh wait-shutdown +source $srcdir/diag.sh es-getdata 10000 +source $srcdir/diag.sh seq-check 0 9999 +source $srcdir/diag.sh exit diff --git a/tests/elasticsearch-bulk-errorfile-empty.sh b/tests/elasticsearch-bulk-errorfile-empty.sh new file mode 100755 index 0000000..a370e72 --- /dev/null +++ b/tests/elasticsearch-bulk-errorfile-empty.sh @@ -0,0 +1,17 @@ +# This file is part of the rsyslog project, released under ASL 2.0 +echo =============================================================================== +echo \[elasticsearch-bulk-errorfile-empty\]: basic test for elasticsearch functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh es-init +source $srcdir/diag.sh startup elasticsearch-bulk-errorfile-empty.conf +source $srcdir/diag.sh injectmsg 0 10000 +source $srcdir/diag.sh shutdown-when-empty +source $srcdir/diag.sh wait-shutdown +source $srcdir/diag.sh es-getdata 10000 +if [ -f rsyslog.errorfile ] +then + echo "error: error file exists!" + exit 1 +fi +source $srcdir/diag.sh seq-check 0 9999 +source $srcdir/diag.sh exit diff --git a/tests/elasticsearch-bulk-errorfile-populated.sh b/tests/elasticsearch-bulk-errorfile-populated.sh new file mode 100755 index 0000000..169fa1c --- /dev/null +++ b/tests/elasticsearch-bulk-errorfile-populated.sh @@ -0,0 +1,26 @@ +# This file is part of the rsyslog project, released under ASL 2.0 +echo =============================================================================== +echo \[elasticsearch-bulk-errorfile-populated\]: basic test for elasticsearch functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh es-init +curl -XPUT localhost:9200/rsyslog_testbench/ -d '{ + "mappings": { + "test-type": { + "properties": { + "msgnum": { + "type": "integer" + } + } + } + } +}' +source $srcdir/diag.sh startup elasticsearch-bulk-errorfile-populated.conf +source $srcdir/diag.sh injectmsg 0 1000 +source $srcdir/diag.sh shutdown-when-empty +source $srcdir/diag.sh wait-shutdown +if [ ! -f rsyslog.errorfile ] +then + echo "error: error file does not exist!" + exit 1 +fi +source $srcdir/diag.sh exit diff --git a/tests/fac_authpriv.sh b/tests/fac_authpriv.sh new file mode 100755 index 0000000..f2c8544 --- /dev/null +++ b/tests/fac_authpriv.sh @@ -0,0 +1,11 @@ +# This tests proper processing of the authpriv facility. +# added 2014-09-16 by Rgerhards + +# This file is part of the rsyslog project, released under ASL 2.0 +source $srcdir/diag.sh init +source $srcdir/diag.sh startup fac_authpriv.conf +source $srcdir/diag.sh tcpflood -m1000 -P 81 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # and wait for it to terminate +source $srcdir/diag.sh seq-check 0 999 +source $srcdir/diag.sh exit diff --git a/tests/fac_local0.sh b/tests/fac_local0.sh new file mode 100755 index 0000000..516d3c0 --- /dev/null +++ b/tests/fac_local0.sh @@ -0,0 +1,10 @@ +# added 2014-09-17 by Rgerhards + +# This file is part of the rsyslog project, released under ASL 2.0 +source $srcdir/diag.sh init +source $srcdir/diag.sh startup fac_local0.conf +source $srcdir/diag.sh tcpflood -m1000 -P 129 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # and wait for it to terminate +source $srcdir/diag.sh seq-check 0 999 +source $srcdir/diag.sh exit diff --git a/tests/fac_mail.sh b/tests/fac_mail.sh new file mode 100755 index 0000000..e8873da --- /dev/null +++ b/tests/fac_mail.sh @@ -0,0 +1,10 @@ +# added 2014-09-17 by Rgerhards + +# This file is part of the rsyslog project, released under ASL 2.0 +source $srcdir/diag.sh init +source $srcdir/diag.sh startup fac_mail.conf +source $srcdir/diag.sh tcpflood -m1000 -P 17 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # and wait for it to terminate +source $srcdir/diag.sh seq-check 0 999 +source $srcdir/diag.sh exit diff --git a/tests/fac_news.sh b/tests/fac_news.sh new file mode 100755 index 0000000..85ded82 --- /dev/null +++ b/tests/fac_news.sh @@ -0,0 +1,10 @@ +# added 2014-09-17 by Rgerhards + +# This file is part of the rsyslog project, released under ASL 2.0 +source $srcdir/diag.sh init +source $srcdir/diag.sh startup fac_news.conf +source $srcdir/diag.sh tcpflood -m1000 -P 57 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # and wait for it to terminate +source $srcdir/diag.sh seq-check 0 999 +source $srcdir/diag.sh exit diff --git a/tests/fac_uucp.sh b/tests/fac_uucp.sh new file mode 100755 index 0000000..6c5c06b --- /dev/null +++ b/tests/fac_uucp.sh @@ -0,0 +1,10 @@ +# added 2014-09-17 by Rgerhards + +# This file is part of the rsyslog project, released under ASL 2.0 +source $srcdir/diag.sh init +source $srcdir/diag.sh startup fac_uucp.conf +source $srcdir/diag.sh tcpflood -m1000 -P 65 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # and wait for it to terminate +source $srcdir/diag.sh seq-check 0 999 +source $srcdir/diag.sh exit diff --git a/tests/testsuites/elasticsearch-basic-bulk.conf b/tests/testsuites/elasticsearch-basic-bulk.conf new file mode 100644 index 0000000..69a0495 --- /dev/null +++ b/tests/testsuites/elasticsearch-basic-bulk.conf @@ -0,0 +1,10 @@ +$IncludeConfig diag-common.conf + +template(name="tpl" type="string" + string="{\"msgnum\":\"%msg:F,58:2%\"}") + +module(load="../plugins/omelasticsearch/.libs/omelasticsearch") +:msg, contains, "msgnum:" action(type="omelasticsearch" + template="tpl" + searchIndex="rsyslog_testbench" + bulkmode="on") diff --git a/tests/testsuites/elasticsearch-basic-errorfile-empty.conf b/tests/testsuites/elasticsearch-basic-errorfile-empty.conf new file mode 100644 index 0000000..6b0371c --- /dev/null +++ b/tests/testsuites/elasticsearch-basic-errorfile-empty.conf @@ -0,0 +1,10 @@ +$IncludeConfig diag-common.conf + +template(name="tpl" type="string" + string="{\"msgnum\":\"%msg:F,58:2%\"}") + +module(load="../plugins/omelasticsearch/.libs/omelasticsearch") +:msg, contains, "msgnum:" action(type="omelasticsearch" + template="tpl" + searchIndex="rsyslog_testbench" + errorFile="./rsyslog.errorfile") diff --git a/tests/testsuites/elasticsearch-basic-errorfile-populated.conf b/tests/testsuites/elasticsearch-basic-errorfile-populated.conf new file mode 100644 index 0000000..d13b712 --- /dev/null +++ b/tests/testsuites/elasticsearch-basic-errorfile-populated.conf @@ -0,0 +1,15 @@ +$IncludeConfig diag-common.conf + +# Note: we must mess up with the template, because we can not +# instruct ES to put further constraints on the data type and +# values. So we require integer and make sure it is none. +template(name="tpl" type="string" + string="{\"msgnum\":\"x%msg:F,58:2%\"}") + +module(load="../plugins/omelasticsearch/.libs/omelasticsearch") +:msg, contains, "msgnum:" action(type="omelasticsearch" + template="tpl" + searchIndex="rsyslog_testbench" + searchType="test-type" + bulkmode="off" + errorFile="./rsyslog.errorfile") diff --git a/tests/testsuites/elasticsearch-basic.conf b/tests/testsuites/elasticsearch-basic.conf new file mode 100644 index 0000000..627bacc --- /dev/null +++ b/tests/testsuites/elasticsearch-basic.conf @@ -0,0 +1,9 @@ +$IncludeConfig diag-common.conf + +template(name="tpl" type="string" + string="{\"msgnum\":\"%msg:F,58:2%\"}") + +module(load="../plugins/omelasticsearch/.libs/omelasticsearch") +:msg, contains, "msgnum:" action(type="omelasticsearch" + template="tpl" + searchIndex="rsyslog_testbench") diff --git a/tests/testsuites/elasticsearch-bulk-errorfile-empty.conf b/tests/testsuites/elasticsearch-bulk-errorfile-empty.conf new file mode 100644 index 0000000..46e7cce --- /dev/null +++ b/tests/testsuites/elasticsearch-bulk-errorfile-empty.conf @@ -0,0 +1,11 @@ +$IncludeConfig diag-common.conf + +template(name="tpl" type="string" + string="{\"msgnum\":\"%msg:F,58:2%\"}") + +module(load="../plugins/omelasticsearch/.libs/omelasticsearch") +:msg, contains, "msgnum:" action(type="omelasticsearch" + template="tpl" + searchIndex="rsyslog_testbench" + bulkmode="on" + errorFile="./rsyslog.errorfile") diff --git a/tests/testsuites/elasticsearch-bulk-errorfile-populated.conf b/tests/testsuites/elasticsearch-bulk-errorfile-populated.conf new file mode 100644 index 0000000..21e7ddd --- /dev/null +++ b/tests/testsuites/elasticsearch-bulk-errorfile-populated.conf @@ -0,0 +1,15 @@ +$IncludeConfig diag-common.conf + +# Note: we must mess up with the template, because we can not +# instruct ES to put further constraints on the data type and +# values. So we require integer and make sure it is none. +template(name="tpl" type="string" + string="{\"msgnum\":\"x%msg:F,58:2%\"}") + +module(load="../plugins/omelasticsearch/.libs/omelasticsearch") +:msg, contains, "msgnum:" action(type="omelasticsearch" + template="tpl" + searchIndex="rsyslog_testbench" + searchType="test-type" + bulkmode="on" + errorFile="./rsyslog.errorfile") diff --git a/tests/testsuites/fac_authpriv.conf b/tests/testsuites/fac_authpriv.conf new file mode 100644 index 0000000..6a6484b --- /dev/null +++ b/tests/testsuites/fac_authpriv.conf @@ -0,0 +1,7 @@ +$IncludeConfig diag-common.conf + +$ModLoad ../plugins/imtcp/.libs/imtcp +$InputTCPServerRun 13514 + +$template outfmt,"%msg:F,58:2%,%msg:F,58:3%,%msg:F,58:4%\n" +authpriv.* ./rsyslog.out.log;outfmt diff --git a/tests/testsuites/fac_local0.conf b/tests/testsuites/fac_local0.conf new file mode 100644 index 0000000..2357e63 --- /dev/null +++ b/tests/testsuites/fac_local0.conf @@ -0,0 +1,8 @@ +$IncludeConfig diag-common.conf + +module(load="../plugins/imtcp/.libs/imtcp") +input(type="imtcp" port="13514") + +template(type="string" name="outfmt" string="%msg:F,58:2%,%msg:F,58:3%,%msg:F,58:4%\n") +if $syslogfacility-text == "local0" then + action(type="omfile" file="rsyslog.out.log" template="outfmt") diff --git a/tests/testsuites/fac_mail.conf b/tests/testsuites/fac_mail.conf new file mode 100644 index 0000000..ffe0dfd --- /dev/null +++ b/tests/testsuites/fac_mail.conf @@ -0,0 +1,7 @@ +$IncludeConfig diag-common.conf + +module(load="../plugins/imtcp/.libs/imtcp") +input(type="imtcp" port="13514") + +template(type="string" name="outfmt" string="%msg:F,58:2%,%msg:F,58:3%,%msg:F,58:4%\n") +mail.* action(type="omfile" file="rsyslog.out.log" template="outfmt") diff --git a/tests/testsuites/fac_news.conf b/tests/testsuites/fac_news.conf new file mode 100644 index 0000000..efc6ba0 --- /dev/null +++ b/tests/testsuites/fac_news.conf @@ -0,0 +1,8 @@ +$IncludeConfig diag-common.conf + +module(load="../plugins/imtcp/.libs/imtcp") +input(type="imtcp" port="13514") + +template(type="string" name="outfmt" string="%msg:F,58:2%,%msg:F,58:3%,%msg:F,58:4%\n") +if prifilt("news.*") then + action(type="omfile" file="rsyslog.out.log" template="outfmt") diff --git a/tests/testsuites/fac_uucp.conf b/tests/testsuites/fac_uucp.conf new file mode 100644 index 0000000..90d9646 --- /dev/null +++ b/tests/testsuites/fac_uucp.conf @@ -0,0 +1,7 @@ +$IncludeConfig diag-common.conf + +module(load="../plugins/imtcp/.libs/imtcp") +input(type="imtcp" port="13514") + +template(type="string" name="outfmt" string="%msg:F,58:2%,%msg:F,58:3%,%msg:F,58:4%\n") +uucp.* action(type="omfile" file="rsyslog.out.log" template="outfmt") diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c index abff2c6..a0fe02c 100644 --- a/tools/rsyslogd.c +++ b/tools/rsyslogd.c @@ -491,8 +491,8 @@ logmsgInternalSelf(const int iErr, const int pri, const size_t lenMsg, pszTag[32] = '\0'; /* just to make sure... */ MsgSetTAG(pMsg, pszTag, len); } - pMsg->iFacility = LOG_FAC(pri); - pMsg->iSeverity = LOG_PRI(pri); + pMsg->iFacility = pri2fac(pri); + pMsg->iSeverity = pri2sev(pri); flags |= INTERNAL_MSG; pMsg->msgFlags = flags; @@ -540,7 +540,7 @@ logmsgInternal(int iErr, int pri, const uchar *const msg, int flags) (bufModMsg == NULL) ? (char*)msg : bufModMsg, flags)); } else { - stdlog_log(stdlog_hdl, LOG_PRI(pri), "%s", + stdlog_log(stdlog_hdl, pri2sev(pri), "%s", (bufModMsg == NULL) ? (char*)msg : bufModMsg); } @@ -553,7 +553,7 @@ logmsgInternal(int iErr, int pri, const uchar *const msg, int flags) * supressor statement. */ if(((Debug == DEBUG_FULL || !doFork) && ourConf->globals.bErrMsgToStderr) || iConfigVerify) { - if(LOG_PRI(pri) == LOG_ERR) + if(pri2sev(pri) == LOG_ERR) fprintf(stderr, "rsyslogd: %s\n", (bufModMsg == NULL) ? (char*)msg : bufModMsg); } |