diff --git a/configure b/configure index 3e5e562ae..7fa20f987 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.12.1. +# Generated by GNU Autoconf 2.69 for unbound 1.13.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.12.1' -PACKAGE_STRING='unbound 1.12.1' +PACKAGE_VERSION='1.13.0' +PACKAGE_STRING='unbound 1.13.0' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -1459,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.12.1 to adapt to many kinds of systems. +\`configure' configures unbound 1.13.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1524,7 +1524,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.12.1:";; + short | recursive ) echo "Configuration of unbound 1.13.0:";; esac cat <<\_ACEOF @@ -1752,7 +1752,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.12.1 +unbound configure 1.13.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2461,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.12.1, which was +It was created by unbound $as_me 1.13.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2811,9 +2811,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu UNBOUND_VERSION_MAJOR=1 -UNBOUND_VERSION_MINOR=12 +UNBOUND_VERSION_MINOR=13 -UNBOUND_VERSION_MICRO=1 +UNBOUND_VERSION_MICRO=0 LIBUNBOUND_CURRENT=9 @@ -2895,7 +2895,7 @@ LIBUNBOUND_AGE=1 # 1.10.1 had 9:8:1 # 1.11.0 had 9:9:1 # 1.12.0 had 9:10:1 -# 1.12.1 had 9:11:1 +# 1.13.0 had 9:11:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -21731,7 +21731,7 @@ _ACEOF -version=1.12.1 +version=1.13.0 date=`date +'%b %e, %Y'` @@ -22250,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.12.1, which was +This file was extended by unbound $as_me 1.13.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22316,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.12.1 +unbound config.status 1.13.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b4caa37dd..5385f7747 100644 --- a/configure.ac +++ b/configure.ac @@ -10,8 +10,8 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) -m4_define([VERSION_MINOR],[12]) -m4_define([VERSION_MICRO],[1]) +m4_define([VERSION_MINOR],[13]) +m4_define([VERSION_MICRO],[0]) 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]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) @@ -96,7 +96,7 @@ LIBUNBOUND_AGE=1 # 1.10.1 had 9:8:1 # 1.11.0 had 9:9:1 # 1.12.0 had 9:10:1 -# 1.12.1 had 9:11:1 +# 1.13.0 had 9:11:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary diff --git a/contrib/README b/contrib/README index 9db078e56..ef2a0ab88 100644 --- a/contrib/README +++ b/contrib/README @@ -53,3 +53,5 @@ distribution but may be helpful. lookups for downstream clients. * drop2rpz: perl script that converts the Spamhaus DROP-List in RPZ-Format, contributed by Andreas Schulze. +* metrics.awk: awk script that can convert unbound-control stats to + Prometheus metrics format output. diff --git a/contrib/metrics.awk b/contrib/metrics.awk new file mode 100644 index 000000000..5a7a2569c --- /dev/null +++ b/contrib/metrics.awk @@ -0,0 +1,180 @@ +# read output of unbound-control stats +# and output prometheus metrics style output. +# use these options: +# server: extended-statistics: yes +# statistics-cumulative: no +# statistics-interval: 0 +# remote-control: control-enable: yes +# Can use it like unbound-control stats | awk -f "metrics.awk" + +BEGIN { + FS="="; +} +# everything like total.num.queries=value is put in val["total.num.queries"] +/^.*\..*=/ { + val[$1]=$2; +} +# print the output metrics +END { + print "# HELP unbound_hits_queries Unbound DNS traffic and cache hits" + print "# TYPE unbound_hits_queries gauge" + print "unbound_hits_queries{type=\"total.num.queries\"} " val["total.num.queries"]; + for (x=0; x<99; x++) { + if(val["thread" $x ".num.queries"] != "") { + print "unbound_hits_queries{type=\"thread" $x ".num.queries\"} " val["thread" $x ".num.queries"]; + } + } + print "unbound_hits_queries{type=\"total.num.cachehits\"} " val["total.num.cachehits"]; + print "unbound_hits_queries{type=\"total.num.prefetch\"} " val["total.num.prefetch"]; + print "unbound_hits_queries{type=\"num.query.tcp\"} " val["num.query.tcp"]; + print "unbound_hits_queries{type=\"num.query.tcpout\"} " val["num.query.tcpout"]; + print "unbound_hits_queries{type=\"num.query.tls\"} " val["num.query.tls"]; + print "unbound_hits_queries{type=\"num.query.tls.resume\"} " val["num.query.tls.resume"]; + print "unbound_hits_queries{type=\"num.query.ipv6\"} " val["num.query.ipv6"]; + print "unbound_hits_queries{type=\"unwanted.queries\"} " val["unwanted.queries"]; + print "" + + print "# HELP unbound_queue_queries Unbound requestlist size" + print "# TYPE unbound_queue_queries gauge" + print "unbound_queue_queries{type=\"total.requestlist.avg\"} " val["total.requestlist.avg"]; + print "unbound_queue_queries{type=\"total.requestlist.max\"} " val["total.requestlist.max"]; + print "unbound_queue_queries{type=\"total.requestlist.overwritten\"} " val["total.requestlist.overwritten"]; + print "unbound_queue_queries{type=\"total.requestlist.exceeded\"} " val["total.requestlist.exceeded"]; + print "" + + print "# HELP unbound_memory_bytes Unbound memory usage" + print "# TYPE unbound_memory_bytes gauge" + print "unbound_memory_bytes{type=\"mem.cache.rrset\"} " val["mem.cache.rrset"]; + print "unbound_memory_bytes{type=\"mem.cache.message\"} " val["mem.cache.message"]; + print "unbound_memory_bytes{type=\"mem.mod.iterator\"} " val["mem.mod.iterator"]; + if(val["mem.mod.validator"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.validator\"} " val["mem.mod.validator"]; + } + if(val["mem.mod.respip"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.respip\"} " val["mem.mod.respip"]; + } + if(val["mem.mod.subnet"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.subnet\"} " val["mem.mod.subnet"]; + } + if(val["mem.mod.ipsecmod"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.ipsecmod\"} " val["mem.mod.ipsecmod"]; + } + if(val["mem.mod.dynlibmod"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.dynlibmod\"} " val["mem.mod.dynlibmod"]; + } + print "unbound_memory_bytes{type=\"msg.cache.count\"} " val["msg.cache.count"]; + print "unbound_memory_bytes{type=\"rrset.cache.count\"} " val["rrset.cache.count"]; + print "unbound_memory_bytes{type=\"infra.cache.count\"} " val["infra.cache.count"]; + print "unbound_memory_bytes{type=\"key.cache.count\"} " val["key.cache.count"]; + print "" + + print "# HELP unbound_by_type_queries Unbound DNS queries by type" + print "# TYPE unbound_by_type_queries gauge" + for(x in val) { + if(x ~ /^num.query.type./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_type_queries{type=\"" a[4] "\"} " val[x]; + } + } + } + print "" + + print "# HELP unbound_by_class_queries Unbound DNS queries by class" + print "# TYPE unbound_by_class_queries gauge" + for(x in val) { + if(x ~ /^num.query.class./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_class_queries{class=\"" a[4] "\"} " val[x]; + } + } + } + print "" + + print "# HELP unbound_by_opcode_queries Unbound DNS queries by opcode" + print "# TYPE unbound_by_opcode_queries gauge" + for(x in val) { + if(x ~ /^num.query.opcode./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_opcode_queries{opcode=\"" a[4] "\"} " val[x]; + } + } + } + print "" + + print "# HELP unbound_by_rcode_queries Unbound DNS answers by rcode" + print "# TYPE unbound_by_rcode_queries gauge" + for(x in val) { + if(x ~ /^num.answer.rcode./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_rcode_queries{rcode=\"" a[4] "\"} " val[x]; + } + } + } + print "" + + print "# HELP unbound_by_flags_queries Unbound DNS queries by flags" + print "# TYPE unbound_by_flags_queries gauge" + for(x in val) { + if(x ~ /^num.query.flags./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_flags_queries{flag=\"" a[4] "\"} " val[x]; + } + } + } + if(val["num.query.edns.present"] != "") { + print "unbound_by_flags_queries{flag=\"num.query.edns.present\"} " val["num.query.edns.present"]; + } + if(val["num.query.edns.DO"] != "") { + print "unbound_by_flags_queries{flag=\"num.query.edns.DO\"} " val["num.query.edns.DO"]; + } + print "" + + print "# HELP unbound_histogram_seconds Unbound DNS histogram of reply time" + print "# TYPE unbound_histogram_seconds gauge" + print "unbound_histogram_seconds{bucket=\"000000.000000.to.000000.000001\"} " val["histogram.000000.000000.to.000000.000001"]; + print "unbound_histogram_seconds{bucket=\"000000.000001.to.000000.000002\"} " val["histogram.000000.000001.to.000000.000002"]; + print "unbound_histogram_seconds{bucket=\"000000.000002.to.000000.000004\"} " val["histogram.000000.000002.to.000000.000004"]; + print "unbound_histogram_seconds{bucket=\"000000.000004.to.000000.000008\"} " val["histogram.000000.000004.to.000000.000008"]; + print "unbound_histogram_seconds{bucket=\"000000.000008.to.000000.000016\"} " val["histogram.000000.000008.to.000000.000016"]; + print "unbound_histogram_seconds{bucket=\"000000.000016.to.000000.000032\"} " val["histogram.000000.000016.to.000000.000032"]; + print "unbound_histogram_seconds{bucket=\"000000.000032.to.000000.000064\"} " val["histogram.000000.000032.to.000000.000064"]; + print "unbound_histogram_seconds{bucket=\"000000.000064.to.000000.000128\"} " val["histogram.000000.000064.to.000000.000128"]; + print "unbound_histogram_seconds{bucket=\"000000.000128.to.000000.000256\"} " val["histogram.000000.000128.to.000000.000256"]; + print "unbound_histogram_seconds{bucket=\"000000.000256.to.000000.000512\"} " val["histogram.000000.000256.to.000000.000512"]; + print "unbound_histogram_seconds{bucket=\"000000.000512.to.000000.001024\"} " val["histogram.000000.000512.to.000000.001024"]; + print "unbound_histogram_seconds{bucket=\"000000.001024.to.000000.002048\"} " val["histogram.000000.001024.to.000000.002048"]; + print "unbound_histogram_seconds{bucket=\"000000.002048.to.000000.004096\"} " val["histogram.000000.002048.to.000000.004096"]; + print "unbound_histogram_seconds{bucket=\"000000.004096.to.000000.008192\"} " val["histogram.000000.004096.to.000000.008192"]; + print "unbound_histogram_seconds{bucket=\"000000.008192.to.000000.016384\"} " val["histogram.000000.008192.to.000000.016384"]; + print "unbound_histogram_seconds{bucket=\"000000.016384.to.000000.032768\"} " val["histogram.000000.016384.to.000000.032768"]; + print "unbound_histogram_seconds{bucket=\"000000.032768.to.000000.065536\"} " val["histogram.000000.032768.to.000000.065536"]; + print "unbound_histogram_seconds{bucket=\"000000.065536.to.000000.131072\"} " val["histogram.000000.065536.to.000000.131072"]; + print "unbound_histogram_seconds{bucket=\"000000.131072.to.000000.262144\"} " val["histogram.000000.131072.to.000000.262144"]; + print "unbound_histogram_seconds{bucket=\"000000.262144.to.000000.524288\"} " val["histogram.000000.262144.to.000000.524288"]; + print "unbound_histogram_seconds{bucket=\"000000.524288.to.000001.000000\"} " val["histogram.000000.524288.to.000001.000000"]; + print "unbound_histogram_seconds{bucket=\"000001.000000.to.000002.000000\"} " val["histogram.000001.000000.to.000002.000000"]; + print "unbound_histogram_seconds{bucket=\"000002.000000.to.000004.000000\"} " val["histogram.000002.000000.to.000004.000000"]; + print "unbound_histogram_seconds{bucket=\"000004.000000.to.000008.000000\"} " val["histogram.000004.000000.to.000008.000000"]; + print "unbound_histogram_seconds{bucket=\"000008.000000.to.000016.000000\"} " val["histogram.000008.000000.to.000016.000000"]; + print "unbound_histogram_seconds{bucket=\"000016.000000.to.000032.000000\"} " val["histogram.000016.000000.to.000032.000000"]; + print "unbound_histogram_seconds{bucket=\"000032.000000.to.000064.000000\"} " val["histogram.000032.000000.to.000064.000000"]; + print "unbound_histogram_seconds{bucket=\"000064.000000.to.000128.000000\"} " val["histogram.000064.000000.to.000128.000000"]; + print "unbound_histogram_seconds{bucket=\"000128.000000.to.000256.000000\"} " val["histogram.000128.000000.to.000256.000000"]; + print "unbound_histogram_seconds{bucket=\"000256.000000.to.000512.000000\"} " val["histogram.000256.000000.to.000512.000000"]; + print "unbound_histogram_seconds{bucket=\"000512.000000.to.001024.000000\"} " val["histogram.000512.000000.to.001024.000000"]; + print "unbound_histogram_seconds{bucket=\"001024.000000.to.002048.000000\"} " val["histogram.001024.000000.to.002048.000000"]; + print "unbound_histogram_seconds{bucket=\"002048.000000.to.004096.000000\"} " val["histogram.002048.000000.to.004096.000000"]; + print "unbound_histogram_seconds{bucket=\"004096.000000.to.008192.000000\"} " val["histogram.004096.000000.to.008192.000000"]; + print "unbound_histogram_seconds{bucket=\"008192.000000.to.016384.000000\"} " val["histogram.008192.000000.to.016384.000000"]; + print "unbound_histogram_seconds{bucket=\"016384.000000.to.032768.000000\"} " val["histogram.016384.000000.to.032768.000000"]; + print "unbound_histogram_seconds{bucket=\"032768.000000.to.065536.000000\"} " val["histogram.032768.000000.to.065536.000000"]; + print "unbound_histogram_seconds{bucket=\"065536.000000.to.131072.000000\"} " val["histogram.065536.000000.to.131072.000000"]; + print "unbound_histogram_seconds{bucket=\"131072.000000.to.262144.000000\"} " val["histogram.131072.000000.to.262144.000000"]; + print "unbound_histogram_seconds{bucket=\"262144.000000.to.524288.000000\"} " val["histogram.262144.000000.to.524288.000000"]; + print "" +} diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in index c95ab94b3..a4596978d 100644 --- a/contrib/unbound.service.in +++ b/contrib/unbound.service.in @@ -66,7 +66,7 @@ ProtectSystem=strict RuntimeDirectory=unbound ConfigurationDirectory=unbound StateDirectory=unbound -RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX RestrictRealtime=true SystemCallArchitectures=native SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module mount @obsolete @resources diff --git a/contrib/unbound_portable.service.in b/contrib/unbound_portable.service.in index 998b66dec..e763763f0 100644 --- a/contrib/unbound_portable.service.in +++ b/contrib/unbound_portable.service.in @@ -38,7 +38,7 @@ ProtectSystem=strict RuntimeDirectory=unbound ConfigurationDirectory=unbound StateDirectory=unbound -RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX RestrictRealtime=true SystemCallArchitectures=native SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module mount @obsolete @resources diff --git a/daemon/daemon.c b/daemon/daemon.c index f480c94e6..a11d50a9b 100644 --- a/daemon/daemon.c +++ b/daemon/daemon.c @@ -291,7 +291,7 @@ daemon_init(void) free(daemon); return NULL; } - if(!(daemon->env->edns_tags = edns_tags_create())) { + if(!(daemon->env->edns_strings = edns_strings_create())) { auth_zones_delete(daemon->env->auth_zones); acl_list_delete(daemon->acl); tcl_list_delete(daemon->tcl); @@ -638,9 +638,9 @@ daemon_fork(struct daemon* daemon) &daemon->use_rpz)) fatal_exit("auth_zones could not be setup"); - /* Set-up EDNS tags */ - if(!edns_tags_apply_cfg(daemon->env->edns_tags, daemon->cfg)) - fatal_exit("Could not set up EDNS tags"); + /* Set-up EDNS strings */ + if(!edns_strings_apply_cfg(daemon->env->edns_strings, daemon->cfg)) + fatal_exit("Could not set up EDNS strings"); /* setup modules */ daemon_setup_modules(daemon); @@ -773,7 +773,7 @@ daemon_delete(struct daemon* daemon) rrset_cache_delete(daemon->env->rrset_cache); infra_delete(daemon->env->infra_cache); edns_known_options_delete(daemon->env); - edns_tags_delete(daemon->env->edns_tags); + edns_strings_delete(daemon->env->edns_strings); auth_zones_delete(daemon->env->auth_zones); } ub_randfree(daemon->rand); diff --git a/daemon/unbound.c b/daemon/unbound.c index cd0fd69f2..bc6d2bc9e 100644 --- a/daemon/unbound.c +++ b/daemon/unbound.c @@ -337,22 +337,44 @@ readpid (const char* file) /** write pid to file. * @param pidfile: file name of pid file. * @param pid: pid to write to file. + * @return false on failure */ -static void +static int writepid (const char* pidfile, pid_t pid) { - FILE* f; + int fd; + char pidbuf[32]; + size_t count = 0; + snprintf(pidbuf, sizeof(pidbuf), "%lu\n", (unsigned long)pid); - if ((f = fopen(pidfile, "w")) == NULL ) { + if((fd = open(pidfile, O_WRONLY | O_CREAT | O_TRUNC +#ifdef O_NOFOLLOW + | O_NOFOLLOW +#endif + , 0644)) == -1) { log_err("cannot open pidfile %s: %s", pidfile, strerror(errno)); - return; + return 0; } - if(fprintf(f, "%lu\n", (unsigned long)pid) < 0) { - log_err("cannot write to pidfile %s: %s", - pidfile, strerror(errno)); + while(count < strlen(pidbuf)) { + ssize_t r = write(fd, pidbuf+count, strlen(pidbuf)-count); + if(r == -1) { + if(errno == EAGAIN || errno == EINTR) + continue; + log_err("cannot write to pidfile %s: %s", + pidfile, strerror(errno)); + close(fd); + return 0; + } else if(r == 0) { + log_err("cannot write any bytes to pidfile %s: " + "write returns 0 bytes written", pidfile); + close(fd); + return 0; + } + count += r; } - fclose(f); + close(fd); + return 1; } /** @@ -506,16 +528,17 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode, /* write new pidfile (while still root, so can be outside chroot) */ #ifdef HAVE_KILL if(cfg->pidfile && cfg->pidfile[0] && need_pidfile) { - writepid(daemon->pidfile, getpid()); - if(cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1 && - pidinchroot) { + if(writepid(daemon->pidfile, getpid())) { + if(cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1 && + pidinchroot) { # ifdef HAVE_CHOWN - if(chown(daemon->pidfile, cfg_uid, cfg_gid) == -1) { - verbose(VERB_QUERY, "cannot chown %u.%u %s: %s", - (unsigned)cfg_uid, (unsigned)cfg_gid, - daemon->pidfile, strerror(errno)); - } + if(chown(daemon->pidfile, cfg_uid, cfg_gid) == -1) { + verbose(VERB_QUERY, "cannot chown %u.%u %s: %s", + (unsigned)cfg_uid, (unsigned)cfg_gid, + daemon->pidfile, strerror(errno)); + } # endif /* HAVE_CHOWN */ + } } } #else diff --git a/daemon/worker.c b/daemon/worker.c index 458afa04e..76c4bb5b1 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -576,7 +576,7 @@ apply_respip_action(struct worker* worker, const struct query_info* qinfo, struct comm_reply* repinfo, struct ub_packed_rrset_key** alias_rrset, struct reply_info** encode_repp, struct auth_zones* az) { - struct respip_action_info actinfo = {0}; + struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL}; actinfo.action = respip_none; if(qinfo->qtype != LDNS_RR_TYPE_A && @@ -1807,7 +1807,7 @@ worker_init(struct worker* worker, struct config_file *cfg, &worker_alloc_cleanup, worker, cfg->do_udp || cfg->udp_upstream_without_downstream, worker->daemon->connect_sslctx, cfg->delay_close, - cfg->tls_use_sni, dtenv); + cfg->tls_use_sni, dtenv, cfg->udp_connect); if(!worker->back) { log_err("could not create outgoing sockets"); worker_delete(worker); diff --git a/doc/Changelog b/doc/Changelog index 0b4fe977a..d9c04d1d4 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,80 @@ +1 December 2020: Wouter + - Fix #358: Squelch udp connect 'no route to host' errors on low + verbosity. + +30 November 2020: Wouter + - Fix assertion failure on double callback when iterator loses + interest in query at head of line that then has the tcp stream + not kept for reuse. + - tag for the 1.13.0rc4 release. + +27 November 2020: Wouter + - Fix compile warning for type cast in http2_submit_dns_response. + - Fix when use free buffer to initialize rbtree for stream reuse. + - Fix compile warnings for windows. + - Fix compile warnings in rpz initialization. + - Fix contrib/metrics.awk for FreeBSD awk compatibility. + - tag for the 1.13.0rc3 release. + +26 November 2020: Wouter + - Fix to omit UDP receive errors from log, if verbosity low. + These happen because of udp-connect. + - For #352: contrib/metrics.awk for Prometheus style metrics output. + - Fix that after failed read, the readagain cannot activate. + - Clear readagain upon decommission of pending tcp structure. + +25 November 2020: Wouter + - with udp-connect ignore connection refused with UDP timeouts. + - Fix udp-connect on FreeBSD, do send calls on connected UDP socket. + - Better fix for reuse tree comparison for is-tls sockets. Where + the tree key identity is preserved after cleanup of the TLS state. + - Remove debug commands from reuse tests. + - Fix memory leak for edns client tag opcode config element. + - Attempt fix for libevent state in tcp reuse cases after a packet + is written. + - Fix readagain and writeagain callback functions for comm point + cleanup. + - tag for the 1.13.0rc2 release. + +24 November 2020: Wouter + - Merge PR #283 : Stream reuse. This implements upstream stream + reuse for performing several queries over the same TCP or TLS + channel. + - set version of main branch to 1.13.0 for upcoming release. + - iana portlist updated. + - Fix one port unit test for udp-connect. + - tag for the 1.13.0rc1 release. + - Fix crash when TLS connection is closed prematurely, when + reuse tree comparison is not properly identical to insertion. + - Fix padding of struct regional for 32bit systems. + +23 November 2020: George + - Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with + edns-client-string option. + +23 November 2020: Wouter + - Merge #351 from dvzrv: Add AF_NETLINK to set of allowed socket + address families. + - Fix #350: with the AF_NETLINK permission, to fix 1.12.0 error: + failed to list interfaces: getifaddrs: Address family not + supported by protocol. + - Fix #347: IP_DONTFRAG broken on Apple xcode 12.2. + - Option to toggle udp-connect, default is enabled. + - Fix for #303 CVE-2020-28935 : Fix that symlink does not interfere + with chown of pidfile. + - Further fix for it and retvalue 0 fix for it. + +12 November 2020: Wouter + - Fix to connect() to UDP destinations, default turned on, + this lowers vulnerability to ICMP side channels. + - Retry for interfaces with unused ports if possible. + +10 November 2020: Wouter + - Fix #341: fixing a possible memory leak. + - Fix memory leak after fix for possible memory leak failure. + - Fix #343: Fail to build --with-libnghttp2 with error: 'SSIZE_MAX' + undeclared. + 27 October 2020: Wouter - In man page note that tls-cert-bundle is read before permission drop and chroot. diff --git a/doc/example.conf.in b/doc/example.conf.in index 85d475ea3..9269461cf 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -161,6 +161,9 @@ server: # msec to wait before close of port on timeout UDP. 0 disables. # delay-close: 0 + # perform connect for UDP sockets to mitigate ICMP side channel. + # udp-connect: yes + # msec for waiting for an unknown server to reply. Increase if you # are behind a slow satellite link, to eg. 1128. # unknown-server-time-limit: 376 diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 84805f90f..38bbc44df 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -274,6 +274,10 @@ eg. 1500 msec. When timeouts happen you need extra sockets, it checks the ID and remote IP of packets, and unwanted packets are added to the unwanted packet counter. .TP +.B udp\-connect: \fI +Perform connect for UDP sockets that mitigates ICMP side channel leakage. +Default is yes. +.TP .B unknown\-server\-time\-limit: \fI The wait time in msec for waiting for an unknown server to reply. Increase this if you are behind a slow satellite link, to eg. 1128. @@ -1546,15 +1550,15 @@ Set the number of servers that should be used for fast server selection. Only use the fastest specified number of servers with the fast\-server\-permil option, that turns this on or off. The default is to use the fastest 3 servers. .TP 5 -.B edns\-client\-tag: \fI -Include an edns-client-tag option in queries with destination address matching -the configured IP netblock. This configuration option can be used multiple -times. The most specific match will be used. The tag data is configured in -decimal format, from 0 to 65535. +.B edns\-client\-string: \fI +Include an EDNS0 option containing configured ascii string in queries with +destination address matching the configured IP netblock. This configuration +option can be used multiple times. The most specific match will be used. .TP 5 -.B edns\-client\-tag\-opcode: \fI -EDNS0 option code for the edns-client-tag option, from 0 to 65535. Default is -16, as assigned by IANA. +.B edns\-client\-string\-opcode: \fI +EDNS0 option code for the \fIedns\-client\-string\fR option, from 0 to 65535. +A value from the `Reserved for Local/Experimental` range (65001-65534) should +be used. Default is 65001. .SS "Remote Control Options" In the .B remote\-control: diff --git a/libunbound/context.c b/libunbound/context.c index 713259c71..cff2831a7 100644 --- a/libunbound/context.c +++ b/libunbound/context.c @@ -80,7 +80,7 @@ context_finalize(struct ub_ctx* ctx) return UB_INITFAIL; if(!auth_zones_apply_cfg(ctx->env->auth_zones, cfg, 1, &is_rpz)) return UB_INITFAIL; - if(!edns_tags_apply_cfg(ctx->env->edns_tags, cfg)) + if(!edns_strings_apply_cfg(ctx->env->edns_strings, cfg)) return UB_INITFAIL; if(!slabhash_is_size(ctx->env->msg_cache, cfg->msg_cache_size, cfg->msg_cache_slabs)) { diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c index 3922eb041..c9e24ba8d 100644 --- a/libunbound/libunbound.c +++ b/libunbound/libunbound.c @@ -154,8 +154,8 @@ static struct ub_ctx* ub_ctx_create_nopipe(void) errno = ENOMEM; return NULL; } - ctx->env->edns_tags = edns_tags_create(); - if(!ctx->env->edns_tags) { + ctx->env->edns_strings = edns_strings_create(); + if(!ctx->env->edns_strings) { auth_zones_delete(ctx->env->auth_zones); edns_known_options_delete(ctx->env); config_delete(ctx->env->cfg); @@ -186,7 +186,7 @@ ub_ctx_create(void) config_delete(ctx->env->cfg); modstack_desetup(&ctx->mods, ctx->env); edns_known_options_delete(ctx->env); - edns_tags_delete(ctx->env->edns_tags); + edns_strings_delete(ctx->env->edns_strings); free(ctx->env); free(ctx); errno = e; @@ -199,7 +199,7 @@ ub_ctx_create(void) config_delete(ctx->env->cfg); modstack_desetup(&ctx->mods, ctx->env); edns_known_options_delete(ctx->env); - edns_tags_delete(ctx->env->edns_tags); + edns_strings_delete(ctx->env->edns_strings); free(ctx->env); free(ctx); errno = e; @@ -338,7 +338,7 @@ ub_ctx_delete(struct ub_ctx* ctx) infra_delete(ctx->env->infra_cache); config_delete(ctx->env->cfg); edns_known_options_delete(ctx->env); - edns_tags_delete(ctx->env->edns_tags); + edns_strings_delete(ctx->env->edns_strings); auth_zones_delete(ctx->env->auth_zones); free(ctx->env); } diff --git a/libunbound/libworker.c b/libunbound/libworker.c index bd42462e1..06cbb8869 100644 --- a/libunbound/libworker.c +++ b/libunbound/libworker.c @@ -238,7 +238,7 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb) ports, numports, cfg->unwanted_threshold, cfg->outgoing_tcp_mss, &libworker_alloc_cleanup, w, cfg->do_udp || cfg->udp_upstream_without_downstream, w->sslctx, - cfg->delay_close, cfg->tls_use_sni, NULL); + cfg->delay_close, cfg->tls_use_sni, NULL, cfg->udp_connect); w->env->outnet = w->back; if(!w->is_bg || w->is_bg_thread) { lock_basic_unlock(&ctx->cfglock); diff --git a/respip/respip.c b/respip/respip.c index 6fa4f1885..9ee098def 100644 --- a/respip/respip.c +++ b/respip/respip.c @@ -914,7 +914,7 @@ respip_rewrite_reply(const struct query_info* qinfo, int ret = 1; struct ub_packed_rrset_key* redirect_rrset = NULL; struct rpz* r; - struct auth_zone* a; + struct auth_zone* a = NULL; struct ub_packed_rrset_key* data = NULL; int rpz_used = 0; int rpz_log = 0; @@ -1109,7 +1109,7 @@ respip_operate(struct module_qstate* qstate, enum module_ev event, int id, qstate->return_msg && qstate->return_msg->rep) { struct reply_info* new_rep = qstate->return_msg->rep; struct ub_packed_rrset_key* alias_rrset = NULL; - struct respip_action_info actinfo = {0}; + struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL}; actinfo.action = respip_none; if(!respip_rewrite_reply(&qstate->qinfo, @@ -1170,7 +1170,7 @@ respip_merge_cname(struct reply_info* base_rep, struct ub_packed_rrset_key* alias_rrset = NULL; /* ditto */ uint16_t tgt_rcode; size_t i, j; - struct respip_action_info actinfo = {0}; + struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL}; actinfo.action = respip_none; /* If the query for the CNAME target would result in an unusual rcode, diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index e506eeb31..d63c0e0aa 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -43,6 +43,7 @@ # include #endif #include +#include #ifdef USE_TCP_FASTOPEN #include #endif @@ -530,7 +531,9 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, return -1; } } -# elif defined(IP_DONTFRAG) +# elif defined(IP_DONTFRAG) && !defined(__APPLE__) + /* the IP_DONTFRAG option if defined in the 11.0 OSX headers, + * but does not work on that version, so we exclude it */ int off = 0; if (setsockopt(s, IPPROTO_IP, IP_DONTFRAG, &off, (socklen_t)sizeof(off)) < 0) { @@ -1404,6 +1407,7 @@ static int resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addresses, int *ip_addresses_size) { struct ifaddrs *ifa; + void *tmpbuf; int last_ip_addresses_size = *ip_addresses_size; for(ifa = ifas; ifa != NULL; ifa = ifa->ifa_next) { @@ -1468,10 +1472,12 @@ resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addres } verbose(4, "interface %s has address %s", search_ifa, addr_buf); - *ip_addresses = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1)); - if(!*ip_addresses) { + tmpbuf = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1)); + if(!tmpbuf) { log_err("realloc failed: out of memory"); return 0; + } else { + *ip_addresses = tmpbuf; } (*ip_addresses)[*ip_addresses_size] = strdup(addr_buf); if(!(*ip_addresses)[*ip_addresses_size]) { @@ -1482,10 +1488,12 @@ resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addres } if (*ip_addresses_size == last_ip_addresses_size) { - *ip_addresses = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1)); - if(!*ip_addresses) { + tmpbuf = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1)); + if(!tmpbuf) { log_err("realloc failed: out of memory"); return 0; + } else { + *ip_addresses = tmpbuf; } (*ip_addresses)[*ip_addresses_size] = strdup(search_ifa); if(!(*ip_addresses)[*ip_addresses_size]) { @@ -2200,7 +2208,7 @@ 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); + snprintf(rlen_str, sizeof(rlen_str), "%u", (unsigned)rlen); lock_basic_lock(&http2_response_buffer_count_lock); if(http2_response_buffer_count + rlen > http2_response_buffer_max) { diff --git a/services/outside_network.c b/services/outside_network.c index 31b71f4c7..e884dec30 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -132,6 +132,52 @@ serviced_cmp(const void* key1, const void* key2) return sockaddr_cmp(&q1->addr, q1->addrlen, &q2->addr, q2->addrlen); } +/** compare if the reuse element has the same address, port and same ssl-is + * used-for-it characteristic */ +static int +reuse_cmp_addrportssl(const void* key1, const void* key2) +{ + struct reuse_tcp* r1 = (struct reuse_tcp*)key1; + struct reuse_tcp* r2 = (struct reuse_tcp*)key2; + int r; + /* compare address and port */ + r = sockaddr_cmp(&r1->addr, r1->addrlen, &r2->addr, r2->addrlen); + if(r != 0) + return r; + + /* compare if SSL-enabled */ + if(r1->is_ssl && !r2->is_ssl) + return 1; + if(!r1->is_ssl && r2->is_ssl) + return -1; + return 0; +} + +int +reuse_cmp(const void* key1, const void* key2) +{ + int r; + r = reuse_cmp_addrportssl(key1, key2); + if(r != 0) + return r; + + /* compare ptr value */ + if(key1 < key2) return -1; + if(key1 > key2) return 1; + return 0; +} + +int reuse_id_cmp(const void* key1, const void* key2) +{ + struct waiting_tcp* w1 = (struct waiting_tcp*)key1; + struct waiting_tcp* w2 = (struct waiting_tcp*)key2; + if(w1->id < w2->id) + return -1; + if(w1->id > w2->id) + return 1; + return 0; +} + /** delete waiting_tcp entry. Does not unlink from waiting list. * @param w: to delete. */ @@ -280,15 +326,234 @@ outnet_tcp_connect(int s, struct sockaddr_storage* addr, socklen_t addrlen) return 1; } +/** log reuse item addr and ptr with message */ +static void +log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse) +{ + uint16_t port; + char addrbuf[128]; + if(verbosity < v) return; + addr_to_str(&reuse->addr, reuse->addrlen, addrbuf, sizeof(addrbuf)); + port = ntohs(((struct sockaddr_in*)&reuse->addr)->sin_port); + verbose(v, "%s %s#%u fd %d", msg, addrbuf, (unsigned)port, + reuse->pending->c->fd); +} + +/** pop the first element from the writewait list */ +static struct waiting_tcp* reuse_write_wait_pop(struct reuse_tcp* reuse) +{ + struct waiting_tcp* w = reuse->write_wait_first; + if(!w) + return NULL; + log_assert(w->write_wait_queued); + log_assert(!w->write_wait_prev); + reuse->write_wait_first = w->write_wait_next; + if(w->write_wait_next) + w->write_wait_next->write_wait_prev = NULL; + else reuse->write_wait_last = NULL; + w->write_wait_queued = 0; + return w; +} + +/** remove the element from the writewait list */ +static void reuse_write_wait_remove(struct reuse_tcp* reuse, + struct waiting_tcp* w) +{ + if(!w) + return; + if(!w->write_wait_queued) + return; + if(w->write_wait_prev) + w->write_wait_prev->write_wait_next = w->write_wait_next; + else reuse->write_wait_first = w->write_wait_next; + if(w->write_wait_next) + w->write_wait_next->write_wait_prev = w->write_wait_prev; + else reuse->write_wait_last = w->write_wait_prev; + w->write_wait_queued = 0; +} + +/** push the element after the last on the writewait list */ +static void reuse_write_wait_push_back(struct reuse_tcp* reuse, + struct waiting_tcp* w) +{ + if(!w) return; + log_assert(!w->write_wait_queued); + if(reuse->write_wait_last) { + reuse->write_wait_last->write_wait_next = w; + w->write_wait_prev = reuse->write_wait_last; + } else { + reuse->write_wait_first = w; + } + reuse->write_wait_last = w; + w->write_wait_queued = 1; +} + +/** insert element in tree by id */ +void +reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w) +{ + log_assert(w->id_node.key == NULL); + w->id_node.key = w; + rbtree_insert(&reuse->tree_by_id, &w->id_node); +} + +/** find element in tree by id */ +struct waiting_tcp* +reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id) +{ + struct waiting_tcp key_w; + rbnode_type* n; + memset(&key_w, 0, sizeof(key_w)); + key_w.id_node.key = &key_w; + key_w.id = id; + n = rbtree_search(&reuse->tree_by_id, &key_w); + if(!n) return NULL; + return (struct waiting_tcp*)n->key; +} + +/** return ID value of rbnode in tree_by_id */ +static uint16_t +tree_by_id_get_id(rbnode_type* node) +{ + struct waiting_tcp* w = (struct waiting_tcp*)node->key; + return w->id; +} + +/** insert into reuse tcp tree and LRU, false on failure (duplicate) */ +static int +reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp) +{ + log_reuse_tcp(VERB_CLIENT, "reuse_tcp_insert", &pend_tcp->reuse); + if(pend_tcp->reuse.item_on_lru_list) + return 1; + pend_tcp->reuse.node.key = &pend_tcp->reuse; + pend_tcp->reuse.pending = pend_tcp; + if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) { + /* this is a duplicate connection, close this one */ + verbose(VERB_CLIENT, "reuse_tcp_insert: duplicate connection"); + pend_tcp->reuse.node.key = NULL; + return 0; + } + /* insert into LRU, first is newest */ + pend_tcp->reuse.lru_prev = NULL; + if(outnet->tcp_reuse_first) { + pend_tcp->reuse.lru_next = outnet->tcp_reuse_first; + outnet->tcp_reuse_first->lru_prev = &pend_tcp->reuse; + } else { + pend_tcp->reuse.lru_next = NULL; + outnet->tcp_reuse_last = &pend_tcp->reuse; + } + outnet->tcp_reuse_first = &pend_tcp->reuse; + pend_tcp->reuse.item_on_lru_list = 1; + return 1; +} + +/** find reuse tcp stream to destination for query, or NULL if none */ +static struct reuse_tcp* +reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr, + socklen_t addrlen, int use_ssl) +{ + struct waiting_tcp key_w; + struct pending_tcp key_p; + struct comm_point c; + rbnode_type* result = NULL, *prev; + verbose(VERB_CLIENT, "reuse_tcp_find"); + memset(&key_w, 0, sizeof(key_w)); + memset(&key_p, 0, sizeof(key_p)); + memset(&c, 0, sizeof(c)); + key_p.query = &key_w; + key_p.c = &c; + key_p.reuse.pending = &key_p; + key_p.reuse.node.key = &key_p.reuse; + if(use_ssl) + key_p.reuse.is_ssl = 1; + if(addrlen > (socklen_t)sizeof(key_p.reuse.addr)) + return NULL; + memmove(&key_p.reuse.addr, addr, addrlen); + key_p.reuse.addrlen = addrlen; + + verbose(VERB_CLIENT, "reuse_tcp_find: num reuse streams %u", + (unsigned)outnet->tcp_reuse.count); + if(outnet->tcp_reuse.root == NULL || + outnet->tcp_reuse.root == RBTREE_NULL) + return NULL; + if(rbtree_find_less_equal(&outnet->tcp_reuse, &key_p.reuse.node, + &result)) { + /* exact match */ + /* but the key is on stack, and ptr is compared, impossible */ + log_assert(&key_p.reuse != (struct reuse_tcp*)result); + log_assert(&key_p != ((struct reuse_tcp*)result)->pending); + } + /* not found, return null */ + if(!result || result == RBTREE_NULL) + return NULL; + verbose(VERB_CLIENT, "reuse_tcp_find check inexact match"); + /* inexact match, find one of possibly several connections to the + * same destination address, with the correct port, ssl, and + * also less than max number of open queries, or else, fail to open + * a new one */ + /* rewind to start of sequence of same address,port,ssl */ + prev = rbtree_previous(result); + while(prev && prev != RBTREE_NULL && + reuse_cmp_addrportssl(prev->key, &key_p.reuse) == 0) { + result = prev; + prev = rbtree_previous(result); + } + + /* loop to find first one that has correct characteristics */ + while(result && result != RBTREE_NULL && + reuse_cmp_addrportssl(result->key, &key_p.reuse) == 0) { + if(((struct reuse_tcp*)result)->tree_by_id.count < + MAX_REUSE_TCP_QUERIES) { + /* same address, port, ssl-yes-or-no, and has + * space for another query */ + return (struct reuse_tcp*)result; + } + result = rbtree_next(result); + } + return NULL; +} + +/** use the buffer to setup writing the query */ +static void +outnet_tcp_take_query_setup(int s, struct pending_tcp* pend, + struct waiting_tcp* w) +{ + struct timeval tv; + verbose(VERB_CLIENT, "outnet_tcp_take_query_setup: setup packet to write " + "len %d timeout %d msec", + (int)w->pkt_len, w->timeout); + pend->c->tcp_write_pkt = w->pkt; + pend->c->tcp_write_pkt_len = w->pkt_len; + pend->c->tcp_write_and_read = 1; + pend->c->tcp_write_byte_count = 0; + pend->c->tcp_is_reading = 0; + comm_point_start_listening(pend->c, s, -1); + /* set timer on the waiting_tcp entry, this is the write timeout + * for the written packet. The timer on pend->c is the timer + * for when there is no written packet and we have readtimeouts */ +#ifndef S_SPLINT_S + tv.tv_sec = w->timeout/1000; + tv.tv_usec = (w->timeout%1000)*1000; +#endif + /* if the waiting_tcp was previously waiting for a buffer in the + * outside_network.tcpwaitlist, then the timer is reset now that + * we start writing it */ + comm_timer_set(w->timer, &tv); +} + /** use next free buffer to service a tcp query */ static int -outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len) +outnet_tcp_take_into_use(struct waiting_tcp* w) { struct pending_tcp* pend = w->outnet->tcp_free; int s; log_assert(pend); - log_assert(pkt); + log_assert(w->pkt); + log_assert(w->pkt_len > 0); log_assert(w->addrlen > 0); + pend->c->tcp_do_toggle_rw = 0; + pend->c->tcp_do_close = 0; /* open socket */ s = outnet_get_tcp_fd(&w->addr, w->addrlen, w->outnet->tcp_mss, w->outnet->ip_dscp); @@ -383,24 +648,65 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len) return 0; } } - w->pkt = NULL; w->next_waiting = (void*)pend; - pend->id = LDNS_ID_WIRE(pkt); w->outnet->num_tcp_outgoing++; w->outnet->tcp_free = pend->next_free; pend->next_free = NULL; pend->query = w; + pend->reuse.outnet = w->outnet; pend->c->repinfo.addrlen = w->addrlen; + pend->c->tcp_more_read_again = &pend->reuse.cp_more_read_again; + pend->c->tcp_more_write_again = &pend->reuse.cp_more_write_again; + pend->reuse.cp_more_read_again = 0; + pend->reuse.cp_more_write_again = 0; memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen); - sldns_buffer_clear(pend->c->buffer); - sldns_buffer_write(pend->c->buffer, pkt, pkt_len); - sldns_buffer_flip(pend->c->buffer); - pend->c->tcp_is_reading = 0; - pend->c->tcp_byte_count = 0; - comm_point_start_listening(pend->c, s, -1); + pend->reuse.pending = pend; + if(pend->c->ssl) + pend->reuse.is_ssl = 1; + else pend->reuse.is_ssl = 0; + /* insert in reuse by address tree if not already inserted there */ + (void)reuse_tcp_insert(w->outnet, pend); + reuse_tree_by_id_insert(&pend->reuse, w); + outnet_tcp_take_query_setup(s, pend, w); return 1; } +/** Touch the lru of a reuse_tcp element, it is in use. + * This moves it to the front of the list, where it is not likely to + * be closed. Items at the back of the list are closed to make space. */ +static void +reuse_tcp_lru_touch(struct outside_network* outnet, struct reuse_tcp* reuse) +{ + if(!reuse->item_on_lru_list) + return; /* not on the list, no lru to modify */ + if(!reuse->lru_prev) + return; /* already first in the list */ + /* remove at current position */ + /* since it is not first, there is a previous element */ + reuse->lru_prev->lru_next = reuse->lru_next; + if(reuse->lru_next) + reuse->lru_next->lru_prev = reuse->lru_prev; + else outnet->tcp_reuse_last = reuse->lru_prev; + /* insert at the front */ + reuse->lru_prev = NULL; + reuse->lru_next = outnet->tcp_reuse_first; + /* since it is not first, it is not the only element and + * lru_next is thus not NULL and thus reuse is now not the last in + * the list, so outnet->tcp_reuse_last does not need to be modified */ + outnet->tcp_reuse_first = reuse; +} + +/** call callback on waiting_tcp, if not NULL */ +static void +waiting_tcp_callback(struct waiting_tcp* w, struct comm_point* c, int error, + struct comm_reply* reply_info) +{ + if(w->cb) { + fptr_ok(fptr_whitelist_pending_tcp(w->cb)); + (void)(*w->cb)(c, w->cb_arg, error, reply_info); + } +} + /** see if buffers can be used to service TCP queries */ static void use_free_buffer(struct outside_network* outnet) @@ -408,25 +714,198 @@ use_free_buffer(struct outside_network* outnet) struct waiting_tcp* w; while(outnet->tcp_free && outnet->tcp_wait_first && !outnet->want_to_quit) { + struct reuse_tcp* reuse = NULL; w = outnet->tcp_wait_first; outnet->tcp_wait_first = w->next_waiting; if(outnet->tcp_wait_last == w) outnet->tcp_wait_last = NULL; - if(!outnet_tcp_take_into_use(w, w->pkt, w->pkt_len)) { - comm_point_callback_type* cb = w->cb; - void* cb_arg = w->cb_arg; - waiting_tcp_delete(w); - fptr_ok(fptr_whitelist_pending_tcp(cb)); - (void)(*cb)(NULL, cb_arg, NETEVENT_CLOSED, NULL); + w->on_tcp_waiting_list = 0; + reuse = reuse_tcp_find(outnet, &w->addr, w->addrlen, + w->ssl_upstream); + if(reuse) { + log_reuse_tcp(VERB_CLIENT, "use free buffer for waiting tcp: " + "found reuse", reuse); + reuse_tcp_lru_touch(outnet, reuse); + comm_timer_disable(w->timer); + w->next_waiting = (void*)reuse->pending; + reuse_tree_by_id_insert(reuse, w); + if(reuse->pending->query) { + /* on the write wait list */ + reuse_write_wait_push_back(reuse, w); + } else { + /* write straight away */ + /* stop the timer on read of the fd */ + comm_point_stop_listening(reuse->pending->c); + reuse->pending->query = w; + outnet_tcp_take_query_setup( + reuse->pending->c->fd, reuse->pending, + w); + } + } else { + struct pending_tcp* pend = w->outnet->tcp_free; + rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp); + pend->reuse.pending = pend; + memcpy(&pend->reuse.addr, &w->addr, w->addrlen); + pend->reuse.addrlen = w->addrlen; + if(!outnet_tcp_take_into_use(w)) { + waiting_tcp_callback(w, NULL, NETEVENT_CLOSED, + NULL); + waiting_tcp_delete(w); + } } } } +/** add waiting_tcp element to the outnet tcp waiting list */ +static void +outnet_add_tcp_waiting(struct outside_network* outnet, struct waiting_tcp* w) +{ + struct timeval tv; + if(w->on_tcp_waiting_list) + return; + w->next_waiting = NULL; + if(outnet->tcp_wait_last) + outnet->tcp_wait_last->next_waiting = w; + else outnet->tcp_wait_first = w; + outnet->tcp_wait_last = w; + w->on_tcp_waiting_list = 1; +#ifndef S_SPLINT_S + tv.tv_sec = w->timeout/1000; + tv.tv_usec = (w->timeout%1000)*1000; +#endif + comm_timer_set(w->timer, &tv); +} + +/** delete element from tree by id */ +static void +reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w) +{ + log_assert(w->id_node.key != NULL); + rbtree_delete(&reuse->tree_by_id, w); + w->id_node.key = NULL; +} + +/** move writewait list to go for another connection. */ +static void +reuse_move_writewait_away(struct outside_network* outnet, + struct pending_tcp* pend) +{ + /* the writewait list has not been written yet, so if the + * stream was closed, they have not actually been failed, only + * the queries written. Other queries can get written to another + * stream. For upstreams that do not support multiple queries + * and answers, the stream can get closed, and then the queries + * can get written on a new socket */ + struct waiting_tcp* w; + if(pend->query && pend->query->error_count == 0 && + pend->c->tcp_write_pkt == pend->query->pkt && + pend->c->tcp_write_pkt_len == pend->query->pkt_len) { + /* since the current query is not written, it can also + * move to a free buffer */ + if(verbosity >= VERB_CLIENT && pend->query->pkt_len > 12+2+2 && + LDNS_QDCOUNT(pend->query->pkt) > 0 && + dname_valid(pend->query->pkt+12, pend->query->pkt_len-12)) { + char buf[LDNS_MAX_DOMAINLEN+1]; + dname_str(pend->query->pkt+12, buf); + verbose(VERB_CLIENT, "reuse_move_writewait_away current %s %d bytes were written", + buf, (int)pend->c->tcp_write_byte_count); + } + pend->c->tcp_write_pkt = NULL; + pend->c->tcp_write_pkt_len = 0; + pend->c->tcp_write_and_read = 0; + pend->reuse.cp_more_read_again = 0; + pend->reuse.cp_more_write_again = 0; + pend->c->tcp_is_reading = 1; + w = pend->query; + pend->query = NULL; + /* increase error count, so that if the next socket fails too + * the server selection is run again with this query failed + * and it can select a different server (if possible), or + * fail the query */ + w->error_count ++; + reuse_tree_by_id_delete(&pend->reuse, w); + outnet_add_tcp_waiting(outnet, w); + } + while((w = reuse_write_wait_pop(&pend->reuse)) != NULL) { + if(verbosity >= VERB_CLIENT && w->pkt_len > 12+2+2 && + LDNS_QDCOUNT(w->pkt) > 0 && + dname_valid(w->pkt+12, w->pkt_len-12)) { + char buf[LDNS_MAX_DOMAINLEN+1]; + dname_str(w->pkt+12, buf); + verbose(VERB_CLIENT, "reuse_move_writewait_away item %s", buf); + } + reuse_tree_by_id_delete(&pend->reuse, w); + outnet_add_tcp_waiting(outnet, w); + } +} + +/** remove reused element from tree and lru list */ +static void +reuse_tcp_remove_tree_list(struct outside_network* outnet, + struct reuse_tcp* reuse) +{ + verbose(VERB_CLIENT, "reuse_tcp_remove_tree_list"); + if(reuse->node.key) { + /* delete it from reuse tree */ + (void)rbtree_delete(&outnet->tcp_reuse, &reuse->node); + reuse->node.key = NULL; + } + /* delete from reuse list */ + if(reuse->item_on_lru_list) { + if(reuse->lru_prev) { + /* assert that members of the lru list are waiting + * and thus have a pending pointer to the struct */ + log_assert(reuse->lru_prev->pending); + reuse->lru_prev->lru_next = reuse->lru_next; + } else { + log_assert(!reuse->lru_next || reuse->lru_next->pending); + outnet->tcp_reuse_first = reuse->lru_next; + } + if(reuse->lru_next) { + /* assert that members of the lru list are waiting + * and thus have a pending pointer to the struct */ + log_assert(reuse->lru_next->pending); + reuse->lru_next->lru_prev = reuse->lru_prev; + } else { + log_assert(!reuse->lru_prev || reuse->lru_prev->pending); + outnet->tcp_reuse_last = reuse->lru_prev; + } + reuse->item_on_lru_list = 0; + } +} + +/** helper function that deletes an element from the tree of readwait + * elements in tcp reuse structure */ +static void reuse_del_readwait_elem(rbnode_type* node, void* ATTR_UNUSED(arg)) +{ + struct waiting_tcp* w = (struct waiting_tcp*)node->key; + waiting_tcp_delete(w); +} + +/** delete readwait waiting_tcp elements, deletes the elements in the list */ +void reuse_del_readwait(rbtree_type* tree_by_id) +{ + if(tree_by_id->root == NULL || + tree_by_id->root == RBTREE_NULL) + return; + traverse_postorder(tree_by_id, &reuse_del_readwait_elem, NULL); + rbtree_init(tree_by_id, reuse_id_cmp); +} + /** decommission a tcp buffer, closes commpoint and frees waiting_tcp entry */ static void decommission_pending_tcp(struct outside_network* outnet, struct pending_tcp* pend) { + verbose(VERB_CLIENT, "decommission_pending_tcp"); + pend->next_free = outnet->tcp_free; + outnet->tcp_free = pend; + if(pend->reuse.node.key) { + /* needs unlink from the reuse tree to get deleted */ + reuse_tcp_remove_tree_list(outnet, &pend->reuse); + } + /* free SSL structure after remove from outnet tcp reuse tree, + * because the c->ssl null or not is used for sorting in the tree */ if(pend->c->ssl) { #ifdef HAVE_SSL SSL_shutdown(pend->c->ssl); @@ -435,11 +914,68 @@ decommission_pending_tcp(struct outside_network* outnet, #endif } comm_point_close(pend->c); - pend->next_free = outnet->tcp_free; - outnet->tcp_free = pend; - waiting_tcp_delete(pend->query); + pend->reuse.cp_more_read_again = 0; + pend->reuse.cp_more_write_again = 0; + /* unlink the query and writewait list, it is part of the tree + * nodes and is deleted */ pend->query = NULL; - use_free_buffer(outnet); + pend->reuse.write_wait_first = NULL; + pend->reuse.write_wait_last = NULL; + reuse_del_readwait(&pend->reuse.tree_by_id); +} + +/** perform failure callbacks for waiting queries in reuse read rbtree */ +static void reuse_cb_readwait_for_failure(rbtree_type* tree_by_id, int err) +{ + rbnode_type* node; + if(tree_by_id->root == NULL || + tree_by_id->root == RBTREE_NULL) + return; + node = rbtree_first(tree_by_id); + while(node && node != RBTREE_NULL) { + struct waiting_tcp* w = (struct waiting_tcp*)node->key; + waiting_tcp_callback(w, NULL, err, NULL); + node = rbtree_next(node); + } +} + +/** perform callbacks for failure and also decommission pending tcp. + * the callbacks remove references in sq->pending to the waiting_tcp + * members of the tree_by_id in the pending tcp. The pending_tcp is + * removed before the callbacks, so that the callbacks do not modify + * the pending_tcp due to its reference in the outside_network reuse tree */ +static void reuse_cb_and_decommission(struct outside_network* outnet, + struct pending_tcp* pend, int error) +{ + rbtree_type store; + store = pend->reuse.tree_by_id; + pend->query = NULL; + rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp); + pend->reuse.write_wait_first = NULL; + pend->reuse.write_wait_last = NULL; + decommission_pending_tcp(outnet, pend); + reuse_cb_readwait_for_failure(&store, error); + reuse_del_readwait(&store); +} + +/** set timeout on tcp fd and setup read event to catch incoming dns msgs */ +static void +reuse_tcp_setup_timeout(struct pending_tcp* pend_tcp) +{ + log_reuse_tcp(VERB_CLIENT, "reuse_tcp_setup_timeout", &pend_tcp->reuse); + comm_point_start_listening(pend_tcp->c, -1, REUSE_TIMEOUT); +} + +/** set timeout on tcp fd and setup read event to catch incoming dns msgs */ +static void +reuse_tcp_setup_read_and_timeout(struct pending_tcp* pend_tcp) +{ + log_reuse_tcp(VERB_CLIENT, "reuse_tcp_setup_readtimeout", &pend_tcp->reuse); + sldns_buffer_clear(pend_tcp->c->buffer); + pend_tcp->c->tcp_is_reading = 1; + pend_tcp->c->tcp_byte_count = 0; + comm_point_stop_listening(pend_tcp->c); + comm_point_start_listening(pend_tcp->c, -1, REUSE_TIMEOUT); } int @@ -447,24 +983,116 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error, struct comm_reply *reply_info) { struct pending_tcp* pend = (struct pending_tcp*)arg; - struct outside_network* outnet = pend->query->outnet; + struct outside_network* outnet = pend->reuse.outnet; + struct waiting_tcp* w = NULL; verbose(VERB_ALGO, "outnettcp cb"); - if(error != NETEVENT_NOERROR) { + if(error == NETEVENT_TIMEOUT) { + if(pend->c->tcp_write_and_read) { + verbose(VERB_QUERY, "outnettcp got tcp timeout " + "for read, ignored because write underway"); + /* if we are writing, ignore readtimer, wait for write timer + * or write is done */ + return 0; + } else { + verbose(VERB_QUERY, "outnettcp got tcp timeout %s", + (pend->reuse.tree_by_id.count?"for reading pkt": + "for keepalive for reuse")); + } + /* must be timeout for reading or keepalive reuse, + * close it. */ + reuse_tcp_remove_tree_list(outnet, &pend->reuse); + } else if(error == NETEVENT_PKT_WRITTEN) { + /* the packet we want to write has been written. */ + verbose(VERB_ALGO, "outnet tcp pkt was written event"); + log_assert(c == pend->c); + log_assert(pend->query->pkt == pend->c->tcp_write_pkt); + log_assert(pend->query->pkt_len == pend->c->tcp_write_pkt_len); + pend->c->tcp_write_pkt = NULL; + pend->c->tcp_write_pkt_len = 0; + /* the pend.query is already in tree_by_id */ + log_assert(pend->query->id_node.key); + pend->query = NULL; + /* setup to write next packet or setup read timeout */ + if(pend->reuse.write_wait_first) { + verbose(VERB_ALGO, "outnet tcp setup next pkt"); + /* we can write it straight away perhaps, set flag + * because this callback called after a tcp write + * succeeded and likely more buffer space is available + * and we can write some more. */ + pend->reuse.cp_more_write_again = 1; + pend->query = reuse_write_wait_pop(&pend->reuse); + comm_point_stop_listening(pend->c); + outnet_tcp_take_query_setup(pend->c->fd, pend, + pend->query); + } else { + verbose(VERB_ALGO, "outnet tcp writes done, wait"); + pend->c->tcp_write_and_read = 0; + pend->reuse.cp_more_read_again = 0; + pend->reuse.cp_more_write_again = 0; + pend->c->tcp_is_reading = 1; + comm_point_stop_listening(pend->c); + reuse_tcp_setup_timeout(pend); + } + return 0; + } else if(error != NETEVENT_NOERROR) { verbose(VERB_QUERY, "outnettcp got tcp error %d", error); + reuse_move_writewait_away(outnet, pend); /* pass error below and exit */ } else { /* check ID */ - if(sldns_buffer_limit(c->buffer) < sizeof(uint16_t) || - LDNS_ID_WIRE(sldns_buffer_begin(c->buffer))!=pend->id) { + if(sldns_buffer_limit(c->buffer) < sizeof(uint16_t)) { log_addr(VERB_QUERY, - "outnettcp: bad ID in reply, from:", - &pend->query->addr, pend->query->addrlen); + "outnettcp: bad ID in reply, too short, from:", + &pend->reuse.addr, pend->reuse.addrlen); error = NETEVENT_CLOSED; - } + } else { + uint16_t id = LDNS_ID_WIRE(sldns_buffer_begin( + c->buffer)); + /* find the query the reply is for */ + w = reuse_tcp_by_id_find(&pend->reuse, id); + } + } + if(error == NETEVENT_NOERROR && !w) { + /* no struct waiting found in tree, no reply to call */ + log_addr(VERB_QUERY, "outnettcp: bad ID in reply, from:", + &pend->reuse.addr, pend->reuse.addrlen); + error = NETEVENT_CLOSED; + } + if(error == NETEVENT_NOERROR) { + /* add to reuse tree so it can be reused, if not a failure. + * This is possible if the state machine wants to make a tcp + * query again to the same destination. */ + if(outnet->tcp_reuse.count < outnet->tcp_reuse_max) { + (void)reuse_tcp_insert(outnet, pend); + } + } + if(w) { + reuse_tree_by_id_delete(&pend->reuse, w); + verbose(VERB_CLIENT, "outnet tcp callback query err %d buflen %d", + error, (int)sldns_buffer_limit(c->buffer)); + waiting_tcp_callback(w, c, error, reply_info); + waiting_tcp_delete(w); + } + verbose(VERB_CLIENT, "outnet_tcp_cb reuse after cb"); + if(error == NETEVENT_NOERROR && pend->reuse.node.key) { + verbose(VERB_CLIENT, "outnet_tcp_cb reuse after cb: keep it"); + /* it is in the reuse_tcp tree, with other queries, or + * on the empty list. do not decommission it */ + /* if there are more outstanding queries, we could try to + * read again, to see if it is on the input, + * because this callback called after a successful read + * and there could be more bytes to read on the input */ + if(pend->reuse.tree_by_id.count != 0) + pend->reuse.cp_more_read_again = 1; + reuse_tcp_setup_read_and_timeout(pend); + return 0; } - fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb)); - (void)(*pend->query->cb)(c, pend->query->cb_arg, error, reply_info); - decommission_pending_tcp(outnet, pend); + verbose(VERB_CLIENT, "outnet_tcp_cb reuse after cb: decommission it"); + /* no queries on it, no space to keep it. or timeout or closed due + * to error. Close it */ + reuse_cb_and_decommission(outnet, pend, (error==NETEVENT_TIMEOUT? + NETEVENT_TIMEOUT:NETEVENT_CLOSED)); + use_free_buffer(outnet); return 0; } @@ -723,7 +1351,8 @@ outside_network_create(struct comm_base *base, size_t bufsize, struct ub_randstate* rnd, int use_caps_for_id, int* availports, int numavailports, size_t unwanted_threshold, int tcp_mss, void (*unwanted_action)(void*), void* unwanted_param, int do_udp, - void* sslctx, int delayclose, int tls_use_sni, struct dt_env* dtenv) + void* sslctx, int delayclose, int tls_use_sni, struct dt_env* dtenv, + int udp_connect) { struct outside_network* outnet = (struct outside_network*) calloc(1, sizeof(struct outside_network)); @@ -761,6 +1390,9 @@ outside_network_create(struct comm_base *base, size_t bufsize, outnet->delay_tv.tv_usec = (delayclose%1000)*1000; } #endif + if(udp_connect) { + outnet->udp_connect = 1; + } if(numavailports == 0 || num_ports == 0) { log_err("no outgoing ports available"); outside_network_delete(outnet); @@ -795,6 +1427,8 @@ outside_network_create(struct comm_base *base, size_t bufsize, outside_network_delete(outnet); return NULL; } + rbtree_init(&outnet->tcp_reuse, reuse_cmp); + outnet->tcp_reuse_max = num_tcp; /* allocate commpoints */ for(k=0; knum_tcp; i++) if(outnet->tcp_conns[i]) { + if(outnet->tcp_conns[i]->query && + !outnet->tcp_conns[i]->query-> + on_tcp_waiting_list) { + /* delete waiting_tcp elements that + * the tcp conn is working on */ + struct pending_tcp* pend = + (struct pending_tcp*)outnet-> + tcp_conns[i]->query-> + next_waiting; + decommission_pending_tcp(outnet, pend); + } comm_point_delete(outnet->tcp_conns[i]->c); waiting_tcp_delete(outnet->tcp_conns[i]->query); free(outnet->tcp_conns[i]); @@ -972,6 +1617,10 @@ outside_network_delete(struct outside_network* outnet) p = np; } } + /* was allocated in struct pending that was deleted above */ + rbtree_init(&outnet->tcp_reuse, reuse_cmp); + outnet->tcp_reuse_first = NULL; + outnet->tcp_reuse_last = NULL; if(outnet->udp_wait_first) { struct pending* p = outnet->udp_wait_first, *np; while(p) { @@ -1096,6 +1745,33 @@ select_id(struct outside_network* outnet, struct pending* pend, return 1; } +/** return true is UDP connect error needs to be logged */ +static int udp_connect_needs_log(int err) +{ + switch(err) { + case ECONNREFUSED: +# ifdef ENETUNREACH + case ENETUNREACH: +# endif +# ifdef EHOSTDOWN + case EHOSTDOWN: +# endif +# ifdef EHOSTUNREACH + case EHOSTUNREACH: +# endif +# ifdef ENETDOWN + case ENETDOWN: +# endif + if(verbosity >= VERB_ALGO) + return 1; + return 0; + default: + break; + } + return 1; +} + + /** Select random interface and port */ static int select_ifport(struct outside_network* outnet, struct pending* pend, @@ -1115,13 +1791,26 @@ select_ifport(struct outside_network* outnet, struct pending* pend, my_if = ub_random_max(outnet->rnd, num_if); pif = &ifs[my_if]; #ifndef DISABLE_EXPLICIT_PORT_RANDOMISATION - my_port = ub_random_max(outnet->rnd, pif->avail_total); - if(my_port < pif->inuse) { - /* port already open */ - pend->pc = pif->out[my_port]; - verbose(VERB_ALGO, "using UDP if=%d port=%d", - my_if, pend->pc->number); - break; + if(outnet->udp_connect) { + /* if we connect() we cannot reuse fds for a port */ + if(pif->inuse >= pif->avail_total) { + tries++; + if(tries < MAX_PORT_RETRY) + continue; + log_err("failed to find an open port, drop msg"); + return 0; + } + my_port = pif->inuse + ub_random_max(outnet->rnd, + pif->avail_total - pif->inuse); + } else { + my_port = ub_random_max(outnet->rnd, pif->avail_total); + if(my_port < pif->inuse) { + /* port already open */ + pend->pc = pif->out[my_port]; + verbose(VERB_ALGO, "using UDP if=%d port=%d", + my_if, pend->pc->number); + break; + } } /* try to open new port, if fails, loop to try again */ log_assert(pif->inuse < pif->maxout); @@ -1138,6 +1827,19 @@ select_ifport(struct outside_network* outnet, struct pending* pend, if(fd != -1) { verbose(VERB_ALGO, "opened UDP if=%d port=%d", my_if, portno); + if(outnet->udp_connect) { + /* connect() to the destination */ + if(connect(fd, (struct sockaddr*)&pend->addr, + pend->addrlen) < 0) { + if(udp_connect_needs_log(errno)) { + log_err_addr("udp connect failed", + strerror(errno), &pend->addr, + pend->addrlen); + } + sock_close(fd); + return 0; + } + } /* grab fd */ pend->pc = outnet->unused_fds; outnet->unused_fds = pend->pc->next; @@ -1197,10 +1899,17 @@ randomize_and_send_udp(struct pending* pend, sldns_buffer* packet, int timeout) log_assert(pend->pc && pend->pc->cp); /* send it over the commlink */ - if(!comm_point_send_udp_msg(pend->pc->cp, packet, - (struct sockaddr*)&pend->addr, pend->addrlen)) { - portcomm_loweruse(outnet, pend->pc); - return 0; + if(outnet->udp_connect) { + if(!comm_point_send_udp_msg(pend->pc->cp, packet, NULL, 0)) { + portcomm_loweruse(outnet, pend->pc); + return 0; + } + } else { + if(!comm_point_send_udp_msg(pend->pc->cp, packet, + (struct sockaddr*)&pend->addr, pend->addrlen)) { + portcomm_loweruse(outnet, pend->pc); + return 0; + } } /* system calls to set timeout after sending UDP to make roundtrip @@ -1273,45 +1982,152 @@ outnet_tcptimer(void* arg) { struct waiting_tcp* w = (struct waiting_tcp*)arg; struct outside_network* outnet = w->outnet; - comm_point_callback_type* cb; - void* cb_arg; - if(w->pkt) { + verbose(VERB_CLIENT, "outnet_tcptimer"); + if(w->on_tcp_waiting_list) { /* it is on the waiting list */ waiting_list_remove(outnet, w); + waiting_tcp_callback(w, NULL, NETEVENT_TIMEOUT, NULL); + waiting_tcp_delete(w); } else { /* it was in use */ struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting; - if(pend->c->ssl) { -#ifdef HAVE_SSL - SSL_shutdown(pend->c->ssl); - SSL_free(pend->c->ssl); - pend->c->ssl = NULL; -#endif - } - comm_point_close(pend->c); - pend->query = NULL; - pend->next_free = outnet->tcp_free; - outnet->tcp_free = pend; + reuse_cb_and_decommission(outnet, pend, NETEVENT_TIMEOUT); } - cb = w->cb; - cb_arg = w->cb_arg; - waiting_tcp_delete(w); - fptr_ok(fptr_whitelist_pending_tcp(cb)); - (void)(*cb)(NULL, cb_arg, NETEVENT_TIMEOUT, NULL); use_free_buffer(outnet); } +/** close the oldest reuse_tcp connection to make a fd and struct pend + * available for a new stream connection */ +static void +reuse_tcp_close_oldest(struct outside_network* outnet) +{ + struct pending_tcp* pend; + verbose(VERB_CLIENT, "reuse_tcp_close_oldest"); + if(!outnet->tcp_reuse_last) return; + pend = outnet->tcp_reuse_last->pending; + + /* snip off of LRU */ + log_assert(pend->reuse.lru_next == NULL); + if(pend->reuse.lru_prev) { + outnet->tcp_reuse_last = pend->reuse.lru_prev; + pend->reuse.lru_prev->lru_next = NULL; + } else { + outnet->tcp_reuse_last = NULL; + outnet->tcp_reuse_first = NULL; + } + pend->reuse.item_on_lru_list = 0; + + /* free up */ + reuse_cb_and_decommission(outnet, pend, NETEVENT_CLOSED); +} + +/** find spare ID value for reuse tcp stream. That is random and also does + * not collide with an existing query ID that is in use or waiting */ +uint16_t +reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet) +{ + uint16_t id = 0, curid, nextid; + const int try_random = 2000; + int i; + unsigned select, count, space; + rbnode_type* node; + + /* make really sure the tree is not empty */ + if(reuse->tree_by_id.count == 0) { + id = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff; + return id; + } + + /* try to find random empty spots by picking them */ + for(i = 0; irnd)>>8) & 0xffff; + if(!reuse_tcp_by_id_find(reuse, id)) { + return id; + } + } + + /* equally pick a random unused element from the tree that is + * not in use. Pick a the n-th index of an ununused number, + * then loop over the empty spaces in the tree and find it */ + log_assert(reuse->tree_by_id.count < 0xffff); + select = ub_random_max(outnet->rnd, 0xffff - reuse->tree_by_id.count); + /* select value now in 0 .. num free - 1 */ + + count = 0; /* number of free spaces passed by */ + node = rbtree_first(&reuse->tree_by_id); + log_assert(node && node != RBTREE_NULL); /* tree not empty */ + /* see if select is before first node */ + if(select < tree_by_id_get_id(node)) + return select; + count += tree_by_id_get_id(node); + /* perhaps select is between nodes */ + while(node && node != RBTREE_NULL) { + rbnode_type* next = rbtree_next(node); + if(next && next != RBTREE_NULL) { + curid = tree_by_id_get_id(node); + nextid = tree_by_id_get_id(next); + log_assert(curid < nextid); + if(curid != 0xffff && curid + 1 < nextid) { + /* space between nodes */ + space = nextid - curid - 1; + log_assert(select >= count); + if(select < count + space) { + /* here it is */ + return curid + 1 + (select - count); + } + count += space; + } + } + node = next; + } + + /* select is after the last node */ + /* count is the number of free positions before the nodes in the + * tree */ + node = rbtree_last(&reuse->tree_by_id); + log_assert(node && node != RBTREE_NULL); /* tree not empty */ + curid = tree_by_id_get_id(node); + log_assert(count + (0xffff-curid) + reuse->tree_by_id.count == 0xffff); + return curid + 1 + (select - count); +} + struct waiting_tcp* pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet, int timeout, comm_point_callback_type* callback, void* callback_arg) { struct pending_tcp* pend = sq->outnet->tcp_free; + struct reuse_tcp* reuse = NULL; struct waiting_tcp* w; - struct timeval tv; - uint16_t id; - /* if no buffer is free allocate space to store query */ + + verbose(VERB_CLIENT, "pending_tcp_query"); + if(sldns_buffer_limit(packet) < sizeof(uint16_t)) { + verbose(VERB_ALGO, "pending tcp query with too short buffer < 2"); + return NULL; + } + + /* find out if a reused stream to the target exists */ + /* if so, take it into use */ + reuse = reuse_tcp_find(sq->outnet, &sq->addr, sq->addrlen, + sq->ssl_upstream); + if(reuse) { + log_reuse_tcp(VERB_CLIENT, "pending_tcp_query: found reuse", reuse); + log_assert(reuse->pending); + pend = reuse->pending; + reuse_tcp_lru_touch(sq->outnet, reuse); + } + + /* if !pend but we have reuse streams, close a reuse stream + * to be able to open a new one to this target, no use waiting + * to reuse a file descriptor while another query needs to use + * that buffer and file descriptor now. */ + if(!pend) { + reuse_tcp_close_oldest(sq->outnet); + pend = sq->outnet->tcp_free; + } + + /* allocate space to store query */ w = (struct waiting_tcp*)malloc(sizeof(struct waiting_tcp) - + (pend?0:sldns_buffer_limit(packet))); + + sldns_buffer_limit(packet)); if(!w) { return NULL; } @@ -1319,47 +2135,76 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet, free(w); return NULL; } - w->pkt = NULL; - w->pkt_len = 0; - id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff; - LDNS_ID_SET(sldns_buffer_begin(packet), id); + w->pkt = (uint8_t*)w + sizeof(struct waiting_tcp); + w->pkt_len = sldns_buffer_limit(packet); + memmove(w->pkt, sldns_buffer_begin(packet), w->pkt_len); + if(reuse) + w->id = reuse_tcp_select_id(reuse, sq->outnet); + else w->id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff; + LDNS_ID_SET(w->pkt, w->id); memcpy(&w->addr, &sq->addr, sq->addrlen); w->addrlen = sq->addrlen; w->outnet = sq->outnet; + w->on_tcp_waiting_list = 0; + w->next_waiting = NULL; w->cb = callback; w->cb_arg = callback_arg; w->ssl_upstream = sq->ssl_upstream; w->tls_auth_name = sq->tls_auth_name; -#ifndef S_SPLINT_S - tv.tv_sec = timeout/1000; - tv.tv_usec = (timeout%1000)*1000; -#endif - comm_timer_set(w->timer, &tv); + w->timeout = timeout; + w->id_node.key = NULL; + w->write_wait_prev = NULL; + w->write_wait_next = NULL; + w->write_wait_queued = 0; + w->error_count = 0; if(pend) { /* we have a buffer available right now */ - if(!outnet_tcp_take_into_use(w, sldns_buffer_begin(packet), - sldns_buffer_limit(packet))) { - waiting_tcp_delete(w); - return NULL; + if(reuse) { + /* reuse existing fd, write query and continue */ + /* store query in tree by id */ + verbose(VERB_CLIENT, "pending_tcp_query: reuse, store"); + w->next_waiting = (void*)pend; + reuse_tree_by_id_insert(&pend->reuse, w); + /* can we write right now? */ + if(pend->query == NULL) { + /* write straight away */ + /* stop the timer on read of the fd */ + comm_point_stop_listening(pend->c); + pend->query = w; + outnet_tcp_take_query_setup(pend->c->fd, pend, + w); + } else { + /* put it in the waiting list for + * this stream */ + reuse_write_wait_push_back(&pend->reuse, w); + } + } else { + /* create new fd and connect to addr, setup to + * write query */ + verbose(VERB_CLIENT, "pending_tcp_query: new fd, connect"); + rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp); + pend->reuse.pending = pend; + memcpy(&pend->reuse.addr, &sq->addr, sq->addrlen); + pend->reuse.addrlen = sq->addrlen; + if(!outnet_tcp_take_into_use(w)) { + waiting_tcp_delete(w); + return NULL; + } } -#ifdef USE_DNSTAP - if(sq->outnet->dtenv && - (sq->outnet->dtenv->log_resolver_query_messages || - sq->outnet->dtenv->log_forwarder_query_messages)) - dt_msg_send_outside_query(sq->outnet->dtenv, &sq->addr, - comm_tcp, sq->zone, sq->zonelen, packet); -#endif } else { /* queue up */ - w->pkt = (uint8_t*)w + sizeof(struct waiting_tcp); - w->pkt_len = sldns_buffer_limit(packet); - memmove(w->pkt, sldns_buffer_begin(packet), w->pkt_len); - w->next_waiting = NULL; - if(sq->outnet->tcp_wait_last) - sq->outnet->tcp_wait_last->next_waiting = w; - else sq->outnet->tcp_wait_first = w; - sq->outnet->tcp_wait_last = w; + /* waiting for a buffer on the outside network buffer wait + * list */ + verbose(VERB_CLIENT, "pending_tcp_query: queue to wait"); + outnet_add_tcp_waiting(sq->outnet, w); } +#ifdef USE_DNSTAP + if(sq->outnet->dtenv && + (sq->outnet->dtenv->log_resolver_query_messages || + sq->outnet->dtenv->log_forwarder_query_messages)) + dt_msg_send_outside_query(sq->outnet->dtenv, &sq->addr, + comm_tcp, sq->zone, sq->zonelen, packet); +#endif return w; } @@ -1477,6 +2322,7 @@ static void waiting_list_remove(struct outside_network* outnet, struct waiting_tcp* w) { struct waiting_tcp* p = outnet->tcp_wait_first, *prev = NULL; + w->on_tcp_waiting_list = 0; while(p) { if(p == w) { /* remove w */ @@ -1492,10 +2338,53 @@ waiting_list_remove(struct outside_network* outnet, struct waiting_tcp* w) } } +/** reuse tcp stream, remove serviced query from stream, + * return true if the stream is kept, false if it is to be closed */ +static int +reuse_tcp_remove_serviced_keep(struct waiting_tcp* w, + struct serviced_query* sq) +{ + struct pending_tcp* pend_tcp = (struct pending_tcp*)w->next_waiting; + verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep"); + /* remove the callback. let query continue to write to not cancel + * the stream itself. also keep it as an entry in the tree_by_id, + * in case the answer returns (that we no longer want), but we cannot + * pick the same ID number meanwhile */ + w->cb = NULL; + /* see if can be entered in reuse tree + * for that the FD has to be non-1 */ + if(pend_tcp->c->fd == -1) { + verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep: -1 fd"); + return 0; + } + /* if in tree and used by other queries */ + if(pend_tcp->reuse.node.key) { + verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep: in use by other queries"); + /* do not reset the keepalive timer, for that + * we'd need traffic, and this is where the serviced is + * removed due to state machine internal reasons, + * eg. iterator no longer interested in this query */ + return 1; + } + /* if still open and want to keep it open */ + if(pend_tcp->c->fd != -1 && sq->outnet->tcp_reuse.count < + sq->outnet->tcp_reuse_max) { + verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep: keep open"); + /* set a keepalive timer on it */ + if(!reuse_tcp_insert(sq->outnet, pend_tcp)) { + return 0; + } + reuse_tcp_setup_timeout(pend_tcp); + return 1; + } + return 0; +} + /** cleanup serviced query entry */ static void serviced_delete(struct serviced_query* sq) { + verbose(VERB_CLIENT, "serviced_delete"); if(sq->pending) { /* clear up the pending query */ if(sq->status == serviced_query_UDP_EDNS || @@ -1504,6 +2393,7 @@ serviced_delete(struct serviced_query* sq) sq->status == serviced_query_UDP_EDNS_FRAG || sq->status == serviced_query_UDP_EDNS_fallback) { struct pending* p = (struct pending*)sq->pending; + verbose(VERB_CLIENT, "serviced_delete: UDP"); if(p->pc) portcomm_loweruse(sq->outnet, p->pc); pending_delete(sq->outnet, p); @@ -1511,14 +2401,32 @@ serviced_delete(struct serviced_query* sq) * mesh */ outnet_send_wait_udp(sq->outnet); } else { - struct waiting_tcp* p = (struct waiting_tcp*) + struct waiting_tcp* w = (struct waiting_tcp*) sq->pending; - if(p->pkt == NULL) { - decommission_pending_tcp(sq->outnet, - (struct pending_tcp*)p->next_waiting); + verbose(VERB_CLIENT, "serviced_delete: TCP"); + /* if on stream-write-waiting list then + * remove from waiting list and waiting_tcp_delete */ + if(w->write_wait_queued) { + struct pending_tcp* pend = + (struct pending_tcp*)w->next_waiting; + verbose(VERB_CLIENT, "serviced_delete: writewait"); + reuse_tree_by_id_delete(&pend->reuse, w); + reuse_write_wait_remove(&pend->reuse, w); + waiting_tcp_delete(w); + } else if(!w->on_tcp_waiting_list) { + struct pending_tcp* pend = + (struct pending_tcp*)w->next_waiting; + verbose(VERB_CLIENT, "serviced_delete: tcpreusekeep"); + if(!reuse_tcp_remove_serviced_keep(w, sq)) { + reuse_cb_and_decommission(sq->outnet, + pend, NETEVENT_CLOSED); + use_free_buffer(sq->outnet); + } + sq->pending = NULL; } else { - waiting_list_remove(sq->outnet, p); - waiting_tcp_delete(p); + verbose(VERB_CLIENT, "serviced_delete: tcpwait"); + waiting_list_remove(sq->outnet, w); + waiting_tcp_delete(w); } } } @@ -2118,18 +3026,18 @@ outnet_serviced_query(struct outside_network* outnet, { struct serviced_query* sq; struct service_callback* cb; - struct edns_tag_addr* client_tag_addr; + struct edns_string_addr* client_string_addr; if(!inplace_cb_query_call(env, qinfo, flags, addr, addrlen, zone, zonelen, qstate, qstate->region)) return NULL; - if((client_tag_addr = edns_tag_addr_lookup(&env->edns_tags->client_tags, - addr, addrlen))) { - uint16_t client_tag = htons(client_tag_addr->tag_data); + if((client_string_addr = edns_string_addr_lookup( + &env->edns_strings->client_strings, addr, addrlen))) { edns_opt_list_append(&qstate->edns_opts_back_out, - env->edns_tags->client_tag_opcode, 2, - (uint8_t*)&client_tag, qstate->region); + env->edns_strings->client_string_opcode, + client_string_addr->string_len, + client_string_addr->string, qstate->region); } serviced_gen_query(buff, qinfo->qname, qinfo->qname_len, qinfo->qtype, diff --git a/services/outside_network.h b/services/outside_network.h index dd7a7a541..6218b9dc5 100644 --- a/services/outside_network.h +++ b/services/outside_network.h @@ -52,6 +52,7 @@ struct ub_randstate; struct pending_tcp; struct waiting_tcp; struct waiting_udp; +struct reuse_tcp; struct infra_cache; struct port_comm; struct port_if; @@ -106,6 +107,9 @@ struct outside_network { int delayclose; /** timeout for delayclose */ struct timeval delay_tv; + /** if we perform udp-connect, connect() for UDP socket to mitigate + * ICMP side channel leakage */ + int udp_connect; /** array of outgoing IP4 interfaces */ struct port_if* ip4_ifs; @@ -154,6 +158,21 @@ struct outside_network { size_t num_tcp; /** number of tcp communication points in use. */ size_t num_tcp_outgoing; + /** + * tree of still-open and waiting tcp connections for reuse. + * can be closed and reopened to get a new tcp connection. + * or reused to the same destination again. with timeout to close. + * Entries are of type struct reuse_tcp. + * The entries are both active and empty connections. + */ + rbtree_type tcp_reuse; + /** max number of tcp_reuse entries we want to keep open */ + size_t tcp_reuse_max; + /** first and last(oldest) in lru list of reuse connections. + * the oldest can be closed to get a new free pending_tcp if needed + * The list contains empty connections, that wait for timeout or + * a new query that can use the existing connection. */ + struct reuse_tcp* tcp_reuse_first, *tcp_reuse_last; /** list of tcp comm points that are free for use */ struct pending_tcp* tcp_free; /** list of tcp queries waiting for a buffer */ @@ -211,6 +230,76 @@ struct port_comm { struct comm_point* cp; }; +/** + * Reuse TCP connection, still open can be used again. + */ +struct reuse_tcp { + /** rbtree node with links in tcp_reuse tree. key is NULL when not + * in tree. Both active and empty connections are in the tree. + * key is a pointer to this structure, the members used to compare + * are the sockaddr and and then is-ssl bool, and then ptr value is + * used in case the same address exists several times in the tree + * when there are multiple connections to the same destination to + * make the rbtree items unique. */ + rbnode_type node; + /** the key for the tcp_reuse tree. address of peer, ip4 or ip6, + * and port number of peer */ + struct sockaddr_storage addr; + /** length of addr */ + socklen_t addrlen; + /** also key for tcp_reuse tree, if ssl is used */ + int is_ssl; + /** lru chain, so that the oldest can be removed to get a new + * connection when all are in (re)use. oldest is last in list. + * The lru only contains empty connections waiting for reuse, + * the ones with active queries are not on the list because they + * do not need to be closed to make space for others. They already + * service a query so the close for another query does not help + * service a larger number of queries. */ + struct reuse_tcp* lru_next, *lru_prev; + /** true if the reuse_tcp item is on the lru list with empty items */ + int item_on_lru_list; + /** the connection to reuse, the fd is non-1 and is open. + * the addr and port determine where the connection is going, + * and is key to the rbtree. The SSL ptr determines if it is + * a TLS connection or a plain TCP connection there. And TLS + * or not is also part of the key to the rbtree. + * There is a timeout and read event on the fd, to close it. */ + struct pending_tcp* pending; + /** + * The more read again value pointed to by the commpoint + * tcp_more_read_again pointer, so that it exists after commpoint + * delete + */ + int cp_more_read_again; + /** + * The more write again value pointed to by the commpoint + * tcp_more_write_again pointer, so that it exists after commpoint + * delete + */ + int cp_more_write_again; + /** rbtree with other queries waiting on the connection, by ID number, + * of type struct waiting_tcp. It is for looking up received + * answers to the structure for callback. And also to see if ID + * numbers are unused and can be used for a new query. + * The write_wait elements are also in the tree, so that ID numbers + * can be looked up also for them. They are bool write_wait_queued. */ + rbtree_type tree_by_id; + /** list of queries waiting to be written on the channel, + * if NULL no queries are waiting to be written and the pending->query + * is the query currently serviced. The first is the next in line. + * They are also in the tree_by_id. Once written, the are removed + * from this list, but stay in the tree. */ + struct waiting_tcp* write_wait_first, *write_wait_last; + /** the outside network it is part of */ + struct outside_network* outnet; +}; + +/** max number of queries on a reuse connection */ +#define MAX_REUSE_TCP_QUERIES 200 +/** timeout for REUSE entries in milliseconds. */ +#define REUSE_TIMEOUT 60000 + /** * A query that has an answer pending for it. */ @@ -255,12 +344,15 @@ struct pending { struct pending_tcp { /** next in list of free tcp comm points, or NULL. */ struct pending_tcp* next_free; - /** the ID for the query; checked in reply */ - uint16_t id; /** tcp comm point it was sent on (and reply must come back on). */ struct comm_point* c; /** the query being serviced, NULL if the pending_tcp is unused. */ struct waiting_tcp* query; + /** the pre-allocated reuse tcp structure. if ->pending is nonNULL + * it is in use and the connection is waiting for reuse. + * It is here for memory pre-allocation, and used to make this + * pending_tcp wait for reuse. */ + struct reuse_tcp reuse; }; /** @@ -269,12 +361,27 @@ struct pending_tcp { struct waiting_tcp { /** * next in waiting list. - * if pkt==0, this points to the pending_tcp structure. + * if on_tcp_waiting_list==0, this points to the pending_tcp structure. */ struct waiting_tcp* next_waiting; + /** if true the item is on the tcp waiting list and next_waiting + * is used for that. If false, the next_waiting points to the + * pending_tcp */ + int on_tcp_waiting_list; + /** next and prev in query waiting list for stream connection */ + struct waiting_tcp* write_wait_prev, *write_wait_next; + /** true if the waiting_tcp structure is on the write_wait queue */ + int write_wait_queued; + /** entry in reuse.tree_by_id, if key is NULL, not in tree, otherwise, + * this struct is key and sorted by ID (from waiting_tcp.id). */ + rbnode_type id_node; + /** the ID for the query; checked in reply */ + uint16_t id; /** timeout event; timer keeps running whether the query is * waiting for a buffer or the tcp reply is pending */ struct comm_timer* timer; + /** timeout in msec */ + int timeout; /** the outside network it is part of */ struct outside_network* outnet; /** remote address. */ @@ -284,13 +391,14 @@ struct waiting_tcp { /** * The query itself, the query packet to send. * allocated after the waiting_tcp structure. - * set to NULL when the query is serviced and it part of pending_tcp. - * if this is NULL, the next_waiting points to the pending_tcp. */ uint8_t* pkt; /** length of query packet. */ size_t pkt_len; - /** callback for the timeout, error or reply to the message */ + /** callback for the timeout, error or reply to the message, + * or NULL if no user is waiting. the entry uses an ID number. + * a query that was written is no longer needed, but the ID number + * and a reply will come back and can be ignored if NULL */ comm_point_callback_type* cb; /** callback user argument */ void* cb_arg; @@ -298,6 +406,8 @@ struct waiting_tcp { int ssl_upstream; /** ref to the tls_auth_name from the serviced_query */ char* tls_auth_name; + /** the packet was involved in an error, to stop looping errors */ + int error_count; }; /** @@ -423,6 +533,7 @@ struct serviced_query { * msec to wait on timeouted udp sockets. * @param tls_use_sni: if SNI is used for TLS connections. * @param dtenv: environment to send dnstap events with (if enabled). + * @param udp_connect: if the udp_connect option is enabled. * @return: the new structure (with no pending answers) or NULL on error. */ struct outside_network* outside_network_create(struct comm_base* base, @@ -431,7 +542,8 @@ struct outside_network* outside_network_create(struct comm_base* base, struct ub_randstate* rnd, int use_caps_for_id, int* availports, int numavailports, size_t unwanted_threshold, int tcp_mss, void (*unwanted_action)(void*), void* unwanted_param, int do_udp, - void* sslctx, int delayclose, int tls_use_sni, struct dt_env *dtenv); + void* sslctx, int delayclose, int tls_use_sni, struct dt_env *dtenv, + int udp_connect); /** * Delete outside_network structure. @@ -548,6 +660,19 @@ size_t outnet_get_mem(struct outside_network* outnet); */ size_t serviced_get_mem(struct serviced_query* sq); +/** Pick random ID value for a tcp stream, avoids existing IDs. */ +uint16_t reuse_tcp_select_id(struct reuse_tcp* reuse, + struct outside_network* outnet); + +/** find element in tree by id */ +struct waiting_tcp* reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id); + +/** insert element in tree by id */ +void reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w); + +/** delete readwait waiting_tcp elements, deletes the elements in the list */ +void reuse_del_readwait(rbtree_type* tree_by_id); + /** get TCP file descriptor for address, returns -1 on failure, * tcp_mss is 0 or maxseg size to set for TCP packets. */ int outnet_get_tcp_fd(struct sockaddr_storage* addr, socklen_t addrlen, int tcp_mss, int dscp); @@ -645,4 +770,10 @@ int pending_cmp(const void* key1, const void* key2); /** compare function of serviced query rbtree */ int serviced_cmp(const void* key1, const void* key2); +/** compare function of reuse_tcp rbtree in outside_network struct */ +int reuse_cmp(const void* key1, const void* key2); + +/** compare function of reuse_tcp tree_by_id rbtree */ +int reuse_id_cmp(const void* key1, const void* key2); + #endif /* OUTSIDE_NETWORK_H */ diff --git a/testcode/fake_event.c b/testcode/fake_event.c index e8fc84746..591557c35 100644 --- a/testcode/fake_event.c +++ b/testcode/fake_event.c @@ -1045,7 +1045,7 @@ outside_network_create(struct comm_base* base, size_t bufsize, void (*unwanted_action)(void*), void* ATTR_UNUSED(unwanted_param), int ATTR_UNUSED(do_udp), void* ATTR_UNUSED(sslctx), int ATTR_UNUSED(delayclose), int ATTR_UNUSED(tls_use_sni), - struct dt_env* ATTR_UNUSED(dtenv)) + struct dt_env* ATTR_UNUSED(dtenv), int ATTR_UNUSED(udp_connect)) { struct replay_runtime* runtime = (struct replay_runtime*)base; struct outside_network* outnet = calloc(1, @@ -1214,7 +1214,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, sldns_buffer_flip(pend->buffer); if(1) { struct edns_data edns; - struct edns_tag_addr* client_tag_addr; + struct edns_string_addr* client_string_addr; if(!inplace_cb_query_call(env, qinfo, flags, addr, addrlen, zone, zonelen, qstate, qstate->region)) { free(pend); @@ -1228,13 +1228,13 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, edns.bits = 0; if(dnssec) edns.bits = EDNS_DO; - if((client_tag_addr = edns_tag_addr_lookup( - &env->edns_tags->client_tags, + if((client_string_addr = edns_string_addr_lookup( + &env->edns_strings->client_strings, addr, addrlen))) { - uint16_t client_tag = htons(client_tag_addr->tag_data); edns_opt_list_append(&qstate->edns_opts_back_out, - env->edns_tags->client_tag_opcode, 2, - (uint8_t*)&client_tag, qstate->region); + env->edns_strings->client_string_opcode, + client_string_addr->string_len, + client_string_addr->string, qstate->region); } edns.opt_list = qstate->edns_opts_back_out; attach_edns_record(pend->buffer, &edns); @@ -1511,6 +1511,18 @@ int serviced_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b)) return 0; } +int reuse_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b)) +{ + log_assert(0); + return 0; +} + +int reuse_id_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b)) +{ + log_assert(0); + return 0; +} + /* timers in testbound for autotrust. statistics tested in tdir. */ struct comm_timer* comm_timer_create(struct comm_base* base, void (*cb)(void*), void* cb_arg) diff --git a/testcode/unitmain.c b/testcode/unitmain.c index a42be424e..c61026f26 100644 --- a/testcode/unitmain.c +++ b/testcode/unitmain.c @@ -839,6 +839,52 @@ static void respip_test(void) respip_conf_actions_test(); } +#include "services/outside_network.h" +/** add number of new IDs to the reuse tree, randomly chosen */ +static void tcpid_addmore(struct reuse_tcp* reuse, + struct outside_network* outnet, unsigned int addnum) +{ + unsigned int i; + struct waiting_tcp* w; + for(i=0; iid = id; + w->outnet = outnet; + w->next_waiting = (void*)reuse->pending; + reuse_tree_by_id_insert(reuse, w); + } +} + +/** fill up the reuse ID tree and test assertions */ +static void tcpid_fillup(struct reuse_tcp* reuse, + struct outside_network* outnet) +{ + int t, numtest=3; + for(t=0; ttree_by_id, reuse_id_cmp); + tcpid_addmore(reuse, outnet, 65535); + reuse_del_readwait(&reuse->tree_by_id); + } +} + +/** test TCP ID selection */ +static void tcpid_test(void) +{ + struct pending_tcp pend; + struct outside_network outnet; + unit_show_func("services/outside_network.c", "reuse_tcp_select_id"); + memset(&pend, 0, sizeof(pend)); + pend.reuse.pending = &pend; + memset(&outnet, 0, sizeof(outnet)); + outnet.rnd = ub_initstate(NULL); + rbtree_init(&pend.reuse.tree_by_id, reuse_id_cmp); + tcpid_fillup(&pend.reuse, &outnet); + ub_randfree(outnet.rnd); +} + void unit_show_func(const char* file, const char* func) { printf("test %s:%s\n", file, func); @@ -907,6 +953,7 @@ main(int argc, char* argv[]) infra_test(); ldns_test(); msgparse_test(); + tcpid_test(); #ifdef CLIENT_SUBNET ecs_test(); #endif /* CLIENT_SUBNET */ diff --git a/testdata/edns_client_tag.rpl b/testdata/edns_client_string.rpl similarity index 72% rename from testdata/edns_client_tag.rpl rename to testdata/edns_client_string.rpl index 767652c26..1822f7898 100644 --- a/testdata/edns_client_tag.rpl +++ b/testdata/edns_client_string.rpl @@ -1,14 +1,14 @@ ; config options server: - edns-client-tag: 10.0.0.0/24 1234 - edns-client-tag: 10.0.0.10/32 5678 + edns-client-string: 10.0.0.0/24 "abc d" + edns-client-string: 10.0.0.10/32 "123AbC!" stub-zone: - name: "tag1234." + name: "edns-string-abc." stub-addr: 10.0.0.1 stub-zone: - name: "tag5678." + name: "edns-string-123." stub-addr: 10.0.0.10 stub-zone: @@ -17,7 +17,7 @@ stub-zone: CONFIG_END -SCENARIO_BEGIN Test EDNS client tag option +SCENARIO_BEGIN Test EDNS string tag option RANGE_BEGIN 0 1000 ADDRESS 10.0.0.1 @@ -26,9 +26,9 @@ MATCH opcode qtype qname ADJUST copy_id REPLY QR NOERROR SECTION QUESTION -tag1234. IN A +edns-string-abc. IN A SECTION ANSWER -tag1234. IN A 10.20.30.40 +edns-string-abc. IN A 10.20.30.40 SECTION ADDITIONAL ENTRY_END RANGE_END @@ -40,9 +40,9 @@ MATCH opcode qtype qname ADJUST copy_id REPLY QR NOERROR SECTION QUESTION -tag5678. IN A +edns-string-123. IN A SECTION ANSWER -tag5678. IN A 10.20.30.40 +edns-string-123. IN A 10.20.30.40 SECTION ADDITIONAL ENTRY_END RANGE_END @@ -65,19 +65,19 @@ STEP 10 QUERY ENTRY_BEGIN REPLY RD SECTION QUESTION -tag1234. IN A +edns-string-abc. IN A ENTRY_END STEP 20 CHECK_OUT_QUERY ENTRY_BEGIN MATCH qname qtype opcode ednsdata SECTION QUESTION -tag1234. IN A +edns-string-abc. IN A SECTION ADDITIONAL HEX_EDNSDATA_BEGIN - 00 10 ; Opcode 16 - 00 02 ; Length 2 - 04 d2 ; 1234 + fd e9 ; Opcode 65001 + 00 05 ; Length 5 + 61 62 63 20 64 ; "abc d" HEX_EDNSDATA_END ENTRY_END @@ -86,28 +86,29 @@ ENTRY_BEGIN MATCH all REPLY QR RD RA NOERROR SECTION QUESTION -tag1234. IN A +edns-string-abc. IN A SECTION ANSWER -tag1234. IN A 10.20.30.40 +edns-string-abc. IN A 10.20.30.40 ENTRY_END STEP 110 QUERY ENTRY_BEGIN REPLY RD SECTION QUESTION -tag5678. IN A +edns-string-123. IN A ENTRY_END STEP 120 CHECK_OUT_QUERY ENTRY_BEGIN MATCH qname qtype opcode ednsdata SECTION QUESTION -tag5678. IN A +edns-string-123. IN A SECTION ADDITIONAL HEX_EDNSDATA_BEGIN - 00 10 ; Opcode 16 - 00 02 ; Length 2 - 16 2e ; 5678 + fd e9 ; Opcode 65001 + 00 07 ; Length 7 + 31 32 33 41 62 ; "123Ab" + 43 21 ; "C!" HEX_EDNSDATA_END ENTRY_END @@ -116,9 +117,9 @@ ENTRY_BEGIN MATCH all REPLY QR RD RA NOERROR SECTION QUESTION -tag5678. IN A +edns-string-123. IN A SECTION ANSWER -tag5678. IN A 10.20.30.40 +edns-string-123. IN A 10.20.30.40 ENTRY_END STEP 210 QUERY diff --git a/testdata/edns_client_string_opcode.rpl b/testdata/edns_client_string_opcode.rpl new file mode 100644 index 000000000..3bd6dda4e --- /dev/null +++ b/testdata/edns_client_string_opcode.rpl @@ -0,0 +1,153 @@ +; config options +server: + edns-client-string: 10.0.0.0/24 "abc d" + edns-client-string: 10.0.0.10/32 "123AbC!" + edns-client-string-opcode: 65432 + +stub-zone: + name: "edns-string-abc." + stub-addr: 10.0.0.1 + +stub-zone: + name: "edns-string-123." + stub-addr: 10.0.0.10 + +stub-zone: + name: "notag." + stub-addr: 10.10.0.1 + +CONFIG_END + +SCENARIO_BEGIN Test EDNS string tag option + +RANGE_BEGIN 0 1000 + ADDRESS 10.0.0.1 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +edns-string-abc. IN A +SECTION ANSWER +edns-string-abc. IN A 10.20.30.40 +SECTION ADDITIONAL +ENTRY_END +RANGE_END + +RANGE_BEGIN 0 1000 + ADDRESS 10.0.0.10 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +edns-string-123. IN A +SECTION ANSWER +edns-string-123. IN A 10.20.30.40 +SECTION ADDITIONAL +ENTRY_END +RANGE_END + +RANGE_BEGIN 0 1000 + ADDRESS 10.10.0.1 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +notag. IN A +SECTION ANSWER +notag. IN A 10.20.30.40 +SECTION ADDITIONAL +ENTRY_END +RANGE_END + +STEP 10 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +edns-string-abc. IN A +ENTRY_END + +STEP 20 CHECK_OUT_QUERY +ENTRY_BEGIN +MATCH qname qtype opcode ednsdata +SECTION QUESTION +edns-string-abc. IN A +SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + ff 98 ; Opcode 65432 + 00 05 ; Length 5 + 61 62 63 20 64 ; "abc d" + HEX_EDNSDATA_END +ENTRY_END + +STEP 30 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +edns-string-abc. IN A +SECTION ANSWER +edns-string-abc. IN A 10.20.30.40 +ENTRY_END + +STEP 110 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +edns-string-123. IN A +ENTRY_END + +STEP 120 CHECK_OUT_QUERY +ENTRY_BEGIN +MATCH qname qtype opcode ednsdata +SECTION QUESTION +edns-string-123. IN A +SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + ff 98 ; Opcode 65432 + 00 07 ; Length 7 + 31 32 33 41 62 ; "123Ab" + 43 21 ; "C!" + HEX_EDNSDATA_END +ENTRY_END + +STEP 130 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +edns-string-123. IN A +SECTION ANSWER +edns-string-123. IN A 10.20.30.40 +ENTRY_END + +STEP 210 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +notag. IN A +ENTRY_END + +STEP 220 CHECK_OUT_QUERY +ENTRY_BEGIN +MATCH qname qtype opcode ednsdata +SECTION QUESTION +notag. IN A +SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + HEX_EDNSDATA_END +ENTRY_END + +STEP 230 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +notag. IN A +SECTION ANSWER +notag. IN A 10.20.30.40 +ENTRY_END + +SCENARIO_END diff --git a/testdata/fwd_oneport.tdir/fwd_oneport.conf b/testdata/fwd_oneport.tdir/fwd_oneport.conf index f3427fece..21ebc9fed 100644 --- a/testdata/fwd_oneport.tdir/fwd_oneport.conf +++ b/testdata/fwd_oneport.tdir/fwd_oneport.conf @@ -13,6 +13,7 @@ server: num-queries-per-thread: 1024 use-syslog: no do-not-query-localhost: no + udp-connect: no forward-zone: name: "." forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.conf b/testdata/tcp_reuse.tdir/tcp_reuse.conf new file mode 100644 index 000000000..e8de8d3f8 --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.conf @@ -0,0 +1,17 @@ +server: + verbosity: 5 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + + tcp-upstream: yes + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.conf2 b/testdata/tcp_reuse.tdir/tcp_reuse.conf2 new file mode 100644 index 000000000..55985c83f --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.conf2 @@ -0,0 +1,39 @@ +# this is the upstream server that has pipelining and responds to queries. +server: + verbosity: 1 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound2.pid" + chroot: "" + username: "" + do-not-query-localhost: no + tcp-idle-timeout: 10000 + + log-queries: yes + log-replies: yes + log-identity: "upstream" + + local-zone: "." refuse + local-zone: "example.com" static + local-data: "www.example.com A 10.20.30.40" + local-data: "www1.example.com A 10.20.30.41" + local-data: "www2.example.com A 10.20.30.42" + local-data: "www3.example.com A 10.20.30.43" + local-data: "www4.example.com A 10.20.30.44" + local-data: "www5.example.com A 10.20.30.45" + local-data: "www6.example.com A 10.20.30.46" + local-data: "www7.example.com A 10.20.30.47" + + local-zone: "drop.net" deny + local-zone: "refuse.net" refuse + + local-zone: "more.net" redirect + local-data: "more.net A 10.20.30.40" + +# if queries escape, send them to localhost +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.dsc b/testdata/tcp_reuse.tdir/tcp_reuse.dsc new file mode 100644 index 000000000..8a780480d --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.dsc @@ -0,0 +1,16 @@ +BaseName: tcp_reuse +Version: 1.0 +Description: Test tcp stream reuse. +CreationDate: Wed Jun 03 09:37:00 CET 2020 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: tcp_reuse.pre +Post: tcp_reuse.post +Test: tcp_reuse.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.post b/testdata/tcp_reuse.tdir/tcp_reuse.post new file mode 100644 index 000000000..ca7535471 --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.post @@ -0,0 +1,19 @@ +# #-- tcp_reuse.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 +. ../common.sh +kill_pid `cat unbound2.pid` +if test -f unbound2.log; then + echo ">>> upstream log" + cat unbound2.log +fi +#kill_pid $UNBOUND_PID +kill_pid `cat unbound.pid` +if test -f unbound.log; then + echo ">>> unbound log" + cat unbound.log +fi diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.pre b/testdata/tcp_reuse.tdir/tcp_reuse.pre new file mode 100644 index 000000000..511dbc6f7 --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.pre @@ -0,0 +1,34 @@ +# #-- tcp_reuse.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 +get_random_port 2 +UNBOUND_PORT=$RND_PORT +UPSTREAM_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test + +# make config file +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf > ub.conf +# start unbound in the background +#$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log & +UNBOUND_PID=$! +echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test +wait_unbound_up unbound.log + +# make upstream config file +sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf2 > ub2.conf +# start upstream unbound in the background +#$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 & +$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log & +UPSTREAM_PID=$! +echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test +wait_unbound_up unbound2.log + +cat .tpkg.var.test + diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test new file mode 100644 index 000000000..b62ec0d19 --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.test @@ -0,0 +1,309 @@ +# #-- tcp_reuse.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 + +get_make +(cd $PRE; $MAKE streamtcp) + +echo "> query www1.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www1.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 unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.com" outfile | grep "10.20.30.41"; then + echo "content OK" +else + echo "result contents not OK, for www1.example.com" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www1.example.com" + exit 1 +fi +echo "OK" +echo "" + +# this should be reused on the same tcp stream: +echo "> query www2.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www2.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 unbound2.log + cat unbound.log + echo "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, for www2.example.com" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www2.example.com" + exit 1 +fi + +echo "> query refuse.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT refuse.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile; then + echo "content OK" +else + echo "result contents not OK, for refuse.net" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for refuse.net" + exit 1 +fi + +echo "> query www3.example.com." +echo "> query www4.example.com." +echo "> query www5.example.com." +echo "> query www6.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www3.example.com. A IN >outfile3 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN >outfile4 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN >outfile5 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN >outfile6 2>&1 & +wait +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www3.example.com" outfile3 | grep "10.20.30.43"; then + echo "content OK" +else + echo "result contents not OK, for www3.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www3.example.com" + exit 1 +fi +if grep "www4.example.com" outfile4 | grep "10.20.30.44"; then + echo "content OK" +else + echo "result contents not OK, for www4.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www4.example.com" + exit 1 +fi +if grep "www5.example.com" outfile5 | grep "10.20.30.45"; then + echo "content OK" +else + echo "result contents not OK, for www5.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www5.example.com" + exit 1 +fi +if grep "www6.example.com" outfile6 | grep "10.20.30.46"; then + echo "content OK" +else + echo "result contents not OK, for www6.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www6.example.com" + exit 1 +fi + +echo "> query a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a1.more.net A IN a2.more.net A IN a3.more.net A IN a4.more.net A IN a5.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do + if grep "$x" outfile | grep "10.20.30.40"; then + echo "content OK for $x" + else + echo "result contents not OK, for $x" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for $x" + exit 1 + fi +done + +# make the server timeout to drop the upstream connection +echo "> sleep 15" +sleep 15 +# see if we are still up. +echo "> query a7.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a7.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +for x in a7.more.net; do + if grep "$x" outfile | grep "10.20.30.40"; then + echo "content OK for $x" + else + echo "result contents not OK, for $x" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for $x" + exit 1 + fi +done + +# dropconn.drop.net make the server drop the connection. +echo "> query a11.more.net a12.more.net dropconn.drop.net a14.more.net a15.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a11.more.net A IN a12.more.net A IN dropconn.drop.net A IN a14.more.net A IN a15.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +# cannot really check outfile, because it may or may not have answers depending +# on how fast the other server responds or the drop happens, but there are +# a bunch of connection drops, whilst resolving the other queries. + +echo "> query drop.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT drop.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile; then + echo "content OK" +else + echo "result contents not OK, for drop.net" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for drop.net" + exit 1 +fi + + +# timeouts at the end. (so that the server is not marked as failed for +# the other tests). +echo "> query q1.drop.net." +echo "> query q2.drop.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q1.drop.net. A IN >outfile1 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q2.drop.net. A IN >outfile2 2>&1 & +wait +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile1 +cat outfile2 +if grep "rcode: SERVFAIL" outfile1; then + echo "content OK" +else + echo "result contents not OK, for q1.drop.net" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for q1.drop.net" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile2; then + echo "content OK" +else + echo "result contents not OK, for q2.drop.net" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for q2.drop.net" + exit 1 +fi + +echo "OK" +exit 0 diff --git a/testdata/tls_reuse.tdir/tls_reuse.conf b/testdata/tls_reuse.tdir/tls_reuse.conf new file mode 100644 index 000000000..e8200b28b --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.conf @@ -0,0 +1,18 @@ +server: + verbosity: 5 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + + tls-cert-bundle: "unbound_server.pem" + tls-upstream: yes + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@#unbound" diff --git a/testdata/tls_reuse.tdir/tls_reuse.conf2 b/testdata/tls_reuse.tdir/tls_reuse.conf2 new file mode 100644 index 000000000..0b452558d --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.conf2 @@ -0,0 +1,43 @@ +# this is the upstream server that has pipelining and responds to queries. +server: + verbosity: 1 + # num-threads: 1 + interface: 127.0.0.1@@PORT@ + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound2.pid" + chroot: "" + username: "" + do-not-query-localhost: no + tls-port: @PORT@ + tls-service-key: "unbound_server.key" + tls-service-pem: "unbound_server.pem" + tcp-idle-timeout: 10000 + + log-queries: yes + log-replies: yes + log-identity: "upstream" + + local-zone: "." refuse + local-zone: "example.com" static + local-data: "www.example.com A 10.20.30.40" + local-data: "www1.example.com A 10.20.30.41" + local-data: "www2.example.com A 10.20.30.42" + local-data: "www3.example.com A 10.20.30.43" + local-data: "www4.example.com A 10.20.30.44" + local-data: "www5.example.com A 10.20.30.45" + local-data: "www6.example.com A 10.20.30.46" + local-data: "www7.example.com A 10.20.30.47" + + local-zone: "drop.net" deny + local-zone: "refuse.net" refuse + + local-zone: "more.net" redirect + local-data: "more.net A 10.20.30.40" + +# if queries escape, send them to localhost +forward-zone: + name: "." + forward-tls-upstream: yes + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tls_reuse.tdir/tls_reuse.dsc b/testdata/tls_reuse.tdir/tls_reuse.dsc new file mode 100644 index 000000000..76a80cdad --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.dsc @@ -0,0 +1,16 @@ +BaseName: tls_reuse +Version: 1.0 +Description: Test tls stream reuse. +CreationDate: Wed Jun 30 16:37:00 CET 2020 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: tls_reuse.pre +Post: tls_reuse.post +Test: tls_reuse.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/tls_reuse.tdir/tls_reuse.post b/testdata/tls_reuse.tdir/tls_reuse.post new file mode 100644 index 000000000..2eef0da96 --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.post @@ -0,0 +1,19 @@ +# #-- tls_reuse.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 +. ../common.sh +kill_pid `cat unbound2.pid` +if test -f unbound2.log; then + echo ">>> upstream log" + cat unbound2.log +fi +#kill_pid $UNBOUND_PID +kill_pid `cat unbound.pid` +if test -f unbound.log; then + echo ">>> unbound log" + cat unbound.log +fi diff --git a/testdata/tls_reuse.tdir/tls_reuse.pre b/testdata/tls_reuse.tdir/tls_reuse.pre new file mode 100644 index 000000000..f4ba26372 --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.pre @@ -0,0 +1,34 @@ +# #-- tls_reuse.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 +get_random_port 2 +UNBOUND_PORT=$RND_PORT +UPSTREAM_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test + +# make config file +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tls_reuse.conf > ub.conf +# start unbound in the background +#$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log & +UNBOUND_PID=$! +echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test +wait_unbound_up unbound.log + +# make upstream config file +sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tls_reuse.conf2 > ub2.conf +# start upstream unbound in the background +#$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 & +$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log & +UPSTREAM_PID=$! +echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test +wait_unbound_up unbound2.log + +cat .tpkg.var.test + diff --git a/testdata/tls_reuse.tdir/tls_reuse.test b/testdata/tls_reuse.tdir/tls_reuse.test new file mode 100644 index 000000000..0f392fba8 --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.test @@ -0,0 +1,308 @@ +# #-- tls_reuse.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 + +get_make +(cd $PRE; $MAKE streamtcp) + +echo "> query www1.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www1.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 unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.com" outfile | grep "10.20.30.41"; then + echo "content OK" +else + echo "result contents not OK, for www1.example.com" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www1.example.com" + exit 1 +fi +echo "OK" +echo "" + +# this should be reused on the same tcp stream: +echo "> query www2.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www2.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 unbound2.log + cat unbound.log + echo "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, for www2.example.com" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www2.example.com" + exit 1 +fi + +echo "> query refuse.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT refuse.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile; then + echo "content OK" +else + echo "result contents not OK, for refuse.net" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for refuse.net" + exit 1 +fi + +echo "> query www3.example.com." +echo "> query www4.example.com." +echo "> query www5.example.com." +echo "> query www6.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www3.example.com. A IN >outfile3 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN >outfile4 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN >outfile5 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN >outfile6 2>&1 & +wait +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www3.example.com" outfile3 | grep "10.20.30.43"; then + echo "content OK" +else + echo "result contents not OK, for www3.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www3.example.com" + exit 1 +fi +if grep "www4.example.com" outfile4 | grep "10.20.30.44"; then + echo "content OK" +else + echo "result contents not OK, for www4.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www4.example.com" + exit 1 +fi +if grep "www5.example.com" outfile5 | grep "10.20.30.45"; then + echo "content OK" +else + echo "result contents not OK, for www5.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www5.example.com" + exit 1 +fi +if grep "www6.example.com" outfile6 | grep "10.20.30.46"; then + echo "content OK" +else + echo "result contents not OK, for www6.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www6.example.com" + exit 1 +fi + +echo "> query a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a1.more.net A IN a2.more.net A IN a3.more.net A IN a4.more.net A IN a5.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do + if grep "$x" outfile | grep "10.20.30.40"; then + echo "content OK for $x" + else + echo "result contents not OK, for $x" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for $x" + exit 1 + fi +done + +# make the server timeout to drop the upstream connection +echo "> sleep 15" +sleep 15 +# see if we are still up. +echo "> query a7.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a7.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +for x in a7.more.net; do + if grep "$x" outfile | grep "10.20.30.40"; then + echo "content OK for $x" + else + echo "result contents not OK, for $x" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for $x" + exit 1 + fi +done + +# dropconn.drop.net make the server drop the connection. +echo "> query a11.more.net a12.more.net dropconn.drop.net a14.more.net a15.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a11.more.net A IN a12.more.net A IN dropconn.drop.net A IN a14.more.net A IN a15.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +# cannot really check outfile, because it may or may not have answers depending +# on how fast the other server responds or the drop happens, but there are +# a bunch of connection drops, whilst resolving the other queries. + +echo "> query drop.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT drop.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile; then + echo "content OK" +else + echo "result contents not OK, for drop.net" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for drop.net" + exit 1 +fi + +# timeouts at the end. (so that the server is not marked as failed for +# the other tests). +echo "> query q1.drop.net." +echo "> query q2.drop.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q1.drop.net. A IN >outfile1 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q2.drop.net. A IN >outfile2 2>&1 & +wait +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile1 +cat outfile2 +if grep "rcode: SERVFAIL" outfile1; then + echo "content OK" +else + echo "result contents not OK, for q1.drop.net" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for q1.drop.net" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile2; then + echo "content OK" +else + echo "result contents not OK, for q2.drop.net" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for q2.drop.net" + exit 1 +fi + +echo "OK" +exit 0 diff --git a/testdata/tls_reuse.tdir/unbound_control.key b/testdata/tls_reuse.tdir/unbound_control.key new file mode 100644 index 000000000..753a4ef61 --- /dev/null +++ b/testdata/tls_reuse.tdir/unbound_control.key @@ -0,0 +1,39 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIG4gIBAAKCAYEAstEp+Pyh8XGrtZ77A4FhYjvbeB3dMa7Q2rGWxobzlA9przhA +1aChAvUtCOAuM+rB6NTNB8YWfZJbQHawyMNpmC77cg6vXLYCGUQHZyAqidN049RJ +F5T7j4N8Vniv17LiRdr0S6swy4PRvEnIPPV43EQHZqC5jVvHsKkhIfmBF/Dj5TXR +ypeawWV/m5jeU6/4HRYMfytBZdO1mPXuWLh0lgbQ4SCbgrOUVD3rniMk1yZIbQOm +vlDHYqekjDb/vOW2KxUQLG04aZMJ1mWfdbwG0CKQkSjISEDZ1l76vhM6mTM0fwXb +IvyFZ9yPPCle1mF5aSlxS2cmGuGVSRQaw8XF9fe3a9ACJJTr33HdSpyaZkKRAUzL +cKqLCl323daKv3NwwAT03Tj4iQM416ASMoiyfFa/2GWTKQVjddu8Crar7tGaf5xr +lig4DBmrBvdYA3njy72/RD71hLwmlRoCGU7dRuDr9O6KASUm1Ri91ONZ/qdjMvov +15l2vj4GV+KXR00dAgMBAAECggGAHepIL1N0dEQkCdpy+/8lH54L9WhpnOo2HqAf +LU9eaKK7d4jdr9+TkD8cLaPzltPrZNxVALvu/0sA4SP6J1wpyj/x6P7z73qzly5+ +Xo5PD4fEwmi9YaiW/UduAblnEZrnp/AddptJKoL/D5T4XtpiQddPtael4zQ7kB57 +YIexRSQTvEDovA/o3/nvA0TrzOxfgd4ycQP3iOWGN/TMzyLsvjydrUwbOB567iz9 +whL3Etdgvnwh5Sz2blbFfH+nAR8ctvFFz+osPvuIVR21VMEI6wm7kTpSNnQ6sh/c +lrLb/bTADn4g7z/LpIZJ+MrLvyEcoqValrLYeFBhM9CV8woPxvkO2P3pU47HVGax +tC7GV6a/kt5RoKFd/TNdiA3OC7NGZtaeXv9VkPf4fVwBtSO9d5ZZXTGEynDD/rUQ +U4KFJe6OD23APjse08HiiKqTPhsOneOONU67iqoaTdIkT2R4EdlkVEDpXVtWb+G9 +Q+IqYzVljlzuyHrhWXLJw/FMa2aBAoHBAOnZbi4gGpH+P6886WDWVgIlTccuXoyc +Mg9QQYk9UDeXxL0AizR5bZy49Sduegz9vkHpAiZARQsUnizHjZ8YlRcrmn4t6tx3 +ahTIKAjdprnxJfYINM580j8CGbXvX5LhIlm3O267D0Op+co3+7Ujy+cjsIuFQrP+ +1MqMgXSeBjzC1APivmps7HeFE+4w0k2PfN5wSMDNCzLo99PZuUG5XZ93OVOS5dpN +b+WskdcD8NOoJy/X/5A08veEI/jYO/DyqQKBwQDDwUQCOWf41ecvJLtBHKmEnHDz +ftzHino9DRKG8a9XaN4rmetnoWEaM2vHGX3pf3mwH+dAe8vJdAQueDhBKYeEpm6C +TYNOpou1+Zs5s99BilCTNYo8fkMOAyqwRwmz9zgHS6QxXuPwsghKefLJGt6o6RFF +tfWVTfLlYJ+I3GQe3ySsk3wjVz4oUTKiyiq5+KzD+HhEkS7u+RQ7Z0ZI2xd2cF8Y +aN2hjKDpcOiFf3CDoqka5D1qMNLgIHO52AHww1UCgcA1h7o7AMpURRka6hyaODY0 +A4oMYEbwdQjYjIyT998W+rzkbu1us6UtzQEBZ760npkgyU/epbOoV63lnkCC/MOU +LD0PST+L/CHiY/cWIHb79YG1EifUZKpUFg0Aoq0EGFkepF0MefGCkbRGYA5UZr9U +R80wAu9D+L+JJiS0J0BSRF74DL196zUuHt5zFeXuLzxsRtPAnq9DliS08BACRYZy +7H3I7cWD9Vn5/0jbKWHFcaaWwyETR6uekTcSzZzbCRECgcBeoE3/xUA9SSk34Mmj +7/cB4522Ft0imA3+9RK/qJTZ7Bd5fC4PKjOGNtUiqW/0L2rjeIiQ40bfWvWqgPKw +jSK1PL6uvkl6+4cNsFsYyZpiVDoe7wKju2UuoNlB3RUTqa2r2STFuNj2wRjA57I1 +BIgdnox65jqQsd14g/yaa+75/WP9CE45xzKEyrtvdcqxm0Pod3OrsYK+gikFjiar +kT0GQ8u0QPzh2tjt/2ZnIfOBrl+QYERP0MofDZDjhUdq2wECgcB0Lu841+yP5cdR +qbJhXO4zJNh7oWNcJlOuQp3ZMNFrA1oHpe9pmLukiROOy01k9WxIMQDzU5GSqRv3 +VLkYOIcbhJ3kClKAcM3j95SkKbU2H5/RENb3Ck52xtl4pNU1x/3PnVFZfDVuuHO9 +MZ9YBcIeK98MyP2jr5JtFKnOyPE7xKq0IHIhXadpbc2wjje5FtZ1cUtMyEECCXNa +C1TpXebHGyXGpY9WdWXhjdE/1jPvfS+uO5WyuDpYPr339gsdq1g= +-----END RSA PRIVATE KEY----- diff --git a/testdata/tls_reuse.tdir/unbound_control.pem b/testdata/tls_reuse.tdir/unbound_control.pem new file mode 100644 index 000000000..a1edf7017 --- /dev/null +++ b/testdata/tls_reuse.tdir/unbound_control.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDszCCAhsCFGD5193whHQ2bVdzbaQfdf1gc4SkMA0GCSqGSIb3DQEBCwUAMBIx +EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjMwWhcNNDAwMzI1MTMzMjMw +WjAaMRgwFgYDVQQDDA91bmJvdW5kLWNvbnRyb2wwggGiMA0GCSqGSIb3DQEBAQUA +A4IBjwAwggGKAoIBgQCy0Sn4/KHxcau1nvsDgWFiO9t4Hd0xrtDasZbGhvOUD2mv +OEDVoKEC9S0I4C4z6sHo1M0HxhZ9kltAdrDIw2mYLvtyDq9ctgIZRAdnICqJ03Tj +1EkXlPuPg3xWeK/XsuJF2vRLqzDLg9G8Scg89XjcRAdmoLmNW8ewqSEh+YEX8OPl +NdHKl5rBZX+bmN5Tr/gdFgx/K0Fl07WY9e5YuHSWBtDhIJuCs5RUPeueIyTXJkht +A6a+UMdip6SMNv+85bYrFRAsbThpkwnWZZ91vAbQIpCRKMhIQNnWXvq+EzqZMzR/ +Bdsi/IVn3I88KV7WYXlpKXFLZyYa4ZVJFBrDxcX197dr0AIklOvfcd1KnJpmQpEB +TMtwqosKXfbd1oq/c3DABPTdOPiJAzjXoBIyiLJ8Vr/YZZMpBWN127wKtqvu0Zp/ +nGuWKDgMGasG91gDeePLvb9EPvWEvCaVGgIZTt1G4Ov07ooBJSbVGL3U41n+p2My ++i/XmXa+PgZX4pdHTR0CAwEAATANBgkqhkiG9w0BAQsFAAOCAYEAd++Wen6l8Ifj +4h3p/y16PhSsWJWuJ4wdNYy3/GM84S26wGjzlEEwiW76HpH6VJzPOiBAeWnFKE83 +hFyetEIxgJeIPbcs9ZP/Uoh8GZH9tRISBSN9Hgk2Slr9llo4t1H0g/XTgA5HqMQU +9YydlBh43G7Vw3FVwh09OM6poNOGQKNc/tq2/QdKeUMtyBbLWpRmjH5XcCT35fbn +ZiVOUldqSHD4kKrFO4nJYXZyipRbcXybsLiX9GP0GLemc3IgIvOXyJ2RPp06o/SJ +pzlMlkcAfLJaSuEW57xRakhuNK7m051TKKzJzIEX+NFYOVdafFHS8VwGrYsdrFvD +72tMfu+Fu55y3awdWWGc6YlaGogZiuMnJkvQphwgn+5qE/7CGEckoKEsH601rqIZ +muaIc85+nEcHJeijd/ZlBN9zeltjFoMuqTUENgmv8+tUAdVm/UMY9Vjme6b43ydP +uv6DS02+k9z8toxXworLiPr94BGaiGV1NxgwZKLZigYJt/Fi2Qte +-----END CERTIFICATE----- diff --git a/testdata/tls_reuse.tdir/unbound_server.key b/testdata/tls_reuse.tdir/unbound_server.key new file mode 100644 index 000000000..370a7bbb2 --- /dev/null +++ b/testdata/tls_reuse.tdir/unbound_server.key @@ -0,0 +1,39 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIG5AIBAAKCAYEAvjSVSN2QMXudpzukdLCqgg/IOhCX8KYkD0FFFfWcQjgKq5wI +0x41iG32a6wbGanre4IX7VxaSPu9kkHfnGgynCk5nwDRedE/FLFhAU78PoT0+Nqq +GRS7XVQ24vLmIz9Hqc2Ozx1um1BXBTmIT0UfN2e22I0LWQ6a3seZlEDRj45gnk7Z +uh9MDgotaBdm+v1JAbupSf6Zis4VEH3JNdvVGE3O1DHEIeuuz/3BDhpf6WBDH+8K +WaBe1ca4TZHr9ThL2gEMEfAQl0wXDwRWRoi3NjNMH+mw0L1rjwThI5GXqNIee7o5 +FzUReSXZuTdFMyGe3Owcx+XoYnwi6cplSNoGsDBu4B9bKKglR9YleJVw4L4Xi8xP +q6O9UPj4+nypHk/DOoC7DIM3ufN0yxPBsFo5TVowxfhdjZXJbbftd2TZv7AH8+XL +A5UoZgRzXgzECelXSCTBFlMTnT48LfA9pMLydyjAz2UdPHs5Iv+TK5nnI+aJoeaP +7kFZSngxdy1+A/bNAgMBAAECggGBALpTOIqQwVg4CFBylL/a8K1IWJTI/I65sklf +XxYL7G7SB2HlEJ//z+E+F0+S4Vlao1vyLQ5QkgE82pAUB8FoMWvY1qF0Y8A5wtm6 +iZSGk4OLK488ZbT8Ii9i+AGKgPe2XbVxsJwj8N4k7Zooqec9hz73Up8ATEWJkRz7 +2u7oMGG4z91E0PULA64dOi3l/vOQe5w/Aa+CwVbAWtI05o7kMvQEBMDJn6C7CByo +MB5op9wueJMnz7PM7hns+U7Dy6oE4ljuolJUy51bDzFWwoM54cRoQqLFNHd8JVQj +WxldCkbfF43iyprlsEcUrTyUjtdA+ZeiG39vg/mtdmgNpGmdupHJZQvSuG8IcVlz +O+eMSeQS1QXPD6Ik8UK4SU0h+zOl8xIWtRrsxQuh4fnTN40udm/YUWl/6gOebsBI +IrVLlKGqJSfB3tMjpCRqdTzJ0dA9keVpkqm2ugZkxEf1+/efq/rFIQ2pUBLCqNTN +qpNqruK8y8FphP30I2uI4Ej2UIB8AQKBwQDd2Yptj2FyDyaXCycsyde0wYkNyzGU +dRnzdibfHnMZwjgTjwAwgIUBVIS8H0/z7ZJQKN7osJfddMrtjJtYYUk9g/dCpHXs +bNh2QSoWah3FdzNGuWd0iRf9+LFxhjAAMo/FS8zFJAJKrFsBdCGTfFUMdsLC0bjr +YjiWBuvV72uKf8XIZX5KIZruKdWBBcWukcb21R1UDyFYyXRBsly5XHaIYKZql3km +7pV7MKWO0IYgHbHIqGUqPQlzZ/lkunS1jKECgcEA23wHffD6Ou9/x3okPx2AWpTr +gh8rgqbyo6hQkBW5Y90Wz824cqaYebZDaBR/xlVx/YwjKkohv8Bde2lpH/ZxRZ1Z +5Sk2s6GJ/vU0L9RsJZgCgj4L6Coal1NMxuZtCXAlnOpiCdxSZgfqbshbTVz30KsG +ZJG361Cua1ScdAHxlZBxT52/1Sm0zRC2hnxL7h4qo7Idmtzs40LAJvYOKekR0pPN +oWeJfra7vgx/jVNvMFWoOoSLpidVO4g+ot4ery6tAoHAdW3rCic1C2zdnmH28Iw+ +s50l8Lk3mz+I5wgJd1zkzCO0DxZIoWPGA3g7cmCYr6N3KRsZMs4W9NAXgjpFGDkW +zYsG3K21BdpvkdjYcFjnPVjlOXB2RIc0vehf9Jl02wXoeCSxVUDEPcaRvWk9RJYx +ZpGOchUU7vNkxHURbIJ4yCzuAi9G8/Jp0dsu+kaV5tufF5SjG5WOrzKjaQsCbdN1 +oqaWMCHRrTvov/Z2C+xwsptFOdN5CSyZzg6hQiI4GMlBAoHAXyb6KINcOEi0YMp3 +BFXJ23tMTnEs78tozcKeipigcsbaqORK3omS+NEnj+uzKUzJyl4CsMbKstK2tFYS +mSTCHqgE3PBtIpsZtEqhgUraR8IK9GPpzZDTTl9ynZgwFTNlWw3RyuyVXF56J+T8 +kCGJ3hEHCHqT/ZRQyX85BKIDFhA0z4tYKxWVqIFiYBNq56R0X9tMMmMs36mEnF93 +7Ht6mowxTZQRa7nU0qOgeKh/P7ki4Zus3y+WJ+T9IqahLtlRAoHBAIhqMrcxSAB8 +RpB9jukJlAnidw2jCMPgrFE8tP0khhVvGrXMldxAUsMKntDIo8dGCnG1KTcWDI0O +jepvSPHSsxVLFugL79h0eVIS5z4huW48i9xgU8VlHdgAcgEPIAOFcOw2BCu/s0Vp +O+MM/EyUOdo3NsibB3qc/GJI6iNBYS7AljYEVo6rXo5V/MZvZUF4vClen6Obzsre +MTTb+4sJjfqleWuvr1XNMeu2mBfXBQkWGZP1byBK0MvD/aQ2PWq92A== +-----END RSA PRIVATE KEY----- diff --git a/testdata/tls_reuse.tdir/unbound_server.pem b/testdata/tls_reuse.tdir/unbound_server.pem new file mode 100644 index 000000000..986807310 --- /dev/null +++ b/testdata/tls_reuse.tdir/unbound_server.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDqzCCAhMCFBHWXeQ6ZIa9QcQbXLFfC6tj+KA+MA0GCSqGSIb3DQEBCwUAMBIx +EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjI5WhcNNDAwMzI1MTMzMjI5 +WjASMRAwDgYDVQQDDAd1bmJvdW5kMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB +igKCAYEAvjSVSN2QMXudpzukdLCqgg/IOhCX8KYkD0FFFfWcQjgKq5wI0x41iG32 +a6wbGanre4IX7VxaSPu9kkHfnGgynCk5nwDRedE/FLFhAU78PoT0+NqqGRS7XVQ2 +4vLmIz9Hqc2Ozx1um1BXBTmIT0UfN2e22I0LWQ6a3seZlEDRj45gnk7Zuh9MDgot +aBdm+v1JAbupSf6Zis4VEH3JNdvVGE3O1DHEIeuuz/3BDhpf6WBDH+8KWaBe1ca4 +TZHr9ThL2gEMEfAQl0wXDwRWRoi3NjNMH+mw0L1rjwThI5GXqNIee7o5FzUReSXZ +uTdFMyGe3Owcx+XoYnwi6cplSNoGsDBu4B9bKKglR9YleJVw4L4Xi8xPq6O9UPj4 ++nypHk/DOoC7DIM3ufN0yxPBsFo5TVowxfhdjZXJbbftd2TZv7AH8+XLA5UoZgRz +XgzECelXSCTBFlMTnT48LfA9pMLydyjAz2UdPHs5Iv+TK5nnI+aJoeaP7kFZSngx +dy1+A/bNAgMBAAEwDQYJKoZIhvcNAQELBQADggGBABunf93MKaCUHiZgnoOTinsW +84/EgInrgtKzAyH+BhnKkJOhhR0kkIAx5d9BpDlaSiRTACFon9moWCgDIIsK/Ar7 +JE0Kln9cV//wiiNoFU0O4mnzyGUIMvlaEX6QHMJJQYvL05+w/3AAcf5XmMJtR5ca +fJ8FqvGC34b2WxX9lTQoyT52sRt+1KnQikiMEnEyAdKktMG+MwKsFDdOwDXyZhZg +XZhRrfX3/NVJolqB6EahjWIGXDeKuSSKZVtCyib6LskyeMzN5lcRfvubKDdlqFVF +qlD7rHBsKhQUWK/IO64mGf7y/de+CgHtED5vDvr/p2uj/9sABATfbrOQR3W/Of25 +sLBj4OEfrJ7lX8hQgFaxkMI3x6VFT3W8dTCp7xnQgb6bgROWB5fNEZ9jk/gjSRmD +yIU+r0UbKe5kBk/CmZVFXL2TyJ92V5NYEQh8V4DGy19qZ6u/XKYyNJL4ocs35GGe +CA8SBuyrmdhx38h1RHErR2Skzadi1S7MwGf1y431fQ== +-----END CERTIFICATE----- diff --git a/util/config_file.c b/util/config_file.c index 406911ecc..4c827b74e 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -172,6 +172,7 @@ config_create(void) cfg->infra_cache_min_rtt = 50; cfg->infra_keep_probing = 0; cfg->delay_close = 0; + cfg->udp_connect = 1; if(!(cfg->outgoing_avail_ports = (int*)calloc(65536, sizeof(int)))) goto error_exit; init_outgoing_availports(cfg->outgoing_avail_ports, 65536); @@ -322,8 +323,8 @@ config_create(void) cfg->qname_minimisation_strict = 0; cfg->shm_enable = 0; cfg->shm_key = 11777; - cfg->edns_client_tags = NULL; - cfg->edns_client_tag_opcode = LDNS_EDNS_CLIENT_TAG; + cfg->edns_client_strings = NULL; + cfg->edns_client_string_opcode = 65001; cfg->dnscrypt = 0; cfg->dnscrypt_port = 0; cfg->dnscrypt_provider = NULL; @@ -569,6 +570,7 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_POW2("infra-cache-slabs:", infra_cache_slabs) else S_SIZET_NONZERO("infra-cache-numhosts:", infra_cache_numhosts) else S_NUMBER_OR_ZERO("delay-close:", delay_close) + else S_YNO("udp-connect:", udp_connect) else S_STR("chroot:", chrootdir) else S_STR("username:", username) else S_STR("directory:", directory) @@ -964,6 +966,7 @@ config_get_option(struct config_file* cfg, const char* opt, 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, "udp-connect", udp_connect) else O_YNO(opt, "do-ip4", do_ip4) else O_YNO(opt, "do-ip6", do_ip6) else O_YNO(opt, "do-udp", do_udp) @@ -1155,7 +1158,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_LS3(opt, "access-control-tag-action", acl_tag_actions) else O_LS3(opt, "access-control-tag-data", acl_tag_datas) else O_LS2(opt, "access-control-view", acl_view) - else O_LS2(opt, "edns-client-tags", edns_client_tags) + else O_LS2(opt, "edns-client-strings", edns_client_strings) #ifdef USE_IPSECMOD else O_YNO(opt, "ipsecmod-enabled", ipsecmod_enabled) else O_YNO(opt, "ipsecmod-ignore-bogus", ipsecmod_ignore_bogus) @@ -1524,7 +1527,7 @@ config_delete(struct config_file* cfg) config_deldblstrlist(cfg->ratelimit_below_domain); config_delstrlist(cfg->python_script); config_delstrlist(cfg->dynlib_file); - config_deldblstrlist(cfg->edns_client_tags); + config_deldblstrlist(cfg->edns_client_strings); #ifdef USE_IPSECMOD free(cfg->ipsecmod_hook); config_delstrlist(cfg->ipsecmod_whitelist); diff --git a/util/config_file.h b/util/config_file.h index a12a078f7..556544021 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -185,6 +185,8 @@ struct config_file { int infra_keep_probing; /** delay close of udp-timeouted ports, if 0 no delayclose. in msec */ int delay_close; + /** udp_connect enable uses UDP connect to mitigate ICMP side channel */ + int udp_connect; /** the target fetch policy for the iterator */ char* target_fetch_policy; @@ -566,10 +568,10 @@ struct config_file { /** SHM data - key for the shm */ int shm_key; - /** list of EDNS client tag entries, linked list */ - struct config_str2list* edns_client_tags; - /** EDNS opcode to use for EDNS client tags */ - uint16_t edns_client_tag_opcode; + /** list of EDNS client string entries, linked list */ + struct config_str2list* edns_client_strings; + /** EDNS opcode to use for EDNS client strings */ + uint16_t edns_client_string_opcode; /** DNSCrypt */ /** true to enable dnscrypt */ diff --git a/util/configlexer.c b/util/configlexer.c index 9fc565e0c..f845e2057 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 336 -#define YY_END_OF_BUFFER 337 +#define YY_NUM_RULES 337 +#define YY_END_OF_BUFFER 338 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -363,368 +363,371 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[3281] = +static const flex_int16_t yy_accept[3292] = { 0, - 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, - - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 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, - - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 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, - - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 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, - - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 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, - - 334, 334, 334, 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, - - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 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, 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, - - 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, - - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 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, - - 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, - - 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, - - 334, 334, 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, 306, 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, 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, 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, 334, 334, 334, 334, 334, 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, 334, 334, 334, 334, 334, 334, 240, 334, 334, - 334, 334, 334, 334, 334, 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, - - 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, - - 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, 307, 334, 94, 48, 334, - 147, 148, 151, 152, 149, 150, 87, 334, 265, 334, - - 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, 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, 101, 334, 233, 334, - 257, 285, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 49, 5, 334, 334, 225, 334, - 334, 286, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 245, 25, 334, 334, 334, 334, 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 + 1, 1, 311, 311, 315, 315, 319, 319, 323, 323, + 1, 1, 327, 327, 331, 331, 338, 335, 1, 309, + 309, 336, 2, 336, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 311, 312, 312, 313, + 336, 315, 316, 316, 317, 336, 322, 319, 320, 320, + 321, 336, 323, 324, 324, 325, 336, 334, 310, 2, + 314, 336, 334, 330, 327, 328, 328, 329, 336, 331, + 332, 332, 333, 336, 335, 0, 1, 2, 2, 2, + 2, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 311, 0, 315, + 0, 322, 0, 319, 323, 0, 334, 0, 2, 2, + 334, 330, 0, 327, 331, 0, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 334, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 125, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 134, 335, 335, 335, 335, 335, 335, + 335, 334, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 109, 335, 335, 335, 335, 335, 335, 8, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 126, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 139, 335, + 334, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 302, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 334, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 64, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 238, + 335, 14, 15, 335, 19, 18, 335, 335, 222, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 132, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 220, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 3, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 334, 335, 335, 335, + 335, 335, 335, 335, 296, 335, 335, 295, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 318, 335, 335, 335, 335, + 335, 335, 335, 335, 63, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 67, 335, 269, 335, 335, 335, 335, 335, 335, + 335, 335, 303, 304, 335, 335, 335, 335, 335, 68, + + 335, 335, 133, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 129, 335, 335, + 335, 335, 335, 335, 335, 335, 209, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 21, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 158, 335, 335, + 334, 318, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 107, 335, 335, 335, 335, 335, 335, + 335, 277, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 181, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 157, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 106, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 32, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 33, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 65, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 131, 334, 335, 335, + 335, 335, 335, 124, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 66, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 242, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 182, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 54, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 260, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 58, 335, 59, 335, 335, 335, + 335, 335, 110, 335, 111, 335, 335, 335, 335, 108, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 7, + 335, 334, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 231, 335, 335, 335, 335, 160, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 243, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 45, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 55, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 201, 335, 200, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 16, 17, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 69, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 208, 335, 335, 335, 335, 335, 335, 113, 335, 112, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 192, 335, 335, 335, 335, 335, 335, 335, + 335, 140, 334, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 101, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 89, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 221, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 94, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 62, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 195, + 196, 335, 335, 335, 271, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 6, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 275, + 335, 335, 335, 335, 335, 335, 297, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 42, 335, 335, + 335, 335, 44, 335, 335, 335, 90, 335, 335, 335, + 335, 335, 52, 335, 335, 335, 335, 335, 335, 335, + 334, 335, 188, 335, 335, 335, 135, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 213, 335, 189, + + 335, 335, 335, 228, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 53, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 137, 118, 335, 119, 335, + 335, 335, 117, 335, 335, 335, 335, 335, 335, 335, + 335, 155, 335, 335, 50, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 259, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 190, 335, 335, 335, 335, 335, 193, 335, 199, + 335, 335, 335, 335, 335, 227, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 105, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 130, + 335, 335, 335, 335, 335, 335, 60, 335, 335, 335, + 26, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 20, 335, 335, 335, 335, 335, 335, 27, 36, 335, + 165, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 334, 335, 335, 335, 335, 335, + 335, 77, 79, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 279, 335, 335, 335, + + 335, 239, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 120, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 154, 335, 46, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 290, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 159, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 219, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 300, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 176, 335, 335, 335, 335, 335, 335, + 335, 335, 114, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 171, 335, 183, 335, 335, 335, 335, 334, + 335, 143, 335, 335, 335, 335, 335, 100, 335, 335, + 335, 335, 211, 335, 335, 335, 335, 335, 335, 229, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 251, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 136, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 175, 335, 335, 335, 335, 335, 335, 80, + 335, 81, 335, 335, 335, 335, 335, 61, 293, 335, + 335, 335, 335, 335, 88, 184, 335, 202, 335, 232, + 335, 335, 194, 272, 335, 335, 335, 335, 335, 73, + 335, 186, 335, 335, 335, 335, 335, 9, 335, 335, + 335, 104, 335, 335, 335, 335, 264, 335, 335, 335, + 335, 210, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 334, 335, 335, + 335, 335, 174, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 161, 335, 278, 335, 335, 335, 335, + 335, 250, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 223, 335, 335, 335, 335, 335, 270, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 294, 335, 185, 335, 335, 335, 335, 335, 335, 335, + + 72, 74, 335, 335, 335, 335, 335, 335, 335, 103, + 335, 335, 335, 335, 262, 335, 335, 335, 335, 274, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 215, 34, 28, 30, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 35, 335, 29, 31, 335, 335, + 335, 335, 335, 335, 335, 335, 99, 335, 335, 335, + 335, 335, 335, 334, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 217, 214, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 71, 335, 335, 335, 138, + + 335, 121, 335, 335, 335, 335, 335, 335, 335, 335, + 156, 47, 335, 335, 335, 326, 13, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 288, 335, 291, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 12, 335, 335, 22, 335, 335, 335, 268, 335, 335, + 335, 335, 276, 335, 335, 335, 75, 335, 225, 335, + 335, 335, 335, 216, 335, 335, 70, 335, 335, 335, + 335, 23, 335, 43, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 170, 169, 326, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 218, 212, + + 335, 230, 335, 335, 280, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 82, 335, 335, + 335, 335, 263, 335, 335, 335, 335, 198, 335, 335, + 335, 335, 224, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 298, 299, 167, 335, 335, 76, 335, 335, + 335, 335, 177, 335, 335, 115, 116, 335, 335, 335, + 335, 162, 335, 164, 335, 203, 335, 335, 335, 335, + 168, 335, 335, 233, 335, 335, 335, 335, 335, 335, + + 335, 145, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 241, 335, 335, 335, 335, 335, + 335, 335, 307, 335, 24, 335, 273, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 86, 204, 335, 335, 261, 335, 292, 335, 197, + 335, 335, 335, 335, 56, 335, 335, 335, 335, 4, + 335, 335, 335, 335, 128, 144, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 236, 37, 38, 335, 335, 335, + 335, 335, 335, 335, 281, 335, 335, 335, 335, 335, + + 335, 335, 249, 335, 335, 335, 335, 335, 335, 335, + 335, 207, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 85, 335, 57, 267, 335, 237, + 335, 335, 335, 335, 11, 335, 335, 335, 335, 335, + 335, 127, 335, 335, 335, 335, 205, 91, 335, 40, + 335, 335, 335, 335, 335, 335, 335, 335, 173, 335, + 335, 335, 335, 335, 147, 335, 335, 335, 335, 240, + 335, 335, 335, 335, 335, 248, 335, 335, 335, 335, + 141, 335, 335, 335, 122, 123, 335, 335, 335, 93, + 97, 92, 335, 335, 335, 335, 83, 335, 335, 335, + + 335, 335, 10, 335, 335, 335, 265, 301, 335, 335, + 335, 335, 306, 39, 335, 335, 335, 335, 335, 172, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 98, 96, 335, 51, 335, 335, 84, + 289, 335, 335, 335, 335, 335, 335, 335, 191, 335, + 335, 335, 335, 335, 206, 335, 335, 335, 335, 335, + 335, 335, 335, 163, 78, 335, 335, 335, 335, 335, + 282, 335, 335, 335, 335, 335, 335, 335, 245, 335, + 335, 244, 142, 335, 335, 95, 48, 335, 148, 149, + + 152, 153, 150, 151, 87, 335, 266, 335, 335, 335, + 335, 166, 335, 335, 335, 335, 335, 235, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 179, 178, 41, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 102, 335, 234, 335, + 258, 286, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 308, 335, 49, 5, 335, 335, 226, + 335, 335, 287, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 246, 25, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 247, 335, 335, 335, + 146, 335, 335, 335, 335, 335, 335, 335, 335, 180, + 335, 187, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 283, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 305, + 335, 335, 254, 335, 335, 335, 335, 335, 284, 335, + 335, 335, 335, 335, 335, 285, 335, 335, 335, 252, + 335, 255, 256, 335, 335, 335, 335, 335, 253, 257, + 0 + } ; static const YY_CHAR yy_ec[256] = @@ -767,17 +770,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[3299] = +static const flex_int16_t yy_base[3310] = { 0, 0, 0, 38, 41, 44, 46, 59, 65, 71, 77, - 90, 112, 96, 118, 124, 136, 3790, 3594, 81, 6407, - 6407, 6407, 129, 52, 130, 63, 131, 152, 70, 140, + 90, 112, 96, 118, 124, 136, 3493, 3402, 81, 6426, + 6426, 6426, 129, 52, 130, 63, 131, 152, 70, 140, 149, 156, 57, 88, 76, 173, 175, 95, 184, 145, - 185, 205, 194, 204, 178, 123, 2749, 6407, 6407, 6407, - 107, 2656, 6407, 6407, 6407, 154, 2610, 2162, 6407, 6407, - 6407, 226, 2040, 6407, 6407, 6407, 163, 1972, 6407, 238, - 6407, 242, 148, 1845, 1693, 6407, 6407, 6407, 246, 1651, - 6407, 6407, 6407, 250, 1521, 254, 219, 0, 258, 0, + 185, 205, 194, 204, 178, 123, 3176, 6426, 6426, 6426, + 107, 2960, 6426, 6426, 6426, 154, 2373, 2342, 6426, 6426, + 6426, 226, 2208, 6426, 6426, 6426, 163, 2071, 6426, 238, + 6426, 242, 148, 1858, 1710, 6426, 6426, 6426, 246, 1553, + 6426, 6426, 6426, 250, 1440, 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, @@ -785,8 +788,8 @@ static const flex_int16_t yy_base[3299] = 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, 1437, 411, 1203, - 415, 1088, 422, 1027, 689, 426, 406, 430, 434, 0, + 384, 385, 387, 388, 391, 399, 389, 1400, 411, 1086, + 415, 984, 422, 871, 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, 456, 467, 471, 472, 469, 476, 474, 460, 482, 488, @@ -807,701 +810,703 @@ static const flex_int16_t yy_base[3299] = 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, 6407, 817, 820, 833, 826, 834, 835, 836, - 841, 842, 823, 849, 847, 848, 852, 874, 856, 858, - 854, 863, 866, 6407, 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, - - 859, 935, 944, 942, 943, 946, 950, 952, 953, 955, - 956, 769, 958, 962, 964, 973, 957, 965, 963, 975, - 977, 981, 982, 992, 985, 984, 998, 988, 1010, 1005, - 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, - 6407, 1068, 1070, 1072, 1073, 1074, 1075, 6407, 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, 6407, 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, 6407, 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, 1348, 1349, 1355, 1345, 6407, 1363, 1358, - - 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, - - 1566, 1572, 1567, 1577, 1578, 1580, 1579, 1583, 1587, 1585, - 1590, 1589, 6407, 1591, 1603, 1592, 1601, 1599, 1602, 1604, - 1613, 1606, 1608, 1616, 1617, 1609, 1643, 6407, 1618, 6407, - 6407, 315, 6407, 6407, 1619, 1620, 6407, 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, 6407, 1749, - 1758, 1759, 1760, 1767, 1763, 1762, 1764, 1770, 1774, 1771, - - 1775, 1776, 1777, 1778, 1783, 1780, 1786, 1788, 1791, 1790, - 6407, 1792, 1795, 1796, 1798, 1799, 1802, 1806, 1800, 1807, - 1810, 1737, 1818, 1815, 1813, 1821, 1822, 1823, 1824, 6407, - 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, 6407, 1949, 1954, 6407, 1956, 1955, 1953, 1976, 1957, - - 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, 6407, 2091, 2089, 2084, 2094, 2088, 2104, 2095, - 2096, 6407, 2097, 2105, 2107, 2116, 2108, 2109, 2113, 2111, - 2112, 2119, 2120, 2121, 2124, 2129, 2125, 2140, 6407, 2122, - 6407, 2127, 2136, 2143, 2137, 2145, 2144, 2147, 2148, 6407, - 6407, 2149, 2146, 2157, 2166, 2161, 6407, 2164, 2171, 6407, - - 2168, 2173, 2167, 2175, 2177, 2178, 2179, 2182, 2189, 2184, - 2191, 2186, 2194, 2188, 6407, 2187, 2198, 2200, 2203, 2206, - 2207, 2209, 2211, 6407, 2210, 2213, 2215, 2224, 2226, 2227, - 2217, 2228, 2232, 2220, 2230, 2234, 2237, 2239, 2247, 2248, - 2245, 2246, 2253, 2261, 6407, 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, 6407, 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, 6407, - - 2355, 2357, 2359, 2363, 2362, 2365, 2367, 6407, 2369, 2374, - 2379, 2388, 2382, 2366, 2390, 2376, 2391, 2392, 2394, 2396, - 2398, 2397, 2400, 2405, 2403, 6407, 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, 6407, 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, 6407, 2563, - - 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, 6407, 2620, 2624, 2618, - 2625, 2627, 2628, 2632, 2635, 2633, 2639, 2640, 2642, 2643, - 2644, 2645, 2646, 2649, 2650, 2653, 6407, 2654, 2655, 2659, - 2662, 2667, 2666, 2668, 2675, 2677, 2679, 2669, 2682, 2683, - 2681, 6407, 2691, 2692, 2693, 2695, 2696, 2697, 2699, 2701, - 2702, 6407, 2703, 2704, 2706, 2713, 2714, 2709, 6407, 2717, - 2712, 2719, 2720, 2721, 2723, 2725, 2727, 2730, 2731, 2734, - 2736, 2745, 2735, 2742, 6407, 2738, 2754, 2746, 2751, 2755, - - 2759, 2761, 2762, 2766, 2769, 2765, 2768, 6407, 2781, 2779, - 2784, 2791, 2770, 2772, 2786, 2787, 2788, 2794, 2796, 2797, - 2799, 6407, 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, 6407, - 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, - - 2957, 2958, 2972, 2974, 2975, 2977, 2948, 2950, 2969, 2983, - 6407, 2976, 2979, 2978, 2967, 2988, 2991, 2992, 3001, 2996, - 2986, 2998, 3005, 3006, 3000, 3007, 3008, 3018, 3014, 6407, - 3015, 6407, 3016, 3017, 3023, 3027, 3019, 6407, 3030, 6407, - 3031, 3036, 3026, 3032, 6407, 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, 6407, 3094, 3091, 3096, 3098, 3100, 3101, - 3102, 3103, 3106, 3109, 3110, 3117, 3113, 3118, 3121, 3124, - 3128, 3131, 3132, 3140, 6407, 3135, 3137, 3138, 3139, 6407, - - 3142, 3143, 3150, 3153, 3144, 3146, 3148, 3156, 3160, 3155, - 3162, 3165, 3166, 3176, 3175, 3168, 6407, 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, 6407, 3246, 3251, 3253, 3256, 3255, 3257, - 3259, 3260, 3261, 6407, 3268, 3265, 3271, 3269, 3277, 3272, - 3270, 3280, 3283, 3286, 3288, 3289, 3290, 3291, 6407, 3293, - 6407, 3292, 3294, 3306, 3310, 3300, 3298, 3311, 3319, 3315, - 3320, 3321, 3322, 3323, 3324, 3325, 3329, 3332, 3336, 3337, - - 3347, 3330, 3338, 3335, 3343, 3333, 3352, 6407, 6407, 3354, - 3355, 3358, 3356, 3360, 3361, 3362, 3371, 3365, 3367, 3368, - 3374, 3382, 6407, 3384, 3375, 3378, 3386, 3393, 3388, 3395, - 3402, 3399, 3403, 3401, 6407, 3405, 3408, 3415, 3410, 3411, - 3418, 6407, 3413, 6407, 3416, 3417, 3419, 3424, 3426, 3428, - 3429, 3430, 3432, 3440, 3448, 3437, 3446, 3438, 3447, 3449, - 3451, 3460, 3452, 3455, 3457, 6407, 3462, 3456, 3459, 3467, - 3473, 3477, 3470, 3466, 6407, 3469, 3480, 3484, 3485, 3486, - 3487, 3491, 3488, 3492, 3493, 3496, 6407, 3494, 3497, 3507, - 3500, 3503, 3509, 3511, 3516, 3523, 6407, 3520, 3518, 3530, - - 3529, 3514, 3531, 3532, 3534, 3536, 3537, 3538, 3539, 3540, - 3541, 3547, 3542, 3543, 3551, 3546, 3562, 3563, 3549, 3553, - 3571, 3561, 6407, 3569, 3570, 3575, 3572, 3576, 3579, 3580, - 3584, 3586, 3577, 3599, 3600, 3587, 3589, 3603, 3605, 3612, - 3604, 6407, 3617, 3596, 3619, 3615, 3618, 3623, 3616, 3620, - 3627, 3624, 3628, 3629, 3630, 3632, 3641, 3633, 3638, 3642, - 3643, 3650, 3648, 6407, 3657, 3653, 3654, 3659, 3655, 3662, - 3670, 3665, 3671, 3672, 3676, 3673, 3678, 3680, 3681, 3682, - 3685, 3686, 6407, 6407, 3688, 3689, 3692, 6407, 3695, 3690, - 3702, 3698, 3694, 3705, 3709, 3708, 3707, 3712, 3710, 3718, - - 6407, 3719, 3727, 3722, 3723, 3731, 3732, 3729, 3735, 3737, - 3738, 3741, 3739, 3744, 3743, 3745, 3748, 3756, 3759, 3752, - 3754, 3762, 6407, 3755, 3757, 3763, 3765, 3767, 3770, 6407, - 3773, 3774, 3777, 3780, 3788, 3790, 3784, 3797, 3781, 3791, - 3793, 3798, 3799, 3801, 3810, 3807, 3806, 3809, 3813, 3816, - 6407, 3815, 3817, 3818, 3826, 6407, 3830, 3837, 3840, 3841, - 3823, 3827, 3839, 3848, 6407, 3843, 3846, 3844, 3845, 3853, - 3852, 3860, 3857, 3859, 6407, 3861, 3858, 3863, 6407, 3864, - 3865, 3876, 3879, 3869, 3886, 3881, 3883, 3884, 3882, 6407, - 3892, 6407, 3893, 3894, 3898, 6407, 3895, 3900, 3903, 3902, - - 3904, 3905, 3909, 3915, 3917, 3911, 3919, 3920, 3921, 3922, - 3924, 3933, 3923, 3925, 3930, 3932, 6407, 3935, 3937, 3942, - 3943, 3949, 3945, 3952, 3939, 3953, 3872, 6407, 6407, 3957, - 6407, 3959, 3961, 3963, 6407, 3965, 3967, 3972, 3968, 3969, - 3971, 3975, 3976, 6407, 3983, 3986, 6407, 3978, 3988, 3995, - 3990, 3991, 3992, 3998, 3993, 3996, 4003, 4004, 4005, 4006, - 4000, 4007, 4008, 6407, 4009, 4010, 4011, 4025, 4019, 4021, - 4028, 4030, 4032, 6407, 4034, 4036, 4040, 4042, 4043, 6407, - 4044, 6407, 4045, 4046, 4048, 4049, 4054, 6407, 4057, 4056, - 4062, 4064, 4066, 4065, 4069, 4072, 4068, 4075, 4082, 4078, - - 4079, 4080, 6407, 4081, 4084, 4094, 4096, 4087, 4085, 4107, - 4099, 4089, 4103, 4106, 4109, 4111, 4112, 4115, 4110, 4120, - 4117, 6407, 4118, 4124, 4128, 4137, 4129, 4132, 6407, 4133, - 4134, 4141, 6407, 4140, 4142, 4143, 4148, 4150, 4151, 4154, - 4157, 4158, 6407, 4155, 4160, 4156, 4159, 4161, 4165, 6407, - 6407, 4175, 6407, 4177, 4163, 4178, 4179, 4180, 4182, 4185, - 4187, 4189, 4190, 4195, 4198, 4200, 4192, 4207, 4208, 4210, - 4212, 4211, 4216, 6407, 6407, 4218, 4220, 4222, 4224, 4225, - 4227, 4229, 4234, 4232, 4240, 4243, 4233, 4250, 6407, 4245, - 4248, 4251, 4252, 6407, 4253, 4254, 4256, 4258, 4257, 4263, - - 4260, 4264, 4261, 4265, 4270, 4267, 4274, 4275, 4277, 4283, - 4282, 4285, 4286, 4288, 4292, 4296, 6407, 4297, 4293, 4298, - 4299, 4300, 4302, 4306, 4307, 4308, 6407, 4311, 6407, 4315, - 4309, 4314, 4316, 4331, 4332, 4333, 4325, 4334, 4339, 4340, - 4343, 4344, 4350, 4345, 4351, 4353, 4347, 4358, 4362, 4363, - 6407, 4365, 4335, 4366, 4367, 4372, 4374, 4369, 4376, 4377, - 4381, 4378, 4382, 4384, 4390, 4385, 4391, 4392, 4394, 6407, - 4396, 4398, 4402, 4404, 4405, 4408, 4407, 4411, 4416, 4409, - 4417, 4418, 4420, 6407, 4422, 4424, 4425, 4426, 4434, 4429, - 4431, 4435, 4438, 6407, 4444, 4439, 4445, 4441, 4446, 4449, - - 4451, 4456, 4454, 4458, 4462, 6407, 4461, 4466, 4469, 4468, - 4470, 4475, 4476, 4472, 6407, 4479, 4485, 4486, 4494, 4478, - 4495, 4487, 4497, 4491, 4500, 4503, 4505, 4508, 4509, 4510, - 4507, 4526, 4528, 4511, 6407, 4504, 6407, 4523, 4529, 4531, - 4533, 4535, 4527, 6407, 4536, 4537, 4539, 4541, 4545, 6407, - 4543, 4544, 4546, 4550, 6407, 4548, 4558, 4557, 4559, 4565, - 4566, 6407, 4569, 4570, 4574, 4578, 4581, 4576, 4583, 4580, - 4586, 4584, 4588, 4589, 4590, 4598, 4593, 4595, 6407, 4597, - 4603, 4605, 4609, 4616, 4611, 4599, 4613, 4622, 4612, 6407, - 4618, 4624, 4626, 4627, 4628, 4629, 4630, 4637, 4633, 4634, - - 4636, 4638, 4640, 4642, 6407, 4647, 4648, 4651, 4660, 4650, - 4665, 6407, 4653, 6407, 4661, 4668, 4670, 4666, 4671, 6407, - 6407, 4674, 4682, 4677, 4680, 4681, 6407, 6407, 4684, 6407, - 4685, 6407, 4686, 4688, 6407, 6407, 4691, 4687, 4693, 4694, - 4702, 6407, 4706, 6407, 4714, 4709, 4695, 4697, 4707, 6407, - 4715, 4716, 4718, 6407, 4720, 4727, 4722, 4723, 6407, 4725, - 4730, 4726, 4731, 6407, 4735, 4742, 4732, 4739, 4743, 4746, - 4748, 4744, 4747, 4753, 4754, 4755, 4762, 4764, 4769, 4771, - 4773, 4766, 4756, 4776, 4779, 4782, 4777, 4784, 4785, 4786, - 4788, 4790, 4792, 4794, 4795, 4798, 4797, 4799, 4800, 4803, - - 4801, 4807, 4813, 4814, 4815, 4816, 4817, 4818, 4819, 4822, - 4824, 4826, 4828, 4829, 6407, 4831, 4832, 4837, 4845, 4838, - 4846, 4850, 4840, 4857, 4858, 6407, 4861, 6407, 4863, 4847, - 4866, 4853, 4867, 6407, 4868, 4869, 4870, 4871, 4874, 4873, - 4876, 4875, 4879, 4880, 4884, 6407, 4890, 4881, 6407, 4886, - 4894, 4900, 6407, 4901, 4905, 4902, 4906, 4907, 4911, 4909, - 4912, 4913, 4915, 4917, 4919, 4921, 4922, 4925, 4933, 4936, - 4943, 4928, 4923, 4939, 4942, 4944, 4945, 4947, 4948, 4950, - 4955, 4957, 4961, 6407, 4951, 6407, 4962, 4963, 4964, 4966, - 4968, 4969, 4972, 6407, 6407, 4974, 4975, 4980, 4977, 4981, - - 4984, 4993, 6407, 4985, 4998, 4988, 4990, 6407, 4995, 4996, - 5001, 5005, 6407, 5006, 5008, 5007, 5013, 5009, 5015, 5019, - 5020, 5022, 5023, 5026, 6407, 6407, 6407, 6407, 5030, 5027, - 5033, 5034, 5037, 5036, 5039, 5041, 5042, 6407, 5044, 6407, - 6407, 5046, 5053, 5052, 5054, 5055, 5056, 5060, 5062, 6407, - 5061, 5067, 5068, 5064, 5078, 5081, 5083, 5084, 5085, 5071, - 5074, 5093, 5094, 5095, 5086, 5097, 5104, 5106, 6407, 6407, - 5098, 5108, 5109, 5116, 5113, 5114, 5117, 5126, 5121, 5122, - 5123, 5124, 5128, 5129, 5140, 5141, 5133, 5088, 6407, 5130, - 5137, 5144, 6407, 5143, 6407, 5148, 5149, 5145, 5151, 5152, - - 5156, 5157, 5159, 6407, 6407, 5160, 5172, 5167, 6407, 6407, - 5162, 5169, 5171, 5175, 5170, 5176, 5179, 5182, 5184, 5180, - 6407, 5185, 6407, 5186, 5187, 5193, 5194, 5202, 5204, 5207, - 5209, 5203, 5205, 6407, 5212, 5213, 6407, 5214, 5215, 5216, - 6407, 5222, 5217, 5225, 5228, 6407, 5233, 5230, 5236, 6407, - 5238, 6407, 5220, 5239, 5242, 5249, 6407, 5245, 5246, 6407, - 5251, 5253, 5255, 5256, 6407, 5257, 6407, 5259, 5261, 5262, - 5267, 5268, 5271, 5264, 5272, 5273, 5280, 5282, 5284, 6407, - 6407, 135, 5292, 5276, 5278, 5285, 5289, 5300, 5293, 5297, - 5303, 6407, 6407, 5304, 6407, 5306, 5307, 6407, 5296, 5308, - - 5312, 5315, 5317, 5316, 5319, 5323, 5325, 5326, 5327, 5328, - 5329, 5335, 5341, 5351, 5336, 5347, 5352, 5356, 5358, 5360, - 5349, 5362, 5354, 5363, 5364, 5366, 5368, 5370, 5371, 5372, - 6407, 5376, 5378, 5380, 5381, 6407, 5387, 5388, 5394, 5396, - 6407, 5398, 5400, 5402, 5403, 6407, 5390, 5405, 5406, 5407, - 5413, 5420, 5417, 5415, 5418, 6407, 6407, 6407, 5421, 5432, - 6407, 5434, 5423, 5425, 5427, 6407, 5429, 5435, 6407, 6407, - 5436, 5439, 5440, 5449, 6407, 5441, 6407, 5442, 6407, 5446, - 5452, 5454, 5456, 6407, 5459, 5466, 6407, 5469, 5472, 5474, - 5475, 5458, 5462, 5477, 6407, 5485, 5483, 5486, 5490, 5476, - - 5480, 5487, 5493, 5495, 5502, 5497, 5500, 6407, 5501, 5504, - 5506, 5514, 5507, 5503, 5510, 5512, 6407, 5517, 6407, 5520, - 5521, 5519, 5527, 5524, 5528, 5529, 5530, 5538, 5541, 5531, - 5542, 5544, 5545, 6407, 6407, 5552, 5554, 6407, 5546, 6407, - 5556, 6407, 5557, 5558, 5559, 5560, 6407, 5562, 5563, 5548, - 5566, 6407, 5569, 5572, 5576, 5578, 6407, 6407, 5579, 5587, - 5584, 5580, 5591, 5593, 5588, 5597, 5320, 5594, 5598, 5606, - 5582, 5605, 5604, 5610, 5611, 5612, 6407, 6407, 6407, 5607, - 5615, 5626, 5622, 5625, 5629, 5627, 6407, 5631, 5633, 5634, - 5630, 5643, 5638, 5641, 6407, 5642, 5644, 5646, 5647, 5651, - - 5648, 5653, 5652, 6407, 5659, 5664, 5665, 5666, 5668, 5675, - 5677, 5679, 5669, 5672, 5687, 5683, 6407, 5685, 6407, 6407, - 5686, 6407, 5689, 5690, 5691, 5692, 6407, 5695, 5696, 5697, - 5699, 5701, 5703, 6407, 5715, 5704, 5706, 5714, 6407, 6407, - 5721, 6407, 5723, 5726, 5716, 5733, 5728, 5729, 5735, 5736, - 6407, 5718, 5732, 5739, 5742, 5743, 6407, 5745, 5746, 5747, - 5748, 6407, 5751, 5750, 5755, 5756, 5757, 6407, 5758, 5759, - 5770, 5771, 6407, 5760, 5778, 5761, 6407, 6407, 5782, 5785, - 5786, 6407, 6407, 6407, 5788, 5789, 5791, 5793, 6407, 5796, - 5800, 5804, 5808, 5799, 6407, 5812, 5807, 5809, 6407, 6407, - - 5813, 5814, 5815, 5817, 6407, 6407, 5818, 5819, 5824, 5821, - 5822, 6407, 5827, 5829, 5831, 5836, 5840, 5841, 5842, 5846, - 5850, 5854, 5851, 5852, 5853, 5857, 5859, 5860, 5866, 5869, - 5871, 5873, 5881, 5883, 5870, 6407, 6407, 5885, 6407, 5887, - 5888, 6407, 6407, 5890, 5892, 5894, 5896, 5899, 5901, 5903, - 6407, 5904, 5906, 5907, 5908, 5909, 6407, 5911, 5915, 5910, - 5918, 5912, 5921, 5917, 5927, 6407, 6407, 5919, 5933, 5923, - 5934, 5928, 6407, 5938, 5945, 5940, 5942, 5943, 5948, 5944, - 6407, 5950, 5952, 6407, 6407, 6407, 5953, 6407, 6407, 5951, - 6407, 6407, 6407, 6407, 6407, 6407, 6407, 5955, 6407, 5957, - - 5964, 5972, 5974, 6407, 5959, 5967, 5965, 5975, 5978, 6407, - 5979, 5980, 5981, 5382, 5983, 5984, 5987, 5988, 5990, 5989, - 5993, 5994, 5997, 5999, 5996, 6010, 6001, 6014, 6407, 6407, - 6407, 6012, 6003, 6025, 6004, 6028, 6029, 6032, 6034, 6016, - 6020, 6036, 6037, 6038, 6022, 6041, 6050, 6045, 6046, 6048, - 6049, 6052, 6055, 6057, 6060, 6062, 6407, 6063, 6407, 6064, - 6407, 6407, 6066, 6067, 6073, 6070, 6077, 6080, 6076, 6075, - 6083, 6086, 6085, 6093, 6407, 6407, 6087, 6094, 6407, 6095, - 6096, 6407, 6097, 6098, 6099, 6106, 6107, 6104, 6105, 6111, - 6113, 6407, 6407, 6101, 6115, 6122, 6125, 6126, 6134, 6129, - - 6127, 6135, 6137, 6136, 6144, 6407, 6146, 6143, 6150, 6407, - 6147, 6139, 5861, 6152, 6153, 6160, 6156, 6157, 6407, 6161, - 6407, 6164, 6165, 6168, 6159, 6166, 6167, 6181, 6179, 6176, - 6407, 6169, 6186, 6183, 6190, 6192, 6194, 6196, 6188, 6198, - 6200, 6204, 6209, 6210, 6211, 6201, 6214, 6212, 6407, 6216, - 6213, 6407, 6221, 6222, 6223, 6224, 6228, 6407, 6234, 6225, - 6230, 6235, 6238, 6239, 6407, 6241, 6248, 6245, 6407, 6250, - 6407, 6407, 6251, 6253, 6254, 6258, 6260, 6407, 6407, 6407, - 6287, 6294, 6301, 6308, 6315, 6322, 6329, 88, 6336, 6343, - 6350, 6357, 6364, 6371, 6378, 6385, 6392, 6399 - + 822, 818, 6426, 817, 820, 833, 826, 834, 835, 836, + 841, 842, 823, 849, 847, 848, 852, 874, 856, 863, + 854, 864, 858, 6426, 867, 868, 898, 881, 871, 889, + 885, 878, 887, 892, 894, 902, 911, 904, 908, 909, + 922, 915, 919, 924, 918, 927, 925, 935, 936, 931, + + 934, 941, 948, 943, 945, 947, 956, 949, 950, 957, + 958, 769, 960, 967, 970, 964, 959, 975, 976, 977, + 979, 982, 983, 987, 985, 998, 1005, 999, 1012, 986, + 1010, 1011, 1014, 1013, 1019, 1020, 1022, 1024, 1025, 1027, + 1028, 1032, 1033, 1031, 1034, 1036, 1038, 1044, 1042, 1047, + 1048, 1049, 1056, 1058, 1051, 1064, 1052, 1050, 1068, 1060, + 6426, 1072, 1070, 1075, 1076, 1074, 1077, 6426, 1078, 1079, + 1080, 1081, 1090, 1092, 1093, 1099, 1088, 1103, 1105, 1106, + 1107, 1115, 1110, 1113, 1118, 1117, 1119, 1121, 1123, 1125, + 1127, 1126, 1128, 1134, 1135, 1138, 1155, 6426, 1137, 1145, + + 1142, 1139, 1148, 1149, 1167, 1147, 1165, 1166, 1159, 1179, + 1177, 1178, 1180, 1186, 1187, 1188, 1190, 1195, 1191, 1140, + 1193, 1197, 1198, 1199, 1201, 1200, 1202, 1205, 6426, 1203, + 1214, 1227, 1213, 1222, 1223, 1224, 1226, 1228, 1229, 1230, + 1232, 1231, 1236, 1240, 1251, 1235, 1254, 1249, 1250, 1252, + 1256, 1257, 1260, 1258, 1259, 1270, 1265, 1273, 1280, 1282, + 1284, 1286, 1287, 1294, 1268, 1290, 1292, 1291, 1297, 1298, + 1300, 1299, 1301, 1307, 1305, 1314, 1311, 1310, 1312, 1313, + 1318, 1320, 1321, 1325, 1322, 1323, 1337, 1329, 1332, 1333, + 1339, 1347, 1340, 1349, 1350, 1351, 1352, 1353, 6426, 1360, + + 1361, 1359, 1363, 1364, 1371, 1372, 1375, 1376, 1373, 1379, + 1378, 1381, 1385, 1386, 1387, 1382, 1388, 1390, 1399, 1403, + 1404, 1413, 1405, 1412, 1396, 1415, 1422, 1418, 1425, 1421, + 1420, 1426, 1433, 1428, 1430, 1434, 1442, 1437, 1435, 1446, + 1438, 1447, 1450, 1449, 1461, 1459, 1460, 1469, 1472, 1462, + 1464, 1470, 1474, 1475, 1477, 1478, 1479, 1480, 1488, 1481, + 1483, 1484, 1486, 1490, 1491, 1494, 1497, 1509, 1502, 1505, + 1504, 1507, 1511, 1513, 1514, 1518, 1519, 1520, 1522, 1521, + 1524, 1528, 1529, 1533, 1534, 1540, 1541, 1542, 1544, 1547, + 1548, 1551, 1550, 1559, 1561, 1549, 1562, 1565, 1568, 1570, + + 1571, 1572, 1573, 1580, 1575, 1578, 1581, 1585, 1586, 1591, + 1592, 1595, 1597, 1600, 6426, 1598, 1610, 1588, 1611, 1606, + 1603, 1605, 1619, 1612, 1614, 1616, 1622, 1624, 1648, 6426, + 1625, 6426, 6426, 315, 6426, 6426, 1626, 1627, 6426, 1630, + 1629, 1639, 1637, 1631, 1642, 1645, 1646, 1649, 1651, 1658, + 1672, 1654, 1661, 1662, 1665, 1675, 1677, 1678, 1666, 1686, + 1687, 1689, 1694, 1695, 1703, 1696, 1700, 1706, 1708, 1714, + 1710, 1719, 1720, 1709, 1716, 1723, 1724, 1726, 1725, 1728, + 1731, 1734, 1736, 1732, 1730, 1738, 1747, 1749, 1740, 1757, + 6426, 1753, 1761, 1765, 1762, 1769, 1768, 1764, 1766, 1773, + + 1776, 1777, 1778, 1779, 1780, 1781, 1783, 1743, 1786, 1789, + 1797, 1790, 6426, 1792, 1793, 1795, 1798, 1799, 1804, 1805, + 1806, 1811, 1812, 1813, 1823, 1814, 1816, 1818, 1824, 1825, + 1827, 6426, 1832, 1829, 1835, 1839, 1840, 1842, 1843, 1845, + 1846, 1841, 1847, 1848, 1851, 1853, 1860, 1855, 1859, 1857, + 1865, 1868, 1873, 1875, 1878, 1881, 1882, 1883, 1884, 1885, + 1886, 1888, 1889, 1896, 1899, 1897, 1900, 1898, 1895, 1910, + 1919, 1902, 1914, 1916, 1917, 1918, 1920, 1929, 1924, 1925, + 1931, 1932, 1930, 1935, 1937, 1940, 1947, 1938, 1948, 1956, + 1942, 1949, 1954, 1951, 6426, 1958, 1960, 6426, 1962, 1961, + + 1963, 1985, 1965, 1967, 1968, 1973, 1977, 1976, 1978, 1986, + 1987, 1989, 2005, 1998, 1995, 2008, 2010, 2011, 1979, 2013, + 2014, 2015, 2017, 2020, 2021, 2030, 2038, 2039, 2023, 2042, + 2040, 1997, 2041, 2043, 2062, 2044, 2045, 2051, 2046, 2047, + 2049, 2059, 2052, 2053, 2055, 2057, 2075, 2078, 2077, 2079, + 2064, 2084, 2086, 2087, 2090, 6426, 2098, 2093, 2094, 2095, + 2099, 2107, 2103, 2104, 6426, 2105, 2106, 2109, 2117, 2118, + 2116, 2119, 2120, 2122, 2121, 2126, 2128, 2130, 2142, 2129, + 2149, 6426, 2131, 6426, 2144, 2132, 2134, 2145, 2133, 2150, + 2155, 2156, 6426, 6426, 2157, 2154, 2166, 2170, 2168, 6426, + + 2169, 2177, 6426, 2174, 2179, 2172, 2173, 2180, 2183, 2184, + 2187, 2194, 2189, 2198, 2190, 2195, 2199, 6426, 2203, 2191, + 2210, 2211, 2204, 2214, 2217, 2218, 6426, 2221, 2207, 2225, + 2232, 2229, 2224, 2234, 2235, 2236, 2239, 2240, 2241, 2242, + 2243, 2250, 2253, 2246, 2249, 2255, 2264, 6426, 2248, 2262, + 2269, 2265, 2268, 2271, 2272, 2273, 2274, 2275, 2276, 2277, + 2284, 2283, 2285, 2286, 2296, 2298, 2287, 2294, 2304, 2295, + 2306, 2300, 2311, 2308, 2309, 2310, 2313, 6426, 2315, 2317, + 2319, 171, 2321, 2322, 2324, 2323, 2331, 2333, 2325, 2347, + 2348, 2327, 2344, 2350, 2346, 2353, 2354, 2355, 2356, 2357, + + 2358, 2359, 2361, 6426, 2363, 2364, 2366, 2370, 2369, 2372, + 2377, 6426, 2379, 2386, 2389, 2398, 2381, 2390, 2399, 2395, + 2400, 2401, 2403, 2405, 2407, 2406, 2409, 2415, 2412, 6426, + 2417, 2420, 2422, 2413, 2429, 2428, 2421, 2435, 2436, 2437, + 2440, 2438, 2439, 2442, 2441, 2443, 2444, 2449, 2448, 2445, + 2447, 2457, 2458, 2459, 2468, 2469, 2461, 2470, 2471, 6426, + 2481, 2472, 2476, 2474, 2477, 2479, 2484, 2492, 2499, 2483, + 2494, 2496, 2500, 2510, 2503, 2505, 2512, 2520, 2517, 2525, + 2513, 2526, 2527, 2535, 2524, 2537, 2539, 2528, 2540, 2541, + 2543, 2546, 2547, 2549, 2559, 2560, 2552, 2562, 2555, 2576, + + 2581, 2572, 6426, 2570, 2565, 2568, 2582, 2590, 2585, 2587, + 2588, 2592, 2595, 2596, 2597, 2598, 2605, 2600, 2602, 2603, + 2608, 2607, 2611, 2614, 2618, 2619, 2623, 2625, 2627, 2628, + 6426, 2631, 2633, 2629, 2635, 2637, 2639, 2642, 2645, 2647, + 2649, 2650, 2654, 2655, 2657, 2656, 2658, 2664, 2665, 2651, + 6426, 2674, 2666, 2678, 2668, 2679, 2672, 2685, 2686, 2687, + 2661, 2688, 2691, 2694, 2695, 2697, 6426, 2704, 2705, 2696, + 2712, 2707, 2703, 2708, 2714, 2711, 6426, 2715, 2717, 2718, + 2726, 2727, 2723, 6426, 2734, 2724, 2725, 2732, 2735, 2736, + 2733, 2739, 2742, 2743, 2746, 2748, 2755, 2749, 2756, 6426, + + 2757, 2766, 2759, 2758, 2763, 2769, 2770, 2773, 2774, 2775, + 2778, 2781, 6426, 2792, 2789, 2787, 2800, 2790, 2530, 2796, + 2797, 2801, 2803, 2804, 2805, 2807, 6426, 2808, 2811, 2812, + 2815, 2813, 2818, 2819, 2826, 2823, 2825, 2828, 2831, 2832, + 2833, 2834, 2841, 2840, 2837, 2849, 2850, 2853, 2854, 2856, + 2859, 2867, 2870, 2843, 2866, 2869, 2862, 2871, 2872, 2879, + 2880, 2887, 2882, 2884, 6426, 2889, 2886, 2891, 2893, 2894, + 2895, 2897, 2896, 2898, 2901, 2902, 2908, 2904, 2905, 2920, + 2923, 2907, 2915, 2925, 2926, 2928, 2929, 2930, 2931, 2932, + 2939, 2935, 2936, 2947, 2938, 2942, 2952, 2953, 2954, 2955, + + 2956, 2963, 2943, 2961, 2958, 2965, 2966, 2970, 2980, 2981, + 2967, 2982, 2983, 2984, 2985, 6426, 2988, 2989, 2990, 2993, + 2996, 2999, 3002, 3009, 3000, 3001, 3011, 3017, 3018, 3008, + 3019, 3010, 3026, 3024, 6426, 3025, 6426, 3027, 3029, 3031, + 3039, 3035, 6426, 3041, 6426, 3042, 3047, 3036, 3038, 6426, + 3050, 3044, 3049, 3056, 3051, 3059, 3060, 3062, 3061, 3068, + 3063, 3065, 3070, 3071, 3073, 3076, 3074, 3081, 3082, 3086, + 3090, 3091, 3078, 3102, 3084, 3094, 3100, 3092, 3107, 6426, + 3109, 3097, 3110, 3115, 3114, 3116, 3117, 3118, 3120, 3121, + 3123, 3127, 3122, 3132, 3124, 3136, 3135, 3145, 3146, 3153, + + 6426, 3148, 3150, 3151, 3152, 6426, 3154, 3155, 3156, 3160, + 3163, 3164, 3165, 3168, 3172, 3167, 3169, 3174, 3183, 3184, + 3187, 3188, 6426, 3190, 3193, 3175, 3202, 3196, 3203, 3210, + 3206, 3208, 3212, 3220, 3216, 3215, 3217, 3218, 3219, 3222, + 3229, 3230, 3226, 3233, 3232, 3236, 3243, 3240, 3234, 3238, + 3244, 3246, 3247, 3248, 3249, 3250, 3253, 3254, 3251, 6426, + 3259, 3265, 3263, 3272, 3268, 3269, 3273, 3278, 3274, 6426, + 3280, 3281, 3282, 3284, 3289, 3283, 3286, 3291, 3294, 3297, + 3299, 3302, 3304, 3303, 6426, 3305, 6426, 3307, 3308, 3318, + 3322, 3323, 3310, 3324, 3330, 3326, 3331, 3333, 3336, 3334, + + 3340, 3337, 3342, 3343, 3345, 3357, 3348, 3344, 3349, 3358, + 3359, 3363, 3360, 6426, 6426, 3365, 3366, 3367, 3369, 3371, + 3370, 3377, 3374, 3382, 3381, 3388, 3389, 3397, 6426, 3394, + 3395, 3393, 3398, 3406, 3401, 3405, 3417, 3413, 3420, 3416, + 6426, 3412, 3421, 3429, 3424, 3425, 3433, 6426, 3430, 6426, + 3426, 3431, 3436, 3439, 3440, 3441, 3442, 3443, 3447, 3455, + 3458, 3451, 3460, 3461, 3462, 3463, 3466, 3470, 3473, 3469, + 3471, 3472, 6426, 3475, 3476, 3484, 3489, 3492, 3493, 3477, + 3478, 6426, 3495, 3485, 3503, 3499, 3504, 3505, 3509, 3506, + 3510, 3511, 3513, 6426, 3512, 3514, 3521, 3526, 3519, 3522, + + 3530, 3532, 3540, 6426, 3536, 3533, 3549, 3545, 3546, 3548, + 3551, 3527, 3552, 3553, 3555, 3556, 3557, 3559, 3560, 3563, + 3564, 3566, 3565, 3577, 3576, 3579, 3584, 3586, 3570, 6426, + 3587, 3590, 3592, 3593, 3595, 3596, 3598, 3601, 3603, 3604, + 3615, 3616, 3605, 3607, 3619, 3621, 3629, 3627, 6426, 3637, + 3620, 3639, 3611, 3632, 3641, 3622, 3643, 3645, 3634, 3646, + 3647, 3650, 3653, 3660, 3656, 3657, 3655, 3659, 3671, 3661, + 6426, 3684, 3662, 3672, 3664, 3663, 3680, 3688, 3685, 3686, + 3689, 3691, 3692, 3696, 3693, 3698, 3699, 3702, 3703, 6426, + 6426, 3705, 3707, 3708, 6426, 3712, 3709, 3722, 3715, 3719, + + 3711, 3724, 3725, 3727, 3728, 3733, 3735, 6426, 3736, 3743, + 3738, 3739, 3748, 3750, 3755, 3747, 3756, 3749, 3745, 3760, + 3763, 3757, 3761, 3767, 3776, 3777, 3762, 3773, 3774, 6426, + 3779, 3780, 3781, 3784, 3785, 3790, 6426, 3789, 3791, 3792, + 3797, 3801, 3803, 3809, 3811, 3793, 3812, 3796, 3813, 3816, + 3817, 3827, 3819, 3823, 3830, 3831, 3835, 6426, 3824, 3838, + 3822, 3841, 6426, 3844, 3851, 3852, 6426, 3853, 3848, 3855, + 3856, 3863, 6426, 3858, 3861, 3859, 3862, 3872, 3864, 3873, + 3875, 3869, 6426, 3876, 3877, 3878, 6426, 3879, 3884, 3890, + 3892, 3893, 3900, 3895, 3897, 3898, 3899, 6426, 3905, 6426, + + 3903, 3907, 3911, 6426, 3909, 3914, 3915, 3917, 3918, 3923, + 3924, 3922, 3931, 3932, 3933, 3935, 3936, 3934, 3939, 3943, + 3940, 3941, 3945, 3946, 6426, 3947, 3949, 3956, 3951, 3961, + 3957, 3964, 3954, 3968, 3969, 6426, 6426, 3978, 6426, 3980, + 3970, 3972, 6426, 3974, 3979, 3987, 3984, 3990, 3992, 3996, + 3997, 6426, 3999, 4002, 6426, 3985, 4000, 4010, 4007, 4009, + 4012, 4015, 4011, 4013, 4017, 4018, 4021, 4023, 4019, 4022, + 4027, 6426, 4024, 4025, 4026, 4040, 4041, 4042, 4047, 4049, + 4043, 6426, 4051, 4053, 4052, 4060, 4057, 6426, 4058, 6426, + 4061, 4066, 4068, 4069, 4072, 6426, 4074, 4073, 4078, 4081, + + 4083, 4082, 4085, 4089, 4086, 4092, 4099, 4095, 4096, 4097, + 6426, 4098, 4101, 4103, 4110, 4106, 4108, 4119, 4118, 4114, + 4120, 4124, 4126, 4122, 4129, 4135, 4133, 4139, 4127, 6426, + 4137, 4141, 4131, 4154, 4147, 4150, 6426, 4151, 4155, 4159, + 6426, 4157, 4158, 4165, 4167, 4161, 4168, 4169, 4173, 4175, + 6426, 4171, 4172, 4176, 4177, 4188, 4180, 6426, 6426, 4191, + 6426, 4192, 4181, 4194, 4195, 4199, 4202, 4201, 4203, 4206, + 4207, 4214, 4215, 4208, 4216, 4223, 4225, 4233, 4228, 4229, + 4230, 6426, 6426, 4235, 4239, 4232, 4243, 4244, 4236, 4246, + 4253, 4251, 4257, 4260, 4261, 4255, 6426, 4263, 4252, 4269, + + 4262, 6426, 4268, 4270, 4271, 4274, 4276, 4277, 4280, 4278, + 4279, 4283, 4286, 4287, 4288, 4292, 4290, 4299, 4300, 4301, + 4302, 4306, 4304, 4309, 6426, 4310, 4311, 4313, 4314, 4315, + 4321, 4323, 4324, 4325, 6426, 4326, 6426, 4329, 4331, 4327, + 4347, 4335, 4338, 4348, 4350, 4352, 4354, 4355, 4358, 4359, + 4365, 4353, 4360, 4369, 4362, 4376, 4378, 4379, 6426, 4380, + 4372, 4381, 4382, 4387, 4389, 4383, 4391, 4393, 4396, 4397, + 4398, 4400, 4405, 4406, 4407, 4408, 4409, 6426, 4410, 4414, + 4417, 4419, 4421, 4423, 4424, 4425, 4431, 4432, 4433, 4434, + 4438, 6426, 4435, 4440, 4442, 4443, 4445, 4446, 4449, 4452, + + 4456, 6426, 4459, 4450, 4461, 4460, 4462, 4464, 4466, 4472, + 4469, 4475, 4476, 6426, 4481, 4483, 4484, 4485, 4486, 4487, + 4490, 4491, 6426, 4497, 4498, 4500, 4507, 4504, 4511, 4509, + 4513, 4506, 4516, 4519, 4512, 4523, 4524, 4526, 4520, 4536, + 4543, 4538, 6426, 4527, 6426, 4539, 4540, 4550, 4545, 4551, + 4549, 6426, 4552, 4557, 4559, 4555, 4553, 6426, 4560, 4561, + 4563, 4564, 6426, 4579, 4575, 4565, 4574, 4567, 4583, 6426, + 4588, 4589, 4590, 4597, 4599, 4594, 4601, 4596, 4604, 4602, + 4598, 4606, 4607, 4615, 4613, 4611, 6426, 4617, 4619, 4624, + 4626, 4620, 4628, 4618, 4630, 4633, 4635, 6426, 4636, 4639, + + 4640, 4642, 4643, 4644, 4645, 4652, 4649, 4651, 4653, 4654, + 4657, 4658, 6426, 4663, 4661, 4665, 4674, 4676, 4678, 6426, + 4681, 6426, 4671, 4666, 4683, 4682, 4687, 6426, 6426, 4689, + 4697, 4692, 4695, 4696, 6426, 6426, 4699, 6426, 4700, 6426, + 4701, 4703, 6426, 6426, 4702, 4706, 4709, 4711, 4713, 6426, + 4721, 6426, 4723, 4724, 4710, 4722, 4728, 6426, 4727, 4729, + 4731, 6426, 4734, 4742, 4735, 4737, 6426, 4739, 4745, 4740, + 4747, 6426, 4749, 4755, 4751, 4757, 4758, 4761, 4760, 4763, + 4764, 4768, 4769, 4770, 4771, 4773, 4782, 4784, 4786, 4779, + 4787, 4788, 4794, 4796, 4789, 4792, 4798, 4799, 4803, 4800, + + 4807, 4809, 4810, 4811, 4813, 4812, 4814, 4817, 4816, 4825, + 4827, 4828, 4829, 4830, 4831, 4832, 4833, 4839, 4840, 4843, + 4838, 4842, 6426, 4846, 4848, 4835, 4859, 4849, 4860, 4861, + 4868, 4872, 4873, 6426, 4875, 6426, 4877, 4869, 4879, 4880, + 4881, 6426, 4882, 4883, 4884, 4885, 4886, 4888, 4889, 4892, + 4893, 4897, 4903, 6426, 4910, 4900, 4894, 4898, 4918, 6426, + 4913, 4920, 4921, 4923, 4924, 4925, 4926, 4927, 4930, 4928, + 4933, 4935, 4929, 4936, 4937, 4951, 4953, 4948, 4938, 4955, + 4957, 4958, 4959, 4960, 4961, 4962, 4963, 4969, 4971, 4975, + 6426, 4966, 6426, 4977, 4978, 4979, 4982, 4983, 4984, 4987, + + 6426, 6426, 4989, 4990, 4995, 4992, 4996, 4999, 5001, 6426, + 5000, 5008, 5011, 5003, 6426, 5013, 5017, 5018, 5020, 6426, + 5021, 5022, 5023, 5025, 5026, 5030, 5034, 5032, 5035, 5036, + 5043, 6426, 6426, 6426, 6426, 5046, 5040, 5050, 5044, 5052, + 5054, 5055, 5059, 5053, 6426, 5061, 6426, 6426, 5066, 5067, + 5056, 5069, 5073, 5075, 5076, 5078, 6426, 5077, 5079, 5082, + 5080, 5089, 5091, 5097, 5093, 5098, 5083, 5099, 5108, 5104, + 5105, 5107, 5110, 5112, 5114, 6426, 6426, 5116, 5119, 5120, + 5127, 5125, 5128, 5124, 5137, 5132, 5134, 5135, 5140, 5141, + 5142, 5151, 5152, 5143, 5147, 6426, 5150, 5153, 5161, 6426, + + 5154, 6426, 5160, 5162, 5156, 5168, 5169, 5170, 5171, 5173, + 6426, 6426, 5175, 5183, 5180, 6426, 6426, 5176, 5184, 5187, + 5189, 5185, 5190, 5191, 5196, 5198, 5194, 6426, 5199, 6426, + 5201, 5203, 5216, 5202, 5218, 5223, 5225, 5229, 5222, 5205, + 6426, 5224, 5226, 6426, 5231, 5220, 5232, 6426, 5236, 5238, + 5241, 5243, 6426, 5245, 5246, 5248, 6426, 5252, 6426, 5249, + 5254, 5255, 5263, 6426, 5258, 5260, 6426, 5265, 5271, 5272, + 5266, 6426, 5268, 6426, 5273, 5277, 5280, 5283, 5274, 5285, + 5287, 5288, 5290, 5297, 5295, 5292, 6426, 6426, 135, 5308, + 5298, 5299, 5303, 5305, 5315, 5301, 5310, 5313, 6426, 6426, + + 5317, 6426, 5316, 5325, 6426, 5318, 5327, 5331, 5320, 5329, + 5333, 5335, 5336, 5340, 5342, 5341, 5345, 5346, 5349, 5354, + 5364, 5347, 5361, 5367, 5369, 5371, 5373, 5362, 5375, 5376, + 5377, 5379, 5381, 5382, 5383, 5385, 5386, 6426, 5389, 5391, + 5394, 5393, 6426, 5399, 5395, 5408, 5404, 6426, 5413, 5401, + 5414, 5415, 6426, 5416, 5418, 5421, 5419, 5420, 5432, 5427, + 5429, 5433, 6426, 6426, 6426, 5436, 5443, 6426, 5445, 5439, + 5422, 5430, 6426, 5446, 5449, 6426, 6426, 5450, 5451, 5452, + 5462, 6426, 5454, 6426, 5457, 6426, 5458, 5459, 5467, 5465, + 6426, 5471, 5469, 6426, 5480, 5482, 5484, 5477, 5485, 5487, + + 5488, 6426, 5495, 5491, 5492, 5499, 5490, 5500, 5494, 5502, + 5501, 5509, 5504, 5511, 6426, 5513, 5516, 5518, 5524, 5514, + 5520, 5522, 6426, 5526, 6426, 5528, 6426, 5530, 5531, 5532, + 5538, 5534, 5539, 5540, 5549, 5541, 5551, 5545, 5552, 5556, + 5553, 6426, 6426, 5562, 5565, 6426, 5559, 6426, 5567, 6426, + 5557, 5568, 5569, 5570, 6426, 5577, 5571, 5574, 5579, 6426, + 5581, 5586, 5583, 5588, 6426, 6426, 5589, 5596, 5594, 5592, + 5604, 5606, 5593, 5608, 5601, 5610, 5595, 5617, 5616, 5618, + 5620, 5622, 5623, 5624, 6426, 6426, 6426, 5629, 5628, 5637, + 5633, 5636, 5644, 5634, 6426, 5642, 5646, 5649, 5643, 5656, + + 5651, 5658, 6426, 5653, 5655, 5659, 5661, 5664, 5660, 5666, + 5667, 6426, 5671, 5678, 5675, 5672, 5683, 5690, 5692, 5694, + 5685, 5681, 5701, 5697, 6426, 5700, 6426, 6426, 5687, 6426, + 5696, 5703, 5704, 5708, 6426, 5711, 5705, 5712, 5713, 5715, + 5717, 6426, 5727, 5720, 5723, 5724, 6426, 6426, 5731, 6426, + 5734, 5736, 5735, 5743, 5738, 5739, 5745, 5746, 6426, 5728, + 5752, 5753, 5754, 5755, 6426, 5756, 5757, 5759, 5760, 6426, + 5763, 5762, 5765, 5767, 5768, 6426, 5769, 5770, 5777, 5784, + 6426, 5775, 5791, 5785, 6426, 6426, 5787, 5793, 5796, 6426, + 6426, 6426, 5802, 5799, 5797, 5806, 6426, 5808, 5812, 5817, + + 5821, 5820, 6426, 5823, 5811, 5813, 6426, 6426, 5825, 5826, + 5828, 5831, 6426, 6426, 5832, 5834, 5835, 5838, 5836, 6426, + 5837, 5840, 5842, 5853, 5859, 5848, 5856, 5860, 5868, 5850, + 5854, 5865, 5864, 5866, 5870, 5873, 5877, 5884, 5881, 5883, + 5889, 5886, 5890, 6426, 6426, 5894, 6426, 5897, 5891, 6426, + 6426, 5899, 5903, 5905, 5907, 5909, 5911, 5913, 6426, 5914, + 5916, 5917, 5918, 5919, 6426, 5921, 5925, 5920, 5928, 5922, + 5931, 5927, 5937, 6426, 6426, 5929, 5943, 5933, 5944, 5938, + 6426, 5948, 5955, 5950, 5952, 5953, 5958, 5954, 6426, 5960, + 5962, 6426, 6426, 5961, 5963, 6426, 6426, 5967, 6426, 6426, + + 6426, 6426, 6426, 6426, 6426, 5974, 6426, 5968, 5980, 5983, + 5985, 6426, 5969, 5986, 5987, 5988, 5975, 6426, 5973, 5990, + 5994, 5998, 5997, 6002, 6004, 6005, 6007, 6006, 6009, 6011, + 6010, 6015, 6013, 6014, 6016, 6020, 6023, 6426, 6426, 6426, + 6029, 6030, 6032, 6033, 6037, 6038, 6045, 6047, 6041, 6048, + 6049, 6051, 6053, 6054, 6055, 6063, 6059, 6062, 6061, 6065, + 6067, 6072, 6076, 6069, 6077, 6081, 6426, 6078, 6426, 6082, + 6426, 6426, 6086, 6088, 6083, 6090, 6098, 6101, 6094, 6097, + 6099, 6102, 6104, 6426, 6106, 6426, 6426, 6111, 6113, 6426, + 6112, 6115, 6426, 6114, 6116, 6117, 6122, 6124, 6120, 6123, + + 6125, 6141, 6426, 6426, 6127, 6131, 6129, 6143, 6145, 6144, + 6151, 6153, 6154, 6155, 6146, 6162, 6426, 6164, 6161, 6168, + 6426, 6169, 6157, 6170, 6171, 6172, 6180, 6175, 6179, 6426, + 6181, 6426, 6184, 6186, 6188, 6178, 6185, 6187, 6201, 6203, + 6196, 6426, 6189, 6205, 6199, 6210, 6212, 6214, 6216, 6207, + 6221, 6217, 6225, 6229, 6224, 6230, 6232, 6233, 6234, 6426, + 6236, 6239, 6426, 6240, 6241, 6242, 6243, 6247, 6426, 6250, + 6244, 6252, 6254, 6257, 6259, 6426, 6265, 6268, 6269, 6426, + 6270, 6426, 6426, 6272, 6260, 6273, 6281, 6283, 6426, 6426, + 6426, 6306, 6313, 6320, 6327, 6334, 6341, 6348, 88, 6355, + + 6362, 6369, 6376, 6383, 6390, 6397, 6404, 6411, 6418 } ; -static const flex_int16_t yy_def[3299] = +static const flex_int16_t yy_def[3310] = { 0, - 3280, 1, 3281, 3281, 3282, 3282, 3283, 3283, 3284, 3284, - 3285, 3285, 3286, 3286, 3287, 3287, 3280, 3288, 3280, 3280, - 3280, 3280, 3289, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3290, 3280, 3280, 3280, - 3290, 3291, 3280, 3280, 3280, 3291, 3292, 3280, 3280, 3280, - 3280, 3292, 3293, 3280, 3280, 3280, 3293, 3294, 3280, 3295, - 3280, 3294, 3294, 3296, 3280, 3280, 3280, 3280, 3296, 3297, - 3280, 3280, 3280, 3297, 3288, 3288, 3280, 3298, 3289, 3298, - 3289, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3290, 3290, 3291, - 3291, 3292, 3292, 3280, 3293, 3293, 3294, 3294, 3295, 3295, - 3294, 3296, 3296, 3280, 3297, 3297, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3294, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3294, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3294, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3294, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, - 3280, 3288, 3280, 3280, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3294, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3280, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3294, 3294, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3294, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3294, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3280, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3294, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3280, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3294, 3288, 3280, 3288, 3288, 3288, 3280, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3280, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288, - 3280, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3294, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, 3288, 3288, - 3288, 3294, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, - 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3280, - 3288, 3280, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3294, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3280, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3280, 3280, 3280, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3294, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3288, 3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3280, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3280, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3280, - 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, - 3280, 3294, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3280, 3288, 3280, 3288, 3288, 3280, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3280, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3280, 3280, - 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, 3280, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3280, 3288, 3280, - 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3280, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3280, - 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3280, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3280, 3280, 3288, 3288, - 3288, 3280, 3280, 3280, 3288, 3288, 3288, 3288, 3280, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3280, 3280, - - 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3280, 3288, - 3288, 3280, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288, - 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3280, 3280, 3280, 3288, 3280, 3280, 3288, - 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3288, 3280, 3288, - - 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, - 3280, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3280, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3280, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - - 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3280, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, - 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, - 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, - 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3280, 3288, - 3280, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3280, 0, - 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280 - + 3291, 1, 3292, 3292, 3293, 3293, 3294, 3294, 3295, 3295, + 3296, 3296, 3297, 3297, 3298, 3298, 3291, 3299, 3291, 3291, + 3291, 3291, 3300, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3301, 3291, 3291, 3291, + 3301, 3302, 3291, 3291, 3291, 3302, 3303, 3291, 3291, 3291, + 3291, 3303, 3304, 3291, 3291, 3291, 3304, 3305, 3291, 3306, + 3291, 3305, 3305, 3307, 3291, 3291, 3291, 3291, 3307, 3308, + 3291, 3291, 3291, 3308, 3299, 3299, 3291, 3309, 3300, 3309, + 3300, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3301, 3301, 3302, + 3302, 3303, 3303, 3291, 3304, 3304, 3305, 3305, 3306, 3306, + 3305, 3307, 3307, 3291, 3308, 3308, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3305, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3291, 3291, 3299, 3291, 3291, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3305, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3291, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291, + + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3305, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3305, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3291, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3305, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, + + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3291, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3305, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3305, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, + 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3291, 3299, 3291, + 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3305, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3291, 3291, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3291, + + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3291, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3291, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3305, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, + + 3299, 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3291, 3291, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3291, 3291, 3299, 3299, 3299, + 3299, 3291, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3291, 3299, 3299, 3291, 3299, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3291, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3291, + 3291, 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + + 3299, 3299, 3291, 3299, 3299, 3299, 3291, 3291, 3299, 3299, + 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3291, 3299, 3291, 3299, 3299, 3291, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3291, 3291, 3299, 3299, 3291, 3291, 3299, 3291, 3291, + + 3291, 3291, 3291, 3291, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, + 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3291, 3291, 3299, 3299, 3291, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3291, + 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3291, + 0, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291 } ; -static const flex_int16_t yy_nxt[6448] = +static const flex_int16_t yy_nxt[6467] = { 0, 18, 19, 20, 21, 22, 23, 22, 18, 18, 18, 18, 18, 22, 24, 25, 26, 27, 28, 29, 30, @@ -1540,7 +1545,7 @@ static const flex_int16_t yy_nxt[6448] = 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, 919, 221, 86, 227, 220, + 224, 86, 214, 86, 217, 922, 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, @@ -1588,7 +1593,7 @@ static const flex_int16_t yy_nxt[6448] = 435, 86, 86, 426, 440, 431, 86, 427, 86, 424, 86, 437, 86, 86, 433, 441, 434, 86, 439, 436, 450, 86, 86, 86, 455, 442, 449, 451, 438, 86, - 86, 86, 86, 452, 563, 453, 456, 86, 443, 458, + 86, 86, 86, 452, 564, 453, 456, 86, 443, 458, 459, 444, 86, 457, 86, 462, 445, 446, 447, 448, 460, 454, 86, 86, 86, 461, 86, 468, 86, 86, @@ -1598,623 +1603,625 @@ static const flex_int16_t yy_nxt[6448] = 484, 477, 475, 481, 485, 476, 86, 86, 86, 86, 482, 488, 486, 489, 86, 86, 497, 491, 487, 498, 86, 86, 86, 490, 495, 86, 499, 86, 500, 86, - 492, 86, 86, 493, 501, 494, 86, 86, 502, 86, - 515, 86, 512, 86, 551, 86, 503, 86, 504, 510, - 505, 513, 511, 514, 526, 517, 516, 168, 525, 527, - - 86, 86, 86, 506, 528, 86, 507, 529, 508, 86, - 509, 86, 86, 518, 519, 86, 535, 532, 530, 531, - 86, 533, 86, 520, 86, 521, 522, 523, 534, 539, - 524, 86, 86, 86, 86, 86, 541, 86, 538, 540, - 537, 536, 546, 86, 548, 86, 549, 86, 86, 545, - 86, 553, 543, 544, 542, 86, 86, 86, 547, 86, - 557, 558, 552, 86, 556, 86, 86, 550, 86, 86, - 86, 86, 555, 564, 565, 86, 86, 86, 86, 567, - 554, 568, 560, 562, 561, 559, 86, 570, 86, 571, - 86, 566, 573, 572, 86, 86, 569, 86, 86, 584, - - 579, 86, 586, 576, 575, 86, 574, 585, 580, 581, - 588, 86, 582, 583, 577, 587, 578, 589, 86, 86, - 86, 86, 86, 86, 592, 591, 86, 594, 164, 593, - 86, 596, 86, 598, 86, 86, 86, 86, 601, 590, - 599, 595, 602, 86, 86, 597, 86, 603, 86, 600, - 86, 86, 86, 608, 86, 606, 607, 86, 86, 604, - 86, 609, 86, 86, 86, 614, 610, 605, 615, 86, - 617, 86, 613, 86, 86, 616, 612, 611, 618, 86, - 620, 86, 622, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 619, 624, 86, 625, 621, 633, 86, 636, - - 627, 163, 630, 86, 623, 632, 86, 626, 628, 631, - 629, 635, 637, 86, 86, 634, 86, 86, 86, 640, - 643, 638, 86, 646, 639, 86, 86, 86, 641, 86, - 645, 86, 86, 642, 86, 86, 649, 86, 86, 648, - 653, 652, 644, 86, 86, 86, 86, 647, 655, 86, - 86, 86, 86, 654, 650, 651, 86, 86, 86, 658, - 656, 669, 672, 86, 657, 86, 659, 668, 707, 667, - 670, 660, 671, 661, 86, 86, 86, 86, 675, 662, - 676, 663, 673, 86, 664, 665, 674, 86, 680, 86, - 677, 666, 679, 678, 86, 86, 685, 86, 683, 681, - - 86, 686, 86, 682, 86, 688, 86, 86, 86, 86, - 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, 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, - 723, 86, 728, 86, 730, 86, 741, 724, 86, 726, - 725, 732, 729, 731, 86, 733, 86, 86, 734, 86, - - 735, 86, 736, 86, 86, 86, 86, 737, 86, 738, - 745, 86, 743, 739, 740, 86, 86, 86, 744, 86, - 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, 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, 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, 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, - - 86, 1920, 86, 1921, 1922, 1923, 1925, 86, 1926, 86, - 1930, 1931, 86, 86, 1932, 1935, 86, 86, 86, 1937, - 1938, 1933, 1936, 1934, 1939, 86, 1941, 1940, 86, 86, - 86, 86, 86, 86, 1943, 1944, 86, 86, 1946, 1947, - 86, 86, 86, 86, 1951, 86, 86, 1950, 1953, 1945, - 1952, 86, 1948, 1942, 86, 86, 86, 1961, 1954, 1955, - 1956, 86, 1949, 86, 1963, 1957, 86, 86, 86, 1964, - 86, 1958, 86, 1959, 1967, 86, 1960, 1970, 86, 1968, - 1965, 1962, 1966, 86, 86, 86, 86, 1971, 1974, 86, - 1969, 86, 1976, 86, 86, 86, 1979, 1980, 86, 86, - - 1982, 86, 86, 86, 1972, 86, 1973, 86, 86, 1987, - 1988, 86, 1975, 1977, 1984, 86, 1978, 1985, 86, 1981, - 86, 86, 86, 86, 1986, 86, 1994, 1983, 1989, 1991, - 1992, 86, 86, 1990, 1998, 86, 86, 1997, 2001, 2002, - 86, 2003, 86, 2000, 86, 86, 1993, 1996, 86, 1995, - 86, 86, 86, 2004, 86, 1999, 86, 86, 86, 2005, - 2009, 86, 2012, 2013, 2008, 86, 2014, 86, 86, 86, - 86, 2006, 86, 2007, 2010, 86, 86, 2022, 86, 2017, - 86, 2021, 2016, 86, 2011, 2015, 86, 86, 2019, 3280, - 86, 2026, 2020, 86, 86, 2018, 2027, 86, 2024, 2023, - - 2029, 86, 2028, 86, 86, 2025, 86, 2030, 2031, 2033, - 86, 86, 86, 2032, 86, 2034, 2037, 2040, 2035, 86, - 86, 2043, 86, 86, 2042, 2036, 86, 2044, 86, 86, - 86, 86, 2038, 2045, 2039, 2041, 86, 2046, 2050, 86, - 86, 2047, 2051, 86, 2052, 2057, 2048, 2054, 2055, 2053, - 86, 2049, 86, 86, 86, 2059, 86, 86, 86, 86, - 2064, 86, 2056, 2061, 2058, 86, 86, 2066, 2060, 2062, - 168, 86, 86, 86, 86, 2067, 86, 86, 86, 2073, - 2072, 2071, 86, 2063, 2068, 86, 2069, 2065, 2074, 86, - 2070, 2075, 86, 2077, 86, 86, 86, 86, 2116, 86, - - 2078, 2079, 2076, 2080, 2081, 86, 86, 86, 86, 2083, - 2082, 86, 2085, 86, 2089, 86, 86, 86, 86, 2084, - 2086, 2088, 86, 2091, 86, 2087, 2090, 2092, 86, 2094, - 86, 2093, 86, 86, 86, 86, 86, 86, 86, 2099, - 2101, 2096, 2100, 86, 2095, 86, 86, 2103, 86, 2106, - 86, 2097, 86, 2098, 2102, 86, 86, 2110, 86, 2105, - 2107, 2104, 86, 2111, 2109, 86, 86, 2112, 2108, 2117, - 86, 2115, 86, 2114, 86, 2118, 86, 2113, 86, 2123, - 86, 86, 86, 2125, 86, 86, 2126, 2127, 86, 86, - 2119, 86, 2120, 2121, 2122, 2129, 86, 2128, 2124, 86, - - 2130, 86, 2133, 86, 86, 86, 86, 2132, 86, 86, - 2134, 86, 2137, 86, 2131, 2138, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 2136, 2135, 2146, 2140, 2141, - 2139, 2143, 86, 2142, 86, 2145, 2150, 2151, 86, 2144, - 2147, 86, 2148, 86, 2154, 86, 2149, 86, 2155, 86, - 2152, 2158, 2157, 86, 2153, 86, 86, 86, 86, 86, - 2160, 86, 86, 2161, 2166, 2156, 2162, 86, 2164, 86, - 86, 2159, 2168, 2165, 2170, 86, 2163, 86, 86, 86, - 2173, 86, 86, 2169, 2172, 86, 2167, 2174, 86, 2178, - 2175, 86, 86, 86, 86, 86, 2179, 86, 86, 2176, - - 86, 2181, 86, 2171, 2190, 2180, 2184, 86, 2177, 86, - 2185, 2183, 86, 2182, 2188, 2186, 86, 2189, 2187, 86, - 86, 2194, 86, 86, 86, 86, 2196, 2192, 86, 2197, - 86, 86, 2198, 86, 2191, 2193, 2195, 86, 2199, 2203, - 2201, 86, 86, 2202, 2205, 86, 86, 86, 2200, 2206, - 86, 2207, 2210, 86, 86, 86, 86, 2208, 2209, 2211, - 2215, 86, 2204, 86, 86, 2214, 2212, 86, 86, 86, - 86, 86, 86, 86, 86, 2213, 86, 2224, 86, 2225, - 2221, 2216, 2217, 2218, 2219, 2222, 2220, 2226, 86, 2223, - 86, 86, 86, 86, 2227, 86, 2229, 2235, 86, 2230, - - 86, 2237, 86, 86, 2234, 168, 2231, 2228, 86, 2236, - 2232, 86, 2239, 86, 2243, 2245, 2240, 2246, 2233, 2244, - 86, 86, 2238, 86, 86, 86, 2241, 2242, 2247, 86, - 2250, 86, 2248, 86, 2251, 86, 2255, 86, 86, 2256, - 86, 2259, 86, 3280, 2254, 86, 86, 86, 2252, 2249, - 2260, 2263, 2257, 86, 2261, 2262, 86, 2264, 86, 2253, - 2258, 86, 2265, 86, 86, 86, 86, 86, 2267, 86, - 86, 86, 2270, 86, 86, 2273, 86, 86, 86, 2277, - 86, 2266, 2279, 86, 2280, 2268, 2272, 86, 86, 2275, - 86, 2269, 2271, 2282, 2274, 86, 86, 2276, 86, 86, - - 2278, 86, 2281, 2284, 2287, 86, 86, 2285, 2290, 86, - 86, 86, 86, 86, 2288, 86, 2283, 2286, 2291, 86, - 86, 86, 86, 2289, 86, 2292, 3280, 86, 86, 86, - 2293, 2304, 2298, 2303, 2296, 2294, 2302, 2295, 86, 2300, - 2297, 2301, 2299, 2305, 86, 86, 86, 86, 86, 2307, - 2306, 2308, 86, 86, 2311, 2312, 86, 86, 86, 2313, - 86, 2309, 2314, 86, 86, 2310, 86, 2317, 2324, 2318, - 2320, 86, 2319, 2315, 2321, 86, 86, 2316, 86, 86, - 86, 2322, 86, 2323, 2327, 86, 2328, 86, 2330, 86, - 86, 86, 2326, 2332, 86, 86, 2335, 86, 86, 2325, - - 2334, 2329, 2336, 86, 86, 86, 2333, 86, 2331, 86, - 2342, 86, 2337, 2338, 2341, 86, 2344, 86, 86, 2339, - 86, 86, 86, 2347, 86, 2348, 2340, 2346, 2350, 86, - 86, 86, 2354, 86, 2343, 86, 2345, 86, 86, 86, - 2349, 2351, 86, 2358, 86, 2352, 2359, 86, 86, 2361, - 2353, 86, 86, 2357, 86, 2355, 2364, 86, 86, 86, - 2356, 2360, 86, 2362, 86, 2366, 2363, 86, 2367, 86, - 2371, 86, 2365, 2373, 86, 86, 2372, 2368, 2374, 86, - 2369, 86, 86, 86, 2378, 86, 2377, 2379, 86, 86, - 2370, 86, 86, 2375, 2383, 2376, 2381, 2385, 86, 86, - - 86, 2388, 2390, 2386, 86, 2391, 2380, 86, 86, 2382, - 86, 2384, 2389, 86, 2387, 2392, 86, 86, 86, 2395, - 86, 86, 86, 86, 86, 3280, 2394, 2396, 2403, 2393, - 2397, 2398, 2399, 2401, 2400, 2402, 86, 2404, 2407, 86, - 86, 86, 86, 2406, 86, 2405, 86, 2408, 168, 86, - 86, 2415, 86, 2410, 86, 2409, 86, 86, 86, 86, - 2411, 86, 2412, 86, 2422, 2413, 2414, 2417, 2418, 2416, - 86, 86, 86, 2419, 2420, 2421, 2423, 2426, 86, 86, - 2427, 2428, 86, 86, 2425, 2431, 2429, 86, 2432, 86, - 2424, 86, 2430, 86, 86, 2434, 86, 86, 2433, 86, - - 2436, 86, 86, 86, 2440, 2441, 86, 2435, 86, 2437, - 86, 86, 86, 2443, 2444, 2438, 86, 2446, 86, 2445, - 2442, 2439, 86, 2448, 86, 86, 86, 2447, 2449, 86, - 2452, 86, 2451, 2450, 2453, 86, 2455, 86, 2454, 86, - 86, 86, 86, 86, 2462, 2459, 86, 86, 2461, 86, - 86, 86, 2463, 86, 2458, 86, 3280, 2456, 2467, 2457, - 86, 86, 2460, 86, 86, 2464, 86, 2472, 2465, 2471, - 2466, 2473, 2469, 86, 86, 2475, 2468, 2470, 86, 86, - 2474, 86, 2477, 86, 86, 2480, 2478, 86, 2476, 2482, - 86, 2481, 2484, 86, 86, 86, 2486, 86, 86, 86, - - 86, 86, 2483, 2485, 86, 2479, 86, 86, 86, 2490, - 86, 2492, 2493, 2488, 2494, 86, 2487, 2489, 2495, 86, - 86, 2496, 86, 2497, 2498, 2500, 2491, 86, 86, 86, - 2503, 86, 2499, 86, 2505, 86, 86, 2508, 86, 86, - 86, 2502, 2504, 86, 86, 86, 2509, 2501, 86, 2512, - 2514, 2507, 86, 2506, 2513, 86, 86, 86, 2510, 86, - 86, 86, 2511, 2518, 2517, 2516, 86, 86, 86, 86, - 2515, 2519, 2522, 3280, 2520, 86, 2525, 86, 2521, 86, - 2524, 2526, 86, 2527, 86, 2528, 86, 2530, 2523, 86, - 86, 2529, 86, 2532, 2531, 86, 2533, 86, 86, 86, - - 2538, 86, 2534, 86, 2540, 86, 2541, 86, 86, 2535, - 86, 86, 86, 86, 86, 2537, 86, 2544, 2536, 2542, - 86, 2547, 2539, 2543, 2545, 2550, 86, 86, 86, 86, - 86, 86, 86, 2546, 2548, 168, 2551, 86, 2558, 86, - 2549, 86, 86, 2554, 86, 86, 2556, 2557, 2559, 2553, - 86, 86, 2569, 86, 2552, 2555, 2560, 2561, 86, 86, - 86, 2565, 2562, 86, 2567, 2566, 86, 2563, 2568, 2570, - 86, 86, 2571, 2564, 86, 2572, 86, 2573, 2574, 86, - 86, 86, 86, 86, 86, 2576, 86, 86, 86, 86, - 2575, 2584, 86, 86, 86, 2577, 2582, 86, 2588, 86, - - 2579, 2578, 2589, 86, 2581, 2580, 2583, 86, 2585, 2590, - 2586, 2587, 2593, 86, 86, 86, 2592, 2595, 86, 86, - 86, 2591, 86, 2594, 86, 86, 86, 2598, 86, 2604, - 86, 2605, 86, 2596, 86, 86, 86, 2597, 86, 2599, - 2600, 86, 2602, 2601, 2608, 2609, 86, 2603, 2610, 86, - 2611, 2613, 86, 2607, 2606, 86, 86, 86, 86, 2612, - 86, 86, 2616, 86, 86, 2620, 2619, 2621, 86, 2615, - 86, 2614, 2622, 2623, 86, 86, 86, 86, 2617, 86, - 2618, 86, 86, 2624, 2625, 86, 2629, 86, 86, 2627, - 86, 2633, 2634, 86, 86, 2626, 2637, 86, 86, 2628, - - 2641, 86, 2630, 86, 2631, 2635, 86, 2632, 86, 86, - 2638, 86, 2636, 2639, 86, 2640, 2642, 2646, 86, 86, - 86, 86, 86, 2643, 2649, 2650, 86, 2652, 86, 2644, - 2648, 2647, 86, 86, 2645, 86, 86, 2653, 2657, 86, - 86, 2651, 2654, 86, 2658, 2660, 86, 86, 2656, 86, - 86, 2655, 86, 2665, 86, 86, 2667, 86, 2663, 86, - 2661, 2664, 2659, 2662, 2668, 86, 86, 86, 86, 86, - 2666, 2669, 2671, 86, 86, 86, 2672, 86, 3280, 2670, - 86, 86, 2674, 2675, 86, 2677, 2678, 86, 2673, 2676, - 2680, 86, 2679, 2681, 86, 2682, 168, 86, 86, 86, - - 2687, 86, 2685, 2684, 2683, 2686, 86, 86, 86, 2689, - 86, 86, 2688, 2712, 2690, 2691, 2692, 86, 2693, 86, - 2695, 86, 86, 2697, 2694, 2696, 86, 86, 2698, 86, - 86, 2699, 2700, 2702, 86, 86, 86, 86, 2703, 86, - 2704, 86, 86, 86, 2701, 2705, 86, 2709, 2710, 2707, - 86, 2711, 2706, 86, 86, 2714, 86, 86, 86, 2713, - 2715, 86, 86, 2708, 86, 86, 2717, 2718, 2716, 86, - 86, 2723, 86, 86, 2721, 86, 2719, 2720, 2722, 2726, - 86, 2724, 86, 86, 86, 86, 2727, 2731, 86, 86, - 2732, 2725, 86, 86, 2728, 86, 2736, 86, 86, 86, - - 86, 2734, 2729, 2730, 2740, 2741, 86, 86, 2733, 2743, - 2735, 2744, 2737, 2738, 2745, 86, 86, 86, 86, 2739, - 86, 2746, 86, 2748, 2747, 86, 86, 86, 86, 86, - 86, 2751, 2742, 86, 2749, 86, 2754, 2756, 86, 2750, - 2757, 86, 2752, 86, 2753, 2758, 86, 2759, 2755, 86, - 2761, 86, 86, 2762, 2760, 86, 2765, 2763, 86, 86, - 2768, 2766, 86, 2769, 86, 2770, 86, 2764, 86, 86, - 86, 2771, 86, 2775, 86, 86, 2776, 86, 2767, 2777, - 86, 86, 2772, 2779, 86, 86, 86, 2783, 2773, 86, - 2780, 86, 2774, 86, 2784, 86, 2778, 86, 86, 2786, - - 2782, 2785, 86, 2781, 2787, 86, 86, 2792, 2791, 86, - 86, 2789, 2788, 86, 2794, 2795, 86, 86, 2790, 86, - 86, 86, 2796, 2798, 2800, 86, 2801, 2797, 86, 86, - 86, 2793, 86, 86, 2799, 2804, 86, 2808, 86, 86, - 86, 86, 86, 2810, 2944, 2802, 2803, 2805, 86, 86, - 2807, 2811, 2806, 2809, 86, 2812, 2814, 2815, 2816, 2819, - 86, 2813, 86, 2817, 86, 86, 2820, 86, 2818, 86, - 2821, 86, 2822, 86, 2823, 86, 86, 86, 2824, 86, - 2825, 86, 2828, 86, 86, 86, 2830, 2826, 2834, 86, - 2835, 86, 2831, 86, 86, 86, 2836, 3140, 2829, 2838, - - 86, 86, 2827, 86, 2832, 2833, 2840, 86, 2839, 86, - 2842, 86, 2837, 86, 2841, 86, 86, 2847, 86, 86, - 86, 2846, 2843, 2848, 2844, 2845, 86, 2851, 86, 2849, - 86, 86, 2852, 86, 86, 2855, 86, 2854, 86, 2856, - 86, 2850, 86, 2853, 2857, 86, 2858, 86, 86, 86, - 2859, 2862, 86, 86, 86, 86, 2867, 3280, 2861, 86, - 2863, 2865, 86, 2860, 2870, 86, 2868, 86, 2872, 86, - 2871, 86, 86, 2866, 2864, 86, 2869, 2874, 2873, 86, - 2875, 2877, 86, 2876, 2878, 86, 2879, 86, 86, 86, - 86, 2881, 2884, 86, 2882, 2883, 86, 2880, 86, 86, - - 86, 2885, 2887, 86, 2886, 2889, 86, 2888, 86, 2893, - 86, 2891, 2895, 86, 86, 86, 86, 86, 2896, 86, - 86, 2890, 2897, 86, 2898, 86, 2892, 86, 2899, 2904, - 86, 2901, 86, 86, 86, 2894, 2907, 86, 2902, 2900, - 86, 86, 86, 86, 86, 2903, 2905, 2906, 2912, 2908, - 2911, 86, 2913, 2909, 86, 86, 2917, 86, 86, 86, - 2910, 86, 2915, 2914, 2919, 86, 2920, 86, 2922, 86, - 86, 86, 86, 86, 2927, 86, 86, 2918, 2926, 86, - 2921, 2916, 86, 2931, 2929, 86, 2923, 2924, 2925, 86, - 2934, 86, 86, 86, 2936, 86, 2928, 86, 2930, 2932, - - 86, 86, 2937, 2939, 86, 2940, 86, 86, 2933, 2942, - 86, 86, 2935, 2947, 2948, 2938, 2945, 86, 86, 86, - 86, 2941, 2951, 86, 86, 86, 2953, 2952, 86, 2943, - 2949, 2946, 2954, 2956, 2957, 86, 2959, 2950, 86, 86, - 86, 2958, 86, 86, 86, 2962, 86, 86, 2955, 2961, - 2965, 86, 2963, 2968, 86, 86, 86, 86, 2960, 86, - 86, 86, 2964, 2973, 86, 86, 86, 2969, 2966, 2967, - 2975, 2977, 86, 2972, 2976, 2970, 2978, 86, 86, 86, - 2974, 86, 86, 2979, 2971, 86, 2981, 2982, 86, 2983, - 86, 2984, 86, 2980, 2987, 2985, 86, 2989, 86, 86, - - 86, 2988, 86, 86, 86, 86, 2994, 2995, 86, 86, - 86, 2986, 86, 2999, 86, 3000, 86, 86, 2990, 86, - 3280, 2998, 3001, 2996, 2991, 2992, 2993, 86, 86, 86, - 2997, 86, 3004, 3005, 86, 3006, 86, 3002, 3003, 86, - 3009, 86, 86, 3008, 3007, 86, 86, 3012, 86, 86, - 3011, 3014, 86, 3010, 3013, 86, 86, 3016, 86, 86, - 86, 86, 3018, 86, 86, 3015, 3019, 3017, 86, 86, - 86, 86, 86, 86, 86, 3028, 3029, 3031, 3020, 3024, - 3021, 3022, 3023, 86, 86, 3025, 3026, 3035, 3280, 3032, - 3027, 86, 3030, 3033, 3036, 86, 3034, 3037, 86, 86, - - 3039, 86, 86, 3038, 86, 3042, 86, 3040, 3043, 86, - 3044, 3045, 86, 86, 3046, 3047, 3050, 86, 3048, 3049, - 86, 86, 86, 3041, 3051, 86, 86, 86, 86, 3057, - 86, 86, 86, 3056, 86, 86, 3053, 86, 3052, 3059, - 86, 3060, 86, 3061, 86, 3065, 3054, 3055, 3066, 86, - 3062, 3064, 3067, 86, 86, 86, 3058, 3072, 3063, 86, - 3069, 3074, 3073, 86, 86, 86, 86, 86, 3070, 3068, - 86, 3071, 86, 86, 86, 3078, 3082, 3079, 3081, 86, - 3076, 3224, 86, 86, 86, 3084, 86, 3077, 3087, 3075, - 3083, 3280, 3080, 3085, 86, 3086, 86, 3088, 86, 3089, - - 86, 86, 3091, 86, 3092, 86, 3093, 86, 3094, 86, - 3090, 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, 86, 3123, - 86, 3127, 86, 3122, 3124, 3120, 3129, 86, 86, 3121, - 86, 3125, 3134, 3128, 3130, 86, 3131, 86, 86, 3133, - 3126, 86, 86, 86, 86, 3132, 86, 86, 3142, 3139, - - 86, 86, 86, 86, 3138, 3136, 86, 86, 3135, 86, - 86, 3141, 86, 3143, 86, 3137, 86, 86, 3146, 3149, - 3144, 3145, 3148, 86, 3150, 86, 3158, 86, 3152, 86, - 3151, 3147, 3154, 86, 3153, 86, 3156, 3157, 86, 3155, - 3159, 86, 86, 3160, 3161, 86, 3162, 86, 3163, 86, - 86, 86, 3165, 3164, 86, 3166, 3167, 3170, 86, 86, - 3168, 86, 86, 86, 3175, 86, 3173, 3176, 86, 3169, - 86, 3172, 3171, 86, 3179, 86, 86, 86, 3182, 86, - 86, 3183, 3174, 86, 3186, 3177, 86, 3187, 86, 86, - 86, 3180, 3178, 86, 3184, 3181, 86, 3192, 86, 86, - - 86, 3189, 3185, 3188, 3191, 3193, 86, 86, 86, 86, - 86, 86, 86, 3197, 86, 3190, 3199, 86, 86, 86, - 86, 3194, 3196, 3204, 86, 3206, 86, 3195, 86, 3205, - 3198, 3200, 3201, 3202, 3207, 86, 3203, 3210, 86, 86, - 86, 3212, 86, 3213, 3211, 3214, 3208, 86, 86, 86, - 86, 3218, 86, 3215, 3209, 3216, 86, 86, 3219, 86, - 86, 3220, 3221, 86, 3222, 86, 86, 3227, 3217, 86, - 86, 3223, 86, 86, 86, 3230, 3231, 86, 86, 86, - 86, 86, 86, 3229, 3225, 3226, 3234, 3232, 3228, 86, - 3233, 3235, 86, 3237, 86, 3238, 86, 3239, 3236, 86, - - 3242, 86, 3240, 86, 3244, 86, 3245, 86, 3241, 86, - 3249, 86, 3246, 86, 86, 3243, 3247, 86, 3250, 3251, - 3248, 3252, 86, 86, 86, 86, 86, 86, 3258, 86, - 3253, 3254, 3256, 3255, 86, 86, 86, 86, 86, 3260, - 3261, 86, 3264, 86, 3257, 3259, 3265, 86, 86, 3268, - 3269, 86, 86, 3271, 86, 3262, 3263, 3266, 86, 3270, - 3272, 86, 3267, 86, 86, 3273, 86, 86, 3274, 3275, - 3278, 86, 3279, 86, 3280, 3280, 3280, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3276, 3277, 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, 3280, 89, - 89, 89, 89, 158, 158, 3280, 3280, 3280, 158, 158, - 160, 160, 3280, 3280, 160, 3280, 160, 162, 3280, 3280, - 3280, 3280, 3280, 162, 165, 165, 3280, 3280, 3280, 165, - 165, 167, 3280, 3280, 3280, 3280, 3280, 167, 169, 169, - 3280, 169, 169, 169, 169, 172, 3280, 3280, 3280, 3280, - 3280, 172, 175, 175, 3280, 3280, 3280, 175, 175, 90, - - 90, 3280, 90, 90, 90, 90, 17, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3280, 3280 + 492, 86, 164, 493, 501, 494, 86, 86, 502, 511, + 86, 86, 513, 516, 86, 515, 503, 86, 504, 510, + 505, 168, 514, 527, 86, 518, 528, 512, 86, 517, + + 86, 529, 86, 506, 530, 86, 507, 86, 508, 526, + 509, 86, 531, 519, 520, 86, 534, 86, 536, 532, + 533, 86, 86, 521, 86, 522, 523, 524, 86, 540, + 525, 86, 86, 542, 535, 86, 539, 86, 86, 541, + 86, 538, 549, 537, 86, 547, 546, 86, 86, 86, + 550, 543, 544, 548, 86, 554, 86, 545, 86, 552, + 86, 86, 86, 86, 551, 557, 558, 559, 553, 86, + 86, 86, 86, 86, 556, 565, 566, 86, 571, 561, + 86, 555, 560, 86, 568, 563, 562, 569, 86, 86, + 86, 572, 86, 567, 585, 86, 86, 163, 86, 86, + + 86, 580, 570, 573, 577, 574, 576, 586, 575, 581, + 582, 86, 86, 583, 584, 578, 587, 579, 86, 590, + 591, 589, 588, 86, 86, 86, 86, 86, 593, 592, + 594, 595, 86, 86, 597, 86, 599, 86, 86, 603, + 86, 86, 602, 600, 86, 86, 86, 86, 598, 86, + 604, 86, 596, 601, 607, 86, 608, 86, 609, 605, + 86, 86, 86, 86, 86, 86, 610, 611, 606, 86, + 619, 86, 615, 86, 614, 616, 617, 86, 618, 613, + 612, 86, 621, 86, 620, 86, 623, 86, 86, 86, + 86, 86, 86, 86, 86, 622, 625, 634, 626, 161, + + 636, 86, 628, 86, 624, 86, 86, 627, 633, 629, + 631, 630, 86, 632, 635, 638, 86, 637, 86, 86, + 86, 641, 644, 86, 639, 647, 86, 640, 86, 646, + 86, 86, 86, 642, 86, 643, 86, 650, 86, 86, + 86, 86, 653, 645, 649, 654, 656, 86, 86, 648, + 86, 86, 86, 86, 655, 86, 651, 652, 86, 670, + 86, 86, 86, 657, 659, 692, 673, 658, 86, 660, + 668, 671, 86, 669, 661, 676, 662, 672, 86, 86, + 86, 680, 663, 677, 664, 674, 681, 665, 666, 675, + 86, 86, 86, 86, 667, 678, 685, 682, 679, 86, + + 86, 86, 688, 86, 86, 683, 86, 684, 86, 690, + 86, 86, 86, 86, 86, 86, 86, 696, 86, 691, + 687, 693, 686, 697, 700, 701, 86, 168, 689, 694, + 699, 702, 698, 695, 703, 86, 86, 86, 704, 86, + 86, 86, 86, 86, 86, 86, 710, 712, 86, 86, + 705, 707, 715, 86, 708, 706, 711, 714, 716, 709, + 717, 718, 86, 86, 86, 86, 720, 86, 713, 86, + 86, 86, 86, 86, 719, 723, 724, 729, 86, 721, + 725, 86, 730, 86, 722, 732, 86, 726, 728, 734, + 727, 731, 733, 86, 737, 86, 735, 86, 736, 86, + + 86, 738, 740, 86, 86, 86, 739, 86, 742, 743, + 86, 86, 86, 86, 86, 741, 746, 747, 86, 745, + 86, 751, 750, 86, 86, 86, 86, 86, 752, 744, + 754, 86, 756, 86, 86, 86, 86, 748, 86, 749, + 755, 753, 86, 759, 762, 86, 86, 763, 757, 765, + 86, 760, 86, 86, 766, 758, 761, 767, 768, 764, + 86, 770, 86, 86, 86, 86, 86, 777, 773, 774, + 769, 771, 86, 86, 86, 779, 86, 86, 772, 775, + 780, 776, 782, 778, 86, 86, 86, 783, 86, 86, + 784, 86, 86, 787, 86, 86, 789, 791, 86, 86, + + 86, 86, 781, 86, 785, 788, 797, 786, 792, 86, + 795, 794, 86, 159, 790, 796, 86, 86, 86, 793, + 799, 802, 798, 800, 801, 86, 86, 804, 86, 806, + 803, 86, 808, 86, 86, 86, 807, 809, 86, 86, + 812, 86, 805, 86, 811, 813, 86, 86, 86, 819, + 86, 86, 816, 86, 814, 86, 815, 821, 810, 86, + 86, 824, 86, 86, 822, 826, 817, 818, 828, 820, + 825, 823, 86, 86, 86, 86, 831, 86, 830, 835, + 827, 832, 86, 86, 829, 86, 833, 86, 86, 837, + 86, 86, 86, 86, 86, 843, 86, 86, 844, 86, + + 834, 86, 836, 86, 86, 845, 838, 86, 839, 840, + 86, 841, 846, 842, 847, 86, 852, 86, 86, 850, + 86, 848, 86, 849, 86, 851, 86, 86, 857, 853, + 854, 86, 86, 86, 86, 86, 855, 86, 866, 856, + 864, 86, 86, 859, 858, 867, 86, 86, 865, 860, + 861, 862, 863, 86, 86, 86, 868, 86, 870, 872, + 86, 86, 86, 86, 86, 869, 176, 871, 876, 877, + 878, 873, 86, 875, 86, 86, 874, 879, 86, 880, + 881, 86, 882, 86, 86, 168, 86, 883, 86, 888, + 887, 86, 885, 86, 86, 884, 886, 889, 86, 86, + + 891, 86, 890, 895, 86, 86, 896, 898, 86, 892, + 86, 86, 893, 86, 897, 899, 86, 902, 86, 86, + 894, 903, 900, 86, 86, 86, 908, 86, 904, 86, + 901, 905, 86, 909, 910, 86, 907, 86, 86, 86, + 86, 906, 86, 86, 86, 929, 924, 911, 923, 925, + 86, 926, 86, 921, 928, 86, 930, 913, 86, 86, + 912, 86, 86, 914, 86, 935, 915, 86, 927, 931, + 916, 86, 943, 917, 86, 86, 933, 932, 86, 86, + 918, 919, 946, 920, 934, 86, 936, 937, 86, 938, + 86, 86, 939, 945, 948, 944, 950, 940, 951, 86, + + 86, 955, 86, 941, 942, 954, 956, 86, 86, 86, + 949, 174, 947, 86, 952, 957, 86, 958, 960, 86, + 961, 86, 86, 86, 959, 953, 962, 86, 964, 86, + 963, 965, 86, 86, 967, 966, 86, 86, 86, 86, + 969, 86, 973, 86, 86, 86, 972, 86, 968, 86, + 976, 86, 982, 86, 980, 978, 86, 970, 971, 974, + 86, 975, 86, 977, 983, 1001, 86, 981, 986, 984, + 86, 985, 987, 979, 86, 86, 989, 86, 86, 86, + 988, 86, 86, 991, 990, 993, 86, 992, 994, 86, + 86, 86, 86, 86, 86, 1000, 86, 997, 995, 86, + + 998, 1003, 86, 86, 1004, 86, 86, 1002, 86, 996, + 86, 86, 86, 999, 1006, 1007, 1009, 86, 86, 86, + 1011, 1010, 1005, 1012, 86, 86, 86, 86, 1019, 86, + 1017, 86, 1008, 1013, 1015, 1018, 86, 86, 86, 1016, + 86, 1027, 86, 1024, 1020, 86, 1022, 1026, 86, 1014, + 1021, 1025, 86, 86, 86, 86, 86, 1029, 86, 86, + 86, 86, 1023, 1035, 86, 1037, 86, 1040, 86, 1028, + 86, 173, 86, 86, 1030, 1031, 1032, 1041, 86, 1034, + 1033, 86, 1038, 1036, 1042, 1039, 86, 1045, 86, 1043, + 1048, 86, 1044, 1047, 86, 86, 86, 86, 86, 86, + + 1046, 86, 86, 1057, 1050, 1052, 1058, 1060, 86, 86, + 86, 86, 86, 86, 1049, 86, 1051, 1063, 1053, 1065, + 1055, 1054, 1056, 86, 1059, 1061, 1064, 86, 1062, 86, + 86, 86, 86, 86, 1071, 1069, 1072, 86, 86, 1076, + 1073, 1067, 86, 86, 86, 86, 1066, 1078, 86, 1068, + 86, 86, 1070, 86, 1081, 86, 1074, 1075, 1080, 1082, + 168, 86, 86, 1077, 86, 1084, 1083, 86, 1079, 86, + 1085, 86, 1088, 86, 86, 86, 86, 1086, 86, 1101, + 86, 86, 1087, 1089, 1102, 1104, 86, 1091, 1092, 86, + 86, 86, 86, 1106, 1093, 1090, 1103, 1094, 86, 86, + + 86, 1095, 86, 1096, 1120, 1109, 1107, 1097, 86, 1098, + 86, 86, 1111, 1108, 1099, 1105, 1110, 1112, 86, 1100, + 1113, 86, 1114, 86, 86, 1115, 86, 86, 86, 1118, + 86, 1121, 1133, 86, 86, 1130, 86, 1116, 1117, 1119, + 1126, 1122, 1125, 86, 1124, 1128, 1129, 1132, 1127, 1123, + 1131, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 1147, 86, 1144, 86, 86, 86, 1148, 86, 1143, + 86, 1146, 86, 1134, 1135, 86, 1136, 86, 1145, 1150, + 1149, 1137, 1154, 1138, 168, 1151, 1153, 1152, 86, 1139, + 86, 86, 86, 1158, 1140, 1141, 1155, 86, 1160, 86, + + 86, 1142, 1156, 86, 1161, 1163, 86, 86, 86, 1164, + 1157, 86, 86, 1166, 1168, 1159, 86, 86, 86, 86, + 86, 1169, 86, 1162, 1174, 1167, 1165, 1171, 1172, 86, + 86, 86, 86, 86, 86, 86, 1170, 1177, 1173, 86, + 1175, 86, 86, 86, 86, 86, 86, 86, 1176, 1179, + 1182, 1181, 1183, 1178, 1180, 86, 1186, 86, 86, 1185, + 1187, 1184, 86, 86, 1192, 1189, 1190, 86, 86, 86, + 86, 1188, 1191, 1194, 1195, 1196, 1197, 1199, 1193, 86, + 1198, 86, 86, 86, 1202, 86, 86, 86, 1204, 1203, + 86, 1205, 86, 86, 1200, 1206, 86, 86, 1201, 1207, + + 86, 1213, 86, 86, 86, 1215, 1208, 86, 86, 1209, + 1211, 86, 86, 1217, 1210, 1212, 86, 86, 1216, 1219, + 86, 166, 1214, 86, 86, 1220, 1218, 86, 1221, 1222, + 86, 86, 1224, 1223, 86, 1225, 1228, 86, 86, 1230, + 1227, 1231, 86, 1226, 1229, 86, 1232, 86, 86, 86, + 1235, 1234, 86, 86, 86, 86, 86, 1241, 1239, 86, + 1242, 86, 86, 86, 1243, 1233, 86, 1244, 86, 1240, + 1236, 1246, 1237, 1245, 1238, 86, 1249, 86, 86, 1247, + 1251, 86, 86, 1250, 86, 86, 86, 86, 86, 86, + 86, 1256, 1257, 1252, 1253, 1248, 86, 86, 86, 86, + + 86, 1258, 1259, 1263, 1254, 1264, 1255, 86, 86, 86, + 1261, 86, 1266, 86, 1260, 1265, 1267, 86, 1262, 86, + 1271, 86, 86, 86, 86, 1270, 86, 1268, 86, 1277, + 86, 1273, 168, 1269, 86, 86, 86, 86, 86, 1272, + 86, 1282, 1274, 164, 86, 1284, 86, 1276, 1279, 1281, + 1280, 1275, 1278, 1283, 1286, 1287, 1288, 86, 1285, 86, + 86, 86, 1289, 86, 1291, 1290, 86, 86, 86, 86, + 86, 86, 86, 1294, 86, 1300, 86, 86, 1297, 86, + 1292, 1293, 86, 86, 1295, 86, 163, 1298, 1304, 1296, + 86, 1301, 86, 1299, 86, 1306, 1310, 1302, 1303, 86, + + 1311, 1314, 86, 86, 1307, 1305, 1308, 1312, 86, 1309, + 1313, 86, 86, 86, 86, 1316, 86, 1315, 86, 86, + 86, 1320, 86, 1319, 1323, 86, 86, 1317, 86, 1327, + 86, 1318, 1322, 86, 86, 86, 1324, 1321, 1328, 1325, + 1329, 86, 86, 1333, 1326, 1332, 1330, 1331, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 1339, + 86, 86, 86, 1334, 1335, 1337, 1338, 1340, 1344, 1336, + 86, 86, 86, 1341, 86, 1343, 1345, 1342, 1346, 1348, + 1347, 86, 86, 86, 86, 86, 1349, 86, 1356, 86, + 86, 1350, 86, 1351, 86, 1359, 86, 86, 1354, 1353, + + 1357, 1352, 1362, 1358, 1355, 86, 1364, 86, 1361, 86, + 1360, 1365, 86, 86, 1369, 1366, 86, 1363, 86, 1379, + 1383, 1367, 1368, 86, 1370, 86, 86, 1378, 1371, 1377, + 86, 1372, 1373, 86, 1380, 1381, 1374, 86, 86, 86, + 86, 86, 1375, 86, 1384, 1385, 1376, 1382, 86, 1386, + 86, 1388, 86, 86, 86, 1389, 86, 1390, 1387, 86, + 86, 1391, 86, 1393, 1395, 86, 1398, 1399, 86, 1525, + 1400, 1392, 86, 86, 1396, 86, 1394, 1402, 86, 1401, + 1397, 86, 1403, 86, 1404, 86, 1405, 1411, 1406, 86, + 1407, 1408, 1409, 1412, 86, 86, 1410, 1415, 86, 1413, + + 86, 86, 1416, 86, 1414, 86, 1419, 1417, 86, 86, + 86, 86, 1425, 86, 1426, 86, 86, 1421, 86, 1420, + 86, 86, 1418, 1427, 86, 1424, 1429, 86, 1422, 1423, + 1428, 86, 86, 1431, 1430, 1435, 86, 1434, 86, 1437, + 86, 86, 86, 1438, 86, 1432, 86, 1439, 86, 1443, + 86, 1440, 86, 1436, 1445, 86, 1433, 1442, 86, 1446, + 86, 1441, 86, 86, 86, 1447, 1450, 86, 86, 86, + 86, 86, 1444, 1452, 86, 1467, 1454, 86, 86, 86, + 1456, 86, 1457, 1448, 1449, 86, 1455, 86, 1451, 1453, + 1458, 86, 86, 1463, 1459, 1461, 1460, 1462, 86, 86, + + 86, 86, 1465, 1464, 86, 1466, 1468, 86, 86, 86, + 86, 1473, 1474, 1470, 1475, 1471, 86, 86, 86, 1476, + 86, 86, 1469, 1472, 86, 86, 1480, 86, 168, 1477, + 86, 86, 1479, 1485, 1486, 1478, 86, 86, 86, 86, + 86, 1488, 1487, 1482, 1481, 86, 86, 86, 86, 86, + 1483, 1489, 86, 1496, 1484, 86, 86, 1490, 1491, 86, + 1493, 86, 86, 1494, 1495, 1492, 1500, 1501, 86, 86, + 86, 86, 86, 1505, 1503, 1497, 86, 1499, 1506, 86, + 1508, 1498, 86, 86, 1509, 1502, 86, 86, 86, 1504, + 1507, 86, 1514, 1517, 86, 1515, 1510, 1516, 1511, 1519, + + 86, 1512, 86, 86, 1513, 86, 1520, 1522, 1518, 86, + 86, 1521, 1523, 86, 86, 1527, 86, 86, 86, 1528, + 86, 86, 1524, 1531, 86, 86, 86, 1526, 86, 1536, + 1537, 86, 86, 1540, 1529, 1533, 86, 1530, 86, 86, + 1532, 86, 1534, 1535, 86, 86, 86, 86, 1541, 1538, + 86, 1539, 1547, 86, 86, 1543, 86, 1542, 1549, 1544, + 1545, 1548, 86, 86, 1552, 1546, 86, 86, 1550, 86, + 1559, 1551, 86, 1556, 1557, 86, 1554, 1558, 1560, 86, + 86, 1553, 86, 86, 86, 86, 1565, 1566, 1561, 1555, + 1564, 1562, 86, 86, 1567, 86, 1568, 86, 1569, 86, + + 86, 1570, 86, 1571, 86, 1563, 86, 86, 86, 86, + 86, 86, 1578, 1572, 86, 86, 1577, 86, 86, 1574, + 86, 86, 1575, 1580, 1573, 1576, 1581, 1584, 86, 1589, + 1586, 1582, 1585, 86, 1579, 1587, 86, 1583, 86, 86, + 1588, 86, 86, 86, 86, 86, 1597, 1593, 86, 86, + 1592, 86, 86, 1598, 1600, 86, 86, 1590, 1591, 1603, + 86, 1602, 1594, 1596, 1595, 86, 86, 86, 86, 86, + 1601, 86, 1611, 161, 86, 1599, 86, 1609, 86, 86, + 86, 1612, 1614, 86, 1617, 1604, 1605, 1606, 1607, 1610, + 1608, 1613, 1615, 86, 86, 86, 86, 86, 86, 1616, + + 1621, 86, 86, 86, 1622, 1619, 86, 1625, 1618, 86, + 1620, 1629, 86, 86, 86, 86, 1631, 1623, 1626, 1624, + 1630, 86, 86, 86, 86, 1628, 1627, 1633, 1632, 1634, + 86, 86, 86, 1640, 1635, 1636, 1641, 86, 86, 86, + 86, 1637, 86, 1639, 86, 1645, 1646, 1644, 86, 86, + 1638, 86, 86, 1648, 86, 86, 1642, 86, 1649, 1650, + 86, 1643, 86, 86, 86, 1651, 1653, 1652, 1647, 86, + 1656, 1655, 86, 86, 86, 86, 86, 1654, 86, 1657, + 1660, 86, 1662, 86, 86, 1663, 86, 86, 1661, 86, + 1668, 86, 1659, 1658, 86, 86, 1664, 86, 1665, 86, + + 1671, 1669, 1673, 86, 86, 86, 1667, 86, 1674, 1666, + 168, 1675, 1670, 86, 1672, 86, 1676, 1679, 1678, 1677, + 86, 1682, 86, 86, 1680, 1681, 1683, 86, 86, 86, + 86, 86, 1690, 86, 86, 86, 86, 86, 1691, 1694, + 86, 1684, 1685, 1688, 1695, 86, 1686, 1687, 86, 86, + 1696, 1698, 1700, 1699, 1692, 1689, 1693, 1697, 86, 86, + 1702, 86, 1704, 86, 86, 86, 86, 86, 86, 86, + 1709, 1706, 1707, 86, 1710, 1703, 86, 86, 86, 1701, + 86, 86, 86, 1705, 1714, 86, 1715, 86, 86, 159, + 1711, 1722, 1708, 1713, 1717, 1712, 86, 86, 1716, 1719, + + 86, 86, 1720, 86, 1724, 1723, 86, 1718, 1730, 86, + 1731, 1727, 1726, 1728, 1721, 86, 86, 1732, 1729, 86, + 1725, 86, 1734, 86, 1733, 86, 1735, 1736, 86, 86, + 86, 86, 86, 86, 1737, 86, 1743, 1744, 1742, 86, + 1746, 1738, 86, 86, 1745, 86, 86, 86, 1739, 86, + 1740, 86, 1741, 86, 1748, 1749, 86, 86, 1750, 86, + 86, 86, 86, 86, 86, 1751, 86, 86, 1747, 1760, + 1759, 1752, 86, 1754, 1755, 1756, 86, 1753, 86, 1765, + 1757, 86, 86, 1761, 1762, 86, 86, 86, 1758, 1764, + 1763, 86, 1771, 86, 86, 86, 86, 86, 1767, 86, + + 1773, 1766, 86, 1775, 86, 1769, 1768, 86, 1770, 1774, + 86, 1776, 86, 1777, 1772, 86, 86, 86, 86, 1780, + 86, 86, 1782, 86, 1789, 1779, 1783, 1781, 1778, 1784, + 1790, 86, 1785, 1786, 1791, 86, 86, 86, 1787, 86, + 1794, 1793, 1795, 86, 86, 1788, 86, 86, 1792, 86, + 86, 1798, 1796, 86, 1799, 86, 86, 86, 86, 1802, + 1808, 86, 86, 1797, 1807, 1804, 1800, 1806, 1805, 1801, + 86, 86, 86, 86, 1803, 1810, 86, 1809, 86, 86, + 86, 1817, 86, 86, 86, 1814, 1812, 86, 1820, 1811, + 86, 1821, 1813, 1819, 86, 86, 1823, 1816, 1818, 1824, + + 1825, 86, 86, 1815, 1829, 1822, 86, 86, 86, 1830, + 86, 86, 1826, 1835, 86, 86, 1834, 1837, 86, 86, + 1828, 1831, 1827, 1832, 1838, 86, 86, 1840, 1833, 86, + 86, 1839, 1836, 86, 86, 1841, 1844, 86, 86, 86, + 1848, 1846, 86, 86, 86, 1842, 86, 1847, 1843, 86, + 1845, 1849, 86, 86, 86, 86, 86, 1852, 1850, 1858, + 86, 1853, 1860, 1851, 86, 1861, 1854, 1855, 86, 1856, + 1857, 86, 1863, 86, 86, 86, 86, 1862, 1867, 86, + 1869, 1859, 86, 86, 86, 86, 86, 1873, 86, 86, + 86, 86, 3291, 1865, 1864, 1866, 1868, 86, 86, 1879, + + 1871, 1875, 86, 1872, 1870, 86, 86, 1876, 168, 1874, + 1877, 1878, 86, 1882, 1880, 1883, 86, 86, 86, 86, + 1881, 1887, 86, 86, 86, 86, 86, 86, 1894, 1885, + 1889, 1884, 86, 1888, 86, 86, 1890, 1886, 1891, 86, + 86, 1897, 1898, 86, 1892, 86, 86, 1893, 1899, 86, + 1896, 1895, 1900, 86, 1901, 1902, 1903, 1904, 86, 86, + 1908, 86, 86, 1906, 86, 86, 86, 1907, 86, 86, + 86, 1905, 86, 86, 1912, 1913, 86, 86, 86, 86, + 3291, 1914, 1917, 86, 1910, 1915, 1911, 1909, 1918, 86, + 86, 1916, 86, 1926, 1923, 1921, 1925, 86, 1920, 86, + + 86, 1919, 1922, 86, 1927, 86, 86, 1924, 86, 86, + 1932, 86, 1935, 1936, 86, 1937, 86, 86, 86, 1928, + 86, 1930, 1929, 1933, 86, 1934, 1931, 1939, 86, 86, + 1940, 1943, 86, 86, 86, 86, 1945, 1938, 1944, 1941, + 86, 1942, 86, 1946, 1947, 86, 1949, 86, 1951, 1950, + 86, 1948, 86, 1952, 86, 1953, 86, 1955, 86, 86, + 86, 1954, 1956, 86, 1959, 1958, 86, 1961, 86, 86, + 86, 1960, 86, 86, 86, 86, 86, 86, 1969, 1975, + 1957, 1962, 1963, 1964, 86, 86, 1967, 1976, 1965, 1973, + 1966, 1971, 1968, 86, 1970, 1978, 1972, 86, 86, 86, + + 1974, 86, 86, 1982, 86, 86, 86, 1979, 1977, 86, + 1984, 86, 86, 1987, 1988, 86, 86, 1990, 86, 1980, + 86, 86, 86, 1981, 86, 86, 1985, 1996, 86, 1995, + 1992, 1983, 86, 1986, 1993, 86, 1989, 86, 86, 1998, + 86, 86, 2002, 1994, 1999, 1991, 86, 2000, 86, 86, + 2006, 86, 86, 1997, 2005, 2009, 86, 2010, 86, 2008, + 86, 86, 86, 86, 2004, 2012, 2001, 2011, 86, 86, + 86, 2007, 2003, 86, 86, 86, 86, 2015, 2013, 2017, + 86, 2020, 2014, 2021, 2022, 2016, 86, 86, 2018, 86, + 86, 2025, 86, 86, 86, 2023, 2030, 86, 86, 2029, + + 2019, 2024, 86, 86, 86, 86, 86, 2026, 2034, 86, + 86, 2035, 2027, 2037, 86, 2028, 86, 2031, 2032, 2036, + 2038, 2033, 86, 2041, 86, 86, 86, 2042, 2044, 86, + 86, 2045, 86, 2039, 2048, 86, 86, 86, 2040, 2043, + 86, 2050, 2051, 86, 86, 2052, 2054, 2049, 86, 2046, + 2047, 86, 2053, 2058, 86, 2057, 2059, 86, 2060, 2062, + 2063, 86, 2055, 2061, 86, 86, 86, 2056, 86, 86, + 2067, 86, 86, 2065, 86, 86, 86, 86, 2069, 2072, + 2074, 2066, 86, 2068, 2070, 86, 86, 2064, 168, 86, + 86, 86, 86, 2075, 2076, 2080, 2079, 86, 2081, 2073, + + 2071, 2077, 2082, 86, 2083, 86, 86, 2085, 86, 2078, + 86, 86, 86, 86, 2086, 2087, 86, 2088, 86, 2091, + 86, 2089, 86, 2090, 86, 2093, 2084, 86, 86, 2097, + 86, 86, 2092, 2096, 2094, 86, 86, 86, 2101, 2095, + 2098, 2099, 2100, 2102, 86, 86, 86, 86, 86, 86, + 2109, 2107, 86, 86, 86, 2104, 86, 2108, 86, 86, + 86, 2114, 86, 2111, 86, 2103, 2105, 86, 2106, 86, + 86, 2110, 2115, 2113, 86, 2119, 2112, 86, 2117, 2120, + 2116, 86, 86, 86, 2118, 86, 2123, 86, 2122, 2121, + 2125, 86, 86, 86, 2131, 2124, 2126, 86, 86, 2127, + + 86, 2128, 2129, 86, 2133, 86, 2130, 2134, 2135, 86, + 86, 2137, 86, 86, 2132, 86, 2138, 2141, 2136, 2140, + 86, 2139, 86, 86, 86, 86, 86, 2142, 86, 2145, + 86, 86, 86, 2146, 86, 86, 86, 86, 86, 86, + 86, 3291, 2148, 2149, 2143, 2144, 2154, 2147, 2151, 2150, + 2153, 2158, 2159, 86, 86, 86, 86, 2156, 2152, 2155, + 86, 2157, 86, 2162, 86, 86, 86, 2163, 2166, 2165, + 86, 86, 2160, 86, 86, 2161, 2164, 2169, 2168, 86, + 2170, 86, 86, 2167, 2174, 86, 86, 86, 2172, 2176, + 2178, 86, 2171, 2173, 86, 86, 86, 2181, 86, 86, + + 2177, 2180, 86, 2182, 2175, 86, 2186, 2183, 86, 86, + 86, 86, 86, 2187, 86, 2192, 86, 2184, 2189, 86, + 2179, 86, 2188, 86, 2193, 2185, 2196, 86, 2191, 2198, + 2190, 86, 86, 86, 2194, 86, 2197, 86, 2202, 86, + 86, 2195, 86, 2204, 86, 2200, 86, 2203, 86, 2205, + 86, 2199, 86, 2201, 86, 2206, 2211, 2207, 2208, 2209, + 86, 2213, 2210, 86, 86, 2212, 2214, 86, 86, 2215, + 86, 86, 86, 2218, 86, 2216, 2217, 2219, 86, 2223, + 86, 86, 86, 2220, 86, 86, 86, 2222, 86, 86, + 86, 2221, 2224, 86, 86, 2232, 2229, 2230, 2226, 2225, + + 2227, 86, 2234, 2228, 86, 86, 2233, 86, 86, 2231, + 2235, 2237, 86, 2243, 86, 86, 86, 2238, 2245, 86, + 86, 86, 2239, 2236, 2242, 2244, 2240, 86, 86, 168, + 2251, 2247, 2253, 2248, 2249, 2252, 86, 2241, 86, 2246, + 2254, 86, 86, 86, 2255, 86, 86, 2258, 86, 86, + 2256, 2250, 86, 2259, 2262, 2263, 86, 86, 2264, 86, + 2267, 2265, 2272, 2257, 86, 86, 86, 2260, 86, 2268, + 86, 2269, 2270, 86, 86, 86, 86, 2266, 2261, 2271, + 2273, 86, 86, 86, 86, 2274, 2275, 86, 2278, 86, + 86, 86, 86, 86, 2281, 2276, 86, 2285, 2287, 86, + + 86, 86, 2280, 86, 2288, 86, 2277, 2279, 2282, 2283, + 2290, 2284, 86, 86, 86, 86, 2289, 86, 2286, 86, + 2295, 2298, 86, 86, 86, 2293, 86, 86, 86, 2291, + 2292, 2299, 2296, 2294, 86, 2297, 86, 86, 86, 86, + 86, 3291, 86, 2300, 86, 2301, 2311, 2313, 86, 2306, + 2302, 86, 2303, 2304, 2308, 2309, 2314, 2305, 2310, 2307, + 86, 86, 2312, 86, 2315, 86, 86, 86, 86, 2319, + 2320, 86, 86, 86, 2321, 86, 2316, 2322, 86, 2317, + 2318, 2323, 86, 2325, 2326, 86, 2324, 2327, 2328, 86, + 2329, 86, 86, 86, 86, 86, 86, 2330, 2331, 2335, + + 86, 2336, 86, 2338, 86, 2332, 86, 2334, 2340, 86, + 86, 86, 2343, 86, 2333, 2337, 2342, 2344, 86, 86, + 86, 86, 86, 86, 2339, 2341, 2350, 86, 2349, 2346, + 86, 2352, 86, 2345, 86, 2347, 86, 86, 86, 2356, + 2355, 2348, 2354, 2358, 86, 86, 86, 86, 86, 2351, + 2362, 86, 2353, 86, 2357, 86, 86, 2367, 86, 86, + 2366, 2360, 86, 86, 2359, 86, 2361, 2369, 2363, 86, + 2365, 2372, 86, 86, 86, 86, 2364, 86, 2368, 86, + 2370, 2374, 86, 2373, 2371, 86, 2379, 2375, 86, 86, + 2381, 2380, 2382, 2376, 86, 2377, 86, 86, 86, 86, + + 86, 2386, 2387, 86, 86, 2378, 2385, 2383, 2391, 2384, + 86, 86, 2389, 86, 2396, 2393, 2394, 86, 2398, 86, + 86, 2390, 86, 2388, 86, 86, 86, 2399, 2395, 86, + 2392, 2400, 86, 86, 2404, 2403, 86, 86, 2397, 86, + 86, 3291, 2402, 2409, 2401, 2405, 2406, 2408, 2407, 86, + 2410, 86, 86, 86, 2414, 2411, 86, 2415, 86, 2416, + 2412, 2413, 86, 86, 168, 86, 86, 2417, 86, 2418, + 86, 2423, 86, 86, 86, 2425, 86, 86, 86, 2434, + 86, 2421, 2419, 2424, 2420, 2426, 2422, 86, 86, 2429, + 2427, 2428, 86, 2431, 3291, 2430, 86, 2435, 2432, 2433, + + 2436, 86, 86, 86, 2439, 2437, 2440, 86, 2438, 86, + 86, 86, 86, 2442, 86, 86, 2441, 86, 2444, 86, + 86, 2448, 2449, 2443, 86, 2446, 86, 2445, 86, 2451, + 86, 86, 86, 86, 2452, 2453, 2454, 86, 2447, 86, + 2450, 86, 2456, 86, 2455, 2460, 86, 2459, 86, 86, + 2457, 2458, 86, 86, 2462, 86, 86, 86, 86, 2469, + 2466, 2461, 86, 2468, 86, 86, 86, 86, 2470, 2465, + 86, 86, 2463, 2464, 86, 2474, 86, 2467, 86, 86, + 2484, 2479, 2471, 2478, 86, 2472, 2473, 86, 2476, 86, + 2477, 86, 2475, 2481, 86, 86, 86, 2480, 2483, 2485, + + 86, 2487, 86, 2482, 2489, 86, 2488, 2491, 86, 86, + 86, 2493, 86, 86, 86, 86, 86, 2490, 2492, 86, + 2497, 2486, 86, 86, 86, 2501, 86, 2499, 2495, 2500, + 2503, 2494, 2496, 2502, 86, 86, 86, 86, 2504, 2505, + 86, 86, 86, 2510, 86, 2498, 2507, 86, 86, 2512, + 86, 2515, 86, 86, 2509, 86, 2511, 2506, 86, 2508, + 86, 2516, 86, 2519, 86, 2514, 2513, 2520, 86, 2521, + 86, 86, 2517, 86, 86, 2525, 86, 86, 2518, 2524, + 2523, 86, 86, 86, 86, 2532, 86, 2529, 2522, 2531, + 2526, 2527, 86, 2528, 2533, 86, 2534, 86, 2535, 86, + + 86, 86, 86, 2530, 2536, 86, 2538, 86, 2539, 86, + 2540, 86, 86, 86, 2541, 2545, 86, 2542, 2537, 2547, + 86, 2548, 86, 86, 86, 86, 86, 86, 2544, 86, + 86, 2543, 2546, 2551, 2549, 2554, 2550, 2552, 86, 2557, + 86, 86, 86, 86, 86, 86, 86, 2553, 86, 2555, + 2558, 86, 168, 86, 2565, 86, 86, 2561, 2556, 86, + 2563, 86, 86, 2560, 2564, 2566, 2567, 3291, 2559, 2562, + 2568, 2571, 86, 86, 86, 2572, 2573, 2569, 2574, 2575, + 2576, 86, 86, 2570, 2577, 86, 86, 2578, 86, 2579, + 86, 2580, 86, 86, 86, 86, 86, 86, 86, 86, + + 2581, 86, 86, 2582, 2591, 86, 86, 86, 2589, 2584, + 86, 86, 2583, 86, 2586, 2585, 86, 2595, 2588, 2587, + 2599, 2590, 2596, 86, 2593, 2592, 86, 2597, 2594, 2598, + 2600, 86, 2602, 86, 86, 2601, 86, 86, 86, 86, + 86, 86, 86, 86, 2605, 2611, 86, 2612, 86, 86, + 86, 86, 2603, 2606, 2604, 2618, 2615, 2607, 2608, 2609, + 2610, 86, 2613, 2616, 86, 2617, 86, 2614, 86, 2619, + 86, 86, 86, 86, 86, 86, 86, 2623, 2627, 86, + 2626, 2628, 86, 2620, 86, 2622, 2629, 2630, 86, 2621, + 86, 86, 86, 2624, 2625, 86, 86, 86, 2631, 2632, + + 86, 2636, 86, 86, 2634, 86, 2640, 2641, 86, 86, + 2633, 2644, 86, 86, 86, 2635, 86, 2637, 2645, 2638, + 2642, 86, 2639, 2648, 86, 2647, 86, 2643, 2646, 2649, + 86, 86, 2653, 86, 86, 86, 86, 2657, 86, 86, + 2656, 2650, 2659, 86, 2655, 86, 2654, 86, 86, 86, + 2651, 2652, 2660, 86, 2661, 2664, 86, 86, 2658, 86, + 2665, 2663, 2667, 86, 2662, 86, 86, 86, 86, 86, + 2668, 2672, 86, 2674, 86, 2666, 2670, 2671, 2669, 86, + 86, 2673, 86, 2677, 2675, 2676, 86, 2678, 86, 86, + 86, 86, 86, 86, 2679, 86, 86, 2684, 2681, 2682, + + 2685, 2687, 86, 2688, 86, 2683, 86, 2680, 2686, 2689, + 168, 86, 86, 2690, 2692, 2694, 2691, 86, 86, 2696, + 86, 86, 2695, 86, 2699, 86, 2700, 86, 2698, 86, + 2693, 2702, 86, 86, 2704, 2697, 2703, 86, 86, 2705, + 86, 86, 2701, 2706, 2709, 86, 2707, 86, 86, 2710, + 86, 2708, 2711, 86, 86, 86, 86, 2712, 2716, 2717, + 86, 2718, 2714, 86, 86, 86, 86, 86, 2713, 86, + 2720, 2721, 2719, 86, 86, 86, 2715, 2722, 2724, 2723, + 2725, 86, 86, 86, 86, 2730, 86, 2726, 86, 86, + 2733, 2728, 2729, 86, 2727, 2731, 86, 86, 86, 2734, + + 86, 2738, 86, 86, 86, 2739, 2732, 86, 2735, 86, + 2743, 86, 86, 2741, 86, 86, 86, 2736, 86, 2737, + 2747, 3291, 2740, 2755, 2742, 2750, 2744, 2745, 2748, 86, + 2751, 86, 2752, 86, 2746, 86, 86, 86, 86, 86, + 2749, 2753, 86, 2754, 86, 86, 2756, 2759, 2758, 86, + 2761, 86, 2757, 2763, 86, 2764, 86, 2765, 86, 86, + 2760, 86, 86, 2766, 2768, 86, 2767, 86, 86, 2762, + 2772, 86, 2770, 86, 2775, 2773, 86, 2776, 86, 86, + 2771, 86, 2769, 2777, 86, 86, 86, 86, 2778, 2782, + 86, 2774, 2779, 86, 2783, 2784, 86, 2786, 86, 2780, + + 86, 86, 2785, 86, 2790, 86, 2781, 2791, 86, 2792, + 86, 86, 86, 2787, 86, 2793, 86, 2789, 86, 2788, + 2794, 86, 2799, 86, 2798, 2802, 86, 2801, 86, 86, + 86, 86, 2796, 86, 2795, 2803, 2797, 2804, 86, 2800, + 86, 2805, 86, 2807, 86, 2808, 86, 2811, 86, 86, + 2809, 2810, 2815, 86, 86, 86, 2806, 2817, 86, 86, + 86, 2822, 86, 2814, 2812, 2818, 2823, 86, 2813, 2816, + 2821, 2824, 2819, 2827, 86, 86, 2825, 86, 2820, 2826, + 86, 2828, 86, 2829, 86, 2830, 86, 2831, 86, 86, + 86, 2832, 86, 2833, 86, 86, 86, 2836, 86, 86, + + 2838, 2842, 86, 2843, 86, 2839, 86, 86, 86, 2834, + 2844, 2846, 86, 2837, 86, 2847, 2835, 86, 2840, 2841, + 2848, 86, 2849, 2851, 2845, 2850, 86, 86, 86, 86, + 2855, 86, 86, 86, 86, 86, 2852, 2853, 2856, 2859, + 86, 2857, 86, 86, 2860, 86, 86, 2854, 2858, 86, + 2863, 2862, 86, 2861, 2864, 2865, 86, 2866, 86, 86, + 2868, 2869, 86, 86, 86, 86, 2867, 86, 2870, 2875, + 86, 86, 86, 2873, 2871, 86, 2878, 2879, 86, 2876, + 86, 2880, 86, 2883, 86, 2874, 2884, 2881, 2872, 2882, + 86, 2877, 2885, 86, 2886, 86, 2887, 86, 86, 2888, + + 86, 86, 2892, 86, 86, 86, 2891, 86, 86, 2893, + 2894, 2895, 86, 86, 86, 86, 2901, 86, 2889, 2890, + 2899, 2896, 86, 2903, 86, 2897, 86, 86, 2898, 86, + 2904, 86, 2900, 86, 2905, 86, 2906, 86, 2907, 86, + 2912, 86, 2902, 86, 86, 86, 2908, 86, 2909, 2915, + 2910, 86, 86, 86, 86, 2921, 2913, 2914, 86, 2911, + 2916, 2919, 86, 2917, 86, 86, 86, 2920, 2925, 86, + 86, 2918, 86, 2922, 2927, 86, 2923, 2928, 86, 2930, + 86, 86, 86, 86, 86, 2926, 2931, 86, 2934, 2935, + 86, 2924, 86, 2929, 86, 2939, 86, 2932, 2933, 86, + + 2942, 86, 86, 2944, 2936, 86, 86, 86, 86, 86, + 2937, 2938, 2945, 2940, 86, 2941, 2947, 86, 2948, 86, + 2950, 86, 2943, 86, 2955, 2952, 2949, 2946, 2954, 86, + 86, 86, 2953, 86, 2959, 86, 86, 86, 2961, 2960, + 2951, 86, 86, 2957, 2964, 2965, 86, 86, 2956, 86, + 86, 2967, 2966, 2958, 2962, 86, 86, 86, 2970, 86, + 2969, 2963, 86, 2973, 86, 2968, 86, 2971, 86, 86, + 2976, 86, 86, 86, 86, 2972, 2981, 86, 2977, 86, + 86, 2974, 2975, 2985, 86, 86, 2978, 2980, 86, 2984, + 2986, 86, 2982, 2987, 86, 2983, 86, 2979, 86, 2988, + + 86, 2989, 2990, 86, 2991, 86, 2992, 86, 2995, 86, + 86, 2993, 2997, 86, 86, 2996, 86, 86, 86, 2998, + 2994, 86, 3002, 3003, 86, 86, 86, 3007, 86, 3008, + 86, 2999, 3004, 86, 3009, 3006, 86, 86, 3000, 3001, + 86, 86, 3012, 3013, 86, 3005, 3014, 86, 86, 86, + 3017, 86, 86, 3010, 3015, 3011, 86, 3020, 86, 86, + 3019, 3022, 3016, 3018, 3021, 86, 86, 86, 86, 86, + 86, 3024, 86, 86, 3026, 86, 86, 3027, 86, 3025, + 86, 86, 86, 86, 3039, 3023, 3036, 3037, 86, 3028, + 86, 3032, 3029, 3030, 3031, 3033, 3034, 86, 86, 3044, + + 86, 3035, 3040, 3038, 86, 3045, 86, 3042, 3041, 86, + 86, 3043, 86, 3046, 3047, 86, 3291, 3048, 3050, 86, + 3051, 86, 3052, 3053, 86, 86, 86, 3054, 3055, 3049, + 86, 3056, 3057, 86, 86, 3059, 86, 3058, 86, 86, + 3061, 86, 3060, 3065, 86, 86, 3064, 86, 86, 86, + 86, 86, 3068, 86, 3067, 86, 3073, 3082, 3062, 3063, + 3069, 86, 3072, 86, 3070, 3074, 86, 86, 3071, 86, + 3066, 3075, 86, 86, 3077, 3080, 3076, 86, 86, 86, + 3081, 86, 3078, 86, 3086, 3079, 86, 3291, 3087, 3089, + 86, 3090, 3083, 3084, 86, 3092, 86, 86, 3085, 86, + + 3091, 3093, 86, 86, 86, 3088, 3096, 86, 3095, 3097, + 86, 3099, 86, 3098, 3094, 3100, 86, 3101, 86, 3102, + 86, 3103, 86, 3104, 86, 3105, 86, 86, 3107, 86, + 86, 86, 86, 86, 86, 86, 3106, 3112, 86, 3108, + 86, 86, 86, 3109, 86, 3116, 86, 3115, 3113, 3118, + 86, 86, 3110, 3111, 3114, 3117, 86, 86, 3122, 3120, + 3119, 86, 3125, 86, 3124, 86, 86, 86, 86, 3123, + 3127, 86, 3121, 86, 86, 86, 86, 3126, 3133, 3131, + 86, 86, 86, 3130, 3132, 3128, 86, 86, 86, 3129, + 3136, 3134, 3138, 86, 3137, 3139, 86, 3140, 86, 86, + + 86, 86, 3145, 86, 3143, 3141, 3135, 86, 3142, 3146, + 86, 86, 3148, 3149, 3147, 86, 3151, 86, 86, 86, + 86, 3144, 86, 86, 86, 3150, 86, 86, 86, 86, + 3152, 3160, 3158, 86, 3162, 3155, 86, 3153, 3154, 3157, + 3159, 3164, 86, 86, 3167, 86, 86, 3156, 3161, 3169, + 86, 86, 3170, 3163, 86, 3168, 3165, 3171, 86, 3172, + 86, 86, 86, 3166, 86, 3175, 86, 86, 86, 3176, + 3180, 3177, 86, 3173, 86, 86, 86, 3184, 86, 3183, + 86, 3174, 86, 3179, 3186, 86, 3181, 3182, 3187, 86, + 86, 86, 3178, 3190, 86, 86, 86, 3188, 3193, 86, + + 3185, 86, 3194, 86, 3195, 3197, 3191, 86, 3198, 3189, + 86, 86, 86, 3192, 86, 86, 3203, 86, 3204, 86, + 3202, 3199, 3196, 3200, 86, 86, 86, 86, 86, 86, + 86, 3201, 3208, 86, 3210, 86, 86, 86, 86, 3207, + 86, 3215, 86, 3216, 86, 3205, 3206, 3209, 3212, 3211, + 3213, 3223, 3214, 3217, 86, 3221, 86, 86, 86, 86, + 3218, 3220, 3219, 3222, 86, 3224, 86, 86, 86, 3229, + 86, 3225, 3226, 3227, 86, 86, 3230, 86, 3228, 3231, + 3232, 86, 86, 86, 86, 86, 3233, 3238, 86, 3234, + 3235, 86, 86, 86, 86, 3241, 3242, 86, 86, 86, + + 86, 86, 86, 3236, 3237, 3240, 3245, 3239, 3243, 86, + 3246, 3244, 86, 3248, 86, 3249, 86, 3247, 86, 3253, + 86, 3250, 3251, 86, 3255, 86, 3256, 86, 3252, 86, + 86, 3254, 3257, 3260, 86, 3261, 3258, 86, 86, 3259, + 3262, 3263, 86, 86, 3264, 86, 86, 86, 3269, 86, + 3265, 3267, 86, 86, 86, 86, 86, 86, 3271, 3272, + 86, 3275, 3276, 86, 3266, 86, 3268, 86, 3279, 3280, + 86, 3270, 86, 86, 3273, 3274, 3277, 3282, 86, 3281, + 3283, 86, 86, 86, 3278, 86, 86, 3291, 3285, 3284, + 3286, 3291, 3287, 3289, 86, 3290, 86, 3291, 3291, 3291, + + 3291, 3291, 3291, 3291, 3291, 3288, 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, 3291, 89, 89, + 89, 89, 158, 158, 3291, 3291, 3291, 158, 158, 160, + 160, 3291, 3291, 160, 3291, 160, 162, 3291, 3291, 3291, + 3291, 3291, 162, 165, 165, 3291, 3291, 3291, 165, 165, + 167, 3291, 3291, 3291, 3291, 3291, 167, 169, 169, 3291, + + 169, 169, 169, 169, 172, 3291, 3291, 3291, 3291, 3291, + 172, 175, 175, 3291, 3291, 3291, 175, 175, 90, 90, + 3291, 90, 90, 90, 90, 17, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291 } ; -static const flex_int16_t yy_chk[6448] = +static const flex_int16_t yy_chk[6467] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -2224,18 +2231,18 @@ static const flex_int16_t yy_chk[6448] = 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, 3288, 35, + 10, 10, 19, 29, 9, 33, 19, 29, 3299, 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, 2682, 16, + 16, 23, 23, 25, 27, 27, 25, 25, 2689, 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, 1078, 32, 36, 36, 37, 37, + 28, 92, 31, 32, 1082, 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, @@ -2251,9 +2258,9 @@ static const flex_int16_t yy_chk[6448] = 104, 114, 111, 113, 108, 110, 110, 113, 116, 115, 112, 109, 117, 110, 115, 117, 119, 118, 117, 120, - 123, 114, 116, 118, 120, 126, 121, 122, 732, 121, + 123, 114, 116, 118, 120, 126, 121, 122, 734, 121, 125, 117, 117, 121, 123, 119, 124, 125, 126, 128, - 124, 127, 118, 129, 120, 732, 122, 130, 127, 121, + 124, 127, 118, 129, 120, 734, 122, 130, 127, 121, 131, 122, 128, 132, 131, 133, 134, 135, 135, 136, 133, 139, 137, 129, 133, 130, 137, 138, 143, 140, 142, 132, 144, 148, 143, 137, 134, 141, 147, 136, @@ -2311,620 +2318,622 @@ static const flex_int16_t yy_chk[6448] = 356, 350, 348, 352, 357, 349, 356, 358, 359, 360, 354, 359, 358, 359, 361, 362, 364, 361, 358, 365, 365, 366, 364, 360, 362, 367, 366, 371, 367, 369, - 361, 370, 401, 361, 367, 361, 372, 375, 367, 373, - 375, 376, 371, 378, 401, 379, 367, 368, 368, 369, - 368, 372, 370, 373, 379, 376, 375, 382, 378, 380, - - 383, 381, 384, 368, 380, 380, 368, 381, 368, 386, - 368, 377, 385, 377, 377, 388, 387, 384, 382, 383, - 389, 385, 387, 377, 390, 377, 377, 377, 386, 391, - 377, 392, 393, 394, 395, 391, 392, 396, 390, 391, - 389, 388, 396, 397, 398, 399, 399, 400, 402, 395, - 398, 403, 393, 394, 392, 404, 405, 403, 397, 406, - 407, 407, 402, 407, 406, 408, 409, 400, 410, 411, - 417, 413, 405, 413, 413, 414, 419, 415, 418, 414, - 404, 415, 409, 411, 410, 408, 416, 416, 420, 417, - 421, 413, 419, 418, 422, 423, 415, 426, 425, 424, - - 423, 428, 426, 422, 421, 424, 420, 425, 423, 423, - 428, 427, 423, 423, 422, 427, 422, 429, 430, 431, - 432, 435, 434, 429, 432, 431, 433, 434, 164, 433, - 436, 436, 437, 438, 438, 439, 440, 441, 441, 430, - 439, 435, 442, 443, 444, 437, 445, 443, 442, 440, - 446, 447, 448, 448, 449, 446, 447, 450, 451, 444, - 452, 448, 453, 455, 454, 453, 449, 445, 454, 456, - 456, 458, 452, 457, 460, 455, 451, 450, 457, 459, - 459, 462, 462, 463, 470, 464, 465, 466, 467, 471, - 469, 472, 458, 464, 476, 465, 460, 473, 477, 476, - - 467, 162, 470, 473, 463, 472, 474, 466, 469, 471, - 469, 475, 477, 478, 480, 474, 479, 475, 481, 479, - 482, 478, 483, 485, 478, 486, 482, 484, 480, 485, - 484, 487, 488, 481, 489, 491, 487, 490, 492, 486, - 491, 490, 483, 493, 494, 495, 496, 485, 493, 499, - 537, 502, 500, 492, 488, 489, 503, 501, 504, 496, - 494, 501, 504, 506, 495, 497, 497, 500, 537, 499, - 502, 497, 503, 497, 508, 507, 514, 505, 506, 497, - 507, 497, 505, 509, 497, 497, 505, 511, 510, 513, - 508, 497, 509, 508, 510, 512, 514, 516, 512, 510, - - 515, 515, 518, 511, 517, 517, 519, 521, 520, 522, - 523, 524, 513, 525, 526, 523, 160, 518, 519, 527, - 524, 529, 516, 520, 530, 527, 521, 531, 530, 526, - 529, 522, 525, 531, 532, 533, 534, 535, 536, 538, - 540, 539, 540, 538, 541, 650, 532, 650, 542, 545, - 533, 535, 547, 536, 539, 534, 542, 543, 543, 544, - 546, 545, 549, 550, 547, 544, 546, 548, 541, 551, - 548, 553, 552, 554, 551, 552, 549, 555, 550, 556, - 553, 567, 555, 555, 557, 557, 567, 553, 564, 554, - 553, 559, 556, 558, 558, 560, 560, 559, 561, 561, - - 562, 565, 563, 568, 569, 571, 562, 563, 563, 564, - 571, 566, 569, 565, 566, 570, 572, 573, 570, 574, - 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, 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 1736, 1724, 1737, 1725, 1726, 1727, 1729, 18, 1729, 1744, - 1733, 1734, 1734, 1735, 1735, 1738, 1738, 1741, 1739, 1740, - 1741, 1736, 1739, 1737, 1743, 1740, 1745, 1744, 1746, 1749, - 1743, 1747, 1745, 1750, 1747, 1748, 1748, 1752, 1750, 1751, - 1751, 1753, 1754, 1755, 1755, 1756, 1758, 1754, 1757, 1749, - 1756, 1759, 1752, 1746, 1757, 1760, 1761, 1762, 1758, 1758, - 1758, 1763, 1753, 1762, 1765, 1758, 1766, 1767, 1769, 1765, - 1765, 1759, 1768, 1760, 1768, 1770, 1761, 1771, 1772, 1769, - 1766, 1763, 1767, 1771, 1773, 1774, 1776, 1772, 1775, 1775, - 1770, 1777, 1777, 1778, 1779, 1780, 1780, 1781, 1781, 1782, - - 1785, 1785, 1786, 1790, 1773, 1787, 1774, 1793, 1789, 1791, - 1792, 1792, 1776, 1778, 1787, 1791, 1779, 1789, 1794, 1782, - 1797, 1796, 1795, 1799, 1790, 1798, 1798, 1786, 1793, 1795, - 1796, 1800, 1802, 1794, 1803, 1804, 1805, 1802, 1806, 1807, - 1803, 1808, 1808, 1805, 1806, 1807, 1797, 1800, 1809, 1799, - 1810, 1811, 1813, 1809, 1812, 1804, 1815, 1814, 1816, 1810, - 1814, 1817, 1817, 1818, 1813, 1820, 1819, 1821, 1824, 1818, - 1825, 1811, 1819, 1812, 1815, 1822, 1826, 1827, 1827, 1822, - 1828, 1826, 1821, 1829, 1816, 1820, 1831, 1832, 1824, 17, - 1833, 1832, 1825, 1834, 1839, 1822, 1833, 1837, 1829, 1828, - - 1835, 1835, 1834, 1836, 1840, 1831, 1841, 1836, 1837, 1838, - 1838, 1842, 1843, 1837, 1844, 1839, 1842, 1845, 1840, 1847, - 1846, 1848, 1848, 1845, 1847, 1841, 1849, 1849, 1852, 1850, - 1853, 1854, 1843, 1850, 1844, 1846, 1861, 1852, 1855, 1855, - 1862, 1853, 1857, 1857, 1858, 1862, 1853, 1859, 1860, 1858, - 1858, 1854, 1863, 1859, 1860, 1864, 1866, 1868, 1869, 1867, - 1870, 1864, 1861, 1867, 1863, 1871, 1870, 1872, 1866, 1868, - 1873, 1877, 1874, 1872, 1876, 1873, 1878, 1880, 1881, 1881, - 1880, 1878, 1884, 1869, 1874, 1927, 1876, 1871, 1882, 1882, - 1877, 1883, 1883, 1885, 1886, 1889, 1887, 1888, 1927, 1885, - - 1886, 1887, 1884, 1888, 1889, 1891, 1893, 1894, 1897, 1893, - 1891, 1895, 1895, 1898, 1900, 1900, 1899, 1901, 1902, 1894, - 1897, 1899, 1903, 1902, 1906, 1898, 1901, 1903, 1904, 1905, - 1905, 1904, 1907, 1908, 1909, 1910, 1913, 1911, 1914, 1910, - 1912, 1907, 1911, 1915, 1906, 1916, 1912, 1914, 1918, 1918, - 1919, 1908, 1925, 1909, 1913, 1920, 1921, 1921, 1923, 1916, - 1918, 1915, 1922, 1922, 1920, 1924, 1926, 1923, 1919, 1930, - 1930, 1926, 1932, 1925, 1933, 1932, 1934, 1924, 1936, 1938, - 1937, 1939, 1940, 1940, 1941, 1938, 1941, 1942, 1942, 1943, - 1933, 1948, 1934, 1936, 1937, 1945, 1945, 1943, 1939, 1946, - - 1946, 1949, 1950, 1951, 1952, 1953, 1955, 1949, 1950, 1956, - 1951, 1954, 1954, 1961, 1948, 1955, 1957, 1958, 1959, 1960, - 1962, 1963, 1965, 1966, 1967, 1953, 1952, 1963, 1957, 1958, - 1956, 1960, 1969, 1959, 1970, 1962, 1967, 1968, 1968, 1961, - 1963, 1971, 1965, 1972, 1971, 1973, 1966, 1975, 1972, 1976, - 1969, 1976, 1975, 1977, 1970, 1978, 1979, 1981, 1983, 1984, - 1978, 1985, 1986, 1979, 1986, 1973, 1981, 1987, 1984, 1990, - 1989, 1977, 1989, 1985, 1991, 1991, 1983, 1992, 1994, 1993, - 1994, 1997, 1995, 1990, 1993, 1996, 1987, 1995, 1998, 1999, - 1996, 2000, 2001, 2002, 2004, 1999, 2000, 2005, 2009, 1997, - - 2008, 2002, 2012, 1992, 2012, 2001, 2006, 2006, 1998, 2007, - 2007, 2005, 2011, 2004, 2010, 2008, 2013, 2011, 2009, 2014, - 2010, 2015, 2015, 2019, 2016, 2017, 2017, 2014, 2018, 2018, - 2021, 2023, 2019, 2020, 2013, 2014, 2016, 2024, 2020, 2024, - 2023, 2025, 2027, 2023, 2026, 2028, 2030, 2031, 2021, 2026, - 2026, 2027, 2031, 2034, 2032, 2035, 2036, 2028, 2030, 2032, - 2037, 2037, 2025, 2038, 2039, 2036, 2034, 2040, 2044, 2046, - 2041, 2042, 2047, 2045, 2048, 2035, 2055, 2047, 2049, 2048, - 2044, 2038, 2039, 2040, 2041, 2045, 2042, 2049, 2052, 2046, - 2054, 2056, 2057, 2058, 2052, 2059, 2054, 2060, 2060, 2055, - - 2061, 2062, 2062, 2063, 2059, 2067, 2056, 2052, 2064, 2061, - 2057, 2065, 2064, 2066, 2068, 2069, 2065, 2070, 2058, 2068, - 2068, 2069, 2063, 2070, 2072, 2071, 2066, 2067, 2071, 2073, - 2076, 2076, 2072, 2077, 2077, 2078, 2079, 2079, 2080, 2080, - 2081, 2083, 2082, 0, 2078, 2084, 2087, 2083, 2077, 2073, - 2084, 2087, 2081, 2085, 2085, 2086, 2086, 2088, 2090, 2077, - 2082, 2091, 2090, 2088, 2092, 2093, 2095, 2096, 2092, 2097, - 2099, 2098, 2096, 2101, 2103, 2099, 2100, 2102, 2104, 2103, - 2106, 2091, 2105, 2105, 2106, 2093, 2098, 2107, 2108, 2101, - 2109, 2095, 2097, 2108, 2100, 2111, 2110, 2102, 2112, 2113, - - 2104, 2114, 2107, 2110, 2113, 2115, 2119, 2111, 2116, 2116, - 2118, 2120, 2121, 2122, 2114, 2123, 2109, 2112, 2118, 2124, - 2125, 2126, 2131, 2115, 2128, 2119, 0, 2132, 2130, 2133, - 2120, 2133, 2125, 2132, 2123, 2121, 2131, 2122, 2137, 2128, - 2124, 2130, 2126, 2134, 2134, 2135, 2136, 2138, 2153, 2136, - 2135, 2137, 2139, 2140, 2140, 2141, 2141, 2142, 2144, 2142, - 2147, 2138, 2143, 2143, 2145, 2139, 2146, 2146, 2153, 2147, - 2148, 2148, 2147, 2144, 2149, 2149, 2150, 2145, 2152, 2154, - 2155, 2150, 2158, 2152, 2156, 2156, 2157, 2157, 2159, 2159, - 2160, 2162, 2155, 2161, 2161, 2163, 2164, 2164, 2166, 2154, - - 2163, 2158, 2165, 2165, 2167, 2168, 2162, 2169, 2160, 2171, - 2172, 2172, 2166, 2167, 2171, 2173, 2174, 2174, 2175, 2168, - 2177, 2176, 2180, 2177, 2178, 2178, 2169, 2176, 2179, 2179, - 2181, 2182, 2183, 2183, 2173, 2185, 2175, 2186, 2187, 2188, - 2178, 2180, 2190, 2188, 2191, 2181, 2189, 2189, 2192, 2191, - 2182, 2193, 2196, 2187, 2198, 2185, 2195, 2195, 2197, 2199, - 2186, 2190, 2200, 2192, 2201, 2197, 2193, 2203, 2198, 2202, - 2202, 2204, 2196, 2204, 2207, 2205, 2203, 2199, 2205, 2208, - 2200, 2210, 2209, 2211, 2208, 2214, 2207, 2209, 2212, 2213, - 2201, 2220, 2216, 2205, 2213, 2205, 2211, 2216, 2217, 2218, - - 2222, 2219, 2221, 2217, 2224, 2222, 2210, 2219, 2221, 2212, - 2223, 2214, 2220, 2225, 2218, 2223, 2226, 2236, 2227, 2226, - 2231, 2228, 2229, 2230, 2234, 0, 2225, 2227, 2234, 2224, - 2228, 2229, 2230, 2232, 2231, 2233, 2238, 2236, 2240, 2232, - 2243, 2233, 2239, 2239, 2240, 2238, 2241, 2241, 2242, 2245, - 2246, 2247, 2247, 2242, 2248, 2241, 2251, 2252, 2249, 2253, - 2243, 2256, 2243, 2254, 2256, 2245, 2246, 2249, 2251, 2248, - 2258, 2257, 2259, 2252, 2253, 2254, 2257, 2260, 2260, 2261, - 2261, 2263, 2263, 2264, 2259, 2266, 2264, 2265, 2267, 2268, - 2258, 2266, 2265, 2270, 2267, 2269, 2269, 2272, 2268, 2271, - - 2271, 2273, 2274, 2275, 2275, 2276, 2277, 2270, 2278, 2272, - 2280, 2276, 2286, 2278, 2280, 2273, 2281, 2282, 2282, 2281, - 2277, 2274, 2283, 2284, 2285, 2289, 2287, 2283, 2284, 2284, - 2287, 2291, 2286, 2285, 2288, 2288, 2291, 2292, 2289, 2293, - 2294, 2295, 2296, 2297, 2298, 2295, 2299, 2300, 2297, 2301, - 2298, 2302, 2299, 2303, 2294, 2304, 0, 2292, 2303, 2293, - 2306, 2307, 2296, 2310, 2308, 2300, 2313, 2309, 2301, 2308, - 2302, 2310, 2306, 2309, 2315, 2313, 2304, 2307, 2311, 2318, - 2311, 2316, 2316, 2317, 2319, 2319, 2317, 2322, 2315, 2323, - 2324, 2322, 2325, 2325, 2326, 2323, 2329, 2329, 2331, 2333, - - 2338, 2334, 2324, 2326, 2337, 2318, 2339, 2340, 2347, 2337, - 2348, 2339, 2340, 2333, 2341, 2341, 2331, 2334, 2343, 2343, - 2349, 2345, 2346, 2346, 2347, 2349, 2338, 2345, 2351, 2352, - 2353, 2353, 2348, 2355, 2356, 2357, 2358, 2360, 2360, 2362, - 2356, 2352, 2355, 2361, 2363, 2367, 2361, 2351, 2365, 2365, - 2367, 2358, 2368, 2357, 2366, 2366, 2369, 2372, 2362, 2370, - 2373, 2371, 2363, 2371, 2370, 2369, 2374, 2375, 2376, 2383, - 2368, 2372, 2375, 0, 2373, 2377, 2378, 2378, 2374, 2382, - 2377, 2379, 2379, 2380, 2380, 2381, 2381, 2383, 2376, 2384, - 2387, 2382, 2385, 2385, 2384, 2386, 2386, 2388, 2389, 2390, - - 2391, 2391, 2387, 2392, 2393, 2393, 2394, 2394, 2395, 2388, - 2397, 2396, 2398, 2399, 2401, 2390, 2400, 2397, 2389, 2395, - 2402, 2400, 2392, 2396, 2398, 2403, 2403, 2404, 2405, 2406, - 2407, 2408, 2409, 2399, 2401, 2410, 2404, 2411, 2411, 2412, - 2402, 2413, 2414, 2407, 2416, 2417, 2409, 2410, 2412, 2406, - 2418, 2420, 2423, 2423, 2405, 2408, 2413, 2414, 2419, 2421, - 2430, 2419, 2416, 2422, 2421, 2420, 2432, 2417, 2422, 2424, - 2424, 2425, 2425, 2418, 2427, 2427, 2429, 2429, 2430, 2431, - 2433, 2435, 2436, 2437, 2438, 2432, 2440, 2439, 2442, 2441, - 2431, 2441, 2443, 2444, 2448, 2433, 2439, 2445, 2445, 2450, - - 2436, 2435, 2447, 2447, 2438, 2437, 2440, 2451, 2442, 2448, - 2443, 2444, 2452, 2452, 2454, 2456, 2451, 2455, 2455, 2457, - 2458, 2450, 2460, 2454, 2459, 2461, 2462, 2458, 2463, 2464, - 2464, 2465, 2465, 2456, 2466, 2467, 2473, 2457, 2468, 2459, - 2460, 2472, 2462, 2461, 2468, 2469, 2469, 2463, 2470, 2470, - 2471, 2473, 2474, 2467, 2466, 2475, 2471, 2476, 2477, 2472, - 2478, 2479, 2476, 2480, 2485, 2480, 2479, 2481, 2481, 2475, - 2482, 2474, 2482, 2483, 2483, 2487, 2488, 2489, 2477, 2490, - 2478, 2491, 2492, 2485, 2487, 2493, 2491, 2496, 2497, 2489, - 2499, 2497, 2498, 2498, 2500, 2488, 2501, 2501, 2504, 2490, - - 2506, 2506, 2492, 2507, 2493, 2499, 2502, 2496, 2509, 2510, - 2502, 2505, 2500, 2504, 2511, 2505, 2507, 2512, 2512, 2514, - 2516, 2515, 2518, 2509, 2516, 2517, 2517, 2519, 2519, 2510, - 2515, 2514, 2520, 2521, 2511, 2522, 2523, 2520, 2524, 2524, - 2530, 2518, 2521, 2529, 2529, 2531, 2531, 2532, 2523, 2534, - 2533, 2522, 2535, 2536, 2536, 2537, 2539, 2539, 2534, 2542, - 2532, 2535, 2530, 2533, 2542, 2544, 2543, 2545, 2546, 2547, - 2537, 2543, 2545, 2548, 2551, 2549, 2546, 2554, 0, 2544, - 2552, 2553, 2548, 2549, 2560, 2552, 2553, 2561, 2547, 2551, - 2555, 2555, 2554, 2556, 2556, 2557, 2557, 2558, 2559, 2565, - - 2562, 2588, 2560, 2559, 2558, 2561, 2562, 2563, 2564, 2564, - 2566, 2571, 2563, 2588, 2565, 2566, 2567, 2567, 2568, 2568, - 2572, 2572, 2573, 2574, 2571, 2573, 2575, 2576, 2574, 2574, - 2577, 2575, 2576, 2578, 2579, 2580, 2581, 2582, 2579, 2578, - 2580, 2583, 2584, 2590, 2577, 2581, 2587, 2585, 2586, 2583, - 2591, 2587, 2582, 2585, 2586, 2591, 2594, 2592, 2598, 2590, - 2592, 2596, 2597, 2584, 2599, 2600, 2596, 2597, 2594, 2601, - 2602, 2602, 2603, 2606, 2600, 2611, 2598, 2599, 2601, 2607, - 2608, 2603, 2612, 2615, 2613, 2607, 2608, 2614, 2614, 2616, - 2615, 2606, 2617, 2620, 2611, 2618, 2619, 2619, 2622, 2624, - - 2625, 2617, 2612, 2613, 2625, 2626, 2626, 2627, 2616, 2628, - 2618, 2629, 2620, 2622, 2630, 2628, 2632, 2629, 2633, 2624, - 2630, 2631, 2631, 2633, 2632, 2635, 2636, 2638, 2639, 2640, - 2643, 2638, 2627, 2653, 2635, 2642, 2642, 2644, 2644, 2636, - 2645, 2645, 2639, 2648, 2640, 2647, 2647, 2648, 2643, 2649, - 2651, 2651, 2654, 2653, 2649, 2655, 2656, 2654, 2658, 2659, - 2659, 2656, 2656, 2661, 2661, 2662, 2662, 2655, 2663, 2664, - 2666, 2663, 2668, 2669, 2669, 2670, 2670, 2674, 2658, 2671, - 2671, 2672, 2664, 2673, 2673, 2675, 2676, 2677, 2666, 2684, - 2674, 2685, 2668, 2677, 2678, 2678, 2672, 2679, 2686, 2683, - - 2676, 2679, 2687, 2675, 2683, 2683, 2689, 2688, 2687, 2699, - 2690, 2685, 2684, 2688, 2690, 2691, 2691, 2694, 2686, 2696, - 2697, 2700, 2694, 2697, 2700, 2701, 2701, 2696, 2702, 2704, - 2703, 2689, 2705, 2867, 2699, 2703, 2706, 2707, 2707, 2708, - 2709, 2710, 2711, 2709, 2867, 2702, 2702, 2704, 2712, 2715, - 2706, 2709, 2705, 2708, 2713, 2710, 2712, 2713, 2714, 2716, - 2716, 2711, 2721, 2714, 2714, 2717, 2717, 2723, 2715, 2718, - 2718, 2719, 2719, 2720, 2720, 2722, 2724, 2725, 2721, 2726, - 2722, 2727, 2725, 2728, 2729, 2730, 2727, 2723, 2732, 2732, - 2733, 2733, 2728, 2734, 2735, 3114, 2734, 3114, 2726, 2737, - - 2737, 2738, 2724, 2747, 2729, 2730, 2739, 2739, 2738, 2740, - 2742, 2742, 2735, 2743, 2740, 2744, 2745, 2748, 2748, 2749, - 2750, 2747, 2743, 2749, 2744, 2745, 2751, 2752, 2754, 2750, - 2753, 2755, 2752, 2752, 2759, 2755, 2763, 2754, 2764, 2759, - 2765, 2751, 2767, 2753, 2760, 2760, 2762, 2762, 2768, 2771, - 2763, 2767, 2772, 2773, 2776, 2778, 2774, 0, 2765, 2780, - 2768, 2772, 2774, 2764, 2780, 2781, 2776, 2782, 2782, 2783, - 2781, 2792, 2785, 2773, 2771, 2793, 2778, 2785, 2783, 2786, - 2786, 2788, 2788, 2786, 2789, 2789, 2790, 2790, 2791, 2800, - 2794, 2792, 2796, 2801, 2793, 2794, 2797, 2791, 2796, 2798, - - 2802, 2797, 2799, 2799, 2798, 2801, 2803, 2800, 2804, 2805, - 2806, 2803, 2807, 2807, 2809, 2805, 2814, 2810, 2809, 2811, - 2813, 2802, 2810, 2815, 2811, 2816, 2804, 2812, 2812, 2818, - 2818, 2814, 2822, 2820, 2821, 2806, 2822, 2824, 2815, 2813, - 2823, 2825, 2826, 2827, 2830, 2816, 2820, 2821, 2827, 2823, - 2826, 2828, 2828, 2824, 2829, 2831, 2832, 2832, 2833, 2839, - 2825, 2850, 2830, 2829, 2836, 2836, 2837, 2837, 2841, 2841, - 2843, 2844, 2845, 2846, 2848, 2848, 2849, 2833, 2846, 2851, - 2839, 2831, 2853, 2853, 2850, 2854, 2843, 2844, 2845, 2855, - 2856, 2856, 2859, 2862, 2860, 2871, 2849, 2861, 2851, 2854, - - 2860, 2865, 2861, 2863, 2863, 2864, 2864, 2868, 2855, 2866, - 2866, 2869, 2859, 2870, 2871, 2862, 2868, 2873, 2872, 2870, - 2880, 2865, 2874, 2874, 2875, 2876, 2876, 2875, 2881, 2866, - 2872, 2869, 2880, 2882, 2883, 2883, 2885, 2873, 2884, 2882, - 2886, 2884, 2885, 2891, 2888, 2889, 2889, 2890, 2881, 2888, - 2892, 2893, 2890, 2894, 2894, 2896, 2892, 2897, 2886, 2898, - 2899, 2901, 2891, 2900, 2900, 2903, 2902, 2896, 2893, 2893, - 2902, 2905, 2905, 2899, 2903, 2897, 2906, 2906, 2907, 2908, - 2901, 2909, 2913, 2907, 2898, 2914, 2909, 2910, 2910, 2911, - 2911, 2912, 2912, 2908, 2915, 2913, 2916, 2918, 2918, 2921, - - 2915, 2916, 2923, 2924, 2925, 2926, 2926, 2928, 2928, 2929, - 2930, 2914, 2931, 2932, 2932, 2933, 2933, 2936, 2921, 2937, - 0, 2931, 2935, 2929, 2923, 2924, 2925, 2938, 2935, 2945, - 2930, 2952, 2938, 2941, 2941, 2943, 2943, 2936, 2937, 2944, - 2946, 2947, 2948, 2945, 2944, 2953, 2946, 2949, 2949, 2950, - 2948, 2952, 2954, 2947, 2950, 2955, 2956, 2954, 2958, 2959, - 2960, 2961, 2956, 2964, 2963, 2953, 2958, 2955, 2965, 2966, - 2967, 2969, 2970, 2974, 2976, 2967, 2969, 2971, 2959, 2964, - 2960, 2961, 2963, 2971, 2972, 2965, 2965, 2976, 0, 2972, - 2966, 2975, 2970, 2974, 2979, 2979, 2975, 2980, 2980, 2981, - - 2985, 2985, 2986, 2981, 2987, 2988, 2988, 2986, 2990, 2990, - 2991, 2991, 2994, 2991, 2992, 2992, 2994, 2992, 2993, 2993, - 2997, 2993, 2998, 2987, 2996, 2996, 3001, 3002, 3003, 3004, - 3004, 3007, 3008, 3003, 3010, 3011, 2998, 3009, 2997, 3008, - 3013, 3009, 3014, 3010, 3015, 3015, 3001, 3002, 3016, 3016, - 3011, 3014, 3017, 3017, 3018, 3019, 3007, 3021, 3013, 3020, - 3019, 3022, 3021, 3021, 3023, 3024, 3025, 3022, 3020, 3018, - 3026, 3020, 3027, 3028, 3213, 3026, 3030, 3027, 3029, 3029, - 3024, 3213, 3030, 3035, 3031, 3032, 3032, 3025, 3035, 3023, - 3031, 0, 3028, 3033, 3033, 3034, 3034, 3038, 3038, 3040, - - 3040, 3041, 3044, 3044, 3045, 3045, 3046, 3046, 3047, 3047, - 3041, 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, 3090, 3083, 3087, 3076, 3098, 3082, - 3100, 3098, 3105, 3080, 3083, 3078, 3101, 3101, 3107, 3079, - 3106, 3087, 3107, 3100, 3102, 3102, 3103, 3103, 3108, 3106, - 3090, 3109, 3111, 3112, 3113, 3105, 3115, 3116, 3116, 3113, - - 3117, 3118, 3120, 3119, 3112, 3109, 3121, 3122, 3108, 3125, - 3123, 3115, 3124, 3117, 3127, 3111, 3133, 3135, 3120, 3123, - 3118, 3119, 3122, 3126, 3124, 3132, 3135, 3128, 3126, 3140, - 3125, 3121, 3128, 3141, 3127, 3145, 3133, 3134, 3134, 3132, - 3136, 3136, 3137, 3137, 3138, 3138, 3139, 3139, 3140, 3142, - 3143, 3144, 3142, 3141, 3146, 3143, 3144, 3147, 3148, 3149, - 3145, 3150, 3151, 3147, 3152, 3152, 3150, 3153, 3153, 3146, - 3154, 3149, 3148, 3155, 3156, 3156, 3158, 3160, 3163, 3163, - 3164, 3164, 3151, 3166, 3167, 3154, 3165, 3168, 3170, 3169, - 3167, 3158, 3155, 3168, 3165, 3160, 3171, 3173, 3173, 3172, - - 3177, 3170, 3166, 3169, 3172, 3174, 3174, 3178, 3180, 3181, - 3183, 3184, 3185, 3181, 3194, 3171, 3184, 3188, 3189, 3186, - 3187, 3177, 3180, 3189, 3190, 3191, 3191, 3178, 3195, 3190, - 3183, 3185, 3186, 3187, 3194, 3196, 3188, 3197, 3197, 3198, - 3201, 3199, 3200, 3200, 3198, 3201, 3195, 3199, 3202, 3204, - 3203, 3205, 3212, 3202, 3196, 3203, 3208, 3205, 3207, 3207, - 3211, 3208, 3209, 3209, 3211, 3214, 3215, 3216, 3204, 3217, - 3218, 3212, 3225, 3216, 3220, 3220, 3222, 3222, 3223, 3226, - 3227, 3224, 3232, 3218, 3214, 3215, 3224, 3223, 3217, 3230, - 3223, 3225, 3229, 3227, 3228, 3228, 3234, 3229, 3226, 3233, - - 3233, 3239, 3230, 3235, 3235, 3236, 3236, 3237, 3232, 3238, - 3240, 3240, 3237, 3241, 3246, 3234, 3238, 3242, 3241, 3242, - 3239, 3243, 3243, 3244, 3245, 3248, 3251, 3247, 3250, 3250, - 3244, 3245, 3247, 3246, 3253, 3254, 3255, 3256, 3260, 3253, - 3254, 3257, 3257, 3261, 3248, 3251, 3259, 3259, 3262, 3262, - 3263, 3263, 3264, 3266, 3266, 3255, 3256, 3260, 3268, 3264, - 3267, 3267, 3261, 3270, 3273, 3268, 3274, 3275, 3270, 3273, - 3276, 3276, 3277, 3277, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 3274, 3275, 3281, 3281, 3281, - 3281, 3281, 3281, 3281, 3282, 3282, 3282, 3282, 3282, 3282, - - 3282, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3284, 3284, - 3284, 3284, 3284, 3284, 3284, 3285, 3285, 3285, 3285, 3285, - 3285, 3285, 3286, 3286, 3286, 3286, 3286, 3286, 3286, 3287, - 3287, 3287, 3287, 3287, 3287, 3287, 3289, 3289, 0, 3289, - 3289, 3289, 3289, 3290, 3290, 0, 0, 0, 3290, 3290, - 3291, 3291, 0, 0, 3291, 0, 3291, 3292, 0, 0, - 0, 0, 0, 3292, 3293, 3293, 0, 0, 0, 3293, - 3293, 3294, 0, 0, 0, 0, 0, 3294, 3295, 3295, - 0, 3295, 3295, 3295, 3295, 3296, 0, 0, 0, 0, - 0, 3296, 3297, 3297, 0, 0, 0, 3297, 3297, 3298, - - 3298, 0, 3298, 3298, 3298, 3298, 3280, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, - 3280, 3280, 3280, 3280, 3280, 3280, 3280 + 361, 373, 164, 361, 367, 361, 370, 372, 367, 370, + 375, 376, 371, 375, 379, 373, 367, 368, 368, 369, + 368, 382, 372, 379, 378, 376, 380, 370, 381, 375, + + 383, 380, 380, 368, 381, 384, 368, 385, 368, 378, + 368, 377, 382, 377, 377, 386, 385, 388, 387, 383, + 384, 389, 390, 377, 387, 377, 377, 377, 392, 391, + 377, 395, 393, 392, 386, 391, 390, 394, 397, 391, + 396, 389, 398, 388, 400, 396, 395, 401, 398, 399, + 399, 392, 393, 397, 402, 403, 404, 394, 405, 401, + 406, 403, 408, 409, 400, 406, 407, 407, 402, 407, + 410, 411, 417, 413, 405, 413, 413, 416, 416, 409, + 414, 404, 408, 415, 414, 411, 410, 415, 418, 419, + 420, 417, 421, 413, 424, 422, 423, 162, 425, 430, + + 424, 423, 415, 418, 422, 419, 421, 425, 420, 423, + 423, 426, 428, 423, 423, 422, 426, 422, 427, 429, + 430, 428, 427, 431, 432, 429, 434, 433, 432, 431, + 433, 434, 435, 436, 436, 437, 438, 438, 439, 442, + 440, 441, 441, 439, 444, 442, 443, 445, 437, 446, + 443, 447, 435, 440, 446, 449, 447, 448, 448, 444, + 450, 451, 452, 458, 455, 457, 448, 449, 445, 453, + 457, 454, 453, 460, 452, 454, 455, 456, 456, 451, + 450, 459, 459, 463, 458, 462, 462, 466, 464, 465, + 467, 469, 470, 471, 472, 460, 464, 473, 465, 160, + + 475, 477, 467, 473, 463, 474, 475, 466, 472, 469, + 470, 469, 476, 471, 474, 477, 478, 476, 479, 480, + 481, 479, 482, 483, 478, 485, 484, 478, 482, 484, + 486, 485, 487, 480, 488, 481, 489, 487, 490, 492, + 491, 493, 490, 483, 486, 491, 493, 494, 495, 485, + 499, 496, 502, 520, 492, 501, 488, 489, 500, 501, + 506, 503, 504, 494, 496, 520, 504, 495, 497, 497, + 499, 502, 509, 500, 497, 506, 497, 503, 507, 508, + 505, 509, 497, 507, 497, 505, 510, 497, 497, 505, + 511, 512, 510, 513, 497, 508, 513, 510, 508, 514, + + 515, 516, 516, 517, 519, 511, 521, 512, 518, 518, + 522, 523, 524, 526, 525, 527, 530, 524, 528, 519, + 515, 521, 514, 525, 528, 530, 533, 531, 517, 522, + 527, 531, 526, 523, 532, 534, 535, 536, 533, 537, + 532, 538, 539, 540, 542, 541, 539, 541, 546, 543, + 534, 536, 544, 544, 537, 535, 540, 543, 545, 538, + 546, 547, 548, 549, 545, 550, 549, 547, 542, 551, + 552, 554, 555, 553, 548, 552, 553, 556, 557, 550, + 554, 565, 556, 556, 551, 558, 558, 554, 555, 560, + 554, 557, 559, 559, 563, 560, 561, 561, 562, 562, + + 563, 564, 565, 566, 568, 567, 564, 564, 567, 568, + 569, 570, 572, 571, 573, 566, 571, 572, 575, 570, + 574, 576, 575, 578, 577, 579, 580, 576, 577, 569, + 579, 581, 581, 582, 583, 585, 586, 573, 584, 574, + 580, 578, 588, 584, 587, 589, 590, 588, 582, 590, + 587, 585, 591, 593, 590, 583, 586, 590, 590, 589, + 592, 592, 594, 595, 596, 597, 598, 600, 595, 596, + 591, 593, 602, 600, 601, 602, 603, 604, 594, 597, + 603, 598, 604, 601, 605, 606, 609, 605, 607, 608, + 606, 611, 610, 609, 612, 616, 611, 613, 613, 614, + + 615, 617, 603, 618, 607, 610, 619, 608, 614, 625, + 617, 616, 619, 158, 612, 618, 620, 621, 623, 615, + 621, 623, 620, 622, 622, 624, 622, 625, 626, 627, + 624, 628, 629, 631, 630, 627, 628, 630, 629, 632, + 633, 634, 626, 635, 632, 633, 633, 636, 639, 637, + 638, 641, 636, 85, 634, 637, 635, 639, 631, 640, + 642, 642, 644, 643, 640, 644, 636, 636, 645, 638, + 643, 641, 646, 647, 645, 650, 648, 651, 647, 651, + 644, 648, 648, 652, 646, 649, 649, 653, 654, 653, + 655, 656, 657, 658, 660, 659, 661, 662, 660, 663, + + 650, 659, 652, 664, 665, 661, 654, 666, 655, 656, + 667, 657, 662, 658, 663, 669, 668, 671, 670, 666, + 672, 664, 668, 665, 673, 667, 674, 675, 673, 669, + 670, 676, 677, 678, 680, 679, 671, 681, 681, 672, + 679, 682, 683, 675, 674, 682, 684, 685, 680, 676, + 677, 677, 678, 686, 687, 688, 683, 689, 685, 687, + 690, 691, 696, 693, 692, 684, 80, 686, 691, 692, + 693, 688, 694, 690, 695, 697, 689, 694, 698, 695, + 696, 699, 697, 700, 701, 702, 703, 698, 705, 703, + 702, 706, 700, 704, 707, 699, 701, 704, 708, 709, + + 706, 718, 705, 710, 710, 711, 711, 712, 712, 707, + 713, 716, 708, 714, 711, 713, 721, 717, 722, 720, + 709, 718, 714, 717, 719, 724, 723, 725, 719, 726, + 716, 720, 723, 724, 725, 727, 722, 728, 731, 737, + 738, 721, 741, 740, 744, 744, 738, 726, 737, 740, + 743, 741, 742, 731, 743, 745, 745, 728, 746, 747, + 727, 729, 748, 729, 749, 750, 729, 752, 742, 746, + 729, 750, 752, 729, 753, 754, 748, 747, 755, 759, + 729, 729, 755, 729, 749, 751, 751, 751, 756, 751, + 757, 758, 751, 754, 757, 753, 758, 751, 759, 760, + + 761, 763, 762, 751, 751, 762, 763, 763, 764, 766, + 757, 75, 756, 767, 760, 764, 765, 765, 767, 768, + 768, 769, 774, 771, 766, 761, 769, 770, 771, 775, + 770, 772, 772, 773, 774, 773, 776, 777, 779, 778, + 776, 780, 780, 785, 781, 784, 779, 782, 775, 783, + 783, 786, 789, 789, 787, 785, 808, 777, 778, 781, + 787, 782, 788, 784, 790, 808, 792, 788, 793, 790, + 790, 792, 794, 786, 793, 795, 796, 798, 794, 799, + 795, 797, 796, 798, 797, 800, 800, 799, 801, 801, + 802, 803, 804, 805, 806, 807, 807, 804, 802, 809, + + 805, 810, 810, 812, 811, 814, 815, 809, 816, 803, + 811, 817, 818, 806, 814, 815, 817, 819, 820, 821, + 819, 818, 812, 820, 822, 823, 824, 826, 826, 827, + 825, 828, 816, 821, 823, 825, 825, 829, 830, 824, + 831, 834, 834, 831, 827, 833, 829, 833, 835, 822, + 828, 831, 836, 837, 842, 838, 839, 836, 840, 841, + 843, 844, 830, 842, 845, 844, 846, 847, 848, 835, + 850, 74, 849, 847, 837, 838, 839, 848, 851, 841, + 840, 852, 845, 843, 849, 846, 853, 852, 854, 850, + 855, 855, 851, 854, 856, 857, 858, 859, 860, 861, + + 853, 862, 863, 864, 857, 859, 865, 867, 869, 864, + 866, 868, 865, 867, 856, 872, 858, 870, 860, 872, + 862, 861, 863, 870, 866, 868, 871, 873, 869, 874, + 875, 876, 871, 877, 877, 875, 878, 879, 880, 882, + 879, 874, 878, 883, 881, 882, 873, 884, 884, 874, + 885, 888, 876, 886, 887, 891, 880, 881, 886, 887, + 887, 889, 892, 883, 894, 889, 888, 893, 885, 890, + 890, 896, 893, 897, 900, 899, 901, 891, 903, 903, + 904, 905, 892, 894, 904, 906, 906, 897, 899, 908, + 907, 909, 919, 908, 900, 896, 905, 901, 902, 910, + + 911, 902, 912, 902, 919, 911, 909, 902, 915, 902, + 932, 914, 913, 910, 902, 907, 912, 913, 913, 902, + 914, 916, 915, 917, 918, 916, 920, 921, 922, 918, + 923, 920, 932, 924, 925, 929, 929, 916, 917, 918, + 925, 921, 924, 926, 923, 927, 928, 931, 926, 922, + 930, 927, 928, 931, 933, 930, 934, 936, 937, 939, + 940, 940, 941, 937, 938, 943, 944, 941, 945, 936, + 946, 939, 942, 933, 934, 935, 935, 951, 938, 943, + 942, 935, 947, 935, 68, 944, 946, 945, 947, 935, + 949, 948, 950, 951, 935, 935, 948, 952, 953, 953, + + 954, 935, 949, 955, 954, 957, 958, 959, 960, 958, + 950, 957, 961, 960, 962, 952, 963, 964, 966, 967, + 962, 963, 968, 955, 969, 961, 959, 966, 967, 971, + 969, 970, 972, 973, 975, 974, 964, 972, 968, 976, + 970, 977, 980, 978, 983, 986, 989, 987, 971, 974, + 977, 976, 978, 973, 975, 979, 981, 985, 988, 980, + 983, 979, 981, 990, 989, 986, 987, 996, 991, 992, + 995, 985, 988, 991, 992, 995, 996, 998, 990, 997, + 997, 999, 1001, 998, 1002, 1006, 1007, 1004, 1004, 1002, + 1002, 1004, 1005, 1008, 999, 1005, 1009, 1010, 1001, 1006, + + 1011, 1012, 1013, 1015, 1020, 1014, 1007, 1012, 1016, 1008, + 1010, 1014, 1017, 1016, 1009, 1011, 1019, 1023, 1015, 1019, + 1029, 63, 1013, 1021, 1022, 1020, 1017, 1024, 1021, 1022, + 1025, 1026, 1024, 1023, 1028, 1025, 1029, 1033, 1030, 1031, + 1028, 1032, 1032, 1026, 1030, 1031, 1033, 1034, 1035, 1036, + 1036, 1035, 1037, 1038, 1039, 1040, 1041, 1042, 1040, 1044, + 1043, 1049, 1045, 1042, 1044, 1034, 1043, 1045, 1046, 1041, + 1037, 1047, 1038, 1046, 1039, 1050, 1051, 1047, 1052, 1049, + 1053, 1053, 1051, 1052, 1054, 1055, 1056, 1057, 1058, 1059, + 1060, 1058, 1059, 1054, 1055, 1050, 1062, 1061, 1063, 1064, + + 1067, 1060, 1061, 1065, 1056, 1066, 1057, 1068, 1070, 1065, + 1063, 1066, 1068, 1072, 1062, 1067, 1069, 1069, 1064, 1071, + 1073, 1074, 1075, 1076, 1073, 1072, 1077, 1070, 1079, 1080, + 1080, 1075, 1081, 1071, 1083, 1084, 1086, 1085, 1089, 1074, + 1092, 1086, 1076, 58, 1087, 1088, 1088, 1079, 1083, 1085, + 1084, 1077, 1081, 1087, 1090, 1091, 1092, 1093, 1089, 1095, + 1090, 1091, 1093, 1094, 1095, 1094, 1096, 1097, 1098, 1099, + 1100, 1101, 1102, 1098, 1103, 1105, 1105, 1106, 1101, 1107, + 1096, 1097, 1109, 1108, 1099, 1110, 57, 1102, 1109, 1100, + 1111, 1106, 1113, 1103, 1117, 1111, 1113, 1107, 1108, 1114, + + 1114, 1117, 1115, 1118, 1111, 1110, 1111, 1115, 1120, 1111, + 1116, 1116, 1119, 1121, 1122, 1119, 1123, 1118, 1124, 1126, + 1125, 1123, 1127, 1122, 1126, 1129, 1134, 1120, 1128, 1131, + 1131, 1121, 1125, 1132, 1137, 1133, 1127, 1124, 1132, 1128, + 1133, 1136, 1135, 1137, 1129, 1136, 1134, 1135, 1138, 1139, + 1140, 1142, 1143, 1141, 1145, 1144, 1146, 1147, 1150, 1143, + 1151, 1149, 1148, 1138, 1139, 1141, 1142, 1144, 1148, 1140, + 1152, 1153, 1154, 1145, 1157, 1147, 1149, 1146, 1150, 1152, + 1151, 1155, 1156, 1158, 1159, 1162, 1153, 1164, 1161, 1163, + 1165, 1154, 1166, 1155, 1161, 1164, 1170, 1167, 1158, 1157, + + 1162, 1156, 1167, 1163, 1159, 1168, 1169, 1171, 1166, 1172, + 1165, 1169, 1169, 1173, 1173, 1170, 1175, 1168, 1176, 1177, + 1181, 1171, 1172, 1174, 1174, 1177, 1181, 1176, 1174, 1175, + 1179, 1174, 1174, 1178, 1178, 1179, 1174, 1185, 1180, 1182, + 1183, 1188, 1174, 1319, 1182, 1183, 1174, 1180, 1184, 1184, + 1186, 1186, 1187, 1189, 1190, 1187, 1191, 1187, 1185, 1192, + 1193, 1188, 1194, 1190, 1192, 1197, 1195, 1196, 1199, 1319, + 1197, 1189, 1195, 1196, 1193, 1198, 1191, 1199, 1205, 1198, + 1194, 1206, 1199, 1204, 1199, 1202, 1199, 1204, 1199, 1200, + 1200, 1201, 1201, 1205, 1201, 1207, 1202, 1208, 1209, 1206, + + 1210, 1211, 1208, 1208, 1207, 1212, 1211, 1209, 1213, 1214, + 1215, 1216, 1217, 1218, 1218, 1219, 1220, 1213, 1217, 1212, + 1222, 1221, 1210, 1219, 1223, 1216, 1221, 1224, 1214, 1215, + 1220, 1225, 1226, 1223, 1222, 1227, 1227, 1226, 1228, 1229, + 1229, 1230, 1234, 1230, 1232, 1224, 1233, 1232, 1235, 1236, + 1236, 1233, 1237, 1228, 1238, 1238, 1225, 1235, 1239, 1239, + 1240, 1234, 1241, 1242, 1250, 1240, 1243, 1243, 1244, 1246, + 1245, 1247, 1237, 1245, 1261, 1261, 1247, 1248, 1249, 1253, + 1249, 1255, 1250, 1241, 1242, 1257, 1248, 1252, 1244, 1246, + 1252, 1254, 1256, 1257, 1253, 1255, 1254, 1256, 1258, 1259, + + 1260, 1262, 1259, 1258, 1263, 1260, 1262, 1264, 1265, 1270, + 1266, 1268, 1269, 1264, 1270, 1265, 1273, 1268, 1269, 1271, + 1272, 1274, 1263, 1266, 1276, 1271, 1275, 1275, 1278, 1272, + 1279, 1280, 1274, 1281, 1282, 1273, 1283, 1286, 1287, 1281, + 1282, 1285, 1283, 1278, 1276, 1288, 1291, 1285, 1289, 1290, + 1279, 1286, 1292, 1292, 1280, 1293, 1294, 1286, 1287, 1295, + 1289, 1296, 1298, 1290, 1291, 1288, 1296, 1297, 1297, 1299, + 1301, 1304, 1303, 1302, 1299, 1293, 1305, 1295, 1302, 1302, + 1304, 1294, 1306, 1307, 1305, 1298, 1308, 1309, 1310, 1301, + 1303, 1311, 1309, 1311, 1312, 1309, 1306, 1310, 1307, 1314, + + 1316, 1308, 1315, 1318, 1308, 1314, 1315, 1317, 1312, 1320, + 1321, 1316, 1317, 1317, 1322, 1321, 1323, 1324, 1325, 1322, + 1326, 1328, 1318, 1325, 1329, 1330, 1332, 1320, 1331, 1331, + 1332, 1333, 1334, 1335, 1323, 1328, 1336, 1324, 1337, 1335, + 1326, 1338, 1329, 1330, 1339, 1340, 1341, 1342, 1336, 1333, + 1345, 1334, 1342, 1344, 1343, 1338, 1354, 1337, 1344, 1339, + 1340, 1343, 1346, 1347, 1347, 1341, 1348, 1349, 1345, 1350, + 1354, 1346, 1351, 1351, 1352, 1357, 1349, 1353, 1355, 1355, + 1352, 1348, 1356, 1353, 1358, 1359, 1360, 1361, 1356, 1350, + 1359, 1357, 1360, 1361, 1362, 1363, 1363, 1364, 1364, 1367, + + 1362, 1366, 1366, 1367, 1368, 1358, 1369, 1370, 1371, 1373, + 1372, 1374, 1374, 1368, 1375, 1376, 1373, 1378, 1379, 1370, + 1382, 1377, 1371, 1376, 1369, 1372, 1377, 1380, 1383, 1383, + 1381, 1378, 1380, 1380, 1375, 1381, 1381, 1379, 1384, 1385, + 1382, 1386, 1387, 1388, 1389, 1390, 1391, 1387, 1392, 1393, + 1386, 1395, 1391, 1392, 1394, 1396, 1403, 1384, 1385, 1397, + 1394, 1396, 1388, 1390, 1389, 1397, 1398, 1399, 1400, 1401, + 1395, 1405, 1405, 52, 1404, 1393, 1402, 1403, 1406, 1407, + 1411, 1406, 1408, 1408, 1411, 1398, 1399, 1400, 1401, 1404, + 1402, 1407, 1409, 1409, 1410, 1412, 1413, 1414, 1415, 1410, + + 1415, 1417, 1418, 1419, 1415, 1413, 1420, 1418, 1412, 1421, + 1414, 1422, 1422, 1425, 1426, 1423, 1424, 1415, 1419, 1417, + 1423, 1430, 1424, 1432, 1427, 1421, 1420, 1426, 1425, 1427, + 1428, 1429, 1431, 1433, 1428, 1429, 1434, 1434, 1436, 1433, + 1438, 1430, 1439, 1432, 1440, 1440, 1441, 1439, 1442, 1448, + 1431, 1449, 1441, 1444, 1444, 1446, 1436, 1452, 1446, 1447, + 1447, 1438, 1453, 1451, 1455, 1448, 1451, 1449, 1442, 1454, + 1454, 1453, 1456, 1457, 1459, 1458, 1461, 1452, 1462, 1455, + 1458, 1460, 1460, 1463, 1464, 1461, 1465, 1467, 1459, 1466, + 1466, 1473, 1457, 1456, 1468, 1469, 1462, 1475, 1463, 1470, + + 1469, 1467, 1471, 1471, 1472, 1478, 1465, 1476, 1472, 1464, + 1482, 1473, 1468, 1477, 1470, 1474, 1474, 1477, 1476, 1475, + 1479, 1481, 1481, 1483, 1478, 1479, 1482, 1485, 1484, 1486, + 1487, 1488, 1488, 1489, 1490, 1493, 1491, 1495, 1489, 1492, + 1492, 1483, 1484, 1486, 1493, 1494, 1485, 1485, 1497, 1496, + 1494, 1496, 1498, 1497, 1490, 1487, 1491, 1495, 1498, 1499, + 1500, 1502, 1503, 1503, 1504, 1505, 1500, 1507, 1508, 1509, + 1509, 1505, 1507, 1510, 1510, 1502, 1511, 1512, 1513, 1499, + 1516, 1514, 1517, 1504, 1514, 1515, 1515, 1518, 1526, 47, + 1511, 1520, 1508, 1513, 1517, 1512, 1519, 1520, 1516, 1519, + + 1521, 1522, 1519, 1524, 1522, 1521, 1525, 1518, 1528, 1528, + 1529, 1525, 1524, 1526, 1519, 1527, 1529, 1530, 1527, 1531, + 1522, 1532, 1532, 1530, 1531, 1533, 1533, 1534, 1536, 1535, + 1537, 1538, 1539, 1534, 1535, 1540, 1541, 1542, 1540, 1543, + 1544, 1536, 1541, 1542, 1543, 1545, 1544, 1549, 1537, 1546, + 1538, 1550, 1539, 1548, 1546, 1547, 1547, 1551, 1548, 1552, + 1553, 1554, 1555, 1556, 1559, 1549, 1557, 1558, 1545, 1558, + 1557, 1550, 1561, 1552, 1553, 1554, 1563, 1551, 1562, 1564, + 1555, 1565, 1566, 1559, 1561, 1564, 1567, 1569, 1556, 1563, + 1562, 1568, 1571, 1571, 1572, 1573, 1576, 1574, 1566, 1577, + + 1573, 1565, 1575, 1575, 1578, 1568, 1567, 1579, 1569, 1574, + 1580, 1576, 1581, 1577, 1572, 1582, 1584, 1583, 1586, 1580, + 1588, 1589, 1582, 1593, 1589, 1579, 1583, 1581, 1578, 1583, + 1590, 1590, 1584, 1586, 1591, 1591, 1592, 1594, 1586, 1596, + 1594, 1593, 1595, 1595, 1597, 1588, 1598, 1600, 1592, 1599, + 1602, 1598, 1596, 1601, 1599, 1603, 1604, 1608, 1605, 1602, + 1607, 1607, 1609, 1597, 1606, 1604, 1600, 1605, 1604, 1601, + 1606, 1610, 1611, 1613, 1603, 1609, 1612, 1608, 1616, 1617, + 1618, 1618, 1619, 1621, 1620, 1613, 1611, 1623, 1621, 1610, + 1622, 1622, 1612, 1620, 1625, 1624, 1623, 1617, 1619, 1623, + + 1624, 1626, 1627, 1616, 1628, 1622, 1632, 1630, 1631, 1628, + 1628, 1633, 1625, 1634, 1635, 18, 1633, 1636, 1636, 1634, + 1627, 1630, 1626, 1631, 1637, 1642, 1638, 1639, 1632, 1640, + 1637, 1638, 1635, 1639, 1643, 1640, 1644, 1645, 1646, 1651, + 1647, 1646, 1644, 1649, 1652, 1642, 1647, 1646, 1643, 1653, + 1645, 1649, 1654, 1655, 1656, 1657, 1658, 1653, 1651, 1659, + 1659, 1654, 1660, 1652, 1662, 1661, 1655, 1656, 1660, 1657, + 1658, 1661, 1663, 1663, 1664, 1665, 1666, 1662, 1667, 1667, + 1669, 1659, 1670, 1668, 1671, 1672, 1669, 1674, 1674, 1675, + 1680, 1681, 17, 1665, 1664, 1666, 1668, 1676, 1684, 1680, + + 1671, 1676, 1677, 1672, 1670, 1678, 1679, 1677, 1683, 1675, + 1678, 1679, 1686, 1684, 1681, 1685, 1685, 1687, 1688, 1690, + 1683, 1689, 1689, 1691, 1692, 1695, 1693, 1696, 1697, 1687, + 1691, 1686, 1699, 1690, 1697, 1700, 1692, 1688, 1693, 1698, + 1712, 1700, 1701, 1701, 1695, 1702, 1706, 1696, 1702, 1705, + 1699, 1698, 1703, 1703, 1705, 1706, 1707, 1708, 1708, 1709, + 1712, 1710, 1707, 1710, 1711, 1713, 1714, 1711, 1715, 1716, + 1717, 1709, 1718, 1719, 1716, 1717, 1720, 1721, 1723, 1722, + 0, 1718, 1721, 1729, 1714, 1719, 1715, 1713, 1722, 1725, + 1724, 1720, 1726, 1728, 1725, 1724, 1727, 1727, 1723, 1728, + + 1731, 1722, 1724, 1732, 1729, 1733, 1734, 1726, 1735, 1736, + 1735, 1737, 1737, 1738, 1738, 1739, 1739, 1740, 1743, 1731, + 1744, 1733, 1732, 1736, 1753, 1736, 1734, 1741, 1741, 1742, + 1742, 1745, 1745, 1751, 1746, 1756, 1747, 1740, 1746, 1743, + 1748, 1744, 1747, 1748, 1750, 1754, 1752, 1759, 1754, 1753, + 1750, 1751, 1752, 1755, 1755, 1756, 1757, 1758, 1758, 1760, + 1761, 1757, 1759, 1762, 1762, 1761, 1763, 1764, 1767, 1765, + 1766, 1763, 1768, 1764, 1770, 1773, 1776, 1775, 1769, 1775, + 1760, 1765, 1765, 1765, 1769, 1774, 1767, 1776, 1765, 1773, + 1766, 1772, 1768, 1777, 1770, 1778, 1772, 1772, 1779, 1780, + + 1774, 1778, 1781, 1782, 1782, 1783, 1785, 1779, 1777, 1784, + 1784, 1786, 1787, 1787, 1788, 1788, 1789, 1792, 1792, 1780, + 1793, 1794, 1797, 1781, 1801, 1796, 1785, 1799, 1799, 1798, + 1794, 1783, 1800, 1786, 1796, 1798, 1789, 1802, 1803, 1801, + 1804, 1805, 1805, 1797, 1802, 1793, 1806, 1803, 1807, 1809, + 1810, 1811, 1812, 1800, 1809, 1813, 1810, 1814, 1819, 1812, + 1816, 1813, 1818, 1814, 1807, 1816, 1804, 1815, 1815, 1817, + 1822, 1811, 1806, 1820, 1823, 1827, 1821, 1819, 1817, 1821, + 1824, 1824, 1818, 1825, 1826, 1820, 1828, 1829, 1822, 1825, + 1826, 1829, 1831, 1832, 1833, 1827, 1834, 1834, 1835, 1833, + + 1823, 1828, 1838, 1836, 1839, 1840, 1846, 1829, 1839, 1848, + 1841, 1840, 1831, 1842, 1842, 1832, 1843, 1835, 1836, 1841, + 1843, 1838, 1844, 1845, 1845, 1847, 1849, 1846, 1848, 1850, + 1851, 1849, 1853, 1844, 1852, 1861, 1854, 1859, 1844, 1847, + 1852, 1854, 1855, 1855, 1856, 1856, 1859, 1853, 1857, 1850, + 1851, 1860, 1857, 1862, 1862, 1861, 1864, 1864, 1865, 1866, + 1868, 1869, 1860, 1865, 1865, 1866, 1868, 1860, 1870, 1871, + 1872, 1874, 1876, 1870, 1875, 1877, 1872, 1879, 1875, 1878, + 1880, 1871, 1882, 1874, 1876, 1878, 1880, 1869, 1881, 1884, + 1885, 1886, 1888, 1881, 1882, 1888, 1886, 1889, 1889, 1879, + + 1877, 1884, 1890, 1890, 1891, 1891, 1892, 1893, 1894, 1885, + 1895, 1896, 1897, 1893, 1894, 1895, 1901, 1896, 1899, 1901, + 1902, 1897, 1905, 1899, 1903, 1903, 1892, 1906, 1907, 1908, + 1908, 1909, 1902, 1907, 1905, 1912, 1910, 1911, 1912, 1906, + 1909, 1910, 1911, 1913, 1913, 1914, 1915, 1918, 1916, 1917, + 1920, 1918, 1919, 1921, 1922, 1915, 1920, 1919, 1923, 1924, + 1926, 1926, 1927, 1922, 1929, 1914, 1916, 1933, 1917, 1928, + 1931, 1921, 1926, 1924, 1930, 1930, 1923, 1932, 1928, 1931, + 1927, 1934, 1935, 1941, 1929, 1942, 1934, 1944, 1933, 1932, + 1938, 1938, 1945, 1940, 1946, 1935, 1940, 1947, 1956, 1941, + + 1946, 1942, 1944, 1948, 1948, 1949, 1945, 1949, 1950, 1950, + 1951, 1953, 1953, 1957, 1947, 1954, 1954, 1958, 1951, 1957, + 1959, 1956, 1960, 1958, 1963, 1961, 1964, 1959, 1962, 1962, + 1965, 1966, 1969, 1963, 1967, 1970, 1968, 1973, 1974, 1975, + 1971, 0, 1965, 1966, 1960, 1961, 1971, 1964, 1968, 1967, + 1970, 1975, 1976, 1976, 1977, 1978, 1981, 1973, 1969, 1971, + 1979, 1974, 1980, 1979, 1983, 1985, 1984, 1980, 1984, 1983, + 1987, 1989, 1977, 1986, 1991, 1978, 1981, 1987, 1986, 1992, + 1989, 1993, 1994, 1985, 1994, 1995, 1998, 1997, 1992, 1997, + 1999, 1999, 1991, 1993, 2000, 2002, 2001, 2002, 2003, 2005, + + 1998, 2001, 2004, 2003, 1995, 2006, 2007, 2004, 2008, 2009, + 2010, 2012, 2007, 2008, 2013, 2014, 2014, 2005, 2010, 2016, + 2000, 2017, 2009, 2015, 2015, 2006, 2018, 2020, 2013, 2020, + 2012, 2019, 2018, 2021, 2016, 2024, 2019, 2022, 2023, 2023, + 2029, 2017, 2025, 2025, 2033, 2022, 2027, 2024, 2026, 2026, + 2031, 2021, 2028, 2022, 2032, 2027, 2032, 2028, 2029, 2031, + 2035, 2034, 2031, 2036, 2038, 2033, 2034, 2034, 2039, 2035, + 2042, 2043, 2040, 2039, 2046, 2036, 2038, 2040, 2044, 2045, + 2045, 2047, 2048, 2042, 2052, 2053, 2049, 2044, 2050, 2054, + 2055, 2043, 2046, 2057, 2063, 2055, 2052, 2053, 2048, 2047, + + 2049, 2056, 2057, 2050, 2060, 2062, 2056, 2064, 2065, 2054, + 2060, 2062, 2066, 2068, 2068, 2067, 2069, 2063, 2070, 2070, + 2071, 2074, 2064, 2060, 2067, 2069, 2065, 2072, 2073, 2075, + 2076, 2072, 2077, 2073, 2074, 2076, 2076, 2066, 2077, 2071, + 2078, 2079, 2080, 2081, 2079, 2086, 2078, 2084, 2084, 2089, + 2080, 2075, 2085, 2085, 2086, 2087, 2087, 2088, 2088, 2090, + 2091, 2089, 2096, 2081, 2092, 2099, 2091, 2085, 2096, 2092, + 2093, 2093, 2094, 2094, 2095, 2101, 2098, 2090, 2085, 2095, + 2098, 2103, 2100, 2104, 2105, 2099, 2100, 2106, 2104, 2107, + 2108, 2110, 2111, 2109, 2107, 2101, 2112, 2111, 2113, 2113, + + 2114, 2115, 2106, 2117, 2114, 2116, 2103, 2105, 2108, 2109, + 2116, 2110, 2118, 2119, 2120, 2121, 2115, 2123, 2112, 2122, + 2121, 2124, 2124, 2126, 2127, 2119, 2128, 2129, 2130, 2117, + 2118, 2126, 2122, 2120, 2131, 2123, 2132, 2133, 2134, 2136, + 2140, 0, 2138, 2127, 2139, 2128, 2140, 2142, 2142, 2133, + 2129, 2143, 2130, 2131, 2136, 2138, 2143, 2132, 2139, 2134, + 2141, 2144, 2141, 2145, 2144, 2146, 2152, 2147, 2148, 2148, + 2149, 2149, 2150, 2153, 2150, 2155, 2145, 2151, 2151, 2146, + 2147, 2152, 2154, 2154, 2155, 2161, 2153, 2155, 2156, 2156, + 2157, 2157, 2158, 2160, 2162, 2163, 2166, 2158, 2160, 2164, + + 2164, 2165, 2165, 2167, 2167, 2161, 2168, 2163, 2169, 2169, + 2170, 2171, 2172, 2172, 2162, 2166, 2171, 2173, 2173, 2174, + 2175, 2176, 2177, 2179, 2168, 2170, 2180, 2180, 2179, 2175, + 2181, 2182, 2182, 2174, 2183, 2176, 2184, 2185, 2186, 2186, + 2185, 2177, 2184, 2187, 2187, 2188, 2189, 2190, 2193, 2181, + 2191, 2191, 2183, 2194, 2186, 2195, 2196, 2197, 2197, 2198, + 2196, 2189, 2199, 2204, 2188, 2200, 2190, 2199, 2193, 2201, + 2195, 2203, 2203, 2206, 2205, 2207, 2194, 2208, 2198, 2209, + 2200, 2205, 2211, 2204, 2201, 2210, 2210, 2206, 2212, 2213, + 2212, 2211, 2213, 2207, 2215, 2208, 2216, 2217, 2218, 2219, + + 2220, 2216, 2217, 2221, 2222, 2209, 2215, 2213, 2221, 2213, + 2224, 2225, 2219, 2226, 2227, 2224, 2225, 2228, 2229, 2232, + 2227, 2220, 2230, 2218, 2229, 2235, 2231, 2230, 2226, 2233, + 2222, 2231, 2234, 2239, 2235, 2234, 2236, 2237, 2228, 2238, + 2244, 0, 2233, 2240, 2232, 2236, 2237, 2239, 2238, 2240, + 2241, 2242, 2246, 2247, 2247, 2242, 2241, 2248, 2249, 2249, + 2244, 2246, 2251, 2248, 2250, 2253, 2257, 2249, 2256, 2250, + 2254, 2255, 2255, 2259, 2260, 2257, 2261, 2262, 2266, 2268, + 2268, 2253, 2251, 2256, 2251, 2259, 2254, 2267, 2265, 2262, + 2260, 2261, 2264, 2265, 0, 2264, 2269, 2269, 2266, 2267, + + 2271, 2271, 2272, 2273, 2274, 2272, 2275, 2276, 2273, 2278, + 2274, 2281, 2275, 2277, 2277, 2280, 2276, 2279, 2279, 2282, + 2283, 2283, 2284, 2278, 2286, 2281, 2285, 2280, 2284, 2286, + 2288, 2294, 2289, 2292, 2288, 2289, 2290, 2290, 2282, 2291, + 2285, 2293, 2292, 2295, 2291, 2296, 2296, 2295, 2297, 2299, + 2293, 2294, 2300, 2301, 2299, 2302, 2303, 2304, 2305, 2306, + 2303, 2297, 2307, 2305, 2308, 2306, 2309, 2310, 2307, 2302, + 2311, 2312, 2300, 2301, 2315, 2311, 2314, 2304, 2316, 2324, + 2324, 2317, 2308, 2316, 2323, 2309, 2310, 2317, 2314, 2318, + 2315, 2319, 2312, 2319, 2321, 2326, 2325, 2318, 2323, 2325, + + 2327, 2327, 2330, 2321, 2331, 2332, 2330, 2333, 2333, 2334, + 2331, 2337, 2337, 2339, 2341, 2345, 2342, 2332, 2334, 2346, + 2345, 2326, 2347, 2355, 2348, 2349, 2349, 2347, 2341, 2348, + 2353, 2339, 2342, 2351, 2351, 2356, 2353, 2354, 2354, 2355, + 2359, 2357, 2360, 2361, 2361, 2346, 2357, 2363, 2365, 2364, + 2366, 2368, 2368, 2370, 2360, 2364, 2363, 2356, 2369, 2359, + 2371, 2369, 2373, 2373, 2375, 2366, 2365, 2374, 2374, 2375, + 2376, 2377, 2370, 2379, 2378, 2379, 2380, 2381, 2371, 2378, + 2377, 2382, 2383, 2384, 2385, 2386, 2386, 2383, 2376, 2385, + 2380, 2381, 2390, 2382, 2387, 2387, 2388, 2388, 2389, 2389, + + 2391, 2392, 2395, 2384, 2390, 2396, 2392, 2393, 2393, 2394, + 2394, 2397, 2398, 2400, 2395, 2399, 2399, 2396, 2391, 2401, + 2401, 2402, 2402, 2403, 2404, 2406, 2405, 2407, 2398, 2409, + 2408, 2397, 2400, 2405, 2403, 2408, 2404, 2406, 2410, 2411, + 2411, 2412, 2413, 2414, 2415, 2416, 2417, 2407, 2426, 2409, + 2412, 2421, 2418, 2419, 2419, 2422, 2420, 2415, 2410, 2424, + 2417, 2425, 2428, 2414, 2418, 2420, 2421, 0, 2413, 2416, + 2422, 2426, 2427, 2429, 2430, 2427, 2428, 2424, 2429, 2430, + 2431, 2431, 2438, 2425, 2432, 2432, 2433, 2433, 2435, 2435, + 2437, 2437, 2439, 2440, 2441, 2443, 2444, 2445, 2446, 2447, + + 2438, 2448, 2449, 2439, 2449, 2450, 2451, 2457, 2447, 2441, + 2452, 2458, 2440, 2456, 2444, 2443, 2453, 2453, 2446, 2445, + 2458, 2448, 2455, 2455, 2451, 2450, 2461, 2456, 2452, 2457, + 2459, 2459, 2462, 2462, 2463, 2461, 2464, 2465, 2466, 2467, + 2468, 2470, 2473, 2469, 2465, 2471, 2471, 2472, 2472, 2474, + 2475, 2479, 2463, 2466, 2464, 2478, 2475, 2467, 2468, 2469, + 2470, 2478, 2473, 2476, 2476, 2477, 2477, 2474, 2480, 2479, + 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2483, 2487, 2492, + 2486, 2488, 2488, 2480, 2489, 2482, 2489, 2490, 2490, 2481, + 2494, 2495, 2496, 2484, 2485, 2497, 2498, 2499, 2492, 2494, + + 2500, 2498, 2503, 2504, 2496, 2506, 2504, 2505, 2505, 2507, + 2495, 2508, 2508, 2511, 2509, 2497, 2514, 2499, 2509, 2500, + 2506, 2512, 2503, 2513, 2513, 2512, 2516, 2507, 2511, 2514, + 2517, 2518, 2519, 2519, 2521, 2522, 2523, 2524, 2524, 2525, + 2523, 2516, 2526, 2526, 2522, 2528, 2521, 2527, 2529, 2530, + 2517, 2518, 2527, 2537, 2528, 2531, 2531, 2539, 2525, 2536, + 2536, 2530, 2538, 2538, 2529, 2540, 2544, 2541, 2542, 2551, + 2539, 2543, 2543, 2546, 2546, 2537, 2541, 2542, 2540, 2549, + 2550, 2544, 2552, 2551, 2549, 2550, 2553, 2552, 2554, 2555, + 2558, 2556, 2559, 2561, 2553, 2560, 2567, 2559, 2555, 2556, + + 2560, 2562, 2562, 2563, 2563, 2558, 2565, 2554, 2561, 2564, + 2564, 2566, 2568, 2565, 2567, 2569, 2566, 2570, 2571, 2571, + 2572, 2569, 2570, 2573, 2574, 2574, 2575, 2575, 2573, 2578, + 2568, 2579, 2579, 2580, 2581, 2572, 2580, 2584, 2582, 2581, + 2581, 2583, 2578, 2582, 2585, 2586, 2583, 2587, 2588, 2586, + 2585, 2584, 2587, 2589, 2590, 2591, 2594, 2588, 2592, 2593, + 2595, 2594, 2590, 2597, 2592, 2593, 2598, 2601, 2589, 2605, + 2597, 2598, 2595, 2603, 2599, 2604, 2591, 2599, 2603, 2601, + 2604, 2606, 2607, 2608, 2609, 2609, 2610, 2605, 2613, 2618, + 2614, 2607, 2608, 2615, 2606, 2610, 2614, 2619, 2622, 2615, + + 2620, 2621, 2621, 2623, 2624, 2622, 2613, 2627, 2618, 2625, + 2626, 2626, 2629, 2624, 2631, 2634, 2632, 2619, 2640, 2620, + 2632, 0, 2623, 2640, 2625, 2635, 2627, 2629, 2633, 2633, + 2636, 2635, 2637, 2646, 2631, 2639, 2636, 2642, 2637, 2643, + 2634, 2638, 2638, 2639, 2645, 2647, 2642, 2646, 2645, 2649, + 2649, 2650, 2643, 2651, 2651, 2652, 2652, 2654, 2654, 2655, + 2647, 2656, 2660, 2655, 2658, 2658, 2656, 2661, 2662, 2650, + 2663, 2665, 2661, 2666, 2666, 2663, 2663, 2668, 2668, 2671, + 2662, 2673, 2660, 2669, 2669, 2670, 2675, 2679, 2670, 2676, + 2676, 2665, 2671, 2677, 2677, 2678, 2678, 2680, 2680, 2673, + + 2681, 2682, 2679, 2683, 2684, 2686, 2675, 2685, 2685, 2686, + 2684, 2691, 2692, 2681, 2696, 2690, 2693, 2683, 2694, 2682, + 2690, 2690, 2695, 2697, 2694, 2698, 2698, 2697, 2695, 2703, + 2701, 2706, 2692, 2709, 2691, 2701, 2693, 2703, 2704, 2696, + 2707, 2704, 2710, 2707, 2708, 2708, 2711, 2710, 2712, 2713, + 2709, 2709, 2714, 2714, 2716, 2715, 2706, 2716, 2717, 2718, + 2722, 2720, 2719, 2713, 2711, 2716, 2720, 2720, 2712, 2715, + 2719, 2721, 2717, 2723, 2723, 2728, 2721, 2721, 2718, 2722, + 2724, 2724, 2725, 2725, 2726, 2726, 2727, 2727, 2729, 2730, + 2731, 2728, 2732, 2729, 2733, 2734, 2735, 2732, 2736, 2737, + + 2734, 2739, 2739, 2740, 2740, 2735, 2742, 2741, 2745, 2730, + 2741, 2744, 2744, 2733, 2750, 2745, 2731, 2747, 2736, 2737, + 2746, 2746, 2747, 2750, 2742, 2749, 2749, 2751, 2752, 2754, + 2755, 2755, 2757, 2758, 2756, 2771, 2751, 2752, 2756, 2759, + 2760, 2757, 2761, 2772, 2759, 2759, 2762, 2754, 2758, 2766, + 2762, 2761, 2770, 2760, 2766, 2767, 2767, 2769, 2769, 2774, + 2771, 2772, 2775, 2778, 2779, 2780, 2770, 2783, 2774, 2781, + 2785, 2787, 2788, 2779, 2775, 2781, 2787, 2788, 2790, 2783, + 2789, 2789, 2793, 2793, 2792, 2780, 2793, 2790, 2778, 2792, + 2798, 2785, 2795, 2795, 2796, 2796, 2797, 2797, 2799, 2798, + + 2800, 2801, 2803, 2807, 2804, 2805, 2801, 2809, 2803, 2804, + 2805, 2806, 2806, 2808, 2811, 2810, 2812, 2813, 2799, 2800, + 2810, 2807, 2812, 2814, 2814, 2808, 2816, 2820, 2809, 2817, + 2816, 2818, 2811, 2821, 2817, 2822, 2818, 2819, 2819, 2824, + 2826, 2826, 2813, 2828, 2829, 2830, 2820, 2832, 2821, 2830, + 2822, 2831, 2833, 2834, 2836, 2836, 2828, 2829, 2838, 2824, + 2831, 2834, 2835, 2832, 2837, 2839, 2841, 2835, 2840, 2840, + 2851, 2833, 2847, 2837, 2844, 2844, 2838, 2845, 2845, 2849, + 2849, 2852, 2853, 2854, 2857, 2841, 2851, 2858, 2854, 2856, + 2856, 2839, 2859, 2847, 2861, 2861, 2863, 2852, 2853, 2862, + + 2864, 2864, 2867, 2868, 2857, 2870, 2873, 2869, 2877, 2868, + 2858, 2859, 2869, 2862, 2875, 2863, 2871, 2871, 2872, 2872, + 2874, 2874, 2867, 2876, 2878, 2875, 2873, 2870, 2877, 2879, + 2878, 2880, 2876, 2881, 2882, 2882, 2883, 2884, 2884, 2883, + 2874, 2889, 2888, 2880, 2890, 2891, 2891, 2894, 2879, 2892, + 2890, 2893, 2892, 2881, 2888, 2896, 2899, 2893, 2897, 2897, + 2896, 2889, 2898, 2900, 2901, 2894, 2904, 2898, 2905, 2900, + 2902, 2902, 2906, 2909, 2907, 2899, 2908, 2908, 2904, 2910, + 2911, 2901, 2901, 2913, 2913, 2916, 2905, 2907, 2915, 2911, + 2914, 2914, 2909, 2915, 2922, 2910, 2917, 2906, 2921, 2916, + + 2929, 2917, 2918, 2918, 2919, 2919, 2920, 2920, 2923, 2931, + 2924, 2921, 2926, 2926, 2923, 2924, 2932, 2933, 2937, 2929, + 2922, 2934, 2934, 2936, 2936, 2938, 2939, 2940, 2940, 2941, + 2941, 2931, 2937, 2944, 2943, 2939, 2945, 2946, 2932, 2933, + 2943, 2960, 2946, 2949, 2949, 2938, 2951, 2951, 2953, 2952, + 2954, 2955, 2956, 2944, 2952, 2945, 2954, 2957, 2957, 2958, + 2956, 2960, 2953, 2955, 2958, 2961, 2962, 2963, 2964, 2966, + 2967, 2962, 2968, 2969, 2964, 2972, 2971, 2966, 2973, 2963, + 2974, 2975, 2977, 2978, 2979, 2961, 2975, 2977, 2982, 2967, + 2979, 2972, 2968, 2969, 2971, 2973, 2973, 2980, 2984, 2987, + + 2987, 2974, 2980, 2978, 2983, 2988, 2988, 2983, 2982, 2989, + 2995, 2984, 2994, 2989, 2993, 2993, 0, 2994, 2996, 2996, + 2998, 2998, 2999, 2999, 3005, 2999, 3006, 3000, 3000, 2995, + 3000, 3001, 3001, 3002, 3001, 3004, 3004, 3002, 3009, 3010, + 3006, 3011, 3005, 3012, 3012, 3015, 3011, 3016, 3017, 3019, + 3021, 3018, 3017, 3022, 3016, 3023, 3023, 3030, 3009, 3010, + 3018, 3026, 3022, 3030, 3019, 3024, 3024, 3031, 3021, 3027, + 3015, 3025, 3025, 3028, 3027, 3029, 3026, 3033, 3032, 3034, + 3029, 3029, 3028, 3035, 3034, 3028, 3036, 0, 3035, 3037, + 3037, 3038, 3031, 3032, 3039, 3040, 3040, 3038, 3033, 3042, + + 3039, 3041, 3041, 3043, 3049, 3036, 3046, 3046, 3043, 3048, + 3048, 3052, 3052, 3049, 3042, 3053, 3053, 3054, 3054, 3055, + 3055, 3056, 3056, 3057, 3057, 3058, 3058, 3060, 3061, 3061, + 3062, 3063, 3064, 3068, 3066, 3070, 3060, 3067, 3067, 3062, + 3072, 3069, 3076, 3063, 3071, 3071, 3078, 3070, 3068, 3073, + 3073, 3080, 3064, 3066, 3069, 3072, 3077, 3079, 3079, 3077, + 3076, 3082, 3083, 3084, 3082, 3085, 3086, 3088, 3083, 3080, + 3085, 3087, 3078, 3090, 3094, 3091, 3095, 3084, 3094, 3090, + 3098, 3108, 3113, 3088, 3091, 3086, 3119, 3106, 3117, 3087, + 3106, 3095, 3109, 3109, 3108, 3110, 3110, 3111, 3111, 3114, + + 3115, 3116, 3117, 3120, 3115, 3113, 3098, 3121, 3114, 3119, + 3123, 3122, 3121, 3122, 3120, 3124, 3124, 3125, 3126, 3128, + 3127, 3116, 3129, 3131, 3130, 3123, 3133, 3134, 3132, 3135, + 3125, 3133, 3131, 3136, 3135, 3128, 3137, 3126, 3127, 3130, + 3132, 3137, 3141, 3142, 3143, 3143, 3144, 3129, 3134, 3145, + 3145, 3146, 3146, 3136, 3149, 3144, 3141, 3147, 3147, 3148, + 3148, 3150, 3151, 3142, 3152, 3151, 3153, 3154, 3155, 3152, + 3156, 3153, 3157, 3149, 3159, 3158, 3156, 3160, 3160, 3159, + 3161, 3150, 3164, 3155, 3162, 3162, 3157, 3158, 3163, 3163, + 3165, 3168, 3154, 3166, 3166, 3170, 3175, 3164, 3173, 3173, + + 3161, 3174, 3174, 3176, 3175, 3177, 3168, 3179, 3178, 3165, + 3180, 3177, 3181, 3170, 3178, 3182, 3183, 3183, 3185, 3185, + 3182, 3179, 3176, 3180, 3188, 3191, 3189, 3194, 3192, 3195, + 3196, 3181, 3192, 3199, 3195, 3197, 3200, 3198, 3201, 3191, + 3205, 3200, 3207, 3201, 3206, 3188, 3189, 3194, 3197, 3196, + 3198, 3210, 3199, 3202, 3202, 3208, 3208, 3210, 3209, 3215, + 3205, 3207, 3206, 3209, 3211, 3211, 3212, 3213, 3214, 3216, + 3223, 3212, 3213, 3214, 3219, 3216, 3218, 3218, 3215, 3219, + 3220, 3220, 3222, 3224, 3225, 3226, 3222, 3227, 3228, 3223, + 3224, 3236, 3229, 3227, 3231, 3231, 3233, 3233, 3237, 3234, + + 3238, 3235, 3243, 3225, 3226, 3229, 3235, 3228, 3234, 3241, + 3236, 3234, 3245, 3238, 3239, 3239, 3240, 3237, 3244, 3244, + 3250, 3240, 3241, 3246, 3246, 3247, 3247, 3248, 3243, 3249, + 3252, 3245, 3248, 3251, 3251, 3252, 3249, 3255, 3253, 3250, + 3253, 3254, 3254, 3256, 3255, 3257, 3258, 3259, 3261, 3261, + 3256, 3258, 3262, 3264, 3265, 3266, 3267, 3271, 3264, 3265, + 3268, 3268, 3270, 3270, 3257, 3272, 3259, 3273, 3273, 3274, + 3274, 3262, 3275, 3285, 3266, 3267, 3271, 3277, 3277, 3275, + 3278, 3278, 3279, 3281, 3272, 3284, 3286, 0, 3281, 3279, + 3284, 0, 3285, 3287, 3287, 3288, 3288, 0, 0, 0, + + 0, 0, 0, 0, 0, 3286, 3292, 3292, 3292, 3292, + 3292, 3292, 3292, 3293, 3293, 3293, 3293, 3293, 3293, 3293, + 3294, 3294, 3294, 3294, 3294, 3294, 3294, 3295, 3295, 3295, + 3295, 3295, 3295, 3295, 3296, 3296, 3296, 3296, 3296, 3296, + 3296, 3297, 3297, 3297, 3297, 3297, 3297, 3297, 3298, 3298, + 3298, 3298, 3298, 3298, 3298, 3300, 3300, 0, 3300, 3300, + 3300, 3300, 3301, 3301, 0, 0, 0, 3301, 3301, 3302, + 3302, 0, 0, 3302, 0, 3302, 3303, 0, 0, 0, + 0, 0, 3303, 3304, 3304, 0, 0, 0, 3304, 3304, + 3305, 0, 0, 0, 0, 0, 3305, 3306, 3306, 0, + + 3306, 3306, 3306, 3306, 3307, 0, 0, 0, 0, 0, + 3307, 3308, 3308, 0, 0, 0, 3308, 3308, 3309, 3309, + 0, 3309, 3309, 3309, 3309, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291 } ; static yy_state_type yy_last_accepting_state; @@ -3130,7 +3139,7 @@ static void config_end_include(void) } #endif -#line 3131 "" +#line 3140 "" #define YY_NO_INPUT 1 #line 191 "./util/configlexer.lex" #ifndef YY_NO_UNPUT @@ -3139,9 +3148,9 @@ static void config_end_include(void) #ifndef YY_NO_INPUT #define YY_NO_INPUT 1 #endif -#line 3140 "" +#line 3149 "" -#line 3142 "" +#line 3151 "" #define INITIAL 0 #define quotedstring 1 @@ -3365,7 +3374,7 @@ YY_DECL { #line 211 "./util/configlexer.lex" -#line 3366 "" +#line 3375 "" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -3398,13 +3407,13 @@ YY_DECL 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 >= 3281 ) + if ( yy_current_state >= 3292 ) 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] != 6407 ); + while ( yy_base[yy_current_state] != 6426 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -3879,52 +3888,52 @@ YY_RULE_SETUP case 90: YY_RULE_SETUP #line 304 "./util/configlexer.lex" -{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } +{ YDVAR(1, VAR_UDP_CONNECT) } YY_BREAK case 91: YY_RULE_SETUP #line 305 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } +{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } YY_BREAK case 92: YY_RULE_SETUP #line 306 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } +{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } YY_BREAK case 93: YY_RULE_SETUP #line 307 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_GLUE) } +{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } YY_BREAK case 94: YY_RULE_SETUP #line 308 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } +{ YDVAR(1, VAR_HARDEN_GLUE) } YY_BREAK case 95: YY_RULE_SETUP #line 309 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } +{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 96: YY_RULE_SETUP #line 310 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } +{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } YY_BREAK case 97: YY_RULE_SETUP #line 311 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } +{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } YY_BREAK case 98: YY_RULE_SETUP #line 312 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } +{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } YY_BREAK case 99: YY_RULE_SETUP #line 313 "./util/configlexer.lex" -{ YDVAR(1, VAR_CAPS_WHITELIST) } +{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } YY_BREAK case 100: YY_RULE_SETUP @@ -3934,72 +3943,72 @@ YY_RULE_SETUP case 101: YY_RULE_SETUP #line 315 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } +{ YDVAR(1, VAR_CAPS_WHITELIST) } YY_BREAK case 102: YY_RULE_SETUP #line 316 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_ADDRESS) } +{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } YY_BREAK case 103: YY_RULE_SETUP #line 317 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_DOMAIN) } +{ YDVAR(1, VAR_PRIVATE_ADDRESS) } YY_BREAK case 104: YY_RULE_SETUP #line 318 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH_KEY) } +{ YDVAR(1, VAR_PRIVATE_DOMAIN) } YY_BREAK case 105: YY_RULE_SETUP #line 319 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH) } +{ YDVAR(1, VAR_PREFETCH_KEY) } YY_BREAK case 106: YY_RULE_SETUP #line 320 "./util/configlexer.lex" -{ YDVAR(1, VAR_DENY_ANY) } +{ YDVAR(1, VAR_PREFETCH) } YY_BREAK case 107: YY_RULE_SETUP #line 321 "./util/configlexer.lex" -{ YDVAR(0, VAR_STUB_ZONE) } +{ YDVAR(1, VAR_DENY_ANY) } YY_BREAK case 108: YY_RULE_SETUP #line 322 "./util/configlexer.lex" -{ YDVAR(1, VAR_NAME) } +{ YDVAR(0, VAR_STUB_ZONE) } YY_BREAK case 109: YY_RULE_SETUP #line 323 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_ADDR) } +{ YDVAR(1, VAR_NAME) } YY_BREAK case 110: YY_RULE_SETUP #line 324 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_HOST) } +{ YDVAR(1, VAR_STUB_ADDR) } YY_BREAK case 111: YY_RULE_SETUP #line 325 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_PRIME) } +{ YDVAR(1, VAR_STUB_HOST) } YY_BREAK case 112: YY_RULE_SETUP #line 326 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_FIRST) } +{ YDVAR(1, VAR_STUB_PRIME) } YY_BREAK case 113: YY_RULE_SETUP #line 327 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_NO_CACHE) } +{ YDVAR(1, VAR_STUB_FIRST) } YY_BREAK case 114: YY_RULE_SETUP #line 328 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } +{ YDVAR(1, VAR_STUB_NO_CACHE) } YY_BREAK case 115: YY_RULE_SETUP @@ -4009,32 +4018,32 @@ YY_RULE_SETUP case 116: YY_RULE_SETUP #line 330 "./util/configlexer.lex" -{ YDVAR(0, VAR_FORWARD_ZONE) } +{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } YY_BREAK case 117: YY_RULE_SETUP #line 331 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_ADDR) } +{ YDVAR(0, VAR_FORWARD_ZONE) } YY_BREAK case 118: YY_RULE_SETUP #line 332 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_HOST) } +{ YDVAR(1, VAR_FORWARD_ADDR) } YY_BREAK case 119: YY_RULE_SETUP #line 333 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_FIRST) } +{ YDVAR(1, VAR_FORWARD_HOST) } YY_BREAK case 120: YY_RULE_SETUP #line 334 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_NO_CACHE) } +{ YDVAR(1, VAR_FORWARD_FIRST) } YY_BREAK case 121: YY_RULE_SETUP #line 335 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } +{ YDVAR(1, VAR_FORWARD_NO_CACHE) } YY_BREAK case 122: YY_RULE_SETUP @@ -4044,47 +4053,47 @@ YY_RULE_SETUP case 123: YY_RULE_SETUP #line 337 "./util/configlexer.lex" -{ YDVAR(0, VAR_AUTH_ZONE) } +{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } YY_BREAK case 124: YY_RULE_SETUP #line 338 "./util/configlexer.lex" -{ YDVAR(0, VAR_RPZ) } +{ YDVAR(0, VAR_AUTH_ZONE) } YY_BREAK case 125: YY_RULE_SETUP #line 339 "./util/configlexer.lex" -{ YDVAR(1, VAR_TAGS) } +{ YDVAR(0, VAR_RPZ) } YY_BREAK case 126: YY_RULE_SETUP #line 340 "./util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) } +{ YDVAR(1, VAR_TAGS) } YY_BREAK case 127: YY_RULE_SETUP #line 341 "./util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) } +{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) } YY_BREAK case 128: YY_RULE_SETUP #line 342 "./util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_LOG) } +{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) } YY_BREAK case 129: YY_RULE_SETUP #line 343 "./util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_LOG_NAME) } +{ YDVAR(1, VAR_RPZ_LOG) } YY_BREAK case 130: YY_RULE_SETUP #line 344 "./util/configlexer.lex" -{ YDVAR(1, VAR_ZONEFILE) } +{ YDVAR(1, VAR_RPZ_LOG_NAME) } YY_BREAK case 131: YY_RULE_SETUP #line 345 "./util/configlexer.lex" -{ YDVAR(1, VAR_MASTER) } +{ YDVAR(1, VAR_ZONEFILE) } YY_BREAK case 132: YY_RULE_SETUP @@ -4094,701 +4103,701 @@ YY_RULE_SETUP case 133: YY_RULE_SETUP #line 347 "./util/configlexer.lex" -{ YDVAR(1, VAR_URL) } +{ YDVAR(1, VAR_MASTER) } YY_BREAK case 134: YY_RULE_SETUP #line 348 "./util/configlexer.lex" -{ YDVAR(1, VAR_ALLOW_NOTIFY) } +{ YDVAR(1, VAR_URL) } YY_BREAK case 135: YY_RULE_SETUP #line 349 "./util/configlexer.lex" -{ YDVAR(1, VAR_FOR_DOWNSTREAM) } +{ YDVAR(1, VAR_ALLOW_NOTIFY) } YY_BREAK case 136: YY_RULE_SETUP #line 350 "./util/configlexer.lex" -{ YDVAR(1, VAR_FOR_UPSTREAM) } +{ YDVAR(1, VAR_FOR_DOWNSTREAM) } YY_BREAK case 137: YY_RULE_SETUP #line 351 "./util/configlexer.lex" -{ YDVAR(1, VAR_FALLBACK_ENABLED) } +{ YDVAR(1, VAR_FOR_UPSTREAM) } YY_BREAK case 138: YY_RULE_SETUP #line 352 "./util/configlexer.lex" -{ YDVAR(0, VAR_VIEW) } +{ YDVAR(1, VAR_FALLBACK_ENABLED) } YY_BREAK case 139: YY_RULE_SETUP #line 353 "./util/configlexer.lex" -{ YDVAR(1, VAR_VIEW_FIRST) } +{ YDVAR(0, VAR_VIEW) } YY_BREAK case 140: YY_RULE_SETUP #line 354 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } +{ YDVAR(1, VAR_VIEW_FIRST) } YY_BREAK case 141: YY_RULE_SETUP #line 355 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } +{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } YY_BREAK case 142: YY_RULE_SETUP #line 356 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL) } +{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } YY_BREAK case 143: YY_RULE_SETUP #line 357 "./util/configlexer.lex" -{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) } +{ YDVAR(2, VAR_ACCESS_CONTROL) } YY_BREAK case 144: YY_RULE_SETUP #line 358 "./util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) } +{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) } YY_BREAK case 145: YY_RULE_SETUP #line 359 "./util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) } +{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) } YY_BREAK case 146: YY_RULE_SETUP #line 360 "./util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) } +{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) } YY_BREAK case 147: YY_RULE_SETUP #line 361 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) } +{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) } YY_BREAK case 148: YY_RULE_SETUP #line 362 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) } +{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) } YY_BREAK case 149: YY_RULE_SETUP #line 363 "./util/configlexer.lex" -{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) } +{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) } YY_BREAK case 150: YY_RULE_SETUP #line 364 "./util/configlexer.lex" -{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) } +{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) } YY_BREAK case 151: YY_RULE_SETUP #line 365 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) } +{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) } YY_BREAK case 152: YY_RULE_SETUP #line 366 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) } +{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) } YY_BREAK case 153: YY_RULE_SETUP #line 367 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_IDENTITY) } +{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) } YY_BREAK case 154: YY_RULE_SETUP #line 368 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_VERSION) } +{ YDVAR(1, VAR_HIDE_IDENTITY) } YY_BREAK case 155: YY_RULE_SETUP #line 369 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) } +{ YDVAR(1, VAR_HIDE_VERSION) } YY_BREAK case 156: YY_RULE_SETUP #line 370 "./util/configlexer.lex" -{ YDVAR(1, VAR_IDENTITY) } +{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) } YY_BREAK case 157: YY_RULE_SETUP #line 371 "./util/configlexer.lex" -{ YDVAR(1, VAR_VERSION) } +{ YDVAR(1, VAR_IDENTITY) } YY_BREAK case 158: YY_RULE_SETUP #line 372 "./util/configlexer.lex" -{ YDVAR(1, VAR_MODULE_CONF) } +{ YDVAR(1, VAR_VERSION) } YY_BREAK case 159: YY_RULE_SETUP #line 373 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR) } +{ YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 160: YY_RULE_SETUP #line 374 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 161: YY_RULE_SETUP #line 375 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 162: YY_RULE_SETUP #line 376 "./util/configlexer.lex" -{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 163: YY_RULE_SETUP #line 377 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } +{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 164: YY_RULE_SETUP #line 378 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR) } +{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 165: YY_RULE_SETUP #line 379 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } +{ YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 166: YY_RULE_SETUP #line 380 "./util/configlexer.lex" -{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) } +{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } YY_BREAK case 167: YY_RULE_SETUP #line 381 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } +{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) } YY_BREAK case 168: YY_RULE_SETUP #line 382 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } +{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 169: YY_RULE_SETUP #line 383 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 170: YY_RULE_SETUP #line 384 "./util/configlexer.lex" -{ YDVAR(1, VAR_BOGUS_TTL) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 171: YY_RULE_SETUP #line 385 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } +{ YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 172: YY_RULE_SETUP #line 386 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } +{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 173: YY_RULE_SETUP #line 387 "./util/configlexer.lex" -{ YDVAR(1, VAR_AGGRESSIVE_NSEC) } +{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 174: YY_RULE_SETUP #line 388 "./util/configlexer.lex" -{ YDVAR(1, VAR_IGNORE_CD_FLAG) } +{ YDVAR(1, VAR_AGGRESSIVE_NSEC) } YY_BREAK case 175: YY_RULE_SETUP #line 389 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED) } +{ YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 176: YY_RULE_SETUP #line 390 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) } +{ YDVAR(1, VAR_SERVE_EXPIRED) } YY_BREAK case 177: YY_RULE_SETUP #line 391 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) } YY_BREAK case 178: YY_RULE_SETUP #line 392 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } YY_BREAK case 179: YY_RULE_SETUP #line 393 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) } +{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) } YY_BREAK case 180: YY_RULE_SETUP #line 394 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_DSA) } +{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) } YY_BREAK case 181: YY_RULE_SETUP #line 395 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_SHA1) } +{ YDVAR(1, VAR_FAKE_DSA) } YY_BREAK case 182: YY_RULE_SETUP #line 396 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_FAKE_SHA1) } YY_BREAK case 183: YY_RULE_SETUP #line 397 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 184: YY_RULE_SETUP #line 398 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 185: YY_RULE_SETUP #line 399 "./util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 186: YY_RULE_SETUP #line 400 "./util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 187: YY_RULE_SETUP -#line 402 "./util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 401 "./util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 188: YY_RULE_SETUP #line 403 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 189: YY_RULE_SETUP #line 404 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 190: YY_RULE_SETUP #line 405 "./util/configlexer.lex" -{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 191: YY_RULE_SETUP #line 406 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } YY_BREAK case 192: YY_RULE_SETUP #line 407 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_IDENTITY) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 193: YY_RULE_SETUP #line 408 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_LOG_IDENTITY) } YY_BREAK case 194: YY_RULE_SETUP #line 409 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 195: YY_RULE_SETUP #line 410 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_REPLIES) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 196: YY_RULE_SETUP #line 411 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) } +{ YDVAR(1, VAR_LOG_REPLIES) } YY_BREAK case 197: YY_RULE_SETUP #line 412 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } +{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) } YY_BREAK case 198: YY_RULE_SETUP #line 413 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_SERVFAIL) } +{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } YY_BREAK case 199: YY_RULE_SETUP #line 414 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_SERVFAIL) } YY_BREAK case 200: YY_RULE_SETUP #line 415 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 201: YY_RULE_SETUP #line 416 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 202: YY_RULE_SETUP #line 417 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 203: YY_RULE_SETUP #line 418 "./util/configlexer.lex" -{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } +{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 204: YY_RULE_SETUP #line 419 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } YY_BREAK case 205: YY_RULE_SETUP #line 420 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 206: YY_RULE_SETUP #line 421 "./util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 207: YY_RULE_SETUP #line 422 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_ENABLE) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 208: YY_RULE_SETUP #line 423 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_KEY) } +{ YDVAR(1, VAR_SHM_ENABLE) } YY_BREAK case 209: YY_RULE_SETUP #line 424 "./util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_SHM_KEY) } YY_BREAK case 210: YY_RULE_SETUP #line 425 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 211: YY_RULE_SETUP #line 426 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 212: YY_RULE_SETUP #line 427 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 213: YY_RULE_SETUP #line 428 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_USE_CERT) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 214: YY_RULE_SETUP #line 429 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 215: YY_RULE_SETUP #line 430 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 216: YY_RULE_SETUP #line 431 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 217: YY_RULE_SETUP #line 432 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 218: YY_RULE_SETUP #line 433 "./util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 219: YY_RULE_SETUP #line 434 "./util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 220: YY_RULE_SETUP #line 435 "./util/configlexer.lex" -{ YDVAR(1, VAR_DYNLIB_FILE) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 221: YY_RULE_SETUP #line 436 "./util/configlexer.lex" -{ YDVAR(0, VAR_DYNLIB) } +{ YDVAR(1, VAR_DYNLIB_FILE) } YY_BREAK case 222: YY_RULE_SETUP #line 437 "./util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(0, VAR_DYNLIB) } YY_BREAK case 223: YY_RULE_SETUP #line 438 "./util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 224: YY_RULE_SETUP #line 439 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 225: YY_RULE_SETUP #line 440 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 226: YY_RULE_SETUP #line 441 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) } YY_BREAK case 227: YY_RULE_SETUP #line 442 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_PREFIX) } +{ YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 228: YY_RULE_SETUP #line 443 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_SYNTHALL) } +{ YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 229: YY_RULE_SETUP #line 444 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } +{ YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 230: YY_RULE_SETUP #line 445 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEFINE_TAG) } +{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } YY_BREAK case 231: YY_RULE_SETUP #line 446 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } +{ YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 232: YY_RULE_SETUP #line 447 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } +{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 233: YY_RULE_SETUP #line 448 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } +{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 234: YY_RULE_SETUP #line 449 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 235: YY_RULE_SETUP #line 450 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 236: YY_RULE_SETUP #line 451 "./util/configlexer.lex" -{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } +{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 237: YY_RULE_SETUP #line 452 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSTAP) } +{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 238: YY_RULE_SETUP #line 453 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_ENABLE) } +{ YDVAR(0, VAR_DNSTAP) } YY_BREAK case 239: YY_RULE_SETUP #line 454 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) } +{ YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 240: YY_RULE_SETUP #line 455 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } +{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) } YY_BREAK case 241: YY_RULE_SETUP #line 456 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IP) } +{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 242: YY_RULE_SETUP #line 457 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS) } +{ YDVAR(1, VAR_DNSTAP_IP) } YY_BREAK case 243: YY_RULE_SETUP #line 458 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) } +{ YDVAR(1, VAR_DNSTAP_TLS) } YY_BREAK case 244: YY_RULE_SETUP #line 459 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) } +{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) } YY_BREAK case 245: YY_RULE_SETUP #line 460 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) } +{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) } YY_BREAK case 246: YY_RULE_SETUP -#line 462 "./util/configlexer.lex" +#line 461 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) } + YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) } YY_BREAK case 247: YY_RULE_SETUP -#line 464 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } +#line 463 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) } YY_BREAK case 248: YY_RULE_SETUP #line 465 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 249: YY_RULE_SETUP #line 466 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 250: YY_RULE_SETUP #line 467 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_VERSION) } +{ YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 251: YY_RULE_SETUP #line 468 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } +{ YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 252: YY_RULE_SETUP -#line 470 "./util/configlexer.lex" +#line 469 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 253: YY_RULE_SETUP -#line 472 "./util/configlexer.lex" +#line 471 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 254: YY_RULE_SETUP -#line 474 "./util/configlexer.lex" +#line 473 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 255: YY_RULE_SETUP -#line 476 "./util/configlexer.lex" +#line 475 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 256: YY_RULE_SETUP -#line 478 "./util/configlexer.lex" +#line 477 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 257: YY_RULE_SETUP -#line 480 "./util/configlexer.lex" -{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } +#line 479 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 258: YY_RULE_SETUP #line 481 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT) } +{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 259: YY_RULE_SETUP #line 482 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT) } +{ YDVAR(1, VAR_IP_RATELIMIT) } YY_BREAK case 260: YY_RULE_SETUP #line 483 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 261: YY_RULE_SETUP #line 484 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } YY_BREAK case 262: YY_RULE_SETUP #line 485 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 263: YY_RULE_SETUP #line 486 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } YY_BREAK case 264: YY_RULE_SETUP #line 487 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } +{ YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 265: YY_RULE_SETUP #line 488 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 266: YY_RULE_SETUP #line 489 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 267: YY_RULE_SETUP #line 490 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_FACTOR) } +{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } YY_BREAK case 268: YY_RULE_SETUP #line 491 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOW_RTT) } +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } YY_BREAK case 269: YY_RULE_SETUP #line 492 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_NUM) } +{ YDVAR(1, VAR_LOW_RTT) } YY_BREAK case 270: YY_RULE_SETUP #line 493 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +{ YDVAR(1, VAR_FAST_SERVER_NUM) } YY_BREAK case 271: YY_RULE_SETUP @@ -4803,99 +4812,99 @@ YY_RULE_SETUP case 273: YY_RULE_SETUP #line 496 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_TAG) } +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 274: YY_RULE_SETUP #line 497 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP) } +{ YDVAR(2, VAR_RESPONSE_IP_TAG) } YY_BREAK case 275: YY_RULE_SETUP #line 498 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_DATA) } +{ YDVAR(2, VAR_RESPONSE_IP) } YY_BREAK case 276: YY_RULE_SETUP #line 499 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSCRYPT) } +{ YDVAR(2, VAR_RESPONSE_IP_DATA) } YY_BREAK case 277: YY_RULE_SETUP #line 500 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } +{ YDVAR(0, VAR_DNSCRYPT) } YY_BREAK case 278: YY_RULE_SETUP #line 501 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PORT) } +{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } YY_BREAK case 279: YY_RULE_SETUP #line 502 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } +{ YDVAR(1, VAR_DNSCRYPT_PORT) } YY_BREAK case 280: YY_RULE_SETUP #line 503 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } YY_BREAK case 281: YY_RULE_SETUP #line 504 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } +{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } YY_BREAK case 282: YY_RULE_SETUP #line 505 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } YY_BREAK case 283: YY_RULE_SETUP #line 506 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } YY_BREAK case 284: YY_RULE_SETUP -#line 508 "./util/configlexer.lex" +#line 507 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } YY_BREAK case 285: YY_RULE_SETUP -#line 510 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } +#line 509 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } YY_BREAK case 286: YY_RULE_SETUP #line 511 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } YY_BREAK case 287: YY_RULE_SETUP #line 512 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_ENABLED) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } YY_BREAK case 288: YY_RULE_SETUP #line 513 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } +{ YDVAR(1, VAR_IPSECMOD_ENABLED) } YY_BREAK case 289: YY_RULE_SETUP #line 514 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_HOOK) } +{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } YY_BREAK case 290: YY_RULE_SETUP #line 515 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } +{ YDVAR(1, VAR_IPSECMOD_HOOK) } YY_BREAK case 291: YY_RULE_SETUP #line 516 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } +{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } YY_BREAK case 292: YY_RULE_SETUP @@ -4905,113 +4914,118 @@ YY_RULE_SETUP case 293: YY_RULE_SETUP #line 518 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_STRICT) } +{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } YY_BREAK case 294: YY_RULE_SETUP #line 519 "./util/configlexer.lex" -{ YDVAR(0, VAR_CACHEDB) } +{ YDVAR(1, VAR_IPSECMOD_STRICT) } YY_BREAK case 295: YY_RULE_SETUP #line 520 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_BACKEND) } +{ YDVAR(0, VAR_CACHEDB) } YY_BREAK case 296: YY_RULE_SETUP #line 521 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } +{ YDVAR(1, VAR_CACHEDB_BACKEND) } YY_BREAK case 297: YY_RULE_SETUP #line 522 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISHOST) } +{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } YY_BREAK case 298: YY_RULE_SETUP #line 523 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISPORT) } +{ YDVAR(1, VAR_CACHEDB_REDISHOST) } YY_BREAK case 299: YY_RULE_SETUP #line 524 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } +{ YDVAR(1, VAR_CACHEDB_REDISPORT) } YY_BREAK case 300: YY_RULE_SETUP #line 525 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) } +{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } YY_BREAK case 301: YY_RULE_SETUP #line 526 "./util/configlexer.lex" -{ YDVAR(0, VAR_IPSET) } +{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) } YY_BREAK case 302: YY_RULE_SETUP #line 527 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSET_NAME_V4) } +{ YDVAR(0, VAR_IPSET) } YY_BREAK case 303: YY_RULE_SETUP #line 528 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSET_NAME_V6) } +{ YDVAR(1, VAR_IPSET_NAME_V4) } YY_BREAK case 304: YY_RULE_SETUP #line 529 "./util/configlexer.lex" -{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } +{ YDVAR(1, VAR_IPSET_NAME_V6) } YY_BREAK case 305: YY_RULE_SETUP #line 530 "./util/configlexer.lex" -{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } +{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } YY_BREAK case 306: YY_RULE_SETUP #line 531 "./util/configlexer.lex" -{ YDVAR(2, VAR_EDNS_CLIENT_TAG) } +{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } YY_BREAK case 307: YY_RULE_SETUP #line 532 "./util/configlexer.lex" -{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) } +{ YDVAR(2, VAR_EDNS_CLIENT_STRING) } YY_BREAK case 308: -/* rule 308 can match eol */ YY_RULE_SETUP #line 533 "./util/configlexer.lex" +{ YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) } + YY_BREAK +case 309: +/* rule 309 can match eol */ +YY_RULE_SETUP +#line 534 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 309: +case 310: YY_RULE_SETUP -#line 536 "./util/configlexer.lex" +#line 537 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 537 "./util/configlexer.lex" +#line 538 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 310: +case 311: YY_RULE_SETUP -#line 542 "./util/configlexer.lex" +#line 543 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 311: -/* rule 311 can match eol */ +case 312: +/* rule 312 can match eol */ YY_RULE_SETUP -#line 543 "./util/configlexer.lex" +#line 544 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 312: +case 313: YY_RULE_SETUP -#line 545 "./util/configlexer.lex" +#line 546 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -5024,34 +5038,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 313: +case 314: YY_RULE_SETUP -#line 557 "./util/configlexer.lex" +#line 558 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 558 "./util/configlexer.lex" +#line 559 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 314: +case 315: YY_RULE_SETUP -#line 563 "./util/configlexer.lex" +#line 564 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 315: -/* rule 315 can match eol */ +case 316: +/* rule 316 can match eol */ YY_RULE_SETUP -#line 564 "./util/configlexer.lex" +#line 565 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 316: +case 317: YY_RULE_SETUP -#line 566 "./util/configlexer.lex" +#line 567 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -5064,38 +5078,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 317: +case 318: YY_RULE_SETUP -#line 578 "./util/configlexer.lex" +#line 579 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 580 "./util/configlexer.lex" +#line 581 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 318: -YY_RULE_SETUP -#line 584 "./util/configlexer.lex" -{ 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++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 320: +/* rule 320 can match eol */ YY_RULE_SETUP #line 586 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 321: YY_RULE_SETUP #line 587 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 322: +YY_RULE_SETUP +#line 588 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext, 0); @@ -5103,27 +5117,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 592 "./util/configlexer.lex" +#line 593 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 322: +case 323: YY_RULE_SETUP -#line 596 "./util/configlexer.lex" +#line 597 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 323: -/* rule 323 can match eol */ +case 324: +/* rule 324 can match eol */ YY_RULE_SETUP -#line 597 "./util/configlexer.lex" +#line 598 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 324: +case 325: YY_RULE_SETUP -#line 599 "./util/configlexer.lex" +#line 600 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -5133,7 +5147,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 605 "./util/configlexer.lex" +#line 606 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -5148,39 +5162,39 @@ case YY_STATE_EOF(val): } YY_BREAK /* include-toplevel: directive */ -case 325: +case 326: YY_RULE_SETUP -#line 619 "./util/configlexer.lex" +#line 620 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel); } YY_BREAK case YY_STATE_EOF(include_toplevel): -#line 622 "./util/configlexer.lex" +#line 623 "./util/configlexer.lex" { yyerror("EOF inside include_toplevel directive"); BEGIN(inc_prev); } YY_BREAK -case 326: -YY_RULE_SETUP -#line 626 "./util/configlexer.lex" -{ 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++; } +{ LEXOUT(("ITSP ")); /* ignore */ } YY_BREAK case 328: +/* rule 328 can match eol */ YY_RULE_SETUP #line 628 "./util/configlexer.lex" -{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK case 329: YY_RULE_SETUP #line 629 "./util/configlexer.lex" +{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); } + YY_BREAK +case 330: +YY_RULE_SETUP +#line 630 "./util/configlexer.lex" { LEXOUT(("ITunquotedstr(%s) ", yytext)); config_start_include_glob(yytext, 1); @@ -5189,29 +5203,29 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_toplevel_quoted): -#line 635 "./util/configlexer.lex" +#line 636 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 330: +case 331: YY_RULE_SETUP -#line 639 "./util/configlexer.lex" +#line 640 "./util/configlexer.lex" { LEXOUT(("ITSTR(%s) ", yytext)); yymore(); } YY_BREAK -case 331: -/* rule 331 can match eol */ +case 332: +/* rule 332 can match eol */ YY_RULE_SETUP -#line 640 "./util/configlexer.lex" +#line 641 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 332: +case 333: YY_RULE_SETUP -#line 644 "./util/configlexer.lex" +#line 645 "./util/configlexer.lex" { LEXOUT(("ITQE ")); yytext[yyleng - 1] = '\0'; @@ -5220,33 +5234,33 @@ YY_RULE_SETUP return (VAR_FORCE_TOPLEVEL); } YY_BREAK -case 333: +case 334: YY_RULE_SETUP -#line 652 "./util/configlexer.lex" +#line 653 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 334: +case 335: YY_RULE_SETUP -#line 656 "./util/configlexer.lex" +#line 657 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 335: +case 336: YY_RULE_SETUP -#line 660 "./util/configlexer.lex" +#line 661 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 336: +case 337: YY_RULE_SETUP -#line 664 "./util/configlexer.lex" +#line 665 "./util/configlexer.lex" ECHO; YY_BREAK -#line 5247 "" +#line 5261 "" case YY_END_OF_BUFFER: { @@ -5541,7 +5555,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 >= 3281 ) + if ( yy_current_state >= 3292 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -5569,11 +5583,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 >= 3281 ) + if ( yy_current_state >= 3292 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 3280); + yy_is_jam = (yy_current_state == 3291); return yy_is_jam ? 0 : yy_current_state; } @@ -6212,6 +6226,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 664 "./util/configlexer.lex" +#line 665 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 4e0bf240f..55c584a76 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -301,6 +301,7 @@ 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) } +udp-connect{COLON} { YDVAR(1, VAR_UDP_CONNECT) } target-fetch-policy{COLON} { YDVAR(1, VAR_TARGET_FETCH_POLICY) } harden-short-bufsize{COLON} { YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } harden-large-queries{COLON} { YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } @@ -528,8 +529,8 @@ name-v4{COLON} { YDVAR(1, VAR_IPSET_NAME_V4) } name-v6{COLON} { YDVAR(1, VAR_IPSET_NAME_V6) } udp-upstream-without-downstream{COLON} { YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } tcp-connection-limit{COLON} { YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } -edns-client-tag{COLON} { YDVAR(2, VAR_EDNS_CLIENT_TAG) } -edns-client-tag-opcode{COLON} { YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) } +edns-client-string{COLON} { YDVAR(2, VAR_EDNS_CLIENT_STRING) } +edns-client-string-opcode{COLON} { YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) } {NEWLINE} { LEXOUT(("NL\n")); cfg_parser->line++; } /* Quoted strings. Strip leading and ending quotes */ diff --git a/util/configparser.c b/util/configparser.c index 0ce58427e..4e5bf5a41 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -285,154 +285,155 @@ extern int yydebug; 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_TAG = 555, - VAR_EDNS_CLIENT_TAG_OPCODE = 556 + VAR_UDP_CONNECT = 409, + VAR_UNBLOCK_LAN_ZONES = 410, + VAR_INSECURE_LAN_ZONES = 411, + VAR_INFRA_CACHE_MIN_RTT = 412, + VAR_INFRA_KEEP_PROBING = 413, + VAR_DNS64_PREFIX = 414, + VAR_DNS64_SYNTHALL = 415, + VAR_DNS64_IGNORE_AAAA = 416, + VAR_DNSTAP = 417, + VAR_DNSTAP_ENABLE = 418, + VAR_DNSTAP_SOCKET_PATH = 419, + VAR_DNSTAP_IP = 420, + VAR_DNSTAP_TLS = 421, + VAR_DNSTAP_TLS_SERVER_NAME = 422, + VAR_DNSTAP_TLS_CERT_BUNDLE = 423, + VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424, + VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425, + VAR_DNSTAP_SEND_IDENTITY = 426, + VAR_DNSTAP_SEND_VERSION = 427, + VAR_DNSTAP_BIDIRECTIONAL = 428, + VAR_DNSTAP_IDENTITY = 429, + VAR_DNSTAP_VERSION = 430, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436, + VAR_RESPONSE_IP_TAG = 437, + VAR_RESPONSE_IP = 438, + VAR_RESPONSE_IP_DATA = 439, + VAR_HARDEN_ALGO_DOWNGRADE = 440, + VAR_IP_TRANSPARENT = 441, + VAR_IP_DSCP = 442, + VAR_DISABLE_DNSSEC_LAME_CHECK = 443, + VAR_IP_RATELIMIT = 444, + VAR_IP_RATELIMIT_SLABS = 445, + VAR_IP_RATELIMIT_SIZE = 446, + VAR_RATELIMIT = 447, + VAR_RATELIMIT_SLABS = 448, + VAR_RATELIMIT_SIZE = 449, + VAR_RATELIMIT_FOR_DOMAIN = 450, + VAR_RATELIMIT_BELOW_DOMAIN = 451, + VAR_IP_RATELIMIT_FACTOR = 452, + VAR_RATELIMIT_FACTOR = 453, + VAR_SEND_CLIENT_SUBNET = 454, + VAR_CLIENT_SUBNET_ZONE = 455, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456, + VAR_CLIENT_SUBNET_OPCODE = 457, + VAR_MAX_CLIENT_SUBNET_IPV4 = 458, + VAR_MAX_CLIENT_SUBNET_IPV6 = 459, + VAR_MIN_CLIENT_SUBNET_IPV4 = 460, + VAR_MIN_CLIENT_SUBNET_IPV6 = 461, + VAR_MAX_ECS_TREE_SIZE_IPV4 = 462, + VAR_MAX_ECS_TREE_SIZE_IPV6 = 463, + VAR_CAPS_WHITELIST = 464, + VAR_CACHE_MAX_NEGATIVE_TTL = 465, + VAR_PERMIT_SMALL_HOLDDOWN = 466, + VAR_QNAME_MINIMISATION = 467, + VAR_QNAME_MINIMISATION_STRICT = 468, + VAR_IP_FREEBIND = 469, + VAR_DEFINE_TAG = 470, + VAR_LOCAL_ZONE_TAG = 471, + VAR_ACCESS_CONTROL_TAG = 472, + VAR_LOCAL_ZONE_OVERRIDE = 473, + VAR_ACCESS_CONTROL_TAG_ACTION = 474, + VAR_ACCESS_CONTROL_TAG_DATA = 475, + VAR_VIEW = 476, + VAR_ACCESS_CONTROL_VIEW = 477, + VAR_VIEW_FIRST = 478, + VAR_SERVE_EXPIRED = 479, + VAR_SERVE_EXPIRED_TTL = 480, + VAR_SERVE_EXPIRED_TTL_RESET = 481, + VAR_SERVE_EXPIRED_REPLY_TTL = 482, + VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483, + VAR_FAKE_DSA = 484, + VAR_FAKE_SHA1 = 485, + VAR_LOG_IDENTITY = 486, + VAR_HIDE_TRUSTANCHOR = 487, + VAR_TRUST_ANCHOR_SIGNALING = 488, + VAR_AGGRESSIVE_NSEC = 489, + VAR_USE_SYSTEMD = 490, + VAR_SHM_ENABLE = 491, + VAR_SHM_KEY = 492, + VAR_ROOT_KEY_SENTINEL = 493, + VAR_DNSCRYPT = 494, + VAR_DNSCRYPT_ENABLE = 495, + VAR_DNSCRYPT_PORT = 496, + VAR_DNSCRYPT_PROVIDER = 497, + VAR_DNSCRYPT_SECRET_KEY = 498, + VAR_DNSCRYPT_PROVIDER_CERT = 499, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504, + VAR_IPSECMOD_ENABLED = 505, + VAR_IPSECMOD_HOOK = 506, + VAR_IPSECMOD_IGNORE_BOGUS = 507, + VAR_IPSECMOD_MAX_TTL = 508, + VAR_IPSECMOD_WHITELIST = 509, + VAR_IPSECMOD_STRICT = 510, + VAR_CACHEDB = 511, + VAR_CACHEDB_BACKEND = 512, + VAR_CACHEDB_SECRETSEED = 513, + VAR_CACHEDB_REDISHOST = 514, + VAR_CACHEDB_REDISPORT = 515, + VAR_CACHEDB_REDISTIMEOUT = 516, + VAR_CACHEDB_REDISEXPIRERECORDS = 517, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518, + VAR_FOR_UPSTREAM = 519, + VAR_AUTH_ZONE = 520, + VAR_ZONEFILE = 521, + VAR_MASTER = 522, + VAR_URL = 523, + VAR_FOR_DOWNSTREAM = 524, + VAR_FALLBACK_ENABLED = 525, + VAR_TLS_ADDITIONAL_PORT = 526, + VAR_LOW_RTT = 527, + VAR_LOW_RTT_PERMIL = 528, + VAR_FAST_SERVER_PERMIL = 529, + VAR_FAST_SERVER_NUM = 530, + VAR_ALLOW_NOTIFY = 531, + VAR_TLS_WIN_CERT = 532, + VAR_TCP_CONNECTION_LIMIT = 533, + VAR_FORWARD_NO_CACHE = 534, + VAR_STUB_NO_CACHE = 535, + VAR_LOG_SERVFAIL = 536, + VAR_DENY_ANY = 537, + VAR_UNKNOWN_SERVER_TIME_LIMIT = 538, + VAR_LOG_TAG_QUERYREPLY = 539, + VAR_STREAM_WAIT_SIZE = 540, + VAR_TLS_CIPHERS = 541, + VAR_TLS_CIPHERSUITES = 542, + VAR_TLS_USE_SNI = 543, + VAR_IPSET = 544, + VAR_IPSET_NAME_V4 = 545, + VAR_IPSET_NAME_V6 = 546, + VAR_TLS_SESSION_TICKET_KEYS = 547, + VAR_RPZ = 548, + VAR_TAGS = 549, + VAR_RPZ_ACTION_OVERRIDE = 550, + VAR_RPZ_CNAME_OVERRIDE = 551, + VAR_RPZ_LOG = 552, + VAR_RPZ_LOG_NAME = 553, + VAR_DYNLIB = 554, + VAR_DYNLIB_FILE = 555, + VAR_EDNS_CLIENT_STRING = 556, + VAR_EDNS_CLIENT_STRING_OPCODE = 557 }; #endif /* Tokens. */ @@ -587,154 +588,155 @@ extern int yydebug; #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_TAG 555 -#define VAR_EDNS_CLIENT_TAG_OPCODE 556 +#define VAR_UDP_CONNECT 409 +#define VAR_UNBLOCK_LAN_ZONES 410 +#define VAR_INSECURE_LAN_ZONES 411 +#define VAR_INFRA_CACHE_MIN_RTT 412 +#define VAR_INFRA_KEEP_PROBING 413 +#define VAR_DNS64_PREFIX 414 +#define VAR_DNS64_SYNTHALL 415 +#define VAR_DNS64_IGNORE_AAAA 416 +#define VAR_DNSTAP 417 +#define VAR_DNSTAP_ENABLE 418 +#define VAR_DNSTAP_SOCKET_PATH 419 +#define VAR_DNSTAP_IP 420 +#define VAR_DNSTAP_TLS 421 +#define VAR_DNSTAP_TLS_SERVER_NAME 422 +#define VAR_DNSTAP_TLS_CERT_BUNDLE 423 +#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 424 +#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 425 +#define VAR_DNSTAP_SEND_IDENTITY 426 +#define VAR_DNSTAP_SEND_VERSION 427 +#define VAR_DNSTAP_BIDIRECTIONAL 428 +#define VAR_DNSTAP_IDENTITY 429 +#define VAR_DNSTAP_VERSION 430 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 431 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 432 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 433 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 434 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 435 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 436 +#define VAR_RESPONSE_IP_TAG 437 +#define VAR_RESPONSE_IP 438 +#define VAR_RESPONSE_IP_DATA 439 +#define VAR_HARDEN_ALGO_DOWNGRADE 440 +#define VAR_IP_TRANSPARENT 441 +#define VAR_IP_DSCP 442 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 443 +#define VAR_IP_RATELIMIT 444 +#define VAR_IP_RATELIMIT_SLABS 445 +#define VAR_IP_RATELIMIT_SIZE 446 +#define VAR_RATELIMIT 447 +#define VAR_RATELIMIT_SLABS 448 +#define VAR_RATELIMIT_SIZE 449 +#define VAR_RATELIMIT_FOR_DOMAIN 450 +#define VAR_RATELIMIT_BELOW_DOMAIN 451 +#define VAR_IP_RATELIMIT_FACTOR 452 +#define VAR_RATELIMIT_FACTOR 453 +#define VAR_SEND_CLIENT_SUBNET 454 +#define VAR_CLIENT_SUBNET_ZONE 455 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 456 +#define VAR_CLIENT_SUBNET_OPCODE 457 +#define VAR_MAX_CLIENT_SUBNET_IPV4 458 +#define VAR_MAX_CLIENT_SUBNET_IPV6 459 +#define VAR_MIN_CLIENT_SUBNET_IPV4 460 +#define VAR_MIN_CLIENT_SUBNET_IPV6 461 +#define VAR_MAX_ECS_TREE_SIZE_IPV4 462 +#define VAR_MAX_ECS_TREE_SIZE_IPV6 463 +#define VAR_CAPS_WHITELIST 464 +#define VAR_CACHE_MAX_NEGATIVE_TTL 465 +#define VAR_PERMIT_SMALL_HOLDDOWN 466 +#define VAR_QNAME_MINIMISATION 467 +#define VAR_QNAME_MINIMISATION_STRICT 468 +#define VAR_IP_FREEBIND 469 +#define VAR_DEFINE_TAG 470 +#define VAR_LOCAL_ZONE_TAG 471 +#define VAR_ACCESS_CONTROL_TAG 472 +#define VAR_LOCAL_ZONE_OVERRIDE 473 +#define VAR_ACCESS_CONTROL_TAG_ACTION 474 +#define VAR_ACCESS_CONTROL_TAG_DATA 475 +#define VAR_VIEW 476 +#define VAR_ACCESS_CONTROL_VIEW 477 +#define VAR_VIEW_FIRST 478 +#define VAR_SERVE_EXPIRED 479 +#define VAR_SERVE_EXPIRED_TTL 480 +#define VAR_SERVE_EXPIRED_TTL_RESET 481 +#define VAR_SERVE_EXPIRED_REPLY_TTL 482 +#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 483 +#define VAR_FAKE_DSA 484 +#define VAR_FAKE_SHA1 485 +#define VAR_LOG_IDENTITY 486 +#define VAR_HIDE_TRUSTANCHOR 487 +#define VAR_TRUST_ANCHOR_SIGNALING 488 +#define VAR_AGGRESSIVE_NSEC 489 +#define VAR_USE_SYSTEMD 490 +#define VAR_SHM_ENABLE 491 +#define VAR_SHM_KEY 492 +#define VAR_ROOT_KEY_SENTINEL 493 +#define VAR_DNSCRYPT 494 +#define VAR_DNSCRYPT_ENABLE 495 +#define VAR_DNSCRYPT_PORT 496 +#define VAR_DNSCRYPT_PROVIDER 497 +#define VAR_DNSCRYPT_SECRET_KEY 498 +#define VAR_DNSCRYPT_PROVIDER_CERT 499 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 500 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 501 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 502 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 503 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 504 +#define VAR_IPSECMOD_ENABLED 505 +#define VAR_IPSECMOD_HOOK 506 +#define VAR_IPSECMOD_IGNORE_BOGUS 507 +#define VAR_IPSECMOD_MAX_TTL 508 +#define VAR_IPSECMOD_WHITELIST 509 +#define VAR_IPSECMOD_STRICT 510 +#define VAR_CACHEDB 511 +#define VAR_CACHEDB_BACKEND 512 +#define VAR_CACHEDB_SECRETSEED 513 +#define VAR_CACHEDB_REDISHOST 514 +#define VAR_CACHEDB_REDISPORT 515 +#define VAR_CACHEDB_REDISTIMEOUT 516 +#define VAR_CACHEDB_REDISEXPIRERECORDS 517 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 518 +#define VAR_FOR_UPSTREAM 519 +#define VAR_AUTH_ZONE 520 +#define VAR_ZONEFILE 521 +#define VAR_MASTER 522 +#define VAR_URL 523 +#define VAR_FOR_DOWNSTREAM 524 +#define VAR_FALLBACK_ENABLED 525 +#define VAR_TLS_ADDITIONAL_PORT 526 +#define VAR_LOW_RTT 527 +#define VAR_LOW_RTT_PERMIL 528 +#define VAR_FAST_SERVER_PERMIL 529 +#define VAR_FAST_SERVER_NUM 530 +#define VAR_ALLOW_NOTIFY 531 +#define VAR_TLS_WIN_CERT 532 +#define VAR_TCP_CONNECTION_LIMIT 533 +#define VAR_FORWARD_NO_CACHE 534 +#define VAR_STUB_NO_CACHE 535 +#define VAR_LOG_SERVFAIL 536 +#define VAR_DENY_ANY 537 +#define VAR_UNKNOWN_SERVER_TIME_LIMIT 538 +#define VAR_LOG_TAG_QUERYREPLY 539 +#define VAR_STREAM_WAIT_SIZE 540 +#define VAR_TLS_CIPHERS 541 +#define VAR_TLS_CIPHERSUITES 542 +#define VAR_TLS_USE_SNI 543 +#define VAR_IPSET 544 +#define VAR_IPSET_NAME_V4 545 +#define VAR_IPSET_NAME_V6 546 +#define VAR_TLS_SESSION_TICKET_KEYS 547 +#define VAR_RPZ 548 +#define VAR_TAGS 549 +#define VAR_RPZ_ACTION_OVERRIDE 550 +#define VAR_RPZ_CNAME_OVERRIDE 551 +#define VAR_RPZ_LOG 552 +#define VAR_RPZ_LOG_NAME 553 +#define VAR_DYNLIB 554 +#define VAR_DYNLIB_FILE 555 +#define VAR_EDNS_CLIENT_STRING 556 +#define VAR_EDNS_CLIENT_STRING_OPCODE 557 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -744,7 +746,7 @@ union YYSTYPE char* str; -#line 748 "util/configparser.c" +#line 750 "util/configparser.c" }; typedef union YYSTYPE YYSTYPE; @@ -994,19 +996,19 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 639 +#define YYLAST 641 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 302 +#define YYNTOKENS 303 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 327 +#define YYNNTS 328 /* YYNRULES -- Number of rules. */ -#define YYNRULES 630 +#define YYNRULES 632 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 936 +#define YYNSTATES 939 #define YYUNDEFTOK 2 -#define YYMAXUTOK 556 +#define YYMAXUTOK 557 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM as returned by yylex, with out-of-bounds checking. */ @@ -1072,77 +1074,77 @@ static const yytype_uint16 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, 300, 301 + 295, 296, 297, 298, 299, 300, 301, 302 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 184, 184, 184, 185, 185, 186, 186, 187, 187, - 187, 188, 188, 189, 189, 190, 190, 191, 193, 199, - 204, 205, 206, 206, 206, 207, 207, 208, 208, 208, - 209, 209, 210, 210, 210, 211, 211, 212, 212, 212, - 213, 213, 213, 214, 214, 215, 215, 216, 216, 217, - 217, 218, 218, 219, 219, 220, 220, 221, 221, 222, - 222, 222, 223, 223, 223, 224, 224, 224, 225, 225, - 226, 226, 227, 227, 228, 228, 229, 229, 229, 230, - 230, 231, 231, 232, 232, 232, 233, 233, 234, 234, - 235, 235, 236, 236, 236, 237, 237, 238, 238, 239, - 239, 240, 240, 241, 241, 242, 242, 242, 243, 243, - 244, 244, 244, 245, 245, 245, 246, 246, 246, 247, - 247, 247, 247, 248, 249, 249, 249, 250, 250, 250, - 251, 251, 252, 252, 253, 253, 253, 254, 254, 255, - 255, 256, 256, 256, 257, 257, 258, 258, 258, 259, - 259, 260, 260, 261, 261, 262, 263, 263, 264, 264, - 265, 265, 266, 267, 267, 268, 268, 269, 269, 270, - 270, 271, 271, 272, 272, 272, 273, 273, 274, 274, - 275, 275, 276, 276, 277, 277, 278, 278, 279, 279, - 279, 280, 280, 280, 281, 281, 281, 282, 282, 283, - 284, 284, 285, 285, 286, 286, 287, 287, 288, 288, - 288, 289, 289, 289, 290, 290, 290, 291, 291, 292, - 292, 293, 293, 294, 294, 295, 297, 309, 310, 311, - 311, 311, 311, 311, 312, 312, 314, 326, 327, 328, - 328, 328, 328, 329, 329, 331, 345, 346, 347, 347, - 347, 347, 348, 348, 348, 350, 367, 368, 369, 369, - 369, 369, 370, 370, 370, 371, 374, 393, 410, 418, - 428, 436, 453, 454, 455, 455, 455, 455, 455, 456, - 456, 456, 457, 457, 459, 468, 477, 488, 497, 506, - 515, 526, 535, 547, 561, 576, 587, 604, 621, 638, - 655, 670, 685, 698, 713, 722, 731, 740, 749, 758, - 767, 776, 785, 794, 803, 812, 821, 830, 839, 852, - 861, 874, 883, 892, 901, 908, 915, 924, 931, 940, - 948, 955, 962, 970, 979, 987, 1003, 1011, 1019, 1027, - 1035, 1043, 1052, 1061, 1075, 1084, 1093, 1102, 1111, 1120, - 1129, 1136, 1143, 1169, 1177, 1184, 1191, 1198, 1205, 1213, - 1221, 1229, 1236, 1247, 1258, 1265, 1274, 1283, 1292, 1299, - 1306, 1314, 1322, 1332, 1342, 1352, 1366, 1374, 1387, 1398, - 1406, 1419, 1428, 1437, 1446, 1456, 1466, 1474, 1487, 1496, - 1504, 1513, 1521, 1534, 1543, 1553, 1560, 1570, 1580, 1590, - 1600, 1610, 1620, 1630, 1640, 1647, 1654, 1661, 1670, 1679, - 1688, 1697, 1704, 1714, 1734, 1741, 1759, 1772, 1785, 1794, - 1803, 1812, 1821, 1831, 1841, 1852, 1861, 1870, 1879, 1888, - 1897, 1906, 1919, 1932, 1941, 1948, 1957, 1966, 1975, 1984, - 1992, 2005, 2013, 2054, 2061, 2076, 2086, 2096, 2103, 2110, - 2117, 2126, 2134, 2148, 2169, 2190, 2202, 2214, 2226, 2235, - 2256, 2266, 2275, 2283, 2291, 2304, 2317, 2332, 2347, 2356, - 2365, 2371, 2380, 2389, 2399, 2409, 2422, 2435, 2447, 2461, - 2473, 2487, 2502, 2513, 2523, 2530, 2537, 2546, 2555, 2565, - 2575, 2585, 2592, 2599, 2608, 2617, 2627, 2637, 2644, 2651, - 2658, 2666, 2676, 2686, 2696, 2706, 2745, 2755, 2763, 2771, - 2786, 2795, 2800, 2801, 2802, 2802, 2802, 2803, 2803, 2803, - 2804, 2804, 2806, 2816, 2825, 2832, 2839, 2846, 2853, 2860, - 2867, 2872, 2873, 2874, 2874, 2874, 2875, 2875, 2875, 2876, - 2877, 2877, 2878, 2878, 2879, 2879, 2880, 2881, 2882, 2883, - 2884, 2885, 2887, 2896, 2906, 2913, 2920, 2929, 2936, 2943, - 2950, 2957, 2966, 2975, 2982, 2989, 2999, 3009, 3019, 3029, - 3039, 3049, 3054, 3055, 3056, 3058, 3064, 3069, 3070, 3071, - 3073, 3079, 3089, 3096, 3105, 3113, 3118, 3119, 3121, 3121, - 3121, 3122, 3122, 3123, 3124, 3125, 3126, 3127, 3129, 3139, - 3148, 3155, 3164, 3171, 3180, 3188, 3201, 3209, 3222, 3227, - 3228, 3229, 3229, 3230, 3230, 3230, 3231, 3233, 3245, 3257, - 3269, 3284, 3297, 3310, 3321, 3326, 3327, 3328, 3328, 3330, - 3345 + 0, 185, 185, 185, 186, 186, 187, 187, 188, 188, + 188, 189, 189, 190, 190, 191, 191, 192, 194, 200, + 205, 206, 207, 207, 207, 208, 208, 209, 209, 209, + 210, 210, 211, 211, 211, 212, 212, 213, 213, 213, + 214, 214, 214, 215, 215, 216, 216, 217, 217, 218, + 218, 219, 219, 220, 220, 221, 221, 222, 222, 223, + 223, 223, 224, 224, 224, 225, 225, 225, 226, 226, + 227, 227, 228, 228, 229, 229, 230, 230, 230, 231, + 231, 232, 232, 233, 233, 233, 234, 234, 235, 235, + 236, 236, 237, 237, 237, 238, 238, 239, 239, 240, + 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, 253, 254, 254, 254, 255, 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, 1456, 1466, 1476, 1484, + 1497, 1506, 1514, 1523, 1531, 1544, 1553, 1563, 1570, 1580, + 1590, 1600, 1610, 1620, 1630, 1640, 1650, 1657, 1664, 1671, + 1680, 1689, 1698, 1707, 1714, 1724, 1744, 1751, 1769, 1782, + 1795, 1804, 1813, 1822, 1831, 1841, 1851, 1862, 1871, 1880, + 1889, 1898, 1907, 1916, 1929, 1942, 1951, 1958, 1967, 1976, + 1985, 1994, 2002, 2015, 2023, 2064, 2071, 2086, 2096, 2106, + 2113, 2120, 2127, 2136, 2144, 2158, 2179, 2200, 2212, 2224, + 2236, 2245, 2266, 2276, 2285, 2293, 2301, 2314, 2327, 2342, + 2357, 2366, 2375, 2381, 2390, 2399, 2409, 2419, 2432, 2445, + 2457, 2471, 2483, 2497, 2506, 2518, 2528, 2535, 2542, 2551, + 2560, 2570, 2580, 2590, 2597, 2604, 2613, 2622, 2632, 2642, + 2649, 2656, 2663, 2671, 2681, 2691, 2701, 2711, 2750, 2760, + 2768, 2776, 2791, 2800, 2805, 2806, 2807, 2807, 2807, 2808, + 2808, 2808, 2809, 2809, 2811, 2821, 2830, 2837, 2844, 2851, + 2858, 2865, 2872, 2877, 2878, 2879, 2879, 2879, 2880, 2880, + 2880, 2881, 2882, 2882, 2883, 2883, 2884, 2884, 2885, 2886, + 2887, 2888, 2889, 2890, 2892, 2901, 2911, 2918, 2925, 2934, + 2941, 2948, 2955, 2962, 2971, 2980, 2987, 2994, 3004, 3014, + 3024, 3034, 3044, 3054, 3059, 3060, 3061, 3063, 3069, 3074, + 3075, 3076, 3078, 3084, 3094, 3101, 3110, 3118, 3123, 3124, + 3126, 3126, 3126, 3127, 3127, 3128, 3129, 3130, 3131, 3132, + 3134, 3144, 3153, 3160, 3169, 3176, 3185, 3193, 3206, 3214, + 3227, 3232, 3233, 3234, 3234, 3235, 3235, 3235, 3236, 3238, + 3250, 3262, 3274, 3289, 3302, 3315, 3326, 3331, 3332, 3333, + 3333, 3335, 3350 }; #endif @@ -1201,15 +1203,15 @@ static const char *const yytname[] = "VAR_HTTP_QUERY_BUFFER_SIZE", "VAR_HTTP_RESPONSE_BUFFER_SIZE", "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_DELAY_CLOSE", "VAR_UDP_CONNECT", "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", @@ -1262,15 +1264,15 @@ static const char *const yytname[] = "VAR_IPSET_NAME_V4", "VAR_IPSET_NAME_V6", "VAR_TLS_SESSION_TICKET_KEYS", "VAR_RPZ", "VAR_TAGS", "VAR_RPZ_ACTION_OVERRIDE", "VAR_RPZ_CNAME_OVERRIDE", "VAR_RPZ_LOG", "VAR_RPZ_LOG_NAME", - "VAR_DYNLIB", "VAR_DYNLIB_FILE", "VAR_EDNS_CLIENT_TAG", - "VAR_EDNS_CLIENT_TAG_OPCODE", "$accept", "toplevelvars", "toplevelvar", - "force_toplevel", "serverstart", "contents_server", "content_server", - "stubstart", "contents_stub", "content_stub", "forwardstart", - "contents_forward", "content_forward", "viewstart", "contents_view", - "content_view", "authstart", "contents_auth", "content_auth", "rpz_tag", - "rpz_action_override", "rpz_cname_override", "rpz_log", "rpz_log_name", - "rpzstart", "contents_rpz", "content_rpz", "server_num_threads", - "server_verbosity", "server_statistics_interval", + "VAR_DYNLIB", "VAR_DYNLIB_FILE", "VAR_EDNS_CLIENT_STRING", + "VAR_EDNS_CLIENT_STRING_OPCODE", "$accept", "toplevelvars", + "toplevelvar", "force_toplevel", "serverstart", "contents_server", + "content_server", "stubstart", "contents_stub", "content_stub", + "forwardstart", "contents_forward", "content_forward", "viewstart", + "contents_view", "content_view", "authstart", "contents_auth", + "content_auth", "rpz_tag", "rpz_action_override", "rpz_cname_override", + "rpz_log", "rpz_log_name", "rpzstart", "contents_rpz", "content_rpz", + "server_num_threads", "server_verbosity", "server_statistics_interval", "server_statistics_cumulative", "server_extended_statistics", "server_shm_enable", "server_shm_key", "server_port", "server_send_client_subnet", "server_client_subnet_zone", @@ -1311,7 +1313,7 @@ static const char *const yytname[] = "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_delay_close", "server_udp_connect", "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", @@ -1356,24 +1358,25 @@ static const char *const yytname[] = "server_qname_minimisation_strict", "server_ipsecmod_enabled", "server_ipsecmod_ignore_bogus", "server_ipsecmod_hook", "server_ipsecmod_max_ttl", "server_ipsecmod_whitelist", - "server_ipsecmod_strict", "server_edns_client_tag", - "server_edns_client_tag_opcode", "stub_name", "stub_host", "stub_addr", - "stub_first", "stub_no_cache", "stub_ssl_upstream", "stub_prime", - "forward_name", "forward_host", "forward_addr", "forward_first", - "forward_no_cache", "forward_ssl_upstream", "auth_name", "auth_zonefile", - "auth_master", "auth_url", "auth_allow_notify", "auth_for_downstream", - "auth_for_upstream", "auth_fallback_enabled", "view_name", - "view_local_zone", "view_response_ip", "view_response_ip_data", - "view_local_data", "view_local_data_ptr", "view_first", "rcstart", - "contents_rc", "content_rc", "rc_control_enable", "rc_control_port", - "rc_control_interface", "rc_control_use_cert", "rc_server_key_file", - "rc_server_cert_file", "rc_control_key_file", "rc_control_cert_file", - "dtstart", "contents_dt", "content_dt", "dt_dnstap_enable", - "dt_dnstap_bidirectional", "dt_dnstap_socket_path", "dt_dnstap_ip", - "dt_dnstap_tls", "dt_dnstap_tls_server_name", - "dt_dnstap_tls_cert_bundle", "dt_dnstap_tls_client_key_file", - "dt_dnstap_tls_client_cert_file", "dt_dnstap_send_identity", - "dt_dnstap_send_version", "dt_dnstap_identity", "dt_dnstap_version", + "server_ipsecmod_strict", "server_edns_client_string", + "server_edns_client_string_opcode", "stub_name", "stub_host", + "stub_addr", "stub_first", "stub_no_cache", "stub_ssl_upstream", + "stub_prime", "forward_name", "forward_host", "forward_addr", + "forward_first", "forward_no_cache", "forward_ssl_upstream", "auth_name", + "auth_zonefile", "auth_master", "auth_url", "auth_allow_notify", + "auth_for_downstream", "auth_for_upstream", "auth_fallback_enabled", + "view_name", "view_local_zone", "view_response_ip", + "view_response_ip_data", "view_local_data", "view_local_data_ptr", + "view_first", "rcstart", "contents_rc", "content_rc", + "rc_control_enable", "rc_control_port", "rc_control_interface", + "rc_control_use_cert", "rc_server_key_file", "rc_server_cert_file", + "rc_control_key_file", "rc_control_cert_file", "dtstart", "contents_dt", + "content_dt", "dt_dnstap_enable", "dt_dnstap_bidirectional", + "dt_dnstap_socket_path", "dt_dnstap_ip", "dt_dnstap_tls", + "dt_dnstap_tls_server_name", "dt_dnstap_tls_cert_bundle", + "dt_dnstap_tls_client_key_file", "dt_dnstap_tls_client_cert_file", + "dt_dnstap_send_identity", "dt_dnstap_send_version", + "dt_dnstap_identity", "dt_dnstap_version", "dt_dnstap_log_resolver_query_messages", "dt_dnstap_log_resolver_response_messages", "dt_dnstap_log_client_query_messages", @@ -1432,14 +1435,14 @@ static const yytype_uint16 yytoknum[] = 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, - 555, 556 + 555, 556, 557 }; # endif -#define YYPACT_NINF -290 +#define YYPACT_NINF -291 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-290))) + (!!((Yystate) == (-291))) #define YYTABLE_NINF -1 @@ -1450,100 +1453,100 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -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, + -291, 0, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, 287, -42, -38, -43, -21, -44, -11, -96, + -109, -290, -215, -240, -282, 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, 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, 127, 128, 131, 132, 133, 134, 135, 136, 137, + 126, 127, 128, 129, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 152, 153, 154, 155, 156, 157, 158, + 148, 149, 150, 151, 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, + 169, 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, 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, + 210, 215, 216, 217, 218, 219, 220, 221, 223, 224, + 225, 226, 227, 230, 232, 234, 247, 248, 249, 250, + 251, 252, 253, 254, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, - 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 + 272, 273, 274, 275, 276, 277, 278, 280, 281, 282, + 284, 285, 286, 288, 322, 323, 324, 325, 329, 330, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, 331, 373, 374, 375, + 376, 377, 378, -291, -291, -291, -291, -291, -291, -291, + -291, 379, 380, 381, 385, 389, 390, -291, -291, -291, + -291, -291, -291, -291, 415, 416, 417, 426, 439, 440, + 441, -291, -291, -291, -291, -291, -291, -291, -291, 442, + 443, 444, 445, 446, 447, 448, 449, -291, -291, -291, + -291, -291, -291, -291, -291, -291, 450, 451, 452, 453, + 454, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, 455, 456, 457, 458, 498, 500, 516, 517, + -291, -291, -291, -291, -291, -291, -291, -291, -291, 518, + 519, 520, 521, 522, 523, 524, 525, 526, 533, 534, + 535, 536, 537, 538, 539, 541, 542, 543, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, 544, -291, + -291, 545, -291, -291, 546, 547, 550, 553, 556, 557, + 566, 567, 568, 570, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, 571, 572, 573, 574, 575, + 576, -291, -291, -291, -291, -291, -291, -291, 577, 580, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, 581, 582, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, 583, + 584, 585, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, 586, 587, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, 588, 589, 590, 591, 592, 593, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, 594, -291, -291, -291, + -291, -291, -291, -291, -291, -291, 595, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, 596, -291, -291, 597, 598, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, 599, 600, 601, + -291, -291, -291, -291, -291, -291, -291, -291, -291 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1551,10 +1554,10 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 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, + 2, 0, 1, 18, 19, 227, 237, 513, 573, 532, + 246, 587, 610, 256, 626, 272, 578, 3, 17, 21, + 229, 239, 248, 258, 274, 515, 534, 575, 580, 589, + 612, 628, 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, @@ -1575,152 +1578,152 @@ static const yytype_uint16 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, 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, 0, 0, 0, 0, 531, 533, 535, 534, - 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, - 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 + 20, 22, 23, 86, 89, 98, 195, 196, 24, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 37, + 77, 25, 90, 91, 48, 70, 85, 26, 27, 30, + 31, 28, 29, 32, 33, 34, 35, 36, 121, 207, + 122, 124, 125, 126, 209, 214, 210, 221, 222, 223, + 224, 127, 128, 129, 130, 131, 132, 133, 191, 87, + 76, 102, 119, 120, 219, 216, 123, 38, 39, 40, + 41, 42, 78, 92, 93, 108, 64, 74, 65, 199, + 200, 103, 58, 59, 198, 60, 61, 112, 116, 137, + 147, 174, 150, 220, 113, 71, 43, 44, 45, 100, + 138, 139, 140, 141, 46, 47, 49, 50, 52, 53, + 51, 145, 151, 54, 55, 56, 62, 81, 117, 95, + 146, 88, 170, 96, 97, 114, 115, 217, 101, 57, + 79, 82, 63, 66, 104, 105, 80, 171, 106, 67, + 68, 69, 208, 118, 184, 185, 186, 187, 188, 189, + 197, 107, 75, 109, 110, 111, 172, 72, 73, 94, + 83, 84, 99, 134, 135, 218, 136, 142, 143, 144, + 175, 176, 178, 180, 181, 179, 182, 192, 148, 149, + 154, 155, 152, 153, 156, 157, 159, 158, 211, 213, + 212, 173, 183, 201, 203, 202, 204, 205, 206, 225, + 226, 177, 190, 193, 194, 215, 0, 0, 0, 0, + 0, 0, 0, 228, 230, 231, 232, 234, 235, 236, + 233, 0, 0, 0, 0, 0, 0, 238, 240, 241, + 242, 243, 244, 245, 0, 0, 0, 0, 0, 0, + 0, 247, 249, 250, 253, 254, 251, 255, 252, 0, + 0, 0, 0, 0, 0, 0, 0, 257, 259, 260, + 261, 262, 266, 263, 264, 265, 0, 0, 0, 0, + 0, 277, 281, 282, 283, 284, 273, 275, 276, 278, + 279, 280, 0, 0, 0, 0, 0, 0, 0, 0, + 514, 516, 518, 517, 523, 519, 520, 521, 522, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 533, 535, + 537, 536, 538, 539, 540, 541, 542, 543, 544, 545, + 546, 547, 548, 549, 550, 551, 552, 553, 0, 574, + 576, 0, 579, 581, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 588, 590, 591, 592, 594, 595, + 593, 596, 597, 598, 599, 0, 0, 0, 0, 0, + 0, 611, 613, 614, 615, 616, 617, 618, 0, 0, + 627, 629, 630, 286, 285, 292, 305, 303, 315, 311, + 312, 316, 313, 314, 317, 318, 319, 320, 321, 351, + 352, 353, 354, 355, 380, 381, 382, 388, 389, 308, + 390, 391, 394, 392, 393, 397, 398, 399, 413, 366, + 367, 369, 370, 400, 416, 360, 362, 417, 423, 424, + 425, 309, 379, 441, 442, 361, 436, 344, 304, 356, + 414, 420, 401, 0, 0, 445, 310, 287, 343, 405, + 288, 306, 307, 357, 358, 443, 403, 407, 408, 289, + 446, 383, 412, 345, 365, 418, 419, 422, 435, 359, + 439, 437, 438, 371, 378, 409, 410, 372, 373, 402, + 427, 346, 347, 350, 322, 324, 325, 326, 327, 328, + 335, 336, 337, 338, 339, 340, 341, 447, 448, 450, + 384, 385, 386, 387, 395, 396, 451, 452, 453, 0, + 0, 0, 404, 374, 376, 583, 462, 466, 464, 463, + 467, 465, 0, 0, 470, 471, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 406, 421, 440, 475, + 476, 375, 454, 0, 0, 0, 0, 0, 0, 428, + 429, 430, 431, 432, 433, 434, 584, 368, 363, 426, + 342, 290, 291, 364, 477, 479, 478, 480, 481, 482, + 323, 330, 472, 474, 473, 329, 0, 349, 411, 449, + 348, 377, 331, 332, 334, 333, 0, 484, 485, 486, + 487, 491, 490, 488, 489, 492, 493, 494, 495, 497, + 496, 506, 0, 510, 511, 0, 0, 512, 498, 504, + 499, 500, 501, 503, 505, 502, 267, 268, 269, 270, + 271, 524, 526, 525, 528, 529, 530, 531, 527, 554, + 556, 557, 558, 559, 560, 561, 562, 563, 564, 555, + 565, 566, 567, 568, 569, 570, 571, 572, 577, 582, + 600, 601, 602, 605, 603, 604, 606, 607, 608, 609, + 619, 620, 621, 622, 623, 624, 631, 632, 415, 444, + 461, 585, 586, 468, 469, 455, 456, 0, 0, 0, + 460, 625, 483, 507, 508, 509, 459, 457, 458 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -290, -290, -290, -290, -290, - -290, -290, -290, -290, -290, -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 + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + 578, 579, 602, 603, 604, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -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 + -1, 1, 17, 18, 19, 32, 250, 20, 33, 463, + 21, 34, 477, 22, 35, 491, 23, 36, 507, 521, + 522, 523, 524, 525, 24, 37, 526, 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, 449, 450, 464, 465, 466, + 467, 468, 469, 470, 478, 479, 480, 481, 482, 483, + 508, 509, 510, 511, 512, 513, 514, 515, 492, 493, + 494, 495, 496, 497, 498, 25, 38, 540, 541, 542, + 543, 544, 545, 546, 547, 548, 26, 39, 568, 569, + 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, + 580, 581, 582, 583, 584, 585, 586, 587, 27, 40, + 589, 590, 28, 41, 592, 593, 451, 452, 453, 454, + 29, 42, 604, 605, 606, 607, 608, 609, 610, 611, + 612, 613, 614, 30, 43, 621, 622, 623, 624, 625, + 626, 627, 455, 31, 44, 630, 631, 632 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1728,149 +1731,151 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 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, + 2, 499, 484, 456, 588, 457, 458, 471, 628, 629, + 591, 3, 4, 633, 634, 472, 473, 615, 616, 617, + 618, 619, 620, 635, 499, 594, 595, 596, 597, 598, + 599, 600, 601, 602, 603, 636, 637, 638, 485, 486, + 639, 640, 641, 642, 643, 644, 5, 645, 646, 647, + 648, 649, 6, 650, 651, 652, 653, 654, 655, 656, + 657, 658, 659, 487, 660, 661, 459, 549, 550, 551, + 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, + 562, 563, 564, 565, 566, 567, 532, 533, 534, 535, + 536, 537, 538, 539, 662, 663, 7, 460, 664, 665, + 474, 666, 475, 667, 668, 669, 670, 461, 671, 672, + 673, 674, 8, 675, 676, 677, 678, 679, 680, 681, + 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, + 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, + 488, 489, 702, 703, 704, 705, 706, 707, 708, 709, + 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, + 720, 721, 9, 722, 723, 724, 725, 726, 727, 728, + 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, + 490, 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, 776, 777, + 778, 10, 501, 502, 503, 779, 780, 781, 782, 783, + 784, 785, 506, 786, 787, 788, 789, 790, 462, 11, + 791, 476, 792, 500, 793, 501, 502, 503, 504, 505, + 516, 517, 518, 519, 520, 506, 12, 794, 795, 796, + 797, 798, 799, 800, 801, 13, 802, 803, 804, 805, + 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, + 816, 817, 818, 819, 820, 821, 822, 823, 824, 14, + 825, 826, 827, 15, 828, 829, 830, 0, 831, 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, 832, 833, 834, 835, 77, 78, 79, 836, + 837, 838, 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, 839, 840, 841, 842, 843, 844, 845, + 846, 847, 121, 122, 123, 848, 124, 125, 126, 849, + 850, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 851, 852, 853, 151, 152, + 153, 154, 155, 156, 157, 158, 854, 159, 160, 161, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 855, + 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, + 866, 867, 868, 869, 870, 871, 872, 873, 874, 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, 209, 875, 210, + 876, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 877, 878, 879, 880, + 881, 882, 883, 884, 885, 886, 887, 226, 227, 228, + 229, 230, 231, 888, 889, 890, 891, 892, 893, 894, + 232, 895, 896, 897, 898, 899, 900, 901, 233, 234, + 902, 235, 236, 903, 237, 238, 904, 905, 239, 240, + 241, 242, 243, 244, 245, 246, 906, 907, 908, 247, + 909, 910, 911, 912, 913, 914, 915, 916, 248, 249, + 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, + 927, 928, 929, 930, 931, 932, 933, 934, 935, 936, + 937, 938, 0, 0, 0, 527, 528, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 527, 528, 529 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 529, + 530, 531 }; static const yytype_int16 yycheck[] = { - 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, + 0, 45, 45, 45, 113, 47, 48, 45, 290, 291, + 300, 11, 12, 10, 10, 53, 54, 257, 258, 259, + 260, 261, 262, 10, 45, 240, 241, 242, 243, 244, + 245, 246, 247, 248, 249, 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, 162, 163, 164, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 97, 98, 99, 100, + 10, 10, 10, 106, 10, 10, 108, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 97, 98, 99, 100, 101, 102, 103, 104, 10, 10, 96, 139, 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, 10, 10, 182, - 183, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 161, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 222, + 183, 184, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 162, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 223, 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, - 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, 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, 221, 266, 267, 268, 10, 10, 10, 10, 10, + 10, 10, 276, 10, 10, 10, 10, 10, 280, 239, + 10, 279, 10, 264, 10, 266, 267, 268, 269, 270, + 294, 295, 296, 297, 298, 276, 256, 10, 10, 10, + 10, 10, 10, 10, 10, 265, 10, 10, 10, 10, 10, 10, 10, 10, 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, 289, + 10, 10, 10, 293, 10, 10, 10, -1, 10, 299, + 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, 161, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 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, 220, 10, 222, + 10, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 250, 251, 252, + 253, 254, 255, 10, 10, 10, 10, 10, 10, 10, + 263, 10, 10, 10, 10, 10, 10, 10, 271, 272, + 10, 274, 275, 10, 277, 278, 10, 10, 281, 282, + 283, 284, 285, 286, 287, 288, 10, 10, 10, 292, + 10, 10, 10, 10, 10, 10, 10, 10, 301, 302, 10, 10, 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, + 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, -1, -1, 37, 37, 37 + -1, -1, -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_uint16 yystos[] = { - 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, + 0, 304, 0, 11, 12, 46, 52, 96, 112, 162, + 221, 239, 256, 265, 289, 293, 299, 305, 306, 307, + 310, 313, 316, 319, 327, 558, 569, 591, 595, 603, + 616, 626, 308, 311, 314, 317, 320, 328, 559, 570, + 592, 596, 604, 617, 627, 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, @@ -1883,15 +1888,15 @@ static const yytype_uint16 yystos[] = 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 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, + 161, 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, 221, - 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, - 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, + 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, + 222, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 250, 251, 252, 253, + 254, 255, 263, 271, 272, 274, 275, 277, 278, 281, + 282, 283, 284, 285, 286, 287, 288, 292, 301, 302, + 309, 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, @@ -1910,26 +1915,26 @@ static const yytype_uint16 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, 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, + 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, + 529, 599, 600, 601, 602, 625, 45, 47, 48, 108, + 139, 149, 280, 312, 530, 531, 532, 533, 534, 535, + 536, 45, 53, 54, 138, 140, 279, 315, 537, 538, + 539, 540, 541, 542, 45, 81, 82, 106, 183, 184, + 223, 318, 551, 552, 553, 554, 555, 556, 557, 45, + 264, 266, 267, 268, 269, 270, 276, 321, 543, 544, + 545, 546, 547, 548, 549, 550, 294, 295, 296, 297, + 298, 322, 323, 324, 325, 326, 329, 543, 544, 545, + 546, 547, 97, 98, 99, 100, 101, 102, 103, 104, + 560, 561, 562, 563, 564, 565, 566, 567, 568, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, - 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, + 583, 584, 585, 586, 587, 588, 589, 590, 113, 593, + 594, 300, 597, 598, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 605, 606, 607, 608, 609, 610, + 611, 612, 613, 614, 615, 257, 258, 259, 260, 261, + 262, 618, 619, 620, 621, 622, 623, 624, 290, 291, + 628, 629, 630, 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, @@ -1959,41 +1964,41 @@ static const yytype_uint16 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 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 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, + 0, 303, 304, 304, 305, 305, 305, 305, 305, 305, + 305, 305, 305, 305, 305, 305, 305, 305, 306, 307, + 308, 308, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 310, 311, 311, + 312, 312, 312, 312, 312, 312, 312, 313, 314, 314, + 315, 315, 315, 315, 315, 315, 316, 317, 317, 318, + 318, 318, 318, 318, 318, 318, 319, 320, 320, 321, + 321, 321, 321, 321, 321, 321, 321, 322, 323, 324, + 325, 326, 327, 328, 328, 329, 329, 329, 329, 329, + 329, 329, 329, 329, 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, @@ -2016,19 +2021,19 @@ static const yytype_uint16 yyr1[] = 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, - 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, + 555, 556, 557, 558, 559, 559, 560, 560, 560, 560, + 560, 560, 560, 560, 561, 562, 563, 564, 565, 566, + 567, 568, 569, 570, 570, 571, 571, 571, 571, 571, + 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, + 571, 571, 571, 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, + 588, 589, 590, 591, 592, 592, 593, 594, 595, 596, + 596, 597, 598, 599, 600, 601, 602, 603, 604, 604, + 605, 605, 605, 605, 605, 605, 605, 605, 605, 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 + 616, 617, 617, 618, 618, 618, 618, 618, 618, 619, + 620, 621, 622, 623, 624, 625, 626, 627, 627, 628, + 628, 629, 630 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -2056,13 +2061,13 @@ static const yytype_uint8 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, 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, 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, + 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, @@ -2075,29 +2080,29 @@ static const yytype_uint8 yyr2[] = 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, 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, 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, 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, 3, 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, 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, + 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, - 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 + 1, 2, 0, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 3, 1, 2, 0, 1, + 1, 2, 2 }; @@ -2782,23 +2787,23 @@ yyparse (void) switch (yyn) { case 18: -#line 194 "./util/configparser.y" +#line 195 "./util/configparser.y" { OUTYY(("\nP(force-toplevel)\n")); } -#line 2790 "util/configparser.c" +#line 2795 "util/configparser.c" break; case 19: -#line 200 "./util/configparser.y" +#line 201 "./util/configparser.y" { OUTYY(("\nP(server:)\n")); } -#line 2798 "util/configparser.c" +#line 2803 "util/configparser.c" break; - case 226: -#line 298 "./util/configparser.y" + case 227: +#line 299 "./util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2809,11 +2814,11 @@ yyparse (void) } else yyerror("out of memory"); } -#line 2813 "util/configparser.c" +#line 2818 "util/configparser.c" break; - case 236: -#line 315 "./util/configparser.y" + case 237: +#line 316 "./util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2824,11 +2829,11 @@ yyparse (void) } else yyerror("out of memory"); } -#line 2828 "util/configparser.c" +#line 2833 "util/configparser.c" break; - case 245: -#line 332 "./util/configparser.y" + case 246: +#line 333 "./util/configparser.y" { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2841,11 +2846,11 @@ yyparse (void) } else yyerror("out of memory"); } -#line 2845 "util/configparser.c" +#line 2850 "util/configparser.c" break; - case 255: -#line 351 "./util/configparser.y" + case 256: +#line 352 "./util/configparser.y" { struct config_auth* s; OUTYY(("\nP(auth_zone:)\n")); @@ -2861,11 +2866,11 @@ yyparse (void) } else yyerror("out of memory"); } -#line 2865 "util/configparser.c" +#line 2870 "util/configparser.c" break; - case 266: -#line 375 "./util/configparser.y" + case 267: +#line 376 "./util/configparser.y" { uint8_t* bitlist; size_t len = 0; @@ -2882,11 +2887,11 @@ yyparse (void) } } -#line 2886 "util/configparser.c" +#line 2891 "util/configparser.c" break; - case 267: -#line 394 "./util/configparser.y" + case 268: +#line 395 "./util/configparser.y" { OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 && @@ -2901,21 +2906,21 @@ yyparse (void) cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str); } } -#line 2905 "util/configparser.c" +#line 2910 "util/configparser.c" break; - case 268: -#line 411 "./util/configparser.y" + case 269: +#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 2915 "util/configparser.c" +#line 2920 "util/configparser.c" break; - case 269: -#line 419 "./util/configparser.y" + case 270: +#line 420 "./util/configparser.y" { OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2923,21 +2928,21 @@ yyparse (void) else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2927 "util/configparser.c" +#line 2932 "util/configparser.c" break; - case 270: -#line 429 "./util/configparser.y" + case 271: +#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 2937 "util/configparser.c" +#line 2942 "util/configparser.c" break; - case 271: -#line 437 "./util/configparser.y" + case 272: +#line 438 "./util/configparser.y" { struct config_auth* s; OUTYY(("\nP(rpz:)\n")); @@ -2953,11 +2958,11 @@ yyparse (void) } else yyerror("out of memory"); } -#line 2957 "util/configparser.c" +#line 2962 "util/configparser.c" break; - case 284: -#line 460 "./util/configparser.y" + case 285: +#line 461 "./util/configparser.y" { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2965,11 +2970,11 @@ yyparse (void) else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2969 "util/configparser.c" +#line 2974 "util/configparser.c" break; - case 285: -#line 469 "./util/configparser.y" + case 286: +#line 470 "./util/configparser.y" { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2977,11 +2982,11 @@ yyparse (void) else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2981 "util/configparser.c" +#line 2986 "util/configparser.c" break; - case 286: -#line 478 "./util/configparser.y" + case 287: +#line 479 "./util/configparser.y" { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2991,11 +2996,11 @@ yyparse (void) else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2995 "util/configparser.c" +#line 3000 "util/configparser.c" break; - case 287: -#line 489 "./util/configparser.y" + case 288: +#line 490 "./util/configparser.y" { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3003,11 +3008,11 @@ yyparse (void) else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3007 "util/configparser.c" +#line 3012 "util/configparser.c" break; - case 288: -#line 498 "./util/configparser.y" + case 289: +#line 499 "./util/configparser.y" { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3015,11 +3020,11 @@ yyparse (void) else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3019 "util/configparser.c" +#line 3024 "util/configparser.c" break; - case 289: -#line 507 "./util/configparser.y" + case 290: +#line 508 "./util/configparser.y" { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3027,11 +3032,11 @@ yyparse (void) else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3031 "util/configparser.c" +#line 3036 "util/configparser.c" break; - case 290: -#line 516 "./util/configparser.y" + case 291: +#line 517 "./util/configparser.y" { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -3041,11 +3046,11 @@ yyparse (void) else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3045 "util/configparser.c" +#line 3050 "util/configparser.c" break; - case 291: -#line 527 "./util/configparser.y" + case 292: +#line 528 "./util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3053,11 +3058,11 @@ yyparse (void) else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3057 "util/configparser.c" +#line 3062 "util/configparser.c" break; - case 292: -#line 536 "./util/configparser.y" + case 293: +#line 537 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -3068,11 +3073,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 3072 "util/configparser.c" +#line 3077 "util/configparser.c" break; - case 293: -#line 548 "./util/configparser.y" + case 294: +#line 549 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -3084,11 +3089,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 3088 "util/configparser.c" +#line 3093 "util/configparser.c" break; - case 294: -#line 562 "./util/configparser.y" + case 295: +#line 563 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -3102,11 +3107,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 3106 "util/configparser.c" +#line 3111 "util/configparser.c" break; - case 295: -#line 577 "./util/configparser.y" + case 296: +#line 578 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -3116,11 +3121,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 3120 "util/configparser.c" +#line 3125 "util/configparser.c" break; - case 296: -#line 588 "./util/configparser.y" + case 297: +#line 589 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -3136,11 +3141,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 3140 "util/configparser.c" +#line 3145 "util/configparser.c" break; - case 297: -#line 605 "./util/configparser.y" + case 298: +#line 606 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -3156,11 +3161,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 3160 "util/configparser.c" +#line 3165 "util/configparser.c" break; - case 298: -#line 622 "./util/configparser.y" + case 299: +#line 623 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -3176,11 +3181,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 3180 "util/configparser.c" +#line 3185 "util/configparser.c" break; - case 299: -#line 639 "./util/configparser.y" + case 300: +#line 640 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -3196,11 +3201,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 3200 "util/configparser.c" +#line 3205 "util/configparser.c" break; - case 300: -#line 656 "./util/configparser.y" + case 301: +#line 657 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str))); @@ -3214,11 +3219,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 3218 "util/configparser.c" +#line 3223 "util/configparser.c" break; - case 301: -#line 671 "./util/configparser.y" + case 302: +#line 672 "./util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str))); @@ -3232,11 +3237,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 3236 "util/configparser.c" +#line 3241 "util/configparser.c" break; - case 302: -#line 686 "./util/configparser.y" + case 303: +#line 687 "./util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -3248,11 +3253,11 @@ yyparse (void) else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 3252 "util/configparser.c" +#line 3257 "util/configparser.c" break; - case 303: -#line 699 "./util/configparser.y" + case 304: +#line 700 "./util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -3266,11 +3271,11 @@ yyparse (void) cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 3270 "util/configparser.c" +#line 3275 "util/configparser.c" break; - case 304: -#line 714 "./util/configparser.y" + case 305: +#line 715 "./util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3278,11 +3283,11 @@ yyparse (void) else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3282 "util/configparser.c" +#line 3287 "util/configparser.c" break; - case 305: -#line 723 "./util/configparser.y" + case 306: +#line 724 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -3290,11 +3295,11 @@ yyparse (void) yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3294 "util/configparser.c" +#line 3299 "util/configparser.c" break; - case 306: -#line 732 "./util/configparser.y" + case 307: +#line 733 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -3302,11 +3307,11 @@ yyparse (void) yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3306 "util/configparser.c" +#line 3311 "util/configparser.c" break; - case 307: -#line 741 "./util/configparser.y" + case 308: +#line 742 "./util/configparser.y" { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3314,11 +3319,11 @@ yyparse (void) else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3318 "util/configparser.c" +#line 3323 "util/configparser.c" break; - case 308: -#line 750 "./util/configparser.y" + case 309: +#line 751 "./util/configparser.y" { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3326,11 +3331,11 @@ yyparse (void) else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3330 "util/configparser.c" +#line 3335 "util/configparser.c" break; - case 309: -#line 759 "./util/configparser.y" + case 310: +#line 760 "./util/configparser.y" { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3338,11 +3343,11 @@ yyparse (void) else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3342 "util/configparser.c" +#line 3347 "util/configparser.c" break; - case 310: -#line 768 "./util/configparser.y" + case 311: +#line 769 "./util/configparser.y" { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3350,11 +3355,11 @@ yyparse (void) else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3354 "util/configparser.c" +#line 3359 "util/configparser.c" break; - case 311: -#line 777 "./util/configparser.y" + case 312: +#line 778 "./util/configparser.y" { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3362,11 +3367,11 @@ yyparse (void) else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3366 "util/configparser.c" +#line 3371 "util/configparser.c" break; - case 312: -#line 786 "./util/configparser.y" + case 313: +#line 787 "./util/configparser.y" { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3374,11 +3379,11 @@ yyparse (void) else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3378 "util/configparser.c" +#line 3383 "util/configparser.c" break; - case 313: -#line 795 "./util/configparser.y" + case 314: +#line 796 "./util/configparser.y" { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3386,11 +3391,11 @@ yyparse (void) else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3390 "util/configparser.c" +#line 3395 "util/configparser.c" break; - case 314: -#line 804 "./util/configparser.y" + case 315: +#line 805 "./util/configparser.y" { OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3398,11 +3403,11 @@ yyparse (void) else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3402 "util/configparser.c" +#line 3407 "util/configparser.c" break; - case 315: -#line 813 "./util/configparser.y" + case 316: +#line 814 "./util/configparser.y" { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3410,11 +3415,11 @@ yyparse (void) else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3414 "util/configparser.c" +#line 3419 "util/configparser.c" break; - case 316: -#line 822 "./util/configparser.y" + case 317: +#line 823 "./util/configparser.y" { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3422,11 +3427,11 @@ yyparse (void) else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3426 "util/configparser.c" +#line 3431 "util/configparser.c" break; - case 317: -#line 831 "./util/configparser.y" + case 318: +#line 832 "./util/configparser.y" { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3434,11 +3439,11 @@ yyparse (void) else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3438 "util/configparser.c" +#line 3443 "util/configparser.c" break; - case 318: -#line 840 "./util/configparser.y" + case 319: +#line 841 "./util/configparser.y" { OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3450,11 +3455,11 @@ yyparse (void) else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3454 "util/configparser.c" +#line 3459 "util/configparser.c" break; - case 319: -#line 853 "./util/configparser.y" + case 320: +#line 854 "./util/configparser.y" { OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3462,11 +3467,11 @@ yyparse (void) else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3466 "util/configparser.c" +#line 3471 "util/configparser.c" break; - case 320: -#line 862 "./util/configparser.y" + case 321: +#line 863 "./util/configparser.y" { OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3478,11 +3483,11 @@ yyparse (void) else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3482 "util/configparser.c" +#line 3487 "util/configparser.c" break; - case 321: -#line 875 "./util/configparser.y" + case 322: +#line 876 "./util/configparser.y" { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3490,11 +3495,11 @@ yyparse (void) else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3494 "util/configparser.c" +#line 3499 "util/configparser.c" break; - case 322: -#line 884 "./util/configparser.y" + case 323: +#line 885 "./util/configparser.y" { OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3502,11 +3507,11 @@ yyparse (void) else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3506 "util/configparser.c" +#line 3511 "util/configparser.c" break; - case 323: -#line 893 "./util/configparser.y" + case 324: +#line 894 "./util/configparser.y" { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3514,31 +3519,31 @@ yyparse (void) else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3518 "util/configparser.c" +#line 3523 "util/configparser.c" break; - case 324: -#line 902 "./util/configparser.y" + case 325: +#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 3528 "util/configparser.c" +#line 3533 "util/configparser.c" break; - case 325: -#line 909 "./util/configparser.y" + case 326: +#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 3538 "util/configparser.c" +#line 3543 "util/configparser.c" break; - case 326: -#line 916 "./util/configparser.y" + case 327: +#line 917 "./util/configparser.y" { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3546,21 +3551,21 @@ yyparse (void) else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3550 "util/configparser.c" +#line 3555 "util/configparser.c" break; - case 327: -#line 925 "./util/configparser.y" + case 328: +#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 3560 "util/configparser.c" +#line 3565 "util/configparser.c" break; - case 328: -#line 932 "./util/configparser.y" + case 329: +#line 933 "./util/configparser.y" { OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3568,53 +3573,53 @@ yyparse (void) else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3572 "util/configparser.c" +#line 3577 "util/configparser.c" break; - case 329: -#line 941 "./util/configparser.y" + case 330: +#line 942 "./util/configparser.y" { OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3583 "util/configparser.c" +#line 3588 "util/configparser.c" break; - case 330: -#line 949 "./util/configparser.y" + case 331: +#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 3593 "util/configparser.c" +#line 3598 "util/configparser.c" break; - case 331: -#line 956 "./util/configparser.y" + case 332: +#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 3603 "util/configparser.c" +#line 3608 "util/configparser.c" break; - case 332: -#line 963 "./util/configparser.y" + case 333: +#line 964 "./util/configparser.y" { OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3614 "util/configparser.c" +#line 3619 "util/configparser.c" break; - case 333: -#line 971 "./util/configparser.y" + case 334: +#line 972 "./util/configparser.y" { OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3622,11 +3627,11 @@ yyparse (void) else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3626 "util/configparser.c" +#line 3631 "util/configparser.c" break; - case 334: -#line 980 "./util/configparser.y" + case 335: +#line 981 "./util/configparser.y" { OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3634,11 +3639,11 @@ yyparse (void) else cfg_parser->cfg->https_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3638 "util/configparser.c" +#line 3643 "util/configparser.c" break; - case 335: -#line 988 "./util/configparser.y" + case 336: +#line 989 "./util/configparser.y" { OUTYY(("P(server_http_endpoint:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->http_endpoint); @@ -3654,11 +3659,11 @@ yyparse (void) cfg_parser->cfg->http_endpoint = (yyvsp[0].str); } } -#line 3658 "util/configparser.c" +#line 3663 "util/configparser.c" break; - case 336: -#line 1004 "./util/configparser.y" + case 337: +#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) @@ -3666,11 +3671,11 @@ yyparse (void) else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3670 "util/configparser.c" +#line 3675 "util/configparser.c" break; - case 337: -#line 1012 "./util/configparser.y" + case 338: +#line 1013 "./util/configparser.y" { OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), @@ -3678,11 +3683,11 @@ yyparse (void) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3682 "util/configparser.c" +#line 3687 "util/configparser.c" break; - case 338: -#line 1020 "./util/configparser.y" + case 339: +#line 1021 "./util/configparser.y" { OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), @@ -3690,11 +3695,11 @@ yyparse (void) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3694 "util/configparser.c" +#line 3699 "util/configparser.c" break; - case 339: -#line 1028 "./util/configparser.y" + case 340: +#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) @@ -3702,11 +3707,11 @@ yyparse (void) else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3706 "util/configparser.c" +#line 3711 "util/configparser.c" break; - case 340: -#line 1036 "./util/configparser.y" + case 341: +#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) @@ -3714,11 +3719,11 @@ yyparse (void) else cfg_parser->cfg->http_notls_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3718 "util/configparser.c" +#line 3723 "util/configparser.c" break; - case 341: -#line 1044 "./util/configparser.y" + case 342: +#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) @@ -3726,11 +3731,11 @@ yyparse (void) else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3730 "util/configparser.c" +#line 3735 "util/configparser.c" break; - case 342: -#line 1053 "./util/configparser.y" + case 343: +#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) @@ -3738,11 +3743,11 @@ yyparse (void) else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3742 "util/configparser.c" +#line 3747 "util/configparser.c" break; - case 343: -#line 1062 "./util/configparser.y" + case 344: +#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) @@ -3755,11 +3760,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 3759 "util/configparser.c" +#line 3764 "util/configparser.c" break; - case 344: -#line 1076 "./util/configparser.y" + case 345: +#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) @@ -3767,11 +3772,11 @@ yyparse (void) else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3771 "util/configparser.c" +#line 3776 "util/configparser.c" break; - case 345: -#line 1085 "./util/configparser.y" + case 346: +#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) @@ -3779,11 +3784,11 @@ yyparse (void) else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3783 "util/configparser.c" +#line 3788 "util/configparser.c" break; - case 346: -#line 1094 "./util/configparser.y" + case 347: +#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) @@ -3791,11 +3796,11 @@ yyparse (void) else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3795 "util/configparser.c" +#line 3800 "util/configparser.c" break; - case 347: -#line 1103 "./util/configparser.y" + case 348: +#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) @@ -3803,11 +3808,11 @@ yyparse (void) else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3807 "util/configparser.c" +#line 3812 "util/configparser.c" break; - case 348: -#line 1112 "./util/configparser.y" + case 349: +#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) @@ -3815,11 +3820,11 @@ yyparse (void) else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3819 "util/configparser.c" +#line 3824 "util/configparser.c" break; - case 349: -#line 1121 "./util/configparser.y" + case 350: +#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) @@ -3827,31 +3832,31 @@ yyparse (void) else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3831 "util/configparser.c" +#line 3836 "util/configparser.c" break; - case 350: -#line 1130 "./util/configparser.y" + case 351: +#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 3841 "util/configparser.c" +#line 3846 "util/configparser.c" break; - case 351: -#line 1137 "./util/configparser.y" + case 352: +#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 3851 "util/configparser.c" +#line 3856 "util/configparser.c" break; - case 352: -#line 1144 "./util/configparser.y" + case 353: +#line 1145 "./util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3876,105 +3881,105 @@ yyparse (void) } } } -#line 3880 "util/configparser.c" +#line 3885 "util/configparser.c" break; - case 353: -#line 1170 "./util/configparser.y" + case 354: +#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 3891 "util/configparser.c" +#line 3896 "util/configparser.c" break; - case 354: -#line 1178 "./util/configparser.y" + case 355: +#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 3901 "util/configparser.c" +#line 3906 "util/configparser.c" break; - case 355: -#line 1185 "./util/configparser.y" + case 356: +#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 3911 "util/configparser.c" +#line 3916 "util/configparser.c" break; - case 356: -#line 1192 "./util/configparser.y" + case 357: +#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 3921 "util/configparser.c" +#line 3926 "util/configparser.c" break; - case 357: -#line 1199 "./util/configparser.y" + case 358: +#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 3931 "util/configparser.c" +#line 3936 "util/configparser.c" break; - case 358: -#line 1206 "./util/configparser.y" + case 359: +#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 3942 "util/configparser.c" +#line 3947 "util/configparser.c" break; - case 359: -#line 1214 "./util/configparser.y" + case 360: +#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 3953 "util/configparser.c" +#line 3958 "util/configparser.c" break; - case 360: -#line 1222 "./util/configparser.y" + case 361: +#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 3964 "util/configparser.c" +#line 3969 "util/configparser.c" break; - case 361: -#line 1230 "./util/configparser.y" + case 362: +#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 3974 "util/configparser.c" +#line 3979 "util/configparser.c" break; - case 362: -#line 1237 "./util/configparser.y" + case 363: +#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) @@ -3984,11 +3989,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3988 "util/configparser.c" +#line 3993 "util/configparser.c" break; - case 363: -#line 1248 "./util/configparser.y" + case 364: +#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) @@ -3998,21 +4003,21 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4002 "util/configparser.c" +#line 4007 "util/configparser.c" break; - case 364: -#line 1259 "./util/configparser.y" + case 365: +#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 4012 "util/configparser.c" +#line 4017 "util/configparser.c" break; - case 365: -#line 1266 "./util/configparser.y" + case 366: +#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) @@ -4020,11 +4025,11 @@ yyparse (void) else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4024 "util/configparser.c" +#line 4029 "util/configparser.c" break; - case 366: -#line 1275 "./util/configparser.y" + case 367: +#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) @@ -4032,11 +4037,11 @@ yyparse (void) else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4036 "util/configparser.c" +#line 4041 "util/configparser.c" break; - case 367: -#line 1284 "./util/configparser.y" + case 368: +#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) @@ -4044,53 +4049,53 @@ yyparse (void) else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4048 "util/configparser.c" +#line 4053 "util/configparser.c" break; - case 368: -#line 1293 "./util/configparser.y" + case 369: +#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 4058 "util/configparser.c" +#line 4063 "util/configparser.c" break; - case 369: -#line 1300 "./util/configparser.y" + case 370: +#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 4068 "util/configparser.c" +#line 4073 "util/configparser.c" break; - case 370: -#line 1307 "./util/configparser.y" + case 371: +#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 4079 "util/configparser.c" +#line 4084 "util/configparser.c" break; - case 371: -#line 1315 "./util/configparser.y" + case 372: +#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 4090 "util/configparser.c" +#line 4095 "util/configparser.c" break; - case 372: -#line 1323 "./util/configparser.y" + case 373: +#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) @@ -4099,11 +4104,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4103 "util/configparser.c" +#line 4108 "util/configparser.c" break; - case 373: -#line 1333 "./util/configparser.y" + case 374: +#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) @@ -4112,11 +4117,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4116 "util/configparser.c" +#line 4121 "util/configparser.c" break; - case 374: -#line 1343 "./util/configparser.y" + case 375: +#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) @@ -4125,11 +4130,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4129 "util/configparser.c" +#line 4134 "util/configparser.c" break; - case 375: -#line 1353 "./util/configparser.y" + case 376: +#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) @@ -4142,22 +4147,22 @@ yyparse (void) cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4146 "util/configparser.c" +#line 4151 "util/configparser.c" break; - case 376: -#line 1367 "./util/configparser.y" + case 377: +#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 4157 "util/configparser.c" +#line 4162 "util/configparser.c" break; - case 377: -#line 1375 "./util/configparser.y" + case 378: +#line 1376 "./util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4169,11 +4174,11 @@ yyparse (void) else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4173 "util/configparser.c" +#line 4178 "util/configparser.c" break; - case 378: -#line 1388 "./util/configparser.y" + case 379: +#line 1389 "./util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4183,22 +4188,22 @@ yyparse (void) else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4187 "util/configparser.c" +#line 4192 "util/configparser.c" break; - case 379: -#line 1399 "./util/configparser.y" + case 380: +#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 4198 "util/configparser.c" +#line 4203 "util/configparser.c" break; - case 380: -#line 1407 "./util/configparser.y" + case 381: +#line 1408 "./util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4210,11 +4215,11 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 4214 "util/configparser.c" +#line 4219 "util/configparser.c" break; - case 381: -#line 1420 "./util/configparser.y" + case 382: +#line 1421 "./util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4222,11 +4227,11 @@ yyparse (void) else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4226 "util/configparser.c" +#line 4231 "util/configparser.c" break; - case 382: -#line 1429 "./util/configparser.y" + case 383: +#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) @@ -4234,11 +4239,11 @@ yyparse (void) else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4238 "util/configparser.c" +#line 4243 "util/configparser.c" break; - case 383: -#line 1438 "./util/configparser.y" + case 384: +#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) @@ -4246,11 +4251,23 @@ yyparse (void) else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4250 "util/configparser.c" +#line 4255 "util/configparser.c" break; - case 384: -#line 1447 "./util/configparser.y" + case 385: +#line 1448 "./util/configparser.y" + { + OUTYY(("P(server_udp_connect:%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->udp_connect = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4267 "util/configparser.c" + break; + + case 386: +#line 1457 "./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) @@ -4259,11 +4276,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4263 "util/configparser.c" +#line 4280 "util/configparser.c" break; - case 385: -#line 1457 "./util/configparser.y" + case 387: +#line 1467 "./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) @@ -4272,22 +4289,22 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4276 "util/configparser.c" +#line 4293 "util/configparser.c" break; - case 386: -#line 1467 "./util/configparser.y" + case 388: +#line 1477 "./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 4287 "util/configparser.c" +#line 4304 "util/configparser.c" break; - case 387: -#line 1475 "./util/configparser.y" + case 389: +#line 1485 "./util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4299,11 +4316,11 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 4303 "util/configparser.c" +#line 4320 "util/configparser.c" break; - case 388: -#line 1488 "./util/configparser.y" + case 390: +#line 1498 "./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) @@ -4311,22 +4328,22 @@ yyparse (void) else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4315 "util/configparser.c" +#line 4332 "util/configparser.c" break; - case 389: -#line 1497 "./util/configparser.y" + case 391: +#line 1507 "./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 4326 "util/configparser.c" +#line 4343 "util/configparser.c" break; - case 390: -#line 1505 "./util/configparser.y" + case 392: +#line 1515 "./util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4334,22 +4351,22 @@ yyparse (void) else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4338 "util/configparser.c" +#line 4355 "util/configparser.c" break; - case 391: -#line 1514 "./util/configparser.y" + case 393: +#line 1524 "./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 4349 "util/configparser.c" +#line 4366 "util/configparser.c" break; - case 392: -#line 1522 "./util/configparser.y" + case 394: +#line 1532 "./util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4361,11 +4378,11 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 4365 "util/configparser.c" +#line 4382 "util/configparser.c" break; - case 393: -#line 1535 "./util/configparser.y" + case 395: +#line 1545 "./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) @@ -4373,11 +4390,11 @@ yyparse (void) else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4377 "util/configparser.c" +#line 4394 "util/configparser.c" break; - case 394: -#line 1544 "./util/configparser.y" + case 396: +#line 1554 "./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) @@ -4386,21 +4403,21 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4390 "util/configparser.c" +#line 4407 "util/configparser.c" break; - case 395: -#line 1554 "./util/configparser.y" + case 397: +#line 1564 "./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 4400 "util/configparser.c" +#line 4417 "util/configparser.c" break; - case 396: -#line 1561 "./util/configparser.y" + case 398: +#line 1571 "./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) @@ -4409,11 +4426,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4413 "util/configparser.c" +#line 4430 "util/configparser.c" break; - case 397: -#line 1571 "./util/configparser.y" + case 399: +#line 1581 "./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) @@ -4422,11 +4439,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4426 "util/configparser.c" +#line 4443 "util/configparser.c" break; - case 398: -#line 1581 "./util/configparser.y" + case 400: +#line 1591 "./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) @@ -4435,11 +4452,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4439 "util/configparser.c" +#line 4456 "util/configparser.c" break; - case 399: -#line 1591 "./util/configparser.y" + case 401: +#line 1601 "./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) @@ -4448,11 +4465,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4452 "util/configparser.c" +#line 4469 "util/configparser.c" break; - case 400: -#line 1601 "./util/configparser.y" + case 402: +#line 1611 "./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) @@ -4461,11 +4478,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4465 "util/configparser.c" +#line 4482 "util/configparser.c" break; - case 401: -#line 1611 "./util/configparser.y" + case 403: +#line 1621 "./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) @@ -4474,11 +4491,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4478 "util/configparser.c" +#line 4495 "util/configparser.c" break; - case 402: -#line 1621 "./util/configparser.y" + case 404: +#line 1631 "./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) @@ -4487,11 +4504,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4491 "util/configparser.c" +#line 4508 "util/configparser.c" break; - case 403: -#line 1631 "./util/configparser.y" + case 405: +#line 1641 "./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) @@ -4500,41 +4517,41 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4504 "util/configparser.c" +#line 4521 "util/configparser.c" break; - case 404: -#line 1641 "./util/configparser.y" + case 406: +#line 1651 "./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 4514 "util/configparser.c" +#line 4531 "util/configparser.c" break; - case 405: -#line 1648 "./util/configparser.y" + case 407: +#line 1658 "./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 4524 "util/configparser.c" +#line 4541 "util/configparser.c" break; - case 406: -#line 1655 "./util/configparser.y" + case 408: +#line 1665 "./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 4534 "util/configparser.c" +#line 4551 "util/configparser.c" break; - case 407: -#line 1662 "./util/configparser.y" + case 409: +#line 1672 "./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) @@ -4542,11 +4559,11 @@ yyparse (void) else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4546 "util/configparser.c" +#line 4563 "util/configparser.c" break; - case 408: -#line 1671 "./util/configparser.y" + case 410: +#line 1681 "./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) @@ -4554,11 +4571,11 @@ yyparse (void) else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4558 "util/configparser.c" +#line 4575 "util/configparser.c" break; - case 409: -#line 1680 "./util/configparser.y" + case 411: +#line 1690 "./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) @@ -4566,11 +4583,11 @@ yyparse (void) else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4570 "util/configparser.c" +#line 4587 "util/configparser.c" break; - case 410: -#line 1689 "./util/configparser.y" + case 412: +#line 1699 "./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) @@ -4578,21 +4595,21 @@ yyparse (void) else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4582 "util/configparser.c" +#line 4599 "util/configparser.c" break; - case 411: -#line 1698 "./util/configparser.y" + case 413: +#line 1708 "./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 4592 "util/configparser.c" +#line 4609 "util/configparser.c" break; - case 412: -#line 1705 "./util/configparser.y" + case 414: +#line 1715 "./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) @@ -4601,11 +4618,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4605 "util/configparser.c" +#line 4622 "util/configparser.c" break; - case 413: -#line 1715 "./util/configparser.y" + case 415: +#line 1725 "./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 && @@ -4624,21 +4641,21 @@ yyparse (void) fatal_exit("out of memory adding acl"); } } -#line 4628 "util/configparser.c" +#line 4645 "util/configparser.c" break; - case 414: -#line 1735 "./util/configparser.y" + case 416: +#line 1745 "./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 4638 "util/configparser.c" +#line 4655 "util/configparser.c" break; - case 415: -#line 1742 "./util/configparser.y" + case 417: +#line 1752 "./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) { @@ -4655,11 +4672,11 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 4659 "util/configparser.c" +#line 4676 "util/configparser.c" break; - case 416: -#line 1760 "./util/configparser.y" + case 418: +#line 1770 "./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) { @@ -4671,11 +4688,11 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 4675 "util/configparser.c" +#line 4692 "util/configparser.c" break; - case 417: -#line 1773 "./util/configparser.y" + case 419: +#line 1783 "./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) { @@ -4687,11 +4704,11 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 4691 "util/configparser.c" +#line 4708 "util/configparser.c" break; - case 418: -#line 1786 "./util/configparser.y" + case 420: +#line 1796 "./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) @@ -4699,11 +4716,11 @@ yyparse (void) else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4703 "util/configparser.c" +#line 4720 "util/configparser.c" break; - case 419: -#line 1795 "./util/configparser.y" + case 421: +#line 1805 "./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) @@ -4711,11 +4728,11 @@ yyparse (void) else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4715 "util/configparser.c" +#line 4732 "util/configparser.c" break; - case 420: -#line 1804 "./util/configparser.y" + case 422: +#line 1814 "./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) @@ -4723,11 +4740,11 @@ yyparse (void) else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4727 "util/configparser.c" +#line 4744 "util/configparser.c" break; - case 421: -#line 1813 "./util/configparser.y" + case 423: +#line 1823 "./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) @@ -4735,11 +4752,11 @@ yyparse (void) else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4739 "util/configparser.c" +#line 4756 "util/configparser.c" break; - case 422: -#line 1822 "./util/configparser.y" + case 424: +#line 1832 "./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) @@ -4748,11 +4765,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4752 "util/configparser.c" +#line 4769 "util/configparser.c" break; - case 423: -#line 1832 "./util/configparser.y" + case 425: +#line 1842 "./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) @@ -4761,11 +4778,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4765 "util/configparser.c" +#line 4782 "util/configparser.c" break; - case 424: -#line 1842 "./util/configparser.y" + case 426: +#line 1852 "./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) @@ -4775,11 +4792,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4779 "util/configparser.c" +#line 4796 "util/configparser.c" break; - case 425: -#line 1853 "./util/configparser.y" + case 427: +#line 1863 "./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) @@ -4787,11 +4804,11 @@ yyparse (void) else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4791 "util/configparser.c" +#line 4808 "util/configparser.c" break; - case 426: -#line 1862 "./util/configparser.y" + case 428: +#line 1872 "./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) @@ -4799,11 +4816,11 @@ yyparse (void) else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4803 "util/configparser.c" +#line 4820 "util/configparser.c" break; - case 427: -#line 1871 "./util/configparser.y" + case 429: +#line 1881 "./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) @@ -4811,11 +4828,11 @@ yyparse (void) else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4815 "util/configparser.c" +#line 4832 "util/configparser.c" break; - case 428: -#line 1880 "./util/configparser.y" + case 430: +#line 1890 "./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) @@ -4823,11 +4840,11 @@ yyparse (void) else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4827 "util/configparser.c" +#line 4844 "util/configparser.c" break; - case 429: -#line 1889 "./util/configparser.y" + case 431: +#line 1899 "./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) @@ -4835,11 +4852,11 @@ yyparse (void) else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4839 "util/configparser.c" +#line 4856 "util/configparser.c" break; - case 430: -#line 1898 "./util/configparser.y" + case 432: +#line 1908 "./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) @@ -4847,11 +4864,11 @@ yyparse (void) else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4851 "util/configparser.c" +#line 4868 "util/configparser.c" break; - case 431: -#line 1907 "./util/configparser.y" + case 433: +#line 1917 "./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) @@ -4863,11 +4880,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 4867 "util/configparser.c" +#line 4884 "util/configparser.c" break; - case 432: -#line 1920 "./util/configparser.y" + case 434: +#line 1930 "./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) @@ -4879,11 +4896,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 4883 "util/configparser.c" +#line 4900 "util/configparser.c" break; - case 433: -#line 1933 "./util/configparser.y" + case 435: +#line 1943 "./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) @@ -4891,21 +4908,21 @@ yyparse (void) else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4895 "util/configparser.c" +#line 4912 "util/configparser.c" break; - case 434: -#line 1942 "./util/configparser.y" + case 436: +#line 1952 "./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 4905 "util/configparser.c" +#line 4922 "util/configparser.c" break; - case 435: -#line 1949 "./util/configparser.y" + case 437: +#line 1959 "./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) @@ -4913,11 +4930,11 @@ yyparse (void) else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4917 "util/configparser.c" +#line 4934 "util/configparser.c" break; - case 436: -#line 1958 "./util/configparser.y" + case 438: +#line 1968 "./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) @@ -4925,11 +4942,11 @@ yyparse (void) else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4929 "util/configparser.c" +#line 4946 "util/configparser.c" break; - case 437: -#line 1967 "./util/configparser.y" + case 439: +#line 1977 "./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) @@ -4937,11 +4954,11 @@ yyparse (void) else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4941 "util/configparser.c" +#line 4958 "util/configparser.c" break; - case 438: -#line 1976 "./util/configparser.y" + case 440: +#line 1986 "./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) @@ -4950,22 +4967,22 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4954 "util/configparser.c" +#line 4971 "util/configparser.c" break; - case 439: -#line 1985 "./util/configparser.y" + case 441: +#line 1995 "./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 4965 "util/configparser.c" +#line 4982 "util/configparser.c" break; - case 440: -#line 1993 "./util/configparser.y" + case 442: +#line 2003 "./util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4977,22 +4994,22 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 4981 "util/configparser.c" +#line 4998 "util/configparser.c" break; - case 441: -#line 2006 "./util/configparser.y" + case 443: +#line 2016 "./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 4992 "util/configparser.c" +#line 5009 "util/configparser.c" break; - case 442: -#line 2014 "./util/configparser.y" + case 444: +#line 2024 "./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 && @@ -5032,21 +5049,21 @@ yyparse (void) fatal_exit("out of memory adding local-zone"); } } -#line 5036 "util/configparser.c" +#line 5053 "util/configparser.c" break; - case 443: -#line 2055 "./util/configparser.y" + case 445: +#line 2065 "./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 5046 "util/configparser.c" +#line 5063 "util/configparser.c" break; - case 444: -#line 2062 "./util/configparser.y" + case 446: +#line 2072 "./util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5060,11 +5077,11 @@ yyparse (void) yyerror("local-data-ptr could not be reversed"); } } -#line 5064 "util/configparser.c" +#line 5081 "util/configparser.c" break; - case 445: -#line 2077 "./util/configparser.y" + case 447: +#line 2087 "./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) @@ -5073,11 +5090,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5077 "util/configparser.c" +#line 5094 "util/configparser.c" break; - case 446: -#line 2087 "./util/configparser.y" + case 448: +#line 2097 "./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) @@ -5086,41 +5103,41 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5090 "util/configparser.c" +#line 5107 "util/configparser.c" break; - case 447: -#line 2097 "./util/configparser.y" + case 449: +#line 2107 "./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 5100 "util/configparser.c" +#line 5117 "util/configparser.c" break; - case 448: -#line 2104 "./util/configparser.y" + case 450: +#line 2114 "./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 5110 "util/configparser.c" +#line 5127 "util/configparser.c" break; - case 449: -#line 2111 "./util/configparser.y" + case 451: +#line 2121 "./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 5120 "util/configparser.c" +#line 5137 "util/configparser.c" break; - case 450: -#line 2118 "./util/configparser.y" + case 452: +#line 2128 "./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) @@ -5128,22 +5145,22 @@ yyparse (void) else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5132 "util/configparser.c" +#line 5149 "util/configparser.c" break; - case 451: -#line 2127 "./util/configparser.y" + case 453: +#line 2137 "./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 5143 "util/configparser.c" +#line 5160 "util/configparser.c" break; - case 452: -#line 2135 "./util/configparser.y" + case 454: +#line 2145 "./util/configparser.y" { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -5156,11 +5173,11 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 5160 "util/configparser.c" +#line 5177 "util/configparser.c" break; - case 453: -#line 2149 "./util/configparser.y" + case 455: +#line 2159 "./util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5180,11 +5197,11 @@ yyparse (void) } } } -#line 5184 "util/configparser.c" +#line 5201 "util/configparser.c" break; - case 454: -#line 2170 "./util/configparser.y" + case 456: +#line 2180 "./util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5204,11 +5221,11 @@ yyparse (void) } } } -#line 5208 "util/configparser.c" +#line 5225 "util/configparser.c" break; - case 455: -#line 2191 "./util/configparser.y" + case 457: +#line 2201 "./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, @@ -5219,11 +5236,11 @@ yyparse (void) free((yyvsp[0].str)); } } -#line 5223 "util/configparser.c" +#line 5240 "util/configparser.c" break; - case 456: -#line 2203 "./util/configparser.y" + case 458: +#line 2213 "./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, @@ -5234,11 +5251,11 @@ yyparse (void) free((yyvsp[0].str)); } } -#line 5238 "util/configparser.c" +#line 5255 "util/configparser.c" break; - case 457: -#line 2215 "./util/configparser.y" + case 459: +#line 2225 "./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, @@ -5249,11 +5266,11 @@ yyparse (void) free((yyvsp[0].str)); } } -#line 5253 "util/configparser.c" +#line 5270 "util/configparser.c" break; - case 458: -#line 2227 "./util/configparser.y" + case 460: +#line 2237 "./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, @@ -5261,11 +5278,11 @@ yyparse (void) yyerror("out of memory"); } } -#line 5265 "util/configparser.c" +#line 5282 "util/configparser.c" break; - case 459: -#line 2236 "./util/configparser.y" + case 461: +#line 2246 "./util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5285,11 +5302,11 @@ yyparse (void) } } } -#line 5289 "util/configparser.c" +#line 5306 "util/configparser.c" break; - case 460: -#line 2257 "./util/configparser.y" + case 462: +#line 2267 "./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) @@ -5297,11 +5314,11 @@ yyparse (void) else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5301 "util/configparser.c" +#line 5318 "util/configparser.c" break; - case 461: -#line 2267 "./util/configparser.y" + case 463: +#line 2277 "./util/configparser.y" { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5309,33 +5326,33 @@ yyparse (void) else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5313 "util/configparser.c" +#line 5330 "util/configparser.c" break; - case 462: -#line 2276 "./util/configparser.y" + case 464: +#line 2286 "./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 5324 "util/configparser.c" +#line 5341 "util/configparser.c" break; - case 463: -#line 2284 "./util/configparser.y" + case 465: +#line 2294 "./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 5335 "util/configparser.c" +#line 5352 "util/configparser.c" break; - case 464: -#line 2292 "./util/configparser.y" + case 466: +#line 2302 "./util/configparser.y" { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5347,11 +5364,11 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 5351 "util/configparser.c" +#line 5368 "util/configparser.c" break; - case 465: -#line 2305 "./util/configparser.y" + case 467: +#line 2315 "./util/configparser.y" { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5363,11 +5380,11 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 5367 "util/configparser.c" +#line 5384 "util/configparser.c" break; - case 466: -#line 2318 "./util/configparser.y" + case 468: +#line 2328 "./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) { @@ -5381,11 +5398,11 @@ yyparse (void) "ratelimit-for-domain"); } } -#line 5385 "util/configparser.c" +#line 5402 "util/configparser.c" break; - case 467: -#line 2333 "./util/configparser.y" + case 469: +#line 2343 "./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) { @@ -5399,11 +5416,11 @@ yyparse (void) "ratelimit-below-domain"); } } -#line 5403 "util/configparser.c" +#line 5420 "util/configparser.c" break; - case 468: -#line 2348 "./util/configparser.y" + case 470: +#line 2358 "./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) @@ -5411,11 +5428,11 @@ yyparse (void) else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5415 "util/configparser.c" +#line 5432 "util/configparser.c" break; - case 469: -#line 2357 "./util/configparser.y" + case 471: +#line 2367 "./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) @@ -5423,20 +5440,20 @@ yyparse (void) else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5427 "util/configparser.c" +#line 5444 "util/configparser.c" break; - case 470: -#line 2366 "./util/configparser.y" + case 472: +#line 2376 "./util/configparser.y" { OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n")); free((yyvsp[0].str)); } -#line 5436 "util/configparser.c" +#line 5453 "util/configparser.c" break; - case 471: -#line 2372 "./util/configparser.y" + case 473: +#line 2382 "./util/configparser.y" { OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) <= 0) @@ -5444,11 +5461,11 @@ yyparse (void) else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5448 "util/configparser.c" +#line 5465 "util/configparser.c" break; - case 472: -#line 2381 "./util/configparser.y" + case 474: +#line 2391 "./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) @@ -5456,11 +5473,11 @@ yyparse (void) else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5460 "util/configparser.c" +#line 5477 "util/configparser.c" break; - case 473: -#line 2390 "./util/configparser.y" + case 475: +#line 2400 "./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) @@ -5469,11 +5486,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5473 "util/configparser.c" +#line 5490 "util/configparser.c" break; - case 474: -#line 2400 "./util/configparser.y" + case 476: +#line 2410 "./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) @@ -5482,11 +5499,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5486 "util/configparser.c" +#line 5503 "util/configparser.c" break; - case 475: -#line 2410 "./util/configparser.y" + case 477: +#line 2420 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -5498,11 +5515,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 5502 "util/configparser.c" +#line 5519 "util/configparser.c" break; - case 476: -#line 2423 "./util/configparser.y" + case 478: +#line 2433 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -5514,11 +5531,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 5518 "util/configparser.c" +#line 5535 "util/configparser.c" break; - case 477: -#line 2436 "./util/configparser.y" + case 479: +#line 2446 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -5529,11 +5546,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 5533 "util/configparser.c" +#line 5550 "util/configparser.c" break; - case 478: -#line 2448 "./util/configparser.y" + case 480: +#line 2458 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -5546,11 +5563,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 5550 "util/configparser.c" +#line 5567 "util/configparser.c" break; - case 479: -#line 2462 "./util/configparser.y" + case 481: +#line 2472 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -5561,11 +5578,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 5565 "util/configparser.c" +#line 5582 "util/configparser.c" break; - case 480: -#line 2474 "./util/configparser.y" + case 482: +#line 2484 "./util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -5578,43 +5595,38 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 5582 "util/configparser.c" +#line 5599 "util/configparser.c" break; - case 481: -#line 2488 "./util/configparser.y" - { - int tag_data; - OUTYY(("P(server_edns_client_tag:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); - tag_data = atoi((yyvsp[0].str)); - if(tag_data > 65535 || tag_data < 0 || - (tag_data == 0 && (strlen((yyvsp[0].str)) != 1 || (yyvsp[0].str)[0] != '0'))) - yyerror("edns-client-tag data invalid, needs to be a " - "number from 0 to 65535"); + case 483: +#line 2498 "./util/configparser.y" + { + OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert( - &cfg_parser->cfg->edns_client_tags, (yyvsp[-1].str), (yyvsp[0].str))) + &cfg_parser->cfg->edns_client_strings, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding " - "edns-client-tag"); + "edns-client-string"); } -#line 5600 "util/configparser.c" +#line 5611 "util/configparser.c" break; - case 482: -#line 2503 "./util/configparser.y" + case 484: +#line 2507 "./util/configparser.y" { - OUTYY(("P(edns_client_tag_opcode:%s)\n", (yyvsp[0].str))); + OUTYY(("P(edns_client_string_opcode:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) yyerror("option code expected"); else if(atoi((yyvsp[0].str)) > 65535 || atoi((yyvsp[0].str)) < 0) yyerror("option code must be in interval [0, 65535]"); - else cfg_parser->cfg->edns_client_tag_opcode = atoi((yyvsp[0].str)); + else cfg_parser->cfg->edns_client_string_opcode = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); } -#line 5614 "util/configparser.c" +#line 5626 "util/configparser.c" break; - case 483: -#line 2514 "./util/configparser.y" + case 485: +#line 2519 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -5623,31 +5635,31 @@ yyparse (void) free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 5627 "util/configparser.c" +#line 5639 "util/configparser.c" break; - case 484: -#line 2524 "./util/configparser.y" + case 486: +#line 2529 "./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 5637 "util/configparser.c" +#line 5649 "util/configparser.c" break; - case 485: -#line 2531 "./util/configparser.y" + case 487: +#line 2536 "./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 5647 "util/configparser.c" +#line 5659 "util/configparser.c" break; - case 486: -#line 2538 "./util/configparser.y" + case 488: +#line 2543 "./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) @@ -5655,11 +5667,11 @@ yyparse (void) else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5659 "util/configparser.c" +#line 5671 "util/configparser.c" break; - case 487: -#line 2547 "./util/configparser.y" + case 489: +#line 2552 "./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) @@ -5667,11 +5679,11 @@ yyparse (void) else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5671 "util/configparser.c" +#line 5683 "util/configparser.c" break; - case 488: -#line 2556 "./util/configparser.y" + case 490: +#line 2561 "./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) @@ -5680,11 +5692,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5684 "util/configparser.c" +#line 5696 "util/configparser.c" break; - case 489: -#line 2566 "./util/configparser.y" + case 491: +#line 2571 "./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) @@ -5693,11 +5705,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5697 "util/configparser.c" +#line 5709 "util/configparser.c" break; - case 490: -#line 2576 "./util/configparser.y" + case 492: +#line 2581 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -5706,31 +5718,31 @@ yyparse (void) free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 5710 "util/configparser.c" +#line 5722 "util/configparser.c" break; - case 491: -#line 2586 "./util/configparser.y" + case 493: +#line 2591 "./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 5720 "util/configparser.c" +#line 5732 "util/configparser.c" break; - case 492: -#line 2593 "./util/configparser.y" + case 494: +#line 2598 "./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 5730 "util/configparser.c" +#line 5742 "util/configparser.c" break; - case 493: -#line 2600 "./util/configparser.y" + case 495: +#line 2605 "./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) @@ -5738,11 +5750,11 @@ yyparse (void) else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5742 "util/configparser.c" +#line 5754 "util/configparser.c" break; - case 494: -#line 2609 "./util/configparser.y" + case 496: +#line 2614 "./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) @@ -5750,11 +5762,11 @@ yyparse (void) else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5754 "util/configparser.c" +#line 5766 "util/configparser.c" break; - case 495: -#line 2618 "./util/configparser.y" + case 497: +#line 2623 "./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) @@ -5763,11 +5775,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5767 "util/configparser.c" +#line 5779 "util/configparser.c" break; - case 496: -#line 2628 "./util/configparser.y" + case 498: +#line 2633 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -5776,52 +5788,52 @@ yyparse (void) free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 5780 "util/configparser.c" +#line 5792 "util/configparser.c" break; - case 497: -#line 2638 "./util/configparser.y" + case 499: +#line 2643 "./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 5790 "util/configparser.c" +#line 5802 "util/configparser.c" break; - case 498: -#line 2645 "./util/configparser.y" + case 500: +#line 2650 "./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 5800 "util/configparser.c" +#line 5812 "util/configparser.c" break; - case 499: -#line 2652 "./util/configparser.y" + case 501: +#line 2657 "./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 5810 "util/configparser.c" +#line 5822 "util/configparser.c" break; - case 500: -#line 2659 "./util/configparser.y" + case 502: +#line 2664 "./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 5821 "util/configparser.c" +#line 5833 "util/configparser.c" break; - case 501: -#line 2667 "./util/configparser.y" + case 503: +#line 2672 "./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) @@ -5830,11 +5842,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5834 "util/configparser.c" +#line 5846 "util/configparser.c" break; - case 502: -#line 2677 "./util/configparser.y" + case 504: +#line 2682 "./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) @@ -5843,11 +5855,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5847 "util/configparser.c" +#line 5859 "util/configparser.c" break; - case 503: -#line 2687 "./util/configparser.y" + case 505: +#line 2692 "./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) @@ -5856,11 +5868,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5860 "util/configparser.c" +#line 5872 "util/configparser.c" break; - case 504: -#line 2697 "./util/configparser.y" + case 506: +#line 2702 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -5869,11 +5881,11 @@ yyparse (void) free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 5873 "util/configparser.c" +#line 5885 "util/configparser.c" break; - case 505: -#line 2707 "./util/configparser.y" + case 507: +#line 2712 "./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 && @@ -5911,11 +5923,11 @@ yyparse (void) fatal_exit("out of memory adding local-zone"); } } -#line 5915 "util/configparser.c" +#line 5927 "util/configparser.c" break; - case 506: -#line 2746 "./util/configparser.y" + case 508: +#line 2751 "./util/configparser.y" { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5924,33 +5936,33 @@ yyparse (void) fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 5928 "util/configparser.c" +#line 5940 "util/configparser.c" break; - case 507: -#line 2756 "./util/configparser.y" + case 509: +#line 2761 "./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 5939 "util/configparser.c" +#line 5951 "util/configparser.c" break; - case 508: -#line 2764 "./util/configparser.y" + case 510: +#line 2769 "./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 5950 "util/configparser.c" +#line 5962 "util/configparser.c" break; - case 509: -#line 2772 "./util/configparser.y" + case 511: +#line 2777 "./util/configparser.y" { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5964,11 +5976,11 @@ yyparse (void) yyerror("local-data-ptr could not be reversed"); } } -#line 5968 "util/configparser.c" +#line 5980 "util/configparser.c" break; - case 510: -#line 2787 "./util/configparser.y" + case 512: +#line 2792 "./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) @@ -5976,19 +5988,19 @@ yyparse (void) else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5980 "util/configparser.c" +#line 5992 "util/configparser.c" break; - case 511: -#line 2796 "./util/configparser.y" + case 513: +#line 2801 "./util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } -#line 5988 "util/configparser.c" +#line 6000 "util/configparser.c" break; - case 522: -#line 2807 "./util/configparser.y" + case 524: +#line 2812 "./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) @@ -5997,11 +6009,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6001 "util/configparser.c" +#line 6013 "util/configparser.c" break; - case 523: -#line 2817 "./util/configparser.y" + case 525: +#line 2822 "./util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6009,79 +6021,79 @@ yyparse (void) else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6013 "util/configparser.c" +#line 6025 "util/configparser.c" break; - case 524: -#line 2826 "./util/configparser.y" + case 526: +#line 2831 "./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 6023 "util/configparser.c" +#line 6035 "util/configparser.c" break; - case 525: -#line 2833 "./util/configparser.y" + case 527: +#line 2838 "./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 6033 "util/configparser.c" +#line 6045 "util/configparser.c" break; - case 526: -#line 2840 "./util/configparser.y" + case 528: +#line 2845 "./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 6043 "util/configparser.c" +#line 6055 "util/configparser.c" break; - case 527: -#line 2847 "./util/configparser.y" + case 529: +#line 2852 "./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 6053 "util/configparser.c" +#line 6065 "util/configparser.c" break; - case 528: -#line 2854 "./util/configparser.y" + case 530: +#line 2859 "./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 6063 "util/configparser.c" +#line 6075 "util/configparser.c" break; - case 529: -#line 2861 "./util/configparser.y" + case 531: +#line 2866 "./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 6073 "util/configparser.c" +#line 6085 "util/configparser.c" break; - case 530: -#line 2868 "./util/configparser.y" + case 532: +#line 2873 "./util/configparser.y" { OUTYY(("\nP(dnstap:)\n")); } -#line 6081 "util/configparser.c" +#line 6093 "util/configparser.c" break; - case 552: -#line 2888 "./util/configparser.y" + case 554: +#line 2893 "./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) @@ -6089,11 +6101,11 @@ yyparse (void) else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6093 "util/configparser.c" +#line 6105 "util/configparser.c" break; - case 553: -#line 2897 "./util/configparser.y" + case 555: +#line 2902 "./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) @@ -6102,31 +6114,31 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6106 "util/configparser.c" +#line 6118 "util/configparser.c" break; - case 554: -#line 2907 "./util/configparser.y" + case 556: +#line 2912 "./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 6116 "util/configparser.c" +#line 6128 "util/configparser.c" break; - case 555: -#line 2914 "./util/configparser.y" + case 557: +#line 2919 "./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 6126 "util/configparser.c" +#line 6138 "util/configparser.c" break; - case 556: -#line 2921 "./util/configparser.y" + case 558: +#line 2926 "./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) @@ -6134,51 +6146,51 @@ yyparse (void) else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6138 "util/configparser.c" +#line 6150 "util/configparser.c" break; - case 557: -#line 2930 "./util/configparser.y" + case 559: +#line 2935 "./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 6148 "util/configparser.c" +#line 6160 "util/configparser.c" break; - case 558: -#line 2937 "./util/configparser.y" + case 560: +#line 2942 "./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 6158 "util/configparser.c" +#line 6170 "util/configparser.c" break; - case 559: -#line 2944 "./util/configparser.y" + case 561: +#line 2949 "./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 6168 "util/configparser.c" +#line 6180 "util/configparser.c" break; - case 560: -#line 2951 "./util/configparser.y" + case 562: +#line 2956 "./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 6178 "util/configparser.c" +#line 6190 "util/configparser.c" break; - case 561: -#line 2958 "./util/configparser.y" + case 563: +#line 2963 "./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) @@ -6186,11 +6198,11 @@ yyparse (void) else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6190 "util/configparser.c" +#line 6202 "util/configparser.c" break; - case 562: -#line 2967 "./util/configparser.y" + case 564: +#line 2972 "./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) @@ -6198,31 +6210,31 @@ yyparse (void) else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6202 "util/configparser.c" +#line 6214 "util/configparser.c" break; - case 563: -#line 2976 "./util/configparser.y" + case 565: +#line 2981 "./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 6212 "util/configparser.c" +#line 6224 "util/configparser.c" break; - case 564: -#line 2983 "./util/configparser.y" + case 566: +#line 2988 "./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 6222 "util/configparser.c" +#line 6234 "util/configparser.c" break; - case 565: -#line 2990 "./util/configparser.y" + case 567: +#line 2995 "./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) @@ -6231,11 +6243,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6235 "util/configparser.c" +#line 6247 "util/configparser.c" break; - case 566: -#line 3000 "./util/configparser.y" + case 568: +#line 3005 "./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) @@ -6244,11 +6256,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6248 "util/configparser.c" +#line 6260 "util/configparser.c" break; - case 567: -#line 3010 "./util/configparser.y" + case 569: +#line 3015 "./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) @@ -6257,11 +6269,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6261 "util/configparser.c" +#line 6273 "util/configparser.c" break; - case 568: -#line 3020 "./util/configparser.y" + case 570: +#line 3025 "./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) @@ -6270,11 +6282,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6274 "util/configparser.c" +#line 6286 "util/configparser.c" break; - case 569: -#line 3030 "./util/configparser.y" + case 571: +#line 3035 "./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) @@ -6283,11 +6295,11 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6287 "util/configparser.c" +#line 6299 "util/configparser.c" break; - case 570: -#line 3040 "./util/configparser.y" + case 572: +#line 3045 "./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) @@ -6296,47 +6308,47 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6300 "util/configparser.c" +#line 6312 "util/configparser.c" break; - case 571: -#line 3050 "./util/configparser.y" + case 573: +#line 3055 "./util/configparser.y" { OUTYY(("\nP(python:)\n")); } -#line 6308 "util/configparser.c" +#line 6320 "util/configparser.c" break; - case 575: -#line 3059 "./util/configparser.y" + case 577: +#line 3064 "./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 6318 "util/configparser.c" +#line 6330 "util/configparser.c" break; - case 576: -#line 3065 "./util/configparser.y" + case 578: +#line 3070 "./util/configparser.y" { OUTYY(("\nP(dynlib:)\n")); } -#line 6326 "util/configparser.c" +#line 6338 "util/configparser.c" break; - case 580: -#line 3074 "./util/configparser.y" + case 582: +#line 3079 "./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 6336 "util/configparser.c" +#line 6348 "util/configparser.c" break; - case 581: -#line 3080 "./util/configparser.y" + case 583: +#line 3085 "./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) @@ -6345,21 +6357,21 @@ yyparse (void) (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6349 "util/configparser.c" +#line 6361 "util/configparser.c" break; - case 582: -#line 3090 "./util/configparser.y" + case 584: +#line 3095 "./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 6359 "util/configparser.c" +#line 6371 "util/configparser.c" break; - case 583: -#line 3097 "./util/configparser.y" + case 585: +#line 3102 "./util/configparser.y" { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -6367,30 +6379,30 @@ yyparse (void) (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 6371 "util/configparser.c" +#line 6383 "util/configparser.c" break; - case 584: -#line 3106 "./util/configparser.y" + case 586: +#line 3111 "./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 6382 "util/configparser.c" +#line 6394 "util/configparser.c" break; - case 585: -#line 3114 "./util/configparser.y" + case 587: +#line 3119 "./util/configparser.y" { OUTYY(("\nP(dnscrypt:)\n")); } -#line 6390 "util/configparser.c" +#line 6402 "util/configparser.c" break; - case 598: -#line 3130 "./util/configparser.y" + case 600: +#line 3135 "./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) @@ -6398,11 +6410,11 @@ yyparse (void) else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6402 "util/configparser.c" +#line 6414 "util/configparser.c" break; - case 599: -#line 3140 "./util/configparser.y" + case 601: +#line 3145 "./util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6410,21 +6422,21 @@ yyparse (void) else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6414 "util/configparser.c" +#line 6426 "util/configparser.c" break; - case 600: -#line 3149 "./util/configparser.y" + case 602: +#line 3154 "./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 6424 "util/configparser.c" +#line 6436 "util/configparser.c" break; - case 601: -#line 3156 "./util/configparser.y" + case 603: +#line 3161 "./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))) @@ -6432,21 +6444,21 @@ yyparse (void) if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 6436 "util/configparser.c" +#line 6448 "util/configparser.c" break; - case 602: -#line 3165 "./util/configparser.y" + case 604: +#line 3170 "./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 6446 "util/configparser.c" +#line 6458 "util/configparser.c" break; - case 603: -#line 3172 "./util/configparser.y" + case 605: +#line 3177 "./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))) @@ -6454,22 +6466,22 @@ yyparse (void) if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 6458 "util/configparser.c" +#line 6470 "util/configparser.c" break; - case 604: -#line 3181 "./util/configparser.y" + case 606: +#line 3186 "./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 6469 "util/configparser.c" +#line 6481 "util/configparser.c" break; - case 605: -#line 3189 "./util/configparser.y" + case 607: +#line 3194 "./util/configparser.y" { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6481,22 +6493,22 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 6485 "util/configparser.c" +#line 6497 "util/configparser.c" break; - case 606: -#line 3202 "./util/configparser.y" + case 608: +#line 3207 "./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 6496 "util/configparser.c" +#line 6508 "util/configparser.c" break; - case 607: -#line 3210 "./util/configparser.y" + case 609: +#line 3215 "./util/configparser.y" { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6508,19 +6520,19 @@ yyparse (void) } free((yyvsp[0].str)); } -#line 6512 "util/configparser.c" +#line 6524 "util/configparser.c" break; - case 608: -#line 3223 "./util/configparser.y" + case 610: +#line 3228 "./util/configparser.y" { OUTYY(("\nP(cachedb:)\n")); } -#line 6520 "util/configparser.c" +#line 6532 "util/configparser.c" break; - case 617: -#line 3234 "./util/configparser.y" + case 619: +#line 3239 "./util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -6531,11 +6543,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 6535 "util/configparser.c" +#line 6547 "util/configparser.c" break; - case 618: -#line 3246 "./util/configparser.y" + case 620: +#line 3251 "./util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -6546,11 +6558,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 6550 "util/configparser.c" +#line 6562 "util/configparser.c" break; - case 619: -#line 3258 "./util/configparser.y" + case 621: +#line 3263 "./util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -6561,11 +6573,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 6565 "util/configparser.c" +#line 6577 "util/configparser.c" break; - case 620: -#line 3270 "./util/configparser.y" + case 622: +#line 3275 "./util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -6579,11 +6591,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 6583 "util/configparser.c" +#line 6595 "util/configparser.c" break; - case 621: -#line 3285 "./util/configparser.y" + case 623: +#line 3290 "./util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -6595,11 +6607,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 6599 "util/configparser.c" +#line 6611 "util/configparser.c" break; - case 622: -#line 3298 "./util/configparser.y" + case 624: +#line 3303 "./util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str))); @@ -6611,11 +6623,11 @@ yyparse (void) #endif free((yyvsp[0].str)); } -#line 6615 "util/configparser.c" +#line 6627 "util/configparser.c" break; - case 623: -#line 3311 "./util/configparser.y" + case 625: +#line 3316 "./util/configparser.y" { OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if (atoi((yyvsp[0].str)) < 0) @@ -6625,19 +6637,19 @@ yyparse (void) fatal_exit("out of memory adding tcp connection limit"); } } -#line 6629 "util/configparser.c" +#line 6641 "util/configparser.c" break; - case 624: -#line 3322 "./util/configparser.y" + case 626: +#line 3327 "./util/configparser.y" { OUTYY(("\nP(ipset:)\n")); } -#line 6637 "util/configparser.c" +#line 6649 "util/configparser.c" break; - case 629: -#line 3331 "./util/configparser.y" + case 631: +#line 3336 "./util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str))); @@ -6651,11 +6663,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 6655 "util/configparser.c" +#line 6667 "util/configparser.c" break; - case 630: -#line 3346 "./util/configparser.y" + case 632: +#line 3351 "./util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str))); @@ -6669,11 +6681,11 @@ yyparse (void) free((yyvsp[0].str)); #endif } -#line 6673 "util/configparser.c" +#line 6685 "util/configparser.c" break; -#line 6677 "util/configparser.c" +#line 6689 "util/configparser.c" default: break; } @@ -6905,7 +6917,7 @@ yyparse (void) #endif return yyresult; } -#line 3360 "./util/configparser.y" +#line 3365 "./util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 79ed369c4..323d587dd 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -200,154 +200,155 @@ extern int yydebug; 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_TAG = 555, - VAR_EDNS_CLIENT_TAG_OPCODE = 556 + VAR_UDP_CONNECT = 409, + VAR_UNBLOCK_LAN_ZONES = 410, + VAR_INSECURE_LAN_ZONES = 411, + VAR_INFRA_CACHE_MIN_RTT = 412, + VAR_INFRA_KEEP_PROBING = 413, + VAR_DNS64_PREFIX = 414, + VAR_DNS64_SYNTHALL = 415, + VAR_DNS64_IGNORE_AAAA = 416, + VAR_DNSTAP = 417, + VAR_DNSTAP_ENABLE = 418, + VAR_DNSTAP_SOCKET_PATH = 419, + VAR_DNSTAP_IP = 420, + VAR_DNSTAP_TLS = 421, + VAR_DNSTAP_TLS_SERVER_NAME = 422, + VAR_DNSTAP_TLS_CERT_BUNDLE = 423, + VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424, + VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425, + VAR_DNSTAP_SEND_IDENTITY = 426, + VAR_DNSTAP_SEND_VERSION = 427, + VAR_DNSTAP_BIDIRECTIONAL = 428, + VAR_DNSTAP_IDENTITY = 429, + VAR_DNSTAP_VERSION = 430, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436, + VAR_RESPONSE_IP_TAG = 437, + VAR_RESPONSE_IP = 438, + VAR_RESPONSE_IP_DATA = 439, + VAR_HARDEN_ALGO_DOWNGRADE = 440, + VAR_IP_TRANSPARENT = 441, + VAR_IP_DSCP = 442, + VAR_DISABLE_DNSSEC_LAME_CHECK = 443, + VAR_IP_RATELIMIT = 444, + VAR_IP_RATELIMIT_SLABS = 445, + VAR_IP_RATELIMIT_SIZE = 446, + VAR_RATELIMIT = 447, + VAR_RATELIMIT_SLABS = 448, + VAR_RATELIMIT_SIZE = 449, + VAR_RATELIMIT_FOR_DOMAIN = 450, + VAR_RATELIMIT_BELOW_DOMAIN = 451, + VAR_IP_RATELIMIT_FACTOR = 452, + VAR_RATELIMIT_FACTOR = 453, + VAR_SEND_CLIENT_SUBNET = 454, + VAR_CLIENT_SUBNET_ZONE = 455, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456, + VAR_CLIENT_SUBNET_OPCODE = 457, + VAR_MAX_CLIENT_SUBNET_IPV4 = 458, + VAR_MAX_CLIENT_SUBNET_IPV6 = 459, + VAR_MIN_CLIENT_SUBNET_IPV4 = 460, + VAR_MIN_CLIENT_SUBNET_IPV6 = 461, + VAR_MAX_ECS_TREE_SIZE_IPV4 = 462, + VAR_MAX_ECS_TREE_SIZE_IPV6 = 463, + VAR_CAPS_WHITELIST = 464, + VAR_CACHE_MAX_NEGATIVE_TTL = 465, + VAR_PERMIT_SMALL_HOLDDOWN = 466, + VAR_QNAME_MINIMISATION = 467, + VAR_QNAME_MINIMISATION_STRICT = 468, + VAR_IP_FREEBIND = 469, + VAR_DEFINE_TAG = 470, + VAR_LOCAL_ZONE_TAG = 471, + VAR_ACCESS_CONTROL_TAG = 472, + VAR_LOCAL_ZONE_OVERRIDE = 473, + VAR_ACCESS_CONTROL_TAG_ACTION = 474, + VAR_ACCESS_CONTROL_TAG_DATA = 475, + VAR_VIEW = 476, + VAR_ACCESS_CONTROL_VIEW = 477, + VAR_VIEW_FIRST = 478, + VAR_SERVE_EXPIRED = 479, + VAR_SERVE_EXPIRED_TTL = 480, + VAR_SERVE_EXPIRED_TTL_RESET = 481, + VAR_SERVE_EXPIRED_REPLY_TTL = 482, + VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483, + VAR_FAKE_DSA = 484, + VAR_FAKE_SHA1 = 485, + VAR_LOG_IDENTITY = 486, + VAR_HIDE_TRUSTANCHOR = 487, + VAR_TRUST_ANCHOR_SIGNALING = 488, + VAR_AGGRESSIVE_NSEC = 489, + VAR_USE_SYSTEMD = 490, + VAR_SHM_ENABLE = 491, + VAR_SHM_KEY = 492, + VAR_ROOT_KEY_SENTINEL = 493, + VAR_DNSCRYPT = 494, + VAR_DNSCRYPT_ENABLE = 495, + VAR_DNSCRYPT_PORT = 496, + VAR_DNSCRYPT_PROVIDER = 497, + VAR_DNSCRYPT_SECRET_KEY = 498, + VAR_DNSCRYPT_PROVIDER_CERT = 499, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504, + VAR_IPSECMOD_ENABLED = 505, + VAR_IPSECMOD_HOOK = 506, + VAR_IPSECMOD_IGNORE_BOGUS = 507, + VAR_IPSECMOD_MAX_TTL = 508, + VAR_IPSECMOD_WHITELIST = 509, + VAR_IPSECMOD_STRICT = 510, + VAR_CACHEDB = 511, + VAR_CACHEDB_BACKEND = 512, + VAR_CACHEDB_SECRETSEED = 513, + VAR_CACHEDB_REDISHOST = 514, + VAR_CACHEDB_REDISPORT = 515, + VAR_CACHEDB_REDISTIMEOUT = 516, + VAR_CACHEDB_REDISEXPIRERECORDS = 517, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518, + VAR_FOR_UPSTREAM = 519, + VAR_AUTH_ZONE = 520, + VAR_ZONEFILE = 521, + VAR_MASTER = 522, + VAR_URL = 523, + VAR_FOR_DOWNSTREAM = 524, + VAR_FALLBACK_ENABLED = 525, + VAR_TLS_ADDITIONAL_PORT = 526, + VAR_LOW_RTT = 527, + VAR_LOW_RTT_PERMIL = 528, + VAR_FAST_SERVER_PERMIL = 529, + VAR_FAST_SERVER_NUM = 530, + VAR_ALLOW_NOTIFY = 531, + VAR_TLS_WIN_CERT = 532, + VAR_TCP_CONNECTION_LIMIT = 533, + VAR_FORWARD_NO_CACHE = 534, + VAR_STUB_NO_CACHE = 535, + VAR_LOG_SERVFAIL = 536, + VAR_DENY_ANY = 537, + VAR_UNKNOWN_SERVER_TIME_LIMIT = 538, + VAR_LOG_TAG_QUERYREPLY = 539, + VAR_STREAM_WAIT_SIZE = 540, + VAR_TLS_CIPHERS = 541, + VAR_TLS_CIPHERSUITES = 542, + VAR_TLS_USE_SNI = 543, + VAR_IPSET = 544, + VAR_IPSET_NAME_V4 = 545, + VAR_IPSET_NAME_V6 = 546, + VAR_TLS_SESSION_TICKET_KEYS = 547, + VAR_RPZ = 548, + VAR_TAGS = 549, + VAR_RPZ_ACTION_OVERRIDE = 550, + VAR_RPZ_CNAME_OVERRIDE = 551, + VAR_RPZ_LOG = 552, + VAR_RPZ_LOG_NAME = 553, + VAR_DYNLIB = 554, + VAR_DYNLIB_FILE = 555, + VAR_EDNS_CLIENT_STRING = 556, + VAR_EDNS_CLIENT_STRING_OPCODE = 557 }; #endif /* Tokens. */ @@ -502,154 +503,155 @@ extern int yydebug; #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_TAG 555 -#define VAR_EDNS_CLIENT_TAG_OPCODE 556 +#define VAR_UDP_CONNECT 409 +#define VAR_UNBLOCK_LAN_ZONES 410 +#define VAR_INSECURE_LAN_ZONES 411 +#define VAR_INFRA_CACHE_MIN_RTT 412 +#define VAR_INFRA_KEEP_PROBING 413 +#define VAR_DNS64_PREFIX 414 +#define VAR_DNS64_SYNTHALL 415 +#define VAR_DNS64_IGNORE_AAAA 416 +#define VAR_DNSTAP 417 +#define VAR_DNSTAP_ENABLE 418 +#define VAR_DNSTAP_SOCKET_PATH 419 +#define VAR_DNSTAP_IP 420 +#define VAR_DNSTAP_TLS 421 +#define VAR_DNSTAP_TLS_SERVER_NAME 422 +#define VAR_DNSTAP_TLS_CERT_BUNDLE 423 +#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 424 +#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 425 +#define VAR_DNSTAP_SEND_IDENTITY 426 +#define VAR_DNSTAP_SEND_VERSION 427 +#define VAR_DNSTAP_BIDIRECTIONAL 428 +#define VAR_DNSTAP_IDENTITY 429 +#define VAR_DNSTAP_VERSION 430 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 431 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 432 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 433 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 434 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 435 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 436 +#define VAR_RESPONSE_IP_TAG 437 +#define VAR_RESPONSE_IP 438 +#define VAR_RESPONSE_IP_DATA 439 +#define VAR_HARDEN_ALGO_DOWNGRADE 440 +#define VAR_IP_TRANSPARENT 441 +#define VAR_IP_DSCP 442 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 443 +#define VAR_IP_RATELIMIT 444 +#define VAR_IP_RATELIMIT_SLABS 445 +#define VAR_IP_RATELIMIT_SIZE 446 +#define VAR_RATELIMIT 447 +#define VAR_RATELIMIT_SLABS 448 +#define VAR_RATELIMIT_SIZE 449 +#define VAR_RATELIMIT_FOR_DOMAIN 450 +#define VAR_RATELIMIT_BELOW_DOMAIN 451 +#define VAR_IP_RATELIMIT_FACTOR 452 +#define VAR_RATELIMIT_FACTOR 453 +#define VAR_SEND_CLIENT_SUBNET 454 +#define VAR_CLIENT_SUBNET_ZONE 455 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 456 +#define VAR_CLIENT_SUBNET_OPCODE 457 +#define VAR_MAX_CLIENT_SUBNET_IPV4 458 +#define VAR_MAX_CLIENT_SUBNET_IPV6 459 +#define VAR_MIN_CLIENT_SUBNET_IPV4 460 +#define VAR_MIN_CLIENT_SUBNET_IPV6 461 +#define VAR_MAX_ECS_TREE_SIZE_IPV4 462 +#define VAR_MAX_ECS_TREE_SIZE_IPV6 463 +#define VAR_CAPS_WHITELIST 464 +#define VAR_CACHE_MAX_NEGATIVE_TTL 465 +#define VAR_PERMIT_SMALL_HOLDDOWN 466 +#define VAR_QNAME_MINIMISATION 467 +#define VAR_QNAME_MINIMISATION_STRICT 468 +#define VAR_IP_FREEBIND 469 +#define VAR_DEFINE_TAG 470 +#define VAR_LOCAL_ZONE_TAG 471 +#define VAR_ACCESS_CONTROL_TAG 472 +#define VAR_LOCAL_ZONE_OVERRIDE 473 +#define VAR_ACCESS_CONTROL_TAG_ACTION 474 +#define VAR_ACCESS_CONTROL_TAG_DATA 475 +#define VAR_VIEW 476 +#define VAR_ACCESS_CONTROL_VIEW 477 +#define VAR_VIEW_FIRST 478 +#define VAR_SERVE_EXPIRED 479 +#define VAR_SERVE_EXPIRED_TTL 480 +#define VAR_SERVE_EXPIRED_TTL_RESET 481 +#define VAR_SERVE_EXPIRED_REPLY_TTL 482 +#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 483 +#define VAR_FAKE_DSA 484 +#define VAR_FAKE_SHA1 485 +#define VAR_LOG_IDENTITY 486 +#define VAR_HIDE_TRUSTANCHOR 487 +#define VAR_TRUST_ANCHOR_SIGNALING 488 +#define VAR_AGGRESSIVE_NSEC 489 +#define VAR_USE_SYSTEMD 490 +#define VAR_SHM_ENABLE 491 +#define VAR_SHM_KEY 492 +#define VAR_ROOT_KEY_SENTINEL 493 +#define VAR_DNSCRYPT 494 +#define VAR_DNSCRYPT_ENABLE 495 +#define VAR_DNSCRYPT_PORT 496 +#define VAR_DNSCRYPT_PROVIDER 497 +#define VAR_DNSCRYPT_SECRET_KEY 498 +#define VAR_DNSCRYPT_PROVIDER_CERT 499 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 500 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 501 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 502 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 503 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 504 +#define VAR_IPSECMOD_ENABLED 505 +#define VAR_IPSECMOD_HOOK 506 +#define VAR_IPSECMOD_IGNORE_BOGUS 507 +#define VAR_IPSECMOD_MAX_TTL 508 +#define VAR_IPSECMOD_WHITELIST 509 +#define VAR_IPSECMOD_STRICT 510 +#define VAR_CACHEDB 511 +#define VAR_CACHEDB_BACKEND 512 +#define VAR_CACHEDB_SECRETSEED 513 +#define VAR_CACHEDB_REDISHOST 514 +#define VAR_CACHEDB_REDISPORT 515 +#define VAR_CACHEDB_REDISTIMEOUT 516 +#define VAR_CACHEDB_REDISEXPIRERECORDS 517 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 518 +#define VAR_FOR_UPSTREAM 519 +#define VAR_AUTH_ZONE 520 +#define VAR_ZONEFILE 521 +#define VAR_MASTER 522 +#define VAR_URL 523 +#define VAR_FOR_DOWNSTREAM 524 +#define VAR_FALLBACK_ENABLED 525 +#define VAR_TLS_ADDITIONAL_PORT 526 +#define VAR_LOW_RTT 527 +#define VAR_LOW_RTT_PERMIL 528 +#define VAR_FAST_SERVER_PERMIL 529 +#define VAR_FAST_SERVER_NUM 530 +#define VAR_ALLOW_NOTIFY 531 +#define VAR_TLS_WIN_CERT 532 +#define VAR_TCP_CONNECTION_LIMIT 533 +#define VAR_FORWARD_NO_CACHE 534 +#define VAR_STUB_NO_CACHE 535 +#define VAR_LOG_SERVFAIL 536 +#define VAR_DENY_ANY 537 +#define VAR_UNKNOWN_SERVER_TIME_LIMIT 538 +#define VAR_LOG_TAG_QUERYREPLY 539 +#define VAR_STREAM_WAIT_SIZE 540 +#define VAR_TLS_CIPHERS 541 +#define VAR_TLS_CIPHERSUITES 542 +#define VAR_TLS_USE_SNI 543 +#define VAR_IPSET 544 +#define VAR_IPSET_NAME_V4 545 +#define VAR_IPSET_NAME_V6 546 +#define VAR_TLS_SESSION_TICKET_KEYS 547 +#define VAR_RPZ 548 +#define VAR_TAGS 549 +#define VAR_RPZ_ACTION_OVERRIDE 550 +#define VAR_RPZ_CNAME_OVERRIDE 551 +#define VAR_RPZ_LOG 552 +#define VAR_RPZ_LOG_NAME 553 +#define VAR_DYNLIB 554 +#define VAR_DYNLIB_FILE 555 +#define VAR_EDNS_CLIENT_STRING 556 +#define VAR_EDNS_CLIENT_STRING_OPCODE 557 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -659,7 +661,7 @@ union YYSTYPE char* str; -#line 663 "util/configparser.h" +#line 665 "util/configparser.h" }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index 340fc0f5d..4d6b5e3fb 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -116,7 +116,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_HTTP_QUERY_BUFFER_SIZE VAR_HTTP_RESPONSE_BUFFER_SIZE %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_MAX_UDP_SIZE VAR_DELAY_CLOSE VAR_UDP_CONNECT %token VAR_UNBLOCK_LAN_ZONES VAR_INSECURE_LAN_ZONES %token VAR_INFRA_CACHE_MIN_RTT VAR_INFRA_KEEP_PROBING %token VAR_DNS64_PREFIX VAR_DNS64_SYNTHALL VAR_DNS64_IGNORE_AAAA @@ -178,7 +178,8 @@ extern struct config_parser_state* cfg_parser; %token VAR_IPSET VAR_IPSET_NAME_V4 VAR_IPSET_NAME_V6 %token VAR_TLS_SESSION_TICKET_KEYS VAR_RPZ VAR_TAGS VAR_RPZ_ACTION_OVERRIDE %token VAR_RPZ_CNAME_OVERRIDE VAR_RPZ_LOG VAR_RPZ_LOG_NAME -%token VAR_DYNLIB VAR_DYNLIB_FILE VAR_EDNS_CLIENT_TAG VAR_EDNS_CLIENT_TAG_OPCODE +%token VAR_DYNLIB VAR_DYNLIB_FILE VAR_EDNS_CLIENT_STRING +%token VAR_EDNS_CLIENT_STRING_OPCODE %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -251,7 +252,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_http_query_buffer_size | server_http_response_buffer_size | server_http_nodelay | server_http_notls_downstream | server_minimal_responses | server_rrset_roundrobin | server_max_udp_size | - server_so_reuseport | server_delay_close | + server_so_reuseport | server_delay_close | server_udp_connect | 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 | @@ -291,8 +292,8 @@ content_server: server_num_threads | server_verbosity | server_port | server_unknown_server_time_limit | server_log_tag_queryreply | server_stream_wait_size | server_tls_ciphers | server_tls_ciphersuites | server_tls_session_ticket_keys | - server_tls_use_sni | server_edns_client_tag | - server_edns_client_tag_opcode + server_tls_use_sni | server_edns_client_string | + server_edns_client_string_opcode ; stubstart: VAR_STUB_ZONE { @@ -1443,6 +1444,15 @@ server_delay_close: VAR_DELAY_CLOSE STRING_ARG free($2); } ; +server_udp_connect: VAR_UDP_CONNECT STRING_ARG + { + OUTYY(("P(server_udp_connect:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->udp_connect = (strcmp($2, "yes")==0); + free($2); + } + ; server_unblock_lan_zones: VAR_UNBLOCK_LAN_ZONES STRING_ARG { OUTYY(("P(server_unblock_lan_zones:%s)\n", $2)); @@ -2484,29 +2494,24 @@ server_ipsecmod_strict: VAR_IPSECMOD_STRICT STRING_ARG #endif } ; -server_edns_client_tag: VAR_EDNS_CLIENT_TAG STRING_ARG STRING_ARG +server_edns_client_string: VAR_EDNS_CLIENT_STRING STRING_ARG STRING_ARG { - int tag_data; - OUTYY(("P(server_edns_client_tag:%s %s)\n", $2, $3)); - tag_data = atoi($3); - if(tag_data > 65535 || tag_data < 0 || - (tag_data == 0 && (strlen($3) != 1 || $3[0] != '0'))) - yyerror("edns-client-tag data invalid, needs to be a " - "number from 0 to 65535"); + OUTYY(("P(server_edns_client_string:%s %s)\n", $2, $3)); if(!cfg_str2list_insert( - &cfg_parser->cfg->edns_client_tags, $2, $3)) + &cfg_parser->cfg->edns_client_strings, $2, $3)) fatal_exit("out of memory adding " - "edns-client-tag"); + "edns-client-string"); } ; -server_edns_client_tag_opcode: VAR_EDNS_CLIENT_TAG_OPCODE STRING_ARG +server_edns_client_string_opcode: VAR_EDNS_CLIENT_STRING_OPCODE STRING_ARG { - OUTYY(("P(edns_client_tag_opcode:%s)\n", $2)); + OUTYY(("P(edns_client_string_opcode:%s)\n", $2)); if(atoi($2) == 0 && strcmp($2, "0") != 0) yyerror("option code expected"); else if(atoi($2) > 65535 || atoi($2) < 0) yyerror("option code must be in interval [0, 65535]"); - else cfg_parser->cfg->edns_client_tag_opcode = atoi($2); + else cfg_parser->cfg->edns_client_string_opcode = atoi($2); + free($2); } ; diff --git a/util/edns.c b/util/edns.c index c83a4a545..ddbb46e89 100644 --- a/util/edns.c +++ b/util/edns.c @@ -48,81 +48,84 @@ #include "util/data/msgparse.h" #include "util/data/msgreply.h" -struct edns_tags* edns_tags_create(void) +struct edns_strings* edns_strings_create(void) { - struct edns_tags* edns_tags = calloc(1, sizeof(struct edns_tags)); - if(!edns_tags) + struct edns_strings* edns_strings = calloc(1, + sizeof(struct edns_strings)); + if(!edns_strings) return NULL; - if(!(edns_tags->region = regional_create())) { - edns_tags_delete(edns_tags); + if(!(edns_strings->region = regional_create())) { + edns_strings_delete(edns_strings); return NULL; } - return edns_tags; + return edns_strings; } -void edns_tags_delete(struct edns_tags* edns_tags) +void edns_strings_delete(struct edns_strings* edns_strings) { - if(!edns_tags) + if(!edns_strings) return; - regional_destroy(edns_tags->region); - free(edns_tags); + regional_destroy(edns_strings->region); + free(edns_strings); } static int -edns_tags_client_insert(struct edns_tags* edns_tags, +edns_strings_client_insert(struct edns_strings* edns_strings, struct sockaddr_storage* addr, socklen_t addrlen, int net, - uint16_t tag_data) + const char* string) { - struct edns_tag_addr* eta = regional_alloc_zero(edns_tags->region, - sizeof(struct edns_tag_addr)); - if(!eta) + struct edns_string_addr* esa = regional_alloc_zero(edns_strings->region, + sizeof(struct edns_string_addr)); + if(!esa) return 0; - eta->tag_data = tag_data; - if(!addr_tree_insert(&edns_tags->client_tags, &eta->node, addr, addrlen, - net)) { - verbose(VERB_QUERY, "duplicate EDNS client tag ignored."); + esa->string_len = strlen(string); + esa->string = regional_alloc_init(edns_strings->region, string, + esa->string_len); + if(!esa->string) + return 0; + if(!addr_tree_insert(&edns_strings->client_strings, &esa->node, addr, + addrlen, net)) { + verbose(VERB_QUERY, "duplicate EDNS client string ignored."); } return 1; } -int edns_tags_apply_cfg(struct edns_tags* edns_tags, +int edns_strings_apply_cfg(struct edns_strings* edns_strings, struct config_file* config) { struct config_str2list* c; - regional_free_all(edns_tags->region); - addr_tree_init(&edns_tags->client_tags); + regional_free_all(edns_strings->region); + addr_tree_init(&edns_strings->client_strings); - for(c=config->edns_client_tags; c; c=c->next) { + for(c=config->edns_client_strings; c; c=c->next) { struct sockaddr_storage addr; socklen_t addrlen; int net; - uint16_t tag_data; log_assert(c->str && c->str2); if(!netblockstrtoaddr(c->str, UNBOUND_DNS_PORT, &addr, &addrlen, &net)) { - log_err("cannot parse EDNS client tag IP netblock: %s", - c->str); + log_err("cannot parse EDNS client string IP netblock: " + "%s", c->str); return 0; } - tag_data = atoi(c->str2); /* validated in config parser */ - if(!edns_tags_client_insert(edns_tags, &addr, addrlen, net, - tag_data)) { - log_err("out of memory while adding EDNS tags"); + if(!edns_strings_client_insert(edns_strings, &addr, addrlen, + net, c->str2)) { + log_err("out of memory while adding EDNS strings"); return 0; } } - edns_tags->client_tag_opcode = config->edns_client_tag_opcode; + edns_strings->client_string_opcode = config->edns_client_string_opcode; - addr_tree_init_parents(&edns_tags->client_tags); + addr_tree_init_parents(&edns_strings->client_strings); return 1; } -struct edns_tag_addr* -edns_tag_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr, +struct edns_string_addr* +edns_string_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr, socklen_t addrlen) { - return (struct edns_tag_addr*)addr_tree_lookup(tree, addr, addrlen); + return (struct edns_string_addr*)addr_tree_lookup(tree, addr, addrlen); } static int edns_keepalive(struct edns_data* edns_out, struct edns_data* edns_in, diff --git a/util/edns.h b/util/edns.h index cf9f8707e..11742eb5b 100644 --- a/util/edns.h +++ b/util/edns.h @@ -50,58 +50,60 @@ struct comm_point; struct regional; /** - * Structure containing all EDNS tags. + * Structure containing all EDNS strings. */ -struct edns_tags { - /** Tree of EDNS client tags to use in upstream queries, per address - * prefix. Contains nodes of type edns_tag_addr. */ - rbtree_type client_tags; - /** EDNS opcode to use for client tags */ - uint16_t client_tag_opcode; +struct edns_strings { + /** Tree of EDNS client strings to use in upstream queries, per address + * prefix. Contains nodes of type edns_string_addr. */ + rbtree_type client_strings; + /** EDNS opcode to use for client strings */ + uint16_t client_string_opcode; /** region to allocate tree nodes in */ struct regional* region; }; /** - * EDNS tag. Node of rbtree, containing tag and prefix. + * EDNS string. Node of rbtree, containing string and prefix. */ -struct edns_tag_addr { +struct edns_string_addr { /** node in address tree, used for tree lookups. Need to be the first * member of this struct. */ struct addr_tree_node node; - /** tag data, in host byte ordering */ - uint16_t tag_data; + /** string, ascii format */ + uint8_t* string; + /** length of string */ + size_t string_len; }; /** - * Create structure to hold EDNS tags - * @return: newly created edns_tags, NULL on alloc failure. + * Create structure to hold EDNS strings + * @return: newly created edns_strings, NULL on alloc failure. */ -struct edns_tags* edns_tags_create(void); +struct edns_strings* edns_strings_create(void); -/** Delete EDNS tags structure - * @param edns_tags: struct to delete +/** Delete EDNS strings structure + * @param edns_strings: struct to delete */ -void edns_tags_delete(struct edns_tags* edns_tags); +void edns_strings_delete(struct edns_strings* edns_strings); /** - * Add configured EDNS tags - * @param edns_tags: edns tags to apply config to - * @param config: struct containing EDNS tags configuration + * Add configured EDNS strings + * @param edns_strings: edns strings to apply config to + * @param config: struct containing EDNS strings configuration * @return 0 on error */ -int edns_tags_apply_cfg(struct edns_tags* edns_tags, +int edns_strings_apply_cfg(struct edns_strings* edns_strings, struct config_file* config); /** - * Find tag for address. - * @param tree: tree containing EDNS tags per address prefix. + * Find string for address. + * @param tree: tree containing EDNS strings per address prefix. * @param addr: address to use for tree lookup * @param addrlen: length of address * @return: matching tree node, NULL otherwise */ -struct edns_tag_addr* -edns_tag_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr, +struct edns_string_addr* +edns_string_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr, socklen_t addrlen); /** diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c index 7d15d1075..a9e9d3a03 100644 --- a/util/fptr_wlist.c +++ b/util/fptr_wlist.c @@ -229,6 +229,8 @@ fptr_whitelist_rbtree_cmp(int (*fptr) (const void *, const void *)) else if(fptr == &fwd_cmp) return 1; else if(fptr == &pending_cmp) return 1; else if(fptr == &serviced_cmp) return 1; + else if(fptr == &reuse_cmp) return 1; + else if(fptr == &reuse_id_cmp) return 1; else if(fptr == &name_tree_compare) return 1; else if(fptr == &order_lock_cmp) return 1; else if(fptr == &codeline_cmp) return 1; diff --git a/util/iana_ports.inc b/util/iana_ports.inc index fa25869d3..d9978f92e 100644 --- a/util/iana_ports.inc +++ b/util/iana_ports.inc @@ -5290,6 +5290,7 @@ 22005, 22273, 22305, +22333, 22335, 22343, 22347, diff --git a/util/module.h b/util/module.h index 1eed21300..7b833f8ad 100644 --- a/util/module.h +++ b/util/module.h @@ -520,8 +520,8 @@ struct module_env { struct edns_known_option* edns_known_options; /* Number of known edns options */ size_t edns_known_options_num; - /** EDNS client tag information */ - struct edns_tags* edns_tags; + /** EDNS client string information */ + struct edns_strings* edns_strings; /* Make every mesh state unique, do not aggregate mesh states. */ int unique_mesh; diff --git a/util/netevent.c b/util/netevent.c index 2428417fa..311a114ee 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -341,10 +341,15 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, if(sldns_buffer_remaining(packet) == 0) log_err("error: send empty UDP packet"); #endif - log_assert(addr && addrlen > 0); - sent = sendto(c->fd, (void*)sldns_buffer_begin(packet), - sldns_buffer_remaining(packet), 0, - addr, addrlen); + if(addr) { + log_assert(addr && addrlen > 0); + sent = sendto(c->fd, (void*)sldns_buffer_begin(packet), + sldns_buffer_remaining(packet), 0, + addr, addrlen); + } else { + sent = send(c->fd, (void*)sldns_buffer_begin(packet), + sldns_buffer_remaining(packet), 0); + } if(sent == -1) { /* try again and block, waiting for IO to complete, * we want to send the answer, and we will wait for @@ -574,6 +579,32 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, #endif /* AF_INET6 && IPV6_PKTINFO && HAVE_SENDMSG */ } +/** return true is UDP receive error needs to be logged */ +static int udp_recv_needs_log(int err) +{ + switch(err) { + case ECONNREFUSED: +# ifdef ENETUNREACH + case ENETUNREACH: +# endif +# ifdef EHOSTDOWN + case EHOSTDOWN: +# endif +# ifdef EHOSTUNREACH + case EHOSTUNREACH: +# endif +# ifdef ENETDOWN + case ENETDOWN: +# endif + if(verbosity >= VERB_ALGO) + return 1; + return 0; + default: + break; + } + return 1; +} + void comm_point_udp_ancil_callback(int fd, short event, void* arg) { @@ -616,7 +647,8 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg) msg.msg_flags = 0; rcv = recvmsg(fd, &msg, 0); if(rcv == -1) { - if(errno != EAGAIN && errno != EINTR) { + if(errno != EAGAIN && errno != EINTR + && udp_recv_needs_log(errno)) { log_err("recvmsg failed: %s", strerror(errno)); } return; @@ -697,7 +729,8 @@ comm_point_udp_callback(int fd, short event, void* arg) (struct sockaddr*)&rep.addr, &rep.addrlen); if(rcv == -1) { #ifndef USE_WINSOCK - if(errno != EAGAIN && errno != EINTR) + if(errno != EAGAIN && errno != EINTR + && udp_recv_needs_log(errno)) log_err("recvfrom %d failed: %s", fd, strerror(errno)); #else @@ -1050,6 +1083,8 @@ reclaim_tcp_handler(struct comm_point* c) comm_point_start_listening(c->tcp_parent, -1, -1); } } + c->tcp_more_read_again = NULL; + c->tcp_more_write_again = NULL; } /** do the callback when writing is done */ @@ -1057,16 +1092,27 @@ static void tcp_callback_writer(struct comm_point* c) { log_assert(c->type == comm_tcp); - sldns_buffer_clear(c->buffer); + if(!c->tcp_write_and_read) { + sldns_buffer_clear(c->buffer); + c->tcp_byte_count = 0; + } if(c->tcp_do_toggle_rw) c->tcp_is_reading = 1; - c->tcp_byte_count = 0; /* switch from listening(write) to listening(read) */ if(c->tcp_req_info) { tcp_req_info_handle_writedone(c->tcp_req_info); } else { comm_point_stop_listening(c); - comm_point_start_listening(c, -1, c->tcp_timeout_msec); + if(c->tcp_write_and_read) { + fptr_ok(fptr_whitelist_comm_point(c->callback)); + if( (*c->callback)(c, c->cb_arg, NETEVENT_PKT_WRITTEN, + &c->repinfo) ) { + comm_point_start_listening(c, -1, + c->tcp_timeout_msec); + } + } else { + comm_point_start_listening(c, -1, c->tcp_timeout_msec); + } } } @@ -1369,10 +1415,28 @@ ssl_handle_write(struct comm_point* c) } /* ignore return, if fails we may simply block */ (void)SSL_set_mode(c->ssl, (long)SSL_MODE_ENABLE_PARTIAL_WRITE); - if(c->tcp_byte_count < sizeof(uint16_t)) { - uint16_t len = htons(sldns_buffer_limit(c->buffer)); + if((c->tcp_write_and_read?c->tcp_write_byte_count:c->tcp_byte_count) < sizeof(uint16_t)) { + uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(c->buffer)); ERR_clear_error(); - if(sizeof(uint16_t)+sldns_buffer_remaining(c->buffer) < + if(c->tcp_write_and_read) { + if(c->tcp_write_pkt_len + 2 < LDNS_RR_BUF_SIZE) { + /* combine the tcp length and the query for + * write, this emulates writev */ + uint8_t buf[LDNS_RR_BUF_SIZE]; + memmove(buf, &len, sizeof(uint16_t)); + memmove(buf+sizeof(uint16_t), + c->tcp_write_pkt, + c->tcp_write_pkt_len); + r = SSL_write(c->ssl, + (void*)(buf+c->tcp_write_byte_count), + c->tcp_write_pkt_len + 2 - + c->tcp_write_byte_count); + } else { + r = SSL_write(c->ssl, + (void*)(((uint8_t*)&len)+c->tcp_write_byte_count), + (int)(sizeof(uint16_t)-c->tcp_write_byte_count)); + } + } else if(sizeof(uint16_t)+sldns_buffer_remaining(c->buffer) < LDNS_RR_BUF_SIZE) { /* combine the tcp length and the query for write, * this emulates writev */ @@ -1414,20 +1478,32 @@ ssl_handle_write(struct comm_point* c) log_crypto_err("could not SSL_write"); return 0; } - c->tcp_byte_count += r; - if(c->tcp_byte_count < sizeof(uint16_t)) - return 1; - sldns_buffer_set_position(c->buffer, c->tcp_byte_count - - sizeof(uint16_t)); - if(sldns_buffer_remaining(c->buffer) == 0) { + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + if(c->tcp_write_byte_count < sizeof(uint16_t)) + return 1; + } else { + c->tcp_byte_count += r; + if(c->tcp_byte_count < sizeof(uint16_t)) + return 1; + sldns_buffer_set_position(c->buffer, c->tcp_byte_count - + sizeof(uint16_t)); + } + if((!c->tcp_write_and_read && sldns_buffer_remaining(c->buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); return 1; } } - log_assert(sldns_buffer_remaining(c->buffer) > 0); + log_assert(c->tcp_write_and_read || sldns_buffer_remaining(c->buffer) > 0); + log_assert(!c->tcp_write_and_read || c->tcp_write_byte_count < c->tcp_write_pkt_len + 2); ERR_clear_error(); - r = SSL_write(c->ssl, (void*)sldns_buffer_current(c->buffer), - (int)sldns_buffer_remaining(c->buffer)); + if(c->tcp_write_and_read) { + r = SSL_write(c->ssl, (void*)(c->tcp_write_pkt + c->tcp_write_byte_count - 2), + (int)(c->tcp_write_pkt_len + 2 - c->tcp_write_byte_count)); + } else { + r = SSL_write(c->ssl, (void*)sldns_buffer_current(c->buffer), + (int)sldns_buffer_remaining(c->buffer)); + } if(r <= 0) { int want = SSL_get_error(c->ssl, r); if(want == SSL_ERROR_ZERO_RETURN) { @@ -1452,9 +1528,13 @@ ssl_handle_write(struct comm_point* c) log_crypto_err("could not SSL_write"); return 0; } - sldns_buffer_skip(c->buffer, (ssize_t)r); + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + } else { + sldns_buffer_skip(c->buffer, (ssize_t)r); + } - if(sldns_buffer_remaining(c->buffer) == 0) { + if((!c->tcp_write_and_read && sldns_buffer_remaining(c->buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); } return 1; @@ -1466,9 +1546,17 @@ ssl_handle_write(struct comm_point* c) /** handle ssl tcp connection with dns contents */ static int -ssl_handle_it(struct comm_point* c) +ssl_handle_it(struct comm_point* c, int is_write) { - if(c->tcp_is_reading) + /* handle case where renegotiation wants read during write call + * or write during read calls */ + if(is_write && c->ssl_shake_state == comm_ssl_shake_hs_write) + return ssl_handle_read(c); + else if(!is_write && c->ssl_shake_state == comm_ssl_shake_hs_read) + return ssl_handle_write(c); + /* handle read events for read operation and write events for a + * write operation */ + else if(!is_write) return ssl_handle_read(c); return ssl_handle_write(c); } @@ -1485,8 +1573,8 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok) ssize_t r; log_assert(c->type == comm_tcp || c->type == comm_local); if(c->ssl) - return ssl_handle_it(c); - if(!c->tcp_is_reading) + return ssl_handle_it(c, 0); + if(!c->tcp_is_reading && !c->tcp_write_and_read) return 0; log_assert(fd != -1); @@ -1589,10 +1677,10 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) #else buffer = c->buffer; #endif - if(c->tcp_is_reading && !c->ssl) + if(c->tcp_is_reading && !c->ssl && !c->tcp_write_and_read) return 0; log_assert(fd != -1); - if(c->tcp_byte_count == 0 && c->tcp_check_nb_connect) { + if(((!c->tcp_write_and_read && c->tcp_byte_count == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == 0)) && c->tcp_check_nb_connect) { /* check for pending error from nonblocking connect */ /* from Stevens, unix network programming, vol1, 3rd ed, p450*/ int error = 0; @@ -1633,7 +1721,7 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) } } if(c->ssl) - return ssl_handle_it(c); + return ssl_handle_it(c, 1); #ifdef USE_MSG_FASTOPEN /* Only try this on first use of a connection that uses tfo, @@ -1642,15 +1730,22 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) if(c->tcp_do_fastopen == 1) { /* this form of sendmsg() does both a connect() and send() so need to look for various flavours of error*/ - uint16_t len = htons(sldns_buffer_limit(buffer)); + uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(buffer)); struct msghdr msg; struct iovec iov[2]; c->tcp_do_fastopen = 0; memset(&msg, 0, sizeof(msg)); - iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count; - iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count; - iov[1].iov_base = sldns_buffer_begin(buffer); - iov[1].iov_len = sldns_buffer_limit(buffer); + if(c->tcp_write_and_read) { + iov[0].iov_base = (uint8_t*)&len + c->tcp_write_byte_count; + iov[0].iov_len = sizeof(uint16_t) - c->tcp_write_byte_count; + iov[1].iov_base = c->tcp_write_pkt; + iov[1].iov_len = c->tcp_write_pkt_len; + } else { + iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count; + iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count; + iov[1].iov_base = sldns_buffer_begin(buffer); + iov[1].iov_len = sldns_buffer_limit(buffer); + } log_assert(iov[0].iov_len > 0); msg.msg_name = &c->repinfo.addr; msg.msg_namelen = c->repinfo.addrlen; @@ -1696,12 +1791,18 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) } } else { - c->tcp_byte_count += r; - if(c->tcp_byte_count < sizeof(uint16_t)) - return 1; - sldns_buffer_set_position(buffer, c->tcp_byte_count - - sizeof(uint16_t)); - if(sldns_buffer_remaining(buffer) == 0) { + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + if(c->tcp_write_byte_count < sizeof(uint16_t)) + return 1; + } else { + c->tcp_byte_count += r; + if(c->tcp_byte_count < sizeof(uint16_t)) + return 1; + sldns_buffer_set_position(buffer, c->tcp_byte_count - + sizeof(uint16_t)); + } + if((!c->tcp_write_and_read && sldns_buffer_remaining(buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); return 1; } @@ -1709,19 +1810,31 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) } #endif /* USE_MSG_FASTOPEN */ - if(c->tcp_byte_count < sizeof(uint16_t)) { - uint16_t len = htons(sldns_buffer_limit(buffer)); + if((c->tcp_write_and_read?c->tcp_write_byte_count:c->tcp_byte_count) < sizeof(uint16_t)) { + uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(buffer)); #ifdef HAVE_WRITEV struct iovec iov[2]; - iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count; - iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count; - iov[1].iov_base = sldns_buffer_begin(buffer); - iov[1].iov_len = sldns_buffer_limit(buffer); + if(c->tcp_write_and_read) { + iov[0].iov_base = (uint8_t*)&len + c->tcp_write_byte_count; + iov[0].iov_len = sizeof(uint16_t) - c->tcp_write_byte_count; + iov[1].iov_base = c->tcp_write_pkt; + iov[1].iov_len = c->tcp_write_pkt_len; + } else { + iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count; + iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count; + iov[1].iov_base = sldns_buffer_begin(buffer); + iov[1].iov_len = sldns_buffer_limit(buffer); + } log_assert(iov[0].iov_len > 0); r = writev(fd, iov, 2); #else /* HAVE_WRITEV */ - r = send(fd, (void*)(((uint8_t*)&len)+c->tcp_byte_count), - sizeof(uint16_t)-c->tcp_byte_count, 0); + if(c->tcp_write_and_read) { + r = send(fd, (void*)(((uint8_t*)&len)+c->tcp_write_byte_count), + sizeof(uint16_t)-c->tcp_write_byte_count, 0); + } else { + r = send(fd, (void*)(((uint8_t*)&len)+c->tcp_byte_count), + sizeof(uint16_t)-c->tcp_byte_count, 0); + } #endif /* HAVE_WRITEV */ if(r == -1) { #ifndef USE_WINSOCK @@ -1760,19 +1873,31 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) #endif return 0; } - c->tcp_byte_count += r; - if(c->tcp_byte_count < sizeof(uint16_t)) - return 1; - sldns_buffer_set_position(buffer, c->tcp_byte_count - - sizeof(uint16_t)); - if(sldns_buffer_remaining(buffer) == 0) { + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + if(c->tcp_write_byte_count < sizeof(uint16_t)) + return 1; + } else { + c->tcp_byte_count += r; + if(c->tcp_byte_count < sizeof(uint16_t)) + return 1; + sldns_buffer_set_position(buffer, c->tcp_byte_count - + sizeof(uint16_t)); + } + if((!c->tcp_write_and_read && sldns_buffer_remaining(buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); return 1; } } - log_assert(sldns_buffer_remaining(buffer) > 0); - r = send(fd, (void*)sldns_buffer_current(buffer), - sldns_buffer_remaining(buffer), 0); + log_assert(c->tcp_write_and_read || sldns_buffer_remaining(buffer) > 0); + log_assert(!c->tcp_write_and_read || c->tcp_write_byte_count < c->tcp_write_pkt_len + 2); + if(c->tcp_write_and_read) { + r = send(fd, (void*)c->tcp_write_pkt + c->tcp_write_byte_count - 2, + c->tcp_write_pkt_len + 2 - c->tcp_write_byte_count, 0); + } else { + r = send(fd, (void*)sldns_buffer_current(buffer), + sldns_buffer_remaining(buffer), 0); + } if(r == -1) { #ifndef USE_WINSOCK if(errno == EINTR || errno == EAGAIN) @@ -1795,9 +1920,13 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) &c->repinfo.addr, c->repinfo.addrlen); return 0; } - sldns_buffer_skip(buffer, r); + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + } else { + sldns_buffer_skip(buffer, r); + } - if(sldns_buffer_remaining(buffer) == 0) { + if((!c->tcp_write_and_read && sldns_buffer_remaining(buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); } @@ -1827,6 +1956,54 @@ tcp_req_info_read_again(int fd, struct comm_point* c) } } +/** read again to drain buffers when there could be more to read */ +static void +tcp_more_read_again(int fd, struct comm_point* c) +{ + /* if the packet is done, but another one could be waiting on + * the connection, the callback signals this, and we try again */ + /* this continues until the read routines get EAGAIN or so, + * and thus does not call the callback, and the bool is 0 */ + int* moreread = c->tcp_more_read_again; + while(moreread && *moreread) { + *moreread = 0; + if(!comm_point_tcp_handle_read(fd, c, 0)) { + reclaim_tcp_handler(c); + if(!c->tcp_do_close) { + fptr_ok(fptr_whitelist_comm_point( + c->callback)); + (void)(*c->callback)(c, c->cb_arg, + NETEVENT_CLOSED, NULL); + } + return; + } + } +} + +/** write again to fill up when there could be more to write */ +static void +tcp_more_write_again(int fd, struct comm_point* c) +{ + /* if the packet is done, but another is waiting to be written, + * the callback signals it and we try again. */ + /* this continues until the write routines get EAGAIN or so, + * and thus does not call the callback, and the bool is 0 */ + int* morewrite = c->tcp_more_write_again; + while(morewrite && *morewrite) { + *morewrite = 0; + if(!comm_point_tcp_handle_write(fd, c)) { + reclaim_tcp_handler(c); + if(!c->tcp_do_close) { + fptr_ok(fptr_whitelist_comm_point( + c->callback)); + (void)(*c->callback)(c, c->cb_arg, + NETEVENT_CLOSED, NULL); + } + return; + } + } +} + void comm_point_tcp_handle_callback(int fd, short event, void* arg) { @@ -1847,7 +2024,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } return; @@ -1867,32 +2044,40 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) } if(event&UB_EV_READ) { int has_tcpq = (c->tcp_req_info != NULL); + int* moreread = c->tcp_more_read_again; if(!comm_point_tcp_handle_read(fd, c, 0)) { reclaim_tcp_handler(c); if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } + return; } if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again) tcp_req_info_read_again(fd, c); + if(moreread && *moreread) + tcp_more_read_again(fd, c); return; } if(event&UB_EV_WRITE) { int has_tcpq = (c->tcp_req_info != NULL); + int* morewrite = c->tcp_more_write_again; if(!comm_point_tcp_handle_write(fd, c)) { reclaim_tcp_handler(c); if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } + return; } if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again) tcp_req_info_read_again(fd, c); + if(morewrite && *morewrite) + tcp_more_write_again(fd, c); return; } log_err("Ignored event %d for tcphdl.", event); @@ -2882,7 +3067,7 @@ comm_point_http_handle_callback(int fd, short event, void* arg) if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } } @@ -2894,7 +3079,7 @@ comm_point_http_handle_callback(int fd, short event, void* arg) if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } } @@ -3626,6 +3811,7 @@ comm_point_close(struct comm_point* c) if(!c) return; if(c->fd != -1) { + verbose(5, "comm_point_close of %d: event_del", c->fd); if(ub_event_del(c->ev->ev) != 0) { log_err("could not event_del on close"); } @@ -3807,12 +3993,20 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec) } if(c->type == comm_tcp || c->type == comm_http) { ub_event_del_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE); - if(c->tcp_is_reading) + if(c->tcp_write_and_read) { + verbose(5, "startlistening %d mode rw", (newfd==-1?c->fd:newfd)); + ub_event_add_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE); + } else if(c->tcp_is_reading) { + verbose(5, "startlistening %d mode r", (newfd==-1?c->fd:newfd)); ub_event_add_bits(c->ev->ev, UB_EV_READ); - else ub_event_add_bits(c->ev->ev, UB_EV_WRITE); + } else { + verbose(5, "startlistening %d mode w", (newfd==-1?c->fd:newfd)); + ub_event_add_bits(c->ev->ev, UB_EV_WRITE); + } } if(newfd != -1) { - if(c->fd != -1) { + if(c->fd != -1 && c->fd != newfd) { + verbose(5, "cpsl close of fd %d for %d", c->fd, newfd); sock_close(c->fd); } c->fd = newfd; diff --git a/util/netevent.h b/util/netevent.h index 6986f881b..daa954b64 100644 --- a/util/netevent.h +++ b/util/netevent.h @@ -95,6 +95,9 @@ typedef int comm_point_callback_type(struct comm_point*, void*, int, #define NETEVENT_CAPSFAIL -3 /** to pass done transfer to callback function; http file is complete */ #define NETEVENT_DONE -4 +/** to pass write of the write packet is done to callback function + * used when tcp_write_and_read is enabled */ +#define NETEVENT_PKT_WRITTEN -5 /** timeout to slow accept calls when not possible, in msec. */ #define NETEVENT_SLOW_ACCEPT_TIME 2000 @@ -276,6 +279,44 @@ struct comm_point { and after read/write completes. No callback is done. */ int tcp_do_close; + /** flag that indicates the stream is both written and read from. */ + int tcp_write_and_read; + + /** byte count for written length over write channel, for when + * tcp_write_and_read is enabled. When tcp_write_and_read is enabled, + * this is the counter for writing, the one for reading is in the + * commpoint.buffer sldns buffer. The counter counts from 0 to + * 2+tcp_write_pkt_len, and includes the tcp length bytes. */ + size_t tcp_write_byte_count; + + /** packet to write currently over the write channel. for when + * tcp_write_and_read is enabled. When tcp_write_and_read is enabled, + * this is the buffer for the written packet, the commpoint.buffer + * sldns buffer is the buffer for the received packet. */ + uint8_t* tcp_write_pkt; + /** length of tcp_write_pkt in bytes */ + size_t tcp_write_pkt_len; + + /** if set try to read another packet again (over connection with + * multiple packets), once set, tries once, then zero again, + * so set it in the packet complete section. + * The pointer itself has to be set before the callback is invoked, + * when you set things up, and continue to exist also after the + * commpoint is closed and deleted in your callback. So that after + * the callback cleans up netevent can see what it has to do. + * Or leave NULL if it is not used at all. */ + int* tcp_more_read_again; + + /** if set try to write another packet (over connection with + * multiple packets), once set, tries once, then zero again, + * so set it in the packet complete section. + * The pointer itself has to be set before the callback is invoked, + * when you set things up, and continue to exist also after the + * commpoint is closed and deleted in your callback. So that after + * the callback cleans up netevent can see what it has to do. + * Or leave NULL if it is not used at all. */ + int* tcp_more_write_again; + /** if set, read/write completes: read/write state of tcp is toggled. buffer reset/bytecount reset. @@ -589,7 +630,8 @@ void comm_point_drop_reply(struct comm_reply* repinfo); * Send an udp message over a commpoint. * @param c: commpoint to send it from. * @param packet: what to send. - * @param addr: where to send it to. + * @param addr: where to send it to. If NULL, send is performed, + * for connected sockets, to the connected address. * @param addrlen: length of addr. * @return: false on a failure. */ diff --git a/util/regional.h b/util/regional.h index eeb7de7b5..b439897d5 100644 --- a/util/regional.h +++ b/util/regional.h @@ -76,6 +76,9 @@ struct regional char* data; /** threshold for outside of chunk allocations */ size_t large_object_size; + /** padding for sizeof8 alignment of sizeof(struct regional) + * for 32bit systems */ + size_t padding; }; /**