diff --git a/configure b/configure index 680722769..3e5e562ae 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.11.1. +# Generated by GNU Autoconf 2.69 for unbound 1.12.1. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.11.1' -PACKAGE_STRING='unbound 1.11.1' +PACKAGE_VERSION='1.12.1' +PACKAGE_STRING='unbound 1.12.1' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -808,7 +808,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -958,7 +957,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1211,15 +1209,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1357,7 +1346,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1470,7 +1459,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 unbound 1.11.1 to adapt to many kinds of systems. +\`configure' configures unbound 1.12.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1510,7 +1499,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1536,7 +1524,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.11.1:";; + short | recursive ) echo "Configuration of unbound 1.12.1:";; esac cat <<\_ACEOF @@ -1764,7 +1752,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.11.1 +unbound configure 1.12.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2473,7 +2461,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 unbound $as_me 1.11.1, which was +It was created by unbound $as_me 1.12.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2823,13 +2811,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu UNBOUND_VERSION_MAJOR=1 -UNBOUND_VERSION_MINOR=11 +UNBOUND_VERSION_MINOR=12 UNBOUND_VERSION_MICRO=1 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=10 +LIBUNBOUND_REVISION=11 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2906,7 +2894,8 @@ LIBUNBOUND_AGE=1 # 1.10.0 had 9:7:1 # 1.10.1 had 9:8:1 # 1.11.0 had 9:9:1 -# 1.11.1 had 9:10:1 +# 1.12.0 had 9:10:1 +# 1.12.1 had 9:11:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -14756,7 +14745,7 @@ $as_echo "no" >&6; } fi # Checks for header files. -for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h net/if.h +for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default @@ -14770,6 +14759,34 @@ fi done +# net/if.h portability for Darwin see: +# https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Header-Portability.html +for ac_header in net/if.h +do : + ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" " +#include +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_SYS_SOCKET_H +# include +#endif + +" +if test "x$ac_cv_header_net_if_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NET_IF_H 1 +_ACEOF + +fi + +done + # Check for Apple header. This uncovers TARGET_OS_IPHONE, TARGET_OS_TV or TARGET_OS_WATCH for ac_header in TargetConditionals.h @@ -15705,7 +15722,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -15751,7 +15768,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -15775,7 +15792,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -15820,7 +15837,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -15844,7 +15861,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -21714,7 +21731,7 @@ _ACEOF -version=1.11.1 +version=1.12.1 date=`date +'%b %e, %Y'` @@ -22233,7 +22250,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 unbound $as_me 1.11.1, which was +This file was extended by unbound $as_me 1.12.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22299,7 +22316,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="\\ -unbound config.status 1.11.1 +unbound config.status 1.12.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8ccfafe6c..b4caa37dd 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) -m4_define([VERSION_MINOR],[11]) +m4_define([VERSION_MINOR],[12]) m4_define([VERSION_MICRO],[1]) AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) @@ -18,7 +18,7 @@ AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=10 +LIBUNBOUND_REVISION=11 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -95,7 +95,8 @@ LIBUNBOUND_AGE=1 # 1.10.0 had 9:7:1 # 1.10.1 had 9:8:1 # 1.11.0 had 9:9:1 -# 1.11.1 had 9:10:1 +# 1.12.0 had 9:10:1 +# 1.12.1 had 9:11:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -399,7 +400,23 @@ ACX_LIBTOOL_C_ONLY PKG_PROG_PKG_CONFIG # Checks for header files. -AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h net/if.h],,, [AC_INCLUDES_DEFAULT]) +AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h],,, [AC_INCLUDES_DEFAULT]) +# net/if.h portability for Darwin see: +# https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Header-Portability.html +AC_CHECK_HEADERS([net/if.h],,, [ +#include +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_SYS_SOCKET_H +# include +#endif +]) # Check for Apple header. This uncovers TARGET_OS_IPHONE, TARGET_OS_TV or TARGET_OS_WATCH AC_CHECK_HEADERS([TargetConditionals.h]) diff --git a/daemon/worker.c b/daemon/worker.c index 5ad8ce4e4..458afa04e 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -1789,8 +1789,8 @@ worker_init(struct worker* worker, struct config_file *cfg, ? cfg->tcp_keepalive_timeout : cfg->tcp_idle_timeout, cfg->harden_large_queries, cfg->http_max_streams, - cfg->http_endpoint, worker->daemon->tcl, - worker->daemon->listen_sslctx, + cfg->http_endpoint, cfg->http_notls_downstream, + worker->daemon->tcl, worker->daemon->listen_sslctx, dtenv, worker_handle_request, worker); if(!worker->front) { log_err("could not create listening sockets"); diff --git a/dnstap/dnstap.c b/dnstap/dnstap.c index 0c8c6c4d4..b8a321670 100644 --- a/dnstap/dnstap.c +++ b/dnstap/dnstap.c @@ -134,15 +134,13 @@ dt_create(struct config_file* cfg) if(cfg->dnstap && cfg->dnstap_socket_path && cfg->dnstap_socket_path[0] && (cfg->dnstap_ip==NULL || cfg->dnstap_ip[0]==0)) { - char* p = fname_after_chroot(cfg->dnstap_socket_path, cfg, 1); - if(!p) { - log_err("malloc failure"); - return NULL; - } + char* p = cfg->dnstap_socket_path; + if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(p, + cfg->chrootdir, strlen(cfg->chrootdir)) == 0) + p += strlen(cfg->chrootdir); verbose(VERB_OPS, "attempting to connect to dnstap socket %s", p); check_socket_file(p); - free(p); } env = (struct dt_env *) calloc(1, sizeof(struct dt_env)); diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c index b0918c52c..f1ace3c34 100644 --- a/dnstap/dtstream.c +++ b/dnstap/dtstream.c @@ -341,15 +341,19 @@ int dt_io_thread_apply_cfg(struct dt_io_thread* dtio, struct config_file *cfg) dtio->is_bidirectional = cfg->dnstap_bidirectional; if(dtio->upstream_is_unix) { + char* nm; if(!cfg->dnstap_socket_path || cfg->dnstap_socket_path[0]==0) { log_err("dnstap setup: no dnstap-socket-path for " "socket connect"); return 0; } + nm = cfg->dnstap_socket_path; + if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(nm, + cfg->chrootdir, strlen(cfg->chrootdir)) == 0) + nm += strlen(cfg->chrootdir); free(dtio->socket_path); - dtio->socket_path = fname_after_chroot(cfg->dnstap_socket_path, - cfg, 1); + dtio->socket_path = strdup(nm); if(!dtio->socket_path) { log_err("dnstap setup: malloc failure"); return 0; diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c index 5a540f337..3ebe2b4e4 100644 --- a/dnstap/unbound-dnstap-socket.c +++ b/dnstap/unbound-dnstap-socket.c @@ -1167,8 +1167,10 @@ int sig_quit = 0; static RETSIGTYPE main_sigh(int sig) { verbose(VERB_ALGO, "exit on signal %d\n", sig); - if(sig_base) + if(sig_base) { ub_event_base_loopexit(sig_base); + sig_base = NULL; + } sig_quit = 1; } diff --git a/doc/Changelog b/doc/Changelog index aba2a9ae2..181aaad05 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,96 @@ +27 October 2020: Wouter + - In man page note that tls-cert-bundle is read before permission + drop and chroot. + +22 October 2020: Wouter + - Fix #333: Unbound Segmentation Fault w/ log_info Functions From + Python Mod. + - Fix that minimal-responses does not remove addresses from a priming + query response. + +21 October 2020: George + - Fix #327: net/if.h check fails on some darwin versions; contribution by + Joshua Root. + - Fix #320: potential memory corruption due to size miscomputation upton + custom region alloc init. + +21 October 2020: Wouter + - Merge PR #228 : infra-keep-probing option to probe hosts that are + down. Add infra-keep-probing: yes option. Hosts that are down are + probed more frequently. + With the option turned on, it probes about every 120 seconds, + eventually after exponential backoff, and that keeps that way. If + traffic keeps up for the domain. It probes with one at a time, eg. + one query is allowed to probe, other queries within that 120 second + interval are turned away. + +19 October 2020: George + - Merge PR #324 from James Renken: Add modern X.509v3 extensions to + unbound-control TLS certificates. + - Fix for PR #324 to attach the x509v3 extensions to the client + certificate. + +19 October 2020: Ralph + - local-zone regional allocations outside of chunk + +19 October 2020: Wouter + - Fix that http settings have colon in set_option, for + http-endpoint, http-max-streams, http-query-buffer-size, + http-response-buffer-size, and http-nodelay. + - Fix memory leak of https port string when reading config. + - Fix #330: [Feature request] Add unencrypted DNS over HTTPS support. + This adds the option http-notls-downstream: yesno to change that, + and the dohclient test code has the -n option. + - Fix python documentation warning on functions.rst inplace_cb_reply. + - Fix dnstap test to wait for log timer to see if queries are logged. + - Log ip address when http session recv fails, eg. due to tls fail. + - Fix to set the tcp handler event toggle flag back to default when + the handler structure is reused. + - Clean the fix for out of order TCP processing limits on number + of queries. It was tested to work. + +16 October 2020: Wouter + - Fix that the out of order TCP processing does not limit the + number of outstanding queries over a connection. + +15 October 2020: George + - Fix that if there are reply callbacks for the given rcode, those + are called per reply and a new message created if that was modified + by the call. + - Pass the comm_reply information to the inplace_cb_reply* functions + during the mesh state and update the documentation on that. + +15 October 2020: Wouter + - Merge PR #326 from netblue30: DoH: implement content-length + header field + - DoH content length, simplify code, remove declaration after + statement and fix cast warning. + +14 October 2020: Wouter + - Fix for python reply callback to see mesh state reply_list member, + it only removes it briefly for the commpoint call so that it does + not drop it and attempt to modify the reply list during reply. + - Fix that if there are on reply callbacks, those are called per + reply and a new message created if that was modified by the call. + - Free up auth zone parse region after use for lookup of host + +13 October 2020: Wouter + - Fix #323: unbound testsuite fails on mock build in systemd-nspawn + if systemd support is build. + +9 October 2020: Wouter + - Fix dnstap socket and the chroot not applied properly to the dnstap + socket path. + - Fix warning in libnss compile, nss_buf2dsa is not used without DSA. + +8 October 2020: Wouter + - Tag for 1.12.0 release. + - Current repo is version 1.12.1 in development. + - Fix #319: potential memory leak on config failure, in rpz config. + +1 October 2020: Wouter + - Current repo is version 1.12.0 for release. Tag for 1.12.0rc1. + 30 September 2020: Wouter - Fix doh tests when not compiled in. - Add dohclient test executable to gitignore. @@ -5,6 +98,7 @@ alloc check debug output. - Easier kill of unbound-dnstap-socket tool in test. - Fix memory leak of edns tags at libunbound context delete. + - Fix double loopexit for unbound-dnstap-socket after sigterm. 29 September 2020: Ralph - DNS Flag Day 2020: change edns-buffer-size default to 1232. diff --git a/doc/example.conf.in b/doc/example.conf.in index 852cccaed..85d475ea3 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -192,6 +192,9 @@ server: # minimum wait time for responses, increase if uplink is long. In msec. # infra-cache-min-rtt: 50 + # enable to make server probe down hosts more frequently. + # infra-keep-probing: no + # the number of slabs to use for the Infrastructure cache. # the number of slabs must be a power of 2. # more slabs reduce lock contention, but fragment memory usage. @@ -788,6 +791,9 @@ server: # service. # http-nodelay: yes + # Disable TLS for DNS-over-HTTP downstream service. + # http-notls-downstream: no + # DNS64 prefix. Must be specified when DNS64 is use. # Enable dns64 in module-config. Used to synthesize IPv6 from IPv4. # dns64-prefix: 64:ff9b::0/96 diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 8a4f5349a..84cba76d4 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -382,6 +382,12 @@ Lower limit for dynamic retransmit timeout calculation in infrastructure cache. Default is 50 milliseconds. Increase this value if using forwarders needing more time to do recursive name resolution. .TP +.B infra\-keep\-probing: \fI +If enabled the server keeps probing hosts that are down, in the one probe +at a time regime. Default is no. Hosts that are down, eg. they did +not respond during the one probe at a time period, are marked as down and +it may take \fBinfra\-host\-ttl\fR time to get probed again. +.TP .B define\-tag: \fI<"list of tags"> Define the tags that can be used with local\-zone and access\-control. Enclose the list between quotes ("") and put spaces between tags. @@ -516,7 +522,8 @@ Alternate syntax for \fBtls\-port\fR. If null or "", no file is used. Set it to the certificate bundle file, for example "/etc/pki/tls/certs/ca\-bundle.crt". These certificates are used for authenticating connections made to outside peers. For example auth\-zone -urls, and also DNS over TLS connections. +urls, and also DNS over TLS connections. It is read at start up before +permission drop and chroot. .TP .B ssl\-cert\-bundle: \fI Alternate syntax for \fBtls\-cert\-bundle\fR. @@ -587,6 +594,10 @@ megabytes or gigabytes (1024*1024 bytes in a megabyte). Set TCP_NODELAY socket option on sockets used to provide DNS-over-HTTPS service. Ignored if the option is not available. Default is yes. .TP +.B http\-notls\-downstream: \fI +Disable use of TLS for the downstream DNS-over-HTTP connections. Useful for +local back end servers. Default is no. +.TP .B use\-systemd: \fI Enable or disable systemd socket activation. Default is no. diff --git a/pythonmod/doc/examples/example6.rst b/pythonmod/doc/examples/example6.rst index d294fb8be..fd6caf74d 100644 --- a/pythonmod/doc/examples/example6.rst +++ b/pythonmod/doc/examples/example6.rst @@ -60,7 +60,6 @@ The callback function's prototype is the following: :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh states. :return: True on success, False on failure. @@ -105,8 +104,6 @@ The callback function's prototype is the following: :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -154,8 +151,6 @@ The callback function's prototype is the following: :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -201,8 +196,6 @@ The callback function's prototype is the following: :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. diff --git a/pythonmod/doc/modules/functions.rst b/pythonmod/doc/modules/functions.rst index 43c66eb38..333f696b8 100644 --- a/pythonmod/doc/modules/functions.rst +++ b/pythonmod/doc/modules/functions.rst @@ -89,7 +89,7 @@ EDNS options Inplace callbacks ----------------- -.. function:: inplace_cb_reply(qinfo, qstate, rep, rcode, edns, opt_list_out, region) +.. function:: inplace_cb_reply(qinfo, qstate, rep, rcode, edns, opt_list_out, region, \*\*kwargs) Function prototype for callback functions used in `register_inplace_cb_reply`_, `register_inplace_cb_reply_cache`_, @@ -102,6 +102,9 @@ Inplace callbacks :param edns: :class:`edns_data` :param opt_list_out: :class:`edns_option`. EDNS option list to append options to. :param region: :class:`regional` + :param \*\*kwargs: Dictionary that may contain parameters added in a future + release. Current parameters: + ``repinfo``: :class:`comm_reply`. Reply information for a communication point. .. function:: inplace_cb_query(qinfo, flags, qstate, addr, zone, region) diff --git a/pythonmod/examples/inplace_callbacks.py b/pythonmod/examples/inplace_callbacks.py index 768c2d013..de375b4e1 100644 --- a/pythonmod/examples/inplace_callbacks.py +++ b/pythonmod/examples/inplace_callbacks.py @@ -43,7 +43,7 @@ # This query returns SERVFAIL as the txt record of bogus.nlnetlabs.nl is # intentionally bogus. The reply will contain an empty EDNS option # with option code 65003. -# Unbound will also log the source address(es) of the client(s) that made +# Unbound will also log the source address of the client that made # the request. # (unbound needs to be validating for this example to work) @@ -91,8 +91,6 @@ def inplace_reply_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -121,8 +119,6 @@ def inplace_cache_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -173,8 +169,6 @@ def inplace_local_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -205,13 +199,11 @@ def inplace_servfail_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. For demonstration purposes we want to reply with an empty EDNS code '65003' - and log the IP address(es) of the client(s). + and log the IP address of the client. """ log_info("python: called back while servfail.") @@ -219,30 +211,14 @@ def inplace_servfail_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, b = bytearray.fromhex("") edns_opt_list_append(opt_list_out, 65003, b, region) - # Log the client(s) IP address(es) + # Log the client's IP address comm_reply = kwargs['repinfo'] if comm_reply: - # If it is not None this callback was called before the query reached - # the mesh states(modules). There is only one client associated with - # this query. addr = comm_reply.addr port = comm_reply.port addr_family = comm_reply.family log_info("python: Client IP: {}({}), port: {}" "".format(addr, addr_family, port)) - else: - # If it is not None this callback was called while the query is in the - # mesh states(modules). In this case they may be multiple clients - # waiting for this query. - # The following code is the same as with the resip.py example. - rl = qstate.mesh_info.reply_list - while (rl): - if rl.query_reply: - q = rl.query_reply - log_info("python: Client IP: {}({}), port: {}" - "".format(q.addr, q.family, q.port)) - rl = rl.next - return True diff --git a/pythonmod/interface.i b/pythonmod/interface.i index 71f2bf774..cbee4f714 100644 --- a/pythonmod/interface.i +++ b/pythonmod/interface.i @@ -1413,6 +1413,19 @@ struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t n /****************************** * Various debugging functions * ******************************/ + +/* rename the variadic functions because python does the formatting already*/ +%rename (unbound_log_info) log_info; +%rename (unbound_log_err) log_err; +%rename (unbound_log_warn) log_warn; +%rename (unbound_verbose) verbose; +/* provide functions that take one string as argument, so python can cook +the string */ +%rename (log_info) pymod_log_info; +%rename (log_warn) pymod_log_warn; +%rename (log_err) pymod_log_err; +%rename (verbose) pymod_verbose; + void verbose(enum verbosity_value level, const char* format, ...); void log_info(const char* format, ...); void log_err(const char* format, ...); @@ -1422,6 +1435,19 @@ void log_dns_msg(const char* str, struct query_info* qinfo, struct reply_info* r void log_query_info(enum verbosity_value v, const char* str, struct query_info* qinf); void regional_log_stats(struct regional *r); +/* the one argument string log functions */ +void pymod_log_info(const char* str); +void pymod_log_err(const char* str); +void pymod_log_warn(const char* str); +void pymod_verbose(enum verbosity_value level, const char* str); +%{ +void pymod_log_info(const char* str) { log_info("%s", str); } +void pymod_log_err(const char* str) { log_err("%s", str); } +void pymod_log_warn(const char* str) { log_warn("%s", str); } +void pymod_verbose(enum verbosity_value level, const char* str) { + verbose(level, "%s", str); } +%} + /*************************************************************************** * Free allocated memory from marked sources returning corresponding types * ***************************************************************************/ diff --git a/services/authzone.c b/services/authzone.c index a26d1003a..15be5d60c 100644 --- a/services/authzone.c +++ b/services/authzone.c @@ -5387,6 +5387,7 @@ void auth_xfer_transfer_lookup_callback(void* arg, int rcode, sldns_buffer* buf, verbose(VERB_ALGO, "auth zone %s host %s type %s transfer lookup has no answer", zname, xfr->task_transfer->lookup_target->host, (xfr->task_transfer->lookup_aaaa?"AAAA":"A")); } } + regional_free_all(temp); } else { if(verbosity >= VERB_ALGO) { char zname[255+1]; @@ -6444,6 +6445,7 @@ void auth_xfer_probe_lookup_callback(void* arg, int rcode, sldns_buffer* buf, verbose(VERB_ALGO, "auth zone %s host %s type %s probe lookup has no address", zname, xfr->task_probe->lookup_target->host, (xfr->task_probe->lookup_aaaa?"AAAA":"A")); } } + regional_free_all(temp); } else { if(verbosity >= VERB_ALGO) { char zname[255+1]; diff --git a/services/cache/infra.c b/services/cache/infra.c index c2484a9f1..2d16bcd6e 100644 --- a/services/cache/infra.c +++ b/services/cache/infra.c @@ -244,6 +244,7 @@ infra_create(struct config_file* cfg) return NULL; } infra->host_ttl = cfg->host_ttl; + infra->infra_keep_probing = cfg->infra_keep_probing; infra_dp_ratelimit = cfg->ratelimit; infra->domain_rates = slabhash_create(cfg->ratelimit_slabs, INFRA_HOST_STARTSIZE, cfg->ratelimit_size, @@ -297,6 +298,7 @@ infra_adjust(struct infra_cache* infra, struct config_file* cfg) if(!infra) return infra_create(cfg); infra->host_ttl = cfg->host_ttl; + infra->infra_keep_probing = cfg->infra_keep_probing; infra_dp_ratelimit = cfg->ratelimit; infra_ip_ratelimit = cfg->ip_ratelimit; maxmem = cfg->infra_cache_numhosts * (sizeof(struct infra_key)+ @@ -445,6 +447,7 @@ infra_host(struct infra_cache* infra, struct sockaddr_storage* addr, if(e && ((struct infra_data*)e->data)->ttl < timenow) { /* it expired, try to reuse existing entry */ int old = ((struct infra_data*)e->data)->rtt.rto; + time_t tprobe = ((struct infra_data*)e->data)->probedelay; uint8_t tA = ((struct infra_data*)e->data)->timeout_A; uint8_t tAAAA = ((struct infra_data*)e->data)->timeout_AAAA; uint8_t tother = ((struct infra_data*)e->data)->timeout_other; @@ -460,6 +463,7 @@ infra_host(struct infra_cache* infra, struct sockaddr_storage* addr, if(old >= USEFUL_SERVER_TOP_TIMEOUT) { ((struct infra_data*)e->data)->rtt.rto = USEFUL_SERVER_TOP_TIMEOUT; + ((struct infra_data*)e->data)->probedelay = tprobe; ((struct infra_data*)e->data)->timeout_A = tA; ((struct infra_data*)e->data)->timeout_AAAA = tAAAA; ((struct infra_data*)e->data)->timeout_other = tother; @@ -482,7 +486,8 @@ infra_host(struct infra_cache* infra, struct sockaddr_storage* addr, *edns_vs = data->edns_version; *edns_lame_known = data->edns_lame_known; *to = rtt_timeout(&data->rtt); - if(*to >= PROBE_MAXRTO && rtt_notimeout(&data->rtt)*4 <= *to) { + if(*to >= PROBE_MAXRTO && (infra->infra_keep_probing || + rtt_notimeout(&data->rtt)*4 <= *to)) { /* delay other queries, this is the probe query */ if(!wr) { lock_rw_unlock(&e->lock); @@ -566,18 +571,27 @@ infra_rtt_update(struct infra_cache* infra, struct sockaddr_storage* addr, struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen, nm, nmlen, 1); struct infra_data* data; - int needtoinsert = 0; + int needtoinsert = 0, expired = 0; int rto = 1; + time_t oldprobedelay = 0; if(!e) { if(!(e = new_entry(infra, addr, addrlen, nm, nmlen, timenow))) return 0; needtoinsert = 1; } else if(((struct infra_data*)e->data)->ttl < timenow) { + oldprobedelay = ((struct infra_data*)e->data)->probedelay; data_entry_init(infra, e, timenow); + expired = 1; } /* have an entry, update the rtt */ data = (struct infra_data*)e->data; if(roundtrip == -1) { + if(needtoinsert || expired) { + /* timeout on entry that has expired before the timer + * keep old timeout from the function caller */ + data->rtt.rto = orig_rtt; + data->probedelay = oldprobedelay; + } rtt_lost(&data->rtt, orig_rtt); if(qtype == LDNS_RR_TYPE_A) { if(data->timeout_A < TIMEOUT_COUNT_MAX) @@ -681,7 +695,12 @@ infra_get_lame_rtt(struct infra_cache* infra, return 0; host = (struct infra_data*)e->data; *rtt = rtt_unclamped(&host->rtt); - if(host->rtt.rto >= PROBE_MAXRTO && timenow < host->probedelay + if(host->rtt.rto >= PROBE_MAXRTO && timenow >= host->probedelay + && infra->infra_keep_probing) { + /* single probe, keep probing */ + if(*rtt >= USEFUL_SERVER_TOP_TIMEOUT) + *rtt = USEFUL_SERVER_TOP_TIMEOUT-1000; + } else if(host->rtt.rto >= PROBE_MAXRTO && timenow < host->probedelay && rtt_notimeout(&host->rtt)*4 <= host->rtt.rto) { /* single probe for this domain, and we are not probing */ /* unless the query type allows a probe to happen */ @@ -704,7 +723,8 @@ infra_get_lame_rtt(struct infra_cache* infra, /* see if this can be a re-probe of an unresponsive server */ /* minus 1000 because that is outside of the RTTBAND, so * blacklisted servers stay blacklisted if this is chosen */ - if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT) { + if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT || + infra->infra_keep_probing) { lock_rw_unlock(&e->lock); *rtt = USEFUL_SERVER_TOP_TIMEOUT-1000; *lame = 0; diff --git a/services/cache/infra.h b/services/cache/infra.h index e33f2a6c0..14f97c4c6 100644 --- a/services/cache/infra.h +++ b/services/cache/infra.h @@ -114,6 +114,8 @@ struct infra_cache { struct slabhash* hosts; /** TTL value for host information, in seconds */ int host_ttl; + /** the hosts that are down are kept probed for recovery */ + int infra_keep_probing; /** hash table with query rates per name: rate_key, rate_data */ struct slabhash* domain_rates; /** ratelimit settings for domains, struct domain_limit_data */ diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index 3a98c2642..e506eeb31 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -81,9 +81,6 @@ /** number of queued TCP connections for listen() */ #define TCP_BACKLOG 256 -/** number of simultaneous requests a client can have */ -#define TCP_MAX_REQ_SIMULTANEOUS 32 - #ifndef THREADS_DISABLED /** lock on the counter of stream buffer memory */ static lock_basic_type stream_wait_count_lock; @@ -1244,8 +1241,9 @@ struct listen_dnsport* listen_create(struct comm_base* base, struct listen_port* ports, size_t bufsize, int tcp_accept_count, int tcp_idle_timeout, int harden_large_queries, uint32_t http_max_streams, - char* http_endpoint, struct tcl_list* tcp_conn_limit, void* sslctx, - struct dt_env* dtenv, comm_point_callback_type* cb, void *cb_arg) + char* http_endpoint, int http_notls, struct tcl_list* tcp_conn_limit, + void* sslctx, struct dt_env* dtenv, comm_point_callback_type* cb, + void *cb_arg) { struct listen_dnsport* front = (struct listen_dnsport*) malloc(sizeof(struct listen_dnsport)); @@ -1295,15 +1293,19 @@ listen_create(struct comm_base* base, struct listen_port* ports, http_max_streams, http_endpoint, tcp_conn_limit, bufsize, front->udp_buff, ports->ftype, cb, cb_arg); - cp->ssl = sslctx; + if(http_notls && ports->ftype == listen_type_http) + cp->ssl = NULL; + else + cp->ssl = sslctx; if(ports->ftype == listen_type_http) { - if(!sslctx) { - log_warn("HTTPS port configured, but no TLS " + if(!sslctx && !http_notls) { + log_warn("HTTPS port configured, but no TLS " "tls-service-key or tls-service-pem " "set"); } #ifndef HAVE_SSL_CTX_SET_ALPN_SELECT_CB - log_warn("Unbound is not compiled with an " + if(!http_notls) + log_warn("Unbound is not compiled with an " "OpenSSL version supporting ALPN " " (OpenSSL >= 1.0.2). This is required " "to use DNS-over-HTTPS"); @@ -1804,8 +1806,7 @@ tcp_req_info_setup_listen(struct tcp_req_info* req) if(!req->cp->tcp_is_reading) wr = 1; - if(req->num_open_req + req->num_done_req < TCP_MAX_REQ_SIMULTANEOUS && - !req->read_is_closed) + if(!req->read_is_closed) rd = 1; if(wr) { @@ -2177,9 +2178,10 @@ int http2_submit_dns_response(struct http2_session* h2_session) int ret; nghttp2_data_provider data_prd; char status[4]; - nghttp2_nv headers[2]; + nghttp2_nv headers[3]; struct http2_stream* h2_stream = h2_session->c->h2_stream; size_t rlen; + char rlen_str[32]; if(h2_stream->rbuffer) { log_err("http2 submit response error: rbuffer already " @@ -2198,6 +2200,8 @@ int http2_submit_dns_response(struct http2_session* h2_session) } rlen = sldns_buffer_remaining(h2_session->c->buffer); + snprintf(rlen_str, sizeof(rlen_str), "%u", rlen); + lock_basic_lock(&http2_response_buffer_count_lock); if(http2_response_buffer_count + rlen > http2_response_buffer_max) { lock_basic_unlock(&http2_response_buffer_count_lock); @@ -2228,13 +2232,11 @@ int http2_submit_dns_response(struct http2_session* h2_session) headers[1].valuelen = 23; headers[1].flags = NGHTTP2_NV_FLAG_NONE; - /*TODO be nice and add the content-length header headers[2].name = (uint8_t*)"content-length"; headers[2].namelen = 14; - headers[2].value = - headers[2].valuelen = + headers[2].value = (uint8_t*)rlen_str; + headers[2].valuelen = strlen(rlen_str); headers[2].flags = NGHTTP2_NV_FLAG_NONE; - */ sldns_buffer_write(h2_stream->rbuffer, sldns_buffer_current(h2_session->c->buffer), @@ -2244,7 +2246,7 @@ int http2_submit_dns_response(struct http2_session* h2_session) data_prd.source.ptr = h2_session; data_prd.read_callback = http2_submit_response_read_callback; ret = nghttp2_submit_response(h2_session->session, h2_stream->stream_id, - headers, 2, &data_prd); + headers, 3, &data_prd); if(ret) { verbose(VERB_QUERY, "http2: set_stream_user_data failed, " "error: %s", nghttp2_strerror(ret)); diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h index 4bbde0691..9d6ea2c33 100644 --- a/services/listen_dnsport.h +++ b/services/listen_dnsport.h @@ -159,6 +159,7 @@ int resolve_interface_names(struct config_file* cfg, char*** resif, * @param harden_large_queries: whether query size should be limited. * @param http_max_streams: maximum number of HTTP/2 streams per connection. * @param http_endpoint: HTTP endpoint to service queries on + * @param http_notls: no TLS for http downstream * @param tcp_conn_limit: TCP connection limit info. * @param sslctx: nonNULL if ssl context. * @param dtenv: nonNULL if dnstap enabled. @@ -171,8 +172,9 @@ struct listen_dnsport* listen_create(struct comm_base* base, struct listen_port* ports, size_t bufsize, int tcp_accept_count, int tcp_idle_timeout, int harden_large_queries, uint32_t http_max_streams, - char* http_endpoint, struct tcl_list* tcp_conn_limit, void* sslctx, - struct dt_env* dtenv, comm_point_callback_type* cb, void *cb_arg); + char* http_endpoint, int http_notls, struct tcl_list* tcp_conn_limit, + void* sslctx, struct dt_env* dtenv, comm_point_callback_type* cb, + void *cb_arg); /** * delete the listening structure diff --git a/services/localzone.c b/services/localzone.c index 6aaf0c055..cad460663 100644 --- a/services/localzone.c +++ b/services/localzone.c @@ -157,7 +157,7 @@ local_zone_create(uint8_t* nm, size_t len, int labs, z->namelen = len; z->namelabs = labs; lock_rw_init(&z->lock); - z->region = regional_create_custom(sizeof(struct regional)); + z->region = regional_create_nochunk(sizeof(struct regional)); if(!z->region) { free(z); return NULL; diff --git a/services/mesh.c b/services/mesh.c index 52ff97e4a..cd9050936 100644 --- a/services/mesh.c +++ b/services/mesh.c @@ -1196,6 +1196,12 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, /* Copy the client's EDNS for later restore, to make sure the edns * compare is with the correct edns options. */ struct edns_data edns_bak = r->edns; + /* briefly set the replylist to null in case the + * meshsendreply calls tcpreqinfo sendreply that + * comm_point_drops because of size, and then the + * null stops the mesh state remove and thus + * reply_list modification and accounting */ + struct mesh_reply* rlist = m->reply_list; /* examine security status */ if(m->s.env->need_to_validate && (!(r->qflags&BIT_CD) || m->s.env->cfg->ignore_cd) && rep && @@ -1218,15 +1224,21 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, r->h2_stream->mesh_state = NULL; } /* send the reply */ - /* We don't reuse the encoded answer if either the previous or current - * response has a local alias. We could compare the alias records - * and still reuse the previous answer if they are the same, but that - * would be complicated and error prone for the relatively minor case. - * So we err on the side of safety. */ - if(prev && prev_buffer && prev->qflags == r->qflags && + /* We don't reuse the encoded answer if: + * - either the previous or current response has a local alias. We could + * compare the alias records and still reuse the previous answer if they + * are the same, but that would be complicated and error prone for the + * relatively minor case. So we err on the side of safety. + * - there are registered callback functions for the given rcode, as these + * need to be called for each reply. */ + if(((rcode != LDNS_RCODE_SERVFAIL && + !m->s.env->inplace_cb_lists[inplace_cb_reply]) || + (rcode == LDNS_RCODE_SERVFAIL && + !m->s.env->inplace_cb_lists[inplace_cb_reply_servfail])) && + prev && prev_buffer && prev->qflags == r->qflags && !prev->local_alias && !r->local_alias && - prev->edns.edns_present == r->edns.edns_present && - prev->edns.bits == r->edns.bits && + prev->edns.edns_present == r->edns.edns_present && + prev->edns.bits == r->edns.bits && prev->edns.udp_size == r->edns.udp_size && edns_opt_list_compare(prev->edns.opt_list, r->edns.opt_list) == 0) { @@ -1236,22 +1248,26 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, sldns_buffer_write_at(r_buffer, 0, &r->qid, sizeof(uint16_t)); sldns_buffer_write_at(r_buffer, 12, r->qname, m->s.qinfo.qname_len); + m->reply_list = NULL; comm_point_send_reply(&r->query_reply); + m->reply_list = rlist; } else if(rcode) { m->s.qinfo.qname = r->qname; m->s.qinfo.local_alias = r->local_alias; if(rcode == LDNS_RCODE_SERVFAIL) { if(!inplace_cb_reply_servfail_call(m->s.env, &m->s.qinfo, &m->s, - rep, rcode, &r->edns, NULL, m->s.region)) + rep, rcode, &r->edns, &r->query_reply, m->s.region)) r->edns.opt_list = NULL; } else { if(!inplace_cb_reply_call(m->s.env, &m->s.qinfo, &m->s, rep, rcode, - &r->edns, NULL, m->s.region)) + &r->edns, &r->query_reply, m->s.region)) r->edns.opt_list = NULL; } error_encode(r_buffer, rcode, &m->s.qinfo, r->qid, r->qflags, &r->edns); + m->reply_list = NULL; comm_point_send_reply(&r->query_reply); + m->reply_list = rlist; } else { size_t udp_size = r->edns.udp_size; r->edns.edns_version = EDNS_ADVERTISED_VERSION; @@ -1261,7 +1277,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, m->s.qinfo.qname = r->qname; m->s.qinfo.local_alias = r->local_alias; if(!inplace_cb_reply_call(m->s.env, &m->s.qinfo, &m->s, rep, - LDNS_RCODE_NOERROR, &r->edns, NULL, m->s.region) || + LDNS_RCODE_NOERROR, &r->edns, &r->query_reply, m->s.region) || !apply_edns_options(&r->edns, &edns_bak, m->s.env->cfg, r->query_reply.c, m->s.region) || @@ -1271,13 +1287,15 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, secure)) { if(!inplace_cb_reply_servfail_call(m->s.env, &m->s.qinfo, &m->s, - rep, LDNS_RCODE_SERVFAIL, &r->edns, NULL, m->s.region)) + rep, LDNS_RCODE_SERVFAIL, &r->edns, &r->query_reply, m->s.region)) r->edns.opt_list = NULL; error_encode(r_buffer, LDNS_RCODE_SERVFAIL, &m->s.qinfo, r->qid, r->qflags, &r->edns); } r->edns = edns_bak; + m->reply_list = NULL; comm_point_send_reply(&r->query_reply); + m->reply_list = rlist; } /* account */ log_assert(m->s.env->mesh->num_reply_addrs > 0); @@ -1365,20 +1383,12 @@ void mesh_query_done(struct mesh_state* mstate) mstate->reply_list = reply_list; } else { struct sldns_buffer* r_buffer = r->query_reply.c->buffer; - struct mesh_reply* rlist = mstate->reply_list; if(r->query_reply.c->tcp_req_info) { r_buffer = r->query_reply.c->tcp_req_info->spool_buffer; prev_buffer = NULL; } - /* briefly set the replylist to null in case the - * meshsendreply calls tcpreqinfo sendreply that - * comm_point_drops because of size, and then the - * null stops the mesh state remove and thus - * reply_list modification and accounting */ - mstate->reply_list = NULL; mesh_send_reply(mstate, mstate->s.return_rcode, rep, r, r_buffer, prev, prev_buffer); - mstate->reply_list = rlist; if(r->query_reply.c->tcp_req_info) { tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate); r_buffer = NULL; @@ -1894,7 +1904,7 @@ mesh_serve_expired_callback(void* arg) { struct mesh_state* mstate = (struct mesh_state*) arg; struct module_qstate* qstate = &mstate->s; - struct mesh_reply* r, *rlist; + struct mesh_reply* r; struct mesh_area* mesh = qstate->env->mesh; struct dns_msg* msg; struct mesh_cb* c; @@ -1999,15 +2009,8 @@ mesh_serve_expired_callback(void* arg) r_buffer = r->query_reply.c->buffer; if(r->query_reply.c->tcp_req_info) r_buffer = r->query_reply.c->tcp_req_info->spool_buffer; - /* briefly set the replylist to null in case the meshsendreply - * calls tcpreqinfo sendreply that comm_point_drops because - * of size, and then the null stops the mesh state remove and - * thus reply_list modification and accounting */ - rlist = mstate->reply_list; - mstate->reply_list = NULL; mesh_send_reply(mstate, LDNS_RCODE_NOERROR, msg->rep, r, r_buffer, prev, prev_buffer); - mstate->reply_list = rlist; if(r->query_reply.c->tcp_req_info) tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate); prev = r; diff --git a/services/rpz.c b/services/rpz.c index ba5dd186d..13304652c 100644 --- a/services/rpz.c +++ b/services/rpz.c @@ -440,6 +440,8 @@ err: respip_set_delete(r->respip_set); if(r->taglist) free(r->taglist); + if(r->region) + regional_destroy(r->region); free(r); } return NULL; diff --git a/smallapp/unbound-control-setup.sh.in b/smallapp/unbound-control-setup.sh.in index 3e506e84e..eaf1d082c 100644 --- a/smallapp/unbound-control-setup.sh.in +++ b/smallapp/unbound-control-setup.sh.in @@ -120,12 +120,19 @@ if [ ! -f "$SVR_BASE.key" ]; then fi cat >server.cnf <path; headers[2].name = (uint8_t*)":scheme"; - headers[2].value = (uint8_t*)"https"; + if(h2_session->ssl) + headers[2].value = (uint8_t*)"https"; + else + headers[2].value = (uint8_t*)"http"; headers[3].name = (uint8_t*)":authority"; headers[3].value = (uint8_t*)h2_session->authority; headers[4].name = (uint8_t*)"content-type"; @@ -246,6 +250,7 @@ static ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), { struct http2_session* h2_session = (struct http2_session*)cb_arg; int r; + ssize_t ret; struct timeval tv, *waittv; fd_set rfd; ERR_clear_error(); @@ -267,35 +272,58 @@ static ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), return NGHTTP2_ERR_WOULDBLOCK; } - r = SSL_read(h2_session->ssl, buf, len); - if(r <= 0) { - int want = SSL_get_error(h2_session->ssl, r); - if(want == SSL_ERROR_ZERO_RETURN) { + if(h2_session->ssl) { + r = SSL_read(h2_session->ssl, buf, len); + if(r <= 0) { + int want = SSL_get_error(h2_session->ssl, r); + if(want == SSL_ERROR_ZERO_RETURN) { + return NGHTTP2_ERR_EOF; + } + log_crypto_err("could not SSL_read"); return NGHTTP2_ERR_EOF; } - log_crypto_err("could not SSL_read"); + return r; + } + + ret = read(h2_session->fd, buf, len); + if(ret == 0) { + return NGHTTP2_ERR_EOF; + } else if(ret < 0) { + log_err("could not http2 read: %s", strerror(errno)); return NGHTTP2_ERR_EOF; } - return r; + return ret; } static ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session), const uint8_t* buf, size_t len, int ATTR_UNUSED(flags), void* cb_arg) { struct http2_session* h2_session = (struct http2_session*)cb_arg; + ssize_t ret; - int r; - ERR_clear_error(); - r = SSL_write(h2_session->ssl, buf, len); - if(r <= 0) { - int want = SSL_get_error(h2_session->ssl, r); - if(want == SSL_ERROR_ZERO_RETURN) { + if(h2_session->ssl) { + int r; + ERR_clear_error(); + r = SSL_write(h2_session->ssl, buf, len); + if(r <= 0) { + int want = SSL_get_error(h2_session->ssl, r); + if(want == SSL_ERROR_ZERO_RETURN) { + return NGHTTP2_ERR_CALLBACK_FAILURE; + } + log_crypto_err("could not SSL_write"); return NGHTTP2_ERR_CALLBACK_FAILURE; } - log_crypto_err("could not SSL_write"); + return r; + } + + ret = write(h2_session->fd, buf, len); + if(ret == 0) { + return NGHTTP2_ERR_CALLBACK_FAILURE; + } else if(ret < 0) { + log_err("could not http2 write: %s", strerror(errno)); return NGHTTP2_ERR_CALLBACK_FAILURE; } - return r; + return ret; } static int http2_stream_close_cb(nghttp2_session* ATTR_UNUSED(session), @@ -459,7 +487,7 @@ http2_read(struct http2_session* h2_session) } static void -run(struct http2_session* h2_session, int port, int count, char** q) +run(struct http2_session* h2_session, int port, int no_tls, int count, char** q) { int i; SSL_CTX* ctx = NULL; @@ -470,26 +498,28 @@ run(struct http2_session* h2_session, int port, int count, char** q) fd = open_svr(h2_session->authority, port); h2_session->fd = fd; - ctx = connect_sslctx_create(NULL, NULL, NULL, 0); - if(!ctx) fatal_exit("cannot create ssl ctx"); - SSL_CTX_set_alpn_protos(ctx, (const unsigned char *)"\x02h2", 3); - ssl = outgoing_ssl_fd(ctx, fd); - if(!ssl) { - printf("cannot create ssl\n"); - exit(1); - } - h2_session->ssl = ssl; - while(1) { - int r; - ERR_clear_error(); - if( (r=SSL_do_handshake(ssl)) == 1) - break; - r = SSL_get_error(ssl, r); - if(r != SSL_ERROR_WANT_READ && - r != SSL_ERROR_WANT_WRITE) { - log_crypto_err("could not ssl_handshake"); + if(!no_tls) { + ctx = connect_sslctx_create(NULL, NULL, NULL, 0); + if(!ctx) fatal_exit("cannot create ssl ctx"); + SSL_CTX_set_alpn_protos(ctx, (const unsigned char *)"\x02h2", 3); + ssl = outgoing_ssl_fd(ctx, fd); + if(!ssl) { + printf("cannot create ssl\n"); exit(1); } + h2_session->ssl = ssl; + while(1) { + int r; + ERR_clear_error(); + if( (r=SSL_do_handshake(ssl)) == 1) + break; + r = SSL_get_error(ssl, r); + if(r != SSL_ERROR_WANT_READ && + r != SSL_ERROR_WANT_WRITE) { + log_crypto_err("could not ssl_handshake"); + exit(1); + } + } } http2_submit_setting(h2_session); @@ -511,9 +541,13 @@ run(struct http2_session* h2_session, int port, int count, char** q) /* shutdown */ http2_session_delete(h2_session); - SSL_shutdown(ssl); - SSL_free(ssl); - SSL_CTX_free(ctx); + if(ssl) { + SSL_shutdown(ssl); + SSL_free(ssl); + } + if(ctx) { + SSL_CTX_free(ctx); + } close(fd); } @@ -524,10 +558,21 @@ extern char* optarg; int main(int argc, char** argv) { int c; - int port = UNBOUND_DNS_OVER_HTTPS_PORT; - struct http2_session* h2_session = http2_session_create(); - if(!h2_session) fatal_exit("out of memory"); + int port = UNBOUND_DNS_OVER_HTTPS_PORT, no_tls = 0; + struct http2_session* h2_session; +#ifdef USE_WINSOCK + WSADATA wsa_data; + if(WSAStartup(MAKEWORD(2,2), &wsa_data) != 0) { + printf("WSAStartup failed\n"); + return 1; + } +#endif + log_init(0, 0, 0); + checklock_start(); + + h2_session = http2_session_create(); + if(!h2_session) fatal_exit("out of memory"); if(argc == 1) { usage(argv); } @@ -537,7 +582,7 @@ int main(int argc, char** argv) h2_session->endpoint = "/dns-query"; h2_session->content_type = "application/dns-message"; - while((c=getopt(argc, argv, "c:e:hs:p:P")) != -1) { + while((c=getopt(argc, argv, "c:e:hns:p:P")) != -1) { switch(c) { case 'c': h2_session->content_type = optarg; @@ -545,6 +590,9 @@ int main(int argc, char** argv) case 'e': h2_session->endpoint = optarg; break; + case 'n': + no_tls = 1; + break; case 'p': if(atoi(optarg)==0 && strcmp(optarg,"0")!=0) { printf("error parsing port, " @@ -573,8 +621,12 @@ int main(int argc, char** argv) } - run(h2_session, port, argc, argv); + run(h2_session, port, no_tls, argc, argv); + checklock_stop(); +#ifdef USE_WINSOCK + WSACleanup(); +#endif return 0; } #else diff --git a/testcode/fake_event.c b/testcode/fake_event.c index 558c592a7..503fe5b3a 100644 --- a/testcode/fake_event.c +++ b/testcode/fake_event.c @@ -872,6 +872,7 @@ listen_create(struct comm_base* base, struct listen_port* ATTR_UNUSED(ports), int ATTR_UNUSED(harden_large_queries), uint32_t ATTR_UNUSED(http_max_streams), char* ATTR_UNUSED(http_endpoint), + int ATTR_UNUSED(http_notls), struct tcl_list* ATTR_UNUSED(tcp_conn_limit), void* ATTR_UNUSED(sslctx), struct dt_env* ATTR_UNUSED(dtenv), comm_point_callback_type* cb, void *cb_arg) diff --git a/testcode/run_vm.sh b/testcode/run_vm.sh index 5f599e144..363a32b52 100644 --- a/testcode/run_vm.sh +++ b/testcode/run_vm.sh @@ -40,6 +40,8 @@ cleanup() { exit 0 } trap cleanup INT +# stop tests from notifying systemd, if that is compiled in. +export -n NOTIFY_SOCKET for t in $RUNLIST do diff --git a/testcode/testbound.c b/testcode/testbound.c index 602dffaff..3f3e106b0 100644 --- a/testcode/testbound.c +++ b/testcode/testbound.c @@ -362,6 +362,10 @@ main(int argc, char* argv[]) /* we do not want the test to depend on the timezone */ (void)putenv("TZ=UTC"); memset(pass_argv, 0, sizeof(pass_argv)); +#ifdef HAVE_SYSTEMD + /* we do not want the test to use systemd daemon startup notification*/ + (void)unsetenv("NOTIFY_SOCKET"); +#endif /* HAVE_SYSTEMD */ log_init(NULL, 0, NULL); /* determine commandline options for the daemon */ diff --git a/testdata/dnstap.tdir/dnstap.pre b/testdata/dnstap.tdir/dnstap.pre index 95216949c..6561d77e9 100644 --- a/testdata/dnstap.tdir/dnstap.pre +++ b/testdata/dnstap.tdir/dnstap.pre @@ -45,7 +45,7 @@ fi # make config file sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < dnstap.conf > ub.conf # start unbound in the background -$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +$PRE/unbound -d -c ub.conf -vvvv >unbound.log 2>&1 & UNBOUND_PID=$! echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test diff --git a/testdata/dnstap.tdir/dnstap.test b/testdata/dnstap.tdir/dnstap.test index d548e2dad..fbf8565ff 100644 --- a/testdata/dnstap.tdir/dnstap.test +++ b/testdata/dnstap.tdir/dnstap.test @@ -59,6 +59,8 @@ dig @127.0.0.1 -p $UNBOUND_PORT q7.example.net. dig @127.0.0.1 -p $UNBOUND_PORT q8.example.net. dig @127.0.0.1 -p $UNBOUND_PORT q9.example.net. dig @127.0.0.1 -p $UNBOUND_PORT q10.example.net. +echo "> wait for log to happen on timer" +sleep 3 for x in q1 q2 q3 q4 5 q6 q7 q8 q9 q10; do if grep "$x.example.net" tap.log >/dev/null; then :; else sleep 1; fi if grep "$x.example.net" tap.log >/dev/null; then :; else sleep 1; fi diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf new file mode 100644 index 000000000..bdca45645 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf @@ -0,0 +1,28 @@ +server: + verbosity: 2 + # num-threads: 1 + interface: 127.0.0.1@@PORT@ + https-port: @PORT@ + tls-service-key: "unbound_server.key" + tls-service-pem: "unbound_server.pem" + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + http-query-buffer-size: 1G + http-response-buffer-size: 1G + http-max-streams: 200 + http-notls-downstream: yes + + local-zone: "example.net" static + local-data: "www1.example.net. IN A 1.2.3.1" + local-data: "www2.example.net. IN A 1.2.3.2" + local-data: "www3.example.net. IN A 1.2.3.3" + local-zone: "drop.net" deny + tcp-upstream: yes + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc new file mode 100644 index 000000000..4b908e052 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc @@ -0,0 +1,16 @@ +BaseName: doh_downstream_notls +Version: 1.0 +Description: Test DNS-over-HTTP query processing with no-tls +CreationDate: Mon Jun 12 12:00:00 CET 2020 +Maintainer: +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: doh_downstream_notls.pre +Post: doh_downstream_notls.post +Test: doh_downstream_notls.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post new file mode 100644 index 000000000..3ceaeade8 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post @@ -0,0 +1,13 @@ +# #-- doh_downstream_notls.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +PRE="../.." +if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi +. ../common.sh +kill_pid $FWD_PID +kill_pid $UNBOUND_PID +cat unbound.log diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre new file mode 100644 index 000000000..e1f30a575 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre @@ -0,0 +1,33 @@ +# #-- doh_downstream_notls.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +PRE="../.." +. ../common.sh +if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi + +get_random_port 2 +UNBOUND_PORT=$RND_PORT +FWD_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test + +# start forwarder +get_ldns_testns +$LDNS_TESTNS -p $FWD_PORT doh_downstream_notls.testns >fwd.log 2>&1 & +FWD_PID=$! +echo "FWD_PID=$FWD_PID" >> .tpkg.var.test + +# make config file +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_notls.conf > ub.conf +# start unbound in the background +$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 & +UNBOUND_PID=$! +echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test + +cat .tpkg.var.test +wait_ldns_testns_up fwd.log +wait_unbound_up unbound.log + diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.test b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.test new file mode 100644 index 000000000..87ff560d3 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.test @@ -0,0 +1,339 @@ +# #-- doh_downstream_notls.test --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +PRE="../.." +. ../common.sh +if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi +get_make +(cd $PRE; $MAKE dohclient) + + +# this test query should just work (server is up) +echo "> query www1.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +echo "OK" + +# multiple requests (from localdata) +echo "> query www1.example.net. www2.example.net. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.net" outfile | grep "1.2.3.2"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + +# out of order requests, the example.com elements take 2 seconds to wait. +echo "" +echo "> query www1.example.net. www.example.com. www2.example.net. www2.example.com. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www2.example.com. A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.net" outfile | grep "1.2.3.2"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www.example.com" outfile | grep "10.20.30.40"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.com" outfile | grep "10.20.30.42"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + +# out of order requests, the example.com elements take 2 seconds to wait. +# www.example.com present twice, answered twice. +echo "" +echo "> query www1.example.net. www.example.com. www2.example.net. www.example.com. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www.example.com. A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.net" outfile | grep "1.2.3.2"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www.example.com" outfile | grep "10.20.30.40"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + +# out of order requests, the example.com elements take 2 seconds to wait. +# www3.example.com present twice, answered twice. +echo "" +echo "> query www1.example.net. www3.example.com. www2.example.net. www3.example.com. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www3.example.com. A IN www2.example.net A IN www3.example.com. A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.net" outfile | grep "1.2.3.2"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.com" outfile | grep "10.20.30.43"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + +echo "" +echo "> query www4.example.com. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www4.example.com. A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www4.example.com" outfile | grep "10.20.30.44"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + + +echo "" +echo "> query a1.example.com. - a90.example.com." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www6.example.com. A IN a1.a.example.com. A IN a2.a.example.com. A IN a3.a.example.com. A IN a4.a.example.com. A IN a5.a.example.com. A IN a6.a.example.com. A IN a7.a.example.com. A IN a8.a.example.com. A IN a9.a.example.com. A IN a10.a.example.com. A IN a11.a.example.com. A IN a12.a.example.com. A IN a13.a.example.com. A IN a14.a.example.com. A IN a15.a.example.com. A IN a16.a.example.com. A IN a17.a.example.com. A IN a18.a.example.com. A IN a19.a.example.com. A IN a20.a.example.com. A IN a21.a.example.com. A IN a22.a.example.com. A IN a23.a.example.com. A IN a24.a.example.com. A IN a25.a.example.com. A IN a26.a.example.com. A IN a27.a.example.com. A IN a28.a.example.com. A IN a29.a.example.com. A IN a30.a.example.com. A IN a31.a.example.com. A IN a32.a.example.com. A IN a33.a.example.com. A IN a34.a.example.com. A IN a35.a.example.com. A IN a36.a.example.com. A IN a37.a.example.com. A IN a38.a.example.com. A IN a39.a.example.com. A IN a40.a.example.com. A IN a41.a.example.com. A IN a42.a.example.com. A IN a43.a.example.com. A IN a44.a.example.com. A IN a45.a.example.com. A IN a46.a.example.com. A IN a47.a.example.com. A IN a48.a.example.com. A IN a49.a.example.com. A IN a50.a.example.com. A IN a51.a.example.com. A IN a52.a.example.com. A IN a53.a.example.com. A IN a54.a.example.com. A IN a55.a.example.com. A IN a56.a.example.com. A IN a57.a.example.com. A IN a58.a.example.com. A IN a59.a.example.com. A IN a60.a.example.com. A IN a61.a.example.com. A IN a62.a.example.com. A IN a63.a.example.com. A IN a64.a.example.com. A IN a65.a.example.com. A IN a66.a.example.com. A IN a67.a.example.com. A IN a68.a.example.com. A IN a69.a.example.com. A IN a70.a.example.com. A IN a71.a.example.com. A IN a72.a.example.com. A IN a73.a.example.com. A IN a74.a.example.com. A IN a75.a.example.com. A IN a76.a.example.com. A IN a77.a.example.com. A IN a78.a.example.com. A IN a79.a.example.com. A IN a80.a.example.com. A IN a81.a.example.com. A IN a82.a.example.com. A IN a83.a.example.com. A IN a84.a.example.com. A IN a85.a.example.com. A IN a86.a.example.com. A IN a87.a.example.com. A IN a88.a.example.com. A IN a89.a.example.com. A IN a90.a.example.com. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +num_ans=$(grep -B 3 "a.example.com. IN A" outfile | grep "rcode: NOERROR" | wc -l ) +if test "$num_ans" -ne 90; then + echo "number of answers not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi + +echo "OK" +exit 0 diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns new file mode 100644 index 000000000..c53941b67 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns @@ -0,0 +1,74 @@ +; nameserver test file +$ORIGIN example.com. +$TTL 3600 + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www IN A +SECTION ANSWER +www IN A 10.20.30.40 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id +SECTION QUESTION +www2 IN A +SECTION ANSWER +www2 IN A 10.20.30.42 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id +SECTION QUESTION +www3 IN A +SECTION ANSWER +www3 IN A 10.20.30.43 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www4 IN A +SECTION ANSWER +www4 IN A 10.20.30.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www5 IN A +SECTION ANSWER +www5 IN A 10.20.30.45 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www6 IN A +SECTION ANSWER +www6 IN A 10.20.30.46 +ENTRY_END + +; lots of noerror/nodata answers for other queries (a.. queries) +ENTRY_BEGIN +MATCH opcode qtype subdomain +REPLY QR AA NOERROR +ADJUST copy_id copy_query +SECTION QUESTION +a.example.com. IN A +SECTION AUTHORITY +example.com. IN SOA ns hostmaster 2019 28800 7200 604800 3600 +ENTRY_END diff --git a/testdata/doh_downstream_notls.tdir/unbound_server.key b/testdata/doh_downstream_notls.tdir/unbound_server.key new file mode 100644 index 000000000..4256c421d --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/unbound_server.key @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICWwIBAAKBgQC3F7Jsv2u01pLL9rFnjsMU/IaCFUIz/624DcaE84Z4gjMl5kWA +3axQcqul1wlwSrbKwrony+d9hH/+MX0tZwvl8w3OmhmOAiaQ+SHCsIuOjVwQjX0s +RLB61Pz5+PAiVvnPa9JIYB5QrK6DVEsxIHj8MOc5JKORrnESsFDh6yeMeQIDAQAB +AoGAAuWoGBprTOA8UGfl5LqYkaNxSWumsYXxLMFjC8WCsjN1NbtQDDr1uAwodSZS +6ujzvX+ZTHnofs7y64XC8k34HTOCD2zlW7kijWbT8YjRYFU6o9F5zUGD9RCan0ds +sVscT2psLSzfdsmFAcbmnGdxYkXk2PC1FHtaqExxehralGUCQQDcqrg9uQKXlhQi +XAaPr8SiWvtRm2a9IMMZkRfUWZclPHq6fCWNuUaCD+cTat4wAuqeknAz33VEosw3 +fXGsok//AkEA1GjIHXrOcSlpfVJb6NeOBugjRtZ7ZDT5gbtnMS9ob0qntKV6saaL +CNmJwuD9Q3XkU5j1+uHvYGP2NzcJd2CjhwJACV0hNlVMe9w9fHvFN4Gw6WbM9ViP +0oS6YrJafYNTu5vGZXVxLoNnL4u3NYa6aPUmuZXjNwBLfJ8f5VboZPf6RwJAINd2 +oYA8bSi/A755MX4qmozH74r4Fx1Nuq5UHTm8RwDe/0Javx8F/j9MWpJY9lZDEF3l +In5OebPa/NyInSmW/wJAZuP9aRn0nDBkHYri++1A7NykMiJ/nH0mDECbnk+wxx0S +LwqIetBhxb8eQwMg45+iAH7CHAMQ8BQuF/nFE6eotg== +-----END RSA PRIVATE KEY----- diff --git a/testdata/doh_downstream_notls.tdir/unbound_server.pem b/testdata/doh_downstream_notls.tdir/unbound_server.pem new file mode 100644 index 000000000..aeda3ff11 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/unbound_server.pem @@ -0,0 +1,11 @@ +-----BEGIN CERTIFICATE----- +MIIBmzCCAQQCCQDsNJ1UmphEFzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDEwd1 +bmJvdW5kMB4XDTA4MDkxMTA5MDk0MFoXDTI4MDUyOTA5MDk0MFowEjEQMA4GA1UE +AxMHdW5ib3VuZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtxeybL9rtNaS +y/axZ47DFPyGghVCM/+tuA3GhPOGeIIzJeZFgN2sUHKrpdcJcEq2ysK6J8vnfYR/ +/jF9LWcL5fMNzpoZjgImkPkhwrCLjo1cEI19LESwetT8+fjwIlb5z2vSSGAeUKyu +g1RLMSB4/DDnOSSjka5xErBQ4esnjHkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAZ +9N0lnLENs4JMvPS+mn8C5m9bkkFITd32IiLjf0zgYpIUbFXH6XaEr9GNZBUG8feG +l/6WRXnbnVSblI5odQ4XxGZ9inYY6qtW30uv76HvoKp+QZ1c3460ddR8NauhcCHH +Z7S+QbLXi+r2JAhpPozZCjBHlRD0ixzA1mKQTJhJZg== +-----END CERTIFICATE----- diff --git a/util/config_file.c b/util/config_file.c index ca8a7060f..5e4c9c8dd 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -170,6 +170,7 @@ config_create(void) cfg->infra_cache_slabs = 4; cfg->infra_cache_numhosts = 10000; cfg->infra_cache_min_rtt = 50; + cfg->infra_keep_probing = 0; cfg->delay_close = 0; if(!(cfg->outgoing_avail_ports = (int*)calloc(65536, sizeof(int)))) goto error_exit; @@ -522,11 +523,12 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_STR("tls-ciphersuites:", tls_ciphersuites) else S_YNO("tls-use-sni:", tls_use_sni) else S_NUMBER_NONZERO("https-port:", https_port) - else S_STR("http-endpoint", http_endpoint) - else S_NUMBER_NONZERO("http-max-streams", http_max_streams) - else S_MEMSIZE("http-query-buffer-size", http_query_buffer_size) - else S_MEMSIZE("http-response-buffer-size", http_response_buffer_size) - else S_YNO("http-nodelay", http_nodelay) + else S_STR("http-endpoint:", http_endpoint) + else S_NUMBER_NONZERO("http-max-streams:", http_max_streams) + else S_MEMSIZE("http-query-buffer-size:", http_query_buffer_size) + else S_MEMSIZE("http-response-buffer-size:", http_response_buffer_size) + else S_YNO("http-nodelay:", http_nodelay) + else S_YNO("http-notls-downstream:", http_notls_downstream) else S_YNO("interface-automatic:", if_automatic) else S_YNO("use-systemd:", use_systemd) else S_YNO("do-daemonize:", do_daemonize) @@ -562,6 +564,7 @@ int config_set_option(struct config_file* cfg, const char* opt, IS_NUMBER_OR_ZERO; cfg->infra_cache_min_rtt = atoi(val); RTT_MIN_TIMEOUT=cfg->infra_cache_min_rtt; } + else S_YNO("infra-keep-probing:", infra_keep_probing) else S_NUMBER_OR_ZERO("infra-host-ttl:", host_ttl) else S_POW2("infra-cache-slabs:", infra_cache_slabs) else S_SIZET_NONZERO("infra-cache-numhosts:", infra_cache_numhosts) @@ -958,6 +961,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_DEC(opt, "infra-host-ttl", host_ttl) else O_DEC(opt, "infra-cache-slabs", infra_cache_slabs) else O_DEC(opt, "infra-cache-min-rtt", infra_cache_min_rtt) + else O_YNO(opt, "infra-keep-probing", infra_keep_probing) else O_MEM(opt, "infra-cache-numhosts", infra_cache_numhosts) else O_UNS(opt, "delay-close", delay_close) else O_YNO(opt, "do-ip4", do_ip4) @@ -990,6 +994,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_MEM(opt, "http-query-buffer-size", http_query_buffer_size) else O_MEM(opt, "http-response-buffer-size", http_response_buffer_size) else O_YNO(opt, "http-nodelay", http_nodelay) + else O_YNO(opt, "http-notls-downstream", http_notls_downstream) else O_YNO(opt, "use-systemd", use_systemd) else O_YNO(opt, "do-daemonize", do_daemonize) else O_STR(opt, "chroot", chrootdir) diff --git a/util/config_file.h b/util/config_file.h index 401d9d70f..4703e0da6 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -143,6 +143,8 @@ struct config_file { size_t http_response_buffer_size; /** set TCP_NODELAY option for http sockets */ int http_nodelay; + /** Disable TLS for http sockets downstream */ + int http_notls_downstream; /** outgoing port range number of ports (per thread) */ int outgoing_num_ports; @@ -179,6 +181,8 @@ struct config_file { size_t infra_cache_numhosts; /** min value for infra cache rtt */ int infra_cache_min_rtt; + /** keep probing hosts that are down */ + int infra_keep_probing; /** delay close of udp-timeouted ports, if 0 no delayclose. in msec */ int delay_close; diff --git a/util/configlexer.c b/util/configlexer.c index 8db2f8b20..3f41781e6 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -354,8 +354,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 334 -#define YY_END_OF_BUFFER 335 +#define YY_NUM_RULES 336 +#define YY_END_OF_BUFFER 337 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -363,366 +363,369 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[3256] = +static const flex_int16_t yy_accept[3284] = { 0, - 1, 1, 308, 308, 312, 312, 316, 316, 320, 320, - 1, 1, 324, 324, 328, 328, 335, 332, 1, 306, - 306, 333, 2, 333, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 308, 309, 309, 310, - 333, 312, 313, 313, 314, 333, 319, 316, 317, 317, - 318, 333, 320, 321, 321, 322, 333, 331, 307, 2, - 311, 333, 331, 327, 324, 325, 325, 326, 333, 328, - 329, 329, 330, 333, 332, 0, 1, 2, 2, 2, - 2, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 1, 1, 310, 310, 314, 314, 318, 318, 322, 322, + 1, 1, 326, 326, 330, 330, 337, 334, 1, 308, + 308, 335, 2, 335, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 310, 311, 311, 312, + 335, 314, 315, 315, 316, 335, 321, 318, 319, 319, + 320, 335, 322, 323, 323, 324, 335, 333, 309, 2, + 313, 335, 333, 329, 326, 327, 327, 328, 335, 330, + 331, 331, 332, 335, 334, 0, 1, 2, 2, 2, + 2, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 308, 0, 312, - 0, 319, 0, 316, 320, 0, 331, 0, 2, 2, - 331, 327, 0, 324, 328, 0, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 310, 0, 314, + 0, 321, 0, 318, 322, 0, 333, 0, 2, 2, + 333, 329, 0, 326, 330, 0, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 331, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 333, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 122, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 131, 332, 332, 332, 332, 332, 332, - 332, 331, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 124, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 133, 334, 334, 334, 334, 334, 334, + 334, 333, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 106, 332, 332, 332, 332, 332, 332, 8, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 123, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 108, 334, 334, 334, 334, 334, 334, 8, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 125, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 136, 332, 331, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 299, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 138, 334, 333, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 301, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 331, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 333, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 63, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 235, 332, 14, - 15, 332, 19, 18, 332, 332, 219, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 129, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 64, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 237, 334, 14, + 15, 334, 19, 18, 334, 334, 221, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 131, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 217, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 3, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 331, 332, 332, 332, 332, 332, 332, 332, - 293, 332, 332, 292, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 219, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 3, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 333, 334, 334, 334, 334, 334, 334, + 334, 295, 334, 334, 294, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 315, 332, 332, 332, 332, 332, 332, 332, 62, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 66, 332, 266, 332, 332, - 332, 332, 332, 332, 332, 332, 300, 301, 332, 332, - 332, 332, 332, 67, 332, 332, 130, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 317, 334, 334, 334, 334, 334, 334, 334, + 334, 63, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 67, 334, + 268, 334, 334, 334, 334, 334, 334, 334, 334, 302, + 303, 334, 334, 334, 334, 334, 68, 334, 334, 132, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 126, 332, 332, 332, 332, 332, 332, 332, 332, - 206, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 21, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 155, 332, 332, 331, 315, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 104, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 128, 334, 334, 334, 334, 334, + 334, 334, 334, 208, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 21, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 157, 334, 334, 333, 317, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 106, - 332, 332, 332, 332, 274, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 178, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 154, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 103, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 276, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 180, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 156, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 105, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 32, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 33, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 64, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 128, 331, 332, 332, - 332, 332, 332, 121, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 65, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 32, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 33, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 65, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 130, 333, 334, 334, 334, 334, 334, 123, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 66, 334, 334, 334, 334, 334, - 332, 332, 239, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 179, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 53, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 241, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 181, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 54, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 257, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 57, 332, 58, 332, 332, 332, 332, 332, - 107, 332, 108, 332, 332, 332, 332, 105, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 7, 332, 331, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 228, 332, 332, - 332, 332, 157, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 259, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 58, + 334, 59, 334, 334, 334, 334, 334, 109, 334, 110, + 334, 334, 334, 334, 107, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 7, 334, 333, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 230, 334, 334, 334, 334, 159, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 240, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 45, 332, 332, 332, 332, - 332, 332, 332, 332, 54, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 198, - 332, 197, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 16, 17, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 242, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 45, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 55, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 200, 334, + 199, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 68, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 205, 332, 332, 332, 332, - 332, 332, 110, 332, 109, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 189, 332, 332, 332, - 332, 332, 332, 332, 332, 137, 331, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 98, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 87, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 16, 17, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 69, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 207, 334, 334, 334, 334, 334, + 334, 112, 334, 111, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 191, 334, 334, 334, 334, + 334, 334, 334, 334, 139, 333, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 100, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 89, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 218, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 91, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 61, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 192, 193, 332, 332, 332, 268, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 6, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 220, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 93, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 62, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 194, 195, 334, 334, 334, 270, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 272, 332, 332, 332, 332, 332, 332, 294, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 42, - 332, 332, 332, 332, 44, 332, 332, 332, 332, 332, - 332, 332, 332, 51, 332, 332, 332, 332, 332, 332, - 332, 331, 332, 185, 332, 332, 332, 132, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 210, 332, - 186, 332, 332, 332, 225, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 6, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 274, 334, 334, 334, 334, 334, 334, 296, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 42, 334, 334, 334, 334, 44, 334, 334, 334, 334, + 334, 334, 334, 334, 52, 334, 334, 334, 334, 334, + 334, 334, 333, 334, 187, 334, 334, 334, 134, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 212, + 334, 188, 334, 334, 334, 227, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 52, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 134, 115, 332, 116, - 332, 332, 332, 114, 332, 332, 332, 332, 332, 332, - 332, 332, 152, 332, 332, 50, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 256, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 187, 332, 332, 332, 332, 332, 190, 332, 196, 332, - 332, 332, 332, 332, 224, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 102, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 53, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 136, 117, 334, + 118, 334, 334, 334, 116, 334, 334, 334, 334, 334, + 334, 334, 334, 154, 334, 334, 50, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 258, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 189, 334, 334, 334, 334, 334, 192, + 334, 198, 334, 334, 334, 334, 334, 226, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 127, 332, - 332, 332, 332, 332, 332, 59, 332, 332, 332, 26, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 20, - 332, 332, 332, 332, 332, 332, 27, 36, 332, 162, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 331, 332, 332, 332, 332, 332, 332, - 76, 78, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 276, 332, 332, 332, 332, - 236, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 104, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 129, 334, 334, 334, 334, 334, 334, 60, 334, + 334, 334, 26, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 20, 334, 334, 334, 334, 334, 334, 27, + 36, 334, 164, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 333, 334, 334, 334, + 334, 334, 334, 77, 79, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 278, 334, + 334, 334, 334, 238, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 117, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 151, 332, 46, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 287, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 156, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 216, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 297, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 173, 332, 332, 332, 332, 332, 332, 332, 332, 111, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 119, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 153, 334, 46, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 289, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 158, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 218, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 299, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 168, - 332, 180, 332, 332, 332, 332, 331, 332, 140, 332, - 332, 332, 332, 332, 97, 332, 332, 332, 332, 208, - 332, 332, 332, 332, 332, 332, 226, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 248, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 133, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 172, 332, - 332, 332, 332, 332, 332, 79, 80, 332, 332, 332, + 334, 334, 334, 334, 334, 175, 334, 334, 334, 334, + 334, 334, 334, 334, 113, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 170, 334, 182, 334, 334, 334, + 334, 333, 334, 142, 334, 334, 334, 334, 334, 99, + 334, 334, 334, 334, 210, 334, 334, 334, 334, 334, + 334, 228, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 250, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 135, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 60, 290, 332, 332, 332, 332, 332, 86, - 181, 332, 199, 332, 229, 332, 332, 191, 269, 332, - 332, 332, 332, 332, 72, 332, 183, 332, 332, 332, - 332, 332, 9, 332, 332, 332, 101, 332, 332, 332, - 332, 261, 332, 332, 332, 332, 207, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 331, 332, 332, 332, 332, 171, 332, 332, + 334, 334, 334, 334, 174, 334, 334, 334, 334, 334, + 334, 80, 334, 81, 334, 334, 334, 334, 334, 61, + 292, 334, 334, 334, 334, 334, 88, 183, 334, 201, + 334, 231, 334, 334, 193, 271, 334, 334, 334, 334, + 334, 73, 334, 185, 334, 334, 334, 334, 334, 9, + 334, 334, 334, 103, 334, 334, 334, 334, 263, 334, + 334, 334, 334, 209, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 158, 332, - 275, 332, 332, 332, 332, 332, 247, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 220, 332, - 332, 332, 332, 332, 267, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 291, 332, 182, 332, 332, 332, 332, - 332, 332, 332, 71, 73, 332, 332, 332, 332, 332, - 332, 332, 100, 332, 332, 332, 332, 259, 332, 332, - 332, 332, 271, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 333, + 334, 334, 334, 334, 173, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 160, 334, 277, 334, 334, + 334, 334, 334, 249, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 222, 334, 334, 334, 334, + 334, 269, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 293, 334, 184, 334, 334, 334, 334, 334, + 334, 334, 72, 74, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 212, 34, 28, 30, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 35, 332, 29, - 31, 332, 332, 332, 332, 332, 332, 332, 332, 96, - 332, 332, 332, 332, 332, 332, 331, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 214, 211, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 70, 332, - 332, 332, 135, 332, 118, 332, 332, 332, 332, 332, - 332, 332, 332, 153, 47, 332, 332, 323, 13, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 285, 332, + 334, 102, 334, 334, 334, 334, 261, 334, 334, 334, + 334, 273, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 214, 34, 28, 30, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 35, 334, 29, 31, + 334, 334, 334, 334, 334, 334, 334, 334, 98, 334, + 334, 334, 334, 334, 334, 333, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 216, 213, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 71, 334, 334, + 334, 137, 334, 120, 334, 334, 334, 334, 334, 334, - 288, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 12, 332, 332, 22, 332, 332, 332, 265, 332, - 332, 332, 332, 273, 332, 332, 332, 74, 332, 222, - 332, 332, 332, 332, 213, 332, 332, 69, 332, 332, - 332, 332, 23, 332, 43, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 167, 166, 323, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 215, - 209, 332, 227, 332, 332, 277, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 155, 47, 334, 334, 334, 325, 13, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 287, + 334, 290, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 12, 334, 334, 22, 334, 334, 334, 267, + 334, 334, 334, 334, 275, 334, 334, 334, 75, 334, + 224, 334, 334, 334, 334, 215, 334, 334, 70, 334, + 334, 334, 334, 23, 334, 43, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 169, 168, + 325, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 217, 211, 334, 229, 334, 334, 279, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 81, 332, 332, - 332, 260, 332, 332, 332, 332, 195, 332, 332, 332, - 332, 221, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 295, 296, 164, 332, 332, 75, 332, 332, 332, - 332, 174, 332, 332, 112, 113, 332, 332, 332, 332, - 159, 332, 161, 332, 200, 332, 332, 332, 332, 165, - 332, 332, 230, 332, 332, 332, 332, 332, 332, 332, - 142, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 238, 332, 332, 332, 332, 332, 332, - 332, 304, 332, 24, 332, 270, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 82, + 334, 334, 334, 334, 262, 334, 334, 334, 334, 197, + 334, 334, 334, 334, 223, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 297, 298, 166, 334, 334, 76, + 334, 334, 334, 334, 176, 334, 334, 114, 115, 334, + 334, 334, 334, 161, 334, 163, 334, 202, 334, 334, + 334, 334, 167, 334, 334, 232, 334, 334, 334, 334, + 334, 334, 334, 144, 334, 334, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 201, - 332, 332, 258, 332, 289, 332, 194, 332, 332, 332, - 332, 55, 332, 332, 332, 332, 4, 332, 332, 332, - 332, 125, 141, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 233, 37, 38, 332, 332, 332, 332, 332, 332, - 332, 278, 332, 332, 332, 332, 332, 332, 332, 246, - 332, 332, 332, 332, 332, 332, 332, 332, 204, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 84, 332, 56, 264, 332, 234, 332, 332, 332, 332, + 334, 334, 334, 334, 334, 334, 240, 334, 334, 334, + 334, 334, 334, 334, 306, 334, 24, 334, 272, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 86, 203, 334, 334, 260, 334, 291, + 334, 196, 334, 334, 334, 334, 56, 334, 334, 334, + 334, 4, 334, 334, 334, 334, 127, 143, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 235, 37, 38, 334, + 334, 334, 334, 334, 334, 334, 280, 334, 334, 334, + 334, 334, 334, 334, 248, 334, 334, 334, 334, 334, - 11, 332, 332, 332, 332, 332, 332, 124, 332, 332, - 332, 332, 202, 88, 332, 40, 332, 332, 332, 332, - 332, 332, 332, 332, 170, 332, 332, 332, 332, 332, - 144, 332, 332, 332, 332, 237, 332, 332, 332, 332, - 332, 245, 332, 332, 332, 332, 138, 332, 332, 332, - 119, 120, 332, 332, 332, 90, 94, 89, 332, 332, - 332, 82, 332, 332, 332, 332, 332, 10, 332, 332, - 332, 262, 298, 332, 332, 332, 332, 303, 39, 332, - 332, 332, 332, 332, 169, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 206, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 85, 334, 57, 266, + 334, 236, 334, 334, 334, 334, 11, 334, 334, 334, + 334, 334, 334, 126, 334, 334, 334, 334, 204, 90, + 334, 40, 334, 334, 334, 334, 334, 334, 334, 334, + 172, 334, 334, 334, 334, 334, 146, 334, 334, 334, + 334, 239, 334, 334, 334, 334, 334, 247, 334, 334, + 334, 334, 140, 334, 334, 334, 121, 122, 334, 334, + 334, 92, 96, 91, 334, 334, 334, 334, 83, 334, + 334, 334, 334, 334, 10, 334, 334, 334, 264, 300, - 332, 332, 332, 332, 332, 332, 332, 332, 95, 93, - 332, 332, 332, 83, 286, 332, 332, 332, 332, 332, - 332, 332, 188, 332, 332, 332, 332, 332, 203, 332, - 332, 332, 332, 332, 332, 332, 332, 160, 77, 332, - 332, 332, 332, 332, 279, 332, 332, 332, 332, 332, - 332, 332, 242, 332, 332, 241, 139, 332, 332, 92, - 48, 332, 145, 146, 149, 150, 147, 148, 85, 332, - 263, 332, 332, 332, 332, 163, 332, 332, 332, 332, - 332, 232, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 334, 334, 334, 334, 305, 39, 334, 334, 334, 334, + 334, 171, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 97, 95, 334, 51, 334, + 334, 84, 288, 334, 334, 334, 334, 334, 334, 334, + 190, 334, 334, 334, 334, 334, 205, 334, 334, 334, + 334, 334, 334, 334, 334, 162, 78, 334, 334, 334, + 334, 334, 281, 334, 334, 334, 334, 334, 334, 334, + 244, 334, 334, 243, 141, 334, 334, 94, 48, 334, + 147, 148, 151, 152, 149, 150, 87, 334, 265, 334, - 332, 176, 175, 41, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 99, 332, 231, 332, 255, 283, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 305, 332, 49, - 5, 332, 332, 223, 332, 332, 284, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 243, 25, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 244, 332, 332, 332, 143, 332, 332, 332, 332, 332, - 332, 332, 332, 177, 332, 184, 332, 332, 332, 332, + 334, 334, 334, 165, 334, 334, 334, 334, 334, 234, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 178, + 177, 41, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 101, 334, + 233, 334, 257, 285, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 307, 334, 49, 5, 334, + 334, 225, 334, 334, 286, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 245, 25, 334, 334, 334, 334, - 332, 332, 332, 332, 332, 280, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 302, 332, 332, 251, 332, 332, 332, - 332, 332, 281, 332, 332, 332, 332, 332, 332, 282, - 332, 332, 332, 249, 332, 252, 253, 332, 332, 332, - 332, 332, 250, 254, 0 + 334, 334, 334, 334, 334, 334, 334, 334, 246, 334, + 334, 334, 145, 334, 334, 334, 334, 334, 334, 334, + 334, 179, 334, 186, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 282, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 304, 334, 334, 253, 334, 334, 334, 334, 334, + 283, 334, 334, 334, 334, 334, 334, 284, 334, 334, + 334, 251, 334, 254, 255, 334, 334, 334, 334, 334, + 252, 256, 0 } ; static const YY_CHAR yy_ec[256] = @@ -765,17 +768,17 @@ static const YY_CHAR yy_meta[41] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static const flex_int16_t yy_base[3274] = +static const flex_int16_t yy_base[3302] = { 0, 0, 0, 38, 41, 44, 46, 59, 65, 71, 77, - 90, 112, 96, 118, 124, 136, 3165, 3121, 81, 6361, - 6361, 6361, 129, 52, 130, 63, 131, 152, 70, 140, + 90, 112, 96, 118, 124, 136, 4025, 3851, 81, 6409, + 6409, 6409, 129, 52, 130, 63, 131, 152, 70, 140, 149, 156, 57, 88, 76, 173, 175, 95, 184, 145, - 185, 205, 194, 204, 178, 123, 3093, 6361, 6361, 6361, - 107, 2724, 6361, 6361, 6361, 154, 2535, 2515, 6361, 6361, - 6361, 226, 2454, 6361, 6361, 6361, 163, 2353, 6361, 238, - 6361, 242, 148, 2067, 1986, 6361, 6361, 6361, 246, 1743, - 6361, 6361, 6361, 250, 1651, 254, 219, 0, 258, 0, + 185, 205, 194, 204, 178, 123, 2749, 6409, 6409, 6409, + 107, 2656, 6409, 6409, 6409, 154, 2610, 2162, 6409, 6409, + 6409, 226, 2040, 6409, 6409, 6409, 163, 1972, 6409, 238, + 6409, 242, 148, 1845, 1693, 6409, 6409, 6409, 246, 1651, + 6409, 6409, 6409, 250, 1521, 254, 219, 0, 258, 0, 0, 165, 250, 191, 215, 243, 252, 256, 92, 260, 261, 262, 264, 265, 266, 273, 270, 277, 278, 281, @@ -783,7 +786,7 @@ static const flex_int16_t yy_base[3274] = 313, 314, 307, 323, 317, 312, 328, 326, 330, 334, 337, 340, 342, 343, 344, 346, 349, 354, 348, 356, 364, 357, 361, 359, 372, 376, 365, 360, 377, 380, - 384, 385, 387, 388, 391, 399, 389, 1400, 411, 1203, + 384, 385, 387, 388, 391, 399, 389, 1437, 411, 1203, 415, 1088, 422, 1027, 689, 426, 406, 430, 434, 0, 411, 280, 438, 233, 181, 442, 430, 442, 419, 438, 439, 441, 440, 443, 444, 445, 446, 449, 463, 455, @@ -805,9 +808,9 @@ static const flex_int16_t yy_base[3274] = 745, 743, 747, 749, 750, 766, 754, 739, 759, 767, 758, 760, 768, 774, 793, 779, 781, 789, 790, 791, 795, 797, 805, 807, 796, 809, 803, 810, 812, 813, - 822, 818, 6361, 817, 820, 833, 826, 834, 835, 836, + 822, 818, 6409, 817, 820, 833, 826, 834, 835, 836, 841, 842, 823, 849, 847, 848, 852, 874, 856, 858, - 854, 863, 866, 6361, 864, 868, 898, 870, 872, 892, + 854, 863, 866, 6409, 864, 868, 898, 870, 872, 892, 888, 884, 887, 889, 899, 896, 909, 902, 907, 911, 922, 918, 919, 920, 921, 924, 930, 937, 932, 934, @@ -817,683 +820,691 @@ static const flex_int16_t yy_base[3274] = 1006, 1007, 1013, 1009, 1008, 1017, 1019, 1021, 1022, 1023, 1024, 1035, 1030, 1031, 1033, 1037, 1038, 1039, 1041, 1044, 1045, 1047, 1049, 1051, 1050, 1056, 1060, 1058, 1066, 1061, - 6361, 1068, 1070, 1072, 1073, 1074, 1075, 6361, 1077, 1071, + 6409, 1068, 1070, 1072, 1073, 1074, 1075, 6409, 1077, 1071, 1076, 1078, 1090, 1093, 1104, 1081, 1085, 1100, 1103, 1101, 1105, 1113, 1109, 1114, 1116, 1112, 1118, 1119, 1121, 1124, - 1122, 1125, 1130, 1131, 1132, 1133, 1152, 6361, 1136, 1139, + 1122, 1125, 1130, 1131, 1132, 1133, 1152, 6409, 1136, 1139, 1144, 1138, 1143, 1145, 1164, 1150, 1162, 1161, 1170, 1181, 1174, 1182, 1176, 1163, 1187, 1184, 1191, 1189, 1193, 1195, - 1194, 1196, 1197, 1198, 1200, 1201, 1206, 6361, 1208, 1211, + 1194, 1196, 1197, 1198, 1200, 1201, 1206, 6409, 1208, 1211, 1220, 1221, 1222, 1223, 1224, 1225, 1137, 1226, 1228, 1227, 1231, 1235, 1245, 1252, 1236, 1253, 1239, 1254, 1249, 1250, 1256, 1259, 1258, 1260, 1270, 1266, 1272, 1281, 1284, 1283, 1286, 1293, 1295, 1275, 1288, 1298, 1268, 1290, 1291, 1302, 1292, 1303, 1304, 1306, 1313, 1308, 1311, 1314, 1316, 1317, 1320, 1315, 1322, 1321, 1324, 1331, 1328, 1332, 1339, 1334, - 1340, 1338, 1343, 1345, 1348, 1349, 1354, 6361, 1361, 1357, + 1340, 1338, 1343, 1348, 1349, 1355, 1345, 6409, 1363, 1358, - 1362, 1360, 1367, 1368, 1370, 1358, 1373, 1376, 1377, 1379, - 1378, 1381, 1385, 1382, 1387, 1388, 1392, 1395, 1393, 1402, - 1409, 1408, 1410, 1396, 1412, 1419, 1416, 1423, 1422, 1418, - 1424, 1433, 1428, 1431, 1430, 1440, 1420, 1436, 1437, 1438, - 1446, 1448, 1451, 1459, 1452, 1456, 1463, 1465, 1460, 1232, - 1467, 1468, 1471, 1472, 1473, 1474, 1475, 1482, 1477, 1478, - 1479, 1483, 1484, 1480, 1488, 1492, 1503, 1496, 1501, 1504, - 1505, 1508, 1509, 1506, 1511, 1514, 1515, 1516, 1517, 1518, - 1526, 1520, 1525, 1528, 1535, 1537, 1538, 1541, 1543, 1544, - 1545, 1546, 1555, 1547, 1556, 1558, 1548, 1559, 1561, 1564, + 1361, 1362, 1365, 1368, 1372, 1373, 1374, 1375, 1378, 1376, + 1379, 1384, 1385, 1386, 1380, 1393, 1395, 1403, 1398, 1387, + 1411, 1410, 1401, 1400, 1412, 1420, 1416, 1423, 1419, 1415, + 1424, 1431, 1428, 1432, 1433, 1442, 1427, 1434, 1439, 1435, + 1447, 1449, 1451, 1463, 1450, 1459, 1466, 1467, 1458, 1232, + 1461, 1470, 1471, 1473, 1474, 1475, 1476, 1484, 1477, 1479, + 1482, 1485, 1486, 1487, 1490, 1493, 1501, 1498, 1499, 1503, + 1505, 1509, 1507, 1510, 1514, 1515, 1516, 1518, 1517, 1519, + 1536, 1527, 1528, 1529, 1537, 1538, 1530, 1544, 1541, 1545, + 1551, 1547, 1555, 1553, 1556, 1559, 1561, 1564, 1562, 1565, - 1571, 1566, 1572, 1575, 1576, 1578, 1577, 1580, 1581, 1588, - 1589, 1593, 6361, 1585, 1601, 1583, 1596, 1597, 1599, 1605, - 1612, 1607, 1610, 1608, 1611, 1613, 1637, 6361, 1614, 6361, - 6361, 315, 6361, 6361, 1616, 1621, 6361, 1622, 1631, 1618, - 1641, 1619, 1643, 1647, 1630, 1638, 1635, 1660, 1661, 1664, - 1632, 1666, 1667, 1650, 1672, 1670, 1677, 1678, 1681, 1682, - 1689, 1687, 1690, 1686, 1697, 1695, 1699, 1703, 1705, 1707, - 1710, 1692, 1712, 1713, 1715, 1717, 1718, 1714, 1721, 1723, - 1720, 1727, 1726, 1736, 1732, 1741, 1750, 6361, 1742, 1751, - 1752, 1753, 1760, 1728, 1755, 1756, 1763, 1766, 1759, 1757, + 1566, 1572, 1567, 1577, 1578, 1580, 1579, 1583, 1587, 1585, + 1590, 1589, 6409, 1591, 1603, 1592, 1601, 1599, 1602, 1604, + 1613, 1606, 1608, 1616, 1617, 1609, 1643, 6409, 1618, 6409, + 6409, 315, 6409, 6409, 1619, 1620, 6409, 1624, 1623, 1621, + 1631, 1638, 1640, 1625, 1646, 1644, 1647, 1656, 1668, 1649, + 1653, 1659, 1657, 1660, 1678, 1666, 1673, 1676, 1679, 1685, + 1695, 1683, 1696, 1693, 1700, 1701, 1706, 1707, 1709, 1713, + 1715, 1716, 1699, 1719, 1720, 1703, 1721, 1724, 1726, 1730, + 1731, 1727, 1734, 1733, 1742, 1738, 1748, 1757, 6409, 1749, + 1758, 1759, 1760, 1767, 1763, 1762, 1764, 1770, 1774, 1771, - 1768, 1769, 1770, 1772, 1774, 1777, 1779, 1786, 1781, 6361, - 1782, 1784, 1787, 1790, 1788, 1796, 1798, 1792, 1794, 1801, - 1802, 1813, 1804, 1808, 1809, 1816, 1814, 1818, 6361, 1820, - 1827, 1824, 1830, 1831, 1817, 1833, 1832, 1836, 1834, 1839, - 1840, 1841, 1842, 1855, 1848, 1846, 1847, 1850, 1863, 1851, - 1867, 1871, 1860, 1868, 1873, 1874, 1875, 1876, 1878, 1879, - 1887, 1889, 1886, 1890, 1885, 1894, 1902, 1903, 1891, 1892, - 1901, 1908, 1913, 1915, 1916, 1917, 1911, 1926, 1918, 1922, - 1923, 1925, 1933, 1928, 1936, 1944, 1931, 1934, 1937, 1939, - 6361, 1946, 1947, 6361, 1949, 1948, 1950, 1972, 1951, 1955, + 1775, 1776, 1777, 1778, 1783, 1780, 1786, 1788, 1791, 1790, + 6409, 1792, 1795, 1796, 1798, 1799, 1802, 1806, 1800, 1807, + 1810, 1737, 1818, 1815, 1813, 1821, 1822, 1823, 1824, 6409, + 1834, 1826, 1829, 1833, 1830, 1837, 1839, 1841, 1842, 1843, + 1844, 1735, 1846, 1849, 1854, 1856, 1858, 1853, 1855, 1860, + 1861, 1871, 1874, 1877, 1878, 1879, 1880, 1881, 1882, 1883, + 1885, 1890, 1892, 1889, 1900, 1891, 1912, 1913, 1910, 1896, + 1908, 1893, 1895, 1917, 1925, 1921, 1909, 1922, 1929, 1926, + 1931, 1932, 1933, 1940, 1936, 1937, 1942, 1944, 1945, 1947, + 1948, 6409, 1949, 1954, 6409, 1956, 1955, 1953, 1976, 1957, - 1963, 1957, 1960, 1965, 1964, 1966, 1982, 1976, 1992, 1989, - 1994, 1995, 1997, 2000, 1984, 2001, 2002, 2003, 2004, 2010, - 1967, 2009, 2013, 2023, 2021, 2027, 2031, 2026, 2028, 2032, - 2051, 2029, 2030, 2039, 2033, 2036, 2038, 2034, 2040, 2044, - 2049, 2046, 2061, 2064, 2056, 2060, 2066, 2073, 2075, 2058, - 6361, 2086, 2082, 2081, 2083, 2093, 2089, 2088, 6361, 2090, - 2092, 2095, 2097, 2103, 2098, 2104, 2102, 2105, 2106, 2108, - 2114, 2115, 2110, 2113, 2127, 6361, 2118, 6361, 2125, 2128, - 2131, 2129, 2133, 2132, 2135, 2136, 6361, 6361, 2137, 2144, - 2145, 2155, 2152, 6361, 2138, 2162, 6361, 2159, 2164, 2157, + 1959, 1962, 1961, 1964, 1978, 1971, 1970, 1983, 1980, 1996, + 1991, 1993, 1998, 2001, 2003, 1999, 2004, 2005, 2006, 2010, + 2012, 2017, 2015, 2028, 2031, 2030, 2037, 2039, 2013, 2026, + 2034, 2053, 2036, 2038, 2041, 2044, 2046, 2057, 2042, 2049, + 2051, 2058, 2060, 2071, 2064, 2066, 2068, 2074, 2075, 2081, + 2083, 2082, 6409, 2091, 2089, 2084, 2094, 2088, 2104, 2095, + 2096, 6409, 2097, 2105, 2107, 2116, 2108, 2109, 2113, 2111, + 2112, 2119, 2120, 2121, 2124, 2129, 2125, 2140, 6409, 2122, + 6409, 2127, 2136, 2143, 2137, 2145, 2144, 2147, 2148, 6409, + 6409, 2149, 2146, 2157, 2166, 2161, 6409, 2164, 2171, 6409, - 2158, 2166, 2168, 2170, 2169, 2179, 2172, 2180, 2175, 2176, - 2177, 6361, 2185, 2187, 2189, 2193, 2195, 2196, 2197, 2200, - 6361, 2199, 2203, 2204, 2213, 2215, 2209, 2206, 2217, 2221, - 2216, 2223, 2225, 2226, 2227, 2236, 2237, 2228, 2238, 2239, - 2241, 6361, 2232, 2246, 2253, 2249, 2252, 2248, 2255, 2256, - 2258, 2259, 2260, 2261, 2265, 2267, 2268, 2275, 2276, 2271, - 2273, 2281, 2282, 2284, 2285, 2292, 2289, 2290, 2291, 2293, - 6361, 2294, 2296, 2300, 171, 2302, 2304, 2303, 2306, 2305, - 2309, 2312, 2323, 2327, 2322, 2324, 2326, 2325, 2331, 2333, - 2334, 2335, 2336, 2337, 2341, 2340, 6361, 2343, 2346, 2348, + 2168, 2173, 2167, 2175, 2177, 2178, 2179, 2182, 2189, 2184, + 2191, 2186, 2194, 2188, 6409, 2187, 2198, 2200, 2203, 2206, + 2207, 2209, 2211, 6409, 2210, 2213, 2215, 2224, 2226, 2227, + 2217, 2228, 2232, 2220, 2230, 2234, 2237, 2239, 2247, 2248, + 2245, 2246, 2253, 2261, 6409, 2244, 2243, 2265, 2264, 2257, + 2266, 2267, 2260, 2268, 2270, 2271, 2272, 2277, 2279, 2280, + 2288, 2290, 2281, 2289, 2286, 2292, 2293, 2297, 2302, 2300, + 2301, 2303, 2304, 6409, 2305, 2313, 2306, 171, 2314, 2308, + 2315, 2316, 2325, 2320, 2317, 2336, 2338, 2331, 2335, 2339, + 2343, 2342, 2344, 2345, 2346, 2333, 2353, 2349, 2351, 6409, - 2349, 2351, 2352, 2362, 6361, 2354, 2368, 2365, 2374, 2375, - 2363, 2380, 2371, 2361, 2384, 2386, 2385, 2387, 2389, 2388, - 2392, 2395, 6361, 2397, 2400, 2401, 2398, 2407, 2409, 2408, - 2410, 2411, 2415, 2416, 2420, 2422, 2419, 2421, 2423, 2424, - 2427, 2430, 2432, 2436, 2437, 2438, 2439, 2443, 2441, 2447, - 2448, 6361, 2457, 2449, 2459, 2461, 2450, 2460, 2463, 2477, - 2467, 2474, 2472, 2478, 2489, 2480, 2482, 2487, 2483, 2495, - 2492, 2505, 2504, 2506, 2513, 2496, 2515, 2518, 2507, 2510, - 2520, 2519, 2525, 2522, 2524, 2532, 2537, 2533, 2540, 2534, - 2545, 2558, 2549, 6361, 2547, 2553, 2541, 2557, 2570, 2562, + 2355, 2357, 2359, 2363, 2362, 2365, 2367, 6409, 2369, 2374, + 2379, 2388, 2382, 2366, 2390, 2376, 2391, 2392, 2394, 2396, + 2398, 2397, 2400, 2405, 2403, 6409, 2407, 2408, 2412, 2404, + 2418, 2421, 2411, 2419, 2426, 2427, 2428, 2429, 2430, 2431, + 2432, 2433, 2435, 2436, 2445, 2438, 2439, 2447, 2448, 2449, + 2450, 2452, 2455, 2457, 2461, 6409, 2470, 2467, 2465, 2466, + 2469, 2475, 2473, 2476, 2493, 2477, 2483, 2485, 2494, 2499, + 2490, 2501, 2511, 2513, 2515, 2516, 2523, 2519, 2521, 2527, + 2509, 2531, 2533, 2486, 2484, 2534, 2529, 2535, 2537, 2539, + 2547, 2548, 2545, 2552, 2544, 2554, 2568, 2559, 6409, 2563, - 2561, 2567, 2563, 2565, 2573, 2575, 2576, 2584, 2579, 2581, - 2582, 2586, 2585, 2588, 2587, 2593, 2595, 2602, 2598, 2604, - 2606, 6361, 2607, 2609, 2611, 2612, 2616, 2617, 2620, 2622, - 2624, 2625, 2626, 2628, 2631, 2632, 2633, 2634, 2636, 2638, - 2641, 6361, 2649, 2642, 2643, 2644, 2650, 2654, 2656, 2660, - 2663, 2666, 2667, 2668, 2669, 2670, 6361, 2678, 2679, 2675, - 2687, 2677, 2682, 2684, 2689, 2690, 6361, 2691, 2692, 2693, - 2700, 2702, 2697, 6361, 2704, 2699, 2705, 2707, 2708, 2709, - 2711, 2714, 2717, 2718, 2721, 2726, 2733, 2722, 2730, 6361, - 2728, 2742, 2734, 2740, 2738, 2744, 2748, 2750, 2751, 2753, + 2546, 2569, 2571, 2578, 2573, 2574, 2576, 2575, 2579, 2583, + 2584, 2585, 2592, 2590, 2593, 2594, 2595, 2597, 2598, 2604, + 2605, 2609, 2613, 2606, 2616, 2617, 6409, 2620, 2624, 2618, + 2625, 2627, 2628, 2632, 2635, 2633, 2639, 2640, 2642, 2643, + 2644, 2645, 2646, 2649, 2650, 2653, 6409, 2654, 2655, 2659, + 2662, 2667, 2666, 2668, 2675, 2677, 2679, 2669, 2682, 2683, + 2681, 6409, 2691, 2692, 2693, 2695, 2696, 2697, 2699, 2701, + 2702, 6409, 2703, 2704, 2706, 2713, 2714, 2709, 6409, 2717, + 2712, 2719, 2720, 2721, 2723, 2725, 2727, 2730, 2731, 2734, + 2736, 2745, 2735, 2742, 6409, 2738, 2754, 2746, 2751, 2755, - 2755, 2760, 6361, 2767, 2766, 2764, 2777, 2754, 2769, 2772, - 2778, 2779, 2780, 2781, 2782, 2785, 6361, 2786, 2788, 2789, - 2791, 2793, 2794, 2796, 2808, 2799, 2803, 2804, 2809, 2810, - 2813, 2814, 2816, 2821, 2817, 2820, 2827, 2830, 2831, 2833, - 2836, 2844, 2834, 2842, 2843, 2839, 2846, 2847, 2856, 2857, - 2858, 2860, 6361, 2863, 2864, 2865, 2854, 2866, 2869, 2870, - 2873, 2875, 2871, 2879, 2877, 2881, 2884, 2894, 2898, 2886, - 2889, 2896, 2899, 2900, 2902, 2901, 2904, 2905, 2914, 2911, - 2910, 2919, 2912, 2921, 2928, 2925, 2926, 2929, 2930, 2932, - 2917, 2935, 2933, 2937, 2939, 2942, 2953, 2954, 2943, 2955, + 2759, 2761, 2762, 2766, 2769, 2765, 2768, 6409, 2781, 2779, + 2784, 2791, 2770, 2772, 2786, 2787, 2788, 2794, 2796, 2797, + 2799, 6409, 2800, 2803, 2805, 2806, 2809, 2808, 2801, 2817, + 2810, 2815, 2818, 2824, 2825, 2827, 2828, 2829, 2830, 2831, + 2838, 2841, 2837, 2844, 2843, 2850, 2854, 2861, 2845, 2857, + 2858, 2860, 2862, 2865, 2872, 2873, 2874, 2877, 2879, 6409, + 2882, 2871, 2884, 2869, 2885, 2886, 2888, 2889, 2890, 2892, + 2894, 2899, 2895, 2898, 2907, 2911, 2908, 2913, 2915, 2916, + 2918, 2919, 2920, 2921, 2922, 2929, 2925, 2926, 2937, 2932, + 2936, 2944, 2943, 2945, 2946, 2947, 2949, 2933, 2953, 2955, - 2956, 2957, 2958, 6361, 2961, 2962, 2963, 2966, 2969, 2972, - 2975, 2982, 2973, 2974, 2984, 2990, 2991, 2981, 2992, 2983, - 2999, 2997, 6361, 2998, 6361, 3000, 3002, 3004, 3012, 3008, - 6361, 3014, 6361, 3015, 3020, 3009, 3011, 6361, 3023, 3017, - 3022, 3029, 3024, 3032, 3033, 3035, 3034, 3041, 3036, 3038, - 3043, 3044, 3046, 3049, 3050, 3054, 3051, 3061, 3067, 3055, - 3064, 3057, 3062, 3070, 3072, 3076, 6361, 3078, 3080, 3082, - 3083, 3084, 3085, 3086, 3087, 3089, 3090, 3092, 3102, 3098, - 3108, 3095, 3114, 3117, 3124, 3105, 3126, 6361, 3109, 3128, - 3119, 3129, 6361, 3131, 3106, 3132, 3139, 3134, 3137, 3141, + 2957, 2958, 2972, 2974, 2975, 2977, 2948, 2950, 2969, 2983, + 6409, 2976, 2979, 2978, 2967, 2988, 2991, 2992, 3001, 2996, + 2986, 2998, 3005, 3006, 3000, 3007, 3008, 3018, 3014, 6409, + 3015, 6409, 3016, 3017, 3023, 3027, 3019, 6409, 3030, 6409, + 3031, 3036, 3026, 3032, 6409, 3038, 3040, 3043, 3044, 3046, + 3047, 3050, 3049, 3051, 3055, 3053, 3057, 3058, 3059, 3063, + 3066, 3067, 3071, 3072, 3078, 3070, 3079, 3081, 3083, 3086, + 3088, 3089, 3090, 6409, 3094, 3091, 3096, 3098, 3100, 3101, + 3102, 3103, 3106, 3109, 3110, 3117, 3113, 3118, 3121, 3124, + 3128, 3131, 3132, 3140, 6409, 3135, 3137, 3138, 3139, 6409, - 3142, 3143, 3146, 3147, 3149, 3154, 3158, 3161, 3162, 6361, - 3167, 3163, 3150, 3170, 3178, 3180, 3185, 3182, 3183, 3188, - 3192, 3190, 3191, 3153, 3193, 3194, 3196, 3203, 3206, 3202, - 3211, 3198, 3208, 3210, 3215, 3201, 3216, 3217, 3218, 3224, - 3225, 3222, 3223, 3226, 3227, 6361, 3229, 3230, 3231, 3249, - 3233, 3234, 3245, 3235, 6361, 3251, 3247, 3252, 3258, 3260, - 3262, 3255, 3263, 3264, 3265, 3266, 3268, 3271, 3272, 6361, - 3276, 6361, 3273, 3286, 3279, 3285, 3290, 3292, 3294, 3300, - 3293, 3295, 3303, 3304, 3301, 3305, 3307, 3311, 3313, 3315, - 3318, 3327, 3317, 3319, 3323, 3328, 3329, 3331, 6361, 6361, + 3142, 3143, 3150, 3153, 3144, 3146, 3148, 3156, 3160, 3155, + 3162, 3165, 3166, 3176, 3175, 3168, 6409, 3177, 3178, 3179, + 3188, 3182, 3195, 3196, 3192, 3193, 3198, 3206, 3202, 3201, + 3203, 3205, 3208, 3209, 3216, 3217, 3213, 3225, 3215, 3222, + 3230, 3226, 3223, 3220, 3232, 3233, 3234, 3235, 3236, 3237, + 3239, 3242, 3245, 6409, 3246, 3251, 3253, 3256, 3255, 3257, + 3259, 3260, 3261, 6409, 3268, 3265, 3271, 3269, 3277, 3272, + 3270, 3280, 3283, 3286, 3288, 3289, 3290, 3291, 6409, 3293, + 6409, 3292, 3294, 3306, 3310, 3300, 3298, 3311, 3319, 3315, + 3320, 3321, 3322, 3323, 3324, 3325, 3329, 3332, 3336, 3337, - 3333, 3334, 3335, 3338, 3339, 3344, 3346, 3350, 3351, 3353, - 3355, 3357, 3366, 6361, 3363, 3364, 3367, 3368, 3378, 3369, - 3381, 3388, 3385, 3392, 3391, 6361, 3374, 3370, 3399, 3383, - 3395, 3406, 6361, 3401, 6361, 3402, 3403, 3405, 3407, 3410, - 3411, 3412, 3414, 3418, 3425, 3433, 3429, 3431, 3415, 3420, - 3432, 3434, 3443, 3436, 3440, 3441, 6361, 3445, 3446, 3448, - 3449, 3450, 3457, 3460, 3453, 6361, 3461, 3463, 3465, 3467, - 3468, 3470, 3472, 3474, 3475, 3479, 3481, 6361, 3477, 3483, - 3490, 3485, 3487, 3492, 3495, 3499, 3501, 6361, 3504, 3506, - 3513, 3511, 3508, 3512, 3516, 3517, 3518, 3521, 3523, 3522, + 3347, 3330, 3338, 3335, 3343, 3333, 3352, 6409, 6409, 3354, + 3355, 3358, 3356, 3360, 3361, 3362, 3371, 3365, 3367, 3368, + 3374, 3382, 6409, 3384, 3375, 3378, 3386, 3393, 3388, 3395, + 3402, 3399, 3403, 3401, 6409, 3405, 3408, 3415, 3410, 3411, + 3418, 6409, 3413, 6409, 3416, 3417, 3419, 3424, 3426, 3428, + 3429, 3430, 3432, 3440, 3448, 3437, 3446, 3438, 3447, 3449, + 3451, 3460, 3452, 3455, 3457, 6409, 3462, 3456, 3459, 3467, + 3473, 3477, 3470, 3466, 6409, 3469, 3480, 3484, 3485, 3486, + 3487, 3491, 3488, 3492, 3493, 3496, 6409, 3494, 3497, 3507, + 3500, 3503, 3509, 3511, 3516, 3523, 6409, 3520, 3518, 3530, - 3524, 3525, 3526, 3528, 3530, 3533, 3531, 3544, 3545, 3532, - 3553, 3554, 3536, 6361, 3546, 3558, 3559, 3560, 3561, 3562, - 3566, 3569, 3571, 3564, 3573, 3581, 3574, 3579, 3586, 3583, - 3594, 3589, 6361, 3596, 3591, 3599, 3597, 3598, 3603, 3604, - 3605, 3607, 3608, 3611, 3612, 3614, 3621, 3618, 3620, 3623, - 3633, 3625, 6361, 3642, 3634, 3635, 3626, 3638, 3639, 3652, - 3644, 3647, 3651, 3656, 3657, 3658, 3660, 3662, 3663, 3666, - 3661, 6361, 6361, 3669, 3670, 3673, 6361, 3676, 3671, 3693, - 3675, 3677, 3679, 3689, 3688, 3678, 3690, 3686, 3699, 6361, - 3700, 3707, 3702, 3703, 3714, 3717, 3719, 3716, 3720, 3706, + 3529, 3514, 3531, 3532, 3534, 3536, 3537, 3538, 3539, 3540, + 3541, 3547, 3542, 3543, 3551, 3546, 3562, 3563, 3549, 3553, + 3571, 3561, 6409, 3569, 3570, 3575, 3572, 3576, 3579, 3580, + 3584, 3586, 3577, 3599, 3600, 3587, 3590, 3603, 3605, 3610, + 3612, 6409, 3613, 3596, 3622, 3594, 3617, 3624, 3606, 3625, + 3628, 3618, 3621, 3629, 3631, 3635, 3643, 3636, 3638, 3639, + 3641, 3651, 3644, 6409, 3653, 3646, 3654, 3663, 3656, 3659, + 3668, 3666, 3670, 3671, 3673, 3676, 3677, 3679, 3681, 3682, + 3685, 3680, 6409, 6409, 3687, 3688, 3689, 6409, 3695, 3691, + 3707, 3694, 3696, 3705, 3708, 3697, 3709, 3710, 3714, 3716, - 3709, 3713, 3724, 3723, 3730, 3731, 3739, 3740, 3735, 3736, - 3738, 6361, 3737, 3743, 3744, 3746, 3747, 3748, 6361, 3750, - 3760, 3753, 3752, 3768, 3770, 3762, 3772, 3754, 3776, 3777, - 3779, 3780, 3781, 3788, 3783, 3786, 3793, 3794, 3785, 6361, - 3797, 3799, 3787, 3803, 6361, 3805, 3814, 3817, 3818, 3809, - 3816, 3819, 3826, 6361, 3822, 3823, 3824, 3825, 3838, 3829, - 3839, 3837, 3828, 6361, 3841, 3830, 3843, 6361, 3844, 3845, - 3855, 3857, 3852, 3864, 3859, 3861, 3862, 3860, 6361, 3870, - 6361, 3871, 3867, 3876, 6361, 3873, 3878, 3881, 3883, 3880, - 3887, 3888, 3891, 3896, 3884, 3897, 3898, 3899, 3901, 3902, + 6409, 3718, 3725, 3721, 3722, 3730, 3733, 3737, 3726, 3734, + 3728, 3738, 3739, 3742, 3744, 3746, 3749, 3753, 3758, 3754, + 3755, 3756, 6409, 3759, 3761, 3763, 3765, 3766, 3767, 6409, + 3769, 3771, 3778, 3777, 3781, 3787, 3789, 3793, 3773, 3790, + 3795, 3796, 3797, 3798, 3808, 3806, 3807, 3810, 3815, 3799, + 6409, 3811, 3813, 3819, 3823, 6409, 3826, 3833, 3834, 3836, + 3831, 3835, 3837, 3844, 6409, 3841, 3842, 3843, 3845, 3854, + 3847, 3856, 3858, 3852, 6409, 3859, 3860, 3861, 6409, 3862, + 3867, 3873, 3875, 3876, 3883, 3878, 3880, 3881, 3882, 6409, + 3888, 6409, 3886, 3890, 3894, 6409, 3892, 3897, 3898, 3900, - 3909, 3908, 3910, 3911, 3900, 6361, 3912, 3915, 3921, 3917, - 3922, 3925, 3920, 3927, 3931, 3928, 6361, 6361, 3939, 6361, - 3940, 3935, 3942, 6361, 3944, 3946, 3953, 3945, 3949, 3952, - 3956, 3957, 6361, 3964, 3966, 6361, 3968, 3975, 3970, 3961, - 3971, 3972, 3976, 3978, 3980, 3981, 3982, 3979, 3986, 3984, - 6361, 3987, 3988, 3996, 3998, 3995, 3989, 4012, 4014, 4000, - 6361, 4016, 4002, 4006, 4017, 4018, 6361, 4023, 6361, 4010, - 4026, 4027, 4029, 4030, 6361, 4034, 4033, 4038, 4040, 4041, - 4042, 4043, 4045, 4051, 4052, 4059, 4055, 4054, 4056, 6361, - 4057, 4061, 4063, 4070, 4058, 4065, 4074, 4077, 4078, 4079, + 3901, 3906, 3907, 3905, 3914, 3915, 3916, 3918, 3919, 3917, + 3922, 3926, 3923, 3924, 3928, 3929, 6409, 3930, 3932, 3939, + 3934, 3944, 3940, 3947, 3937, 3951, 3952, 6409, 6409, 3961, + 6409, 3963, 3953, 3955, 6409, 3957, 3962, 3970, 3967, 3973, + 3975, 3979, 3980, 6409, 3982, 3985, 6409, 3968, 3983, 3993, + 3990, 3992, 3995, 3998, 3994, 3996, 4000, 4001, 4004, 4006, + 4002, 4005, 4010, 6409, 4007, 4008, 4009, 4023, 4024, 4025, + 4030, 4032, 4026, 6409, 4034, 4036, 4035, 4043, 4040, 6409, + 4041, 6409, 4044, 4049, 4051, 4052, 4055, 6409, 4057, 4056, + 4061, 4064, 4066, 4065, 4068, 4072, 4069, 4075, 4082, 4078, - 4083, 4087, 4081, 4088, 4094, 4092, 4098, 4084, 6361, 4096, - 4104, 4090, 4113, 4100, 4110, 6361, 4114, 4115, 4116, 6361, - 4117, 4118, 4119, 4124, 4125, 4127, 4131, 4132, 4129, 6361, - 4136, 4137, 4133, 4134, 4135, 4141, 6361, 6361, 4151, 6361, - 4152, 4142, 4154, 4155, 4156, 4159, 4161, 4162, 4164, 4166, - 4172, 4174, 4167, 4175, 4183, 4184, 4192, 4187, 4188, 4189, - 6361, 6361, 4194, 4198, 4191, 4202, 4203, 4195, 4205, 4212, - 4210, 4216, 4219, 4220, 4214, 6361, 4222, 4211, 4228, 4221, - 6361, 4227, 4229, 4230, 4233, 4235, 4236, 4239, 4237, 4238, - 4242, 4245, 4246, 4247, 4251, 4249, 4258, 4259, 4260, 4261, + 4079, 4080, 6409, 4081, 4084, 4086, 4093, 4089, 4091, 4102, + 4101, 4097, 4103, 4107, 4109, 4105, 4112, 4118, 4116, 4122, + 4110, 6409, 4120, 4124, 4114, 4137, 4130, 4133, 6409, 4134, + 4138, 4142, 6409, 4140, 4141, 4148, 4150, 4144, 4151, 4152, + 4156, 4158, 6409, 4154, 4155, 4159, 4160, 4171, 4163, 6409, + 6409, 4174, 6409, 4175, 4164, 4177, 4178, 4182, 4185, 4184, + 4186, 4189, 4190, 4197, 4198, 4191, 4199, 4206, 4208, 4216, + 4211, 4212, 4213, 6409, 6409, 4218, 4222, 4215, 4226, 4227, + 4219, 4229, 4236, 4234, 4240, 4243, 4244, 4238, 6409, 4246, + 4235, 4252, 4245, 6409, 4251, 4253, 4254, 4257, 4259, 4260, - 4265, 4263, 4268, 6361, 4269, 4270, 4272, 4273, 4274, 4280, - 4282, 4283, 4284, 6361, 4285, 6361, 4288, 4286, 4302, 4294, - 4306, 4287, 4297, 4307, 4309, 4312, 4315, 4317, 4308, 4318, - 4319, 4324, 4326, 4328, 4329, 6361, 4330, 4332, 4337, 4338, - 4340, 4342, 4343, 4345, 4346, 4348, 4351, 4349, 4356, 4359, - 4353, 4360, 4361, 4363, 6361, 4365, 4372, 4368, 4374, 4376, - 4377, 4378, 4379, 4385, 4386, 4388, 4389, 4391, 6361, 4392, - 4393, 4396, 4397, 4399, 4400, 4402, 4406, 4409, 6361, 4414, - 4410, 4415, 4404, 4417, 4420, 4423, 4425, 4427, 4429, 4434, - 6361, 4428, 4439, 4441, 4432, 4442, 4443, 4445, 4433, 6361, + 4263, 4261, 4262, 4266, 4269, 4270, 4271, 4275, 4273, 4282, + 4283, 4284, 4285, 4289, 4287, 4292, 6409, 4293, 4294, 4296, + 4297, 4298, 4304, 4306, 4307, 4308, 6409, 4309, 6409, 4312, + 4314, 4310, 4330, 4318, 4321, 4331, 4333, 4335, 4337, 4338, + 4341, 4342, 4348, 4336, 4343, 4352, 4345, 4359, 4361, 4362, + 6409, 4363, 4355, 4364, 4365, 4370, 4372, 4366, 4374, 4376, + 4379, 4380, 4381, 4383, 4388, 4389, 4390, 4391, 4392, 6409, + 4393, 4397, 4400, 4402, 4404, 4406, 4407, 4408, 4414, 4415, + 4416, 4417, 4421, 6409, 4418, 4423, 4425, 4426, 4428, 4429, + 4432, 4435, 4439, 6409, 4442, 4433, 4444, 4443, 4445, 4447, - 4448, 4451, 4447, 4466, 4458, 4467, 4463, 4465, 4469, 4471, - 4472, 4473, 4474, 4476, 4477, 4478, 4487, 4495, 4493, 6361, - 4480, 6361, 4490, 4501, 4504, 4505, 4491, 4488, 6361, 4503, - 4507, 4512, 4509, 4513, 6361, 4515, 4516, 4518, 4517, 6361, - 4525, 4521, 4520, 4530, 4535, 4536, 6361, 4539, 4541, 4543, - 4551, 4552, 4547, 4550, 4553, 4554, 4557, 4558, 4559, 4560, - 4568, 4563, 4565, 6361, 4571, 4573, 4580, 4581, 4574, 4582, - 4564, 4585, 4588, 4590, 6361, 4592, 4593, 4594, 4595, 4596, - 4598, 4599, 4607, 4602, 4605, 4606, 4610, 4611, 6361, 4612, - 4617, 4616, 4626, 4619, 4628, 6361, 6361, 4622, 4634, 4637, + 4449, 4455, 4452, 4458, 4459, 6409, 4464, 4466, 4467, 4468, + 4469, 4470, 4473, 4474, 6409, 4480, 4481, 4483, 4490, 4487, + 4494, 4492, 4496, 4489, 4499, 4502, 4495, 4506, 4507, 4509, + 4503, 4519, 4526, 4521, 6409, 4510, 6409, 4522, 4523, 4533, + 4528, 4534, 4532, 6409, 4535, 4540, 4542, 4538, 4536, 6409, + 4543, 4544, 4546, 4547, 6409, 4562, 4558, 4548, 4557, 4550, + 4566, 6409, 4571, 4572, 4573, 4580, 4582, 4577, 4584, 4579, + 4587, 4585, 4581, 4589, 4590, 4598, 4596, 4594, 6409, 4600, + 4602, 4607, 4609, 4603, 4611, 4601, 4613, 4616, 4618, 6409, + 4619, 4622, 4623, 4625, 4626, 4627, 4628, 4635, 4632, 4634, - 4629, 4638, 6361, 6361, 4641, 4648, 4631, 4647, 4644, 6361, - 6361, 4650, 6361, 4651, 6361, 4652, 4654, 6361, 6361, 4656, - 4657, 4658, 4659, 4668, 6361, 4672, 6361, 4679, 4674, 4660, - 4662, 4677, 6361, 4678, 4680, 4686, 6361, 4681, 4693, 4688, - 4689, 6361, 4695, 4696, 4691, 4698, 6361, 4700, 4703, 4707, - 4705, 4708, 4709, 4711, 4715, 4718, 4719, 4720, 4721, 4722, - 4734, 4736, 4738, 4740, 4730, 4726, 4743, 4745, 4749, 4747, - 4751, 4752, 4753, 4755, 4756, 4758, 4761, 4762, 4764, 4767, - 4765, 4766, 4778, 4768, 4770, 4780, 4782, 4771, 4781, 4785, - 4784, 4789, 4787, 4792, 4795, 4794, 4796, 6361, 4800, 4802, + 4636, 4637, 4640, 4641, 6409, 4646, 4644, 4648, 4657, 4659, + 4661, 6409, 4664, 6409, 4654, 4649, 4666, 4665, 4670, 6409, + 6409, 4672, 4680, 4675, 4678, 4679, 6409, 6409, 4682, 6409, + 4683, 6409, 4684, 4686, 6409, 6409, 4685, 4689, 4692, 4694, + 4696, 6409, 4704, 6409, 4706, 4707, 4693, 4705, 4711, 6409, + 4710, 4712, 4714, 6409, 4717, 4725, 4718, 4720, 6409, 4722, + 4728, 4723, 4730, 6409, 4732, 4738, 4734, 4740, 4741, 4744, + 4743, 4746, 4747, 4751, 4752, 4753, 4754, 4756, 4765, 4767, + 4769, 4762, 4770, 4771, 4777, 4779, 4772, 4775, 4781, 4782, + 4786, 4783, 4790, 4792, 4793, 4794, 4796, 4795, 4797, 4800, - 4805, 4807, 4806, 4812, 4814, 4816, 4822, 4825, 6361, 4829, - 6361, 4831, 4823, 4827, 4833, 4834, 6361, 4835, 4836, 4837, - 4840, 4839, 4842, 4843, 4844, 4847, 4850, 4856, 6361, 4867, - 4858, 4851, 4861, 4875, 6361, 4869, 4877, 4853, 4863, 4879, - 4880, 4882, 4883, 4887, 4885, 4889, 4891, 4884, 4892, 4894, - 4897, 4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912, 4913, - 4919, 4921, 4926, 6361, 4916, 6361, 4920, 4928, 4932, 4933, - 4934, 4936, 4938, 6361, 6361, 4940, 4942, 4949, 4937, 4941, - 4951, 4724, 6361, 4943, 4961, 4955, 4962, 6361, 4963, 4946, - 4964, 4968, 6361, 4969, 4970, 4972, 4974, 4971, 4983, 4980, + 4799, 4808, 4810, 4811, 4812, 4813, 4814, 4815, 4816, 4822, + 4823, 4826, 4821, 4825, 6409, 4829, 4831, 4818, 4842, 4832, + 4843, 4844, 4851, 4855, 4856, 6409, 4858, 6409, 4860, 4852, + 4862, 4863, 4864, 6409, 4865, 4866, 4867, 4868, 4869, 4871, + 4872, 4875, 4876, 4880, 4886, 6409, 4893, 4883, 4877, 4881, + 4901, 6409, 4896, 4903, 4904, 4906, 4907, 4908, 4909, 4910, + 4913, 4911, 4916, 4918, 4912, 4919, 4920, 4934, 4936, 4931, + 4921, 4938, 4940, 4941, 4942, 4943, 4944, 4945, 4946, 4952, + 4954, 4958, 6409, 4949, 6409, 4960, 4961, 4962, 4965, 4966, + 4967, 4970, 6409, 6409, 4972, 4973, 4978, 4975, 4979, 4982, - 4977, 4987, 4988, 4992, 6361, 6361, 6361, 6361, 4993, 4989, - 4996, 4997, 4999, 4998, 5004, 5002, 5005, 6361, 5009, 6361, - 6361, 5014, 5016, 5015, 5017, 5018, 5006, 5023, 5027, 6361, - 5024, 5028, 5031, 5030, 5038, 5041, 5043, 5044, 5047, 5046, - 5048, 5055, 5053, 5056, 5050, 5054, 5061, 5063, 6361, 6361, - 5067, 5069, 5070, 5077, 5074, 5078, 5072, 5081, 5084, 5082, - 5085, 5089, 5090, 5091, 5099, 5101, 5092, 5096, 6361, 5100, - 5105, 5103, 6361, 5102, 6361, 5111, 5113, 5109, 5115, 5117, - 5120, 5121, 5123, 6361, 6361, 5125, 5124, 6361, 6361, 5131, - 5133, 5135, 5137, 5138, 5134, 5140, 5142, 5139, 6361, 5144, + 4984, 6409, 4983, 4991, 4994, 4986, 6409, 4996, 5000, 5001, + 5003, 6409, 5004, 5005, 5006, 5008, 5009, 5013, 5017, 5015, + 5018, 5019, 5026, 6409, 6409, 6409, 6409, 5029, 5023, 5033, + 5027, 5035, 5037, 5038, 5042, 5036, 6409, 5044, 6409, 6409, + 5049, 5050, 5039, 5052, 5056, 5058, 5059, 5061, 6409, 5060, + 5062, 5065, 5063, 5072, 5074, 5080, 5076, 5081, 5066, 5082, + 5091, 5087, 5088, 5090, 5093, 5095, 5097, 6409, 6409, 5099, + 5102, 5103, 5110, 5108, 5111, 5107, 5120, 5115, 5117, 5118, + 5123, 5124, 5125, 5134, 5135, 5126, 5130, 6409, 5133, 5136, + 5144, 6409, 5137, 6409, 5143, 5145, 5139, 5151, 5152, 5153, - 6361, 5145, 5147, 5149, 5146, 5162, 5166, 5167, 5164, 5168, - 5169, 6361, 5170, 5172, 6361, 5173, 5175, 5178, 6361, 5180, - 5182, 5184, 5187, 6361, 5191, 5188, 5194, 6361, 5196, 6361, - 5197, 5198, 5201, 5208, 6361, 5204, 5205, 6361, 5210, 5212, - 5215, 5214, 6361, 5216, 6361, 5219, 5221, 5222, 5226, 5228, - 5230, 5231, 5232, 5233, 5241, 5237, 5238, 6361, 6361, 135, - 5246, 5248, 5249, 5252, 5251, 5259, 5254, 5256, 5262, 6361, - 6361, 5258, 6361, 5265, 5264, 6361, 5255, 5274, 5275, 5266, - 5281, 5270, 5278, 5268, 5290, 5285, 5291, 5287, 5292, 5295, - 5306, 5310, 5293, 5297, 5307, 5313, 5315, 5317, 5319, 5320, + 5154, 5156, 6409, 6409, 5158, 5166, 5163, 6409, 6409, 5159, + 5167, 5170, 5172, 5168, 5173, 5174, 5179, 5181, 5177, 6409, + 5182, 6409, 5184, 5186, 5199, 5185, 5201, 5206, 5208, 5212, + 5205, 5188, 6409, 5207, 5209, 6409, 5214, 5203, 5215, 6409, + 5219, 5221, 5224, 5226, 6409, 5228, 5229, 5231, 6409, 5235, + 6409, 5232, 5237, 5238, 5246, 6409, 5241, 5243, 6409, 5248, + 5254, 5255, 5249, 6409, 5251, 6409, 5256, 5260, 5263, 5266, + 5257, 5268, 5270, 5271, 5273, 5280, 5278, 5275, 6409, 6409, + 135, 5291, 5281, 5282, 5286, 5288, 5298, 5284, 5293, 5296, + 6409, 6409, 5300, 6409, 5299, 5308, 6409, 5301, 5310, 5314, - 5321, 5322, 5323, 5324, 5327, 5326, 5330, 6361, 5332, 5334, - 5333, 6361, 5339, 5340, 5344, 5349, 6361, 5353, 5355, 5356, - 5357, 6361, 5345, 5359, 5367, 5360, 5361, 5374, 5362, 5370, - 5377, 6361, 6361, 6361, 5378, 5385, 6361, 5387, 5380, 5372, - 5382, 6361, 5389, 5390, 6361, 6361, 5388, 5392, 5391, 5399, - 6361, 5395, 6361, 5396, 6361, 5403, 5404, 5405, 5410, 6361, - 5415, 5421, 6361, 5424, 5427, 5429, 5430, 5412, 5414, 5431, - 6361, 5440, 5437, 5438, 5445, 5435, 5446, 5441, 5447, 5448, - 5455, 5450, 5457, 6361, 5459, 5460, 5464, 5467, 5451, 5461, - 5471, 6361, 5454, 6361, 5473, 6361, 5477, 5478, 5479, 5480, + 5303, 5312, 5316, 5318, 5319, 5323, 5325, 5324, 5328, 5329, + 5332, 5337, 5347, 5330, 5344, 5350, 5352, 5354, 5356, 5345, + 5358, 5359, 5360, 5362, 5364, 5365, 5366, 5368, 5369, 6409, + 5372, 5374, 5377, 5376, 6409, 5382, 5378, 5391, 5387, 6409, + 5396, 5384, 5397, 5398, 6409, 5399, 5401, 5404, 5402, 5403, + 5415, 5410, 5412, 5416, 6409, 6409, 6409, 5419, 5426, 6409, + 5428, 5422, 5405, 5413, 6409, 5429, 5432, 6409, 6409, 5433, + 5434, 5435, 5445, 6409, 5437, 6409, 5440, 6409, 5441, 5442, + 5450, 5448, 6409, 5454, 5452, 6409, 5463, 5465, 5467, 5460, + 5468, 5470, 5471, 6409, 5478, 5474, 5475, 5482, 5473, 5483, - 5481, 5482, 5484, 5488, 5485, 5487, 5495, 5499, 5496, 6361, - 5503, 5507, 6361, 5504, 6361, 5509, 6361, 5500, 5510, 5511, - 5512, 6361, 5514, 5518, 5519, 5520, 6361, 5522, 5529, 5528, - 5531, 6361, 6361, 5524, 5540, 5532, 5533, 5536, 5546, 5541, - 5549, 5551, 5550, 5552, 5560, 5556, 5553, 5557, 5564, 5566, - 5570, 6361, 6361, 6361, 5567, 5558, 5580, 5582, 5573, 5589, - 5584, 6361, 5585, 5587, 5588, 5591, 5598, 5594, 5596, 6361, - 5597, 5599, 5600, 5601, 5604, 5605, 5606, 5607, 6361, 5619, - 5621, 5608, 5615, 5623, 5627, 5631, 5633, 5634, 5641, 5637, - 6361, 5639, 6361, 6361, 5636, 6361, 5640, 5643, 5644, 5645, + 5477, 5485, 5484, 5492, 5487, 5494, 6409, 5496, 5499, 5501, + 5507, 5497, 5503, 5505, 6409, 5509, 6409, 5511, 6409, 5513, + 5514, 5515, 5521, 5517, 5522, 5523, 5532, 5524, 5534, 5528, + 5535, 5539, 5536, 6409, 6409, 5545, 5548, 6409, 5542, 6409, + 5550, 6409, 5540, 5551, 5552, 5553, 6409, 5560, 5554, 5557, + 5562, 6409, 5564, 5569, 5566, 5571, 6409, 6409, 5572, 5579, + 5577, 5575, 5587, 5589, 5576, 5591, 5584, 5593, 5578, 5600, + 5599, 5601, 5603, 5605, 5606, 5607, 6409, 6409, 6409, 5612, + 5611, 5620, 5616, 5619, 5627, 5617, 6409, 5625, 5629, 5632, + 5626, 5639, 5634, 5641, 6409, 5636, 5638, 5642, 5644, 5647, - 6361, 5648, 5649, 5650, 5652, 5654, 5657, 6361, 5664, 5651, - 5659, 5667, 6361, 6361, 5669, 6361, 5674, 5675, 5676, 5683, - 5679, 5681, 5685, 5682, 6361, 5686, 5688, 5692, 5693, 5694, - 6361, 5695, 5696, 5698, 5699, 6361, 5702, 5701, 5704, 5707, - 5709, 6361, 5711, 5710, 5729, 5726, 6361, 5712, 5724, 5725, - 6361, 6361, 5734, 5736, 5737, 6361, 6361, 6361, 5739, 5740, - 5743, 6361, 5746, 5750, 5754, 5758, 5749, 6361, 5761, 5757, - 5762, 6361, 6361, 5763, 5764, 5765, 5767, 6361, 6361, 5768, - 5771, 5769, 5772, 5774, 6361, 5777, 5779, 5785, 5791, 5797, - 5787, 5794, 5792, 5806, 5809, 5782, 5798, 5808, 5810, 5811, + 5643, 5649, 5650, 6409, 5654, 5661, 5658, 5655, 5666, 5673, + 5675, 5677, 5668, 5664, 5684, 5680, 6409, 5683, 6409, 6409, + 5670, 6409, 5679, 5686, 5687, 5691, 6409, 5694, 5688, 5695, + 5696, 5698, 5700, 6409, 5710, 5703, 5706, 5707, 6409, 6409, + 5714, 6409, 5717, 5719, 5718, 5726, 5721, 5722, 5728, 5729, + 6409, 5711, 5735, 5736, 5737, 5738, 6409, 5739, 5740, 5742, + 5743, 6409, 5746, 5745, 5748, 5750, 5751, 6409, 5752, 5753, + 5760, 5767, 6409, 5758, 5774, 5768, 6409, 6409, 5770, 5776, + 5779, 6409, 6409, 6409, 5785, 5782, 5780, 5789, 6409, 5791, + 5795, 5800, 5804, 5803, 6409, 5806, 5794, 5796, 6409, 6409, - 5812, 5818, 5820, 5819, 5822, 5824, 5826, 5827, 6361, 6361, - 5834, 5836, 5828, 6361, 6361, 5839, 5843, 5845, 5847, 5849, - 5851, 5853, 6361, 5854, 5856, 5857, 5858, 5840, 6361, 5859, - 5862, 5864, 5867, 5865, 5868, 5871, 5873, 6361, 6361, 5874, - 5881, 5875, 5882, 5876, 6361, 5885, 5893, 5889, 5890, 5891, - 5896, 5897, 6361, 5898, 5899, 6361, 6361, 5902, 5900, 6361, - 6361, 5905, 6361, 6361, 6361, 6361, 6361, 6361, 6361, 5909, - 6361, 5907, 5917, 5919, 5922, 6361, 5911, 5923, 5924, 5925, - 5926, 6361, 5927, 5930, 5933, 5416, 5929, 5935, 5939, 5937, - 5942, 5943, 5946, 5947, 5948, 5949, 5953, 5951, 5963, 5954, + 5808, 5809, 5811, 5814, 6409, 6409, 5815, 5817, 5818, 5821, + 5819, 6409, 5820, 5823, 5825, 5836, 5842, 5831, 5839, 5843, + 5851, 5833, 5837, 5848, 5847, 5849, 5853, 5856, 5860, 5867, + 5864, 5866, 5872, 5869, 5873, 6409, 6409, 5877, 6409, 5880, + 5874, 6409, 6409, 5882, 5886, 5888, 5890, 5892, 5894, 5896, + 6409, 5897, 5899, 5900, 5901, 5902, 6409, 5904, 5908, 5903, + 5911, 5905, 5914, 5910, 5920, 6409, 6409, 5912, 5926, 5916, + 5927, 5921, 6409, 5931, 5938, 5933, 5935, 5936, 5941, 5937, + 6409, 5943, 5945, 6409, 6409, 5944, 5946, 6409, 6409, 5950, + 6409, 6409, 6409, 6409, 6409, 6409, 6409, 5957, 6409, 5951, - 5964, 6361, 6361, 6361, 5965, 5955, 5967, 5973, 5977, 5980, - 5984, 5986, 5970, 5978, 5987, 5988, 5991, 5992, 5994, 6001, - 5997, 6000, 5999, 6003, 6005, 6007, 6014, 6008, 6010, 6016, - 6361, 6018, 6361, 6019, 6361, 6361, 6021, 6026, 6022, 6024, - 6034, 6038, 6031, 6035, 6036, 6039, 6041, 6361, 6047, 6361, - 6361, 6042, 6049, 6361, 6050, 6052, 6361, 6051, 6053, 6054, - 6057, 6059, 6060, 6061, 6062, 6075, 6361, 6361, 6065, 6068, - 6076, 6078, 6082, 6089, 6080, 6088, 6091, 6092, 6084, 6100, - 6361, 6099, 6101, 6105, 6361, 6107, 6090, 6108, 6102, 6110, - 6118, 6113, 6114, 6361, 6116, 6361, 6120, 6122, 6123, 6124, + 5963, 5966, 5968, 6409, 5952, 5969, 5970, 5971, 5958, 6409, + 5956, 5973, 5977, 5981, 5980, 5985, 5987, 5988, 5990, 5989, + 5992, 5994, 5993, 5998, 5996, 5997, 5999, 6003, 6006, 6409, + 6409, 6409, 6012, 6013, 6015, 6016, 6020, 6021, 6028, 6030, + 6024, 6031, 6032, 6034, 6036, 6037, 6038, 6046, 6042, 6045, + 6044, 6048, 6050, 6055, 6059, 6052, 6060, 6064, 6409, 6061, + 6409, 6065, 6409, 6409, 6069, 6071, 6066, 6073, 6081, 6084, + 6077, 6080, 6082, 6085, 6087, 6409, 6089, 6409, 6409, 6094, + 6096, 6409, 6095, 6098, 6409, 6097, 6099, 6100, 6105, 6107, + 6103, 6106, 6108, 6124, 6409, 6409, 6110, 6114, 6112, 6126, - 6125, 6126, 6135, 6133, 6137, 6361, 6130, 6140, 6142, 6145, - 6147, 6149, 6151, 6152, 6160, 6157, 6153, 6164, 6165, 6166, - 6167, 6169, 6168, 6361, 6176, 6170, 6361, 6177, 6178, 6179, - 6180, 6184, 6361, 6191, 6181, 6188, 6192, 6195, 6196, 6361, - 6202, 6205, 6206, 6361, 6209, 6361, 6361, 6210, 6197, 6208, - 6212, 6218, 6361, 6361, 6361, 6241, 6248, 6255, 6262, 6269, - 6276, 6283, 88, 6290, 6297, 6304, 6311, 6318, 6325, 6332, - 6339, 6346, 6353 + 6128, 6127, 6134, 6136, 6137, 6138, 6129, 6145, 6409, 6147, + 6144, 6151, 6409, 6152, 6140, 6153, 6154, 6155, 6163, 6158, + 6162, 6409, 6164, 6409, 6167, 6169, 6171, 6161, 6168, 6170, + 6184, 6186, 6179, 6409, 6172, 6188, 6182, 6193, 6195, 6197, + 6199, 6190, 6204, 6200, 6208, 6212, 6207, 6213, 6215, 6216, + 6217, 6409, 6219, 6222, 6409, 6223, 6224, 6225, 6226, 6230, + 6409, 6233, 6227, 6235, 6237, 6240, 6242, 6409, 6248, 6251, + 6252, 6409, 6253, 6409, 6409, 6255, 6243, 6256, 6264, 6266, + 6409, 6409, 6409, 6289, 6296, 6303, 6310, 6317, 6324, 6331, + 88, 6338, 6345, 6352, 6359, 6366, 6373, 6380, 6387, 6394, + + 6401 } ; -static const flex_int16_t yy_def[3274] = +static const flex_int16_t yy_def[3302] = { 0, - 3255, 1, 3256, 3256, 3257, 3257, 3258, 3258, 3259, 3259, - 3260, 3260, 3261, 3261, 3262, 3262, 3255, 3263, 3255, 3255, - 3255, 3255, 3264, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3265, 3255, 3255, 3255, - 3265, 3266, 3255, 3255, 3255, 3266, 3267, 3255, 3255, 3255, - 3255, 3267, 3268, 3255, 3255, 3255, 3268, 3269, 3255, 3270, - 3255, 3269, 3269, 3271, 3255, 3255, 3255, 3255, 3271, 3272, - 3255, 3255, 3255, 3272, 3263, 3263, 3255, 3273, 3264, 3273, - 3264, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3283, 1, 3284, 3284, 3285, 3285, 3286, 3286, 3287, 3287, + 3288, 3288, 3289, 3289, 3290, 3290, 3283, 3291, 3283, 3283, + 3283, 3283, 3292, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3293, 3283, 3283, 3283, + 3293, 3294, 3283, 3283, 3283, 3294, 3295, 3283, 3283, 3283, + 3283, 3295, 3296, 3283, 3283, 3283, 3296, 3297, 3283, 3298, + 3283, 3297, 3297, 3299, 3283, 3283, 3283, 3283, 3299, 3300, + 3283, 3283, 3283, 3300, 3291, 3291, 3283, 3301, 3292, 3301, + 3292, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3265, 3265, 3266, - 3266, 3267, 3267, 3255, 3268, 3268, 3269, 3269, 3270, 3270, - 3269, 3271, 3271, 3255, 3272, 3272, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3293, 3293, 3294, + 3294, 3295, 3295, 3283, 3296, 3296, 3297, 3297, 3298, 3298, + 3297, 3299, 3299, 3283, 3300, 3300, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3269, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3297, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3269, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3297, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3269, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3297, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3269, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3297, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255, - 3255, 3263, 3255, 3255, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3283, + 3283, 3291, 3283, 3283, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3269, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3297, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3283, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3283, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3269, 3269, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3297, 3297, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3269, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3297, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3269, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3283, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3297, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3283, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3255, 3269, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3297, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3255, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3283, 3291, 3291, 3291, 3283, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3269, 3263, 3255, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3255, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3283, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3297, 3291, 3283, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3283, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3255, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3283, 3291, + 3283, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3269, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3283, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3297, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3255, 3263, 3263, 3263, 3263, 3269, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3283, 3291, 3291, 3291, + 3291, 3297, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3255, 3255, 3263, 3263, 3263, 3263, 3263, 3255, - 3255, 3263, 3255, 3263, 3255, 3263, 3263, 3255, 3255, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3269, 3263, 3263, 3263, 3263, 3255, 3263, 3263, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3283, + 3283, 3291, 3291, 3291, 3291, 3291, 3283, 3283, 3291, 3283, + 3291, 3283, 3291, 3291, 3283, 3283, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3255, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3297, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3283, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3283, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3255, 3255, 3255, 3255, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3269, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3255, 3263, 3263, 3255, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, + 3291, 3283, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3283, 3283, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3283, 3283, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3297, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, + 3291, 3283, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3255, 3263, 3255, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3269, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3255, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3283, 3283, 3291, 3291, 3291, 3283, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3283, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3283, 3291, + 3283, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3283, 3291, + 3291, 3291, 3291, 3283, 3291, 3283, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3283, + 3297, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3283, 3283, 3291, 3283, 3291, 3291, 3283, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3255, 3255, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3255, 3255, 3263, 3263, 3263, 3263, - 3255, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3283, 3283, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3283, 3283, 3291, + 3291, 3291, 3291, 3283, 3291, 3283, 3291, 3283, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3283, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3255, 3263, 3255, 3263, 3255, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3255, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3255, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3255, 3255, 3263, 3255, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3283, 3291, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3283, 3291, 3291, 3283, 3291, 3283, + 3291, 3283, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3283, 3283, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3283, 3283, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, - 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3263, 3255, 3255, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, - 3255, 3255, 3263, 3263, 3263, 3255, 3255, 3255, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, - 3263, 3255, 3255, 3263, 3263, 3263, 3263, 3255, 3255, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3283, 3283, + 3291, 3283, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3283, 3283, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3283, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3283, 3283, 3291, 3291, + 3291, 3283, 3283, 3283, 3291, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3283, 3283, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, - 3263, 3263, 3263, 3255, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3255, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, - 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3255, 3255, 3263, 3263, 3255, - 3255, 3263, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3263, - 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3291, 3283, 3283, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3283, 3283, 3291, 3283, 3291, + 3291, 3283, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3283, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3283, 3283, 3291, 3291, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3283, 3291, 3291, 3283, 3283, 3291, 3291, 3283, 3283, 3291, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3291, 3283, 3291, - 3263, 3255, 3255, 3255, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3255, 3263, 3255, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255, - 3255, 3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3255, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3283, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, + 3283, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3283, 3291, 3283, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3283, 3283, 3291, + 3291, 3283, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3283, 3283, 3291, 3291, 3291, 3291, - 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, - 3263, 3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263, - 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3255, - 3263, 3263, 3263, 3255, 3263, 3255, 3255, 3263, 3263, 3263, - 3263, 3263, 3255, 3255, 0, 3255, 3255, 3255, 3255, 3255, - 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, - 3255, 3255, 3255 + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, + 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3283, 3291, 3291, 3283, 3291, 3291, 3291, 3291, 3291, + 3283, 3291, 3291, 3291, 3291, 3291, 3291, 3283, 3291, 3291, + 3291, 3283, 3291, 3283, 3283, 3291, 3291, 3291, 3291, 3291, + 3283, 3283, 0, 3283, 3283, 3283, 3283, 3283, 3283, 3283, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, + + 3283 } ; -static const flex_int16_t yy_nxt[6402] = +static const flex_int16_t yy_nxt[6450] = { 0, 18, 19, 20, 21, 22, 23, 22, 18, 18, 18, 18, 18, 22, 24, 25, 26, 27, 28, 29, 30, @@ -1532,7 +1543,7 @@ static const flex_int16_t yy_nxt[6402] = 204, 199, 86, 202, 207, 209, 86, 213, 210, 86, 86, 206, 208, 86, 216, 86, 86, 86, 86, 218, 86, 211, 212, 219, 223, 215, 86, 225, 226, 86, - 224, 86, 214, 86, 217, 918, 221, 86, 227, 220, + 224, 86, 214, 86, 217, 919, 221, 86, 227, 220, 86, 222, 228, 86, 231, 86, 86, 86, 236, 86, 233, 86, 86, 229, 234, 230, 238, 86, 248, 86, 86, 232, 86, 86, 86, 239, 235, 86, 86, 237, @@ -1631,7 +1642,7 @@ static const flex_int16_t yy_nxt[6402] = 86, 86, 684, 86, 86, 694, 161, 689, 690, 86, 695, 86, 687, 691, 168, 698, 692, 701, 700, 697, 699, 693, 696, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 710, 708, 86, 86, 702, 832, 86, 86, + 86, 86, 710, 708, 86, 86, 702, 833, 86, 86, 703, 705, 86, 706, 709, 704, 712, 713, 86, 714, 716, 715, 86, 86, 717, 86, 86, 86, 711, 86, 718, 86, 86, 86, 721, 722, 719, 727, 720, 86, @@ -1643,566 +1654,570 @@ static const flex_int16_t yy_nxt[6402] = 749, 86, 742, 748, 86, 750, 86, 86, 86, 86, 86, 754, 752, 86, 86, 86, 747, 86, 760, 746, 757, 86, 751, 753, 86, 86, 761, 86, 755, 756, - 758, 86, 86, 86, 767, 763, 86, 759, 86, 762, - 764, 86, 86, 770, 765, 766, 771, 86, 774, 768, - 86, 86, 769, 86, 86, 86, 772, 777, 776, 775, - 86, 86, 773, 86, 780, 779, 86, 782, 781, 86, - 86, 86, 86, 788, 86, 86, 784, 786, 86, 778, + 758, 86, 86, 86, 768, 763, 86, 759, 86, 762, + 764, 86, 86, 765, 766, 767, 771, 772, 86, 769, + 775, 86, 770, 774, 86, 86, 86, 777, 86, 778, + 776, 86, 773, 780, 781, 86, 86, 86, 86, 86, + 782, 86, 86, 86, 787, 785, 789, 86, 86, 86, - 86, 86, 794, 785, 783, 86, 86, 789, 86, 86, - 792, 787, 795, 159, 790, 86, 791, 793, 796, 797, - 798, 86, 86, 86, 799, 86, 803, 801, 800, 86, - 805, 86, 86, 86, 804, 86, 86, 86, 806, 802, - 809, 86, 808, 86, 86, 810, 86, 816, 813, 86, - 86, 86, 817, 86, 811, 819, 807, 812, 818, 86, - 821, 86, 814, 815, 86, 86, 825, 823, 822, 86, - 828, 820, 86, 86, 827, 829, 86, 826, 86, 830, - 86, 86, 824, 834, 86, 86, 86, 86, 86, 840, - 86, 86, 86, 86, 841, 86, 86, 86, 831, 833, + 86, 779, 783, 797, 786, 784, 86, 790, 86, 792, + 795, 86, 788, 86, 86, 793, 86, 796, 791, 801, + 794, 798, 799, 86, 86, 86, 800, 804, 86, 86, + 806, 802, 86, 86, 805, 807, 86, 86, 810, 803, + 86, 86, 809, 811, 86, 86, 86, 86, 86, 817, + 159, 814, 86, 808, 812, 86, 819, 820, 813, 818, + 86, 822, 86, 86, 86, 815, 816, 824, 821, 823, + 826, 86, 86, 829, 86, 827, 86, 828, 830, 86, + 86, 831, 825, 86, 86, 835, 86, 86, 86, 86, + 86, 841, 86, 834, 842, 86, 832, 86, 86, 86, - 842, 86, 835, 836, 837, 86, 838, 843, 839, 86, - 849, 844, 846, 847, 86, 845, 86, 86, 86, 86, - 848, 86, 86, 850, 86, 854, 851, 86, 86, 86, - 86, 86, 863, 86, 861, 856, 852, 853, 86, 86, - 855, 86, 857, 864, 862, 858, 859, 860, 86, 866, - 86, 86, 865, 868, 86, 867, 86, 86, 86, 86, - 86, 86, 873, 872, 875, 874, 869, 871, 86, 86, - 870, 86, 86, 876, 86, 880, 878, 168, 877, 86, - 879, 881, 883, 885, 86, 86, 882, 884, 86, 86, - 86, 86, 891, 86, 86, 892, 86, 887, 86, 886, + 86, 843, 836, 86, 837, 838, 86, 839, 850, 840, + 844, 86, 86, 845, 86, 848, 86, 846, 86, 847, + 86, 849, 86, 86, 852, 851, 855, 86, 86, 86, + 86, 86, 86, 864, 86, 853, 862, 854, 856, 857, + 86, 86, 86, 86, 863, 858, 859, 860, 861, 86, + 86, 86, 867, 865, 86, 869, 868, 86, 86, 866, + 86, 873, 871, 874, 86, 876, 86, 870, 86, 86, + 872, 875, 86, 877, 86, 86, 879, 86, 168, 86, + 86, 880, 885, 884, 878, 86, 882, 883, 881, 886, + 86, 86, 86, 86, 887, 892, 86, 895, 86, 888, - 894, 86, 86, 893, 888, 889, 86, 895, 898, 86, - 86, 890, 86, 900, 86, 896, 899, 897, 86, 904, - 86, 86, 901, 86, 86, 86, 86, 86, 905, 86, - 906, 86, 86, 925, 86, 86, 903, 902, 919, 907, - 920, 921, 917, 86, 86, 86, 909, 923, 86, 908, - 86, 86, 910, 922, 86, 911, 86, 926, 924, 912, - 86, 928, 913, 86, 86, 929, 940, 931, 930, 914, - 915, 927, 916, 86, 86, 932, 933, 86, 934, 86, - 86, 935, 939, 86, 942, 86, 936, 943, 945, 944, - 86, 86, 937, 938, 86, 86, 950, 941, 949, 86, + 86, 893, 86, 86, 86, 86, 889, 890, 896, 894, + 899, 897, 86, 891, 86, 86, 86, 86, 901, 86, + 905, 86, 86, 898, 902, 900, 86, 906, 907, 86, + 86, 86, 86, 86, 86, 904, 86, 86, 86, 921, + 903, 920, 910, 922, 86, 923, 918, 908, 925, 928, + 924, 86, 926, 86, 927, 909, 86, 86, 911, 86, + 86, 912, 86, 932, 176, 913, 86, 940, 914, 86, + 86, 930, 86, 86, 943, 915, 916, 929, 917, 86, + 931, 86, 933, 934, 947, 935, 86, 941, 936, 86, + 942, 86, 86, 937, 174, 945, 86, 944, 86, 938, - 86, 951, 86, 86, 953, 86, 947, 952, 86, 946, - 86, 955, 86, 956, 954, 957, 86, 959, 86, 948, - 86, 958, 960, 86, 962, 86, 86, 86, 86, 963, - 86, 86, 967, 86, 86, 961, 86, 970, 966, 86, - 86, 86, 968, 974, 984, 86, 964, 965, 969, 86, - 975, 971, 972, 976, 86, 86, 176, 977, 980, 981, - 979, 973, 978, 86, 86, 86, 86, 983, 86, 86, - 86, 982, 86, 86, 985, 987, 86, 986, 988, 86, - 989, 86, 86, 86, 994, 86, 991, 86, 990, 992, - 86, 997, 86, 998, 86, 86, 995, 86, 996, 86, + 939, 951, 952, 954, 949, 948, 86, 953, 86, 86, + 955, 946, 86, 86, 86, 958, 86, 950, 957, 86, + 86, 956, 86, 960, 959, 962, 86, 961, 86, 86, + 963, 965, 86, 86, 86, 968, 966, 86, 970, 86, + 86, 964, 969, 86, 86, 973, 86, 86, 86, 977, + 86, 86, 1034, 967, 971, 86, 978, 972, 974, 975, + 979, 86, 86, 1013, 980, 983, 984, 982, 976, 981, + 86, 86, 86, 86, 986, 86, 86, 86, 985, 987, + 86, 988, 990, 86, 86, 989, 991, 86, 86, 86, + 86, 86, 992, 86, 994, 997, 86, 995, 1001, 86, - 86, 86, 993, 86, 1000, 86, 1001, 86, 1003, 86, - 1004, 86, 1005, 999, 86, 86, 1006, 86, 1013, 1007, - 1011, 86, 86, 1009, 1002, 1012, 86, 86, 1010, 86, - 86, 86, 1008, 86, 1018, 1020, 1014, 86, 1016, 1021, - 86, 1015, 1019, 86, 86, 86, 86, 86, 1023, 86, - 1025, 1017, 86, 86, 86, 86, 1029, 1031, 1022, 86, - 86, 86, 1034, 86, 86, 1024, 1026, 1027, 86, 1028, - 1035, 1036, 1032, 86, 1033, 1030, 86, 1038, 1040, 1037, - 86, 86, 1039, 1042, 86, 1041, 86, 86, 86, 86, - 1044, 86, 86, 1043, 1051, 1046, 1052, 1054, 86, 86, + 1000, 86, 998, 86, 86, 86, 993, 999, 86, 86, + 996, 86, 86, 86, 1003, 86, 1006, 1004, 1008, 86, + 86, 1007, 1002, 86, 1009, 1014, 86, 1010, 86, 1016, + 1015, 86, 1012, 1005, 86, 86, 86, 86, 1024, 86, + 1021, 1017, 86, 86, 1019, 1011, 86, 86, 1022, 1023, + 86, 1026, 86, 1018, 86, 86, 86, 86, 173, 86, + 1020, 1037, 86, 1025, 1027, 1032, 86, 86, 86, 86, + 1028, 86, 1029, 86, 86, 1031, 1030, 1035, 1038, 1042, + 1033, 1036, 1041, 1039, 86, 1040, 1045, 86, 1043, 1044, + 86, 86, 86, 86, 86, 86, 86, 1054, 86, 1055, - 86, 1056, 86, 86, 86, 86, 1045, 86, 1047, 1057, - 1049, 1048, 1050, 1053, 86, 86, 86, 1060, 1055, 1062, - 1058, 86, 1065, 1059, 86, 1061, 86, 1064, 86, 86, - 86, 86, 1066, 1069, 1071, 86, 86, 1068, 86, 86, - 1074, 86, 1063, 1073, 86, 1075, 168, 86, 1067, 86, - 86, 1070, 86, 1077, 1072, 1081, 1076, 86, 1078, 86, - 86, 86, 86, 86, 86, 1094, 1079, 1080, 86, 1097, - 86, 1082, 1095, 86, 1084, 1085, 86, 86, 86, 86, - 86, 1086, 1099, 1083, 1087, 86, 1119, 174, 1088, 86, - 1089, 1096, 1100, 1101, 1090, 86, 1091, 86, 1098, 1104, + 1047, 1049, 86, 86, 86, 86, 86, 1057, 86, 86, + 1046, 1065, 1048, 86, 1050, 1052, 1056, 1051, 1053, 1059, + 1060, 86, 86, 86, 1058, 86, 86, 1061, 1062, 1066, + 86, 1067, 1068, 1063, 86, 86, 1072, 1069, 86, 86, + 1070, 1064, 86, 1074, 86, 86, 86, 1077, 1071, 86, + 86, 1076, 1078, 168, 1080, 86, 1081, 86, 86, 1073, + 86, 86, 86, 1075, 1079, 1084, 86, 86, 86, 86, + 86, 1097, 86, 1100, 86, 86, 1098, 86, 1083, 1082, + 1085, 1087, 1088, 86, 86, 168, 1086, 1090, 1089, 86, + 1099, 86, 1091, 86, 1092, 1102, 86, 1104, 1093, 1103, - 1102, 1092, 86, 1103, 1105, 86, 1093, 86, 86, 1113, - 86, 1106, 1108, 86, 86, 86, 86, 86, 1111, 1114, - 1121, 1107, 86, 86, 1109, 1110, 86, 1120, 1112, 1115, - 1122, 1117, 1118, 1123, 86, 1124, 86, 1116, 1125, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 1137, 86, - 1140, 86, 86, 86, 1136, 1142, 1141, 86, 1139, 86, - 1127, 1126, 86, 1128, 86, 1129, 1138, 1143, 1147, 86, - 1130, 86, 1131, 86, 86, 1146, 1144, 86, 1132, 86, - 173, 1145, 1148, 1133, 1134, 1152, 86, 1149, 86, 1150, - 1135, 1154, 1153, 1155, 86, 86, 86, 1151, 1156, 86, + 1094, 1105, 1101, 1107, 86, 1095, 86, 1106, 1108, 86, + 1096, 86, 86, 1109, 86, 1111, 86, 86, 86, 86, + 1110, 1114, 1117, 86, 1116, 86, 86, 1112, 86, 1113, + 86, 1115, 1118, 1123, 1121, 1124, 1122, 1120, 1125, 86, + 1119, 86, 1126, 86, 86, 1127, 1128, 86, 1129, 86, + 86, 86, 86, 166, 86, 86, 1140, 86, 1130, 86, + 1143, 1139, 86, 1145, 86, 1131, 86, 1132, 1141, 1142, + 86, 86, 1133, 86, 1134, 1144, 1146, 86, 1150, 86, + 1135, 86, 1151, 1147, 86, 1136, 1137, 86, 86, 1149, + 1148, 1152, 1138, 1156, 86, 86, 86, 86, 1159, 1153, - 1159, 86, 86, 86, 1165, 86, 86, 1160, 86, 1158, - 86, 86, 1162, 1157, 1163, 86, 86, 86, 86, 86, - 1161, 86, 1168, 86, 1164, 1166, 86, 86, 86, 1175, - 1167, 86, 1170, 1172, 1177, 1169, 1173, 1174, 86, 1171, - 86, 86, 86, 1176, 86, 86, 86, 1178, 86, 86, - 86, 86, 1179, 1185, 1186, 1187, 1182, 86, 86, 1189, - 1184, 1180, 1190, 1181, 1183, 86, 1188, 1192, 86, 1193, - 86, 86, 86, 1195, 1194, 86, 1196, 86, 1191, 86, - 1197, 86, 86, 86, 1198, 86, 1204, 1206, 86, 86, - 86, 1199, 86, 86, 1208, 1200, 1202, 1203, 86, 1201, + 1157, 86, 86, 1154, 86, 1160, 1155, 86, 86, 86, + 86, 1164, 1162, 1165, 1163, 1158, 1161, 86, 86, 1167, + 86, 86, 86, 1170, 86, 86, 86, 1168, 1166, 86, + 1171, 1173, 86, 86, 86, 86, 1169, 86, 86, 1175, + 86, 1172, 86, 1178, 1174, 1177, 1179, 1182, 1180, 86, + 86, 1183, 1176, 86, 1184, 1181, 86, 86, 86, 86, + 86, 86, 86, 164, 1187, 1190, 1191, 1192, 1193, 1185, + 86, 1194, 1189, 1195, 86, 1186, 1188, 86, 1198, 86, + 86, 86, 1200, 1199, 86, 1201, 86, 1196, 86, 1202, + 86, 86, 86, 1197, 1203, 86, 1209, 86, 1211, 86, - 86, 1210, 86, 1207, 1209, 1205, 86, 1212, 86, 86, - 86, 1213, 86, 86, 1215, 1216, 86, 86, 1218, 86, - 1221, 1211, 86, 1220, 1214, 1217, 86, 1222, 86, 86, - 86, 1223, 1219, 1225, 86, 1226, 86, 1224, 86, 86, - 86, 86, 1230, 1232, 1233, 86, 1234, 1227, 1237, 86, - 86, 86, 86, 1231, 86, 1228, 1235, 1236, 1229, 86, - 1240, 86, 86, 1238, 1242, 86, 86, 1241, 86, 86, - 1243, 86, 86, 86, 86, 1247, 1248, 1244, 86, 1239, - 86, 86, 1253, 1254, 86, 1249, 86, 1245, 86, 86, - 1246, 1256, 1251, 1257, 86, 86, 1250, 86, 86, 1255, + 86, 86, 86, 1215, 86, 1207, 1205, 86, 1204, 1206, + 1208, 86, 1213, 86, 1212, 1214, 86, 1210, 1217, 86, + 86, 1218, 86, 86, 86, 1220, 86, 1221, 86, 1223, + 86, 1226, 1216, 86, 1225, 1219, 1222, 86, 1227, 86, + 86, 86, 1224, 86, 1230, 86, 1231, 86, 1229, 1228, + 86, 1232, 86, 1235, 1237, 1238, 86, 86, 86, 86, + 86, 86, 1233, 1239, 1240, 1236, 86, 1234, 1242, 1247, + 86, 1241, 1245, 86, 86, 1243, 1244, 86, 86, 86, + 86, 86, 1246, 86, 86, 86, 1252, 1253, 1248, 1249, + 86, 1250, 86, 86, 86, 1258, 1254, 1259, 1262, 86, - 1252, 1261, 86, 86, 86, 86, 86, 86, 1267, 86, - 1260, 1259, 1263, 168, 1258, 86, 86, 86, 86, 86, - 1262, 1274, 86, 1264, 1272, 86, 1266, 1273, 1271, 1269, - 1276, 1265, 1270, 1268, 1277, 86, 86, 86, 86, 86, - 86, 1280, 1279, 1281, 86, 1275, 86, 86, 86, 86, - 86, 1278, 1284, 86, 86, 1290, 86, 1287, 1282, 86, - 1283, 86, 86, 1285, 86, 86, 168, 86, 1286, 1288, - 1294, 1300, 1289, 1291, 86, 86, 86, 1293, 86, 1292, - 1296, 86, 1301, 1302, 86, 1295, 1303, 86, 86, 1297, - 1305, 1298, 1308, 86, 1299, 1304, 1306, 86, 86, 86, + 1251, 86, 86, 86, 1256, 86, 86, 1261, 1255, 1260, + 86, 1266, 1257, 86, 86, 86, 86, 86, 86, 168, + 1264, 86, 1265, 1268, 1263, 1272, 86, 86, 86, 86, + 86, 1267, 1279, 86, 1277, 1269, 1275, 1271, 86, 1273, + 1276, 1274, 1270, 1281, 86, 1282, 86, 1278, 86, 86, + 1280, 86, 86, 1284, 1285, 86, 86, 86, 86, 86, + 1283, 1286, 86, 1289, 86, 1291, 86, 1295, 86, 1287, + 86, 1288, 86, 1292, 1290, 86, 86, 1293, 86, 86, + 86, 1299, 86, 1294, 1296, 1301, 1305, 86, 1306, 86, + 1297, 1298, 86, 1310, 1302, 86, 1303, 1307, 1300, 1304, - 86, 86, 86, 1307, 1310, 86, 1309, 1313, 86, 1317, - 86, 86, 1312, 86, 86, 1314, 1315, 1311, 1318, 1319, - 86, 86, 86, 86, 86, 1321, 1322, 1316, 86, 86, - 1323, 1320, 86, 86, 86, 86, 86, 86, 1324, 1325, - 86, 1327, 1329, 86, 1330, 86, 1334, 1326, 1328, 86, - 86, 86, 86, 1331, 86, 1333, 86, 1332, 1335, 1338, - 86, 86, 86, 86, 1345, 1336, 1339, 166, 1341, 1337, - 86, 1340, 86, 86, 86, 1343, 86, 1346, 1350, 1342, - 86, 1344, 1348, 1349, 1352, 86, 1347, 86, 1351, 1353, - 86, 86, 1357, 86, 1367, 86, 86, 1368, 1356, 1354, + 1308, 86, 1309, 86, 86, 86, 1311, 86, 1312, 86, + 86, 86, 1315, 86, 1314, 1318, 86, 86, 86, 1322, + 86, 86, 1313, 1317, 86, 86, 1323, 1319, 1316, 1320, + 1324, 86, 86, 1328, 86, 1321, 1326, 1325, 1327, 86, + 86, 86, 86, 86, 86, 86, 86, 1329, 86, 86, + 1334, 86, 86, 1332, 1330, 1339, 1335, 1333, 86, 1331, + 86, 86, 86, 86, 1336, 86, 1338, 1337, 86, 1343, + 86, 1341, 1342, 1340, 86, 1346, 1344, 1351, 86, 86, + 86, 1345, 86, 86, 1347, 1349, 86, 1354, 86, 86, + 86, 1357, 1353, 1348, 1350, 1352, 86, 86, 86, 86, - 86, 1355, 86, 1358, 1366, 86, 1365, 1359, 86, 86, - 1360, 1361, 1371, 1369, 1370, 1362, 164, 86, 86, 86, - 86, 1363, 1372, 86, 1373, 1364, 86, 1374, 86, 1376, - 1375, 86, 86, 86, 1377, 86, 1378, 86, 86, 1386, - 1379, 1380, 1381, 1383, 1387, 86, 86, 86, 163, 1384, - 86, 1388, 1382, 86, 86, 1385, 1390, 1389, 86, 1395, - 86, 1391, 86, 1392, 1399, 1393, 86, 1394, 1396, 1397, - 86, 86, 1401, 1398, 86, 86, 86, 1403, 86, 1402, - 86, 1400, 1404, 86, 1405, 1407, 86, 1409, 86, 86, - 1408, 1413, 86, 1414, 86, 86, 1406, 86, 86, 86, + 1359, 1358, 1355, 86, 1356, 1360, 86, 86, 1364, 1361, + 1362, 1363, 86, 1365, 86, 1387, 1372, 1366, 1374, 1386, + 1367, 1368, 86, 1373, 86, 1369, 86, 1375, 86, 86, + 1378, 1370, 86, 1376, 86, 1371, 86, 1379, 1377, 1380, + 86, 1381, 86, 1382, 86, 1383, 86, 86, 86, 1384, + 86, 1385, 86, 1390, 1393, 1394, 1388, 86, 86, 86, + 86, 86, 1389, 1395, 1391, 86, 1397, 86, 1402, 1396, + 1392, 1398, 86, 1399, 1407, 1400, 86, 1401, 1403, 1404, + 1406, 86, 86, 1405, 86, 1410, 86, 86, 86, 86, + 1411, 86, 86, 1409, 1414, 1412, 86, 86, 86, 1420, - 86, 86, 1415, 1412, 1417, 1410, 86, 1411, 86, 1416, - 1419, 86, 1418, 1422, 1423, 86, 1425, 86, 1420, 86, - 86, 1426, 86, 1427, 86, 86, 1424, 1428, 1431, 86, - 86, 1421, 1433, 86, 1430, 86, 1434, 86, 86, 86, - 1438, 86, 1435, 1429, 86, 86, 86, 86, 1440, 86, - 1432, 86, 1442, 1444, 86, 86, 86, 86, 1443, 1436, - 1437, 1448, 86, 86, 1439, 1446, 1441, 86, 1450, 86, - 1447, 1449, 1445, 86, 1452, 1451, 86, 1454, 1453, 86, - 86, 86, 86, 86, 1455, 1460, 1461, 1457, 86, 1458, - 86, 86, 86, 1462, 1463, 86, 1459, 86, 1456, 1464, + 1408, 1416, 1415, 86, 1421, 86, 86, 86, 86, 1413, + 86, 86, 1419, 1424, 1422, 1417, 1418, 86, 86, 86, + 1426, 1423, 86, 163, 1425, 1430, 86, 1429, 1432, 86, + 86, 86, 1433, 86, 1431, 1427, 1434, 86, 86, 1438, + 86, 86, 1435, 1428, 1440, 86, 86, 1437, 86, 1441, + 1436, 1442, 86, 86, 1445, 86, 86, 86, 86, 86, + 1447, 1439, 86, 86, 1449, 1451, 86, 86, 86, 161, + 1453, 1450, 86, 1443, 1444, 86, 1446, 1455, 1448, 86, + 86, 86, 86, 1454, 1452, 1457, 1459, 1458, 86, 1456, + 86, 1461, 86, 1460, 86, 86, 86, 1462, 1467, 1468, - 86, 1467, 86, 86, 168, 86, 86, 1472, 1466, 1473, - 86, 1475, 86, 86, 1465, 86, 1474, 86, 86, 1469, - 86, 86, 86, 1468, 86, 1470, 1476, 86, 1483, 1471, - 86, 86, 1477, 1480, 86, 86, 1481, 161, 1478, 86, - 1479, 86, 1482, 86, 1487, 1488, 86, 86, 1490, 1492, - 1484, 86, 1486, 86, 1493, 86, 1485, 86, 1489, 1496, - 1491, 86, 1495, 86, 86, 1494, 86, 86, 86, 1501, - 1504, 1497, 1502, 86, 1506, 1503, 1498, 86, 1499, 86, - 86, 1500, 86, 1507, 1509, 86, 1511, 1505, 1508, 1510, - 86, 86, 86, 86, 86, 86, 1514, 1515, 86, 86, + 1463, 1464, 1470, 1465, 86, 86, 86, 1466, 86, 86, + 86, 1469, 86, 1474, 86, 86, 168, 86, 1471, 86, + 1479, 1480, 86, 1473, 1482, 86, 86, 86, 1481, 1472, + 86, 1476, 86, 86, 86, 1475, 86, 1477, 86, 1483, + 86, 1490, 1478, 86, 86, 1484, 1487, 86, 86, 86, + 1488, 86, 1485, 1486, 1494, 86, 1489, 1495, 86, 86, + 1497, 1499, 159, 1491, 86, 1493, 1500, 86, 86, 1492, + 1498, 1496, 86, 1502, 86, 86, 1503, 1501, 86, 86, + 1511, 86, 86, 86, 1508, 86, 1504, 1509, 1513, 1505, + 1506, 1510, 86, 1507, 86, 1512, 1514, 86, 1516, 86, - 1518, 86, 86, 1513, 86, 1523, 86, 86, 1512, 86, - 1524, 1516, 86, 1520, 1517, 1527, 86, 86, 1519, 1521, - 1522, 86, 86, 86, 1528, 1525, 86, 86, 1526, 86, - 86, 1530, 1534, 86, 86, 1529, 1535, 1531, 1532, 1536, - 86, 1539, 1538, 86, 86, 1533, 86, 86, 1537, 86, - 1543, 1544, 86, 1541, 1546, 86, 86, 86, 1540, 86, - 86, 1545, 1547, 1551, 1552, 1550, 1542, 86, 1548, 86, - 86, 86, 1553, 86, 1554, 1555, 86, 86, 86, 86, - 1549, 1556, 86, 86, 86, 1558, 86, 1557, 86, 1563, - 86, 1559, 86, 1562, 86, 1566, 1560, 86, 1561, 86, + 86, 86, 1518, 1517, 86, 1521, 1522, 86, 1515, 86, + 86, 1519, 86, 86, 86, 1525, 86, 1520, 86, 86, + 1530, 86, 86, 86, 1534, 1523, 1531, 1527, 86, 1524, + 86, 86, 1526, 1533, 1528, 1535, 1529, 86, 86, 1532, + 86, 86, 86, 86, 86, 1537, 1541, 1536, 1543, 1542, + 86, 86, 1538, 1539, 86, 1546, 86, 86, 86, 1540, + 1545, 1551, 1544, 86, 1550, 1547, 1548, 86, 1552, 1554, + 86, 86, 1553, 86, 86, 86, 1549, 1555, 86, 1559, + 1560, 1561, 86, 1558, 86, 86, 86, 86, 1565, 1556, + 86, 1562, 86, 1563, 1564, 86, 1557, 86, 86, 86, - 1565, 1569, 86, 1574, 1564, 1571, 1570, 86, 1567, 86, - 1572, 86, 86, 86, 86, 86, 1568, 86, 86, 1573, - 1578, 1582, 1577, 86, 86, 86, 1585, 86, 1575, 1583, - 86, 1576, 86, 1579, 86, 1588, 1581, 1580, 86, 86, - 1587, 86, 86, 86, 1586, 86, 86, 1596, 86, 1584, - 86, 1594, 86, 1597, 1599, 86, 86, 1589, 1590, 1593, - 1602, 1591, 1592, 1595, 1598, 1600, 86, 86, 86, 86, - 86, 86, 1601, 1606, 86, 86, 86, 1607, 1604, 86, - 1610, 1603, 86, 1605, 1614, 86, 86, 86, 86, 1616, - 1608, 1611, 1609, 1615, 86, 86, 86, 86, 1613, 1612, + 1567, 86, 86, 86, 1572, 86, 1566, 86, 86, 1571, + 1568, 86, 86, 1569, 1578, 1574, 1570, 1575, 1580, 1579, + 86, 86, 1576, 1581, 86, 1573, 86, 1583, 86, 86, + 1577, 86, 86, 86, 86, 86, 1591, 1587, 86, 86, + 1586, 1582, 86, 1592, 1594, 86, 86, 1584, 1585, 86, + 86, 1597, 1588, 1590, 1589, 1596, 86, 86, 86, 86, + 86, 86, 86, 86, 1595, 1593, 86, 1603, 86, 1605, + 86, 86, 1613, 1606, 1612, 1598, 1602, 1599, 1600, 1601, + 86, 1604, 86, 1607, 1608, 86, 1609, 86, 86, 86, + 86, 86, 86, 1610, 1611, 1614, 86, 1619, 1615, 86, - 1618, 1617, 1619, 86, 86, 86, 1625, 1620, 1621, 1626, - 86, 86, 86, 86, 1622, 86, 1624, 86, 1630, 1631, - 1629, 86, 86, 1623, 86, 86, 1633, 86, 86, 1627, - 86, 1634, 1635, 86, 1628, 86, 86, 86, 1636, 1638, - 1637, 1632, 86, 1641, 1640, 86, 86, 86, 86, 86, - 1639, 86, 1642, 1645, 86, 1647, 86, 86, 1648, 86, - 1652, 1646, 86, 86, 86, 1644, 1643, 86, 86, 1649, - 86, 1650, 1655, 1657, 86, 86, 1653, 86, 1660, 1656, - 86, 1654, 1651, 86, 1658, 86, 1662, 1663, 1659, 86, - 1666, 86, 1661, 168, 1665, 86, 86, 86, 86, 86, + 1621, 86, 1616, 1623, 86, 86, 1620, 1618, 1625, 86, + 1624, 86, 1627, 86, 86, 1617, 1628, 1622, 86, 86, + 86, 86, 1629, 1630, 1626, 1634, 1635, 86, 86, 86, + 86, 86, 86, 1631, 1640, 1638, 86, 1639, 1632, 86, + 86, 1633, 1642, 86, 86, 86, 1636, 1643, 1644, 86, + 1637, 86, 1641, 86, 1647, 1645, 86, 86, 1650, 86, + 86, 1646, 86, 86, 86, 1649, 86, 1654, 86, 1656, + 86, 86, 86, 1648, 1651, 1657, 86, 1661, 1655, 86, + 86, 1652, 1653, 86, 86, 86, 1659, 1667, 1658, 1664, + 1666, 86, 86, 1662, 86, 1669, 86, 1660, 1663, 86, - 86, 1674, 86, 86, 1664, 86, 159, 1675, 86, 1667, - 1669, 86, 1672, 1668, 1678, 86, 1670, 1671, 86, 86, - 1679, 86, 86, 1676, 1673, 1677, 1680, 86, 1681, 1682, - 86, 1684, 86, 1686, 86, 1683, 1687, 86, 1685, 86, - 1688, 86, 86, 1692, 86, 86, 1693, 86, 1690, 1691, - 86, 1689, 86, 1694, 86, 86, 86, 1699, 1698, 86, - 86, 1695, 86, 86, 3255, 1706, 86, 86, 1696, 1697, - 1703, 86, 1701, 1704, 86, 86, 86, 1700, 1708, 1707, - 86, 1711, 1702, 86, 1723, 1705, 1713, 1715, 1712, 1710, - 1714, 86, 1716, 86, 1709, 86, 86, 1718, 86, 1720, + 1665, 86, 86, 86, 168, 1672, 1675, 86, 1674, 86, + 1671, 86, 1668, 86, 86, 86, 86, 1683, 1670, 86, + 1676, 1673, 86, 86, 1684, 1678, 86, 1677, 1681, 1687, + 86, 86, 1679, 1680, 86, 1688, 1689, 86, 1693, 1691, + 1682, 86, 1685, 1686, 86, 86, 1692, 1695, 86, 1697, + 86, 86, 86, 86, 1690, 86, 86, 86, 1699, 86, + 1700, 86, 1696, 86, 1702, 1694, 86, 1703, 86, 86, + 1698, 1704, 1707, 86, 1708, 86, 1706, 1705, 86, 86, + 1701, 86, 1712, 1715, 1717, 1713, 1709, 1710, 86, 86, + 86, 86, 86, 1716, 1723, 86, 1720, 1714, 1711, 1719, - 1717, 86, 1719, 86, 86, 86, 86, 86, 1721, 86, - 1727, 86, 1726, 1728, 86, 86, 86, 1722, 1730, 86, - 1729, 86, 1733, 86, 86, 1724, 1732, 1725, 86, 86, - 86, 86, 1735, 1734, 1731, 86, 86, 86, 86, 86, - 86, 1743, 86, 86, 86, 1738, 86, 86, 86, 1736, - 1737, 1739, 1740, 1741, 1745, 1746, 1748, 1747, 86, 1744, - 86, 1742, 86, 1753, 86, 86, 1749, 1750, 86, 1752, - 1755, 86, 1751, 86, 1757, 86, 86, 86, 86, 86, - 1754, 86, 1759, 1756, 86, 86, 86, 1762, 1764, 86, - 1758, 1772, 86, 1765, 1763, 1761, 1766, 1773, 86, 86, + 1718, 86, 1724, 1725, 1722, 86, 86, 1727, 86, 86, + 1726, 86, 1728, 1729, 86, 86, 86, 1721, 86, 86, + 1730, 86, 86, 1736, 1737, 1735, 86, 1731, 86, 86, + 86, 1738, 1739, 86, 1732, 86, 86, 1733, 86, 86, + 1741, 1734, 1742, 86, 1743, 86, 86, 86, 86, 86, + 86, 1740, 86, 1745, 1744, 86, 1752, 1753, 86, 86, + 1747, 1748, 1749, 1758, 86, 1746, 86, 1750, 86, 86, + 86, 1755, 86, 86, 86, 1751, 1756, 1754, 86, 1757, + 1764, 86, 86, 86, 86, 86, 1760, 1762, 1759, 1766, + 86, 1768, 1761, 86, 1767, 1763, 86, 1770, 1765, 86, - 1760, 1767, 1771, 86, 1768, 86, 86, 86, 86, 1769, - 1776, 1770, 1777, 86, 86, 1774, 86, 86, 86, 1778, - 86, 1780, 1781, 1775, 86, 1789, 86, 1779, 86, 1784, - 86, 86, 86, 1782, 1783, 1786, 86, 1788, 1787, 1790, - 86, 86, 86, 1785, 86, 1792, 86, 86, 86, 1799, - 1791, 86, 86, 3255, 1793, 1794, 1796, 86, 1795, 86, - 1803, 1801, 1802, 86, 86, 1798, 86, 1800, 86, 1807, - 86, 1797, 1805, 1811, 1804, 1806, 86, 86, 1812, 86, - 86, 86, 86, 86, 1808, 1817, 1816, 86, 1810, 1809, - 1813, 86, 1814, 1819, 86, 1820, 86, 1825, 86, 1822, + 1769, 86, 86, 86, 86, 86, 86, 86, 1773, 1775, + 1782, 86, 1776, 86, 1772, 1777, 1774, 1771, 1783, 86, + 1778, 1779, 1784, 86, 86, 1785, 1780, 1787, 86, 1786, + 1781, 1788, 86, 86, 86, 86, 86, 86, 86, 1791, + 1792, 1789, 86, 86, 1800, 86, 86, 1795, 86, 86, + 86, 86, 1790, 1794, 1797, 1793, 86, 1798, 1799, 1801, + 86, 1796, 1806, 1802, 1803, 86, 1804, 86, 86, 86, + 1805, 86, 1810, 86, 86, 86, 1814, 1807, 86, 1813, + 86, 86, 1812, 1818, 86, 1811, 1809, 86, 86, 1822, + 1815, 86, 1808, 1816, 1823, 86, 1817, 86, 1819, 86, - 1818, 86, 1815, 1821, 86, 86, 1826, 1824, 86, 1827, - 1823, 1828, 86, 1830, 86, 86, 86, 1829, 86, 86, - 86, 3255, 1831, 86, 86, 86, 1834, 86, 86, 1835, - 1840, 86, 1842, 86, 1832, 1833, 1836, 1837, 86, 1838, - 1843, 1839, 86, 1845, 86, 86, 86, 86, 1846, 86, - 1850, 1847, 1841, 86, 86, 1844, 86, 1854, 86, 86, - 1849, 86, 86, 86, 1848, 1856, 86, 1857, 1858, 1852, - 86, 1851, 1853, 86, 168, 1859, 86, 1864, 86, 1855, - 86, 86, 1860, 86, 1868, 86, 1862, 86, 86, 1861, - 86, 1863, 86, 1866, 86, 1870, 86, 1875, 86, 1865, + 1828, 86, 1820, 1825, 1827, 1821, 86, 1830, 86, 1831, + 1833, 1824, 86, 1826, 86, 86, 86, 1832, 86, 1829, + 1834, 86, 1837, 86, 86, 1841, 86, 1839, 86, 86, + 86, 86, 86, 1840, 1842, 1836, 1838, 86, 1835, 86, + 1845, 86, 86, 86, 1851, 86, 1846, 1853, 1843, 1844, + 86, 86, 1847, 86, 1848, 1854, 1849, 1850, 1856, 86, + 86, 86, 86, 1855, 86, 86, 1852, 1861, 86, 86, + 86, 1857, 86, 86, 1865, 86, 1867, 1860, 1858, 86, + 86, 1859, 168, 86, 1863, 1868, 86, 1862, 1864, 1866, + 86, 1869, 1871, 86, 1873, 1870, 1875, 86, 86, 86, - 86, 1869, 1867, 86, 1871, 86, 1872, 1879, 86, 1873, - 1876, 1878, 86, 1881, 86, 1880, 1874, 86, 1877, 86, - 1884, 86, 1882, 1885, 86, 86, 86, 1887, 1883, 86, - 86, 86, 1888, 1886, 86, 86, 86, 86, 86, 86, - 1893, 86, 1894, 86, 86, 86, 86, 1895, 1898, 86, - 1889, 1896, 1891, 1890, 1892, 1899, 1897, 86, 86, 86, - 1905, 1907, 1902, 1904, 1901, 1906, 86, 86, 1900, 1903, - 1908, 86, 86, 86, 86, 86, 1913, 86, 1909, 86, - 1916, 1917, 86, 1918, 86, 1920, 86, 86, 1911, 1914, - 1910, 1915, 86, 1912, 86, 1921, 86, 1919, 1924, 86, + 86, 86, 1872, 1879, 86, 86, 86, 86, 1874, 86, + 86, 1877, 1881, 86, 1886, 1880, 86, 1876, 1882, 1878, + 86, 1883, 86, 1890, 86, 1887, 1884, 86, 1889, 86, + 1885, 86, 1891, 86, 1888, 1892, 86, 1895, 1893, 1897, + 1894, 1896, 86, 86, 86, 86, 1898, 86, 1899, 86, + 86, 86, 86, 86, 86, 86, 86, 1904, 1905, 86, + 86, 1909, 86, 1906, 86, 1917, 86, 1900, 1902, 1903, + 1908, 1901, 1907, 1910, 86, 86, 86, 1916, 1918, 1912, + 1913, 1915, 86, 86, 86, 86, 1911, 1914, 86, 86, + 86, 1924, 86, 86, 1927, 1919, 1928, 86, 1929, 86, - 1925, 1926, 86, 1928, 86, 1927, 1930, 86, 1922, 86, - 86, 86, 86, 1923, 1932, 1933, 86, 86, 86, 1936, - 86, 86, 1929, 1935, 86, 86, 1939, 86, 1941, 1938, - 3255, 86, 1940, 86, 86, 1931, 86, 1934, 86, 86, - 1948, 1954, 1937, 1942, 1943, 1944, 86, 86, 86, 1950, - 1945, 86, 86, 1946, 1951, 86, 1947, 86, 1949, 1957, - 86, 1952, 1955, 1953, 86, 86, 1958, 1956, 1961, 86, - 86, 86, 1963, 86, 86, 86, 86, 1966, 1967, 86, - 1959, 1969, 86, 86, 86, 1960, 86, 1975, 86, 86, - 86, 86, 86, 1964, 1968, 1971, 1962, 1965, 1972, 86, + 86, 1920, 1921, 86, 1922, 1923, 1925, 86, 1926, 86, + 1930, 1931, 86, 86, 1932, 1935, 86, 1937, 86, 86, + 1939, 1933, 1936, 86, 1934, 86, 86, 1940, 1938, 1941, + 86, 86, 1942, 1943, 86, 86, 1944, 86, 86, 1945, + 1947, 86, 86, 1946, 86, 1951, 1948, 1950, 86, 86, + 1953, 86, 86, 1952, 86, 1949, 86, 86, 1961, 86, + 1963, 1954, 1955, 1956, 86, 1964, 86, 86, 1957, 86, + 1959, 1958, 86, 1965, 1960, 1970, 86, 1962, 1967, 86, + 1968, 86, 1966, 86, 86, 1974, 86, 1969, 1971, 86, + 86, 1976, 86, 86, 86, 86, 1979, 1980, 86, 1982, - 1974, 86, 86, 86, 1981, 1973, 86, 1977, 1970, 1978, - 1979, 1976, 86, 86, 1985, 86, 86, 1980, 1984, 86, - 86, 1988, 86, 1987, 1989, 1982, 86, 86, 1983, 86, - 86, 1990, 86, 86, 1991, 1986, 86, 86, 1995, 1993, - 1996, 1994, 1992, 86, 86, 1999, 2000, 2001, 86, 86, - 86, 86, 86, 86, 1997, 2004, 86, 86, 2009, 86, - 86, 86, 2008, 86, 2003, 86, 86, 86, 2002, 1998, - 2006, 2005, 2014, 86, 2015, 86, 2011, 2013, 2007, 2010, - 2016, 86, 2012, 86, 2020, 86, 2018, 2017, 2021, 86, - 86, 2019, 86, 86, 86, 2027, 86, 2024, 86, 86, + 86, 86, 86, 1972, 86, 1973, 1988, 86, 86, 86, + 86, 1984, 1977, 1981, 1987, 1975, 1978, 1985, 86, 1992, + 86, 86, 86, 86, 1994, 1986, 1983, 86, 1991, 86, + 1989, 86, 1998, 1990, 86, 86, 1997, 2001, 86, 86, + 2002, 86, 2000, 86, 2004, 1996, 86, 86, 1993, 2003, + 86, 86, 86, 1995, 1999, 86, 2005, 86, 2009, 86, + 2013, 2006, 86, 2012, 2008, 2014, 86, 86, 86, 86, + 2007, 86, 86, 2017, 86, 2010, 86, 2022, 86, 86, + 86, 2021, 86, 2016, 86, 2011, 86, 2015, 2026, 2018, + 86, 86, 2019, 2029, 86, 2024, 2020, 2027, 2023, 2028, - 86, 86, 2032, 2022, 2029, 2030, 86, 86, 2031, 2023, - 86, 2028, 86, 2025, 2026, 2037, 86, 2038, 86, 2033, - 2036, 2039, 86, 2034, 2041, 2042, 2040, 86, 2035, 86, - 86, 86, 86, 2046, 2044, 86, 86, 86, 86, 86, - 2048, 86, 86, 86, 2045, 2051, 2053, 2047, 2043, 2049, - 168, 86, 86, 2055, 86, 2054, 86, 86, 86, 2060, - 2059, 2058, 2057, 2050, 2052, 86, 2056, 2061, 86, 2062, - 86, 2064, 86, 86, 86, 86, 3255, 86, 2065, 2066, - 86, 2067, 2068, 86, 86, 2063, 86, 2070, 2069, 86, - 2072, 86, 2071, 86, 86, 2076, 86, 86, 2073, 2075, + 86, 2025, 86, 86, 2030, 2033, 86, 2034, 86, 86, + 86, 86, 86, 2031, 2037, 2040, 2045, 2035, 2032, 86, + 86, 86, 2043, 86, 86, 2042, 86, 2036, 86, 2044, + 2038, 2039, 86, 2046, 2041, 2050, 86, 2047, 2051, 86, + 2052, 2054, 2048, 2055, 86, 2053, 86, 86, 86, 86, + 86, 2059, 2049, 2057, 86, 86, 86, 86, 86, 2061, + 86, 2064, 2058, 2066, 86, 86, 2060, 86, 2062, 86, + 2056, 168, 86, 86, 86, 86, 2067, 2068, 2072, 2071, + 86, 2073, 2065, 2063, 2069, 2074, 86, 2075, 86, 86, + 2077, 86, 2070, 86, 86, 86, 86, 2078, 2079, 86, - 86, 86, 2077, 2074, 86, 2078, 2079, 2080, 2081, 86, - 86, 86, 86, 86, 86, 86, 2088, 2082, 2086, 2083, - 2087, 86, 86, 86, 86, 86, 2093, 2092, 86, 2084, - 86, 2085, 2090, 86, 86, 86, 2098, 2094, 86, 2089, - 86, 86, 2091, 2096, 86, 2100, 2095, 2099, 86, 2102, - 2097, 2104, 86, 86, 2103, 86, 2105, 86, 86, 86, - 2110, 2101, 86, 2112, 2106, 86, 86, 2113, 2114, 86, - 86, 2107, 2108, 2109, 86, 2111, 2116, 86, 2115, 86, - 2117, 86, 2119, 86, 86, 86, 2123, 2118, 86, 86, - 2120, 86, 86, 86, 86, 86, 2121, 86, 2124, 86, + 2080, 86, 2083, 86, 2081, 86, 2082, 86, 2085, 2076, + 86, 86, 2089, 86, 86, 2084, 2088, 2086, 86, 86, + 86, 2093, 2087, 2090, 2091, 2092, 2094, 86, 86, 86, + 86, 86, 86, 2101, 2099, 86, 86, 86, 2096, 86, + 2100, 86, 86, 86, 2106, 86, 2103, 86, 2095, 2097, + 86, 2098, 86, 86, 2102, 2107, 2105, 86, 2111, 2104, + 86, 2109, 2112, 2108, 86, 86, 86, 2110, 86, 2115, + 86, 2114, 2113, 2117, 86, 86, 86, 2123, 2116, 2118, + 86, 86, 2119, 86, 2120, 2121, 86, 2125, 86, 2122, + 2126, 2127, 86, 86, 2129, 86, 86, 2124, 86, 2130, - 86, 86, 86, 2131, 2122, 2126, 2127, 2128, 86, 86, - 2136, 86, 2125, 86, 2130, 86, 2132, 2143, 2129, 86, - 2133, 2135, 2138, 86, 2134, 86, 2137, 86, 2139, 86, - 86, 86, 2140, 2141, 2142, 2145, 86, 2144, 2146, 86, - 86, 2148, 86, 86, 2151, 2147, 86, 86, 2149, 2153, - 2155, 86, 2150, 86, 86, 86, 86, 2158, 86, 2157, - 2154, 2159, 2152, 2160, 86, 86, 2163, 86, 86, 86, - 86, 86, 86, 2164, 86, 2169, 86, 2166, 86, 2156, - 2165, 2173, 2161, 86, 2170, 2162, 2171, 86, 2168, 2167, - 86, 86, 86, 2175, 86, 2174, 86, 86, 2172, 2179, + 2133, 2128, 2132, 86, 2131, 86, 86, 86, 86, 86, + 2134, 86, 2137, 86, 86, 86, 2138, 86, 86, 86, + 86, 86, 86, 86, 3283, 2140, 2141, 2135, 2136, 2146, + 2139, 2143, 2142, 2145, 2150, 2151, 86, 86, 86, 86, + 2148, 2144, 2147, 86, 2149, 86, 2154, 86, 86, 86, + 2155, 2158, 2157, 86, 86, 2152, 86, 86, 2153, 2156, + 2161, 2160, 86, 2162, 86, 86, 2159, 2166, 86, 86, + 86, 2164, 2168, 2170, 86, 2163, 2165, 86, 86, 86, + 2173, 86, 86, 2169, 2172, 86, 2174, 2167, 86, 2178, + 2175, 86, 86, 86, 86, 86, 2179, 86, 2184, 86, - 86, 86, 2181, 86, 2177, 86, 2180, 86, 2182, 86, - 2176, 86, 2178, 86, 2183, 2185, 2184, 86, 2186, 2188, - 2190, 2187, 2192, 86, 2189, 2191, 86, 86, 86, 86, - 86, 86, 86, 2195, 2196, 2193, 2200, 86, 86, 2194, - 86, 2199, 86, 2197, 86, 86, 86, 86, 86, 86, - 86, 2198, 2209, 2210, 86, 86, 2201, 2205, 2202, 2204, - 2203, 2206, 2207, 2211, 86, 86, 2208, 86, 86, 86, - 2212, 2214, 86, 2220, 86, 86, 2222, 86, 2215, 86, - 86, 2219, 2216, 2213, 2221, 86, 2217, 86, 168, 2224, - 2228, 2230, 2225, 2226, 2218, 2229, 86, 86, 2223, 2231, + 2176, 2181, 86, 2171, 86, 2180, 86, 2185, 2177, 2188, + 86, 2183, 2190, 2182, 86, 86, 86, 2186, 86, 2189, + 86, 2194, 86, 86, 2187, 86, 2196, 86, 2192, 86, + 2195, 86, 2197, 86, 2191, 86, 2193, 86, 2198, 2203, + 2199, 2200, 2201, 86, 2205, 2202, 86, 86, 2204, 2206, + 86, 86, 2207, 86, 86, 86, 2210, 86, 2208, 2209, + 2211, 86, 2215, 86, 86, 86, 2212, 86, 86, 86, + 2214, 86, 86, 86, 2213, 2216, 86, 86, 2224, 2221, + 2222, 2218, 2217, 2219, 86, 2226, 2220, 86, 86, 2225, + 86, 86, 2223, 2227, 2229, 86, 2235, 86, 86, 86, - 86, 86, 86, 2232, 86, 86, 2235, 86, 86, 2233, - 2227, 86, 2236, 2239, 2240, 86, 86, 2241, 86, 2244, - 2242, 2249, 2234, 86, 86, 86, 2237, 86, 2245, 86, - 2246, 2247, 86, 86, 86, 86, 2243, 2238, 2248, 2250, - 86, 86, 86, 86, 2251, 2252, 86, 2255, 86, 86, - 86, 86, 86, 2258, 2253, 86, 2262, 2264, 86, 86, - 86, 2257, 86, 2265, 86, 2254, 2256, 2259, 2260, 2267, - 2261, 86, 86, 86, 86, 2266, 86, 2263, 86, 2272, - 2275, 86, 86, 86, 2270, 86, 86, 86, 2268, 2269, - 2276, 2273, 2271, 86, 2274, 86, 86, 86, 86, 86, + 2230, 2237, 86, 86, 86, 2231, 2228, 2234, 2236, 2232, + 86, 86, 168, 2243, 2239, 2245, 2240, 2241, 2244, 86, + 2233, 86, 2238, 2246, 86, 86, 86, 2247, 86, 86, + 2250, 86, 86, 2248, 2242, 86, 2251, 2254, 2255, 86, + 86, 2256, 86, 2259, 2257, 2264, 2249, 86, 86, 86, + 2252, 86, 2260, 86, 2261, 2262, 86, 86, 86, 86, + 2258, 2253, 2263, 2265, 86, 86, 86, 86, 2266, 2267, + 86, 2270, 86, 86, 86, 86, 86, 2273, 2268, 86, + 2277, 2279, 86, 86, 86, 2272, 86, 2280, 86, 2269, + 2271, 2274, 2275, 2282, 2276, 86, 86, 86, 86, 2281, - 86, 86, 2277, 2291, 2278, 2287, 2289, 86, 2283, 2279, - 86, 2280, 2281, 2285, 2286, 86, 2282, 2288, 2284, 86, - 86, 86, 86, 2292, 2290, 86, 2295, 2296, 86, 2297, - 86, 86, 86, 2300, 2293, 2294, 2298, 86, 2303, 86, - 2304, 86, 86, 86, 2299, 86, 2301, 2305, 2306, 2302, - 86, 86, 2310, 86, 2311, 86, 86, 2313, 86, 86, - 2315, 86, 86, 2309, 86, 2307, 86, 2317, 2318, 86, - 2308, 2319, 86, 86, 86, 2312, 86, 2314, 86, 2316, - 2320, 86, 2321, 2324, 2325, 86, 2327, 86, 2322, 86, - 86, 86, 86, 2331, 2330, 2323, 2329, 2333, 86, 86, + 86, 2278, 86, 2287, 2290, 86, 86, 86, 2285, 86, + 86, 86, 2283, 2284, 2291, 2288, 2286, 86, 2289, 86, + 86, 86, 86, 86, 3283, 86, 2292, 86, 2293, 2303, + 2305, 86, 2298, 2294, 86, 2295, 2296, 2300, 2301, 2306, + 2297, 2302, 2299, 86, 86, 2304, 86, 2307, 86, 86, + 86, 86, 2311, 2312, 86, 86, 86, 2313, 86, 2308, + 2314, 86, 2309, 2310, 2315, 86, 2317, 2318, 86, 2316, + 2319, 2320, 86, 2321, 86, 86, 86, 86, 86, 86, + 2322, 2323, 2327, 86, 2328, 86, 2330, 86, 2324, 86, + 2326, 2332, 86, 86, 86, 2335, 86, 2325, 2329, 2334, - 2326, 86, 86, 2337, 86, 86, 86, 2328, 2332, 86, - 86, 2342, 86, 86, 2341, 86, 2335, 86, 2334, 86, - 2344, 2336, 86, 86, 2340, 2338, 2347, 86, 86, 2339, - 86, 2350, 2343, 86, 2345, 2349, 86, 2346, 86, 2354, - 86, 86, 86, 2348, 2356, 86, 86, 86, 2351, 2355, - 2357, 2352, 86, 2360, 86, 86, 86, 2361, 86, 2362, - 86, 86, 2353, 2366, 86, 2358, 2368, 2359, 2364, 2369, - 2363, 86, 2367, 2371, 2373, 2370, 86, 2365, 86, 86, - 86, 2374, 86, 2375, 86, 86, 86, 86, 2378, 86, - 86, 86, 2372, 86, 2384, 2379, 2380, 2377, 2381, 2382, + 2336, 86, 86, 86, 86, 86, 86, 2331, 2333, 2342, + 86, 2341, 2338, 86, 2344, 86, 2337, 86, 2339, 86, + 86, 86, 2348, 2347, 2340, 2346, 2350, 86, 86, 86, + 86, 86, 2343, 2354, 86, 2345, 86, 2349, 86, 86, + 2359, 86, 86, 2358, 2352, 86, 86, 2351, 86, 2353, + 2361, 2355, 86, 2357, 2364, 86, 86, 86, 86, 2356, + 86, 2360, 86, 2362, 2366, 86, 2365, 2363, 86, 2371, + 2367, 86, 86, 2373, 2372, 2374, 2368, 86, 2369, 86, + 86, 86, 86, 86, 2378, 2379, 86, 86, 2370, 2377, + 2375, 2383, 2376, 86, 86, 2381, 86, 2388, 2385, 2386, - 86, 86, 2385, 86, 168, 2383, 86, 2376, 86, 2393, - 2386, 2390, 2388, 2387, 86, 2389, 86, 86, 86, 2391, - 86, 2394, 86, 2395, 2398, 86, 86, 2392, 86, 86, - 86, 86, 2396, 86, 86, 2400, 2397, 2399, 86, 2406, - 2401, 2405, 2404, 86, 3255, 2402, 2403, 2409, 86, 86, - 2410, 2411, 86, 2407, 86, 2408, 86, 2412, 2414, 2415, - 86, 2413, 2417, 86, 86, 86, 86, 86, 2419, 2416, - 86, 86, 86, 86, 2423, 2424, 86, 86, 86, 3255, - 2418, 86, 2420, 2426, 86, 2421, 86, 86, 2427, 2428, - 2425, 2422, 2429, 86, 86, 86, 2431, 2433, 86, 2430, + 86, 2390, 86, 86, 2382, 86, 2380, 86, 86, 86, + 2391, 2387, 86, 2384, 2392, 86, 86, 2396, 2395, 86, + 86, 2389, 86, 86, 3283, 2394, 2401, 2393, 2397, 2398, + 2400, 2399, 86, 2402, 86, 86, 86, 2406, 2403, 86, + 2407, 86, 2408, 2404, 2405, 86, 86, 168, 86, 86, + 2409, 86, 2410, 86, 2415, 86, 86, 86, 2417, 86, + 86, 86, 2426, 86, 2413, 2411, 2416, 2412, 2418, 2414, + 86, 86, 2421, 2419, 2420, 86, 2423, 3283, 2422, 86, + 2427, 2424, 2425, 2428, 86, 86, 86, 2431, 2429, 2432, + 86, 2430, 86, 86, 86, 86, 2434, 86, 86, 2433, - 2435, 86, 2434, 86, 2432, 86, 86, 86, 86, 86, - 2437, 86, 86, 2441, 2444, 86, 2436, 2443, 86, 86, - 86, 2445, 2440, 86, 86, 86, 2438, 2439, 2448, 86, - 86, 2442, 86, 2453, 2452, 86, 2446, 2450, 2447, 86, - 2454, 86, 86, 2455, 86, 2449, 2451, 86, 2457, 2456, - 86, 86, 2460, 2458, 86, 2462, 2463, 86, 2461, 2464, - 86, 86, 2466, 86, 86, 86, 2465, 86, 2459, 86, - 86, 86, 86, 86, 2470, 86, 2472, 2473, 3255, 2468, - 2474, 86, 2467, 2469, 2475, 86, 2476, 86, 2477, 2478, - 86, 86, 86, 86, 86, 2480, 2471, 2479, 2483, 86, + 86, 2436, 86, 86, 2440, 2441, 2435, 86, 2438, 86, + 2437, 86, 2443, 86, 86, 86, 86, 2444, 2445, 2446, + 86, 2439, 86, 2442, 86, 2448, 86, 2447, 2452, 86, + 2451, 86, 86, 2449, 2450, 86, 86, 2454, 86, 86, + 86, 86, 2461, 2458, 2453, 86, 2460, 86, 86, 86, + 86, 2462, 2457, 86, 86, 2455, 2456, 86, 2466, 86, + 2459, 86, 86, 2476, 2471, 2463, 2470, 86, 2464, 2465, + 86, 2468, 86, 2469, 86, 2467, 2473, 86, 86, 86, + 2472, 2475, 2477, 86, 2479, 86, 2474, 2481, 86, 2480, + 2483, 86, 86, 86, 2485, 86, 86, 86, 86, 86, - 2485, 86, 86, 2484, 86, 2482, 86, 2488, 86, 86, - 2481, 86, 2489, 86, 2492, 2493, 86, 2487, 86, 2486, - 86, 86, 86, 2490, 86, 2494, 2498, 2497, 86, 2491, - 2496, 86, 86, 86, 86, 86, 2495, 86, 2502, 86, - 2504, 2616, 2499, 86, 2501, 2500, 2505, 86, 2506, 86, - 2507, 86, 2508, 86, 2503, 2509, 86, 2510, 86, 2512, - 86, 2511, 86, 2513, 86, 86, 86, 2518, 86, 86, - 2520, 86, 2514, 2521, 86, 86, 2515, 86, 86, 86, - 86, 86, 2517, 86, 86, 2516, 2522, 2524, 2519, 2523, - 2525, 86, 2530, 86, 86, 86, 2527, 86, 86, 2526, + 2482, 2484, 86, 2489, 2478, 86, 86, 86, 2493, 86, + 2491, 2487, 2492, 2495, 2486, 2488, 2494, 86, 86, 86, + 86, 2496, 2497, 86, 86, 86, 2502, 86, 2490, 2499, + 86, 86, 2504, 86, 2507, 86, 86, 2501, 86, 2503, + 2498, 86, 2500, 86, 2508, 86, 2511, 86, 2506, 2505, + 2512, 86, 2513, 86, 86, 2509, 86, 86, 2517, 86, + 86, 2510, 2516, 2515, 86, 86, 86, 86, 2524, 86, + 2521, 2514, 2523, 2518, 2519, 86, 2520, 2525, 86, 2526, + 86, 2527, 86, 86, 86, 86, 2522, 2528, 86, 2530, + 86, 2531, 86, 2532, 86, 86, 86, 2533, 2537, 86, - 168, 2528, 86, 2529, 2531, 86, 2538, 86, 86, 86, - 2532, 2534, 2537, 86, 2533, 86, 2536, 2539, 86, 86, - 86, 2535, 2540, 2545, 2541, 86, 3255, 86, 2549, 86, - 2547, 2542, 2548, 2546, 2550, 86, 86, 2543, 86, 2551, - 86, 2544, 86, 2552, 86, 2553, 86, 86, 86, 86, - 86, 2555, 86, 86, 2554, 86, 86, 86, 2564, 3255, - 86, 2562, 2557, 86, 86, 2556, 86, 2559, 2558, 86, - 2568, 86, 2560, 2561, 86, 2563, 86, 2565, 2566, 2569, - 86, 2567, 86, 2572, 2576, 2570, 2571, 2573, 86, 2575, - 86, 2574, 86, 86, 2577, 86, 86, 86, 86, 2578, + 2534, 2529, 2539, 86, 2540, 86, 86, 86, 86, 86, + 86, 2536, 86, 86, 2535, 2538, 2543, 2541, 2546, 2542, + 2544, 86, 2549, 86, 86, 86, 86, 86, 86, 86, + 2545, 86, 2547, 2550, 86, 168, 86, 2557, 86, 86, + 2553, 2548, 86, 2555, 86, 86, 2552, 2556, 2558, 2559, + 3283, 2551, 2554, 2560, 2563, 86, 86, 86, 2564, 2565, + 2561, 2566, 2567, 2568, 86, 86, 2562, 2569, 86, 86, + 2570, 86, 2571, 86, 2572, 86, 86, 86, 86, 86, + 86, 86, 86, 2573, 86, 86, 2574, 2583, 86, 86, + 86, 2581, 2576, 86, 86, 2575, 86, 2578, 2577, 86, - 86, 2584, 86, 2585, 86, 86, 2588, 86, 2579, 2589, - 86, 2587, 2590, 2580, 2581, 2586, 2582, 2583, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 2594, 2598, 86, - 2597, 2599, 86, 86, 86, 2592, 2600, 2591, 2601, 86, - 2593, 86, 2603, 2595, 2596, 86, 86, 86, 2602, 86, - 86, 86, 2607, 86, 86, 86, 86, 2605, 2611, 86, - 2604, 2612, 86, 2615, 86, 2613, 2606, 2619, 86, 2608, - 2609, 2617, 2614, 2610, 86, 86, 86, 86, 2618, 2622, - 2624, 86, 86, 86, 86, 86, 2628, 86, 2620, 2627, - 86, 2621, 2626, 86, 2625, 2630, 86, 2623, 2631, 2632, + 2587, 2580, 2579, 2591, 2582, 2588, 86, 2585, 2584, 86, + 2589, 2586, 2590, 2592, 86, 2594, 86, 86, 2593, 86, + 86, 86, 86, 86, 86, 86, 86, 2597, 2603, 86, + 2604, 86, 86, 86, 86, 2595, 2598, 2596, 2610, 2607, + 2599, 2600, 2601, 2602, 86, 2605, 2608, 86, 2609, 86, + 2606, 86, 2611, 86, 86, 86, 86, 86, 86, 86, + 2615, 2619, 86, 2618, 2620, 86, 2612, 86, 2614, 2621, + 2622, 86, 2613, 86, 86, 86, 2616, 2617, 86, 86, + 86, 2623, 2624, 86, 2628, 86, 86, 2626, 86, 2632, + 2633, 86, 86, 2625, 2636, 86, 86, 86, 2627, 86, - 86, 86, 86, 2629, 2635, 86, 86, 2636, 2638, 86, - 86, 86, 86, 2634, 2643, 86, 2633, 86, 86, 86, - 2641, 2645, 86, 2639, 2637, 2640, 2642, 86, 86, 86, - 86, 86, 2646, 2644, 2647, 2649, 86, 86, 2651, 2650, - 86, 86, 2648, 86, 86, 2652, 2655, 3255, 2653, 2656, - 2658, 86, 2654, 2659, 86, 2660, 168, 86, 2657, 86, - 86, 86, 2665, 86, 2661, 2662, 86, 86, 86, 86, - 2667, 2666, 2669, 2670, 86, 2671, 86, 2663, 2668, 2664, - 86, 2673, 86, 86, 2675, 86, 2674, 86, 2680, 2676, - 86, 86, 2677, 2672, 86, 86, 2678, 86, 86, 2679, + 2629, 2637, 2630, 2634, 86, 2631, 2640, 86, 2639, 86, + 2635, 2638, 2641, 86, 86, 2645, 86, 86, 86, 86, + 2649, 86, 86, 2648, 2642, 2651, 86, 2647, 86, 2646, + 86, 86, 86, 2643, 2644, 2652, 86, 2653, 2656, 86, + 86, 2650, 86, 2657, 2655, 2659, 86, 2654, 86, 86, + 86, 86, 86, 2660, 2664, 86, 2666, 86, 2658, 2662, + 2663, 2661, 86, 86, 2665, 86, 2669, 2667, 2668, 86, + 2670, 86, 86, 86, 86, 86, 86, 2671, 86, 86, + 2676, 2673, 2674, 2677, 2679, 86, 2680, 86, 2675, 86, + 2672, 2678, 2681, 168, 86, 86, 2682, 2684, 2686, 2683, - 2682, 2681, 86, 86, 86, 86, 2687, 2683, 2688, 86, - 2689, 2685, 86, 86, 86, 86, 86, 2684, 86, 2693, - 2691, 2690, 86, 2692, 86, 2686, 86, 2694, 86, 2695, - 86, 2696, 2703, 86, 86, 2701, 86, 86, 86, 2699, - 2697, 2698, 2700, 2704, 86, 2702, 86, 86, 86, 2708, - 86, 86, 86, 86, 2712, 86, 2710, 86, 86, 86, - 86, 2717, 86, 2705, 2716, 3255, 2706, 2707, 2711, 2719, - 2709, 2713, 2714, 2720, 2721, 86, 2722, 86, 2715, 86, - 86, 86, 86, 86, 2718, 86, 86, 2724, 86, 2723, - 2727, 86, 2725, 86, 2730, 86, 2732, 86, 2726, 2733, + 86, 86, 2688, 86, 86, 2687, 86, 2691, 86, 2692, + 86, 2690, 86, 2685, 2694, 86, 86, 2696, 2689, 2695, + 86, 86, 2697, 86, 86, 2693, 2698, 2701, 86, 2699, + 86, 86, 2702, 86, 2700, 2703, 86, 86, 86, 86, + 2704, 2708, 2709, 86, 2710, 2706, 86, 86, 86, 86, + 86, 2705, 86, 2712, 2713, 2711, 86, 86, 86, 2707, + 2714, 2716, 2715, 2717, 86, 86, 86, 86, 2722, 86, + 2718, 86, 86, 2725, 2720, 2721, 86, 2719, 2723, 86, + 86, 86, 2726, 86, 2730, 86, 86, 86, 2731, 2724, + 86, 2727, 86, 2735, 86, 86, 2733, 86, 86, 86, - 86, 86, 2728, 2734, 86, 2735, 2729, 86, 2737, 86, - 86, 86, 2736, 2731, 86, 2741, 2739, 86, 86, 2744, - 2742, 86, 2745, 86, 2746, 86, 2740, 86, 86, 86, - 2738, 2747, 86, 2751, 86, 86, 2752, 2743, 2753, 86, - 2748, 86, 2755, 86, 86, 86, 86, 2749, 2759, 2760, - 86, 86, 2750, 2762, 86, 2761, 2754, 2756, 2763, 86, - 2758, 86, 86, 2757, 86, 86, 2768, 86, 86, 86, - 2767, 86, 86, 2770, 2771, 86, 2772, 86, 86, 86, - 2774, 86, 2765, 86, 2764, 2766, 2773, 86, 86, 2777, - 2776, 86, 2769, 2775, 86, 2783, 2778, 2779, 86, 2780, + 2728, 86, 2729, 2739, 3283, 2732, 2747, 2734, 2742, 2736, + 2737, 2740, 86, 2743, 86, 2744, 86, 2738, 86, 86, + 86, 86, 86, 2741, 2745, 86, 2746, 86, 86, 2748, + 2751, 2750, 86, 2753, 86, 2749, 2755, 86, 2756, 86, + 2757, 86, 86, 2752, 86, 86, 2758, 2760, 86, 2759, + 86, 86, 2754, 2764, 86, 2762, 86, 2767, 2765, 86, + 2768, 86, 86, 2763, 86, 2761, 2769, 86, 86, 86, + 86, 2770, 2774, 86, 2766, 2771, 86, 2775, 2776, 86, + 2778, 86, 2772, 86, 86, 2777, 86, 2782, 86, 2773, + 2783, 86, 2784, 86, 86, 86, 2779, 86, 2785, 86, - 86, 2781, 2784, 86, 86, 86, 86, 2786, 86, 2796, - 86, 2782, 2785, 2791, 2788, 2787, 2790, 2793, 2792, 86, - 86, 2797, 2794, 86, 2789, 2795, 86, 2798, 86, 2799, - 86, 2800, 86, 86, 86, 86, 86, 86, 2802, 86, - 86, 3255, 2806, 86, 2810, 86, 86, 86, 2801, 2807, - 2811, 2813, 86, 86, 2803, 2805, 2815, 86, 86, 2808, - 2814, 2804, 86, 2809, 2812, 2817, 86, 2816, 86, 86, - 86, 2822, 86, 86, 86, 86, 2821, 2818, 2819, 2820, - 86, 2826, 2824, 86, 2823, 86, 2827, 86, 2828, 2825, - 86, 86, 2829, 86, 2830, 86, 2831, 2832, 86, 2833, + 2781, 86, 2780, 2786, 86, 2791, 86, 2790, 2794, 86, + 2793, 86, 86, 86, 86, 2788, 86, 2787, 2795, 2789, + 2796, 86, 2792, 86, 2797, 86, 2799, 86, 2800, 86, + 2803, 86, 86, 2801, 2802, 2807, 86, 86, 86, 2798, + 2809, 86, 86, 86, 2814, 86, 2806, 2804, 2810, 2815, + 86, 2805, 2808, 2813, 2816, 2811, 2819, 86, 86, 2817, + 86, 2812, 2818, 86, 2820, 86, 2821, 86, 2822, 86, + 2823, 86, 86, 86, 2824, 86, 2825, 86, 86, 86, + 2828, 86, 86, 2830, 2834, 86, 2835, 86, 2831, 86, + 86, 86, 2826, 2836, 2838, 86, 2829, 86, 2839, 2827, - 86, 86, 86, 86, 86, 86, 2842, 2834, 86, 86, - 2835, 2837, 86, 2836, 2840, 2838, 86, 86, 86, 2847, - 2843, 2845, 2846, 86, 2841, 86, 2839, 86, 86, 86, - 2844, 3113, 2848, 2849, 86, 2850, 2852, 86, 2851, 2853, - 86, 2854, 86, 86, 86, 2856, 2857, 2859, 86, 2858, - 86, 86, 2855, 86, 86, 2860, 2861, 2862, 86, 86, - 86, 86, 2868, 86, 86, 2866, 2863, 86, 86, 2870, - 86, 2864, 86, 86, 86, 2865, 2871, 86, 2872, 2867, - 86, 2874, 2873, 2875, 86, 2879, 86, 2878, 2869, 2876, - 86, 86, 86, 86, 86, 86, 2882, 86, 86, 2877, + 86, 2832, 2833, 2840, 86, 2841, 2843, 2837, 2842, 86, + 86, 86, 86, 2847, 86, 86, 86, 86, 86, 2844, + 2845, 2848, 2851, 86, 2849, 86, 86, 2852, 86, 86, + 2846, 2850, 86, 2855, 2854, 86, 2853, 2856, 2857, 86, + 2858, 86, 86, 2860, 2861, 86, 86, 86, 86, 2859, + 86, 2862, 2867, 86, 86, 86, 2865, 2863, 86, 2870, + 2871, 86, 2868, 86, 2872, 86, 2875, 86, 2866, 2876, + 2873, 2864, 2874, 86, 2869, 2877, 86, 2878, 86, 2879, + 86, 86, 2880, 86, 86, 2884, 86, 86, 86, 2883, + 86, 86, 2885, 2886, 2887, 86, 86, 86, 86, 2893, - 86, 86, 2883, 2880, 2881, 2886, 2887, 2888, 86, 86, - 2884, 2891, 86, 86, 2885, 2893, 86, 86, 2889, 2894, - 86, 2896, 86, 86, 86, 86, 2901, 86, 2892, 2897, - 2900, 86, 86, 86, 2890, 86, 2905, 86, 2895, 2898, - 2899, 86, 86, 2908, 86, 86, 86, 2910, 2913, 86, - 2911, 2902, 2904, 86, 86, 2903, 2906, 2909, 2914, 86, - 2907, 2916, 86, 86, 86, 86, 86, 2921, 2912, 86, - 86, 86, 2919, 86, 2915, 2918, 2925, 86, 2923, 86, - 86, 2917, 2926, 86, 2927, 2920, 86, 2930, 2922, 2932, - 2924, 2929, 2928, 86, 2931, 86, 2933, 86, 86, 2936, + 86, 2881, 2882, 2891, 2888, 86, 2895, 86, 2889, 86, + 86, 2890, 86, 2896, 86, 2892, 86, 2897, 86, 2898, + 86, 2899, 86, 2904, 86, 2894, 86, 86, 86, 2900, + 86, 2901, 2907, 2902, 86, 86, 86, 86, 2913, 2905, + 2906, 86, 2903, 2908, 2911, 86, 2909, 86, 86, 86, + 2912, 2917, 86, 86, 2910, 86, 2914, 2919, 86, 2915, + 2920, 86, 2922, 86, 86, 86, 86, 86, 2918, 2923, + 86, 2926, 2927, 86, 2916, 86, 2921, 86, 2931, 86, + 2924, 2925, 86, 2934, 86, 86, 2936, 2928, 86, 86, + 86, 86, 86, 2929, 2930, 2937, 2932, 86, 2933, 2939, - 86, 86, 86, 2935, 86, 2939, 2937, 86, 2942, 86, - 86, 86, 86, 86, 86, 2934, 2947, 86, 86, 86, - 86, 86, 2943, 2938, 2940, 2941, 2953, 2946, 86, 2950, - 2944, 2951, 86, 2952, 86, 2949, 86, 2948, 2945, 2956, - 86, 2955, 2954, 2957, 86, 2958, 86, 86, 2960, 86, - 86, 2962, 86, 86, 86, 2961, 86, 86, 86, 2967, - 2968, 86, 86, 86, 86, 86, 2972, 86, 2963, 2973, - 86, 2974, 86, 2959, 2971, 2964, 2969, 86, 2965, 2966, - 86, 2978, 86, 2970, 2975, 2977, 2979, 86, 86, 86, - 2982, 2976, 86, 2980, 86, 86, 86, 2985, 86, 86, + 86, 2940, 86, 2942, 86, 2935, 86, 2947, 2944, 2941, + 2938, 2946, 86, 86, 86, 2945, 86, 2951, 86, 86, + 86, 2953, 2952, 2943, 86, 86, 2949, 2956, 2957, 86, + 86, 2948, 86, 86, 2959, 2958, 2950, 2954, 86, 86, + 86, 2962, 86, 2961, 2955, 86, 2965, 86, 2960, 86, + 2963, 86, 86, 2968, 86, 86, 86, 86, 2964, 2973, + 86, 2969, 86, 86, 2966, 2967, 2977, 86, 86, 2970, + 2972, 86, 2976, 2978, 86, 2974, 2979, 86, 2975, 86, + 2971, 86, 2980, 86, 2981, 2982, 86, 2983, 86, 2984, + 86, 2987, 86, 86, 2985, 2989, 86, 86, 2988, 86, - 2986, 86, 2984, 2981, 2983, 86, 86, 86, 86, 86, - 2989, 86, 86, 2991, 86, 86, 2992, 86, 2990, 2987, - 86, 2988, 86, 86, 86, 86, 3255, 3001, 2993, 3002, - 2997, 2994, 2995, 2996, 2998, 2999, 3004, 86, 86, 86, - 3007, 3000, 86, 3003, 3005, 3006, 3009, 86, 3010, 86, - 86, 3008, 86, 86, 3011, 3014, 86, 3012, 3015, 86, - 3016, 3017, 86, 86, 3018, 3019, 3022, 86, 3020, 3021, - 86, 86, 3013, 3023, 86, 86, 86, 86, 86, 3029, - 86, 86, 86, 3028, 86, 86, 3032, 86, 3024, 3025, - 86, 3031, 86, 3255, 3033, 86, 3026, 3027, 86, 3037, + 86, 86, 2990, 2986, 86, 2994, 2995, 86, 86, 86, + 2999, 86, 3000, 86, 2991, 2996, 86, 3001, 2998, 86, + 86, 2992, 2993, 86, 86, 3004, 3005, 86, 2997, 3006, + 86, 86, 86, 3009, 86, 86, 3002, 3007, 3003, 86, + 3012, 86, 86, 3011, 3014, 3008, 3010, 3013, 86, 86, + 86, 86, 86, 86, 3016, 86, 86, 3018, 86, 86, + 3019, 86, 3017, 86, 86, 86, 86, 3031, 3015, 3028, + 3029, 86, 3020, 86, 3024, 3021, 3022, 3023, 3025, 3026, + 86, 86, 3036, 86, 3027, 3032, 3030, 86, 3037, 86, + 3034, 3033, 86, 86, 3035, 86, 3038, 3039, 86, 3283, - 86, 3036, 3034, 3038, 86, 86, 3030, 86, 3035, 3039, - 86, 86, 3041, 3044, 3042, 3040, 3046, 3043, 3045, 86, - 3047, 86, 86, 86, 86, 86, 3048, 3054, 3050, 3051, - 3053, 86, 86, 86, 3056, 86, 3057, 86, 3055, 86, - 86, 86, 3049, 3255, 3052, 3059, 3060, 86, 3061, 86, - 3062, 3063, 86, 86, 3058, 3064, 86, 3065, 86, 3066, - 86, 3067, 86, 3068, 86, 3069, 86, 86, 3071, 86, - 86, 86, 86, 3074, 3076, 86, 3070, 86, 86, 3072, - 86, 86, 3080, 3073, 86, 3082, 86, 86, 86, 86, - 3079, 3075, 3077, 3078, 86, 86, 3086, 3084, 86, 3081, + 3040, 3042, 86, 3043, 86, 3044, 3045, 86, 86, 86, + 3046, 3047, 3041, 86, 3048, 3049, 86, 86, 3051, 86, + 3050, 86, 86, 3053, 86, 3052, 3057, 86, 86, 3056, + 86, 86, 86, 86, 86, 3060, 86, 3059, 86, 3065, + 3074, 3054, 3055, 3061, 86, 3064, 86, 3062, 3066, 86, + 86, 3063, 86, 3058, 3067, 86, 86, 3069, 3072, 3068, + 86, 86, 86, 3073, 86, 3070, 86, 3078, 3071, 86, + 3283, 3079, 3081, 86, 3082, 3075, 3076, 86, 3084, 86, + 86, 3077, 86, 3083, 3085, 86, 86, 86, 3080, 3088, + 86, 3087, 3089, 86, 3091, 86, 3090, 3086, 3092, 86, - 3089, 3088, 86, 86, 86, 3083, 86, 3087, 3091, 86, - 86, 86, 86, 86, 3085, 86, 3090, 3095, 86, 3097, - 86, 3096, 86, 3092, 86, 3100, 3094, 3093, 3098, 3102, - 86, 3103, 86, 3101, 3104, 86, 86, 86, 86, 86, - 86, 3107, 86, 86, 3099, 3106, 86, 3105, 86, 3115, - 86, 3112, 86, 3109, 3111, 86, 86, 3114, 3108, 86, - 86, 86, 86, 3110, 86, 3116, 86, 86, 86, 3117, - 3122, 3124, 3119, 3118, 3123, 3121, 86, 86, 86, 3131, - 86, 3126, 3128, 86, 3120, 3125, 86, 3127, 3130, 3133, - 86, 86, 3129, 86, 3134, 3132, 3135, 86, 3136, 86, + 3093, 86, 3094, 86, 3095, 86, 3096, 86, 3097, 86, + 86, 3099, 86, 86, 86, 86, 86, 86, 86, 3098, + 3104, 86, 3100, 86, 86, 86, 3101, 86, 3108, 86, + 3107, 3105, 3110, 86, 86, 3102, 3103, 3106, 3109, 86, + 86, 3114, 3112, 3111, 86, 3117, 86, 3116, 86, 86, + 86, 86, 3115, 3119, 86, 3113, 86, 86, 86, 86, + 3118, 3125, 3123, 86, 86, 86, 3122, 3124, 3120, 86, + 86, 86, 3121, 3128, 3126, 3130, 86, 3129, 3131, 86, + 3132, 86, 86, 86, 86, 3137, 86, 3135, 3133, 3127, + 86, 3134, 3138, 86, 86, 3140, 3141, 3139, 86, 3143, - 86, 86, 3137, 3139, 86, 86, 3140, 86, 3144, 3141, - 86, 3138, 86, 86, 86, 3148, 86, 3147, 86, 3150, - 86, 86, 3143, 86, 3145, 3146, 3151, 86, 3154, 86, - 3142, 86, 86, 3157, 86, 86, 3152, 86, 3149, 86, - 3158, 3161, 3153, 3159, 86, 3162, 3155, 86, 86, 86, - 3156, 86, 86, 3167, 86, 86, 3160, 3166, 3163, 3168, - 86, 3164, 86, 86, 86, 86, 86, 86, 3165, 3172, - 86, 3174, 86, 86, 86, 86, 3169, 3171, 86, 3179, - 3180, 86, 3170, 3176, 3173, 3177, 3175, 3181, 86, 86, - 3185, 86, 3178, 86, 3188, 86, 3187, 86, 3182, 3183, + 86, 86, 86, 86, 3136, 86, 86, 86, 3142, 86, + 86, 86, 86, 3144, 3152, 3150, 86, 3154, 3147, 86, + 3145, 3146, 3149, 3151, 3156, 86, 86, 3159, 86, 86, + 3148, 3153, 3161, 86, 86, 3162, 3155, 86, 3160, 3157, + 3163, 86, 3164, 86, 86, 86, 3158, 86, 3167, 86, + 86, 86, 3168, 3172, 3169, 86, 3165, 86, 86, 86, + 3176, 86, 3175, 86, 3166, 86, 3171, 3178, 86, 3173, + 3174, 3179, 86, 86, 86, 3170, 3182, 86, 86, 86, + 3180, 3185, 86, 3177, 86, 3186, 86, 3187, 3189, 3183, + 86, 3190, 3181, 86, 86, 86, 3184, 86, 86, 3195, - 3186, 86, 86, 86, 86, 86, 3189, 3193, 3184, 3190, - 3191, 3194, 86, 86, 86, 86, 3192, 3196, 86, 3195, - 86, 86, 3198, 86, 3197, 3202, 86, 86, 3199, 86, - 3205, 86, 3206, 86, 3200, 86, 86, 86, 86, 86, - 3204, 3209, 3201, 86, 3207, 3203, 86, 3208, 86, 3213, - 86, 3214, 3212, 86, 3217, 86, 3210, 3211, 86, 3219, - 86, 3220, 86, 3215, 86, 86, 86, 3221, 3226, 3216, - 86, 3222, 3224, 86, 3218, 3225, 3227, 86, 86, 86, - 86, 86, 86, 86, 3223, 3228, 3229, 3231, 3233, 86, - 86, 86, 86, 86, 86, 3235, 3236, 86, 3239, 3230, + 86, 3196, 86, 3194, 3191, 3188, 3192, 86, 86, 86, + 86, 86, 86, 86, 3193, 3200, 86, 3202, 86, 86, + 86, 86, 3199, 86, 3207, 86, 3208, 86, 3197, 3198, + 3201, 3204, 3203, 3205, 3215, 3206, 3209, 86, 3213, 86, + 86, 86, 86, 3210, 3212, 3211, 3214, 86, 3216, 86, + 86, 86, 3221, 86, 3217, 3218, 3219, 86, 86, 3222, + 86, 3220, 3223, 3224, 86, 86, 86, 86, 86, 3225, + 3230, 86, 3226, 3227, 86, 86, 86, 86, 3233, 3234, + 86, 86, 86, 86, 86, 86, 3228, 3229, 3232, 3237, + 3231, 3235, 86, 3238, 3236, 86, 3240, 86, 3241, 86, - 3232, 86, 3234, 3240, 86, 86, 3243, 3244, 86, 86, - 86, 3237, 3238, 3241, 3246, 86, 3245, 3247, 86, 86, - 3242, 86, 86, 86, 3253, 86, 3248, 3249, 3250, 3251, - 3254, 86, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, - 3252, 47, 47, 47, 47, 47, 47, 47, 52, 52, - 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, - 57, 57, 63, 63, 63, 63, 63, 63, 63, 68, - 68, 68, 68, 68, 68, 68, 74, 74, 74, 74, - 74, 74, 74, 80, 80, 80, 80, 80, 80, 80, - 89, 89, 3255, 89, 89, 89, 89, 158, 158, 3255, + 3239, 86, 3245, 86, 3242, 3243, 86, 3247, 86, 3248, + 86, 3244, 86, 86, 3246, 3249, 3252, 86, 3253, 3250, + 86, 86, 3251, 3254, 3255, 86, 86, 3256, 86, 86, + 86, 3261, 86, 3257, 3259, 86, 86, 86, 86, 86, + 86, 3263, 3264, 86, 3267, 3268, 86, 3258, 86, 3260, + 86, 3271, 3272, 86, 3262, 86, 86, 3265, 3266, 3269, + 3274, 86, 3273, 3275, 86, 86, 86, 3270, 86, 86, + 3283, 3277, 3276, 3278, 3283, 3279, 3281, 86, 3282, 86, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3280, 47, + 47, 47, 47, 47, 47, 47, 52, 52, 52, 52, - 3255, 3255, 158, 158, 160, 160, 3255, 3255, 160, 3255, - 160, 162, 3255, 3255, 3255, 3255, 3255, 162, 165, 165, - 3255, 3255, 3255, 165, 165, 167, 3255, 3255, 3255, 3255, - 3255, 167, 169, 169, 3255, 169, 169, 169, 169, 172, - 3255, 3255, 3255, 3255, 3255, 172, 175, 175, 3255, 3255, - 3255, 175, 175, 90, 90, 3255, 90, 90, 90, 90, - 17, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, - 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, - 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, - 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, + 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, + 63, 63, 63, 63, 63, 63, 63, 68, 68, 68, + 68, 68, 68, 68, 74, 74, 74, 74, 74, 74, + 74, 80, 80, 80, 80, 80, 80, 80, 89, 89, + 3283, 89, 89, 89, 89, 158, 158, 3283, 3283, 3283, + 158, 158, 160, 160, 3283, 3283, 160, 3283, 160, 162, + 3283, 3283, 3283, 3283, 3283, 162, 165, 165, 3283, 3283, + 3283, 165, 165, 167, 3283, 3283, 3283, 3283, 3283, 167, + 169, 169, 3283, 169, 169, 169, 169, 172, 3283, 3283, + 3283, 3283, 3283, 172, 175, 175, 3283, 3283, 3283, 175, - 3255 + 175, 90, 90, 3283, 90, 90, 90, 90, 17, 3283, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283 } ; -static const flex_int16_t yy_chk[6402] = +static const flex_int16_t yy_chk[6450] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -2212,18 +2227,18 @@ static const flex_int16_t yy_chk[6402] = 5, 3, 6, 24, 4, 24, 24, 5, 24, 6, 7, 7, 7, 7, 24, 7, 8, 8, 8, 8, 33, 8, 7, 9, 9, 9, 26, 26, 8, 10, - 10, 10, 19, 29, 9, 33, 19, 29, 3263, 35, + 10, 10, 19, 29, 9, 33, 19, 29, 3291, 35, 10, 11, 11, 11, 11, 11, 11, 13, 13, 13, 13, 34, 13, 11, 35, 99, 34, 29, 38, 13, 51, 51, 11, 12, 12, 12, 12, 12, 12, 14, 14, 14, 14, 99, 14, 12, 15, 15, 15, 38, 23, 14, 23, 23, 12, 23, 46, 15, 16, 16, - 16, 23, 23, 25, 27, 27, 25, 25, 2660, 16, + 16, 23, 23, 25, 27, 27, 25, 25, 2681, 16, 25, 46, 27, 30, 30, 25, 27, 56, 40, 27, 56, 73, 31, 31, 25, 28, 67, 67, 30, 32, 28, 31, 40, 32, 28, 73, 32, 28, 92, 28, - 28, 92, 31, 32, 1075, 32, 36, 36, 37, 37, + 28, 92, 31, 32, 1078, 32, 36, 36, 37, 37, 28, 45, 45, 37, 175, 36, 45, 39, 41, 41, 45, 36, 39, 41, 94, 36, 39, 43, 43, 37, @@ -2352,563 +2367,567 @@ static const flex_int16_t yy_chk[6402] = 575, 576, 568, 574, 577, 576, 575, 578, 582, 579, 580, 580, 578, 581, 584, 583, 573, 585, 586, 572, 583, 587, 577, 579, 586, 588, 587, 590, 581, 582, - 584, 592, 589, 591, 591, 589, 593, 585, 594, 588, - 589, 595, 596, 594, 589, 590, 595, 597, 599, 592, - 600, 606, 593, 602, 599, 601, 596, 602, 601, 600, - 603, 604, 597, 605, 604, 603, 607, 606, 605, 608, - 609, 611, 610, 612, 612, 614, 608, 610, 613, 602, + 584, 592, 589, 591, 591, 589, 593, 585, 597, 588, + 589, 594, 595, 589, 589, 590, 594, 595, 596, 592, + 599, 600, 593, 597, 601, 602, 599, 601, 603, 602, + 600, 604, 596, 603, 604, 605, 606, 607, 608, 610, + 605, 609, 611, 615, 610, 608, 612, 612, 613, 614, - 615, 616, 618, 609, 607, 617, 619, 613, 618, 624, - 616, 611, 619, 158, 614, 620, 615, 617, 620, 621, - 621, 622, 621, 623, 622, 625, 626, 624, 623, 627, - 628, 630, 626, 637, 627, 629, 628, 631, 629, 625, - 632, 633, 631, 635, 634, 632, 632, 636, 635, 638, - 639, 640, 637, 636, 633, 639, 630, 634, 638, 641, - 641, 642, 635, 635, 643, 645, 644, 643, 642, 646, - 647, 640, 644, 649, 646, 647, 647, 645, 648, 648, - 651, 652, 643, 652, 653, 654, 655, 656, 657, 658, - 659, 660, 661, 664, 659, 658, 662, 663, 649, 651, + 620, 602, 606, 620, 609, 607, 616, 613, 617, 615, + 618, 619, 611, 624, 623, 616, 618, 619, 614, 623, + 617, 621, 621, 622, 621, 625, 622, 626, 630, 627, + 628, 624, 629, 626, 627, 629, 628, 631, 632, 625, + 637, 633, 631, 632, 632, 634, 635, 638, 640, 636, + 158, 635, 639, 630, 633, 636, 638, 639, 634, 637, + 641, 641, 642, 645, 643, 635, 635, 643, 640, 642, + 644, 649, 646, 647, 651, 645, 644, 646, 647, 647, + 648, 648, 643, 652, 653, 652, 654, 655, 656, 657, + 659, 658, 660, 651, 659, 661, 649, 658, 662, 663, - 660, 665, 653, 654, 655, 666, 656, 661, 657, 668, - 667, 662, 664, 665, 669, 663, 667, 670, 671, 674, - 666, 672, 673, 668, 675, 672, 669, 676, 677, 678, - 679, 680, 680, 682, 678, 674, 670, 671, 683, 681, - 673, 684, 675, 681, 679, 676, 676, 677, 685, 683, - 686, 687, 682, 685, 688, 684, 689, 690, 691, 692, - 694, 697, 690, 689, 692, 691, 686, 688, 693, 695, - 687, 696, 698, 693, 699, 697, 695, 700, 694, 702, - 696, 698, 700, 702, 701, 703, 699, 701, 704, 705, - 707, 706, 708, 708, 709, 709, 716, 704, 714, 703, + 664, 660, 653, 665, 654, 655, 666, 656, 667, 657, + 661, 668, 669, 662, 667, 665, 670, 663, 671, 664, + 673, 666, 672, 674, 669, 668, 672, 675, 676, 677, + 679, 678, 680, 680, 85, 670, 678, 671, 673, 674, + 682, 683, 684, 687, 679, 675, 676, 676, 677, 681, + 685, 686, 683, 681, 689, 685, 684, 688, 690, 682, + 692, 689, 687, 690, 691, 692, 694, 686, 693, 695, + 688, 691, 696, 693, 697, 699, 695, 698, 700, 701, + 703, 696, 701, 700, 694, 702, 698, 699, 697, 702, + 704, 705, 707, 706, 703, 708, 708, 710, 710, 704, - 710, 710, 711, 709, 705, 706, 712, 711, 715, 717, - 718, 707, 719, 717, 715, 712, 716, 714, 720, 721, - 722, 724, 718, 723, 725, 721, 726, 729, 722, 735, - 723, 740, 742, 742, 736, 738, 720, 719, 735, 724, - 736, 738, 729, 745, 739, 751, 726, 740, 747, 725, - 727, 746, 727, 739, 741, 727, 743, 743, 741, 727, - 744, 745, 727, 754, 85, 746, 751, 748, 747, 727, - 727, 744, 727, 748, 749, 749, 749, 750, 749, 752, - 753, 749, 750, 756, 753, 755, 749, 754, 756, 755, - 757, 758, 749, 749, 759, 760, 761, 752, 760, 764, + 709, 709, 712, 711, 714, 716, 705, 706, 711, 709, + 715, 712, 718, 707, 717, 719, 715, 720, 717, 722, + 721, 723, 726, 714, 718, 716, 721, 722, 723, 724, + 725, 729, 735, 736, 740, 720, 739, 738, 744, 736, + 719, 735, 726, 738, 741, 739, 729, 724, 741, 744, + 740, 742, 742, 743, 743, 725, 727, 746, 727, 745, + 747, 727, 750, 748, 80, 727, 751, 750, 727, 748, + 753, 746, 752, 754, 753, 727, 727, 745, 727, 756, + 747, 749, 749, 749, 756, 749, 757, 751, 749, 758, + 752, 755, 759, 749, 75, 755, 762, 754, 760, 749, - 762, 761, 761, 763, 763, 772, 758, 762, 766, 757, - 765, 765, 767, 766, 764, 767, 768, 769, 769, 759, - 770, 768, 770, 771, 772, 773, 774, 778, 775, 773, - 776, 777, 777, 781, 779, 771, 780, 780, 776, 783, - 782, 794, 778, 784, 794, 785, 774, 775, 779, 784, - 785, 781, 782, 786, 786, 789, 80, 787, 790, 791, - 789, 783, 787, 787, 790, 791, 792, 793, 795, 796, - 800, 792, 799, 793, 795, 797, 797, 796, 798, 798, - 799, 801, 802, 803, 804, 804, 801, 805, 800, 802, - 806, 807, 807, 808, 809, 811, 805, 812, 806, 808, + 749, 760, 761, 762, 758, 757, 764, 761, 761, 763, + 763, 755, 773, 765, 766, 766, 776, 759, 765, 767, + 768, 764, 769, 768, 767, 770, 770, 769, 771, 772, + 771, 773, 774, 775, 777, 776, 774, 778, 778, 779, + 782, 772, 777, 780, 781, 781, 784, 783, 842, 785, + 822, 786, 842, 775, 779, 785, 786, 780, 782, 783, + 787, 787, 790, 822, 788, 791, 792, 790, 784, 788, + 788, 791, 792, 793, 794, 796, 795, 797, 793, 795, + 794, 796, 798, 798, 800, 797, 799, 799, 801, 802, + 803, 804, 800, 806, 802, 805, 805, 803, 809, 807, - 813, 815, 803, 814, 811, 818, 812, 819, 814, 816, - 815, 817, 816, 809, 820, 821, 817, 823, 823, 818, - 822, 824, 825, 820, 813, 822, 822, 827, 821, 826, - 835, 828, 819, 830, 828, 830, 824, 832, 826, 831, - 831, 825, 828, 833, 834, 837, 836, 839, 833, 838, - 835, 827, 840, 841, 842, 843, 839, 841, 832, 846, - 847, 845, 844, 848, 850, 834, 836, 837, 844, 838, - 845, 846, 842, 853, 843, 840, 849, 848, 850, 847, - 851, 854, 849, 852, 852, 851, 855, 856, 857, 858, - 854, 859, 860, 853, 861, 856, 862, 864, 865, 863, + 808, 808, 806, 810, 809, 812, 801, 807, 813, 814, + 804, 815, 816, 819, 812, 817, 815, 813, 817, 818, + 820, 816, 810, 821, 818, 823, 825, 819, 824, 824, + 823, 823, 821, 814, 826, 827, 828, 829, 832, 832, + 829, 825, 833, 835, 827, 820, 834, 831, 829, 831, + 836, 834, 837, 826, 838, 839, 840, 841, 74, 843, + 828, 845, 844, 833, 835, 840, 848, 845, 849, 846, + 836, 847, 837, 850, 851, 839, 838, 843, 846, 850, + 841, 844, 849, 847, 852, 848, 853, 853, 851, 852, + 854, 855, 856, 857, 858, 859, 860, 862, 861, 863, - 861, 866, 862, 864, 869, 870, 855, 866, 857, 867, - 859, 858, 860, 863, 871, 867, 868, 870, 865, 871, - 868, 872, 874, 869, 877, 870, 873, 873, 874, 875, - 876, 879, 875, 878, 880, 880, 881, 877, 882, 878, - 883, 884, 872, 882, 887, 883, 883, 888, 876, 885, - 889, 879, 890, 885, 881, 889, 884, 886, 886, 892, - 893, 896, 895, 897, 899, 899, 887, 888, 900, 902, - 902, 890, 900, 903, 893, 895, 901, 905, 904, 906, - 921, 896, 904, 892, 897, 898, 921, 75, 898, 908, - 898, 901, 905, 906, 898, 907, 898, 915, 903, 909, + 855, 857, 864, 862, 866, 863, 872, 865, 873, 870, + 854, 872, 856, 865, 858, 860, 864, 859, 861, 867, + 868, 871, 877, 869, 866, 867, 868, 869, 870, 873, + 874, 874, 875, 871, 876, 878, 879, 876, 875, 880, + 877, 871, 879, 881, 881, 882, 883, 884, 878, 885, + 886, 883, 884, 884, 886, 887, 887, 888, 889, 880, + 890, 891, 893, 882, 885, 890, 898, 894, 897, 896, + 900, 900, 901, 903, 903, 902, 901, 904, 889, 888, + 891, 894, 896, 907, 906, 68, 893, 898, 897, 899, + 902, 905, 899, 909, 899, 905, 908, 907, 899, 906, - 907, 898, 910, 908, 909, 909, 898, 911, 912, 915, - 913, 910, 912, 914, 916, 917, 918, 919, 914, 916, - 923, 911, 922, 920, 912, 913, 923, 922, 914, 917, - 924, 919, 920, 925, 925, 926, 924, 918, 927, 928, - 926, 929, 932, 933, 927, 930, 935, 938, 933, 936, - 936, 937, 934, 939, 932, 938, 937, 940, 935, 942, - 929, 928, 941, 930, 931, 931, 934, 939, 943, 945, - 931, 950, 931, 946, 943, 942, 940, 944, 931, 947, - 74, 941, 944, 931, 931, 948, 948, 945, 949, 946, - 931, 950, 949, 952, 954, 953, 955, 947, 953, 952, + 899, 908, 904, 910, 911, 899, 912, 909, 910, 910, + 899, 913, 916, 911, 914, 913, 915, 917, 918, 919, + 912, 915, 917, 920, 916, 921, 929, 913, 923, 914, + 922, 915, 918, 923, 921, 924, 922, 920, 925, 930, + 919, 924, 926, 926, 925, 927, 928, 931, 929, 933, + 927, 934, 928, 63, 935, 939, 934, 936, 930, 937, + 937, 933, 940, 939, 941, 931, 932, 932, 935, 936, + 938, 942, 932, 943, 932, 938, 940, 945, 944, 946, + 932, 947, 945, 941, 944, 932, 932, 948, 949, 943, + 942, 946, 932, 950, 950, 952, 951, 956, 954, 947, - 956, 958, 957, 960, 963, 961, 956, 957, 962, 955, - 963, 965, 960, 954, 961, 967, 964, 966, 968, 969, - 958, 970, 966, 973, 962, 964, 974, 971, 972, 973, - 965, 977, 968, 970, 975, 967, 971, 972, 979, 969, - 975, 980, 982, 974, 981, 984, 983, 977, 985, 986, - 989, 995, 979, 985, 986, 989, 982, 990, 991, 991, - 984, 980, 992, 981, 983, 993, 990, 995, 992, 996, - 1000, 1001, 998, 998, 996, 996, 998, 999, 993, 1002, - 999, 1003, 1005, 1004, 1000, 1007, 1006, 1008, 1009, 1010, - 1011, 1001, 1006, 1008, 1010, 1002, 1004, 1005, 1013, 1003, + 951, 958, 955, 948, 954, 955, 949, 957, 960, 961, + 963, 959, 957, 960, 958, 952, 956, 959, 964, 963, + 965, 967, 968, 966, 970, 971, 969, 964, 961, 966, + 967, 969, 972, 973, 974, 980, 965, 975, 977, 971, + 982, 968, 976, 974, 970, 973, 975, 978, 976, 983, + 985, 980, 972, 978, 982, 977, 984, 987, 986, 993, + 988, 989, 992, 58, 985, 988, 989, 992, 993, 983, + 994, 994, 987, 995, 996, 984, 986, 998, 999, 995, + 1003, 1001, 1001, 999, 999, 1001, 1002, 996, 1004, 1002, + 1005, 1006, 1007, 998, 1003, 1008, 1009, 1010, 1011, 1012, - 1014, 1013, 1015, 1009, 1011, 1007, 1016, 1015, 1017, 1018, - 1019, 1016, 1022, 1020, 1018, 1019, 1023, 1024, 1022, 1028, - 1025, 1014, 1027, 1024, 1017, 1020, 1025, 1026, 1026, 1031, - 1029, 1027, 1023, 1029, 1030, 1030, 1032, 1028, 1033, 1034, - 1035, 1038, 1034, 1036, 1037, 1043, 1038, 1031, 1041, 1036, - 1037, 1039, 1040, 1035, 1041, 1032, 1039, 1040, 1033, 1044, - 1045, 1048, 1046, 1043, 1047, 1047, 1045, 1046, 1049, 1050, - 1048, 1051, 1052, 1053, 1054, 1052, 1053, 1049, 1055, 1044, - 1056, 1057, 1058, 1059, 1060, 1054, 1061, 1050, 1058, 1059, - 1051, 1061, 1056, 1062, 1062, 1063, 1055, 1064, 1065, 1060, + 1016, 1014, 1009, 1016, 1011, 1007, 1005, 1013, 1004, 1006, + 1008, 1017, 1013, 1018, 1012, 1014, 1019, 1010, 1018, 1020, + 1021, 1019, 1022, 1025, 1023, 1021, 1026, 1022, 1027, 1025, + 1031, 1028, 1017, 1034, 1027, 1020, 1023, 1028, 1029, 1029, + 1030, 1032, 1026, 1035, 1032, 1033, 1033, 1036, 1031, 1030, + 1037, 1034, 1038, 1037, 1039, 1040, 1047, 1046, 1041, 1042, + 1039, 1040, 1035, 1041, 1042, 1038, 1043, 1036, 1044, 1050, + 1050, 1043, 1048, 1053, 1044, 1046, 1047, 1049, 1048, 1051, + 1052, 1054, 1049, 1055, 1056, 1057, 1055, 1056, 1051, 1052, + 1058, 1053, 1059, 1060, 1063, 1061, 1057, 1062, 1065, 1065, - 1057, 1066, 1067, 1068, 1069, 1066, 1070, 1072, 1073, 1073, - 1065, 1064, 1068, 1074, 1063, 1076, 1078, 1077, 1080, 1079, - 1067, 1081, 1081, 1069, 1079, 1082, 1072, 1080, 1078, 1076, - 1083, 1070, 1077, 1074, 1084, 1085, 1083, 1086, 1088, 1087, - 1084, 1087, 1086, 1088, 1089, 1082, 1090, 1091, 1092, 1093, - 1094, 1085, 1091, 1096, 1095, 1098, 1098, 1094, 1089, 1099, - 1090, 1100, 1101, 1092, 1102, 1103, 68, 1106, 1093, 1095, - 1102, 1106, 1096, 1099, 1114, 1104, 1111, 1101, 1108, 1100, - 1104, 1107, 1107, 1108, 1113, 1103, 1109, 1109, 1110, 1104, - 1111, 1104, 1114, 1112, 1104, 1110, 1112, 1115, 1117, 1116, + 1054, 1061, 1064, 1062, 1059, 1066, 1067, 1064, 1058, 1063, + 1068, 1069, 1060, 1070, 1071, 1069, 1072, 1073, 1075, 1077, + 1067, 1080, 1068, 1071, 1066, 1076, 1076, 1079, 1081, 1082, + 1085, 1070, 1084, 1084, 1082, 1072, 1080, 1075, 1083, 1077, + 1081, 1079, 1073, 1086, 1088, 1087, 1096, 1083, 1089, 1086, + 1085, 1087, 1090, 1089, 1090, 1092, 1091, 1093, 1094, 1095, + 1088, 1091, 1098, 1094, 1099, 1096, 1097, 1101, 1101, 1092, + 1102, 1093, 1103, 1097, 1095, 1105, 1104, 1098, 1106, 1114, + 1107, 1105, 1109, 1099, 1102, 1107, 1109, 1110, 1110, 1116, + 1103, 1104, 1111, 1114, 1107, 1113, 1107, 1111, 1106, 1107, - 1118, 1120, 1119, 1113, 1116, 1121, 1115, 1119, 1122, 1124, - 1124, 1127, 1118, 1125, 1126, 1120, 1121, 1117, 1125, 1126, - 1128, 1130, 1129, 1131, 1132, 1128, 1129, 1122, 1133, 1134, - 1130, 1127, 1137, 1135, 1138, 1136, 1139, 1140, 1131, 1132, - 1141, 1134, 1136, 1142, 1137, 1143, 1141, 1133, 1135, 1144, - 1145, 1146, 1147, 1138, 1149, 1140, 1148, 1139, 1142, 1145, - 1150, 1151, 1154, 1157, 1153, 1143, 1146, 63, 1148, 1144, - 1153, 1147, 1155, 1158, 1156, 1150, 1159, 1154, 1158, 1149, - 1161, 1151, 1156, 1157, 1160, 1163, 1155, 1162, 1159, 1160, - 1160, 1164, 1164, 1166, 1168, 1167, 1169, 1169, 1163, 1161, + 1112, 1112, 1113, 1115, 1117, 1118, 1115, 1119, 1116, 1120, + 1122, 1121, 1119, 1123, 1118, 1122, 1125, 1130, 1124, 1127, + 1127, 1128, 1117, 1121, 1133, 1129, 1128, 1123, 1120, 1124, + 1129, 1131, 1134, 1133, 1132, 1125, 1131, 1130, 1132, 1135, + 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1134, 1143, 1144, + 1139, 1146, 1147, 1137, 1135, 1144, 1140, 1138, 1145, 1136, + 1148, 1149, 1150, 1151, 1141, 1152, 1143, 1142, 1153, 1148, + 1154, 1146, 1147, 1145, 1155, 1151, 1149, 1157, 1159, 1160, + 1158, 1150, 1161, 1157, 1152, 1154, 1163, 1160, 1162, 1164, + 1166, 1163, 1159, 1153, 1155, 1158, 1167, 1185, 1168, 1184, - 1168, 1162, 1165, 1165, 1167, 1171, 1166, 1165, 1170, 1176, - 1165, 1165, 1172, 1170, 1171, 1165, 58, 1173, 1172, 1174, - 1179, 1165, 1173, 1180, 1174, 1165, 1175, 1175, 1177, 1177, - 1176, 1178, 1182, 1181, 1178, 1184, 1178, 1185, 1183, 1186, - 1179, 1180, 1181, 1183, 1187, 1186, 1188, 1190, 57, 1184, - 1187, 1188, 1182, 1189, 1197, 1185, 1190, 1189, 1191, 1191, - 1195, 1190, 1193, 1190, 1195, 1190, 1196, 1190, 1192, 1192, - 1198, 1192, 1197, 1193, 1201, 1200, 1203, 1199, 1204, 1198, - 1202, 1196, 1199, 1199, 1200, 1202, 1205, 1204, 1206, 1207, - 1203, 1208, 1209, 1209, 1210, 1211, 1201, 1208, 1213, 1212, + 1165, 1164, 1161, 1171, 1162, 1165, 1165, 1169, 1169, 1166, + 1167, 1168, 1170, 1170, 1172, 1185, 1171, 1170, 1173, 1184, + 1170, 1170, 1181, 1172, 1173, 1170, 1174, 1174, 1175, 1176, + 1177, 1170, 1178, 1175, 1179, 1170, 1177, 1178, 1176, 1179, + 1180, 1180, 1187, 1181, 1182, 1182, 1183, 1186, 1188, 1183, + 1189, 1183, 1190, 1188, 1191, 1192, 1186, 1195, 1193, 1201, + 1191, 1192, 1187, 1193, 1189, 1194, 1195, 1196, 1196, 1194, + 1190, 1195, 1198, 1195, 1201, 1195, 1200, 1195, 1197, 1197, + 1200, 1197, 1202, 1198, 1203, 1204, 1205, 1206, 1208, 1207, + 1204, 1204, 1209, 1203, 1207, 1205, 1210, 1211, 1212, 1213, - 1215, 1214, 1210, 1207, 1212, 1205, 1216, 1206, 1217, 1211, - 1214, 1219, 1213, 1217, 1218, 1218, 1220, 1220, 1215, 1221, - 1223, 1221, 1224, 1223, 1225, 1226, 1219, 1224, 1227, 1227, - 1228, 1216, 1229, 1229, 1226, 1230, 1230, 1231, 1232, 1233, - 1234, 1234, 1231, 1225, 1235, 1236, 1237, 1238, 1236, 1239, - 1228, 1240, 1238, 1240, 1241, 1244, 1245, 1246, 1239, 1232, - 1233, 1245, 1243, 1247, 1235, 1243, 1237, 1248, 1247, 1249, - 1244, 1246, 1241, 1250, 1249, 1248, 1251, 1251, 1250, 1252, - 1253, 1254, 1255, 1256, 1252, 1258, 1259, 1254, 1260, 1255, - 1262, 1258, 1259, 1260, 1261, 1263, 1256, 1264, 1253, 1262, + 1202, 1209, 1208, 1214, 1214, 1213, 1215, 1216, 1217, 1206, + 1218, 1219, 1212, 1217, 1215, 1210, 1211, 1220, 1221, 1224, + 1219, 1216, 1222, 57, 1218, 1223, 1223, 1222, 1225, 1225, + 1226, 1230, 1226, 1228, 1224, 1220, 1228, 1229, 1231, 1232, + 1232, 1233, 1229, 1221, 1234, 1234, 1236, 1231, 1235, 1235, + 1230, 1236, 1237, 1238, 1239, 1239, 1240, 1241, 1242, 1243, + 1241, 1233, 1244, 1245, 1243, 1245, 1246, 1248, 1249, 52, + 1248, 1244, 1250, 1237, 1238, 1251, 1240, 1250, 1242, 1253, + 1252, 1254, 1258, 1249, 1246, 1252, 1254, 1253, 1255, 1251, + 1256, 1256, 1257, 1255, 1261, 1259, 1260, 1257, 1263, 1264, - 1261, 1265, 1265, 1266, 1268, 1269, 1270, 1271, 1264, 1272, - 1273, 1275, 1276, 1271, 1263, 1272, 1273, 1275, 1277, 1268, - 1278, 1279, 1280, 1266, 1281, 1269, 1276, 1282, 1282, 1270, - 1283, 1284, 1276, 1279, 1285, 1288, 1280, 52, 1277, 1286, - 1278, 1291, 1281, 1289, 1286, 1287, 1287, 1293, 1289, 1292, - 1283, 1295, 1285, 1294, 1292, 1292, 1284, 1296, 1288, 1295, - 1291, 1297, 1294, 1298, 1299, 1293, 1300, 1308, 1301, 1299, - 1301, 1296, 1299, 1302, 1304, 1300, 1297, 1306, 1298, 1305, - 1304, 1298, 1309, 1305, 1307, 1310, 1308, 1302, 1306, 1307, - 1307, 1311, 1312, 1313, 1314, 1315, 1311, 1312, 1316, 1318, + 1258, 1259, 1266, 1260, 1263, 1264, 1265, 1261, 1266, 1267, + 1268, 1265, 1269, 1270, 1270, 1271, 1273, 1274, 1267, 1275, + 1276, 1277, 1278, 1269, 1280, 1281, 1276, 1277, 1278, 1268, + 1280, 1273, 1282, 1283, 1284, 1271, 1285, 1274, 1286, 1281, + 1287, 1287, 1275, 1288, 1289, 1281, 1284, 1290, 1293, 1291, + 1285, 1296, 1282, 1283, 1291, 1294, 1286, 1292, 1292, 1298, + 1294, 1297, 47, 1288, 1299, 1290, 1297, 1297, 1300, 1289, + 1296, 1293, 1301, 1299, 1302, 1303, 1300, 1298, 1306, 1304, + 1306, 1307, 1305, 1313, 1304, 1314, 1301, 1304, 1309, 1302, + 1303, 1305, 1310, 1303, 1309, 1307, 1310, 1311, 1312, 1315, - 1315, 1319, 1320, 1310, 1321, 1321, 1322, 1323, 1309, 1324, - 1322, 1313, 1326, 1318, 1314, 1325, 1327, 1328, 1316, 1319, - 1320, 1325, 1329, 1330, 1326, 1323, 1331, 1332, 1324, 1333, - 1335, 1328, 1332, 1336, 1334, 1327, 1333, 1329, 1330, 1334, - 1337, 1337, 1336, 1338, 1339, 1331, 1340, 1343, 1335, 1341, - 1341, 1342, 1346, 1339, 1344, 1344, 1345, 1342, 1338, 1347, - 1348, 1343, 1345, 1349, 1350, 1348, 1340, 1357, 1346, 1349, - 1350, 1351, 1351, 1352, 1352, 1354, 1354, 1355, 1356, 1358, - 1347, 1355, 1359, 1360, 1363, 1357, 1361, 1356, 1362, 1362, - 1365, 1358, 1364, 1361, 1366, 1365, 1359, 1367, 1360, 1370, + 1316, 1317, 1313, 1312, 1312, 1316, 1317, 1318, 1311, 1319, + 1320, 1314, 1321, 1323, 1329, 1320, 1324, 1315, 1325, 1326, + 1326, 1328, 1327, 1331, 1330, 1318, 1327, 1323, 1332, 1319, + 1330, 1333, 1321, 1329, 1324, 1331, 1325, 1334, 1335, 1328, + 1336, 1337, 1338, 1339, 1340, 1333, 1337, 1332, 1339, 1338, + 1343, 1341, 1334, 1335, 1342, 1342, 1345, 1344, 1349, 1336, + 1341, 1347, 1340, 1346, 1346, 1343, 1344, 1347, 1348, 1350, + 1350, 1351, 1349, 1352, 1348, 1353, 1345, 1351, 1354, 1355, + 1356, 1357, 1364, 1354, 1362, 1355, 1356, 1357, 1362, 1352, + 1358, 1358, 1359, 1359, 1361, 1361, 1353, 1363, 1365, 1366, - 1364, 1368, 1371, 1371, 1363, 1369, 1368, 1368, 1366, 1372, - 1369, 1369, 1373, 1374, 1376, 1375, 1367, 1377, 1378, 1370, - 1375, 1379, 1374, 1381, 1380, 1383, 1382, 1379, 1372, 1380, - 1391, 1373, 1382, 1376, 1384, 1385, 1378, 1377, 1386, 1387, - 1384, 1385, 1388, 1389, 1383, 1390, 1393, 1393, 1392, 1381, - 1394, 1391, 1395, 1394, 1396, 1396, 1399, 1386, 1387, 1390, - 1399, 1388, 1389, 1392, 1395, 1397, 1397, 1398, 1400, 1401, - 1402, 1403, 1398, 1403, 1405, 1406, 1407, 1403, 1401, 1408, - 1406, 1400, 1409, 1402, 1410, 1410, 1413, 1414, 1411, 1412, - 1403, 1407, 1405, 1411, 1418, 1412, 1420, 1415, 1409, 1408, + 1364, 1367, 1368, 1369, 1369, 1370, 1363, 1371, 1373, 1368, + 1365, 1374, 1372, 1366, 1375, 1371, 1367, 1372, 1376, 1375, + 1375, 1377, 1373, 1376, 1376, 1370, 1378, 1378, 1379, 1380, + 1374, 1381, 1382, 1383, 1384, 1385, 1386, 1382, 1387, 1388, + 1381, 1377, 1386, 1387, 1389, 1390, 1398, 1379, 1380, 1391, + 1389, 1392, 1383, 1385, 1384, 1391, 1393, 1392, 1394, 1395, + 1396, 1407, 1397, 1408, 1390, 1388, 1399, 1398, 1400, 1400, + 1401, 1402, 1408, 1401, 1407, 1393, 1397, 1394, 1395, 1396, + 1415, 1399, 1409, 1402, 1403, 1403, 1404, 1404, 1405, 1412, + 1406, 1414, 1413, 1405, 1406, 1409, 1410, 1413, 1410, 1421, - 1414, 1413, 1415, 1416, 1417, 1419, 1421, 1416, 1417, 1422, - 1422, 1424, 1421, 1426, 1418, 1427, 1420, 1428, 1428, 1429, - 1427, 1430, 1436, 1419, 1437, 1429, 1432, 1432, 1434, 1424, - 1440, 1434, 1435, 1435, 1426, 1441, 1439, 1443, 1436, 1439, - 1437, 1430, 1442, 1442, 1441, 1444, 1445, 1447, 1446, 1449, - 1440, 1450, 1443, 1446, 1448, 1448, 1451, 1452, 1449, 1453, - 1453, 1447, 1454, 1455, 1457, 1445, 1444, 1456, 1460, 1450, - 1462, 1451, 1456, 1458, 1458, 1463, 1454, 1461, 1461, 1457, - 1459, 1455, 1452, 1464, 1459, 1465, 1463, 1464, 1460, 1466, - 1468, 1468, 1462, 1469, 1466, 1470, 1471, 1472, 1473, 1474, + 1415, 1416, 1410, 1417, 1417, 1418, 1414, 1412, 1419, 1420, + 1418, 1422, 1421, 1425, 1419, 1410, 1422, 1416, 1423, 1424, + 1426, 1427, 1423, 1424, 1420, 1428, 1429, 1429, 1431, 1433, + 1434, 1428, 1437, 1425, 1436, 1434, 1435, 1435, 1426, 1443, + 1436, 1427, 1439, 1439, 1441, 1444, 1431, 1441, 1442, 1442, + 1433, 1446, 1437, 1447, 1446, 1443, 1448, 1449, 1449, 1450, + 1451, 1444, 1453, 1452, 1454, 1448, 1456, 1453, 1455, 1455, + 1457, 1458, 1459, 1447, 1450, 1456, 1460, 1460, 1454, 1461, + 1462, 1451, 1452, 1466, 1463, 1464, 1458, 1466, 1457, 1463, + 1465, 1465, 1467, 1461, 1468, 1468, 1469, 1459, 1462, 1470, - 1475, 1475, 1476, 1477, 1465, 1478, 47, 1476, 1482, 1469, - 1471, 1480, 1473, 1470, 1479, 1479, 1472, 1472, 1486, 1495, - 1480, 1481, 1489, 1477, 1474, 1478, 1481, 1483, 1482, 1483, - 1484, 1485, 1491, 1487, 18, 1484, 1489, 1485, 1486, 1487, - 1490, 1490, 1492, 1495, 1494, 1496, 1496, 1498, 1492, 1494, - 1499, 1491, 1497, 1497, 1500, 1501, 1502, 1502, 1501, 1503, - 1504, 1498, 1505, 1513, 17, 1507, 1524, 1506, 1499, 1500, - 1506, 1507, 1504, 1506, 1508, 1509, 1512, 1503, 1509, 1508, - 1511, 1512, 1505, 1514, 1524, 1506, 1514, 1516, 1513, 1511, - 1515, 1515, 1517, 1516, 1509, 1518, 1519, 1519, 1517, 1521, + 1464, 1471, 1472, 1473, 1476, 1471, 1475, 1475, 1473, 1477, + 1470, 1478, 1467, 1479, 1480, 1481, 1482, 1482, 1469, 1483, + 1476, 1472, 1484, 1485, 1483, 1478, 1487, 1477, 1480, 1486, + 1486, 1488, 1479, 1479, 1489, 1487, 1488, 1490, 1492, 1490, + 1481, 1491, 1484, 1485, 1492, 1493, 1491, 1494, 1496, 1497, + 1497, 1498, 1499, 1494, 1489, 1501, 1502, 1505, 1499, 1506, + 1501, 1507, 1496, 1503, 1503, 1493, 1504, 1504, 1510, 1508, + 1498, 1505, 1508, 1509, 1509, 1511, 1507, 1506, 1512, 1513, + 1502, 1516, 1513, 1514, 1516, 1513, 1510, 1511, 1515, 1514, + 1518, 1519, 1520, 1515, 1522, 1522, 1519, 1513, 1512, 1518, - 1518, 1520, 1520, 1522, 1523, 1521, 1525, 1526, 1522, 1527, - 1528, 1532, 1527, 1529, 1536, 1530, 1528, 1523, 1531, 1529, - 1530, 1533, 1534, 1534, 1531, 1525, 1533, 1526, 1535, 1537, - 1538, 1539, 1536, 1535, 1532, 1542, 1543, 1540, 1541, 1544, - 1545, 1544, 1547, 1548, 1549, 1539, 1551, 1552, 1554, 1537, - 1538, 1540, 1541, 1542, 1547, 1548, 1550, 1549, 1553, 1545, - 1557, 1543, 1550, 1556, 1556, 1558, 1551, 1552, 1562, 1554, - 1558, 1559, 1553, 1560, 1560, 1561, 1563, 1564, 1565, 1566, - 1557, 1567, 1562, 1559, 1568, 1569, 1573, 1565, 1567, 1571, - 1561, 1575, 1575, 1568, 1566, 1564, 1568, 1576, 1576, 1574, + 1516, 1521, 1523, 1524, 1521, 1525, 1526, 1526, 1523, 1524, + 1525, 1527, 1527, 1528, 1530, 1529, 1531, 1520, 1532, 1528, + 1529, 1533, 1534, 1535, 1536, 1534, 1537, 1530, 1539, 1535, + 1536, 1537, 1538, 1544, 1531, 1540, 1543, 1532, 1538, 1542, + 1540, 1533, 1541, 1541, 1542, 1545, 1546, 1547, 1548, 1549, + 1550, 1539, 1551, 1544, 1543, 1552, 1551, 1552, 1553, 1555, + 1546, 1547, 1548, 1558, 1556, 1545, 1557, 1549, 1559, 1558, + 1560, 1555, 1561, 1562, 1563, 1550, 1556, 1553, 1566, 1557, + 1565, 1565, 1568, 1571, 1567, 1570, 1560, 1562, 1559, 1567, + 1569, 1569, 1561, 1572, 1568, 1563, 1573, 1571, 1566, 1574, - 1563, 1569, 1574, 1577, 1571, 1578, 1581, 1579, 1582, 1571, - 1579, 1573, 1580, 1580, 1585, 1577, 1583, 1584, 1586, 1581, - 1587, 1583, 1584, 1578, 1588, 1591, 1589, 1582, 1590, 1587, - 1593, 1591, 1594, 1585, 1586, 1589, 1595, 1590, 1589, 1592, - 1592, 1596, 1597, 1588, 1598, 1594, 1601, 1602, 1603, 1603, - 1593, 1604, 1605, 0, 1595, 1596, 1598, 1606, 1597, 1607, - 1607, 1605, 1606, 1608, 1609, 1602, 1610, 1604, 1611, 1609, - 1612, 1601, 1608, 1613, 1607, 1608, 1615, 1616, 1613, 1613, - 1617, 1618, 1620, 1628, 1610, 1619, 1618, 1627, 1612, 1611, - 1615, 1619, 1616, 1621, 1621, 1622, 1630, 1628, 1623, 1624, + 1570, 1575, 1576, 1577, 1578, 1582, 1580, 1583, 1574, 1576, + 1583, 1587, 1577, 1586, 1573, 1577, 1575, 1572, 1584, 1584, + 1578, 1580, 1585, 1585, 1588, 1586, 1580, 1588, 1590, 1587, + 1582, 1589, 1589, 1591, 1592, 1593, 1594, 1595, 1596, 1592, + 1593, 1590, 1597, 1602, 1600, 1598, 1606, 1596, 1604, 1599, + 1600, 1603, 1591, 1595, 1598, 1594, 1605, 1598, 1599, 1601, + 1601, 1597, 1606, 1602, 1603, 1607, 1604, 1610, 1611, 1613, + 1605, 1612, 1612, 1614, 1615, 1616, 1616, 1607, 1618, 1615, + 1619, 1620, 1614, 1618, 1617, 1613, 1611, 1621, 1625, 1622, + 1616, 1626, 1610, 1617, 1622, 1622, 1617, 1624, 1619, 1627, - 1620, 1622, 1617, 1623, 1625, 1624, 1629, 1627, 1631, 1630, - 1625, 1631, 1629, 1632, 1634, 1636, 1637, 1631, 1638, 1632, - 1639, 0, 1634, 1640, 1641, 1642, 1638, 1643, 1649, 1639, - 1644, 1644, 1645, 1650, 1636, 1637, 1640, 1641, 1645, 1642, - 1646, 1643, 1647, 1648, 1648, 1651, 1646, 1652, 1649, 1654, - 1653, 1650, 1644, 1655, 1656, 1647, 1653, 1658, 1658, 1659, - 1652, 1660, 1661, 1662, 1651, 1660, 1665, 1661, 1662, 1655, - 1663, 1654, 1656, 1664, 1667, 1663, 1668, 1669, 1669, 1659, - 1670, 1671, 1664, 1672, 1673, 1673, 1667, 1674, 1675, 1665, - 1679, 1668, 1676, 1671, 1677, 1675, 1680, 1681, 1682, 1670, + 1628, 1629, 1620, 1625, 1627, 1621, 1628, 1630, 1630, 1631, + 1633, 1624, 1632, 1626, 1634, 1631, 1633, 1632, 1636, 1629, + 1634, 1637, 1638, 1639, 1640, 1641, 1643, 1640, 1638, 1645, + 1646, 1641, 1647, 1640, 1643, 1637, 1639, 1648, 1636, 1649, + 1647, 1650, 1651, 1652, 1653, 1653, 1648, 1654, 1645, 1646, + 1656, 1658, 1649, 1654, 1650, 1655, 1651, 1652, 1657, 1657, + 1659, 1655, 1660, 1656, 1661, 1663, 1653, 1662, 1664, 1668, + 1665, 1658, 1669, 1662, 1667, 1667, 1669, 1661, 1659, 1674, + 1670, 1660, 1676, 1673, 1664, 1670, 1671, 1663, 1665, 1668, + 1672, 1671, 1673, 1677, 1676, 1672, 1678, 1678, 1679, 1680, - 1683, 1674, 1672, 1681, 1676, 1684, 1677, 1685, 1685, 1679, - 1682, 1684, 1686, 1687, 1687, 1686, 1680, 1689, 1683, 1690, - 1691, 1693, 1689, 1692, 1692, 1694, 1691, 1694, 1690, 1695, - 1696, 1697, 1695, 1693, 1698, 1700, 1699, 1701, 1702, 1703, - 1700, 1704, 1701, 1705, 1707, 1710, 1706, 1702, 1705, 1713, - 1696, 1703, 1698, 1697, 1699, 1706, 1704, 1708, 1709, 1715, - 1710, 1712, 1708, 1709, 1707, 1711, 1711, 1712, 1706, 1708, - 1713, 1716, 1717, 1718, 1719, 1720, 1719, 1724, 1715, 1721, - 1721, 1722, 1722, 1723, 1723, 1725, 1725, 1727, 1717, 1720, - 1716, 1720, 1728, 1718, 1726, 1726, 1730, 1724, 1729, 1729, + 1681, 1683, 1674, 1682, 1682, 1684, 1685, 1688, 1677, 1686, + 1689, 1680, 1684, 1691, 1690, 1683, 1692, 1679, 1685, 1681, + 1690, 1686, 1693, 1694, 1694, 1691, 1688, 1702, 1693, 1695, + 1689, 1699, 1695, 1698, 1692, 1696, 1696, 1700, 1698, 1702, + 1699, 1701, 1701, 1700, 1703, 1704, 1703, 1705, 1704, 1706, + 1707, 1708, 1709, 1710, 1711, 1713, 1714, 1709, 1710, 1716, + 1712, 1714, 1719, 1711, 1715, 1720, 1720, 1705, 1707, 1708, + 1713, 1706, 1712, 1715, 1722, 1717, 1718, 1719, 1721, 1716, + 1717, 1718, 1724, 1725, 1721, 1727, 1715, 1717, 1726, 1728, + 1733, 1728, 1729, 1730, 1730, 1722, 1731, 1731, 1732, 1732, - 1730, 1731, 1732, 1734, 1735, 1732, 1736, 1731, 1727, 1734, - 1737, 1738, 1736, 1728, 1738, 1739, 1739, 1740, 1741, 1742, - 1742, 1743, 1735, 1741, 1744, 1745, 1745, 1746, 1747, 1744, - 0, 1748, 1746, 1749, 1747, 1737, 1750, 1740, 1752, 1757, - 1751, 1757, 1743, 1748, 1748, 1748, 1751, 1755, 1756, 1754, - 1748, 1758, 1759, 1749, 1754, 1754, 1750, 1761, 1752, 1760, - 1762, 1755, 1758, 1756, 1763, 1760, 1761, 1759, 1764, 1764, - 1765, 1766, 1766, 1767, 1771, 1768, 1769, 1769, 1770, 1770, - 1762, 1774, 1774, 1775, 1779, 1763, 1776, 1781, 1781, 1778, - 1782, 1786, 1783, 1767, 1771, 1776, 1765, 1768, 1778, 1788, + 1736, 1724, 1725, 1737, 1726, 1727, 1729, 1746, 1729, 1744, + 1733, 1734, 1734, 1735, 1735, 1738, 1738, 1740, 1739, 1749, + 1743, 1736, 1739, 1740, 1737, 1741, 1743, 1744, 1741, 1745, + 1747, 1752, 1746, 1747, 1753, 1745, 1748, 1748, 1750, 1749, + 1751, 1751, 1754, 1750, 1755, 1755, 1752, 1754, 1756, 1758, + 1757, 1759, 1760, 1756, 1761, 1753, 1757, 1763, 1762, 1766, + 1765, 1758, 1758, 1758, 1762, 1765, 1765, 1767, 1758, 1769, + 1760, 1759, 1770, 1766, 1761, 1771, 1768, 1763, 1768, 1772, + 1769, 1771, 1767, 1773, 1774, 1775, 1775, 1770, 1772, 1776, + 1777, 1777, 1778, 1782, 1779, 1780, 1780, 1781, 1781, 1785, - 1780, 1785, 1784, 1787, 1787, 1779, 1780, 1783, 1775, 1784, - 1785, 1782, 1789, 1791, 1792, 1793, 1794, 1786, 1791, 1800, - 1792, 1795, 1801, 1794, 1796, 1788, 1802, 1795, 1789, 1798, - 1796, 1797, 1797, 1799, 1798, 1793, 1804, 1803, 1802, 1800, - 1803, 1801, 1799, 1805, 1806, 1806, 1807, 1808, 1809, 1810, - 1813, 1811, 1807, 1808, 1804, 1811, 1814, 1815, 1816, 1816, - 1817, 1818, 1815, 1820, 1810, 1823, 1822, 1828, 1809, 1805, - 1813, 1811, 1822, 1821, 1823, 1826, 1818, 1821, 1814, 1817, - 1824, 1824, 1820, 1825, 1827, 1827, 1826, 1825, 1828, 1829, - 1830, 1826, 1831, 1832, 1833, 1834, 1835, 1831, 1839, 1836, + 1785, 1786, 1787, 1773, 1790, 1774, 1792, 1792, 1789, 1793, + 1796, 1787, 1778, 1782, 1791, 1776, 1779, 1789, 1794, 1796, + 1791, 1795, 1797, 1798, 1798, 1790, 1786, 1799, 1795, 1800, + 1793, 1802, 1803, 1794, 1804, 1805, 1802, 1806, 1803, 1809, + 1807, 1811, 1805, 1806, 1809, 1800, 1807, 1810, 1797, 1808, + 1808, 1812, 1813, 1799, 1804, 1814, 1810, 1815, 1814, 1816, + 1818, 1811, 1817, 1817, 1813, 1819, 1818, 1820, 1821, 1822, + 1812, 1819, 1824, 1822, 1825, 1815, 1826, 1827, 1827, 1828, + 1829, 1826, 1831, 1821, 1832, 1816, 1839, 1820, 1832, 1822, + 1834, 1833, 1824, 1835, 1835, 1829, 1825, 1833, 1828, 1834, - 1843, 1834, 1839, 1829, 1836, 1837, 1837, 1838, 1838, 1830, - 1841, 1835, 1842, 1832, 1833, 1844, 1844, 1846, 1846, 1841, - 1843, 1847, 1850, 1842, 1848, 1849, 1847, 1847, 1842, 1851, - 1848, 1849, 1852, 1853, 1851, 1855, 1856, 1857, 1858, 1853, - 1856, 1863, 1860, 1866, 1852, 1859, 1861, 1855, 1850, 1857, - 1862, 1859, 1861, 1863, 1865, 1862, 1867, 1869, 1870, 1870, - 1869, 1867, 1866, 1858, 1860, 1873, 1865, 1871, 1871, 1872, - 1872, 1874, 1875, 1878, 1876, 1877, 0, 1874, 1875, 1876, - 1883, 1877, 1878, 1880, 1882, 1873, 1886, 1882, 1880, 1884, - 1884, 1887, 1883, 1890, 1888, 1889, 1889, 1895, 1886, 1888, + 1836, 1831, 1837, 1840, 1836, 1838, 1838, 1839, 1841, 1842, + 1843, 1844, 1850, 1837, 1842, 1845, 1850, 1840, 1837, 1846, + 1847, 1845, 1848, 1848, 1852, 1847, 1853, 1841, 1849, 1849, + 1843, 1844, 1854, 1852, 1846, 1855, 1855, 1853, 1857, 1857, + 1858, 1859, 1853, 1860, 1861, 1858, 1858, 1859, 1862, 1860, + 1863, 1864, 1854, 1862, 1866, 1867, 1868, 1864, 1869, 1867, + 1871, 1870, 1863, 1872, 18, 1874, 1866, 1870, 1868, 1872, + 1861, 1873, 1876, 1877, 1878, 1880, 1873, 1874, 1880, 1878, + 1881, 1881, 1871, 1869, 1876, 1882, 1882, 1883, 1883, 1884, + 1885, 1886, 1877, 1887, 1888, 1889, 1885, 1886, 1887, 1893, - 1891, 1892, 1890, 1887, 1893, 1891, 1892, 1893, 1894, 1894, - 1896, 1897, 1898, 1905, 1899, 1900, 1901, 1895, 1899, 1896, - 1900, 1902, 1901, 1903, 1904, 1907, 1907, 1905, 1908, 1897, - 1910, 1898, 1903, 1913, 1909, 1911, 1911, 1907, 1912, 1902, - 1914, 1916, 1904, 1909, 1915, 1913, 1908, 1912, 1922, 1915, - 1910, 1919, 1919, 1921, 1916, 1923, 1921, 1925, 1928, 1926, - 1927, 1914, 1929, 1929, 1922, 1930, 1927, 1930, 1931, 1931, - 1932, 1923, 1925, 1926, 1940, 1928, 1934, 1934, 1932, 1935, - 1935, 1937, 1938, 1939, 1941, 1942, 1942, 1937, 1938, 1943, - 1939, 1944, 1948, 1945, 1946, 1947, 1940, 1950, 1943, 1949, + 1888, 1891, 1893, 1894, 1889, 1897, 1891, 1895, 1895, 1884, + 1898, 1899, 1900, 1900, 1901, 1894, 1899, 1897, 1904, 1902, + 1903, 1904, 1898, 1901, 1902, 1903, 1905, 1905, 1906, 1907, + 1910, 1908, 1909, 1912, 1910, 1911, 1913, 1914, 1907, 1912, + 1911, 1915, 1916, 1918, 1918, 1919, 1914, 1921, 1906, 1908, + 1925, 1909, 1920, 1923, 1913, 1918, 1916, 1922, 1922, 1915, + 1924, 1920, 1923, 1919, 1926, 1927, 1933, 1921, 1934, 1926, + 1936, 1925, 1924, 1930, 1930, 1937, 1932, 1938, 1927, 1932, + 1939, 1948, 1933, 1938, 1934, 1936, 1940, 1940, 1941, 1937, + 1941, 1942, 1942, 1943, 1945, 1945, 1949, 1939, 1946, 1946, - 1952, 1953, 1957, 1950, 1941, 1945, 1946, 1947, 1956, 1954, - 1955, 1955, 1944, 1960, 1949, 1963, 1950, 1963, 1948, 1964, - 1952, 1954, 1957, 1970, 1953, 1958, 1956, 1959, 1958, 1962, - 1965, 1966, 1959, 1960, 1962, 1965, 1968, 1964, 1966, 1971, - 1972, 1970, 1973, 1974, 1973, 1968, 1977, 1976, 1971, 1976, - 1978, 1978, 1972, 1979, 1980, 1981, 1982, 1981, 1983, 1980, - 1977, 1982, 1974, 1983, 1984, 1985, 1986, 1988, 1987, 1989, - 1991, 1995, 1986, 1987, 1992, 1993, 1993, 1989, 1996, 1979, - 1988, 1997, 1984, 1994, 1994, 1985, 1995, 1997, 1992, 1991, - 1998, 1999, 2000, 1999, 2003, 1998, 2001, 2008, 1996, 2002, + 1950, 1943, 1949, 1951, 1948, 1952, 1950, 1955, 1953, 1956, + 1951, 1954, 1954, 1957, 1958, 1961, 1955, 1959, 1962, 1960, + 1965, 1966, 1967, 1963, 17, 1957, 1958, 1952, 1953, 1963, + 1956, 1960, 1959, 1962, 1967, 1968, 1968, 1969, 1970, 1973, + 1965, 1961, 1963, 1971, 1966, 1972, 1971, 1975, 1977, 1976, + 1972, 1976, 1975, 1979, 1981, 1969, 1978, 1983, 1970, 1973, + 1979, 1978, 1984, 1981, 1985, 1986, 1977, 1986, 1987, 1990, + 1989, 1984, 1989, 1991, 1991, 1983, 1985, 1992, 1994, 1993, + 1994, 1995, 1997, 1990, 1993, 1996, 1995, 1987, 1998, 1999, + 1996, 2000, 2001, 2002, 2004, 1999, 2000, 2005, 2006, 2006, - 2002, 2004, 2004, 2012, 2001, 2006, 2003, 2005, 2005, 2010, - 2000, 2007, 2001, 2014, 2006, 2008, 2007, 2011, 2010, 2011, - 2013, 2010, 2014, 2015, 2012, 2013, 2013, 2017, 2018, 2019, - 2021, 2022, 2023, 2018, 2019, 2015, 2024, 2024, 2025, 2017, - 2026, 2023, 2029, 2021, 2027, 2028, 2033, 2034, 2035, 2031, - 2032, 2022, 2034, 2035, 2036, 2042, 2025, 2029, 2026, 2028, - 2027, 2031, 2032, 2036, 2039, 2041, 2033, 2043, 2044, 2045, - 2039, 2041, 2046, 2047, 2047, 2048, 2049, 2049, 2042, 2050, - 2053, 2046, 2043, 2039, 2048, 2051, 2044, 2052, 2054, 2051, - 2055, 2056, 2052, 2053, 2045, 2055, 2055, 2056, 2050, 2057, + 1997, 2002, 2008, 1992, 2009, 2001, 2007, 2007, 1998, 2010, + 2012, 2005, 2012, 2004, 2011, 2010, 2013, 2008, 2016, 2011, + 2014, 2015, 2015, 2021, 2009, 2017, 2017, 2025, 2014, 2019, + 2016, 2018, 2018, 2023, 2013, 2020, 2014, 2024, 2019, 2024, + 2020, 2021, 2023, 2027, 2026, 2023, 2028, 2030, 2025, 2026, + 2026, 2031, 2027, 2034, 2035, 2032, 2031, 2038, 2028, 2030, + 2032, 2036, 2037, 2037, 2039, 2040, 2034, 2044, 2045, 2041, + 2036, 2042, 2046, 2047, 2035, 2038, 2049, 2055, 2047, 2044, + 2045, 2040, 2039, 2041, 2048, 2049, 2042, 2052, 2054, 2048, + 2056, 2057, 2046, 2052, 2054, 2058, 2060, 2060, 2059, 2061, - 2058, 2059, 2060, 2058, 2065, 2057, 2063, 2063, 2068, 2059, - 2054, 2064, 2064, 2065, 2066, 2066, 2067, 2067, 2069, 2070, - 2068, 2075, 2060, 2071, 2078, 2070, 2064, 2075, 2071, 2072, - 2072, 2073, 2073, 2074, 2080, 2077, 2069, 2064, 2074, 2077, - 2082, 2079, 2083, 2084, 2078, 2079, 2085, 2083, 2086, 2087, - 2089, 2090, 2088, 2086, 2080, 2091, 2090, 2092, 2092, 2093, - 2094, 2085, 2096, 2093, 2095, 2082, 2084, 2087, 2088, 2095, - 2089, 2097, 2098, 2099, 2100, 2094, 2102, 2091, 2101, 2100, - 2103, 2103, 2105, 2106, 2098, 2107, 2108, 2109, 2096, 2097, - 2105, 2101, 2099, 2110, 2102, 2111, 2112, 2113, 2115, 2118, + 2055, 2062, 2062, 2063, 2066, 2056, 2052, 2059, 2061, 2057, + 2064, 2065, 2067, 2068, 2064, 2069, 2065, 2066, 2068, 2068, + 2058, 2069, 2063, 2070, 2071, 2072, 2073, 2071, 2078, 2070, + 2076, 2076, 2081, 2072, 2067, 2077, 2077, 2078, 2079, 2079, + 2080, 2080, 2082, 2083, 2081, 2088, 2073, 2084, 2091, 2083, + 2077, 2088, 2084, 2085, 2085, 2086, 2086, 2087, 2093, 2090, + 2082, 2077, 2087, 2090, 2095, 2092, 2096, 2097, 2091, 2092, + 2098, 2096, 2099, 2100, 2102, 2103, 2101, 2099, 2093, 2104, + 2103, 2105, 2105, 2106, 2107, 2098, 2109, 2106, 2108, 2095, + 2097, 2100, 2101, 2108, 2102, 2110, 2111, 2112, 2113, 2107, - 2122, 2117, 2106, 2122, 2107, 2118, 2120, 2120, 2112, 2108, - 2123, 2109, 2110, 2115, 2117, 2119, 2111, 2119, 2113, 2121, - 2124, 2129, 2125, 2123, 2121, 2126, 2126, 2127, 2127, 2128, - 2128, 2130, 2131, 2131, 2124, 2125, 2129, 2132, 2133, 2133, - 2134, 2134, 2135, 2137, 2130, 2138, 2132, 2135, 2137, 2132, - 2139, 2140, 2141, 2141, 2142, 2142, 2143, 2144, 2144, 2145, - 2146, 2146, 2148, 2140, 2147, 2138, 2151, 2148, 2149, 2149, - 2139, 2150, 2150, 2152, 2153, 2143, 2154, 2145, 2156, 2147, - 2151, 2158, 2152, 2156, 2157, 2157, 2159, 2159, 2153, 2160, - 2161, 2162, 2163, 2163, 2162, 2154, 2161, 2164, 2164, 2165, + 2115, 2104, 2114, 2113, 2116, 2116, 2118, 2119, 2111, 2120, + 2121, 2122, 2109, 2110, 2118, 2114, 2112, 2123, 2115, 2124, + 2125, 2126, 2128, 2132, 0, 2130, 2119, 2131, 2120, 2132, + 2134, 2134, 2125, 2121, 2135, 2122, 2123, 2128, 2130, 2135, + 2124, 2131, 2126, 2133, 2136, 2133, 2137, 2136, 2138, 2144, + 2139, 2140, 2140, 2141, 2141, 2142, 2145, 2142, 2147, 2137, + 2143, 2143, 2138, 2139, 2144, 2146, 2146, 2147, 2153, 2145, + 2147, 2148, 2148, 2149, 2149, 2150, 2152, 2154, 2155, 2158, + 2150, 2152, 2156, 2156, 2157, 2157, 2159, 2159, 2153, 2160, + 2155, 2161, 2161, 2162, 2163, 2164, 2164, 2154, 2158, 2163, - 2158, 2166, 2167, 2168, 2168, 2170, 2171, 2160, 2163, 2172, - 2173, 2174, 2174, 2175, 2173, 2176, 2166, 2183, 2165, 2177, - 2176, 2167, 2178, 2181, 2172, 2170, 2180, 2180, 2182, 2171, - 2184, 2183, 2175, 2185, 2177, 2182, 2186, 2178, 2187, 2187, - 2188, 2192, 2189, 2181, 2189, 2195, 2199, 2190, 2184, 2188, - 2190, 2185, 2193, 2192, 2194, 2196, 2197, 2193, 2198, 2194, - 2203, 2201, 2186, 2198, 2202, 2190, 2201, 2190, 2196, 2202, - 2195, 2205, 2199, 2204, 2206, 2203, 2207, 2197, 2208, 2204, - 2206, 2207, 2209, 2208, 2210, 2211, 2212, 2213, 2211, 2214, - 2215, 2216, 2205, 2221, 2217, 2212, 2213, 2210, 2214, 2215, + 2165, 2165, 2166, 2167, 2168, 2169, 2171, 2160, 2162, 2172, + 2172, 2171, 2167, 2173, 2174, 2174, 2166, 2175, 2168, 2176, + 2177, 2178, 2178, 2177, 2169, 2176, 2179, 2179, 2180, 2181, + 2182, 2185, 2173, 2183, 2183, 2175, 2186, 2178, 2187, 2188, + 2189, 2189, 2190, 2188, 2181, 2191, 2196, 2180, 2192, 2182, + 2191, 2185, 2193, 2187, 2195, 2195, 2198, 2197, 2199, 2186, + 2200, 2190, 2201, 2192, 2197, 2203, 2196, 2193, 2202, 2202, + 2198, 2204, 2205, 2204, 2203, 2205, 2199, 2207, 2200, 2208, + 2209, 2210, 2211, 2212, 2208, 2209, 2213, 2214, 2201, 2207, + 2205, 2213, 2205, 2216, 2217, 2211, 2218, 2219, 2216, 2217, - 2217, 2228, 2218, 2223, 2227, 2216, 2219, 2209, 2218, 2227, - 2219, 2225, 2223, 2221, 2224, 2224, 2230, 2225, 2226, 2226, - 2231, 2228, 2233, 2228, 2232, 2232, 2234, 2226, 2236, 2237, - 2239, 2238, 2230, 2243, 2242, 2234, 2231, 2233, 2241, 2242, - 2236, 2241, 2239, 2244, 0, 2237, 2238, 2245, 2245, 2246, - 2246, 2248, 2248, 2243, 2249, 2244, 2250, 2249, 2251, 2252, - 2253, 2250, 2254, 2254, 2251, 2252, 2255, 2256, 2256, 2253, - 2257, 2258, 2259, 2260, 2260, 2261, 2262, 2271, 2263, 0, - 2255, 2261, 2257, 2263, 2265, 2258, 2266, 2269, 2265, 2266, - 2262, 2259, 2267, 2267, 2268, 2270, 2269, 2271, 2272, 2268, + 2220, 2221, 2224, 2219, 2212, 2222, 2210, 2221, 2227, 2223, + 2222, 2218, 2225, 2214, 2223, 2226, 2231, 2227, 2226, 2228, + 2229, 2220, 2230, 2236, 0, 2225, 2232, 2224, 2228, 2229, + 2231, 2230, 2232, 2233, 2234, 2238, 2239, 2239, 2234, 2233, + 2240, 2241, 2241, 2236, 2238, 2243, 2240, 2242, 2245, 2249, + 2241, 2248, 2242, 2246, 2247, 2247, 2251, 2252, 2249, 2253, + 2254, 2258, 2260, 2260, 2245, 2243, 2248, 2243, 2251, 2246, + 2259, 2257, 2254, 2252, 2253, 2256, 2257, 0, 2256, 2261, + 2261, 2258, 2259, 2263, 2263, 2264, 2265, 2266, 2264, 2267, + 2268, 2265, 2270, 2266, 2273, 2267, 2269, 2269, 2272, 2268, - 2273, 2273, 2272, 2274, 2270, 2276, 2277, 2278, 2279, 2280, - 2276, 2281, 2282, 2280, 2283, 2284, 2274, 2282, 2285, 2286, - 2283, 2284, 2279, 2287, 2288, 2290, 2277, 2278, 2287, 2292, - 2291, 2281, 2294, 2293, 2292, 2298, 2285, 2290, 2286, 2293, - 2294, 2295, 2301, 2295, 2307, 2288, 2291, 2299, 2299, 2298, - 2300, 2302, 2302, 2300, 2305, 2306, 2307, 2309, 2305, 2308, - 2308, 2306, 2312, 2312, 2314, 2316, 2309, 2317, 2301, 2320, - 2321, 2322, 2323, 2330, 2320, 2331, 2322, 2323, 0, 2316, - 2324, 2324, 2314, 2317, 2326, 2326, 2328, 2329, 2329, 2330, - 2332, 2334, 2328, 2335, 2338, 2332, 2321, 2331, 2336, 2336, + 2271, 2271, 2274, 2275, 2275, 2276, 2270, 2278, 2273, 2277, + 2272, 2276, 2278, 2280, 2286, 2281, 2284, 2280, 2281, 2282, + 2282, 2274, 2283, 2277, 2285, 2284, 2287, 2283, 2288, 2288, + 2287, 2289, 2291, 2285, 2286, 2292, 2293, 2291, 2294, 2295, + 2296, 2297, 2298, 2295, 2289, 2299, 2297, 2300, 2298, 2301, + 2302, 2299, 2294, 2303, 2304, 2292, 2293, 2307, 2303, 2306, + 2296, 2308, 2316, 2316, 2309, 2300, 2308, 2315, 2301, 2302, + 2309, 2306, 2310, 2307, 2311, 2304, 2311, 2313, 2318, 2317, + 2310, 2315, 2317, 2319, 2319, 2322, 2313, 2323, 2324, 2322, + 2325, 2325, 2326, 2323, 2329, 2329, 2331, 2333, 2337, 2334, - 2339, 2340, 2341, 2338, 2345, 2335, 2339, 2343, 2343, 2344, - 2334, 2346, 2344, 2348, 2348, 2349, 2349, 2341, 2351, 2340, - 2350, 2352, 2353, 2345, 2354, 2350, 2354, 2353, 2355, 2346, - 2352, 2356, 2357, 2358, 2359, 2360, 2351, 2482, 2358, 2366, - 2360, 2482, 2355, 2365, 2357, 2356, 2361, 2361, 2362, 2362, - 2363, 2363, 2364, 2364, 2359, 2365, 2367, 2366, 2368, 2368, - 2370, 2367, 2369, 2369, 2371, 2372, 2373, 2374, 2374, 2375, - 2376, 2376, 2370, 2377, 2377, 2378, 2371, 2379, 2381, 2382, - 2380, 2384, 2373, 2385, 2388, 2372, 2378, 2380, 2375, 2379, - 2381, 2383, 2386, 2386, 2389, 2387, 2383, 2391, 2390, 2382, + 2324, 2326, 2338, 2337, 2318, 2339, 2347, 2340, 2341, 2341, + 2339, 2333, 2340, 2345, 2331, 2334, 2343, 2343, 2348, 2345, + 2346, 2346, 2347, 2351, 2349, 2352, 2353, 2353, 2338, 2349, + 2355, 2357, 2356, 2358, 2360, 2360, 2362, 2352, 2356, 2355, + 2348, 2361, 2351, 2363, 2361, 2365, 2365, 2367, 2358, 2357, + 2366, 2366, 2367, 2368, 2369, 2362, 2371, 2370, 2371, 2372, + 2373, 2363, 2370, 2369, 2374, 2375, 2376, 2377, 2378, 2378, + 2375, 2368, 2377, 2372, 2373, 2382, 2374, 2379, 2379, 2380, + 2380, 2381, 2381, 2383, 2384, 2387, 2376, 2382, 2388, 2384, + 2385, 2385, 2386, 2386, 2389, 2390, 2392, 2387, 2391, 2391, - 2393, 2384, 2392, 2385, 2387, 2394, 2394, 2396, 2395, 2397, - 2388, 2390, 2393, 2399, 2389, 2400, 2392, 2395, 2401, 2403, - 2402, 2391, 2396, 2402, 2397, 2404, 0, 2405, 2406, 2406, - 2404, 2399, 2405, 2403, 2407, 2407, 2413, 2400, 2408, 2408, - 2414, 2401, 2410, 2410, 2412, 2412, 2415, 2416, 2418, 2419, - 2420, 2414, 2422, 2421, 2413, 2423, 2424, 2425, 2424, 0, - 2426, 2422, 2416, 2427, 2432, 2415, 2438, 2419, 2418, 2428, - 2428, 2431, 2420, 2421, 2433, 2423, 2439, 2425, 2426, 2430, - 2430, 2427, 2436, 2433, 2438, 2431, 2432, 2434, 2434, 2437, - 2437, 2436, 2440, 2441, 2439, 2442, 2443, 2448, 2445, 2440, + 2388, 2383, 2393, 2393, 2394, 2394, 2395, 2396, 2398, 2397, + 2399, 2390, 2401, 2400, 2389, 2392, 2397, 2395, 2400, 2396, + 2398, 2402, 2403, 2403, 2404, 2405, 2406, 2407, 2408, 2409, + 2399, 2418, 2401, 2404, 2413, 2410, 2411, 2411, 2414, 2412, + 2407, 2402, 2416, 2409, 2417, 2420, 2406, 2410, 2412, 2413, + 0, 2405, 2408, 2414, 2418, 2419, 2421, 2422, 2419, 2420, + 2416, 2421, 2422, 2423, 2423, 2430, 2417, 2424, 2424, 2425, + 2425, 2427, 2427, 2429, 2429, 2431, 2432, 2433, 2435, 2436, + 2437, 2438, 2439, 2430, 2440, 2441, 2431, 2441, 2442, 2443, + 2449, 2439, 2433, 2444, 2450, 2432, 2448, 2436, 2435, 2445, - 2444, 2446, 2446, 2447, 2447, 2449, 2450, 2450, 2441, 2451, - 2451, 2449, 2452, 2442, 2443, 2448, 2444, 2445, 2452, 2453, - 2454, 2455, 2456, 2457, 2458, 2459, 2460, 2456, 2460, 2465, - 2459, 2461, 2461, 2467, 2462, 2454, 2462, 2453, 2463, 2463, - 2455, 2468, 2467, 2457, 2458, 2469, 2470, 2471, 2465, 2472, - 2479, 2473, 2471, 2476, 2480, 2477, 2484, 2469, 2477, 2490, - 2468, 2478, 2478, 2481, 2481, 2479, 2470, 2486, 2486, 2472, - 2473, 2484, 2480, 2476, 2485, 2487, 2489, 2491, 2485, 2490, - 2492, 2492, 2494, 2495, 2498, 2496, 2497, 2497, 2487, 2496, - 2501, 2489, 2495, 2500, 2494, 2499, 2499, 2491, 2500, 2501, + 2445, 2438, 2437, 2450, 2440, 2447, 2447, 2443, 2442, 2453, + 2448, 2444, 2449, 2451, 2451, 2454, 2454, 2455, 2453, 2456, + 2457, 2458, 2459, 2460, 2462, 2465, 2461, 2457, 2463, 2463, + 2464, 2464, 2466, 2467, 2471, 2455, 2458, 2456, 2470, 2467, + 2459, 2460, 2461, 2462, 2470, 2465, 2468, 2468, 2469, 2469, + 2466, 2472, 2471, 2473, 2474, 2475, 2476, 2477, 2478, 2479, + 2475, 2479, 2484, 2478, 2480, 2480, 2472, 2481, 2474, 2481, + 2482, 2482, 2473, 2486, 2487, 2488, 2476, 2477, 2489, 2490, + 2491, 2484, 2486, 2492, 2490, 2495, 2496, 2488, 2498, 2496, + 2497, 2497, 2499, 2487, 2500, 2500, 2503, 2501, 2489, 2506, - 2502, 2503, 2510, 2498, 2504, 2504, 2509, 2509, 2511, 2511, - 2512, 2514, 2513, 2503, 2516, 2516, 2502, 2515, 2517, 2527, - 2514, 2519, 2519, 2512, 2510, 2513, 2515, 2522, 2524, 2523, - 2525, 2526, 2522, 2517, 2523, 2525, 2528, 2531, 2527, 2526, - 2529, 2532, 2524, 2534, 2533, 2528, 2532, 0, 2529, 2533, - 2535, 2535, 2531, 2536, 2536, 2537, 2537, 2538, 2534, 2540, - 2539, 2541, 2542, 2545, 2538, 2539, 2543, 2546, 2542, 2544, - 2544, 2543, 2546, 2547, 2547, 2548, 2548, 2540, 2545, 2541, - 2551, 2552, 2552, 2553, 2554, 2557, 2553, 2555, 2558, 2554, - 2554, 2556, 2555, 2551, 2558, 2560, 2556, 2559, 2561, 2557, + 2491, 2501, 2492, 2498, 2504, 2495, 2505, 2505, 2504, 2508, + 2499, 2503, 2506, 2509, 2510, 2511, 2511, 2513, 2514, 2515, + 2516, 2516, 2517, 2515, 2508, 2518, 2518, 2514, 2520, 2513, + 2519, 2521, 2522, 2509, 2510, 2519, 2529, 2520, 2523, 2523, + 2531, 2517, 2528, 2528, 2522, 2530, 2530, 2521, 2532, 2536, + 2533, 2534, 2543, 2531, 2535, 2535, 2538, 2538, 2529, 2533, + 2534, 2532, 2541, 2542, 2536, 2544, 2543, 2541, 2542, 2545, + 2544, 2546, 2547, 2550, 2548, 2551, 2553, 2545, 2552, 2559, + 2551, 2547, 2548, 2552, 2554, 2554, 2555, 2555, 2550, 2557, + 2546, 2553, 2556, 2556, 2558, 2560, 2557, 2559, 2561, 2558, - 2560, 2559, 2562, 2563, 2564, 2567, 2565, 2561, 2566, 2568, - 2567, 2563, 2565, 2570, 2566, 2574, 2572, 2562, 2571, 2572, - 2570, 2568, 2578, 2571, 2576, 2564, 2577, 2574, 2579, 2576, - 2580, 2577, 2586, 2581, 2582, 2582, 2583, 2587, 2586, 2580, - 2578, 2579, 2581, 2587, 2590, 2583, 2591, 2595, 2592, 2593, - 2593, 2594, 2598, 2596, 2597, 2597, 2595, 2600, 2602, 2605, - 2603, 2604, 2604, 2590, 2603, 0, 2591, 2592, 2596, 2606, - 2594, 2598, 2600, 2607, 2608, 2606, 2609, 2609, 2602, 2607, - 2608, 2610, 2611, 2613, 2605, 2614, 2616, 2611, 2617, 2610, - 2616, 2618, 2613, 2620, 2620, 2621, 2622, 2622, 2614, 2623, + 2562, 2563, 2563, 2564, 2561, 2562, 2565, 2566, 2566, 2567, + 2567, 2565, 2570, 2560, 2571, 2571, 2572, 2573, 2564, 2572, + 2576, 2574, 2573, 2573, 2575, 2570, 2574, 2577, 2578, 2575, + 2579, 2580, 2578, 2577, 2576, 2579, 2581, 2582, 2583, 2586, + 2580, 2584, 2585, 2587, 2586, 2582, 2589, 2584, 2585, 2590, + 2593, 2581, 2597, 2589, 2590, 2587, 2595, 2591, 2596, 2583, + 2591, 2595, 2593, 2596, 2598, 2599, 2600, 2601, 2601, 2602, + 2597, 2605, 2610, 2606, 2599, 2600, 2607, 2598, 2602, 2606, + 2611, 2614, 2607, 2612, 2613, 2613, 2615, 2616, 2614, 2605, + 2619, 2610, 2617, 2618, 2618, 2621, 2616, 2623, 2626, 2624, - 2623, 2626, 2617, 2625, 2625, 2626, 2618, 2627, 2629, 2629, - 2631, 2632, 2627, 2621, 2633, 2634, 2632, 2636, 2637, 2637, - 2634, 2634, 2639, 2639, 2640, 2640, 2633, 2642, 2641, 2644, - 2631, 2641, 2646, 2647, 2647, 2648, 2648, 2636, 2649, 2649, - 2642, 2650, 2651, 2651, 2652, 2653, 2654, 2644, 2655, 2656, - 2656, 2657, 2646, 2661, 2655, 2657, 2650, 2652, 2661, 2661, - 2654, 2662, 2663, 2653, 2665, 2664, 2666, 2667, 2677, 2668, - 2665, 2672, 2666, 2668, 2669, 2669, 2672, 2675, 2674, 2680, - 2675, 2684, 2663, 2682, 2662, 2664, 2674, 2678, 2679, 2679, - 2678, 2683, 2667, 2677, 2681, 2684, 2680, 2680, 2686, 2681, + 2611, 2632, 2612, 2624, 0, 2615, 2632, 2617, 2627, 2619, + 2621, 2625, 2625, 2628, 2627, 2629, 2638, 2623, 2631, 2628, + 2634, 2629, 2635, 2626, 2630, 2630, 2631, 2637, 2639, 2634, + 2638, 2637, 2641, 2641, 2642, 2635, 2643, 2643, 2644, 2644, + 2646, 2646, 2647, 2639, 2648, 2652, 2647, 2650, 2650, 2648, + 2653, 2654, 2642, 2655, 2657, 2653, 2658, 2658, 2655, 2655, + 2660, 2660, 2663, 2654, 2665, 2652, 2661, 2661, 2662, 2667, + 2671, 2662, 2668, 2668, 2657, 2663, 2669, 2669, 2670, 2670, + 2672, 2672, 2665, 2673, 2674, 2671, 2675, 2676, 2678, 2667, + 2677, 2677, 2678, 2676, 2683, 2684, 2673, 2688, 2682, 2685, - 2688, 2682, 2685, 2685, 2687, 2689, 2693, 2687, 2690, 2694, - 2694, 2683, 2686, 2691, 2688, 2687, 2690, 2692, 2691, 2691, - 2695, 2695, 2692, 2692, 2689, 2693, 2696, 2696, 2697, 2697, - 2698, 2698, 2699, 2700, 2701, 2702, 2703, 2704, 2700, 2706, - 2705, 0, 2704, 2707, 2709, 2709, 2711, 2710, 2699, 2705, - 2710, 2713, 2713, 2714, 2701, 2703, 2715, 2715, 2723, 2706, - 2714, 2702, 2716, 2707, 2711, 2718, 2718, 2716, 2719, 2720, - 2721, 2724, 2724, 2726, 2727, 2729, 2723, 2719, 2720, 2721, - 2725, 2728, 2726, 2730, 2725, 2740, 2728, 2728, 2729, 2727, - 2731, 2735, 2730, 2739, 2731, 2741, 2735, 2736, 2736, 2738, + 2675, 2686, 2674, 2682, 2682, 2687, 2689, 2686, 2690, 2690, + 2689, 2687, 2695, 2693, 2698, 2684, 2701, 2683, 2693, 2685, + 2695, 2696, 2688, 2699, 2696, 2702, 2699, 2700, 2700, 2703, + 2702, 2704, 2705, 2701, 2701, 2706, 2706, 2708, 2707, 2698, + 2708, 2709, 2710, 2714, 2712, 2711, 2705, 2703, 2708, 2712, + 2712, 2704, 2707, 2711, 2713, 2709, 2715, 2715, 2720, 2713, + 2713, 2710, 2714, 2716, 2716, 2717, 2717, 2718, 2718, 2719, + 2719, 2721, 2722, 2723, 2720, 2724, 2721, 2725, 2726, 2727, + 2724, 2728, 2729, 2726, 2731, 2731, 2732, 2732, 2727, 2734, + 2733, 2737, 2722, 2733, 2736, 2736, 2725, 2742, 2737, 2723, - 2738, 2747, 2743, 2744, 2749, 2748, 2750, 2739, 2752, 2754, - 2740, 2743, 2750, 2741, 2748, 2744, 2756, 2757, 2758, 2758, - 2752, 2756, 2757, 2759, 2749, 2768, 2747, 2769, 2761, 3086, - 2754, 3086, 2759, 2761, 2762, 2762, 2764, 2764, 2762, 2765, - 2765, 2766, 2766, 2767, 2770, 2768, 2769, 2772, 2776, 2770, - 2773, 2774, 2767, 2772, 2778, 2773, 2774, 2775, 2775, 2777, - 2779, 2780, 2781, 2782, 2789, 2779, 2776, 2793, 2781, 2783, - 2783, 2777, 2785, 2786, 2790, 2778, 2785, 2787, 2786, 2780, - 2788, 2788, 2787, 2789, 2791, 2795, 2795, 2793, 2782, 2790, - 2797, 2798, 2799, 2800, 2801, 2802, 2799, 2803, 2805, 2791, + 2739, 2728, 2729, 2738, 2738, 2739, 2742, 2734, 2741, 2741, + 2743, 2744, 2746, 2747, 2747, 2749, 2750, 2748, 2763, 2743, + 2744, 2748, 2751, 2752, 2749, 2753, 2764, 2751, 2751, 2754, + 2746, 2750, 2758, 2754, 2753, 2762, 2752, 2758, 2759, 2759, + 2761, 2761, 2766, 2763, 2764, 2767, 2770, 2771, 2772, 2762, + 2775, 2766, 2773, 2777, 2779, 2780, 2771, 2767, 2773, 2779, + 2780, 2782, 2775, 2781, 2781, 2785, 2785, 2784, 2772, 2785, + 2782, 2770, 2784, 2790, 2777, 2787, 2787, 2788, 2788, 2789, + 2789, 2791, 2790, 2792, 2793, 2795, 2799, 2796, 2797, 2793, + 2801, 2795, 2796, 2797, 2798, 2798, 2800, 2803, 2802, 2804, - 2806, 2804, 2800, 2797, 2798, 2803, 2804, 2805, 2807, 2809, - 2801, 2808, 2808, 2818, 2802, 2811, 2811, 2814, 2806, 2812, - 2812, 2816, 2816, 2819, 2820, 2821, 2823, 2823, 2809, 2818, - 2821, 2824, 2825, 2826, 2807, 2828, 2828, 2834, 2814, 2819, - 2820, 2830, 2829, 2831, 2831, 2836, 2837, 2835, 2838, 2838, - 2836, 2824, 2826, 2835, 2840, 2825, 2829, 2834, 2839, 2839, - 2830, 2841, 2841, 2843, 2842, 2844, 2847, 2845, 2837, 2846, - 2848, 2856, 2843, 2845, 2840, 2842, 2849, 2849, 2847, 2850, - 2855, 2841, 2850, 2851, 2851, 2844, 2859, 2857, 2846, 2859, - 2848, 2856, 2855, 2857, 2858, 2858, 2860, 2861, 2863, 2864, + 2805, 2791, 2792, 2802, 2799, 2804, 2806, 2806, 2800, 2808, + 2812, 2801, 2809, 2808, 2810, 2803, 2813, 2809, 2814, 2810, + 2811, 2811, 2816, 2818, 2818, 2805, 2820, 2821, 2822, 2812, + 2824, 2813, 2822, 2814, 2823, 2825, 2826, 2828, 2828, 2820, + 2821, 2830, 2816, 2823, 2826, 2827, 2824, 2829, 2831, 2833, + 2827, 2832, 2832, 2843, 2825, 2839, 2829, 2836, 2836, 2830, + 2837, 2837, 2841, 2841, 2844, 2845, 2846, 2849, 2833, 2843, + 2850, 2846, 2848, 2848, 2831, 2851, 2839, 2853, 2853, 2855, + 2844, 2845, 2854, 2856, 2856, 2859, 2860, 2849, 2862, 2865, + 2861, 2869, 2860, 2850, 2851, 2861, 2854, 2867, 2855, 2863, - 2864, 2865, 2860, 2863, 2866, 2867, 2865, 2868, 2869, 2869, - 2871, 2867, 2872, 2873, 2874, 2861, 2875, 2875, 2876, 2877, - 2878, 2882, 2871, 2866, 2868, 2868, 2882, 2874, 2883, 2878, - 2872, 2880, 2880, 2881, 2881, 2877, 2884, 2876, 2873, 2885, - 2885, 2884, 2883, 2886, 2886, 2887, 2887, 2888, 2889, 2895, - 2890, 2892, 2892, 2897, 2889, 2890, 2898, 2899, 2900, 2900, - 2902, 2902, 2903, 2904, 2910, 2905, 2906, 2906, 2895, 2907, - 2907, 2909, 2911, 2888, 2905, 2897, 2903, 2909, 2898, 2899, - 2912, 2915, 2915, 2904, 2910, 2912, 2917, 2917, 2918, 2919, - 2920, 2911, 2921, 2918, 2922, 2924, 2920, 2923, 2923, 2926, + 2863, 2864, 2864, 2866, 2866, 2859, 2868, 2870, 2867, 2865, + 2862, 2869, 2871, 2870, 2872, 2868, 2873, 2874, 2874, 2875, + 2876, 2876, 2875, 2866, 2881, 2880, 2872, 2882, 2883, 2883, + 2886, 2871, 2884, 2882, 2885, 2884, 2873, 2880, 2888, 2891, + 2885, 2889, 2889, 2888, 2881, 2890, 2892, 2893, 2886, 2896, + 2890, 2897, 2892, 2894, 2894, 2898, 2901, 2899, 2891, 2900, + 2900, 2896, 2902, 2903, 2893, 2893, 2905, 2905, 2908, 2897, + 2899, 2907, 2903, 2906, 2906, 2901, 2907, 2914, 2902, 2909, + 2898, 2913, 2908, 2921, 2909, 2910, 2910, 2911, 2911, 2912, + 2912, 2915, 2923, 2916, 2913, 2918, 2918, 2915, 2916, 2924, - 2924, 2927, 2922, 2919, 2921, 2928, 2929, 2930, 2932, 2933, - 2928, 2934, 2935, 2930, 2938, 2937, 2932, 2939, 2929, 2926, - 2940, 2927, 2941, 2944, 2943, 2948, 0, 2941, 2933, 2943, - 2938, 2934, 2935, 2937, 2939, 2939, 2945, 2949, 2950, 2946, - 2949, 2940, 2945, 2944, 2946, 2948, 2953, 2953, 2954, 2954, - 2955, 2950, 2959, 2960, 2955, 2961, 2961, 2959, 2963, 2963, - 2964, 2964, 2967, 2964, 2965, 2965, 2967, 2965, 2966, 2966, - 2970, 2966, 2960, 2969, 2969, 2971, 2974, 2975, 2976, 2977, - 2977, 2980, 2982, 2976, 2981, 2983, 2982, 2984, 2970, 2971, - 2986, 2981, 2987, 0, 2983, 2996, 2974, 2975, 2988, 2988, + 2925, 2929, 2921, 2914, 2926, 2926, 2928, 2928, 2930, 2931, + 2932, 2932, 2933, 2933, 2923, 2929, 2936, 2935, 2931, 2937, + 2938, 2924, 2925, 2935, 2952, 2938, 2941, 2941, 2930, 2943, + 2943, 2945, 2944, 2946, 2947, 2948, 2936, 2944, 2937, 2946, + 2949, 2949, 2950, 2948, 2952, 2945, 2947, 2950, 2953, 2954, + 2955, 2956, 2958, 2959, 2954, 2960, 2961, 2956, 2964, 2963, + 2958, 2965, 2955, 2966, 2967, 2969, 2970, 2971, 2953, 2967, + 2969, 2974, 2959, 2971, 2964, 2960, 2961, 2963, 2965, 2965, + 2972, 2976, 2979, 2979, 2966, 2972, 2970, 2975, 2980, 2980, + 2975, 2974, 2981, 2987, 2976, 2986, 2981, 2985, 2985, 0, - 2991, 2987, 2984, 2989, 2989, 2993, 2980, 2992, 2986, 2990, - 2990, 2997, 2992, 2994, 2993, 2991, 2995, 2993, 2994, 2994, - 2996, 2998, 2995, 2999, 3000, 3001, 2997, 3003, 2999, 3000, - 3002, 3002, 3004, 3003, 3005, 3005, 3006, 3006, 3004, 3007, - 3008, 3013, 2998, 0, 3001, 3008, 3011, 3011, 3012, 3012, - 3013, 3016, 3016, 3028, 3007, 3017, 3017, 3018, 3018, 3019, - 3019, 3020, 3020, 3021, 3021, 3022, 3022, 3024, 3025, 3025, - 3026, 3027, 3030, 3028, 3031, 3031, 3024, 3032, 3034, 3026, - 3033, 3035, 3035, 3027, 3036, 3037, 3037, 3040, 3042, 3044, - 3034, 3030, 3032, 3033, 3041, 3043, 3043, 3041, 3046, 3036, + 2986, 2988, 2988, 2990, 2990, 2991, 2991, 2997, 2991, 2998, + 2992, 2992, 2987, 2992, 2993, 2993, 2994, 2993, 2996, 2996, + 2994, 3001, 3002, 2998, 3003, 2997, 3004, 3004, 3007, 3003, + 3008, 3009, 3011, 3013, 3010, 3009, 3014, 3008, 3015, 3015, + 3022, 3001, 3002, 3010, 3018, 3014, 3022, 3011, 3016, 3016, + 3023, 3013, 3019, 3007, 3017, 3017, 3020, 3019, 3021, 3018, + 3025, 3024, 3026, 3021, 3021, 3020, 3027, 3026, 3020, 3028, + 0, 3027, 3029, 3029, 3030, 3023, 3024, 3031, 3032, 3032, + 3030, 3025, 3034, 3031, 3033, 3033, 3035, 3041, 3028, 3038, + 3038, 3035, 3040, 3040, 3044, 3044, 3041, 3034, 3045, 3045, - 3047, 3046, 3048, 3049, 3050, 3040, 3047, 3044, 3049, 3051, - 3052, 3054, 3055, 3059, 3042, 3058, 3048, 3054, 3062, 3058, - 3072, 3055, 3070, 3050, 3077, 3070, 3052, 3051, 3059, 3073, - 3073, 3074, 3074, 3072, 3075, 3075, 3078, 3079, 3080, 3081, - 3083, 3079, 3087, 3084, 3062, 3078, 3085, 3077, 3088, 3088, - 3090, 3085, 3089, 3081, 3084, 3091, 3092, 3087, 3080, 3093, - 3094, 3095, 3096, 3083, 3098, 3089, 3097, 3100, 3106, 3090, - 3095, 3097, 3092, 3091, 3096, 3094, 3099, 3101, 3105, 3107, - 3107, 3099, 3101, 3113, 3093, 3098, 3108, 3100, 3106, 3109, - 3109, 3114, 3105, 3110, 3110, 3108, 3111, 3111, 3112, 3112, + 3046, 3046, 3047, 3047, 3048, 3048, 3049, 3049, 3050, 3050, + 3052, 3053, 3053, 3054, 3055, 3056, 3060, 3058, 3062, 3052, + 3059, 3059, 3054, 3064, 3061, 3068, 3055, 3063, 3063, 3070, + 3062, 3060, 3065, 3065, 3072, 3056, 3058, 3061, 3064, 3069, + 3071, 3071, 3069, 3068, 3074, 3075, 3076, 3074, 3077, 3078, + 3080, 3075, 3072, 3077, 3079, 3070, 3082, 3086, 3083, 3087, + 3076, 3086, 3082, 3090, 3100, 3105, 3080, 3083, 3078, 3111, + 3098, 3109, 3079, 3098, 3087, 3101, 3101, 3100, 3102, 3102, + 3103, 3103, 3106, 3107, 3108, 3109, 3112, 3107, 3105, 3090, + 3113, 3106, 3111, 3115, 3114, 3113, 3114, 3112, 3116, 3116, - 3115, 3116, 3113, 3115, 3117, 3118, 3116, 3119, 3120, 3117, - 3121, 3114, 3123, 3122, 3120, 3124, 3124, 3123, 3125, 3126, - 3126, 3128, 3119, 3129, 3121, 3122, 3127, 3127, 3130, 3130, - 3118, 3132, 3134, 3137, 3137, 3139, 3128, 3140, 3125, 3138, - 3138, 3141, 3129, 3139, 3143, 3142, 3132, 3141, 3144, 3145, - 3134, 3142, 3146, 3147, 3147, 3152, 3140, 3146, 3143, 3149, - 3149, 3144, 3153, 3155, 3158, 3156, 3159, 3160, 3145, 3156, - 3161, 3159, 3162, 3163, 3164, 3165, 3152, 3155, 3169, 3164, - 3165, 3170, 3153, 3161, 3158, 3162, 3160, 3166, 3166, 3171, - 3172, 3172, 3163, 3175, 3175, 3173, 3174, 3179, 3169, 3170, + 3117, 3118, 3120, 3119, 3108, 3121, 3123, 3122, 3115, 3125, + 3126, 3124, 3127, 3117, 3125, 3123, 3128, 3127, 3120, 3129, + 3118, 3119, 3122, 3124, 3129, 3133, 3134, 3135, 3135, 3136, + 3121, 3126, 3137, 3137, 3138, 3138, 3128, 3141, 3136, 3133, + 3139, 3139, 3140, 3140, 3142, 3143, 3134, 3144, 3143, 3145, + 3146, 3147, 3144, 3148, 3145, 3149, 3141, 3151, 3150, 3148, + 3152, 3152, 3151, 3153, 3142, 3156, 3147, 3154, 3154, 3149, + 3150, 3155, 3155, 3157, 3160, 3146, 3158, 3158, 3162, 3167, + 3156, 3165, 3165, 3153, 3166, 3166, 3168, 3167, 3169, 3160, + 3171, 3170, 3157, 3172, 3169, 3173, 3162, 3170, 3174, 3175, - 3173, 3176, 3174, 3187, 3177, 3178, 3176, 3180, 3171, 3177, - 3178, 3182, 3182, 3180, 3183, 3189, 3179, 3184, 3184, 3183, - 3186, 3188, 3187, 3190, 3186, 3191, 3192, 3193, 3188, 3195, - 3195, 3191, 3197, 3197, 3189, 3198, 3199, 3200, 3201, 3202, - 3193, 3199, 3190, 3207, 3198, 3192, 3204, 3198, 3203, 3203, - 3205, 3204, 3202, 3208, 3208, 3209, 3200, 3201, 3210, 3210, - 3211, 3211, 3212, 3205, 3213, 3214, 3217, 3212, 3217, 3207, - 3216, 3213, 3215, 3215, 3209, 3216, 3218, 3218, 3219, 3220, - 3221, 3223, 3222, 3226, 3214, 3219, 3220, 3222, 3225, 3225, - 3228, 3229, 3230, 3231, 3235, 3228, 3229, 3232, 3232, 3221, + 3175, 3177, 3177, 3174, 3171, 3168, 3172, 3180, 3183, 3181, + 3186, 3184, 3187, 3188, 3173, 3184, 3191, 3187, 3189, 3192, + 3190, 3193, 3183, 3197, 3192, 3199, 3193, 3198, 3180, 3181, + 3186, 3189, 3188, 3190, 3202, 3191, 3194, 3194, 3200, 3200, + 3202, 3201, 3207, 3197, 3199, 3198, 3201, 3203, 3203, 3204, + 3205, 3206, 3208, 3215, 3204, 3205, 3206, 3211, 3208, 3210, + 3210, 3207, 3211, 3212, 3212, 3214, 3216, 3217, 3218, 3214, + 3219, 3220, 3215, 3216, 3228, 3221, 3219, 3223, 3223, 3225, + 3225, 3229, 3226, 3230, 3227, 3235, 3217, 3218, 3221, 3227, + 3220, 3226, 3233, 3228, 3226, 3237, 3230, 3231, 3231, 3232, - 3223, 3236, 3226, 3234, 3234, 3237, 3237, 3238, 3238, 3239, - 3249, 3230, 3231, 3235, 3241, 3241, 3239, 3242, 3242, 3243, - 3236, 3250, 3245, 3248, 3251, 3251, 3243, 3245, 3248, 3249, - 3252, 3252, 0, 0, 0, 0, 0, 0, 0, 0, - 3250, 3256, 3256, 3256, 3256, 3256, 3256, 3256, 3257, 3257, - 3257, 3257, 3257, 3257, 3257, 3258, 3258, 3258, 3258, 3258, - 3258, 3258, 3259, 3259, 3259, 3259, 3259, 3259, 3259, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3261, 3261, 3261, 3261, - 3261, 3261, 3261, 3262, 3262, 3262, 3262, 3262, 3262, 3262, - 3264, 3264, 0, 3264, 3264, 3264, 3264, 3265, 3265, 0, + 3229, 3236, 3236, 3242, 3232, 3233, 3238, 3238, 3239, 3239, + 3240, 3235, 3241, 3244, 3237, 3240, 3243, 3243, 3244, 3241, + 3247, 3245, 3242, 3245, 3246, 3246, 3248, 3247, 3249, 3250, + 3251, 3253, 3253, 3248, 3250, 3254, 3256, 3257, 3258, 3259, + 3263, 3256, 3257, 3260, 3260, 3262, 3262, 3249, 3264, 3251, + 3265, 3265, 3266, 3266, 3254, 3267, 3277, 3258, 3259, 3263, + 3269, 3269, 3267, 3270, 3270, 3271, 3273, 3264, 3276, 3278, + 0, 3273, 3271, 3276, 0, 3277, 3279, 3279, 3280, 3280, + 0, 0, 0, 0, 0, 0, 0, 0, 3278, 3284, + 3284, 3284, 3284, 3284, 3284, 3284, 3285, 3285, 3285, 3285, - 0, 0, 3265, 3265, 3266, 3266, 0, 0, 3266, 0, - 3266, 3267, 0, 0, 0, 0, 0, 3267, 3268, 3268, - 0, 0, 0, 3268, 3268, 3269, 0, 0, 0, 0, - 0, 3269, 3270, 3270, 0, 3270, 3270, 3270, 3270, 3271, - 0, 0, 0, 0, 0, 3271, 3272, 3272, 0, 0, - 0, 3272, 3272, 3273, 3273, 0, 3273, 3273, 3273, 3273, - 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, - 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, - 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, - 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, + 3285, 3285, 3285, 3286, 3286, 3286, 3286, 3286, 3286, 3286, + 3287, 3287, 3287, 3287, 3287, 3287, 3287, 3288, 3288, 3288, + 3288, 3288, 3288, 3288, 3289, 3289, 3289, 3289, 3289, 3289, + 3289, 3290, 3290, 3290, 3290, 3290, 3290, 3290, 3292, 3292, + 0, 3292, 3292, 3292, 3292, 3293, 3293, 0, 0, 0, + 3293, 3293, 3294, 3294, 0, 0, 3294, 0, 3294, 3295, + 0, 0, 0, 0, 0, 3295, 3296, 3296, 0, 0, + 0, 3296, 3296, 3297, 0, 0, 0, 0, 0, 3297, + 3298, 3298, 0, 3298, 3298, 3298, 3298, 3299, 0, 0, + 0, 0, 0, 3299, 3300, 3300, 0, 0, 0, 3300, - 3255 + 3300, 3301, 3301, 0, 3301, 3301, 3301, 3301, 3283, 3283, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, + 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3283 } ; static yy_state_type yy_last_accepting_state; @@ -3114,7 +3133,7 @@ static void config_end_include(void) } #endif -#line 3116 "" +#line 3135 "" #define YY_NO_INPUT 1 #line 191 "./util/configlexer.lex" #ifndef YY_NO_UNPUT @@ -3123,9 +3142,9 @@ static void config_end_include(void) #ifndef YY_NO_INPUT #define YY_NO_INPUT 1 #endif -#line 3125 "" +#line 3144 "" -#line 3127 "" +#line 3146 "" #define INITIAL 0 #define quotedstring 1 @@ -3349,7 +3368,7 @@ YY_DECL { #line 211 "./util/configlexer.lex" -#line 3351 "" +#line 3370 "" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -3382,13 +3401,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 3256 ) + if ( yy_current_state >= 3284 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 6361 ); + while ( yy_base[yy_current_state] != 6409 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -3668,17 +3687,17 @@ YY_RULE_SETUP case 51: YY_RULE_SETUP #line 265 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSTEMD) } +{ YDVAR(1, VAR_HTTP_NOTLS_DOWNSTREAM) } YY_BREAK case 52: YY_RULE_SETUP #line 266 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_DAEMONIZE) } +{ YDVAR(1, VAR_USE_SYSTEMD) } YY_BREAK case 53: YY_RULE_SETUP #line 267 "./util/configlexer.lex" -{ YDVAR(1, VAR_INTERFACE) } +{ YDVAR(1, VAR_DO_DAEMONIZE) } YY_BREAK case 54: YY_RULE_SETUP @@ -3688,1086 +3707,1086 @@ YY_RULE_SETUP case 55: YY_RULE_SETUP #line 269 "./util/configlexer.lex" -{ YDVAR(1, VAR_OUTGOING_INTERFACE) } +{ YDVAR(1, VAR_INTERFACE) } YY_BREAK case 56: YY_RULE_SETUP #line 270 "./util/configlexer.lex" -{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) } +{ YDVAR(1, VAR_OUTGOING_INTERFACE) } YY_BREAK case 57: YY_RULE_SETUP #line 271 "./util/configlexer.lex" -{ YDVAR(1, VAR_SO_RCVBUF) } +{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) } YY_BREAK case 58: YY_RULE_SETUP #line 272 "./util/configlexer.lex" -{ YDVAR(1, VAR_SO_SNDBUF) } +{ YDVAR(1, VAR_SO_RCVBUF) } YY_BREAK case 59: YY_RULE_SETUP #line 273 "./util/configlexer.lex" -{ YDVAR(1, VAR_SO_REUSEPORT) } +{ YDVAR(1, VAR_SO_SNDBUF) } YY_BREAK case 60: YY_RULE_SETUP #line 274 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_TRANSPARENT) } +{ YDVAR(1, VAR_SO_REUSEPORT) } YY_BREAK case 61: YY_RULE_SETUP #line 275 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_FREEBIND) } +{ YDVAR(1, VAR_IP_TRANSPARENT) } YY_BREAK case 62: YY_RULE_SETUP #line 276 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_DSCP) } +{ YDVAR(1, VAR_IP_FREEBIND) } YY_BREAK case 63: YY_RULE_SETUP #line 277 "./util/configlexer.lex" -{ YDVAR(1, VAR_CHROOT) } +{ YDVAR(1, VAR_IP_DSCP) } YY_BREAK case 64: YY_RULE_SETUP #line 278 "./util/configlexer.lex" -{ YDVAR(1, VAR_USERNAME) } +{ YDVAR(1, VAR_CHROOT) } YY_BREAK case 65: YY_RULE_SETUP #line 279 "./util/configlexer.lex" -{ YDVAR(1, VAR_DIRECTORY) } +{ YDVAR(1, VAR_USERNAME) } YY_BREAK case 66: YY_RULE_SETUP #line 280 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOGFILE) } +{ YDVAR(1, VAR_DIRECTORY) } YY_BREAK case 67: YY_RULE_SETUP #line 281 "./util/configlexer.lex" -{ YDVAR(1, VAR_PIDFILE) } +{ YDVAR(1, VAR_LOGFILE) } YY_BREAK case 68: YY_RULE_SETUP #line 282 "./util/configlexer.lex" -{ YDVAR(1, VAR_ROOT_HINTS) } +{ YDVAR(1, VAR_PIDFILE) } YY_BREAK case 69: YY_RULE_SETUP #line 283 "./util/configlexer.lex" -{ YDVAR(1, VAR_STREAM_WAIT_SIZE) } +{ YDVAR(1, VAR_ROOT_HINTS) } YY_BREAK case 70: YY_RULE_SETUP #line 284 "./util/configlexer.lex" -{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } +{ YDVAR(1, VAR_STREAM_WAIT_SIZE) } YY_BREAK case 71: YY_RULE_SETUP #line 285 "./util/configlexer.lex" -{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } +{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } YY_BREAK case 72: YY_RULE_SETUP #line 286 "./util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SIZE) } +{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } YY_BREAK case 73: YY_RULE_SETUP #line 287 "./util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SLABS) } +{ YDVAR(1, VAR_MSG_CACHE_SIZE) } YY_BREAK case 74: YY_RULE_SETUP #line 288 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } +{ YDVAR(1, VAR_MSG_CACHE_SLABS) } YY_BREAK case 75: YY_RULE_SETUP #line 289 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } +{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } YY_BREAK case 76: YY_RULE_SETUP #line 290 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MAX_TTL) } +{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } YY_BREAK case 77: YY_RULE_SETUP #line 291 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) } +{ YDVAR(1, VAR_CACHE_MAX_TTL) } YY_BREAK case 78: YY_RULE_SETUP #line 292 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MIN_TTL) } +{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) } YY_BREAK case 79: YY_RULE_SETUP #line 293 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_HOST_TTL) } +{ YDVAR(1, VAR_CACHE_MIN_TTL) } YY_BREAK case 80: YY_RULE_SETUP #line 294 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_LAME_TTL) } +{ YDVAR(1, VAR_INFRA_HOST_TTL) } YY_BREAK case 81: YY_RULE_SETUP #line 295 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } +{ YDVAR(1, VAR_INFRA_LAME_TTL) } YY_BREAK case 82: YY_RULE_SETUP #line 296 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } +{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } YY_BREAK case 83: YY_RULE_SETUP #line 297 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } +{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } YY_BREAK case 84: YY_RULE_SETUP #line 298 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } +{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } YY_BREAK case 85: YY_RULE_SETUP #line 299 "./util/configlexer.lex" -{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } +{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } YY_BREAK case 86: YY_RULE_SETUP #line 300 "./util/configlexer.lex" -{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } +{ YDVAR(1, VAR_INFRA_KEEP_PROBING) } YY_BREAK case 87: YY_RULE_SETUP #line 301 "./util/configlexer.lex" -{ YDVAR(1, VAR_DELAY_CLOSE) } +{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } YY_BREAK case 88: YY_RULE_SETUP #line 302 "./util/configlexer.lex" -{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } +{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } YY_BREAK case 89: YY_RULE_SETUP #line 303 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } +{ YDVAR(1, VAR_DELAY_CLOSE) } YY_BREAK case 90: YY_RULE_SETUP #line 304 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } +{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } YY_BREAK case 91: YY_RULE_SETUP #line 305 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_GLUE) } +{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } YY_BREAK case 92: YY_RULE_SETUP #line 306 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } +{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } YY_BREAK case 93: YY_RULE_SETUP #line 307 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } +{ YDVAR(1, VAR_HARDEN_GLUE) } YY_BREAK case 94: YY_RULE_SETUP #line 308 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } +{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 95: YY_RULE_SETUP #line 309 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } +{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } YY_BREAK case 96: YY_RULE_SETUP #line 310 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } +{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } YY_BREAK case 97: YY_RULE_SETUP #line 311 "./util/configlexer.lex" -{ YDVAR(1, VAR_CAPS_WHITELIST) } +{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } YY_BREAK case 98: YY_RULE_SETUP #line 312 "./util/configlexer.lex" -{ YDVAR(1, VAR_CAPS_WHITELIST) } +{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } YY_BREAK case 99: YY_RULE_SETUP #line 313 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } +{ YDVAR(1, VAR_CAPS_WHITELIST) } YY_BREAK case 100: YY_RULE_SETUP #line 314 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_ADDRESS) } +{ YDVAR(1, VAR_CAPS_WHITELIST) } YY_BREAK case 101: YY_RULE_SETUP #line 315 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_DOMAIN) } +{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } YY_BREAK case 102: YY_RULE_SETUP #line 316 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH_KEY) } +{ YDVAR(1, VAR_PRIVATE_ADDRESS) } YY_BREAK case 103: YY_RULE_SETUP #line 317 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH) } +{ YDVAR(1, VAR_PRIVATE_DOMAIN) } YY_BREAK case 104: YY_RULE_SETUP #line 318 "./util/configlexer.lex" -{ YDVAR(1, VAR_DENY_ANY) } +{ YDVAR(1, VAR_PREFETCH_KEY) } YY_BREAK case 105: YY_RULE_SETUP #line 319 "./util/configlexer.lex" -{ YDVAR(0, VAR_STUB_ZONE) } +{ YDVAR(1, VAR_PREFETCH) } YY_BREAK case 106: YY_RULE_SETUP #line 320 "./util/configlexer.lex" -{ YDVAR(1, VAR_NAME) } +{ YDVAR(1, VAR_DENY_ANY) } YY_BREAK case 107: YY_RULE_SETUP #line 321 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_ADDR) } +{ YDVAR(0, VAR_STUB_ZONE) } YY_BREAK case 108: YY_RULE_SETUP #line 322 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_HOST) } +{ YDVAR(1, VAR_NAME) } YY_BREAK case 109: YY_RULE_SETUP #line 323 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_PRIME) } +{ YDVAR(1, VAR_STUB_ADDR) } YY_BREAK case 110: YY_RULE_SETUP #line 324 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_FIRST) } +{ YDVAR(1, VAR_STUB_HOST) } YY_BREAK case 111: YY_RULE_SETUP #line 325 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_NO_CACHE) } +{ YDVAR(1, VAR_STUB_PRIME) } YY_BREAK case 112: YY_RULE_SETUP #line 326 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } +{ YDVAR(1, VAR_STUB_FIRST) } YY_BREAK case 113: YY_RULE_SETUP #line 327 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } +{ YDVAR(1, VAR_STUB_NO_CACHE) } YY_BREAK case 114: YY_RULE_SETUP #line 328 "./util/configlexer.lex" -{ YDVAR(0, VAR_FORWARD_ZONE) } +{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } YY_BREAK case 115: YY_RULE_SETUP #line 329 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_ADDR) } +{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } YY_BREAK case 116: YY_RULE_SETUP #line 330 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_HOST) } +{ YDVAR(0, VAR_FORWARD_ZONE) } YY_BREAK case 117: YY_RULE_SETUP #line 331 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_FIRST) } +{ YDVAR(1, VAR_FORWARD_ADDR) } YY_BREAK case 118: YY_RULE_SETUP #line 332 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_NO_CACHE) } +{ YDVAR(1, VAR_FORWARD_HOST) } YY_BREAK case 119: YY_RULE_SETUP #line 333 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } +{ YDVAR(1, VAR_FORWARD_FIRST) } YY_BREAK case 120: YY_RULE_SETUP #line 334 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } +{ YDVAR(1, VAR_FORWARD_NO_CACHE) } YY_BREAK case 121: YY_RULE_SETUP #line 335 "./util/configlexer.lex" -{ YDVAR(0, VAR_AUTH_ZONE) } +{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } YY_BREAK case 122: YY_RULE_SETUP #line 336 "./util/configlexer.lex" -{ YDVAR(0, VAR_RPZ) } +{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } YY_BREAK case 123: YY_RULE_SETUP #line 337 "./util/configlexer.lex" -{ YDVAR(1, VAR_TAGS) } +{ YDVAR(0, VAR_AUTH_ZONE) } YY_BREAK case 124: YY_RULE_SETUP #line 338 "./util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) } +{ YDVAR(0, VAR_RPZ) } YY_BREAK case 125: YY_RULE_SETUP #line 339 "./util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) } +{ YDVAR(1, VAR_TAGS) } YY_BREAK case 126: YY_RULE_SETUP #line 340 "./util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_LOG) } +{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) } YY_BREAK case 127: YY_RULE_SETUP #line 341 "./util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_LOG_NAME) } +{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) } YY_BREAK case 128: YY_RULE_SETUP #line 342 "./util/configlexer.lex" -{ YDVAR(1, VAR_ZONEFILE) } +{ YDVAR(1, VAR_RPZ_LOG) } YY_BREAK case 129: YY_RULE_SETUP #line 343 "./util/configlexer.lex" -{ YDVAR(1, VAR_MASTER) } +{ YDVAR(1, VAR_RPZ_LOG_NAME) } YY_BREAK case 130: YY_RULE_SETUP #line 344 "./util/configlexer.lex" -{ YDVAR(1, VAR_MASTER) } +{ YDVAR(1, VAR_ZONEFILE) } YY_BREAK case 131: YY_RULE_SETUP #line 345 "./util/configlexer.lex" -{ YDVAR(1, VAR_URL) } +{ YDVAR(1, VAR_MASTER) } YY_BREAK case 132: YY_RULE_SETUP #line 346 "./util/configlexer.lex" -{ YDVAR(1, VAR_ALLOW_NOTIFY) } +{ YDVAR(1, VAR_MASTER) } YY_BREAK case 133: YY_RULE_SETUP #line 347 "./util/configlexer.lex" -{ YDVAR(1, VAR_FOR_DOWNSTREAM) } +{ YDVAR(1, VAR_URL) } YY_BREAK case 134: YY_RULE_SETUP #line 348 "./util/configlexer.lex" -{ YDVAR(1, VAR_FOR_UPSTREAM) } +{ YDVAR(1, VAR_ALLOW_NOTIFY) } YY_BREAK case 135: YY_RULE_SETUP #line 349 "./util/configlexer.lex" -{ YDVAR(1, VAR_FALLBACK_ENABLED) } +{ YDVAR(1, VAR_FOR_DOWNSTREAM) } YY_BREAK case 136: YY_RULE_SETUP #line 350 "./util/configlexer.lex" -{ YDVAR(0, VAR_VIEW) } +{ YDVAR(1, VAR_FOR_UPSTREAM) } YY_BREAK case 137: YY_RULE_SETUP #line 351 "./util/configlexer.lex" -{ YDVAR(1, VAR_VIEW_FIRST) } +{ YDVAR(1, VAR_FALLBACK_ENABLED) } YY_BREAK case 138: YY_RULE_SETUP #line 352 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } +{ YDVAR(0, VAR_VIEW) } YY_BREAK case 139: YY_RULE_SETUP #line 353 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } +{ YDVAR(1, VAR_VIEW_FIRST) } YY_BREAK case 140: YY_RULE_SETUP #line 354 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL) } +{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } YY_BREAK case 141: YY_RULE_SETUP #line 355 "./util/configlexer.lex" -{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) } +{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } YY_BREAK case 142: YY_RULE_SETUP #line 356 "./util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) } +{ YDVAR(2, VAR_ACCESS_CONTROL) } YY_BREAK case 143: YY_RULE_SETUP #line 357 "./util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) } +{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) } YY_BREAK case 144: YY_RULE_SETUP #line 358 "./util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) } +{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) } YY_BREAK case 145: YY_RULE_SETUP #line 359 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) } +{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) } YY_BREAK case 146: YY_RULE_SETUP #line 360 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) } +{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) } YY_BREAK case 147: YY_RULE_SETUP #line 361 "./util/configlexer.lex" -{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) } +{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) } YY_BREAK case 148: YY_RULE_SETUP #line 362 "./util/configlexer.lex" -{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) } +{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) } YY_BREAK case 149: YY_RULE_SETUP #line 363 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) } +{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) } YY_BREAK case 150: YY_RULE_SETUP #line 364 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) } +{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) } YY_BREAK case 151: YY_RULE_SETUP #line 365 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_IDENTITY) } +{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) } YY_BREAK case 152: YY_RULE_SETUP #line 366 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_VERSION) } +{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) } YY_BREAK case 153: YY_RULE_SETUP #line 367 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) } +{ YDVAR(1, VAR_HIDE_IDENTITY) } YY_BREAK case 154: YY_RULE_SETUP #line 368 "./util/configlexer.lex" -{ YDVAR(1, VAR_IDENTITY) } +{ YDVAR(1, VAR_HIDE_VERSION) } YY_BREAK case 155: YY_RULE_SETUP #line 369 "./util/configlexer.lex" -{ YDVAR(1, VAR_VERSION) } +{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) } YY_BREAK case 156: YY_RULE_SETUP #line 370 "./util/configlexer.lex" -{ YDVAR(1, VAR_MODULE_CONF) } +{ YDVAR(1, VAR_IDENTITY) } YY_BREAK case 157: YY_RULE_SETUP #line 371 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR) } +{ YDVAR(1, VAR_VERSION) } YY_BREAK case 158: YY_RULE_SETUP #line 372 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } +{ YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 159: YY_RULE_SETUP #line 373 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 160: YY_RULE_SETUP #line 374 "./util/configlexer.lex" -{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 161: YY_RULE_SETUP #line 375 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } +{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 162: YY_RULE_SETUP #line 376 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR) } +{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 163: YY_RULE_SETUP #line 377 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } +{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 164: YY_RULE_SETUP #line 378 "./util/configlexer.lex" -{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) } +{ YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 165: YY_RULE_SETUP #line 379 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } +{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } YY_BREAK case 166: YY_RULE_SETUP #line 380 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } +{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) } YY_BREAK case 167: YY_RULE_SETUP #line 381 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } +{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 168: YY_RULE_SETUP #line 382 "./util/configlexer.lex" -{ YDVAR(1, VAR_BOGUS_TTL) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 169: YY_RULE_SETUP #line 383 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 170: YY_RULE_SETUP #line 384 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } +{ YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 171: YY_RULE_SETUP #line 385 "./util/configlexer.lex" -{ YDVAR(1, VAR_AGGRESSIVE_NSEC) } +{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 172: YY_RULE_SETUP #line 386 "./util/configlexer.lex" -{ YDVAR(1, VAR_IGNORE_CD_FLAG) } +{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 173: YY_RULE_SETUP #line 387 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED) } +{ YDVAR(1, VAR_AGGRESSIVE_NSEC) } YY_BREAK case 174: YY_RULE_SETUP #line 388 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) } +{ YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 175: YY_RULE_SETUP #line 389 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } +{ YDVAR(1, VAR_SERVE_EXPIRED) } YY_BREAK case 176: YY_RULE_SETUP #line 390 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) } YY_BREAK case 177: YY_RULE_SETUP #line 391 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } YY_BREAK case 178: YY_RULE_SETUP #line 392 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_DSA) } +{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) } YY_BREAK case 179: YY_RULE_SETUP #line 393 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_SHA1) } +{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) } YY_BREAK case 180: YY_RULE_SETUP #line 394 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_FAKE_DSA) } YY_BREAK case 181: YY_RULE_SETUP #line 395 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_FAKE_SHA1) } YY_BREAK case 182: YY_RULE_SETUP #line 396 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 183: YY_RULE_SETUP #line 397 "./util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 184: YY_RULE_SETUP #line 398 "./util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 185: YY_RULE_SETUP -#line 400 "./util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 399 "./util/configlexer.lex" +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 186: YY_RULE_SETUP -#line 401 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +#line 400 "./util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 187: YY_RULE_SETUP #line 402 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 188: YY_RULE_SETUP #line 403 "./util/configlexer.lex" -{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 189: YY_RULE_SETUP #line 404 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 190: YY_RULE_SETUP #line 405 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_IDENTITY) } +{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } YY_BREAK case 191: YY_RULE_SETUP #line 406 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 192: YY_RULE_SETUP #line 407 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_LOG_IDENTITY) } YY_BREAK case 193: YY_RULE_SETUP #line 408 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_REPLIES) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 194: YY_RULE_SETUP #line 409 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 195: YY_RULE_SETUP #line 410 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } +{ YDVAR(1, VAR_LOG_REPLIES) } YY_BREAK case 196: YY_RULE_SETUP #line 411 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_SERVFAIL) } +{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) } YY_BREAK case 197: YY_RULE_SETUP #line 412 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } YY_BREAK case 198: YY_RULE_SETUP #line 413 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(1, VAR_LOG_SERVFAIL) } YY_BREAK case 199: YY_RULE_SETUP #line 414 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 200: YY_RULE_SETUP #line 415 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 201: YY_RULE_SETUP #line 416 "./util/configlexer.lex" -{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 202: YY_RULE_SETUP #line 417 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 203: YY_RULE_SETUP #line 418 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } YY_BREAK case 204: YY_RULE_SETUP #line 419 "./util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 205: YY_RULE_SETUP #line 420 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_ENABLE) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 206: YY_RULE_SETUP #line 421 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_KEY) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 207: YY_RULE_SETUP #line 422 "./util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_SHM_ENABLE) } YY_BREAK case 208: YY_RULE_SETUP #line 423 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(1, VAR_SHM_KEY) } YY_BREAK case 209: YY_RULE_SETUP #line 424 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 210: YY_RULE_SETUP #line 425 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 211: YY_RULE_SETUP #line 426 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_USE_CERT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 212: YY_RULE_SETUP #line 427 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 213: YY_RULE_SETUP #line 428 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 214: YY_RULE_SETUP #line 429 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 215: YY_RULE_SETUP #line 430 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 216: YY_RULE_SETUP #line 431 "./util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 217: YY_RULE_SETUP #line 432 "./util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 218: YY_RULE_SETUP #line 433 "./util/configlexer.lex" -{ YDVAR(1, VAR_DYNLIB_FILE) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 219: YY_RULE_SETUP #line 434 "./util/configlexer.lex" -{ YDVAR(0, VAR_DYNLIB) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 220: YY_RULE_SETUP #line 435 "./util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(1, VAR_DYNLIB_FILE) } YY_BREAK case 221: YY_RULE_SETUP #line 436 "./util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(0, VAR_DYNLIB) } YY_BREAK case 222: YY_RULE_SETUP #line 437 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 223: YY_RULE_SETUP #line 438 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 224: YY_RULE_SETUP #line 439 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 225: YY_RULE_SETUP #line 440 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_PREFIX) } +{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) } YY_BREAK case 226: YY_RULE_SETUP #line 441 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_SYNTHALL) } +{ YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 227: YY_RULE_SETUP #line 442 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } +{ YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 228: YY_RULE_SETUP #line 443 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEFINE_TAG) } +{ YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 229: YY_RULE_SETUP #line 444 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } +{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } YY_BREAK case 230: YY_RULE_SETUP #line 445 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } +{ YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 231: YY_RULE_SETUP #line 446 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } +{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 232: YY_RULE_SETUP #line 447 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } +{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 233: YY_RULE_SETUP #line 448 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 234: YY_RULE_SETUP #line 449 "./util/configlexer.lex" -{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 235: YY_RULE_SETUP #line 450 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSTAP) } +{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 236: YY_RULE_SETUP #line 451 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_ENABLE) } +{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 237: YY_RULE_SETUP #line 452 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) } +{ YDVAR(0, VAR_DNSTAP) } YY_BREAK case 238: YY_RULE_SETUP #line 453 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } +{ YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 239: YY_RULE_SETUP #line 454 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IP) } +{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) } YY_BREAK case 240: YY_RULE_SETUP #line 455 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS) } +{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 241: YY_RULE_SETUP #line 456 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) } +{ YDVAR(1, VAR_DNSTAP_IP) } YY_BREAK case 242: YY_RULE_SETUP #line 457 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) } +{ YDVAR(1, VAR_DNSTAP_TLS) } YY_BREAK case 243: YY_RULE_SETUP #line 458 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) } +{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) } YY_BREAK case 244: YY_RULE_SETUP -#line 460 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) } +#line 459 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) } YY_BREAK case 245: YY_RULE_SETUP -#line 462 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } +#line 460 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) } YY_BREAK case 246: YY_RULE_SETUP -#line 463 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } +#line 462 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) } YY_BREAK case 247: YY_RULE_SETUP #line 464 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 248: YY_RULE_SETUP #line 465 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 249: YY_RULE_SETUP #line 466 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } +{ YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 250: YY_RULE_SETUP -#line 468 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } +#line 467 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 251: YY_RULE_SETUP -#line 470 "./util/configlexer.lex" +#line 468 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 252: YY_RULE_SETUP -#line 472 "./util/configlexer.lex" +#line 470 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 253: YY_RULE_SETUP -#line 474 "./util/configlexer.lex" +#line 472 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 254: YY_RULE_SETUP -#line 476 "./util/configlexer.lex" +#line 474 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 255: YY_RULE_SETUP -#line 478 "./util/configlexer.lex" -{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } +#line 476 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 256: YY_RULE_SETUP -#line 479 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT) } +#line 478 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 257: YY_RULE_SETUP #line 480 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT) } +{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 258: YY_RULE_SETUP #line 481 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_IP_RATELIMIT) } YY_BREAK case 259: YY_RULE_SETUP #line 482 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 260: YY_RULE_SETUP #line 483 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } YY_BREAK case 261: YY_RULE_SETUP #line 484 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 262: YY_RULE_SETUP #line 485 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } +{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } YY_BREAK case 263: YY_RULE_SETUP #line 486 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +{ YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 264: YY_RULE_SETUP #line 487 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 265: YY_RULE_SETUP #line 488 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 266: YY_RULE_SETUP #line 489 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOW_RTT) } +{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } YY_BREAK case 267: YY_RULE_SETUP #line 490 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_NUM) } +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } YY_BREAK case 268: YY_RULE_SETUP #line 491 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +{ YDVAR(1, VAR_LOW_RTT) } YY_BREAK case 269: YY_RULE_SETUP #line 492 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +{ YDVAR(1, VAR_FAST_SERVER_NUM) } YY_BREAK case 270: YY_RULE_SETUP @@ -4777,215 +4796,225 @@ YY_RULE_SETUP case 271: YY_RULE_SETUP #line 494 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_TAG) } +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 272: YY_RULE_SETUP #line 495 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP) } +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 273: YY_RULE_SETUP #line 496 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_DATA) } +{ YDVAR(2, VAR_RESPONSE_IP_TAG) } YY_BREAK case 274: YY_RULE_SETUP #line 497 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSCRYPT) } +{ YDVAR(2, VAR_RESPONSE_IP) } YY_BREAK case 275: YY_RULE_SETUP #line 498 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } +{ YDVAR(2, VAR_RESPONSE_IP_DATA) } YY_BREAK case 276: YY_RULE_SETUP #line 499 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PORT) } +{ YDVAR(0, VAR_DNSCRYPT) } YY_BREAK case 277: YY_RULE_SETUP #line 500 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } +{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } YY_BREAK case 278: YY_RULE_SETUP #line 501 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } +{ YDVAR(1, VAR_DNSCRYPT_PORT) } YY_BREAK case 279: YY_RULE_SETUP #line 502 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } YY_BREAK case 280: YY_RULE_SETUP #line 503 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } +{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } YY_BREAK case 281: YY_RULE_SETUP #line 504 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } YY_BREAK case 282: YY_RULE_SETUP -#line 506 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } +#line 505 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } YY_BREAK case 283: YY_RULE_SETUP -#line 508 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } +#line 506 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } YY_BREAK case 284: YY_RULE_SETUP -#line 509 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } +#line 508 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } YY_BREAK case 285: YY_RULE_SETUP #line 510 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_ENABLED) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } YY_BREAK case 286: YY_RULE_SETUP #line 511 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } YY_BREAK case 287: YY_RULE_SETUP #line 512 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_HOOK) } +{ YDVAR(1, VAR_IPSECMOD_ENABLED) } YY_BREAK case 288: YY_RULE_SETUP #line 513 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } +{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } YY_BREAK case 289: YY_RULE_SETUP #line 514 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } +{ YDVAR(1, VAR_IPSECMOD_HOOK) } YY_BREAK case 290: YY_RULE_SETUP #line 515 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } +{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } YY_BREAK case 291: YY_RULE_SETUP #line 516 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_STRICT) } +{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } YY_BREAK case 292: YY_RULE_SETUP #line 517 "./util/configlexer.lex" -{ YDVAR(0, VAR_CACHEDB) } +{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } YY_BREAK case 293: YY_RULE_SETUP #line 518 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_BACKEND) } +{ YDVAR(1, VAR_IPSECMOD_STRICT) } YY_BREAK case 294: YY_RULE_SETUP #line 519 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } +{ YDVAR(0, VAR_CACHEDB) } YY_BREAK case 295: YY_RULE_SETUP #line 520 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISHOST) } +{ YDVAR(1, VAR_CACHEDB_BACKEND) } YY_BREAK case 296: YY_RULE_SETUP #line 521 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISPORT) } +{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } YY_BREAK case 297: YY_RULE_SETUP #line 522 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } +{ YDVAR(1, VAR_CACHEDB_REDISHOST) } YY_BREAK case 298: YY_RULE_SETUP #line 523 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) } +{ YDVAR(1, VAR_CACHEDB_REDISPORT) } YY_BREAK case 299: YY_RULE_SETUP #line 524 "./util/configlexer.lex" -{ YDVAR(0, VAR_IPSET) } +{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } YY_BREAK case 300: YY_RULE_SETUP #line 525 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSET_NAME_V4) } +{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) } YY_BREAK case 301: YY_RULE_SETUP #line 526 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSET_NAME_V6) } +{ YDVAR(0, VAR_IPSET) } YY_BREAK case 302: YY_RULE_SETUP #line 527 "./util/configlexer.lex" -{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } +{ YDVAR(1, VAR_IPSET_NAME_V4) } YY_BREAK case 303: YY_RULE_SETUP #line 528 "./util/configlexer.lex" -{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } +{ YDVAR(1, VAR_IPSET_NAME_V6) } YY_BREAK case 304: YY_RULE_SETUP #line 529 "./util/configlexer.lex" -{ YDVAR(2, VAR_EDNS_CLIENT_STRING) } +{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } YY_BREAK case 305: YY_RULE_SETUP #line 530 "./util/configlexer.lex" -{ YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) } +{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } YY_BREAK case 306: -/* rule 306 can match eol */ YY_RULE_SETUP #line 531 "./util/configlexer.lex" +{ YDVAR(2, VAR_EDNS_CLIENT_STRING) } + YY_BREAK +case 307: +YY_RULE_SETUP +#line 532 "./util/configlexer.lex" +{ YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) } + YY_BREAK +case 308: +/* rule 308 can match eol */ +YY_RULE_SETUP +#line 533 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 307: +case 309: YY_RULE_SETUP -#line 534 "./util/configlexer.lex" +#line 536 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 535 "./util/configlexer.lex" +#line 537 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 308: +case 310: YY_RULE_SETUP -#line 540 "./util/configlexer.lex" +#line 542 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 309: -/* rule 309 can match eol */ +case 311: +/* rule 311 can match eol */ YY_RULE_SETUP -#line 541 "./util/configlexer.lex" +#line 543 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 310: +case 312: YY_RULE_SETUP -#line 543 "./util/configlexer.lex" +#line 545 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -4998,34 +5027,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 311: +case 313: YY_RULE_SETUP -#line 555 "./util/configlexer.lex" +#line 557 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 556 "./util/configlexer.lex" +#line 558 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 312: +case 314: YY_RULE_SETUP -#line 561 "./util/configlexer.lex" +#line 563 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 313: -/* rule 313 can match eol */ +case 315: +/* rule 315 can match eol */ YY_RULE_SETUP -#line 562 "./util/configlexer.lex" +#line 564 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 314: +case 316: YY_RULE_SETUP -#line 564 "./util/configlexer.lex" +#line 566 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -5038,38 +5067,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 315: +case 317: YY_RULE_SETUP -#line 576 "./util/configlexer.lex" +#line 578 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 578 "./util/configlexer.lex" +#line 580 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 316: -YY_RULE_SETUP -#line 582 "./util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK -case 317: -/* rule 317 can match eol */ -YY_RULE_SETUP -#line 583 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} - YY_BREAK case 318: YY_RULE_SETUP #line 584 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 319: +/* rule 319 can match eol */ YY_RULE_SETUP #line 585 "./util/configlexer.lex" +{ LEXOUT(("NL\n")); cfg_parser->line++;} + YY_BREAK +case 320: +YY_RULE_SETUP +#line 586 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 321: +YY_RULE_SETUP +#line 587 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext, 0); @@ -5077,27 +5106,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 590 "./util/configlexer.lex" +#line 592 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 320: +case 322: YY_RULE_SETUP -#line 594 "./util/configlexer.lex" +#line 596 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 321: -/* rule 321 can match eol */ +case 323: +/* rule 323 can match eol */ YY_RULE_SETUP -#line 595 "./util/configlexer.lex" +#line 597 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 322: +case 324: YY_RULE_SETUP -#line 597 "./util/configlexer.lex" +#line 599 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -5107,7 +5136,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 603 "./util/configlexer.lex" +#line 605 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -5122,39 +5151,39 @@ case YY_STATE_EOF(val): } YY_BREAK /* include-toplevel: directive */ -case 323: +case 325: YY_RULE_SETUP -#line 617 "./util/configlexer.lex" +#line 619 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel); } YY_BREAK case YY_STATE_EOF(include_toplevel): -#line 620 "./util/configlexer.lex" +#line 622 "./util/configlexer.lex" { yyerror("EOF inside include_toplevel directive"); BEGIN(inc_prev); } YY_BREAK -case 324: -YY_RULE_SETUP -#line 624 "./util/configlexer.lex" -{ LEXOUT(("ITSP ")); /* ignore */ } - YY_BREAK -case 325: -/* rule 325 can match eol */ -YY_RULE_SETUP -#line 625 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++; } - YY_BREAK case 326: YY_RULE_SETUP #line 626 "./util/configlexer.lex" -{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); } +{ LEXOUT(("ITSP ")); /* ignore */ } YY_BREAK case 327: +/* rule 327 can match eol */ YY_RULE_SETUP #line 627 "./util/configlexer.lex" +{ LEXOUT(("NL\n")); cfg_parser->line++; } + YY_BREAK +case 328: +YY_RULE_SETUP +#line 628 "./util/configlexer.lex" +{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); } + YY_BREAK +case 329: +YY_RULE_SETUP +#line 629 "./util/configlexer.lex" { LEXOUT(("ITunquotedstr(%s) ", yytext)); config_start_include_glob(yytext, 1); @@ -5163,29 +5192,29 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_toplevel_quoted): -#line 633 "./util/configlexer.lex" +#line 635 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 328: +case 330: YY_RULE_SETUP -#line 637 "./util/configlexer.lex" +#line 639 "./util/configlexer.lex" { LEXOUT(("ITSTR(%s) ", yytext)); yymore(); } YY_BREAK -case 329: -/* rule 329 can match eol */ +case 331: +/* rule 331 can match eol */ YY_RULE_SETUP -#line 638 "./util/configlexer.lex" +#line 640 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 330: +case 332: YY_RULE_SETUP -#line 642 "./util/configlexer.lex" +#line 644 "./util/configlexer.lex" { LEXOUT(("ITQE ")); yytext[yyleng - 1] = '\0'; @@ -5194,33 +5223,33 @@ YY_RULE_SETUP return (VAR_FORCE_TOPLEVEL); } YY_BREAK -case 331: +case 333: YY_RULE_SETUP -#line 650 "./util/configlexer.lex" +#line 652 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 332: +case 334: YY_RULE_SETUP -#line 654 "./util/configlexer.lex" +#line 656 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 333: +case 335: YY_RULE_SETUP -#line 658 "./util/configlexer.lex" +#line 660 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 334: +case 336: YY_RULE_SETUP -#line 662 "./util/configlexer.lex" +#line 664 "./util/configlexer.lex" ECHO; YY_BREAK -#line 5222 "" +#line 5251 "" case YY_END_OF_BUFFER: { @@ -5515,7 +5544,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 3256 ) + if ( yy_current_state >= 3284 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -5543,11 +5572,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 3256 ) + if ( yy_current_state >= 3284 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 3255); + yy_is_jam = (yy_current_state == 3283); return yy_is_jam ? 0 : yy_current_state; } @@ -6186,6 +6215,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 662 "./util/configlexer.lex" +#line 664 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index a825d8156..06c58a2b3 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -262,6 +262,7 @@ http-max-streams{COLON} { YDVAR(1, VAR_HTTP_MAX_STREAMS) } http-query-buffer-size{COLON} { YDVAR(1, VAR_HTTP_QUERY_BUFFER_SIZE) } http-response-buffer-size{COLON} { YDVAR(1, VAR_HTTP_RESPONSE_BUFFER_SIZE) } http-nodelay{COLON} { YDVAR(1, VAR_HTTP_NODELAY) } +http-notls-downstream{COLON} { YDVAR(1, VAR_HTTP_NOTLS_DOWNSTREAM) } use-systemd{COLON} { YDVAR(1, VAR_USE_SYSTEMD) } do-daemonize{COLON} { YDVAR(1, VAR_DO_DAEMONIZE) } interface{COLON} { YDVAR(1, VAR_INTERFACE) } @@ -296,6 +297,7 @@ infra-cache-slabs{COLON} { YDVAR(1, VAR_INFRA_CACHE_SLABS) } infra-cache-numhosts{COLON} { YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } infra-cache-lame-size{COLON} { YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } infra-cache-min-rtt{COLON} { YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } +infra-keep-probing{COLON} { YDVAR(1, VAR_INFRA_KEEP_PROBING) } num-queries-per-thread{COLON} { YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } jostle-timeout{COLON} { YDVAR(1, VAR_JOSTLE_TIMEOUT) } delay-close{COLON} { YDVAR(1, VAR_DELAY_CLOSE) } diff --git a/util/configparser.c b/util/configparser.c index adb3e53be..bd6af0ea5 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -288,158 +288,160 @@ extern int yydebug; VAR_HTTP_QUERY_BUFFER_SIZE = 400, VAR_HTTP_RESPONSE_BUFFER_SIZE = 401, VAR_HTTP_NODELAY = 402, - VAR_STUB_FIRST = 403, - VAR_MINIMAL_RESPONSES = 404, - VAR_RRSET_ROUNDROBIN = 405, - VAR_MAX_UDP_SIZE = 406, - VAR_DELAY_CLOSE = 407, - VAR_UNBLOCK_LAN_ZONES = 408, - VAR_INSECURE_LAN_ZONES = 409, - VAR_INFRA_CACHE_MIN_RTT = 410, - VAR_DNS64_PREFIX = 411, - VAR_DNS64_SYNTHALL = 412, - VAR_DNS64_IGNORE_AAAA = 413, - VAR_DNSTAP = 414, - VAR_DNSTAP_ENABLE = 415, - VAR_DNSTAP_SOCKET_PATH = 416, - VAR_DNSTAP_IP = 417, - VAR_DNSTAP_TLS = 418, - VAR_DNSTAP_TLS_SERVER_NAME = 419, - VAR_DNSTAP_TLS_CERT_BUNDLE = 420, - VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 421, - VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 422, - VAR_DNSTAP_SEND_IDENTITY = 423, - VAR_DNSTAP_SEND_VERSION = 424, - VAR_DNSTAP_BIDIRECTIONAL = 425, - VAR_DNSTAP_IDENTITY = 426, - VAR_DNSTAP_VERSION = 427, - VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 428, - VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 429, - VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 430, - VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 431, - VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 432, - VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 433, - VAR_RESPONSE_IP_TAG = 434, - VAR_RESPONSE_IP = 435, - VAR_RESPONSE_IP_DATA = 436, - VAR_HARDEN_ALGO_DOWNGRADE = 437, - VAR_IP_TRANSPARENT = 438, - VAR_IP_DSCP = 439, - VAR_DISABLE_DNSSEC_LAME_CHECK = 440, - VAR_IP_RATELIMIT = 441, - VAR_IP_RATELIMIT_SLABS = 442, - VAR_IP_RATELIMIT_SIZE = 443, - VAR_RATELIMIT = 444, - VAR_RATELIMIT_SLABS = 445, - VAR_RATELIMIT_SIZE = 446, - VAR_RATELIMIT_FOR_DOMAIN = 447, - VAR_RATELIMIT_BELOW_DOMAIN = 448, - VAR_IP_RATELIMIT_FACTOR = 449, - VAR_RATELIMIT_FACTOR = 450, - VAR_SEND_CLIENT_SUBNET = 451, - VAR_CLIENT_SUBNET_ZONE = 452, - VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 453, - VAR_CLIENT_SUBNET_OPCODE = 454, - VAR_MAX_CLIENT_SUBNET_IPV4 = 455, - VAR_MAX_CLIENT_SUBNET_IPV6 = 456, - VAR_MIN_CLIENT_SUBNET_IPV4 = 457, - VAR_MIN_CLIENT_SUBNET_IPV6 = 458, - VAR_MAX_ECS_TREE_SIZE_IPV4 = 459, - VAR_MAX_ECS_TREE_SIZE_IPV6 = 460, - VAR_CAPS_WHITELIST = 461, - VAR_CACHE_MAX_NEGATIVE_TTL = 462, - VAR_PERMIT_SMALL_HOLDDOWN = 463, - VAR_QNAME_MINIMISATION = 464, - VAR_QNAME_MINIMISATION_STRICT = 465, - VAR_IP_FREEBIND = 466, - VAR_DEFINE_TAG = 467, - VAR_LOCAL_ZONE_TAG = 468, - VAR_ACCESS_CONTROL_TAG = 469, - VAR_LOCAL_ZONE_OVERRIDE = 470, - VAR_ACCESS_CONTROL_TAG_ACTION = 471, - VAR_ACCESS_CONTROL_TAG_DATA = 472, - VAR_VIEW = 473, - VAR_ACCESS_CONTROL_VIEW = 474, - VAR_VIEW_FIRST = 475, - VAR_SERVE_EXPIRED = 476, - VAR_SERVE_EXPIRED_TTL = 477, - VAR_SERVE_EXPIRED_TTL_RESET = 478, - VAR_SERVE_EXPIRED_REPLY_TTL = 479, - VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 480, - VAR_FAKE_DSA = 481, - VAR_FAKE_SHA1 = 482, - VAR_LOG_IDENTITY = 483, - VAR_HIDE_TRUSTANCHOR = 484, - VAR_TRUST_ANCHOR_SIGNALING = 485, - VAR_AGGRESSIVE_NSEC = 486, - VAR_USE_SYSTEMD = 487, - VAR_SHM_ENABLE = 488, - VAR_SHM_KEY = 489, - VAR_ROOT_KEY_SENTINEL = 490, - VAR_DNSCRYPT = 491, - VAR_DNSCRYPT_ENABLE = 492, - VAR_DNSCRYPT_PORT = 493, - VAR_DNSCRYPT_PROVIDER = 494, - VAR_DNSCRYPT_SECRET_KEY = 495, - VAR_DNSCRYPT_PROVIDER_CERT = 496, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 497, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 498, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 499, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 500, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 501, - VAR_IPSECMOD_ENABLED = 502, - VAR_IPSECMOD_HOOK = 503, - VAR_IPSECMOD_IGNORE_BOGUS = 504, - VAR_IPSECMOD_MAX_TTL = 505, - VAR_IPSECMOD_WHITELIST = 506, - VAR_IPSECMOD_STRICT = 507, - VAR_CACHEDB = 508, - VAR_CACHEDB_BACKEND = 509, - VAR_CACHEDB_SECRETSEED = 510, - VAR_CACHEDB_REDISHOST = 511, - VAR_CACHEDB_REDISPORT = 512, - VAR_CACHEDB_REDISTIMEOUT = 513, - VAR_CACHEDB_REDISEXPIRERECORDS = 514, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 515, - VAR_FOR_UPSTREAM = 516, - VAR_AUTH_ZONE = 517, - VAR_ZONEFILE = 518, - VAR_MASTER = 519, - VAR_URL = 520, - VAR_FOR_DOWNSTREAM = 521, - VAR_FALLBACK_ENABLED = 522, - VAR_TLS_ADDITIONAL_PORT = 523, - VAR_LOW_RTT = 524, - VAR_LOW_RTT_PERMIL = 525, - VAR_FAST_SERVER_PERMIL = 526, - VAR_FAST_SERVER_NUM = 527, - VAR_ALLOW_NOTIFY = 528, - VAR_TLS_WIN_CERT = 529, - VAR_TCP_CONNECTION_LIMIT = 530, - VAR_FORWARD_NO_CACHE = 531, - VAR_STUB_NO_CACHE = 532, - VAR_LOG_SERVFAIL = 533, - VAR_DENY_ANY = 534, - VAR_UNKNOWN_SERVER_TIME_LIMIT = 535, - VAR_LOG_TAG_QUERYREPLY = 536, - VAR_STREAM_WAIT_SIZE = 537, - VAR_TLS_CIPHERS = 538, - VAR_TLS_CIPHERSUITES = 539, - VAR_TLS_USE_SNI = 540, - VAR_IPSET = 541, - VAR_IPSET_NAME_V4 = 542, - VAR_IPSET_NAME_V6 = 543, - VAR_TLS_SESSION_TICKET_KEYS = 544, - VAR_RPZ = 545, - VAR_TAGS = 546, - VAR_RPZ_ACTION_OVERRIDE = 547, - VAR_RPZ_CNAME_OVERRIDE = 548, - VAR_RPZ_LOG = 549, - VAR_RPZ_LOG_NAME = 550, - VAR_DYNLIB = 551, - VAR_DYNLIB_FILE = 552, - VAR_EDNS_CLIENT_STRING = 553, - VAR_EDNS_CLIENT_STRING_OPCODE = 554 + VAR_HTTP_NOTLS_DOWNSTREAM = 403, + VAR_STUB_FIRST = 404, + VAR_MINIMAL_RESPONSES = 405, + VAR_RRSET_ROUNDROBIN = 406, + VAR_MAX_UDP_SIZE = 407, + VAR_DELAY_CLOSE = 408, + VAR_UNBLOCK_LAN_ZONES = 409, + VAR_INSECURE_LAN_ZONES = 410, + VAR_INFRA_CACHE_MIN_RTT = 411, + VAR_INFRA_KEEP_PROBING = 412, + VAR_DNS64_PREFIX = 413, + VAR_DNS64_SYNTHALL = 414, + VAR_DNS64_IGNORE_AAAA = 415, + VAR_DNSTAP = 416, + VAR_DNSTAP_ENABLE = 417, + VAR_DNSTAP_SOCKET_PATH = 418, + VAR_DNSTAP_IP = 419, + VAR_DNSTAP_TLS = 420, + VAR_DNSTAP_TLS_SERVER_NAME = 421, + VAR_DNSTAP_TLS_CERT_BUNDLE = 422, + VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 423, + VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 424, + VAR_DNSTAP_SEND_IDENTITY = 425, + VAR_DNSTAP_SEND_VERSION = 426, + VAR_DNSTAP_BIDIRECTIONAL = 427, + VAR_DNSTAP_IDENTITY = 428, + VAR_DNSTAP_VERSION = 429, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 430, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 431, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 432, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 433, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 434, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 435, + VAR_RESPONSE_IP_TAG = 436, + VAR_RESPONSE_IP = 437, + VAR_RESPONSE_IP_DATA = 438, + VAR_HARDEN_ALGO_DOWNGRADE = 439, + VAR_IP_TRANSPARENT = 440, + VAR_IP_DSCP = 441, + VAR_DISABLE_DNSSEC_LAME_CHECK = 442, + VAR_IP_RATELIMIT = 443, + VAR_IP_RATELIMIT_SLABS = 444, + VAR_IP_RATELIMIT_SIZE = 445, + VAR_RATELIMIT = 446, + VAR_RATELIMIT_SLABS = 447, + VAR_RATELIMIT_SIZE = 448, + VAR_RATELIMIT_FOR_DOMAIN = 449, + VAR_RATELIMIT_BELOW_DOMAIN = 450, + VAR_IP_RATELIMIT_FACTOR = 451, + VAR_RATELIMIT_FACTOR = 452, + VAR_SEND_CLIENT_SUBNET = 453, + VAR_CLIENT_SUBNET_ZONE = 454, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 455, + VAR_CLIENT_SUBNET_OPCODE = 456, + VAR_MAX_CLIENT_SUBNET_IPV4 = 457, + VAR_MAX_CLIENT_SUBNET_IPV6 = 458, + VAR_MIN_CLIENT_SUBNET_IPV4 = 459, + VAR_MIN_CLIENT_SUBNET_IPV6 = 460, + VAR_MAX_ECS_TREE_SIZE_IPV4 = 461, + VAR_MAX_ECS_TREE_SIZE_IPV6 = 462, + VAR_CAPS_WHITELIST = 463, + VAR_CACHE_MAX_NEGATIVE_TTL = 464, + VAR_PERMIT_SMALL_HOLDDOWN = 465, + VAR_QNAME_MINIMISATION = 466, + VAR_QNAME_MINIMISATION_STRICT = 467, + VAR_IP_FREEBIND = 468, + VAR_DEFINE_TAG = 469, + VAR_LOCAL_ZONE_TAG = 470, + VAR_ACCESS_CONTROL_TAG = 471, + VAR_LOCAL_ZONE_OVERRIDE = 472, + VAR_ACCESS_CONTROL_TAG_ACTION = 473, + VAR_ACCESS_CONTROL_TAG_DATA = 474, + VAR_VIEW = 475, + VAR_ACCESS_CONTROL_VIEW = 476, + VAR_VIEW_FIRST = 477, + VAR_SERVE_EXPIRED = 478, + VAR_SERVE_EXPIRED_TTL = 479, + VAR_SERVE_EXPIRED_TTL_RESET = 480, + VAR_SERVE_EXPIRED_REPLY_TTL = 481, + VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 482, + VAR_FAKE_DSA = 483, + VAR_FAKE_SHA1 = 484, + VAR_LOG_IDENTITY = 485, + VAR_HIDE_TRUSTANCHOR = 486, + VAR_TRUST_ANCHOR_SIGNALING = 487, + VAR_AGGRESSIVE_NSEC = 488, + VAR_USE_SYSTEMD = 489, + VAR_SHM_ENABLE = 490, + VAR_SHM_KEY = 491, + VAR_ROOT_KEY_SENTINEL = 492, + VAR_DNSCRYPT = 493, + VAR_DNSCRYPT_ENABLE = 494, + VAR_DNSCRYPT_PORT = 495, + VAR_DNSCRYPT_PROVIDER = 496, + VAR_DNSCRYPT_SECRET_KEY = 497, + VAR_DNSCRYPT_PROVIDER_CERT = 498, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 499, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 500, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 501, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 502, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 503, + VAR_IPSECMOD_ENABLED = 504, + VAR_IPSECMOD_HOOK = 505, + VAR_IPSECMOD_IGNORE_BOGUS = 506, + VAR_IPSECMOD_MAX_TTL = 507, + VAR_IPSECMOD_WHITELIST = 508, + VAR_IPSECMOD_STRICT = 509, + VAR_CACHEDB = 510, + VAR_CACHEDB_BACKEND = 511, + VAR_CACHEDB_SECRETSEED = 512, + VAR_CACHEDB_REDISHOST = 513, + VAR_CACHEDB_REDISPORT = 514, + VAR_CACHEDB_REDISTIMEOUT = 515, + VAR_CACHEDB_REDISEXPIRERECORDS = 516, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 517, + VAR_FOR_UPSTREAM = 518, + VAR_AUTH_ZONE = 519, + VAR_ZONEFILE = 520, + VAR_MASTER = 521, + VAR_URL = 522, + VAR_FOR_DOWNSTREAM = 523, + VAR_FALLBACK_ENABLED = 524, + VAR_TLS_ADDITIONAL_PORT = 525, + VAR_LOW_RTT = 526, + VAR_LOW_RTT_PERMIL = 527, + VAR_FAST_SERVER_PERMIL = 528, + VAR_FAST_SERVER_NUM = 529, + VAR_ALLOW_NOTIFY = 530, + VAR_TLS_WIN_CERT = 531, + VAR_TCP_CONNECTION_LIMIT = 532, + VAR_FORWARD_NO_CACHE = 533, + VAR_STUB_NO_CACHE = 534, + VAR_LOG_SERVFAIL = 535, + VAR_DENY_ANY = 536, + VAR_UNKNOWN_SERVER_TIME_LIMIT = 537, + VAR_LOG_TAG_QUERYREPLY = 538, + VAR_STREAM_WAIT_SIZE = 539, + VAR_TLS_CIPHERS = 540, + VAR_TLS_CIPHERSUITES = 541, + VAR_TLS_USE_SNI = 542, + VAR_IPSET = 543, + VAR_IPSET_NAME_V4 = 544, + VAR_IPSET_NAME_V6 = 545, + VAR_TLS_SESSION_TICKET_KEYS = 546, + VAR_RPZ = 547, + VAR_TAGS = 548, + VAR_RPZ_ACTION_OVERRIDE = 549, + VAR_RPZ_CNAME_OVERRIDE = 550, + VAR_RPZ_LOG = 551, + VAR_RPZ_LOG_NAME = 552, + VAR_DYNLIB = 553, + VAR_DYNLIB_FILE = 554, + VAR_EDNS_CLIENT_STRING = 555, + VAR_EDNS_CLIENT_STRING_OPCODE = 556 }; #endif /* Tokens. */ @@ -588,158 +590,160 @@ extern int yydebug; #define VAR_HTTP_QUERY_BUFFER_SIZE 400 #define VAR_HTTP_RESPONSE_BUFFER_SIZE 401 #define VAR_HTTP_NODELAY 402 -#define VAR_STUB_FIRST 403 -#define VAR_MINIMAL_RESPONSES 404 -#define VAR_RRSET_ROUNDROBIN 405 -#define VAR_MAX_UDP_SIZE 406 -#define VAR_DELAY_CLOSE 407 -#define VAR_UNBLOCK_LAN_ZONES 408 -#define VAR_INSECURE_LAN_ZONES 409 -#define VAR_INFRA_CACHE_MIN_RTT 410 -#define VAR_DNS64_PREFIX 411 -#define VAR_DNS64_SYNTHALL 412 -#define VAR_DNS64_IGNORE_AAAA 413 -#define VAR_DNSTAP 414 -#define VAR_DNSTAP_ENABLE 415 -#define VAR_DNSTAP_SOCKET_PATH 416 -#define VAR_DNSTAP_IP 417 -#define VAR_DNSTAP_TLS 418 -#define VAR_DNSTAP_TLS_SERVER_NAME 419 -#define VAR_DNSTAP_TLS_CERT_BUNDLE 420 -#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 421 -#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 422 -#define VAR_DNSTAP_SEND_IDENTITY 423 -#define VAR_DNSTAP_SEND_VERSION 424 -#define VAR_DNSTAP_BIDIRECTIONAL 425 -#define VAR_DNSTAP_IDENTITY 426 -#define VAR_DNSTAP_VERSION 427 -#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 428 -#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 429 -#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 430 -#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 431 -#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 432 -#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 433 -#define VAR_RESPONSE_IP_TAG 434 -#define VAR_RESPONSE_IP 435 -#define VAR_RESPONSE_IP_DATA 436 -#define VAR_HARDEN_ALGO_DOWNGRADE 437 -#define VAR_IP_TRANSPARENT 438 -#define VAR_IP_DSCP 439 -#define VAR_DISABLE_DNSSEC_LAME_CHECK 440 -#define VAR_IP_RATELIMIT 441 -#define VAR_IP_RATELIMIT_SLABS 442 -#define VAR_IP_RATELIMIT_SIZE 443 -#define VAR_RATELIMIT 444 -#define VAR_RATELIMIT_SLABS 445 -#define VAR_RATELIMIT_SIZE 446 -#define VAR_RATELIMIT_FOR_DOMAIN 447 -#define VAR_RATELIMIT_BELOW_DOMAIN 448 -#define VAR_IP_RATELIMIT_FACTOR 449 -#define VAR_RATELIMIT_FACTOR 450 -#define VAR_SEND_CLIENT_SUBNET 451 -#define VAR_CLIENT_SUBNET_ZONE 452 -#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 453 -#define VAR_CLIENT_SUBNET_OPCODE 454 -#define VAR_MAX_CLIENT_SUBNET_IPV4 455 -#define VAR_MAX_CLIENT_SUBNET_IPV6 456 -#define VAR_MIN_CLIENT_SUBNET_IPV4 457 -#define VAR_MIN_CLIENT_SUBNET_IPV6 458 -#define VAR_MAX_ECS_TREE_SIZE_IPV4 459 -#define VAR_MAX_ECS_TREE_SIZE_IPV6 460 -#define VAR_CAPS_WHITELIST 461 -#define VAR_CACHE_MAX_NEGATIVE_TTL 462 -#define VAR_PERMIT_SMALL_HOLDDOWN 463 -#define VAR_QNAME_MINIMISATION 464 -#define VAR_QNAME_MINIMISATION_STRICT 465 -#define VAR_IP_FREEBIND 466 -#define VAR_DEFINE_TAG 467 -#define VAR_LOCAL_ZONE_TAG 468 -#define VAR_ACCESS_CONTROL_TAG 469 -#define VAR_LOCAL_ZONE_OVERRIDE 470 -#define VAR_ACCESS_CONTROL_TAG_ACTION 471 -#define VAR_ACCESS_CONTROL_TAG_DATA 472 -#define VAR_VIEW 473 -#define VAR_ACCESS_CONTROL_VIEW 474 -#define VAR_VIEW_FIRST 475 -#define VAR_SERVE_EXPIRED 476 -#define VAR_SERVE_EXPIRED_TTL 477 -#define VAR_SERVE_EXPIRED_TTL_RESET 478 -#define VAR_SERVE_EXPIRED_REPLY_TTL 479 -#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 480 -#define VAR_FAKE_DSA 481 -#define VAR_FAKE_SHA1 482 -#define VAR_LOG_IDENTITY 483 -#define VAR_HIDE_TRUSTANCHOR 484 -#define VAR_TRUST_ANCHOR_SIGNALING 485 -#define VAR_AGGRESSIVE_NSEC 486 -#define VAR_USE_SYSTEMD 487 -#define VAR_SHM_ENABLE 488 -#define VAR_SHM_KEY 489 -#define VAR_ROOT_KEY_SENTINEL 490 -#define VAR_DNSCRYPT 491 -#define VAR_DNSCRYPT_ENABLE 492 -#define VAR_DNSCRYPT_PORT 493 -#define VAR_DNSCRYPT_PROVIDER 494 -#define VAR_DNSCRYPT_SECRET_KEY 495 -#define VAR_DNSCRYPT_PROVIDER_CERT 496 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 497 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 498 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 499 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 500 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 501 -#define VAR_IPSECMOD_ENABLED 502 -#define VAR_IPSECMOD_HOOK 503 -#define VAR_IPSECMOD_IGNORE_BOGUS 504 -#define VAR_IPSECMOD_MAX_TTL 505 -#define VAR_IPSECMOD_WHITELIST 506 -#define VAR_IPSECMOD_STRICT 507 -#define VAR_CACHEDB 508 -#define VAR_CACHEDB_BACKEND 509 -#define VAR_CACHEDB_SECRETSEED 510 -#define VAR_CACHEDB_REDISHOST 511 -#define VAR_CACHEDB_REDISPORT 512 -#define VAR_CACHEDB_REDISTIMEOUT 513 -#define VAR_CACHEDB_REDISEXPIRERECORDS 514 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 515 -#define VAR_FOR_UPSTREAM 516 -#define VAR_AUTH_ZONE 517 -#define VAR_ZONEFILE 518 -#define VAR_MASTER 519 -#define VAR_URL 520 -#define VAR_FOR_DOWNSTREAM 521 -#define VAR_FALLBACK_ENABLED 522 -#define VAR_TLS_ADDITIONAL_PORT 523 -#define VAR_LOW_RTT 524 -#define VAR_LOW_RTT_PERMIL 525 -#define VAR_FAST_SERVER_PERMIL 526 -#define VAR_FAST_SERVER_NUM 527 -#define VAR_ALLOW_NOTIFY 528 -#define VAR_TLS_WIN_CERT 529 -#define VAR_TCP_CONNECTION_LIMIT 530 -#define VAR_FORWARD_NO_CACHE 531 -#define VAR_STUB_NO_CACHE 532 -#define VAR_LOG_SERVFAIL 533 -#define VAR_DENY_ANY 534 -#define VAR_UNKNOWN_SERVER_TIME_LIMIT 535 -#define VAR_LOG_TAG_QUERYREPLY 536 -#define VAR_STREAM_WAIT_SIZE 537 -#define VAR_TLS_CIPHERS 538 -#define VAR_TLS_CIPHERSUITES 539 -#define VAR_TLS_USE_SNI 540 -#define VAR_IPSET 541 -#define VAR_IPSET_NAME_V4 542 -#define VAR_IPSET_NAME_V6 543 -#define VAR_TLS_SESSION_TICKET_KEYS 544 -#define VAR_RPZ 545 -#define VAR_TAGS 546 -#define VAR_RPZ_ACTION_OVERRIDE 547 -#define VAR_RPZ_CNAME_OVERRIDE 548 -#define VAR_RPZ_LOG 549 -#define VAR_RPZ_LOG_NAME 550 -#define VAR_DYNLIB 551 -#define VAR_DYNLIB_FILE 552 -#define VAR_EDNS_CLIENT_STRING 553 -#define VAR_EDNS_CLIENT_STRING_OPCODE 554 +#define VAR_HTTP_NOTLS_DOWNSTREAM 403 +#define VAR_STUB_FIRST 404 +#define VAR_MINIMAL_RESPONSES 405 +#define VAR_RRSET_ROUNDROBIN 406 +#define VAR_MAX_UDP_SIZE 407 +#define VAR_DELAY_CLOSE 408 +#define VAR_UNBLOCK_LAN_ZONES 409 +#define VAR_INSECURE_LAN_ZONES 410 +#define VAR_INFRA_CACHE_MIN_RTT 411 +#define VAR_INFRA_KEEP_PROBING 412 +#define VAR_DNS64_PREFIX 413 +#define VAR_DNS64_SYNTHALL 414 +#define VAR_DNS64_IGNORE_AAAA 415 +#define VAR_DNSTAP 416 +#define VAR_DNSTAP_ENABLE 417 +#define VAR_DNSTAP_SOCKET_PATH 418 +#define VAR_DNSTAP_IP 419 +#define VAR_DNSTAP_TLS 420 +#define VAR_DNSTAP_TLS_SERVER_NAME 421 +#define VAR_DNSTAP_TLS_CERT_BUNDLE 422 +#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 423 +#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 424 +#define VAR_DNSTAP_SEND_IDENTITY 425 +#define VAR_DNSTAP_SEND_VERSION 426 +#define VAR_DNSTAP_BIDIRECTIONAL 427 +#define VAR_DNSTAP_IDENTITY 428 +#define VAR_DNSTAP_VERSION 429 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 430 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 431 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 432 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 433 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 434 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 435 +#define VAR_RESPONSE_IP_TAG 436 +#define VAR_RESPONSE_IP 437 +#define VAR_RESPONSE_IP_DATA 438 +#define VAR_HARDEN_ALGO_DOWNGRADE 439 +#define VAR_IP_TRANSPARENT 440 +#define VAR_IP_DSCP 441 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 442 +#define VAR_IP_RATELIMIT 443 +#define VAR_IP_RATELIMIT_SLABS 444 +#define VAR_IP_RATELIMIT_SIZE 445 +#define VAR_RATELIMIT 446 +#define VAR_RATELIMIT_SLABS 447 +#define VAR_RATELIMIT_SIZE 448 +#define VAR_RATELIMIT_FOR_DOMAIN 449 +#define VAR_RATELIMIT_BELOW_DOMAIN 450 +#define VAR_IP_RATELIMIT_FACTOR 451 +#define VAR_RATELIMIT_FACTOR 452 +#define VAR_SEND_CLIENT_SUBNET 453 +#define VAR_CLIENT_SUBNET_ZONE 454 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 455 +#define VAR_CLIENT_SUBNET_OPCODE 456 +#define VAR_MAX_CLIENT_SUBNET_IPV4 457 +#define VAR_MAX_CLIENT_SUBNET_IPV6 458 +#define VAR_MIN_CLIENT_SUBNET_IPV4 459 +#define VAR_MIN_CLIENT_SUBNET_IPV6 460 +#define VAR_MAX_ECS_TREE_SIZE_IPV4 461 +#define VAR_MAX_ECS_TREE_SIZE_IPV6 462 +#define VAR_CAPS_WHITELIST 463 +#define VAR_CACHE_MAX_NEGATIVE_TTL 464 +#define VAR_PERMIT_SMALL_HOLDDOWN 465 +#define VAR_QNAME_MINIMISATION 466 +#define VAR_QNAME_MINIMISATION_STRICT 467 +#define VAR_IP_FREEBIND 468 +#define VAR_DEFINE_TAG 469 +#define VAR_LOCAL_ZONE_TAG 470 +#define VAR_ACCESS_CONTROL_TAG 471 +#define VAR_LOCAL_ZONE_OVERRIDE 472 +#define VAR_ACCESS_CONTROL_TAG_ACTION 473 +#define VAR_ACCESS_CONTROL_TAG_DATA 474 +#define VAR_VIEW 475 +#define VAR_ACCESS_CONTROL_VIEW 476 +#define VAR_VIEW_FIRST 477 +#define VAR_SERVE_EXPIRED 478 +#define VAR_SERVE_EXPIRED_TTL 479 +#define VAR_SERVE_EXPIRED_TTL_RESET 480 +#define VAR_SERVE_EXPIRED_REPLY_TTL 481 +#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 482 +#define VAR_FAKE_DSA 483 +#define VAR_FAKE_SHA1 484 +#define VAR_LOG_IDENTITY 485 +#define VAR_HIDE_TRUSTANCHOR 486 +#define VAR_TRUST_ANCHOR_SIGNALING 487 +#define VAR_AGGRESSIVE_NSEC 488 +#define VAR_USE_SYSTEMD 489 +#define VAR_SHM_ENABLE 490 +#define VAR_SHM_KEY 491 +#define VAR_ROOT_KEY_SENTINEL 492 +#define VAR_DNSCRYPT 493 +#define VAR_DNSCRYPT_ENABLE 494 +#define VAR_DNSCRYPT_PORT 495 +#define VAR_DNSCRYPT_PROVIDER 496 +#define VAR_DNSCRYPT_SECRET_KEY 497 +#define VAR_DNSCRYPT_PROVIDER_CERT 498 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 499 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 500 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 501 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 502 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 503 +#define VAR_IPSECMOD_ENABLED 504 +#define VAR_IPSECMOD_HOOK 505 +#define VAR_IPSECMOD_IGNORE_BOGUS 506 +#define VAR_IPSECMOD_MAX_TTL 507 +#define VAR_IPSECMOD_WHITELIST 508 +#define VAR_IPSECMOD_STRICT 509 +#define VAR_CACHEDB 510 +#define VAR_CACHEDB_BACKEND 511 +#define VAR_CACHEDB_SECRETSEED 512 +#define VAR_CACHEDB_REDISHOST 513 +#define VAR_CACHEDB_REDISPORT 514 +#define VAR_CACHEDB_REDISTIMEOUT 515 +#define VAR_CACHEDB_REDISEXPIRERECORDS 516 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 517 +#define VAR_FOR_UPSTREAM 518 +#define VAR_AUTH_ZONE 519 +#define VAR_ZONEFILE 520 +#define VAR_MASTER 521 +#define VAR_URL 522 +#define VAR_FOR_DOWNSTREAM 523 +#define VAR_FALLBACK_ENABLED 524 +#define VAR_TLS_ADDITIONAL_PORT 525 +#define VAR_LOW_RTT 526 +#define VAR_LOW_RTT_PERMIL 527 +#define VAR_FAST_SERVER_PERMIL 528 +#define VAR_FAST_SERVER_NUM 529 +#define VAR_ALLOW_NOTIFY 530 +#define VAR_TLS_WIN_CERT 531 +#define VAR_TCP_CONNECTION_LIMIT 532 +#define VAR_FORWARD_NO_CACHE 533 +#define VAR_STUB_NO_CACHE 534 +#define VAR_LOG_SERVFAIL 535 +#define VAR_DENY_ANY 536 +#define VAR_UNKNOWN_SERVER_TIME_LIMIT 537 +#define VAR_LOG_TAG_QUERYREPLY 538 +#define VAR_STREAM_WAIT_SIZE 539 +#define VAR_TLS_CIPHERS 540 +#define VAR_TLS_CIPHERSUITES 541 +#define VAR_TLS_USE_SNI 542 +#define VAR_IPSET 543 +#define VAR_IPSET_NAME_V4 544 +#define VAR_IPSET_NAME_V6 545 +#define VAR_TLS_SESSION_TICKET_KEYS 546 +#define VAR_RPZ 547 +#define VAR_TAGS 548 +#define VAR_RPZ_ACTION_OVERRIDE 549 +#define VAR_RPZ_CNAME_OVERRIDE 550 +#define VAR_RPZ_LOG 551 +#define VAR_RPZ_LOG_NAME 552 +#define VAR_DYNLIB 553 +#define VAR_DYNLIB_FILE 554 +#define VAR_EDNS_CLIENT_STRING 555 +#define VAR_EDNS_CLIENT_STRING_OPCODE 556 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -749,7 +753,7 @@ union YYSTYPE char* str; -#line 753 "util/configparser.c" +#line 757 "util/configparser.c" }; typedef union YYSTYPE YYSTYPE; @@ -1068,19 +1072,19 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 635 +#define YYLAST 639 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 300 +#define YYNTOKENS 302 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 325 +#define YYNNTS 327 /* YYNRULES -- Number of rules. */ -#define YYNRULES 626 +#define YYNRULES 630 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 930 +#define YYNSTATES 936 #define YYUNDEFTOK 2 -#define YYMAXUTOK 554 +#define YYMAXUTOK 556 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM @@ -1147,7 +1151,7 @@ static const yytype_int16 yytranslate[] = 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299 + 295, 296, 297, 298, 299, 300, 301 }; #if YYDEBUG @@ -1167,56 +1171,57 @@ static const yytype_int16 yyrline[] = 240, 241, 241, 242, 242, 243, 243, 243, 244, 244, 245, 245, 245, 246, 246, 246, 247, 247, 247, 248, 248, 248, 248, 249, 250, 250, 250, 251, 251, 251, - 252, 252, 253, 254, 254, 254, 255, 255, 256, 256, - 257, 257, 257, 258, 258, 259, 259, 259, 260, 261, - 261, 262, 262, 263, 264, 264, 265, 265, 266, 266, - 267, 268, 268, 269, 269, 270, 270, 271, 271, 272, - 272, 273, 273, 273, 274, 274, 275, 275, 276, 276, - 277, 277, 278, 278, 279, 279, 280, 280, 280, 281, - 281, 281, 282, 282, 282, 283, 283, 284, 285, 285, - 286, 286, 287, 287, 288, 288, 289, 289, 289, 290, - 290, 290, 291, 291, 291, 292, 292, 293, 293, 294, - 294, 295, 295, 296, 298, 310, 311, 312, 312, 312, - 312, 312, 313, 313, 315, 327, 328, 329, 329, 329, - 329, 330, 330, 332, 346, 347, 348, 348, 348, 348, - 349, 349, 349, 351, 368, 369, 370, 370, 370, 370, - 371, 371, 371, 372, 375, 394, 411, 419, 429, 437, - 454, 455, 456, 456, 456, 456, 456, 457, 457, 457, - 458, 458, 460, 469, 478, 489, 498, 507, 516, 527, - 536, 548, 562, 577, 588, 605, 622, 639, 656, 671, - 686, 699, 714, 723, 732, 741, 750, 759, 768, 777, - 786, 795, 804, 813, 822, 831, 840, 853, 862, 875, - 884, 893, 902, 909, 916, 925, 932, 941, 949, 956, - 963, 971, 980, 987, 1003, 1011, 1019, 1027, 1035, 1044, - 1053, 1067, 1076, 1085, 1094, 1103, 1112, 1121, 1128, 1135, - 1161, 1169, 1176, 1183, 1190, 1197, 1205, 1213, 1221, 1228, - 1239, 1250, 1257, 1266, 1275, 1284, 1291, 1298, 1306, 1314, - 1324, 1334, 1344, 1358, 1366, 1379, 1390, 1398, 1411, 1420, - 1429, 1438, 1448, 1458, 1466, 1479, 1488, 1496, 1505, 1513, - 1526, 1535, 1542, 1552, 1562, 1572, 1582, 1592, 1602, 1612, - 1622, 1629, 1636, 1643, 1652, 1661, 1670, 1679, 1686, 1696, - 1716, 1723, 1741, 1754, 1767, 1776, 1785, 1794, 1803, 1813, - 1823, 1834, 1843, 1852, 1861, 1870, 1879, 1888, 1901, 1914, - 1923, 1930, 1939, 1948, 1957, 1966, 1974, 1987, 1995, 2036, - 2043, 2058, 2068, 2078, 2085, 2092, 2099, 2108, 2116, 2130, - 2151, 2172, 2184, 2196, 2208, 2217, 2238, 2248, 2257, 2265, - 2273, 2286, 2299, 2314, 2329, 2338, 2347, 2353, 2362, 2371, - 2381, 2391, 2404, 2417, 2429, 2443, 2455, 2469, 2478, 2489, - 2499, 2506, 2513, 2522, 2531, 2541, 2551, 2561, 2568, 2575, - 2584, 2593, 2603, 2613, 2620, 2627, 2634, 2642, 2652, 2662, - 2672, 2682, 2721, 2731, 2739, 2747, 2762, 2771, 2776, 2777, - 2778, 2778, 2778, 2779, 2779, 2779, 2780, 2780, 2782, 2792, - 2801, 2808, 2815, 2822, 2829, 2836, 2843, 2848, 2849, 2850, - 2850, 2850, 2851, 2851, 2851, 2852, 2853, 2853, 2854, 2854, - 2855, 2855, 2856, 2857, 2858, 2859, 2860, 2861, 2863, 2872, - 2882, 2889, 2896, 2905, 2912, 2919, 2926, 2933, 2942, 2951, - 2958, 2965, 2975, 2985, 2995, 3005, 3015, 3025, 3030, 3031, - 3032, 3034, 3040, 3045, 3046, 3047, 3049, 3055, 3065, 3072, - 3081, 3089, 3094, 3095, 3097, 3097, 3097, 3098, 3098, 3099, - 3100, 3101, 3102, 3103, 3105, 3115, 3124, 3131, 3140, 3147, - 3156, 3164, 3177, 3185, 3198, 3203, 3204, 3205, 3205, 3206, - 3206, 3206, 3207, 3209, 3221, 3233, 3245, 3260, 3273, 3286, - 3297, 3302, 3303, 3304, 3304, 3306, 3321 + 252, 252, 253, 253, 254, 254, 254, 255, 255, 256, + 256, 257, 257, 257, 258, 258, 259, 259, 259, 260, + 260, 261, 261, 262, 262, 263, 264, 264, 265, 265, + 266, 266, 267, 268, 268, 269, 269, 270, 270, 271, + 271, 272, 272, 273, 273, 273, 274, 274, 275, 275, + 276, 276, 277, 277, 278, 278, 279, 279, 280, 280, + 280, 281, 281, 281, 282, 282, 282, 283, 283, 284, + 285, 285, 286, 286, 287, 287, 288, 288, 289, 289, + 289, 290, 290, 290, 291, 291, 291, 292, 292, 293, + 293, 294, 294, 295, 295, 296, 298, 310, 311, 312, + 312, 312, 312, 312, 313, 313, 315, 327, 328, 329, + 329, 329, 329, 330, 330, 332, 346, 347, 348, 348, + 348, 348, 349, 349, 349, 351, 368, 369, 370, 370, + 370, 370, 371, 371, 371, 372, 375, 394, 411, 419, + 429, 437, 454, 455, 456, 456, 456, 456, 456, 457, + 457, 457, 458, 458, 460, 469, 478, 489, 498, 507, + 516, 527, 536, 548, 562, 577, 588, 605, 622, 639, + 656, 671, 686, 699, 714, 723, 732, 741, 750, 759, + 768, 777, 786, 795, 804, 813, 822, 831, 840, 853, + 862, 875, 884, 893, 902, 909, 916, 925, 932, 941, + 949, 956, 963, 971, 980, 988, 1004, 1012, 1020, 1028, + 1036, 1044, 1053, 1062, 1076, 1085, 1094, 1103, 1112, 1121, + 1130, 1137, 1144, 1170, 1178, 1185, 1192, 1199, 1206, 1214, + 1222, 1230, 1237, 1248, 1259, 1266, 1275, 1284, 1293, 1300, + 1307, 1315, 1323, 1333, 1343, 1353, 1367, 1375, 1388, 1399, + 1407, 1420, 1429, 1438, 1447, 1457, 1467, 1475, 1488, 1497, + 1505, 1514, 1522, 1535, 1544, 1554, 1561, 1571, 1581, 1591, + 1601, 1611, 1621, 1631, 1641, 1648, 1655, 1662, 1671, 1680, + 1689, 1698, 1705, 1715, 1735, 1742, 1760, 1773, 1786, 1795, + 1804, 1813, 1822, 1832, 1842, 1853, 1862, 1871, 1880, 1889, + 1898, 1907, 1920, 1933, 1942, 1949, 1958, 1967, 1976, 1985, + 1993, 2006, 2014, 2055, 2062, 2077, 2087, 2097, 2104, 2111, + 2118, 2127, 2135, 2149, 2170, 2191, 2203, 2215, 2227, 2236, + 2257, 2267, 2276, 2284, 2292, 2305, 2318, 2333, 2348, 2357, + 2366, 2372, 2381, 2390, 2400, 2410, 2423, 2436, 2448, 2462, + 2474, 2488, 2497, 2508, 2518, 2525, 2532, 2541, 2550, 2560, + 2570, 2580, 2587, 2594, 2603, 2612, 2622, 2632, 2639, 2646, + 2653, 2661, 2671, 2681, 2691, 2701, 2740, 2750, 2758, 2766, + 2781, 2790, 2795, 2796, 2797, 2797, 2797, 2798, 2798, 2798, + 2799, 2799, 2801, 2811, 2820, 2827, 2834, 2841, 2848, 2855, + 2862, 2867, 2868, 2869, 2869, 2869, 2870, 2870, 2870, 2871, + 2872, 2872, 2873, 2873, 2874, 2874, 2875, 2876, 2877, 2878, + 2879, 2880, 2882, 2891, 2901, 2908, 2915, 2924, 2931, 2938, + 2945, 2952, 2961, 2970, 2977, 2984, 2994, 3004, 3014, 3024, + 3034, 3044, 3049, 3050, 3051, 3053, 3059, 3064, 3065, 3066, + 3068, 3074, 3084, 3091, 3100, 3108, 3113, 3114, 3116, 3116, + 3116, 3117, 3117, 3118, 3119, 3120, 3121, 3122, 3124, 3134, + 3143, 3150, 3159, 3166, 3175, 3183, 3196, 3204, 3217, 3222, + 3223, 3224, 3224, 3225, 3225, 3225, 3226, 3228, 3240, 3252, + 3264, 3279, 3292, 3305, 3316, 3321, 3322, 3323, 3323, 3325, + 3340 }; #endif @@ -1273,16 +1278,17 @@ static const char *const yytname[] = "VAR_FORWARD_SSL_UPSTREAM", "VAR_TLS_CERT_BUNDLE", "VAR_HTTPS_PORT", "VAR_HTTP_ENDPOINT", "VAR_HTTP_MAX_STREAMS", "VAR_HTTP_QUERY_BUFFER_SIZE", "VAR_HTTP_RESPONSE_BUFFER_SIZE", - "VAR_HTTP_NODELAY", "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES", - "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE", - "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES", - "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", "VAR_DNS64_SYNTHALL", - "VAR_DNS64_IGNORE_AAAA", "VAR_DNSTAP", "VAR_DNSTAP_ENABLE", - "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_IP", "VAR_DNSTAP_TLS", - "VAR_DNSTAP_TLS_SERVER_NAME", "VAR_DNSTAP_TLS_CERT_BUNDLE", - "VAR_DNSTAP_TLS_CLIENT_KEY_FILE", "VAR_DNSTAP_TLS_CLIENT_CERT_FILE", - "VAR_DNSTAP_SEND_IDENTITY", "VAR_DNSTAP_SEND_VERSION", - "VAR_DNSTAP_BIDIRECTIONAL", "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION", + "VAR_HTTP_NODELAY", "VAR_HTTP_NOTLS_DOWNSTREAM", "VAR_STUB_FIRST", + "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", + "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES", + "VAR_INFRA_CACHE_MIN_RTT", "VAR_INFRA_KEEP_PROBING", "VAR_DNS64_PREFIX", + "VAR_DNS64_SYNTHALL", "VAR_DNS64_IGNORE_AAAA", "VAR_DNSTAP", + "VAR_DNSTAP_ENABLE", "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_IP", + "VAR_DNSTAP_TLS", "VAR_DNSTAP_TLS_SERVER_NAME", + "VAR_DNSTAP_TLS_CERT_BUNDLE", "VAR_DNSTAP_TLS_CLIENT_KEY_FILE", + "VAR_DNSTAP_TLS_CLIENT_CERT_FILE", "VAR_DNSTAP_SEND_IDENTITY", + "VAR_DNSTAP_SEND_VERSION", "VAR_DNSTAP_BIDIRECTIONAL", + "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION", "VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES", "VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES", "VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES", @@ -1367,28 +1373,29 @@ static const char *const yytname[] = "server_tls_use_sni", "server_https_port", "server_http_endpoint", "server_http_max_streams", "server_http_query_buffer_size", "server_http_response_buffer_size", "server_http_nodelay", - "server_use_systemd", "server_do_daemonize", "server_use_syslog", - "server_log_time_ascii", "server_log_queries", "server_log_replies", - "server_log_tag_queryreply", "server_log_servfail", - "server_log_local_actions", "server_chroot", "server_username", - "server_directory", "server_logfile", "server_pidfile", - "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor", - "server_auto_trust_anchor_file", "server_trust_anchor_file", - "server_trusted_keys_file", "server_trust_anchor", - "server_trust_anchor_signaling", "server_root_key_sentinel", - "server_domain_insecure", "server_hide_identity", "server_hide_version", - "server_hide_trustanchor", "server_identity", "server_version", - "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport", - "server_ip_transparent", "server_ip_freebind", "server_ip_dscp", - "server_stream_wait_size", "server_edns_buffer_size", - "server_msg_buffer_size", "server_msg_cache_size", - "server_msg_cache_slabs", "server_num_queries_per_thread", - "server_jostle_timeout", "server_delay_close", - "server_unblock_lan_zones", "server_insecure_lan_zones", - "server_rrset_cache_size", "server_rrset_cache_slabs", - "server_infra_host_ttl", "server_infra_lame_ttl", - "server_infra_cache_numhosts", "server_infra_cache_lame_size", - "server_infra_cache_slabs", "server_infra_cache_min_rtt", + "server_http_notls_downstream", "server_use_systemd", + "server_do_daemonize", "server_use_syslog", "server_log_time_ascii", + "server_log_queries", "server_log_replies", "server_log_tag_queryreply", + "server_log_servfail", "server_log_local_actions", "server_chroot", + "server_username", "server_directory", "server_logfile", + "server_pidfile", "server_root_hints", "server_dlv_anchor_file", + "server_dlv_anchor", "server_auto_trust_anchor_file", + "server_trust_anchor_file", "server_trusted_keys_file", + "server_trust_anchor", "server_trust_anchor_signaling", + "server_root_key_sentinel", "server_domain_insecure", + "server_hide_identity", "server_hide_version", "server_hide_trustanchor", + "server_identity", "server_version", "server_so_rcvbuf", + "server_so_sndbuf", "server_so_reuseport", "server_ip_transparent", + "server_ip_freebind", "server_ip_dscp", "server_stream_wait_size", + "server_edns_buffer_size", "server_msg_buffer_size", + "server_msg_cache_size", "server_msg_cache_slabs", + "server_num_queries_per_thread", "server_jostle_timeout", + "server_delay_close", "server_unblock_lan_zones", + "server_insecure_lan_zones", "server_rrset_cache_size", + "server_rrset_cache_slabs", "server_infra_host_ttl", + "server_infra_lame_ttl", "server_infra_cache_numhosts", + "server_infra_cache_lame_size", "server_infra_cache_slabs", + "server_infra_cache_min_rtt", "server_infra_keep_probing", "server_target_fetch_policy", "server_harden_short_bufsize", "server_harden_large_queries", "server_harden_glue", "server_harden_dnssec_stripped", "server_harden_below_nxdomain", @@ -1504,11 +1511,12 @@ static const yytype_int16 yytoknum[] = 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, - 545, 546, 547, 548, 549, 550, 551, 552, 553, 554 + 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, + 555, 556 }; # endif -#define YYPACT_NINF (-288) +#define YYPACT_NINF (-290) #define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) @@ -1522,99 +1530,100 @@ static const yytype_int16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -288, 0, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, 284, -42, -38, -43, -21, -44, -11, -93, - -109, -287, -212, -237, -279, 3, 4, 13, 25, 26, + -290, 0, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, 286, -42, -38, -43, -21, -44, -11, -95, + -109, -289, -214, -239, -281, 3, 4, 13, 25, 26, 27, 30, 31, 32, 33, 34, 35, 37, 38, 39, 40, 41, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 54, 55, 84, 85, 88, 89, 91, 93, - 94, 95, 97, 98, 99, 100, 101, 103, 104, 105, + 94, 95, 96, 98, 99, 100, 101, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 126, 127, 128, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 150, 151, 152, 153, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 163, 164, 165, 166, 168, 169, + 148, 149, 150, 152, 153, 154, 155, 156, 157, 158, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, - 200, 201, 202, 203, 204, 205, 206, 207, 212, 213, - 214, 215, 216, 217, 218, 220, 221, 222, 223, 224, - 227, 229, 231, 244, 245, 246, 247, 248, 249, 250, - 251, 253, 254, 255, 256, 257, 258, 259, 260, 261, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 214, 215, 216, 217, 218, 219, 220, 222, 223, 224, + 225, 226, 229, 231, 233, 246, 247, 248, 249, 250, + 251, 252, 253, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, - 272, 273, 274, 275, 277, 278, 279, 281, 282, 283, - 285, 319, 320, 321, 322, 326, 327, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - 328, 370, 371, 372, 373, 374, 375, -288, -288, -288, - -288, -288, -288, -288, -288, 376, 377, 378, 382, 386, - 387, -288, -288, -288, -288, -288, -288, -288, 412, 413, - 414, 422, 433, 434, 435, -288, -288, -288, -288, -288, - -288, -288, -288, 436, 437, 438, 439, 440, 441, 442, - 443, -288, -288, -288, -288, -288, -288, -288, -288, -288, - 444, 445, 446, 447, 448, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, 449, 450, 451, 452, - 492, 494, 510, 511, -288, -288, -288, -288, -288, -288, - -288, -288, -288, 512, 513, 514, 515, 516, 517, 518, - 519, 520, 527, 528, 529, 530, 531, 532, 533, 535, - 536, 537, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, 538, -288, -288, 539, -288, -288, 540, 541, - 544, 547, 550, 551, 560, 561, 562, 564, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, 565, - 566, 567, 568, 569, 570, -288, -288, -288, -288, -288, - -288, -288, 571, 574, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, 575, 576, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - 577, 578, 579, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, 580, 581, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, 582, 583, 584, 585, 586, 587, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, 588, -288, -288, - -288, -288, -288, -288, -288, -288, -288, 589, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, 590, -288, -288, 591, 592, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, 593, 594, - 595, -288, -288, -288, -288, -288, -288, -288, -288, -288 + 272, 273, 274, 275, 276, 277, 279, 280, 281, 283, + 284, 285, 287, 321, 322, 323, 324, 328, 329, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, 330, 372, 373, 374, 375, 376, + 377, -290, -290, -290, -290, -290, -290, -290, -290, 378, + 379, 380, 384, 388, 389, -290, -290, -290, -290, -290, + -290, -290, 414, 415, 416, 425, 437, 438, 439, -290, + -290, -290, -290, -290, -290, -290, -290, 440, 441, 442, + 443, 444, 445, 446, 447, -290, -290, -290, -290, -290, + -290, -290, -290, -290, 448, 449, 450, 451, 452, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + 453, 454, 455, 456, 496, 498, 514, 515, -290, -290, + -290, -290, -290, -290, -290, -290, -290, 516, 517, 518, + 519, 520, 521, 522, 523, 524, 531, 532, 533, 534, + 535, 536, 537, 539, 540, 541, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, 542, -290, -290, 543, + -290, -290, 544, 545, 548, 551, 554, 555, 564, 565, + 566, 568, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, 569, 570, 571, 572, 573, 574, -290, + -290, -290, -290, -290, -290, -290, 575, 578, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, 579, 580, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, 581, 582, 583, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, 584, + 585, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + 586, 587, 588, 589, 590, 591, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, 592, -290, -290, -290, -290, -290, -290, + -290, -290, -290, 593, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, 594, + -290, -290, 595, 596, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, 597, 598, 599, -290, -290, -290, + -290, -290, -290, -290, -290, -290 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1622,10 +1631,10 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_int16 yydefact[] = { - 2, 0, 1, 18, 19, 224, 234, 507, 567, 526, - 243, 581, 604, 253, 620, 269, 572, 3, 17, 21, - 226, 236, 245, 255, 271, 509, 528, 569, 574, 583, - 606, 622, 4, 5, 6, 10, 14, 15, 8, 9, + 2, 0, 1, 18, 19, 226, 236, 511, 571, 530, + 245, 585, 608, 255, 624, 271, 576, 3, 17, 21, + 228, 238, 247, 257, 273, 513, 532, 573, 578, 587, + 610, 626, 4, 5, 6, 10, 14, 15, 8, 9, 7, 16, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1646,151 +1655,152 @@ static const yytype_int16 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 20, 22, 23, - 86, 89, 98, 192, 193, 24, 157, 158, 159, 160, - 161, 162, 163, 164, 165, 166, 37, 77, 25, 90, - 91, 48, 70, 85, 26, 27, 30, 31, 28, 29, - 32, 33, 34, 35, 36, 121, 204, 122, 124, 125, - 126, 206, 211, 207, 218, 219, 220, 221, 127, 128, - 129, 130, 131, 132, 188, 87, 76, 102, 119, 120, - 216, 213, 123, 38, 39, 40, 41, 42, 78, 92, - 93, 108, 64, 74, 65, 196, 197, 103, 58, 59, - 195, 60, 61, 112, 116, 136, 145, 171, 148, 217, - 113, 71, 43, 44, 45, 100, 137, 138, 139, 46, - 47, 49, 50, 52, 53, 51, 143, 54, 55, 56, - 62, 81, 117, 95, 144, 88, 167, 96, 97, 114, - 115, 214, 101, 57, 79, 82, 63, 66, 104, 105, - 80, 168, 106, 67, 68, 69, 205, 118, 181, 182, - 183, 184, 185, 186, 194, 107, 75, 109, 110, 111, - 169, 72, 73, 94, 83, 84, 99, 133, 134, 215, - 135, 140, 141, 142, 172, 173, 175, 177, 178, 176, - 179, 189, 146, 147, 151, 152, 149, 150, 153, 154, - 156, 155, 208, 210, 209, 170, 180, 198, 200, 199, - 201, 202, 203, 222, 223, 174, 187, 190, 191, 212, - 0, 0, 0, 0, 0, 0, 0, 225, 227, 228, - 229, 231, 232, 233, 230, 0, 0, 0, 0, 0, - 0, 235, 237, 238, 239, 240, 241, 242, 0, 0, - 0, 0, 0, 0, 0, 244, 246, 247, 250, 251, - 248, 252, 249, 0, 0, 0, 0, 0, 0, 0, - 0, 254, 256, 257, 258, 259, 263, 260, 261, 262, - 0, 0, 0, 0, 0, 274, 278, 279, 280, 281, - 270, 272, 273, 275, 276, 277, 0, 0, 0, 0, - 0, 0, 0, 0, 508, 510, 512, 511, 517, 513, - 514, 515, 516, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, + 22, 23, 86, 89, 98, 194, 195, 24, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 37, 77, + 25, 90, 91, 48, 70, 85, 26, 27, 30, 31, + 28, 29, 32, 33, 34, 35, 36, 121, 206, 122, + 124, 125, 126, 208, 213, 209, 220, 221, 222, 223, + 127, 128, 129, 130, 131, 132, 133, 190, 87, 76, + 102, 119, 120, 218, 215, 123, 38, 39, 40, 41, + 42, 78, 92, 93, 108, 64, 74, 65, 198, 199, + 103, 58, 59, 197, 60, 61, 112, 116, 137, 146, + 173, 149, 219, 113, 71, 43, 44, 45, 100, 138, + 139, 140, 46, 47, 49, 50, 52, 53, 51, 144, + 150, 54, 55, 56, 62, 81, 117, 95, 145, 88, + 169, 96, 97, 114, 115, 216, 101, 57, 79, 82, + 63, 66, 104, 105, 80, 170, 106, 67, 68, 69, + 207, 118, 183, 184, 185, 186, 187, 188, 196, 107, + 75, 109, 110, 111, 171, 72, 73, 94, 83, 84, + 99, 134, 135, 217, 136, 141, 142, 143, 174, 175, + 177, 179, 180, 178, 181, 191, 147, 148, 153, 154, + 151, 152, 155, 156, 158, 157, 210, 212, 211, 172, + 182, 200, 202, 201, 203, 204, 205, 224, 225, 176, + 189, 192, 193, 214, 0, 0, 0, 0, 0, 0, + 0, 227, 229, 230, 231, 233, 234, 235, 232, 0, + 0, 0, 0, 0, 0, 237, 239, 240, 241, 242, + 243, 244, 0, 0, 0, 0, 0, 0, 0, 246, + 248, 249, 252, 253, 250, 254, 251, 0, 0, 0, + 0, 0, 0, 0, 0, 256, 258, 259, 260, 261, + 265, 262, 263, 264, 0, 0, 0, 0, 0, 276, + 280, 281, 282, 283, 272, 274, 275, 277, 278, 279, + 0, 0, 0, 0, 0, 0, 0, 0, 512, 514, + 516, 515, 521, 517, 518, 519, 520, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 527, 529, 531, 530, 532, 533, 534, 535, + 0, 0, 0, 0, 0, 0, 531, 533, 535, 534, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, - 546, 547, 0, 568, 570, 0, 573, 575, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 582, 584, - 585, 586, 588, 589, 587, 590, 591, 592, 593, 0, - 0, 0, 0, 0, 0, 605, 607, 608, 609, 610, - 611, 612, 0, 0, 621, 623, 624, 283, 282, 289, - 302, 300, 312, 308, 309, 313, 310, 311, 314, 315, - 316, 317, 318, 347, 348, 349, 350, 351, 376, 377, - 378, 383, 384, 305, 385, 386, 389, 387, 388, 391, - 392, 393, 407, 362, 363, 365, 366, 394, 410, 356, - 358, 411, 417, 418, 419, 306, 375, 435, 436, 357, - 430, 340, 301, 352, 408, 414, 395, 0, 0, 439, - 307, 284, 339, 399, 285, 303, 304, 353, 354, 437, - 397, 401, 402, 286, 440, 379, 406, 341, 361, 412, - 413, 416, 429, 355, 433, 431, 432, 367, 374, 403, - 404, 368, 369, 396, 421, 342, 343, 346, 319, 321, - 322, 323, 324, 325, 332, 333, 334, 335, 336, 337, - 441, 442, 444, 380, 381, 382, 390, 445, 446, 447, - 0, 0, 0, 398, 370, 372, 577, 456, 460, 458, - 457, 461, 459, 0, 0, 464, 465, 290, 291, 292, - 293, 294, 295, 296, 297, 298, 299, 400, 415, 434, - 469, 470, 371, 448, 0, 0, 0, 0, 0, 0, - 422, 423, 424, 425, 426, 427, 428, 578, 364, 359, - 420, 338, 287, 288, 360, 471, 473, 472, 474, 475, - 476, 320, 327, 466, 468, 467, 326, 0, 345, 405, - 443, 344, 373, 328, 329, 331, 330, 0, 478, 479, - 480, 481, 485, 484, 482, 483, 486, 487, 488, 489, - 491, 490, 500, 0, 504, 505, 0, 0, 506, 492, - 498, 493, 494, 495, 497, 499, 496, 264, 265, 266, - 267, 268, 518, 520, 519, 522, 523, 524, 525, 521, - 548, 550, 551, 552, 553, 554, 555, 556, 557, 558, - 549, 559, 560, 561, 562, 563, 564, 565, 566, 571, - 576, 594, 595, 596, 599, 597, 598, 600, 601, 602, - 603, 613, 614, 615, 616, 617, 618, 625, 626, 409, - 438, 455, 579, 580, 462, 463, 449, 450, 0, 0, - 0, 454, 619, 477, 501, 502, 503, 453, 451, 452 + 546, 547, 548, 549, 550, 551, 0, 572, 574, 0, + 577, 579, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 586, 588, 589, 590, 592, 593, 591, 594, + 595, 596, 597, 0, 0, 0, 0, 0, 0, 609, + 611, 612, 613, 614, 615, 616, 0, 0, 625, 627, + 628, 285, 284, 291, 304, 302, 314, 310, 311, 315, + 312, 313, 316, 317, 318, 319, 320, 350, 351, 352, + 353, 354, 379, 380, 381, 386, 387, 307, 388, 389, + 392, 390, 391, 395, 396, 397, 411, 365, 366, 368, + 369, 398, 414, 359, 361, 415, 421, 422, 423, 308, + 378, 439, 440, 360, 434, 343, 303, 355, 412, 418, + 399, 0, 0, 443, 309, 286, 342, 403, 287, 305, + 306, 356, 357, 441, 401, 405, 406, 288, 444, 382, + 410, 344, 364, 416, 417, 420, 433, 358, 437, 435, + 436, 370, 377, 407, 408, 371, 372, 400, 425, 345, + 346, 349, 321, 323, 324, 325, 326, 327, 334, 335, + 336, 337, 338, 339, 340, 445, 446, 448, 383, 384, + 385, 393, 394, 449, 450, 451, 0, 0, 0, 402, + 373, 375, 581, 460, 464, 462, 461, 465, 463, 0, + 0, 468, 469, 292, 293, 294, 295, 296, 297, 298, + 299, 300, 301, 404, 419, 438, 473, 474, 374, 452, + 0, 0, 0, 0, 0, 0, 426, 427, 428, 429, + 430, 431, 432, 582, 367, 362, 424, 341, 289, 290, + 363, 475, 477, 476, 478, 479, 480, 322, 329, 470, + 472, 471, 328, 0, 348, 409, 447, 347, 376, 330, + 331, 333, 332, 0, 482, 483, 484, 485, 489, 488, + 486, 487, 490, 491, 492, 493, 495, 494, 504, 0, + 508, 509, 0, 0, 510, 496, 502, 497, 498, 499, + 501, 503, 500, 266, 267, 268, 269, 270, 522, 524, + 523, 526, 527, 528, 529, 525, 552, 554, 555, 556, + 557, 558, 559, 560, 561, 562, 553, 563, 564, 565, + 566, 567, 568, 569, 570, 575, 580, 598, 599, 600, + 603, 601, 602, 604, 605, 606, 607, 617, 618, 619, + 620, 621, 622, 629, 630, 413, 442, 459, 583, 584, + 466, 467, 453, 454, 0, 0, 0, 458, 623, 481, + 505, 506, 507, 457, 455, 456 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, 572, 573, 596, - 597, 598, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288 + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, 576, + 577, 600, 601, 602, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, + -290, -290, -290, -290, -290, -290, -290 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 17, 18, 19, 32, 247, 20, 33, 457, - 21, 34, 471, 22, 35, 485, 23, 36, 501, 515, - 516, 517, 518, 519, 24, 37, 520, 248, 249, 250, - 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, - 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, - 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, - 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, - 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, - 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, - 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, - 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, - 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, - 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, - 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, - 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, - 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, - 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, - 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, - 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, - 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, - 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, - 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, - 441, 442, 443, 444, 458, 459, 460, 461, 462, 463, - 464, 472, 473, 474, 475, 476, 477, 502, 503, 504, - 505, 506, 507, 508, 509, 486, 487, 488, 489, 490, - 491, 492, 25, 38, 534, 535, 536, 537, 538, 539, - 540, 541, 542, 26, 39, 562, 563, 564, 565, 566, - 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, - 577, 578, 579, 580, 581, 27, 40, 583, 584, 28, - 41, 586, 587, 445, 446, 447, 448, 29, 42, 598, - 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, - 30, 43, 615, 616, 617, 618, 619, 620, 621, 449, - 31, 44, 624, 625, 626 + -1, 1, 17, 18, 19, 32, 249, 20, 33, 461, + 21, 34, 475, 22, 35, 489, 23, 36, 505, 519, + 520, 521, 522, 523, 24, 37, 524, 250, 251, 252, + 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, + 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, + 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, + 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, + 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, + 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, + 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, + 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, + 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, + 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, + 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, + 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, + 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, + 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, + 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, + 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, + 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, + 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, + 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, + 443, 444, 445, 446, 447, 448, 462, 463, 464, 465, + 466, 467, 468, 476, 477, 478, 479, 480, 481, 506, + 507, 508, 509, 510, 511, 512, 513, 490, 491, 492, + 493, 494, 495, 496, 25, 38, 538, 539, 540, 541, + 542, 543, 544, 545, 546, 26, 39, 566, 567, 568, + 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, + 579, 580, 581, 582, 583, 584, 585, 27, 40, 587, + 588, 28, 41, 590, 591, 449, 450, 451, 452, 29, + 42, 602, 603, 604, 605, 606, 607, 608, 609, 610, + 611, 612, 30, 43, 619, 620, 621, 622, 623, 624, + 625, 453, 31, 44, 628, 629, 630 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1798,149 +1808,149 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 2, 493, 478, 450, 582, 451, 452, 465, 622, 623, - 585, 3, 4, 627, 628, 466, 467, 609, 610, 611, - 612, 613, 614, 629, 493, 588, 589, 590, 591, 592, - 593, 594, 595, 596, 597, 630, 631, 632, 479, 480, - 633, 634, 635, 636, 637, 638, 5, 639, 640, 641, - 642, 643, 6, 644, 645, 646, 647, 648, 649, 650, - 651, 652, 653, 481, 654, 655, 453, 543, 544, 545, - 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, - 556, 557, 558, 559, 560, 561, 526, 527, 528, 529, - 530, 531, 532, 533, 656, 657, 7, 454, 658, 659, - 468, 660, 469, 661, 662, 663, 455, 664, 665, 666, - 667, 668, 8, 669, 670, 671, 672, 673, 674, 675, - 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, - 686, 687, 688, 689, 690, 691, 692, 482, 483, 693, - 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, - 704, 705, 706, 707, 708, 709, 710, 711, 712, 9, - 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, - 723, 724, 725, 726, 727, 728, 729, 484, 730, 731, - 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, - 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, - 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, - 762, 763, 764, 765, 766, 767, 768, 769, 10, 495, - 496, 497, 770, 771, 772, 773, 774, 775, 776, 500, - 777, 778, 779, 780, 781, 456, 11, 782, 470, 783, - 494, 784, 495, 496, 497, 498, 499, 510, 511, 512, - 513, 514, 500, 12, 785, 786, 787, 788, 789, 790, - 791, 792, 13, 793, 794, 795, 796, 797, 798, 799, - 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, - 810, 811, 812, 813, 814, 815, 14, 816, 817, 818, - 15, 819, 820, 821, 0, 822, 16, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 823, - 824, 825, 826, 77, 78, 79, 827, 828, 829, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 830, 831, 832, 833, 834, 835, 836, 837, 838, 121, - 122, 123, 839, 124, 125, 126, 840, 841, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 842, 843, 844, 151, 152, 153, 154, 155, - 156, 157, 845, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 846, 847, 848, 849, 850, 851, 852, - 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, - 863, 864, 865, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 866, 207, 867, 208, 209, 210, 211, 212, - 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, - 878, 223, 224, 225, 226, 227, 228, 879, 880, 881, - 882, 883, 884, 885, 229, 886, 887, 888, 889, 890, - 891, 892, 230, 231, 893, 232, 233, 894, 234, 235, - 895, 896, 236, 237, 238, 239, 240, 241, 242, 243, - 897, 898, 899, 244, 900, 901, 902, 903, 904, 905, - 906, 907, 245, 246, 908, 909, 910, 911, 912, 913, - 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, - 924, 925, 926, 927, 928, 929, 0, 0, 0, 521, - 522, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 497, 482, 454, 586, 455, 456, 469, 626, 627, + 589, 3, 4, 631, 632, 470, 471, 613, 614, 615, + 616, 617, 618, 633, 497, 592, 593, 594, 595, 596, + 597, 598, 599, 600, 601, 634, 635, 636, 483, 484, + 637, 638, 639, 640, 641, 642, 5, 643, 644, 645, + 646, 647, 6, 648, 649, 650, 651, 652, 653, 654, + 655, 656, 657, 485, 658, 659, 457, 547, 548, 549, + 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, + 560, 561, 562, 563, 564, 565, 530, 531, 532, 533, + 534, 535, 536, 537, 660, 661, 7, 458, 662, 663, + 472, 664, 473, 665, 666, 667, 668, 459, 669, 670, + 671, 672, 8, 673, 674, 675, 676, 677, 678, 679, + 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, + 690, 691, 692, 693, 694, 695, 696, 697, 698, 486, + 487, 699, 700, 701, 702, 703, 704, 705, 706, 707, + 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, + 718, 9, 719, 720, 721, 722, 723, 724, 725, 726, + 727, 728, 729, 730, 731, 732, 733, 734, 735, 488, + 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, + 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, + 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, + 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, + 10, 499, 500, 501, 776, 777, 778, 779, 780, 781, + 782, 504, 783, 784, 785, 786, 787, 460, 11, 788, + 474, 789, 498, 790, 499, 500, 501, 502, 503, 514, + 515, 516, 517, 518, 504, 12, 791, 792, 793, 794, + 795, 796, 797, 798, 13, 799, 800, 801, 802, 803, + 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, + 814, 815, 816, 817, 818, 819, 820, 821, 14, 822, + 823, 824, 15, 825, 826, 827, 0, 828, 16, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 829, 830, 831, 832, 77, 78, 79, 833, 834, + 835, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 836, 837, 838, 839, 840, 841, 842, 843, + 844, 121, 122, 123, 845, 124, 125, 126, 846, 847, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 150, 848, 849, 850, 151, 152, 153, + 154, 155, 156, 157, 158, 851, 159, 160, 161, 162, + 163, 164, 165, 166, 167, 168, 169, 852, 853, 854, + 855, 856, 857, 858, 859, 860, 861, 862, 863, 864, + 865, 866, 867, 868, 869, 870, 871, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 872, 209, 873, 210, + 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 874, 875, 876, 877, 878, 879, + 880, 881, 882, 883, 884, 225, 226, 227, 228, 229, + 230, 885, 886, 887, 888, 889, 890, 891, 231, 892, + 893, 894, 895, 896, 897, 898, 232, 233, 899, 234, + 235, 900, 236, 237, 901, 902, 238, 239, 240, 241, + 242, 243, 244, 245, 903, 904, 905, 246, 906, 907, + 908, 909, 910, 911, 912, 913, 247, 248, 914, 915, + 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, + 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, + 0, 0, 0, 525, 526, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 523, 524, 525 + 0, 0, 0, 0, 0, 0, 0, 527, 528, 529 }; static const yytype_int16 yycheck[] = { - 0, 45, 45, 45, 113, 47, 48, 45, 287, 288, - 297, 11, 12, 10, 10, 53, 54, 254, 255, 256, - 257, 258, 259, 10, 45, 237, 238, 239, 240, 241, - 242, 243, 244, 245, 246, 10, 10, 10, 81, 82, + 0, 45, 45, 45, 113, 47, 48, 45, 289, 290, + 299, 11, 12, 10, 10, 53, 54, 256, 257, 258, + 259, 260, 261, 10, 45, 239, 240, 241, 242, 243, + 244, 245, 246, 247, 248, 10, 10, 10, 81, 82, 10, 10, 10, 10, 10, 10, 46, 10, 10, 10, 10, 10, 52, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 106, 10, 10, 108, 160, 161, 162, - 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 97, 98, 99, 100, + 10, 10, 10, 106, 10, 10, 108, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 97, 98, 99, 100, 101, 102, 103, 104, 10, 10, 96, 139, 10, 10, - 138, 10, 140, 10, 10, 10, 148, 10, 10, 10, + 138, 10, 140, 10, 10, 10, 10, 149, 10, 10, 10, 10, 112, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 180, 181, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 182, + 183, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 159, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 220, 10, 10, + 10, 161, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 222, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 218, 263, - 264, 265, 10, 10, 10, 10, 10, 10, 10, 273, - 10, 10, 10, 10, 10, 277, 236, 10, 276, 10, - 261, 10, 263, 264, 265, 266, 267, 291, 292, 293, - 294, 295, 273, 253, 10, 10, 10, 10, 10, 10, - 10, 10, 262, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 286, 10, 10, 10, - 290, 10, 10, 10, -1, 10, 296, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 10, - 10, 10, 10, 49, 50, 51, 10, 10, 10, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 105, - 106, 107, 10, 109, 110, 111, 10, 10, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 10, 10, 10, 141, 142, 143, 144, 145, - 146, 147, 10, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 10, 10, 10, 10, 10, 10, 10, + 220, 265, 266, 267, 10, 10, 10, 10, 10, 10, + 10, 275, 10, 10, 10, 10, 10, 279, 238, 10, + 278, 10, 263, 10, 265, 266, 267, 268, 269, 293, + 294, 295, 296, 297, 275, 255, 10, 10, 10, 10, + 10, 10, 10, 10, 264, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 179, 180, 181, 182, 183, 184, 185, - 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 217, 10, 219, 10, 221, 222, 223, 224, 225, - 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 10, 10, 10, 10, 10, 10, 10, 10, 288, 10, + 10, 10, 292, 10, 10, 10, -1, 10, 298, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 10, 10, 10, 10, 49, 50, 51, 10, 10, + 10, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 105, 106, 107, 10, 109, 110, 111, 10, 10, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 10, 10, 10, 141, 142, 143, + 144, 145, 146, 147, 148, 10, 150, 151, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 247, 248, 249, 250, 251, 252, 10, 10, 10, - 10, 10, 10, 10, 260, 10, 10, 10, 10, 10, - 10, 10, 268, 269, 10, 271, 272, 10, 274, 275, - 10, 10, 278, 279, 280, 281, 282, 283, 284, 285, - 10, 10, 10, 289, 10, 10, 10, 10, 10, 10, - 10, 10, 298, 299, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, + 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, + 214, 215, 216, 217, 218, 219, 10, 221, 10, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, + 234, 235, 236, 237, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 249, 250, 251, 252, 253, + 254, 10, 10, 10, 10, 10, 10, 10, 262, 10, + 10, 10, 10, 10, 10, 10, 270, 271, 10, 273, + 274, 10, 276, 277, 10, 10, 280, 281, 282, 283, + 284, 285, 286, 287, 10, 10, 10, 291, 10, 10, + 10, 10, 10, 10, 10, 10, 300, 301, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, -1, -1, -1, 37, - 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + -1, -1, -1, 37, 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 37, 37, 37 + -1, -1, -1, -1, -1, -1, -1, 37, 37, 37 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_int16 yystos[] = { - 0, 301, 0, 11, 12, 46, 52, 96, 112, 159, - 218, 236, 253, 262, 286, 290, 296, 302, 303, 304, - 307, 310, 313, 316, 324, 552, 563, 585, 589, 597, - 610, 620, 305, 308, 311, 314, 317, 325, 553, 564, - 586, 590, 598, 611, 621, 13, 14, 15, 16, 17, + 0, 303, 0, 11, 12, 46, 52, 96, 112, 161, + 220, 238, 255, 264, 288, 292, 298, 304, 305, 306, + 309, 312, 315, 318, 326, 556, 567, 589, 593, 601, + 614, 624, 307, 310, 313, 316, 319, 327, 557, 568, + 590, 594, 602, 615, 625, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 49, 50, 51, @@ -1951,16 +1961,16 @@ static const yytype_int16 yystos[] = 95, 105, 106, 107, 109, 110, 111, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, - 137, 141, 142, 143, 144, 145, 146, 147, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 158, 179, 180, + 137, 141, 142, 143, 144, 145, 146, 147, 148, 150, + 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, - 211, 212, 213, 214, 215, 216, 217, 219, 221, 222, + 211, 212, 213, 214, 215, 216, 217, 218, 219, 221, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, - 233, 234, 235, 247, 248, 249, 250, 251, 252, 260, - 268, 269, 271, 272, 274, 275, 278, 279, 280, 281, - 282, 283, 284, 285, 289, 298, 299, 306, 327, 328, + 233, 234, 235, 236, 237, 249, 250, 251, 252, 253, + 254, 262, 270, 271, 273, 274, 276, 277, 280, 281, + 282, 283, 284, 285, 286, 287, 291, 300, 301, 308, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, @@ -1980,25 +1990,26 @@ static const yytype_int16 yystos[] = 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, - 519, 520, 521, 522, 523, 593, 594, 595, 596, 619, - 45, 47, 48, 108, 139, 148, 277, 309, 524, 525, - 526, 527, 528, 529, 530, 45, 53, 54, 138, 140, - 276, 312, 531, 532, 533, 534, 535, 536, 45, 81, - 82, 106, 180, 181, 220, 315, 545, 546, 547, 548, - 549, 550, 551, 45, 261, 263, 264, 265, 266, 267, - 273, 318, 537, 538, 539, 540, 541, 542, 543, 544, - 291, 292, 293, 294, 295, 319, 320, 321, 322, 323, - 326, 537, 538, 539, 540, 541, 97, 98, 99, 100, - 101, 102, 103, 104, 554, 555, 556, 557, 558, 559, - 560, 561, 562, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 565, 566, 567, 568, 569, 570, 571, 572, + 519, 520, 521, 522, 523, 524, 525, 526, 527, 597, + 598, 599, 600, 623, 45, 47, 48, 108, 139, 149, + 279, 311, 528, 529, 530, 531, 532, 533, 534, 45, + 53, 54, 138, 140, 278, 314, 535, 536, 537, 538, + 539, 540, 45, 81, 82, 106, 182, 183, 222, 317, + 549, 550, 551, 552, 553, 554, 555, 45, 263, 265, + 266, 267, 268, 269, 275, 320, 541, 542, 543, 544, + 545, 546, 547, 548, 293, 294, 295, 296, 297, 321, + 322, 323, 324, 325, 328, 541, 542, 543, 544, 545, + 97, 98, 99, 100, 101, 102, 103, 104, 558, 559, + 560, 561, 562, 563, 564, 565, 566, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, - 583, 584, 113, 587, 588, 297, 591, 592, 237, 238, - 239, 240, 241, 242, 243, 244, 245, 246, 599, 600, - 601, 602, 603, 604, 605, 606, 607, 608, 609, 254, - 255, 256, 257, 258, 259, 612, 613, 614, 615, 616, - 617, 618, 287, 288, 622, 623, 624, 10, 10, 10, + 583, 584, 585, 586, 587, 588, 113, 591, 592, 299, + 595, 596, 239, 240, 241, 242, 243, 244, 245, 246, + 247, 248, 603, 604, 605, 606, 607, 608, 609, 610, + 611, 612, 613, 256, 257, 258, 259, 260, 261, 616, + 617, 618, 619, 620, 621, 622, 289, 290, 626, 627, + 628, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -2028,41 +2039,41 @@ static const yytype_int16 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_int16 yyr1[] = { - 0, 300, 301, 301, 302, 302, 302, 302, 302, 302, - 302, 302, 302, 302, 302, 302, 302, 302, 303, 304, - 305, 305, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 307, 308, 308, 309, 309, 309, - 309, 309, 309, 309, 310, 311, 311, 312, 312, 312, - 312, 312, 312, 313, 314, 314, 315, 315, 315, 315, - 315, 315, 315, 316, 317, 317, 318, 318, 318, 318, - 318, 318, 318, 318, 319, 320, 321, 322, 323, 324, - 325, 325, 326, 326, 326, 326, 326, 326, 326, 326, - 326, 326, 327, 328, 329, 330, 331, 332, 333, 334, + 0, 302, 303, 303, 304, 304, 304, 304, 304, 304, + 304, 304, 304, 304, 304, 304, 304, 304, 305, 306, + 307, 307, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 309, 310, 310, 311, + 311, 311, 311, 311, 311, 311, 312, 313, 313, 314, + 314, 314, 314, 314, 314, 315, 316, 316, 317, 317, + 317, 317, 317, 317, 317, 318, 319, 319, 320, 320, + 320, 320, 320, 320, 320, 320, 321, 322, 323, 324, + 325, 326, 327, 327, 328, 328, 328, 328, 328, 328, + 328, 328, 328, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, @@ -2084,19 +2095,20 @@ static const yytype_int16 yyr1[] = 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, - 545, 546, 547, 548, 549, 550, 551, 552, 553, 553, - 554, 554, 554, 554, 554, 554, 554, 554, 555, 556, - 557, 558, 559, 560, 561, 562, 563, 564, 564, 565, - 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, - 565, 565, 565, 565, 565, 565, 565, 565, 566, 567, - 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, - 578, 579, 580, 581, 582, 583, 584, 585, 586, 586, - 587, 588, 589, 590, 590, 591, 592, 593, 594, 595, - 596, 597, 598, 598, 599, 599, 599, 599, 599, 599, - 599, 599, 599, 599, 600, 601, 602, 603, 604, 605, - 606, 607, 608, 609, 610, 611, 611, 612, 612, 612, - 612, 612, 612, 613, 614, 615, 616, 617, 618, 619, - 620, 621, 621, 622, 622, 623, 624 + 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, + 555, 556, 557, 557, 558, 558, 558, 558, 558, 558, + 558, 558, 559, 560, 561, 562, 563, 564, 565, 566, + 567, 568, 568, 569, 569, 569, 569, 569, 569, 569, + 569, 569, 569, 569, 569, 569, 569, 569, 569, 569, + 569, 569, 570, 571, 572, 573, 574, 575, 576, 577, + 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, + 588, 589, 590, 590, 591, 592, 593, 594, 594, 595, + 596, 597, 598, 599, 600, 601, 602, 602, 603, 603, + 603, 603, 603, 603, 603, 603, 603, 603, 604, 605, + 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, + 615, 616, 616, 616, 616, 616, 616, 617, 618, 619, + 620, 621, 622, 623, 624, 625, 625, 626, 626, 627, + 628 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -2124,47 +2136,48 @@ static const yytype_int8 yyr2[] = 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, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, - 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, + 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, + 2, 1, 2, 0, 1, 1, 1, 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, 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, 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, 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, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 3, 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, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 3, 3, 4, 4, 4, 3, 3, + 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 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, 2, 2, + 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 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, 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, 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, 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, 2, 2, 2, 2, 2, 2, 2, 2, 3, - 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, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, - 3, 4, 4, 4, 3, 3, 2, 2, 2, 2, - 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 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, 2, 2, 2, 1, 2, 0, + 2, 1, 2, 0, 1, 2, 1, 2, 0, 1, + 2, 2, 2, 3, 3, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 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, 1, 2, 0, - 1, 2, 1, 2, 0, 1, 2, 2, 2, 3, - 3, 1, 2, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, - 1, 2, 0, 1, 1, 2, 2 + 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, + 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, + 2, 2, 2, 3, 1, 2, 0, 1, 1, 2, + 2 }; @@ -2864,7 +2877,7 @@ yyreduce: { OUTYY(("\nP(force-toplevel)\n")); } -#line 2868 "util/configparser.c" +#line 2881 "util/configparser.c" break; case 19: @@ -2872,10 +2885,10 @@ yyreduce: { OUTYY(("\nP(server:)\n")); } -#line 2876 "util/configparser.c" +#line 2889 "util/configparser.c" break; - case 224: + case 226: #line 299 "./util/configparser.y" { struct config_stub* s; @@ -2887,10 +2900,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2891 "util/configparser.c" +#line 2904 "util/configparser.c" break; - case 234: + case 236: #line 316 "./util/configparser.y" { struct config_stub* s; @@ -2902,10 +2915,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2906 "util/configparser.c" +#line 2919 "util/configparser.c" break; - case 243: + case 245: #line 333 "./util/configparser.y" { struct config_view* s; @@ -2919,10 +2932,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2923 "util/configparser.c" +#line 2936 "util/configparser.c" break; - case 253: + case 255: #line 352 "./util/configparser.y" { struct config_auth* s; @@ -2939,10 +2952,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2943 "util/configparser.c" +#line 2956 "util/configparser.c" break; - case 264: + case 266: #line 376 "./util/configparser.y" { uint8_t* bitlist; @@ -2960,10 +2973,10 @@ yyreduce: } } -#line 2964 "util/configparser.c" +#line 2977 "util/configparser.c" break; - case 265: + case 267: #line 395 "./util/configparser.y" { OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str))); @@ -2979,20 +2992,20 @@ yyreduce: cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str); } } -#line 2983 "util/configparser.c" +#line 2996 "util/configparser.c" break; - case 266: + case 268: #line 412 "./util/configparser.y" { OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->rpz_cname); cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str); } -#line 2993 "util/configparser.c" +#line 3006 "util/configparser.c" break; - case 267: + case 269: #line 420 "./util/configparser.y" { OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str))); @@ -3001,20 +3014,20 @@ yyreduce: else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3005 "util/configparser.c" +#line 3018 "util/configparser.c" break; - case 268: + case 270: #line 430 "./util/configparser.y" { OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->rpz_log_name); cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str); } -#line 3015 "util/configparser.c" +#line 3028 "util/configparser.c" break; - case 269: + case 271: #line 438 "./util/configparser.y" { struct config_auth* s; @@ -3031,10 +3044,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 3035 "util/configparser.c" +#line 3048 "util/configparser.c" break; - case 282: + case 284: #line 461 "./util/configparser.y" { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); @@ -3043,10 +3056,10 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3047 "util/configparser.c" +#line 3060 "util/configparser.c" break; - case 283: + case 285: #line 470 "./util/configparser.y" { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); @@ -3055,10 +3068,10 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3059 "util/configparser.c" +#line 3072 "util/configparser.c" break; - case 284: + case 286: #line 479 "./util/configparser.y" { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); @@ -3069,10 +3082,10 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3073 "util/configparser.c" +#line 3086 "util/configparser.c" break; - case 285: + case 287: #line 490 "./util/configparser.y" { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); @@ -3081,10 +3094,10 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3085 "util/configparser.c" +#line 3098 "util/configparser.c" break; - case 286: + case 288: #line 499 "./util/configparser.y" { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); @@ -3093,10 +3106,10 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3097 "util/configparser.c" +#line 3110 "util/configparser.c" break; - case 287: + case 289: #line 508 "./util/configparser.y" { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); @@ -3105,10 +3118,10 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3109 "util/configparser.c" +#line 3122 "util/configparser.c" break; - case 288: + case 290: #line 517 "./util/configparser.y" { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); @@ -3119,10 +3132,10 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3123 "util/configparser.c" +#line 3136 "util/configparser.c" break; - case 289: + case 291: #line 528 "./util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); @@ -3131,10 +3144,10 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3135 "util/configparser.c" +#line 3148 "util/configparser.c" break; - case 290: + case 292: #line 537 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3146,10 +3159,10 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 3150 "util/configparser.c" +#line 3163 "util/configparser.c" break; - case 291: + case 293: #line 549 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3162,10 +3175,10 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 3166 "util/configparser.c" +#line 3179 "util/configparser.c" break; - case 292: + case 294: #line 563 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3180,10 +3193,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3184 "util/configparser.c" +#line 3197 "util/configparser.c" break; - case 293: + case 295: #line 578 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3194,10 +3207,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3198 "util/configparser.c" +#line 3211 "util/configparser.c" break; - case 294: + case 296: #line 589 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3214,10 +3227,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3218 "util/configparser.c" +#line 3231 "util/configparser.c" break; - case 295: + case 297: #line 606 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3234,10 +3247,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3238 "util/configparser.c" +#line 3251 "util/configparser.c" break; - case 296: + case 298: #line 623 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3254,10 +3267,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3258 "util/configparser.c" +#line 3271 "util/configparser.c" break; - case 297: + case 299: #line 640 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3274,10 +3287,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3278 "util/configparser.c" +#line 3291 "util/configparser.c" break; - case 298: + case 300: #line 657 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3292,10 +3305,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3296 "util/configparser.c" +#line 3309 "util/configparser.c" break; - case 299: + case 301: #line 672 "./util/configparser.y" { #ifdef CLIENT_SUBNET @@ -3310,10 +3323,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3314 "util/configparser.c" +#line 3327 "util/configparser.c" break; - case 300: + case 302: #line 687 "./util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); @@ -3326,10 +3339,10 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 3330 "util/configparser.c" +#line 3343 "util/configparser.c" break; - case 301: + case 303: #line 700 "./util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); @@ -3344,10 +3357,10 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 3348 "util/configparser.c" +#line 3361 "util/configparser.c" break; - case 302: + case 304: #line 715 "./util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); @@ -3356,10 +3369,10 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3360 "util/configparser.c" +#line 3373 "util/configparser.c" break; - case 303: + case 305: #line 724 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); @@ -3368,10 +3381,10 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3372 "util/configparser.c" +#line 3385 "util/configparser.c" break; - case 304: + case 306: #line 733 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); @@ -3380,10 +3393,10 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3384 "util/configparser.c" +#line 3397 "util/configparser.c" break; - case 305: + case 307: #line 742 "./util/configparser.y" { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); @@ -3392,10 +3405,10 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3396 "util/configparser.c" +#line 3409 "util/configparser.c" break; - case 306: + case 308: #line 751 "./util/configparser.y" { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); @@ -3404,10 +3417,10 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3408 "util/configparser.c" +#line 3421 "util/configparser.c" break; - case 307: + case 309: #line 760 "./util/configparser.y" { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); @@ -3416,10 +3429,10 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3420 "util/configparser.c" +#line 3433 "util/configparser.c" break; - case 308: + case 310: #line 769 "./util/configparser.y" { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); @@ -3428,10 +3441,10 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3432 "util/configparser.c" +#line 3445 "util/configparser.c" break; - case 309: + case 311: #line 778 "./util/configparser.y" { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); @@ -3440,10 +3453,10 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3444 "util/configparser.c" +#line 3457 "util/configparser.c" break; - case 310: + case 312: #line 787 "./util/configparser.y" { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); @@ -3452,10 +3465,10 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3456 "util/configparser.c" +#line 3469 "util/configparser.c" break; - case 311: + case 313: #line 796 "./util/configparser.y" { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); @@ -3464,10 +3477,10 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3468 "util/configparser.c" +#line 3481 "util/configparser.c" break; - case 312: + case 314: #line 805 "./util/configparser.y" { OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str))); @@ -3476,10 +3489,10 @@ yyreduce: else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3480 "util/configparser.c" +#line 3493 "util/configparser.c" break; - case 313: + case 315: #line 814 "./util/configparser.y" { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); @@ -3488,10 +3501,10 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3492 "util/configparser.c" +#line 3505 "util/configparser.c" break; - case 314: + case 316: #line 823 "./util/configparser.y" { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); @@ -3500,10 +3513,10 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3504 "util/configparser.c" +#line 3517 "util/configparser.c" break; - case 315: + case 317: #line 832 "./util/configparser.y" { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); @@ -3512,10 +3525,10 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3516 "util/configparser.c" +#line 3529 "util/configparser.c" break; - case 316: + case 318: #line 841 "./util/configparser.y" { OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str))); @@ -3528,10 +3541,10 @@ yyreduce: else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3532 "util/configparser.c" +#line 3545 "util/configparser.c" break; - case 317: + case 319: #line 854 "./util/configparser.y" { OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str))); @@ -3540,10 +3553,10 @@ yyreduce: else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3544 "util/configparser.c" +#line 3557 "util/configparser.c" break; - case 318: + case 320: #line 863 "./util/configparser.y" { OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str))); @@ -3556,10 +3569,10 @@ yyreduce: else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3560 "util/configparser.c" +#line 3573 "util/configparser.c" break; - case 319: + case 321: #line 876 "./util/configparser.y" { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); @@ -3568,10 +3581,10 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3572 "util/configparser.c" +#line 3585 "util/configparser.c" break; - case 320: + case 322: #line 885 "./util/configparser.y" { OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str))); @@ -3580,10 +3593,10 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3584 "util/configparser.c" +#line 3597 "util/configparser.c" break; - case 321: + case 323: #line 894 "./util/configparser.y" { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); @@ -3592,30 +3605,30 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3596 "util/configparser.c" +#line 3609 "util/configparser.c" break; - case 322: + case 324: #line 903 "./util/configparser.y" { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_key); cfg_parser->cfg->ssl_service_key = (yyvsp[0].str); } -#line 3606 "util/configparser.c" +#line 3619 "util/configparser.c" break; - case 323: + case 325: #line 910 "./util/configparser.y" { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_pem); cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str); } -#line 3616 "util/configparser.c" +#line 3629 "util/configparser.c" break; - case 324: + case 326: #line 917 "./util/configparser.y" { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); @@ -3624,20 +3637,20 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3628 "util/configparser.c" +#line 3641 "util/configparser.c" break; - case 325: + case 327: #line 926 "./util/configparser.y" { OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->tls_cert_bundle); cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str); } -#line 3638 "util/configparser.c" +#line 3651 "util/configparser.c" break; - case 326: + case 328: #line 933 "./util/configparser.y" { OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str))); @@ -3646,10 +3659,10 @@ yyreduce: else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3650 "util/configparser.c" +#line 3663 "util/configparser.c" break; - case 327: + case 329: #line 942 "./util/configparser.y" { OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str))); @@ -3657,30 +3670,30 @@ yyreduce: (yyvsp[0].str))) yyerror("out of memory"); } -#line 3661 "util/configparser.c" +#line 3674 "util/configparser.c" break; - case 328: + case 330: #line 950 "./util/configparser.y" { OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->tls_ciphers); cfg_parser->cfg->tls_ciphers = (yyvsp[0].str); } -#line 3671 "util/configparser.c" +#line 3684 "util/configparser.c" break; - case 329: + case 331: #line 957 "./util/configparser.y" { OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->tls_ciphersuites); cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str); } -#line 3681 "util/configparser.c" +#line 3694 "util/configparser.c" break; - case 330: + case 332: #line 964 "./util/configparser.y" { OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str))); @@ -3688,10 +3701,10 @@ yyreduce: (yyvsp[0].str))) yyerror("out of memory"); } -#line 3692 "util/configparser.c" +#line 3705 "util/configparser.c" break; - case 331: + case 333: #line 972 "./util/configparser.y" { OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str))); @@ -3700,22 +3713,23 @@ yyreduce: else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3704 "util/configparser.c" +#line 3717 "util/configparser.c" break; - case 332: + case 334: #line 981 "./util/configparser.y" { OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) yyerror("port number expected"); else cfg_parser->cfg->https_port = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); } -#line 3715 "util/configparser.c" +#line 3729 "util/configparser.c" break; - case 333: -#line 988 "./util/configparser.y" + case 335: +#line 989 "./util/configparser.y" { OUTYY(("P(server_http_endpoint:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->http_endpoint); @@ -3731,11 +3745,11 @@ yyreduce: cfg_parser->cfg->http_endpoint = (yyvsp[0].str); } } -#line 3735 "util/configparser.c" +#line 3749 "util/configparser.c" break; - case 334: -#line 1004 "./util/configparser.y" + case 336: +#line 1005 "./util/configparser.y" { OUTYY(("P(server_http_max_streams:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3743,11 +3757,11 @@ yyreduce: else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3747 "util/configparser.c" +#line 3761 "util/configparser.c" break; - case 335: -#line 1012 "./util/configparser.y" + case 337: +#line 1013 "./util/configparser.y" { OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), @@ -3755,11 +3769,11 @@ yyreduce: yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3759 "util/configparser.c" +#line 3773 "util/configparser.c" break; - case 336: -#line 1020 "./util/configparser.y" + case 338: +#line 1021 "./util/configparser.y" { OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), @@ -3767,11 +3781,11 @@ yyreduce: yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3771 "util/configparser.c" +#line 3785 "util/configparser.c" break; - case 337: -#line 1028 "./util/configparser.y" + case 339: +#line 1029 "./util/configparser.y" { OUTYY(("P(server_http_nodelay:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3779,11 +3793,23 @@ yyreduce: else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3783 "util/configparser.c" +#line 3797 "util/configparser.c" break; - case 338: -#line 1036 "./util/configparser.y" + case 340: +#line 1037 "./util/configparser.y" + { + OUTYY(("P(server_http_notls_downstream:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->http_notls_downstream = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 3809 "util/configparser.c" + break; + + case 341: +#line 1045 "./util/configparser.y" { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3791,11 +3817,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3795 "util/configparser.c" +#line 3821 "util/configparser.c" break; - case 339: -#line 1045 "./util/configparser.y" + case 342: +#line 1054 "./util/configparser.y" { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3803,11 +3829,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3807 "util/configparser.c" +#line 3833 "util/configparser.c" break; - case 340: -#line 1054 "./util/configparser.y" + case 343: +#line 1063 "./util/configparser.y" { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3820,11 +3846,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3824 "util/configparser.c" +#line 3850 "util/configparser.c" break; - case 341: -#line 1068 "./util/configparser.y" + case 344: +#line 1077 "./util/configparser.y" { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3832,11 +3858,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3836 "util/configparser.c" +#line 3862 "util/configparser.c" break; - case 342: -#line 1077 "./util/configparser.y" + case 345: +#line 1086 "./util/configparser.y" { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3844,11 +3870,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3848 "util/configparser.c" +#line 3874 "util/configparser.c" break; - case 343: -#line 1086 "./util/configparser.y" + case 346: +#line 1095 "./util/configparser.y" { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3856,11 +3882,11 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3860 "util/configparser.c" +#line 3886 "util/configparser.c" break; - case 344: -#line 1095 "./util/configparser.y" + case 347: +#line 1104 "./util/configparser.y" { OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3868,11 +3894,11 @@ yyreduce: else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3872 "util/configparser.c" +#line 3898 "util/configparser.c" break; - case 345: -#line 1104 "./util/configparser.y" + case 348: +#line 1113 "./util/configparser.y" { OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3880,11 +3906,11 @@ yyreduce: else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3884 "util/configparser.c" +#line 3910 "util/configparser.c" break; - case 346: -#line 1113 "./util/configparser.y" + case 349: +#line 1122 "./util/configparser.y" { OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3892,31 +3918,31 @@ yyreduce: else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3896 "util/configparser.c" +#line 3922 "util/configparser.c" break; - case 347: -#line 1122 "./util/configparser.y" + case 350: +#line 1131 "./util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 3906 "util/configparser.c" +#line 3932 "util/configparser.c" break; - case 348: -#line 1129 "./util/configparser.y" + case 351: +#line 1138 "./util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 3916 "util/configparser.c" +#line 3942 "util/configparser.c" break; - case 349: -#line 1136 "./util/configparser.y" + case 352: +#line 1145 "./util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3941,105 +3967,105 @@ yyreduce: } } } -#line 3945 "util/configparser.c" +#line 3971 "util/configparser.c" break; - case 350: -#line 1162 "./util/configparser.y" + case 353: +#line 1171 "./util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->logfile); cfg_parser->cfg->logfile = (yyvsp[0].str); cfg_parser->cfg->use_syslog = 0; } -#line 3956 "util/configparser.c" +#line 3982 "util/configparser.c" break; - case 351: -#line 1170 "./util/configparser.y" + case 354: +#line 1179 "./util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 3966 "util/configparser.c" +#line 3992 "util/configparser.c" break; - case 352: -#line 1177 "./util/configparser.y" + case 355: +#line 1186 "./util/configparser.y" { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3976 "util/configparser.c" +#line 4002 "util/configparser.c" break; - case 353: -#line 1184 "./util/configparser.y" + case 356: +#line 1193 "./util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str))); log_warn("option dlv-anchor-file ignored: DLV is decommissioned"); free((yyvsp[0].str)); } -#line 3986 "util/configparser.c" +#line 4012 "util/configparser.c" break; - case 354: -#line 1191 "./util/configparser.y" + case 357: +#line 1200 "./util/configparser.y" { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str))); log_warn("option dlv-anchor ignored: DLV is decommissioned"); free((yyvsp[0].str)); } -#line 3996 "util/configparser.c" +#line 4022 "util/configparser.c" break; - case 355: -#line 1198 "./util/configparser.y" + case 358: +#line 1207 "./util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> auto_trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4007 "util/configparser.c" +#line 4033 "util/configparser.c" break; - case 356: -#line 1206 "./util/configparser.y" + case 359: +#line 1215 "./util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4018 "util/configparser.c" +#line 4044 "util/configparser.c" break; - case 357: -#line 1214 "./util/configparser.y" + case 360: +#line 1223 "./util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trusted_keys_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4029 "util/configparser.c" +#line 4055 "util/configparser.c" break; - case 358: -#line 1222 "./util/configparser.y" + case 361: +#line 1231 "./util/configparser.y" { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4039 "util/configparser.c" +#line 4065 "util/configparser.c" break; - case 359: -#line 1229 "./util/configparser.y" + case 362: +#line 1238 "./util/configparser.y" { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4049,11 +4075,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4053 "util/configparser.c" +#line 4079 "util/configparser.c" break; - case 360: -#line 1240 "./util/configparser.y" + case 363: +#line 1249 "./util/configparser.y" { OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4063,21 +4089,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4067 "util/configparser.c" +#line 4093 "util/configparser.c" break; - case 361: -#line 1251 "./util/configparser.y" + case 364: +#line 1260 "./util/configparser.y" { OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4077 "util/configparser.c" +#line 4103 "util/configparser.c" break; - case 362: -#line 1258 "./util/configparser.y" + case 365: +#line 1267 "./util/configparser.y" { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4085,11 +4111,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4089 "util/configparser.c" +#line 4115 "util/configparser.c" break; - case 363: -#line 1267 "./util/configparser.y" + case 366: +#line 1276 "./util/configparser.y" { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4097,11 +4123,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4101 "util/configparser.c" +#line 4127 "util/configparser.c" break; - case 364: -#line 1276 "./util/configparser.y" + case 367: +#line 1285 "./util/configparser.y" { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4109,53 +4135,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4113 "util/configparser.c" +#line 4139 "util/configparser.c" break; - case 365: -#line 1285 "./util/configparser.y" + case 368: +#line 1294 "./util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 4123 "util/configparser.c" +#line 4149 "util/configparser.c" break; - case 366: -#line 1292 "./util/configparser.y" + case 369: +#line 1301 "./util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 4133 "util/configparser.c" +#line 4159 "util/configparser.c" break; - case 367: -#line 1299 "./util/configparser.y" + case 370: +#line 1308 "./util/configparser.y" { OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 4144 "util/configparser.c" +#line 4170 "util/configparser.c" break; - case 368: -#line 1307 "./util/configparser.y" + case 371: +#line 1316 "./util/configparser.y" { OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 4155 "util/configparser.c" +#line 4181 "util/configparser.c" break; - case 369: -#line 1315 "./util/configparser.y" + case 372: +#line 1324 "./util/configparser.y" { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4164,11 +4190,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4168 "util/configparser.c" +#line 4194 "util/configparser.c" break; - case 370: -#line 1325 "./util/configparser.y" + case 373: +#line 1334 "./util/configparser.y" { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4177,11 +4203,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4181 "util/configparser.c" +#line 4207 "util/configparser.c" break; - case 371: -#line 1335 "./util/configparser.y" + case 374: +#line 1344 "./util/configparser.y" { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4190,11 +4216,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4194 "util/configparser.c" +#line 4220 "util/configparser.c" break; - case 372: -#line 1345 "./util/configparser.y" + case 375: +#line 1354 "./util/configparser.y" { OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4207,22 +4233,22 @@ yyreduce: cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4211 "util/configparser.c" +#line 4237 "util/configparser.c" break; - case 373: -#line 1359 "./util/configparser.y" + case 376: +#line 1368 "./util/configparser.y" { OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4222 "util/configparser.c" +#line 4248 "util/configparser.c" break; - case 374: -#line 1367 "./util/configparser.y" + case 377: +#line 1376 "./util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4234,11 +4260,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4238 "util/configparser.c" +#line 4264 "util/configparser.c" break; - case 375: -#line 1380 "./util/configparser.y" + case 378: +#line 1389 "./util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4248,22 +4274,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4252 "util/configparser.c" +#line 4278 "util/configparser.c" break; - case 376: -#line 1391 "./util/configparser.y" + case 379: +#line 1400 "./util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4263 "util/configparser.c" +#line 4289 "util/configparser.c" break; - case 377: -#line 1399 "./util/configparser.y" + case 380: +#line 1408 "./util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4275,11 +4301,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4279 "util/configparser.c" +#line 4305 "util/configparser.c" break; - case 378: -#line 1412 "./util/configparser.y" + case 381: +#line 1421 "./util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4287,11 +4313,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4291 "util/configparser.c" +#line 4317 "util/configparser.c" break; - case 379: -#line 1421 "./util/configparser.y" + case 382: +#line 1430 "./util/configparser.y" { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4299,11 +4325,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4303 "util/configparser.c" +#line 4329 "util/configparser.c" break; - case 380: -#line 1430 "./util/configparser.y" + case 383: +#line 1439 "./util/configparser.y" { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4311,11 +4337,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4315 "util/configparser.c" +#line 4341 "util/configparser.c" break; - case 381: -#line 1439 "./util/configparser.y" + case 384: +#line 1448 "./util/configparser.y" { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4324,11 +4350,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4328 "util/configparser.c" +#line 4354 "util/configparser.c" break; - case 382: -#line 1449 "./util/configparser.y" + case 385: +#line 1458 "./util/configparser.y" { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4337,22 +4363,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4341 "util/configparser.c" +#line 4367 "util/configparser.c" break; - case 383: -#line 1459 "./util/configparser.y" + case 386: +#line 1468 "./util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4352 "util/configparser.c" +#line 4378 "util/configparser.c" break; - case 384: -#line 1467 "./util/configparser.y" + case 387: +#line 1476 "./util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4364,11 +4390,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4368 "util/configparser.c" +#line 4394 "util/configparser.c" break; - case 385: -#line 1480 "./util/configparser.y" + case 388: +#line 1489 "./util/configparser.y" { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4376,22 +4402,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4380 "util/configparser.c" +#line 4406 "util/configparser.c" break; - case 386: -#line 1489 "./util/configparser.y" + case 389: +#line 1498 "./util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " "removed, use infra-host-ttl)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4391 "util/configparser.c" +#line 4417 "util/configparser.c" break; - case 387: -#line 1497 "./util/configparser.y" + case 390: +#line 1506 "./util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4399,22 +4425,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4403 "util/configparser.c" +#line 4429 "util/configparser.c" break; - case 388: -#line 1506 "./util/configparser.y" + case 391: +#line 1515 "./util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " "(option removed, use infra-cache-numhosts)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4414 "util/configparser.c" +#line 4440 "util/configparser.c" break; - case 389: -#line 1514 "./util/configparser.y" + case 392: +#line 1523 "./util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4426,11 +4452,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4430 "util/configparser.c" +#line 4456 "util/configparser.c" break; - case 390: -#line 1527 "./util/configparser.y" + case 393: +#line 1536 "./util/configparser.y" { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4438,21 +4464,34 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4442 "util/configparser.c" +#line 4468 "util/configparser.c" break; - case 391: -#line 1536 "./util/configparser.y" + case 394: +#line 1545 "./util/configparser.y" + { + OUTYY(("P(server_infra_keep_probing:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->infra_keep_probing = + (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4481 "util/configparser.c" + break; + + case 395: +#line 1555 "./util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->target_fetch_policy); cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str); } -#line 4452 "util/configparser.c" +#line 4491 "util/configparser.c" break; - case 392: -#line 1543 "./util/configparser.y" + case 396: +#line 1562 "./util/configparser.y" { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4461,11 +4500,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4465 "util/configparser.c" +#line 4504 "util/configparser.c" break; - case 393: -#line 1553 "./util/configparser.y" + case 397: +#line 1572 "./util/configparser.y" { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4474,11 +4513,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4478 "util/configparser.c" +#line 4517 "util/configparser.c" break; - case 394: -#line 1563 "./util/configparser.y" + case 398: +#line 1582 "./util/configparser.y" { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4487,11 +4526,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4491 "util/configparser.c" +#line 4530 "util/configparser.c" break; - case 395: -#line 1573 "./util/configparser.y" + case 399: +#line 1592 "./util/configparser.y" { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4500,11 +4539,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4504 "util/configparser.c" +#line 4543 "util/configparser.c" break; - case 396: -#line 1583 "./util/configparser.y" + case 400: +#line 1602 "./util/configparser.y" { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4513,11 +4552,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4517 "util/configparser.c" +#line 4556 "util/configparser.c" break; - case 397: -#line 1593 "./util/configparser.y" + case 401: +#line 1612 "./util/configparser.y" { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4526,11 +4565,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4530 "util/configparser.c" +#line 4569 "util/configparser.c" break; - case 398: -#line 1603 "./util/configparser.y" + case 402: +#line 1622 "./util/configparser.y" { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4539,11 +4578,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4543 "util/configparser.c" +#line 4582 "util/configparser.c" break; - case 399: -#line 1613 "./util/configparser.y" + case 403: +#line 1632 "./util/configparser.y" { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4552,41 +4591,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4556 "util/configparser.c" +#line 4595 "util/configparser.c" break; - case 400: -#line 1623 "./util/configparser.y" + case 404: +#line 1642 "./util/configparser.y" { OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4566 "util/configparser.c" +#line 4605 "util/configparser.c" break; - case 401: -#line 1630 "./util/configparser.y" + case 405: +#line 1649 "./util/configparser.y" { OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4576 "util/configparser.c" +#line 4615 "util/configparser.c" break; - case 402: -#line 1637 "./util/configparser.y" + case 406: +#line 1656 "./util/configparser.y" { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4586 "util/configparser.c" +#line 4625 "util/configparser.c" break; - case 403: -#line 1644 "./util/configparser.y" + case 407: +#line 1663 "./util/configparser.y" { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4594,11 +4633,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4598 "util/configparser.c" +#line 4637 "util/configparser.c" break; - case 404: -#line 1653 "./util/configparser.y" + case 408: +#line 1672 "./util/configparser.y" { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4606,11 +4645,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4610 "util/configparser.c" +#line 4649 "util/configparser.c" break; - case 405: -#line 1662 "./util/configparser.y" + case 409: +#line 1681 "./util/configparser.y" { OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4618,11 +4657,11 @@ yyreduce: else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4622 "util/configparser.c" +#line 4661 "util/configparser.c" break; - case 406: -#line 1671 "./util/configparser.y" + case 410: +#line 1690 "./util/configparser.y" { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4630,21 +4669,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4634 "util/configparser.c" +#line 4673 "util/configparser.c" break; - case 407: -#line 1680 "./util/configparser.y" + case 411: +#line 1699 "./util/configparser.y" { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4644 "util/configparser.c" +#line 4683 "util/configparser.c" break; - case 408: -#line 1687 "./util/configparser.y" + case 412: +#line 1706 "./util/configparser.y" { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4653,11 +4692,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4657 "util/configparser.c" +#line 4696 "util/configparser.c" break; - case 409: -#line 1697 "./util/configparser.y" + case 413: +#line 1716 "./util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 && @@ -4676,21 +4715,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 4680 "util/configparser.c" +#line 4719 "util/configparser.c" break; - case 410: -#line 1717 "./util/configparser.y" + case 414: +#line 1736 "./util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->module_conf); cfg_parser->cfg->module_conf = (yyvsp[0].str); } -#line 4690 "util/configparser.c" +#line 4729 "util/configparser.c" break; - case 411: -#line 1724 "./util/configparser.y" + case 415: +#line 1743 "./util/configparser.y" { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4707,11 +4746,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4711 "util/configparser.c" +#line 4750 "util/configparser.c" break; - case 412: -#line 1742 "./util/configparser.y" + case 416: +#line 1761 "./util/configparser.y" { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4723,11 +4762,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4727 "util/configparser.c" +#line 4766 "util/configparser.c" break; - case 413: -#line 1755 "./util/configparser.y" + case 417: +#line 1774 "./util/configparser.y" { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4739,11 +4778,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4743 "util/configparser.c" +#line 4782 "util/configparser.c" break; - case 414: -#line 1768 "./util/configparser.y" + case 418: +#line 1787 "./util/configparser.y" { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4751,11 +4790,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4755 "util/configparser.c" +#line 4794 "util/configparser.c" break; - case 415: -#line 1777 "./util/configparser.y" + case 419: +#line 1796 "./util/configparser.y" { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4763,11 +4802,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4767 "util/configparser.c" +#line 4806 "util/configparser.c" break; - case 416: -#line 1786 "./util/configparser.y" + case 420: +#line 1805 "./util/configparser.y" { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4775,11 +4814,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4779 "util/configparser.c" +#line 4818 "util/configparser.c" break; - case 417: -#line 1795 "./util/configparser.y" + case 421: +#line 1814 "./util/configparser.y" { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4787,11 +4826,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4791 "util/configparser.c" +#line 4830 "util/configparser.c" break; - case 418: -#line 1804 "./util/configparser.y" + case 422: +#line 1823 "./util/configparser.y" { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4800,11 +4839,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4804 "util/configparser.c" +#line 4843 "util/configparser.c" break; - case 419: -#line 1814 "./util/configparser.y" + case 423: +#line 1833 "./util/configparser.y" { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4813,11 +4852,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4817 "util/configparser.c" +#line 4856 "util/configparser.c" break; - case 420: -#line 1824 "./util/configparser.y" + case 424: +#line 1843 "./util/configparser.y" { OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4827,11 +4866,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4831 "util/configparser.c" +#line 4870 "util/configparser.c" break; - case 421: -#line 1835 "./util/configparser.y" + case 425: +#line 1854 "./util/configparser.y" { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4839,11 +4878,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4843 "util/configparser.c" +#line 4882 "util/configparser.c" break; - case 422: -#line 1844 "./util/configparser.y" + case 426: +#line 1863 "./util/configparser.y" { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4851,11 +4890,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4855 "util/configparser.c" +#line 4894 "util/configparser.c" break; - case 423: -#line 1853 "./util/configparser.y" + case 427: +#line 1872 "./util/configparser.y" { OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4863,11 +4902,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4867 "util/configparser.c" +#line 4906 "util/configparser.c" break; - case 424: -#line 1862 "./util/configparser.y" + case 428: +#line 1881 "./util/configparser.y" { OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4875,11 +4914,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4879 "util/configparser.c" +#line 4918 "util/configparser.c" break; - case 425: -#line 1871 "./util/configparser.y" + case 429: +#line 1890 "./util/configparser.y" { OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4887,11 +4926,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4891 "util/configparser.c" +#line 4930 "util/configparser.c" break; - case 426: -#line 1880 "./util/configparser.y" + case 430: +#line 1899 "./util/configparser.y" { OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4899,11 +4938,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4903 "util/configparser.c" +#line 4942 "util/configparser.c" break; - case 427: -#line 1889 "./util/configparser.y" + case 431: +#line 1908 "./util/configparser.y" { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4915,11 +4954,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4919 "util/configparser.c" +#line 4958 "util/configparser.c" break; - case 428: -#line 1902 "./util/configparser.y" + case 432: +#line 1921 "./util/configparser.y" { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4931,11 +4970,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4935 "util/configparser.c" +#line 4974 "util/configparser.c" break; - case 429: -#line 1915 "./util/configparser.y" + case 433: +#line 1934 "./util/configparser.y" { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4943,21 +4982,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4947 "util/configparser.c" +#line 4986 "util/configparser.c" break; - case 430: -#line 1924 "./util/configparser.y" + case 434: +#line 1943 "./util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str); } -#line 4957 "util/configparser.c" +#line 4996 "util/configparser.c" break; - case 431: -#line 1931 "./util/configparser.y" + case 435: +#line 1950 "./util/configparser.y" { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4965,11 +5004,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4969 "util/configparser.c" +#line 5008 "util/configparser.c" break; - case 432: -#line 1940 "./util/configparser.y" + case 436: +#line 1959 "./util/configparser.y" { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4977,11 +5016,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4981 "util/configparser.c" +#line 5020 "util/configparser.c" break; - case 433: -#line 1949 "./util/configparser.y" + case 437: +#line 1968 "./util/configparser.y" { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4989,11 +5028,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4993 "util/configparser.c" +#line 5032 "util/configparser.c" break; - case 434: -#line 1958 "./util/configparser.y" + case 438: +#line 1977 "./util/configparser.y" { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5002,22 +5041,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5006 "util/configparser.c" +#line 5045 "util/configparser.c" break; - case 435: -#line 1967 "./util/configparser.y" + case 439: +#line 1986 "./util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5017 "util/configparser.c" +#line 5056 "util/configparser.c" break; - case 436: -#line 1975 "./util/configparser.y" + case 440: +#line 1994 "./util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5029,22 +5068,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5033 "util/configparser.c" +#line 5072 "util/configparser.c" break; - case 437: -#line 1988 "./util/configparser.y" + case 441: +#line 2007 "./util/configparser.y" { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5044 "util/configparser.c" +#line 5083 "util/configparser.c" break; - case 438: -#line 1996 "./util/configparser.y" + case 442: +#line 2015 "./util/configparser.y" { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -5084,21 +5123,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 5088 "util/configparser.c" +#line 5127 "util/configparser.c" break; - case 439: -#line 2037 "./util/configparser.y" + case 443: +#line 2056 "./util/configparser.y" { OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str))) fatal_exit("out of memory adding local-data"); } -#line 5098 "util/configparser.c" +#line 5137 "util/configparser.c" break; - case 440: -#line 2044 "./util/configparser.y" + case 444: +#line 2063 "./util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5112,11 +5151,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5116 "util/configparser.c" +#line 5155 "util/configparser.c" break; - case 441: -#line 2059 "./util/configparser.y" + case 445: +#line 2078 "./util/configparser.y" { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5125,11 +5164,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5129 "util/configparser.c" +#line 5168 "util/configparser.c" break; - case 442: -#line 2069 "./util/configparser.y" + case 446: +#line 2088 "./util/configparser.y" { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5138,41 +5177,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5142 "util/configparser.c" +#line 5181 "util/configparser.c" break; - case 443: -#line 2079 "./util/configparser.y" + case 447: +#line 2098 "./util/configparser.y" { OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5152 "util/configparser.c" +#line 5191 "util/configparser.c" break; - case 444: -#line 2086 "./util/configparser.y" + case 448: +#line 2105 "./util/configparser.y" { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5162 "util/configparser.c" +#line 5201 "util/configparser.c" break; - case 445: -#line 2093 "./util/configparser.y" + case 449: +#line 2112 "./util/configparser.y" { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 5172 "util/configparser.c" +#line 5211 "util/configparser.c" break; - case 446: -#line 2100 "./util/configparser.y" + case 450: +#line 2119 "./util/configparser.y" { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5180,22 +5219,22 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5184 "util/configparser.c" +#line 5223 "util/configparser.c" break; - case 447: -#line 2109 "./util/configparser.y" + case 451: +#line 2128 "./util/configparser.y" { OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa, (yyvsp[0].str))) fatal_exit("out of memory adding dns64-ignore-aaaa"); } -#line 5195 "util/configparser.c" +#line 5234 "util/configparser.c" break; - case 448: -#line 2117 "./util/configparser.y" + case 452: +#line 2136 "./util/configparser.y" { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -5208,11 +5247,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5212 "util/configparser.c" +#line 5251 "util/configparser.c" break; - case 449: -#line 2131 "./util/configparser.y" + case 453: +#line 2150 "./util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5232,11 +5271,11 @@ yyreduce: } } } -#line 5236 "util/configparser.c" +#line 5275 "util/configparser.c" break; - case 450: -#line 2152 "./util/configparser.y" + case 454: +#line 2171 "./util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5256,11 +5295,11 @@ yyreduce: } } } -#line 5260 "util/configparser.c" +#line 5299 "util/configparser.c" break; - case 451: -#line 2173 "./util/configparser.y" + case 455: +#line 2192 "./util/configparser.y" { OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions, @@ -5271,11 +5310,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5275 "util/configparser.c" +#line 5314 "util/configparser.c" break; - case 452: -#line 2185 "./util/configparser.y" + case 456: +#line 2204 "./util/configparser.y" { OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas, @@ -5286,11 +5325,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5290 "util/configparser.c" +#line 5329 "util/configparser.c" break; - case 453: -#line 2197 "./util/configparser.y" + case 457: +#line 2216 "./util/configparser.y" { OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides, @@ -5301,11 +5340,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5305 "util/configparser.c" +#line 5344 "util/configparser.c" break; - case 454: -#line 2209 "./util/configparser.y" + case 458: +#line 2228 "./util/configparser.y" { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -5313,11 +5352,11 @@ yyreduce: yyerror("out of memory"); } } -#line 5317 "util/configparser.c" +#line 5356 "util/configparser.c" break; - case 455: -#line 2218 "./util/configparser.y" + case 459: +#line 2237 "./util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5337,11 +5376,11 @@ yyreduce: } } } -#line 5341 "util/configparser.c" +#line 5380 "util/configparser.c" break; - case 456: -#line 2239 "./util/configparser.y" + case 460: +#line 2258 "./util/configparser.y" { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5349,11 +5388,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5353 "util/configparser.c" +#line 5392 "util/configparser.c" break; - case 457: -#line 2249 "./util/configparser.y" + case 461: +#line 2268 "./util/configparser.y" { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5361,33 +5400,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5365 "util/configparser.c" +#line 5404 "util/configparser.c" break; - case 458: -#line 2258 "./util/configparser.y" + case 462: +#line 2277 "./util/configparser.y" { OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5376 "util/configparser.c" +#line 5415 "util/configparser.c" break; - case 459: -#line 2266 "./util/configparser.y" + case 463: +#line 2285 "./util/configparser.y" { OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5387 "util/configparser.c" +#line 5426 "util/configparser.c" break; - case 460: -#line 2274 "./util/configparser.y" + case 464: +#line 2293 "./util/configparser.y" { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5399,11 +5438,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5403 "util/configparser.c" +#line 5442 "util/configparser.c" break; - case 461: -#line 2287 "./util/configparser.y" + case 465: +#line 2306 "./util/configparser.y" { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5415,11 +5454,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5419 "util/configparser.c" +#line 5458 "util/configparser.c" break; - case 462: -#line 2300 "./util/configparser.y" + case 466: +#line 2319 "./util/configparser.y" { OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -5433,11 +5472,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 5437 "util/configparser.c" +#line 5476 "util/configparser.c" break; - case 463: -#line 2315 "./util/configparser.y" + case 467: +#line 2334 "./util/configparser.y" { OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -5451,11 +5490,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 5455 "util/configparser.c" +#line 5494 "util/configparser.c" break; - case 464: -#line 2330 "./util/configparser.y" + case 468: +#line 2349 "./util/configparser.y" { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5463,11 +5502,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5467 "util/configparser.c" +#line 5506 "util/configparser.c" break; - case 465: -#line 2339 "./util/configparser.y" + case 469: +#line 2358 "./util/configparser.y" { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5475,20 +5514,20 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5479 "util/configparser.c" +#line 5518 "util/configparser.c" break; - case 466: -#line 2348 "./util/configparser.y" + case 470: +#line 2367 "./util/configparser.y" { OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n")); free((yyvsp[0].str)); } -#line 5488 "util/configparser.c" +#line 5527 "util/configparser.c" break; - case 467: -#line 2354 "./util/configparser.y" + case 471: +#line 2373 "./util/configparser.y" { OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) <= 0) @@ -5496,11 +5535,11 @@ yyreduce: else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5500 "util/configparser.c" +#line 5539 "util/configparser.c" break; - case 468: -#line 2363 "./util/configparser.y" + case 472: +#line 2382 "./util/configparser.y" { OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5508,11 +5547,11 @@ yyreduce: else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5512 "util/configparser.c" +#line 5551 "util/configparser.c" break; - case 469: -#line 2372 "./util/configparser.y" + case 473: +#line 2391 "./util/configparser.y" { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5521,11 +5560,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5525 "util/configparser.c" +#line 5564 "util/configparser.c" break; - case 470: -#line 2382 "./util/configparser.y" + case 474: +#line 2401 "./util/configparser.y" { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5534,11 +5573,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5538 "util/configparser.c" +#line 5577 "util/configparser.c" break; - case 471: -#line 2392 "./util/configparser.y" + case 475: +#line 2411 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -5550,11 +5589,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5554 "util/configparser.c" +#line 5593 "util/configparser.c" break; - case 472: -#line 2405 "./util/configparser.y" + case 476: +#line 2424 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -5566,11 +5605,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5570 "util/configparser.c" +#line 5609 "util/configparser.c" break; - case 473: -#line 2418 "./util/configparser.y" + case 477: +#line 2437 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -5581,11 +5620,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5585 "util/configparser.c" +#line 5624 "util/configparser.c" break; - case 474: -#line 2430 "./util/configparser.y" + case 478: +#line 2449 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -5598,11 +5637,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5602 "util/configparser.c" +#line 5641 "util/configparser.c" break; - case 475: -#line 2444 "./util/configparser.y" + case 479: +#line 2463 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -5613,11 +5652,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5617 "util/configparser.c" +#line 5656 "util/configparser.c" break; - case 476: -#line 2456 "./util/configparser.y" + case 480: +#line 2475 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -5630,11 +5669,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5634 "util/configparser.c" +#line 5673 "util/configparser.c" break; - case 477: -#line 2470 "./util/configparser.y" + case 481: +#line 2489 "./util/configparser.y" { OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert( @@ -5642,11 +5681,11 @@ yyreduce: fatal_exit("out of memory adding " "edns-client-string"); } -#line 5646 "util/configparser.c" +#line 5685 "util/configparser.c" break; - case 478: -#line 2479 "./util/configparser.y" + case 482: +#line 2498 "./util/configparser.y" { OUTYY(("P(edns_client_string_opcode:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5656,11 +5695,11 @@ yyreduce: else cfg_parser->cfg->edns_client_string_opcode = atoi((yyvsp[0].str)); } -#line 5660 "util/configparser.c" +#line 5699 "util/configparser.c" break; - case 479: -#line 2490 "./util/configparser.y" + case 483: +#line 2509 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -5669,31 +5708,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 5673 "util/configparser.c" +#line 5712 "util/configparser.c" break; - case 480: -#line 2500 "./util/configparser.y" + case 484: +#line 2519 "./util/configparser.y" { OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5683 "util/configparser.c" +#line 5722 "util/configparser.c" break; - case 481: -#line 2507 "./util/configparser.y" + case 485: +#line 2526 "./util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5693 "util/configparser.c" +#line 5732 "util/configparser.c" break; - case 482: -#line 2514 "./util/configparser.y" + case 486: +#line 2533 "./util/configparser.y" { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5701,11 +5740,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5705 "util/configparser.c" +#line 5744 "util/configparser.c" break; - case 483: -#line 2523 "./util/configparser.y" + case 487: +#line 2542 "./util/configparser.y" { OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5713,11 +5752,11 @@ yyreduce: else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5717 "util/configparser.c" +#line 5756 "util/configparser.c" break; - case 484: -#line 2532 "./util/configparser.y" + case 488: +#line 2551 "./util/configparser.y" { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5726,11 +5765,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5730 "util/configparser.c" +#line 5769 "util/configparser.c" break; - case 485: -#line 2542 "./util/configparser.y" + case 489: +#line 2561 "./util/configparser.y" { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5739,11 +5778,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5743 "util/configparser.c" +#line 5782 "util/configparser.c" break; - case 486: -#line 2552 "./util/configparser.y" + case 490: +#line 2571 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -5752,31 +5791,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 5756 "util/configparser.c" +#line 5795 "util/configparser.c" break; - case 487: -#line 2562 "./util/configparser.y" + case 491: +#line 2581 "./util/configparser.y" { OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5766 "util/configparser.c" +#line 5805 "util/configparser.c" break; - case 488: -#line 2569 "./util/configparser.y" + case 492: +#line 2588 "./util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5776 "util/configparser.c" +#line 5815 "util/configparser.c" break; - case 489: -#line 2576 "./util/configparser.y" + case 493: +#line 2595 "./util/configparser.y" { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5784,11 +5823,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5788 "util/configparser.c" +#line 5827 "util/configparser.c" break; - case 490: -#line 2585 "./util/configparser.y" + case 494: +#line 2604 "./util/configparser.y" { OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5796,11 +5835,11 @@ yyreduce: else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5800 "util/configparser.c" +#line 5839 "util/configparser.c" break; - case 491: -#line 2594 "./util/configparser.y" + case 495: +#line 2613 "./util/configparser.y" { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5809,11 +5848,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5813 "util/configparser.c" +#line 5852 "util/configparser.c" break; - case 492: -#line 2604 "./util/configparser.y" + case 496: +#line 2623 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -5822,52 +5861,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 5826 "util/configparser.c" +#line 5865 "util/configparser.c" break; - case 493: -#line 2614 "./util/configparser.y" + case 497: +#line 2633 "./util/configparser.y" { OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->zonefile); cfg_parser->cfg->auths->zonefile = (yyvsp[0].str); } -#line 5836 "util/configparser.c" +#line 5875 "util/configparser.c" break; - case 494: -#line 2621 "./util/configparser.y" + case 498: +#line 2640 "./util/configparser.y" { OUTYY(("P(master:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5846 "util/configparser.c" +#line 5885 "util/configparser.c" break; - case 495: -#line 2628 "./util/configparser.y" + case 499: +#line 2647 "./util/configparser.y" { OUTYY(("P(url:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5856 "util/configparser.c" +#line 5895 "util/configparser.c" break; - case 496: -#line 2635 "./util/configparser.y" + case 500: +#line 2654 "./util/configparser.y" { OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5867 "util/configparser.c" +#line 5906 "util/configparser.c" break; - case 497: -#line 2643 "./util/configparser.y" + case 501: +#line 2662 "./util/configparser.y" { OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5876,11 +5915,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5880 "util/configparser.c" +#line 5919 "util/configparser.c" break; - case 498: -#line 2653 "./util/configparser.y" + case 502: +#line 2672 "./util/configparser.y" { OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5889,11 +5928,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5893 "util/configparser.c" +#line 5932 "util/configparser.c" break; - case 499: -#line 2663 "./util/configparser.y" + case 503: +#line 2682 "./util/configparser.y" { OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5902,11 +5941,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5906 "util/configparser.c" +#line 5945 "util/configparser.c" break; - case 500: -#line 2673 "./util/configparser.y" + case 504: +#line 2692 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -5915,11 +5954,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 5919 "util/configparser.c" +#line 5958 "util/configparser.c" break; - case 501: -#line 2683 "./util/configparser.y" + case 505: +#line 2702 "./util/configparser.y" { OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -5957,11 +5996,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 5961 "util/configparser.c" +#line 6000 "util/configparser.c" break; - case 502: -#line 2722 "./util/configparser.y" + case 506: +#line 2741 "./util/configparser.y" { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5970,33 +6009,33 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 5974 "util/configparser.c" +#line 6013 "util/configparser.c" break; - case 503: -#line 2732 "./util/configparser.y" + case 507: +#line 2751 "./util/configparser.y" { OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert( &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 5985 "util/configparser.c" +#line 6024 "util/configparser.c" break; - case 504: -#line 2740 "./util/configparser.y" + case 508: +#line 2759 "./util/configparser.y" { OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) { fatal_exit("out of memory adding local-data"); } } -#line 5996 "util/configparser.c" +#line 6035 "util/configparser.c" break; - case 505: -#line 2748 "./util/configparser.y" + case 509: +#line 2767 "./util/configparser.y" { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -6010,11 +6049,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 6014 "util/configparser.c" +#line 6053 "util/configparser.c" break; - case 506: -#line 2763 "./util/configparser.y" + case 510: +#line 2782 "./util/configparser.y" { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6022,19 +6061,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6026 "util/configparser.c" +#line 6065 "util/configparser.c" break; - case 507: -#line 2772 "./util/configparser.y" + case 511: +#line 2791 "./util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } -#line 6034 "util/configparser.c" +#line 6073 "util/configparser.c" break; - case 518: -#line 2783 "./util/configparser.y" + case 522: +#line 2802 "./util/configparser.y" { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6043,11 +6082,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6047 "util/configparser.c" +#line 6086 "util/configparser.c" break; - case 519: -#line 2793 "./util/configparser.y" + case 523: +#line 2812 "./util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6055,79 +6094,79 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6059 "util/configparser.c" +#line 6098 "util/configparser.c" break; - case 520: -#line 2802 "./util/configparser.y" + case 524: +#line 2821 "./util/configparser.y" { OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6069 "util/configparser.c" +#line 6108 "util/configparser.c" break; - case 521: -#line 2809 "./util/configparser.y" + case 525: +#line 2828 "./util/configparser.y" { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6079 "util/configparser.c" +#line 6118 "util/configparser.c" break; - case 522: -#line 2816 "./util/configparser.y" + case 526: +#line 2835 "./util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_key_file); cfg_parser->cfg->server_key_file = (yyvsp[0].str); } -#line 6089 "util/configparser.c" +#line 6128 "util/configparser.c" break; - case 523: -#line 2823 "./util/configparser.y" + case 527: +#line 2842 "./util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_cert_file); cfg_parser->cfg->server_cert_file = (yyvsp[0].str); } -#line 6099 "util/configparser.c" +#line 6138 "util/configparser.c" break; - case 524: -#line 2830 "./util/configparser.y" + case 528: +#line 2849 "./util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_key_file); cfg_parser->cfg->control_key_file = (yyvsp[0].str); } -#line 6109 "util/configparser.c" +#line 6148 "util/configparser.c" break; - case 525: -#line 2837 "./util/configparser.y" + case 529: +#line 2856 "./util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_cert_file); cfg_parser->cfg->control_cert_file = (yyvsp[0].str); } -#line 6119 "util/configparser.c" +#line 6158 "util/configparser.c" break; - case 526: -#line 2844 "./util/configparser.y" + case 530: +#line 2863 "./util/configparser.y" { OUTYY(("\nP(dnstap:)\n")); } -#line 6127 "util/configparser.c" +#line 6166 "util/configparser.c" break; - case 548: -#line 2864 "./util/configparser.y" + case 552: +#line 2883 "./util/configparser.y" { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6135,11 +6174,11 @@ yyreduce: else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6139 "util/configparser.c" +#line 6178 "util/configparser.c" break; - case 549: -#line 2873 "./util/configparser.y" + case 553: +#line 2892 "./util/configparser.y" { OUTYY(("P(dt_dnstap_bidirectional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6148,31 +6187,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6152 "util/configparser.c" +#line 6191 "util/configparser.c" break; - case 550: -#line 2883 "./util/configparser.y" + case 554: +#line 2902 "./util/configparser.y" { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_socket_path); cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str); } -#line 6162 "util/configparser.c" +#line 6201 "util/configparser.c" break; - case 551: -#line 2890 "./util/configparser.y" + case 555: +#line 2909 "./util/configparser.y" { OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_ip); cfg_parser->cfg->dnstap_ip = (yyvsp[0].str); } -#line 6172 "util/configparser.c" +#line 6211 "util/configparser.c" break; - case 552: -#line 2897 "./util/configparser.y" + case 556: +#line 2916 "./util/configparser.y" { OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6180,51 +6219,51 @@ yyreduce: else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6184 "util/configparser.c" +#line 6223 "util/configparser.c" break; - case 553: -#line 2906 "./util/configparser.y" + case 557: +#line 2925 "./util/configparser.y" { OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_tls_server_name); cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str); } -#line 6194 "util/configparser.c" +#line 6233 "util/configparser.c" break; - case 554: -#line 2913 "./util/configparser.y" + case 558: +#line 2932 "./util/configparser.y" { OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_tls_cert_bundle); cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str); } -#line 6204 "util/configparser.c" +#line 6243 "util/configparser.c" break; - case 555: -#line 2920 "./util/configparser.y" + case 559: +#line 2939 "./util/configparser.y" { OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_tls_client_key_file); cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str); } -#line 6214 "util/configparser.c" +#line 6253 "util/configparser.c" break; - case 556: -#line 2927 "./util/configparser.y" + case 560: +#line 2946 "./util/configparser.y" { OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_tls_client_cert_file); cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str); } -#line 6224 "util/configparser.c" +#line 6263 "util/configparser.c" break; - case 557: -#line 2934 "./util/configparser.y" + case 561: +#line 2953 "./util/configparser.y" { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6232,11 +6271,11 @@ yyreduce: else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6236 "util/configparser.c" +#line 6275 "util/configparser.c" break; - case 558: -#line 2943 "./util/configparser.y" + case 562: +#line 2962 "./util/configparser.y" { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6244,31 +6283,31 @@ yyreduce: else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6248 "util/configparser.c" +#line 6287 "util/configparser.c" break; - case 559: -#line 2952 "./util/configparser.y" + case 563: +#line 2971 "./util/configparser.y" { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_identity); cfg_parser->cfg->dnstap_identity = (yyvsp[0].str); } -#line 6258 "util/configparser.c" +#line 6297 "util/configparser.c" break; - case 560: -#line 2959 "./util/configparser.y" + case 564: +#line 2978 "./util/configparser.y" { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_version); cfg_parser->cfg->dnstap_version = (yyvsp[0].str); } -#line 6268 "util/configparser.c" +#line 6307 "util/configparser.c" break; - case 561: -#line 2966 "./util/configparser.y" + case 565: +#line 2985 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6277,11 +6316,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6281 "util/configparser.c" +#line 6320 "util/configparser.c" break; - case 562: -#line 2976 "./util/configparser.y" + case 566: +#line 2995 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6290,11 +6329,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6294 "util/configparser.c" +#line 6333 "util/configparser.c" break; - case 563: -#line 2986 "./util/configparser.y" + case 567: +#line 3005 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6303,11 +6342,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6307 "util/configparser.c" +#line 6346 "util/configparser.c" break; - case 564: -#line 2996 "./util/configparser.y" + case 568: +#line 3015 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6316,11 +6355,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6320 "util/configparser.c" +#line 6359 "util/configparser.c" break; - case 565: -#line 3006 "./util/configparser.y" + case 569: +#line 3025 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6329,11 +6368,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6333 "util/configparser.c" +#line 6372 "util/configparser.c" break; - case 566: -#line 3016 "./util/configparser.y" + case 570: +#line 3035 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6342,47 +6381,47 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6346 "util/configparser.c" - break; - - case 567: -#line 3026 "./util/configparser.y" - { - OUTYY(("\nP(python:)\n")); - } -#line 6354 "util/configparser.c" +#line 6385 "util/configparser.c" break; case 571: -#line 3035 "./util/configparser.y" +#line 3045 "./util/configparser.y" + { + OUTYY(("\nP(python:)\n")); + } +#line 6393 "util/configparser.c" + break; + + case 575: +#line 3054 "./util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6364 "util/configparser.c" - break; - - case 572: -#line 3041 "./util/configparser.y" - { - OUTYY(("\nP(dynlib:)\n")); - } -#line 6372 "util/configparser.c" +#line 6403 "util/configparser.c" break; case 576: -#line 3050 "./util/configparser.y" +#line 3060 "./util/configparser.y" + { + OUTYY(("\nP(dynlib:)\n")); + } +#line 6411 "util/configparser.c" + break; + + case 580: +#line 3069 "./util/configparser.y" { OUTYY(("P(dynlib-file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append_ex(&cfg_parser->cfg->dynlib_file, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6382 "util/configparser.c" +#line 6421 "util/configparser.c" break; - case 577: -#line 3056 "./util/configparser.y" + case 581: +#line 3075 "./util/configparser.y" { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6391,21 +6430,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6395 "util/configparser.c" +#line 6434 "util/configparser.c" break; - case 578: -#line 3066 "./util/configparser.y" + case 582: +#line 3085 "./util/configparser.y" { OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->log_identity); cfg_parser->cfg->log_identity = (yyvsp[0].str); } -#line 6405 "util/configparser.c" +#line 6444 "util/configparser.c" break; - case 579: -#line 3073 "./util/configparser.y" + case 583: +#line 3092 "./util/configparser.y" { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -6413,30 +6452,30 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 6417 "util/configparser.c" +#line 6456 "util/configparser.c" break; - case 580: -#line 3082 "./util/configparser.y" + case 584: +#line 3101 "./util/configparser.y" { OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 6428 "util/configparser.c" +#line 6467 "util/configparser.c" break; - case 581: -#line 3090 "./util/configparser.y" + case 585: +#line 3109 "./util/configparser.y" { OUTYY(("\nP(dnscrypt:)\n")); } -#line 6436 "util/configparser.c" +#line 6475 "util/configparser.c" break; - case 594: -#line 3106 "./util/configparser.y" + case 598: +#line 3125 "./util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6444,11 +6483,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6448 "util/configparser.c" +#line 6487 "util/configparser.c" break; - case 595: -#line 3116 "./util/configparser.y" + case 599: +#line 3135 "./util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6456,21 +6495,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6460 "util/configparser.c" +#line 6499 "util/configparser.c" break; - case 596: -#line 3125 "./util/configparser.y" + case 600: +#line 3144 "./util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnscrypt_provider); cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str); } -#line 6470 "util/configparser.c" +#line 6509 "util/configparser.c" break; - case 597: -#line 3132 "./util/configparser.y" + case 601: +#line 3151 "./util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) @@ -6478,21 +6517,21 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 6482 "util/configparser.c" +#line 6521 "util/configparser.c" break; - case 598: -#line 3141 "./util/configparser.y" + case 602: +#line 3160 "./util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert-rotated"); } -#line 6492 "util/configparser.c" +#line 6531 "util/configparser.c" break; - case 599: -#line 3148 "./util/configparser.y" + case 603: +#line 3167 "./util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) @@ -6500,22 +6539,22 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 6504 "util/configparser.c" +#line 6543 "util/configparser.c" break; - case 600: -#line 3157 "./util/configparser.y" + case 604: +#line 3176 "./util/configparser.y" { OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 6515 "util/configparser.c" +#line 6554 "util/configparser.c" break; - case 601: -#line 3165 "./util/configparser.y" + case 605: +#line 3184 "./util/configparser.y" { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6527,22 +6566,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 6531 "util/configparser.c" +#line 6570 "util/configparser.c" break; - case 602: -#line 3178 "./util/configparser.y" + case 606: +#line 3197 "./util/configparser.y" { OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 6542 "util/configparser.c" +#line 6581 "util/configparser.c" break; - case 603: -#line 3186 "./util/configparser.y" + case 607: +#line 3205 "./util/configparser.y" { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6554,19 +6593,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 6558 "util/configparser.c" +#line 6597 "util/configparser.c" break; - case 604: -#line 3199 "./util/configparser.y" + case 608: +#line 3218 "./util/configparser.y" { OUTYY(("\nP(cachedb:)\n")); } -#line 6566 "util/configparser.c" +#line 6605 "util/configparser.c" break; - case 613: -#line 3210 "./util/configparser.y" + case 617: +#line 3229 "./util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -6577,11 +6616,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6581 "util/configparser.c" +#line 6620 "util/configparser.c" break; - case 614: -#line 3222 "./util/configparser.y" + case 618: +#line 3241 "./util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -6592,11 +6631,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6596 "util/configparser.c" +#line 6635 "util/configparser.c" break; - case 615: -#line 3234 "./util/configparser.y" + case 619: +#line 3253 "./util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -6607,11 +6646,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6611 "util/configparser.c" +#line 6650 "util/configparser.c" break; - case 616: -#line 3246 "./util/configparser.y" + case 620: +#line 3265 "./util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -6625,11 +6664,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6629 "util/configparser.c" +#line 6668 "util/configparser.c" break; - case 617: -#line 3261 "./util/configparser.y" + case 621: +#line 3280 "./util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -6641,11 +6680,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6645 "util/configparser.c" +#line 6684 "util/configparser.c" break; - case 618: -#line 3274 "./util/configparser.y" + case 622: +#line 3293 "./util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str))); @@ -6657,11 +6696,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6661 "util/configparser.c" +#line 6700 "util/configparser.c" break; - case 619: -#line 3287 "./util/configparser.y" + case 623: +#line 3306 "./util/configparser.y" { OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if (atoi((yyvsp[0].str)) < 0) @@ -6671,19 +6710,19 @@ yyreduce: fatal_exit("out of memory adding tcp connection limit"); } } -#line 6675 "util/configparser.c" +#line 6714 "util/configparser.c" break; - case 620: -#line 3298 "./util/configparser.y" + case 624: +#line 3317 "./util/configparser.y" { OUTYY(("\nP(ipset:)\n")); } -#line 6683 "util/configparser.c" +#line 6722 "util/configparser.c" break; - case 625: -#line 3307 "./util/configparser.y" + case 629: +#line 3326 "./util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str))); @@ -6697,11 +6736,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6701 "util/configparser.c" +#line 6740 "util/configparser.c" break; - case 626: -#line 3322 "./util/configparser.y" + case 630: +#line 3341 "./util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str))); @@ -6715,11 +6754,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6719 "util/configparser.c" +#line 6758 "util/configparser.c" break; -#line 6723 "util/configparser.c" +#line 6762 "util/configparser.c" default: break; } @@ -6951,7 +6990,7 @@ yyreturn: #endif return yyresult; } -#line 3336 "./util/configparser.y" +#line 3355 "./util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index d9a78e107..27d07e65c 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -194,158 +194,160 @@ extern int yydebug; VAR_HTTP_QUERY_BUFFER_SIZE = 400, VAR_HTTP_RESPONSE_BUFFER_SIZE = 401, VAR_HTTP_NODELAY = 402, - VAR_STUB_FIRST = 403, - VAR_MINIMAL_RESPONSES = 404, - VAR_RRSET_ROUNDROBIN = 405, - VAR_MAX_UDP_SIZE = 406, - VAR_DELAY_CLOSE = 407, - VAR_UNBLOCK_LAN_ZONES = 408, - VAR_INSECURE_LAN_ZONES = 409, - VAR_INFRA_CACHE_MIN_RTT = 410, - VAR_DNS64_PREFIX = 411, - VAR_DNS64_SYNTHALL = 412, - VAR_DNS64_IGNORE_AAAA = 413, - VAR_DNSTAP = 414, - VAR_DNSTAP_ENABLE = 415, - VAR_DNSTAP_SOCKET_PATH = 416, - VAR_DNSTAP_IP = 417, - VAR_DNSTAP_TLS = 418, - VAR_DNSTAP_TLS_SERVER_NAME = 419, - VAR_DNSTAP_TLS_CERT_BUNDLE = 420, - VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 421, - VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 422, - VAR_DNSTAP_SEND_IDENTITY = 423, - VAR_DNSTAP_SEND_VERSION = 424, - VAR_DNSTAP_BIDIRECTIONAL = 425, - VAR_DNSTAP_IDENTITY = 426, - VAR_DNSTAP_VERSION = 427, - VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 428, - VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 429, - VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 430, - VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 431, - VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 432, - VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 433, - VAR_RESPONSE_IP_TAG = 434, - VAR_RESPONSE_IP = 435, - VAR_RESPONSE_IP_DATA = 436, - VAR_HARDEN_ALGO_DOWNGRADE = 437, - VAR_IP_TRANSPARENT = 438, - VAR_IP_DSCP = 439, - VAR_DISABLE_DNSSEC_LAME_CHECK = 440, - VAR_IP_RATELIMIT = 441, - VAR_IP_RATELIMIT_SLABS = 442, - VAR_IP_RATELIMIT_SIZE = 443, - VAR_RATELIMIT = 444, - VAR_RATELIMIT_SLABS = 445, - VAR_RATELIMIT_SIZE = 446, - VAR_RATELIMIT_FOR_DOMAIN = 447, - VAR_RATELIMIT_BELOW_DOMAIN = 448, - VAR_IP_RATELIMIT_FACTOR = 449, - VAR_RATELIMIT_FACTOR = 450, - VAR_SEND_CLIENT_SUBNET = 451, - VAR_CLIENT_SUBNET_ZONE = 452, - VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 453, - VAR_CLIENT_SUBNET_OPCODE = 454, - VAR_MAX_CLIENT_SUBNET_IPV4 = 455, - VAR_MAX_CLIENT_SUBNET_IPV6 = 456, - VAR_MIN_CLIENT_SUBNET_IPV4 = 457, - VAR_MIN_CLIENT_SUBNET_IPV6 = 458, - VAR_MAX_ECS_TREE_SIZE_IPV4 = 459, - VAR_MAX_ECS_TREE_SIZE_IPV6 = 460, - VAR_CAPS_WHITELIST = 461, - VAR_CACHE_MAX_NEGATIVE_TTL = 462, - VAR_PERMIT_SMALL_HOLDDOWN = 463, - VAR_QNAME_MINIMISATION = 464, - VAR_QNAME_MINIMISATION_STRICT = 465, - VAR_IP_FREEBIND = 466, - VAR_DEFINE_TAG = 467, - VAR_LOCAL_ZONE_TAG = 468, - VAR_ACCESS_CONTROL_TAG = 469, - VAR_LOCAL_ZONE_OVERRIDE = 470, - VAR_ACCESS_CONTROL_TAG_ACTION = 471, - VAR_ACCESS_CONTROL_TAG_DATA = 472, - VAR_VIEW = 473, - VAR_ACCESS_CONTROL_VIEW = 474, - VAR_VIEW_FIRST = 475, - VAR_SERVE_EXPIRED = 476, - VAR_SERVE_EXPIRED_TTL = 477, - VAR_SERVE_EXPIRED_TTL_RESET = 478, - VAR_SERVE_EXPIRED_REPLY_TTL = 479, - VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 480, - VAR_FAKE_DSA = 481, - VAR_FAKE_SHA1 = 482, - VAR_LOG_IDENTITY = 483, - VAR_HIDE_TRUSTANCHOR = 484, - VAR_TRUST_ANCHOR_SIGNALING = 485, - VAR_AGGRESSIVE_NSEC = 486, - VAR_USE_SYSTEMD = 487, - VAR_SHM_ENABLE = 488, - VAR_SHM_KEY = 489, - VAR_ROOT_KEY_SENTINEL = 490, - VAR_DNSCRYPT = 491, - VAR_DNSCRYPT_ENABLE = 492, - VAR_DNSCRYPT_PORT = 493, - VAR_DNSCRYPT_PROVIDER = 494, - VAR_DNSCRYPT_SECRET_KEY = 495, - VAR_DNSCRYPT_PROVIDER_CERT = 496, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 497, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 498, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 499, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 500, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 501, - VAR_IPSECMOD_ENABLED = 502, - VAR_IPSECMOD_HOOK = 503, - VAR_IPSECMOD_IGNORE_BOGUS = 504, - VAR_IPSECMOD_MAX_TTL = 505, - VAR_IPSECMOD_WHITELIST = 506, - VAR_IPSECMOD_STRICT = 507, - VAR_CACHEDB = 508, - VAR_CACHEDB_BACKEND = 509, - VAR_CACHEDB_SECRETSEED = 510, - VAR_CACHEDB_REDISHOST = 511, - VAR_CACHEDB_REDISPORT = 512, - VAR_CACHEDB_REDISTIMEOUT = 513, - VAR_CACHEDB_REDISEXPIRERECORDS = 514, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 515, - VAR_FOR_UPSTREAM = 516, - VAR_AUTH_ZONE = 517, - VAR_ZONEFILE = 518, - VAR_MASTER = 519, - VAR_URL = 520, - VAR_FOR_DOWNSTREAM = 521, - VAR_FALLBACK_ENABLED = 522, - VAR_TLS_ADDITIONAL_PORT = 523, - VAR_LOW_RTT = 524, - VAR_LOW_RTT_PERMIL = 525, - VAR_FAST_SERVER_PERMIL = 526, - VAR_FAST_SERVER_NUM = 527, - VAR_ALLOW_NOTIFY = 528, - VAR_TLS_WIN_CERT = 529, - VAR_TCP_CONNECTION_LIMIT = 530, - VAR_FORWARD_NO_CACHE = 531, - VAR_STUB_NO_CACHE = 532, - VAR_LOG_SERVFAIL = 533, - VAR_DENY_ANY = 534, - VAR_UNKNOWN_SERVER_TIME_LIMIT = 535, - VAR_LOG_TAG_QUERYREPLY = 536, - VAR_STREAM_WAIT_SIZE = 537, - VAR_TLS_CIPHERS = 538, - VAR_TLS_CIPHERSUITES = 539, - VAR_TLS_USE_SNI = 540, - VAR_IPSET = 541, - VAR_IPSET_NAME_V4 = 542, - VAR_IPSET_NAME_V6 = 543, - VAR_TLS_SESSION_TICKET_KEYS = 544, - VAR_RPZ = 545, - VAR_TAGS = 546, - VAR_RPZ_ACTION_OVERRIDE = 547, - VAR_RPZ_CNAME_OVERRIDE = 548, - VAR_RPZ_LOG = 549, - VAR_RPZ_LOG_NAME = 550, - VAR_DYNLIB = 551, - VAR_DYNLIB_FILE = 552, - VAR_EDNS_CLIENT_STRING = 553, - VAR_EDNS_CLIENT_STRING_OPCODE = 554 + VAR_HTTP_NOTLS_DOWNSTREAM = 403, + VAR_STUB_FIRST = 404, + VAR_MINIMAL_RESPONSES = 405, + VAR_RRSET_ROUNDROBIN = 406, + VAR_MAX_UDP_SIZE = 407, + VAR_DELAY_CLOSE = 408, + VAR_UNBLOCK_LAN_ZONES = 409, + VAR_INSECURE_LAN_ZONES = 410, + VAR_INFRA_CACHE_MIN_RTT = 411, + VAR_INFRA_KEEP_PROBING = 412, + VAR_DNS64_PREFIX = 413, + VAR_DNS64_SYNTHALL = 414, + VAR_DNS64_IGNORE_AAAA = 415, + VAR_DNSTAP = 416, + VAR_DNSTAP_ENABLE = 417, + VAR_DNSTAP_SOCKET_PATH = 418, + VAR_DNSTAP_IP = 419, + VAR_DNSTAP_TLS = 420, + VAR_DNSTAP_TLS_SERVER_NAME = 421, + VAR_DNSTAP_TLS_CERT_BUNDLE = 422, + VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 423, + VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 424, + VAR_DNSTAP_SEND_IDENTITY = 425, + VAR_DNSTAP_SEND_VERSION = 426, + VAR_DNSTAP_BIDIRECTIONAL = 427, + VAR_DNSTAP_IDENTITY = 428, + VAR_DNSTAP_VERSION = 429, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 430, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 431, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 432, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 433, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 434, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 435, + VAR_RESPONSE_IP_TAG = 436, + VAR_RESPONSE_IP = 437, + VAR_RESPONSE_IP_DATA = 438, + VAR_HARDEN_ALGO_DOWNGRADE = 439, + VAR_IP_TRANSPARENT = 440, + VAR_IP_DSCP = 441, + VAR_DISABLE_DNSSEC_LAME_CHECK = 442, + VAR_IP_RATELIMIT = 443, + VAR_IP_RATELIMIT_SLABS = 444, + VAR_IP_RATELIMIT_SIZE = 445, + VAR_RATELIMIT = 446, + VAR_RATELIMIT_SLABS = 447, + VAR_RATELIMIT_SIZE = 448, + VAR_RATELIMIT_FOR_DOMAIN = 449, + VAR_RATELIMIT_BELOW_DOMAIN = 450, + VAR_IP_RATELIMIT_FACTOR = 451, + VAR_RATELIMIT_FACTOR = 452, + VAR_SEND_CLIENT_SUBNET = 453, + VAR_CLIENT_SUBNET_ZONE = 454, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 455, + VAR_CLIENT_SUBNET_OPCODE = 456, + VAR_MAX_CLIENT_SUBNET_IPV4 = 457, + VAR_MAX_CLIENT_SUBNET_IPV6 = 458, + VAR_MIN_CLIENT_SUBNET_IPV4 = 459, + VAR_MIN_CLIENT_SUBNET_IPV6 = 460, + VAR_MAX_ECS_TREE_SIZE_IPV4 = 461, + VAR_MAX_ECS_TREE_SIZE_IPV6 = 462, + VAR_CAPS_WHITELIST = 463, + VAR_CACHE_MAX_NEGATIVE_TTL = 464, + VAR_PERMIT_SMALL_HOLDDOWN = 465, + VAR_QNAME_MINIMISATION = 466, + VAR_QNAME_MINIMISATION_STRICT = 467, + VAR_IP_FREEBIND = 468, + VAR_DEFINE_TAG = 469, + VAR_LOCAL_ZONE_TAG = 470, + VAR_ACCESS_CONTROL_TAG = 471, + VAR_LOCAL_ZONE_OVERRIDE = 472, + VAR_ACCESS_CONTROL_TAG_ACTION = 473, + VAR_ACCESS_CONTROL_TAG_DATA = 474, + VAR_VIEW = 475, + VAR_ACCESS_CONTROL_VIEW = 476, + VAR_VIEW_FIRST = 477, + VAR_SERVE_EXPIRED = 478, + VAR_SERVE_EXPIRED_TTL = 479, + VAR_SERVE_EXPIRED_TTL_RESET = 480, + VAR_SERVE_EXPIRED_REPLY_TTL = 481, + VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 482, + VAR_FAKE_DSA = 483, + VAR_FAKE_SHA1 = 484, + VAR_LOG_IDENTITY = 485, + VAR_HIDE_TRUSTANCHOR = 486, + VAR_TRUST_ANCHOR_SIGNALING = 487, + VAR_AGGRESSIVE_NSEC = 488, + VAR_USE_SYSTEMD = 489, + VAR_SHM_ENABLE = 490, + VAR_SHM_KEY = 491, + VAR_ROOT_KEY_SENTINEL = 492, + VAR_DNSCRYPT = 493, + VAR_DNSCRYPT_ENABLE = 494, + VAR_DNSCRYPT_PORT = 495, + VAR_DNSCRYPT_PROVIDER = 496, + VAR_DNSCRYPT_SECRET_KEY = 497, + VAR_DNSCRYPT_PROVIDER_CERT = 498, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 499, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 500, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 501, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 502, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 503, + VAR_IPSECMOD_ENABLED = 504, + VAR_IPSECMOD_HOOK = 505, + VAR_IPSECMOD_IGNORE_BOGUS = 506, + VAR_IPSECMOD_MAX_TTL = 507, + VAR_IPSECMOD_WHITELIST = 508, + VAR_IPSECMOD_STRICT = 509, + VAR_CACHEDB = 510, + VAR_CACHEDB_BACKEND = 511, + VAR_CACHEDB_SECRETSEED = 512, + VAR_CACHEDB_REDISHOST = 513, + VAR_CACHEDB_REDISPORT = 514, + VAR_CACHEDB_REDISTIMEOUT = 515, + VAR_CACHEDB_REDISEXPIRERECORDS = 516, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 517, + VAR_FOR_UPSTREAM = 518, + VAR_AUTH_ZONE = 519, + VAR_ZONEFILE = 520, + VAR_MASTER = 521, + VAR_URL = 522, + VAR_FOR_DOWNSTREAM = 523, + VAR_FALLBACK_ENABLED = 524, + VAR_TLS_ADDITIONAL_PORT = 525, + VAR_LOW_RTT = 526, + VAR_LOW_RTT_PERMIL = 527, + VAR_FAST_SERVER_PERMIL = 528, + VAR_FAST_SERVER_NUM = 529, + VAR_ALLOW_NOTIFY = 530, + VAR_TLS_WIN_CERT = 531, + VAR_TCP_CONNECTION_LIMIT = 532, + VAR_FORWARD_NO_CACHE = 533, + VAR_STUB_NO_CACHE = 534, + VAR_LOG_SERVFAIL = 535, + VAR_DENY_ANY = 536, + VAR_UNKNOWN_SERVER_TIME_LIMIT = 537, + VAR_LOG_TAG_QUERYREPLY = 538, + VAR_STREAM_WAIT_SIZE = 539, + VAR_TLS_CIPHERS = 540, + VAR_TLS_CIPHERSUITES = 541, + VAR_TLS_USE_SNI = 542, + VAR_IPSET = 543, + VAR_IPSET_NAME_V4 = 544, + VAR_IPSET_NAME_V6 = 545, + VAR_TLS_SESSION_TICKET_KEYS = 546, + VAR_RPZ = 547, + VAR_TAGS = 548, + VAR_RPZ_ACTION_OVERRIDE = 549, + VAR_RPZ_CNAME_OVERRIDE = 550, + VAR_RPZ_LOG = 551, + VAR_RPZ_LOG_NAME = 552, + VAR_DYNLIB = 553, + VAR_DYNLIB_FILE = 554, + VAR_EDNS_CLIENT_STRING = 555, + VAR_EDNS_CLIENT_STRING_OPCODE = 556 }; #endif /* Tokens. */ @@ -494,158 +496,160 @@ extern int yydebug; #define VAR_HTTP_QUERY_BUFFER_SIZE 400 #define VAR_HTTP_RESPONSE_BUFFER_SIZE 401 #define VAR_HTTP_NODELAY 402 -#define VAR_STUB_FIRST 403 -#define VAR_MINIMAL_RESPONSES 404 -#define VAR_RRSET_ROUNDROBIN 405 -#define VAR_MAX_UDP_SIZE 406 -#define VAR_DELAY_CLOSE 407 -#define VAR_UNBLOCK_LAN_ZONES 408 -#define VAR_INSECURE_LAN_ZONES 409 -#define VAR_INFRA_CACHE_MIN_RTT 410 -#define VAR_DNS64_PREFIX 411 -#define VAR_DNS64_SYNTHALL 412 -#define VAR_DNS64_IGNORE_AAAA 413 -#define VAR_DNSTAP 414 -#define VAR_DNSTAP_ENABLE 415 -#define VAR_DNSTAP_SOCKET_PATH 416 -#define VAR_DNSTAP_IP 417 -#define VAR_DNSTAP_TLS 418 -#define VAR_DNSTAP_TLS_SERVER_NAME 419 -#define VAR_DNSTAP_TLS_CERT_BUNDLE 420 -#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 421 -#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 422 -#define VAR_DNSTAP_SEND_IDENTITY 423 -#define VAR_DNSTAP_SEND_VERSION 424 -#define VAR_DNSTAP_BIDIRECTIONAL 425 -#define VAR_DNSTAP_IDENTITY 426 -#define VAR_DNSTAP_VERSION 427 -#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 428 -#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 429 -#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 430 -#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 431 -#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 432 -#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 433 -#define VAR_RESPONSE_IP_TAG 434 -#define VAR_RESPONSE_IP 435 -#define VAR_RESPONSE_IP_DATA 436 -#define VAR_HARDEN_ALGO_DOWNGRADE 437 -#define VAR_IP_TRANSPARENT 438 -#define VAR_IP_DSCP 439 -#define VAR_DISABLE_DNSSEC_LAME_CHECK 440 -#define VAR_IP_RATELIMIT 441 -#define VAR_IP_RATELIMIT_SLABS 442 -#define VAR_IP_RATELIMIT_SIZE 443 -#define VAR_RATELIMIT 444 -#define VAR_RATELIMIT_SLABS 445 -#define VAR_RATELIMIT_SIZE 446 -#define VAR_RATELIMIT_FOR_DOMAIN 447 -#define VAR_RATELIMIT_BELOW_DOMAIN 448 -#define VAR_IP_RATELIMIT_FACTOR 449 -#define VAR_RATELIMIT_FACTOR 450 -#define VAR_SEND_CLIENT_SUBNET 451 -#define VAR_CLIENT_SUBNET_ZONE 452 -#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 453 -#define VAR_CLIENT_SUBNET_OPCODE 454 -#define VAR_MAX_CLIENT_SUBNET_IPV4 455 -#define VAR_MAX_CLIENT_SUBNET_IPV6 456 -#define VAR_MIN_CLIENT_SUBNET_IPV4 457 -#define VAR_MIN_CLIENT_SUBNET_IPV6 458 -#define VAR_MAX_ECS_TREE_SIZE_IPV4 459 -#define VAR_MAX_ECS_TREE_SIZE_IPV6 460 -#define VAR_CAPS_WHITELIST 461 -#define VAR_CACHE_MAX_NEGATIVE_TTL 462 -#define VAR_PERMIT_SMALL_HOLDDOWN 463 -#define VAR_QNAME_MINIMISATION 464 -#define VAR_QNAME_MINIMISATION_STRICT 465 -#define VAR_IP_FREEBIND 466 -#define VAR_DEFINE_TAG 467 -#define VAR_LOCAL_ZONE_TAG 468 -#define VAR_ACCESS_CONTROL_TAG 469 -#define VAR_LOCAL_ZONE_OVERRIDE 470 -#define VAR_ACCESS_CONTROL_TAG_ACTION 471 -#define VAR_ACCESS_CONTROL_TAG_DATA 472 -#define VAR_VIEW 473 -#define VAR_ACCESS_CONTROL_VIEW 474 -#define VAR_VIEW_FIRST 475 -#define VAR_SERVE_EXPIRED 476 -#define VAR_SERVE_EXPIRED_TTL 477 -#define VAR_SERVE_EXPIRED_TTL_RESET 478 -#define VAR_SERVE_EXPIRED_REPLY_TTL 479 -#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 480 -#define VAR_FAKE_DSA 481 -#define VAR_FAKE_SHA1 482 -#define VAR_LOG_IDENTITY 483 -#define VAR_HIDE_TRUSTANCHOR 484 -#define VAR_TRUST_ANCHOR_SIGNALING 485 -#define VAR_AGGRESSIVE_NSEC 486 -#define VAR_USE_SYSTEMD 487 -#define VAR_SHM_ENABLE 488 -#define VAR_SHM_KEY 489 -#define VAR_ROOT_KEY_SENTINEL 490 -#define VAR_DNSCRYPT 491 -#define VAR_DNSCRYPT_ENABLE 492 -#define VAR_DNSCRYPT_PORT 493 -#define VAR_DNSCRYPT_PROVIDER 494 -#define VAR_DNSCRYPT_SECRET_KEY 495 -#define VAR_DNSCRYPT_PROVIDER_CERT 496 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 497 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 498 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 499 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 500 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 501 -#define VAR_IPSECMOD_ENABLED 502 -#define VAR_IPSECMOD_HOOK 503 -#define VAR_IPSECMOD_IGNORE_BOGUS 504 -#define VAR_IPSECMOD_MAX_TTL 505 -#define VAR_IPSECMOD_WHITELIST 506 -#define VAR_IPSECMOD_STRICT 507 -#define VAR_CACHEDB 508 -#define VAR_CACHEDB_BACKEND 509 -#define VAR_CACHEDB_SECRETSEED 510 -#define VAR_CACHEDB_REDISHOST 511 -#define VAR_CACHEDB_REDISPORT 512 -#define VAR_CACHEDB_REDISTIMEOUT 513 -#define VAR_CACHEDB_REDISEXPIRERECORDS 514 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 515 -#define VAR_FOR_UPSTREAM 516 -#define VAR_AUTH_ZONE 517 -#define VAR_ZONEFILE 518 -#define VAR_MASTER 519 -#define VAR_URL 520 -#define VAR_FOR_DOWNSTREAM 521 -#define VAR_FALLBACK_ENABLED 522 -#define VAR_TLS_ADDITIONAL_PORT 523 -#define VAR_LOW_RTT 524 -#define VAR_LOW_RTT_PERMIL 525 -#define VAR_FAST_SERVER_PERMIL 526 -#define VAR_FAST_SERVER_NUM 527 -#define VAR_ALLOW_NOTIFY 528 -#define VAR_TLS_WIN_CERT 529 -#define VAR_TCP_CONNECTION_LIMIT 530 -#define VAR_FORWARD_NO_CACHE 531 -#define VAR_STUB_NO_CACHE 532 -#define VAR_LOG_SERVFAIL 533 -#define VAR_DENY_ANY 534 -#define VAR_UNKNOWN_SERVER_TIME_LIMIT 535 -#define VAR_LOG_TAG_QUERYREPLY 536 -#define VAR_STREAM_WAIT_SIZE 537 -#define VAR_TLS_CIPHERS 538 -#define VAR_TLS_CIPHERSUITES 539 -#define VAR_TLS_USE_SNI 540 -#define VAR_IPSET 541 -#define VAR_IPSET_NAME_V4 542 -#define VAR_IPSET_NAME_V6 543 -#define VAR_TLS_SESSION_TICKET_KEYS 544 -#define VAR_RPZ 545 -#define VAR_TAGS 546 -#define VAR_RPZ_ACTION_OVERRIDE 547 -#define VAR_RPZ_CNAME_OVERRIDE 548 -#define VAR_RPZ_LOG 549 -#define VAR_RPZ_LOG_NAME 550 -#define VAR_DYNLIB 551 -#define VAR_DYNLIB_FILE 552 -#define VAR_EDNS_CLIENT_STRING 553 -#define VAR_EDNS_CLIENT_STRING_OPCODE 554 +#define VAR_HTTP_NOTLS_DOWNSTREAM 403 +#define VAR_STUB_FIRST 404 +#define VAR_MINIMAL_RESPONSES 405 +#define VAR_RRSET_ROUNDROBIN 406 +#define VAR_MAX_UDP_SIZE 407 +#define VAR_DELAY_CLOSE 408 +#define VAR_UNBLOCK_LAN_ZONES 409 +#define VAR_INSECURE_LAN_ZONES 410 +#define VAR_INFRA_CACHE_MIN_RTT 411 +#define VAR_INFRA_KEEP_PROBING 412 +#define VAR_DNS64_PREFIX 413 +#define VAR_DNS64_SYNTHALL 414 +#define VAR_DNS64_IGNORE_AAAA 415 +#define VAR_DNSTAP 416 +#define VAR_DNSTAP_ENABLE 417 +#define VAR_DNSTAP_SOCKET_PATH 418 +#define VAR_DNSTAP_IP 419 +#define VAR_DNSTAP_TLS 420 +#define VAR_DNSTAP_TLS_SERVER_NAME 421 +#define VAR_DNSTAP_TLS_CERT_BUNDLE 422 +#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 423 +#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 424 +#define VAR_DNSTAP_SEND_IDENTITY 425 +#define VAR_DNSTAP_SEND_VERSION 426 +#define VAR_DNSTAP_BIDIRECTIONAL 427 +#define VAR_DNSTAP_IDENTITY 428 +#define VAR_DNSTAP_VERSION 429 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 430 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 431 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 432 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 433 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 434 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 435 +#define VAR_RESPONSE_IP_TAG 436 +#define VAR_RESPONSE_IP 437 +#define VAR_RESPONSE_IP_DATA 438 +#define VAR_HARDEN_ALGO_DOWNGRADE 439 +#define VAR_IP_TRANSPARENT 440 +#define VAR_IP_DSCP 441 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 442 +#define VAR_IP_RATELIMIT 443 +#define VAR_IP_RATELIMIT_SLABS 444 +#define VAR_IP_RATELIMIT_SIZE 445 +#define VAR_RATELIMIT 446 +#define VAR_RATELIMIT_SLABS 447 +#define VAR_RATELIMIT_SIZE 448 +#define VAR_RATELIMIT_FOR_DOMAIN 449 +#define VAR_RATELIMIT_BELOW_DOMAIN 450 +#define VAR_IP_RATELIMIT_FACTOR 451 +#define VAR_RATELIMIT_FACTOR 452 +#define VAR_SEND_CLIENT_SUBNET 453 +#define VAR_CLIENT_SUBNET_ZONE 454 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 455 +#define VAR_CLIENT_SUBNET_OPCODE 456 +#define VAR_MAX_CLIENT_SUBNET_IPV4 457 +#define VAR_MAX_CLIENT_SUBNET_IPV6 458 +#define VAR_MIN_CLIENT_SUBNET_IPV4 459 +#define VAR_MIN_CLIENT_SUBNET_IPV6 460 +#define VAR_MAX_ECS_TREE_SIZE_IPV4 461 +#define VAR_MAX_ECS_TREE_SIZE_IPV6 462 +#define VAR_CAPS_WHITELIST 463 +#define VAR_CACHE_MAX_NEGATIVE_TTL 464 +#define VAR_PERMIT_SMALL_HOLDDOWN 465 +#define VAR_QNAME_MINIMISATION 466 +#define VAR_QNAME_MINIMISATION_STRICT 467 +#define VAR_IP_FREEBIND 468 +#define VAR_DEFINE_TAG 469 +#define VAR_LOCAL_ZONE_TAG 470 +#define VAR_ACCESS_CONTROL_TAG 471 +#define VAR_LOCAL_ZONE_OVERRIDE 472 +#define VAR_ACCESS_CONTROL_TAG_ACTION 473 +#define VAR_ACCESS_CONTROL_TAG_DATA 474 +#define VAR_VIEW 475 +#define VAR_ACCESS_CONTROL_VIEW 476 +#define VAR_VIEW_FIRST 477 +#define VAR_SERVE_EXPIRED 478 +#define VAR_SERVE_EXPIRED_TTL 479 +#define VAR_SERVE_EXPIRED_TTL_RESET 480 +#define VAR_SERVE_EXPIRED_REPLY_TTL 481 +#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 482 +#define VAR_FAKE_DSA 483 +#define VAR_FAKE_SHA1 484 +#define VAR_LOG_IDENTITY 485 +#define VAR_HIDE_TRUSTANCHOR 486 +#define VAR_TRUST_ANCHOR_SIGNALING 487 +#define VAR_AGGRESSIVE_NSEC 488 +#define VAR_USE_SYSTEMD 489 +#define VAR_SHM_ENABLE 490 +#define VAR_SHM_KEY 491 +#define VAR_ROOT_KEY_SENTINEL 492 +#define VAR_DNSCRYPT 493 +#define VAR_DNSCRYPT_ENABLE 494 +#define VAR_DNSCRYPT_PORT 495 +#define VAR_DNSCRYPT_PROVIDER 496 +#define VAR_DNSCRYPT_SECRET_KEY 497 +#define VAR_DNSCRYPT_PROVIDER_CERT 498 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 499 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 500 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 501 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 502 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 503 +#define VAR_IPSECMOD_ENABLED 504 +#define VAR_IPSECMOD_HOOK 505 +#define VAR_IPSECMOD_IGNORE_BOGUS 506 +#define VAR_IPSECMOD_MAX_TTL 507 +#define VAR_IPSECMOD_WHITELIST 508 +#define VAR_IPSECMOD_STRICT 509 +#define VAR_CACHEDB 510 +#define VAR_CACHEDB_BACKEND 511 +#define VAR_CACHEDB_SECRETSEED 512 +#define VAR_CACHEDB_REDISHOST 513 +#define VAR_CACHEDB_REDISPORT 514 +#define VAR_CACHEDB_REDISTIMEOUT 515 +#define VAR_CACHEDB_REDISEXPIRERECORDS 516 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 517 +#define VAR_FOR_UPSTREAM 518 +#define VAR_AUTH_ZONE 519 +#define VAR_ZONEFILE 520 +#define VAR_MASTER 521 +#define VAR_URL 522 +#define VAR_FOR_DOWNSTREAM 523 +#define VAR_FALLBACK_ENABLED 524 +#define VAR_TLS_ADDITIONAL_PORT 525 +#define VAR_LOW_RTT 526 +#define VAR_LOW_RTT_PERMIL 527 +#define VAR_FAST_SERVER_PERMIL 528 +#define VAR_FAST_SERVER_NUM 529 +#define VAR_ALLOW_NOTIFY 530 +#define VAR_TLS_WIN_CERT 531 +#define VAR_TCP_CONNECTION_LIMIT 532 +#define VAR_FORWARD_NO_CACHE 533 +#define VAR_STUB_NO_CACHE 534 +#define VAR_LOG_SERVFAIL 535 +#define VAR_DENY_ANY 536 +#define VAR_UNKNOWN_SERVER_TIME_LIMIT 537 +#define VAR_LOG_TAG_QUERYREPLY 538 +#define VAR_STREAM_WAIT_SIZE 539 +#define VAR_TLS_CIPHERS 540 +#define VAR_TLS_CIPHERSUITES 541 +#define VAR_TLS_USE_SNI 542 +#define VAR_IPSET 543 +#define VAR_IPSET_NAME_V4 544 +#define VAR_IPSET_NAME_V6 545 +#define VAR_TLS_SESSION_TICKET_KEYS 546 +#define VAR_RPZ 547 +#define VAR_TAGS 548 +#define VAR_RPZ_ACTION_OVERRIDE 549 +#define VAR_RPZ_CNAME_OVERRIDE 550 +#define VAR_RPZ_LOG 551 +#define VAR_RPZ_LOG_NAME 552 +#define VAR_DYNLIB 553 +#define VAR_DYNLIB_FILE 554 +#define VAR_EDNS_CLIENT_STRING 555 +#define VAR_EDNS_CLIENT_STRING_OPCODE 556 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -655,7 +659,7 @@ union YYSTYPE char* str; -#line 659 "util/configparser.h" +#line 663 "util/configparser.h" }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index ebc71a8bb..48b09e839 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -114,11 +114,11 @@ extern struct config_parser_state* cfg_parser; %token VAR_STUB_SSL_UPSTREAM VAR_FORWARD_SSL_UPSTREAM VAR_TLS_CERT_BUNDLE %token VAR_HTTPS_PORT VAR_HTTP_ENDPOINT VAR_HTTP_MAX_STREAMS %token VAR_HTTP_QUERY_BUFFER_SIZE VAR_HTTP_RESPONSE_BUFFER_SIZE -%token VAR_HTTP_NODELAY +%token VAR_HTTP_NODELAY VAR_HTTP_NOTLS_DOWNSTREAM %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN %token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE %token VAR_UNBLOCK_LAN_ZONES VAR_INSECURE_LAN_ZONES -%token VAR_INFRA_CACHE_MIN_RTT +%token VAR_INFRA_CACHE_MIN_RTT VAR_INFRA_KEEP_PROBING %token VAR_DNS64_PREFIX VAR_DNS64_SYNTHALL VAR_DNS64_IGNORE_AAAA %token VAR_DNSTAP VAR_DNSTAP_ENABLE VAR_DNSTAP_SOCKET_PATH VAR_DNSTAP_IP %token VAR_DNSTAP_TLS VAR_DNSTAP_TLS_SERVER_NAME VAR_DNSTAP_TLS_CERT_BUNDLE @@ -250,14 +250,14 @@ content_server: server_num_threads | server_verbosity | server_port | server_ssl_service_key | server_ssl_service_pem | server_ssl_port | server_https_port | server_http_endpoint | server_http_max_streams | server_http_query_buffer_size | server_http_response_buffer_size | - server_http_nodelay | + server_http_nodelay | server_http_notls_downstream | server_minimal_responses | server_rrset_roundrobin | server_max_udp_size | server_so_reuseport | server_delay_close | server_unblock_lan_zones | server_insecure_lan_zones | server_dns64_prefix | server_dns64_synthall | server_dns64_ignore_aaaa | server_infra_cache_min_rtt | server_harden_algo_downgrade | server_ip_transparent | server_ip_ratelimit | server_ratelimit | - server_ip_dscp | + server_ip_dscp | server_infra_keep_probing | server_ip_ratelimit_slabs | server_ratelimit_slabs | server_ip_ratelimit_size | server_ratelimit_size | server_ratelimit_for_domain | @@ -983,6 +983,7 @@ server_https_port: VAR_HTTPS_PORT STRING_ARG if(atoi($2) == 0) yyerror("port number expected"); else cfg_parser->cfg->https_port = atoi($2); + free($2); }; server_http_endpoint: VAR_HTTP_ENDPOINT STRING_ARG { @@ -1031,6 +1032,14 @@ server_http_nodelay: VAR_HTTP_NODELAY STRING_ARG yyerror("expected yes or no."); else cfg_parser->cfg->http_nodelay = (strcmp($2, "yes")==0); free($2); + } +server_http_notls_downstream: VAR_HTTP_NOTLS_DOWNSTREAM STRING_ARG + { + OUTYY(("P(server_http_notls_downstream:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->http_notls_downstream = (strcmp($2, "yes")==0); + free($2); }; server_use_systemd: VAR_USE_SYSTEMD STRING_ARG { @@ -1532,6 +1541,16 @@ server_infra_cache_min_rtt: VAR_INFRA_CACHE_MIN_RTT STRING_ARG free($2); } ; +server_infra_keep_probing: VAR_INFRA_KEEP_PROBING STRING_ARG + { + OUTYY(("P(server_infra_keep_probing:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->infra_keep_probing = + (strcmp($2, "yes")==0); + free($2); + } + ; server_target_fetch_policy: VAR_TARGET_FETCH_POLICY STRING_ARG { OUTYY(("P(server_target_fetch_policy:%s)\n", $2)); diff --git a/util/data/msgencode.c b/util/data/msgencode.c index be69f628a..1746cfbb8 100644 --- a/util/data/msgencode.c +++ b/util/data/msgencode.c @@ -624,6 +624,9 @@ positive_answer(struct reply_info* rep, uint16_t qtype) { for(i=0;ian_numrrsets; i++) { if(ntohs(rep->rrsets[i]->rk.type) == qtype) { + /* for priming queries, type NS, include addresses */ + if(qtype == LDNS_RR_TYPE_NS) + return 0; /* in case it is a wildcard with DNSSEC, there will * be NSEC/NSEC3 records in the authority section * that we cannot remove */ diff --git a/util/data/msgreply.h b/util/data/msgreply.h index 8d75f9b12..385780268 100644 --- a/util/data/msgreply.h +++ b/util/data/msgreply.h @@ -552,7 +552,7 @@ struct edns_option* edns_opt_list_find(struct edns_option* list, uint16_t code); * @param rep: Reply info. Could be NULL. * @param rcode: return code. * @param edns: edns data of the reply. - * @param repinfo: comm_reply. NULL. + * @param repinfo: comm_reply. Reply information for a communication point. * @param region: region to store data. * @return false on failure (a callback function returned an error). */ diff --git a/util/netevent.c b/util/netevent.c index 545f09742..2428417fa 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -965,6 +965,10 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg) /* clear leftover flags from previous use, and then set the * correct event base for the event structure for libevent */ ub_event_free(c_hdl->ev->ev); + if((c_hdl->type == comm_tcp && c_hdl->tcp_req_info) || + c_hdl->type == comm_local || c_hdl->type == comm_raw) + c_hdl->tcp_do_toggle_rw = 0; + else c_hdl->tcp_do_toggle_rw = 1; if(c_hdl->type == comm_http) { #ifdef HAVE_NGHTTP2 @@ -978,6 +982,10 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg) log_warn("failed to submit http2 settings"); return; } + if(!c->ssl) { + c_hdl->tcp_do_toggle_rw = 0; + c_hdl->use_h2 = 1; + } #endif c_hdl->ev->ev = ub_event_new(c_hdl->ev->base->eb->base, -1, UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT, @@ -2359,48 +2367,76 @@ int http2_stream_close_cb(nghttp2_session* ATTR_UNUSED(session), ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), uint8_t* buf, size_t len, int ATTR_UNUSED(flags), void* cb_arg) { -#ifdef HAVE_SSL struct http2_session* h2_session = (struct http2_session*)cb_arg; - int r; + ssize_t ret; log_assert(h2_session->c->type == comm_http); log_assert(h2_session->c->h2_session); - if(!h2_session->c->ssl) - return 0; - - ERR_clear_error(); - r = SSL_read(h2_session->c->ssl, buf, len); - if(r <= 0) { - int want = SSL_get_error(h2_session->c->ssl, r); - if(want == SSL_ERROR_ZERO_RETURN) { - return NGHTTP2_ERR_EOF; - } else if(want == SSL_ERROR_WANT_READ) { - return NGHTTP2_ERR_WOULDBLOCK; - } else if(want == SSL_ERROR_WANT_WRITE) { - h2_session->c->ssl_shake_state = comm_ssl_shake_hs_write; - comm_point_listen_for_rw(h2_session->c, 0, 1); - return NGHTTP2_ERR_WOULDBLOCK; - } else if(want == SSL_ERROR_SYSCALL) { +#ifdef HAVE_SSL + if(h2_session->c->ssl) { + int r; + ERR_clear_error(); + r = SSL_read(h2_session->c->ssl, buf, len); + if(r <= 0) { + int want = SSL_get_error(h2_session->c->ssl, r); + if(want == SSL_ERROR_ZERO_RETURN) { + return NGHTTP2_ERR_EOF; + } else if(want == SSL_ERROR_WANT_READ) { + return NGHTTP2_ERR_WOULDBLOCK; + } else if(want == SSL_ERROR_WANT_WRITE) { + h2_session->c->ssl_shake_state = comm_ssl_shake_hs_write; + comm_point_listen_for_rw(h2_session->c, 0, 1); + return NGHTTP2_ERR_WOULDBLOCK; + } else if(want == SSL_ERROR_SYSCALL) { #ifdef ECONNRESET - if(errno == ECONNRESET && verbosity < 2) - return NGHTTP2_ERR_CALLBACK_FAILURE; + if(errno == ECONNRESET && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; #endif - if(errno != 0) - log_err("SSL_read syscall: %s", - strerror(errno)); + if(errno != 0) + log_err("SSL_read syscall: %s", + strerror(errno)); + return NGHTTP2_ERR_CALLBACK_FAILURE; + } + log_crypto_err("could not SSL_read"); return NGHTTP2_ERR_CALLBACK_FAILURE; } - log_crypto_err("could not SSL_read"); + return r; + } +#endif /* HAVE_SSL */ + + ret = recv(h2_session->c->fd, buf, len, 0); + if(ret == 0) { + return NGHTTP2_ERR_EOF; + } else if(ret < 0) { +#ifndef USE_WINSOCK + if(errno == EINTR || errno == EAGAIN) + return NGHTTP2_ERR_WOULDBLOCK; +#ifdef ECONNRESET + if(errno == ECONNRESET && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; +#endif + log_err_addr("could not http2 recv: %s", strerror(errno), + &h2_session->c->repinfo.addr, + h2_session->c->repinfo.addrlen); +#else /* USE_WINSOCK */ + if(WSAGetLastError() == WSAECONNRESET) + return NGHTTP2_ERR_CALLBACK_FAILURE; + if(WSAGetLastError() == WSAEINPROGRESS) + return NGHTTP2_ERR_WOULDBLOCK; + if(WSAGetLastError() == WSAEWOULDBLOCK) { + ub_winsock_tcp_wouldblock(h2_session->c->ev->ev, + UB_EV_READ); + return NGHTTP2_ERR_WOULDBLOCK; + } + log_err_addr("could not http2 recv: %s", + wsa_strerror(WSAGetLastError()), + &h2_session->c->repinfo.addr, + h2_session->c->repinfo.addrlen); +#endif return NGHTTP2_ERR_CALLBACK_FAILURE; } - return r; -#else - (void)buf; - (void)len; - (void)cb_arg; - return -1; -#endif + return ret; } #endif /* HAVE_NGHTTP2 */ @@ -2411,15 +2447,17 @@ comm_point_http2_handle_read(int ATTR_UNUSED(fd), struct comm_point* c) #ifdef HAVE_NGHTTP2 int ret; log_assert(c->h2_session); - log_assert(c->ssl); /* reading until recv cb returns NGHTTP2_ERR_WOULDBLOCK */ ret = nghttp2_session_recv(c->h2_session->session); if(ret) { if(ret != NGHTTP2_ERR_EOF && ret != NGHTTP2_ERR_CALLBACK_FAILURE) { - verbose(VERB_QUERY, "http2: session_recv failed, " - "error: %s", nghttp2_strerror(ret)); + char a[256]; + addr_to_str(&c->repinfo.addr, c->repinfo.addrlen, + a, sizeof(a)); + verbose(VERB_QUERY, "http2: session_recv from %s failed, " + "error: %s", a, nghttp2_strerror(ret)); } return 0; } @@ -2648,47 +2686,81 @@ http_write_more(int fd, struct comm_point* c) ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session), const uint8_t* buf, size_t len, int ATTR_UNUSED(flags), void* cb_arg) { -#ifdef HAVE_SSL - int r; + ssize_t ret; struct http2_session* h2_session = (struct http2_session*)cb_arg; log_assert(h2_session->c->type == comm_http); log_assert(h2_session->c->h2_session); - if(!h2_session->c->ssl) - return 0; - - ERR_clear_error(); - r = SSL_write(h2_session->c->ssl, buf, len); - if(r <= 0) { - int want = SSL_get_error(h2_session->c->ssl, r); - if(want == SSL_ERROR_ZERO_RETURN) { - return NGHTTP2_ERR_CALLBACK_FAILURE; - } else if(want == SSL_ERROR_WANT_READ) { - h2_session->c->ssl_shake_state = comm_ssl_shake_hs_read; - comm_point_listen_for_rw(h2_session->c, 1, 0); - return NGHTTP2_ERR_WOULDBLOCK; - } else if(want == SSL_ERROR_WANT_WRITE) { - return NGHTTP2_ERR_WOULDBLOCK; - } else if(want == SSL_ERROR_SYSCALL) { -#ifdef EPIPE - if(errno == EPIPE && verbosity < 2) +#ifdef HAVE_SSL + if(h2_session->c->ssl) { + int r; + ERR_clear_error(); + r = SSL_write(h2_session->c->ssl, buf, len); + if(r <= 0) { + int want = SSL_get_error(h2_session->c->ssl, r); + if(want == SSL_ERROR_ZERO_RETURN) { return NGHTTP2_ERR_CALLBACK_FAILURE; + } else if(want == SSL_ERROR_WANT_READ) { + h2_session->c->ssl_shake_state = comm_ssl_shake_hs_read; + comm_point_listen_for_rw(h2_session->c, 1, 0); + return NGHTTP2_ERR_WOULDBLOCK; + } else if(want == SSL_ERROR_WANT_WRITE) { + return NGHTTP2_ERR_WOULDBLOCK; + } else if(want == SSL_ERROR_SYSCALL) { +#ifdef EPIPE + if(errno == EPIPE && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; #endif - if(errno != 0) - log_err("SSL_write syscall: %s", - strerror(errno)); + if(errno != 0) + log_err("SSL_write syscall: %s", + strerror(errno)); + return NGHTTP2_ERR_CALLBACK_FAILURE; + } + log_crypto_err("could not SSL_write"); return NGHTTP2_ERR_CALLBACK_FAILURE; } - log_crypto_err("could not SSL_write"); + return r; + } +#endif /* HAVE_SSL */ + + ret = send(h2_session->c->fd, buf, len, 0); + if(ret == 0) { + return NGHTTP2_ERR_CALLBACK_FAILURE; + } else if(ret < 0) { +#ifndef USE_WINSOCK + if(errno == EINTR || errno == EAGAIN) + return NGHTTP2_ERR_WOULDBLOCK; +#ifdef EPIPE + if(errno == EPIPE && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; +#endif +#ifdef ECONNRESET + if(errno == ECONNRESET && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; +#endif + log_err_addr("could not http2 write: %s", strerror(errno), + &h2_session->c->repinfo.addr, + h2_session->c->repinfo.addrlen); +#else /* USE_WINSOCK */ + if(WSAGetLastError() == WSAENOTCONN) + return NGHTTP2_ERR_WOULDBLOCK; + if(WSAGetLastError() == WSAEINPROGRESS) + return NGHTTP2_ERR_WOULDBLOCK; + if(WSAGetLastError() == WSAEWOULDBLOCK) { + ub_winsock_tcp_wouldblock(h2_session->c->ev->ev, + UB_EV_WRITE); + return NGHTTP2_ERR_WOULDBLOCK; + } + if(WSAGetLastError() == WSAECONNRESET && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; + log_err_addr("could not http2 write: %s", + wsa_strerror(WSAGetLastError()), + &h2_session->c->repinfo.addr, + h2_session->c->repinfo.addrlen); +#endif return NGHTTP2_ERR_CALLBACK_FAILURE; } - return r; -#else - (void)buf; - (void)len; - (void)cb_arg; - return -1; -#endif + return ret; } #endif /* HAVE_NGHTTP2 */ @@ -2699,7 +2771,6 @@ comm_point_http2_handle_write(int ATTR_UNUSED(fd), struct comm_point* c) #ifdef HAVE_NGHTTP2 int ret; log_assert(c->h2_session); - log_assert(c->ssl); ret = nghttp2_session_send(c->h2_session->session); if(ret) { diff --git a/util/regional.c b/util/regional.c index ff36d0e21..bd67ecf50 100644 --- a/util/regional.c +++ b/util/regional.c @@ -80,18 +80,39 @@ regional_init(struct regional* r) r->total_large = 0; } -struct regional* -regional_create_custom(size_t size) +/** + * Create a new region, with custom first block and large-object sizes. + * @param size: length of first block. + * @param large_object_size: outside of chunk allocation threshold. + * @return: newly allocated regional. + */ +static struct regional* +regional_create_custom_large_object(size_t size, size_t large_object_size) { - struct regional* r = (struct regional*)malloc(size); + struct regional* r; size = ALIGN_UP(size, ALIGNMENT); + r = (struct regional*)malloc(size); log_assert(sizeof(struct regional) <= size); if(!r) return NULL; r->first_size = size; + r->large_object_size = large_object_size; regional_init(r); return r; } +struct regional* +regional_create_custom(size_t size) +{ + return regional_create_custom_large_object(size, + REGIONAL_LARGE_OBJECT_SIZE); +} + +struct regional* +regional_create_nochunk(size_t size) +{ + return regional_create_custom_large_object(size, 0); +} + void regional_free_all(struct regional *r) { @@ -134,7 +155,7 @@ regional_alloc(struct regional *r, size_t size) malloc and ALIGN_UP */ a = ALIGN_UP(size, ALIGNMENT); /* large objects */ - if(a > REGIONAL_LARGE_OBJECT_SIZE) { + if(a > r->large_object_size) { s = malloc(ALIGNMENT + size); if(!s) return NULL; r->total_large += ALIGNMENT+size; @@ -219,7 +240,7 @@ regional_log_stats(struct regional *r) /* some basic assertions put here (non time critical code) */ log_assert(ALIGNMENT >= sizeof(char*)); log_assert(REGIONAL_CHUNK_SIZE > ALIGNMENT); - log_assert(REGIONAL_CHUNK_SIZE-ALIGNMENT > REGIONAL_LARGE_OBJECT_SIZE); + log_assert(REGIONAL_CHUNK_SIZE-ALIGNMENT > r->large_object_size); log_assert(REGIONAL_CHUNK_SIZE >= sizeof(struct regional)); /* debug print */ log_info("regional %u chunks, %u large", diff --git a/util/regional.h b/util/regional.h index e8b2cb8d0..eeb7de7b5 100644 --- a/util/regional.h +++ b/util/regional.h @@ -74,6 +74,8 @@ struct regional size_t available; /** current chunk data position. */ char* data; + /** threshold for outside of chunk allocations */ + size_t large_object_size; }; /** @@ -88,6 +90,14 @@ struct regional* regional_create(void); * @return: newly allocated regional. */ struct regional* regional_create_custom(size_t size); + +/** + * Create a new region, with custom settings, that will allocate everything + * outside the region chunk. + * @param size: length of first block. + * @return: newly allocated regional. + */ +struct regional* regional_create_nochunk(size_t size); /** * Free all memory associated with regional. Only keeps the first block with diff --git a/validator/val_secalgo.c b/validator/val_secalgo.c index 65bca8b69..15cccf017 100644 --- a/validator/val_secalgo.c +++ b/validator/val_secalgo.c @@ -990,6 +990,7 @@ static SECKEYPublicKey* nss_buf2ecdsa(unsigned char* key, size_t len, int algo) return pk; } +#if defined(USE_DSA) && defined(USE_SHA1) static SECKEYPublicKey* nss_buf2dsa(unsigned char* key, size_t len) { SECKEYPublicKey* pk; @@ -1050,6 +1051,7 @@ static SECKEYPublicKey* nss_buf2dsa(unsigned char* key, size_t len) } return pk; } +#endif /* USE_DSA && USE_SHA1 */ static SECKEYPublicKey* nss_buf2rsa(unsigned char* key, size_t len) {