diff --git a/configure b/configure index ae72d891e..a976189e5 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.10.2. +# Generated by GNU Autoconf 2.69 for unbound 1.11.1. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.10.2' -PACKAGE_STRING='unbound 1.10.2' +PACKAGE_VERSION='1.11.1' +PACKAGE_STRING='unbound 1.11.1' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -1458,7 +1458,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.10.2 to adapt to many kinds of systems. +\`configure' configures unbound 1.11.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1523,7 +1523,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.10.2:";; + short | recursive ) echo "Configuration of unbound 1.11.1:";; esac cat <<\_ACEOF @@ -1750,7 +1750,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.10.2 +unbound configure 1.11.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2459,7 +2459,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.10.2, which was +It was created by unbound $as_me 1.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2809,13 +2809,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu UNBOUND_VERSION_MAJOR=1 -UNBOUND_VERSION_MINOR=10 +UNBOUND_VERSION_MINOR=11 -UNBOUND_VERSION_MICRO=2 +UNBOUND_VERSION_MICRO=1 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=9 +LIBUNBOUND_REVISION=10 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2891,7 +2891,8 @@ LIBUNBOUND_AGE=1 # 1.9.6 had 9:6:1 # 1.10.0 had 9:7:1 # 1.10.1 had 9:8:1 -# 1.10.2 had 9:9:1 +# 1.11.0 had 9:9:1 +# 1.11.1 had 9:10:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -21619,7 +21620,7 @@ _ACEOF -version=1.10.2 +version=1.11.1 date=`date +'%b %e, %Y'` @@ -22138,7 +22139,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.10.2, which was +This file was extended by unbound $as_me 1.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22204,7 +22205,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.10.2 +unbound config.status 1.11.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5c373d9d8..22319b5a9 100644 --- a/configure.ac +++ b/configure.ac @@ -10,15 +10,15 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) -m4_define([VERSION_MINOR],[10]) -m4_define([VERSION_MICRO],[2]) +m4_define([VERSION_MINOR],[11]) +m4_define([VERSION_MICRO],[1]) AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=9 +LIBUNBOUND_REVISION=10 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -94,7 +94,8 @@ LIBUNBOUND_AGE=1 # 1.9.6 had 9:6:1 # 1.10.0 had 9:7:1 # 1.10.1 had 9:8:1 -# 1.10.2 had 9:9:1 +# 1.11.0 had 9:9:1 +# 1.11.1 had 9:10: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/fastrpz.patch b/contrib/fastrpz.patch index aacd5ab82..5b3c18a7c 100644 --- a/contrib/fastrpz.patch +++ b/contrib/fastrpz.patch @@ -2,7 +2,7 @@ Description: based on the included patch contrib/fastrpz.patch Author: fastrpz@farsightsecurity.com --- diff --git a/Makefile.in b/Makefile.in -index a20058cc..495779cc 100644 +index bac212df..4824927f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,6 +23,8 @@ CHECKLOCK_SRC=testcode/checklocks.c @@ -13,8 +13,8 @@ index a20058cc..495779cc 100644 +FASTRPZ_OBJ=@FASTRPZ_OBJ@ DNSCRYPT_SRC=@DNSCRYPT_SRC@ DNSCRYPT_OBJ=@DNSCRYPT_OBJ@ - WITH_PYTHONMODULE=@WITH_PYTHONMODULE@ -@@ -127,7 +129,7 @@ validator/val_sigcrypt.c validator/val_utils.c dns64/dns64.c \ + WITH_DYNLIBMODULE=@WITH_DYNLIBMODULE@ +@@ -134,7 +136,7 @@ validator/val_sigcrypt.c validator/val_utils.c dns64/dns64.c \ edns-subnet/edns-subnet.c edns-subnet/subnetmod.c \ edns-subnet/addrtree.c edns-subnet/subnet-whitelist.c \ cachedb/cachedb.c cachedb/redis.c respip/respip.c $(CHECKLOCK_SRC) \ @@ -23,16 +23,16 @@ index a20058cc..495779cc 100644 COMMON_OBJ_WITHOUT_NETCALL=dns.lo infra.lo rrset.lo dname.lo msgencode.lo \ as112.lo msgparse.lo msgreply.lo packed_rrset.lo iterator.lo iter_delegpt.lo \ iter_donotq.lo iter_fwd.lo iter_hints.lo iter_priv.lo iter_resptype.lo \ -@@ -140,7 +142,7 @@ autotrust.lo val_anchor.lo rpz.lo \ +@@ -147,7 +149,7 @@ autotrust.lo val_anchor.lo rpz.lo \ validator.lo val_kcache.lo val_kentry.lo val_neg.lo val_nsec3.lo val_nsec.lo \ val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo cachedb.lo redis.lo authzone.lo \ $(SUBNET_OBJ) $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ) $(DNSTAP_OBJ) $(DNSCRYPT_OBJ) \ --$(IPSECMOD_OBJ) $(IPSET_OBJ) respip.lo -+$(FASTRPZ_OBJ) $(IPSECMOD_OBJ) $(IPSET_OBJ) respip.lo +-$(IPSECMOD_OBJ) $(IPSET_OBJ) $(DYNLIBMOD_OBJ) respip.lo ++$(FASTRPZ_OBJ) $(IPSECMOD_OBJ) $(IPSET_OBJ) $(DYNLIBMOD_OBJ) respip.lo COMMON_OBJ_WITHOUT_UB_EVENT=$(COMMON_OBJ_WITHOUT_NETCALL) netevent.lo listen_dnsport.lo \ outside_network.lo COMMON_OBJ=$(COMMON_OBJ_WITHOUT_UB_EVENT) ub_event.lo -@@ -410,6 +412,11 @@ dnscrypt.lo dnscrypt.o: $(srcdir)/dnscrypt/dnscrypt.c config.h \ +@@ -428,6 +430,11 @@ dnscrypt.lo dnscrypt.o: $(srcdir)/dnscrypt/dnscrypt.c config.h \ $(srcdir)/util/config_file.h $(srcdir)/util/log.h \ $(srcdir)/util/netevent.h @@ -45,10 +45,10 @@ index a20058cc..495779cc 100644 pythonmod.lo pythonmod.o: $(srcdir)/pythonmod/pythonmod.c config.h \ pythonmod/interface.h \ diff --git a/config.h.in b/config.h.in -index 78d47fed..e33073e4 100644 +index f7a4095e..d5a4fa01 100644 --- a/config.h.in +++ b/config.h.in -@@ -1345,4 +1345,11 @@ void *unbound_stat_realloc_log(void *ptr, size_t size, const char* file, +@@ -1364,4 +1364,11 @@ void *unbound_stat_realloc_log(void *ptr, size_t size, const char* file, /** the version of unbound-control that this software implements */ #define UNBOUND_CONTROL_VERSION 1 @@ -62,7 +62,7 @@ index 78d47fed..e33073e4 100644 +/** turn on fastrpz response policy zones */ +#undef ENABLE_FASTRPZ diff --git a/configure.ac b/configure.ac -index 2b91dd3c..e6063d17 100644 +index 5c373d9d..e45abd89 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,7 @@ sinclude(ax_pthread.m4) @@ -73,10 +73,10 @@ index 2b91dd3c..e6063d17 100644 sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing -@@ -1778,6 +1779,9 @@ case "$enable_ipset" in - ;; +@@ -1819,6 +1820,9 @@ case "$enable_explicit_port_randomisation" in esac + +# check for Fastrpz with fastrpz/rpz.m4 +ck_FASTRPZ + @@ -84,7 +84,7 @@ index 2b91dd3c..e6063d17 100644 # on openBSD, the implicit rule make $< work. # on Solaris, it does not work ($? is changed sources, $^ lists dependencies). diff --git a/daemon/daemon.c b/daemon/daemon.c -index 8b0fc348..7ffb9221 100644 +index 5d427925..f89f1437 100644 --- a/daemon/daemon.c +++ b/daemon/daemon.c @@ -91,6 +91,9 @@ @@ -97,8 +97,8 @@ index 8b0fc348..7ffb9221 100644 #ifdef HAVE_SYSTEMD #include -@@ -458,6 +461,14 @@ daemon_create_workers(struct daemon* daemon) - dt_apply_cfg(daemon->dtenv, daemon->cfg); +@@ -456,6 +459,14 @@ daemon_create_workers(struct daemon* daemon) + fatal_exit("dt_create failed"); #else fatal_exit("dnstap enabled in config but not built with dnstap support"); +#endif @@ -112,7 +112,7 @@ index 8b0fc348..7ffb9221 100644 #endif } for(i=0; inum; i++) { -@@ -731,6 +742,9 @@ daemon_cleanup(struct daemon* daemon) +@@ -729,6 +740,9 @@ daemon_cleanup(struct daemon* daemon) #ifdef USE_DNSCRYPT dnsc_delete(daemon->dnscenv); daemon->dnscenv = NULL; @@ -139,7 +139,7 @@ index 3effbafb..4d4c34da 100644 /** diff --git a/daemon/worker.c b/daemon/worker.c -index eb7fdf2f..1982228d 100644 +index 23e3244c..b63d49b7 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -76,6 +76,9 @@ @@ -152,7 +152,7 @@ index eb7fdf2f..1982228d 100644 #include "sldns/wire2str.h" #include "util/shm_side/shm_main.h" #include "dnscrypt/dnscrypt.h" -@@ -534,8 +537,27 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo, +@@ -535,8 +538,27 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo, /* not secure */ secure = 0; break; @@ -180,7 +180,7 @@ index eb7fdf2f..1982228d 100644 /* return this delegation from the cache */ edns_bak = *edns; edns->edns_version = EDNS_ADVERTISED_VERSION; -@@ -710,6 +732,23 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo, +@@ -711,6 +733,23 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo, *is_secure_answer = 0; } } else *is_secure_answer = 0; @@ -204,7 +204,7 @@ index eb7fdf2f..1982228d 100644 edns_bak = *edns; edns->edns_version = EDNS_ADVERTISED_VERSION; -@@ -1435,6 +1474,15 @@ worker_handle_request(struct comm_point* c, void* arg, int error, +@@ -1436,6 +1475,15 @@ worker_handle_request(struct comm_point* c, void* arg, int error, log_addr(VERB_ALGO, "refused nonrec (cache snoop) query from", &repinfo->addr, repinfo->addrlen); goto send_reply; @@ -220,7 +220,7 @@ index eb7fdf2f..1982228d 100644 } /* If we've found a local alias, replace the qname with the alias -@@ -1485,12 +1533,21 @@ lookup_cache: +@@ -1486,12 +1534,21 @@ lookup_cache: h = query_info_hash(lookup_qinfo, sldns_buffer_read_u16_at(c->buffer, 2)); if((e=slabhash_lookup(worker->env.msg_cache, h, lookup_qinfo, 0))) { /* answer from cache - we have acquired a readlock on it */ @@ -244,7 +244,7 @@ index eb7fdf2f..1982228d 100644 /* prefetch it if the prefetch TTL expired. * Note that if there is more than one pass * its qname must be that used for cache -@@ -1547,11 +1604,19 @@ lookup_cache: +@@ -1548,11 +1605,19 @@ lookup_cache: lock_rw_unlock(&e->lock); } if(!LDNS_RD_WIRE(sldns_buffer_begin(c->buffer))) { @@ -267,10 +267,10 @@ index eb7fdf2f..1982228d 100644 } verbose(VERB_ALGO, "answer norec from cache -- " diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in -index 38c2d298..3b07f392 100644 +index cd43f04e..b92a1af8 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in -@@ -1828,6 +1828,81 @@ List domain for which the AAAA records are ignored and the A record is +@@ -1878,6 +1878,81 @@ List domain for which the AAAA records are ignored and the A record is used by dns64 processing instead. Can be entered multiple times, list a new domain for which it applies, one per line. Applies also to names underneath the name given. @@ -2888,7 +2888,7 @@ index 00000000..21235355 + fi +]) diff --git a/iterator/iterator.c b/iterator/iterator.c -index 1e0113a8..2fcbf547 100644 +index 23b07ea9..c3d31a33 100644 --- a/iterator/iterator.c +++ b/iterator/iterator.c @@ -68,6 +68,9 @@ @@ -2901,7 +2901,7 @@ index 1e0113a8..2fcbf547 100644 /* in msec */ int UNKNOWN_SERVER_NICENESS = 376; -@@ -555,6 +558,23 @@ handle_cname_response(struct module_qstate* qstate, struct iter_qstate* iq, +@@ -563,6 +566,23 @@ handle_cname_response(struct module_qstate* qstate, struct iter_qstate* iq, if(ntohs(r->rk.type) == LDNS_RR_TYPE_CNAME && query_dname_compare(*mname, r->rk.dname) == 0 && !iter_find_rrset_in_prepend_answer(iq, r)) { @@ -2925,7 +2925,7 @@ index 1e0113a8..2fcbf547 100644 /* Add this relevant CNAME rrset to the prepend list.*/ if(!iter_add_prepend_answer(qstate, iq, r)) return 0; -@@ -563,6 +583,9 @@ handle_cname_response(struct module_qstate* qstate, struct iter_qstate* iq, +@@ -571,6 +591,9 @@ handle_cname_response(struct module_qstate* qstate, struct iter_qstate* iq, /* Other rrsets in the section are ignored. */ } @@ -2935,7 +2935,7 @@ index 1e0113a8..2fcbf547 100644 /* add authority rrsets to authority prepend, for wildcarded CNAMEs */ for(i=msg->rep->an_numrrsets; irep->an_numrrsets + msg->rep->ns_numrrsets; i++) { -@@ -1199,6 +1222,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq, +@@ -1231,6 +1254,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq, uint8_t* delname; size_t delnamelen; struct dns_msg* msg = NULL; @@ -2943,7 +2943,7 @@ index 1e0113a8..2fcbf547 100644 log_query_info(VERB_DETAIL, "resolving", &qstate->qinfo); /* check effort */ -@@ -1285,8 +1309,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq, +@@ -1317,8 +1341,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq, } if(msg) { /* handle positive cache response */ @@ -2953,7 +2953,7 @@ index 1e0113a8..2fcbf547 100644 if(verbosity >= VERB_ALGO) { log_dns_msg("msg from cache lookup", &msg->qinfo, msg->rep); -@@ -1294,7 +1317,22 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq, +@@ -1326,7 +1349,22 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq, (int)msg->rep->ttl, (int)msg->rep->prefetch_ttl); } @@ -2976,7 +2976,7 @@ index 1e0113a8..2fcbf547 100644 if(type == RESPONSE_TYPE_CNAME) { uint8_t* sname = 0; size_t slen = 0; -@@ -2718,6 +2756,62 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq, +@@ -2801,6 +2839,62 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq, sock_list_insert(&qstate->reply_origin, &qstate->reply->addr, qstate->reply->addrlen, qstate->region); @@ -3039,7 +3039,7 @@ index 1e0113a8..2fcbf547 100644 if(iq->minimisation_state != DONOT_MINIMISE_STATE && !(iq->chase_flags & BIT_RD)) { if(FLAGS_GET_RCODE(iq->response->rep->flags) != -@@ -3471,12 +3565,44 @@ processFinished(struct module_qstate* qstate, struct iter_qstate* iq, +@@ -3563,12 +3657,44 @@ processFinished(struct module_qstate* qstate, struct iter_qstate* iq, * but only if we did recursion. The nonrecursion referral * from cache does not need to be stored in the msg cache. */ if(!qstate->no_cache_store && qstate->query_flags&BIT_RD) { @@ -3085,10 +3085,10 @@ index 1e0113a8..2fcbf547 100644 qstate->return_msg = iq->response; return 0; diff --git a/iterator/iterator.h b/iterator/iterator.h -index a2f1b570..e1e4a738 100644 +index 342ac207..49b0ecdd 100644 --- a/iterator/iterator.h +++ b/iterator/iterator.h -@@ -386,6 +386,16 @@ struct iter_qstate { +@@ -396,6 +396,16 @@ struct iter_qstate { */ int minimise_count; @@ -3104,12 +3104,12 @@ index a2f1b570..e1e4a738 100644 + /** * Count number of time-outs. Used to prevent resolving failures when - * the QNAME minimisation QTYPE is blocked. */ + * the QNAME minimisation QTYPE is blocked. Used to determine if diff --git a/services/cache/dns.c b/services/cache/dns.c -index 2a5bca4a..6de8863a 100644 +index 7b6e142c..6d7449f5 100644 --- a/services/cache/dns.c +++ b/services/cache/dns.c -@@ -967,6 +967,14 @@ dns_cache_store(struct module_env* env, struct query_info* msgqinf, +@@ -969,6 +969,14 @@ dns_cache_store(struct module_env* env, struct query_info* msgqinf, struct regional* region, uint32_t flags) { struct reply_info* rep = NULL; @@ -3125,7 +3125,7 @@ index 2a5bca4a..6de8863a 100644 rep = reply_info_copy(msgrep, env->alloc, NULL); if(!rep) diff --git a/services/mesh.c b/services/mesh.c -index 9114ef4c..3dc518e5 100644 +index 4b0c5db4..eb9cfa5b 100644 --- a/services/mesh.c +++ b/services/mesh.c @@ -61,6 +61,9 @@ @@ -3138,7 +3138,7 @@ index 9114ef4c..3dc518e5 100644 #include "respip/respip.h" #include "services/listen_dnsport.h" -@@ -1195,6 +1198,13 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, +@@ -1207,6 +1210,13 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, else secure = 0; if(!rep && rcode == LDNS_RCODE_NOERROR) rcode = LDNS_RCODE_SERVFAIL; @@ -3152,7 +3152,7 @@ index 9114ef4c..3dc518e5 100644 /* send the reply */ /* We don't reuse the encoded answer if either the previous or current * response has a local alias. We could compare the alias records -@@ -1415,6 +1425,7 @@ struct mesh_state* mesh_area_find(struct mesh_area* mesh, +@@ -1434,6 +1444,7 @@ struct mesh_state* mesh_area_find(struct mesh_area* mesh, key.s.is_valrec = valrec; key.s.qinfo = *qinfo; key.s.query_flags = qflags; @@ -3160,7 +3160,7 @@ index 9114ef4c..3dc518e5 100644 /* We are searching for a similar mesh state when we DO want to * aggregate the state. Thus unique is set to NULL. (default when we * desire aggregation).*/ -@@ -1461,6 +1472,10 @@ int mesh_state_add_reply(struct mesh_state* s, struct edns_data* edns, +@@ -1480,6 +1491,10 @@ int mesh_state_add_reply(struct mesh_state* s, struct edns_data* edns, if(!r) return 0; r->query_reply = *rep; @@ -3172,11 +3172,11 @@ index 9114ef4c..3dc518e5 100644 if(edns->opt_list) { r->edns.opt_list = edns_opt_copy_region(edns->opt_list, diff --git a/util/config_file.c b/util/config_file.c -index 52ca5a18..0660248f 100644 +index 0e9ee471..a5fd72e0 100644 --- a/util/config_file.c +++ b/util/config_file.c -@@ -1460,6 +1460,8 @@ config_delete(struct config_file* cfg) - free(cfg->dnstap_socket_path); +@@ -1495,6 +1495,8 @@ config_delete(struct config_file* cfg) + free(cfg->dnstap_tls_client_cert_file); free(cfg->dnstap_identity); free(cfg->dnstap_version); + if (cfg->rpz_cstr) @@ -3185,10 +3185,10 @@ index 52ca5a18..0660248f 100644 config_deldblstrlist(cfg->ratelimit_below_domain); config_delstrlist(cfg->python_script); diff --git a/util/config_file.h b/util/config_file.h -index 8739ca2a..a2dcf215 100644 +index 66e5025d..504f4f92 100644 --- a/util/config_file.h +++ b/util/config_file.h -@@ -499,6 +499,11 @@ struct config_file { +@@ -522,6 +522,11 @@ struct config_file { /** true to disable DNSSEC lameness check in iterator */ int disable_dnssec_lame_check; @@ -3201,10 +3201,10 @@ index 8739ca2a..a2dcf215 100644 int ip_ratelimit; /** number of slabs for ip_ratelimit cache */ diff --git a/util/configlexer.lex b/util/configlexer.lex -index deedffa5..301458a3 100644 +index 83cea4b9..9a7feea4 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex -@@ -446,6 +446,10 @@ dnstap-log-forwarder-query-messages{COLON} { +@@ -467,6 +467,10 @@ dnstap-log-forwarder-query-messages{COLON} { YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } dnstap-log-forwarder-response-messages{COLON} { YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } @@ -3216,18 +3216,18 @@ index deedffa5..301458a3 100644 ip-ratelimit{COLON} { YDVAR(1, VAR_IP_RATELIMIT) } ratelimit{COLON} { YDVAR(1, VAR_RATELIMIT) } diff --git a/util/configparser.y b/util/configparser.y -index d471babe..cb6b1d63 100644 +index fe600a99..ce43390f 100644 --- a/util/configparser.y +++ b/util/configparser.y -@@ -125,6 +125,7 @@ extern struct config_parser_state* cfg_parser; +@@ -128,6 +128,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES %token VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES %token VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES +%token VAR_RPZ VAR_RPZ_ENABLE VAR_RPZ_ZONE VAR_RPZ_OPTION %token VAR_RESPONSE_IP_TAG VAR_RESPONSE_IP VAR_RESPONSE_IP_DATA %token VAR_HARDEN_ALGO_DOWNGRADE VAR_IP_TRANSPARENT - %token VAR_DISABLE_DNSSEC_LAME_CHECK -@@ -173,7 +174,7 @@ extern struct config_parser_state* cfg_parser; + %token VAR_IP_DSCP +@@ -179,7 +180,7 @@ extern struct config_parser_state* cfg_parser; %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -3236,7 +3236,7 @@ index d471babe..cb6b1d63 100644 forwardstart contents_forward | pythonstart contents_py | rcstart contents_rc | dtstart contents_dt | viewstart contents_view | dnscstart contents_dnsc | cachedbstart contents_cachedb | -@@ -2837,6 +2838,50 @@ dt_dnstap_log_forwarder_response_messages: VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MES +@@ -2939,6 +2940,50 @@ dt_dnstap_log_forwarder_response_messages: VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MES free($2); } ; @@ -3384,7 +3384,7 @@ index 729877ba..ccd1a0c2 100644 /** diff --git a/util/netevent.c b/util/netevent.c -index 9fe5da2d..037e70d1 100644 +index 3e7a433e..f20d806f 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -57,6 +57,9 @@ @@ -3397,7 +3397,7 @@ index 9fe5da2d..037e70d1 100644 /* -------- Start of local definitions -------- */ /** if CMSG_ALIGN is not defined on this platform, a workaround */ -@@ -590,6 +593,9 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg) +@@ -596,6 +599,9 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg) struct cmsghdr* cmsg; #endif /* S_SPLINT_S */ @@ -3407,7 +3407,7 @@ index 9fe5da2d..037e70d1 100644 rep.c = (struct comm_point*)arg; log_assert(rep.c->type == comm_udp); -@@ -679,6 +685,9 @@ comm_point_udp_callback(int fd, short event, void* arg) +@@ -685,6 +691,9 @@ comm_point_udp_callback(int fd, short event, void* arg) int i; struct sldns_buffer *buffer; @@ -3417,7 +3417,7 @@ index 9fe5da2d..037e70d1 100644 rep.c = (struct comm_point*)arg; log_assert(rep.c->type == comm_udp); -@@ -722,6 +731,9 @@ comm_point_udp_callback(int fd, short event, void* arg) +@@ -728,6 +737,9 @@ comm_point_udp_callback(int fd, short event, void* arg) (void)comm_point_send_udp_msg(rep.c, buffer, (struct sockaddr*)&rep.addr, rep.addrlen); } @@ -3427,7 +3427,7 @@ index 9fe5da2d..037e70d1 100644 if(!rep.c || rep.c->fd != fd) /* commpoint closed to -1 or reused for another UDP port. Note rep.c cannot be reused with TCP fd. */ break; -@@ -3192,6 +3204,9 @@ comm_point_send_reply(struct comm_reply *repinfo) +@@ -3175,6 +3187,9 @@ comm_point_send_reply(struct comm_reply *repinfo) repinfo->c->tcp_timeout_msec); } } @@ -3437,7 +3437,7 @@ index 9fe5da2d..037e70d1 100644 } void -@@ -3201,6 +3216,9 @@ comm_point_drop_reply(struct comm_reply* repinfo) +@@ -3184,6 +3199,9 @@ comm_point_drop_reply(struct comm_reply* repinfo) return; log_assert(repinfo->c); log_assert(repinfo->c->type != comm_tcp_accept); @@ -3447,7 +3447,7 @@ index 9fe5da2d..037e70d1 100644 if(repinfo->c->type == comm_udp) return; if(repinfo->c->tcp_req_info) -@@ -3222,6 +3240,9 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec) +@@ -3205,6 +3223,9 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec) { verbose(VERB_ALGO, "comm point start listening %d (%d msec)", c->fd==-1?newfd:c->fd, msec); @@ -3458,7 +3458,7 @@ index 9fe5da2d..037e70d1 100644 /* no use to start listening no free slots. */ return; diff --git a/util/netevent.h b/util/netevent.h -index d80c72b3..0233292f 100644 +index bb2cd1e5..666067e8 100644 --- a/util/netevent.h +++ b/util/netevent.h @@ -120,6 +120,10 @@ struct comm_reply { diff --git a/contrib/unbound_munin_ b/contrib/unbound_munin_ index 2839cd8b5..defca291c 100755 --- a/contrib/unbound_munin_ +++ b/contrib/unbound_munin_ @@ -174,11 +174,11 @@ get_state ( ) { if test "$1" = "autoconf" ; then if test ! -f $conf; then echo no "($conf does not exist)" - exit 1 + exit 0 fi if test ! -d `dirname $state`; then echo no "(`dirname $state` directory does not exist)" - exit 1 + exit 0 fi echo yes exit 0 diff --git a/daemon/unbound.c b/daemon/unbound.c index ceb3da6f5..3f96603c4 100644 --- a/daemon/unbound.c +++ b/daemon/unbound.c @@ -534,6 +534,8 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode, LOGIN_SETALL & ~LOGIN_SETUSER & ~LOGIN_SETGROUP) != 0) log_warn("unable to setusercontext %s: %s", cfg->username, strerror(errno)); +#else + (void)pwd; #endif /* HAVE_SETUSERCONTEXT */ } #endif /* HAVE_GETPWNAM */ diff --git a/dnstap/dnstap_fstrm.c b/dnstap/dnstap_fstrm.c index cce16e2e4..289e78bdf 100644 --- a/dnstap/dnstap_fstrm.c +++ b/dnstap/dnstap_fstrm.c @@ -92,6 +92,34 @@ void* fstrm_create_control_frame_stop(size_t* len) return control; } +void* fstrm_create_control_frame_ready(char* contenttype, size_t* len) +{ + uint32_t* control; + size_t n; + /* start bidirectional stream: + * 4 bytes 0 escape + * 4 bytes bigendian length of frame + * 4 bytes bigendian type READY + * 4 bytes bigendian frame option content type + * 4 bytes bigendian length of string + * string of content type. + */ + /* len includes the escape and framelength */ + n = 4+4+4+4+4+strlen(contenttype); + control = malloc(n); + if(!control) { + return NULL; + } + control[0] = 0; + control[1] = htonl(4+4+4+strlen(contenttype)); + control[2] = htonl(FSTRM_CONTROL_FRAME_READY); + control[3] = htonl(FSTRM_CONTROL_FIELD_TYPE_CONTENT_TYPE); + control[4] = htonl(strlen(contenttype)); + memmove(&control[5], contenttype, strlen(contenttype)); + *len = n; + return control; +} + void* fstrm_create_control_frame_accept(char* contenttype, size_t* len) { uint32_t* control; diff --git a/dnstap/dnstap_fstrm.h b/dnstap/dnstap_fstrm.h index f0cf93628..8b37d5f9e 100644 --- a/dnstap/dnstap_fstrm.h +++ b/dnstap/dnstap_fstrm.h @@ -127,6 +127,21 @@ */ void* fstrm_create_control_frame_start(char* contenttype, size_t* len); +/** + * This creates an FSTRM control frame of type READY. + * @param contenttype: a zero delimited string with the content type. + * eg. use the constant DNSTAP_CONTENT_TYPE, which is defined as + * "protobuf:dnstap.Dnstap", for a dnstap frame stream. + * @param len: if a buffer is returned this is the length of that buffer. + * @return NULL on malloc failure. Returns a malloced buffer with the + * protocol message. The buffer starts with the 4 bytes of 0 that indicate + * a control frame. The buffer should be sent without preceding it with + * the 'len' variable (like data frames are), but straight the content of the + * buffer, because the lengths are included in the buffer. This is so that + * the zero control indicator can be included before the control frame length. + */ +void* fstrm_create_control_frame_ready(char* contenttype, size_t* len); + /** * This creates an FSTRM control frame of type STOP. * @param len: if a buffer is returned this is the length of that buffer. diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c index 4081a6372..dda3ef1ff 100644 --- a/dnstap/dtstream.c +++ b/dnstap/dtstream.c @@ -48,6 +48,7 @@ #include "util/ub_event.h" #include "util/net_help.h" #include "services/outside_network.h" +#include "sldns/sbuffer.h" #ifdef HAVE_SYS_UN_H #include #endif @@ -68,6 +69,9 @@ /** the msec to wait for reconnect slow, to stop busy spinning on reconnect */ #define DTIO_RECONNECT_TIMEOUT_SLOW 1000 +/** maximum length of received frame */ +#define DTIO_RECV_FRAME_MAX_LEN 1000 + struct stop_flush_info; /** DTIO command channel commands */ enum { @@ -85,9 +89,13 @@ static int dtio_add_output_event_write(struct dt_io_thread* dtio); static void dtio_reconnect_enable(struct dt_io_thread* dtio); /** stop from stop_flush event loop */ static void dtio_stop_flush_exit(struct stop_flush_info* info); +/** setup a start control message */ +static int dtio_control_start_send(struct dt_io_thread* dtio); #ifdef HAVE_SSL /** enable briefly waiting for a read event, for SSL negotiation */ static int dtio_enable_brief_read(struct dt_io_thread* dtio); +/** enable briefly waiting for a write event, for SSL negotiation */ +static int dtio_enable_brief_write(struct dt_io_thread* dtio); #endif struct dt_msg_queue* @@ -261,6 +269,7 @@ int dt_io_thread_apply_cfg(struct dt_io_thread* dtio, struct config_file *cfg) } else { dtio->upstream_is_unix = 1; } + dtio->is_bidirectional = cfg->dnstap_bidirectional; if(dtio->upstream_is_unix) { if(!cfg->dnstap_socket_path || @@ -551,6 +560,20 @@ static void dtio_cur_msg_free(struct dt_io_thread* dtio) dtio->cur_msg_len_done = 0; } +/** delete the buffer and counters used to read frame */ +static void dtio_read_frame_free(struct dt_frame_read_buf* rb) +{ + if(rb->buf) { + free(rb->buf); + rb->buf = NULL; + } + rb->buf_count = 0; + rb->buf_cap = 0; + rb->frame_len = 0; + rb->frame_len_done = 0; + rb->control_frame = 0; +} + /** del the output file descriptor event for listening */ static void dtio_del_output_event(struct dt_io_thread* dtio) { @@ -594,6 +617,11 @@ static void dtio_close_output(struct dt_io_thread* dtio) if(dtio->cur_msg) { dtio_cur_msg_free(dtio); } + + dtio->ready_frame_sent = 0; + dtio->accept_frame_received = 0; + dtio_read_frame_free(&dtio->read_frame); + dtio_reconnect_enable(dtio); } @@ -855,6 +883,94 @@ static int dtio_write_more(struct dt_io_thread* dtio) return 1; } +/** Receive bytes from dtio->fd, store in buffer. Returns 0: closed, + * -1: continue, >0: number of bytes read into buffer */ +static ssize_t receive_bytes(struct dt_io_thread* dtio, void* buf, size_t len) { + ssize_t r; + r = recv(dtio->fd, (void*)buf, len, 0); + if(r == -1) { + char* to = dtio->socket_path; + if(!to) to = dtio->ip_str; + if(!to) to = ""; +#ifndef USE_WINSOCK + if(errno == EINTR || errno == EAGAIN) + return -1; /* try later */ +#else + if(WSAGetLastError() == WSAEINPROGRESS) { + return -1; /* try later */ + } else if(WSAGetLastError() == WSAEWOULDBLOCK) { + ub_winsock_tcp_wouldblock( + (dtio->stop_flush_event? + dtio->stop_flush_event:dtio->event), + UB_EV_READ); + return -1; /* try later */ + } +#endif + if(dtio->reconnect_timeout > DTIO_RECONNECT_TIMEOUT_MIN && + verbosity < 4) + return 0; /* no log retries on low verbosity */ + log_err("dnstap io: output closed, recv %s: %s", to, + strerror(errno)); + /* and close below */ + return 0; + } + if(r == 0) { + if(dtio->reconnect_timeout > DTIO_RECONNECT_TIMEOUT_MIN && + verbosity < 4) + return 0; /* no log retries on low verbosity */ + verbose(VERB_DETAIL, "dnstap io: output closed by the other side"); + /* and close below */ + return 0; + } + /* something was received */ + return r; +} + +#ifdef HAVE_SSL +/** Receive bytes over TLS from dtio->fd, store in buffer. Returns 0: closed, + * -1: continue, >0: number of bytes read into buffer */ +static int ssl_read_bytes(struct dt_io_thread* dtio, void* buf, size_t len) +{ + int r; + ERR_clear_error(); + r = SSL_read(dtio->ssl, buf, len); + if(r <= 0) { + int want = SSL_get_error(dtio->ssl, r); + if(want == SSL_ERROR_ZERO_RETURN) { + if(dtio->reconnect_timeout > DTIO_RECONNECT_TIMEOUT_MIN && + verbosity < 4) + return 0; /* no log retries on low verbosity */ + verbose(VERB_DETAIL, "dnstap io: output closed by the " + "other side"); + return 0; + } else if(want == SSL_ERROR_WANT_READ) { + /* continue later */ + return -1; + } else if(want == SSL_ERROR_WANT_WRITE) { + (void)dtio_enable_brief_write(dtio); + return -1; + } else if(want == SSL_ERROR_SYSCALL) { +#ifdef ECONNRESET + if(dtio->reconnect_timeout > DTIO_RECONNECT_TIMEOUT_MIN && + errno == ECONNRESET && verbosity < 4) + return 0; /* silence reset by peer */ +#endif + if(errno != 0) + log_err("SSL_read syscall: %s", + strerror(errno)); + verbose(VERB_DETAIL, "dnstap io: output closed by the " + "other side"); + return 0; + } + log_crypto_err("could not SSL_read"); + verbose(VERB_DETAIL, "dnstap io: output closed by the " + "other side"); + return 0; + } + return r; +} +#endif /* HAVE_SSL */ + /** check if the output fd has been closed, * it returns false if the stream is closed. */ static int dtio_check_close(struct dt_io_thread* dtio) @@ -864,44 +980,17 @@ static int dtio_check_close(struct dt_io_thread* dtio) * packets is okay for the framestream protocol. And also, the * read call can return that the stream has been closed by the * other side. */ - ssize_t r; uint8_t buf[1024]; + int r = -1; + + if(dtio->fd == -1) return 0; - while(1) { - r = recv(dtio->fd, (void*)buf, sizeof(buf), 0); - if(r == -1) { - char* to = dtio->socket_path; - if(!to) to = dtio->ip_str; - if(!to) to = ""; -#ifndef USE_WINSOCK - if(errno == EINTR || errno == EAGAIN) - return 1; /* try later */ -#else - if(WSAGetLastError() == WSAEINPROGRESS) { - return 1; /* try later */ - } else if(WSAGetLastError() == WSAEWOULDBLOCK) { - ub_winsock_tcp_wouldblock( - (dtio->stop_flush_event? - dtio->stop_flush_event:dtio->event), - UB_EV_READ); - return 1; /* try later */ - } -#endif - if(dtio->reconnect_timeout > DTIO_RECONNECT_TIMEOUT_MIN && verbosity < 4) - break; /* no log retries on low verbosity */ - log_err("dnstap io: output closed, recv %s: %s", to, - strerror(errno)); - /* and close below */ - break; - } - if(r == 0) { - if(dtio->reconnect_timeout > DTIO_RECONNECT_TIMEOUT_MIN && verbosity < 4) - break; /* no log retries on low verbosity */ - verbose(VERB_DETAIL, "dnstap io: output closed by the other side"); - /* and close below */ - break; - } - /* something was received, ignore it */ + + while(r != 0) { + /* not interested in buffer content, overwrite */ + r = receive_bytes(dtio, (void*)buf, sizeof(buf)); + if(r == -1) + return 1; } /* the other end has been closed */ /* close the channel */ @@ -910,6 +999,143 @@ static int dtio_check_close(struct dt_io_thread* dtio) return 0; } +/** Read accept frame. Returns -1: continue reading, 0: closed, + * 1: valid accept received. */ +static int dtio_read_accept_frame(struct dt_io_thread* dtio) +{ + int r; + size_t read_frame_done; + while(dtio->read_frame.frame_len_done < 4) { +#ifdef HAVE_SSL + if(dtio->ssl) { + r = ssl_read_bytes(dtio, + (uint8_t*)&dtio->read_frame.frame_len+ + dtio->read_frame.frame_len_done, + 4-dtio->read_frame.frame_len_done); + } else { +#endif + r = receive_bytes(dtio, + (uint8_t*)&dtio->read_frame.frame_len+ + dtio->read_frame.frame_len_done, + 4-dtio->read_frame.frame_len_done); +#ifdef HAVE_SSL + } +#endif + if(r == -1) + return -1; /* continue reading */ + if(r == 0) { + /* connection closed */ + goto close_connection; + } + dtio->read_frame.frame_len_done += r; + if(dtio->read_frame.frame_len_done < 4) + return -1; /* continue reading */ + + if(dtio->read_frame.frame_len == 0) { + dtio->read_frame.frame_len_done = 0; + dtio->read_frame.control_frame = 1; + continue; + } + dtio->read_frame.frame_len = ntohl(dtio->read_frame.frame_len); + if(dtio->read_frame.frame_len > DTIO_RECV_FRAME_MAX_LEN) { + verbose(VERB_OPS, "dnstap: received frame exceeds max " + "length of %d bytes, closing connection", + DTIO_RECV_FRAME_MAX_LEN); + goto close_connection; + } + dtio->read_frame.buf = calloc(1, dtio->read_frame.frame_len); + dtio->read_frame.buf_cap = dtio->read_frame.frame_len; + if(!dtio->read_frame.buf) { + log_err("dnstap io: out of memory (creating read " + "buffer)"); + goto close_connection; + } + } + if(dtio->read_frame.buf_count < dtio->read_frame.frame_len) { +#ifdef HAVE_SSL + if(dtio->ssl) { + r = ssl_read_bytes(dtio, dtio->read_frame.buf+ + dtio->read_frame.buf_count, + dtio->read_frame.buf_cap- + dtio->read_frame.buf_count); + } else { +#endif + r = receive_bytes(dtio, dtio->read_frame.buf+ + dtio->read_frame.buf_count, + dtio->read_frame.buf_cap- + dtio->read_frame.buf_count); +#ifdef HAVE_SSL + } +#endif + if(r == -1) + return -1; /* continue reading */ + if(r == 0) { + /* connection closed */ + goto close_connection; + } + dtio->read_frame.buf_count += r; + if(dtio->read_frame.buf_count < dtio->read_frame.frame_len) + return -1; /* continue reading */ + } + + /* Complete frame received, check if this is a valid ACCEPT control + * frame. */ + if(dtio->read_frame.frame_len < 4) { + verbose(VERB_OPS, "dnstap: invalid data received"); + goto close_connection; + } + if(sldns_read_uint32(dtio->read_frame.buf) != + FSTRM_CONTROL_FRAME_ACCEPT) { + verbose(VERB_ALGO, "dnstap: invalid control type received, " + "ignored"); + dtio->ready_frame_sent = 0; + dtio->accept_frame_received = 0; + dtio_read_frame_free(&dtio->read_frame); + return -1; + } + read_frame_done = 4; /* control frame type */ + + /* Iterate over control fields, ignore unknown types. + * Need to be able to read at least 8 bytes (control field type + + * length). */ + while(read_frame_done+8 < dtio->read_frame.frame_len) { + uint32_t type = sldns_read_uint32(dtio->read_frame.buf + + read_frame_done); + uint32_t len = sldns_read_uint32(dtio->read_frame.buf + + read_frame_done + 4); + if(type == FSTRM_CONTROL_FIELD_TYPE_CONTENT_TYPE) { + if(len == strlen(DNSTAP_CONTENT_TYPE) && + read_frame_done+8+len <= + dtio->read_frame.frame_len && + memcmp(dtio->read_frame.buf + read_frame_done + + + 8, DNSTAP_CONTENT_TYPE, len) == 0) { + if(!dtio_control_start_send(dtio)) { + verbose(VERB_OPS, "dnstap io: out of " + "memory while sending START frame"); + goto close_connection; + } + dtio->accept_frame_received = 1; + return 1; + } else { + /* unknow content type */ + verbose(VERB_ALGO, "dnstap: ACCEPT frame " + "contains unknown content type, " + "closing connection"); + goto close_connection; + } + } + /* unknown option, try next */ + read_frame_done += 8+len; + } + + +close_connection: + dtio_del_output_event(dtio); + dtio_reconnect_slow(dtio, DTIO_RECONNECT_TIMEOUT_SLOW); + dtio_close_output(dtio); + return 0; +} + /** add the output file descriptor event for listening, read only */ static int dtio_add_output_event_read(struct dt_io_thread* dtio) { @@ -1002,6 +1228,24 @@ static int dtio_disable_brief_read(struct dt_io_thread* dtio) } #endif /* HAVE_SSL */ +#ifdef HAVE_SSL +/** enable the brief write condition */ +static int dtio_enable_brief_write(struct dt_io_thread* dtio) +{ + dtio->ssl_brief_write = 1; + return dtio_add_output_event_write(dtio); +} +#endif /* HAVE_SSL */ + +#ifdef HAVE_SSL +/** disable the brief write condition */ +static int dtio_disable_brief_write(struct dt_io_thread* dtio) +{ + dtio->ssl_brief_write = 0; + return dtio_add_output_event_read(dtio); +} +#endif /* HAVE_SSL */ + #ifdef HAVE_SSL /** check peer verification after ssl handshake connection, false if closed*/ static int dtio_ssl_check_peer(struct dt_io_thread* dtio) @@ -1175,8 +1419,13 @@ void dtio_output_cb(int ATTR_UNUSED(fd), short bits, void* arg) } #endif - if((bits&UB_EV_READ)) { - if(!dtio_check_close(dtio)) + if((bits&UB_EV_READ || dtio->ssl_brief_write)) { + if(dtio->ssl_brief_write) + (void)dtio_disable_brief_write(dtio); + if(dtio->ready_frame_sent && !dtio->accept_frame_received) { + if(dtio_read_accept_frame(dtio) <= 0) + return; + } else if(!dtio_check_close(dtio)) return; } @@ -1208,6 +1457,15 @@ void dtio_output_cb(int ATTR_UNUSED(fd), short bits, void* arg) /* done with the current message */ dtio_cur_msg_free(dtio); + + /* If this is a bidirectional stream the first message will be + * the READY control frame. We can only continue writing after + * receiving an ACCEPT control frame. */ + if(dtio->is_bidirectional && !dtio->ready_frame_sent) { + dtio->ready_frame_sent = 1; + (void)dtio_add_output_event_read(dtio); + break; + } } } @@ -1240,6 +1498,13 @@ void dtio_cmd_cb(int fd, short ATTR_UNUSED(bits), void* arg) verbose(VERB_ALGO, "dnstap io: cmd channel cmd quit"); } else if(r == 1 && cmd == DTIO_COMMAND_WAKEUP) { verbose(VERB_ALGO, "dnstap io: cmd channel cmd wakeup"); + + if(dtio->is_bidirectional && !dtio->accept_frame_received) { + verbose(VERB_ALGO, "dnstap io: cmd wakeup ignored, " + "waiting for ACCEPT control frame"); + return; + } + /* reregister event */ if(!dtio_add_output_event_write(dtio)) return; @@ -1561,6 +1826,25 @@ static int dtio_control_start_send(struct dt_io_thread* dtio) return 1; } +/** setup a ready control message */ +static int dtio_control_ready_send(struct dt_io_thread* dtio) +{ + log_assert(dtio->cur_msg == NULL && dtio->cur_msg_len == 0); + dtio->cur_msg = fstrm_create_control_frame_ready(DNSTAP_CONTENT_TYPE, + &dtio->cur_msg_len); + if(!dtio->cur_msg) { + return 0; + } + /* setup to send the control message */ + /* set that the buffer needs to be sent, but the length + * of that buffer is already written, that way the buffer can + * start with 0 length and then the length of the control frame + * in it */ + dtio->cur_msg_done = 0; + dtio->cur_msg_len_done = 4; + return 1; +} + /** open the output file descriptor for af_local */ static int dtio_open_output_local(struct dt_io_thread* dtio) { @@ -1693,7 +1977,8 @@ static void dtio_open_output(struct dt_io_thread* dtio) } dtio->check_nb_connect = 1; - /* the EV_READ is to catch channel close, write to write packets */ + /* the EV_READ is to read ACCEPT control messages, and catch channel + * close. EV_WRITE is to write packets */ ev = ub_event_new(dtio->event_base, dtio->fd, UB_EV_READ | UB_EV_WRITE | UB_EV_PERSIST, &dtio_output_cb, dtio); @@ -1712,7 +1997,8 @@ static void dtio_open_output(struct dt_io_thread* dtio) dtio->event = ev; /* setup protocol control message to start */ - if(!dtio_control_start_send(dtio)) { + if((!dtio->is_bidirectional && !dtio_control_start_send(dtio)) || + (dtio->is_bidirectional && !dtio_control_ready_send(dtio)) ) { log_err("dnstap io: out of memory"); ub_event_free(dtio->event); dtio->event = NULL; diff --git a/dnstap/dtstream.h b/dnstap/dtstream.h index 03346c213..ede491f30 100644 --- a/dnstap/dtstream.h +++ b/dnstap/dtstream.h @@ -88,6 +88,27 @@ struct dt_msg_entry { size_t len; }; +/** + * Containing buffer and counter for reading DNSTAP frames. + */ +struct dt_frame_read_buf { + /** Buffer containing frame, except length counter(s). */ + void* buf; + /** Number of bytes written to buffer. */ + size_t buf_count; + /** Capacity of the buffer. */ + size_t buf_cap; + + /** Frame length field. Will contain the 2nd length field for control + * frames. */ + uint32_t frame_len; + /** Number of bytes that have been written to the frame_length field. */ + size_t frame_len_done; + + /** Set to 1 if this is a control frame, 0 otherwise (ie data frame). */ + int control_frame; +}; + /** * IO thread that reads from the queues and writes them. */ @@ -130,6 +151,9 @@ struct dt_io_thread { * This happens during negotiation, we then do not want to write, * but wait for a read event. */ int ssl_brief_read; + /** true if SSL_read is waiting for a write event. Set back to 0 after + * single write event is handled. */ + int ssl_brief_write; /** the buffer that currently getting written, or NULL if no * (partial) message written now */ @@ -171,6 +195,16 @@ struct dt_io_thread { * and client certificates can be used for authentication. */ int upstream_is_tls; + /** Perform bidirectional Frame Streams handshake before sending + * messages. */ + int is_bidirectional; + /** Set if the READY control frame has been sent. */ + int ready_frame_sent; + /** Set if valid ACCEPT frame is received. */ + int accept_frame_received; + /** (partially) read frame */ + struct dt_frame_read_buf read_frame; + /** the file path for unix socket (or NULL) */ char* socket_path; /** the ip address and port number (or NULL) */ diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c index 97ed7a087..44a0eda95 100644 --- a/dnstap/unbound-dnstap-socket.c +++ b/dnstap/unbound-dnstap-socket.c @@ -770,10 +770,11 @@ void tap_data_free(struct tap_data* data) /** reply with ACCEPT control frame to bidirectional client, * returns 0 on error */ -static int reply_with_accept(int fd) +static int reply_with_accept(struct tap_data* data) { #ifdef USE_DNSTAP /* len includes the escape and framelength */ + int r; size_t len = 0; void* acceptframe = fstrm_create_control_frame_accept( DNSTAP_CONTENT_TYPE, &len); @@ -782,26 +783,39 @@ static int reply_with_accept(int fd) return 0; } - fd_set_block(fd); - if(send(fd, acceptframe, len, 0) == -1) { + fd_set_block(data->fd); + if(data->ssl) { + if((r=SSL_write(data->ssl, acceptframe, len)) <= 0) { + if(SSL_get_error(data->ssl, r) == SSL_ERROR_ZERO_RETURN) + log_err("SSL_write, peer closed connection"); + else + log_err("could not SSL_write"); + fd_set_nonblock(data->fd); + free(acceptframe); + return 0; + } + } else { + if(send(data->fd, acceptframe, len, 0) == -1) { #ifndef USE_WINSOCK - log_err("send failed: %s", strerror(errno)); + log_err("send failed: %s", strerror(errno)); #else - log_err("send failed: %s", wsa_strerror(WSAGetLastError())); + log_err("send failed: %s", + wsa_strerror(WSAGetLastError())); #endif - fd_set_nonblock(fd); - free(acceptframe); - return 0; + fd_set_nonblock(data->fd); + free(acceptframe); + return 0; + } } if(verbosity) log_info("sent control frame(accept) content-type:(%s)", DNSTAP_CONTENT_TYPE); - fd_set_nonblock(fd); + fd_set_nonblock(data->fd); free(acceptframe); return 1; #else log_err("no dnstap compiled, no reply"); - (void)fd; + (void)data; return 0; #endif } @@ -1033,7 +1047,7 @@ void dtio_tap_callback(int fd, short ATTR_UNUSED(bits), void* arg) FSTRM_CONTROL_FRAME_READY) { data->is_bidirectional = 1; if(verbosity) log_info("bidirectional stream"); - if(!reply_with_accept(fd)) { + if(!reply_with_accept(data)) { tap_data_free(data); } } else if(data->len >= 4 && sldns_read_uint32(data->frame) == diff --git a/doc/Changelog b/doc/Changelog index f4304bddf..3ee202c62 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,43 @@ +27 July 2020: George + - Merge PR #268, draft-ietf-dnsop-serve-stale-10 has become RFC 8767 on + March 2020, by and0x000. + +27 July 2020: Ralph + - Merge PR #269, Fix python module len() implementations, by Torbjörn + Lönnemark + +27 July 2020: Wouter + - branch now named 1.11.1. 1.11.0rc1 became the 1.11.0 release. + - Merge PR #270 from cgzones: munin plugin: always exit 0 in autoconf + +20 July 2020: Wouter + - Fix streamtcp to print packet data to stdout. This makes the + stdout and stderr not mix together lines, when parsing its output. + - Fix contrib/fastrpz.patch to apply cleanly. It fixes for changes + due to added libdynmod, but it does not compile, it conflicts with + new rpz code. + - branch now named 1.11.0 and 1.11.0rc1 tag. + +17 July 2020: Wouter + - Fix libnettle compile for session ticket key callback function + changes. + - Fix lock dependency cycle in rpz zone config setup. + +17 July 2020: Ralph + - Merge PR #234 - Ensure proper alignment of cmsg buffers by Jérémie + Courrèges-Anglas. + - Fix PR #234 log_assert sizeof to use union buffer. + +16 July 2020: Wouter + - Fix check conf test for referencing installation paths. + - Fix unused variable warning for clang analyzer. + +16 July 2020: George + - Introduce 'include-toplevel:' configuration option. + +16 July 2020: Ralph + - Add bidirectional frame streams support. + 8 July 2020: Wouter - Fix add missing DSA header, for compilation without deprecated OpenSSL APIs. diff --git a/doc/example.conf.in b/doc/example.conf.in index 70560273f..3af4420c6 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -5,9 +5,13 @@ # # this is a comment. -#Use this to include other text into the file. +# Use this anywhere in the file to include other text into this file. #include: "otherfile.conf" +# Use this anywhere in the file to include other text, that explicitly starts a +# clause, into this file. Text after this directive needs to start a clause. +#include-toplevel: "otherfile.conf" + # The server clause sets the main parameters. server: # whitespace is not necessary, but looks cleaner. @@ -585,7 +589,7 @@ server: # # Time in milliseconds before replying to the client with expired data. # This essentially enables the serve-stale behavior as specified in - # draft-ietf-dnsop-serve-stale-10 that first tries to resolve before + # RFC 8767 that first tries to resolve before # immediately responding with expired data. 0 disables this behavior. # A recommended value is 1800. # serve-expired-client-timeout: 0 @@ -1046,6 +1050,8 @@ remote-control: # upstream log destination, by socket path, TCP or TLS destination. # dnstap: # dnstap-enable: no +# # if set to yes frame streams will be used in bidirectional mode +# dnstap-bidirectional: yes # dnstap-socket-path: "@DNSTAP_SOCKET_PATH@" # # if "" use the unix socket in dnstap-socket-path, otherwise, # # set it to "IPaddress[@port]" of the destination. diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 8c029411a..51152edb5 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -77,6 +77,12 @@ for the included files works, relative pathnames for the included names work if the directory where the daemon is started equals its chroot/working directory or is specified before the include statement with directory: dir. Wildcards can be used to include multiple files, see \fIglob\fR(7). +.P +For a more structural include option, the +.B include\-toplevel: +directive can be used. This closes whatever clause is currently active (if any) +and forces the use of clauses in the included files and right after this +directive. .SS "Server Options" These options are part of the .B server: @@ -1102,7 +1108,7 @@ later on. Default is "no". .B serve\-expired\-ttl: \fI Limit serving of expired responses to configured seconds after expiration. 0 disables the limit. This option only applies when \fBserve\-expired\fR is -enabled. A suggested value per draft-ietf-dnsop-serve-stale-10 is between +enabled. A suggested value per RFC 8767 is between 86400 (1 day) and 259200 (3 days). The default is 0. .TP .B serve\-expired\-ttl\-reset: \fI @@ -1114,14 +1120,14 @@ expired records will be served as long as there are queries for it. Default is .B serve\-expired\-reply\-ttl: \fI TTL value to use when replying with expired data. If \fBserve\-expired\-client\-timeout\fR is also used then it is RECOMMENDED to -use 30 as the value (draft-ietf-dnsop-serve-stale-10). The default is 30. +use 30 as the value (RFC 8767). The default is 30. .TP .B serve\-expired\-client\-timeout: \fI Time in milliseconds before replying to the client with expired data. This essentially enables the serve-stale behavior as specified in -draft-ietf-dnsop-serve-stale-10 that first tries to resolve before immediately +RFC 8767 that first tries to resolve before immediately responding with expired data. A recommended value per -draft-ietf-dnsop-serve-stale-10 is 1800. Setting this to 0 will disable this +RFC 8767 is 1800. Setting this to 0 will disable this behavior. Default is 0. .TP .B serve\-original\-ttl: \fI @@ -2196,6 +2202,10 @@ If dnstap is enabled. Default no. If yes, it connects to the dnstap server and if any of the dnstap-log-..-messages options is enabled it sends logs for those messages to the server. .TP +.B dnstap-bidirectional: \fI +Use frame streams in bidirectional mode to transfer DNSTAP messages. Default is +yes. +.TP .B dnstap-socket-path: \fI Sets the unix socket file name for connecting to the server that is listening on that socket. Default is "@DNSTAP_SOCKET_PATH@". diff --git a/pythonmod/interface.i b/pythonmod/interface.i index c02ebaf95..f08b575d7 100644 --- a/pythonmod/interface.i +++ b/pythonmod/interface.i @@ -314,16 +314,16 @@ struct packed_rrset_data { class RRSetData_RRLen: def __init__(self, obj): self.obj = obj def __getitem__(self, index): return _unboundmodule._get_data_rr_len(self.obj, index) - def __len__(self): return obj.count + obj.rrsig_count + def __len__(self): return self.obj.count + self.obj.rrsig_count class RRSetData_RRTTL: def __init__(self, obj): self.obj = obj def __getitem__(self, index): return _unboundmodule._get_data_rr_ttl(self.obj, index) def __setitem__(self, index, value): _unboundmodule._set_data_rr_ttl(self.obj, index, value) - def __len__(self): return obj.count + obj.rrsig_count + def __len__(self): return self.obj.count + self.obj.rrsig_count class RRSetData_RRData: def __init__(self, obj): self.obj = obj def __getitem__(self, index): return _unboundmodule._get_data_rr_data(self.obj, index) - def __len__(self): return obj.count + obj.rrsig_count + def __len__(self): return self.obj.count + self.obj.rrsig_count %} %inline %{ @@ -404,12 +404,12 @@ struct dns_msg { class ReplyInfo_RRSet: def __init__(self, obj): self.obj = obj def __getitem__(self, index): return _unboundmodule._rrset_rrsets_get(self.obj, index) - def __len__(self): return obj.rrset_count + def __len__(self): return self.obj.rrset_count class ReplyInfo_Ref: def __init__(self, obj): self.obj = obj def __getitem__(self, index): return _unboundmodule._rrset_ref_get(self.obj, index) - def __len__(self): return obj.rrset_count + def __len__(self): return self.obj.rrset_count %} %inline %{ diff --git a/services/authzone.c b/services/authzone.c index 9b0568c8c..a26d1003a 100644 --- a/services/authzone.c +++ b/services/authzone.c @@ -1866,15 +1866,26 @@ auth_zones_cfg(struct auth_zones* az, struct config_auth* c) struct auth_xfer* x = NULL; /* create zone */ + if(c->isrpz) { + /* if the rpz lock is needed, grab it before the other + * locks to avoid a lock dependency cycle */ + lock_rw_wrlock(&az->rpz_lock); + } lock_rw_wrlock(&az->lock); if(!(z=auth_zones_find_or_add_zone(az, c->name))) { lock_rw_unlock(&az->lock); + if(c->isrpz) { + lock_rw_unlock(&az->rpz_lock); + } return 0; } if(c->masters || c->urls) { if(!(x=auth_zones_find_or_add_xfer(az, z))) { lock_rw_unlock(&az->lock); lock_rw_unlock(&z->lock); + if(c->isrpz) { + lock_rw_unlock(&az->rpz_lock); + } return 0; } } @@ -1889,6 +1900,9 @@ auth_zones_cfg(struct auth_zones* az, struct config_auth* c) lock_basic_unlock(&x->lock); } lock_rw_unlock(&z->lock); + if(c->isrpz) { + lock_rw_unlock(&az->rpz_lock); + } return 0; } z->for_downstream = c->for_downstream; @@ -1900,11 +1914,13 @@ auth_zones_cfg(struct auth_zones* az, struct config_auth* c) return 0; } lock_protect(&z->lock, &z->rpz->local_zones, sizeof(*z->rpz)); - lock_rw_wrlock(&az->rpz_lock); + /* the az->rpz_lock is locked above */ z->rpz_az_next = az->rpz_first; if(az->rpz_first) az->rpz_first->rpz_az_prev = z; az->rpz_first = z; + } + if(c->isrpz) { lock_rw_unlock(&az->rpz_lock); } diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c index 65ea8d4bc..c49159d33 100644 --- a/testcode/streamtcp.c +++ b/testcode/streamtcp.c @@ -200,6 +200,7 @@ write_q(int fd, int udp, SSL* ssl, sldns_buffer* buf, uint16_t id, static void recv_one(int fd, int udp, SSL* ssl, sldns_buffer* buf) { + size_t i; char* pktstr; uint16_t len; if(!udp) { @@ -270,7 +271,13 @@ recv_one(int fd, int udp, SSL* ssl, sldns_buffer* buf) len = (size_t)l; } printf("\nnext received packet\n"); - log_buf(0, "data", buf); + printf("data[%d] ", (int)sldns_buffer_limit(buf)); + for(i=0; i>4], + hex[sldns_buffer_read_u8_at(buf, i)&0x0f]); + } + printf("\n"); pktstr = sldns_wire2str_pkt(sldns_buffer_begin(buf), len); printf("%s", pktstr); diff --git a/testdata/04-checkconf.tdir/bad.badfwd b/testdata/04-checkconf.tdir/bad.badfwd index 27d58c5ea..139d31238 100644 --- a/testdata/04-checkconf.tdir/bad.badfwd +++ b/testdata/04-checkconf.tdir/bad.badfwd @@ -2,6 +2,7 @@ server: # to make sure the check doesn't fail on username or chrootdir. username: "" chroot: "" + directory: "" forward-zone: name: "example.com" diff --git a/testdata/04-checkconf.tdir/bad.include-toplevel.1 b/testdata/04-checkconf.tdir/bad.include-toplevel.1 new file mode 100644 index 000000000..e45efbc25 --- /dev/null +++ b/testdata/04-checkconf.tdir/bad.include-toplevel.1 @@ -0,0 +1,3 @@ +include-toplevel: include.withoutclauses.* +server: + identity: "top 1" diff --git a/testdata/04-checkconf.tdir/bad.include-toplevel.2 b/testdata/04-checkconf.tdir/bad.include-toplevel.2 new file mode 100644 index 000000000..fc274fd5d --- /dev/null +++ b/testdata/04-checkconf.tdir/bad.include-toplevel.2 @@ -0,0 +1,5 @@ +include-toplevel: include.withclauses.* +server: + identity: "top 1" + include: include.withoutclauses.* + include-toplevel: include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/bad.include-toplevel.3 b/testdata/04-checkconf.tdir/bad.include-toplevel.3 new file mode 100644 index 000000000..3a219a8a2 --- /dev/null +++ b/testdata/04-checkconf.tdir/bad.include-toplevel.3 @@ -0,0 +1,6 @@ +include-toplevel: include.withclauses.* +server: + identity: "top 1" + include: include.withoutclauses.* + include-toplevel: include.withclauses.* +include: include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/bad.include-toplevel.4 b/testdata/04-checkconf.tdir/bad.include-toplevel.4 new file mode 100644 index 000000000..8dd4555b6 --- /dev/null +++ b/testdata/04-checkconf.tdir/bad.include-toplevel.4 @@ -0,0 +1,7 @@ +include-toplevel: include.withclauses.* +server: + identity: "top 1" + include: include.withoutclauses.* + include-toplevel: include.withclauses.* +include: include.withclauses.* +include-toplevel: include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/bad.include-toplevel.5 b/testdata/04-checkconf.tdir/bad.include-toplevel.5 new file mode 100644 index 000000000..b2c0eae82 --- /dev/null +++ b/testdata/04-checkconf.tdir/bad.include-toplevel.5 @@ -0,0 +1,8 @@ +include-toplevel: include.withclauses.* +server: + identity: "top 1" + include: include.withoutclauses.* + include-toplevel: include.withsomeclauses.* +include: include.withclauses.* +include-toplevel: include.withclauses.* +server: identity: "top 2" diff --git a/testdata/04-checkconf.tdir/bad.include-toplevel.6 b/testdata/04-checkconf.tdir/bad.include-toplevel.6 new file mode 100644 index 000000000..4f578f5cf --- /dev/null +++ b/testdata/04-checkconf.tdir/bad.include-toplevel.6 @@ -0,0 +1,10 @@ +include-toplevel: include.withclauses.* +include-toplevel: include.withclauses.* +server: + identity: "top 1" + include: include.withoutclauses.* + include-toplevel: include.withclauses.* +include: include.withclauses.* +include-toplevel: include.withclauses.* +server: identity: "top 2" +include-toplevel: include.includetop.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/bad.include-toplevel.7 b/testdata/04-checkconf.tdir/bad.include-toplevel.7 new file mode 100644 index 000000000..386f0166e --- /dev/null +++ b/testdata/04-checkconf.tdir/bad.include-toplevel.7 @@ -0,0 +1,11 @@ +include-toplevel: include.withclauses.* +include-toplevel: include.withclauses.* +server: + identity: "top 1" + include: include.withoutclauses.* + include-toplevel: include.withclauses.* +include: include.withclauses.* +include-toplevel: include.withclauses.* +server: identity: "top 2" +include-toplevel: include.includetop.withclauses.* +include-toplevel: include.include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/bad.user b/testdata/04-checkconf.tdir/bad.user index 40631abb4..ffa556e44 100644 --- a/testdata/04-checkconf.tdir/bad.user +++ b/testdata/04-checkconf.tdir/bad.user @@ -1,2 +1,4 @@ server: username: blabla_noexist_user + chroot: "" + directory: "" diff --git a/testdata/04-checkconf.tdir/good.include-toplevel b/testdata/04-checkconf.tdir/good.include-toplevel new file mode 100644 index 000000000..e88df7d56 --- /dev/null +++ b/testdata/04-checkconf.tdir/good.include-toplevel @@ -0,0 +1,16 @@ +include-toplevel: include.withclauses.* +include-toplevel: include.withclauses.* +server: + identity: "top 1" + include: include.withoutclauses.* + include-toplevel: include.withclauses.* +include: include.withclauses.* +include-toplevel: include.withclauses.* +server: identity: "top 2" +include-toplevel: include.includetop.withclauses.* +include-toplevel: include.include.withclauses.* +include-toplevel: include.include.withclauses.* +server: + chroot: "" + directory: "" + username: "" diff --git a/testdata/04-checkconf.tdir/include.include.withclauses.1 b/testdata/04-checkconf.tdir/include.include.withclauses.1 new file mode 100644 index 000000000..49c88fe8c --- /dev/null +++ b/testdata/04-checkconf.tdir/include.include.withclauses.1 @@ -0,0 +1 @@ +include: include.withclauses.* diff --git a/testdata/04-checkconf.tdir/include.include.withclauses.2 b/testdata/04-checkconf.tdir/include.include.withclauses.2 new file mode 100644 index 000000000..49c88fe8c --- /dev/null +++ b/testdata/04-checkconf.tdir/include.include.withclauses.2 @@ -0,0 +1 @@ +include: include.withclauses.* diff --git a/testdata/04-checkconf.tdir/include.include.withclauses.3 b/testdata/04-checkconf.tdir/include.include.withclauses.3 new file mode 100644 index 000000000..49c88fe8c --- /dev/null +++ b/testdata/04-checkconf.tdir/include.include.withclauses.3 @@ -0,0 +1 @@ +include: include.withclauses.* diff --git a/testdata/04-checkconf.tdir/include.include.withoutclauses.1 b/testdata/04-checkconf.tdir/include.include.withoutclauses.1 new file mode 100644 index 000000000..3552d769c --- /dev/null +++ b/testdata/04-checkconf.tdir/include.include.withoutclauses.1 @@ -0,0 +1 @@ +include: include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/include.include.withoutclauses.2 b/testdata/04-checkconf.tdir/include.include.withoutclauses.2 new file mode 100644 index 000000000..3552d769c --- /dev/null +++ b/testdata/04-checkconf.tdir/include.include.withoutclauses.2 @@ -0,0 +1 @@ +include: include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/include.include.withoutclauses.3 b/testdata/04-checkconf.tdir/include.include.withoutclauses.3 new file mode 100644 index 000000000..3552d769c --- /dev/null +++ b/testdata/04-checkconf.tdir/include.include.withoutclauses.3 @@ -0,0 +1 @@ +include: include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/include.includetop.withclauses.1 b/testdata/04-checkconf.tdir/include.includetop.withclauses.1 new file mode 100644 index 000000000..5e296548f --- /dev/null +++ b/testdata/04-checkconf.tdir/include.includetop.withclauses.1 @@ -0,0 +1 @@ +include-toplevel: include.withclauses.* diff --git a/testdata/04-checkconf.tdir/include.includetop.withclauses.2 b/testdata/04-checkconf.tdir/include.includetop.withclauses.2 new file mode 100644 index 000000000..5e296548f --- /dev/null +++ b/testdata/04-checkconf.tdir/include.includetop.withclauses.2 @@ -0,0 +1 @@ +include-toplevel: include.withclauses.* diff --git a/testdata/04-checkconf.tdir/include.includetop.withclauses.3 b/testdata/04-checkconf.tdir/include.includetop.withclauses.3 new file mode 100644 index 000000000..5e296548f --- /dev/null +++ b/testdata/04-checkconf.tdir/include.includetop.withclauses.3 @@ -0,0 +1 @@ +include-toplevel: include.withclauses.* diff --git a/testdata/04-checkconf.tdir/include.includetop.withoutclauses.1 b/testdata/04-checkconf.tdir/include.includetop.withoutclauses.1 new file mode 100644 index 000000000..a411f7b52 --- /dev/null +++ b/testdata/04-checkconf.tdir/include.includetop.withoutclauses.1 @@ -0,0 +1 @@ +include-toplevel: include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/include.includetop.withoutclauses.2 b/testdata/04-checkconf.tdir/include.includetop.withoutclauses.2 new file mode 100644 index 000000000..a411f7b52 --- /dev/null +++ b/testdata/04-checkconf.tdir/include.includetop.withoutclauses.2 @@ -0,0 +1 @@ +include-toplevel: include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/include.includetop.withoutclauses.3 b/testdata/04-checkconf.tdir/include.includetop.withoutclauses.3 new file mode 100644 index 000000000..a411f7b52 --- /dev/null +++ b/testdata/04-checkconf.tdir/include.includetop.withoutclauses.3 @@ -0,0 +1 @@ +include-toplevel: include.withoutclauses.* diff --git a/testdata/04-checkconf.tdir/include.withclauses.1 b/testdata/04-checkconf.tdir/include.withclauses.1 new file mode 100644 index 000000000..d67920e06 --- /dev/null +++ b/testdata/04-checkconf.tdir/include.withclauses.1 @@ -0,0 +1 @@ +server: identity: "withclauses1" diff --git a/testdata/04-checkconf.tdir/include.withclauses.2 b/testdata/04-checkconf.tdir/include.withclauses.2 new file mode 100644 index 000000000..3537974c0 --- /dev/null +++ b/testdata/04-checkconf.tdir/include.withclauses.2 @@ -0,0 +1 @@ +server: identity: "withclauses2" diff --git a/testdata/04-checkconf.tdir/include.withclauses.3 b/testdata/04-checkconf.tdir/include.withclauses.3 new file mode 100644 index 000000000..5e19c54ef --- /dev/null +++ b/testdata/04-checkconf.tdir/include.withclauses.3 @@ -0,0 +1 @@ +server: identity: "withclauses3" diff --git a/testdata/04-checkconf.tdir/include.withoutclauses.1 b/testdata/04-checkconf.tdir/include.withoutclauses.1 new file mode 100644 index 000000000..3b3b6f48b --- /dev/null +++ b/testdata/04-checkconf.tdir/include.withoutclauses.1 @@ -0,0 +1 @@ +identity: "withoutclauses1" diff --git a/testdata/04-checkconf.tdir/include.withoutclauses.2 b/testdata/04-checkconf.tdir/include.withoutclauses.2 new file mode 100644 index 000000000..fec8b2002 --- /dev/null +++ b/testdata/04-checkconf.tdir/include.withoutclauses.2 @@ -0,0 +1 @@ +identity: "withoutclauses2" diff --git a/testdata/04-checkconf.tdir/include.withoutclauses.3 b/testdata/04-checkconf.tdir/include.withoutclauses.3 new file mode 100644 index 000000000..e34a4b12d --- /dev/null +++ b/testdata/04-checkconf.tdir/include.withoutclauses.3 @@ -0,0 +1 @@ +identity: "withoutclauses3" diff --git a/testdata/04-checkconf.tdir/include.withsomeclauses.1 b/testdata/04-checkconf.tdir/include.withsomeclauses.1 new file mode 100644 index 000000000..d719a44f7 --- /dev/null +++ b/testdata/04-checkconf.tdir/include.withsomeclauses.1 @@ -0,0 +1 @@ +server: identity: "withsomeclauses1" diff --git a/testdata/04-checkconf.tdir/include.withsomeclauses.2 b/testdata/04-checkconf.tdir/include.withsomeclauses.2 new file mode 100644 index 000000000..ec910e1a8 --- /dev/null +++ b/testdata/04-checkconf.tdir/include.withsomeclauses.2 @@ -0,0 +1 @@ +identity: "withsomeclauses2" diff --git a/testdata/04-checkconf.tdir/include.withsomeclauses.3 b/testdata/04-checkconf.tdir/include.withsomeclauses.3 new file mode 100644 index 000000000..dbb696eeb --- /dev/null +++ b/testdata/04-checkconf.tdir/include.withsomeclauses.3 @@ -0,0 +1 @@ +identity: "withsomeclauses3" diff --git a/util/config_file.c b/util/config_file.c index 5e9e2fda2..c47ccf31b 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -299,6 +299,7 @@ config_create(void) if(!(cfg->dnstap_socket_path = strdup(DNSTAP_SOCKET_PATH))) goto error_exit; #endif + cfg->dnstap_bidirectional = 1; cfg->dnstap_tls = 1; cfg->disable_dnssec_lame_check = 0; cfg->ip_ratelimit = 0; @@ -641,6 +642,7 @@ int config_set_option(struct config_file* cfg, const char* opt, #endif #ifdef USE_DNSTAP else S_YNO("dnstap-enable:", dnstap) + else S_YNO("dnstap-bidirectional:", dnstap_bidirectional) else S_STR("dnstap-socket-path:", dnstap_socket_path) else S_STR("dnstap-ip:", dnstap_ip) else S_YNO("dnstap-tls:", dnstap_tls) @@ -1058,6 +1060,7 @@ config_get_option(struct config_file* cfg, const char* opt, #endif #ifdef USE_DNSTAP else O_YNO(opt, "dnstap-enable", dnstap) + else O_YNO(opt, "dnstap-bidirectional", dnstap_bidirectional) else O_STR(opt, "dnstap-socket-path", dnstap_socket_path) else O_STR(opt, "dnstap-ip", dnstap_ip) else O_YNO(opt, "dnstap-tls", dnstap_tls) diff --git a/util/config_file.h b/util/config_file.h index c7a028fba..a18f0e79c 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -483,6 +483,8 @@ struct config_file { /** true to enable dnstap support */ int dnstap; + /** using bidirectional frame streams if true */ + int dnstap_bidirectional; /** dnstap socket path */ char* dnstap_socket_path; /** dnstap IP */ diff --git a/util/configlexer.c b/util/configlexer.c index b4013146d..3b62e9334 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 315 -#define YY_END_OF_BUFFER 316 +#define YY_NUM_RULES 324 +#define YY_END_OF_BUFFER 325 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -363,349 +363,354 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[3096] = +static const flex_int16_t yy_accept[3150] = { 0, - 1, 1, 297, 297, 301, 301, 305, 305, 309, 309, - 1, 1, 316, 313, 1, 295, 295, 314, 2, 314, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 297, 298, 298, 299, 314, 301, 302, 302, - 303, 314, 308, 305, 306, 306, 307, 314, 309, 310, - 310, 311, 314, 312, 296, 2, 300, 314, 312, 313, - 0, 1, 2, 2, 2, 2, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 1, 1, 298, 298, 302, 302, 306, 306, 310, 310, + 1, 1, 314, 314, 318, 318, 325, 322, 1, 296, + 296, 323, 2, 323, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 298, 299, 299, 300, + 323, 302, 303, 303, 304, 323, 309, 306, 307, 307, + 308, 323, 310, 311, 311, 312, 323, 321, 297, 2, + 301, 323, 321, 317, 314, 315, 315, 316, 323, 318, + 319, 319, 320, 323, 322, 0, 1, 2, 2, 2, + 2, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 297, 0, 301, 0, 308, 0, 305, 309, 0, - 312, 0, 2, 2, 312, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 298, 0, 302, 0, + 309, 0, 306, 310, 0, 321, 0, 2, 2, 321, + 317, 0, 314, 318, 0, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 312, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 321, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 115, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 123, - 313, 313, 313, 313, 313, 313, 313, 312, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 115, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 123, + 322, 322, 322, 322, 322, 322, 322, 321, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 99, 313, 313, 313, 313, 313, - 313, 8, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 116, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 99, 322, 322, 322, 322, 322, + 322, 8, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 116, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 128, 313, 312, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 290, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 128, 322, 321, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 291, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 312, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 57, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 228, 313, 14, 15, 313, 19, 18, 313, 313, 212, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 321, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 57, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 122, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 210, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 3, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 228, 322, 14, 15, 322, 19, 18, 322, 322, 212, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 122, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 210, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 312, 313, - 313, 313, 313, 313, 313, 313, 284, 313, 313, 283, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 304, 313, 313, 313, + 322, 322, 322, 322, 3, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 321, 322, + 322, 322, 322, 322, 322, 322, 285, 322, 322, 284, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 56, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 60, 313, 258, 313, 313, 313, 313, 313, 313, - 313, 313, 291, 292, 313, 313, 313, 313, 313, 61, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 119, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 199, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 21, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 305, 322, + 322, 322, 322, 322, 322, 322, 56, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 60, 322, 259, 322, 322, 322, 322, + 322, 322, 322, 322, 292, 293, 322, 322, 322, 322, + 322, 61, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 119, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 199, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 147, 313, 313, 304, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 97, 313, 313, 313, 313, 313, 313, 313, 266, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 171, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 146, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 21, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 147, 322, + 322, 321, 305, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 97, 322, 322, 322, 322, 322, 322, + 322, 267, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 171, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 96, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 32, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 33, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 58, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 146, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 96, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 32, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 121, 313, 313, 313, 313, 313, 114, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 59, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 231, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 172, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 47, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 33, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 58, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 121, 321, 322, + 322, 322, 322, 322, 114, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 59, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 232, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 172, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 249, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 51, 313, 52, - 313, 313, 313, 313, 313, 100, 313, 101, 313, 313, - 313, 313, 98, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 7, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 47, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 250, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 51, 322, 52, 322, 322, + 322, 322, 322, 100, 322, 101, 322, 322, 322, 322, + 98, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 221, 313, 313, 313, 313, 149, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 232, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 48, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 191, 313, 190, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 7, + 322, 321, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 221, + 322, 322, 322, 322, 149, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 233, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 48, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 16, 17, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 62, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 198, - 313, 313, 313, 313, 313, 313, 103, 313, 102, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 182, 313, 313, 313, 313, 313, 313, 313, 313, 129, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 81, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 191, 322, 190, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 16, 17, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 62, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 198, 322, 322, 322, 322, 322, 322, 103, 322, 102, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 211, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 85, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 55, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 185, 186, 313, 313, 313, 260, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 6, 313, 313, 313, 313, 313, 313, 313, + 322, 182, 322, 322, 322, 322, 322, 322, 322, 322, + 129, 321, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 81, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 211, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 85, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 55, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 264, 313, 313, 313, 313, 313, - 313, 285, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 42, 313, 313, 313, 313, 44, 313, - 313, 313, 313, 313, 313, 313, 313, 45, 313, 313, - 313, 313, 313, 313, 313, 313, 178, 313, 313, 313, - 124, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 203, 313, 179, 313, 313, 313, 218, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 185, 186, + 322, 322, 322, 261, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 6, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 265, 322, + 322, 322, 322, 322, 322, 286, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 42, 322, 322, + 322, 322, 44, 322, 322, 322, 322, 322, 322, 322, + 322, 45, 322, 322, 322, 322, 322, 322, 322, 321, - 313, 313, 313, 313, 313, 313, 313, 46, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 126, 108, 313, - 109, 313, 313, 313, 107, 313, 313, 313, 313, 313, - 313, 313, 313, 144, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 248, 313, 313, 313, 313, - 313, 313, 313, 313, 180, 313, 313, 313, 313, 313, - 183, 313, 189, 313, 313, 313, 313, 313, 217, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 95, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 178, 322, 322, 322, 124, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 203, 322, 179, 322, + 322, 322, 218, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 46, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 126, 108, 322, 109, 322, 322, 322, + 107, 322, 322, 322, 322, 322, 322, 322, 322, 144, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 249, 322, 322, 322, 322, 322, 322, 322, + 322, 180, 322, 322, 322, 322, 322, 183, 322, 189, - 313, 313, 120, 313, 313, 313, 313, 313, 313, 313, - 53, 313, 313, 313, 26, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 20, 313, 313, 313, 313, 313, - 313, 27, 36, 313, 154, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 70, 72, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 268, - 313, 313, 313, 229, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 110, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 217, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 95, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 120, + 322, 322, 322, 322, 322, 322, 322, 53, 322, 322, + 322, 26, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 20, 322, 322, 322, 322, 322, 322, 27, 36, + 322, 154, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 321, 322, 322, 322, 322, + 322, 322, 70, 72, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 143, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 279, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 148, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 209, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 288, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 165, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 104, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 269, 322, 322, + 322, 322, 229, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 110, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 143, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 280, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 148, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 209, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 160, 313, 173, 313, - 313, 313, 313, 313, 132, 313, 313, 313, 313, 313, - 91, 313, 313, 313, 313, 201, 313, 313, 313, 313, - 313, 313, 219, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 240, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 125, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 164, - 313, 313, 313, 313, 313, 73, 74, 313, 313, 313, - 313, 313, 54, 313, 313, 313, 313, 313, 80, 174, - 313, 192, 313, 222, 313, 313, 184, 261, 313, 313, + 322, 322, 322, 322, 289, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 165, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 104, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 160, 322, 173, 322, + 322, 322, 322, 321, 322, 132, 322, 322, 322, 322, + 322, 91, 322, 322, 322, 322, 201, 322, 322, 322, + 322, 322, 322, 219, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 241, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 66, 313, 176, 313, 313, 313, 313, - 313, 9, 313, 313, 313, 94, 313, 313, 313, 313, - 253, 313, 313, 313, 313, 200, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 163, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 150, 313, 267, - 313, 313, 313, 313, 239, 313, 313, 313, 313, 313, + 125, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 164, 322, 322, 322, 322, 322, 322, 73, 74, + 322, 322, 322, 322, 322, 54, 322, 322, 322, 322, + 322, 80, 174, 322, 192, 322, 222, 322, 322, 184, + 262, 322, 322, 322, 322, 322, 66, 322, 176, 322, + 322, 322, 322, 322, 9, 322, 322, 322, 94, 322, + 322, 322, 322, 254, 322, 322, 322, 322, 200, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 313, 313, 213, 313, 313, 313, - 313, 259, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 282, 313, 175, 313, - 313, 313, 313, 313, 313, 313, 65, 67, 313, 313, - 313, 313, 313, 313, 313, 93, 313, 313, 313, 313, - 251, 313, 313, 313, 313, 263, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 205, 34, - 28, 30, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 35, 313, 29, 31, 313, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 321, 322, 322, 322, 322, + 163, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 150, 322, 268, 322, 322, 322, 322, 322, 240, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 213, 322, 322, 322, 322, 260, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 283, 322, 175, 322, 322, 322, 322, 322, + 322, 322, 65, 67, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 90, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 207, 204, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 64, 313, 313, 127, 313, 111, 313, 313, 313, 313, - 313, 313, 313, 313, 145, 13, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 277, 313, 280, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 12, 313, - 313, 22, 313, 313, 313, 257, 313, 313, 313, 313, - 265, 313, 313, 313, 68, 313, 215, 313, 313, 313, + 322, 93, 322, 322, 322, 322, 252, 322, 322, 322, + 322, 264, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 205, 34, 28, 30, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 35, 322, 29, + 31, 322, 322, 322, 322, 322, 322, 322, 322, 90, + 322, 322, 322, 322, 322, 322, 321, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 207, 204, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 64, 322, + 322, 127, 322, 111, 322, 322, 322, 322, 322, 322, - 313, 313, 206, 313, 313, 63, 313, 313, 313, 313, - 23, 313, 43, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 159, 158, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 208, 202, 313, 220, - 313, 313, 269, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 75, 313, 313, 313, 252, 313, 313, 313, 313, 188, - 313, 313, 313, 313, 214, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 286, 287, 156, 313, 313, 69, + 322, 322, 145, 313, 13, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 278, 322, 281, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 12, 322, 322, + 22, 322, 322, 322, 258, 322, 322, 322, 322, 266, + 322, 322, 322, 68, 322, 215, 322, 322, 322, 322, + 322, 206, 322, 322, 63, 322, 322, 322, 322, 23, + 322, 43, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 159, 158, 313, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 208, 202, 322, 220, + 322, 322, 270, 322, 322, 322, 322, 322, 322, 322, - 313, 313, 313, 313, 166, 313, 313, 313, 105, 106, - 313, 313, 313, 313, 151, 313, 153, 313, 193, 313, - 313, 313, 313, 157, 313, 313, 223, 313, 313, 313, - 313, 313, 313, 313, 134, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 230, 313, 313, 313, - 313, 313, 313, 313, 24, 313, 262, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 194, 313, - 313, 250, 313, 281, 313, 187, 313, 313, 313, 313, - 49, 313, 313, 313, 313, 4, 313, 313, 313, 313, - 118, 133, 313, 313, 313, 170, 313, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 75, 322, 322, 322, 253, 322, 322, 322, 322, + 188, 322, 322, 322, 322, 214, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 287, 288, 156, 322, 322, + 69, 322, 322, 322, 322, 166, 322, 322, 322, 105, + 106, 322, 322, 322, 322, 151, 322, 153, 322, 193, + 322, 322, 322, 322, 157, 322, 322, 223, 322, 322, + 322, 322, 322, 322, 322, 134, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 231, 322, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 226, 37, 38, 313, 313, 313, 313, 313, 313, - 313, 270, 313, 313, 313, 313, 313, 313, 238, 313, - 313, 313, 313, 313, 313, 313, 197, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 78, 313, 50, 256, - 313, 227, 313, 313, 313, 313, 11, 313, 313, 313, - 313, 313, 313, 117, 313, 313, 313, 313, 195, 82, - 313, 40, 313, 313, 313, 313, 313, 313, 313, 313, - 162, 313, 313, 313, 313, 313, 136, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 237, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 24, 322, 263, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 194, 322, 322, 251, 322, 282, 322, 187, 322, 322, + 322, 322, 49, 322, 322, 322, 322, 4, 322, 322, + 322, 322, 118, 133, 322, 322, 322, 170, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 226, 37, 38, 322, 322, 322, 322, + 322, 322, 322, 271, 322, 322, 322, 322, 322, 322, + 322, 239, 322, 322, 322, 322, 322, 322, 322, 197, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 78, - 313, 130, 313, 313, 112, 113, 313, 313, 313, 84, - 88, 83, 313, 76, 313, 313, 313, 313, 313, 10, - 313, 313, 313, 254, 289, 313, 313, 313, 313, 294, - 39, 313, 313, 313, 313, 313, 161, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 89, - 87, 313, 77, 278, 313, 313, 313, 313, 313, 313, - 313, 181, 313, 313, 313, 313, 313, 196, 313, 313, - 313, 313, 313, 313, 313, 313, 152, 71, 313, 313, - 313, 313, 313, 271, 313, 313, 313, 313, 313, 313, + 322, 50, 257, 322, 227, 322, 322, 322, 322, 11, + 322, 322, 322, 322, 322, 322, 117, 322, 322, 322, + 322, 195, 82, 322, 40, 322, 322, 322, 322, 322, + 322, 322, 322, 162, 322, 322, 322, 322, 322, 136, + 322, 322, 322, 322, 230, 322, 322, 322, 322, 322, + 238, 322, 322, 322, 322, 130, 322, 322, 112, 113, + 322, 322, 322, 84, 88, 83, 322, 76, 322, 322, + 322, 322, 322, 10, 322, 322, 322, 255, 290, 322, + 322, 322, 322, 295, 39, 322, 322, 322, 322, 322, + 161, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 313, 234, 313, 313, 233, 131, 313, 86, 137, 138, - 141, 142, 139, 140, 79, 313, 255, 313, 313, 313, - 313, 155, 313, 313, 313, 313, 313, 225, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 168, 167, 41, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 92, 313, 224, 313, 247, 275, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 5, 313, 313, 216, 313, 313, 276, 313, 313, 313, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 89, 87, 322, 77, 279, 322, 322, + 322, 322, 322, 322, 322, 181, 322, 322, 322, 322, + 322, 196, 322, 322, 322, 322, 322, 322, 322, 322, + 152, 71, 322, 322, 322, 322, 322, 272, 322, 322, + 322, 322, 322, 322, 322, 235, 322, 322, 234, 131, + 322, 86, 137, 138, 141, 142, 139, 140, 79, 322, + 256, 322, 322, 322, 322, 155, 322, 322, 322, 322, + 322, 225, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 168, - 313, 313, 313, 313, 313, 313, 235, 25, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 236, 313, 313, 313, 135, 313, 313, 313, 313, 313, - 313, 313, 313, 169, 313, 177, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 272, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 293, 313, 313, 243, 313, 313, 313, - 313, 313, 273, 313, 313, 313, 313, 313, 313, 274, - 313, 313, 313, 241, 313, 244, 245, 313, 313, 313, - 313, 313, 242, 246, 0 + 167, 41, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 92, 322, 224, 322, + 248, 276, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 5, 322, 322, 216, 322, 322, + 277, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 236, 25, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 237, 322, 322, 322, 135, 322, + 322, 322, 322, 322, 322, 322, 322, 169, 322, 177, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 273, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 294, 322, 322, + 244, 322, 322, 322, 322, 322, 274, 322, 322, 322, + 322, 322, 322, 275, 322, 322, 322, 242, 322, 245, + 246, 322, 322, 322, 322, 322, 243, 247, 0 } ; static const YY_CHAR yy_ec[256] = @@ -748,2040 +753,2082 @@ static const YY_CHAR yy_meta[41] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static const flex_int16_t yy_base[3110] = +static const flex_int16_t yy_base[3168] = { 0, 0, 0, 38, 41, 44, 46, 59, 65, 71, 77, - 90, 112, 1902, 1579, 81, 6033, 6033, 6033, 96, 52, - 106, 63, 107, 128, 70, 116, 123, 134, 57, 88, - 76, 145, 151, 114, 158, 97, 169, 181, 179, 188, - 194, 129, 1551, 6033, 6033, 6033, 135, 1315, 6033, 6033, - 6033, 146, 1142, 1110, 6033, 6033, 6033, 220, 1034, 6033, - 6033, 6033, 171, 903, 6033, 224, 6033, 228, 157, 818, - 232, 167, 0, 239, 0, 0, 165, 205, 85, 166, - 226, 190, 233, 234, 228, 240, 241, 242, 98, 130, - 250, 243, 245, 248, 258, 256, 262, 267, 273, 251, + 90, 112, 96, 118, 124, 136, 3343, 3249, 81, 6165, + 6165, 6165, 129, 52, 130, 63, 131, 152, 70, 140, + 144, 156, 57, 88, 76, 173, 175, 95, 184, 135, + 185, 205, 147, 204, 178, 123, 3065, 6165, 6165, 6165, + 107, 3000, 6165, 6165, 6165, 178, 2747, 2708, 6165, 6165, + 6165, 224, 2394, 6165, 6165, 6165, 204, 2282, 6165, 238, + 6165, 242, 197, 2041, 1960, 6165, 6165, 6165, 246, 1911, + 6165, 6165, 6165, 216, 1831, 252, 166, 0, 256, 0, + 0, 216, 248, 162, 241, 250, 254, 258, 92, 259, - 276, 272, 264, 281, 285, 275, 284, 289, 290, 287, - 302, 301, 303, 304, 307, 310, 312, 305, 315, 313, - 326, 319, 318, 324, 332, 327, 204, 329, 336, 331, - 342, 347, 348, 351, 353, 356, 360, 359, 352, 372, - 361, 721, 372, 711, 388, 597, 392, 432, 320, 383, - 235, 396, 400, 0, 392, 394, 402, 379, 398, 401, - 403, 404, 405, 406, 410, 407, 408, 425, 418, 423, - 429, 437, 435, 432, 439, 422, 442, 444, 445, 447, - 448, 457, 454, 460, 456, 462, 463, 464, 466, 467, - 483, 469, 473, 476, 485, 490, 494, 502, 486, 504, + 262, 263, 260, 264, 265, 272, 267, 273, 271, 282, + 280, 288, 292, 290, 283, 299, 309, 289, 307, 310, + 311, 300, 316, 191, 321, 315, 323, 304, 325, 327, + 326, 337, 329, 338, 340, 348, 341, 345, 347, 350, + 357, 227, 351, 354, 358, 362, 369, 359, 373, 379, + 374, 377, 383, 385, 387, 384, 1479, 403, 1352, 406, + 814, 416, 740, 688, 410, 600, 420, 424, 0, 416, + 501, 430, 464, 442, 435, 422, 434, 429, 430, 431, + 433, 397, 432, 435, 436, 437, 440, 454, 438, 453, + 459, 462, 466, 461, 467, 471, 472, 473, 474, 476, - 505, 495, 513, 510, 517, 518, 519, 508, 522, 509, - 524, 520, 523, 525, 527, 534, 533, 481, 535, 545, - 536, 540, 546, 537, 553, 549, 557, 552, 556, 175, - 554, 562, 566, 570, 563, 571, 574, 575, 576, 579, - 587, 590, 583, 580, 588, 592, 591, 598, 594, 595, - 596, 607, 615, 608, 611, 618, 617, 620, 621, 622, - 623, 599, 633, 625, 635, 629, 641, 626, 642, 645, - 640, 647, 648, 649, 650, 652, 660, 655, 663, 664, - 671, 668, 673, 670, 682, 658, 667, 677, 679, 680, - 683, 684, 687, 688, 690, 693, 695, 696, 697, 706, + 477, 490, 485, 487, 480, 493, 495, 496, 498, 499, + 505, 512, 500, 502, 521, 526, 522, 530, 519, 535, + 537, 532, 540, 533, 542, 547, 543, 544, 545, 548, + 549, 552, 554, 556, 558, 561, 560, 564, 559, 572, + 573, 565, 577, 567, 582, 584, 591, 586, 587, 588, + 593, 594, 604, 605, 595, 613, 596, 597, 609, 616, + 623, 624, 619, 620, 622, 625, 626, 628, 629, 630, + 631, 639, 640, 642, 646, 650, 648, 652, 653, 655, + 656, 632, 665, 658, 660, 667, 673, 672, 674, 676, + 678, 680, 679, 681, 683, 684, 697, 686, 702, 687, - 701, 703, 717, 705, 710, 718, 719, 727, 712, 720, - 739, 744, 745, 733, 731, 747, 749, 752, 754, 760, - 755, 757, 763, 764, 765, 766, 773, 768, 6033, 772, - 774, 782, 784, 786, 790, 787, 796, 794, 777, 804, - 806, 802, 810, 832, 788, 800, 809, 811, 814, 6033, - 822, 816, 856, 827, 820, 840, 837, 836, 844, 845, - 838, 846, 867, 850, 849, 852, 879, 854, 862, 864, - 874, 880, 878, 887, 890, 886, 888, 894, 898, 895, - 896, 897, 907, 899, 901, 909, 910, 911, 914, 918, - 923, 928, 921, 915, 931, 926, 932, 936, 939, 933, + 704, 699, 705, 707, 714, 701, 709, 710, 711, 715, + 719, 717, 725, 713, 718, 733, 723, 737, 726, 745, + 743, 730, 758, 744, 747, 749, 759, 748, 750, 756, + 769, 761, 779, 766, 773, 781, 784, 792, 789, 795, + 785, 797, 787, 798, 801, 803, 810, 808, 6165, 805, + 807, 819, 822, 823, 826, 816, 832, 806, 836, 839, + 841, 838, 846, 868, 824, 842, 845, 847, 850, 6165, + 854, 852, 892, 861, 856, 878, 874, 858, 881, 870, + 888, 882, 896, 883, 893, 898, 916, 899, 903, 905, + 902, 914, 915, 924, 926, 921, 928, 929, 937, 932, - 937, 943, 955, 950, 951, 959, 961, 960, 953, 966, - 962, 969, 972, 970, 978, 980, 981, 976, 982, 984, - 987, 993, 986, 988, 995, 997, 996, 1000, 1005, 1006, - 1010, 990, 1018, 1001, 6033, 1020, 1012, 1014, 1016, 1024, - 1026, 6033, 1027, 1028, 1029, 1036, 1031, 1041, 1032, 1039, - 1046, 1049, 1042, 1050, 1061, 1051, 1059, 1064, 1060, 1063, - 1066, 1069, 1072, 1070, 1077, 1073, 1067, 935, 1080, 1094, - 6033, 1079, 1081, 1085, 1084, 1091, 1097, 1106, 1104, 1112, - 1105, 1109, 1122, 1123, 1125, 1126, 1130, 1086, 1129, 1131, - 1133, 1134, 1136, 1137, 1135, 1138, 1144, 1140, 1145, 1141, + 933, 934, 938, 942, 944, 945, 950, 946, 951, 952, + 954, 965, 955, 963, 959, 967, 968, 970, 972, 983, + 976, 977, 993, 984, 989, 994, 996, 997, 991, 1000, + 1003, 1007, 1004, 1008, 1012, 1020, 1015, 1010, 1017, 1018, + 1022, 1028, 1024, 1026, 1030, 1031, 1032, 1040, 1033, 1041, + 1034, 1047, 1049, 752, 6165, 1051, 1053, 1054, 1055, 1056, + 1057, 6165, 1059, 1058, 1061, 1066, 1063, 1071, 1080, 1067, + 1082, 1070, 1083, 1084, 1092, 1087, 1088, 1095, 1094, 1096, + 947, 1098, 1100, 1105, 1102, 1106, 1109, 1103, 1114, 1128, + 6165, 1112, 1115, 1116, 1118, 1123, 1131, 1140, 1126, 1133, - 6033, 1152, 1158, 1169, 1155, 1164, 1165, 1166, 1168, 1170, - 1171, 1172, 1174, 1173, 1178, 1192, 1182, 1193, 1189, 1195, - 1190, 1191, 1197, 1196, 1200, 1205, 1213, 1210, 1215, 1218, - 1226, 1225, 1228, 1235, 1237, 1211, 1230, 1203, 1222, 1234, - 1240, 1239, 1238, 1245, 1246, 1253, 1248, 1249, 1251, 1254, - 1263, 1255, 1258, 1265, 1262, 1269, 1266, 1259, 1271, 1278, - 1279, 1281, 6033, 1288, 1285, 1286, 1287, 1290, 1297, 1298, - 1292, 1299, 1302, 1301, 1305, 1304, 1307, 1311, 1312, 1316, - 1318, 1321, 1325, 1322, 1323, 1337, 1336, 1338, 1329, 1330, - 1346, 1345, 1348, 1349, 1351, 1359, 1341, 1355, 1357, 1366, + 1143, 1146, 1156, 1151, 1121, 1152, 1153, 1157, 1160, 1163, + 1165, 1166, 1168, 1169, 1170, 1171, 1172, 1174, 1179, 1184, + 6165, 1177, 1187, 1195, 1196, 1182, 1198, 1199, 1200, 1201, + 1202, 1203, 1205, 1204, 1210, 1220, 1211, 1224, 1221, 1222, + 1226, 1227, 1229, 1228, 1230, 1232, 1244, 1237, 1236, 1252, + 1247, 1254, 1256, 1263, 1265, 1245, 1258, 1262, 1260, 1268, + 1269, 1270, 1271, 1273, 1274, 1283, 1280, 1281, 1282, 1285, + 1295, 1286, 1288, 1298, 1290, 1296, 1293, 1300, 1304, 1307, + 1303, 1313, 6165, 1320, 1315, 1318, 1319, 1322, 1326, 1325, + 1331, 1332, 1333, 1335, 1334, 1336, 1338, 1342, 1341, 1343, - 1361, 1363, 1364, 1365, 1370, 1367, 1375, 1379, 1382, 1381, - 1389, 1390, 1384, 1395, 1387, 1398, 1392, 1399, 1401, 1402, - 1403, 1411, 1404, 1407, 1412, 1413, 1414, 1415, 1418, 1420, - 1431, 1422, 1426, 1424, 1429, 1433, 1439, 1440, 1441, 1442, - 1444, 1445, 1451, 1446, 1449, 1452, 1455, 1454, 1462, 1458, - 1464, 1469, 1470, 1473, 1472, 1475, 1476, 1484, 1485, 1486, - 1487, 1488, 1491, 1489, 1490, 1496, 1498, 1499, 1504, 1506, - 1505, 1510, 1513, 1516, 1518, 6033, 1511, 1523, 1521, 1524, - 1525, 1507, 1529, 1539, 1534, 1531, 1535, 1536, 1540, 1562, - 6033, 1543, 6033, 6033, 1546, 6033, 6033, 1545, 1544, 6033, + 1344, 1346, 1355, 1357, 1361, 1368, 1367, 1369, 1354, 1362, + 1377, 1373, 1381, 1379, 1380, 1389, 1384, 1386, 1387, 1396, + 1391, 1393, 1395, 1394, 1403, 1398, 1408, 1415, 1401, 1412, + 1422, 1418, 1420, 1423, 1424, 1428, 1429, 1431, 1432, 1433, + 1434, 1441, 1436, 1437, 1438, 1442, 1444, 1439, 1448, 1451, + 1461, 1456, 1459, 1463, 1464, 1465, 1467, 1468, 1472, 1473, + 1474, 1475, 1481, 1476, 1494, 1478, 875, 1486, 1496, 1487, + 1488, 1489, 1499, 1504, 1505, 1508, 1510, 1511, 1514, 1516, + 1517, 1518, 1520, 1519, 1523, 1530, 1522, 1528, 1533, 1535, + 1538, 1540, 1541, 1544, 1545, 6165, 1546, 1553, 1551, 1552, - 1549, 1548, 1552, 1565, 1568, 1559, 1557, 1572, 1573, 1583, - 1594, 1580, 1576, 1587, 1578, 1588, 1590, 1592, 1607, 1600, - 1609, 1611, 1614, 1618, 1620, 1602, 1621, 1622, 1624, 1625, - 1627, 1626, 1629, 1632, 1635, 1636, 1638, 1631, 1639, 1648, - 1650, 1652, 1659, 6033, 1657, 1660, 1669, 1665, 1672, 1664, - 1668, 1671, 1676, 1678, 1673, 1680, 1682, 1683, 1684, 1686, - 1688, 1691, 1695, 1692, 6033, 1693, 1696, 1694, 1701, 1700, - 1704, 1708, 1710, 1712, 1714, 1715, 1722, 1719, 1717, 1725, - 1726, 1727, 1729, 1730, 6033, 1734, 1739, 1731, 1740, 1742, - 1746, 1748, 1743, 1749, 1750, 1753, 1640, 1754, 1755, 1762, + 1555, 1557, 1558, 1566, 1561, 1563, 1562, 1564, 1568, 1590, + 6165, 1572, 6165, 6165, 1574, 6165, 6165, 1575, 1573, 6165, + 1577, 1578, 1581, 1596, 1600, 1593, 1598, 1603, 1586, 1611, + 1618, 1608, 1607, 1614, 1615, 1621, 1635, 1626, 1638, 1627, + 1643, 1641, 1645, 1647, 1650, 1651, 1654, 1655, 1656, 1657, + 1659, 1623, 1661, 1658, 1665, 1663, 1667, 1668, 1669, 1676, + 1681, 1672, 1688, 6165, 1684, 1696, 1698, 1694, 1701, 1697, + 1702, 1675, 1704, 1706, 1707, 1693, 1709, 1710, 1712, 1719, + 1713, 1716, 1726, 1721, 6165, 1723, 1725, 1727, 1728, 1729, + 1736, 1730, 1741, 1737, 1743, 1744, 1748, 1745, 1749, 1750, - 1758, 1761, 1760, 1757, 1764, 1775, 1777, 1781, 1778, 1783, - 1784, 1785, 1786, 1787, 1788, 1790, 1797, 1800, 1799, 1801, - 1796, 1808, 1811, 1814, 1803, 1812, 1815, 1817, 1825, 1827, - 1828, 1819, 1823, 1835, 1830, 1834, 1839, 1840, 1842, 1843, - 1844, 1846, 1849, 1852, 1851, 1854, 6033, 1853, 1855, 6033, - 1859, 1860, 1882, 1861, 1863, 1865, 1875, 1864, 1866, 1868, - 1876, 1892, 1886, 1902, 1894, 1895, 1904, 1905, 1906, 1907, - 1909, 1913, 1914, 1915, 1878, 1922, 1927, 1926, 1935, 1937, - 1917, 1929, 1932, 1951, 1933, 1936, 1940, 1943, 1946, 1944, - 1953, 1942, 1960, 1962, 1964, 1968, 6033, 1973, 1966, 1974, + 1754, 1753, 1756, 1765, 6165, 1758, 1767, 1759, 1770, 1761, + 1771, 1772, 1773, 1778, 1779, 1781, 1783, 1784, 1786, 1796, + 1785, 1789, 1793, 1797, 1800, 1799, 1803, 1810, 1807, 1814, + 1815, 1816, 1817, 1818, 1819, 1821, 1826, 1828, 1825, 1836, + 1829, 1848, 1850, 1843, 1832, 1833, 1852, 1834, 1858, 1860, + 1861, 1856, 1862, 1869, 1846, 1868, 1865, 1871, 1878, 1870, + 1880, 1881, 1873, 1879, 1886, 1887, 6165, 1888, 1889, 6165, + 1890, 1892, 1914, 1893, 1896, 1901, 1898, 1902, 1904, 1905, + 1907, 1924, 1918, 1934, 1922, 1926, 1937, 1936, 1939, 1938, + 1942, 1943, 1945, 1946, 1949, 1909, 1961, 1962, 1964, 1970, - 1975, 1982, 1978, 1980, 6033, 1985, 1986, 1984, 1996, 1989, - 1987, 1992, 1938, 1991, 2001, 2002, 2003, 2004, 2009, 2007, - 2016, 6033, 2011, 6033, 2008, 2017, 2019, 2018, 2023, 2020, - 2025, 2026, 6033, 6033, 2028, 2034, 2039, 2042, 2044, 6033, - 2029, 2052, 2049, 2055, 2047, 2048, 2054, 2056, 2059, 2060, - 2069, 2062, 2071, 2064, 2073, 2066, 6033, 2081, 2067, 2085, - 2086, 2076, 2087, 2089, 2093, 2083, 6033, 2097, 2099, 2100, - 2107, 2105, 2102, 2108, 2109, 2113, 2110, 2116, 2117, 2118, - 2119, 2129, 2130, 2120, 2122, 2131, 2139, 6033, 2134, 2138, - 2146, 2142, 2144, 2141, 2145, 2148, 2149, 2153, 2157, 2151, + 1973, 1952, 1959, 1968, 1987, 1969, 1971, 1975, 1972, 1979, + 1977, 1983, 1985, 1990, 1992, 1997, 1994, 2000, 6165, 2008, + 2012, 2003, 2004, 2016, 2014, 2005, 6165, 2018, 2021, 2023, + 2031, 2026, 2028, 2029, 2032, 2036, 2033, 2037, 2042, 2045, + 2038, 2040, 2061, 6165, 2043, 6165, 2046, 2048, 2056, 2058, + 2062, 2063, 2064, 2065, 6165, 6165, 2066, 2067, 2073, 2083, + 2079, 6165, 2081, 2088, 2085, 2090, 2084, 2091, 2094, 2095, + 2096, 2099, 2106, 2101, 2108, 2103, 2107, 2105, 6165, 2117, + 2104, 2122, 2123, 2115, 2124, 2129, 2130, 2126, 6165, 2136, + 2116, 2137, 2145, 2141, 2144, 2146, 2147, 2148, 2151, 2152, - 2155, 2159, 2161, 2169, 2170, 2167, 2172, 2175, 2165, 2176, - 2179, 2185, 2178, 2183, 2186, 2187, 6033, 2188, 2194, 147, - 2189, 2195, 2197, 2199, 2202, 2201, 2198, 2214, 2219, 2215, - 2221, 2217, 2216, 2224, 2226, 2225, 2227, 2228, 2229, 2232, - 6033, 2234, 2236, 2237, 2239, 2241, 2242, 2252, 6033, 2248, - 2253, 2260, 2256, 2261, 2264, 2265, 2269, 2270, 2272, 2273, - 2274, 2276, 2278, 2280, 6033, 2283, 2285, 2288, 2291, 2295, - 2294, 2296, 2297, 2301, 2302, 2303, 2304, 2306, 2308, 2307, - 2309, 2310, 2317, 2314, 2318, 2322, 2324, 6033, 2331, 2327, - 2332, 2334, 2339, 2335, 2349, 2336, 2337, 2345, 2352, 2359, + 2154, 2155, 2157, 2162, 2165, 2161, 2163, 2167, 2179, 6165, + 2160, 2175, 2182, 2180, 2184, 2177, 2181, 2187, 2188, 2189, + 2191, 2193, 2196, 2197, 2198, 2206, 2208, 2201, 2210, 2212, + 2199, 2213, 2219, 2224, 2203, 2223, 2222, 2225, 6165, 2226, + 2229, 2233, 391, 2230, 2234, 2235, 2237, 2239, 2252, 2236, + 2246, 2260, 2238, 2255, 2258, 2259, 2261, 2262, 2264, 2265, + 2269, 2266, 2268, 6165, 2271, 2272, 2274, 2278, 2277, 2280, + 2285, 6165, 2291, 2288, 2297, 2306, 2296, 2294, 2307, 2298, + 2309, 2311, 2313, 2312, 2314, 2316, 2319, 2315, 6165, 2323, + 2324, 2328, 2325, 2332, 2335, 2338, 2336, 2340, 2341, 2342, - 2350, 2356, 2366, 2361, 2369, 2370, 2377, 2375, 2376, 2383, - 2373, 2385, 2387, 2388, 2389, 2391, 2393, 2396, 2395, 2397, - 2404, 2405, 2406, 2410, 2403, 2424, 2429, 2346, 6033, 2416, - 2418, 2422, 2428, 2436, 2432, 2431, 2434, 2438, 2442, 2443, - 2444, 2445, 2454, 2446, 2449, 2450, 2455, 2456, 2458, 2461, - 2465, 2466, 2469, 2472, 2473, 2476, 2243, 6033, 2477, 2479, - 2478, 2481, 2486, 2482, 2493, 2494, 2496, 2487, 2489, 2499, - 2500, 2503, 2504, 2507, 2505, 2509, 2513, 6033, 2515, 2517, - 2516, 2519, 2522, 2526, 2523, 2525, 2535, 2537, 2529, 2538, - 2539, 2540, 6033, 2549, 2551, 2550, 2554, 2552, 2541, 2556, + 2343, 2346, 2344, 2348, 2349, 2350, 2357, 2359, 2352, 2361, + 2362, 6165, 2375, 2364, 2366, 2365, 2376, 2377, 2378, 2389, + 2384, 2385, 2387, 2391, 2404, 2393, 2386, 2407, 2397, 2405, + 2402, 2414, 2415, 2416, 2418, 2422, 2424, 2426, 2428, 2432, + 2430, 2433, 2435, 2437, 2434, 2442, 2444, 2441, 2445, 2447, + 2454, 2460, 2459, 6165, 2462, 2464, 2468, 2469, 2477, 2472, + 2473, 2475, 2474, 2482, 2483, 2484, 2485, 2493, 2489, 2492, + 2494, 2496, 2497, 2498, 2505, 2504, 2506, 2509, 2516, 2510, + 2518, 2519, 6165, 2520, 2524, 2513, 2526, 2528, 2530, 2534, + 2536, 2538, 2539, 2540, 2542, 2544, 2545, 2546, 2547, 2549, - 2558, 2559, 6033, 2562, 2563, 2570, 2571, 2566, 6033, 2574, - 2569, 2573, 2575, 2576, 2577, 2580, 2578, 2584, 2585, 2591, - 2600, 2588, 2592, 6033, 2594, 2607, 2602, 2605, 2604, 2608, - 2610, 2615, 2616, 2617, 2618, 6033, 2629, 2627, 2626, 2640, - 2628, 2635, 2636, 2638, 2641, 2642, 2644, 2645, 6033, 2648, - 2650, 2651, 2652, 2655, 2656, 2657, 2664, 2663, 2666, 2667, - 2671, 2672, 2670, 2673, 2677, 2683, 2679, 2682, 2692, 2680, - 2690, 2694, 2698, 2705, 2706, 2701, 2707, 6033, 2710, 2712, - 2704, 2711, 2714, 2717, 2718, 2719, 2721, 2722, 2726, 2723, - 2724, 2739, 2746, 2727, 2734, 2736, 2742, 2744, 2749, 2748, + 2551, 2554, 6165, 2556, 2555, 2557, 2563, 2568, 2567, 2569, + 2571, 2578, 2580, 2565, 2581, 2582, 2584, 6165, 2592, 2594, + 2590, 2599, 2591, 2596, 2598, 2602, 2603, 6165, 2604, 2605, + 2606, 2613, 2614, 2610, 6165, 2617, 2612, 2618, 2621, 2620, + 2622, 2627, 2624, 2630, 2631, 2636, 2643, 2635, 2645, 6165, + 2637, 2652, 2639, 2653, 2659, 2647, 2648, 2654, 2660, 2664, + 2674, 2666, 6165, 2677, 2675, 2670, 2684, 2682, 2685, 2686, + 2687, 2688, 2689, 2690, 2694, 6165, 2691, 2697, 2698, 2699, + 2702, 2703, 2708, 2718, 2710, 2709, 2717, 2719, 2720, 2713, + 2724, 2723, 2733, 2725, 2736, 2739, 2726, 2742, 2737, 2744, - 2750, 2751, 2758, 2757, 2756, 2765, 2760, 2766, 2774, 2764, - 2771, 2773, 2775, 2763, 2776, 2778, 2780, 2784, 2786, 2789, - 2796, 2799, 2801, 2800, 2802, 2803, 2806, 6033, 2791, 2810, - 2807, 2814, 2817, 2819, 2821, 2829, 2820, 2824, 2827, 2836, - 2838, 2828, 2831, 2830, 2841, 2850, 2846, 6033, 2847, 6033, - 2843, 2851, 2852, 2860, 2855, 6033, 2858, 6033, 2859, 2867, - 2863, 2868, 6033, 2869, 2870, 2871, 2873, 2876, 2877, 2878, - 2881, 2882, 2887, 2883, 2885, 2889, 2893, 2894, 2899, 2901, - 2900, 2902, 2907, 2908, 2909, 2910, 2914, 2915, 2916, 2921, - 2922, 6033, 2924, 2925, 2928, 2930, 2931, 2932, 2933, 2939, + 2746, 2755, 2756, 2757, 2759, 6165, 2762, 2763, 2764, 2752, + 2754, 2766, 2769, 2771, 2774, 2775, 2777, 2778, 2779, 2786, + 2790, 2787, 2795, 2791, 2793, 2788, 2799, 2800, 2801, 2802, + 2809, 2806, 2805, 2814, 2813, 2816, 2823, 2815, 2818, 2824, + 2825, 2826, 2827, 2830, 2828, 2833, 2835, 2839, 2842, 2846, + 2849, 2850, 2852, 2854, 2856, 6165, 2855, 2859, 2857, 2860, + 2865, 2869, 2866, 2876, 2874, 2877, 2878, 2882, 2884, 2879, + 2885, 2887, 2891, 2898, 2894, 6165, 2895, 6165, 2897, 2900, + 2901, 2910, 2906, 6165, 2908, 6165, 2909, 2915, 2916, 2917, + 6165, 2919, 2920, 2921, 2923, 2927, 2925, 2928, 2929, 2931, - 2935, 2938, 2937, 2947, 2941, 2951, 2954, 2962, 2948, 2966, - 6033, 2963, 2965, 2967, 2969, 6033, 2971, 2970, 2972, 2978, - 2974, 2980, 2981, 2982, 2983, 2987, 2989, 2997, 3001, 3002, - 3005, 6033, 3004, 3006, 2991, 2990, 3018, 3020, 3021, 3022, - 3027, 3025, 3029, 3030, 2992, 3012, 3032, 3033, 3041, 3044, - 3037, 3045, 3040, 3046, 3048, 3049, 3050, 3053, 3055, 3056, - 3057, 3060, 3061, 3064, 3059, 3062, 3066, 3065, 6033, 3077, - 3067, 3078, 3084, 3081, 3088, 3069, 3089, 3090, 3091, 3094, - 3100, 3092, 6033, 3095, 6033, 3097, 3111, 3104, 3117, 3113, - 3105, 3118, 3120, 3124, 3126, 3127, 3128, 3129, 3130, 3131, + 2935, 2939, 2937, 2938, 2941, 2943, 2949, 2950, 2951, 2952, + 2958, 2960, 2954, 2961, 2959, 2965, 2969, 2970, 2972, 6165, + 2979, 2971, 2975, 2980, 2982, 2983, 2984, 2985, 2990, 2988, + 2991, 2996, 2998, 2992, 3004, 3010, 3013, 2999, 3020, 6165, + 3016, 3018, 3021, 3022, 6165, 3024, 3023, 3025, 3031, 3027, + 3033, 3034, 3035, 3036, 3039, 3042, 3043, 3050, 3052, 3055, + 3045, 6165, 3058, 3061, 3044, 3059, 3071, 3078, 3074, 3075, + 3080, 3083, 3082, 3073, 3084, 3085, 3088, 3089, 3096, 3097, + 3093, 3100, 3095, 3101, 3110, 3107, 3099, 3103, 3105, 3113, + 3114, 3119, 3120, 3111, 3121, 3116, 3122, 3126, 3129, 6165, - 3134, 3135, 3141, 3142, 3139, 3143, 3149, 3151, 3152, 3154, - 3155, 6033, 6033, 3156, 3157, 3158, 3160, 3164, 3172, 3178, - 3171, 3182, 3168, 3174, 3184, 3191, 6033, 3189, 3192, 3188, - 3194, 3204, 3196, 3201, 3211, 3208, 3206, 3215, 3212, 6033, - 3197, 3216, 3225, 3221, 3223, 3228, 6033, 3227, 6033, 3224, - 3229, 3231, 3233, 3236, 3237, 3238, 3240, 3245, 3247, 3257, - 3246, 3256, 3253, 3258, 3260, 3261, 3268, 3263, 3264, 3265, - 6033, 3270, 3267, 3161, 3272, 3281, 3284, 3282, 3271, 6033, - 3275, 3293, 3278, 3288, 3295, 3299, 3296, 3301, 3303, 3304, - 3302, 3305, 3312, 3307, 3309, 3311, 3323, 3326, 3331, 6033, + 3134, 3135, 3138, 3144, 3137, 3139, 3130, 3141, 3147, 3146, + 3151, 3148, 3149, 6165, 3162, 6165, 3163, 3164, 3169, 3171, + 3166, 3172, 3173, 3175, 3179, 3180, 3181, 3184, 3183, 3185, + 3187, 3191, 3194, 3195, 3211, 3198, 3193, 3207, 3200, 3208, + 3209, 3212, 6165, 6165, 3214, 3215, 3216, 3219, 3221, 3223, + 3226, 3231, 3229, 3232, 3236, 3237, 3248, 6165, 3238, 3244, + 3245, 3246, 3260, 3253, 3262, 3264, 3263, 3256, 3272, 3269, + 6165, 3265, 3273, 3280, 3276, 3279, 3283, 6165, 3278, 6165, + 3281, 3284, 3290, 3292, 3291, 3293, 3294, 3295, 3297, 3305, + 3313, 3302, 3311, 3312, 3316, 3314, 3317, 3325, 3320, 3321, - 3313, 3324, 3334, 3336, 3320, 3337, 3338, 3340, 3342, 3343, - 3344, 3345, 3346, 3347, 3348, 3349, 3356, 3351, 3367, 3352, - 3353, 3370, 3380, 3366, 6033, 3358, 3373, 3375, 3381, 3376, - 3384, 3394, 3397, 3382, 3399, 3400, 3386, 3388, 3404, 3406, - 3411, 3412, 6033, 3414, 3413, 3422, 3417, 3418, 3420, 3423, - 3432, 3425, 3427, 3428, 3435, 3430, 6033, 3446, 3441, 3434, - 3443, 3449, 3457, 3452, 3433, 3456, 3459, 3460, 3462, 3465, - 3466, 3467, 3470, 3471, 6033, 6033, 3473, 3474, 3475, 6033, - 3478, 3476, 3489, 3480, 3481, 3490, 3493, 3492, 3482, 3494, - 3496, 3498, 6033, 3504, 3512, 3503, 3510, 3513, 3521, 3519, + 3322, 6165, 3324, 3326, 3327, 3336, 3338, 3339, 3345, 3328, + 6165, 3335, 3348, 3350, 3352, 3353, 3355, 3357, 3358, 3359, + 3361, 3364, 3360, 3362, 3375, 3368, 3367, 3377, 3387, 3378, + 3389, 6165, 3390, 3384, 3397, 3399, 3392, 3394, 3400, 3401, + 3402, 3405, 3407, 3406, 3408, 3409, 3410, 3412, 3414, 3417, + 3415, 3428, 3429, 3416, 3437, 3438, 3420, 6165, 3430, 3442, + 3443, 3444, 3445, 3447, 3451, 3453, 3454, 3456, 3464, 3457, + 3460, 3467, 3468, 3475, 3470, 6165, 3477, 3462, 3482, 3479, + 3483, 3485, 3487, 3489, 3496, 3493, 3491, 3495, 3498, 3497, + 6165, 3509, 3499, 3500, 3510, 3501, 3520, 3518, 3519, 3522, - 3511, 3520, 3524, 3526, 3525, 3527, 3528, 3531, 3532, 3540, - 3541, 3536, 3538, 3539, 6033, 3542, 3547, 3549, 3551, 3548, - 3555, 6033, 3552, 3560, 3565, 3568, 3563, 3576, 3573, 3578, - 3580, 3561, 3581, 3583, 3585, 3584, 3586, 3593, 3588, 3591, - 3598, 3599, 3601, 6033, 3607, 3608, 3592, 3610, 6033, 3614, - 3621, 3617, 3628, 3618, 3625, 3623, 3632, 6033, 3627, 3629, - 3631, 3634, 3642, 3638, 3646, 3637, 6033, 3641, 3645, 3647, - 6033, 3648, 3654, 3657, 3662, 3650, 3669, 3665, 3667, 3668, - 3666, 6033, 3673, 6033, 3676, 3677, 3680, 6033, 3682, 3683, - 3685, 3687, 3684, 3691, 3692, 3699, 3688, 3700, 3701, 3702, + 3524, 3525, 3528, 3526, 3530, 3531, 3534, 3535, 6165, 6165, + 3537, 3538, 3540, 6165, 3541, 3544, 3548, 3554, 3545, 3547, + 3557, 3558, 3556, 3559, 3561, 3568, 6165, 3569, 3576, 3571, + 3572, 3581, 3583, 3586, 3573, 3580, 3588, 3590, 3592, 3593, + 3594, 3595, 3597, 3605, 3606, 3602, 3601, 3603, 6165, 3610, + 3611, 3613, 3615, 3617, 3619, 6165, 3620, 3624, 3625, 3629, + 3631, 3638, 3641, 3632, 3647, 3642, 3644, 3649, 3650, 3651, + 3652, 3659, 3654, 3656, 3665, 3666, 3670, 6165, 3673, 3675, + 3657, 3679, 6165, 3681, 3689, 3690, 3693, 3676, 3692, 3694, + 3701, 6165, 3696, 3699, 3698, 3660, 3711, 3700, 3713, 3704, - 3703, 3705, 3712, 3704, 3711, 3713, 3714, 6033, 3715, 3717, - 3723, 3724, 3729, 3718, 3726, 3734, 3733, 6033, 6033, 3737, - 6033, 3740, 3741, 3742, 6033, 3744, 3748, 3751, 3749, 3752, - 3754, 3761, 3755, 6033, 3764, 3750, 3767, 3765, 3769, 3772, - 3773, 3775, 3776, 3777, 3780, 6033, 3778, 3779, 3782, 3783, - 3788, 3793, 3789, 3795, 6033, 3800, 3804, 3803, 3807, 3809, - 6033, 3810, 6033, 3811, 3813, 3814, 3818, 3817, 6033, 3823, - 3824, 3828, 3830, 3832, 3831, 3834, 3835, 3841, 3842, 3849, - 3845, 3844, 3846, 6033, 3847, 3851, 3853, 3860, 3848, 3855, - 3864, 3867, 3868, 3869, 3873, 3877, 3871, 3878, 3884, 3882, + 3712, 6165, 3714, 3715, 3716, 6165, 3717, 3718, 3728, 3730, + 3723, 3731, 3732, 3735, 3733, 3736, 6165, 3737, 6165, 3741, + 3746, 3747, 6165, 3749, 3750, 3751, 3753, 3754, 3755, 3759, + 3765, 3767, 3757, 3769, 3770, 3771, 3772, 3774, 3781, 3773, + 3780, 3782, 3783, 6165, 3784, 3786, 3792, 3793, 3798, 3787, + 3795, 3803, 3802, 6165, 6165, 3806, 6165, 3809, 3810, 3811, + 6165, 3813, 3817, 3820, 3818, 3821, 3823, 3830, 3824, 6165, + 3833, 3819, 3834, 3836, 3838, 3839, 3843, 3844, 3845, 3842, + 3846, 3852, 6165, 3849, 3850, 3864, 3848, 3853, 3867, 3872, + 3859, 6165, 3875, 3874, 3865, 3881, 3878, 6165, 3882, 6165, - 3888, 3874, 6033, 3886, 3894, 3880, 3903, 3899, 3900, 3904, - 6033, 3905, 3907, 3908, 6033, 3906, 3890, 3914, 3921, 3915, - 3918, 3922, 3925, 3926, 6033, 3928, 3930, 3924, 3927, 3929, - 3937, 6033, 6033, 3943, 6033, 3945, 3931, 3935, 3947, 3948, - 3952, 3956, 3957, 3959, 3953, 3960, 3963, 3967, 3975, 3976, - 3977, 3978, 3979, 3982, 6033, 6033, 3984, 3985, 3988, 3990, - 3991, 3993, 3994, 4001, 3998, 4006, 4009, 3999, 4016, 6033, - 4013, 4014, 4015, 6033, 3996, 4018, 4020, 4022, 4024, 4026, - 4025, 4027, 4028, 4030, 4032, 4035, 4036, 4040, 4038, 4042, - 4046, 4048, 4049, 4050, 4056, 6033, 4058, 4057, 4059, 4060, + 3884, 3887, 3888, 3890, 3889, 6165, 3893, 3897, 3899, 3894, + 3901, 3903, 3904, 3907, 3910, 3913, 3921, 3914, 3916, 3917, + 6165, 3918, 3922, 3924, 3926, 3930, 3931, 3938, 3934, 3940, + 3935, 3941, 3944, 3946, 3947, 3954, 3950, 3956, 3952, 6165, + 3960, 3962, 3963, 3974, 3965, 3966, 3967, 6165, 3971, 3976, + 3980, 6165, 3978, 3982, 3986, 3988, 3989, 3990, 3993, 3992, + 3996, 6165, 3998, 4000, 3994, 3999, 4013, 4015, 6165, 6165, + 3997, 6165, 4017, 4005, 4019, 4020, 4001, 4021, 4032, 4027, + 4040, 4022, 4025, 4037, 4033, 4035, 4049, 4050, 4051, 4052, + 4053, 4047, 6165, 6165, 4059, 4062, 4056, 4069, 4070, 4054, - 4061, 4063, 4067, 4069, 4070, 6033, 4071, 4073, 4074, 4079, - 4075, 4080, 4094, 4097, 4099, 4087, 4090, 4100, 4104, 4106, - 4107, 6033, 4109, 4108, 4110, 4111, 4118, 4120, 4115, 4122, - 4124, 4126, 4129, 4127, 4136, 4138, 4131, 4139, 4133, 4140, - 6033, 4141, 4150, 4143, 4152, 4153, 4154, 4155, 4156, 4164, - 4161, 4166, 4165, 4168, 6033, 4169, 4170, 4173, 4174, 4176, - 4177, 4182, 4179, 4183, 6033, 4186, 4190, 4192, 4191, 4195, - 4197, 4200, 4201, 4203, 4204, 4211, 6033, 4222, 4207, 4218, - 4220, 4208, 4217, 4221, 4227, 4209, 6033, 4234, 4236, 4228, - 4244, 4224, 4246, 4247, 4248, 4237, 4250, 4251, 4249, 4255, + 4060, 4079, 4075, 4081, 4084, 4085, 4092, 6165, 4072, 4074, + 4087, 4089, 6165, 4093, 4095, 4096, 4097, 4098, 4099, 4104, + 4101, 4102, 4105, 4111, 4122, 4108, 4124, 4106, 4113, 4114, + 4130, 4115, 4116, 4137, 6165, 4131, 4138, 4140, 4141, 4142, + 4143, 4144, 4146, 4147, 6165, 4145, 4149, 4150, 4151, 4156, + 4153, 4161, 4170, 4173, 4176, 4163, 4177, 4179, 4182, 4184, + 4181, 6165, 4187, 4185, 4188, 4189, 4196, 4198, 4193, 4200, + 4202, 4204, 4206, 4209, 4211, 4216, 4213, 4217, 4218, 4219, + 6165, 4223, 4225, 4222, 4230, 4231, 4233, 4234, 4235, 4243, + 4240, 4245, 4244, 4247, 6165, 4248, 4250, 4252, 4253, 4255, - 4256, 4257, 4259, 4267, 4274, 4271, 6033, 4260, 6033, 4269, - 4276, 4285, 4281, 4272, 6033, 4270, 4283, 4288, 4289, 4284, - 6033, 4291, 4295, 4297, 4296, 6033, 4298, 4300, 4302, 4306, - 4310, 4313, 6033, 4316, 4317, 4319, 4327, 4329, 4326, 4328, - 4330, 4332, 4333, 4334, 4335, 4343, 4338, 4340, 6033, 4346, - 4348, 4355, 4356, 4349, 4339, 4360, 4363, 4357, 6033, 4366, - 4365, 4367, 4368, 4369, 4372, 4374, 4381, 4377, 4376, 6033, - 4380, 4384, 4397, 4378, 4388, 6033, 6033, 4393, 4398, 4400, - 4395, 4401, 6033, 4404, 4411, 4406, 4410, 4413, 6033, 6033, - 4415, 6033, 4412, 6033, 4417, 4416, 6033, 6033, 4419, 4420, + 4256, 4261, 4262, 4264, 6165, 4270, 4258, 4265, 4271, 4274, + 4276, 4280, 4281, 4284, 4286, 4287, 6165, 4289, 4291, 4295, + 4296, 4297, 4298, 4299, 4304, 4302, 6165, 4308, 4310, 4312, + 4323, 4314, 4324, 4316, 4325, 4319, 4326, 4329, 4331, 4333, + 4334, 4336, 4337, 4347, 4352, 4349, 6165, 4338, 6165, 4348, + 4354, 4356, 4359, 4361, 4362, 6165, 4363, 4364, 4370, 4371, + 4365, 6165, 4373, 4367, 4372, 4376, 6165, 4375, 4389, 4377, + 4381, 4391, 4395, 6165, 4399, 4400, 4401, 4408, 4410, 4405, + 4412, 4407, 4415, 4413, 4409, 4417, 4418, 4426, 4424, 4422, + 6165, 4428, 4430, 4435, 4437, 4431, 4429, 4439, 4445, 4441, - 4423, 4429, 4426, 6033, 4436, 6033, 4433, 4437, 4439, 4440, - 4442, 6033, 4441, 4444, 4449, 6033, 4443, 4451, 4450, 4454, - 6033, 4458, 4461, 4453, 4459, 6033, 4465, 4471, 4473, 4463, - 4467, 4474, 4480, 4475, 4483, 4484, 4485, 4486, 4487, 4488, - 4492, 4495, 4499, 4501, 4502, 4503, 4504, 4510, 4512, 4505, - 4508, 4515, 4516, 4519, 4522, 4524, 4526, 4527, 4528, 4529, - 4530, 4531, 4534, 4533, 4537, 4544, 4545, 4546, 4547, 4548, - 4549, 4550, 4555, 4559, 4560, 4562, 6033, 4552, 4558, 4563, - 4566, 4565, 4571, 4578, 4582, 4585, 4587, 6033, 4589, 6033, - 4591, 4593, 4594, 4595, 6033, 4596, 4597, 4598, 4599, 4600, + 6165, 4446, 4447, 4448, 4450, 4452, 4453, 4455, 4463, 4459, + 4458, 6165, 4462, 4461, 4466, 4475, 4470, 4479, 6165, 6165, + 4472, 4482, 4484, 4480, 4488, 6165, 4490, 4491, 4492, 4496, + 4493, 6165, 6165, 4498, 6165, 4499, 6165, 4500, 4503, 6165, + 6165, 4505, 4501, 4507, 4508, 4516, 6165, 4521, 6165, 4524, + 4522, 4509, 4511, 4526, 6165, 4528, 4529, 4535, 6165, 4530, + 4538, 4536, 4537, 6165, 4543, 4545, 4540, 4544, 6165, 4549, + 4556, 4546, 4553, 4557, 4558, 4565, 4560, 4561, 4564, 4568, + 4569, 4570, 4572, 4579, 4581, 4583, 4585, 4586, 4587, 4588, + 4591, 4594, 4596, 4597, 4599, 4600, 4602, 4603, 4607, 4611, - 4601, 4602, 4603, 4606, 4607, 4612, 6033, 4618, 4608, 4622, - 4627, 6033, 4628, 4633, 4629, 4634, 4635, 4636, 4638, 4639, - 4643, 4641, 4645, 4649, 4646, 4650, 4654, 4653, 4658, 4655, - 4661, 4662, 4664, 4671, 4674, 4678, 6033, 4665, 6033, 4673, - 4679, 4680, 4683, 4685, 4686, 4688, 6033, 6033, 4689, 4691, - 4696, 4687, 4693, 4700, 4697, 6033, 4704, 4708, 4714, 4705, - 6033, 4710, 4715, 4716, 4721, 6033, 4717, 4722, 4723, 4733, - 4724, 4738, 4734, 4740, 4726, 4741, 4728, 4745, 6033, 6033, - 6033, 6033, 4746, 4730, 4751, 4754, 4755, 4756, 4757, 4759, - 4760, 6033, 4762, 6033, 6033, 4764, 4771, 4763, 4773, 4772, + 4604, 4612, 4613, 4614, 4617, 4618, 4621, 4625, 4628, 4629, + 4630, 4631, 4633, 4634, 4635, 4632, 4639, 4643, 4642, 4647, + 6165, 4636, 4648, 4650, 4660, 4653, 4659, 4661, 4669, 4672, + 4674, 6165, 4676, 6165, 4678, 4665, 4680, 4681, 4682, 6165, + 4684, 4685, 4686, 4687, 4689, 4690, 4692, 4693, 4688, 4696, + 4701, 6165, 4712, 4695, 4709, 4716, 6165, 4719, 4721, 4705, + 4722, 4724, 4726, 4725, 4727, 4730, 4729, 4733, 4735, 4737, + 4744, 4739, 4747, 4742, 4749, 4750, 4751, 4753, 4763, 4756, + 4764, 4760, 6165, 4767, 6165, 4768, 4769, 4772, 4773, 4774, + 4775, 4778, 6165, 6165, 4776, 4780, 4782, 4785, 4787, 4790, - 4770, 4774, 4779, 6033, 4781, 4785, 4786, 4782, 4793, 4795, - 4798, 4799, 4784, 4788, 4807, 4803, 4809, 4800, 4811, 4813, - 4818, 6033, 6033, 4814, 4820, 4821, 4829, 4825, 4826, 4838, - 4833, 4834, 4835, 4836, 4840, 4822, 4847, 4852, 4845, 4842, - 6033, 4853, 4856, 6033, 4849, 6033, 4855, 4857, 4863, 4864, - 4865, 4866, 4867, 4869, 6033, 6033, 4870, 4871, 4873, 4880, - 4876, 4884, 4872, 4883, 4885, 6033, 4886, 6033, 4888, 4890, - 4897, 4898, 4905, 4906, 4909, 4911, 4907, 4912, 6033, 4913, - 4914, 6033, 4916, 4918, 4919, 6033, 4924, 4921, 4929, 4931, - 6033, 4936, 4933, 4938, 6033, 4941, 6033, 4926, 4942, 4944, + 4794, 6165, 4791, 4799, 4802, 4804, 6165, 4792, 4808, 4809, + 4811, 6165, 4812, 4813, 4814, 4816, 4819, 4821, 4825, 4823, + 4826, 4827, 4831, 4834, 6165, 6165, 6165, 6165, 4835, 4837, + 4841, 4843, 4844, 4845, 4846, 4848, 4849, 6165, 4853, 6165, + 6165, 4858, 4860, 4861, 4862, 4866, 4850, 4868, 4870, 6165, + 4871, 4876, 4879, 4872, 4883, 4889, 4891, 4873, 4892, 4885, + 4893, 4900, 4896, 4898, 4895, 4902, 4905, 4909, 6165, 6165, + 4906, 4913, 4914, 4921, 4918, 4922, 4916, 4931, 4924, 4929, + 4926, 4932, 4933, 4936, 4943, 4944, 4940, 4939, 6165, 4948, + 4946, 6165, 4942, 6165, 4950, 4956, 4952, 4958, 4959, 4960, - 4951, 4948, 6033, 4949, 4952, 6033, 4955, 4958, 4959, 4961, - 6033, 4963, 6033, 4964, 4966, 4967, 4971, 4972, 4976, 4973, - 4977, 4978, 4985, 4983, 4989, 6033, 6033, 4997, 4980, 4988, - 4990, 4994, 5004, 4999, 5001, 5007, 6033, 6033, 5009, 6033, - 5011, 5012, 6033, 5002, 5013, 5017, 5018, 5020, 5021, 5022, - 5026, 5028, 5029, 5030, 5031, 5037, 5049, 5033, 5047, 5053, - 5055, 5057, 5059, 5051, 5061, 5062, 5039, 5063, 5064, 5068, - 6033, 5070, 5071, 5073, 6033, 5076, 5078, 5080, 5081, 6033, - 5090, 5083, 5087, 5093, 6033, 5077, 5098, 5099, 5100, 5101, - 5111, 5094, 5104, 5108, 6033, 6033, 6033, 5114, 5118, 6033, + 4962, 4964, 6165, 6165, 6165, 4965, 4966, 4972, 4975, 4976, + 4978, 4967, 4980, 4977, 6165, 4983, 6165, 4981, 4985, 4993, + 4988, 5000, 5003, 5005, 5007, 5002, 5004, 6165, 5008, 5011, + 6165, 5012, 5014, 5015, 6165, 5018, 5020, 5022, 5026, 6165, + 5032, 5023, 5029, 6165, 5036, 6165, 5033, 5037, 5039, 5046, + 5043, 6165, 5041, 5047, 6165, 5050, 5057, 5059, 5052, 6165, + 5054, 6165, 5044, 5067, 5068, 5071, 5058, 5075, 5063, 5060, + 5077, 5085, 5081, 5082, 6165, 6165, 181, 5089, 5084, 5090, + 5092, 5087, 5100, 5095, 5097, 5099, 6165, 6165, 5103, 6165, + 5096, 5102, 6165, 5106, 5111, 5115, 5109, 5113, 5117, 5119, - 5121, 5115, 5106, 5122, 6033, 5124, 5125, 5126, 6033, 6033, - 5127, 5128, 5130, 5139, 6033, 5132, 6033, 5135, 6033, 5136, - 5142, 5145, 5148, 6033, 5149, 5158, 6033, 5161, 5164, 5166, - 5167, 5151, 5153, 5168, 6033, 5175, 5174, 5177, 5181, 5170, - 5178, 5184, 5183, 5191, 5186, 5193, 6033, 5190, 5195, 5197, - 5203, 5187, 5198, 5196, 6033, 5208, 6033, 5205, 5209, 5210, - 5212, 5215, 5217, 5219, 5220, 5223, 5229, 5224, 6033, 5233, - 5235, 6033, 5226, 6033, 5238, 6033, 5230, 5239, 5240, 5245, - 6033, 5242, 5244, 5248, 5251, 6033, 5252, 5254, 5257, 5259, - 6033, 6033, 5260, 5267, 5269, 6033, 5262, 5266, 5273, 5263, + 5122, 5124, 5128, 5129, 5130, 5133, 5137, 5147, 5134, 5149, + 5150, 5154, 5156, 5158, 5160, 5138, 5161, 5162, 5163, 5164, + 5165, 6165, 5167, 5168, 5169, 6165, 5174, 5170, 5179, 5175, + 6165, 5183, 5186, 5189, 5190, 6165, 5191, 5193, 5121, 5194, + 5196, 5206, 5197, 5204, 5208, 6165, 6165, 6165, 5202, 5215, + 6165, 5217, 5218, 5201, 5219, 6165, 5221, 5222, 5223, 6165, + 6165, 5224, 5225, 5227, 5236, 6165, 5228, 6165, 5229, 6165, + 5233, 5239, 5241, 5243, 6165, 5246, 5253, 6165, 5256, 5259, + 5261, 5262, 5245, 5248, 5263, 6165, 5270, 5269, 5272, 5276, + 5266, 5273, 5278, 5281, 5279, 5288, 5280, 5290, 6165, 5283, - 5278, 5275, 5279, 5281, 5291, 5287, 5143, 5282, 5290, 5292, - 5293, 6033, 6033, 6033, 5296, 5298, 5305, 5304, 5307, 5315, - 5311, 6033, 5312, 5314, 5313, 5322, 5320, 5324, 6033, 5321, - 5325, 5326, 5327, 5331, 5328, 5335, 6033, 5342, 5346, 5334, - 5336, 5348, 5355, 5357, 5359, 5360, 6033, 5362, 6033, 6033, - 5349, 6033, 5352, 5363, 5364, 5366, 6033, 5370, 5373, 5371, - 5372, 5376, 5378, 6033, 5388, 5379, 5383, 5384, 6033, 6033, - 5393, 6033, 5395, 5396, 5390, 5403, 5398, 5400, 5406, 5407, - 6033, 5409, 5411, 5413, 5414, 5415, 6033, 5416, 5417, 5419, - 5420, 5423, 5422, 5425, 5427, 5428, 6033, 5430, 5432, 5450, + 5291, 5293, 5294, 5292, 5300, 5301, 6165, 5303, 6165, 5304, + 5306, 5308, 5307, 5309, 5310, 5314, 5313, 5320, 5324, 5326, + 6165, 5328, 5331, 6165, 5332, 6165, 5334, 6165, 5335, 5336, + 5338, 5337, 6165, 5340, 5341, 5343, 5344, 6165, 5347, 5350, + 5349, 5356, 6165, 6165, 5357, 5365, 5362, 6165, 5358, 5370, + 5372, 5373, 5375, 5376, 5379, 5378, 5389, 5381, 5384, 5382, + 5386, 5392, 5390, 6165, 6165, 6165, 5397, 5399, 5407, 5404, + 5405, 5412, 5410, 6165, 5411, 5414, 5415, 5417, 5424, 5421, + 5423, 6165, 5425, 5426, 5427, 5429, 5431, 5432, 5434, 6165, + 5441, 5446, 5448, 5433, 5449, 5456, 5458, 5460, 5461, 6165, - 5446, 6033, 5434, 5445, 6033, 6033, 5456, 5460, 5449, 6033, - 6033, 6033, 5462, 6033, 5464, 5468, 5472, 5476, 5467, 6033, - 5478, 5457, 5479, 6033, 6033, 5480, 5481, 5482, 5484, 6033, - 6033, 5485, 5488, 5486, 5489, 5491, 6033, 5494, 5496, 5502, - 5508, 5514, 5504, 5492, 5509, 5517, 5526, 5499, 5515, 5522, - 5523, 5527, 5525, 5534, 5535, 5531, 5539, 5541, 5542, 6033, - 6033, 5546, 6033, 6033, 5549, 5551, 5553, 5555, 5557, 5559, - 5561, 6033, 5562, 5564, 5565, 5566, 5567, 6033, 5569, 5573, - 5568, 5576, 5570, 5579, 5575, 5585, 6033, 6033, 5577, 5591, - 5581, 5592, 5586, 6033, 5596, 5603, 5598, 5600, 5601, 5606, + 5463, 6165, 6165, 5450, 6165, 5464, 5465, 5467, 5470, 6165, + 5473, 5468, 5474, 5475, 5477, 5479, 6165, 5491, 5480, 5483, + 5488, 6165, 6165, 5496, 6165, 5498, 5499, 5492, 5507, 5503, + 5505, 5509, 5511, 6165, 5490, 5512, 5514, 5517, 5518, 6165, + 5520, 5521, 5522, 5523, 6165, 5526, 5525, 5530, 5531, 5533, + 6165, 5534, 5535, 5551, 5549, 6165, 5536, 5537, 6165, 6165, + 5558, 5560, 5561, 6165, 6165, 6165, 5563, 6165, 5567, 5571, + 5575, 5579, 5570, 6165, 5581, 5546, 5578, 6165, 6165, 5582, + 5583, 5584, 5586, 6165, 6165, 5587, 5588, 5590, 5591, 5593, + 6165, 5596, 5597, 5598, 5605, 5610, 5601, 5613, 5611, 5625, - 5602, 6033, 5608, 5610, 6033, 6033, 5611, 6033, 6033, 6033, - 6033, 6033, 6033, 6033, 6033, 5613, 6033, 5609, 5628, 5630, - 5632, 6033, 5615, 5625, 5617, 5623, 5633, 6033, 5635, 5637, - 5636, 5640, 5639, 5644, 5646, 5649, 5651, 5650, 5652, 5655, - 5653, 5660, 5657, 5656, 5674, 6033, 6033, 6033, 5661, 5663, - 5665, 5671, 5682, 5684, 5687, 5689, 5673, 5690, 5691, 5693, - 5695, 5696, 5697, 5705, 5701, 5702, 5703, 5704, 5707, 5711, - 5709, 5717, 6033, 5718, 6033, 5713, 6033, 6033, 5720, 5722, - 5727, 5725, 5736, 5738, 5729, 5734, 5737, 5740, 5742, 5749, - 6033, 5739, 5746, 6033, 5750, 5751, 6033, 5752, 5753, 5754, + 5621, 5607, 5622, 5617, 5626, 5628, 5627, 5630, 5640, 5635, + 5643, 5645, 5647, 6165, 6165, 5649, 6165, 6165, 5651, 5654, + 5656, 5658, 5660, 5662, 5664, 6165, 5665, 5667, 5668, 5669, + 5670, 6165, 5672, 5676, 5671, 5679, 5673, 5682, 5678, 5688, + 6165, 6165, 5680, 5636, 5527, 5694, 5684, 6165, 5696, 5703, + 5700, 5701, 5689, 5704, 5705, 6165, 5707, 5709, 6165, 6165, + 5710, 6165, 6165, 6165, 6165, 6165, 6165, 6165, 6165, 5712, + 6165, 5711, 5717, 5720, 5727, 6165, 5723, 5728, 5729, 5730, + 5731, 6165, 5732, 5736, 5734, 5738, 5741, 5742, 5735, 5744, + 5749, 5752, 5751, 5754, 5753, 5758, 5757, 5759, 5760, 6165, - 5757, 5761, 5759, 5762, 5763, 5776, 6033, 6033, 5765, 5769, - 5771, 5780, 5777, 5789, 5791, 5781, 5788, 5794, 5784, 5801, - 6033, 5797, 5800, 5807, 6033, 5798, 5804, 5808, 5809, 5810, - 5817, 5812, 5813, 6033, 5818, 6033, 5821, 5824, 5822, 5816, - 5825, 5830, 5837, 5834, 5832, 6033, 5814, 5841, 5846, 5847, - 5849, 5851, 5852, 5853, 5855, 5857, 5858, 5864, 5861, 5866, - 5867, 5869, 5870, 6033, 5876, 5871, 6033, 5877, 5878, 5879, - 5880, 5884, 6033, 5888, 5881, 5891, 5892, 5895, 5896, 6033, - 5902, 5905, 5906, 6033, 5907, 6033, 6033, 5909, 5897, 5908, - 5918, 5920, 6033, 6033, 6033, 5941, 5948, 5955, 5962, 5969, + 6165, 6165, 5761, 5764, 5772, 5773, 5781, 5785, 5788, 5790, + 5774, 5777, 5791, 5795, 5796, 5783, 5792, 5804, 5799, 5802, + 5805, 5803, 5812, 5806, 5809, 5816, 6165, 5817, 6165, 5818, + 6165, 6165, 5820, 5824, 5822, 5826, 5833, 5835, 5834, 5831, + 5837, 5838, 5840, 5842, 6165, 5846, 5849, 6165, 5847, 5850, + 6165, 5851, 5852, 5853, 5855, 5860, 5858, 5859, 5865, 5863, + 6165, 6165, 5866, 5874, 5875, 5879, 5876, 5888, 5883, 5880, + 5890, 5891, 5887, 5899, 6165, 5898, 5900, 5902, 6165, 5903, + 5889, 5904, 5909, 5910, 5918, 5913, 5914, 6165, 5915, 6165, + 5920, 5921, 5917, 5923, 5924, 5925, 5934, 5926, 5936, 6165, - 88, 5976, 5983, 5990, 5997, 6004, 6011, 6018, 6025 + 5937, 5939, 5941, 5944, 5946, 5948, 5950, 5951, 5955, 5956, + 5962, 5959, 5965, 5966, 5952, 5969, 5967, 6165, 5976, 5968, + 6165, 5977, 5978, 5979, 5980, 5984, 6165, 5989, 5981, 5990, + 5991, 5994, 5995, 6165, 5997, 6004, 6001, 6165, 6005, 6165, + 6165, 6006, 6007, 6012, 6014, 6016, 6165, 6165, 6165, 6045, + 6052, 6059, 6066, 6073, 6080, 6087, 88, 6094, 6101, 6108, + 6115, 6122, 6129, 6136, 6143, 6150, 6157 } ; -static const flex_int16_t yy_def[3110] = +static const flex_int16_t yy_def[3168] = { 0, - 3095, 1, 3096, 3096, 3097, 3097, 3098, 3098, 3099, 3099, - 3100, 3100, 3095, 3101, 3095, 3095, 3095, 3095, 3102, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3103, 3095, 3095, 3095, 3103, 3104, 3095, 3095, - 3095, 3104, 3105, 3095, 3095, 3095, 3095, 3105, 3106, 3095, - 3095, 3095, 3106, 3107, 3095, 3108, 3095, 3107, 3107, 3101, - 3101, 3095, 3109, 3102, 3109, 3102, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3149, 1, 3150, 3150, 3151, 3151, 3152, 3152, 3153, 3153, + 3154, 3154, 3155, 3155, 3156, 3156, 3149, 3157, 3149, 3149, + 3149, 3149, 3158, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3159, 3149, 3149, 3149, + 3159, 3160, 3149, 3149, 3149, 3160, 3161, 3149, 3149, 3149, + 3149, 3161, 3162, 3149, 3149, 3149, 3162, 3163, 3149, 3164, + 3149, 3163, 3163, 3165, 3149, 3149, 3149, 3149, 3165, 3166, + 3149, 3149, 3149, 3166, 3157, 3157, 3149, 3167, 3158, 3167, + 3158, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3103, 3103, 3104, 3104, 3105, 3105, 3095, 3106, 3106, - 3107, 3107, 3108, 3108, 3107, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3159, 3159, 3160, 3160, + 3161, 3161, 3149, 3162, 3162, 3163, 3163, 3164, 3164, 3163, + 3165, 3165, 3149, 3166, 3166, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3107, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3163, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3107, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3163, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3095, 3101, 3107, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3163, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3107, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3095, 3095, 3101, 3095, 3095, 3101, 3101, 3095, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3163, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3149, 3149, 3157, 3149, 3149, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3107, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3095, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3163, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3149, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3107, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, + 3157, 3163, 3163, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3163, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, - 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3149, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3163, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3149, 3149, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3163, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3149, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3163, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, - 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3149, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, 3157, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3149, 3157, 3149, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3149, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3163, 3157, 3157, 3157, 3157, + 3157, 3157, 3149, 3149, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3095, - 3101, 3095, 3101, 3095, 3101, 3101, 3095, 3095, 3101, 3101, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, 3157, + 3157, 3157, 3157, 3163, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3149, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3149, 3149, 3157, 3149, 3157, 3149, 3157, 3157, 3149, + 3149, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3149, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, - 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3163, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3149, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3149, 3149, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, + 3157, 3149, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3149, 3149, 3149, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3163, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, + 3157, 3149, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3095, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3095, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3095, 3095, 3101, 3101, 3095, + 3157, 3157, 3149, 3149, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3149, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3149, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3149, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3149, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3149, 3163, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3149, 3157, 3149, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3095, 3095, - 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3095, 3101, - 3101, 3101, 3101, 3095, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3095, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3095, 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3149, 3149, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3149, + 3149, 3157, 3157, 3157, 3157, 3149, 3157, 3149, 3157, 3149, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3149, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3095, - 3101, 3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3095, 3095, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3149, 3157, 3149, 3157, 3149, 3157, 3157, + 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3157, 3157, 3149, 3149, 3157, 3157, 3157, 3149, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3149, 3149, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, - 3101, 3095, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3095, - 3095, 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3095, - 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, - 3095, 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, - 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, + 3157, 3149, 3149, 3157, 3149, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, + 3157, 3149, 3149, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3149, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3149, 3149, + 3157, 3157, 3157, 3149, 3149, 3149, 3157, 3149, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3149, 3149, 3157, + 3157, 3157, 3157, 3149, 3149, 3157, 3157, 3157, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, - 3101, 3095, 3101, 3101, 3095, 3095, 3101, 3095, 3095, 3095, - 3095, 3095, 3095, 3095, 3095, 3101, 3095, 3101, 3101, 3101, - 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3095, 3101, 3095, 3101, 3095, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3095, 3101, 3101, 3095, 3101, 3101, 3101, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3149, 3157, 3149, 3149, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3149, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3149, 3149, + 3157, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3157, + 3149, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3157, + 3157, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, - 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, - 3101, 3101, 3101, 3095, 3101, 3101, 3095, 3101, 3101, 3101, - 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3095, - 3101, 3101, 3101, 3095, 3101, 3095, 3095, 3101, 3101, 3101, - 3101, 3101, 3095, 3095, 0, 3095, 3095, 3095, 3095, 3095, + 3149, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, 3157, + 3149, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3149, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3149, 3149, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3149, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3149, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, - 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095 + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3157, + 3157, 3157, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, + 3149, 3157, 3157, 3157, 3157, 3157, 3149, 3157, 3157, 3157, + 3157, 3157, 3157, 3149, 3157, 3157, 3157, 3149, 3157, 3149, + 3149, 3157, 3157, 3157, 3157, 3157, 3149, 3149, 0, 3149, + 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, + 3149, 3149, 3149, 3149, 3149, 3149, 3149 } ; -static const flex_int16_t yy_nxt[6074] = +static const flex_int16_t yy_nxt[6206] = { 0, - 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, - 14, 14, 18, 20, 21, 22, 23, 24, 25, 26, - 14, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 14, 14, 14, 42, - 44, 45, 46, 44, 45, 46, 49, 50, 49, 50, - 51, 47, 51, 70, 47, 70, 70, 52, 70, 52, - 54, 55, 56, 57, 70, 18, 54, 55, 56, 57, - 71, 18, 58, 60, 61, 62, 71, 82, 58, 60, - 61, 62, 72, 71, 63, 103, 73, 93, 70, 71, - 63, 15, 16, 17, 65, 66, 67, 75, 71, 75, + 18, 19, 20, 21, 22, 23, 22, 18, 18, 18, + 18, 18, 22, 24, 25, 26, 27, 28, 29, 30, + 18, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 18, 18, 18, 46, + 48, 49, 50, 48, 49, 50, 53, 54, 53, 54, + 55, 51, 55, 85, 51, 85, 85, 56, 85, 56, + 58, 59, 60, 61, 85, 22, 58, 59, 60, 61, + 86, 22, 62, 64, 65, 66, 86, 97, 62, 64, + 65, 66, 87, 86, 67, 118, 88, 108, 85, 86, + 67, 19, 20, 21, 69, 70, 71, 75, 76, 77, - 75, 71, 75, 68, 105, 158, 104, 94, 75, 76, - 71, 71, 69, 15, 16, 17, 65, 66, 67, 71, - 71, 83, 77, 78, 119, 68, 79, 71, 84, 71, - 95, 80, 85, 172, 69, 86, 71, 97, 142, 142, - 81, 71, 71, 71, 96, 98, 87, 71, 113, 144, - 88, 99, 144, 89, 100, 90, 91, 141, 71, 106, - 152, 101, 173, 102, 71, 110, 92, 107, 72, 111, - 152, 71, 73, 108, 149, 149, 114, 109, 71, 71, - 115, 156, 71, 120, 155, 112, 116, 121, 71, 117, - 340, 159, 71, 130, 71, 131, 118, 122, 123, 125, + 78, 86, 22, 72, 120, 86, 119, 109, 86, 79, + 157, 157, 73, 19, 20, 21, 69, 70, 71, 75, + 76, 77, 78, 184, 22, 72, 81, 82, 83, 128, + 90, 79, 90, 90, 73, 90, 86, 84, 81, 82, + 83, 90, 91, 86, 86, 98, 92, 93, 86, 84, + 94, 156, 99, 86, 110, 95, 100, 86, 112, 101, + 86, 145, 134, 146, 96, 86, 113, 87, 111, 86, + 102, 88, 147, 114, 103, 86, 115, 104, 148, 105, + 106, 159, 178, 116, 159, 117, 86, 121, 86, 125, + 107, 86, 153, 126, 167, 122, 154, 86, 86, 135, - 124, 71, 126, 71, 132, 134, 161, 71, 138, 127, - 133, 226, 139, 128, 129, 135, 140, 71, 71, 136, - 137, 146, 157, 146, 146, 75, 146, 75, 75, 151, - 75, 151, 151, 70, 151, 70, 70, 154, 70, 71, - 75, 71, 75, 75, 70, 75, 71, 71, 152, 162, - 165, 75, 76, 71, 71, 71, 71, 174, 71, 160, - 167, 71, 163, 71, 71, 164, 168, 166, 169, 71, - 176, 71, 177, 170, 171, 71, 175, 71, 186, 191, - 71, 178, 179, 180, 184, 71, 71, 182, 71, 71, - 181, 185, 187, 183, 71, 188, 193, 71, 71, 194, + 155, 123, 129, 136, 86, 124, 130, 164, 164, 127, + 167, 223, 131, 137, 138, 132, 139, 86, 86, 174, + 174, 149, 133, 140, 170, 161, 141, 161, 161, 86, + 161, 150, 176, 142, 246, 151, 152, 143, 144, 90, + 86, 90, 90, 166, 90, 166, 166, 171, 166, 171, + 171, 169, 171, 85, 86, 85, 85, 90, 85, 90, + 90, 86, 90, 86, 85, 177, 179, 86, 90, 91, + 181, 86, 86, 86, 182, 86, 86, 86, 86, 194, + 86, 185, 187, 180, 86, 86, 86, 183, 188, 186, + 189, 190, 191, 86, 196, 86, 86, 193, 195, 192, - 71, 196, 71, 71, 192, 197, 202, 199, 189, 190, - 203, 201, 200, 204, 71, 71, 71, 71, 71, 195, - 71, 198, 205, 71, 209, 71, 71, 206, 71, 214, - 211, 71, 71, 150, 212, 208, 207, 71, 213, 71, - 71, 210, 71, 216, 71, 71, 215, 219, 222, 71, - 228, 231, 217, 225, 227, 71, 221, 220, 218, 223, - 71, 71, 232, 224, 71, 71, 71, 229, 237, 71, - 230, 233, 71, 71, 71, 142, 142, 238, 241, 234, - 236, 240, 235, 243, 242, 71, 149, 149, 245, 239, - 244, 144, 71, 146, 144, 146, 146, 151, 146, 151, + 197, 86, 86, 86, 198, 86, 199, 200, 205, 204, + 206, 202, 86, 86, 201, 207, 211, 86, 208, 203, + 86, 213, 86, 86, 86, 214, 216, 221, 86, 86, + 217, 209, 210, 222, 86, 225, 86, 227, 86, 86, + 86, 212, 86, 219, 229, 215, 218, 224, 220, 226, + 86, 86, 234, 86, 86, 231, 228, 230, 86, 232, + 86, 86, 233, 86, 86, 236, 242, 86, 248, 239, + 86, 86, 86, 235, 237, 86, 247, 243, 251, 241, + 238, 244, 86, 245, 240, 249, 86, 86, 250, 252, + 86, 253, 86, 255, 257, 261, 86, 86, 86, 260, - 151, 75, 151, 75, 75, 152, 75, 71, 246, 248, - 250, 71, 247, 154, 71, 71, 71, 71, 71, 71, - 71, 71, 252, 71, 249, 255, 251, 254, 258, 253, - 260, 71, 261, 148, 257, 71, 71, 256, 71, 262, - 259, 264, 71, 265, 266, 71, 267, 276, 71, 270, - 71, 268, 71, 275, 271, 71, 263, 71, 71, 272, - 71, 71, 278, 279, 282, 273, 274, 71, 269, 71, - 71, 284, 280, 71, 277, 71, 71, 71, 285, 71, - 71, 281, 71, 286, 291, 292, 71, 298, 288, 71, - 287, 289, 301, 283, 71, 290, 71, 293, 71, 71, + 86, 254, 256, 258, 167, 264, 157, 157, 262, 159, + 86, 265, 159, 164, 164, 259, 263, 161, 275, 161, + 161, 166, 161, 166, 166, 90, 166, 90, 90, 167, + 90, 171, 266, 171, 171, 86, 171, 169, 174, 174, + 267, 268, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 272, 86, 278, 175, 269, 274, 271, 273, + 270, 281, 280, 277, 276, 173, 86, 86, 282, 286, + 279, 284, 86, 285, 86, 86, 283, 287, 290, 86, + 86, 295, 288, 291, 86, 86, 86, 86, 292, 86, + 86, 298, 299, 86, 293, 294, 296, 302, 86, 289, - 294, 303, 295, 71, 302, 300, 299, 71, 71, 305, - 326, 307, 308, 304, 296, 71, 297, 71, 71, 306, - 311, 71, 71, 71, 313, 314, 71, 309, 312, 310, - 71, 71, 71, 71, 316, 71, 71, 71, 71, 315, - 71, 317, 318, 319, 321, 323, 71, 71, 71, 71, - 71, 322, 328, 71, 330, 320, 324, 329, 71, 71, - 334, 325, 71, 332, 337, 71, 71, 71, 327, 71, - 71, 331, 333, 343, 339, 71, 71, 344, 346, 71, - 335, 336, 342, 71, 71, 338, 341, 71, 71, 71, - 349, 350, 71, 71, 351, 345, 71, 353, 354, 347, + 86, 300, 304, 86, 297, 305, 86, 306, 86, 86, + 301, 86, 86, 86, 172, 86, 311, 312, 86, 313, + 308, 307, 314, 309, 315, 86, 303, 310, 321, 323, + 318, 320, 86, 319, 86, 86, 316, 325, 317, 86, + 322, 324, 327, 86, 328, 86, 86, 331, 86, 333, + 86, 332, 326, 86, 334, 86, 86, 86, 86, 329, + 86, 86, 86, 335, 337, 86, 330, 86, 339, 86, + 336, 86, 86, 86, 86, 341, 343, 86, 86, 348, + 86, 338, 342, 344, 349, 86, 86, 340, 345, 354, + 86, 350, 347, 346, 352, 86, 351, 86, 357, 86, - 71, 71, 348, 71, 71, 152, 357, 71, 71, 71, - 147, 71, 71, 362, 364, 355, 356, 358, 352, 360, - 71, 71, 365, 359, 71, 368, 366, 361, 71, 367, - 71, 71, 363, 71, 71, 71, 71, 374, 71, 71, - 375, 376, 71, 378, 373, 369, 71, 370, 71, 372, - 377, 379, 371, 71, 71, 71, 381, 380, 71, 382, - 71, 71, 71, 71, 385, 71, 386, 389, 71, 383, - 391, 71, 387, 71, 388, 384, 71, 71, 393, 392, - 71, 71, 390, 71, 71, 394, 71, 396, 397, 398, - 71, 399, 71, 71, 403, 71, 71, 71, 400, 404, + 86, 86, 353, 360, 86, 359, 86, 86, 86, 86, + 86, 363, 364, 167, 362, 355, 356, 86, 86, 358, + 366, 367, 86, 369, 368, 361, 86, 365, 370, 86, + 371, 373, 86, 86, 374, 86, 86, 86, 167, 86, + 377, 86, 86, 86, 86, 86, 384, 385, 382, 380, + 378, 375, 86, 86, 372, 86, 376, 388, 379, 86, + 386, 86, 381, 86, 387, 86, 86, 383, 86, 86, + 394, 86, 395, 86, 396, 397, 389, 393, 86, 390, + 86, 398, 392, 399, 391, 86, 86, 86, 401, 86, + 402, 86, 86, 86, 86, 405, 86, 86, 406, 86, - 71, 71, 395, 71, 406, 402, 71, 409, 71, 71, - 71, 401, 411, 414, 71, 405, 71, 415, 71, 71, - 407, 408, 413, 71, 145, 71, 410, 423, 416, 412, - 71, 71, 71, 71, 143, 426, 425, 427, 430, 417, - 71, 424, 418, 429, 71, 431, 71, 419, 420, 421, - 422, 434, 71, 428, 432, 433, 435, 71, 71, 439, - 71, 436, 71, 437, 442, 71, 438, 71, 71, 440, - 71, 441, 443, 71, 444, 446, 71, 71, 71, 71, - 451, 71, 452, 445, 453, 71, 71, 71, 447, 457, - 71, 469, 456, 454, 450, 71, 448, 71, 449, 71, + 86, 165, 412, 400, 409, 407, 408, 403, 404, 411, + 86, 413, 86, 410, 86, 86, 414, 86, 86, 416, + 86, 418, 86, 86, 86, 417, 86, 86, 86, 423, + 86, 86, 86, 415, 419, 424, 86, 422, 86, 86, + 420, 163, 426, 86, 421, 427, 86, 429, 425, 428, + 86, 433, 434, 431, 430, 436, 86, 86, 86, 435, + 86, 86, 86, 86, 449, 86, 443, 445, 454, 86, + 432, 86, 86, 455, 86, 446, 450, 447, 444, 86, + 437, 451, 86, 438, 452, 453, 86, 606, 439, 440, + 441, 442, 86, 448, 86, 456, 457, 86, 86, 458, - 71, 71, 458, 71, 459, 455, 461, 71, 462, 71, - 460, 470, 464, 71, 463, 71, 468, 71, 471, 71, - 472, 483, 71, 71, 71, 465, 473, 71, 466, 71, - 467, 71, 474, 71, 484, 71, 475, 485, 488, 486, - 71, 487, 499, 490, 476, 71, 477, 500, 478, 152, - 71, 71, 501, 71, 489, 498, 502, 71, 71, 71, - 506, 479, 71, 71, 480, 71, 481, 71, 482, 71, - 503, 491, 492, 505, 508, 71, 504, 71, 507, 511, - 71, 493, 510, 494, 495, 496, 512, 71, 497, 509, - 514, 71, 71, 71, 520, 515, 513, 516, 518, 71, + 86, 459, 86, 460, 462, 86, 461, 463, 86, 464, + 86, 86, 467, 465, 86, 466, 86, 471, 86, 86, + 86, 86, 472, 86, 473, 476, 477, 162, 488, 86, + 468, 470, 86, 474, 469, 86, 86, 86, 475, 86, + 478, 479, 481, 483, 482, 86, 490, 480, 484, 86, + 489, 86, 86, 491, 86, 86, 492, 503, 86, 86, + 86, 485, 493, 86, 486, 86, 487, 86, 494, 86, + 508, 167, 495, 505, 86, 506, 504, 507, 519, 510, + 496, 86, 497, 86, 498, 520, 509, 86, 86, 518, + 521, 86, 523, 522, 86, 86, 86, 499, 525, 842, - 71, 71, 517, 71, 521, 525, 519, 71, 71, 71, - 71, 71, 71, 523, 71, 528, 152, 529, 530, 522, - 71, 524, 71, 71, 71, 527, 535, 71, 71, 536, - 532, 71, 531, 526, 71, 538, 71, 534, 533, 71, - 539, 71, 541, 543, 71, 71, 71, 537, 71, 71, - 71, 551, 71, 542, 552, 540, 71, 545, 547, 546, - 544, 550, 554, 71, 71, 553, 71, 621, 71, 548, - 556, 549, 71, 71, 71, 71, 557, 558, 559, 71, - 561, 563, 71, 71, 555, 71, 560, 567, 562, 71, - 564, 71, 566, 71, 71, 71, 565, 71, 568, 71, + 500, 86, 501, 528, 502, 86, 86, 511, 512, 86, + 526, 86, 86, 524, 527, 86, 86, 513, 86, 514, + 515, 516, 529, 532, 517, 531, 530, 86, 86, 86, + 537, 540, 538, 533, 86, 534, 535, 86, 536, 86, + 541, 86, 86, 539, 545, 86, 86, 86, 549, 550, + 86, 86, 548, 543, 542, 86, 544, 86, 86, 86, + 86, 555, 547, 86, 86, 86, 556, 86, 86, 558, + 546, 559, 86, 552, 553, 551, 86, 554, 86, 561, + 86, 86, 634, 86, 557, 86, 560, 562, 564, 86, + 86, 563, 567, 572, 570, 566, 86, 86, 565, 573, - 71, 71, 571, 71, 569, 572, 71, 573, 71, 71, - 71, 575, 579, 71, 71, 574, 570, 580, 71, 71, - 582, 576, 578, 71, 584, 71, 577, 71, 583, 71, - 581, 71, 585, 71, 587, 589, 586, 71, 590, 71, - 71, 71, 71, 597, 71, 71, 588, 150, 599, 71, - 600, 592, 71, 598, 71, 71, 596, 591, 593, 71, - 594, 595, 71, 71, 71, 604, 601, 602, 607, 605, - 603, 610, 71, 71, 71, 609, 71, 71, 606, 71, - 71, 613, 71, 71, 608, 71, 71, 612, 617, 616, - 71, 619, 71, 71, 71, 611, 620, 71, 71, 71, + 574, 571, 86, 568, 86, 569, 86, 86, 576, 86, + 86, 577, 578, 86, 581, 579, 86, 86, 575, 583, + 86, 86, 584, 86, 580, 86, 586, 587, 86, 582, + 86, 86, 588, 86, 585, 86, 591, 86, 589, 86, + 592, 86, 593, 86, 86, 86, 86, 86, 599, 595, + 594, 590, 603, 86, 86, 602, 598, 600, 601, 596, + 86, 597, 86, 605, 86, 607, 86, 86, 86, 86, + 86, 86, 86, 617, 86, 609, 86, 610, 619, 86, + 86, 604, 612, 86, 86, 618, 624, 608, 616, 611, + 613, 615, 614, 86, 621, 86, 86, 86, 620, 627, - 650, 614, 633, 615, 71, 618, 622, 71, 623, 632, - 71, 148, 631, 624, 636, 625, 634, 71, 71, 71, - 635, 626, 71, 627, 637, 71, 628, 629, 638, 644, - 640, 643, 639, 630, 641, 71, 71, 642, 71, 71, - 645, 647, 71, 71, 71, 652, 71, 71, 71, 71, - 71, 71, 646, 71, 71, 147, 658, 71, 71, 654, - 662, 653, 648, 649, 655, 71, 659, 651, 71, 656, - 657, 152, 660, 661, 663, 664, 665, 71, 71, 71, - 666, 71, 71, 71, 71, 71, 71, 71, 672, 674, - 676, 71, 667, 669, 675, 71, 670, 668, 673, 677, + 86, 86, 630, 622, 629, 86, 623, 86, 86, 86, + 625, 86, 626, 86, 633, 86, 86, 636, 86, 86, + 628, 632, 86, 637, 639, 86, 631, 86, 86, 86, + 638, 86, 635, 653, 86, 641, 86, 667, 640, 86, + 642, 86, 643, 652, 86, 651, 86, 644, 656, 645, + 654, 660, 655, 86, 659, 646, 86, 647, 657, 86, + 648, 649, 658, 664, 86, 86, 86, 650, 663, 86, + 86, 670, 661, 86, 665, 662, 86, 672, 86, 86, + 666, 86, 86, 86, 86, 86, 669, 86, 668, 678, + 86, 674, 86, 673, 679, 86, 675, 86, 671, 683, - 679, 671, 71, 71, 71, 71, 71, 678, 71, 71, - 71, 681, 685, 71, 680, 684, 71, 682, 71, 683, - 690, 703, 686, 71, 71, 691, 71, 693, 71, 687, - 694, 71, 688, 695, 689, 71, 692, 696, 71, 71, - 697, 71, 698, 71, 699, 701, 702, 71, 71, 700, - 71, 71, 71, 71, 704, 705, 706, 707, 71, 71, - 711, 71, 71, 710, 71, 712, 71, 71, 71, 714, - 716, 71, 71, 717, 708, 71, 71, 709, 71, 71, - 713, 719, 71, 723, 71, 718, 720, 715, 725, 726, - 721, 71, 71, 722, 71, 730, 727, 724, 71, 71, + 167, 676, 685, 682, 684, 677, 680, 681, 86, 86, + 687, 86, 86, 86, 86, 86, 86, 86, 86, 692, + 694, 686, 696, 86, 86, 695, 689, 697, 690, 693, + 688, 699, 691, 86, 86, 86, 698, 86, 701, 86, + 86, 86, 86, 86, 705, 86, 700, 704, 713, 86, + 86, 710, 706, 702, 715, 703, 711, 86, 86, 707, + 86, 709, 708, 712, 714, 86, 716, 86, 717, 86, + 718, 86, 719, 86, 722, 86, 86, 720, 86, 721, + 723, 86, 86, 86, 86, 726, 86, 86, 727, 725, + 731, 730, 724, 86, 86, 86, 86, 732, 86, 86, - 71, 71, 732, 71, 733, 71, 728, 731, 735, 729, - 71, 71, 71, 736, 71, 71, 737, 71, 71, 744, - 71, 738, 740, 742, 71, 71, 734, 741, 145, 71, - 739, 71, 750, 745, 71, 71, 71, 743, 71, 752, - 748, 751, 71, 71, 746, 747, 749, 753, 754, 71, - 71, 71, 755, 759, 71, 761, 756, 758, 71, 71, - 757, 71, 71, 760, 71, 762, 764, 766, 71, 763, - 71, 765, 71, 771, 71, 768, 71, 71, 71, 71, - 71, 767, 774, 71, 776, 773, 780, 777, 71, 769, - 770, 778, 71, 772, 71, 71, 784, 71, 775, 782, + 734, 86, 736, 86, 737, 729, 86, 728, 86, 86, + 743, 86, 733, 86, 739, 738, 86, 86, 735, 740, + 86, 742, 746, 741, 744, 747, 86, 750, 86, 745, + 748, 86, 86, 86, 752, 86, 753, 751, 86, 86, + 755, 749, 756, 757, 86, 86, 86, 86, 86, 86, + 764, 86, 762, 760, 86, 86, 86, 86, 754, 86, + 758, 761, 770, 759, 765, 160, 768, 86, 86, 763, + 86, 769, 767, 766, 86, 86, 771, 772, 773, 774, + 86, 86, 86, 775, 779, 777, 86, 776, 781, 778, + 86, 780, 86, 86, 86, 782, 784, 86, 783, 86, - 71, 785, 71, 71, 786, 71, 779, 781, 71, 783, - 788, 71, 71, 790, 71, 71, 71, 71, 796, 789, - 71, 797, 787, 791, 71, 71, 71, 71, 71, 798, - 792, 71, 793, 71, 794, 71, 795, 71, 805, 71, - 799, 800, 71, 803, 71, 801, 71, 802, 804, 806, - 810, 807, 71, 71, 71, 71, 808, 71, 71, 71, - 819, 809, 71, 817, 71, 71, 820, 71, 71, 812, - 811, 71, 813, 814, 815, 71, 816, 71, 818, 822, - 824, 823, 71, 71, 821, 71, 71, 825, 71, 71, - 828, 829, 830, 831, 832, 827, 826, 71, 71, 71, + 86, 785, 86, 791, 86, 788, 86, 86, 86, 86, + 786, 86, 787, 794, 86, 793, 86, 796, 797, 789, + 790, 86, 800, 792, 798, 86, 801, 795, 86, 804, + 802, 86, 806, 86, 805, 86, 86, 86, 808, 799, + 803, 86, 86, 810, 86, 86, 86, 86, 816, 86, + 86, 86, 86, 817, 86, 86, 809, 86, 807, 818, + 811, 86, 812, 813, 86, 814, 819, 815, 825, 86, + 820, 822, 86, 823, 86, 821, 86, 86, 86, 824, + 86, 86, 830, 826, 827, 86, 86, 86, 86, 86, + 839, 86, 158, 837, 86, 828, 829, 832, 831, 86, - 71, 71, 152, 71, 71, 834, 840, 839, 835, 71, - 837, 71, 71, 841, 836, 833, 838, 71, 71, 71, - 71, 843, 847, 71, 71, 842, 71, 848, 850, 71, - 853, 71, 844, 845, 71, 849, 71, 71, 71, 846, - 851, 855, 71, 852, 71, 857, 859, 71, 71, 71, - 856, 861, 71, 71, 854, 860, 71, 71, 71, 71, - 858, 71, 71, 874, 143, 71, 862, 873, 875, 877, - 71, 871, 71, 864, 863, 71, 872, 876, 71, 878, - 865, 71, 879, 880, 866, 71, 71, 867, 881, 71, - 884, 71, 71, 71, 868, 869, 71, 870, 892, 882, + 86, 86, 86, 833, 834, 835, 836, 86, 838, 86, + 841, 840, 86, 843, 844, 847, 845, 86, 86, 848, + 846, 86, 849, 86, 86, 850, 851, 86, 852, 86, + 86, 86, 167, 86, 854, 86, 86, 859, 855, 860, + 857, 86, 853, 86, 856, 858, 86, 861, 86, 862, + 863, 86, 867, 86, 86, 868, 870, 86, 86, 86, + 873, 864, 865, 869, 86, 86, 86, 871, 86, 875, + 86, 86, 866, 879, 86, 86, 86, 86, 872, 86, + 876, 86, 880, 881, 874, 86, 86, 86, 86, 878, + 86, 86, 895, 882, 86, 877, 896, 894, 898, 86, - 71, 71, 897, 71, 896, 71, 883, 71, 885, 886, - 893, 887, 898, 71, 888, 71, 895, 906, 894, 889, - 71, 899, 71, 901, 71, 890, 891, 71, 900, 902, - 903, 71, 905, 71, 71, 71, 904, 71, 71, 71, - 71, 909, 71, 913, 71, 71, 907, 912, 71, 71, - 916, 71, 71, 71, 908, 920, 918, 977, 910, 911, - 914, 71, 915, 71, 922, 71, 923, 926, 921, 917, - 71, 924, 71, 71, 919, 925, 927, 71, 71, 929, - 930, 71, 71, 928, 71, 71, 71, 931, 933, 71, - 934, 71, 932, 71, 935, 71, 71, 71, 940, 71, + 892, 884, 883, 86, 893, 885, 86, 897, 886, 86, + 899, 86, 887, 86, 900, 888, 86, 901, 905, 904, + 86, 86, 889, 890, 86, 891, 913, 86, 86, 902, + 903, 86, 906, 907, 86, 908, 86, 917, 909, 86, + 86, 914, 918, 910, 934, 915, 920, 919, 86, 911, + 912, 86, 921, 916, 86, 922, 86, 923, 86, 924, + 86, 925, 927, 86, 86, 926, 928, 86, 86, 86, + 86, 86, 86, 931, 86, 935, 86, 938, 86, 929, + 86, 86, 86, 942, 944, 86, 936, 930, 86, 86, + 932, 933, 937, 940, 86, 945, 954, 86, 939, 943, - 937, 71, 943, 938, 71, 71, 71, 71, 71, 71, - 941, 936, 942, 71, 71, 945, 939, 71, 946, 948, - 950, 71, 949, 71, 944, 71, 951, 71, 71, 956, - 71, 947, 71, 958, 957, 71, 954, 952, 71, 71, - 71, 955, 71, 71, 71, 959, 964, 71, 961, 966, - 953, 967, 71, 71, 965, 71, 71, 960, 969, 71, - 963, 71, 71, 71, 962, 968, 71, 71, 71, 980, - 71, 71, 975, 71, 71, 71, 970, 71, 973, 971, - 981, 972, 974, 985, 984, 978, 982, 979, 71, 976, - 71, 71, 983, 988, 71, 987, 71, 71, 71, 71, + 946, 86, 947, 948, 941, 949, 86, 86, 951, 86, + 86, 86, 950, 952, 86, 86, 955, 86, 956, 86, + 86, 953, 86, 86, 958, 86, 86, 959, 957, 86, + 960, 962, 86, 965, 86, 963, 86, 964, 86, 86, + 86, 86, 86, 86, 961, 967, 970, 968, 973, 86, + 86, 971, 972, 966, 86, 978, 86, 86, 86, 980, + 979, 86, 86, 86, 969, 976, 86, 86, 974, 86, + 977, 86, 86, 988, 86, 975, 983, 981, 86, 989, + 86, 986, 982, 86, 86, 86, 86, 985, 991, 987, + 984, 86, 86, 990, 86, 992, 86, 86, 86, 86, - 71, 71, 986, 71, 997, 990, 992, 998, 1000, 71, - 71, 989, 71, 71, 71, 1002, 71, 991, 1003, 993, - 995, 71, 994, 996, 71, 71, 999, 71, 71, 1001, - 71, 1004, 71, 1008, 1011, 1005, 71, 1006, 71, 1010, - 71, 71, 1015, 71, 1012, 1007, 1017, 71, 71, 1014, - 1013, 1009, 71, 71, 1020, 152, 71, 71, 1019, 71, - 1023, 1022, 71, 1016, 71, 71, 71, 71, 71, 1026, - 1018, 1021, 71, 71, 71, 1038, 71, 71, 71, 71, - 1039, 71, 1029, 1043, 1024, 1025, 1027, 1041, 71, 71, - 1028, 71, 1030, 1040, 1031, 71, 1044, 1062, 1032, 71, + 999, 997, 86, 1002, 993, 994, 86, 1003, 995, 86, + 86, 996, 86, 86, 1004, 1000, 86, 998, 1001, 1007, + 86, 1009, 1010, 86, 1006, 1005, 1008, 86, 86, 86, + 86, 86, 86, 1019, 86, 1020, 1012, 1014, 86, 86, + 1011, 86, 86, 1022, 86, 86, 86, 86, 1013, 86, + 1015, 1017, 1021, 1016, 1018, 1024, 86, 1025, 1028, 86, + 1026, 86, 1023, 86, 1027, 86, 1029, 1033, 1031, 86, + 1030, 86, 1032, 86, 86, 86, 1037, 1034, 86, 1038, + 1039, 86, 86, 86, 86, 1042, 86, 1035, 1036, 1041, + 1043, 167, 86, 86, 86, 1046, 1040, 1045, 1044, 86, - 1033, 3095, 1042, 1045, 1034, 71, 1035, 71, 71, 1048, - 1046, 1036, 1051, 1047, 1049, 71, 1037, 71, 71, 71, - 71, 1050, 71, 1054, 1052, 1057, 71, 71, 71, 1063, - 71, 1056, 1053, 1055, 1064, 71, 1058, 1061, 1065, 71, - 71, 1060, 71, 1066, 1067, 71, 71, 1059, 71, 71, - 71, 71, 1068, 71, 1079, 71, 71, 71, 1078, 71, - 1082, 1069, 1083, 1070, 71, 1071, 71, 1080, 1081, 1085, - 1072, 1104, 1073, 71, 1084, 71, 1088, 71, 1074, 71, - 1090, 71, 1091, 1075, 1076, 1089, 71, 71, 71, 1094, - 1077, 71, 1086, 71, 1087, 71, 1095, 71, 71, 71, + 86, 86, 86, 86, 1049, 86, 86, 1061, 1047, 86, + 1064, 86, 1048, 1062, 86, 86, 1052, 86, 86, 1050, + 86, 1066, 86, 1053, 175, 1051, 1054, 86, 1086, 1063, + 1055, 86, 1056, 1067, 1068, 86, 1057, 86, 1058, 86, + 1065, 1071, 1069, 1059, 1073, 1070, 1072, 86, 1060, 86, + 86, 86, 86, 1074, 1075, 86, 86, 1078, 86, 86, + 1081, 173, 86, 1080, 1077, 86, 1076, 1079, 1087, 1088, + 1082, 1085, 86, 1084, 86, 86, 1089, 86, 1090, 1083, + 1091, 86, 86, 86, 86, 86, 86, 1092, 86, 1103, + 86, 1093, 86, 1106, 1102, 1107, 86, 1105, 86, 1094, - 71, 1093, 71, 1100, 71, 71, 1092, 1097, 1098, 71, - 1103, 1101, 1096, 1099, 71, 71, 71, 71, 1105, 1102, - 71, 71, 71, 1112, 71, 1108, 1109, 1107, 1110, 71, - 71, 71, 71, 71, 1106, 1114, 71, 1111, 71, 71, - 1113, 71, 71, 1120, 1121, 1117, 1122, 71, 1119, 1125, - 1115, 1116, 71, 1124, 1118, 71, 1123, 71, 1127, 1128, - 71, 71, 71, 1130, 1129, 71, 1131, 71, 71, 71, - 1126, 1132, 71, 71, 1133, 71, 1139, 71, 1141, 71, - 71, 1134, 71, 1135, 71, 1137, 71, 1136, 1138, 71, - 3095, 1143, 1142, 1144, 71, 1140, 71, 1145, 71, 71, + 86, 1095, 1104, 86, 1108, 86, 1096, 86, 1097, 1112, + 86, 1113, 1109, 86, 1098, 1115, 86, 86, 86, 1099, + 1100, 86, 1110, 1119, 1111, 86, 1101, 86, 1116, 86, + 1118, 86, 1120, 1114, 86, 1117, 86, 1121, 1125, 86, + 1122, 86, 86, 1123, 86, 86, 86, 1128, 1126, 86, + 86, 86, 1124, 86, 172, 86, 86, 1135, 86, 86, + 1127, 86, 1132, 1130, 1133, 1129, 1131, 1134, 1137, 86, + 1136, 86, 1138, 1139, 86, 86, 86, 86, 86, 86, + 86, 1140, 1145, 1146, 1147, 1142, 86, 1149, 1141, 1148, + 1150, 1144, 86, 1143, 86, 1153, 86, 86, 86, 1155, - 71, 1146, 71, 1147, 1148, 1149, 71, 1151, 1153, 1150, - 71, 1152, 71, 71, 1157, 71, 1154, 1158, 71, 1156, - 71, 71, 71, 71, 1159, 1161, 71, 1162, 1155, 71, - 71, 71, 71, 71, 1166, 71, 1168, 1169, 1170, 1160, - 1171, 1163, 71, 71, 71, 1167, 1173, 71, 1164, 1172, - 1165, 71, 71, 1176, 71, 71, 1178, 71, 71, 71, - 1177, 71, 71, 1179, 71, 1174, 71, 1180, 71, 1183, - 71, 1175, 71, 1184, 71, 1185, 1189, 1190, 71, 1181, - 71, 1182, 71, 71, 1187, 71, 1186, 1193, 71, 71, - 1192, 71, 71, 1188, 1197, 1191, 71, 1194, 71, 71, + 1154, 86, 1156, 86, 86, 1151, 1157, 86, 86, 86, + 1152, 1158, 86, 1164, 86, 1166, 86, 86, 86, 86, + 86, 86, 1162, 1160, 1159, 1168, 1161, 1163, 86, 86, + 86, 1167, 1169, 1170, 1165, 86, 86, 86, 1171, 86, + 1172, 1173, 86, 86, 1174, 1180, 1175, 1176, 1177, 86, + 86, 1178, 1182, 1183, 86, 1179, 1181, 86, 86, 86, + 86, 86, 1187, 1186, 86, 86, 1184, 86, 86, 1193, + 86, 1191, 1194, 86, 86, 86, 86, 1185, 86, 1195, + 86, 1196, 1188, 1192, 1189, 1197, 1198, 1190, 86, 1201, + 86, 1199, 86, 86, 86, 86, 1203, 86, 1202, 1204, - 71, 71, 71, 1195, 1196, 1199, 1203, 71, 71, 1198, - 71, 71, 71, 1209, 71, 71, 1204, 1207, 1200, 3095, - 1202, 1211, 1206, 1205, 1208, 1201, 1212, 71, 71, 71, - 71, 1210, 71, 1213, 71, 1215, 1214, 71, 71, 71, - 71, 71, 71, 1216, 1218, 71, 1224, 71, 1221, 71, - 71, 1217, 71, 1219, 71, 71, 71, 1222, 1351, 1220, - 1228, 71, 1234, 1225, 1223, 71, 71, 1227, 1226, 71, - 1230, 1235, 1236, 71, 71, 1229, 1237, 71, 71, 1231, - 1239, 1232, 71, 71, 1233, 71, 71, 71, 1238, 71, - 1243, 71, 1242, 71, 1246, 1249, 71, 1240, 71, 1245, + 86, 86, 86, 1205, 86, 1208, 86, 1209, 1200, 86, + 86, 86, 86, 1214, 86, 1215, 86, 1210, 1206, 86, + 1207, 86, 1212, 86, 1218, 86, 86, 1211, 1217, 1216, + 1213, 1219, 86, 1222, 1223, 86, 86, 86, 86, 86, + 1220, 1228, 86, 86, 1221, 1224, 167, 86, 86, 86, + 86, 86, 86, 1237, 1225, 1233, 1239, 1230, 1227, 86, + 1232, 1234, 1231, 1226, 1235, 86, 1229, 1238, 86, 1236, + 1240, 86, 86, 86, 86, 86, 1241, 86, 86, 86, + 1244, 86, 86, 1250, 86, 86, 1242, 86, 1243, 1247, + 86, 86, 1245, 86, 1248, 167, 1254, 1246, 86, 1251, - 1241, 71, 1247, 1250, 71, 1244, 1251, 71, 71, 71, - 71, 1254, 1248, 1253, 71, 71, 71, 71, 1255, 71, - 71, 71, 71, 71, 1252, 1256, 1261, 71, 1259, 1257, - 71, 71, 1260, 1262, 1258, 71, 1266, 71, 1271, 1263, - 71, 1265, 1267, 1264, 71, 71, 1270, 71, 71, 71, - 71, 1268, 71, 1273, 1272, 1269, 1277, 1275, 71, 71, - 1276, 1278, 71, 71, 1280, 71, 1282, 1274, 1279, 71, - 1322, 1281, 71, 1291, 71, 1292, 1289, 1283, 1290, 71, - 1284, 1285, 71, 71, 1295, 1286, 71, 1293, 71, 71, - 71, 1287, 1294, 1296, 1297, 1288, 71, 1298, 71, 1300, + 1249, 86, 1261, 1256, 86, 1252, 1253, 86, 1260, 86, + 86, 86, 1257, 1255, 1258, 1262, 1264, 1259, 1263, 86, + 86, 1265, 86, 1266, 86, 86, 86, 86, 86, 86, + 1267, 1270, 86, 1269, 1273, 1276, 86, 86, 86, 1272, + 1268, 86, 1277, 1274, 1271, 86, 1278, 1275, 86, 86, + 1280, 86, 1281, 86, 86, 86, 86, 86, 1279, 86, + 1282, 86, 86, 86, 1283, 86, 1288, 1286, 1284, 1289, + 86, 1287, 86, 1285, 86, 86, 1293, 86, 86, 86, + 1290, 1292, 1298, 1291, 1297, 1295, 1301, 1294, 86, 86, + 86, 86, 1299, 1300, 1296, 1303, 1305, 86, 86, 86, - 71, 71, 71, 1301, 71, 1302, 71, 1299, 71, 71, - 71, 1310, 1311, 1305, 1307, 3095, 71, 71, 71, 71, - 1304, 1303, 1308, 71, 1312, 1314, 1306, 1313, 1309, 71, - 1315, 71, 1316, 1323, 1317, 71, 1318, 71, 1319, 1320, - 1321, 71, 71, 1327, 71, 71, 1324, 71, 1328, 71, - 1326, 71, 1331, 1325, 1329, 71, 71, 71, 71, 71, - 1338, 1337, 71, 71, 1333, 1332, 1330, 71, 71, 71, - 1339, 71, 1336, 1341, 71, 1334, 1335, 1340, 71, 71, - 1343, 1344, 71, 1342, 1348, 71, 71, 1347, 1350, 71, - 71, 71, 71, 1352, 71, 71, 1345, 1353, 1356, 71, + 86, 1306, 86, 1304, 86, 1310, 86, 165, 1318, 1302, + 86, 1320, 1308, 1309, 1319, 86, 1307, 86, 86, 1317, + 86, 1323, 1311, 1321, 1322, 1312, 1313, 86, 86, 86, + 1314, 86, 1326, 1324, 1325, 86, 1315, 86, 1328, 86, + 1316, 86, 1329, 86, 1330, 86, 86, 86, 86, 1338, + 86, 1339, 1333, 1335, 86, 86, 1327, 86, 86, 1340, + 86, 1331, 1341, 1332, 1336, 1337, 1334, 86, 1347, 1342, + 1348, 1349, 86, 86, 1343, 86, 1344, 86, 1345, 1351, + 1346, 86, 86, 1350, 1355, 86, 86, 86, 86, 1356, + 86, 1354, 1352, 1359, 1357, 86, 86, 86, 86, 1353, - 71, 1349, 71, 1355, 1346, 1358, 71, 71, 1359, 71, - 1354, 1363, 71, 71, 1360, 1357, 71, 71, 71, 1365, - 71, 1361, 71, 1362, 1369, 1367, 71, 1368, 71, 71, - 71, 1371, 71, 1364, 1373, 71, 71, 1366, 71, 71, - 1375, 1377, 71, 1378, 1370, 1372, 1374, 1376, 71, 1379, - 71, 71, 71, 71, 71, 1380, 1385, 1382, 1386, 1383, - 1381, 1388, 71, 71, 71, 71, 1384, 71, 1387, 71, - 1392, 71, 71, 1390, 1389, 71, 71, 1396, 1397, 71, - 1391, 1399, 71, 71, 71, 1398, 71, 71, 71, 71, - 71, 71, 1393, 71, 1406, 1394, 1400, 71, 71, 1395, + 1365, 1360, 86, 1366, 1361, 86, 86, 86, 1358, 86, + 86, 86, 1364, 1367, 1369, 1362, 1363, 86, 86, 86, + 1371, 1368, 86, 86, 1370, 1372, 86, 1375, 1376, 86, + 1378, 86, 86, 86, 1379, 1373, 1380, 86, 1377, 86, + 1384, 86, 1381, 86, 1374, 1382, 1386, 86, 1383, 86, + 1387, 86, 86, 86, 1391, 86, 1388, 86, 86, 86, + 86, 1393, 86, 1385, 86, 1395, 1397, 86, 86, 86, + 86, 1396, 1399, 1389, 1390, 1401, 86, 1392, 86, 1394, + 86, 86, 86, 1400, 86, 1398, 1403, 1405, 1404, 1406, + 1402, 86, 1407, 86, 86, 86, 1409, 86, 1408, 1413, - 1403, 71, 1401, 1404, 71, 71, 1402, 71, 1405, 1410, - 1413, 1407, 1411, 71, 1415, 71, 1409, 71, 71, 1416, - 71, 71, 1408, 71, 1412, 1419, 1414, 1418, 71, 71, - 71, 71, 1426, 1417, 1424, 1420, 1428, 1425, 1421, 71, - 71, 71, 71, 1422, 1429, 1427, 1423, 1431, 71, 71, - 1430, 71, 1432, 71, 71, 71, 1436, 71, 71, 1437, - 1433, 71, 1439, 71, 71, 71, 1444, 1435, 71, 71, - 71, 1448, 1445, 1438, 1434, 1441, 71, 71, 1440, 71, - 71, 1442, 1443, 71, 71, 71, 71, 1446, 1449, 1447, - 71, 1455, 71, 71, 1451, 71, 71, 1456, 1450, 1452, + 1410, 1414, 1411, 86, 86, 86, 1416, 86, 1415, 86, + 1412, 86, 86, 1417, 1420, 86, 86, 167, 86, 86, + 1425, 1426, 1419, 86, 1428, 86, 86, 86, 1418, 1427, + 86, 86, 1422, 86, 86, 86, 1421, 86, 1423, 1429, + 86, 1435, 1424, 86, 86, 1430, 1432, 1433, 86, 86, + 86, 1431, 86, 1434, 1439, 1440, 86, 1436, 86, 1444, + 86, 86, 1438, 1442, 1445, 86, 86, 86, 1437, 1443, + 1446, 1441, 86, 86, 1449, 1447, 1450, 86, 1453, 86, + 1448, 1454, 1451, 86, 1458, 1452, 1455, 86, 86, 1456, + 86, 1461, 1459, 1457, 1460, 86, 1462, 86, 86, 86, - 1453, 1457, 1454, 71, 1459, 71, 1460, 71, 1461, 1462, - 1458, 71, 1465, 1466, 71, 1467, 1464, 71, 71, 71, - 71, 1468, 1469, 71, 71, 71, 1471, 71, 1463, 1470, - 71, 71, 71, 1476, 71, 71, 71, 71, 1475, 71, - 71, 1473, 1472, 1478, 1479, 1474, 1482, 71, 1487, 71, - 1480, 1483, 71, 1484, 1477, 71, 1481, 71, 1485, 71, - 1486, 71, 71, 71, 71, 1495, 1490, 1491, 1488, 71, - 71, 71, 1498, 71, 1489, 1496, 71, 71, 71, 71, - 1492, 1501, 1494, 1493, 71, 1500, 71, 71, 71, 71, - 1506, 71, 1499, 71, 1509, 1497, 1502, 71, 3095, 71, + 86, 86, 86, 86, 86, 1466, 1467, 86, 1469, 163, + 86, 86, 86, 1474, 1463, 86, 86, 1465, 1471, 1475, + 1468, 86, 86, 86, 1464, 1478, 86, 1470, 1472, 1473, + 86, 86, 86, 86, 1476, 1479, 86, 86, 86, 86, + 1477, 1480, 1485, 1486, 1481, 1484, 86, 1482, 1483, 86, + 86, 1487, 86, 1490, 1491, 86, 1488, 86, 1489, 86, + 162, 1492, 1496, 1497, 1495, 86, 1493, 86, 86, 86, + 86, 1498, 86, 1499, 1500, 86, 86, 86, 1494, 86, + 1501, 1504, 86, 1503, 86, 1507, 1502, 86, 86, 1506, + 86, 86, 86, 1513, 1505, 1510, 1509, 1515, 1514, 86, - 1510, 1512, 71, 1503, 71, 1504, 1508, 1505, 1513, 71, - 1507, 1511, 71, 71, 71, 71, 71, 1514, 1515, 71, - 71, 1519, 1522, 71, 1517, 1520, 1516, 71, 1523, 1518, - 71, 1527, 71, 71, 71, 1524, 1529, 71, 1521, 1528, - 71, 71, 71, 71, 71, 1532, 1526, 1525, 1530, 71, - 1531, 71, 1537, 1533, 71, 1534, 71, 1539, 1540, 71, - 71, 1535, 1536, 71, 71, 71, 1544, 1545, 71, 1543, - 1547, 71, 71, 71, 1538, 1548, 71, 1542, 1541, 1549, - 71, 71, 71, 71, 71, 1552, 71, 1555, 1546, 71, - 71, 71, 1550, 1554, 71, 71, 71, 1551, 71, 1559, + 86, 86, 1516, 86, 86, 1511, 86, 1508, 86, 1518, + 1521, 1512, 86, 86, 86, 86, 1526, 1522, 86, 86, + 1517, 1529, 86, 1519, 1527, 1520, 86, 86, 86, 86, + 1532, 86, 1523, 1525, 1524, 1531, 86, 86, 86, 86, + 86, 86, 1540, 86, 1528, 1530, 86, 1533, 86, 1541, + 1534, 1543, 86, 1537, 1544, 86, 1535, 1536, 1539, 86, + 1542, 1538, 86, 86, 1545, 86, 1546, 86, 86, 86, + 86, 1550, 86, 86, 1548, 1551, 1547, 1554, 86, 86, + 1549, 1558, 86, 1560, 1559, 1555, 1553, 86, 1552, 86, + 86, 86, 86, 1556, 1557, 86, 1563, 86, 86, 1564, - 71, 1561, 71, 1553, 1556, 1562, 71, 71, 1566, 1560, - 1558, 1557, 71, 71, 71, 71, 1563, 1564, 1569, 1571, - 71, 71, 71, 71, 1574, 1572, 1567, 71, 71, 71, - 1570, 1565, 1568, 1577, 71, 71, 1580, 71, 71, 1576, - 1579, 71, 1573, 71, 71, 71, 71, 1587, 71, 1575, - 71, 71, 71, 1578, 71, 1582, 1581, 1588, 1585, 1591, - 71, 71, 1583, 1584, 71, 1592, 1594, 71, 1589, 1596, - 1586, 1590, 1595, 1598, 1593, 71, 71, 1600, 71, 71, - 71, 1597, 71, 71, 71, 71, 1605, 71, 1602, 1603, - 1599, 71, 1606, 71, 71, 71, 71, 1611, 1610, 1601, + 86, 1565, 1561, 1562, 86, 1570, 1571, 86, 86, 1568, + 86, 86, 1566, 86, 86, 1575, 1567, 1576, 1574, 86, + 1578, 86, 86, 86, 1569, 1579, 1572, 1580, 86, 86, + 86, 1573, 86, 86, 86, 1583, 86, 1586, 86, 1577, + 86, 86, 86, 1585, 86, 1581, 1582, 1590, 86, 1592, + 86, 86, 86, 1584, 86, 1587, 86, 1597, 1591, 1588, + 1589, 1593, 86, 86, 86, 86, 1595, 86, 1594, 1600, + 1602, 86, 86, 86, 86, 1605, 1598, 1603, 86, 1596, + 1601, 1599, 86, 86, 167, 86, 1608, 1604, 86, 1607, + 1610, 1611, 86, 86, 1606, 86, 86, 86, 86, 1619, - 71, 1607, 71, 71, 71, 71, 1624, 1604, 1617, 1609, - 71, 1608, 1612, 1614, 71, 71, 1615, 71, 71, 71, - 1618, 1619, 1613, 1633, 1622, 71, 1621, 1626, 1616, 1623, - 1625, 71, 1630, 71, 71, 71, 1628, 1620, 71, 1627, - 71, 1629, 71, 71, 1634, 71, 71, 1631, 1637, 1636, - 71, 1638, 1640, 71, 71, 1639, 1632, 71, 71, 71, - 1643, 71, 71, 71, 1642, 1635, 71, 1644, 71, 71, - 71, 1652, 71, 71, 71, 71, 1641, 71, 71, 71, - 71, 1645, 71, 1648, 1649, 1650, 1646, 1651, 1647, 1657, - 71, 71, 1653, 1655, 71, 1654, 1659, 71, 1660, 1656, + 1612, 86, 1609, 86, 86, 86, 1613, 1614, 1620, 86, + 1617, 86, 86, 160, 1615, 1616, 1624, 86, 1623, 1626, + 1628, 1621, 1618, 86, 1622, 1625, 86, 1630, 1627, 86, + 1632, 86, 1629, 86, 86, 86, 86, 86, 86, 1637, + 86, 1634, 1635, 1631, 86, 1638, 86, 86, 86, 86, + 1643, 1642, 86, 1633, 1639, 86, 86, 86, 86, 1650, + 1636, 1652, 1641, 86, 1640, 86, 1647, 1645, 86, 1648, + 1644, 86, 86, 1651, 86, 1657, 1646, 1653, 158, 1655, + 1654, 1649, 1656, 1658, 86, 1659, 86, 86, 86, 1661, + 1663, 86, 1660, 86, 1662, 86, 86, 86, 86, 1665, - 1658, 71, 71, 71, 71, 71, 1663, 71, 71, 1661, - 71, 3095, 1665, 71, 1667, 1662, 1675, 71, 71, 1666, - 1664, 1670, 1668, 1671, 71, 1669, 71, 1674, 1672, 1676, - 71, 71, 1680, 71, 1679, 1673, 1678, 71, 1677, 71, - 71, 71, 71, 71, 71, 1683, 1684, 71, 71, 1692, - 1681, 1693, 71, 1687, 71, 71, 71, 1689, 1682, 1686, - 1690, 1685, 71, 1691, 71, 71, 1688, 71, 71, 71, - 71, 71, 1702, 71, 71, 1695, 1694, 71, 1760, 1697, - 1699, 71, 1696, 1698, 71, 71, 1704, 71, 1701, 1703, - 1705, 71, 1706, 1708, 1700, 71, 1709, 71, 1714, 1711, + 1664, 86, 86, 1670, 1671, 1669, 86, 1673, 86, 86, + 86, 1672, 86, 86, 86, 1666, 86, 1667, 86, 1675, + 86, 1668, 1676, 86, 86, 1677, 86, 86, 1686, 86, + 1678, 1674, 86, 86, 86, 86, 1679, 1685, 1680, 86, + 1681, 1682, 86, 86, 1683, 1684, 1691, 86, 86, 1687, + 86, 86, 86, 1689, 86, 1688, 1693, 86, 1694, 86, + 86, 86, 86, 1690, 86, 1695, 1696, 1697, 1692, 1699, + 1702, 1701, 1698, 1703, 1700, 86, 86, 86, 1704, 86, + 1708, 1709, 86, 1710, 86, 86, 86, 1714, 86, 1713, + 1705, 1711, 86, 86, 86, 1706, 86, 86, 86, 1717, - 1710, 71, 71, 1715, 71, 71, 1707, 71, 1712, 71, - 71, 1720, 1719, 1722, 71, 1713, 1716, 71, 1723, 71, - 1717, 71, 1726, 1718, 71, 71, 1724, 1721, 71, 71, - 1728, 1727, 1730, 1725, 71, 1734, 71, 71, 71, 1732, - 71, 71, 71, 1729, 71, 1733, 71, 1731, 1735, 71, - 71, 71, 1738, 71, 1746, 1739, 1736, 1744, 71, 71, - 71, 1737, 1740, 1741, 1747, 1742, 71, 1743, 1749, 71, - 71, 71, 1748, 71, 71, 1754, 71, 71, 71, 1745, - 71, 71, 1758, 71, 71, 71, 1750, 1753, 71, 1751, - 1761, 71, 1752, 1756, 71, 71, 1757, 71, 1755, 1762, + 86, 1707, 1718, 1712, 86, 1715, 86, 86, 86, 1721, + 1727, 86, 1716, 86, 1720, 1719, 1723, 1725, 1726, 1724, + 86, 86, 86, 1722, 86, 86, 1728, 86, 86, 86, + 1736, 1730, 86, 1729, 86, 1731, 86, 1733, 1732, 86, + 1740, 1739, 86, 1738, 86, 86, 1735, 1744, 1737, 86, + 86, 86, 1734, 1742, 1741, 1748, 1743, 86, 86, 86, + 1749, 86, 86, 1745, 1753, 1750, 86, 1754, 1747, 86, + 1746, 1757, 1751, 86, 1756, 86, 86, 86, 86, 1760, + 1752, 1758, 86, 1759, 1755, 86, 86, 1764, 1761, 86, + 1768, 86, 86, 86, 86, 1766, 86, 86, 1762, 1769, - 1759, 71, 1763, 1766, 1764, 1767, 71, 1765, 71, 71, - 1768, 1771, 71, 1769, 71, 71, 71, 71, 71, 1778, - 71, 1773, 71, 1772, 71, 71, 71, 1770, 1774, 1775, - 1781, 1785, 1779, 71, 1776, 1782, 71, 71, 1777, 71, - 1780, 1787, 1783, 1784, 71, 1789, 1786, 71, 1788, 71, - 71, 71, 1790, 71, 1791, 71, 71, 71, 71, 71, - 71, 71, 71, 1796, 71, 71, 71, 1800, 1797, 71, - 1806, 71, 1798, 1792, 1794, 1795, 1799, 1793, 1801, 71, - 71, 1807, 1808, 71, 1803, 1804, 71, 1809, 71, 71, - 1811, 1802, 1805, 71, 71, 71, 1814, 71, 1817, 71, + 1763, 1767, 1765, 86, 86, 86, 86, 86, 86, 1778, + 86, 1772, 1780, 1770, 1773, 86, 1771, 1774, 86, 1775, + 1781, 1776, 1777, 1783, 86, 86, 86, 86, 1782, 86, + 86, 1779, 1788, 86, 86, 86, 1792, 86, 86, 86, + 86, 86, 3149, 1787, 1794, 1784, 1786, 1785, 167, 86, + 1790, 86, 86, 1791, 1795, 1789, 1796, 1797, 86, 1793, + 1800, 86, 1802, 86, 1799, 86, 86, 1798, 86, 1806, + 86, 86, 86, 86, 86, 86, 1801, 86, 1804, 1808, + 86, 86, 1813, 3149, 1803, 1807, 1809, 1805, 86, 1810, + 86, 86, 1811, 1814, 1818, 1812, 1816, 86, 1815, 1817, - 1810, 71, 1812, 1815, 3095, 1816, 1818, 71, 1813, 1819, - 71, 1821, 71, 71, 1822, 1820, 1825, 71, 1827, 71, - 1823, 1829, 1824, 1826, 71, 71, 71, 71, 1828, 1831, - 71, 71, 1834, 71, 1833, 71, 71, 1835, 71, 1836, - 71, 71, 1843, 71, 1830, 71, 71, 71, 71, 1848, - 1837, 1838, 1839, 1845, 71, 1832, 71, 1840, 1846, 71, - 1841, 1842, 71, 1844, 1851, 71, 1853, 1849, 1847, 71, - 71, 1855, 71, 71, 1852, 71, 1857, 1850, 71, 71, - 71, 1860, 1861, 71, 71, 1863, 71, 71, 71, 71, - 1854, 71, 1869, 71, 71, 71, 1868, 1865, 1858, 1856, + 86, 1819, 86, 86, 1822, 86, 1821, 86, 1820, 1825, + 86, 1823, 86, 86, 86, 86, 1826, 1824, 86, 86, + 86, 86, 86, 86, 1831, 86, 1832, 86, 86, 86, + 86, 1833, 1836, 86, 1827, 1834, 1829, 1828, 1830, 1837, + 1835, 86, 86, 86, 1843, 1845, 1840, 1842, 1839, 1844, + 86, 86, 1838, 1841, 1846, 86, 86, 86, 86, 1850, + 86, 1853, 1847, 1854, 86, 1855, 86, 86, 1857, 86, + 86, 1848, 1851, 86, 1852, 86, 1849, 86, 1858, 1861, + 86, 86, 1863, 86, 1865, 1862, 1864, 1856, 86, 1867, + 86, 1859, 86, 1866, 1860, 86, 86, 1870, 86, 1869, - 1866, 1859, 71, 71, 1862, 71, 71, 71, 1875, 71, - 1867, 71, 1864, 1872, 1873, 1870, 71, 71, 1871, 1879, - 1882, 1874, 1878, 71, 71, 71, 71, 1877, 1883, 1885, - 1881, 1884, 71, 71, 71, 1876, 1880, 71, 71, 71, - 71, 71, 1886, 1890, 71, 71, 1893, 1894, 1895, 71, - 1889, 71, 71, 71, 71, 71, 1898, 1887, 1888, 1891, - 71, 71, 71, 1903, 71, 71, 1897, 1902, 71, 1896, - 1892, 3095, 1899, 71, 71, 1900, 71, 1907, 71, 1908, - 1904, 71, 1901, 1905, 1906, 1910, 71, 1909, 1911, 71, - 1912, 71, 1915, 71, 71, 1916, 71, 71, 71, 71, + 86, 1871, 86, 1873, 86, 1880, 86, 1872, 86, 86, + 86, 86, 86, 86, 86, 1885, 1882, 1868, 1874, 1875, + 1876, 1883, 86, 86, 1878, 1877, 1884, 1888, 1879, 1887, + 1881, 86, 86, 86, 1886, 86, 1892, 86, 86, 86, + 1889, 86, 1894, 86, 86, 1897, 1898, 86, 86, 1900, + 86, 86, 1890, 86, 86, 1905, 1891, 86, 86, 1895, + 86, 86, 1902, 1903, 1893, 1896, 1906, 86, 1899, 86, + 86, 86, 86, 1912, 86, 1908, 1901, 1909, 1904, 1907, + 1910, 86, 86, 1916, 86, 86, 86, 1915, 1919, 86, + 1920, 1922, 1918, 86, 86, 1911, 86, 1914, 1921, 86, - 1922, 71, 1913, 1919, 71, 71, 71, 1914, 1917, 1924, - 1925, 71, 71, 1926, 71, 1918, 1923, 1920, 1927, 1921, - 71, 71, 1932, 71, 1936, 1931, 1933, 71, 1934, 1928, - 71, 71, 1929, 1935, 71, 1937, 71, 1930, 71, 1941, - 71, 71, 71, 1939, 71, 71, 1943, 71, 1940, 1946, - 71, 71, 1942, 1948, 71, 71, 1944, 1938, 71, 71, - 71, 71, 1949, 71, 1953, 1952, 1950, 71, 1954, 1955, - 71, 3095, 1945, 1947, 1956, 71, 1958, 1951, 71, 71, - 71, 71, 71, 1957, 1959, 1960, 71, 1961, 1962, 71, - 71, 1963, 1964, 71, 1966, 71, 71, 71, 71, 1970, + 1913, 86, 1923, 86, 1917, 86, 86, 86, 86, 1927, + 86, 1930, 1931, 1932, 86, 86, 86, 1926, 86, 86, + 1935, 1924, 1925, 86, 86, 1928, 86, 1940, 86, 1934, + 86, 1939, 86, 86, 1929, 1933, 1936, 86, 86, 1945, + 3149, 1944, 86, 1937, 86, 86, 1938, 1942, 1946, 1941, + 1948, 86, 1943, 1947, 86, 86, 1950, 86, 1949, 1952, + 86, 1951, 86, 86, 86, 86, 1959, 86, 1956, 86, + 86, 1954, 86, 86, 1961, 3149, 1953, 1962, 86, 86, + 1963, 1955, 1960, 86, 1957, 1958, 86, 1964, 86, 86, + 1968, 1969, 86, 1970, 86, 1965, 1971, 1973, 1982, 1966, - 71, 71, 1965, 1969, 71, 71, 1971, 1967, 1968, 1972, - 1973, 1974, 71, 71, 71, 71, 71, 71, 71, 1981, - 1979, 1975, 1976, 1980, 71, 71, 71, 71, 71, 1986, - 71, 71, 1977, 1983, 1978, 1982, 71, 71, 1990, 71, - 1987, 1985, 71, 1992, 1984, 1989, 71, 71, 1988, 1996, - 71, 1991, 1994, 71, 71, 71, 1997, 71, 2002, 1995, - 1993, 71, 71, 71, 71, 71, 2004, 71, 71, 2005, - 1998, 1999, 2000, 2006, 71, 2001, 2007, 71, 71, 2003, - 71, 2010, 71, 2009, 2008, 71, 71, 2011, 71, 71, - 71, 71, 71, 71, 2022, 71, 71, 2013, 2014, 2018, + 1974, 1972, 86, 86, 1967, 86, 86, 86, 1978, 86, + 1976, 86, 86, 86, 86, 1975, 1980, 167, 1983, 1977, + 1985, 1979, 1986, 1981, 86, 86, 86, 86, 86, 86, + 86, 86, 1992, 1991, 1990, 1984, 86, 1987, 1996, 1988, + 1993, 86, 1994, 86, 86, 86, 86, 1989, 86, 86, + 86, 1997, 1999, 1998, 86, 2001, 1995, 2002, 2000, 86, + 86, 2004, 86, 86, 86, 2008, 86, 86, 86, 2007, + 86, 2003, 86, 2010, 2005, 2006, 2009, 2011, 86, 2013, + 86, 2012, 86, 86, 86, 86, 86, 86, 2020, 2018, + 2014, 2015, 2019, 86, 86, 86, 86, 86, 2025, 86, - 2015, 71, 71, 2012, 2021, 2017, 71, 2026, 71, 2025, - 3095, 2020, 2019, 71, 2023, 2016, 71, 71, 2028, 2029, - 71, 2024, 71, 71, 71, 2031, 71, 71, 2027, 2032, - 71, 71, 2033, 2037, 2030, 2035, 71, 71, 2039, 2036, - 2041, 71, 2034, 71, 71, 71, 2044, 71, 71, 2038, - 2043, 2040, 2045, 2046, 71, 71, 2049, 71, 71, 71, - 71, 71, 71, 2050, 71, 2055, 71, 2052, 71, 2042, - 2051, 2059, 2047, 71, 2056, 2048, 2057, 71, 2054, 2053, - 71, 71, 71, 2061, 71, 2060, 71, 71, 2058, 2065, - 71, 71, 2067, 71, 2063, 71, 2066, 71, 2068, 71, + 86, 2016, 2022, 2017, 2021, 86, 86, 2029, 86, 2026, + 2024, 86, 2031, 2023, 2028, 86, 86, 2027, 2035, 86, + 2030, 2033, 86, 86, 86, 2036, 86, 2041, 2034, 2032, + 86, 86, 86, 86, 86, 2043, 86, 86, 2044, 2037, + 2038, 2039, 2045, 86, 2040, 2046, 86, 86, 2042, 86, + 2050, 86, 86, 2047, 2048, 86, 86, 86, 86, 86, + 2051, 86, 86, 86, 3149, 86, 86, 2049, 2053, 2054, + 2055, 2058, 86, 2052, 2057, 2061, 2062, 86, 86, 2063, + 86, 2056, 2060, 2065, 2059, 86, 2064, 86, 86, 2069, + 2066, 86, 2067, 2068, 86, 86, 2070, 86, 2072, 2071, - 2062, 71, 2064, 71, 2069, 2071, 2070, 71, 2072, 2074, - 2076, 2073, 71, 71, 2075, 2077, 71, 71, 71, 71, - 71, 71, 2079, 2085, 2078, 2082, 2083, 71, 71, 2080, - 2081, 71, 2084, 2087, 71, 71, 2086, 71, 71, 71, - 71, 71, 71, 71, 71, 2096, 2088, 2097, 71, 2089, - 71, 2090, 2091, 2093, 2092, 2094, 71, 2095, 71, 2098, - 71, 71, 2099, 2103, 2101, 71, 71, 2102, 2107, 71, - 71, 2109, 71, 71, 2106, 2100, 71, 2111, 2104, 2108, - 71, 2112, 2114, 2116, 2117, 2110, 2105, 2115, 71, 71, - 71, 71, 71, 2113, 2118, 71, 2121, 71, 71, 2122, + 86, 86, 86, 86, 2073, 2077, 86, 86, 2079, 2075, + 86, 2081, 86, 2076, 86, 2074, 86, 86, 2084, 2083, + 86, 2078, 2085, 86, 2080, 2086, 86, 86, 2089, 86, + 86, 86, 2090, 2082, 86, 86, 2095, 86, 2092, 86, + 2096, 2087, 2091, 86, 86, 2099, 2088, 86, 86, 2094, + 2093, 86, 2100, 86, 86, 2101, 2105, 86, 2097, 86, + 86, 2107, 2103, 86, 2098, 86, 2102, 86, 2108, 86, + 2104, 2106, 2109, 86, 2110, 86, 86, 2114, 86, 86, + 86, 2116, 2112, 2111, 86, 2113, 2117, 86, 2119, 86, + 2118, 86, 2120, 86, 2122, 86, 2121, 2115, 2123, 86, - 2119, 71, 2126, 71, 71, 2127, 71, 71, 2130, 71, - 2125, 71, 71, 2123, 71, 2120, 2131, 2134, 2128, 71, - 2132, 2133, 71, 2135, 2124, 2129, 71, 71, 71, 71, - 2136, 71, 2138, 71, 2139, 71, 2140, 71, 71, 71, - 71, 71, 2143, 71, 2149, 71, 2147, 2137, 71, 71, - 2142, 71, 2150, 71, 2145, 71, 2141, 2144, 2152, 71, - 2146, 71, 71, 71, 2151, 2148, 2156, 2154, 2159, 71, - 71, 71, 71, 71, 71, 2157, 71, 2153, 2155, 2160, - 71, 2158, 71, 71, 71, 2170, 71, 71, 71, 2161, - 2171, 2162, 71, 71, 2167, 2165, 2163, 3095, 2164, 2169, + 2127, 86, 86, 86, 2124, 86, 86, 86, 2126, 86, + 86, 86, 86, 86, 86, 2125, 2139, 2136, 86, 2131, + 2128, 2129, 2130, 2133, 2132, 2134, 86, 2135, 86, 2140, + 86, 2137, 86, 86, 86, 86, 2141, 2138, 86, 2145, + 86, 2142, 2151, 2146, 2147, 86, 86, 2143, 167, 2148, + 86, 2144, 2149, 86, 2150, 2152, 2155, 2157, 2158, 2153, + 86, 2156, 86, 86, 86, 86, 86, 86, 2159, 86, + 2154, 2162, 86, 86, 2160, 86, 2163, 3149, 2166, 2169, + 2161, 2167, 86, 86, 2168, 86, 2171, 86, 86, 2177, + 2164, 2170, 86, 2172, 86, 2173, 2174, 86, 86, 2176, - 71, 2166, 2173, 71, 2168, 2172, 2174, 71, 2175, 2176, - 71, 2177, 71, 71, 2180, 2178, 2179, 71, 2183, 71, - 71, 71, 71, 71, 71, 2184, 2181, 2185, 71, 2182, - 2189, 71, 2190, 71, 2192, 71, 2188, 71, 2194, 71, - 71, 2186, 71, 2187, 71, 2196, 71, 2191, 2197, 71, - 2198, 71, 71, 71, 71, 2193, 71, 2195, 2199, 2203, - 2201, 2200, 2204, 71, 2206, 71, 71, 71, 71, 71, - 2210, 2209, 2202, 2208, 71, 2205, 2212, 71, 71, 71, - 2216, 71, 71, 71, 2207, 2211, 71, 71, 2221, 71, - 71, 2220, 71, 2213, 2214, 71, 71, 2215, 2226, 71, + 86, 2165, 86, 2175, 2179, 86, 86, 2178, 86, 86, + 86, 86, 86, 2182, 86, 86, 2185, 86, 86, 86, + 2189, 86, 2180, 2191, 86, 2184, 86, 86, 86, 86, + 2186, 2181, 2183, 2187, 2188, 86, 2193, 86, 2196, 2192, + 2190, 2199, 2194, 86, 86, 2195, 2197, 2200, 2198, 2201, + 86, 86, 2202, 86, 86, 86, 86, 86, 86, 86, + 86, 2212, 86, 86, 86, 3149, 86, 2214, 2213, 86, + 2203, 2209, 2204, 2211, 86, 2207, 86, 2205, 2208, 2206, + 2216, 2210, 2215, 86, 2218, 2219, 86, 2217, 2220, 86, + 86, 2221, 86, 2223, 86, 86, 2226, 86, 86, 2227, - 2223, 2219, 2217, 71, 71, 71, 2218, 2224, 71, 2222, - 71, 2225, 2228, 71, 71, 2233, 71, 71, 2229, 2235, - 71, 71, 71, 2227, 71, 2234, 2230, 2236, 2231, 2239, - 71, 71, 2240, 71, 71, 71, 2241, 71, 2242, 2232, - 71, 71, 2237, 2244, 2238, 2246, 2243, 71, 2247, 71, - 71, 2251, 2248, 2253, 2249, 2245, 2250, 71, 2252, 71, - 71, 71, 71, 71, 71, 2254, 2255, 2258, 71, 71, - 71, 2259, 71, 71, 2264, 2256, 2257, 2260, 2261, 2262, - 71, 2265, 71, 71, 71, 71, 2263, 71, 2266, 71, - 2269, 2268, 2270, 2267, 71, 2271, 71, 71, 71, 2275, + 86, 86, 86, 2222, 2224, 2228, 86, 2225, 2232, 86, + 2233, 86, 2235, 86, 2231, 86, 2237, 86, 2229, 86, + 3149, 2230, 86, 2240, 86, 2234, 86, 2239, 2241, 86, + 86, 86, 86, 2236, 2238, 86, 86, 2247, 86, 2243, + 2242, 2246, 2249, 86, 86, 2244, 86, 86, 86, 2253, + 2252, 2245, 2251, 86, 2248, 2255, 86, 86, 86, 2259, + 86, 86, 2250, 86, 2254, 86, 86, 2264, 86, 86, + 2263, 86, 2256, 2257, 86, 86, 2258, 86, 86, 2266, + 2262, 2260, 2269, 86, 86, 2271, 2261, 86, 2265, 86, + 2267, 2270, 2268, 86, 86, 2276, 2282, 86, 2272, 86, - 2277, 71, 71, 2272, 71, 2273, 2279, 2274, 71, 71, - 71, 71, 2276, 71, 2284, 71, 2280, 2278, 2285, 71, - 3095, 2283, 2288, 71, 2281, 2282, 71, 2289, 2290, 71, - 71, 2287, 71, 2291, 2293, 2286, 2294, 2292, 2295, 71, - 71, 71, 71, 71, 2297, 71, 71, 71, 71, 2301, - 2302, 71, 71, 71, 3095, 2296, 71, 2298, 2304, 71, - 2299, 71, 71, 2305, 2306, 2303, 2300, 2307, 71, 71, - 71, 2309, 2310, 71, 2308, 2312, 71, 2311, 71, 71, - 71, 71, 71, 2313, 2314, 71, 2318, 71, 2321, 71, - 71, 71, 2320, 71, 71, 2317, 2322, 71, 2315, 2327, + 86, 2278, 86, 2279, 86, 2273, 2277, 2274, 86, 86, + 86, 86, 86, 2284, 2285, 86, 2283, 86, 2280, 2275, + 2281, 86, 2289, 86, 2287, 86, 2291, 86, 2292, 86, + 2294, 2296, 86, 2288, 2297, 2286, 86, 86, 86, 86, + 2293, 2290, 86, 2298, 86, 2301, 86, 86, 2295, 86, + 86, 86, 2300, 2302, 2307, 2303, 2304, 2299, 2305, 2308, + 86, 86, 86, 2313, 2306, 86, 2309, 86, 2312, 86, + 2311, 2310, 86, 2314, 167, 86, 86, 86, 86, 2316, + 86, 2315, 2321, 86, 86, 86, 86, 2323, 86, 86, + 86, 2328, 2319, 2320, 86, 2317, 2325, 2318, 2324, 2322, - 2316, 71, 2325, 2328, 2326, 2319, 71, 2323, 71, 2324, - 71, 71, 2330, 71, 71, 2333, 2331, 71, 2335, 71, - 2329, 2334, 2337, 71, 71, 71, 71, 2339, 71, 71, - 71, 2336, 71, 71, 2332, 2338, 71, 2343, 2347, 71, - 2349, 2345, 71, 2340, 2341, 2342, 71, 2346, 2348, 71, - 71, 2350, 71, 71, 71, 71, 71, 71, 2358, 2344, - 2353, 2356, 71, 71, 71, 2357, 71, 71, 2351, 2355, - 2361, 71, 71, 2354, 71, 2352, 71, 2362, 71, 2365, - 71, 2359, 2360, 2366, 71, 2363, 71, 71, 71, 2369, - 2364, 2367, 2370, 71, 2368, 2371, 71, 71, 71, 71, + 2326, 2327, 86, 2332, 86, 3149, 2331, 2329, 86, 2333, + 2330, 2334, 86, 86, 86, 2337, 2335, 2338, 86, 2336, + 86, 86, 86, 86, 2340, 86, 86, 2339, 86, 2342, + 86, 86, 2346, 2347, 2341, 86, 2344, 86, 2343, 86, + 2349, 86, 86, 86, 86, 2350, 2351, 2352, 86, 2345, + 86, 2348, 86, 2354, 86, 2353, 2356, 2357, 86, 86, + 86, 86, 2355, 86, 2359, 86, 86, 2358, 86, 2363, + 2366, 86, 86, 2365, 86, 86, 86, 2362, 2367, 86, + 2360, 2361, 2372, 86, 2371, 86, 2364, 2369, 86, 2368, + 2370, 2373, 86, 86, 2374, 86, 2376, 86, 2381, 2375, - 71, 71, 2372, 2375, 2379, 71, 2378, 2380, 71, 2374, - 2373, 2381, 71, 2382, 71, 71, 71, 71, 71, 2376, - 2377, 71, 2385, 71, 2386, 71, 2387, 2383, 71, 71, - 2388, 2392, 71, 2389, 2384, 71, 2394, 71, 2395, 71, - 71, 71, 71, 71, 71, 2391, 71, 71, 2390, 2398, - 71, 2396, 2401, 2397, 2393, 2399, 2404, 71, 71, 71, - 71, 71, 71, 71, 2400, 71, 2402, 2405, 71, 2411, - 2403, 71, 71, 71, 2408, 71, 71, 2410, 71, 71, - 2407, 2412, 2418, 2415, 71, 2406, 2409, 3095, 2413, 2420, - 2414, 71, 2419, 2416, 2422, 71, 2421, 2423, 71, 2417, + 2377, 86, 2379, 86, 86, 86, 86, 2380, 2383, 86, + 2385, 86, 86, 86, 86, 2384, 86, 2382, 86, 2378, + 86, 86, 86, 2389, 86, 2391, 2392, 2387, 2393, 86, + 2386, 2395, 2388, 2394, 86, 86, 2396, 86, 2397, 86, + 2390, 86, 86, 86, 2399, 2404, 2398, 2402, 86, 86, + 86, 86, 2403, 86, 2401, 2407, 86, 86, 86, 86, + 2400, 2408, 86, 2411, 2413, 2406, 86, 2405, 2412, 86, + 86, 86, 2409, 86, 86, 2410, 2416, 86, 86, 2415, + 2417, 86, 86, 86, 2414, 86, 2421, 2418, 2419, 2420, + 2424, 2425, 86, 2426, 86, 2427, 86, 2428, 86, 86, - 71, 2424, 71, 2425, 71, 2426, 71, 71, 71, 71, - 71, 71, 71, 71, 71, 71, 71, 2436, 2428, 71, - 71, 71, 2434, 3095, 2427, 71, 2440, 2429, 2431, 2430, - 2441, 71, 2433, 2432, 2435, 71, 2437, 2438, 2439, 2444, - 71, 71, 71, 2442, 2443, 2446, 71, 71, 71, 71, - 2445, 71, 71, 2457, 71, 2449, 71, 2455, 71, 71, - 2447, 2456, 71, 71, 2450, 2448, 71, 71, 71, 2451, - 2452, 71, 2453, 2454, 71, 71, 2461, 71, 71, 2465, - 2464, 2458, 2459, 2466, 71, 2460, 71, 71, 2462, 2467, - 2468, 71, 71, 71, 2463, 2470, 71, 2469, 71, 71, + 86, 86, 2422, 2423, 86, 2432, 2431, 86, 2433, 86, + 86, 2429, 86, 86, 2438, 86, 86, 86, 2430, 2440, + 86, 2434, 2435, 2441, 86, 86, 86, 86, 2442, 2437, + 86, 86, 2436, 2444, 86, 2439, 2447, 2443, 86, 2445, + 2450, 86, 86, 86, 86, 167, 86, 86, 86, 86, + 2446, 2451, 86, 2458, 2448, 86, 86, 2457, 2449, 2454, + 86, 86, 2456, 86, 2453, 2459, 86, 2462, 3149, 2452, + 2460, 2455, 86, 86, 86, 2461, 2465, 2467, 86, 2468, + 2466, 2469, 86, 2463, 2470, 86, 2464, 86, 2471, 86, + 2472, 86, 2473, 86, 86, 86, 2474, 86, 86, 86, - 71, 71, 71, 2474, 71, 2472, 71, 2478, 2479, 71, - 71, 2471, 2482, 71, 2483, 2480, 2473, 71, 71, 2475, - 2476, 71, 2477, 71, 2481, 2485, 2486, 71, 71, 71, - 71, 2487, 2484, 2491, 71, 71, 71, 71, 2488, 71, - 2494, 71, 2492, 71, 2493, 2495, 71, 71, 2489, 2490, - 2497, 71, 2498, 71, 71, 2500, 2496, 2503, 71, 71, - 2504, 2502, 2499, 2506, 71, 2505, 2501, 71, 71, 71, - 71, 2511, 71, 71, 2513, 71, 71, 71, 2509, 2510, - 2507, 2508, 2514, 71, 71, 71, 71, 71, 2512, 2515, - 2516, 2517, 71, 2518, 71, 71, 2520, 71, 71, 71, + 86, 86, 86, 86, 2475, 86, 86, 2484, 86, 86, + 2477, 2482, 3149, 2476, 86, 2488, 2479, 2478, 86, 2486, + 2481, 2480, 86, 2483, 2489, 86, 2485, 2487, 2492, 86, + 2490, 2491, 86, 2494, 86, 86, 2495, 86, 86, 86, + 86, 2493, 86, 86, 2497, 2503, 86, 2504, 86, 2505, + 86, 2506, 86, 2496, 2498, 86, 2499, 86, 2500, 2501, + 86, 2502, 86, 86, 86, 3149, 86, 2510, 2515, 86, + 2507, 2513, 2517, 86, 2509, 2508, 86, 86, 2514, 2516, + 86, 86, 86, 2511, 2512, 86, 86, 86, 86, 86, + 2519, 86, 2523, 86, 2528, 86, 2527, 2521, 86, 2518, - 2521, 71, 2519, 2523, 2524, 2526, 71, 2527, 71, 2522, - 2525, 71, 71, 71, 2532, 2530, 71, 2529, 2528, 2531, - 71, 2533, 71, 2534, 71, 2537, 71, 71, 2535, 2536, - 2538, 71, 2540, 71, 71, 71, 2542, 2541, 71, 71, - 2539, 2543, 71, 2544, 2545, 2546, 71, 71, 71, 71, - 2547, 71, 2548, 71, 2553, 71, 2552, 2549, 71, 2554, - 71, 2551, 71, 2555, 2550, 71, 71, 2556, 71, 71, - 71, 2557, 2558, 2560, 2559, 2561, 71, 71, 71, 71, - 71, 2566, 71, 71, 71, 71, 71, 2564, 2565, 71, - 2563, 2567, 2571, 71, 2562, 2575, 71, 71, 71, 71, + 86, 2520, 2531, 86, 86, 86, 2522, 86, 2524, 2526, + 2525, 2532, 86, 2529, 2535, 86, 2534, 86, 2530, 2533, + 2537, 86, 86, 2540, 86, 86, 86, 86, 2544, 86, + 2536, 2543, 86, 2546, 86, 2542, 86, 2541, 86, 86, + 86, 2538, 2539, 2547, 86, 2548, 2552, 86, 86, 2553, + 86, 2545, 2550, 2555, 86, 2549, 86, 86, 86, 86, + 2560, 86, 86, 86, 2551, 2562, 86, 2558, 2559, 2556, + 2557, 86, 2554, 86, 86, 86, 2563, 2561, 2564, 86, + 2566, 86, 2568, 86, 86, 86, 86, 2567, 2565, 86, + 2569, 2570, 86, 2578, 2572, 2575, 86, 2573, 86, 2571, - 2574, 71, 2568, 71, 2569, 2570, 2573, 2579, 2572, 2580, - 71, 71, 2582, 2583, 2577, 3095, 2584, 2576, 71, 71, - 71, 2578, 71, 2585, 71, 71, 71, 71, 2586, 71, - 2587, 71, 71, 2590, 71, 2588, 2581, 71, 2593, 71, - 2589, 2595, 71, 2596, 71, 2591, 71, 2592, 2597, 71, - 2598, 71, 2594, 2600, 71, 71, 2599, 71, 2604, 2601, - 2602, 71, 71, 2605, 71, 71, 2608, 2609, 71, 2603, - 2610, 71, 71, 2606, 71, 2611, 71, 71, 2615, 71, - 71, 2616, 2607, 2617, 71, 71, 71, 2612, 2619, 71, - 71, 71, 2623, 71, 2613, 2624, 71, 2614, 71, 2620, + 2574, 2576, 86, 2577, 167, 86, 86, 2582, 86, 86, + 2579, 86, 2584, 86, 2583, 86, 2580, 2587, 86, 86, + 2586, 2588, 86, 2585, 2581, 2590, 86, 86, 2592, 86, + 2591, 86, 2589, 2593, 86, 86, 2594, 86, 2597, 86, + 2595, 2598, 86, 2596, 86, 86, 86, 2599, 2600, 86, + 2604, 2605, 86, 86, 2602, 86, 86, 86, 2606, 86, + 2601, 86, 2609, 86, 2607, 86, 2608, 2610, 2611, 86, + 2603, 86, 86, 86, 2612, 86, 2617, 86, 86, 86, + 86, 2615, 2616, 2613, 2614, 86, 2618, 2622, 86, 86, + 86, 86, 2626, 86, 86, 2625, 86, 2619, 86, 2620, - 2618, 71, 71, 71, 2626, 2622, 2625, 71, 2621, 2627, - 71, 2632, 71, 2631, 71, 71, 2628, 71, 2634, 2635, - 71, 2629, 71, 2630, 71, 71, 71, 2636, 2638, 2640, - 71, 71, 2637, 71, 71, 71, 2643, 2633, 2647, 71, - 2639, 71, 71, 71, 71, 2649, 71, 2641, 2642, 2646, - 71, 2644, 71, 2650, 2645, 2648, 2654, 2651, 2653, 2657, - 71, 2655, 71, 2652, 71, 2656, 71, 2658, 71, 2659, - 71, 2660, 71, 2661, 71, 71, 71, 71, 2665, 2663, - 2662, 71, 2669, 71, 71, 2666, 71, 2670, 2672, 71, - 71, 71, 2674, 71, 71, 2664, 71, 2667, 2673, 2675, + 2624, 86, 2630, 3149, 2621, 2631, 86, 2633, 2623, 2627, + 2634, 2628, 2635, 86, 2629, 86, 86, 86, 86, 2636, + 86, 86, 2638, 2637, 86, 86, 2632, 86, 86, 2641, + 2639, 86, 2644, 86, 2646, 86, 86, 2640, 2647, 86, + 2649, 2642, 86, 2643, 2648, 86, 86, 2650, 2651, 86, + 86, 2645, 86, 2655, 86, 2653, 86, 86, 2656, 86, + 86, 2659, 2660, 86, 2654, 86, 2652, 86, 2657, 2661, + 86, 86, 86, 86, 2658, 2662, 86, 2665, 2663, 2666, + 86, 86, 2667, 2668, 86, 2664, 2669, 2670, 86, 2671, + 86, 2672, 2674, 2675, 86, 86, 2677, 86, 86, 2676, - 71, 2668, 2676, 71, 2671, 2677, 71, 71, 2680, 2678, - 2681, 71, 71, 71, 71, 2679, 2682, 71, 2685, 71, - 2687, 71, 2683, 2686, 71, 2689, 2688, 71, 71, 2684, - 2691, 71, 2690, 2692, 71, 71, 2696, 71, 71, 71, - 71, 71, 2693, 71, 2694, 71, 2702, 2697, 71, 71, - 2700, 2698, 71, 2695, 2705, 71, 71, 2703, 71, 2707, - 2706, 71, 71, 2701, 71, 2699, 71, 2709, 2779, 2704, - 2708, 71, 2710, 2712, 71, 2711, 2713, 71, 2714, 71, - 71, 71, 2719, 71, 2716, 2717, 2718, 71, 71, 2715, - 71, 71, 2720, 2722, 71, 2721, 71, 71, 2727, 71, + 86, 2678, 86, 86, 2673, 86, 2682, 2683, 86, 86, + 86, 2686, 86, 86, 2685, 86, 86, 2688, 2689, 86, + 2679, 2687, 86, 2680, 86, 2681, 86, 2691, 86, 2692, + 86, 2695, 86, 2684, 86, 86, 2699, 86, 2734, 2693, + 2694, 86, 86, 86, 2690, 2701, 86, 86, 2696, 2698, + 86, 86, 2697, 2702, 2706, 2700, 2715, 2703, 2705, 2707, + 86, 2709, 86, 86, 2710, 2704, 2708, 86, 2711, 86, + 2712, 86, 2713, 86, 86, 86, 86, 86, 86, 2721, + 86, 86, 86, 86, 2722, 2718, 2724, 86, 86, 2714, + 2725, 2726, 86, 2727, 2716, 2728, 86, 2719, 2720, 86, - 71, 2723, 2725, 71, 71, 2729, 71, 2730, 71, 71, - 71, 71, 2724, 2731, 2726, 2732, 71, 2733, 71, 2734, - 2737, 71, 71, 71, 2728, 71, 2735, 2740, 71, 2736, - 71, 2738, 71, 71, 2741, 2739, 71, 71, 2745, 71, - 2744, 2747, 71, 71, 2742, 2749, 71, 2750, 71, 2743, - 2752, 71, 71, 71, 2757, 71, 2748, 71, 71, 2753, - 2751, 71, 2746, 2756, 71, 71, 2761, 71, 2754, 2755, - 71, 2764, 71, 71, 2766, 71, 71, 2758, 2769, 71, - 71, 2762, 71, 2760, 2759, 2770, 71, 2767, 71, 2763, - 2772, 71, 71, 2765, 71, 71, 2771, 2768, 2777, 2774, + 2723, 2717, 86, 86, 86, 2733, 86, 86, 2729, 86, + 86, 2730, 2731, 2737, 86, 86, 2735, 86, 2738, 86, + 2742, 86, 2732, 2739, 2736, 2741, 2740, 2743, 86, 2744, + 86, 86, 86, 2748, 86, 86, 86, 86, 86, 2746, + 86, 86, 86, 2754, 2749, 2745, 86, 2752, 2750, 86, + 2747, 2757, 86, 2755, 86, 2759, 86, 2758, 86, 86, + 2753, 86, 2751, 2756, 2761, 2760, 86, 2762, 2764, 86, + 2763, 2765, 86, 2766, 86, 86, 86, 2771, 2768, 86, + 2769, 2770, 86, 86, 2767, 86, 86, 2772, 2774, 86, + 2773, 86, 86, 86, 86, 2780, 86, 2775, 2776, 2778, - 71, 2775, 2781, 71, 71, 71, 71, 2783, 2782, 71, - 2773, 71, 2786, 3095, 2776, 2780, 2787, 71, 71, 2778, - 71, 2784, 2789, 2788, 71, 71, 71, 71, 71, 2794, - 2791, 2785, 2792, 71, 71, 71, 2797, 71, 71, 71, - 71, 71, 2790, 2802, 71, 2793, 2798, 71, 71, 71, - 2795, 2796, 2807, 2801, 2805, 71, 2799, 2804, 2806, 71, - 2803, 71, 71, 2808, 2800, 71, 2809, 2810, 71, 2811, - 71, 2812, 71, 71, 2814, 71, 71, 71, 2813, 71, - 2819, 2815, 2820, 71, 71, 71, 71, 2816, 2824, 71, - 2825, 71, 71, 3095, 2823, 2826, 71, 71, 2817, 2818, + 2783, 86, 2782, 86, 86, 86, 86, 86, 2786, 2784, + 2779, 2785, 2777, 86, 86, 2790, 86, 86, 2781, 86, + 86, 86, 86, 86, 2787, 2793, 86, 86, 2788, 2794, + 2791, 2798, 2792, 86, 2789, 2797, 2800, 86, 2795, 86, + 2802, 86, 2796, 2803, 86, 86, 2805, 86, 86, 86, + 86, 86, 2810, 86, 86, 2809, 86, 86, 2801, 2799, + 86, 2814, 86, 86, 2806, 2807, 2804, 2808, 2817, 86, + 86, 86, 2819, 3149, 2811, 86, 2813, 2815, 86, 2812, + 2820, 2816, 2822, 86, 2823, 86, 86, 2825, 86, 86, + 2818, 86, 86, 2821, 86, 86, 2830, 86, 2834, 86, - 2821, 71, 2829, 71, 2822, 2830, 71, 2831, 71, 71, - 2834, 71, 2827, 71, 2832, 2828, 71, 2833, 2837, 71, - 71, 2836, 71, 2835, 71, 2838, 71, 71, 71, 71, - 71, 2841, 71, 71, 2843, 71, 71, 2844, 71, 2842, - 71, 71, 2839, 71, 2840, 71, 2853, 71, 2854, 2845, - 3095, 2849, 2846, 2847, 2848, 2850, 2851, 2856, 71, 71, - 3095, 2852, 71, 71, 2857, 2855, 2862, 2858, 2860, 71, - 71, 2859, 2861, 71, 2863, 71, 2864, 71, 2865, 2866, - 71, 71, 2867, 2868, 2871, 71, 2869, 2870, 2873, 71, - 2872, 71, 71, 71, 71, 71, 2878, 71, 71, 71, + 2827, 2828, 86, 86, 2836, 86, 2824, 2826, 2835, 2832, + 86, 2829, 86, 2831, 2839, 2833, 2840, 86, 86, 2842, + 86, 2841, 2837, 86, 86, 86, 2845, 86, 86, 2844, + 86, 2848, 2838, 2846, 86, 2851, 86, 86, 86, 86, + 86, 2843, 86, 2856, 86, 86, 86, 86, 3149, 2847, + 2852, 2849, 2850, 2859, 86, 2855, 2858, 2853, 2860, 86, + 2862, 86, 86, 86, 2857, 2854, 2861, 2863, 2864, 86, + 2865, 86, 2866, 86, 86, 2868, 86, 86, 86, 2867, + 86, 86, 2869, 86, 2873, 2874, 86, 86, 86, 2878, + 86, 2879, 86, 86, 3149, 2875, 86, 2877, 2880, 2870, - 2877, 71, 71, 2881, 71, 71, 2874, 71, 2880, 71, - 2890, 2882, 71, 2875, 2876, 71, 2886, 71, 2885, 2883, - 2887, 71, 71, 2879, 2893, 2884, 2888, 71, 71, 2894, - 71, 2891, 2889, 2895, 2892, 71, 71, 2896, 71, 71, - 71, 2899, 2903, 2897, 71, 2900, 2902, 71, 71, 3095, - 2904, 2905, 71, 2906, 71, 71, 2898, 2901, 2908, 71, - 2907, 2909, 71, 2910, 71, 2911, 71, 2912, 71, 2913, - 71, 2914, 71, 2915, 71, 71, 2917, 71, 71, 71, - 71, 71, 71, 71, 2916, 2922, 71, 2918, 71, 71, - 71, 2919, 71, 2926, 71, 2925, 2923, 2928, 71, 71, + 2871, 86, 2872, 86, 86, 86, 2883, 2876, 2884, 86, + 2885, 86, 86, 2881, 2888, 2882, 86, 2886, 86, 2887, + 86, 2891, 86, 2893, 86, 86, 2890, 86, 2889, 2892, + 86, 86, 2895, 86, 86, 86, 86, 2897, 86, 86, + 86, 2898, 2896, 86, 86, 2894, 86, 86, 86, 86, + 86, 2907, 2908, 2899, 2903, 2900, 2901, 2902, 2910, 86, + 2904, 2905, 86, 2913, 86, 2906, 2985, 2911, 2909, 2912, + 2914, 86, 2915, 86, 86, 2917, 86, 2927, 2916, 2918, + 86, 2919, 2920, 86, 86, 2921, 2922, 2925, 86, 2923, + 2924, 86, 86, 2926, 86, 86, 86, 86, 2932, 86, - 2920, 2921, 2924, 2927, 71, 71, 2932, 2930, 2929, 71, - 2935, 71, 2934, 71, 71, 71, 71, 2933, 2937, 71, - 2931, 71, 71, 71, 71, 2936, 71, 2941, 71, 2944, - 71, 2940, 2942, 2938, 2951, 2945, 71, 2939, 71, 2943, - 2946, 71, 2947, 71, 2948, 71, 71, 2950, 71, 71, - 71, 2949, 71, 71, 2956, 2957, 2952, 71, 2959, 71, - 2953, 2955, 71, 71, 71, 71, 71, 2958, 71, 71, - 71, 2954, 2960, 71, 71, 2966, 71, 2973, 71, 2963, - 3095, 2961, 2962, 2965, 71, 2967, 71, 71, 2971, 2969, - 2964, 2968, 2970, 2974, 2975, 71, 2972, 71, 2976, 2977, + 86, 86, 2931, 86, 86, 2928, 86, 2935, 2934, 86, + 86, 86, 2940, 2936, 86, 2929, 2930, 2941, 86, 2939, + 86, 2937, 2942, 86, 86, 2933, 86, 2938, 2949, 2943, + 86, 2944, 2947, 2945, 86, 86, 2946, 2948, 86, 86, + 86, 86, 2956, 86, 2953, 2950, 2954, 2957, 86, 86, + 2951, 2952, 2984, 86, 2958, 2959, 86, 2960, 86, 2955, + 86, 2962, 86, 2963, 86, 2961, 2964, 86, 2965, 86, + 2966, 86, 2967, 86, 2968, 86, 2969, 86, 86, 2971, + 86, 86, 86, 86, 86, 86, 86, 2970, 2976, 86, + 2972, 86, 86, 86, 2973, 86, 2980, 86, 2979, 2977, - 71, 2978, 71, 71, 71, 2979, 71, 2981, 71, 71, - 71, 2982, 2986, 2983, 71, 71, 71, 71, 71, 2991, - 71, 2989, 71, 2980, 71, 2985, 71, 2988, 2987, 2994, - 71, 71, 2997, 71, 2984, 71, 2998, 2990, 71, 2992, - 71, 2993, 71, 3001, 2996, 3002, 2995, 71, 2999, 71, - 71, 71, 71, 71, 3007, 71, 3003, 3000, 3006, 71, - 3004, 3008, 71, 71, 71, 71, 71, 71, 3012, 3005, - 71, 3014, 71, 3009, 71, 71, 71, 3011, 71, 3010, - 3019, 3020, 71, 3016, 71, 3013, 3015, 3017, 3021, 71, - 71, 3018, 3025, 71, 71, 3026, 3027, 71, 3022, 3029, + 2982, 86, 86, 2974, 2975, 2978, 2981, 86, 2986, 86, + 2989, 2983, 2988, 86, 86, 2987, 86, 86, 86, 2991, + 86, 2992, 86, 86, 86, 86, 2995, 2990, 2998, 3000, + 86, 2996, 3001, 86, 2994, 2993, 86, 2999, 2997, 3002, + 86, 86, 86, 86, 86, 86, 3005, 86, 86, 86, + 3004, 86, 3010, 3011, 86, 86, 3013, 86, 3007, 3003, + 3009, 3014, 86, 3006, 86, 86, 86, 86, 3008, 3012, + 86, 86, 86, 86, 86, 3020, 3015, 86, 3024, 3149, + 3016, 3017, 3019, 3021, 3027, 86, 86, 86, 3025, 3018, + 86, 3022, 3023, 3029, 86, 3028, 86, 3026, 86, 3030, - 3023, 71, 71, 3024, 71, 3028, 3030, 71, 3033, 3034, - 71, 71, 3031, 71, 71, 3037, 3032, 71, 3035, 3036, - 71, 71, 71, 71, 3042, 71, 71, 71, 3039, 71, - 71, 71, 3045, 3046, 71, 71, 3038, 71, 71, 3044, - 3049, 3040, 3041, 71, 3043, 71, 3047, 71, 3050, 3048, - 71, 3053, 3054, 3056, 71, 3057, 3052, 3051, 3055, 71, - 71, 3059, 71, 3060, 71, 71, 71, 3064, 71, 3061, - 71, 71, 3062, 3066, 71, 3065, 3067, 71, 3058, 71, - 71, 3068, 71, 71, 71, 3063, 3069, 3071, 3073, 71, - 71, 71, 71, 71, 71, 3075, 3076, 71, 3079, 3070, + 3031, 86, 3032, 86, 86, 86, 3033, 3035, 86, 86, + 3034, 3040, 86, 3036, 3037, 86, 86, 86, 86, 86, + 3039, 3038, 86, 3043, 3045, 86, 3041, 3042, 3048, 86, + 86, 86, 3051, 86, 3046, 86, 3044, 86, 3052, 86, + 3055, 3047, 3056, 3053, 86, 3049, 86, 86, 86, 3050, + 86, 86, 3061, 86, 3062, 86, 3060, 3058, 3054, 86, + 86, 3057, 86, 86, 86, 86, 86, 3066, 86, 3059, + 3068, 86, 86, 86, 3065, 3075, 86, 3073, 86, 86, + 3063, 3070, 3064, 3074, 3067, 3069, 3071, 86, 86, 86, + 3072, 3079, 86, 86, 3080, 3081, 86, 3082, 3083, 3076, - 3080, 71, 3072, 3074, 71, 71, 3083, 3084, 71, 71, - 71, 3077, 3078, 3081, 3086, 71, 3085, 3087, 71, 71, - 71, 71, 71, 3082, 3095, 3089, 3088, 3090, 3095, 3091, - 3093, 71, 3094, 71, 3095, 3095, 3095, 3095, 3095, 3095, - 3092, 43, 43, 43, 43, 43, 43, 43, 48, 48, - 48, 48, 48, 48, 48, 53, 53, 53, 53, 53, - 53, 53, 59, 59, 59, 59, 59, 59, 59, 64, - 64, 64, 64, 64, 64, 64, 74, 74, 3095, 74, - 74, 74, 74, 142, 142, 3095, 3095, 3095, 142, 142, - 144, 144, 3095, 3095, 144, 3095, 144, 146, 3095, 3095, + 86, 86, 86, 86, 86, 3077, 3087, 3078, 3084, 3085, + 3088, 86, 86, 86, 3090, 86, 86, 86, 3089, 3086, + 3091, 3092, 86, 86, 3093, 3096, 86, 86, 86, 3099, + 86, 86, 3100, 86, 86, 3103, 86, 86, 86, 86, + 3098, 3094, 3095, 3101, 3108, 3097, 3102, 86, 3107, 86, + 86, 3106, 86, 3111, 86, 3104, 3105, 86, 3113, 86, + 3114, 86, 3109, 86, 86, 86, 3115, 3118, 86, 86, + 3116, 3121, 86, 3112, 3119, 86, 3110, 3120, 86, 86, + 86, 86, 86, 3117, 3124, 3122, 3123, 3125, 3127, 86, + 86, 86, 86, 86, 86, 3129, 3130, 86, 3133, 3126, - 3095, 3095, 3095, 146, 149, 149, 3095, 3095, 3095, 149, - 149, 151, 3095, 3095, 3095, 3095, 3095, 151, 153, 153, - 3095, 153, 153, 153, 153, 75, 75, 3095, 75, 75, - 75, 75, 13, 3095, 3095, 3095, 3095, 3095, 3095, 3095, - 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, - 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, - 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, - 3095, 3095, 3095 + 3128, 3134, 86, 86, 86, 3137, 3138, 86, 86, 3140, + 86, 3131, 3132, 3135, 86, 3139, 3141, 86, 86, 86, + 86, 3142, 3136, 3143, 3144, 86, 3147, 86, 3148, 86, + 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3145, + 3149, 3149, 3149, 3149, 3146, 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, 3149, 89, 89, 89, + + 89, 157, 157, 3149, 3149, 3149, 157, 157, 159, 159, + 3149, 3149, 159, 3149, 159, 161, 3149, 3149, 3149, 3149, + 3149, 161, 164, 164, 3149, 3149, 3149, 164, 164, 166, + 3149, 3149, 3149, 3149, 3149, 166, 168, 168, 3149, 168, + 168, 168, 168, 171, 3149, 3149, 3149, 3149, 3149, 171, + 174, 174, 3149, 3149, 3149, 174, 174, 90, 90, 3149, + 90, 90, 90, 90, 17, 3149, 3149, 3149, 3149, 3149, + 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, + 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, + 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, + + 3149, 3149, 3149, 3149, 3149 } ; -static const flex_int16_t yy_chk[6074] = +static const flex_int16_t yy_chk[6206] = { 0, 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, 1, 1, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, - 5, 3, 6, 20, 4, 20, 20, 5, 20, 6, - 7, 7, 7, 7, 20, 7, 8, 8, 8, 8, - 29, 8, 7, 9, 9, 9, 22, 22, 8, 10, - 10, 10, 15, 25, 9, 29, 15, 25, 3101, 31, - 10, 11, 11, 11, 11, 11, 11, 19, 79, 19, + 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, 3157, 35, + 10, 11, 11, 11, 11, 11, 11, 13, 13, 13, - 19, 30, 19, 11, 31, 79, 30, 25, 19, 19, - 36, 89, 11, 12, 12, 12, 12, 12, 12, 21, - 23, 23, 21, 21, 36, 12, 21, 34, 23, 26, - 26, 21, 23, 89, 12, 23, 27, 27, 47, 47, - 21, 24, 42, 90, 26, 27, 24, 28, 34, 52, - 24, 28, 52, 24, 28, 24, 24, 42, 32, 32, - 1020, 28, 90, 28, 33, 33, 24, 32, 72, 33, - 69, 35, 72, 32, 63, 63, 35, 32, 77, 80, - 35, 77, 37, 37, 69, 33, 35, 37, 230, 35, - 230, 80, 39, 39, 38, 39, 35, 37, 37, 38, + 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, 40, 16, + 25, 46, 27, 30, 30, 25, 27, 31, 31, 27, + 43, 43, 40, 43, 25, 28, 31, 87, 30, 32, + 28, 87, 43, 32, 28, 94, 32, 28, 43, 28, + 28, 56, 94, 32, 56, 32, 36, 36, 37, 37, + 28, 45, 45, 37, 2577, 36, 45, 39, 41, 41, - 37, 40, 38, 82, 39, 40, 82, 41, 41, 38, - 39, 127, 41, 38, 38, 40, 41, 127, 78, 40, - 40, 58, 78, 58, 58, 66, 58, 66, 66, 68, - 66, 68, 68, 71, 68, 71, 71, 66, 71, 81, - 74, 85, 74, 74, 71, 74, 83, 84, 151, 83, - 85, 74, 74, 86, 87, 88, 92, 91, 93, 81, - 87, 94, 83, 91, 100, 84, 87, 86, 87, 96, - 92, 95, 93, 88, 88, 97, 91, 103, 100, 102, - 98, 94, 95, 95, 98, 102, 99, 96, 106, 101, - 95, 99, 101, 97, 104, 101, 103, 107, 105, 104, + 45, 36, 39, 41, 124, 36, 39, 67, 67, 37, + 73, 124, 39, 41, 41, 39, 41, 44, 42, 84, + 84, 44, 39, 42, 73, 62, 42, 62, 62, 92, + 62, 44, 92, 42, 142, 44, 44, 42, 42, 70, + 142, 70, 70, 72, 70, 72, 72, 79, 72, 79, + 79, 70, 79, 86, 95, 86, 86, 89, 86, 89, + 89, 93, 89, 96, 86, 93, 95, 97, 89, 89, + 97, 98, 100, 103, 98, 101, 102, 104, 105, 106, + 107, 100, 102, 96, 109, 106, 108, 98, 102, 101, + 102, 103, 103, 111, 107, 110, 115, 105, 106, 104, - 110, 105, 108, 109, 102, 105, 108, 106, 101, 101, - 109, 107, 106, 110, 112, 111, 113, 114, 118, 104, - 115, 105, 111, 116, 115, 117, 120, 112, 119, 119, - 117, 123, 122, 149, 117, 114, 113, 124, 118, 121, - 126, 116, 128, 121, 130, 125, 120, 122, 125, 129, - 129, 130, 121, 126, 128, 131, 124, 123, 121, 125, - 132, 133, 130, 125, 134, 139, 135, 129, 135, 136, - 129, 131, 138, 137, 141, 143, 143, 135, 137, 132, - 134, 136, 133, 139, 138, 140, 150, 150, 141, 135, - 140, 145, 158, 147, 145, 147, 147, 152, 147, 152, + 108, 112, 118, 114, 109, 113, 110, 110, 114, 113, + 115, 111, 116, 122, 110, 116, 117, 128, 116, 112, + 119, 118, 117, 120, 121, 119, 120, 122, 126, 123, + 120, 116, 116, 123, 125, 126, 127, 128, 129, 131, + 130, 117, 133, 121, 130, 119, 120, 125, 121, 127, + 132, 134, 134, 135, 137, 132, 129, 131, 138, 132, + 139, 136, 133, 140, 143, 136, 140, 144, 144, 137, + 141, 145, 148, 135, 136, 146, 143, 140, 145, 139, + 136, 140, 147, 141, 138, 144, 149, 151, 144, 145, + 152, 146, 150, 148, 150, 152, 153, 156, 154, 151, - 152, 153, 152, 153, 153, 155, 153, 156, 155, 157, - 158, 159, 156, 153, 160, 157, 161, 162, 163, 164, - 166, 167, 160, 165, 157, 162, 159, 161, 165, 160, - 167, 169, 168, 148, 164, 176, 170, 163, 168, 168, - 166, 170, 171, 171, 172, 174, 173, 176, 173, 174, - 172, 173, 175, 175, 174, 177, 169, 178, 179, 174, - 180, 181, 178, 179, 182, 174, 174, 183, 173, 185, - 182, 183, 180, 184, 177, 186, 187, 188, 184, 189, - 190, 181, 192, 185, 189, 190, 193, 192, 187, 194, - 186, 187, 195, 182, 218, 188, 191, 191, 195, 199, + 155, 147, 149, 150, 1043, 155, 158, 158, 153, 160, + 182, 156, 160, 165, 165, 150, 154, 162, 182, 162, + 162, 167, 162, 167, 167, 168, 167, 168, 168, 170, + 168, 172, 170, 172, 172, 176, 172, 168, 175, 175, + 176, 177, 178, 179, 180, 183, 181, 177, 184, 185, + 186, 189, 180, 187, 185, 174, 177, 181, 179, 180, + 178, 188, 187, 184, 183, 173, 190, 188, 188, 192, + 186, 190, 191, 191, 194, 192, 189, 193, 194, 193, + 195, 195, 193, 194, 196, 197, 198, 199, 194, 200, + 201, 198, 199, 205, 194, 194, 196, 202, 203, 193, - 191, 197, 191, 196, 196, 194, 193, 197, 202, 198, - 218, 200, 201, 197, 191, 198, 191, 200, 201, 199, - 203, 208, 210, 204, 205, 206, 203, 201, 204, 202, - 205, 206, 207, 212, 208, 209, 213, 211, 214, 207, - 215, 209, 210, 211, 213, 215, 217, 216, 219, 221, - 224, 214, 220, 222, 221, 212, 216, 220, 220, 223, - 225, 217, 226, 223, 227, 228, 225, 231, 219, 229, - 227, 222, 224, 233, 229, 232, 235, 234, 236, 233, - 226, 226, 232, 234, 236, 228, 231, 237, 238, 239, - 239, 240, 240, 244, 241, 235, 243, 242, 243, 237, + 204, 200, 203, 202, 197, 204, 206, 205, 207, 208, + 201, 209, 210, 213, 171, 214, 209, 210, 211, 211, + 207, 206, 211, 207, 211, 212, 202, 208, 215, 217, + 212, 214, 219, 213, 215, 217, 211, 218, 211, 216, + 216, 217, 220, 218, 221, 222, 224, 223, 220, 225, + 221, 224, 219, 223, 226, 225, 227, 228, 229, 221, + 226, 230, 231, 227, 229, 232, 222, 233, 231, 234, + 228, 235, 239, 237, 236, 233, 235, 238, 242, 240, + 244, 230, 234, 236, 240, 240, 241, 232, 237, 245, + 243, 241, 239, 238, 243, 245, 242, 246, 247, 248, - 241, 245, 238, 242, 247, 246, 245, 249, 250, 251, - 146, 248, 262, 250, 252, 243, 244, 246, 241, 248, - 252, 254, 253, 247, 255, 256, 254, 249, 253, 255, - 257, 256, 251, 258, 259, 260, 261, 262, 264, 268, - 263, 264, 266, 266, 261, 257, 263, 258, 265, 260, - 265, 267, 259, 271, 267, 269, 269, 268, 270, 270, - 272, 273, 274, 275, 273, 276, 274, 277, 278, 271, - 279, 286, 275, 277, 276, 272, 279, 280, 281, 280, - 287, 282, 278, 284, 281, 282, 283, 283, 284, 285, - 288, 286, 289, 290, 290, 285, 291, 292, 287, 291, + 249, 250, 244, 250, 247, 249, 251, 252, 255, 257, + 258, 253, 254, 166, 252, 246, 246, 253, 254, 248, + 256, 257, 259, 259, 258, 251, 256, 255, 260, 260, + 261, 262, 263, 264, 263, 265, 261, 262, 266, 267, + 265, 268, 269, 270, 271, 282, 272, 273, 270, 268, + 266, 263, 272, 273, 261, 274, 264, 276, 267, 275, + 274, 277, 269, 276, 275, 278, 279, 271, 280, 281, + 282, 284, 283, 285, 284, 285, 277, 281, 283, 278, + 286, 286, 280, 287, 279, 288, 287, 289, 289, 290, + 290, 291, 293, 292, 294, 293, 295, 296, 294, 298, - 293, 294, 282, 295, 293, 289, 296, 296, 297, 298, - 299, 288, 298, 300, 301, 292, 302, 301, 304, 300, - 294, 295, 299, 305, 144, 309, 297, 304, 302, 298, - 303, 306, 307, 310, 142, 307, 306, 307, 309, 303, - 308, 305, 303, 308, 315, 310, 314, 303, 303, 303, - 303, 312, 311, 307, 311, 311, 312, 312, 313, 315, - 316, 313, 317, 314, 318, 318, 314, 319, 321, 316, - 322, 317, 319, 320, 320, 322, 323, 324, 325, 326, - 327, 328, 328, 321, 328, 330, 327, 331, 323, 332, - 339, 339, 331, 328, 326, 332, 324, 333, 325, 334, + 300, 164, 300, 288, 297, 295, 296, 291, 292, 299, + 297, 301, 302, 298, 306, 299, 302, 301, 303, 303, + 304, 305, 307, 308, 309, 304, 314, 305, 310, 310, + 312, 315, 311, 302, 306, 311, 317, 309, 313, 319, + 307, 163, 313, 322, 308, 314, 316, 316, 312, 315, + 318, 319, 320, 318, 317, 322, 321, 324, 320, 321, + 325, 328, 326, 329, 328, 454, 324, 326, 332, 330, + 318, 323, 327, 332, 332, 327, 329, 327, 325, 334, + 323, 330, 331, 323, 331, 331, 335, 454, 323, 323, + 323, 323, 333, 327, 336, 333, 334, 337, 341, 334, - 336, 345, 333, 335, 334, 330, 335, 338, 335, 337, - 334, 340, 337, 346, 336, 342, 338, 340, 341, 341, - 342, 345, 347, 343, 348, 337, 343, 349, 337, 352, - 337, 70, 343, 355, 346, 351, 343, 347, 351, 348, - 354, 349, 355, 352, 343, 344, 344, 356, 344, 358, - 357, 361, 356, 356, 351, 354, 357, 359, 360, 362, - 361, 344, 365, 364, 344, 366, 344, 368, 344, 353, - 358, 353, 353, 360, 363, 369, 359, 370, 362, 366, - 363, 353, 365, 353, 353, 353, 367, 371, 353, 364, - 368, 373, 367, 372, 374, 369, 367, 370, 372, 376, + 343, 335, 339, 336, 338, 338, 337, 339, 340, 340, + 342, 344, 343, 341, 345, 342, 346, 347, 350, 358, + 351, 348, 348, 347, 348, 351, 352, 161, 358, 356, + 344, 346, 352, 348, 345, 353, 354, 365, 350, 355, + 353, 354, 355, 356, 355, 357, 360, 354, 357, 359, + 359, 362, 360, 361, 361, 366, 362, 365, 367, 363, + 368, 357, 363, 369, 357, 372, 357, 371, 363, 375, + 371, 378, 363, 367, 374, 368, 366, 369, 375, 372, + 363, 364, 364, 380, 364, 376, 371, 377, 667, 374, + 376, 376, 378, 377, 379, 382, 384, 364, 380, 667, - 374, 377, 371, 375, 375, 379, 373, 378, 380, 381, - 382, 379, 384, 377, 385, 382, 64, 383, 383, 376, - 383, 378, 386, 387, 388, 381, 388, 389, 394, 389, - 385, 390, 384, 380, 393, 390, 391, 387, 386, 396, - 391, 392, 392, 394, 395, 397, 400, 389, 468, 398, - 401, 400, 399, 393, 401, 391, 402, 396, 398, 397, - 395, 399, 403, 404, 405, 402, 409, 468, 403, 398, - 405, 398, 406, 408, 407, 411, 406, 407, 408, 410, - 410, 412, 412, 414, 404, 413, 409, 416, 411, 418, - 413, 415, 415, 416, 417, 419, 414, 420, 417, 423, + 364, 381, 364, 383, 364, 373, 385, 373, 373, 383, + 381, 386, 388, 379, 382, 391, 389, 373, 390, 373, + 373, 373, 384, 387, 373, 386, 385, 392, 393, 387, + 391, 394, 392, 387, 396, 388, 389, 394, 390, 395, + 395, 397, 398, 393, 399, 400, 401, 402, 403, 403, + 399, 403, 402, 397, 396, 404, 398, 405, 406, 408, + 481, 408, 401, 407, 409, 410, 409, 411, 413, 410, + 400, 411, 415, 405, 406, 404, 414, 407, 412, 412, + 416, 417, 481, 418, 409, 419, 411, 413, 415, 421, + 422, 414, 418, 421, 419, 417, 420, 424, 416, 422, - 421, 424, 420, 432, 418, 421, 422, 422, 425, 427, - 426, 423, 427, 428, 434, 422, 419, 428, 429, 430, - 430, 424, 426, 431, 432, 437, 425, 438, 431, 439, - 429, 433, 433, 436, 436, 438, 434, 440, 439, 441, - 443, 444, 445, 446, 447, 449, 437, 59, 448, 446, - 449, 441, 450, 447, 448, 453, 445, 440, 443, 451, - 443, 444, 452, 454, 456, 452, 450, 451, 455, 453, - 451, 458, 457, 459, 455, 457, 460, 458, 454, 461, - 467, 460, 462, 464, 456, 463, 466, 459, 464, 463, - 465, 466, 472, 469, 473, 458, 467, 475, 474, 488, + 423, 420, 425, 418, 429, 418, 423, 426, 425, 427, + 428, 426, 427, 430, 430, 428, 431, 433, 424, 432, + 432, 434, 433, 438, 429, 435, 435, 436, 437, 431, + 439, 440, 437, 436, 434, 441, 440, 443, 438, 444, + 441, 442, 442, 445, 446, 447, 449, 451, 447, 443, + 442, 439, 451, 448, 450, 450, 446, 448, 449, 444, + 452, 445, 453, 453, 456, 456, 457, 458, 459, 460, + 461, 464, 463, 466, 465, 458, 467, 459, 468, 466, + 470, 452, 461, 472, 468, 467, 472, 457, 465, 460, + 463, 464, 463, 469, 470, 471, 473, 474, 469, 475, - 488, 461, 474, 462, 476, 465, 469, 470, 470, 473, - 477, 54, 472, 470, 477, 470, 475, 479, 481, 478, - 476, 470, 482, 470, 478, 480, 470, 470, 478, 483, - 480, 482, 479, 470, 481, 483, 484, 481, 485, 486, - 483, 485, 489, 487, 490, 490, 491, 492, 495, 493, - 494, 496, 484, 498, 500, 53, 496, 497, 499, 492, - 500, 491, 486, 487, 493, 502, 497, 489, 505, 494, - 495, 503, 498, 499, 502, 503, 504, 506, 507, 508, - 505, 509, 504, 510, 511, 512, 514, 513, 511, 513, - 515, 515, 506, 508, 514, 517, 509, 507, 512, 516, + 476, 477, 478, 471, 477, 475, 471, 479, 478, 480, + 473, 482, 474, 483, 480, 485, 488, 483, 484, 486, + 476, 479, 487, 484, 486, 492, 478, 489, 493, 494, + 485, 495, 482, 494, 505, 488, 496, 505, 487, 499, + 489, 490, 490, 493, 497, 492, 500, 490, 497, 490, + 495, 500, 496, 498, 499, 490, 501, 490, 498, 502, + 490, 490, 498, 503, 504, 506, 507, 490, 502, 503, + 508, 508, 501, 509, 503, 501, 510, 510, 511, 512, + 504, 513, 514, 515, 516, 517, 507, 518, 506, 516, + 522, 512, 519, 511, 517, 526, 513, 520, 509, 522, - 518, 510, 519, 521, 522, 516, 518, 517, 520, 524, - 523, 520, 524, 525, 519, 523, 538, 521, 526, 522, - 527, 538, 525, 528, 536, 527, 527, 529, 529, 525, - 530, 530, 525, 531, 526, 539, 528, 532, 532, 531, - 533, 533, 534, 537, 535, 536, 537, 540, 534, 535, - 535, 543, 542, 541, 539, 540, 541, 542, 544, 545, - 546, 547, 548, 545, 549, 547, 546, 550, 552, 549, - 551, 553, 558, 552, 543, 555, 551, 544, 554, 557, - 548, 554, 556, 556, 559, 553, 554, 550, 558, 559, - 554, 560, 561, 555, 562, 564, 560, 557, 565, 566, + 523, 514, 524, 520, 523, 515, 518, 519, 524, 525, + 526, 527, 528, 529, 530, 531, 532, 534, 533, 531, + 533, 525, 535, 535, 537, 534, 528, 536, 529, 532, + 527, 538, 530, 536, 539, 540, 537, 538, 540, 541, + 542, 544, 543, 545, 544, 546, 539, 543, 549, 549, + 548, 547, 545, 541, 551, 542, 547, 547, 556, 545, + 551, 546, 545, 548, 550, 550, 552, 552, 553, 553, + 554, 557, 555, 559, 557, 558, 554, 555, 555, 556, + 558, 560, 561, 562, 563, 561, 564, 565, 562, 560, + 566, 565, 559, 567, 568, 569, 566, 567, 570, 572, - 567, 564, 566, 568, 567, 571, 561, 565, 568, 562, - 569, 570, 572, 569, 574, 573, 570, 576, 575, 577, - 577, 571, 573, 575, 578, 579, 567, 574, 48, 580, - 572, 581, 583, 578, 582, 584, 585, 576, 583, 585, - 581, 584, 589, 590, 579, 580, 582, 586, 586, 587, - 586, 588, 587, 591, 597, 593, 588, 590, 592, 591, - 589, 593, 594, 592, 595, 594, 596, 597, 598, 595, - 599, 596, 596, 600, 601, 599, 602, 603, 604, 600, - 606, 598, 603, 605, 605, 602, 608, 606, 607, 599, - 599, 607, 608, 601, 610, 609, 611, 613, 604, 610, + 569, 573, 571, 575, 572, 564, 577, 563, 571, 576, + 576, 574, 568, 578, 574, 573, 581, 579, 570, 574, + 580, 575, 579, 574, 577, 580, 582, 584, 585, 578, + 581, 586, 587, 584, 586, 588, 587, 585, 590, 589, + 588, 582, 589, 590, 591, 592, 593, 595, 594, 596, + 597, 597, 595, 593, 599, 598, 600, 601, 587, 602, + 591, 594, 603, 592, 598, 159, 601, 609, 603, 596, + 604, 602, 600, 599, 605, 610, 604, 605, 606, 606, + 607, 606, 608, 607, 611, 609, 612, 608, 613, 610, + 611, 612, 614, 615, 613, 614, 616, 617, 615, 618, - 615, 611, 611, 612, 612, 617, 607, 609, 614, 610, - 614, 616, 618, 616, 619, 620, 621, 623, 622, 615, - 624, 623, 613, 617, 622, 625, 626, 627, 628, 624, - 618, 629, 619, 630, 620, 632, 621, 634, 631, 633, - 625, 626, 635, 629, 631, 627, 636, 628, 630, 632, - 636, 633, 637, 638, 639, 640, 634, 641, 642, 644, - 644, 635, 645, 642, 643, 646, 645, 648, 647, 638, - 637, 650, 639, 640, 640, 649, 641, 651, 643, 647, - 649, 648, 652, 653, 646, 655, 654, 650, 656, 657, - 653, 654, 655, 656, 657, 652, 651, 658, 659, 660, + 619, 616, 616, 620, 621, 619, 622, 624, 623, 620, + 617, 626, 618, 623, 629, 622, 625, 625, 626, 619, + 619, 627, 628, 621, 627, 630, 629, 624, 628, 631, + 630, 632, 632, 633, 631, 631, 634, 635, 634, 627, + 630, 636, 637, 636, 638, 639, 640, 641, 642, 643, + 644, 645, 648, 643, 642, 646, 635, 647, 633, 644, + 637, 649, 638, 639, 650, 640, 645, 641, 651, 652, + 646, 648, 653, 649, 651, 647, 654, 655, 656, 650, + 657, 658, 656, 652, 653, 659, 660, 661, 662, 664, + 664, 666, 157, 662, 663, 654, 655, 658, 657, 668, - 661, 662, 664, 665, 663, 659, 665, 664, 660, 666, - 662, 667, 668, 666, 661, 658, 663, 669, 671, 670, - 682, 668, 672, 672, 677, 667, 673, 673, 674, 674, - 678, 675, 669, 670, 679, 673, 678, 680, 681, 671, - 675, 680, 683, 677, 686, 682, 684, 685, 687, 688, - 681, 686, 684, 689, 679, 685, 692, 699, 698, 695, - 683, 702, 701, 699, 43, 703, 687, 698, 701, 703, - 707, 692, 706, 689, 688, 690, 695, 702, 704, 704, - 690, 705, 705, 706, 690, 708, 709, 690, 707, 713, - 710, 715, 14, 712, 690, 690, 710, 690, 712, 708, + 670, 671, 672, 659, 660, 660, 661, 665, 663, 669, + 666, 665, 673, 668, 669, 672, 670, 674, 675, 673, + 671, 676, 674, 677, 678, 675, 676, 679, 677, 680, + 681, 682, 684, 683, 679, 687, 685, 684, 680, 685, + 682, 688, 678, 686, 681, 683, 689, 686, 690, 687, + 688, 691, 692, 692, 693, 693, 694, 694, 695, 697, + 698, 689, 690, 693, 699, 700, 698, 695, 701, 700, + 702, 703, 691, 704, 705, 707, 706, 708, 697, 704, + 701, 709, 705, 706, 699, 712, 719, 715, 718, 703, + 721, 722, 719, 707, 723, 702, 721, 718, 723, 729, - 714, 716, 717, 717, 716, 718, 709, 711, 711, 711, - 713, 711, 718, 720, 711, 726, 715, 726, 714, 711, - 719, 719, 721, 721, 722, 711, 711, 723, 720, 722, - 723, 724, 725, 725, 727, 728, 724, 729, 730, 732, - 731, 729, 733, 733, 738, 734, 727, 732, 735, 736, - 736, 737, 739, 797, 728, 740, 738, 797, 730, 731, - 734, 740, 735, 741, 742, 742, 743, 746, 741, 737, - 745, 743, 743, 746, 739, 745, 747, 750, 748, 749, - 750, 751, 747, 748, 752, 749, 755, 751, 753, 753, - 754, 754, 752, 756, 755, 757, 758, 759, 760, 760, + 712, 709, 708, 710, 715, 710, 726, 722, 710, 724, + 724, 727, 710, 725, 725, 710, 728, 726, 730, 729, + 733, 732, 710, 710, 730, 710, 732, 734, 735, 727, + 728, 731, 731, 731, 736, 731, 752, 736, 731, 738, + 740, 733, 737, 731, 752, 734, 738, 737, 737, 731, + 731, 739, 739, 735, 742, 740, 741, 741, 743, 742, + 744, 743, 745, 745, 746, 744, 746, 747, 748, 749, + 750, 754, 751, 749, 753, 753, 756, 756, 755, 747, + 757, 758, 759, 760, 762, 762, 754, 748, 772, 760, + 750, 751, 755, 758, 761, 763, 772, 765, 757, 761, - 757, 761, 763, 758, 762, 764, 766, 768, 763, 767, - 761, 756, 762, 770, 769, 766, 759, 771, 767, 769, - 771, 772, 770, 773, 764, 774, 772, 775, 776, 777, - 779, 768, 778, 778, 777, 777, 775, 773, 780, 781, - 782, 776, 783, 784, 788, 779, 784, 786, 781, 786, - 774, 787, 787, 789, 784, 790, 793, 780, 789, 791, - 783, 792, 794, 795, 782, 788, 796, 798, 799, 800, - 804, 801, 795, 803, 802, 800, 790, 805, 793, 791, - 801, 792, 794, 805, 804, 798, 802, 799, 806, 796, - 807, 809, 803, 808, 808, 807, 810, 811, 812, 813, + 763, 763, 765, 766, 759, 767, 776, 768, 769, 766, + 770, 767, 768, 770, 769, 771, 773, 773, 774, 774, + 775, 771, 777, 778, 776, 779, 781, 777, 775, 782, + 778, 780, 780, 783, 784, 781, 786, 782, 787, 783, + 788, 789, 790, 792, 779, 786, 789, 787, 792, 791, + 794, 790, 791, 784, 793, 797, 795, 796, 798, 798, + 797, 797, 799, 800, 788, 795, 802, 801, 793, 803, + 796, 806, 808, 806, 810, 794, 801, 799, 804, 807, + 807, 804, 800, 809, 811, 812, 813, 803, 809, 804, + 802, 814, 815, 808, 816, 810, 817, 818, 821, 819, - 814, 815, 806, 816, 817, 810, 812, 818, 820, 821, - 817, 809, 819, 818, 820, 822, 825, 811, 823, 813, - 815, 822, 814, 816, 823, 826, 819, 824, 827, 821, - 828, 824, 832, 827, 830, 825, 833, 826, 829, 829, - 830, 831, 834, 835, 831, 826, 836, 836, 834, 833, - 832, 828, 837, 838, 839, 839, 840, 841, 838, 842, - 842, 841, 843, 835, 845, 844, 848, 846, 849, 845, - 837, 840, 851, 852, 854, 854, 855, 858, 856, 859, - 855, 860, 849, 859, 843, 844, 846, 857, 857, 861, - 848, 875, 851, 856, 852, 853, 860, 875, 853, 863, + 817, 815, 822, 820, 811, 812, 823, 821, 813, 820, + 824, 814, 826, 825, 822, 818, 827, 816, 819, 825, + 829, 827, 828, 828, 824, 823, 826, 830, 831, 832, + 833, 834, 835, 837, 836, 838, 830, 832, 839, 837, + 829, 838, 841, 840, 85, 845, 846, 848, 831, 840, + 833, 835, 839, 834, 836, 842, 844, 843, 846, 855, + 844, 842, 841, 843, 845, 847, 846, 850, 848, 852, + 847, 849, 849, 850, 851, 853, 854, 851, 857, 855, + 856, 856, 854, 860, 858, 859, 863, 852, 853, 858, + 859, 859, 864, 861, 862, 862, 857, 861, 860, 865, - 853, 13, 858, 861, 853, 862, 853, 865, 866, 864, - 862, 853, 866, 863, 864, 864, 853, 867, 868, 869, - 870, 865, 871, 868, 866, 870, 872, 873, 874, 876, - 881, 869, 867, 868, 877, 876, 871, 874, 878, 878, - 877, 873, 882, 879, 880, 883, 885, 872, 879, 886, - 880, 913, 881, 887, 886, 892, 888, 890, 885, 889, - 889, 882, 890, 883, 884, 884, 891, 887, 888, 892, - 884, 913, 884, 893, 891, 894, 895, 895, 884, 899, - 898, 896, 899, 884, 884, 896, 898, 900, 901, 902, - 884, 903, 893, 904, 894, 902, 903, 908, 906, 907, + 866, 868, 869, 871, 865, 872, 874, 874, 863, 875, + 877, 877, 864, 875, 876, 878, 869, 879, 880, 866, + 881, 879, 896, 871, 80, 868, 872, 873, 896, 876, + 873, 883, 873, 880, 881, 885, 873, 882, 873, 886, + 878, 884, 882, 873, 885, 883, 884, 884, 873, 888, + 887, 890, 889, 886, 887, 891, 892, 889, 893, 894, + 891, 75, 895, 890, 888, 902, 887, 889, 897, 898, + 892, 895, 903, 894, 897, 898, 899, 899, 900, 893, + 901, 904, 906, 900, 907, 909, 901, 902, 908, 907, + 911, 903, 910, 910, 906, 911, 912, 909, 913, 904, - 911, 901, 910, 909, 914, 912, 900, 906, 907, 909, - 912, 910, 904, 908, 915, 916, 917, 918, 914, 911, - 920, 925, 919, 921, 923, 917, 918, 916, 919, 921, - 926, 928, 927, 930, 915, 925, 929, 920, 931, 932, - 923, 935, 941, 931, 932, 928, 935, 936, 930, 938, - 926, 927, 937, 937, 929, 938, 936, 939, 941, 942, - 945, 946, 943, 943, 942, 942, 943, 947, 944, 948, - 939, 944, 949, 950, 945, 952, 951, 954, 953, 956, - 959, 946, 951, 947, 953, 949, 955, 948, 950, 962, - 0, 955, 954, 956, 958, 952, 966, 958, 960, 961, + 905, 905, 908, 914, 912, 915, 905, 917, 905, 916, + 916, 917, 913, 918, 905, 920, 922, 923, 926, 905, + 905, 920, 914, 924, 915, 921, 905, 925, 921, 924, + 923, 928, 925, 918, 929, 922, 930, 926, 931, 932, + 928, 933, 934, 929, 931, 935, 937, 934, 932, 936, + 938, 941, 930, 942, 74, 939, 945, 941, 940, 947, + 933, 948, 938, 936, 939, 935, 937, 940, 943, 949, + 942, 950, 945, 947, 943, 951, 952, 953, 954, 957, + 958, 948, 953, 954, 957, 950, 959, 959, 949, 958, + 960, 952, 961, 951, 963, 964, 960, 967, 965, 965, - 963, 959, 964, 960, 961, 962, 965, 964, 966, 963, - 968, 965, 969, 970, 971, 973, 968, 972, 972, 970, - 971, 974, 975, 977, 973, 975, 976, 976, 969, 978, - 979, 980, 981, 984, 980, 985, 982, 983, 984, 974, - 985, 977, 982, 983, 986, 981, 987, 989, 978, 986, - 979, 990, 987, 991, 994, 992, 993, 993, 995, 991, - 992, 996, 997, 994, 1000, 989, 998, 995, 1001, 998, - 999, 990, 1002, 999, 1003, 1000, 1004, 1005, 1009, 996, - 1006, 997, 1004, 1005, 1002, 1007, 1001, 1008, 1008, 1010, - 1007, 1013, 1011, 1003, 1012, 1006, 1014, 1009, 1012, 1015, + 964, 964, 965, 966, 968, 961, 966, 969, 970, 971, + 963, 967, 972, 973, 974, 975, 976, 981, 978, 973, + 977, 975, 971, 969, 968, 977, 970, 972, 984, 991, + 980, 976, 978, 980, 974, 982, 983, 985, 981, 988, + 982, 983, 986, 987, 984, 991, 985, 986, 987, 990, + 992, 988, 993, 994, 994, 990, 992, 995, 993, 996, + 997, 998, 998, 997, 999, 1000, 995, 1001, 1002, 1004, + 1003, 1002, 1005, 1011, 1006, 1004, 1007, 996, 1005, 1006, + 1008, 1007, 999, 1003, 1000, 1008, 1009, 1001, 1012, 1013, + 1016, 1011, 1009, 1014, 1017, 1013, 1015, 1015, 1014, 1016, - 1016, 1018, 1021, 1010, 1011, 1014, 1019, 1019, 1022, 1013, - 1023, 1027, 1024, 1026, 1026, 1025, 1021, 1024, 1015, 0, - 1018, 1028, 1023, 1022, 1025, 1016, 1029, 1028, 1030, 1033, - 1032, 1027, 1029, 1030, 1031, 1032, 1031, 1034, 1036, 1035, - 1037, 1038, 1039, 1033, 1035, 1040, 1042, 1042, 1038, 1043, - 1044, 1034, 1045, 1036, 1046, 1047, 1157, 1039, 1157, 1037, - 1046, 1050, 1050, 1043, 1040, 1048, 1051, 1045, 1044, 1053, - 1048, 1051, 1052, 1052, 1054, 1047, 1053, 1055, 1056, 1048, - 1055, 1048, 1057, 1058, 1048, 1059, 1060, 1061, 1054, 1062, - 1059, 1063, 1058, 1064, 1062, 1066, 1066, 1056, 1067, 1061, + 1018, 1019, 1020, 1017, 1021, 1020, 1022, 1021, 1012, 1023, + 1024, 1025, 1031, 1026, 1028, 1027, 1035, 1022, 1018, 1026, + 1019, 1027, 1024, 1029, 1030, 1030, 1032, 1023, 1029, 1028, + 1025, 1031, 1033, 1034, 1035, 1037, 1036, 1034, 1038, 1040, + 1032, 1041, 1041, 1044, 1033, 1036, 1042, 1045, 1046, 1050, + 1047, 1053, 1048, 1051, 1037, 1047, 1053, 1044, 1040, 1051, + 1046, 1048, 1045, 1038, 1049, 1049, 1042, 1052, 1054, 1050, + 1054, 1055, 1056, 1052, 1057, 1058, 1055, 1059, 1060, 1062, + 1058, 1063, 1061, 1065, 1065, 1066, 1056, 1067, 1057, 1061, + 1069, 1068, 1059, 1070, 1062, 68, 1069, 1060, 1071, 1066, - 1057, 1068, 1063, 1067, 1069, 1060, 1068, 1071, 1070, 1072, - 1073, 1071, 1064, 1070, 1074, 1075, 1076, 1077, 1072, 1078, - 1080, 1079, 1081, 1082, 1069, 1073, 1078, 1084, 1076, 1074, - 1083, 1085, 1077, 1079, 1075, 1086, 1083, 1087, 1089, 1080, - 1090, 1082, 1084, 1081, 1089, 1091, 1087, 1092, 1094, 1096, - 1097, 1085, 1093, 1091, 1090, 1086, 1095, 1093, 1098, 1128, - 1094, 1095, 1095, 1101, 1097, 1099, 1099, 1092, 1096, 1102, - 1128, 1098, 1100, 1103, 1104, 1104, 1101, 1100, 1102, 1103, - 1100, 1100, 1105, 1106, 1107, 1100, 1111, 1105, 1108, 1109, - 1107, 1100, 1106, 1108, 1109, 1100, 1110, 1110, 1112, 1112, + 1063, 1074, 1074, 1071, 1073, 1067, 1068, 1078, 1073, 1077, + 1075, 1080, 1071, 1070, 1071, 1075, 1077, 1071, 1076, 1076, + 1079, 1078, 1081, 1079, 1082, 1084, 1083, 1085, 1088, 1086, + 1080, 1083, 1087, 1082, 1086, 1090, 1090, 1091, 1093, 1085, + 1081, 1092, 1091, 1087, 1084, 1094, 1092, 1088, 1095, 1097, + 1094, 1096, 1095, 1098, 1099, 1100, 1101, 1103, 1093, 1102, + 1096, 1104, 1105, 1106, 1097, 1109, 1102, 1100, 1098, 1103, + 1107, 1101, 1108, 1099, 1110, 1111, 1107, 1114, 1116, 1115, + 1104, 1106, 1113, 1105, 1111, 1109, 1116, 1108, 1113, 1117, + 1118, 1119, 1114, 1115, 1110, 1118, 1120, 1121, 1122, 1127, - 1113, 1114, 1115, 1113, 1116, 1113, 1117, 1111, 1119, 1118, - 1120, 1121, 1122, 1116, 1118, 0, 1125, 1121, 1122, 1123, - 1115, 1114, 1119, 1124, 1123, 1125, 1117, 1124, 1120, 1130, - 1125, 1131, 1125, 1130, 1125, 1132, 1125, 1126, 1126, 1127, - 1127, 1133, 1127, 1134, 1136, 1135, 1131, 1137, 1134, 1134, - 1133, 1138, 1137, 1132, 1135, 1139, 1140, 1141, 1142, 1144, - 1144, 1143, 1145, 1146, 1139, 1138, 1136, 1143, 1147, 1148, - 1145, 1149, 1142, 1147, 1150, 1140, 1141, 1146, 1151, 1152, - 1149, 1150, 1153, 1148, 1154, 1154, 1155, 1153, 1156, 1156, - 1159, 1161, 1160, 1159, 1162, 1164, 1151, 1160, 1163, 1163, + 1123, 1120, 1120, 1119, 1124, 1124, 1126, 63, 1127, 1117, + 1129, 1129, 1122, 1123, 1128, 1131, 1121, 1125, 1130, 1126, + 1128, 1132, 1125, 1130, 1131, 1125, 1125, 1132, 1133, 1134, + 1125, 1135, 1135, 1133, 1134, 1136, 1125, 1137, 1137, 1138, + 1125, 1139, 1138, 1141, 1138, 1140, 1142, 1145, 1143, 1146, + 1144, 1147, 1141, 1143, 1148, 1146, 1136, 1147, 1149, 1148, + 1150, 1139, 1149, 1140, 1144, 1145, 1142, 1151, 1151, 1150, + 1152, 1152, 1153, 1152, 1150, 1155, 1150, 1156, 1150, 1155, + 1150, 1157, 1158, 1153, 1159, 1160, 1161, 1163, 1162, 1159, + 1159, 1158, 1156, 1162, 1160, 1164, 1165, 1166, 1167, 1157, - 1168, 1155, 1169, 1162, 1152, 1165, 1165, 1166, 1166, 1167, - 1161, 1170, 1170, 1171, 1167, 1164, 1172, 1173, 1175, 1172, - 1174, 1168, 1176, 1169, 1176, 1174, 1177, 1175, 1179, 1181, - 1180, 1179, 1182, 1171, 1181, 1183, 1185, 1173, 1186, 1184, - 1183, 1185, 1189, 1186, 1177, 1180, 1182, 1184, 1187, 1187, - 1188, 1190, 1191, 1192, 1199, 1188, 1194, 1190, 1195, 1191, - 1189, 1197, 1194, 1196, 1195, 1198, 1192, 1197, 1196, 1200, - 1201, 1201, 1202, 1199, 1198, 1204, 1205, 1206, 1207, 1208, - 1200, 1210, 1211, 1206, 1207, 1208, 1212, 1210, 1213, 1214, - 1215, 1217, 1202, 1216, 1216, 1204, 1211, 1218, 1219, 1205, + 1168, 1163, 1169, 1169, 1164, 1170, 1168, 1171, 1161, 1172, + 1173, 1174, 1167, 1170, 1172, 1165, 1166, 1176, 1175, 1177, + 1174, 1171, 1178, 1180, 1173, 1175, 1186, 1178, 1179, 1179, + 1181, 1181, 1182, 1184, 1182, 1176, 1184, 1185, 1180, 1187, + 1188, 1188, 1185, 1189, 1177, 1186, 1190, 1190, 1187, 1191, + 1191, 1192, 1193, 1194, 1195, 1195, 1192, 1196, 1197, 1198, + 1199, 1197, 1200, 1189, 1201, 1199, 1201, 1202, 1205, 1204, + 1206, 1200, 1204, 1193, 1194, 1206, 1207, 1196, 1214, 1198, + 1209, 1208, 1210, 1205, 1211, 1202, 1208, 1210, 1209, 1211, + 1207, 1212, 1212, 1213, 1215, 1216, 1214, 1217, 1213, 1219, - 1213, 1222, 1211, 1214, 1220, 1223, 1212, 1225, 1215, 1220, - 1223, 1217, 1221, 1221, 1226, 1227, 1219, 1229, 1228, 1226, - 1226, 1230, 1218, 1231, 1222, 1229, 1225, 1228, 1232, 1233, - 1234, 1235, 1234, 1227, 1233, 1230, 1237, 1233, 1231, 1239, - 1238, 1241, 1237, 1232, 1238, 1235, 1232, 1240, 1242, 1243, - 1239, 1244, 1240, 1240, 1245, 1246, 1244, 1247, 1248, 1245, - 1241, 1250, 1247, 1251, 1252, 1253, 1253, 1243, 1254, 1255, - 1256, 1257, 1254, 1246, 1242, 1250, 1258, 1257, 1248, 1259, - 1260, 1251, 1252, 1263, 1261, 1262, 1264, 1255, 1258, 1256, - 1265, 1264, 1267, 1270, 1260, 1268, 1266, 1265, 1259, 1261, + 1215, 1220, 1216, 1221, 1223, 1219, 1222, 1220, 1221, 1224, + 1217, 1225, 1222, 1223, 1226, 1226, 1227, 1229, 1230, 1231, + 1232, 1233, 1225, 1234, 1236, 1237, 1232, 1233, 1224, 1234, + 1236, 1238, 1229, 1240, 1239, 1241, 1227, 1243, 1230, 1237, + 1242, 1242, 1231, 1244, 1245, 1237, 1239, 1240, 1248, 1246, + 1251, 1238, 1253, 1241, 1246, 1247, 1247, 1243, 1249, 1252, + 1256, 1257, 1245, 1249, 1252, 1252, 1254, 1258, 1244, 1251, + 1253, 1248, 1255, 1259, 1256, 1254, 1257, 1260, 1259, 1262, + 1255, 1259, 1258, 1266, 1264, 1258, 1260, 1261, 1265, 1261, + 1264, 1267, 1265, 1262, 1266, 1268, 1267, 1267, 1269, 1270, - 1262, 1266, 1263, 1271, 1268, 1269, 1269, 1272, 1270, 1271, - 1267, 1273, 1274, 1275, 1276, 1276, 1273, 1281, 1274, 1275, - 1277, 1277, 1279, 1279, 1282, 1280, 1281, 1283, 1272, 1280, - 1284, 1285, 1286, 1286, 1287, 1288, 1290, 1291, 1285, 1289, - 1294, 1283, 1282, 1288, 1289, 1284, 1292, 1295, 1295, 1296, - 1290, 1292, 1292, 1293, 1287, 1297, 1291, 1298, 1293, 1293, - 1294, 1300, 1299, 1301, 1302, 1303, 1298, 1299, 1296, 1305, - 1304, 1303, 1306, 1307, 1297, 1304, 1314, 1310, 1306, 1308, - 1300, 1309, 1302, 1301, 1311, 1308, 1312, 1309, 1313, 1315, - 1314, 1316, 1307, 1317, 1317, 1305, 1310, 1318, 0, 1319, + 1271, 1272, 1273, 1274, 1277, 1271, 1272, 1275, 1274, 58, + 1278, 1279, 1280, 1280, 1268, 1281, 1282, 1270, 1277, 1281, + 1273, 1283, 1286, 1285, 1269, 1284, 1290, 1275, 1278, 1279, + 1287, 1284, 1288, 1289, 1282, 1285, 1292, 1291, 1294, 1297, + 1283, 1286, 1291, 1292, 1287, 1290, 1293, 1288, 1289, 1295, + 1299, 1293, 1296, 1296, 1297, 1298, 1294, 1300, 1295, 1301, + 57, 1298, 1302, 1303, 1301, 1310, 1299, 1311, 1302, 1303, + 1304, 1304, 1305, 1305, 1307, 1307, 1308, 1309, 1300, 1312, + 1308, 1311, 1313, 1310, 1314, 1314, 1309, 1315, 1316, 1313, + 1317, 1318, 1319, 1320, 1312, 1317, 1316, 1321, 1320, 1320, - 1318, 1320, 1320, 1311, 1329, 1312, 1316, 1313, 1321, 1321, - 1315, 1319, 1322, 1324, 1323, 1325, 1326, 1322, 1323, 1327, - 1331, 1327, 1329, 1330, 1325, 1327, 1324, 1332, 1330, 1326, - 1333, 1334, 1334, 1337, 1335, 1331, 1336, 1338, 1327, 1335, - 1339, 1342, 1336, 1344, 1343, 1339, 1333, 1332, 1337, 1340, - 1338, 1341, 1344, 1340, 1345, 1341, 1351, 1346, 1347, 1347, - 1349, 1342, 1343, 1346, 1352, 1353, 1353, 1354, 1355, 1352, - 1357, 1357, 1359, 1354, 1345, 1359, 1361, 1351, 1349, 1360, - 1360, 1362, 1364, 1365, 1366, 1364, 1367, 1367, 1355, 1368, - 1369, 1370, 1361, 1366, 1371, 1372, 1374, 1362, 1375, 1371, + 1322, 1326, 1321, 1321, 1324, 1318, 1325, 1315, 1323, 1323, + 1326, 1319, 1327, 1328, 1329, 1330, 1331, 1327, 1333, 1332, + 1322, 1334, 1331, 1324, 1332, 1325, 1335, 1334, 1338, 1336, + 1337, 1339, 1328, 1330, 1329, 1336, 1337, 1340, 1341, 1342, + 1343, 1345, 1345, 1344, 1333, 1335, 1346, 1338, 1347, 1346, + 1339, 1348, 1348, 1342, 1349, 1349, 1340, 1341, 1344, 1350, + 1347, 1343, 1351, 1352, 1350, 1353, 1351, 1354, 1357, 1355, + 1359, 1355, 1358, 1360, 1353, 1355, 1352, 1358, 1361, 1363, + 1354, 1362, 1362, 1364, 1363, 1359, 1357, 1365, 1355, 1364, + 1366, 1367, 1370, 1360, 1361, 1368, 1367, 1369, 1371, 1368, - 1373, 1373, 1376, 1365, 1368, 1374, 1377, 1378, 1378, 1372, - 1370, 1369, 1379, 1381, 1380, 1382, 1375, 1376, 1381, 1383, - 1383, 1384, 1385, 1386, 1386, 1384, 1379, 1387, 1388, 1389, - 1382, 1377, 1380, 1389, 1390, 1391, 1393, 1393, 1394, 1388, - 1391, 1395, 1385, 1396, 1397, 1398, 1399, 1399, 1401, 1387, - 1403, 1402, 1400, 1390, 1405, 1395, 1394, 1400, 1397, 1403, - 1404, 1409, 1396, 1396, 1406, 1404, 1406, 1407, 1401, 1408, - 1398, 1402, 1407, 1410, 1405, 1408, 1412, 1413, 1413, 1410, - 1414, 1409, 1415, 1418, 1417, 1419, 1419, 1421, 1415, 1417, - 1412, 1420, 1420, 1422, 1423, 1424, 1425, 1425, 1424, 1414, + 1372, 1369, 1365, 1366, 1373, 1374, 1375, 1375, 1377, 1372, + 1379, 1374, 1370, 1380, 1381, 1381, 1371, 1382, 1380, 1383, + 1385, 1385, 1387, 1382, 1373, 1387, 1377, 1388, 1388, 1389, + 1390, 1379, 1392, 1393, 1394, 1392, 1395, 1395, 1397, 1383, + 1396, 1398, 1399, 1394, 1400, 1389, 1390, 1399, 1401, 1401, + 1403, 1404, 1402, 1393, 1405, 1396, 1406, 1406, 1400, 1397, + 1398, 1402, 1407, 1408, 1409, 1410, 1404, 1413, 1403, 1409, + 1411, 1411, 1415, 1412, 1414, 1414, 1407, 1412, 1416, 1405, + 1410, 1408, 1417, 1418, 1422, 1419, 1417, 1413, 1423, 1416, + 1419, 1421, 1421, 1424, 1415, 1425, 1426, 1427, 1428, 1428, - 1426, 1421, 1427, 1436, 1435, 1445, 1436, 1418, 1429, 1423, - 1428, 1422, 1426, 1428, 1429, 1430, 1428, 1433, 1431, 1434, - 1430, 1431, 1427, 1445, 1434, 1446, 1433, 1438, 1428, 1435, - 1437, 1437, 1442, 1438, 1439, 1440, 1440, 1431, 1442, 1439, - 1441, 1441, 1443, 1444, 1446, 1447, 1448, 1443, 1449, 1448, - 1451, 1450, 1452, 1453, 1449, 1451, 1444, 1450, 1452, 1454, - 1455, 1455, 1456, 1457, 1454, 1447, 1458, 1456, 1459, 1460, - 1461, 1464, 1465, 1462, 1463, 1466, 1453, 1464, 1468, 1467, - 1471, 1457, 1476, 1460, 1461, 1462, 1458, 1463, 1459, 1470, - 1470, 1472, 1465, 1467, 1474, 1466, 1472, 1473, 1473, 1468, + 1422, 1430, 1418, 1429, 1431, 1434, 1423, 1424, 1429, 1432, + 1426, 1433, 1438, 52, 1425, 1425, 1433, 1435, 1432, 1435, + 1437, 1430, 1427, 1436, 1431, 1434, 1437, 1439, 1436, 1441, + 1442, 1442, 1438, 1439, 1443, 1444, 1447, 1446, 1448, 1448, + 1450, 1444, 1446, 1441, 1449, 1449, 1451, 1452, 1453, 1454, + 1454, 1453, 1455, 1443, 1450, 1456, 1457, 1465, 1461, 1459, + 1447, 1461, 1452, 1458, 1451, 1459, 1458, 1456, 1460, 1458, + 1455, 1463, 1466, 1460, 1464, 1466, 1457, 1461, 47, 1464, + 1463, 1458, 1465, 1467, 1467, 1468, 1474, 1469, 1470, 1470, + 1472, 1468, 1469, 1471, 1471, 1473, 1472, 1475, 1476, 1474, - 1471, 1475, 1477, 1478, 1479, 1482, 1476, 1480, 1484, 1474, - 1486, 0, 1478, 1481, 1480, 1475, 1488, 1488, 1491, 1479, - 1477, 1482, 1481, 1484, 1487, 1481, 1490, 1487, 1484, 1489, - 1489, 1492, 1493, 1493, 1492, 1486, 1491, 1494, 1490, 1495, - 1496, 1497, 1498, 1499, 1500, 1496, 1497, 1501, 1502, 1504, - 1494, 1505, 1505, 1500, 1503, 1504, 1506, 1502, 1495, 1499, - 1502, 1498, 1507, 1503, 1508, 1509, 1501, 1510, 1511, 1514, - 1515, 1516, 1516, 1517, 1574, 1507, 1506, 1518, 1574, 1509, - 1511, 1523, 1508, 1510, 1521, 1519, 1518, 1524, 1515, 1517, - 1519, 1520, 1520, 1521, 1514, 1522, 1521, 1525, 1526, 1523, + 1473, 1477, 1478, 1479, 1480, 1478, 1481, 1482, 1483, 1479, + 1480, 1481, 1487, 1482, 1484, 1475, 1488, 1476, 1489, 1484, + 1486, 1477, 1485, 1485, 1494, 1486, 1490, 1491, 1495, 1496, + 1487, 1483, 1492, 1493, 1495, 1497, 1488, 1494, 1489, 1498, + 1490, 1491, 1499, 1507, 1492, 1493, 1501, 1501, 1502, 1496, + 1505, 1503, 1506, 1498, 1508, 1497, 1503, 1504, 1504, 1510, + 1509, 1512, 1513, 1499, 1511, 1505, 1506, 1507, 1502, 1509, + 1512, 1511, 1508, 1512, 1510, 1515, 1517, 1518, 1513, 1521, + 1518, 1519, 1519, 1520, 1520, 1522, 1523, 1524, 1524, 1523, + 1515, 1521, 1525, 1526, 1527, 1515, 1529, 1528, 1530, 1527, - 1522, 1530, 1528, 1526, 1526, 1529, 1520, 1531, 1524, 1533, - 1541, 1532, 1531, 1534, 1534, 1525, 1528, 1532, 1535, 1537, - 1529, 1536, 1538, 1530, 1535, 1539, 1536, 1533, 1538, 1542, - 1541, 1539, 1543, 1537, 1544, 1546, 1545, 1550, 1543, 1545, - 1548, 1546, 1551, 1542, 1552, 1545, 1553, 1544, 1548, 1554, - 1555, 1556, 1552, 1557, 1559, 1553, 1550, 1558, 1558, 1561, - 1559, 1551, 1554, 1555, 1560, 1556, 1563, 1557, 1562, 1562, - 1560, 1564, 1561, 1565, 1566, 1567, 1568, 1569, 1570, 1558, - 1573, 1567, 1572, 1572, 1579, 1575, 1563, 1566, 1581, 1564, - 1575, 1583, 1565, 1569, 1576, 1578, 1570, 1577, 1568, 1576, + 1531, 1517, 1528, 1522, 1532, 1525, 1537, 1533, 1534, 1531, + 1536, 1536, 1526, 1539, 1530, 1529, 1533, 1534, 1535, 1533, + 1538, 1540, 1541, 1532, 1535, 1542, 1537, 1545, 1546, 1547, + 1547, 1539, 1548, 1538, 1549, 1540, 1550, 1542, 1541, 1551, + 1551, 1550, 1553, 1549, 1552, 1554, 1546, 1553, 1548, 1555, + 1556, 1559, 1545, 1552, 1551, 1557, 1552, 1560, 1561, 1562, + 1557, 1557, 18, 1554, 1562, 1559, 1564, 1563, 1556, 1568, + 1555, 1566, 1560, 1563, 1565, 1565, 1567, 1566, 1572, 1569, + 1561, 1567, 1570, 1568, 1564, 1569, 1573, 1574, 1570, 1575, + 1577, 1579, 1576, 1574, 1581, 1576, 1577, 1582, 1572, 1579, - 1573, 1584, 1577, 1581, 1578, 1582, 1582, 1579, 1585, 1587, - 1583, 1586, 1586, 1584, 1588, 1591, 1589, 1590, 1592, 1593, - 1594, 1588, 1595, 1587, 1596, 1593, 1601, 1585, 1589, 1590, - 1596, 1601, 1594, 1605, 1591, 1597, 1597, 1602, 1592, 1598, - 1595, 1603, 1598, 1599, 1599, 1605, 1602, 1603, 1604, 1604, - 1606, 1607, 1606, 1608, 1607, 1609, 1610, 1611, 1612, 1613, - 1614, 1615, 1616, 1612, 1618, 1620, 1621, 1616, 1613, 1617, - 1620, 1626, 1614, 1608, 1610, 1611, 1615, 1609, 1617, 1624, - 1619, 1621, 1622, 1622, 1618, 1619, 1627, 1623, 1628, 1630, - 1626, 1617, 1619, 1623, 1629, 1634, 1629, 1631, 1631, 1637, + 1573, 1576, 1575, 1583, 1585, 1584, 1586, 1587, 1588, 1589, + 1589, 1583, 1590, 1581, 1584, 1592, 1582, 1585, 1590, 1586, + 1591, 1587, 1588, 1593, 1593, 1594, 1591, 1596, 1592, 1595, + 1597, 1589, 1598, 1599, 1600, 1601, 1603, 1603, 1598, 1604, + 1605, 1610, 17, 1597, 1605, 1594, 1596, 1595, 1612, 1606, + 1600, 1607, 1608, 1601, 1606, 1599, 1607, 1608, 1609, 1604, + 1612, 1613, 1614, 1614, 1610, 1615, 1616, 1609, 1617, 1618, + 1618, 1619, 1620, 1623, 1621, 1624, 1613, 1622, 1616, 1620, + 1627, 1626, 1625, 0, 1615, 1619, 1621, 1617, 1625, 1622, + 1628, 1630, 1623, 1626, 1630, 1624, 1628, 1634, 1627, 1629, - 1624, 1638, 1627, 1630, 0, 1630, 1632, 1632, 1628, 1633, - 1633, 1635, 1635, 1636, 1636, 1634, 1639, 1639, 1641, 1640, - 1637, 1644, 1638, 1640, 1641, 1642, 1645, 1644, 1642, 1646, - 1647, 1648, 1649, 1649, 1648, 1646, 1650, 1650, 1652, 1651, - 1653, 1654, 1655, 1656, 1645, 1651, 1665, 1660, 1655, 1660, - 1652, 1652, 1652, 1658, 1659, 1647, 1661, 1652, 1658, 1658, - 1653, 1654, 1662, 1656, 1663, 1664, 1665, 1661, 1659, 1666, - 1663, 1667, 1667, 1668, 1664, 1669, 1669, 1662, 1670, 1671, - 1672, 1672, 1673, 1673, 1674, 1677, 1677, 1678, 1679, 1682, - 1666, 1681, 1684, 1684, 1685, 1689, 1683, 1679, 1670, 1668, + 1629, 1631, 1631, 1633, 1635, 1637, 1634, 1638, 1633, 1638, + 1635, 1636, 1636, 1639, 1640, 1641, 1639, 1637, 1642, 1644, + 1643, 1645, 1646, 1647, 1644, 1648, 1645, 1649, 1651, 1654, + 1650, 1646, 1649, 1657, 1640, 1647, 1642, 1641, 1643, 1650, + 1648, 1652, 1653, 1659, 1654, 1656, 1652, 1653, 1651, 1655, + 1655, 1656, 1650, 1652, 1657, 1660, 1661, 1662, 1663, 1662, + 1664, 1664, 1659, 1665, 1665, 1666, 1666, 1667, 1668, 1668, + 1670, 1660, 1663, 1671, 1663, 1678, 1661, 1669, 1669, 1672, + 1672, 1673, 1674, 1675, 1677, 1673, 1675, 1667, 1674, 1679, + 1677, 1670, 1680, 1678, 1671, 1679, 1681, 1682, 1682, 1681, - 1681, 1671, 1683, 1686, 1674, 1688, 1687, 1690, 1690, 1691, - 1682, 1692, 1678, 1687, 1688, 1685, 1696, 1694, 1686, 1695, - 1698, 1689, 1694, 1697, 1701, 1695, 1698, 1692, 1699, 1701, - 1697, 1700, 1700, 1702, 1699, 1691, 1696, 1703, 1705, 1704, - 1706, 1707, 1702, 1706, 1708, 1709, 1709, 1710, 1711, 1712, - 1705, 1713, 1714, 1710, 1711, 1716, 1714, 1703, 1704, 1707, - 1717, 1720, 1718, 1719, 1719, 1723, 1713, 1718, 1721, 1712, - 1708, 0, 1714, 1724, 1732, 1716, 1727, 1724, 1725, 1725, - 1720, 1726, 1717, 1721, 1723, 1727, 1729, 1726, 1728, 1728, - 1729, 1730, 1731, 1731, 1733, 1732, 1734, 1736, 1735, 1737, + 1683, 1683, 1684, 1685, 1687, 1689, 1686, 1684, 1688, 1685, + 1690, 1689, 1693, 1694, 1696, 1694, 1692, 1680, 1686, 1686, + 1686, 1692, 1692, 1695, 1687, 1686, 1693, 1697, 1688, 1696, + 1690, 1698, 1699, 1697, 1695, 1700, 1701, 1701, 1702, 1704, + 1698, 1703, 1703, 1705, 1706, 1706, 1707, 1707, 1708, 1711, + 1711, 1712, 1699, 1713, 1715, 1717, 1700, 1716, 1719, 1704, + 1720, 1717, 1713, 1715, 1702, 1705, 1718, 1718, 1708, 1723, + 1721, 1722, 1724, 1724, 1725, 1720, 1712, 1721, 1716, 1719, + 1722, 1726, 1728, 1729, 1730, 1731, 1735, 1728, 1732, 1729, + 1733, 1735, 1731, 1736, 1732, 1723, 1733, 1726, 1734, 1734, - 1738, 1739, 1730, 1735, 1740, 1747, 1738, 1730, 1733, 1740, - 1741, 1741, 1742, 1742, 1743, 1734, 1739, 1736, 1743, 1737, - 1745, 1746, 1748, 1748, 1752, 1747, 1750, 1750, 1751, 1745, - 1752, 1754, 1746, 1751, 1751, 1753, 1756, 1746, 1755, 1757, - 1759, 1753, 1760, 1755, 1761, 1757, 1760, 1762, 1756, 1763, - 1766, 1764, 1759, 1765, 1768, 1763, 1761, 1754, 1769, 1765, - 1770, 1772, 1766, 1776, 1772, 1770, 1768, 1773, 1773, 1774, - 1774, 0, 1762, 1764, 1775, 1775, 1777, 1769, 1778, 1781, - 1779, 1780, 1777, 1776, 1778, 1779, 1783, 1780, 1781, 1785, - 1786, 1783, 1785, 1787, 1787, 1789, 1790, 1793, 1791, 1792, + 1725, 1737, 1736, 1738, 1730, 1739, 1740, 1741, 1742, 1740, + 1743, 1743, 1744, 1745, 1747, 1746, 1748, 1739, 1744, 1745, + 1748, 1737, 1738, 1750, 1751, 1741, 1752, 1753, 1753, 1747, + 1754, 1752, 1755, 1757, 1742, 1746, 1748, 1758, 1759, 1759, + 0, 1758, 1760, 1750, 1761, 1764, 1751, 1755, 1760, 1754, + 1762, 1762, 1757, 1761, 1763, 1766, 1764, 1767, 1763, 1765, + 1765, 1764, 1768, 1769, 1770, 1771, 1772, 1773, 1769, 1774, + 1781, 1767, 1772, 1796, 1774, 0, 1766, 1775, 1775, 1776, + 1776, 1768, 1773, 1777, 1770, 1771, 1779, 1777, 1780, 1788, + 1781, 1782, 1782, 1784, 1784, 1779, 1785, 1786, 1796, 1780, - 1792, 1797, 1786, 1791, 1794, 1795, 1793, 1789, 1790, 1794, - 1795, 1796, 1796, 1798, 1799, 1800, 1801, 1804, 1802, 1803, - 1801, 1797, 1798, 1802, 1805, 1803, 1806, 1807, 1809, 1809, - 1810, 1814, 1799, 1805, 1800, 1804, 1811, 1812, 1812, 1815, - 1809, 1807, 1813, 1814, 1806, 1811, 1817, 1816, 1810, 1820, - 1820, 1813, 1816, 1822, 1823, 1824, 1822, 1826, 1828, 1817, - 1815, 1827, 1829, 1836, 1828, 1830, 1830, 1831, 1833, 1831, - 1823, 1824, 1826, 1832, 1832, 1827, 1833, 1835, 1838, 1829, - 1837, 1837, 1839, 1836, 1835, 1840, 1841, 1838, 1842, 1843, - 1844, 1847, 1848, 1845, 1849, 1849, 1850, 1840, 1841, 1845, + 1787, 1785, 1785, 1786, 1780, 1789, 1787, 1790, 1791, 1793, + 1789, 1795, 1794, 1798, 1791, 1788, 1794, 1800, 1797, 1790, + 1799, 1793, 1800, 1795, 1797, 1801, 1799, 1803, 1804, 1805, + 1807, 1808, 1808, 1807, 1805, 1798, 1811, 1801, 1812, 1803, + 1809, 1809, 1810, 1810, 1812, 1813, 1815, 1804, 1814, 1816, + 1818, 1813, 1815, 1814, 1820, 1818, 1811, 1820, 1816, 1821, + 1822, 1822, 1824, 1825, 1826, 1827, 1827, 1828, 1829, 1826, + 1833, 1821, 1830, 1829, 1824, 1825, 1828, 1830, 1831, 1832, + 1832, 1831, 1834, 1835, 1836, 1837, 1840, 1838, 1839, 1837, + 1833, 1834, 1838, 1841, 1839, 1842, 1843, 1845, 1845, 1846, - 1842, 1851, 1853, 1839, 1848, 1844, 1852, 1853, 1854, 1852, - 0, 1847, 1845, 1856, 1850, 1843, 1858, 1857, 1856, 1857, - 1859, 1851, 1860, 1862, 1864, 1859, 1865, 1866, 1854, 1860, - 1868, 1867, 1862, 1867, 1858, 1865, 1870, 1871, 1870, 1866, - 1872, 1872, 1864, 1873, 1875, 1874, 1875, 1876, 1877, 1868, - 1874, 1871, 1876, 1877, 1878, 1879, 1880, 1882, 1881, 1883, - 1885, 1889, 1880, 1881, 1886, 1887, 1887, 1883, 1890, 1873, - 1882, 1891, 1878, 1888, 1888, 1879, 1889, 1891, 1886, 1885, - 1892, 1893, 1894, 1893, 1897, 1892, 1895, 1902, 1890, 1896, - 1896, 1898, 1898, 1906, 1895, 1900, 1897, 1899, 1899, 1904, + 1850, 1835, 1841, 1836, 1840, 1847, 1848, 1848, 1851, 1845, + 1843, 1849, 1850, 1842, 1847, 1853, 1852, 1846, 1856, 1856, + 1849, 1852, 1858, 1859, 1860, 1858, 1862, 1864, 1853, 1851, + 1863, 1865, 1872, 1864, 1866, 1866, 1867, 1869, 1867, 1859, + 1860, 1862, 1868, 1868, 1863, 1869, 1871, 1873, 1865, 1874, + 1874, 1875, 1876, 1871, 1872, 1880, 1877, 1878, 1879, 1881, + 1875, 1887, 1884, 1885, 0, 1882, 1888, 1873, 1877, 1878, + 1879, 1882, 1891, 1876, 1881, 1885, 1886, 1886, 1895, 1887, + 1889, 1880, 1884, 1889, 1882, 1890, 1888, 1894, 1893, 1894, + 1890, 1897, 1891, 1893, 1896, 1899, 1895, 1901, 1897, 1896, - 1894, 1901, 1895, 1917, 1900, 1902, 1901, 1905, 1904, 1905, - 1907, 1904, 1908, 1909, 1906, 1907, 1907, 1910, 1912, 1916, - 1913, 1914, 1909, 1917, 1908, 1913, 1914, 1918, 1920, 1910, - 1912, 1921, 1916, 1919, 1919, 1922, 1918, 1928, 1923, 1924, - 1929, 1926, 1930, 1927, 1937, 1929, 1920, 1930, 1938, 1921, - 1931, 1922, 1923, 1926, 1924, 1927, 1934, 1928, 1936, 1931, - 1939, 1940, 1934, 1938, 1936, 1941, 1945, 1937, 1942, 1942, - 1943, 1944, 1944, 1946, 1941, 1934, 1947, 1946, 1939, 1943, - 1948, 1947, 1949, 1950, 1951, 1945, 1940, 1949, 1949, 1950, - 1951, 1952, 1953, 1948, 1952, 1954, 1957, 1957, 1958, 1958, + 1902, 1903, 1905, 1904, 1899, 1904, 1907, 1910, 1907, 1902, + 1908, 1909, 1909, 1903, 1911, 1901, 1912, 1913, 1912, 1911, + 1914, 1905, 1913, 1915, 1908, 1914, 1916, 1918, 1917, 1919, + 1920, 1922, 1918, 1910, 1917, 1923, 1924, 1924, 1920, 1925, + 1925, 1915, 1919, 1926, 1927, 1928, 1916, 1929, 1931, 1923, + 1922, 1928, 1929, 1930, 1932, 1930, 1933, 1933, 1926, 1934, + 1935, 1935, 1932, 1937, 1927, 1939, 1931, 1936, 1936, 1938, + 1932, 1934, 1937, 1941, 1938, 1942, 1943, 1942, 1945, 1946, + 1947, 1944, 1941, 1939, 1949, 1941, 1944, 1944, 1946, 1950, + 1945, 1953, 1947, 1951, 1950, 1954, 1949, 1943, 1951, 1955, - 1953, 1959, 1960, 1960, 1961, 1961, 1962, 1963, 1964, 1975, - 1959, 1965, 1968, 1958, 1964, 1954, 1965, 1968, 1962, 1966, - 1966, 1967, 1967, 1969, 1958, 1963, 1971, 1972, 1973, 1969, - 1971, 1976, 1973, 1977, 1975, 1978, 1976, 1979, 1981, 1980, - 1982, 1983, 1979, 1984, 1985, 1985, 1983, 1972, 1986, 1987, - 1978, 1989, 1986, 1988, 1981, 1990, 1977, 1980, 1988, 1991, - 1982, 1992, 1993, 1994, 1987, 1984, 1992, 1990, 1995, 1995, - 1998, 1997, 1999, 2000, 2001, 1993, 2002, 1989, 1991, 1997, - 2003, 1994, 2004, 2005, 2007, 2008, 2008, 2009, 2011, 1998, - 2009, 1999, 2010, 2012, 2004, 2002, 2000, 0, 2001, 2007, + 1956, 1956, 1957, 1958, 1953, 1960, 1959, 1965, 1955, 1961, + 1971, 1963, 1966, 1964, 1977, 1954, 1971, 1966, 1974, 1960, + 1957, 1958, 1959, 1963, 1961, 1964, 1967, 1965, 1968, 1971, + 1973, 1967, 1975, 1976, 1978, 1982, 1973, 1968, 1983, 1977, + 1980, 1974, 1983, 1978, 1979, 1979, 1985, 1975, 1986, 1980, + 1984, 1976, 1981, 1981, 1982, 1984, 1987, 1988, 1989, 1985, + 1992, 1987, 1987, 1988, 1989, 1990, 1991, 2000, 1990, 1997, + 1986, 1995, 1995, 2001, 1991, 1996, 1996, 0, 1997, 2000, + 1992, 1998, 1998, 1999, 1999, 2009, 2002, 2010, 2003, 2009, + 1996, 2001, 2002, 2003, 2004, 2004, 2005, 2005, 2006, 2007, - 2016, 2003, 2011, 2017, 2005, 2010, 2012, 2013, 2013, 2014, - 2014, 2015, 2015, 2018, 2018, 2016, 2017, 2019, 2020, 2020, - 2021, 2024, 2023, 2025, 2026, 2021, 2019, 2023, 2029, 2019, - 2027, 2027, 2028, 2028, 2030, 2030, 2026, 2031, 2032, 2032, - 2034, 2024, 2033, 2025, 2037, 2034, 2039, 2029, 2035, 2035, - 2036, 2036, 2038, 2040, 2042, 2031, 2044, 2033, 2037, 2042, - 2039, 2038, 2043, 2043, 2045, 2045, 2046, 2047, 2048, 2049, - 2049, 2048, 2040, 2047, 2051, 2044, 2050, 2050, 2053, 2052, - 2054, 2054, 2056, 2057, 2046, 2049, 2058, 2059, 2060, 2060, - 2061, 2059, 2063, 2051, 2052, 2062, 2064, 2053, 2066, 2066, + 2011, 1996, 2012, 2006, 2011, 2007, 2014, 2010, 2015, 2016, + 2017, 2018, 2019, 2015, 2021, 2022, 2018, 2020, 2023, 2028, + 2022, 2026, 2012, 2024, 2024, 2017, 2029, 2030, 2032, 2033, + 2019, 2014, 2016, 2020, 2021, 2025, 2026, 2027, 2029, 2025, + 2023, 2032, 2027, 2031, 2036, 2028, 2030, 2033, 2031, 2034, + 2034, 2037, 2036, 2038, 2039, 2040, 2041, 2042, 2046, 2043, + 2044, 2047, 2047, 2048, 2049, 0, 2051, 2049, 2048, 2050, + 2037, 2043, 2038, 2046, 2052, 2041, 2056, 2039, 2042, 2040, + 2051, 2044, 2050, 2053, 2053, 2054, 2054, 2052, 2055, 2055, + 2057, 2056, 2058, 2058, 2061, 2059, 2060, 2060, 2064, 2061, - 2062, 2058, 2056, 2067, 2069, 2068, 2057, 2063, 2070, 2061, - 2071, 2064, 2068, 2072, 2073, 2073, 2074, 2075, 2069, 2075, - 2079, 2082, 2086, 2067, 2076, 2074, 2070, 2076, 2071, 2078, - 2083, 2080, 2079, 2081, 2084, 2078, 2080, 2092, 2081, 2072, - 2085, 2090, 2076, 2083, 2076, 2085, 2082, 2088, 2086, 2089, - 2096, 2091, 2088, 2093, 2089, 2084, 2090, 2091, 2092, 2093, - 2094, 2095, 2099, 2097, 2098, 2094, 2095, 2098, 2100, 2101, - 2102, 2099, 2103, 2108, 2104, 2096, 2097, 2100, 2101, 2102, - 2104, 2105, 2110, 2116, 2106, 2114, 2103, 2105, 2106, 2111, - 2111, 2110, 2112, 2108, 2113, 2113, 2117, 2120, 2112, 2116, + 2063, 2065, 2066, 2057, 2059, 2063, 2069, 2059, 2067, 2067, + 2068, 2068, 2070, 2070, 2066, 2071, 2072, 2072, 2064, 2073, + 0, 2065, 2074, 2075, 2075, 2069, 2077, 2074, 2076, 2076, + 2078, 2079, 2080, 2071, 2073, 2084, 2082, 2083, 2083, 2078, + 2077, 2082, 2085, 2085, 2086, 2079, 2087, 2088, 2089, 2089, + 2088, 2080, 2087, 2091, 2084, 2090, 2090, 2093, 2092, 2094, + 2094, 2096, 2086, 2097, 2089, 2098, 2099, 2100, 2100, 2101, + 2099, 2107, 2091, 2092, 2102, 2103, 2093, 2104, 2108, 2102, + 2098, 2096, 2106, 2106, 2109, 2108, 2097, 2110, 2101, 2111, + 2103, 2107, 2104, 2112, 2113, 2113, 2118, 2114, 2109, 2115, - 2118, 2118, 2119, 2113, 2122, 2114, 2120, 2114, 2123, 2125, - 2124, 2127, 2117, 2128, 2127, 2129, 2122, 2119, 2128, 2130, - 0, 2125, 2131, 2131, 2123, 2124, 2132, 2132, 2134, 2134, - 2135, 2130, 2136, 2135, 2137, 2129, 2138, 2136, 2139, 2139, - 2137, 2140, 2138, 2141, 2141, 2142, 2143, 2144, 2145, 2145, - 2146, 2147, 2155, 2148, 0, 2140, 2146, 2142, 2148, 2150, - 2143, 2151, 2154, 2150, 2151, 2147, 2144, 2152, 2152, 2153, - 2158, 2154, 2155, 2156, 2153, 2157, 2157, 2156, 2161, 2160, - 2162, 2163, 2164, 2158, 2160, 2165, 2164, 2166, 2167, 2169, - 2168, 2174, 2166, 2171, 2167, 2163, 2168, 2172, 2161, 2174, + 2116, 2115, 2118, 2116, 2119, 2110, 2114, 2111, 2120, 2121, + 2122, 2123, 2124, 2120, 2121, 2126, 2119, 2125, 2116, 2112, + 2116, 2128, 2125, 2129, 2123, 2130, 2128, 2132, 2129, 2134, + 2131, 2133, 2136, 2124, 2134, 2122, 2131, 2133, 2135, 2137, + 2130, 2126, 2138, 2135, 2139, 2138, 2140, 2141, 2132, 2142, + 2143, 2148, 2137, 2139, 2144, 2140, 2141, 2136, 2142, 2145, + 2144, 2150, 2146, 2152, 2143, 2145, 2146, 2151, 2151, 2152, + 2150, 2148, 2153, 2153, 2154, 2155, 2157, 2158, 2161, 2154, + 2164, 2153, 2159, 2159, 2160, 2165, 2163, 2161, 2168, 2166, + 2170, 2168, 2157, 2158, 2171, 2155, 2164, 2155, 2163, 2160, - 2162, 2175, 2172, 2175, 2173, 2165, 2178, 2169, 2181, 2171, - 2173, 2179, 2179, 2180, 2182, 2182, 2180, 2184, 2185, 2186, - 2178, 2184, 2187, 2187, 2185, 2193, 2188, 2191, 2191, 2196, - 2195, 2186, 2199, 2200, 2181, 2188, 2201, 2199, 2203, 2203, - 2207, 2201, 2202, 2193, 2195, 2196, 2207, 2202, 2205, 2205, - 2208, 2208, 2209, 2210, 2213, 2211, 2217, 2214, 2218, 2200, - 2211, 2215, 2215, 2219, 2218, 2217, 2224, 2220, 2209, 2214, - 2222, 2222, 2225, 2213, 2223, 2210, 2230, 2223, 2227, 2227, - 2231, 2219, 2220, 2228, 2228, 2224, 2229, 2232, 2234, 2231, - 2225, 2229, 2232, 2233, 2230, 2233, 2235, 2236, 2237, 2238, + 2165, 2166, 2169, 2172, 2172, 0, 2171, 2169, 2173, 2173, + 2170, 2175, 2175, 2176, 2177, 2178, 2176, 2179, 2180, 2177, + 2182, 2178, 2185, 2179, 2181, 2181, 2184, 2180, 2183, 2183, + 2186, 2187, 2187, 2188, 2182, 2190, 2185, 2189, 2184, 2188, + 2190, 2192, 2197, 2193, 2196, 2192, 2193, 2194, 2194, 2186, + 2195, 2189, 2198, 2196, 2200, 2195, 2198, 2199, 2199, 2202, + 2203, 2204, 2197, 2205, 2202, 2206, 2207, 2200, 2208, 2206, + 2209, 2211, 2210, 2208, 2214, 2213, 2209, 2205, 2210, 2215, + 2203, 2204, 2216, 2217, 2215, 2221, 2207, 2213, 2216, 2211, + 2214, 2217, 2218, 2224, 2218, 2222, 2222, 2223, 2228, 2221, - 2239, 2240, 2234, 2237, 2241, 2241, 2240, 2242, 2242, 2236, - 2235, 2243, 2243, 2244, 2244, 2245, 2246, 2247, 2250, 2238, - 2239, 2251, 2247, 2248, 2248, 2249, 2249, 2245, 2252, 2253, - 2250, 2254, 2254, 2251, 2246, 2255, 2256, 2256, 2257, 2257, - 2258, 2259, 2260, 2261, 2262, 2253, 2264, 2263, 2252, 2260, - 2265, 2258, 2263, 2259, 2255, 2261, 2266, 2266, 2267, 2268, - 2269, 2270, 2271, 2272, 2262, 2278, 2264, 2267, 2273, 2273, - 2265, 2279, 2274, 2275, 2270, 2276, 2280, 2272, 2282, 2281, - 2269, 2274, 2281, 2278, 2283, 2268, 2271, 0, 2275, 2283, - 2276, 2284, 2282, 2279, 2285, 2285, 2284, 2286, 2286, 2280, + 2223, 2225, 2225, 2227, 2228, 2229, 2231, 2227, 2230, 2230, + 2234, 2234, 2236, 2238, 2243, 2231, 2239, 2229, 2242, 2224, + 2244, 2245, 2252, 2242, 2253, 2244, 2245, 2238, 2246, 2246, + 2236, 2250, 2239, 2248, 2248, 2251, 2251, 2250, 2252, 2254, + 2243, 2256, 2257, 2260, 2254, 2261, 2253, 2258, 2258, 2262, + 2263, 2261, 2260, 2267, 2257, 2265, 2265, 2268, 2266, 2272, + 2256, 2266, 2270, 2270, 2272, 2263, 2273, 2262, 2271, 2271, + 2274, 2275, 2267, 2277, 2278, 2268, 2275, 2279, 2276, 2274, + 2276, 2280, 2281, 2282, 2273, 2283, 2280, 2277, 2278, 2279, + 2283, 2284, 2284, 2285, 2285, 2286, 2286, 2287, 2287, 2288, - 2287, 2287, 2289, 2289, 2291, 2291, 2292, 2293, 2294, 2296, - 2297, 2298, 2299, 2300, 2301, 2302, 2303, 2302, 2293, 2304, - 2305, 2309, 2300, 0, 2292, 2306, 2306, 2294, 2297, 2296, - 2308, 2308, 2299, 2298, 2301, 2310, 2303, 2304, 2305, 2311, - 2311, 2313, 2315, 2309, 2310, 2314, 2314, 2316, 2317, 2318, - 2313, 2319, 2320, 2325, 2322, 2317, 2321, 2323, 2323, 2325, - 2315, 2324, 2324, 2326, 2318, 2316, 2328, 2327, 2330, 2319, - 2320, 2329, 2321, 2322, 2331, 2332, 2329, 2333, 2338, 2333, - 2332, 2326, 2327, 2334, 2334, 2328, 2340, 2335, 2330, 2335, - 2336, 2336, 2341, 2342, 2331, 2340, 2343, 2338, 2344, 2345, + 2289, 2290, 2281, 2282, 2291, 2291, 2290, 2292, 2292, 2293, + 2294, 2288, 2295, 2296, 2297, 2297, 2298, 2301, 2289, 2299, + 2299, 2293, 2294, 2300, 2300, 2302, 2303, 2304, 2301, 2296, + 2305, 2306, 2295, 2303, 2307, 2298, 2306, 2302, 2308, 2304, + 2309, 2309, 2310, 2311, 2312, 2316, 2313, 2314, 2315, 2322, + 2305, 2310, 2317, 2317, 2307, 2319, 2318, 2316, 2308, 2313, + 2320, 2323, 2315, 2324, 2312, 2318, 2326, 2322, 0, 2311, + 2319, 2314, 2327, 2325, 2328, 2320, 2325, 2327, 2336, 2328, + 2326, 2329, 2329, 2323, 2330, 2330, 2324, 2331, 2331, 2333, + 2333, 2335, 2335, 2337, 2338, 2339, 2336, 2341, 2342, 2343, - 2352, 2346, 2349, 2344, 2350, 2342, 2353, 2350, 2351, 2351, - 2355, 2341, 2354, 2354, 2355, 2352, 2343, 2357, 2360, 2345, - 2346, 2358, 2349, 2362, 2353, 2358, 2359, 2359, 2363, 2364, - 2367, 2360, 2357, 2365, 2365, 2368, 2369, 2371, 2362, 2375, - 2369, 2377, 2367, 2384, 2368, 2370, 2370, 2373, 2363, 2364, - 2372, 2372, 2373, 2374, 2376, 2375, 2371, 2378, 2378, 2383, - 2383, 2377, 2374, 2385, 2385, 2384, 2376, 2386, 2387, 2388, - 2389, 2390, 2390, 2391, 2393, 2393, 2398, 2396, 2388, 2389, - 2386, 2387, 2396, 2401, 2397, 2400, 2399, 2402, 2391, 2397, - 2398, 2399, 2403, 2400, 2405, 2408, 2402, 2413, 2406, 2407, + 2344, 2349, 2345, 2346, 2337, 2347, 2348, 2347, 2354, 2350, + 2339, 2345, 0, 2338, 2351, 2351, 2342, 2341, 2360, 2349, + 2344, 2343, 2355, 2346, 2353, 2353, 2348, 2350, 2356, 2356, + 2354, 2355, 2358, 2359, 2359, 2361, 2360, 2362, 2364, 2363, + 2365, 2358, 2367, 2366, 2362, 2368, 2368, 2369, 2369, 2370, + 2370, 2371, 2372, 2361, 2363, 2374, 2364, 2371, 2365, 2366, + 2373, 2367, 2375, 2376, 2377, 0, 2378, 2375, 2380, 2380, + 2372, 2378, 2382, 2382, 2374, 2373, 2379, 2381, 2379, 2381, + 2384, 2386, 2387, 2376, 2377, 2388, 2389, 2390, 2391, 2395, + 2386, 2392, 2390, 2396, 2397, 2397, 2396, 2388, 2398, 2384, - 2403, 2414, 2401, 2406, 2407, 2409, 2409, 2410, 2410, 2405, - 2408, 2411, 2412, 2418, 2415, 2413, 2416, 2412, 2411, 2414, - 2415, 2416, 2417, 2417, 2419, 2420, 2420, 2424, 2418, 2419, - 2421, 2421, 2425, 2425, 2426, 2436, 2427, 2426, 2428, 2429, - 2424, 2427, 2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434, - 2431, 2430, 2432, 2435, 2437, 2440, 2436, 2433, 2439, 2438, - 2437, 2435, 2445, 2439, 2434, 2438, 2442, 2440, 2447, 2443, - 2448, 2442, 2443, 2447, 2445, 2448, 2449, 2450, 2451, 2452, - 2453, 2453, 2454, 2457, 2458, 2463, 2459, 2451, 2452, 2461, - 2450, 2454, 2460, 2460, 2449, 2464, 2464, 2462, 2465, 2467, + 2399, 2387, 2400, 2400, 2403, 2408, 2389, 2401, 2391, 2395, + 2392, 2401, 2404, 2398, 2405, 2405, 2404, 2406, 2399, 2403, + 2408, 2409, 2410, 2411, 2411, 2413, 2414, 2415, 2416, 2416, + 2406, 2415, 2417, 2418, 2418, 2414, 2420, 2413, 2419, 2421, + 2422, 2409, 2410, 2419, 2423, 2420, 2424, 2424, 2429, 2429, + 2430, 2417, 2422, 2431, 2431, 2421, 2432, 2433, 2434, 2435, + 2436, 2436, 2437, 2447, 2423, 2439, 2439, 2434, 2435, 2432, + 2433, 2442, 2430, 2443, 2444, 2445, 2442, 2437, 2443, 2446, + 2445, 2448, 2447, 2449, 2451, 2454, 2458, 2446, 2444, 2452, + 2448, 2449, 2453, 2458, 2452, 2455, 2455, 2453, 2460, 2451, - 2463, 2469, 2457, 2470, 2458, 2459, 2462, 2470, 2461, 2471, - 2471, 2472, 2473, 2474, 2467, 0, 2475, 2465, 2473, 2474, - 2477, 2469, 2475, 2476, 2476, 2478, 2480, 2481, 2477, 2483, - 2478, 2484, 2485, 2483, 2488, 2480, 2472, 2487, 2487, 2498, - 2481, 2489, 2489, 2490, 2490, 2484, 2493, 2485, 2492, 2492, - 2493, 2494, 2488, 2496, 2496, 2499, 2494, 2500, 2501, 2498, - 2499, 2502, 2504, 2501, 2501, 2505, 2505, 2507, 2507, 2500, - 2508, 2508, 2509, 2502, 2510, 2509, 2512, 2514, 2515, 2515, - 2516, 2516, 2504, 2517, 2517, 2518, 2520, 2510, 2519, 2519, - 2521, 2522, 2523, 2529, 2512, 2524, 2524, 2514, 2523, 2520, + 2454, 2456, 2456, 2457, 2457, 2459, 2461, 2462, 2465, 2463, + 2459, 2464, 2464, 2462, 2463, 2466, 2460, 2467, 2467, 2471, + 2466, 2468, 2468, 2465, 2461, 2472, 2472, 2473, 2474, 2477, + 2473, 2475, 2471, 2474, 2474, 2476, 2475, 2479, 2478, 2481, + 2476, 2479, 2480, 2477, 2478, 2482, 2483, 2480, 2481, 2484, + 2485, 2486, 2488, 2487, 2483, 2493, 2485, 2486, 2487, 2491, + 2482, 2490, 2491, 2495, 2488, 2497, 2490, 2493, 2495, 2496, + 2484, 2498, 2499, 2500, 2496, 2501, 2501, 2502, 2506, 2507, + 2512, 2499, 2500, 2497, 2498, 2508, 2502, 2509, 2509, 2510, + 2514, 2511, 2513, 2513, 2518, 2512, 2516, 2506, 2519, 2507, - 2518, 2530, 2525, 2531, 2528, 2522, 2525, 2532, 2521, 2528, - 2528, 2533, 2534, 2532, 2535, 2544, 2529, 2533, 2535, 2536, - 2536, 2530, 2539, 2531, 2541, 2542, 2545, 2539, 2542, 2545, - 2546, 2547, 2541, 2548, 2549, 2550, 2547, 2534, 2551, 2551, - 2544, 2552, 2553, 2554, 2555, 2553, 2558, 2546, 2546, 2550, - 2556, 2548, 2567, 2553, 2549, 2552, 2557, 2554, 2556, 2559, - 2559, 2557, 2557, 2555, 2564, 2558, 2560, 2560, 2561, 2561, - 2562, 2562, 2563, 2563, 2565, 2566, 2568, 2569, 2567, 2565, - 2564, 2570, 2572, 2572, 2573, 2568, 2574, 2573, 2576, 2576, - 2586, 2577, 2578, 2578, 2579, 2566, 2582, 2569, 2577, 2579, + 2511, 2521, 2519, 0, 2508, 2520, 2520, 2522, 2510, 2514, + 2523, 2516, 2524, 2522, 2518, 2526, 2523, 2527, 2524, 2525, + 2525, 2529, 2527, 2526, 2530, 2532, 2521, 2533, 2534, 2532, + 2529, 2536, 2536, 2537, 2538, 2538, 2542, 2530, 2539, 2539, + 2542, 2533, 2543, 2534, 2541, 2541, 2547, 2543, 2545, 2545, + 2548, 2537, 2549, 2550, 2553, 2548, 2551, 2563, 2550, 2550, + 2554, 2554, 2556, 2556, 2549, 2559, 2547, 2561, 2551, 2557, + 2557, 2567, 2558, 2570, 2553, 2558, 2569, 2563, 2559, 2564, + 2564, 2565, 2565, 2566, 2566, 2561, 2567, 2568, 2568, 2569, + 2571, 2570, 2572, 2573, 2573, 2574, 2578, 2579, 2572, 2574, - 2583, 2570, 2581, 2581, 2574, 2582, 2584, 2592, 2586, 2583, - 2587, 2587, 2588, 2589, 2590, 2584, 2588, 2593, 2591, 2603, - 2592, 2594, 2589, 2591, 2591, 2594, 2593, 2598, 2602, 2590, - 2599, 2599, 2598, 2601, 2601, 2604, 2606, 2606, 2607, 2608, - 2611, 2612, 2602, 2613, 2603, 2616, 2614, 2607, 2618, 2620, - 2612, 2608, 2614, 2604, 2620, 2621, 2707, 2616, 2622, 2622, - 2621, 2623, 2625, 2613, 2632, 2611, 2633, 2625, 2707, 2618, - 2623, 2626, 2626, 2628, 2628, 2626, 2629, 2629, 2630, 2630, - 2631, 2634, 2636, 2640, 2632, 2633, 2634, 2637, 2636, 2631, - 2638, 2641, 2637, 2639, 2639, 2638, 2643, 2642, 2644, 2645, + 2582, 2578, 2578, 2580, 2571, 2581, 2582, 2583, 2584, 2591, + 2585, 2586, 2586, 2583, 2585, 2592, 2589, 2591, 2592, 2594, + 2579, 2589, 2597, 2580, 2595, 2581, 2598, 2595, 2596, 2596, + 2599, 2598, 2600, 2584, 2639, 2601, 2602, 2602, 2639, 2597, + 2597, 2603, 2604, 2605, 2594, 2604, 2606, 2609, 2599, 2601, + 2607, 2616, 2600, 2604, 2608, 2603, 2616, 2605, 2607, 2608, + 2608, 2610, 2610, 2611, 2611, 2606, 2609, 2612, 2612, 2613, + 2613, 2614, 2614, 2615, 2617, 2618, 2619, 2620, 2621, 2623, + 2623, 2624, 2625, 2628, 2624, 2619, 2627, 2627, 2630, 2615, + 2628, 2629, 2629, 2630, 2617, 2632, 2632, 2620, 2621, 2633, - 2652, 2640, 2642, 2648, 2644, 2646, 2646, 2648, 2649, 2654, - 2650, 2653, 2641, 2649, 2643, 2650, 2651, 2651, 2658, 2652, - 2656, 2656, 2659, 2660, 2645, 2661, 2653, 2660, 2662, 2654, - 2663, 2658, 2664, 2665, 2661, 2659, 2666, 2668, 2665, 2673, - 2664, 2667, 2667, 2677, 2662, 2670, 2670, 2671, 2671, 2663, - 2675, 2675, 2678, 2679, 2682, 2682, 2668, 2683, 2680, 2677, - 2673, 2684, 2666, 2680, 2685, 2687, 2687, 2688, 2678, 2679, - 2689, 2690, 2690, 2693, 2694, 2697, 2700, 2683, 2698, 2698, - 2694, 2688, 2695, 2685, 2684, 2699, 2699, 2695, 2702, 2689, - 2701, 2701, 2703, 2693, 2704, 2708, 2700, 2697, 2705, 2702, + 2625, 2618, 2634, 2635, 2637, 2638, 2638, 2640, 2633, 2641, + 2643, 2634, 2635, 2642, 2654, 2649, 2640, 2644, 2642, 2642, + 2649, 2645, 2637, 2643, 2641, 2645, 2644, 2650, 2650, 2652, + 2652, 2653, 2655, 2657, 2657, 2658, 2659, 2662, 2663, 2654, + 2664, 2667, 2669, 2665, 2658, 2653, 2671, 2663, 2659, 2665, + 2655, 2671, 2672, 2667, 2673, 2673, 2674, 2672, 2683, 2676, + 2664, 2684, 2662, 2669, 2676, 2674, 2677, 2677, 2679, 2679, + 2677, 2680, 2680, 2681, 2681, 2682, 2685, 2687, 2683, 2691, + 2684, 2685, 2688, 2687, 2682, 2689, 2692, 2688, 2690, 2690, + 2689, 2693, 2695, 2697, 2694, 2696, 2700, 2691, 2692, 2694, - 2706, 2703, 2709, 2709, 2705, 2710, 2711, 2711, 2710, 2715, - 2701, 2716, 2717, 0, 2704, 2708, 2718, 2718, 2717, 2706, - 2719, 2715, 2720, 2719, 2721, 2723, 2725, 2724, 2720, 2726, - 2723, 2716, 2724, 2727, 2730, 2726, 2728, 2728, 2731, 2732, - 2733, 2735, 2721, 2734, 2734, 2725, 2730, 2740, 2736, 2741, - 2727, 2727, 2740, 2733, 2738, 2738, 2731, 2736, 2739, 2739, - 2735, 2742, 2751, 2741, 2732, 2753, 2742, 2743, 2743, 2744, - 2744, 2745, 2745, 2746, 2748, 2748, 2754, 2755, 2746, 2756, - 2756, 2751, 2758, 2758, 2760, 2761, 2759, 2753, 2762, 2762, - 2763, 2763, 2766, 0, 2761, 2765, 2767, 2768, 2754, 2755, + 2700, 2696, 2698, 2698, 2701, 2704, 2702, 2703, 2703, 2701, + 2695, 2702, 2693, 2705, 2706, 2708, 2708, 2710, 2697, 2711, + 2713, 2712, 2714, 2715, 2704, 2712, 2717, 2716, 2705, 2713, + 2710, 2717, 2711, 2718, 2706, 2716, 2719, 2719, 2714, 2720, + 2722, 2722, 2715, 2723, 2723, 2725, 2727, 2727, 2729, 2730, + 2732, 2731, 2734, 2734, 2735, 2732, 2736, 2737, 2720, 2718, + 2739, 2739, 2741, 2740, 2729, 2730, 2725, 2731, 2742, 2742, + 2745, 2749, 2746, 0, 2735, 2747, 2737, 2740, 2746, 2736, + 2747, 2741, 2750, 2750, 2751, 2751, 2752, 2753, 2753, 2754, + 2745, 2756, 2755, 2749, 2758, 2760, 2757, 2759, 2761, 2761, - 2759, 2765, 2768, 2775, 2760, 2771, 2771, 2773, 2773, 2774, - 2776, 2777, 2766, 2778, 2774, 2767, 2776, 2775, 2779, 2779, - 2780, 2778, 2782, 2777, 2783, 2780, 2784, 2785, 2786, 2788, - 2789, 2784, 2790, 2791, 2786, 2793, 2792, 2788, 2794, 2785, - 2795, 2796, 2782, 2798, 2783, 2799, 2796, 2803, 2798, 2789, - 0, 2793, 2790, 2791, 2792, 2794, 2794, 2800, 2804, 2801, - 0, 2795, 2809, 2800, 2801, 2799, 2809, 2803, 2807, 2807, - 2822, 2804, 2808, 2808, 2813, 2813, 2815, 2815, 2816, 2816, - 2819, 2816, 2817, 2817, 2819, 2817, 2818, 2818, 2822, 2818, - 2821, 2821, 2823, 2826, 2827, 2828, 2829, 2829, 2832, 2834, + 2754, 2755, 2757, 2763, 2763, 2762, 2752, 2753, 2762, 2759, + 2767, 2756, 2768, 2758, 2769, 2760, 2770, 2770, 2771, 2772, + 2769, 2771, 2767, 2773, 2775, 2772, 2776, 2776, 2777, 2775, + 2778, 2779, 2768, 2777, 2780, 2781, 2781, 2779, 2783, 2784, + 2785, 2773, 2786, 2787, 2787, 2788, 2794, 2789, 0, 2778, + 2783, 2780, 2780, 2791, 2791, 2786, 2789, 2784, 2792, 2792, + 2794, 2793, 2795, 2804, 2788, 2785, 2793, 2795, 2796, 2796, + 2797, 2797, 2798, 2798, 2799, 2801, 2801, 2806, 2807, 2799, + 2808, 2812, 2804, 2809, 2809, 2811, 2811, 2813, 2814, 2815, + 2815, 2816, 2816, 2819, 0, 2812, 2820, 2814, 2818, 2806, - 2828, 2833, 2835, 2834, 2836, 2844, 2823, 2838, 2833, 2839, - 2844, 2835, 2848, 2826, 2827, 2840, 2840, 2843, 2839, 2836, - 2841, 2841, 2845, 2832, 2846, 2838, 2842, 2842, 2849, 2846, - 2846, 2845, 2843, 2847, 2845, 2850, 2851, 2848, 2853, 2847, - 2852, 2851, 2855, 2849, 2856, 2852, 2854, 2854, 2855, 0, - 2856, 2857, 2857, 2858, 2858, 2859, 2850, 2853, 2862, 2862, - 2859, 2865, 2865, 2866, 2866, 2867, 2867, 2868, 2868, 2869, - 2869, 2870, 2870, 2871, 2871, 2873, 2874, 2874, 2875, 2876, - 2877, 2881, 2879, 2883, 2873, 2880, 2880, 2875, 2885, 2882, - 2889, 2876, 2884, 2884, 2891, 2883, 2881, 2886, 2886, 2893, + 2807, 2821, 2808, 2835, 2818, 2828, 2821, 2813, 2824, 2824, + 2826, 2826, 2827, 2819, 2829, 2820, 2830, 2827, 2831, 2828, + 2829, 2832, 2832, 2835, 2833, 2836, 2831, 2837, 2830, 2833, + 2838, 2839, 2837, 2841, 2842, 2843, 2844, 2839, 2847, 2846, + 2945, 2841, 2838, 2848, 2849, 2836, 2850, 2852, 2853, 2857, + 2858, 2850, 2852, 2842, 2847, 2843, 2844, 2846, 2854, 2876, + 2848, 2848, 2855, 2858, 2854, 2849, 2945, 2855, 2853, 2857, + 2861, 2861, 2862, 2862, 2863, 2867, 2867, 2876, 2863, 2869, + 2869, 2870, 2870, 2873, 2870, 2871, 2871, 2873, 2871, 2872, + 2872, 2877, 2872, 2875, 2875, 2880, 2881, 2882, 2883, 2883, - 2877, 2879, 2882, 2885, 2890, 2892, 2892, 2890, 2889, 2895, - 2896, 2897, 2895, 2898, 2899, 2901, 2896, 2893, 2898, 2900, - 2891, 2903, 2918, 2904, 2907, 2897, 2916, 2903, 2923, 2916, - 2925, 2901, 2904, 2899, 2925, 2918, 2926, 2900, 2924, 2907, - 2919, 2919, 2920, 2920, 2921, 2921, 2927, 2924, 2929, 2931, - 2930, 2923, 2933, 2932, 2931, 2932, 2926, 2934, 2934, 2935, - 2927, 2930, 2936, 2938, 2937, 2939, 2941, 2933, 2940, 2944, - 2943, 2929, 2935, 2942, 2949, 2941, 2950, 2951, 2951, 2938, - 0, 2936, 2937, 2940, 2952, 2942, 2957, 2945, 2949, 2944, - 2939, 2943, 2945, 2952, 2953, 2953, 2950, 2954, 2954, 2955, + 2886, 2887, 2882, 2888, 2889, 2877, 2890, 2888, 2887, 2892, + 2893, 2894, 2894, 2889, 2897, 2880, 2881, 2895, 2895, 2893, + 2902, 2890, 2896, 2896, 2899, 2886, 2898, 2892, 2901, 2897, + 2904, 2898, 2900, 2899, 2901, 2903, 2899, 2900, 2900, 2905, + 2907, 2906, 2908, 2908, 2905, 2902, 2906, 2909, 2910, 2944, + 2903, 2904, 2944, 2909, 2910, 2911, 2911, 2912, 2912, 2907, + 2913, 2916, 2916, 2919, 2919, 2913, 2920, 2920, 2921, 2921, + 2922, 2922, 2923, 2923, 2924, 2924, 2925, 2925, 2927, 2928, + 2928, 2929, 2930, 2931, 2935, 2933, 2937, 2927, 2934, 2934, + 2929, 2939, 2936, 2943, 2930, 2938, 2938, 2947, 2937, 2935, - 2955, 2956, 2956, 2958, 2959, 2957, 2960, 2959, 2961, 2962, - 2963, 2960, 2964, 2961, 2965, 2966, 2967, 2968, 2964, 2969, - 2969, 2967, 2971, 2958, 2970, 2963, 2976, 2966, 2965, 2972, - 2972, 2974, 2979, 2979, 2962, 2980, 2980, 2968, 2982, 2970, - 2981, 2971, 2985, 2983, 2976, 2984, 2974, 2986, 2981, 2983, - 2987, 2984, 2992, 2988, 2989, 2989, 2985, 2982, 2988, 2993, - 2986, 2990, 2990, 2995, 2996, 2998, 2999, 3000, 2996, 2987, - 3001, 2999, 3003, 2992, 3002, 3004, 3005, 2995, 3009, 2993, - 3004, 3005, 3010, 3001, 3011, 2998, 3000, 3002, 3006, 3006, - 3013, 3003, 3012, 3012, 3016, 3013, 3014, 3019, 3009, 3016, + 2940, 2940, 2953, 2931, 2933, 2936, 2939, 2946, 2946, 2949, + 2950, 2943, 2949, 2951, 2952, 2947, 2950, 2954, 2955, 2952, + 2957, 2953, 2958, 2961, 2972, 2970, 2957, 2951, 2970, 2973, + 2973, 2958, 2974, 2974, 2955, 2954, 2977, 2972, 2961, 2975, + 2975, 2978, 2979, 2980, 2981, 2983, 2979, 2985, 2989, 2984, + 2978, 2986, 2985, 2986, 2987, 2988, 2988, 2990, 2981, 2977, + 2984, 2989, 2991, 2980, 2993, 2992, 2995, 2994, 2983, 2987, + 2997, 2996, 2998, 2999, 3003, 2995, 2990, 3004, 2999, 0, + 2991, 2992, 2994, 2996, 3005, 3005, 3006, 3011, 3003, 2993, + 3012, 2997, 2998, 3007, 3007, 3006, 3016, 3004, 3008, 3008, - 3010, 3017, 3014, 3011, 3015, 3015, 3017, 3018, 3020, 3022, - 3022, 3026, 3018, 3023, 3020, 3026, 3019, 3027, 3023, 3024, - 3024, 3028, 3029, 3030, 3031, 3032, 3033, 3047, 3028, 3040, - 3031, 3035, 3035, 3037, 3037, 3039, 3027, 3038, 3041, 3033, - 3039, 3029, 3030, 3042, 3032, 3045, 3038, 3044, 3040, 3038, - 3043, 3043, 3044, 3047, 3048, 3048, 3042, 3041, 3045, 3049, - 3050, 3050, 3051, 3051, 3052, 3053, 3054, 3055, 3055, 3052, - 3056, 3057, 3053, 3057, 3059, 3056, 3058, 3058, 3049, 3060, - 3061, 3059, 3062, 3063, 3066, 3054, 3060, 3062, 3065, 3065, - 3068, 3069, 3070, 3071, 3075, 3068, 3069, 3072, 3072, 3061, + 3009, 3009, 3010, 3010, 3013, 3017, 3011, 3013, 3014, 3015, + 3012, 3018, 3019, 3014, 3015, 3020, 3022, 3018, 3021, 3024, + 3017, 3016, 3025, 3021, 3023, 3023, 3019, 3020, 3026, 3026, + 3028, 3030, 3033, 3033, 3024, 3035, 3022, 3034, 3034, 3036, + 3037, 3025, 3038, 3035, 3040, 3028, 3037, 3039, 3038, 3030, + 3041, 3042, 3043, 3043, 3044, 3044, 3042, 3040, 3036, 3046, + 3049, 3039, 3047, 3050, 3052, 3053, 3054, 3050, 3055, 3041, + 3053, 3057, 3058, 3056, 3049, 3060, 3060, 3058, 3059, 3063, + 3046, 3055, 3047, 3059, 3052, 3054, 3056, 3064, 3065, 3067, + 3057, 3066, 3066, 3070, 3067, 3068, 3069, 3069, 3070, 3063, - 3074, 3074, 3063, 3066, 3076, 3077, 3077, 3078, 3078, 3079, - 3089, 3070, 3071, 3075, 3081, 3081, 3079, 3082, 3082, 3083, - 3085, 3090, 3088, 3076, 0, 3085, 3083, 3088, 0, 3089, - 3091, 3091, 3092, 3092, 0, 0, 0, 0, 0, 0, - 3090, 3096, 3096, 3096, 3096, 3096, 3096, 3096, 3097, 3097, - 3097, 3097, 3097, 3097, 3097, 3098, 3098, 3098, 3098, 3098, - 3098, 3098, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3100, - 3100, 3100, 3100, 3100, 3100, 3100, 3102, 3102, 0, 3102, - 3102, 3102, 3102, 3103, 3103, 0, 0, 0, 3103, 3103, - 3104, 3104, 0, 0, 3104, 0, 3104, 3105, 0, 0, + 3073, 3068, 3081, 3071, 3072, 3064, 3074, 3065, 3071, 3072, + 3076, 3076, 3074, 3077, 3078, 3078, 3080, 3082, 3077, 3073, + 3080, 3081, 3083, 3084, 3082, 3085, 3086, 3087, 3089, 3089, + 3093, 3085, 3091, 3091, 3092, 3093, 3094, 3095, 3096, 3098, + 3087, 3083, 3084, 3092, 3098, 3086, 3092, 3097, 3097, 3099, + 3101, 3096, 3102, 3102, 3103, 3094, 3095, 3104, 3104, 3105, + 3105, 3106, 3099, 3107, 3108, 3115, 3106, 3109, 3109, 3110, + 3107, 3112, 3112, 3103, 3110, 3111, 3101, 3111, 3113, 3114, + 3117, 3120, 3116, 3108, 3115, 3113, 3114, 3116, 3119, 3119, + 3122, 3123, 3124, 3125, 3129, 3122, 3123, 3126, 3126, 3117, - 0, 0, 0, 3105, 3106, 3106, 0, 0, 0, 3106, - 3106, 3107, 0, 0, 0, 0, 0, 3107, 3108, 3108, - 0, 3108, 3108, 3108, 3108, 3109, 3109, 0, 3109, 3109, - 3109, 3109, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, - 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, - 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, - 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, - 3095, 3095, 3095 + 3120, 3128, 3128, 3130, 3131, 3131, 3132, 3132, 3133, 3135, + 3135, 3124, 3125, 3129, 3137, 3133, 3136, 3136, 3139, 3142, + 3143, 3137, 3130, 3139, 3142, 3144, 3145, 3145, 3146, 3146, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3143, + 0, 0, 0, 0, 3144, 3150, 3150, 3150, 3150, 3150, + 3150, 3150, 3151, 3151, 3151, 3151, 3151, 3151, 3151, 3152, + 3152, 3152, 3152, 3152, 3152, 3152, 3153, 3153, 3153, 3153, + 3153, 3153, 3153, 3154, 3154, 3154, 3154, 3154, 3154, 3154, + 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3156, 3156, 3156, + 3156, 3156, 3156, 3156, 3158, 3158, 0, 3158, 3158, 3158, + + 3158, 3159, 3159, 0, 0, 0, 3159, 3159, 3160, 3160, + 0, 0, 3160, 0, 3160, 3161, 0, 0, 0, 0, + 0, 3161, 3162, 3162, 0, 0, 0, 3162, 3162, 3163, + 0, 0, 0, 0, 0, 3163, 3164, 3164, 0, 3164, + 3164, 3164, 3164, 3165, 0, 0, 0, 0, 0, 3165, + 3166, 3166, 0, 0, 0, 3166, 3166, 3167, 3167, 0, + 3167, 3167, 3167, 3167, 3149, 3149, 3149, 3149, 3149, 3149, + 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, + 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, + 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, + + 3149, 3149, 3149, 3149, 3149 } ; static yy_state_type yy_last_accepting_state; @@ -2848,11 +2895,13 @@ struct inc_state { int line; YY_BUFFER_STATE buffer; struct inc_state* next; + int inc_toplevel; }; static struct inc_state* config_include_stack = NULL; static int inc_depth = 0; static int inc_prev = 0; static int num_args = 0; +static int inc_toplevel = 0; void init_cfg_parse(void) { @@ -2860,14 +2909,15 @@ void init_cfg_parse(void) inc_depth = 0; inc_prev = 0; num_args = 0; + inc_toplevel = 0; } -static void config_start_include(const char* filename) +static void config_start_include(const char* filename, int toplevel) { FILE *input; struct inc_state* s; char* nm; - if(inc_depth++ > 100000) { + if(inc_depth+1 > 100000) { ub_c_error_msg("too many include files"); return; } @@ -2899,17 +2949,20 @@ static void config_start_include(const char* filename) return; } LEXOUT(("switch_to_include_file(%s)\n", filename)); + inc_depth++; s->filename = cfg_parser->filename; s->line = cfg_parser->line; s->buffer = YY_CURRENT_BUFFER; + s->inc_toplevel = inc_toplevel; s->next = config_include_stack; config_include_stack = s; cfg_parser->filename = nm; cfg_parser->line = 1; + inc_toplevel = toplevel; yy_switch_to_buffer(yy_create_buffer(input, YY_BUF_SIZE)); } -static void config_start_include_glob(const char* filename) +static void config_start_include_glob(const char* filename, int toplevel) { /* check for wildcards */ @@ -2942,19 +2995,19 @@ static void config_start_include_glob(const char* filename) globfree(&g); if(r == GLOB_NOMATCH) return; /* no matches for pattern */ - config_start_include(filename); /* let original deal with it */ + config_start_include(filename, toplevel); /* let original deal with it */ return; } /* process files found, if any */ for(i=(int)g.gl_pathc-1; i>=0; i--) { - config_start_include(g.gl_pathv[i]); + config_start_include(g.gl_pathv[i], toplevel); } globfree(&g); return; } #endif /* HAVE_GLOB */ - config_start_include(filename); + config_start_include(filename, toplevel); } static void config_end_include(void) @@ -2968,6 +3021,7 @@ static void config_end_include(void) yy_delete_buffer(YY_CURRENT_BUFFER); yy_switch_to_buffer(s->buffer); config_include_stack = s->next; + inc_toplevel = s->inc_toplevel; free(s); } @@ -2980,18 +3034,18 @@ static void config_end_include(void) } #endif -#line 2982 "" +#line 3036 "" #define YY_NO_INPUT 1 -#line 184 "./util/configlexer.lex" +#line 191 "./util/configlexer.lex" #ifndef YY_NO_UNPUT #define YY_NO_UNPUT 1 #endif #ifndef YY_NO_INPUT #define YY_NO_INPUT 1 #endif -#line 2991 "" +#line 3045 "" -#line 2993 "" +#line 3047 "" #define INITIAL 0 #define quotedstring 1 @@ -2999,6 +3053,8 @@ static void config_end_include(void) #define include 3 #define include_quoted 4 #define val 5 +#define include_toplevel 6 +#define include_toplevel_quoted 7 #ifndef YY_NO_UNISTD_H /* Special case for "unistd.h", since it is non-ANSI. We include it way @@ -3211,9 +3267,9 @@ YY_DECL } { -#line 204 "./util/configlexer.lex" +#line 211 "./util/configlexer.lex" -#line 3215 "" +#line 3271 "" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -3246,13 +3302,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 3096 ) + if ( yy_current_state >= 3150 ) 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] != 6033 ); + while ( yy_base[yy_current_state] != 6165 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -3278,1523 +3334,1528 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 205 "./util/configlexer.lex" +#line 212 "./util/configlexer.lex" { LEXOUT(("SP ")); /* ignore */ } YY_BREAK case 2: YY_RULE_SETUP -#line 207 "./util/configlexer.lex" +#line 214 "./util/configlexer.lex" { /* note that flex makes the longest match and '.' is any but not nl */ LEXOUT(("comment(%s) ", yytext)); /* ignore */ } YY_BREAK case 3: YY_RULE_SETUP -#line 210 "./util/configlexer.lex" +#line 217 "./util/configlexer.lex" { YDVAR(0, VAR_SERVER) } YY_BREAK case 4: YY_RULE_SETUP -#line 211 "./util/configlexer.lex" +#line 218 "./util/configlexer.lex" { YDVAR(1, VAR_QNAME_MINIMISATION) } YY_BREAK case 5: YY_RULE_SETUP -#line 212 "./util/configlexer.lex" +#line 219 "./util/configlexer.lex" { YDVAR(1, VAR_QNAME_MINIMISATION_STRICT) } YY_BREAK case 6: YY_RULE_SETUP -#line 213 "./util/configlexer.lex" +#line 220 "./util/configlexer.lex" { YDVAR(1, VAR_NUM_THREADS) } YY_BREAK case 7: YY_RULE_SETUP -#line 214 "./util/configlexer.lex" +#line 221 "./util/configlexer.lex" { YDVAR(1, VAR_VERBOSITY) } YY_BREAK case 8: YY_RULE_SETUP -#line 215 "./util/configlexer.lex" +#line 222 "./util/configlexer.lex" { YDVAR(1, VAR_PORT) } YY_BREAK case 9: YY_RULE_SETUP -#line 216 "./util/configlexer.lex" +#line 223 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_RANGE) } YY_BREAK case 10: YY_RULE_SETUP -#line 217 "./util/configlexer.lex" +#line 224 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_PORT_PERMIT) } YY_BREAK case 11: YY_RULE_SETUP -#line 218 "./util/configlexer.lex" +#line 225 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_PORT_AVOID) } YY_BREAK case 12: YY_RULE_SETUP -#line 219 "./util/configlexer.lex" +#line 226 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_NUM_TCP) } YY_BREAK case 13: YY_RULE_SETUP -#line 220 "./util/configlexer.lex" +#line 227 "./util/configlexer.lex" { YDVAR(1, VAR_INCOMING_NUM_TCP) } YY_BREAK case 14: YY_RULE_SETUP -#line 221 "./util/configlexer.lex" +#line 228 "./util/configlexer.lex" { YDVAR(1, VAR_DO_IP4) } YY_BREAK case 15: YY_RULE_SETUP -#line 222 "./util/configlexer.lex" +#line 229 "./util/configlexer.lex" { YDVAR(1, VAR_DO_IP6) } YY_BREAK case 16: YY_RULE_SETUP -#line 223 "./util/configlexer.lex" +#line 230 "./util/configlexer.lex" { YDVAR(1, VAR_PREFER_IP4) } YY_BREAK case 17: YY_RULE_SETUP -#line 224 "./util/configlexer.lex" +#line 231 "./util/configlexer.lex" { YDVAR(1, VAR_PREFER_IP6) } YY_BREAK case 18: YY_RULE_SETUP -#line 225 "./util/configlexer.lex" +#line 232 "./util/configlexer.lex" { YDVAR(1, VAR_DO_UDP) } YY_BREAK case 19: YY_RULE_SETUP -#line 226 "./util/configlexer.lex" +#line 233 "./util/configlexer.lex" { YDVAR(1, VAR_DO_TCP) } YY_BREAK case 20: YY_RULE_SETUP -#line 227 "./util/configlexer.lex" +#line 234 "./util/configlexer.lex" { YDVAR(1, VAR_TCP_UPSTREAM) } YY_BREAK case 21: YY_RULE_SETUP -#line 228 "./util/configlexer.lex" +#line 235 "./util/configlexer.lex" { YDVAR(1, VAR_TCP_MSS) } YY_BREAK case 22: YY_RULE_SETUP -#line 229 "./util/configlexer.lex" +#line 236 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_TCP_MSS) } YY_BREAK case 23: YY_RULE_SETUP -#line 230 "./util/configlexer.lex" +#line 237 "./util/configlexer.lex" { YDVAR(1, VAR_TCP_IDLE_TIMEOUT) } YY_BREAK case 24: YY_RULE_SETUP -#line 231 "./util/configlexer.lex" +#line 238 "./util/configlexer.lex" { YDVAR(1, VAR_EDNS_TCP_KEEPALIVE) } YY_BREAK case 25: YY_RULE_SETUP -#line 232 "./util/configlexer.lex" +#line 239 "./util/configlexer.lex" { YDVAR(1, VAR_EDNS_TCP_KEEPALIVE_TIMEOUT) } YY_BREAK case 26: YY_RULE_SETUP -#line 233 "./util/configlexer.lex" +#line 240 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_UPSTREAM) } YY_BREAK case 27: YY_RULE_SETUP -#line 234 "./util/configlexer.lex" +#line 241 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_UPSTREAM) } YY_BREAK case 28: YY_RULE_SETUP -#line 235 "./util/configlexer.lex" +#line 242 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_SERVICE_KEY) } YY_BREAK case 29: YY_RULE_SETUP -#line 236 "./util/configlexer.lex" +#line 243 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_SERVICE_KEY) } YY_BREAK case 30: YY_RULE_SETUP -#line 237 "./util/configlexer.lex" +#line 244 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_SERVICE_PEM) } YY_BREAK case 31: YY_RULE_SETUP -#line 238 "./util/configlexer.lex" +#line 245 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_SERVICE_PEM) } YY_BREAK case 32: YY_RULE_SETUP -#line 239 "./util/configlexer.lex" +#line 246 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_PORT) } YY_BREAK case 33: YY_RULE_SETUP -#line 240 "./util/configlexer.lex" +#line 247 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_PORT) } YY_BREAK case 34: YY_RULE_SETUP -#line 241 "./util/configlexer.lex" +#line 248 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_CERT_BUNDLE) } YY_BREAK case 35: YY_RULE_SETUP -#line 242 "./util/configlexer.lex" +#line 249 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_CERT_BUNDLE) } YY_BREAK case 36: YY_RULE_SETUP -#line 243 "./util/configlexer.lex" +#line 250 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_WIN_CERT) } YY_BREAK case 37: YY_RULE_SETUP -#line 244 "./util/configlexer.lex" +#line 251 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_ADDITIONAL_PORT) } YY_BREAK case 38: YY_RULE_SETUP -#line 245 "./util/configlexer.lex" +#line 252 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_ADDITIONAL_PORT) } YY_BREAK case 39: YY_RULE_SETUP -#line 246 "./util/configlexer.lex" +#line 253 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_ADDITIONAL_PORT) } YY_BREAK case 40: YY_RULE_SETUP -#line 247 "./util/configlexer.lex" +#line 254 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_ADDITIONAL_PORT) } YY_BREAK case 41: YY_RULE_SETUP -#line 248 "./util/configlexer.lex" +#line 255 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_SESSION_TICKET_KEYS) } YY_BREAK case 42: YY_RULE_SETUP -#line 249 "./util/configlexer.lex" +#line 256 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_CIPHERS) } YY_BREAK case 43: YY_RULE_SETUP -#line 250 "./util/configlexer.lex" +#line 257 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_CIPHERSUITES) } YY_BREAK case 44: YY_RULE_SETUP -#line 251 "./util/configlexer.lex" +#line 258 "./util/configlexer.lex" { YDVAR(1, VAR_TLS_USE_SNI) } YY_BREAK case 45: YY_RULE_SETUP -#line 252 "./util/configlexer.lex" +#line 259 "./util/configlexer.lex" { YDVAR(1, VAR_USE_SYSTEMD) } YY_BREAK case 46: YY_RULE_SETUP -#line 253 "./util/configlexer.lex" +#line 260 "./util/configlexer.lex" { YDVAR(1, VAR_DO_DAEMONIZE) } YY_BREAK case 47: YY_RULE_SETUP -#line 254 "./util/configlexer.lex" +#line 261 "./util/configlexer.lex" { YDVAR(1, VAR_INTERFACE) } YY_BREAK case 48: YY_RULE_SETUP -#line 255 "./util/configlexer.lex" +#line 262 "./util/configlexer.lex" { YDVAR(1, VAR_INTERFACE) } YY_BREAK case 49: YY_RULE_SETUP -#line 256 "./util/configlexer.lex" +#line 263 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_INTERFACE) } YY_BREAK case 50: YY_RULE_SETUP -#line 257 "./util/configlexer.lex" +#line 264 "./util/configlexer.lex" { YDVAR(1, VAR_INTERFACE_AUTOMATIC) } YY_BREAK case 51: YY_RULE_SETUP -#line 258 "./util/configlexer.lex" +#line 265 "./util/configlexer.lex" { YDVAR(1, VAR_SO_RCVBUF) } YY_BREAK case 52: YY_RULE_SETUP -#line 259 "./util/configlexer.lex" +#line 266 "./util/configlexer.lex" { YDVAR(1, VAR_SO_SNDBUF) } YY_BREAK case 53: YY_RULE_SETUP -#line 260 "./util/configlexer.lex" +#line 267 "./util/configlexer.lex" { YDVAR(1, VAR_SO_REUSEPORT) } YY_BREAK case 54: YY_RULE_SETUP -#line 261 "./util/configlexer.lex" +#line 268 "./util/configlexer.lex" { YDVAR(1, VAR_IP_TRANSPARENT) } YY_BREAK case 55: YY_RULE_SETUP -#line 262 "./util/configlexer.lex" +#line 269 "./util/configlexer.lex" { YDVAR(1, VAR_IP_FREEBIND) } YY_BREAK case 56: YY_RULE_SETUP -#line 263 "./util/configlexer.lex" +#line 270 "./util/configlexer.lex" { YDVAR(1, VAR_IP_DSCP) } YY_BREAK case 57: YY_RULE_SETUP -#line 264 "./util/configlexer.lex" +#line 271 "./util/configlexer.lex" { YDVAR(1, VAR_CHROOT) } YY_BREAK case 58: YY_RULE_SETUP -#line 265 "./util/configlexer.lex" +#line 272 "./util/configlexer.lex" { YDVAR(1, VAR_USERNAME) } YY_BREAK case 59: YY_RULE_SETUP -#line 266 "./util/configlexer.lex" +#line 273 "./util/configlexer.lex" { YDVAR(1, VAR_DIRECTORY) } YY_BREAK case 60: YY_RULE_SETUP -#line 267 "./util/configlexer.lex" +#line 274 "./util/configlexer.lex" { YDVAR(1, VAR_LOGFILE) } YY_BREAK case 61: YY_RULE_SETUP -#line 268 "./util/configlexer.lex" +#line 275 "./util/configlexer.lex" { YDVAR(1, VAR_PIDFILE) } YY_BREAK case 62: YY_RULE_SETUP -#line 269 "./util/configlexer.lex" +#line 276 "./util/configlexer.lex" { YDVAR(1, VAR_ROOT_HINTS) } YY_BREAK case 63: YY_RULE_SETUP -#line 270 "./util/configlexer.lex" +#line 277 "./util/configlexer.lex" { YDVAR(1, VAR_STREAM_WAIT_SIZE) } YY_BREAK case 64: YY_RULE_SETUP -#line 271 "./util/configlexer.lex" +#line 278 "./util/configlexer.lex" { YDVAR(1, VAR_EDNS_BUFFER_SIZE) } YY_BREAK case 65: YY_RULE_SETUP -#line 272 "./util/configlexer.lex" +#line 279 "./util/configlexer.lex" { YDVAR(1, VAR_MSG_BUFFER_SIZE) } YY_BREAK case 66: YY_RULE_SETUP -#line 273 "./util/configlexer.lex" +#line 280 "./util/configlexer.lex" { YDVAR(1, VAR_MSG_CACHE_SIZE) } YY_BREAK case 67: YY_RULE_SETUP -#line 274 "./util/configlexer.lex" +#line 281 "./util/configlexer.lex" { YDVAR(1, VAR_MSG_CACHE_SLABS) } YY_BREAK case 68: YY_RULE_SETUP -#line 275 "./util/configlexer.lex" +#line 282 "./util/configlexer.lex" { YDVAR(1, VAR_RRSET_CACHE_SIZE) } YY_BREAK case 69: YY_RULE_SETUP -#line 276 "./util/configlexer.lex" +#line 283 "./util/configlexer.lex" { YDVAR(1, VAR_RRSET_CACHE_SLABS) } YY_BREAK case 70: YY_RULE_SETUP -#line 277 "./util/configlexer.lex" +#line 284 "./util/configlexer.lex" { YDVAR(1, VAR_CACHE_MAX_TTL) } YY_BREAK case 71: YY_RULE_SETUP -#line 278 "./util/configlexer.lex" +#line 285 "./util/configlexer.lex" { YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) } YY_BREAK case 72: YY_RULE_SETUP -#line 279 "./util/configlexer.lex" +#line 286 "./util/configlexer.lex" { YDVAR(1, VAR_CACHE_MIN_TTL) } YY_BREAK case 73: YY_RULE_SETUP -#line 280 "./util/configlexer.lex" +#line 287 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_HOST_TTL) } YY_BREAK case 74: YY_RULE_SETUP -#line 281 "./util/configlexer.lex" +#line 288 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_LAME_TTL) } YY_BREAK case 75: YY_RULE_SETUP -#line 282 "./util/configlexer.lex" +#line 289 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_CACHE_SLABS) } YY_BREAK case 76: YY_RULE_SETUP -#line 283 "./util/configlexer.lex" +#line 290 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } YY_BREAK case 77: YY_RULE_SETUP -#line 284 "./util/configlexer.lex" +#line 291 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } YY_BREAK case 78: YY_RULE_SETUP -#line 285 "./util/configlexer.lex" +#line 292 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } YY_BREAK case 79: YY_RULE_SETUP -#line 286 "./util/configlexer.lex" +#line 293 "./util/configlexer.lex" { YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } YY_BREAK case 80: YY_RULE_SETUP -#line 287 "./util/configlexer.lex" +#line 294 "./util/configlexer.lex" { YDVAR(1, VAR_JOSTLE_TIMEOUT) } YY_BREAK case 81: YY_RULE_SETUP -#line 288 "./util/configlexer.lex" +#line 295 "./util/configlexer.lex" { YDVAR(1, VAR_DELAY_CLOSE) } YY_BREAK case 82: YY_RULE_SETUP -#line 289 "./util/configlexer.lex" +#line 296 "./util/configlexer.lex" { YDVAR(1, VAR_TARGET_FETCH_POLICY) } YY_BREAK case 83: YY_RULE_SETUP -#line 290 "./util/configlexer.lex" +#line 297 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } YY_BREAK case 84: YY_RULE_SETUP -#line 291 "./util/configlexer.lex" +#line 298 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } YY_BREAK case 85: YY_RULE_SETUP -#line 292 "./util/configlexer.lex" +#line 299 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_GLUE) } YY_BREAK case 86: YY_RULE_SETUP -#line 293 "./util/configlexer.lex" +#line 300 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 87: YY_RULE_SETUP -#line 294 "./util/configlexer.lex" +#line 301 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } YY_BREAK case 88: YY_RULE_SETUP -#line 295 "./util/configlexer.lex" +#line 302 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } YY_BREAK case 89: YY_RULE_SETUP -#line 296 "./util/configlexer.lex" +#line 303 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } YY_BREAK case 90: YY_RULE_SETUP -#line 297 "./util/configlexer.lex" +#line 304 "./util/configlexer.lex" { YDVAR(1, VAR_USE_CAPS_FOR_ID) } YY_BREAK case 91: YY_RULE_SETUP -#line 298 "./util/configlexer.lex" +#line 305 "./util/configlexer.lex" { YDVAR(1, VAR_CAPS_WHITELIST) } YY_BREAK case 92: YY_RULE_SETUP -#line 299 "./util/configlexer.lex" +#line 306 "./util/configlexer.lex" { YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } YY_BREAK case 93: YY_RULE_SETUP -#line 300 "./util/configlexer.lex" +#line 307 "./util/configlexer.lex" { YDVAR(1, VAR_PRIVATE_ADDRESS) } YY_BREAK case 94: YY_RULE_SETUP -#line 301 "./util/configlexer.lex" +#line 308 "./util/configlexer.lex" { YDVAR(1, VAR_PRIVATE_DOMAIN) } YY_BREAK case 95: YY_RULE_SETUP -#line 302 "./util/configlexer.lex" +#line 309 "./util/configlexer.lex" { YDVAR(1, VAR_PREFETCH_KEY) } YY_BREAK case 96: YY_RULE_SETUP -#line 303 "./util/configlexer.lex" +#line 310 "./util/configlexer.lex" { YDVAR(1, VAR_PREFETCH) } YY_BREAK case 97: YY_RULE_SETUP -#line 304 "./util/configlexer.lex" +#line 311 "./util/configlexer.lex" { YDVAR(1, VAR_DENY_ANY) } YY_BREAK case 98: YY_RULE_SETUP -#line 305 "./util/configlexer.lex" +#line 312 "./util/configlexer.lex" { YDVAR(0, VAR_STUB_ZONE) } YY_BREAK case 99: YY_RULE_SETUP -#line 306 "./util/configlexer.lex" +#line 313 "./util/configlexer.lex" { YDVAR(1, VAR_NAME) } YY_BREAK case 100: YY_RULE_SETUP -#line 307 "./util/configlexer.lex" +#line 314 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_ADDR) } YY_BREAK case 101: YY_RULE_SETUP -#line 308 "./util/configlexer.lex" +#line 315 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_HOST) } YY_BREAK case 102: YY_RULE_SETUP -#line 309 "./util/configlexer.lex" +#line 316 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_PRIME) } YY_BREAK case 103: YY_RULE_SETUP -#line 310 "./util/configlexer.lex" +#line 317 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_FIRST) } YY_BREAK case 104: YY_RULE_SETUP -#line 311 "./util/configlexer.lex" +#line 318 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_NO_CACHE) } YY_BREAK case 105: YY_RULE_SETUP -#line 312 "./util/configlexer.lex" +#line 319 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_SSL_UPSTREAM) } YY_BREAK case 106: YY_RULE_SETUP -#line 313 "./util/configlexer.lex" +#line 320 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_SSL_UPSTREAM) } YY_BREAK case 107: YY_RULE_SETUP -#line 314 "./util/configlexer.lex" +#line 321 "./util/configlexer.lex" { YDVAR(0, VAR_FORWARD_ZONE) } YY_BREAK case 108: YY_RULE_SETUP -#line 315 "./util/configlexer.lex" +#line 322 "./util/configlexer.lex" { YDVAR(1, VAR_FORWARD_ADDR) } YY_BREAK case 109: YY_RULE_SETUP -#line 316 "./util/configlexer.lex" +#line 323 "./util/configlexer.lex" { YDVAR(1, VAR_FORWARD_HOST) } YY_BREAK case 110: YY_RULE_SETUP -#line 317 "./util/configlexer.lex" +#line 324 "./util/configlexer.lex" { YDVAR(1, VAR_FORWARD_FIRST) } YY_BREAK case 111: YY_RULE_SETUP -#line 318 "./util/configlexer.lex" +#line 325 "./util/configlexer.lex" { YDVAR(1, VAR_FORWARD_NO_CACHE) } YY_BREAK case 112: YY_RULE_SETUP -#line 319 "./util/configlexer.lex" +#line 326 "./util/configlexer.lex" { YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } YY_BREAK case 113: YY_RULE_SETUP -#line 320 "./util/configlexer.lex" +#line 327 "./util/configlexer.lex" { YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } YY_BREAK case 114: YY_RULE_SETUP -#line 321 "./util/configlexer.lex" +#line 328 "./util/configlexer.lex" { YDVAR(0, VAR_AUTH_ZONE) } YY_BREAK case 115: YY_RULE_SETUP -#line 322 "./util/configlexer.lex" +#line 329 "./util/configlexer.lex" { YDVAR(0, VAR_RPZ) } YY_BREAK case 116: YY_RULE_SETUP -#line 323 "./util/configlexer.lex" +#line 330 "./util/configlexer.lex" { YDVAR(1, VAR_TAGS) } YY_BREAK case 117: YY_RULE_SETUP -#line 324 "./util/configlexer.lex" +#line 331 "./util/configlexer.lex" { YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) } YY_BREAK case 118: YY_RULE_SETUP -#line 325 "./util/configlexer.lex" +#line 332 "./util/configlexer.lex" { YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) } YY_BREAK case 119: YY_RULE_SETUP -#line 326 "./util/configlexer.lex" +#line 333 "./util/configlexer.lex" { YDVAR(1, VAR_RPZ_LOG) } YY_BREAK case 120: YY_RULE_SETUP -#line 327 "./util/configlexer.lex" +#line 334 "./util/configlexer.lex" { YDVAR(1, VAR_RPZ_LOG_NAME) } YY_BREAK case 121: YY_RULE_SETUP -#line 328 "./util/configlexer.lex" +#line 335 "./util/configlexer.lex" { YDVAR(1, VAR_ZONEFILE) } YY_BREAK case 122: YY_RULE_SETUP -#line 329 "./util/configlexer.lex" +#line 336 "./util/configlexer.lex" { YDVAR(1, VAR_MASTER) } YY_BREAK case 123: YY_RULE_SETUP -#line 330 "./util/configlexer.lex" +#line 337 "./util/configlexer.lex" { YDVAR(1, VAR_URL) } YY_BREAK case 124: YY_RULE_SETUP -#line 331 "./util/configlexer.lex" +#line 338 "./util/configlexer.lex" { YDVAR(1, VAR_ALLOW_NOTIFY) } YY_BREAK case 125: YY_RULE_SETUP -#line 332 "./util/configlexer.lex" +#line 339 "./util/configlexer.lex" { YDVAR(1, VAR_FOR_DOWNSTREAM) } YY_BREAK case 126: YY_RULE_SETUP -#line 333 "./util/configlexer.lex" +#line 340 "./util/configlexer.lex" { YDVAR(1, VAR_FOR_UPSTREAM) } YY_BREAK case 127: YY_RULE_SETUP -#line 334 "./util/configlexer.lex" +#line 341 "./util/configlexer.lex" { YDVAR(1, VAR_FALLBACK_ENABLED) } YY_BREAK case 128: YY_RULE_SETUP -#line 335 "./util/configlexer.lex" +#line 342 "./util/configlexer.lex" { YDVAR(0, VAR_VIEW) } YY_BREAK case 129: YY_RULE_SETUP -#line 336 "./util/configlexer.lex" +#line 343 "./util/configlexer.lex" { YDVAR(1, VAR_VIEW_FIRST) } YY_BREAK case 130: YY_RULE_SETUP -#line 337 "./util/configlexer.lex" +#line 344 "./util/configlexer.lex" { YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } YY_BREAK case 131: YY_RULE_SETUP -#line 338 "./util/configlexer.lex" +#line 345 "./util/configlexer.lex" { YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } YY_BREAK case 132: YY_RULE_SETUP -#line 339 "./util/configlexer.lex" +#line 346 "./util/configlexer.lex" { YDVAR(2, VAR_ACCESS_CONTROL) } YY_BREAK case 133: YY_RULE_SETUP -#line 340 "./util/configlexer.lex" +#line 347 "./util/configlexer.lex" { YDVAR(1, VAR_SEND_CLIENT_SUBNET) } YY_BREAK case 134: YY_RULE_SETUP -#line 341 "./util/configlexer.lex" +#line 348 "./util/configlexer.lex" { YDVAR(1, VAR_CLIENT_SUBNET_ZONE) } YY_BREAK case 135: YY_RULE_SETUP -#line 342 "./util/configlexer.lex" +#line 349 "./util/configlexer.lex" { YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) } YY_BREAK case 136: YY_RULE_SETUP -#line 343 "./util/configlexer.lex" +#line 350 "./util/configlexer.lex" { YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) } YY_BREAK case 137: YY_RULE_SETUP -#line 344 "./util/configlexer.lex" +#line 351 "./util/configlexer.lex" { YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) } YY_BREAK case 138: YY_RULE_SETUP -#line 345 "./util/configlexer.lex" +#line 352 "./util/configlexer.lex" { YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) } YY_BREAK case 139: YY_RULE_SETUP -#line 346 "./util/configlexer.lex" +#line 353 "./util/configlexer.lex" { YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) } YY_BREAK case 140: YY_RULE_SETUP -#line 347 "./util/configlexer.lex" +#line 354 "./util/configlexer.lex" { YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) } YY_BREAK case 141: YY_RULE_SETUP -#line 348 "./util/configlexer.lex" +#line 355 "./util/configlexer.lex" { YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) } YY_BREAK case 142: YY_RULE_SETUP -#line 349 "./util/configlexer.lex" +#line 356 "./util/configlexer.lex" { YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) } YY_BREAK case 143: YY_RULE_SETUP -#line 350 "./util/configlexer.lex" +#line 357 "./util/configlexer.lex" { YDVAR(1, VAR_HIDE_IDENTITY) } YY_BREAK case 144: YY_RULE_SETUP -#line 351 "./util/configlexer.lex" +#line 358 "./util/configlexer.lex" { YDVAR(1, VAR_HIDE_VERSION) } YY_BREAK case 145: YY_RULE_SETUP -#line 352 "./util/configlexer.lex" +#line 359 "./util/configlexer.lex" { YDVAR(1, VAR_HIDE_TRUSTANCHOR) } YY_BREAK case 146: YY_RULE_SETUP -#line 353 "./util/configlexer.lex" +#line 360 "./util/configlexer.lex" { YDVAR(1, VAR_IDENTITY) } YY_BREAK case 147: YY_RULE_SETUP -#line 354 "./util/configlexer.lex" +#line 361 "./util/configlexer.lex" { YDVAR(1, VAR_VERSION) } YY_BREAK case 148: YY_RULE_SETUP -#line 355 "./util/configlexer.lex" +#line 362 "./util/configlexer.lex" { YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 149: YY_RULE_SETUP -#line 356 "./util/configlexer.lex" +#line 363 "./util/configlexer.lex" { YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 150: YY_RULE_SETUP -#line 357 "./util/configlexer.lex" +#line 364 "./util/configlexer.lex" { YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 151: YY_RULE_SETUP -#line 358 "./util/configlexer.lex" +#line 365 "./util/configlexer.lex" { YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 152: YY_RULE_SETUP -#line 359 "./util/configlexer.lex" +#line 366 "./util/configlexer.lex" { YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 153: YY_RULE_SETUP -#line 360 "./util/configlexer.lex" +#line 367 "./util/configlexer.lex" { YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 154: YY_RULE_SETUP -#line 361 "./util/configlexer.lex" +#line 368 "./util/configlexer.lex" { YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 155: YY_RULE_SETUP -#line 362 "./util/configlexer.lex" +#line 369 "./util/configlexer.lex" { YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } YY_BREAK case 156: YY_RULE_SETUP -#line 363 "./util/configlexer.lex" +#line 370 "./util/configlexer.lex" { YDVAR(1, VAR_ROOT_KEY_SENTINEL) } YY_BREAK case 157: YY_RULE_SETUP -#line 364 "./util/configlexer.lex" +#line 371 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 158: YY_RULE_SETUP -#line 365 "./util/configlexer.lex" +#line 372 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 159: YY_RULE_SETUP -#line 366 "./util/configlexer.lex" +#line 373 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 160: YY_RULE_SETUP -#line 367 "./util/configlexer.lex" +#line 374 "./util/configlexer.lex" { YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 161: YY_RULE_SETUP -#line 368 "./util/configlexer.lex" +#line 375 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 162: YY_RULE_SETUP -#line 369 "./util/configlexer.lex" +#line 376 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 163: YY_RULE_SETUP -#line 370 "./util/configlexer.lex" +#line 377 "./util/configlexer.lex" { YDVAR(1, VAR_AGGRESSIVE_NSEC) } YY_BREAK case 164: YY_RULE_SETUP -#line 371 "./util/configlexer.lex" +#line 378 "./util/configlexer.lex" { YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 165: YY_RULE_SETUP -#line 372 "./util/configlexer.lex" +#line 379 "./util/configlexer.lex" { YDVAR(1, VAR_SERVE_EXPIRED) } YY_BREAK case 166: YY_RULE_SETUP -#line 373 "./util/configlexer.lex" +#line 380 "./util/configlexer.lex" { YDVAR(1, VAR_SERVE_EXPIRED_TTL) } YY_BREAK case 167: YY_RULE_SETUP -#line 374 "./util/configlexer.lex" +#line 381 "./util/configlexer.lex" { YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } YY_BREAK case 168: YY_RULE_SETUP -#line 375 "./util/configlexer.lex" +#line 382 "./util/configlexer.lex" { YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) } YY_BREAK case 169: YY_RULE_SETUP -#line 376 "./util/configlexer.lex" +#line 383 "./util/configlexer.lex" { YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) } YY_BREAK case 170: YY_RULE_SETUP -#line 377 "./util/configlexer.lex" +#line 384 "./util/configlexer.lex" { YDVAR(1, VAR_SERVE_ORIGINAL_TTL) } YY_BREAK case 171: YY_RULE_SETUP -#line 378 "./util/configlexer.lex" +#line 385 "./util/configlexer.lex" { YDVAR(1, VAR_FAKE_DSA) } YY_BREAK case 172: YY_RULE_SETUP -#line 379 "./util/configlexer.lex" +#line 386 "./util/configlexer.lex" { YDVAR(1, VAR_FAKE_SHA1) } YY_BREAK case 173: YY_RULE_SETUP -#line 380 "./util/configlexer.lex" +#line 387 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 174: YY_RULE_SETUP -#line 381 "./util/configlexer.lex" +#line 388 "./util/configlexer.lex" { YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 175: YY_RULE_SETUP -#line 382 "./util/configlexer.lex" +#line 389 "./util/configlexer.lex" { YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 176: YY_RULE_SETUP -#line 383 "./util/configlexer.lex" +#line 390 "./util/configlexer.lex" { YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 177: YY_RULE_SETUP -#line 384 "./util/configlexer.lex" +#line 391 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 178: YY_RULE_SETUP -#line 386 "./util/configlexer.lex" +#line 393 "./util/configlexer.lex" { YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 179: YY_RULE_SETUP -#line 387 "./util/configlexer.lex" +#line 394 "./util/configlexer.lex" { YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 180: YY_RULE_SETUP -#line 388 "./util/configlexer.lex" +#line 395 "./util/configlexer.lex" { YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 181: YY_RULE_SETUP -#line 389 "./util/configlexer.lex" +#line 396 "./util/configlexer.lex" { YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } YY_BREAK case 182: YY_RULE_SETUP -#line 390 "./util/configlexer.lex" +#line 397 "./util/configlexer.lex" { YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 183: YY_RULE_SETUP -#line 391 "./util/configlexer.lex" +#line 398 "./util/configlexer.lex" { YDVAR(1, VAR_LOG_IDENTITY) } YY_BREAK case 184: YY_RULE_SETUP -#line 392 "./util/configlexer.lex" +#line 399 "./util/configlexer.lex" { YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 185: YY_RULE_SETUP -#line 393 "./util/configlexer.lex" +#line 400 "./util/configlexer.lex" { YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 186: YY_RULE_SETUP -#line 394 "./util/configlexer.lex" +#line 401 "./util/configlexer.lex" { YDVAR(1, VAR_LOG_REPLIES) } YY_BREAK case 187: YY_RULE_SETUP -#line 395 "./util/configlexer.lex" +#line 402 "./util/configlexer.lex" { YDVAR(1, VAR_LOG_TAG_QUERYREPLY) } YY_BREAK case 188: YY_RULE_SETUP -#line 396 "./util/configlexer.lex" +#line 403 "./util/configlexer.lex" { YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } YY_BREAK case 189: YY_RULE_SETUP -#line 397 "./util/configlexer.lex" +#line 404 "./util/configlexer.lex" { YDVAR(1, VAR_LOG_SERVFAIL) } YY_BREAK case 190: YY_RULE_SETUP -#line 398 "./util/configlexer.lex" +#line 405 "./util/configlexer.lex" { YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 191: YY_RULE_SETUP -#line 399 "./util/configlexer.lex" +#line 406 "./util/configlexer.lex" { YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 192: YY_RULE_SETUP -#line 400 "./util/configlexer.lex" +#line 407 "./util/configlexer.lex" { YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 193: YY_RULE_SETUP -#line 401 "./util/configlexer.lex" +#line 408 "./util/configlexer.lex" { YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 194: YY_RULE_SETUP -#line 402 "./util/configlexer.lex" +#line 409 "./util/configlexer.lex" { YDVAR(1, VAR_INSECURE_LAN_ZONES) } YY_BREAK case 195: YY_RULE_SETUP -#line 403 "./util/configlexer.lex" +#line 410 "./util/configlexer.lex" { YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 196: YY_RULE_SETUP -#line 404 "./util/configlexer.lex" +#line 411 "./util/configlexer.lex" { YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 197: YY_RULE_SETUP -#line 405 "./util/configlexer.lex" +#line 412 "./util/configlexer.lex" { YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 198: YY_RULE_SETUP -#line 406 "./util/configlexer.lex" +#line 413 "./util/configlexer.lex" { YDVAR(1, VAR_SHM_ENABLE) } YY_BREAK case 199: YY_RULE_SETUP -#line 407 "./util/configlexer.lex" +#line 414 "./util/configlexer.lex" { YDVAR(1, VAR_SHM_KEY) } YY_BREAK case 200: YY_RULE_SETUP -#line 408 "./util/configlexer.lex" +#line 415 "./util/configlexer.lex" { YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 201: YY_RULE_SETUP -#line 409 "./util/configlexer.lex" +#line 416 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 202: YY_RULE_SETUP -#line 410 "./util/configlexer.lex" +#line 417 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 203: YY_RULE_SETUP -#line 411 "./util/configlexer.lex" +#line 418 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 204: YY_RULE_SETUP -#line 412 "./util/configlexer.lex" +#line 419 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 205: YY_RULE_SETUP -#line 413 "./util/configlexer.lex" +#line 420 "./util/configlexer.lex" { YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 206: YY_RULE_SETUP -#line 414 "./util/configlexer.lex" +#line 421 "./util/configlexer.lex" { YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 207: YY_RULE_SETUP -#line 415 "./util/configlexer.lex" +#line 422 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 208: YY_RULE_SETUP -#line 416 "./util/configlexer.lex" +#line 423 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 209: YY_RULE_SETUP -#line 417 "./util/configlexer.lex" +#line 424 "./util/configlexer.lex" { YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 210: YY_RULE_SETUP -#line 418 "./util/configlexer.lex" +#line 425 "./util/configlexer.lex" { YDVAR(0, VAR_PYTHON) } YY_BREAK case 211: YY_RULE_SETUP -#line 419 "./util/configlexer.lex" +#line 426 "./util/configlexer.lex" { YDVAR(1, VAR_DYNLIB_FILE) } YY_BREAK case 212: YY_RULE_SETUP -#line 420 "./util/configlexer.lex" +#line 427 "./util/configlexer.lex" { YDVAR(0, VAR_DYNLIB) } YY_BREAK case 213: YY_RULE_SETUP -#line 421 "./util/configlexer.lex" +#line 428 "./util/configlexer.lex" { YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 214: YY_RULE_SETUP -#line 422 "./util/configlexer.lex" +#line 429 "./util/configlexer.lex" { YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 215: YY_RULE_SETUP -#line 423 "./util/configlexer.lex" +#line 430 "./util/configlexer.lex" { YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 216: YY_RULE_SETUP -#line 424 "./util/configlexer.lex" +#line 431 "./util/configlexer.lex" { YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) } YY_BREAK case 217: YY_RULE_SETUP -#line 425 "./util/configlexer.lex" +#line 432 "./util/configlexer.lex" { YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 218: YY_RULE_SETUP -#line 426 "./util/configlexer.lex" +#line 433 "./util/configlexer.lex" { YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 219: YY_RULE_SETUP -#line 427 "./util/configlexer.lex" +#line 434 "./util/configlexer.lex" { YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 220: YY_RULE_SETUP -#line 428 "./util/configlexer.lex" +#line 435 "./util/configlexer.lex" { YDVAR(1, VAR_DNS64_IGNORE_AAAA) } YY_BREAK case 221: YY_RULE_SETUP -#line 429 "./util/configlexer.lex" +#line 436 "./util/configlexer.lex" { YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 222: YY_RULE_SETUP -#line 430 "./util/configlexer.lex" +#line 437 "./util/configlexer.lex" { YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 223: YY_RULE_SETUP -#line 431 "./util/configlexer.lex" +#line 438 "./util/configlexer.lex" { YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 224: YY_RULE_SETUP -#line 432 "./util/configlexer.lex" +#line 439 "./util/configlexer.lex" { YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 225: YY_RULE_SETUP -#line 433 "./util/configlexer.lex" +#line 440 "./util/configlexer.lex" { YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 226: YY_RULE_SETUP -#line 434 "./util/configlexer.lex" +#line 441 "./util/configlexer.lex" { YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 227: YY_RULE_SETUP -#line 435 "./util/configlexer.lex" +#line 442 "./util/configlexer.lex" { YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 228: YY_RULE_SETUP -#line 436 "./util/configlexer.lex" +#line 443 "./util/configlexer.lex" { YDVAR(0, VAR_DNSTAP) } YY_BREAK case 229: YY_RULE_SETUP -#line 437 "./util/configlexer.lex" +#line 444 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 230: YY_RULE_SETUP -#line 438 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } +#line 445 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) } YY_BREAK case 231: YY_RULE_SETUP -#line 439 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IP) } +#line 446 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 232: YY_RULE_SETUP -#line 440 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS) } +#line 447 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_IP) } YY_BREAK case 233: YY_RULE_SETUP -#line 441 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) } +#line 448 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_TLS) } YY_BREAK case 234: YY_RULE_SETUP -#line 442 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) } +#line 449 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) } YY_BREAK case 235: YY_RULE_SETUP -#line 443 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) } +#line 450 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) } YY_BREAK case 236: YY_RULE_SETUP -#line 445 "./util/configlexer.lex" +#line 451 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) } + YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) } YY_BREAK case 237: YY_RULE_SETUP -#line 447 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } +#line 453 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) } YY_BREAK case 238: YY_RULE_SETUP -#line 448 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } +#line 455 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 239: YY_RULE_SETUP -#line 449 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IDENTITY) } +#line 456 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 240: YY_RULE_SETUP -#line 450 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_VERSION) } +#line 457 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 241: YY_RULE_SETUP -#line 451 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } +#line 458 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 242: YY_RULE_SETUP -#line 453 "./util/configlexer.lex" +#line 459 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 243: YY_RULE_SETUP -#line 455 "./util/configlexer.lex" +#line 461 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 244: YY_RULE_SETUP -#line 457 "./util/configlexer.lex" +#line 463 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 245: YY_RULE_SETUP -#line 459 "./util/configlexer.lex" +#line 465 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 246: YY_RULE_SETUP -#line 461 "./util/configlexer.lex" +#line 467 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 247: YY_RULE_SETUP -#line 463 "./util/configlexer.lex" -{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } +#line 469 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 248: YY_RULE_SETUP -#line 464 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT) } +#line 471 "./util/configlexer.lex" +{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 249: YY_RULE_SETUP -#line 465 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT) } +#line 472 "./util/configlexer.lex" +{ YDVAR(1, VAR_IP_RATELIMIT) } YY_BREAK case 250: YY_RULE_SETUP -#line 466 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } +#line 473 "./util/configlexer.lex" +{ YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 251: YY_RULE_SETUP -#line 467 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SLABS) } +#line 474 "./util/configlexer.lex" +{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } YY_BREAK case 252: YY_RULE_SETUP -#line 468 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } +#line 475 "./util/configlexer.lex" +{ YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 253: YY_RULE_SETUP -#line 469 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SIZE) } +#line 476 "./util/configlexer.lex" +{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } YY_BREAK case 254: YY_RULE_SETUP -#line 470 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } +#line 477 "./util/configlexer.lex" +{ YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 255: YY_RULE_SETUP -#line 471 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +#line 478 "./util/configlexer.lex" +{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 256: YY_RULE_SETUP -#line 472 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } +#line 479 "./util/configlexer.lex" +{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 257: YY_RULE_SETUP -#line 473 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_FACTOR) } +#line 480 "./util/configlexer.lex" +{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } YY_BREAK case 258: YY_RULE_SETUP -#line 474 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOW_RTT) } +#line 481 "./util/configlexer.lex" +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } YY_BREAK case 259: YY_RULE_SETUP -#line 475 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_NUM) } +#line 482 "./util/configlexer.lex" +{ YDVAR(1, VAR_LOW_RTT) } YY_BREAK case 260: YY_RULE_SETUP -#line 476 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +#line 483 "./util/configlexer.lex" +{ YDVAR(1, VAR_FAST_SERVER_NUM) } YY_BREAK case 261: YY_RULE_SETUP -#line 477 "./util/configlexer.lex" +#line 484 "./util/configlexer.lex" { YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 262: YY_RULE_SETUP -#line 478 "./util/configlexer.lex" +#line 485 "./util/configlexer.lex" { YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 263: YY_RULE_SETUP -#line 479 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_TAG) } +#line 486 "./util/configlexer.lex" +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 264: YY_RULE_SETUP -#line 480 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP) } +#line 487 "./util/configlexer.lex" +{ YDVAR(2, VAR_RESPONSE_IP_TAG) } YY_BREAK case 265: YY_RULE_SETUP -#line 481 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_DATA) } +#line 488 "./util/configlexer.lex" +{ YDVAR(2, VAR_RESPONSE_IP) } YY_BREAK case 266: YY_RULE_SETUP -#line 482 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSCRYPT) } +#line 489 "./util/configlexer.lex" +{ YDVAR(2, VAR_RESPONSE_IP_DATA) } YY_BREAK case 267: YY_RULE_SETUP -#line 483 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } +#line 490 "./util/configlexer.lex" +{ YDVAR(0, VAR_DNSCRYPT) } YY_BREAK case 268: YY_RULE_SETUP -#line 484 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PORT) } +#line 491 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } YY_BREAK case 269: YY_RULE_SETUP -#line 485 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } +#line 492 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PORT) } YY_BREAK case 270: YY_RULE_SETUP -#line 486 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } +#line 493 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } YY_BREAK case 271: YY_RULE_SETUP -#line 487 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } +#line 494 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } YY_BREAK case 272: YY_RULE_SETUP -#line 488 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } +#line 495 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } YY_BREAK case 273: YY_RULE_SETUP -#line 489 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } +#line 496 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } YY_BREAK case 274: YY_RULE_SETUP -#line 491 "./util/configlexer.lex" +#line 497 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } YY_BREAK case 275: YY_RULE_SETUP -#line 493 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } +#line 499 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } YY_BREAK case 276: YY_RULE_SETUP -#line 494 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } +#line 501 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } YY_BREAK case 277: YY_RULE_SETUP -#line 495 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_ENABLED) } +#line 502 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } YY_BREAK case 278: YY_RULE_SETUP -#line 496 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } +#line 503 "./util/configlexer.lex" +{ YDVAR(1, VAR_IPSECMOD_ENABLED) } YY_BREAK case 279: YY_RULE_SETUP -#line 497 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_HOOK) } +#line 504 "./util/configlexer.lex" +{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } YY_BREAK case 280: YY_RULE_SETUP -#line 498 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } +#line 505 "./util/configlexer.lex" +{ YDVAR(1, VAR_IPSECMOD_HOOK) } YY_BREAK case 281: YY_RULE_SETUP -#line 499 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } +#line 506 "./util/configlexer.lex" +{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } YY_BREAK case 282: YY_RULE_SETUP -#line 500 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_STRICT) } +#line 507 "./util/configlexer.lex" +{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } YY_BREAK case 283: YY_RULE_SETUP -#line 501 "./util/configlexer.lex" -{ YDVAR(0, VAR_CACHEDB) } +#line 508 "./util/configlexer.lex" +{ YDVAR(1, VAR_IPSECMOD_STRICT) } YY_BREAK case 284: YY_RULE_SETUP -#line 502 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_BACKEND) } +#line 509 "./util/configlexer.lex" +{ YDVAR(0, VAR_CACHEDB) } YY_BREAK case 285: YY_RULE_SETUP -#line 503 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } +#line 510 "./util/configlexer.lex" +{ YDVAR(1, VAR_CACHEDB_BACKEND) } YY_BREAK case 286: YY_RULE_SETUP -#line 504 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISHOST) } +#line 511 "./util/configlexer.lex" +{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } YY_BREAK case 287: YY_RULE_SETUP -#line 505 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISPORT) } +#line 512 "./util/configlexer.lex" +{ YDVAR(1, VAR_CACHEDB_REDISHOST) } YY_BREAK case 288: YY_RULE_SETUP -#line 506 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } +#line 513 "./util/configlexer.lex" +{ YDVAR(1, VAR_CACHEDB_REDISPORT) } YY_BREAK case 289: YY_RULE_SETUP -#line 507 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) } +#line 514 "./util/configlexer.lex" +{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } YY_BREAK case 290: YY_RULE_SETUP -#line 508 "./util/configlexer.lex" -{ YDVAR(0, VAR_IPSET) } +#line 515 "./util/configlexer.lex" +{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) } YY_BREAK case 291: YY_RULE_SETUP -#line 509 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSET_NAME_V4) } +#line 516 "./util/configlexer.lex" +{ YDVAR(0, VAR_IPSET) } YY_BREAK case 292: YY_RULE_SETUP -#line 510 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSET_NAME_V6) } +#line 517 "./util/configlexer.lex" +{ YDVAR(1, VAR_IPSET_NAME_V4) } YY_BREAK case 293: YY_RULE_SETUP -#line 511 "./util/configlexer.lex" -{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } +#line 518 "./util/configlexer.lex" +{ YDVAR(1, VAR_IPSET_NAME_V6) } YY_BREAK case 294: YY_RULE_SETUP -#line 512 "./util/configlexer.lex" -{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } +#line 519 "./util/configlexer.lex" +{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } YY_BREAK case 295: -/* rule 295 can match eol */ YY_RULE_SETUP -#line 513 "./util/configlexer.lex" +#line 520 "./util/configlexer.lex" +{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } + YY_BREAK +case 296: +/* rule 296 can match eol */ +YY_RULE_SETUP +#line 521 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 296: +case 297: YY_RULE_SETUP -#line 516 "./util/configlexer.lex" +#line 524 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 517 "./util/configlexer.lex" +#line 525 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 297: +case 298: YY_RULE_SETUP -#line 522 "./util/configlexer.lex" +#line 530 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 298: -/* rule 298 can match eol */ +case 299: +/* rule 299 can match eol */ YY_RULE_SETUP -#line 523 "./util/configlexer.lex" +#line 531 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 299: +case 300: YY_RULE_SETUP -#line 525 "./util/configlexer.lex" +#line 533 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -4807,34 +4868,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 300: +case 301: YY_RULE_SETUP -#line 537 "./util/configlexer.lex" +#line 545 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 538 "./util/configlexer.lex" +#line 546 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 301: +case 302: YY_RULE_SETUP -#line 543 "./util/configlexer.lex" +#line 551 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 302: -/* rule 302 can match eol */ +case 303: +/* rule 303 can match eol */ YY_RULE_SETUP -#line 544 "./util/configlexer.lex" +#line 552 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 303: +case 304: YY_RULE_SETUP -#line 546 "./util/configlexer.lex" +#line 554 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -4847,114 +4908,189 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 304: +case 305: YY_RULE_SETUP -#line 558 "./util/configlexer.lex" +#line 566 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 560 "./util/configlexer.lex" +#line 568 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 305: +case 306: YY_RULE_SETUP -#line 564 "./util/configlexer.lex" +#line 572 "./util/configlexer.lex" { LEXOUT(("ISP ")); /* ignore */ } YY_BREAK -case 306: -/* rule 306 can match eol */ -YY_RULE_SETUP -#line 565 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} - YY_BREAK case 307: +/* rule 307 can match eol */ YY_RULE_SETUP -#line 566 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +#line 573 "./util/configlexer.lex" +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 308: YY_RULE_SETUP -#line 567 "./util/configlexer.lex" +#line 574 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 309: +YY_RULE_SETUP +#line 575 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); - config_start_include_glob(yytext); + config_start_include_glob(yytext, 0); BEGIN(inc_prev); } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 572 "./util/configlexer.lex" +#line 580 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 309: +case 310: YY_RULE_SETUP -#line 576 "./util/configlexer.lex" +#line 584 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 310: -/* rule 310 can match eol */ +case 311: +/* rule 311 can match eol */ YY_RULE_SETUP -#line 577 "./util/configlexer.lex" +#line 585 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 311: +case 312: YY_RULE_SETUP -#line 579 "./util/configlexer.lex" +#line 587 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; - config_start_include_glob(yytext); + config_start_include_glob(yytext, 0); BEGIN(inc_prev); } YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 585 "./util/configlexer.lex" +#line 593 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ if (!config_include_stack) { yyterminate(); } else { + int prev_toplevel = inc_toplevel; fclose(yyin); config_end_include(); + if(prev_toplevel) return (VAR_FORCE_TOPLEVEL); } } YY_BREAK -case 312: +/* include-toplevel: directive */ +case 313: YY_RULE_SETUP -#line 596 "./util/configlexer.lex" +#line 607 "./util/configlexer.lex" +{ + LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel); +} + YY_BREAK +case YY_STATE_EOF(include_toplevel): +#line 610 "./util/configlexer.lex" +{ + yyerror("EOF inside include_toplevel directive"); + BEGIN(inc_prev); +} + YY_BREAK +case 314: +YY_RULE_SETUP +#line 614 "./util/configlexer.lex" +{ LEXOUT(("ITSP ")); /* ignore */ } + YY_BREAK +case 315: +/* rule 315 can match eol */ +YY_RULE_SETUP +#line 615 "./util/configlexer.lex" +{ LEXOUT(("NL\n")); cfg_parser->line++; } + YY_BREAK +case 316: +YY_RULE_SETUP +#line 616 "./util/configlexer.lex" +{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); } + YY_BREAK +case 317: +YY_RULE_SETUP +#line 617 "./util/configlexer.lex" +{ + LEXOUT(("ITunquotedstr(%s) ", yytext)); + config_start_include_glob(yytext, 1); + BEGIN(inc_prev); + return (VAR_FORCE_TOPLEVEL); +} + YY_BREAK +case YY_STATE_EOF(include_toplevel_quoted): +#line 623 "./util/configlexer.lex" +{ + yyerror("EOF inside quoted string"); + BEGIN(inc_prev); +} + YY_BREAK +case 318: +YY_RULE_SETUP +#line 627 "./util/configlexer.lex" +{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); } + YY_BREAK +case 319: +/* rule 319 can match eol */ +YY_RULE_SETUP +#line 628 "./util/configlexer.lex" +{ + yyerror("newline before \" in include name"); + cfg_parser->line++; BEGIN(inc_prev); +} + YY_BREAK +case 320: +YY_RULE_SETUP +#line 632 "./util/configlexer.lex" +{ + LEXOUT(("ITQE ")); + yytext[yyleng - 1] = '\0'; + config_start_include_glob(yytext, 1); + BEGIN(inc_prev); + return (VAR_FORCE_TOPLEVEL); +} + YY_BREAK +case 321: +YY_RULE_SETUP +#line 640 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 313: +case 322: YY_RULE_SETUP -#line 600 "./util/configlexer.lex" +#line 644 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 314: +case 323: YY_RULE_SETUP -#line 604 "./util/configlexer.lex" +#line 648 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 315: +case 324: YY_RULE_SETUP -#line 608 "./util/configlexer.lex" +#line 652 "./util/configlexer.lex" ECHO; YY_BREAK -#line 4956 "" +#line 5092 "" case YY_END_OF_BUFFER: { @@ -5249,7 +5385,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 >= 3096 ) + if ( yy_current_state >= 3150 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -5277,11 +5413,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 >= 3096 ) + if ( yy_current_state >= 3150 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 3095); + yy_is_jam = (yy_current_state == 3149); return yy_is_jam ? 0 : yy_current_state; } @@ -5920,6 +6056,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 608 "./util/configlexer.lex" +#line 652 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 74e5d767c..9d304418f 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -45,11 +45,13 @@ struct inc_state { int line; YY_BUFFER_STATE buffer; struct inc_state* next; + int inc_toplevel; }; static struct inc_state* config_include_stack = NULL; static int inc_depth = 0; static int inc_prev = 0; static int num_args = 0; +static int inc_toplevel = 0; void init_cfg_parse(void) { @@ -57,14 +59,15 @@ void init_cfg_parse(void) inc_depth = 0; inc_prev = 0; num_args = 0; + inc_toplevel = 0; } -static void config_start_include(const char* filename) +static void config_start_include(const char* filename, int toplevel) { FILE *input; struct inc_state* s; char* nm; - if(inc_depth++ > 100000) { + if(inc_depth+1 > 100000) { ub_c_error_msg("too many include files"); return; } @@ -96,17 +99,20 @@ static void config_start_include(const char* filename) return; } LEXOUT(("switch_to_include_file(%s)\n", filename)); + inc_depth++; s->filename = cfg_parser->filename; s->line = cfg_parser->line; s->buffer = YY_CURRENT_BUFFER; + s->inc_toplevel = inc_toplevel; s->next = config_include_stack; config_include_stack = s; cfg_parser->filename = nm; cfg_parser->line = 1; + inc_toplevel = toplevel; yy_switch_to_buffer(yy_create_buffer(input, YY_BUF_SIZE)); } -static void config_start_include_glob(const char* filename) +static void config_start_include_glob(const char* filename, int toplevel) { /* check for wildcards */ @@ -139,19 +145,19 @@ static void config_start_include_glob(const char* filename) globfree(&g); if(r == GLOB_NOMATCH) return; /* no matches for pattern */ - config_start_include(filename); /* let original deal with it */ + config_start_include(filename, toplevel); /* let original deal with it */ return; } /* process files found, if any */ for(i=(int)g.gl_pathc-1; i>=0; i--) { - config_start_include(g.gl_pathv[i]); + config_start_include(g.gl_pathv[i], toplevel); } globfree(&g); return; } #endif /* HAVE_GLOB */ - config_start_include(filename); + config_start_include(filename, toplevel); } static void config_end_include(void) @@ -165,6 +171,7 @@ static void config_end_include(void) yy_delete_buffer(YY_CURRENT_BUFFER); yy_switch_to_buffer(s->buffer); config_include_stack = s->next; + inc_toplevel = s->inc_toplevel; free(s); } @@ -199,7 +206,7 @@ COLON \: DQANY [^\"\n\r\\]|\\. SQANY [^\'\n\r\\]|\\. -%x quotedstring singlequotedstr include include_quoted val +%x quotedstring singlequotedstr include include_quoted val include_toplevel include_toplevel_quoted %% {SPACE}* { @@ -435,6 +442,7 @@ access-control-view{COLON} { YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } local-zone-override{COLON} { YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } dnstap{COLON} { YDVAR(0, VAR_DNSTAP) } dnstap-enable{COLON} { YDVAR(1, VAR_DNSTAP_ENABLE) } +dnstap-bidirectional{COLON} { YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) } dnstap-socket-path{COLON} { YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } dnstap-ip{COLON} { YDVAR(1, VAR_DNSTAP_IP) } dnstap-tls{COLON} { YDVAR(1, VAR_DNSTAP_TLS) } @@ -566,7 +574,7 @@ tcp-connection-limit{COLON} { YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } \" { LEXOUT(("IQS ")); BEGIN(include_quoted); } {UNQUOTEDLETTER}* { LEXOUT(("Iunquotedstr(%s) ", yytext)); - config_start_include_glob(yytext); + config_start_include_glob(yytext, 0); BEGIN(inc_prev); } <> { @@ -579,7 +587,7 @@ tcp-connection-limit{COLON} { YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } \" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; - config_start_include_glob(yytext); + config_start_include_glob(yytext, 0); BEGIN(inc_prev); } <> { @@ -588,11 +596,47 @@ tcp-connection-limit{COLON} { YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } if (!config_include_stack) { yyterminate(); } else { + int prev_toplevel = inc_toplevel; fclose(yyin); config_end_include(); + if(prev_toplevel) return (VAR_FORCE_TOPLEVEL); } } + /* include-toplevel: directive */ +include-toplevel{COLON} { + LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel); +} +<> { + yyerror("EOF inside include_toplevel directive"); + BEGIN(inc_prev); +} +{SPACE}* { LEXOUT(("ITSP ")); /* ignore */ } +{NEWLINE} { LEXOUT(("NL\n")); cfg_parser->line++; } +\" { LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); } +{UNQUOTEDLETTER}* { + LEXOUT(("ITunquotedstr(%s) ", yytext)); + config_start_include_glob(yytext, 1); + BEGIN(inc_prev); + return (VAR_FORCE_TOPLEVEL); +} +<> { + yyerror("EOF inside quoted string"); + BEGIN(inc_prev); +} +{DQANY}* { LEXOUT(("ITSTR(%s) ", yytext)); yymore(); } +{NEWLINE} { + yyerror("newline before \" in include name"); + cfg_parser->line++; BEGIN(inc_prev); +} +\" { + LEXOUT(("ITQE ")); + yytext[yyleng - 1] = '\0'; + config_start_include_glob(yytext, 1); + BEGIN(inc_prev); + return (VAR_FORCE_TOPLEVEL); +} + {UNQUOTEDLETTER}* { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } diff --git a/util/configparser.c b/util/configparser.c index 3538b1937..7032f1b9f 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -134,286 +134,288 @@ extern int yydebug; ANY = 263, ZONESTR = 264, STRING_ARG = 265, - VAR_SERVER = 266, - VAR_VERBOSITY = 267, - VAR_NUM_THREADS = 268, - VAR_PORT = 269, - VAR_OUTGOING_RANGE = 270, - VAR_INTERFACE = 271, - VAR_PREFER_IP4 = 272, - VAR_DO_IP4 = 273, - VAR_DO_IP6 = 274, - VAR_PREFER_IP6 = 275, - VAR_DO_UDP = 276, - VAR_DO_TCP = 277, - VAR_TCP_MSS = 278, - VAR_OUTGOING_TCP_MSS = 279, - VAR_TCP_IDLE_TIMEOUT = 280, - VAR_EDNS_TCP_KEEPALIVE = 281, - VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 282, - VAR_CHROOT = 283, - VAR_USERNAME = 284, - VAR_DIRECTORY = 285, - VAR_LOGFILE = 286, - VAR_PIDFILE = 287, - VAR_MSG_CACHE_SIZE = 288, - VAR_MSG_CACHE_SLABS = 289, - VAR_NUM_QUERIES_PER_THREAD = 290, - VAR_RRSET_CACHE_SIZE = 291, - VAR_RRSET_CACHE_SLABS = 292, - VAR_OUTGOING_NUM_TCP = 293, - VAR_INFRA_HOST_TTL = 294, - VAR_INFRA_LAME_TTL = 295, - VAR_INFRA_CACHE_SLABS = 296, - VAR_INFRA_CACHE_NUMHOSTS = 297, - VAR_INFRA_CACHE_LAME_SIZE = 298, - VAR_NAME = 299, - VAR_STUB_ZONE = 300, - VAR_STUB_HOST = 301, - VAR_STUB_ADDR = 302, - VAR_TARGET_FETCH_POLICY = 303, - VAR_HARDEN_SHORT_BUFSIZE = 304, - VAR_HARDEN_LARGE_QUERIES = 305, - VAR_FORWARD_ZONE = 306, - VAR_FORWARD_HOST = 307, - VAR_FORWARD_ADDR = 308, - VAR_DO_NOT_QUERY_ADDRESS = 309, - VAR_HIDE_IDENTITY = 310, - VAR_HIDE_VERSION = 311, - VAR_IDENTITY = 312, - VAR_VERSION = 313, - VAR_HARDEN_GLUE = 314, - VAR_MODULE_CONF = 315, - VAR_TRUST_ANCHOR_FILE = 316, - VAR_TRUST_ANCHOR = 317, - VAR_VAL_OVERRIDE_DATE = 318, - VAR_BOGUS_TTL = 319, - VAR_VAL_CLEAN_ADDITIONAL = 320, - VAR_VAL_PERMISSIVE_MODE = 321, - VAR_INCOMING_NUM_TCP = 322, - VAR_MSG_BUFFER_SIZE = 323, - VAR_KEY_CACHE_SIZE = 324, - VAR_KEY_CACHE_SLABS = 325, - VAR_TRUSTED_KEYS_FILE = 326, - VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 327, - VAR_USE_SYSLOG = 328, - VAR_OUTGOING_INTERFACE = 329, - VAR_ROOT_HINTS = 330, - VAR_DO_NOT_QUERY_LOCALHOST = 331, - VAR_CACHE_MAX_TTL = 332, - VAR_HARDEN_DNSSEC_STRIPPED = 333, - VAR_ACCESS_CONTROL = 334, - VAR_LOCAL_ZONE = 335, - VAR_LOCAL_DATA = 336, - VAR_INTERFACE_AUTOMATIC = 337, - VAR_STATISTICS_INTERVAL = 338, - VAR_DO_DAEMONIZE = 339, - VAR_USE_CAPS_FOR_ID = 340, - VAR_STATISTICS_CUMULATIVE = 341, - VAR_OUTGOING_PORT_PERMIT = 342, - VAR_OUTGOING_PORT_AVOID = 343, - VAR_DLV_ANCHOR_FILE = 344, - VAR_DLV_ANCHOR = 345, - VAR_NEG_CACHE_SIZE = 346, - VAR_HARDEN_REFERRAL_PATH = 347, - VAR_PRIVATE_ADDRESS = 348, - VAR_PRIVATE_DOMAIN = 349, - VAR_REMOTE_CONTROL = 350, - VAR_CONTROL_ENABLE = 351, - VAR_CONTROL_INTERFACE = 352, - VAR_CONTROL_PORT = 353, - VAR_SERVER_KEY_FILE = 354, - VAR_SERVER_CERT_FILE = 355, - VAR_CONTROL_KEY_FILE = 356, - VAR_CONTROL_CERT_FILE = 357, - VAR_CONTROL_USE_CERT = 358, - VAR_EXTENDED_STATISTICS = 359, - VAR_LOCAL_DATA_PTR = 360, - VAR_JOSTLE_TIMEOUT = 361, - VAR_STUB_PRIME = 362, - VAR_UNWANTED_REPLY_THRESHOLD = 363, - VAR_LOG_TIME_ASCII = 364, - VAR_DOMAIN_INSECURE = 365, - VAR_PYTHON = 366, - VAR_PYTHON_SCRIPT = 367, - VAR_VAL_SIG_SKEW_MIN = 368, - VAR_VAL_SIG_SKEW_MAX = 369, - VAR_CACHE_MIN_TTL = 370, - VAR_VAL_LOG_LEVEL = 371, - VAR_AUTO_TRUST_ANCHOR_FILE = 372, - VAR_KEEP_MISSING = 373, - VAR_ADD_HOLDDOWN = 374, - VAR_DEL_HOLDDOWN = 375, - VAR_SO_RCVBUF = 376, - VAR_EDNS_BUFFER_SIZE = 377, - VAR_PREFETCH = 378, - VAR_PREFETCH_KEY = 379, - VAR_SO_SNDBUF = 380, - VAR_SO_REUSEPORT = 381, - VAR_HARDEN_BELOW_NXDOMAIN = 382, - VAR_IGNORE_CD_FLAG = 383, - VAR_LOG_QUERIES = 384, - VAR_LOG_REPLIES = 385, - VAR_LOG_LOCAL_ACTIONS = 386, - VAR_TCP_UPSTREAM = 387, - VAR_SSL_UPSTREAM = 388, - VAR_SSL_SERVICE_KEY = 389, - VAR_SSL_SERVICE_PEM = 390, - VAR_SSL_PORT = 391, - VAR_FORWARD_FIRST = 392, - VAR_STUB_SSL_UPSTREAM = 393, - VAR_FORWARD_SSL_UPSTREAM = 394, - VAR_TLS_CERT_BUNDLE = 395, - VAR_STUB_FIRST = 396, - VAR_MINIMAL_RESPONSES = 397, - VAR_RRSET_ROUNDROBIN = 398, - VAR_MAX_UDP_SIZE = 399, - VAR_DELAY_CLOSE = 400, - VAR_UNBLOCK_LAN_ZONES = 401, - VAR_INSECURE_LAN_ZONES = 402, - VAR_INFRA_CACHE_MIN_RTT = 403, - VAR_DNS64_PREFIX = 404, - VAR_DNS64_SYNTHALL = 405, - VAR_DNS64_IGNORE_AAAA = 406, - VAR_DNSTAP = 407, - VAR_DNSTAP_ENABLE = 408, - VAR_DNSTAP_SOCKET_PATH = 409, - VAR_DNSTAP_IP = 410, - VAR_DNSTAP_TLS = 411, - VAR_DNSTAP_TLS_SERVER_NAME = 412, - VAR_DNSTAP_TLS_CERT_BUNDLE = 413, - VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 414, - VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 415, - VAR_DNSTAP_SEND_IDENTITY = 416, - VAR_DNSTAP_SEND_VERSION = 417, - VAR_DNSTAP_IDENTITY = 418, - VAR_DNSTAP_VERSION = 419, - VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 420, - VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 421, - VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 422, - VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 423, - VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 424, - VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 425, - VAR_RESPONSE_IP_TAG = 426, - VAR_RESPONSE_IP = 427, - VAR_RESPONSE_IP_DATA = 428, - VAR_HARDEN_ALGO_DOWNGRADE = 429, - VAR_IP_TRANSPARENT = 430, - VAR_IP_DSCP = 431, - VAR_DISABLE_DNSSEC_LAME_CHECK = 432, - VAR_IP_RATELIMIT = 433, - VAR_IP_RATELIMIT_SLABS = 434, - VAR_IP_RATELIMIT_SIZE = 435, - VAR_RATELIMIT = 436, - VAR_RATELIMIT_SLABS = 437, - VAR_RATELIMIT_SIZE = 438, - VAR_RATELIMIT_FOR_DOMAIN = 439, - VAR_RATELIMIT_BELOW_DOMAIN = 440, - VAR_IP_RATELIMIT_FACTOR = 441, - VAR_RATELIMIT_FACTOR = 442, - VAR_SEND_CLIENT_SUBNET = 443, - VAR_CLIENT_SUBNET_ZONE = 444, - VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 445, - VAR_CLIENT_SUBNET_OPCODE = 446, - VAR_MAX_CLIENT_SUBNET_IPV4 = 447, - VAR_MAX_CLIENT_SUBNET_IPV6 = 448, - VAR_MIN_CLIENT_SUBNET_IPV4 = 449, - VAR_MIN_CLIENT_SUBNET_IPV6 = 450, - VAR_MAX_ECS_TREE_SIZE_IPV4 = 451, - VAR_MAX_ECS_TREE_SIZE_IPV6 = 452, - VAR_CAPS_WHITELIST = 453, - VAR_CACHE_MAX_NEGATIVE_TTL = 454, - VAR_PERMIT_SMALL_HOLDDOWN = 455, - VAR_QNAME_MINIMISATION = 456, - VAR_QNAME_MINIMISATION_STRICT = 457, - VAR_IP_FREEBIND = 458, - VAR_DEFINE_TAG = 459, - VAR_LOCAL_ZONE_TAG = 460, - VAR_ACCESS_CONTROL_TAG = 461, - VAR_LOCAL_ZONE_OVERRIDE = 462, - VAR_ACCESS_CONTROL_TAG_ACTION = 463, - VAR_ACCESS_CONTROL_TAG_DATA = 464, - VAR_VIEW = 465, - VAR_ACCESS_CONTROL_VIEW = 466, - VAR_VIEW_FIRST = 467, - VAR_SERVE_EXPIRED = 468, - VAR_SERVE_EXPIRED_TTL = 469, - VAR_SERVE_EXPIRED_TTL_RESET = 470, - VAR_SERVE_EXPIRED_REPLY_TTL = 471, - VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 472, - VAR_SERVE_ORIGINAL_TTL = 473, - VAR_FAKE_DSA = 474, - VAR_FAKE_SHA1 = 475, - VAR_LOG_IDENTITY = 476, - VAR_HIDE_TRUSTANCHOR = 477, - VAR_TRUST_ANCHOR_SIGNALING = 478, - VAR_AGGRESSIVE_NSEC = 479, - VAR_USE_SYSTEMD = 480, - VAR_SHM_ENABLE = 481, - VAR_SHM_KEY = 482, - VAR_ROOT_KEY_SENTINEL = 483, - VAR_DNSCRYPT = 484, - VAR_DNSCRYPT_ENABLE = 485, - VAR_DNSCRYPT_PORT = 486, - VAR_DNSCRYPT_PROVIDER = 487, - VAR_DNSCRYPT_SECRET_KEY = 488, - VAR_DNSCRYPT_PROVIDER_CERT = 489, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 490, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 491, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 492, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 493, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 494, - VAR_IPSECMOD_ENABLED = 495, - VAR_IPSECMOD_HOOK = 496, - VAR_IPSECMOD_IGNORE_BOGUS = 497, - VAR_IPSECMOD_MAX_TTL = 498, - VAR_IPSECMOD_WHITELIST = 499, - VAR_IPSECMOD_STRICT = 500, - VAR_CACHEDB = 501, - VAR_CACHEDB_BACKEND = 502, - VAR_CACHEDB_SECRETSEED = 503, - VAR_CACHEDB_REDISHOST = 504, - VAR_CACHEDB_REDISPORT = 505, - VAR_CACHEDB_REDISTIMEOUT = 506, - VAR_CACHEDB_REDISEXPIRERECORDS = 507, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 508, - VAR_FOR_UPSTREAM = 509, - VAR_AUTH_ZONE = 510, - VAR_ZONEFILE = 511, - VAR_MASTER = 512, - VAR_URL = 513, - VAR_FOR_DOWNSTREAM = 514, - VAR_FALLBACK_ENABLED = 515, - VAR_TLS_ADDITIONAL_PORT = 516, - VAR_LOW_RTT = 517, - VAR_LOW_RTT_PERMIL = 518, - VAR_FAST_SERVER_PERMIL = 519, - VAR_FAST_SERVER_NUM = 520, - VAR_ALLOW_NOTIFY = 521, - VAR_TLS_WIN_CERT = 522, - VAR_TCP_CONNECTION_LIMIT = 523, - VAR_FORWARD_NO_CACHE = 524, - VAR_STUB_NO_CACHE = 525, - VAR_LOG_SERVFAIL = 526, - VAR_DENY_ANY = 527, - VAR_UNKNOWN_SERVER_TIME_LIMIT = 528, - VAR_LOG_TAG_QUERYREPLY = 529, - VAR_STREAM_WAIT_SIZE = 530, - VAR_TLS_CIPHERS = 531, - VAR_TLS_CIPHERSUITES = 532, - VAR_TLS_USE_SNI = 533, - VAR_IPSET = 534, - VAR_IPSET_NAME_V4 = 535, - VAR_IPSET_NAME_V6 = 536, - VAR_TLS_SESSION_TICKET_KEYS = 537, - VAR_RPZ = 538, - VAR_TAGS = 539, - VAR_RPZ_ACTION_OVERRIDE = 540, - VAR_RPZ_CNAME_OVERRIDE = 541, - VAR_RPZ_LOG = 542, - VAR_RPZ_LOG_NAME = 543, - VAR_DYNLIB = 544, - VAR_DYNLIB_FILE = 545 + VAR_FORCE_TOPLEVEL = 266, + VAR_SERVER = 267, + VAR_VERBOSITY = 268, + VAR_NUM_THREADS = 269, + VAR_PORT = 270, + VAR_OUTGOING_RANGE = 271, + VAR_INTERFACE = 272, + VAR_PREFER_IP4 = 273, + VAR_DO_IP4 = 274, + VAR_DO_IP6 = 275, + VAR_PREFER_IP6 = 276, + VAR_DO_UDP = 277, + VAR_DO_TCP = 278, + VAR_TCP_MSS = 279, + VAR_OUTGOING_TCP_MSS = 280, + VAR_TCP_IDLE_TIMEOUT = 281, + VAR_EDNS_TCP_KEEPALIVE = 282, + VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 283, + VAR_CHROOT = 284, + VAR_USERNAME = 285, + VAR_DIRECTORY = 286, + VAR_LOGFILE = 287, + VAR_PIDFILE = 288, + VAR_MSG_CACHE_SIZE = 289, + VAR_MSG_CACHE_SLABS = 290, + VAR_NUM_QUERIES_PER_THREAD = 291, + VAR_RRSET_CACHE_SIZE = 292, + VAR_RRSET_CACHE_SLABS = 293, + VAR_OUTGOING_NUM_TCP = 294, + VAR_INFRA_HOST_TTL = 295, + VAR_INFRA_LAME_TTL = 296, + VAR_INFRA_CACHE_SLABS = 297, + VAR_INFRA_CACHE_NUMHOSTS = 298, + VAR_INFRA_CACHE_LAME_SIZE = 299, + VAR_NAME = 300, + VAR_STUB_ZONE = 301, + VAR_STUB_HOST = 302, + VAR_STUB_ADDR = 303, + VAR_TARGET_FETCH_POLICY = 304, + VAR_HARDEN_SHORT_BUFSIZE = 305, + VAR_HARDEN_LARGE_QUERIES = 306, + VAR_FORWARD_ZONE = 307, + VAR_FORWARD_HOST = 308, + VAR_FORWARD_ADDR = 309, + VAR_DO_NOT_QUERY_ADDRESS = 310, + VAR_HIDE_IDENTITY = 311, + VAR_HIDE_VERSION = 312, + VAR_IDENTITY = 313, + VAR_VERSION = 314, + VAR_HARDEN_GLUE = 315, + VAR_MODULE_CONF = 316, + VAR_TRUST_ANCHOR_FILE = 317, + VAR_TRUST_ANCHOR = 318, + VAR_VAL_OVERRIDE_DATE = 319, + VAR_BOGUS_TTL = 320, + VAR_VAL_CLEAN_ADDITIONAL = 321, + VAR_VAL_PERMISSIVE_MODE = 322, + VAR_INCOMING_NUM_TCP = 323, + VAR_MSG_BUFFER_SIZE = 324, + VAR_KEY_CACHE_SIZE = 325, + VAR_KEY_CACHE_SLABS = 326, + VAR_TRUSTED_KEYS_FILE = 327, + VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 328, + VAR_USE_SYSLOG = 329, + VAR_OUTGOING_INTERFACE = 330, + VAR_ROOT_HINTS = 331, + VAR_DO_NOT_QUERY_LOCALHOST = 332, + VAR_CACHE_MAX_TTL = 333, + VAR_HARDEN_DNSSEC_STRIPPED = 334, + VAR_ACCESS_CONTROL = 335, + VAR_LOCAL_ZONE = 336, + VAR_LOCAL_DATA = 337, + VAR_INTERFACE_AUTOMATIC = 338, + VAR_STATISTICS_INTERVAL = 339, + VAR_DO_DAEMONIZE = 340, + VAR_USE_CAPS_FOR_ID = 341, + VAR_STATISTICS_CUMULATIVE = 342, + VAR_OUTGOING_PORT_PERMIT = 343, + VAR_OUTGOING_PORT_AVOID = 344, + VAR_DLV_ANCHOR_FILE = 345, + VAR_DLV_ANCHOR = 346, + VAR_NEG_CACHE_SIZE = 347, + VAR_HARDEN_REFERRAL_PATH = 348, + VAR_PRIVATE_ADDRESS = 349, + VAR_PRIVATE_DOMAIN = 350, + VAR_REMOTE_CONTROL = 351, + VAR_CONTROL_ENABLE = 352, + VAR_CONTROL_INTERFACE = 353, + VAR_CONTROL_PORT = 354, + VAR_SERVER_KEY_FILE = 355, + VAR_SERVER_CERT_FILE = 356, + VAR_CONTROL_KEY_FILE = 357, + VAR_CONTROL_CERT_FILE = 358, + VAR_CONTROL_USE_CERT = 359, + VAR_EXTENDED_STATISTICS = 360, + VAR_LOCAL_DATA_PTR = 361, + VAR_JOSTLE_TIMEOUT = 362, + VAR_STUB_PRIME = 363, + VAR_UNWANTED_REPLY_THRESHOLD = 364, + VAR_LOG_TIME_ASCII = 365, + VAR_DOMAIN_INSECURE = 366, + VAR_PYTHON = 367, + VAR_PYTHON_SCRIPT = 368, + VAR_VAL_SIG_SKEW_MIN = 369, + VAR_VAL_SIG_SKEW_MAX = 370, + VAR_CACHE_MIN_TTL = 371, + VAR_VAL_LOG_LEVEL = 372, + VAR_AUTO_TRUST_ANCHOR_FILE = 373, + VAR_KEEP_MISSING = 374, + VAR_ADD_HOLDDOWN = 375, + VAR_DEL_HOLDDOWN = 376, + VAR_SO_RCVBUF = 377, + VAR_EDNS_BUFFER_SIZE = 378, + VAR_PREFETCH = 379, + VAR_PREFETCH_KEY = 380, + VAR_SO_SNDBUF = 381, + VAR_SO_REUSEPORT = 382, + VAR_HARDEN_BELOW_NXDOMAIN = 383, + VAR_IGNORE_CD_FLAG = 384, + VAR_LOG_QUERIES = 385, + VAR_LOG_REPLIES = 386, + VAR_LOG_LOCAL_ACTIONS = 387, + VAR_TCP_UPSTREAM = 388, + VAR_SSL_UPSTREAM = 389, + VAR_SSL_SERVICE_KEY = 390, + VAR_SSL_SERVICE_PEM = 391, + VAR_SSL_PORT = 392, + VAR_FORWARD_FIRST = 393, + VAR_STUB_SSL_UPSTREAM = 394, + VAR_FORWARD_SSL_UPSTREAM = 395, + VAR_TLS_CERT_BUNDLE = 396, + VAR_STUB_FIRST = 397, + VAR_MINIMAL_RESPONSES = 398, + VAR_RRSET_ROUNDROBIN = 399, + VAR_MAX_UDP_SIZE = 400, + VAR_DELAY_CLOSE = 401, + VAR_UNBLOCK_LAN_ZONES = 402, + VAR_INSECURE_LAN_ZONES = 403, + VAR_INFRA_CACHE_MIN_RTT = 404, + VAR_DNS64_PREFIX = 405, + VAR_DNS64_SYNTHALL = 406, + VAR_DNS64_IGNORE_AAAA = 407, + VAR_DNSTAP = 408, + VAR_DNSTAP_ENABLE = 409, + VAR_DNSTAP_SOCKET_PATH = 410, + VAR_DNSTAP_IP = 411, + VAR_DNSTAP_TLS = 412, + VAR_DNSTAP_TLS_SERVER_NAME = 413, + VAR_DNSTAP_TLS_CERT_BUNDLE = 414, + VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 415, + VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 416, + VAR_DNSTAP_SEND_IDENTITY = 417, + VAR_DNSTAP_SEND_VERSION = 418, + VAR_DNSTAP_BIDIRECTIONAL = 419, + VAR_DNSTAP_IDENTITY = 420, + VAR_DNSTAP_VERSION = 421, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 422, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 423, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 424, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 425, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 426, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 427, + VAR_RESPONSE_IP_TAG = 428, + VAR_RESPONSE_IP = 429, + VAR_RESPONSE_IP_DATA = 430, + VAR_HARDEN_ALGO_DOWNGRADE = 431, + VAR_IP_TRANSPARENT = 432, + VAR_IP_DSCP = 433, + VAR_DISABLE_DNSSEC_LAME_CHECK = 434, + VAR_IP_RATELIMIT = 435, + VAR_IP_RATELIMIT_SLABS = 436, + VAR_IP_RATELIMIT_SIZE = 437, + VAR_RATELIMIT = 438, + VAR_RATELIMIT_SLABS = 439, + VAR_RATELIMIT_SIZE = 440, + VAR_RATELIMIT_FOR_DOMAIN = 441, + VAR_RATELIMIT_BELOW_DOMAIN = 442, + VAR_IP_RATELIMIT_FACTOR = 443, + VAR_RATELIMIT_FACTOR = 444, + VAR_SEND_CLIENT_SUBNET = 445, + VAR_CLIENT_SUBNET_ZONE = 446, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 447, + VAR_CLIENT_SUBNET_OPCODE = 448, + VAR_MAX_CLIENT_SUBNET_IPV4 = 449, + VAR_MAX_CLIENT_SUBNET_IPV6 = 450, + VAR_MIN_CLIENT_SUBNET_IPV4 = 451, + VAR_MIN_CLIENT_SUBNET_IPV6 = 452, + VAR_MAX_ECS_TREE_SIZE_IPV4 = 453, + VAR_MAX_ECS_TREE_SIZE_IPV6 = 454, + VAR_CAPS_WHITELIST = 455, + VAR_CACHE_MAX_NEGATIVE_TTL = 456, + VAR_PERMIT_SMALL_HOLDDOWN = 457, + VAR_QNAME_MINIMISATION = 458, + VAR_QNAME_MINIMISATION_STRICT = 459, + VAR_IP_FREEBIND = 460, + VAR_DEFINE_TAG = 461, + VAR_LOCAL_ZONE_TAG = 462, + VAR_ACCESS_CONTROL_TAG = 463, + VAR_LOCAL_ZONE_OVERRIDE = 464, + VAR_ACCESS_CONTROL_TAG_ACTION = 465, + VAR_ACCESS_CONTROL_TAG_DATA = 466, + VAR_VIEW = 467, + VAR_ACCESS_CONTROL_VIEW = 468, + VAR_VIEW_FIRST = 469, + VAR_SERVE_EXPIRED = 470, + VAR_SERVE_EXPIRED_TTL = 471, + VAR_SERVE_EXPIRED_TTL_RESET = 472, + VAR_SERVE_EXPIRED_REPLY_TTL = 473, + VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 474, + VAR_SERVE_ORIGINAL_TTL = 475, + VAR_FAKE_DSA = 476, + VAR_FAKE_SHA1 = 477, + VAR_LOG_IDENTITY = 478, + VAR_HIDE_TRUSTANCHOR = 479, + VAR_TRUST_ANCHOR_SIGNALING = 480, + VAR_AGGRESSIVE_NSEC = 481, + VAR_USE_SYSTEMD = 482, + VAR_SHM_ENABLE = 483, + VAR_SHM_KEY = 484, + VAR_ROOT_KEY_SENTINEL = 485, + VAR_DNSCRYPT = 486, + VAR_DNSCRYPT_ENABLE = 487, + VAR_DNSCRYPT_PORT = 488, + VAR_DNSCRYPT_PROVIDER = 489, + VAR_DNSCRYPT_SECRET_KEY = 490, + VAR_DNSCRYPT_PROVIDER_CERT = 491, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 492, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 493, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 494, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 495, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 496, + VAR_IPSECMOD_ENABLED = 497, + VAR_IPSECMOD_HOOK = 498, + VAR_IPSECMOD_IGNORE_BOGUS = 499, + VAR_IPSECMOD_MAX_TTL = 500, + VAR_IPSECMOD_WHITELIST = 501, + VAR_IPSECMOD_STRICT = 502, + VAR_CACHEDB = 503, + VAR_CACHEDB_BACKEND = 504, + VAR_CACHEDB_SECRETSEED = 505, + VAR_CACHEDB_REDISHOST = 506, + VAR_CACHEDB_REDISPORT = 507, + VAR_CACHEDB_REDISTIMEOUT = 508, + VAR_CACHEDB_REDISEXPIRERECORDS = 509, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 510, + VAR_FOR_UPSTREAM = 511, + VAR_AUTH_ZONE = 512, + VAR_ZONEFILE = 513, + VAR_MASTER = 514, + VAR_URL = 515, + VAR_FOR_DOWNSTREAM = 516, + VAR_FALLBACK_ENABLED = 517, + VAR_TLS_ADDITIONAL_PORT = 518, + VAR_LOW_RTT = 519, + VAR_LOW_RTT_PERMIL = 520, + VAR_FAST_SERVER_PERMIL = 521, + VAR_FAST_SERVER_NUM = 522, + VAR_ALLOW_NOTIFY = 523, + VAR_TLS_WIN_CERT = 524, + VAR_TCP_CONNECTION_LIMIT = 525, + VAR_FORWARD_NO_CACHE = 526, + VAR_STUB_NO_CACHE = 527, + VAR_LOG_SERVFAIL = 528, + VAR_DENY_ANY = 529, + VAR_UNKNOWN_SERVER_TIME_LIMIT = 530, + VAR_LOG_TAG_QUERYREPLY = 531, + VAR_STREAM_WAIT_SIZE = 532, + VAR_TLS_CIPHERS = 533, + VAR_TLS_CIPHERSUITES = 534, + VAR_TLS_USE_SNI = 535, + VAR_IPSET = 536, + VAR_IPSET_NAME_V4 = 537, + VAR_IPSET_NAME_V6 = 538, + VAR_TLS_SESSION_TICKET_KEYS = 539, + VAR_RPZ = 540, + VAR_TAGS = 541, + VAR_RPZ_ACTION_OVERRIDE = 542, + VAR_RPZ_CNAME_OVERRIDE = 543, + VAR_RPZ_LOG = 544, + VAR_RPZ_LOG_NAME = 545, + VAR_DYNLIB = 546, + VAR_DYNLIB_FILE = 547 }; #endif /* Tokens. */ @@ -425,286 +427,288 @@ extern int yydebug; #define ANY 263 #define ZONESTR 264 #define STRING_ARG 265 -#define VAR_SERVER 266 -#define VAR_VERBOSITY 267 -#define VAR_NUM_THREADS 268 -#define VAR_PORT 269 -#define VAR_OUTGOING_RANGE 270 -#define VAR_INTERFACE 271 -#define VAR_PREFER_IP4 272 -#define VAR_DO_IP4 273 -#define VAR_DO_IP6 274 -#define VAR_PREFER_IP6 275 -#define VAR_DO_UDP 276 -#define VAR_DO_TCP 277 -#define VAR_TCP_MSS 278 -#define VAR_OUTGOING_TCP_MSS 279 -#define VAR_TCP_IDLE_TIMEOUT 280 -#define VAR_EDNS_TCP_KEEPALIVE 281 -#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 282 -#define VAR_CHROOT 283 -#define VAR_USERNAME 284 -#define VAR_DIRECTORY 285 -#define VAR_LOGFILE 286 -#define VAR_PIDFILE 287 -#define VAR_MSG_CACHE_SIZE 288 -#define VAR_MSG_CACHE_SLABS 289 -#define VAR_NUM_QUERIES_PER_THREAD 290 -#define VAR_RRSET_CACHE_SIZE 291 -#define VAR_RRSET_CACHE_SLABS 292 -#define VAR_OUTGOING_NUM_TCP 293 -#define VAR_INFRA_HOST_TTL 294 -#define VAR_INFRA_LAME_TTL 295 -#define VAR_INFRA_CACHE_SLABS 296 -#define VAR_INFRA_CACHE_NUMHOSTS 297 -#define VAR_INFRA_CACHE_LAME_SIZE 298 -#define VAR_NAME 299 -#define VAR_STUB_ZONE 300 -#define VAR_STUB_HOST 301 -#define VAR_STUB_ADDR 302 -#define VAR_TARGET_FETCH_POLICY 303 -#define VAR_HARDEN_SHORT_BUFSIZE 304 -#define VAR_HARDEN_LARGE_QUERIES 305 -#define VAR_FORWARD_ZONE 306 -#define VAR_FORWARD_HOST 307 -#define VAR_FORWARD_ADDR 308 -#define VAR_DO_NOT_QUERY_ADDRESS 309 -#define VAR_HIDE_IDENTITY 310 -#define VAR_HIDE_VERSION 311 -#define VAR_IDENTITY 312 -#define VAR_VERSION 313 -#define VAR_HARDEN_GLUE 314 -#define VAR_MODULE_CONF 315 -#define VAR_TRUST_ANCHOR_FILE 316 -#define VAR_TRUST_ANCHOR 317 -#define VAR_VAL_OVERRIDE_DATE 318 -#define VAR_BOGUS_TTL 319 -#define VAR_VAL_CLEAN_ADDITIONAL 320 -#define VAR_VAL_PERMISSIVE_MODE 321 -#define VAR_INCOMING_NUM_TCP 322 -#define VAR_MSG_BUFFER_SIZE 323 -#define VAR_KEY_CACHE_SIZE 324 -#define VAR_KEY_CACHE_SLABS 325 -#define VAR_TRUSTED_KEYS_FILE 326 -#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 327 -#define VAR_USE_SYSLOG 328 -#define VAR_OUTGOING_INTERFACE 329 -#define VAR_ROOT_HINTS 330 -#define VAR_DO_NOT_QUERY_LOCALHOST 331 -#define VAR_CACHE_MAX_TTL 332 -#define VAR_HARDEN_DNSSEC_STRIPPED 333 -#define VAR_ACCESS_CONTROL 334 -#define VAR_LOCAL_ZONE 335 -#define VAR_LOCAL_DATA 336 -#define VAR_INTERFACE_AUTOMATIC 337 -#define VAR_STATISTICS_INTERVAL 338 -#define VAR_DO_DAEMONIZE 339 -#define VAR_USE_CAPS_FOR_ID 340 -#define VAR_STATISTICS_CUMULATIVE 341 -#define VAR_OUTGOING_PORT_PERMIT 342 -#define VAR_OUTGOING_PORT_AVOID 343 -#define VAR_DLV_ANCHOR_FILE 344 -#define VAR_DLV_ANCHOR 345 -#define VAR_NEG_CACHE_SIZE 346 -#define VAR_HARDEN_REFERRAL_PATH 347 -#define VAR_PRIVATE_ADDRESS 348 -#define VAR_PRIVATE_DOMAIN 349 -#define VAR_REMOTE_CONTROL 350 -#define VAR_CONTROL_ENABLE 351 -#define VAR_CONTROL_INTERFACE 352 -#define VAR_CONTROL_PORT 353 -#define VAR_SERVER_KEY_FILE 354 -#define VAR_SERVER_CERT_FILE 355 -#define VAR_CONTROL_KEY_FILE 356 -#define VAR_CONTROL_CERT_FILE 357 -#define VAR_CONTROL_USE_CERT 358 -#define VAR_EXTENDED_STATISTICS 359 -#define VAR_LOCAL_DATA_PTR 360 -#define VAR_JOSTLE_TIMEOUT 361 -#define VAR_STUB_PRIME 362 -#define VAR_UNWANTED_REPLY_THRESHOLD 363 -#define VAR_LOG_TIME_ASCII 364 -#define VAR_DOMAIN_INSECURE 365 -#define VAR_PYTHON 366 -#define VAR_PYTHON_SCRIPT 367 -#define VAR_VAL_SIG_SKEW_MIN 368 -#define VAR_VAL_SIG_SKEW_MAX 369 -#define VAR_CACHE_MIN_TTL 370 -#define VAR_VAL_LOG_LEVEL 371 -#define VAR_AUTO_TRUST_ANCHOR_FILE 372 -#define VAR_KEEP_MISSING 373 -#define VAR_ADD_HOLDDOWN 374 -#define VAR_DEL_HOLDDOWN 375 -#define VAR_SO_RCVBUF 376 -#define VAR_EDNS_BUFFER_SIZE 377 -#define VAR_PREFETCH 378 -#define VAR_PREFETCH_KEY 379 -#define VAR_SO_SNDBUF 380 -#define VAR_SO_REUSEPORT 381 -#define VAR_HARDEN_BELOW_NXDOMAIN 382 -#define VAR_IGNORE_CD_FLAG 383 -#define VAR_LOG_QUERIES 384 -#define VAR_LOG_REPLIES 385 -#define VAR_LOG_LOCAL_ACTIONS 386 -#define VAR_TCP_UPSTREAM 387 -#define VAR_SSL_UPSTREAM 388 -#define VAR_SSL_SERVICE_KEY 389 -#define VAR_SSL_SERVICE_PEM 390 -#define VAR_SSL_PORT 391 -#define VAR_FORWARD_FIRST 392 -#define VAR_STUB_SSL_UPSTREAM 393 -#define VAR_FORWARD_SSL_UPSTREAM 394 -#define VAR_TLS_CERT_BUNDLE 395 -#define VAR_STUB_FIRST 396 -#define VAR_MINIMAL_RESPONSES 397 -#define VAR_RRSET_ROUNDROBIN 398 -#define VAR_MAX_UDP_SIZE 399 -#define VAR_DELAY_CLOSE 400 -#define VAR_UNBLOCK_LAN_ZONES 401 -#define VAR_INSECURE_LAN_ZONES 402 -#define VAR_INFRA_CACHE_MIN_RTT 403 -#define VAR_DNS64_PREFIX 404 -#define VAR_DNS64_SYNTHALL 405 -#define VAR_DNS64_IGNORE_AAAA 406 -#define VAR_DNSTAP 407 -#define VAR_DNSTAP_ENABLE 408 -#define VAR_DNSTAP_SOCKET_PATH 409 -#define VAR_DNSTAP_IP 410 -#define VAR_DNSTAP_TLS 411 -#define VAR_DNSTAP_TLS_SERVER_NAME 412 -#define VAR_DNSTAP_TLS_CERT_BUNDLE 413 -#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 414 -#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 415 -#define VAR_DNSTAP_SEND_IDENTITY 416 -#define VAR_DNSTAP_SEND_VERSION 417 -#define VAR_DNSTAP_IDENTITY 418 -#define VAR_DNSTAP_VERSION 419 -#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 420 -#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 421 -#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 422 -#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 423 -#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 424 -#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 425 -#define VAR_RESPONSE_IP_TAG 426 -#define VAR_RESPONSE_IP 427 -#define VAR_RESPONSE_IP_DATA 428 -#define VAR_HARDEN_ALGO_DOWNGRADE 429 -#define VAR_IP_TRANSPARENT 430 -#define VAR_IP_DSCP 431 -#define VAR_DISABLE_DNSSEC_LAME_CHECK 432 -#define VAR_IP_RATELIMIT 433 -#define VAR_IP_RATELIMIT_SLABS 434 -#define VAR_IP_RATELIMIT_SIZE 435 -#define VAR_RATELIMIT 436 -#define VAR_RATELIMIT_SLABS 437 -#define VAR_RATELIMIT_SIZE 438 -#define VAR_RATELIMIT_FOR_DOMAIN 439 -#define VAR_RATELIMIT_BELOW_DOMAIN 440 -#define VAR_IP_RATELIMIT_FACTOR 441 -#define VAR_RATELIMIT_FACTOR 442 -#define VAR_SEND_CLIENT_SUBNET 443 -#define VAR_CLIENT_SUBNET_ZONE 444 -#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 445 -#define VAR_CLIENT_SUBNET_OPCODE 446 -#define VAR_MAX_CLIENT_SUBNET_IPV4 447 -#define VAR_MAX_CLIENT_SUBNET_IPV6 448 -#define VAR_MIN_CLIENT_SUBNET_IPV4 449 -#define VAR_MIN_CLIENT_SUBNET_IPV6 450 -#define VAR_MAX_ECS_TREE_SIZE_IPV4 451 -#define VAR_MAX_ECS_TREE_SIZE_IPV6 452 -#define VAR_CAPS_WHITELIST 453 -#define VAR_CACHE_MAX_NEGATIVE_TTL 454 -#define VAR_PERMIT_SMALL_HOLDDOWN 455 -#define VAR_QNAME_MINIMISATION 456 -#define VAR_QNAME_MINIMISATION_STRICT 457 -#define VAR_IP_FREEBIND 458 -#define VAR_DEFINE_TAG 459 -#define VAR_LOCAL_ZONE_TAG 460 -#define VAR_ACCESS_CONTROL_TAG 461 -#define VAR_LOCAL_ZONE_OVERRIDE 462 -#define VAR_ACCESS_CONTROL_TAG_ACTION 463 -#define VAR_ACCESS_CONTROL_TAG_DATA 464 -#define VAR_VIEW 465 -#define VAR_ACCESS_CONTROL_VIEW 466 -#define VAR_VIEW_FIRST 467 -#define VAR_SERVE_EXPIRED 468 -#define VAR_SERVE_EXPIRED_TTL 469 -#define VAR_SERVE_EXPIRED_TTL_RESET 470 -#define VAR_SERVE_EXPIRED_REPLY_TTL 471 -#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 472 -#define VAR_SERVE_ORIGINAL_TTL 473 -#define VAR_FAKE_DSA 474 -#define VAR_FAKE_SHA1 475 -#define VAR_LOG_IDENTITY 476 -#define VAR_HIDE_TRUSTANCHOR 477 -#define VAR_TRUST_ANCHOR_SIGNALING 478 -#define VAR_AGGRESSIVE_NSEC 479 -#define VAR_USE_SYSTEMD 480 -#define VAR_SHM_ENABLE 481 -#define VAR_SHM_KEY 482 -#define VAR_ROOT_KEY_SENTINEL 483 -#define VAR_DNSCRYPT 484 -#define VAR_DNSCRYPT_ENABLE 485 -#define VAR_DNSCRYPT_PORT 486 -#define VAR_DNSCRYPT_PROVIDER 487 -#define VAR_DNSCRYPT_SECRET_KEY 488 -#define VAR_DNSCRYPT_PROVIDER_CERT 489 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 490 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 491 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 492 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 493 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 494 -#define VAR_IPSECMOD_ENABLED 495 -#define VAR_IPSECMOD_HOOK 496 -#define VAR_IPSECMOD_IGNORE_BOGUS 497 -#define VAR_IPSECMOD_MAX_TTL 498 -#define VAR_IPSECMOD_WHITELIST 499 -#define VAR_IPSECMOD_STRICT 500 -#define VAR_CACHEDB 501 -#define VAR_CACHEDB_BACKEND 502 -#define VAR_CACHEDB_SECRETSEED 503 -#define VAR_CACHEDB_REDISHOST 504 -#define VAR_CACHEDB_REDISPORT 505 -#define VAR_CACHEDB_REDISTIMEOUT 506 -#define VAR_CACHEDB_REDISEXPIRERECORDS 507 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 508 -#define VAR_FOR_UPSTREAM 509 -#define VAR_AUTH_ZONE 510 -#define VAR_ZONEFILE 511 -#define VAR_MASTER 512 -#define VAR_URL 513 -#define VAR_FOR_DOWNSTREAM 514 -#define VAR_FALLBACK_ENABLED 515 -#define VAR_TLS_ADDITIONAL_PORT 516 -#define VAR_LOW_RTT 517 -#define VAR_LOW_RTT_PERMIL 518 -#define VAR_FAST_SERVER_PERMIL 519 -#define VAR_FAST_SERVER_NUM 520 -#define VAR_ALLOW_NOTIFY 521 -#define VAR_TLS_WIN_CERT 522 -#define VAR_TCP_CONNECTION_LIMIT 523 -#define VAR_FORWARD_NO_CACHE 524 -#define VAR_STUB_NO_CACHE 525 -#define VAR_LOG_SERVFAIL 526 -#define VAR_DENY_ANY 527 -#define VAR_UNKNOWN_SERVER_TIME_LIMIT 528 -#define VAR_LOG_TAG_QUERYREPLY 529 -#define VAR_STREAM_WAIT_SIZE 530 -#define VAR_TLS_CIPHERS 531 -#define VAR_TLS_CIPHERSUITES 532 -#define VAR_TLS_USE_SNI 533 -#define VAR_IPSET 534 -#define VAR_IPSET_NAME_V4 535 -#define VAR_IPSET_NAME_V6 536 -#define VAR_TLS_SESSION_TICKET_KEYS 537 -#define VAR_RPZ 538 -#define VAR_TAGS 539 -#define VAR_RPZ_ACTION_OVERRIDE 540 -#define VAR_RPZ_CNAME_OVERRIDE 541 -#define VAR_RPZ_LOG 542 -#define VAR_RPZ_LOG_NAME 543 -#define VAR_DYNLIB 544 -#define VAR_DYNLIB_FILE 545 +#define VAR_FORCE_TOPLEVEL 266 +#define VAR_SERVER 267 +#define VAR_VERBOSITY 268 +#define VAR_NUM_THREADS 269 +#define VAR_PORT 270 +#define VAR_OUTGOING_RANGE 271 +#define VAR_INTERFACE 272 +#define VAR_PREFER_IP4 273 +#define VAR_DO_IP4 274 +#define VAR_DO_IP6 275 +#define VAR_PREFER_IP6 276 +#define VAR_DO_UDP 277 +#define VAR_DO_TCP 278 +#define VAR_TCP_MSS 279 +#define VAR_OUTGOING_TCP_MSS 280 +#define VAR_TCP_IDLE_TIMEOUT 281 +#define VAR_EDNS_TCP_KEEPALIVE 282 +#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 283 +#define VAR_CHROOT 284 +#define VAR_USERNAME 285 +#define VAR_DIRECTORY 286 +#define VAR_LOGFILE 287 +#define VAR_PIDFILE 288 +#define VAR_MSG_CACHE_SIZE 289 +#define VAR_MSG_CACHE_SLABS 290 +#define VAR_NUM_QUERIES_PER_THREAD 291 +#define VAR_RRSET_CACHE_SIZE 292 +#define VAR_RRSET_CACHE_SLABS 293 +#define VAR_OUTGOING_NUM_TCP 294 +#define VAR_INFRA_HOST_TTL 295 +#define VAR_INFRA_LAME_TTL 296 +#define VAR_INFRA_CACHE_SLABS 297 +#define VAR_INFRA_CACHE_NUMHOSTS 298 +#define VAR_INFRA_CACHE_LAME_SIZE 299 +#define VAR_NAME 300 +#define VAR_STUB_ZONE 301 +#define VAR_STUB_HOST 302 +#define VAR_STUB_ADDR 303 +#define VAR_TARGET_FETCH_POLICY 304 +#define VAR_HARDEN_SHORT_BUFSIZE 305 +#define VAR_HARDEN_LARGE_QUERIES 306 +#define VAR_FORWARD_ZONE 307 +#define VAR_FORWARD_HOST 308 +#define VAR_FORWARD_ADDR 309 +#define VAR_DO_NOT_QUERY_ADDRESS 310 +#define VAR_HIDE_IDENTITY 311 +#define VAR_HIDE_VERSION 312 +#define VAR_IDENTITY 313 +#define VAR_VERSION 314 +#define VAR_HARDEN_GLUE 315 +#define VAR_MODULE_CONF 316 +#define VAR_TRUST_ANCHOR_FILE 317 +#define VAR_TRUST_ANCHOR 318 +#define VAR_VAL_OVERRIDE_DATE 319 +#define VAR_BOGUS_TTL 320 +#define VAR_VAL_CLEAN_ADDITIONAL 321 +#define VAR_VAL_PERMISSIVE_MODE 322 +#define VAR_INCOMING_NUM_TCP 323 +#define VAR_MSG_BUFFER_SIZE 324 +#define VAR_KEY_CACHE_SIZE 325 +#define VAR_KEY_CACHE_SLABS 326 +#define VAR_TRUSTED_KEYS_FILE 327 +#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 328 +#define VAR_USE_SYSLOG 329 +#define VAR_OUTGOING_INTERFACE 330 +#define VAR_ROOT_HINTS 331 +#define VAR_DO_NOT_QUERY_LOCALHOST 332 +#define VAR_CACHE_MAX_TTL 333 +#define VAR_HARDEN_DNSSEC_STRIPPED 334 +#define VAR_ACCESS_CONTROL 335 +#define VAR_LOCAL_ZONE 336 +#define VAR_LOCAL_DATA 337 +#define VAR_INTERFACE_AUTOMATIC 338 +#define VAR_STATISTICS_INTERVAL 339 +#define VAR_DO_DAEMONIZE 340 +#define VAR_USE_CAPS_FOR_ID 341 +#define VAR_STATISTICS_CUMULATIVE 342 +#define VAR_OUTGOING_PORT_PERMIT 343 +#define VAR_OUTGOING_PORT_AVOID 344 +#define VAR_DLV_ANCHOR_FILE 345 +#define VAR_DLV_ANCHOR 346 +#define VAR_NEG_CACHE_SIZE 347 +#define VAR_HARDEN_REFERRAL_PATH 348 +#define VAR_PRIVATE_ADDRESS 349 +#define VAR_PRIVATE_DOMAIN 350 +#define VAR_REMOTE_CONTROL 351 +#define VAR_CONTROL_ENABLE 352 +#define VAR_CONTROL_INTERFACE 353 +#define VAR_CONTROL_PORT 354 +#define VAR_SERVER_KEY_FILE 355 +#define VAR_SERVER_CERT_FILE 356 +#define VAR_CONTROL_KEY_FILE 357 +#define VAR_CONTROL_CERT_FILE 358 +#define VAR_CONTROL_USE_CERT 359 +#define VAR_EXTENDED_STATISTICS 360 +#define VAR_LOCAL_DATA_PTR 361 +#define VAR_JOSTLE_TIMEOUT 362 +#define VAR_STUB_PRIME 363 +#define VAR_UNWANTED_REPLY_THRESHOLD 364 +#define VAR_LOG_TIME_ASCII 365 +#define VAR_DOMAIN_INSECURE 366 +#define VAR_PYTHON 367 +#define VAR_PYTHON_SCRIPT 368 +#define VAR_VAL_SIG_SKEW_MIN 369 +#define VAR_VAL_SIG_SKEW_MAX 370 +#define VAR_CACHE_MIN_TTL 371 +#define VAR_VAL_LOG_LEVEL 372 +#define VAR_AUTO_TRUST_ANCHOR_FILE 373 +#define VAR_KEEP_MISSING 374 +#define VAR_ADD_HOLDDOWN 375 +#define VAR_DEL_HOLDDOWN 376 +#define VAR_SO_RCVBUF 377 +#define VAR_EDNS_BUFFER_SIZE 378 +#define VAR_PREFETCH 379 +#define VAR_PREFETCH_KEY 380 +#define VAR_SO_SNDBUF 381 +#define VAR_SO_REUSEPORT 382 +#define VAR_HARDEN_BELOW_NXDOMAIN 383 +#define VAR_IGNORE_CD_FLAG 384 +#define VAR_LOG_QUERIES 385 +#define VAR_LOG_REPLIES 386 +#define VAR_LOG_LOCAL_ACTIONS 387 +#define VAR_TCP_UPSTREAM 388 +#define VAR_SSL_UPSTREAM 389 +#define VAR_SSL_SERVICE_KEY 390 +#define VAR_SSL_SERVICE_PEM 391 +#define VAR_SSL_PORT 392 +#define VAR_FORWARD_FIRST 393 +#define VAR_STUB_SSL_UPSTREAM 394 +#define VAR_FORWARD_SSL_UPSTREAM 395 +#define VAR_TLS_CERT_BUNDLE 396 +#define VAR_STUB_FIRST 397 +#define VAR_MINIMAL_RESPONSES 398 +#define VAR_RRSET_ROUNDROBIN 399 +#define VAR_MAX_UDP_SIZE 400 +#define VAR_DELAY_CLOSE 401 +#define VAR_UNBLOCK_LAN_ZONES 402 +#define VAR_INSECURE_LAN_ZONES 403 +#define VAR_INFRA_CACHE_MIN_RTT 404 +#define VAR_DNS64_PREFIX 405 +#define VAR_DNS64_SYNTHALL 406 +#define VAR_DNS64_IGNORE_AAAA 407 +#define VAR_DNSTAP 408 +#define VAR_DNSTAP_ENABLE 409 +#define VAR_DNSTAP_SOCKET_PATH 410 +#define VAR_DNSTAP_IP 411 +#define VAR_DNSTAP_TLS 412 +#define VAR_DNSTAP_TLS_SERVER_NAME 413 +#define VAR_DNSTAP_TLS_CERT_BUNDLE 414 +#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 415 +#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 416 +#define VAR_DNSTAP_SEND_IDENTITY 417 +#define VAR_DNSTAP_SEND_VERSION 418 +#define VAR_DNSTAP_BIDIRECTIONAL 419 +#define VAR_DNSTAP_IDENTITY 420 +#define VAR_DNSTAP_VERSION 421 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 422 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 423 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 424 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 425 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 426 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 427 +#define VAR_RESPONSE_IP_TAG 428 +#define VAR_RESPONSE_IP 429 +#define VAR_RESPONSE_IP_DATA 430 +#define VAR_HARDEN_ALGO_DOWNGRADE 431 +#define VAR_IP_TRANSPARENT 432 +#define VAR_IP_DSCP 433 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 434 +#define VAR_IP_RATELIMIT 435 +#define VAR_IP_RATELIMIT_SLABS 436 +#define VAR_IP_RATELIMIT_SIZE 437 +#define VAR_RATELIMIT 438 +#define VAR_RATELIMIT_SLABS 439 +#define VAR_RATELIMIT_SIZE 440 +#define VAR_RATELIMIT_FOR_DOMAIN 441 +#define VAR_RATELIMIT_BELOW_DOMAIN 442 +#define VAR_IP_RATELIMIT_FACTOR 443 +#define VAR_RATELIMIT_FACTOR 444 +#define VAR_SEND_CLIENT_SUBNET 445 +#define VAR_CLIENT_SUBNET_ZONE 446 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 447 +#define VAR_CLIENT_SUBNET_OPCODE 448 +#define VAR_MAX_CLIENT_SUBNET_IPV4 449 +#define VAR_MAX_CLIENT_SUBNET_IPV6 450 +#define VAR_MIN_CLIENT_SUBNET_IPV4 451 +#define VAR_MIN_CLIENT_SUBNET_IPV6 452 +#define VAR_MAX_ECS_TREE_SIZE_IPV4 453 +#define VAR_MAX_ECS_TREE_SIZE_IPV6 454 +#define VAR_CAPS_WHITELIST 455 +#define VAR_CACHE_MAX_NEGATIVE_TTL 456 +#define VAR_PERMIT_SMALL_HOLDDOWN 457 +#define VAR_QNAME_MINIMISATION 458 +#define VAR_QNAME_MINIMISATION_STRICT 459 +#define VAR_IP_FREEBIND 460 +#define VAR_DEFINE_TAG 461 +#define VAR_LOCAL_ZONE_TAG 462 +#define VAR_ACCESS_CONTROL_TAG 463 +#define VAR_LOCAL_ZONE_OVERRIDE 464 +#define VAR_ACCESS_CONTROL_TAG_ACTION 465 +#define VAR_ACCESS_CONTROL_TAG_DATA 466 +#define VAR_VIEW 467 +#define VAR_ACCESS_CONTROL_VIEW 468 +#define VAR_VIEW_FIRST 469 +#define VAR_SERVE_EXPIRED 470 +#define VAR_SERVE_EXPIRED_TTL 471 +#define VAR_SERVE_EXPIRED_TTL_RESET 472 +#define VAR_SERVE_EXPIRED_REPLY_TTL 473 +#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 474 +#define VAR_SERVE_ORIGINAL_TTL 475 +#define VAR_FAKE_DSA 476 +#define VAR_FAKE_SHA1 477 +#define VAR_LOG_IDENTITY 478 +#define VAR_HIDE_TRUSTANCHOR 479 +#define VAR_TRUST_ANCHOR_SIGNALING 480 +#define VAR_AGGRESSIVE_NSEC 481 +#define VAR_USE_SYSTEMD 482 +#define VAR_SHM_ENABLE 483 +#define VAR_SHM_KEY 484 +#define VAR_ROOT_KEY_SENTINEL 485 +#define VAR_DNSCRYPT 486 +#define VAR_DNSCRYPT_ENABLE 487 +#define VAR_DNSCRYPT_PORT 488 +#define VAR_DNSCRYPT_PROVIDER 489 +#define VAR_DNSCRYPT_SECRET_KEY 490 +#define VAR_DNSCRYPT_PROVIDER_CERT 491 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 492 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 493 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 494 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 495 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 496 +#define VAR_IPSECMOD_ENABLED 497 +#define VAR_IPSECMOD_HOOK 498 +#define VAR_IPSECMOD_IGNORE_BOGUS 499 +#define VAR_IPSECMOD_MAX_TTL 500 +#define VAR_IPSECMOD_WHITELIST 501 +#define VAR_IPSECMOD_STRICT 502 +#define VAR_CACHEDB 503 +#define VAR_CACHEDB_BACKEND 504 +#define VAR_CACHEDB_SECRETSEED 505 +#define VAR_CACHEDB_REDISHOST 506 +#define VAR_CACHEDB_REDISPORT 507 +#define VAR_CACHEDB_REDISTIMEOUT 508 +#define VAR_CACHEDB_REDISEXPIRERECORDS 509 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 510 +#define VAR_FOR_UPSTREAM 511 +#define VAR_AUTH_ZONE 512 +#define VAR_ZONEFILE 513 +#define VAR_MASTER 514 +#define VAR_URL 515 +#define VAR_FOR_DOWNSTREAM 516 +#define VAR_FALLBACK_ENABLED 517 +#define VAR_TLS_ADDITIONAL_PORT 518 +#define VAR_LOW_RTT 519 +#define VAR_LOW_RTT_PERMIL 520 +#define VAR_FAST_SERVER_PERMIL 521 +#define VAR_FAST_SERVER_NUM 522 +#define VAR_ALLOW_NOTIFY 523 +#define VAR_TLS_WIN_CERT 524 +#define VAR_TCP_CONNECTION_LIMIT 525 +#define VAR_FORWARD_NO_CACHE 526 +#define VAR_STUB_NO_CACHE 527 +#define VAR_LOG_SERVFAIL 528 +#define VAR_DENY_ANY 529 +#define VAR_UNKNOWN_SERVER_TIME_LIMIT 530 +#define VAR_LOG_TAG_QUERYREPLY 531 +#define VAR_STREAM_WAIT_SIZE 532 +#define VAR_TLS_CIPHERS 533 +#define VAR_TLS_CIPHERSUITES 534 +#define VAR_TLS_USE_SNI 535 +#define VAR_IPSET 536 +#define VAR_IPSET_NAME_V4 537 +#define VAR_IPSET_NAME_V6 538 +#define VAR_TLS_SESSION_TICKET_KEYS 539 +#define VAR_RPZ 540 +#define VAR_TAGS 541 +#define VAR_RPZ_ACTION_OVERRIDE 542 +#define VAR_RPZ_CNAME_OVERRIDE 543 +#define VAR_RPZ_LOG 544 +#define VAR_RPZ_LOG_NAME 545 +#define VAR_DYNLIB 546 +#define VAR_DYNLIB_FILE 547 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -715,7 +719,7 @@ union YYSTYPE char* str; -#line 719 "util/configparser.c" /* yacc.c:355 */ +#line 723 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -732,7 +736,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 736 "util/configparser.c" /* yacc.c:358 */ +#line 740 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -974,21 +978,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 617 +#define YYLAST 622 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 291 +#define YYNTOKENS 293 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 316 +#define YYNNTS 318 /* YYNRULES -- Number of rules. */ -#define YYNRULES 608 +#define YYNRULES 612 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 903 +#define YYNSTATES 908 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 545 +#define YYMAXUTOK 547 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -1051,74 +1055,75 @@ static const yytype_uint16 yytranslate[] = 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 + 285, 286, 287, 288, 289, 290, 291, 292 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 180, 180, 180, 181, 181, 182, 182, 183, 183, - 183, 184, 184, 185, 185, 186, 186, 190, 195, 196, - 197, 197, 197, 198, 198, 199, 199, 199, 200, 200, - 201, 201, 201, 202, 202, 203, 203, 203, 204, 204, - 204, 205, 205, 206, 206, 207, 207, 208, 208, 209, - 209, 210, 210, 211, 211, 212, 212, 213, 213, 213, - 214, 214, 214, 215, 215, 215, 216, 216, 217, 217, - 218, 218, 219, 219, 220, 220, 220, 221, 221, 222, - 222, 223, 223, 223, 224, 224, 225, 225, 226, 226, - 227, 227, 227, 228, 228, 229, 229, 230, 230, 231, - 231, 232, 232, 233, 233, 233, 234, 234, 235, 235, - 235, 236, 236, 236, 237, 237, 237, 238, 238, 238, - 238, 239, 240, 240, 240, 241, 241, 241, 242, 242, - 243, 243, 244, 244, 244, 245, 245, 246, 246, 246, - 247, 248, 248, 249, 249, 250, 251, 251, 252, 252, - 253, 253, 254, 255, 255, 256, 256, 257, 257, 258, - 258, 259, 259, 260, 260, 260, 261, 261, 262, 262, - 263, 263, 264, 264, 265, 265, 266, 266, 267, 267, - 268, 268, 269, 269, 269, 270, 270, 270, 271, 271, - 272, 273, 273, 274, 274, 275, 275, 276, 276, 277, - 277, 277, 278, 278, 278, 279, 279, 279, 280, 280, - 281, 281, 282, 282, 283, 285, 297, 298, 299, 299, - 299, 299, 299, 300, 300, 302, 314, 315, 316, 316, - 316, 316, 317, 317, 319, 333, 334, 335, 335, 335, - 335, 336, 336, 336, 338, 355, 356, 357, 357, 357, - 357, 358, 358, 358, 359, 362, 381, 398, 406, 416, - 424, 441, 442, 443, 443, 443, 443, 443, 444, 444, - 444, 445, 445, 447, 456, 465, 476, 485, 494, 503, - 514, 523, 535, 549, 564, 575, 592, 609, 626, 643, - 658, 673, 686, 701, 710, 719, 728, 737, 746, 755, - 764, 773, 782, 791, 800, 809, 818, 827, 840, 849, - 862, 871, 880, 889, 896, 903, 912, 919, 928, 936, - 943, 950, 958, 967, 976, 985, 999, 1008, 1017, 1026, - 1035, 1044, 1053, 1060, 1067, 1093, 1101, 1108, 1115, 1122, - 1129, 1137, 1145, 1153, 1160, 1171, 1182, 1189, 1198, 1207, - 1216, 1223, 1230, 1238, 1246, 1256, 1266, 1276, 1290, 1298, - 1311, 1322, 1330, 1343, 1352, 1361, 1370, 1380, 1390, 1398, - 1411, 1420, 1428, 1437, 1445, 1458, 1467, 1474, 1484, 1494, - 1504, 1514, 1524, 1534, 1544, 1554, 1561, 1568, 1575, 1584, - 1593, 1602, 1611, 1618, 1628, 1648, 1655, 1673, 1686, 1699, - 1708, 1717, 1726, 1735, 1745, 1755, 1766, 1775, 1784, 1793, - 1802, 1811, 1820, 1829, 1842, 1855, 1864, 1871, 1880, 1889, - 1898, 1907, 1915, 1928, 1936, 1977, 1984, 1999, 2009, 2019, - 2026, 2033, 2040, 2049, 2057, 2071, 2092, 2113, 2125, 2137, - 2149, 2158, 2179, 2189, 2198, 2206, 2214, 2227, 2240, 2255, - 2270, 2279, 2288, 2294, 2303, 2312, 2322, 2332, 2345, 2358, - 2370, 2384, 2396, 2410, 2420, 2427, 2434, 2443, 2452, 2462, - 2472, 2482, 2489, 2496, 2505, 2514, 2524, 2534, 2541, 2548, - 2555, 2563, 2573, 2583, 2593, 2603, 2642, 2652, 2660, 2668, - 2683, 2692, 2697, 2698, 2699, 2699, 2699, 2700, 2700, 2700, - 2701, 2701, 2703, 2713, 2722, 2729, 2736, 2743, 2750, 2757, - 2764, 2769, 2770, 2771, 2771, 2772, 2772, 2772, 2773, 2774, - 2774, 2775, 2775, 2776, 2776, 2777, 2778, 2779, 2780, 2781, - 2782, 2784, 2793, 2800, 2807, 2816, 2823, 2830, 2837, 2844, - 2853, 2862, 2869, 2876, 2886, 2896, 2906, 2916, 2926, 2936, - 2941, 2942, 2943, 2945, 2951, 2956, 2957, 2958, 2960, 2966, - 2976, 2983, 2992, 3000, 3005, 3006, 3008, 3008, 3008, 3009, - 3009, 3010, 3011, 3012, 3013, 3014, 3016, 3026, 3035, 3042, - 3051, 3058, 3067, 3075, 3088, 3096, 3109, 3114, 3115, 3116, - 3116, 3117, 3117, 3117, 3118, 3120, 3132, 3144, 3156, 3171, - 3184, 3197, 3208, 3213, 3214, 3215, 3215, 3217, 3232 + 0, 181, 181, 181, 182, 182, 183, 183, 184, 184, + 184, 185, 185, 186, 186, 187, 187, 188, 190, 196, + 201, 202, 203, 203, 203, 204, 204, 205, 205, 205, + 206, 206, 207, 207, 207, 208, 208, 209, 209, 209, + 210, 210, 210, 211, 211, 212, 212, 213, 213, 214, + 214, 215, 215, 216, 216, 217, 217, 218, 218, 219, + 219, 219, 220, 220, 220, 221, 221, 221, 222, 222, + 223, 223, 224, 224, 225, 225, 226, 226, 226, 227, + 227, 228, 228, 229, 229, 229, 230, 230, 231, 231, + 232, 232, 233, 233, 233, 234, 234, 235, 235, 236, + 236, 237, 237, 238, 238, 239, 239, 239, 240, 240, + 241, 241, 241, 242, 242, 242, 243, 243, 243, 244, + 244, 244, 244, 245, 246, 246, 246, 247, 247, 247, + 248, 248, 249, 249, 250, 250, 250, 251, 251, 252, + 252, 252, 253, 254, 254, 255, 255, 256, 257, 257, + 258, 258, 259, 259, 260, 261, 261, 262, 262, 263, + 263, 264, 264, 265, 265, 266, 266, 266, 267, 267, + 268, 268, 269, 269, 270, 270, 271, 271, 272, 272, + 273, 273, 274, 274, 275, 275, 275, 276, 276, 276, + 277, 277, 278, 279, 279, 280, 280, 281, 281, 282, + 282, 283, 283, 283, 284, 284, 284, 285, 285, 285, + 286, 286, 287, 287, 288, 288, 289, 291, 303, 304, + 305, 305, 305, 305, 305, 306, 306, 308, 320, 321, + 322, 322, 322, 322, 323, 323, 325, 339, 340, 341, + 341, 341, 341, 342, 342, 342, 344, 361, 362, 363, + 363, 363, 363, 364, 364, 364, 365, 368, 387, 404, + 412, 422, 430, 447, 448, 449, 449, 449, 449, 449, + 450, 450, 450, 451, 451, 453, 462, 471, 482, 491, + 500, 509, 520, 529, 541, 555, 570, 581, 598, 615, + 632, 649, 664, 679, 692, 707, 716, 725, 734, 743, + 752, 761, 770, 779, 788, 797, 806, 815, 824, 833, + 846, 855, 868, 877, 886, 895, 902, 909, 918, 925, + 934, 942, 949, 956, 964, 973, 982, 991, 1005, 1014, + 1023, 1032, 1041, 1050, 1059, 1066, 1073, 1099, 1107, 1114, + 1121, 1128, 1135, 1143, 1151, 1159, 1166, 1177, 1188, 1195, + 1204, 1213, 1222, 1229, 1236, 1244, 1252, 1262, 1272, 1282, + 1296, 1304, 1317, 1328, 1336, 1349, 1358, 1367, 1376, 1386, + 1396, 1404, 1417, 1426, 1434, 1443, 1451, 1464, 1473, 1480, + 1490, 1500, 1510, 1520, 1530, 1540, 1550, 1560, 1567, 1574, + 1581, 1590, 1599, 1608, 1617, 1624, 1634, 1654, 1661, 1679, + 1692, 1705, 1714, 1723, 1732, 1741, 1751, 1761, 1772, 1781, + 1790, 1799, 1808, 1817, 1826, 1835, 1848, 1861, 1870, 1877, + 1886, 1895, 1904, 1913, 1921, 1934, 1942, 1983, 1990, 2005, + 2015, 2025, 2032, 2039, 2046, 2055, 2063, 2077, 2098, 2119, + 2131, 2143, 2155, 2164, 2185, 2195, 2204, 2212, 2220, 2233, + 2246, 2261, 2276, 2285, 2294, 2300, 2309, 2318, 2328, 2338, + 2351, 2364, 2376, 2390, 2402, 2416, 2426, 2433, 2440, 2449, + 2458, 2468, 2478, 2488, 2495, 2502, 2511, 2520, 2530, 2540, + 2547, 2554, 2561, 2569, 2579, 2589, 2599, 2609, 2648, 2658, + 2666, 2674, 2689, 2698, 2703, 2704, 2705, 2705, 2705, 2706, + 2706, 2706, 2707, 2707, 2709, 2719, 2728, 2735, 2742, 2749, + 2756, 2763, 2770, 2775, 2776, 2777, 2777, 2777, 2778, 2778, + 2778, 2779, 2780, 2780, 2781, 2781, 2782, 2782, 2783, 2784, + 2785, 2786, 2787, 2788, 2790, 2799, 2809, 2816, 2823, 2832, + 2839, 2846, 2853, 2860, 2869, 2878, 2885, 2892, 2902, 2912, + 2922, 2932, 2942, 2952, 2957, 2958, 2959, 2961, 2967, 2972, + 2973, 2974, 2976, 2982, 2992, 2999, 3008, 3016, 3021, 3022, + 3024, 3024, 3024, 3025, 3025, 3026, 3027, 3028, 3029, 3030, + 3032, 3042, 3051, 3058, 3067, 3074, 3083, 3091, 3104, 3112, + 3125, 3130, 3131, 3132, 3132, 3133, 3133, 3133, 3134, 3136, + 3148, 3160, 3172, 3187, 3200, 3213, 3224, 3229, 3230, 3231, + 3231, 3233, 3248 }; #endif @@ -1128,16 +1133,17 @@ static const yytype_uint16 yyrline[] = static const char *const yytname[] = { "$end", "error", "$undefined", "SPACE", "LETTER", "NEWLINE", "COMMENT", - "COLON", "ANY", "ZONESTR", "STRING_ARG", "VAR_SERVER", "VAR_VERBOSITY", - "VAR_NUM_THREADS", "VAR_PORT", "VAR_OUTGOING_RANGE", "VAR_INTERFACE", - "VAR_PREFER_IP4", "VAR_DO_IP4", "VAR_DO_IP6", "VAR_PREFER_IP6", - "VAR_DO_UDP", "VAR_DO_TCP", "VAR_TCP_MSS", "VAR_OUTGOING_TCP_MSS", - "VAR_TCP_IDLE_TIMEOUT", "VAR_EDNS_TCP_KEEPALIVE", - "VAR_EDNS_TCP_KEEPALIVE_TIMEOUT", "VAR_CHROOT", "VAR_USERNAME", - "VAR_DIRECTORY", "VAR_LOGFILE", "VAR_PIDFILE", "VAR_MSG_CACHE_SIZE", - "VAR_MSG_CACHE_SLABS", "VAR_NUM_QUERIES_PER_THREAD", - "VAR_RRSET_CACHE_SIZE", "VAR_RRSET_CACHE_SLABS", "VAR_OUTGOING_NUM_TCP", - "VAR_INFRA_HOST_TTL", "VAR_INFRA_LAME_TTL", "VAR_INFRA_CACHE_SLABS", + "COLON", "ANY", "ZONESTR", "STRING_ARG", "VAR_FORCE_TOPLEVEL", + "VAR_SERVER", "VAR_VERBOSITY", "VAR_NUM_THREADS", "VAR_PORT", + "VAR_OUTGOING_RANGE", "VAR_INTERFACE", "VAR_PREFER_IP4", "VAR_DO_IP4", + "VAR_DO_IP6", "VAR_PREFER_IP6", "VAR_DO_UDP", "VAR_DO_TCP", + "VAR_TCP_MSS", "VAR_OUTGOING_TCP_MSS", "VAR_TCP_IDLE_TIMEOUT", + "VAR_EDNS_TCP_KEEPALIVE", "VAR_EDNS_TCP_KEEPALIVE_TIMEOUT", "VAR_CHROOT", + "VAR_USERNAME", "VAR_DIRECTORY", "VAR_LOGFILE", "VAR_PIDFILE", + "VAR_MSG_CACHE_SIZE", "VAR_MSG_CACHE_SLABS", + "VAR_NUM_QUERIES_PER_THREAD", "VAR_RRSET_CACHE_SIZE", + "VAR_RRSET_CACHE_SLABS", "VAR_OUTGOING_NUM_TCP", "VAR_INFRA_HOST_TTL", + "VAR_INFRA_LAME_TTL", "VAR_INFRA_CACHE_SLABS", "VAR_INFRA_CACHE_NUMHOSTS", "VAR_INFRA_CACHE_LAME_SIZE", "VAR_NAME", "VAR_STUB_ZONE", "VAR_STUB_HOST", "VAR_STUB_ADDR", "VAR_TARGET_FETCH_POLICY", "VAR_HARDEN_SHORT_BUFSIZE", @@ -1180,7 +1186,7 @@ static const char *const yytname[] = "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_IDENTITY", "VAR_DNSTAP_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", @@ -1235,13 +1241,13 @@ static const char *const yytname[] = "VAR_RPZ", "VAR_TAGS", "VAR_RPZ_ACTION_OVERRIDE", "VAR_RPZ_CNAME_OVERRIDE", "VAR_RPZ_LOG", "VAR_RPZ_LOG_NAME", "VAR_DYNLIB", "VAR_DYNLIB_FILE", "$accept", "toplevelvars", - "toplevelvar", "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", + "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", @@ -1335,11 +1341,11 @@ static const char *const yytname[] = "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_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_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", @@ -1397,14 +1403,14 @@ static const yytype_uint16 yytoknum[] = 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, - 545 + 545, 546, 547 }; # endif -#define YYPACT_NINF -281 +#define YYPACT_NINF -286 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-281))) + (!!((Yystate) == (-286))) #define YYTABLE_NINF -1 @@ -1415,97 +1421,97 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -281, 0, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - 278, -42, -37, -41, -7, -43, -30, -136, -106, -280, - -178, -173, -272, 2, 3, 4, 25, 26, 28, 31, - 32, 33, 34, 36, 37, 38, 39, 40, 52, 53, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 87, 88, 91, 93, 94, - 95, 96, 97, 98, 99, 100, 102, 103, 104, 105, + -286, 0, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, 279, -42, -37, -43, -21, -44, -11, -87, + -109, -285, -207, -231, -273, 3, 4, 5, 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, 92, 94, + 95, 96, 97, 98, 99, 100, 101, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 143, 144, 145, 146, 147, 148, + 138, 139, 140, 141, 142, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, - 201, 202, 206, 207, 208, 209, 210, 211, 212, 214, - 215, 216, 217, 220, 221, 223, 224, 225, 226, 227, - 228, 229, 230, 238, 244, 246, 247, 248, 250, 251, + 200, 201, 203, 207, 208, 209, 210, 211, 212, 213, + 215, 216, 217, 218, 219, 222, 223, 226, 239, 240, + 241, 242, 243, 244, 245, 246, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, - 262, 263, 264, 265, 266, 267, 268, 270, 271, 272, - 274, 275, 276, 277, 312, 313, 314, 315, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, 319, 320, 321, 363, 364, 365, - 366, -281, -281, -281, -281, -281, -281, -281, -281, 367, - 368, 369, 370, 371, 375, -281, -281, -281, -281, -281, - -281, -281, 379, 380, 405, 406, 407, 409, 420, -281, - -281, -281, -281, -281, -281, -281, -281, 421, 422, 423, - 424, 425, 426, 427, 428, -281, -281, -281, -281, -281, - -281, -281, -281, -281, 429, 430, 431, 432, 433, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - 434, 435, 436, 437, 438, 478, 480, 497, -281, -281, - -281, -281, -281, -281, -281, -281, -281, 498, 499, 500, - 501, 502, 503, 504, 505, 506, 507, 514, 515, 516, - 517, 518, 519, 520, 522, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, 523, -281, -281, 524, -281, -281, - 525, 526, 527, 528, 531, 534, 537, 538, 547, 548, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, 549, 551, 552, 553, 554, 555, -281, -281, -281, - -281, -281, -281, -281, 556, 557, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, 558, - 559, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, 560, 561, 562, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, 563, - 564, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - 565, 566, 567, 568, 569, 570, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, 571, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, 572, -281, - -281, 573, 574, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, 575, 576, 577, -281, -281, -281, -281, -281, - -281, -281, -281 + 262, 263, 264, 265, 266, 267, 268, 269, 270, 272, + 273, 274, 276, 277, 278, 280, 314, 315, 316, 317, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, 321, 322, 323, 365, + 366, 367, 368, -286, -286, -286, -286, -286, -286, -286, + -286, 369, 370, 371, 372, 373, 377, -286, -286, -286, + -286, -286, -286, -286, 381, 382, 407, 408, 409, 411, + 422, -286, -286, -286, -286, -286, -286, -286, -286, 423, + 424, 425, 426, 427, 428, 429, 430, -286, -286, -286, + -286, -286, -286, -286, -286, -286, 431, 432, 433, 434, + 435, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, 436, 437, 438, 439, 440, 441, 481, 483, + -286, -286, -286, -286, -286, -286, -286, -286, -286, 500, + 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, + 517, 518, 519, 520, 521, 522, 523, 525, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, 526, -286, + -286, 527, -286, -286, 528, 529, 530, 531, 534, 537, + 540, 541, 550, 551, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, 552, 554, 555, 556, 557, + 558, -286, -286, -286, -286, -286, -286, -286, 559, 560, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, 561, 562, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + 563, 564, 565, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, 566, 567, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, 568, 569, 570, 571, 572, 573, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, 574, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, 575, -286, -286, 576, 577, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, 578, 579, 580, + -286, -286, -286, -286, -286, -286, -286, -286 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1513,11 +1519,11 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 17, 215, 225, 491, 549, 510, 234, - 563, 586, 244, 602, 260, 554, 3, 19, 217, 227, - 236, 246, 262, 493, 512, 551, 556, 565, 588, 604, - 4, 5, 6, 10, 14, 15, 8, 9, 7, 16, - 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 1, 18, 19, 217, 227, 493, 553, 512, + 236, 567, 590, 246, 606, 262, 558, 3, 17, 21, + 219, 229, 238, 248, 264, 495, 514, 555, 560, 569, + 592, 608, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1536,413 +1542,127 @@ 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, 18, 20, - 21, 84, 87, 96, 185, 186, 22, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 35, 75, 23, - 88, 89, 46, 68, 83, 24, 25, 28, 29, 26, - 27, 30, 31, 32, 33, 34, 119, 197, 120, 122, - 123, 124, 199, 204, 200, 211, 212, 213, 214, 181, - 85, 74, 100, 117, 118, 209, 206, 121, 36, 37, - 38, 39, 40, 76, 90, 91, 106, 62, 72, 63, - 189, 190, 101, 56, 57, 188, 58, 59, 110, 114, - 128, 137, 163, 140, 210, 111, 69, 41, 42, 43, - 98, 129, 130, 131, 44, 45, 47, 48, 50, 51, - 49, 135, 52, 53, 54, 60, 79, 115, 93, 136, - 86, 159, 94, 95, 112, 113, 207, 99, 55, 77, - 80, 61, 64, 102, 103, 78, 160, 104, 65, 66, - 67, 198, 116, 173, 174, 175, 176, 177, 178, 179, - 187, 105, 73, 107, 108, 109, 161, 70, 71, 92, - 81, 82, 97, 125, 126, 208, 127, 132, 133, 134, - 164, 165, 167, 169, 170, 168, 171, 182, 138, 139, - 143, 144, 141, 142, 145, 146, 148, 147, 201, 203, - 202, 162, 172, 191, 193, 192, 194, 195, 196, 166, - 180, 183, 184, 205, 0, 0, 0, 0, 0, 0, - 0, 216, 218, 219, 220, 222, 223, 224, 221, 0, - 0, 0, 0, 0, 0, 226, 228, 229, 230, 231, - 232, 233, 0, 0, 0, 0, 0, 0, 0, 235, - 237, 238, 241, 242, 239, 243, 240, 0, 0, 0, - 0, 0, 0, 0, 0, 245, 247, 248, 249, 250, - 254, 251, 252, 253, 0, 0, 0, 0, 0, 265, - 269, 270, 271, 272, 261, 263, 264, 266, 267, 268, - 0, 0, 0, 0, 0, 0, 0, 0, 492, 494, - 496, 495, 501, 497, 498, 499, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 511, 513, 514, 515, 516, - 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, - 527, 528, 529, 530, 0, 550, 552, 0, 555, 557, + 20, 22, 23, 86, 89, 98, 187, 188, 24, 151, + 152, 153, 154, 155, 156, 157, 158, 159, 160, 37, + 77, 25, 90, 91, 48, 70, 85, 26, 27, 30, + 31, 28, 29, 32, 33, 34, 35, 36, 121, 199, + 122, 124, 125, 126, 201, 206, 202, 213, 214, 215, + 216, 183, 87, 76, 102, 119, 120, 211, 208, 123, + 38, 39, 40, 41, 42, 78, 92, 93, 108, 64, + 74, 65, 191, 192, 103, 58, 59, 190, 60, 61, + 112, 116, 130, 139, 165, 142, 212, 113, 71, 43, + 44, 45, 100, 131, 132, 133, 46, 47, 49, 50, + 52, 53, 51, 137, 54, 55, 56, 62, 81, 117, + 95, 138, 88, 161, 96, 97, 114, 115, 209, 101, + 57, 79, 82, 63, 66, 104, 105, 80, 162, 106, + 67, 68, 69, 200, 118, 175, 176, 177, 178, 179, + 180, 181, 189, 107, 75, 109, 110, 111, 163, 72, + 73, 94, 83, 84, 99, 127, 128, 210, 129, 134, + 135, 136, 166, 167, 169, 171, 172, 170, 173, 184, + 140, 141, 145, 146, 143, 144, 147, 148, 150, 149, + 203, 205, 204, 164, 174, 193, 195, 194, 196, 197, + 198, 168, 182, 185, 186, 207, 0, 0, 0, 0, + 0, 0, 0, 218, 220, 221, 222, 224, 225, 226, + 223, 0, 0, 0, 0, 0, 0, 228, 230, 231, + 232, 233, 234, 235, 0, 0, 0, 0, 0, 0, + 0, 237, 239, 240, 243, 244, 241, 245, 242, 0, + 0, 0, 0, 0, 0, 0, 0, 247, 249, 250, + 251, 252, 256, 253, 254, 255, 0, 0, 0, 0, + 0, 267, 271, 272, 273, 274, 263, 265, 266, 268, + 269, 270, 0, 0, 0, 0, 0, 0, 0, 0, + 494, 496, 498, 497, 503, 499, 500, 501, 502, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 564, 566, 567, 568, 570, 571, 569, 572, 573, 574, - 575, 0, 0, 0, 0, 0, 0, 587, 589, 590, - 591, 592, 593, 594, 0, 0, 603, 605, 606, 274, - 273, 280, 293, 291, 303, 299, 300, 304, 301, 302, - 305, 306, 307, 308, 309, 332, 333, 334, 335, 336, - 361, 362, 363, 368, 369, 296, 370, 371, 374, 372, - 373, 376, 377, 378, 392, 347, 348, 350, 351, 379, - 395, 341, 343, 396, 402, 403, 404, 297, 360, 421, - 422, 342, 416, 325, 292, 337, 393, 399, 380, 0, - 0, 425, 298, 275, 324, 384, 276, 294, 295, 338, - 339, 423, 382, 386, 387, 277, 426, 364, 391, 326, - 346, 397, 398, 401, 415, 340, 419, 417, 418, 352, - 359, 388, 389, 353, 354, 381, 406, 327, 328, 331, - 310, 312, 313, 314, 315, 316, 427, 428, 430, 365, - 366, 367, 375, 431, 432, 433, 0, 0, 0, 383, - 355, 357, 559, 442, 446, 444, 443, 447, 445, 0, - 0, 450, 451, 281, 282, 283, 284, 285, 286, 287, - 288, 289, 290, 385, 400, 420, 455, 456, 356, 434, - 0, 0, 0, 0, 0, 0, 407, 408, 409, 410, - 411, 412, 413, 414, 560, 349, 344, 405, 323, 278, - 279, 345, 457, 459, 458, 460, 461, 462, 311, 318, - 452, 454, 453, 317, 0, 330, 390, 429, 329, 358, - 319, 320, 322, 321, 463, 464, 465, 469, 468, 466, - 467, 470, 471, 472, 473, 475, 474, 484, 0, 488, - 489, 0, 0, 490, 476, 482, 477, 478, 479, 481, - 483, 480, 255, 256, 257, 258, 259, 502, 504, 503, - 506, 507, 508, 509, 505, 531, 532, 533, 534, 535, - 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, - 546, 547, 548, 553, 558, 576, 577, 578, 581, 579, - 580, 582, 583, 584, 585, 595, 596, 597, 598, 599, - 600, 607, 608, 394, 424, 441, 561, 562, 448, 449, - 435, 436, 0, 0, 0, 440, 601, 485, 486, 487, - 439, 437, 438 + 0, 0, 0, 0, 0, 0, 0, 0, 513, 515, + 517, 516, 518, 519, 520, 521, 522, 523, 524, 525, + 526, 527, 528, 529, 530, 531, 532, 533, 0, 554, + 556, 0, 559, 561, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 568, 570, 571, 572, 574, 575, + 573, 576, 577, 578, 579, 0, 0, 0, 0, 0, + 0, 591, 593, 594, 595, 596, 597, 598, 0, 0, + 607, 609, 610, 276, 275, 282, 295, 293, 305, 301, + 302, 306, 303, 304, 307, 308, 309, 310, 311, 334, + 335, 336, 337, 338, 363, 364, 365, 370, 371, 298, + 372, 373, 376, 374, 375, 378, 379, 380, 394, 349, + 350, 352, 353, 381, 397, 343, 345, 398, 404, 405, + 406, 299, 362, 423, 424, 344, 418, 327, 294, 339, + 395, 401, 382, 0, 0, 427, 300, 277, 326, 386, + 278, 296, 297, 340, 341, 425, 384, 388, 389, 279, + 428, 366, 393, 328, 348, 399, 400, 403, 417, 342, + 421, 419, 420, 354, 361, 390, 391, 355, 356, 383, + 408, 329, 330, 333, 312, 314, 315, 316, 317, 318, + 429, 430, 432, 367, 368, 369, 377, 433, 434, 435, + 0, 0, 0, 385, 357, 359, 563, 444, 448, 446, + 445, 449, 447, 0, 0, 452, 453, 283, 284, 285, + 286, 287, 288, 289, 290, 291, 292, 387, 402, 422, + 457, 458, 358, 436, 0, 0, 0, 0, 0, 0, + 409, 410, 411, 412, 413, 414, 415, 416, 564, 351, + 346, 407, 325, 280, 281, 347, 459, 461, 460, 462, + 463, 464, 313, 320, 454, 456, 455, 319, 0, 332, + 392, 431, 331, 360, 321, 322, 324, 323, 465, 466, + 467, 471, 470, 468, 469, 472, 473, 474, 475, 477, + 476, 486, 0, 490, 491, 0, 0, 492, 478, 484, + 479, 480, 481, 483, 485, 482, 257, 258, 259, 260, + 261, 504, 506, 505, 508, 509, 510, 511, 507, 534, + 536, 537, 538, 539, 540, 541, 542, 543, 544, 535, + 545, 546, 547, 548, 549, 550, 551, 552, 557, 562, + 580, 581, 582, 585, 583, 584, 586, 587, 588, 589, + 599, 600, 601, 602, 603, 604, 611, 612, 396, 426, + 443, 565, 566, 450, 451, 437, 438, 0, 0, 0, + 442, 605, 487, 488, 489, 441, 439, 440 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, 578, - 579, 580, 581, 582, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, - -281, -281, -281, -281, -281, -281 + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + 581, 582, 583, 584, 585, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286, -286, -286, + -286, -286, -286, -286, -286, -286, -286, -286 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 16, 17, 30, 238, 18, 31, 441, 19, - 32, 455, 20, 33, 469, 21, 34, 485, 499, 500, - 501, 502, 503, 22, 35, 504, 239, 240, 241, 242, - 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, - 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, - 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, - 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, - 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, - 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, - 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, - 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, - 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, - 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, - 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, - 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, - 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, - 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, - 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, - 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, - 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, - 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, - 423, 424, 425, 426, 427, 428, 442, 443, 444, 445, - 446, 447, 448, 456, 457, 458, 459, 460, 461, 486, - 487, 488, 489, 490, 491, 492, 493, 470, 471, 472, - 473, 474, 475, 476, 23, 36, 518, 519, 520, 521, - 522, 523, 524, 525, 526, 24, 37, 545, 546, 547, - 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, - 558, 559, 560, 561, 562, 563, 25, 38, 565, 566, - 26, 39, 568, 569, 429, 430, 431, 432, 27, 40, - 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, - 590, 28, 41, 597, 598, 599, 600, 601, 602, 603, - 433, 29, 42, 606, 607, 608 -}; - - /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule whose - number is the opposite. If YYTABLE_NINF, syntax error. */ -static const yytype_uint16 yytable[] = -{ - 2, 477, 434, 462, 435, 436, 564, 449, 604, 605, - 567, 3, 609, 610, 611, 450, 451, 527, 528, 529, - 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, - 540, 541, 542, 543, 544, 612, 613, 477, 614, 463, - 464, 615, 616, 617, 618, 4, 619, 620, 621, 622, - 623, 5, 570, 571, 572, 573, 574, 575, 576, 577, - 578, 579, 624, 625, 465, 437, 510, 511, 512, 513, - 514, 515, 516, 517, 591, 592, 593, 594, 595, 596, - 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, - 636, 637, 638, 639, 640, 6, 438, 641, 642, 439, - 452, 643, 453, 644, 645, 646, 647, 648, 649, 650, - 651, 7, 652, 653, 654, 655, 656, 657, 658, 659, - 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, - 670, 466, 467, 671, 672, 673, 674, 675, 676, 677, - 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, - 688, 689, 8, 690, 691, 692, 693, 694, 695, 696, - 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, - 707, 468, 708, 709, 710, 711, 712, 713, 714, 715, - 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, - 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, - 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, - 9, 746, 747, 479, 480, 481, 748, 749, 750, 751, - 752, 753, 754, 484, 755, 756, 757, 758, 440, 10, - 759, 760, 454, 761, 762, 763, 764, 765, 766, 767, - 768, 494, 495, 496, 497, 498, 11, 478, 769, 479, - 480, 481, 482, 483, 770, 12, 771, 772, 773, 484, - 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, - 784, 785, 786, 787, 788, 789, 790, 791, 792, 13, - 793, 794, 795, 14, 796, 797, 798, 799, 0, 15, - 43, 44, 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, 800, 801, 802, 803, 75, 76, 77, 804, - 805, 806, 78, 79, 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, 807, 808, 809, 810, 811, 812, 813, - 814, 815, 119, 120, 121, 816, 122, 123, 124, 817, - 818, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 819, 820, 821, 149, 822, - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, - 833, 834, 835, 836, 837, 838, 839, 840, 841, 160, - 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 194, 195, 196, 197, 198, 842, 199, - 843, 200, 201, 202, 203, 204, 205, 206, 207, 208, - 209, 210, 211, 212, 213, 214, 215, 844, 845, 846, - 847, 848, 849, 850, 851, 852, 853, 854, 216, 217, - 218, 219, 220, 221, 855, 856, 857, 858, 859, 860, - 861, 222, 862, 863, 864, 865, 866, 867, 868, 223, - 224, 869, 225, 226, 870, 227, 228, 871, 872, 229, - 230, 231, 232, 233, 234, 235, 236, 873, 874, 875, - 237, 876, 877, 878, 879, 880, 881, 882, 883, 884, - 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, - 895, 896, 897, 898, 899, 900, 901, 902, 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, 505, 506, 507, 508, 509 -}; - -static const yytype_int16 yycheck[] = -{ - 0, 44, 44, 44, 46, 47, 112, 44, 280, 281, - 290, 11, 10, 10, 10, 52, 53, 153, 154, 155, - 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 10, 10, 44, 10, 80, - 81, 10, 10, 10, 10, 45, 10, 10, 10, 10, - 10, 51, 230, 231, 232, 233, 234, 235, 236, 237, - 238, 239, 10, 10, 105, 107, 96, 97, 98, 99, - 100, 101, 102, 103, 247, 248, 249, 250, 251, 252, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 95, 138, 10, 10, 141, - 137, 10, 139, 10, 10, 10, 10, 10, 10, 10, - 10, 111, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 172, 173, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 152, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 212, 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, - 210, 10, 10, 256, 257, 258, 10, 10, 10, 10, - 10, 10, 10, 266, 10, 10, 10, 10, 270, 229, - 10, 10, 269, 10, 10, 10, 10, 10, 10, 10, - 10, 284, 285, 286, 287, 288, 246, 254, 10, 256, - 257, 258, 259, 260, 10, 255, 10, 10, 10, 266, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 279, - 10, 10, 10, 283, 10, 10, 10, 10, -1, 289, - 12, 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, 10, 10, 10, 10, 48, 49, 50, 10, - 10, 10, 54, 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, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 104, 105, 106, 10, 108, 109, 110, 10, - 10, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 10, 10, 10, 140, 10, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 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, 10, 211, - 10, 213, 214, 215, 216, 217, 218, 219, 220, 221, - 222, 223, 224, 225, 226, 227, 228, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 240, 241, - 242, 243, 244, 245, 10, 10, 10, 10, 10, 10, - 10, 253, 10, 10, 10, 10, 10, 10, 10, 261, - 262, 10, 264, 265, 10, 267, 268, 10, 10, 271, - 272, 273, 274, 275, 276, 277, 278, 10, 10, 10, - 282, 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, -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, 35, 35, 35, 35, 35 -}; - - /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint16 yystos[] = -{ - 0, 292, 0, 11, 45, 51, 95, 111, 152, 210, - 229, 246, 255, 279, 283, 289, 293, 294, 297, 300, - 303, 306, 314, 535, 546, 567, 571, 579, 592, 602, - 295, 298, 301, 304, 307, 315, 536, 547, 568, 572, - 580, 593, 603, 12, 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, 48, 49, 50, 54, 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, 104, - 105, 106, 108, 109, 110, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 140, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - 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, 211, - 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 223, 224, 225, 226, 227, 228, 240, 241, 242, 243, - 244, 245, 253, 261, 262, 264, 265, 267, 268, 271, - 272, 273, 274, 275, 276, 277, 278, 282, 296, 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, 451, 452, 453, 454, 455, 456, 457, - 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, - 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, - 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, - 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, - 498, 499, 500, 501, 502, 503, 504, 505, 506, 575, - 576, 577, 578, 601, 44, 46, 47, 107, 138, 141, - 270, 299, 507, 508, 509, 510, 511, 512, 513, 44, - 52, 53, 137, 139, 269, 302, 514, 515, 516, 517, - 518, 519, 44, 80, 81, 105, 172, 173, 212, 305, - 528, 529, 530, 531, 532, 533, 534, 44, 254, 256, - 257, 258, 259, 260, 266, 308, 520, 521, 522, 523, - 524, 525, 526, 527, 284, 285, 286, 287, 288, 309, - 310, 311, 312, 313, 316, 520, 521, 522, 523, 524, - 96, 97, 98, 99, 100, 101, 102, 103, 537, 538, - 539, 540, 541, 542, 543, 544, 545, 153, 154, 155, - 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 548, 549, 550, 551, 552, - 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, - 563, 564, 565, 566, 112, 569, 570, 290, 573, 574, - 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, - 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, - 591, 247, 248, 249, 250, 251, 252, 594, 595, 596, - 597, 598, 599, 600, 280, 281, 604, 605, 606, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 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, 291, 292, 292, 293, 293, 293, 293, 293, 293, - 293, 293, 293, 293, 293, 293, 293, 294, 295, 295, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 297, 298, 298, 299, 299, - 299, 299, 299, 299, 299, 300, 301, 301, 302, 302, - 302, 302, 302, 302, 303, 304, 304, 305, 305, 305, - 305, 305, 305, 305, 306, 307, 307, 308, 308, 308, - 308, 308, 308, 308, 308, 309, 310, 311, 312, 313, - 314, 315, 315, 316, 316, 316, 316, 316, 316, 316, - 316, 316, 316, 317, 318, 319, 320, 321, 322, 323, + -1, 1, 17, 18, 19, 32, 240, 20, 33, 443, + 21, 34, 457, 22, 35, 471, 23, 36, 487, 501, + 502, 503, 504, 505, 24, 37, 506, 241, 242, 243, + 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, + 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, + 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, + 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, + 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, + 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, @@ -1953,36 +1673,326 @@ static const yytype_uint16 yyr1[] = 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, 451, 452, 453, - 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, - 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, - 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, - 484, 485, 486, 487, 488, 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, 528, 529, 530, 531, 532, 533, - 534, 535, 536, 536, 537, 537, 537, 537, 537, 537, - 537, 537, 538, 539, 540, 541, 542, 543, 544, 545, - 546, 547, 547, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, + 424, 425, 426, 427, 428, 429, 430, 444, 445, 446, + 447, 448, 449, 450, 458, 459, 460, 461, 462, 463, + 488, 489, 490, 491, 492, 493, 494, 495, 472, 473, + 474, 475, 476, 477, 478, 25, 38, 520, 521, 522, + 523, 524, 525, 526, 527, 528, 26, 39, 548, 549, + 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, + 560, 561, 562, 563, 564, 565, 566, 567, 27, 40, + 569, 570, 28, 41, 572, 573, 431, 432, 433, 434, + 29, 42, 584, 585, 586, 587, 588, 589, 590, 591, + 592, 593, 594, 30, 43, 601, 602, 603, 604, 605, + 606, 607, 435, 31, 44, 610, 611, 612 +}; + + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ +static const yytype_uint16 yytable[] = +{ + 2, 479, 464, 436, 568, 437, 438, 571, 451, 608, + 609, 3, 4, 613, 614, 615, 452, 453, 595, 596, + 597, 598, 599, 600, 479, 574, 575, 576, 577, 578, + 579, 580, 581, 582, 583, 616, 617, 618, 465, 466, + 619, 620, 621, 622, 623, 624, 5, 625, 626, 627, + 628, 629, 6, 630, 631, 632, 633, 634, 635, 636, + 637, 638, 639, 467, 640, 641, 439, 529, 530, 531, + 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, + 542, 543, 544, 545, 546, 547, 512, 513, 514, 515, + 516, 517, 518, 519, 642, 643, 7, 440, 644, 645, + 441, 454, 646, 455, 647, 648, 649, 650, 651, 652, + 653, 654, 8, 655, 656, 657, 658, 659, 660, 661, + 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, + 672, 468, 469, 673, 674, 675, 676, 677, 678, 679, + 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, + 690, 691, 692, 9, 693, 694, 695, 696, 697, 698, + 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, + 709, 470, 710, 711, 712, 713, 714, 715, 716, 717, + 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, + 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, + 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, + 748, 749, 10, 750, 481, 482, 483, 751, 752, 753, + 754, 755, 756, 757, 486, 758, 759, 760, 761, 762, + 442, 11, 763, 764, 456, 480, 765, 481, 482, 483, + 484, 485, 496, 497, 498, 499, 500, 486, 12, 766, + 767, 768, 769, 770, 771, 772, 773, 13, 774, 775, + 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, + 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, + 796, 14, 797, 798, 799, 15, 800, 801, 802, 0, + 803, 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, 804, 805, 806, 807, 77, 78, + 79, 808, 809, 810, 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, 811, 812, 813, 814, 815, + 816, 817, 818, 819, 121, 122, 123, 820, 124, 125, + 126, 821, 822, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 823, 824, 825, + 151, 826, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 827, 828, 829, 830, 831, 832, 833, 834, + 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, + 845, 846, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, + 200, 847, 201, 848, 202, 203, 204, 205, 206, 207, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, + 859, 218, 219, 220, 221, 222, 223, 860, 861, 862, + 863, 864, 865, 866, 224, 867, 868, 869, 870, 871, + 872, 873, 225, 226, 874, 227, 228, 875, 229, 230, + 876, 877, 231, 232, 233, 234, 235, 236, 237, 238, + 878, 879, 880, 239, 881, 882, 883, 884, 885, 886, + 887, 888, 889, 890, 891, 892, 893, 894, 895, 896, + 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, + 907, 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, 507, 508, + 509, 510, 511 +}; + +static const yytype_int16 yycheck[] = +{ + 0, 45, 45, 45, 113, 47, 48, 292, 45, 282, + 283, 11, 12, 10, 10, 10, 53, 54, 249, 250, + 251, 252, 253, 254, 45, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 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, 154, 155, 156, + 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 97, 98, 99, 100, + 101, 102, 103, 104, 10, 10, 96, 139, 10, 10, + 142, 138, 10, 140, 10, 10, 10, 10, 10, 10, + 10, 10, 112, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 174, 175, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 153, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 214, 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, 212, 10, 258, 259, 260, 10, 10, 10, + 10, 10, 10, 10, 268, 10, 10, 10, 10, 10, + 272, 231, 10, 10, 271, 256, 10, 258, 259, 260, + 261, 262, 286, 287, 288, 289, 290, 268, 248, 10, + 10, 10, 10, 10, 10, 10, 10, 257, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 281, 10, 10, 10, 285, 10, 10, 10, -1, + 10, 291, 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, 10, 143, 144, 145, 146, 147, 148, 149, 150, + 151, 152, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 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, 210, + 211, 10, 213, 10, 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 242, 243, 244, 245, 246, 247, 10, 10, 10, + 10, 10, 10, 10, 255, 10, 10, 10, 10, 10, + 10, 10, 263, 264, 10, 266, 267, 10, 269, 270, + 10, 10, 273, 274, 275, 276, 277, 278, 279, 280, + 10, 10, 10, 284, 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, -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, 37, 37, + 37, 37, 37 +}; + + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint16 yystos[] = +{ + 0, 294, 0, 11, 12, 46, 52, 96, 112, 153, + 212, 231, 248, 257, 281, 285, 291, 295, 296, 297, + 300, 303, 306, 309, 317, 538, 549, 571, 575, 583, + 596, 606, 298, 301, 304, 307, 310, 318, 539, 550, + 572, 576, 584, 597, 607, 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, + 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, 105, 106, 107, 109, 110, 111, 114, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 141, 143, 144, 145, 146, 147, 148, 149, 150, + 151, 152, 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, 210, + 211, 213, 215, 216, 217, 218, 219, 220, 221, 222, + 223, 224, 225, 226, 227, 228, 229, 230, 242, 243, + 244, 245, 246, 247, 255, 263, 264, 266, 267, 269, + 270, 273, 274, 275, 276, 277, 278, 279, 280, 284, + 299, 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, 451, 452, 453, 454, 455, 456, 457, 458, + 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, + 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, + 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, + 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, + 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, + 509, 579, 580, 581, 582, 605, 45, 47, 48, 108, + 139, 142, 272, 302, 510, 511, 512, 513, 514, 515, + 516, 45, 53, 54, 138, 140, 271, 305, 517, 518, + 519, 520, 521, 522, 45, 81, 82, 106, 174, 175, + 214, 308, 531, 532, 533, 534, 535, 536, 537, 45, + 256, 258, 259, 260, 261, 262, 268, 311, 523, 524, + 525, 526, 527, 528, 529, 530, 286, 287, 288, 289, + 290, 312, 313, 314, 315, 316, 319, 523, 524, 525, + 526, 527, 97, 98, 99, 100, 101, 102, 103, 104, + 540, 541, 542, 543, 544, 545, 546, 547, 548, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 551, 552, + 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, + 563, 564, 565, 566, 567, 568, 569, 570, 113, 573, + 574, 292, 577, 578, 232, 233, 234, 235, 236, 237, + 238, 239, 240, 241, 585, 586, 587, 588, 589, 590, + 591, 592, 593, 594, 595, 249, 250, 251, 252, 253, + 254, 598, 599, 600, 601, 602, 603, 604, 282, 283, + 608, 609, 610, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 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, 293, 294, 294, 295, 295, 295, 295, 295, 295, + 295, 295, 295, 295, 295, 295, 295, 295, 296, 297, + 298, 298, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 300, 301, 301, + 302, 302, 302, 302, 302, 302, 302, 303, 304, 304, + 305, 305, 305, 305, 305, 305, 306, 307, 307, 308, + 308, 308, 308, 308, 308, 308, 309, 310, 310, 311, + 311, 311, 311, 311, 311, 311, 311, 312, 313, 314, + 315, 316, 317, 318, 318, 319, 319, 319, 319, 319, + 319, 319, 319, 319, 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, 451, 452, 453, 454, + 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, + 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, + 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, + 485, 486, 487, 488, 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, 528, 529, 530, 531, 532, 533, 534, + 535, 536, 537, 538, 539, 539, 540, 540, 540, 540, + 540, 540, 540, 540, 541, 542, 543, 544, 545, 546, + 547, 548, 549, 550, 550, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, - 568, 568, 569, 570, 571, 572, 572, 573, 574, 575, - 576, 577, 578, 579, 580, 580, 581, 581, 581, 581, - 581, 581, 581, 581, 581, 581, 582, 583, 584, 585, - 586, 587, 588, 589, 590, 591, 592, 593, 593, 594, - 594, 594, 594, 594, 594, 595, 596, 597, 598, 599, - 600, 601, 602, 603, 603, 604, 604, 605, 606 + 568, 569, 570, 571, 572, 572, 573, 574, 575, 576, + 576, 577, 578, 579, 580, 581, 582, 583, 584, 584, + 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, + 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, + 596, 597, 597, 598, 598, 598, 598, 598, 598, 599, + 600, 601, 602, 603, 604, 605, 606, 607, 607, 608, + 608, 609, 610 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 0, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, + 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, + 2, 0, 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, @@ -2001,14 +2011,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, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, - 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 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, - 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2020,28 +2029,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, 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, 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, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 3, 3, 3, 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, 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, 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, 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 }; @@ -2717,16 +2727,24 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 17: + case 18: #line 191 "./util/configparser.y" /* yacc.c:1646 */ - { - OUTYY(("\nP(server:)\n")); + { + OUTYY(("\nP(force-toplevel)\n")); } -#line 2726 "util/configparser.c" /* yacc.c:1646 */ +#line 2736 "util/configparser.c" /* yacc.c:1646 */ break; - case 215: -#line 286 "./util/configparser.y" /* yacc.c:1646 */ + case 19: +#line 197 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("\nP(server:)\n")); + } +#line 2744 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 217: +#line 292 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2737,11 +2755,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2741 "util/configparser.c" /* yacc.c:1646 */ +#line 2759 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: -#line 303 "./util/configparser.y" /* yacc.c:1646 */ + case 227: +#line 309 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2752,11 +2770,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2756 "util/configparser.c" /* yacc.c:1646 */ +#line 2774 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 320 "./util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 326 "./util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2769,11 +2787,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2773 "util/configparser.c" /* yacc.c:1646 */ +#line 2791 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 339 "./util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 345 "./util/configparser.y" /* yacc.c:1646 */ { struct config_auth* s; OUTYY(("\nP(auth_zone:)\n")); @@ -2789,11 +2807,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2793 "util/configparser.c" /* yacc.c:1646 */ +#line 2811 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 363 "./util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 369 "./util/configparser.y" /* yacc.c:1646 */ { uint8_t* bitlist; size_t len = 0; @@ -2810,11 +2828,11 @@ yyreduce: } } -#line 2814 "util/configparser.c" /* yacc.c:1646 */ +#line 2832 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 382 "./util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 388 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 && @@ -2829,21 +2847,21 @@ yyreduce: cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str); } } -#line 2833 "util/configparser.c" /* yacc.c:1646 */ +#line 2851 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 399 "./util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 405 "./util/configparser.y" /* yacc.c:1646 */ { 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 2843 "util/configparser.c" /* yacc.c:1646 */ +#line 2861 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 407 "./util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 413 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2851,21 +2869,21 @@ yyreduce: else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2855 "util/configparser.c" /* yacc.c:1646 */ +#line 2873 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 417 "./util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 423 "./util/configparser.y" /* yacc.c:1646 */ { 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 2865 "util/configparser.c" /* yacc.c:1646 */ +#line 2883 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 425 "./util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 431 "./util/configparser.y" /* yacc.c:1646 */ { struct config_auth* s; OUTYY(("\nP(rpz:)\n")); @@ -2881,11 +2899,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2885 "util/configparser.c" /* yacc.c:1646 */ +#line 2903 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 448 "./util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 454 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2893,11 +2911,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2897 "util/configparser.c" /* yacc.c:1646 */ +#line 2915 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 457 "./util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 463 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2905,11 +2923,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2909 "util/configparser.c" /* yacc.c:1646 */ +#line 2927 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 466 "./util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 472 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2919,11 +2937,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2923 "util/configparser.c" /* yacc.c:1646 */ +#line 2941 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 477 "./util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 483 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2931,11 +2949,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2935 "util/configparser.c" /* yacc.c:1646 */ +#line 2953 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 486 "./util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 492 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2943,11 +2961,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2947 "util/configparser.c" /* yacc.c:1646 */ +#line 2965 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 495 "./util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 501 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2955,11 +2973,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2959 "util/configparser.c" /* yacc.c:1646 */ +#line 2977 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 504 "./util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 510 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2969,11 +2987,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2973 "util/configparser.c" /* yacc.c:1646 */ +#line 2991 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 515 "./util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 521 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2981,11 +2999,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2985 "util/configparser.c" /* yacc.c:1646 */ +#line 3003 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 524 "./util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 530 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -2996,11 +3014,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 3000 "util/configparser.c" /* yacc.c:1646 */ +#line 3018 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 536 "./util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 542 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -3012,11 +3030,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 3016 "util/configparser.c" /* yacc.c:1646 */ +#line 3034 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 550 "./util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 556 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -3030,11 +3048,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3034 "util/configparser.c" /* yacc.c:1646 */ +#line 3052 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 565 "./util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 571 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -3044,11 +3062,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3048 "util/configparser.c" /* yacc.c:1646 */ +#line 3066 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 576 "./util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 582 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -3064,11 +3082,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3068 "util/configparser.c" /* yacc.c:1646 */ +#line 3086 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 593 "./util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 599 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -3084,11 +3102,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3088 "util/configparser.c" /* yacc.c:1646 */ +#line 3106 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 610 "./util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 616 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -3104,11 +3122,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3108 "util/configparser.c" /* yacc.c:1646 */ +#line 3126 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 627 "./util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 633 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -3124,11 +3142,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3128 "util/configparser.c" /* yacc.c:1646 */ +#line 3146 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 644 "./util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 650 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str))); @@ -3142,11 +3160,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3146 "util/configparser.c" /* yacc.c:1646 */ +#line 3164 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 659 "./util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 665 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str))); @@ -3160,11 +3178,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3164 "util/configparser.c" /* yacc.c:1646 */ +#line 3182 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 674 "./util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 680 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -3176,11 +3194,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 3180 "util/configparser.c" /* yacc.c:1646 */ +#line 3198 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 687 "./util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 693 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -3194,11 +3212,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 3198 "util/configparser.c" /* yacc.c:1646 */ +#line 3216 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 702 "./util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 708 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3206,11 +3224,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3210 "util/configparser.c" /* yacc.c:1646 */ +#line 3228 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 711 "./util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 717 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -3218,11 +3236,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3222 "util/configparser.c" /* yacc.c:1646 */ +#line 3240 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 720 "./util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 726 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -3230,11 +3248,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3234 "util/configparser.c" /* yacc.c:1646 */ +#line 3252 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 729 "./util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 735 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3242,11 +3260,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3246 "util/configparser.c" /* yacc.c:1646 */ +#line 3264 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 738 "./util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 744 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3254,11 +3272,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3258 "util/configparser.c" /* yacc.c:1646 */ +#line 3276 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 747 "./util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 753 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3266,11 +3284,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3270 "util/configparser.c" /* yacc.c:1646 */ +#line 3288 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 756 "./util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 762 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3278,11 +3296,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3282 "util/configparser.c" /* yacc.c:1646 */ +#line 3300 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 765 "./util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 771 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3290,11 +3308,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3294 "util/configparser.c" /* yacc.c:1646 */ +#line 3312 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 774 "./util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 780 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3302,11 +3320,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3306 "util/configparser.c" /* yacc.c:1646 */ +#line 3324 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 783 "./util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 789 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3314,11 +3332,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3318 "util/configparser.c" /* yacc.c:1646 */ +#line 3336 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 792 "./util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 798 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3326,11 +3344,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3330 "util/configparser.c" /* yacc.c:1646 */ +#line 3348 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 801 "./util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 807 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3338,11 +3356,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3342 "util/configparser.c" /* yacc.c:1646 */ +#line 3360 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 810 "./util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 816 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3350,11 +3368,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3354 "util/configparser.c" /* yacc.c:1646 */ +#line 3372 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 819 "./util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 825 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3362,11 +3380,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3366 "util/configparser.c" /* yacc.c:1646 */ +#line 3384 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 828 "./util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 834 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3378,11 +3396,11 @@ yyreduce: else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3382 "util/configparser.c" /* yacc.c:1646 */ +#line 3400 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 841 "./util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 847 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3390,11 +3408,11 @@ yyreduce: else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3394 "util/configparser.c" /* yacc.c:1646 */ +#line 3412 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 850 "./util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 856 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3406,11 +3424,11 @@ yyreduce: else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3410 "util/configparser.c" /* yacc.c:1646 */ +#line 3428 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 863 "./util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 869 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3418,11 +3436,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3422 "util/configparser.c" /* yacc.c:1646 */ +#line 3440 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 872 "./util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 878 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -3430,11 +3448,11 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3434 "util/configparser.c" /* yacc.c:1646 */ +#line 3452 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 881 "./util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 887 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3442,31 +3460,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3446 "util/configparser.c" /* yacc.c:1646 */ +#line 3464 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 890 "./util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 896 "./util/configparser.y" /* yacc.c:1646 */ { 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 3456 "util/configparser.c" /* yacc.c:1646 */ +#line 3474 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 897 "./util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 903 "./util/configparser.y" /* yacc.c:1646 */ { 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 3466 "util/configparser.c" /* yacc.c:1646 */ +#line 3484 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 904 "./util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 910 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3474,21 +3492,21 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3478 "util/configparser.c" /* yacc.c:1646 */ +#line 3496 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 913 "./util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 919 "./util/configparser.y" /* yacc.c:1646 */ { 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 3488 "util/configparser.c" /* yacc.c:1646 */ +#line 3506 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 920 "./util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 926 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3496,53 +3514,53 @@ yyreduce: else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3500 "util/configparser.c" /* yacc.c:1646 */ +#line 3518 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 929 "./util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 935 "./util/configparser.y" /* yacc.c:1646 */ { 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 3511 "util/configparser.c" /* yacc.c:1646 */ +#line 3529 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 937 "./util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 943 "./util/configparser.y" /* yacc.c:1646 */ { 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 3521 "util/configparser.c" /* yacc.c:1646 */ +#line 3539 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 944 "./util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 950 "./util/configparser.y" /* yacc.c:1646 */ { 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 3531 "util/configparser.c" /* yacc.c:1646 */ +#line 3549 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 951 "./util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 957 "./util/configparser.y" /* yacc.c:1646 */ { 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 3542 "util/configparser.c" /* yacc.c:1646 */ +#line 3560 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 959 "./util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 965 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3550,11 +3568,11 @@ yyreduce: else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3554 "util/configparser.c" /* yacc.c:1646 */ +#line 3572 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 968 "./util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 974 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3562,11 +3580,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3566 "util/configparser.c" /* yacc.c:1646 */ +#line 3584 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 977 "./util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 983 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3574,11 +3592,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3578 "util/configparser.c" /* yacc.c:1646 */ +#line 3596 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 986 "./util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 992 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3591,11 +3609,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3595 "util/configparser.c" /* yacc.c:1646 */ +#line 3613 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1000 "./util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1006 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3603,11 +3621,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3607 "util/configparser.c" /* yacc.c:1646 */ +#line 3625 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1009 "./util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1015 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3615,11 +3633,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3619 "util/configparser.c" /* yacc.c:1646 */ +#line 3637 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1018 "./util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1024 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3627,11 +3645,11 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3631 "util/configparser.c" /* yacc.c:1646 */ +#line 3649 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1027 "./util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1033 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3639,11 +3657,11 @@ yyreduce: else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3643 "util/configparser.c" /* yacc.c:1646 */ +#line 3661 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1036 "./util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1042 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3651,11 +3669,11 @@ yyreduce: else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3655 "util/configparser.c" /* yacc.c:1646 */ +#line 3673 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1045 "./util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1051 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3663,31 +3681,31 @@ yyreduce: else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3667 "util/configparser.c" /* yacc.c:1646 */ +#line 3685 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1054 "./util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1060 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 3677 "util/configparser.c" /* yacc.c:1646 */ +#line 3695 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1061 "./util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1067 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 3687 "util/configparser.c" /* yacc.c:1646 */ +#line 3705 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1068 "./util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1074 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3712,105 +3730,105 @@ yyreduce: } } } -#line 3716 "util/configparser.c" /* yacc.c:1646 */ +#line 3734 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1094 "./util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1100 "./util/configparser.y" /* yacc.c:1646 */ { 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 3727 "util/configparser.c" /* yacc.c:1646 */ +#line 3745 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1102 "./util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1108 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 3737 "util/configparser.c" /* yacc.c:1646 */ +#line 3755 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1109 "./util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1115 "./util/configparser.y" /* yacc.c:1646 */ { 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 3747 "util/configparser.c" /* yacc.c:1646 */ +#line 3765 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1116 "./util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1122 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dlv_anchor_file); cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str); } -#line 3757 "util/configparser.c" /* yacc.c:1646 */ +#line 3775 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1123 "./util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1129 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3767 "util/configparser.c" /* yacc.c:1646 */ +#line 3785 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1130 "./util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1136 "./util/configparser.y" /* yacc.c:1646 */ { 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 3778 "util/configparser.c" /* yacc.c:1646 */ +#line 3796 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1138 "./util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1144 "./util/configparser.y" /* yacc.c:1646 */ { 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 3789 "util/configparser.c" /* yacc.c:1646 */ +#line 3807 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1146 "./util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1152 "./util/configparser.y" /* yacc.c:1646 */ { 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 3800 "util/configparser.c" /* yacc.c:1646 */ +#line 3818 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1154 "./util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1160 "./util/configparser.y" /* yacc.c:1646 */ { 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 3810 "util/configparser.c" /* yacc.c:1646 */ +#line 3828 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1161 "./util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1167 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3820,11 +3838,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3824 "util/configparser.c" /* yacc.c:1646 */ +#line 3842 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1172 "./util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1178 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3834,21 +3852,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3838 "util/configparser.c" /* yacc.c:1646 */ +#line 3856 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1183 "./util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1189 "./util/configparser.y" /* yacc.c:1646 */ { 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 3848 "util/configparser.c" /* yacc.c:1646 */ +#line 3866 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1190 "./util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1196 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3856,11 +3874,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3860 "util/configparser.c" /* yacc.c:1646 */ +#line 3878 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1199 "./util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1205 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3868,11 +3886,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3872 "util/configparser.c" /* yacc.c:1646 */ +#line 3890 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1208 "./util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1214 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3880,53 +3898,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3884 "util/configparser.c" /* yacc.c:1646 */ +#line 3902 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1217 "./util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1223 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 3894 "util/configparser.c" /* yacc.c:1646 */ +#line 3912 "util/configparser.c" /* yacc.c:1646 */ break; - case 351: -#line 1224 "./util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1230 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 3904 "util/configparser.c" /* yacc.c:1646 */ +#line 3922 "util/configparser.c" /* yacc.c:1646 */ break; - case 352: -#line 1231 "./util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1237 "./util/configparser.y" /* yacc.c:1646 */ { 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 3915 "util/configparser.c" /* yacc.c:1646 */ +#line 3933 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1239 "./util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1245 "./util/configparser.y" /* yacc.c:1646 */ { 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 3926 "util/configparser.c" /* yacc.c:1646 */ +#line 3944 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1247 "./util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1253 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3935,11 +3953,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3939 "util/configparser.c" /* yacc.c:1646 */ +#line 3957 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1257 "./util/configparser.y" /* yacc.c:1646 */ + case 357: +#line 1263 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3948,11 +3966,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3952 "util/configparser.c" /* yacc.c:1646 */ +#line 3970 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1267 "./util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1273 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3961,11 +3979,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3965 "util/configparser.c" /* yacc.c:1646 */ +#line 3983 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1277 "./util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1283 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3978,22 +3996,22 @@ yyreduce: cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3982 "util/configparser.c" /* yacc.c:1646 */ +#line 4000 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1291 "./util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1297 "./util/configparser.y" /* yacc.c:1646 */ { 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 3993 "util/configparser.c" /* yacc.c:1646 */ +#line 4011 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1299 "./util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1305 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4005,11 +4023,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4009 "util/configparser.c" /* yacc.c:1646 */ +#line 4027 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1312 "./util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1318 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4019,22 +4037,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4023 "util/configparser.c" /* yacc.c:1646 */ +#line 4041 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1323 "./util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1329 "./util/configparser.y" /* yacc.c:1646 */ { 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 4034 "util/configparser.c" /* yacc.c:1646 */ +#line 4052 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1331 "./util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1337 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4046,11 +4064,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4050 "util/configparser.c" /* yacc.c:1646 */ +#line 4068 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1344 "./util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1350 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4058,11 +4076,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4062 "util/configparser.c" /* yacc.c:1646 */ +#line 4080 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1353 "./util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1359 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4070,11 +4088,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4074 "util/configparser.c" /* yacc.c:1646 */ +#line 4092 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1362 "./util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1368 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4082,11 +4100,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4086 "util/configparser.c" /* yacc.c:1646 */ +#line 4104 "util/configparser.c" /* yacc.c:1646 */ break; - case 366: -#line 1371 "./util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1377 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4095,11 +4113,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4099 "util/configparser.c" /* yacc.c:1646 */ +#line 4117 "util/configparser.c" /* yacc.c:1646 */ break; - case 367: -#line 1381 "./util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1387 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4108,22 +4126,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4112 "util/configparser.c" /* yacc.c:1646 */ +#line 4130 "util/configparser.c" /* yacc.c:1646 */ break; - case 368: -#line 1391 "./util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1397 "./util/configparser.y" /* yacc.c:1646 */ { 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 4123 "util/configparser.c" /* yacc.c:1646 */ +#line 4141 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1399 "./util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1405 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4135,11 +4153,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4139 "util/configparser.c" /* yacc.c:1646 */ +#line 4157 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1412 "./util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1418 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4147,22 +4165,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4151 "util/configparser.c" /* yacc.c:1646 */ +#line 4169 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1421 "./util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1427 "./util/configparser.y" /* yacc.c:1646 */ { 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 4162 "util/configparser.c" /* yacc.c:1646 */ +#line 4180 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 1429 "./util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1435 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4170,22 +4188,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4174 "util/configparser.c" /* yacc.c:1646 */ +#line 4192 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 1438 "./util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1444 "./util/configparser.y" /* yacc.c:1646 */ { 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 4185 "util/configparser.c" /* yacc.c:1646 */ +#line 4203 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 1446 "./util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 1452 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4197,11 +4215,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4201 "util/configparser.c" /* yacc.c:1646 */ +#line 4219 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 1459 "./util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 1465 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4209,21 +4227,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4213 "util/configparser.c" /* yacc.c:1646 */ +#line 4231 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 1468 "./util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 1474 "./util/configparser.y" /* yacc.c:1646 */ { 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 4223 "util/configparser.c" /* yacc.c:1646 */ +#line 4241 "util/configparser.c" /* yacc.c:1646 */ break; - case 377: -#line 1475 "./util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 1481 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4232,11 +4250,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4236 "util/configparser.c" /* yacc.c:1646 */ +#line 4254 "util/configparser.c" /* yacc.c:1646 */ break; - case 378: -#line 1485 "./util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 1491 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4245,11 +4263,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4249 "util/configparser.c" /* yacc.c:1646 */ +#line 4267 "util/configparser.c" /* yacc.c:1646 */ break; - case 379: -#line 1495 "./util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1501 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4258,11 +4276,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4262 "util/configparser.c" /* yacc.c:1646 */ +#line 4280 "util/configparser.c" /* yacc.c:1646 */ break; - case 380: -#line 1505 "./util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 1511 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4271,11 +4289,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4275 "util/configparser.c" /* yacc.c:1646 */ +#line 4293 "util/configparser.c" /* yacc.c:1646 */ break; - case 381: -#line 1515 "./util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 1521 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4284,11 +4302,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4288 "util/configparser.c" /* yacc.c:1646 */ +#line 4306 "util/configparser.c" /* yacc.c:1646 */ break; - case 382: -#line 1525 "./util/configparser.y" /* yacc.c:1646 */ + case 384: +#line 1531 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4297,11 +4315,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4301 "util/configparser.c" /* yacc.c:1646 */ +#line 4319 "util/configparser.c" /* yacc.c:1646 */ break; - case 383: -#line 1535 "./util/configparser.y" /* yacc.c:1646 */ + case 385: +#line 1541 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4310,11 +4328,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4314 "util/configparser.c" /* yacc.c:1646 */ +#line 4332 "util/configparser.c" /* yacc.c:1646 */ break; - case 384: -#line 1545 "./util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 1551 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -4323,41 +4341,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4327 "util/configparser.c" /* yacc.c:1646 */ +#line 4345 "util/configparser.c" /* yacc.c:1646 */ break; - case 385: -#line 1555 "./util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 1561 "./util/configparser.y" /* yacc.c:1646 */ { 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 4337 "util/configparser.c" /* yacc.c:1646 */ +#line 4355 "util/configparser.c" /* yacc.c:1646 */ break; - case 386: -#line 1562 "./util/configparser.y" /* yacc.c:1646 */ + case 388: +#line 1568 "./util/configparser.y" /* yacc.c:1646 */ { 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 4347 "util/configparser.c" /* yacc.c:1646 */ +#line 4365 "util/configparser.c" /* yacc.c:1646 */ break; - case 387: -#line 1569 "./util/configparser.y" /* yacc.c:1646 */ + case 389: +#line 1575 "./util/configparser.y" /* yacc.c:1646 */ { 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 4357 "util/configparser.c" /* yacc.c:1646 */ +#line 4375 "util/configparser.c" /* yacc.c:1646 */ break; - case 388: -#line 1576 "./util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 1582 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4365,11 +4383,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4369 "util/configparser.c" /* yacc.c:1646 */ +#line 4387 "util/configparser.c" /* yacc.c:1646 */ break; - case 389: -#line 1585 "./util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 1591 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4377,11 +4395,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4381 "util/configparser.c" /* yacc.c:1646 */ +#line 4399 "util/configparser.c" /* yacc.c:1646 */ break; - case 390: -#line 1594 "./util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 1600 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4389,11 +4407,11 @@ yyreduce: else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4393 "util/configparser.c" /* yacc.c:1646 */ +#line 4411 "util/configparser.c" /* yacc.c:1646 */ break; - case 391: -#line 1603 "./util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 1609 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4401,21 +4419,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4405 "util/configparser.c" /* yacc.c:1646 */ +#line 4423 "util/configparser.c" /* yacc.c:1646 */ break; - case 392: -#line 1612 "./util/configparser.y" /* yacc.c:1646 */ + case 394: +#line 1618 "./util/configparser.y" /* yacc.c:1646 */ { 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 4415 "util/configparser.c" /* yacc.c:1646 */ +#line 4433 "util/configparser.c" /* yacc.c:1646 */ break; - case 393: -#line 1619 "./util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 1625 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -4424,11 +4442,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4428 "util/configparser.c" /* yacc.c:1646 */ +#line 4446 "util/configparser.c" /* yacc.c:1646 */ break; - case 394: -#line 1629 "./util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 1635 "./util/configparser.y" /* yacc.c:1646 */ { 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 && @@ -4447,21 +4465,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 4451 "util/configparser.c" /* yacc.c:1646 */ +#line 4469 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 1649 "./util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 1655 "./util/configparser.y" /* yacc.c:1646 */ { 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 4461 "util/configparser.c" /* yacc.c:1646 */ +#line 4479 "util/configparser.c" /* yacc.c:1646 */ break; - case 396: -#line 1656 "./util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 1662 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4478,11 +4496,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4482 "util/configparser.c" /* yacc.c:1646 */ +#line 4500 "util/configparser.c" /* yacc.c:1646 */ break; - case 397: -#line 1674 "./util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 1680 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4494,11 +4512,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4498 "util/configparser.c" /* yacc.c:1646 */ +#line 4516 "util/configparser.c" /* yacc.c:1646 */ break; - case 398: -#line 1687 "./util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 1693 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4510,11 +4528,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4514 "util/configparser.c" /* yacc.c:1646 */ +#line 4532 "util/configparser.c" /* yacc.c:1646 */ break; - case 399: -#line 1700 "./util/configparser.y" /* yacc.c:1646 */ + case 401: +#line 1706 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4522,11 +4540,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4526 "util/configparser.c" /* yacc.c:1646 */ +#line 4544 "util/configparser.c" /* yacc.c:1646 */ break; - case 400: -#line 1709 "./util/configparser.y" /* yacc.c:1646 */ + case 402: +#line 1715 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4534,11 +4552,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4538 "util/configparser.c" /* yacc.c:1646 */ +#line 4556 "util/configparser.c" /* yacc.c:1646 */ break; - case 401: -#line 1718 "./util/configparser.y" /* yacc.c:1646 */ + case 403: +#line 1724 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4546,11 +4564,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4550 "util/configparser.c" /* yacc.c:1646 */ +#line 4568 "util/configparser.c" /* yacc.c:1646 */ break; - case 402: -#line 1727 "./util/configparser.y" /* yacc.c:1646 */ + case 404: +#line 1733 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4558,11 +4576,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4562 "util/configparser.c" /* yacc.c:1646 */ +#line 4580 "util/configparser.c" /* yacc.c:1646 */ break; - case 403: -#line 1736 "./util/configparser.y" /* yacc.c:1646 */ + case 405: +#line 1742 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4571,11 +4589,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4575 "util/configparser.c" /* yacc.c:1646 */ +#line 4593 "util/configparser.c" /* yacc.c:1646 */ break; - case 404: -#line 1746 "./util/configparser.y" /* yacc.c:1646 */ + case 406: +#line 1752 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4584,11 +4602,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4588 "util/configparser.c" /* yacc.c:1646 */ +#line 4606 "util/configparser.c" /* yacc.c:1646 */ break; - case 405: -#line 1756 "./util/configparser.y" /* yacc.c:1646 */ + case 407: +#line 1762 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4598,11 +4616,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4602 "util/configparser.c" /* yacc.c:1646 */ +#line 4620 "util/configparser.c" /* yacc.c:1646 */ break; - case 406: -#line 1767 "./util/configparser.y" /* yacc.c:1646 */ + case 408: +#line 1773 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4610,11 +4628,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4614 "util/configparser.c" /* yacc.c:1646 */ +#line 4632 "util/configparser.c" /* yacc.c:1646 */ break; - case 407: -#line 1776 "./util/configparser.y" /* yacc.c:1646 */ + case 409: +#line 1782 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4622,11 +4640,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4626 "util/configparser.c" /* yacc.c:1646 */ +#line 4644 "util/configparser.c" /* yacc.c:1646 */ break; - case 408: -#line 1785 "./util/configparser.y" /* yacc.c:1646 */ + case 410: +#line 1791 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4634,11 +4652,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4638 "util/configparser.c" /* yacc.c:1646 */ +#line 4656 "util/configparser.c" /* yacc.c:1646 */ break; - case 409: -#line 1794 "./util/configparser.y" /* yacc.c:1646 */ + case 411: +#line 1800 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -4646,11 +4664,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4650 "util/configparser.c" /* yacc.c:1646 */ +#line 4668 "util/configparser.c" /* yacc.c:1646 */ break; - case 410: -#line 1803 "./util/configparser.y" /* yacc.c:1646 */ + case 412: +#line 1809 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4658,11 +4676,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4662 "util/configparser.c" /* yacc.c:1646 */ +#line 4680 "util/configparser.c" /* yacc.c:1646 */ break; - case 411: -#line 1812 "./util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 1818 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4670,11 +4688,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4674 "util/configparser.c" /* yacc.c:1646 */ +#line 4692 "util/configparser.c" /* yacc.c:1646 */ break; - case 412: -#line 1821 "./util/configparser.y" /* yacc.c:1646 */ + case 414: +#line 1827 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_original_ttl:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4682,11 +4700,11 @@ yyreduce: else cfg_parser->cfg->serve_original_ttl = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4686 "util/configparser.c" /* yacc.c:1646 */ +#line 4704 "util/configparser.c" /* yacc.c:1646 */ break; - case 413: -#line 1830 "./util/configparser.y" /* yacc.c:1646 */ + case 415: +#line 1836 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4698,11 +4716,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4702 "util/configparser.c" /* yacc.c:1646 */ +#line 4720 "util/configparser.c" /* yacc.c:1646 */ break; - case 414: -#line 1843 "./util/configparser.y" /* yacc.c:1646 */ + case 416: +#line 1849 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4714,11 +4732,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4718 "util/configparser.c" /* yacc.c:1646 */ +#line 4736 "util/configparser.c" /* yacc.c:1646 */ break; - case 415: -#line 1856 "./util/configparser.y" /* yacc.c:1646 */ + case 417: +#line 1862 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4726,21 +4744,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4730 "util/configparser.c" /* yacc.c:1646 */ +#line 4748 "util/configparser.c" /* yacc.c:1646 */ break; - case 416: -#line 1865 "./util/configparser.y" /* yacc.c:1646 */ + case 418: +#line 1871 "./util/configparser.y" /* yacc.c:1646 */ { 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 4740 "util/configparser.c" /* yacc.c:1646 */ +#line 4758 "util/configparser.c" /* yacc.c:1646 */ break; - case 417: -#line 1872 "./util/configparser.y" /* yacc.c:1646 */ + case 419: +#line 1878 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4748,11 +4766,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4752 "util/configparser.c" /* yacc.c:1646 */ +#line 4770 "util/configparser.c" /* yacc.c:1646 */ break; - case 418: -#line 1881 "./util/configparser.y" /* yacc.c:1646 */ + case 420: +#line 1887 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4760,11 +4778,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4764 "util/configparser.c" /* yacc.c:1646 */ +#line 4782 "util/configparser.c" /* yacc.c:1646 */ break; - case 419: -#line 1890 "./util/configparser.y" /* yacc.c:1646 */ + case 421: +#line 1896 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4772,11 +4790,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4776 "util/configparser.c" /* yacc.c:1646 */ +#line 4794 "util/configparser.c" /* yacc.c:1646 */ break; - case 420: -#line 1899 "./util/configparser.y" /* yacc.c:1646 */ + case 422: +#line 1905 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4785,22 +4803,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4789 "util/configparser.c" /* yacc.c:1646 */ +#line 4807 "util/configparser.c" /* yacc.c:1646 */ break; - case 421: -#line 1908 "./util/configparser.y" /* yacc.c:1646 */ + case 423: +#line 1914 "./util/configparser.y" /* yacc.c:1646 */ { 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 4800 "util/configparser.c" /* yacc.c:1646 */ +#line 4818 "util/configparser.c" /* yacc.c:1646 */ break; - case 422: -#line 1916 "./util/configparser.y" /* yacc.c:1646 */ + case 424: +#line 1922 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4812,22 +4830,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4816 "util/configparser.c" /* yacc.c:1646 */ +#line 4834 "util/configparser.c" /* yacc.c:1646 */ break; - case 423: -#line 1929 "./util/configparser.y" /* yacc.c:1646 */ + case 425: +#line 1935 "./util/configparser.y" /* yacc.c:1646 */ { 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 4827 "util/configparser.c" /* yacc.c:1646 */ +#line 4845 "util/configparser.c" /* yacc.c:1646 */ break; - case 424: -#line 1937 "./util/configparser.y" /* yacc.c:1646 */ + case 426: +#line 1943 "./util/configparser.y" /* yacc.c:1646 */ { 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 && @@ -4867,21 +4885,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4871 "util/configparser.c" /* yacc.c:1646 */ +#line 4889 "util/configparser.c" /* yacc.c:1646 */ break; - case 425: -#line 1978 "./util/configparser.y" /* yacc.c:1646 */ + case 427: +#line 1984 "./util/configparser.y" /* yacc.c:1646 */ { 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 4881 "util/configparser.c" /* yacc.c:1646 */ +#line 4899 "util/configparser.c" /* yacc.c:1646 */ break; - case 426: -#line 1985 "./util/configparser.y" /* yacc.c:1646 */ + case 428: +#line 1991 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4895,11 +4913,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4899 "util/configparser.c" /* yacc.c:1646 */ +#line 4917 "util/configparser.c" /* yacc.c:1646 */ break; - case 427: -#line 2000 "./util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2006 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4908,11 +4926,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4912 "util/configparser.c" /* yacc.c:1646 */ +#line 4930 "util/configparser.c" /* yacc.c:1646 */ break; - case 428: -#line 2010 "./util/configparser.y" /* yacc.c:1646 */ + case 430: +#line 2016 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4921,41 +4939,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4925 "util/configparser.c" /* yacc.c:1646 */ +#line 4943 "util/configparser.c" /* yacc.c:1646 */ break; - case 429: -#line 2020 "./util/configparser.y" /* yacc.c:1646 */ + case 431: +#line 2026 "./util/configparser.y" /* yacc.c:1646 */ { 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 4935 "util/configparser.c" /* yacc.c:1646 */ +#line 4953 "util/configparser.c" /* yacc.c:1646 */ break; - case 430: -#line 2027 "./util/configparser.y" /* yacc.c:1646 */ + case 432: +#line 2033 "./util/configparser.y" /* yacc.c:1646 */ { 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 4945 "util/configparser.c" /* yacc.c:1646 */ +#line 4963 "util/configparser.c" /* yacc.c:1646 */ break; - case 431: -#line 2034 "./util/configparser.y" /* yacc.c:1646 */ + case 433: +#line 2040 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 4955 "util/configparser.c" /* yacc.c:1646 */ +#line 4973 "util/configparser.c" /* yacc.c:1646 */ break; - case 432: -#line 2041 "./util/configparser.y" /* yacc.c:1646 */ + case 434: +#line 2047 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4963,22 +4981,22 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4967 "util/configparser.c" /* yacc.c:1646 */ +#line 4985 "util/configparser.c" /* yacc.c:1646 */ break; - case 433: -#line 2050 "./util/configparser.y" /* yacc.c:1646 */ + case 435: +#line 2056 "./util/configparser.y" /* yacc.c:1646 */ { 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 4978 "util/configparser.c" /* yacc.c:1646 */ +#line 4996 "util/configparser.c" /* yacc.c:1646 */ break; - case 434: -#line 2058 "./util/configparser.y" /* yacc.c:1646 */ + case 436: +#line 2064 "./util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4991,11 +5009,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4995 "util/configparser.c" /* yacc.c:1646 */ +#line 5013 "util/configparser.c" /* yacc.c:1646 */ break; - case 435: -#line 2072 "./util/configparser.y" /* yacc.c:1646 */ + case 437: +#line 2078 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5015,11 +5033,11 @@ yyreduce: } } } -#line 5019 "util/configparser.c" /* yacc.c:1646 */ +#line 5037 "util/configparser.c" /* yacc.c:1646 */ break; - case 436: -#line 2093 "./util/configparser.y" /* yacc.c:1646 */ + case 438: +#line 2099 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5039,11 +5057,11 @@ yyreduce: } } } -#line 5043 "util/configparser.c" /* yacc.c:1646 */ +#line 5061 "util/configparser.c" /* yacc.c:1646 */ break; - case 437: -#line 2114 "./util/configparser.y" /* yacc.c:1646 */ + case 439: +#line 2120 "./util/configparser.y" /* yacc.c:1646 */ { 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, @@ -5054,11 +5072,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5058 "util/configparser.c" /* yacc.c:1646 */ +#line 5076 "util/configparser.c" /* yacc.c:1646 */ break; - case 438: -#line 2126 "./util/configparser.y" /* yacc.c:1646 */ + case 440: +#line 2132 "./util/configparser.y" /* yacc.c:1646 */ { 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, @@ -5069,11 +5087,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5073 "util/configparser.c" /* yacc.c:1646 */ +#line 5091 "util/configparser.c" /* yacc.c:1646 */ break; - case 439: -#line 2138 "./util/configparser.y" /* yacc.c:1646 */ + case 441: +#line 2144 "./util/configparser.y" /* yacc.c:1646 */ { 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, @@ -5084,11 +5102,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5088 "util/configparser.c" /* yacc.c:1646 */ +#line 5106 "util/configparser.c" /* yacc.c:1646 */ break; - case 440: -#line 2150 "./util/configparser.y" /* yacc.c:1646 */ + case 442: +#line 2156 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -5096,11 +5114,11 @@ yyreduce: yyerror("out of memory"); } } -#line 5100 "util/configparser.c" /* yacc.c:1646 */ +#line 5118 "util/configparser.c" /* yacc.c:1646 */ break; - case 441: -#line 2159 "./util/configparser.y" /* yacc.c:1646 */ + case 443: +#line 2165 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5120,11 +5138,11 @@ yyreduce: } } } -#line 5124 "util/configparser.c" /* yacc.c:1646 */ +#line 5142 "util/configparser.c" /* yacc.c:1646 */ break; - case 442: -#line 2180 "./util/configparser.y" /* yacc.c:1646 */ + case 444: +#line 2186 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5132,11 +5150,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5136 "util/configparser.c" /* yacc.c:1646 */ +#line 5154 "util/configparser.c" /* yacc.c:1646 */ break; - case 443: -#line 2190 "./util/configparser.y" /* yacc.c:1646 */ + case 445: +#line 2196 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5144,33 +5162,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5148 "util/configparser.c" /* yacc.c:1646 */ +#line 5166 "util/configparser.c" /* yacc.c:1646 */ break; - case 444: -#line 2199 "./util/configparser.y" /* yacc.c:1646 */ + case 446: +#line 2205 "./util/configparser.y" /* yacc.c:1646 */ { 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 5159 "util/configparser.c" /* yacc.c:1646 */ +#line 5177 "util/configparser.c" /* yacc.c:1646 */ break; - case 445: -#line 2207 "./util/configparser.y" /* yacc.c:1646 */ + case 447: +#line 2213 "./util/configparser.y" /* yacc.c:1646 */ { 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 5170 "util/configparser.c" /* yacc.c:1646 */ +#line 5188 "util/configparser.c" /* yacc.c:1646 */ break; - case 446: -#line 2215 "./util/configparser.y" /* yacc.c:1646 */ + case 448: +#line 2221 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5182,11 +5200,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5186 "util/configparser.c" /* yacc.c:1646 */ +#line 5204 "util/configparser.c" /* yacc.c:1646 */ break; - case 447: -#line 2228 "./util/configparser.y" /* yacc.c:1646 */ + case 449: +#line 2234 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5198,11 +5216,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5202 "util/configparser.c" /* yacc.c:1646 */ +#line 5220 "util/configparser.c" /* yacc.c:1646 */ break; - case 448: -#line 2241 "./util/configparser.y" /* yacc.c:1646 */ + case 450: +#line 2247 "./util/configparser.y" /* yacc.c:1646 */ { 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) { @@ -5216,11 +5234,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 5220 "util/configparser.c" /* yacc.c:1646 */ +#line 5238 "util/configparser.c" /* yacc.c:1646 */ break; - case 449: -#line 2256 "./util/configparser.y" /* yacc.c:1646 */ + case 451: +#line 2262 "./util/configparser.y" /* yacc.c:1646 */ { 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) { @@ -5234,11 +5252,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 5238 "util/configparser.c" /* yacc.c:1646 */ +#line 5256 "util/configparser.c" /* yacc.c:1646 */ break; - case 450: -#line 2271 "./util/configparser.y" /* yacc.c:1646 */ + case 452: +#line 2277 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5246,11 +5264,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5250 "util/configparser.c" /* yacc.c:1646 */ +#line 5268 "util/configparser.c" /* yacc.c:1646 */ break; - case 451: -#line 2280 "./util/configparser.y" /* yacc.c:1646 */ + case 453: +#line 2286 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5258,20 +5276,20 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5262 "util/configparser.c" /* yacc.c:1646 */ +#line 5280 "util/configparser.c" /* yacc.c:1646 */ break; - case 452: -#line 2289 "./util/configparser.y" /* yacc.c:1646 */ + case 454: +#line 2295 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n")); free((yyvsp[0].str)); } -#line 5271 "util/configparser.c" /* yacc.c:1646 */ +#line 5289 "util/configparser.c" /* yacc.c:1646 */ break; - case 453: -#line 2295 "./util/configparser.y" /* yacc.c:1646 */ + case 455: +#line 2301 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) <= 0) @@ -5279,11 +5297,11 @@ yyreduce: else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5283 "util/configparser.c" /* yacc.c:1646 */ +#line 5301 "util/configparser.c" /* yacc.c:1646 */ break; - case 454: -#line 2304 "./util/configparser.y" /* yacc.c:1646 */ + case 456: +#line 2310 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5291,11 +5309,11 @@ yyreduce: else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5295 "util/configparser.c" /* yacc.c:1646 */ +#line 5313 "util/configparser.c" /* yacc.c:1646 */ break; - case 455: -#line 2313 "./util/configparser.y" /* yacc.c:1646 */ + case 457: +#line 2319 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5304,11 +5322,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5308 "util/configparser.c" /* yacc.c:1646 */ +#line 5326 "util/configparser.c" /* yacc.c:1646 */ break; - case 456: -#line 2323 "./util/configparser.y" /* yacc.c:1646 */ + case 458: +#line 2329 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5317,11 +5335,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5321 "util/configparser.c" /* yacc.c:1646 */ +#line 5339 "util/configparser.c" /* yacc.c:1646 */ break; - case 457: -#line 2333 "./util/configparser.y" /* yacc.c:1646 */ + case 459: +#line 2339 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -5333,11 +5351,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5337 "util/configparser.c" /* yacc.c:1646 */ +#line 5355 "util/configparser.c" /* yacc.c:1646 */ break; - case 458: -#line 2346 "./util/configparser.y" /* yacc.c:1646 */ + case 460: +#line 2352 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -5349,11 +5367,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5353 "util/configparser.c" /* yacc.c:1646 */ +#line 5371 "util/configparser.c" /* yacc.c:1646 */ break; - case 459: -#line 2359 "./util/configparser.y" /* yacc.c:1646 */ + case 461: +#line 2365 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -5364,11 +5382,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5368 "util/configparser.c" /* yacc.c:1646 */ +#line 5386 "util/configparser.c" /* yacc.c:1646 */ break; - case 460: -#line 2371 "./util/configparser.y" /* yacc.c:1646 */ + case 462: +#line 2377 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -5381,11 +5399,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5385 "util/configparser.c" /* yacc.c:1646 */ +#line 5403 "util/configparser.c" /* yacc.c:1646 */ break; - case 461: -#line 2385 "./util/configparser.y" /* yacc.c:1646 */ + case 463: +#line 2391 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -5396,11 +5414,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5400 "util/configparser.c" /* yacc.c:1646 */ +#line 5418 "util/configparser.c" /* yacc.c:1646 */ break; - case 462: -#line 2397 "./util/configparser.y" /* yacc.c:1646 */ + case 464: +#line 2403 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -5413,11 +5431,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5417 "util/configparser.c" /* yacc.c:1646 */ +#line 5435 "util/configparser.c" /* yacc.c:1646 */ break; - case 463: -#line 2411 "./util/configparser.y" /* yacc.c:1646 */ + case 465: +#line 2417 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -5426,31 +5444,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 5430 "util/configparser.c" /* yacc.c:1646 */ +#line 5448 "util/configparser.c" /* yacc.c:1646 */ break; - case 464: -#line 2421 "./util/configparser.y" /* yacc.c:1646 */ + case 466: +#line 2427 "./util/configparser.y" /* yacc.c:1646 */ { 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 5440 "util/configparser.c" /* yacc.c:1646 */ +#line 5458 "util/configparser.c" /* yacc.c:1646 */ break; - case 465: -#line 2428 "./util/configparser.y" /* yacc.c:1646 */ + case 467: +#line 2434 "./util/configparser.y" /* yacc.c:1646 */ { 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 5450 "util/configparser.c" /* yacc.c:1646 */ +#line 5468 "util/configparser.c" /* yacc.c:1646 */ break; - case 466: -#line 2435 "./util/configparser.y" /* yacc.c:1646 */ + case 468: +#line 2441 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5458,11 +5476,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5462 "util/configparser.c" /* yacc.c:1646 */ +#line 5480 "util/configparser.c" /* yacc.c:1646 */ break; - case 467: -#line 2444 "./util/configparser.y" /* yacc.c:1646 */ + case 469: +#line 2450 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5470,11 +5488,11 @@ yyreduce: else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5474 "util/configparser.c" /* yacc.c:1646 */ +#line 5492 "util/configparser.c" /* yacc.c:1646 */ break; - case 468: -#line 2453 "./util/configparser.y" /* yacc.c:1646 */ + case 470: +#line 2459 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5483,11 +5501,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5487 "util/configparser.c" /* yacc.c:1646 */ +#line 5505 "util/configparser.c" /* yacc.c:1646 */ break; - case 469: -#line 2463 "./util/configparser.y" /* yacc.c:1646 */ + case 471: +#line 2469 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5496,11 +5514,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5500 "util/configparser.c" /* yacc.c:1646 */ +#line 5518 "util/configparser.c" /* yacc.c:1646 */ break; - case 470: -#line 2473 "./util/configparser.y" /* yacc.c:1646 */ + case 472: +#line 2479 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -5509,31 +5527,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 5513 "util/configparser.c" /* yacc.c:1646 */ +#line 5531 "util/configparser.c" /* yacc.c:1646 */ break; - case 471: -#line 2483 "./util/configparser.y" /* yacc.c:1646 */ + case 473: +#line 2489 "./util/configparser.y" /* yacc.c:1646 */ { 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 5523 "util/configparser.c" /* yacc.c:1646 */ +#line 5541 "util/configparser.c" /* yacc.c:1646 */ break; - case 472: -#line 2490 "./util/configparser.y" /* yacc.c:1646 */ + case 474: +#line 2496 "./util/configparser.y" /* yacc.c:1646 */ { 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 5533 "util/configparser.c" /* yacc.c:1646 */ +#line 5551 "util/configparser.c" /* yacc.c:1646 */ break; - case 473: -#line 2497 "./util/configparser.y" /* yacc.c:1646 */ + case 475: +#line 2503 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5541,11 +5559,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5545 "util/configparser.c" /* yacc.c:1646 */ +#line 5563 "util/configparser.c" /* yacc.c:1646 */ break; - case 474: -#line 2506 "./util/configparser.y" /* yacc.c:1646 */ + case 476: +#line 2512 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5553,11 +5571,11 @@ yyreduce: else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5557 "util/configparser.c" /* yacc.c:1646 */ +#line 5575 "util/configparser.c" /* yacc.c:1646 */ break; - case 475: -#line 2515 "./util/configparser.y" /* yacc.c:1646 */ + case 477: +#line 2521 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5566,11 +5584,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5570 "util/configparser.c" /* yacc.c:1646 */ +#line 5588 "util/configparser.c" /* yacc.c:1646 */ break; - case 476: -#line 2525 "./util/configparser.y" /* yacc.c:1646 */ + case 478: +#line 2531 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -5579,52 +5597,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 5583 "util/configparser.c" /* yacc.c:1646 */ +#line 5601 "util/configparser.c" /* yacc.c:1646 */ break; - case 477: -#line 2535 "./util/configparser.y" /* yacc.c:1646 */ + case 479: +#line 2541 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->zonefile); cfg_parser->cfg->auths->zonefile = (yyvsp[0].str); } -#line 5593 "util/configparser.c" /* yacc.c:1646 */ +#line 5611 "util/configparser.c" /* yacc.c:1646 */ break; - case 478: -#line 2542 "./util/configparser.y" /* yacc.c:1646 */ + case 480: +#line 2548 "./util/configparser.y" /* yacc.c:1646 */ { 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 5603 "util/configparser.c" /* yacc.c:1646 */ +#line 5621 "util/configparser.c" /* yacc.c:1646 */ break; - case 479: -#line 2549 "./util/configparser.y" /* yacc.c:1646 */ + case 481: +#line 2555 "./util/configparser.y" /* yacc.c:1646 */ { 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 5613 "util/configparser.c" /* yacc.c:1646 */ +#line 5631 "util/configparser.c" /* yacc.c:1646 */ break; - case 480: -#line 2556 "./util/configparser.y" /* yacc.c:1646 */ + case 482: +#line 2562 "./util/configparser.y" /* yacc.c:1646 */ { 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 5624 "util/configparser.c" /* yacc.c:1646 */ +#line 5642 "util/configparser.c" /* yacc.c:1646 */ break; - case 481: -#line 2564 "./util/configparser.y" /* yacc.c:1646 */ + case 483: +#line 2570 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5633,11 +5651,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5637 "util/configparser.c" /* yacc.c:1646 */ +#line 5655 "util/configparser.c" /* yacc.c:1646 */ break; - case 482: -#line 2574 "./util/configparser.y" /* yacc.c:1646 */ + case 484: +#line 2580 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5646,11 +5664,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5650 "util/configparser.c" /* yacc.c:1646 */ +#line 5668 "util/configparser.c" /* yacc.c:1646 */ break; - case 483: -#line 2584 "./util/configparser.y" /* yacc.c:1646 */ + case 485: +#line 2590 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5659,11 +5677,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5663 "util/configparser.c" /* yacc.c:1646 */ +#line 5681 "util/configparser.c" /* yacc.c:1646 */ break; - case 484: -#line 2594 "./util/configparser.y" /* yacc.c:1646 */ + case 486: +#line 2600 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -5672,11 +5690,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 5676 "util/configparser.c" /* yacc.c:1646 */ +#line 5694 "util/configparser.c" /* yacc.c:1646 */ break; - case 485: -#line 2604 "./util/configparser.y" /* yacc.c:1646 */ + case 487: +#line 2610 "./util/configparser.y" /* yacc.c:1646 */ { 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 && @@ -5714,11 +5732,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 5718 "util/configparser.c" /* yacc.c:1646 */ +#line 5736 "util/configparser.c" /* yacc.c:1646 */ break; - case 486: -#line 2643 "./util/configparser.y" /* yacc.c:1646 */ + case 488: +#line 2649 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5727,33 +5745,33 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 5731 "util/configparser.c" /* yacc.c:1646 */ +#line 5749 "util/configparser.c" /* yacc.c:1646 */ break; - case 487: -#line 2653 "./util/configparser.y" /* yacc.c:1646 */ + case 489: +#line 2659 "./util/configparser.y" /* yacc.c:1646 */ { 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 5742 "util/configparser.c" /* yacc.c:1646 */ +#line 5760 "util/configparser.c" /* yacc.c:1646 */ break; - case 488: -#line 2661 "./util/configparser.y" /* yacc.c:1646 */ + case 490: +#line 2667 "./util/configparser.y" /* yacc.c:1646 */ { 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 5753 "util/configparser.c" /* yacc.c:1646 */ +#line 5771 "util/configparser.c" /* yacc.c:1646 */ break; - case 489: -#line 2669 "./util/configparser.y" /* yacc.c:1646 */ + case 491: +#line 2675 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5767,11 +5785,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5771 "util/configparser.c" /* yacc.c:1646 */ +#line 5789 "util/configparser.c" /* yacc.c:1646 */ break; - case 490: -#line 2684 "./util/configparser.y" /* yacc.c:1646 */ + case 492: +#line 2690 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5779,19 +5797,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5783 "util/configparser.c" /* yacc.c:1646 */ +#line 5801 "util/configparser.c" /* yacc.c:1646 */ break; - case 491: -#line 2693 "./util/configparser.y" /* yacc.c:1646 */ + case 493: +#line 2699 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 5791 "util/configparser.c" /* yacc.c:1646 */ +#line 5809 "util/configparser.c" /* yacc.c:1646 */ break; - case 502: -#line 2704 "./util/configparser.y" /* yacc.c:1646 */ + case 504: +#line 2710 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5800,11 +5818,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5804 "util/configparser.c" /* yacc.c:1646 */ +#line 5822 "util/configparser.c" /* yacc.c:1646 */ break; - case 503: -#line 2714 "./util/configparser.y" /* yacc.c:1646 */ + case 505: +#line 2720 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5812,79 +5830,79 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5816 "util/configparser.c" /* yacc.c:1646 */ +#line 5834 "util/configparser.c" /* yacc.c:1646 */ break; - case 504: -#line 2723 "./util/configparser.y" /* yacc.c:1646 */ + case 506: +#line 2729 "./util/configparser.y" /* yacc.c:1646 */ { 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 5826 "util/configparser.c" /* yacc.c:1646 */ +#line 5844 "util/configparser.c" /* yacc.c:1646 */ break; - case 505: -#line 2730 "./util/configparser.y" /* yacc.c:1646 */ + case 507: +#line 2736 "./util/configparser.y" /* yacc.c:1646 */ { 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 5836 "util/configparser.c" /* yacc.c:1646 */ +#line 5854 "util/configparser.c" /* yacc.c:1646 */ break; - case 506: -#line 2737 "./util/configparser.y" /* yacc.c:1646 */ + case 508: +#line 2743 "./util/configparser.y" /* yacc.c:1646 */ { 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 5846 "util/configparser.c" /* yacc.c:1646 */ +#line 5864 "util/configparser.c" /* yacc.c:1646 */ break; - case 507: -#line 2744 "./util/configparser.y" /* yacc.c:1646 */ + case 509: +#line 2750 "./util/configparser.y" /* yacc.c:1646 */ { 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 5856 "util/configparser.c" /* yacc.c:1646 */ +#line 5874 "util/configparser.c" /* yacc.c:1646 */ break; - case 508: -#line 2751 "./util/configparser.y" /* yacc.c:1646 */ + case 510: +#line 2757 "./util/configparser.y" /* yacc.c:1646 */ { 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 5866 "util/configparser.c" /* yacc.c:1646 */ +#line 5884 "util/configparser.c" /* yacc.c:1646 */ break; - case 509: -#line 2758 "./util/configparser.y" /* yacc.c:1646 */ + case 511: +#line 2764 "./util/configparser.y" /* yacc.c:1646 */ { 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 5876 "util/configparser.c" /* yacc.c:1646 */ +#line 5894 "util/configparser.c" /* yacc.c:1646 */ break; - case 510: -#line 2765 "./util/configparser.y" /* yacc.c:1646 */ + case 512: +#line 2771 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 5884 "util/configparser.c" /* yacc.c:1646 */ +#line 5902 "util/configparser.c" /* yacc.c:1646 */ break; - case 531: -#line 2785 "./util/configparser.y" /* yacc.c:1646 */ + case 534: +#line 2791 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5892,31 +5910,44 @@ yyreduce: else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5896 "util/configparser.c" /* yacc.c:1646 */ +#line 5914 "util/configparser.c" /* yacc.c:1646 */ break; - case 532: -#line 2794 "./util/configparser.y" /* yacc.c:1646 */ + case 535: +#line 2800 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(dt_dnstap_bidirectional:%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->dnstap_bidirectional = + (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 5927 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 536: +#line 2810 "./util/configparser.y" /* yacc.c:1646 */ { 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 5906 "util/configparser.c" /* yacc.c:1646 */ +#line 5937 "util/configparser.c" /* yacc.c:1646 */ break; - case 533: -#line 2801 "./util/configparser.y" /* yacc.c:1646 */ + case 537: +#line 2817 "./util/configparser.y" /* yacc.c:1646 */ { 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 5916 "util/configparser.c" /* yacc.c:1646 */ +#line 5947 "util/configparser.c" /* yacc.c:1646 */ break; - case 534: -#line 2808 "./util/configparser.y" /* yacc.c:1646 */ + case 538: +#line 2824 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5924,51 +5955,51 @@ yyreduce: else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5928 "util/configparser.c" /* yacc.c:1646 */ +#line 5959 "util/configparser.c" /* yacc.c:1646 */ break; - case 535: -#line 2817 "./util/configparser.y" /* yacc.c:1646 */ + case 539: +#line 2833 "./util/configparser.y" /* yacc.c:1646 */ { 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 5938 "util/configparser.c" /* yacc.c:1646 */ +#line 5969 "util/configparser.c" /* yacc.c:1646 */ break; - case 536: -#line 2824 "./util/configparser.y" /* yacc.c:1646 */ + case 540: +#line 2840 "./util/configparser.y" /* yacc.c:1646 */ { 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 5948 "util/configparser.c" /* yacc.c:1646 */ +#line 5979 "util/configparser.c" /* yacc.c:1646 */ break; - case 537: -#line 2831 "./util/configparser.y" /* yacc.c:1646 */ + case 541: +#line 2847 "./util/configparser.y" /* yacc.c:1646 */ { 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 5958 "util/configparser.c" /* yacc.c:1646 */ +#line 5989 "util/configparser.c" /* yacc.c:1646 */ break; - case 538: -#line 2838 "./util/configparser.y" /* yacc.c:1646 */ + case 542: +#line 2854 "./util/configparser.y" /* yacc.c:1646 */ { 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 5968 "util/configparser.c" /* yacc.c:1646 */ +#line 5999 "util/configparser.c" /* yacc.c:1646 */ break; - case 539: -#line 2845 "./util/configparser.y" /* yacc.c:1646 */ + case 543: +#line 2861 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5976,11 +6007,11 @@ yyreduce: else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5980 "util/configparser.c" /* yacc.c:1646 */ +#line 6011 "util/configparser.c" /* yacc.c:1646 */ break; - case 540: -#line 2854 "./util/configparser.y" /* yacc.c:1646 */ + case 544: +#line 2870 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5988,31 +6019,31 @@ yyreduce: else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5992 "util/configparser.c" /* yacc.c:1646 */ +#line 6023 "util/configparser.c" /* yacc.c:1646 */ break; - case 541: -#line 2863 "./util/configparser.y" /* yacc.c:1646 */ + case 545: +#line 2879 "./util/configparser.y" /* yacc.c:1646 */ { 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 6002 "util/configparser.c" /* yacc.c:1646 */ +#line 6033 "util/configparser.c" /* yacc.c:1646 */ break; - case 542: -#line 2870 "./util/configparser.y" /* yacc.c:1646 */ + case 546: +#line 2886 "./util/configparser.y" /* yacc.c:1646 */ { 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 6012 "util/configparser.c" /* yacc.c:1646 */ +#line 6043 "util/configparser.c" /* yacc.c:1646 */ break; - case 543: -#line 2877 "./util/configparser.y" /* yacc.c:1646 */ + case 547: +#line 2893 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -6021,11 +6052,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6025 "util/configparser.c" /* yacc.c:1646 */ +#line 6056 "util/configparser.c" /* yacc.c:1646 */ break; - case 544: -#line 2887 "./util/configparser.y" /* yacc.c:1646 */ + case 548: +#line 2903 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -6034,11 +6065,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6038 "util/configparser.c" /* yacc.c:1646 */ +#line 6069 "util/configparser.c" /* yacc.c:1646 */ break; - case 545: -#line 2897 "./util/configparser.y" /* yacc.c:1646 */ + case 549: +#line 2913 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -6047,11 +6078,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6051 "util/configparser.c" /* yacc.c:1646 */ +#line 6082 "util/configparser.c" /* yacc.c:1646 */ break; - case 546: -#line 2907 "./util/configparser.y" /* yacc.c:1646 */ + case 550: +#line 2923 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -6060,11 +6091,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6064 "util/configparser.c" /* yacc.c:1646 */ +#line 6095 "util/configparser.c" /* yacc.c:1646 */ break; - case 547: -#line 2917 "./util/configparser.y" /* yacc.c:1646 */ + case 551: +#line 2933 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -6073,11 +6104,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6077 "util/configparser.c" /* yacc.c:1646 */ +#line 6108 "util/configparser.c" /* yacc.c:1646 */ break; - case 548: -#line 2927 "./util/configparser.y" /* yacc.c:1646 */ + case 552: +#line 2943 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -6086,47 +6117,47 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6090 "util/configparser.c" /* yacc.c:1646 */ - break; - - case 549: -#line 2937 "./util/configparser.y" /* yacc.c:1646 */ - { - OUTYY(("\nP(python:)\n")); - } -#line 6098 "util/configparser.c" /* yacc.c:1646 */ +#line 6121 "util/configparser.c" /* yacc.c:1646 */ break; case 553: -#line 2946 "./util/configparser.y" /* yacc.c:1646 */ +#line 2953 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("\nP(python:)\n")); + } +#line 6129 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 557: +#line 2962 "./util/configparser.y" /* yacc.c:1646 */ { 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 6108 "util/configparser.c" /* yacc.c:1646 */ - break; - - case 554: -#line 2952 "./util/configparser.y" /* yacc.c:1646 */ - { - OUTYY(("\nP(dynlib:)\n")); - } -#line 6116 "util/configparser.c" /* yacc.c:1646 */ +#line 6139 "util/configparser.c" /* yacc.c:1646 */ break; case 558: -#line 2961 "./util/configparser.y" /* yacc.c:1646 */ +#line 2968 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("\nP(dynlib:)\n")); + } +#line 6147 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 562: +#line 2977 "./util/configparser.y" /* yacc.c:1646 */ { 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 6126 "util/configparser.c" /* yacc.c:1646 */ +#line 6157 "util/configparser.c" /* yacc.c:1646 */ break; - case 559: -#line 2967 "./util/configparser.y" /* yacc.c:1646 */ + case 563: +#line 2983 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6135,21 +6166,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6139 "util/configparser.c" /* yacc.c:1646 */ +#line 6170 "util/configparser.c" /* yacc.c:1646 */ break; - case 560: -#line 2977 "./util/configparser.y" /* yacc.c:1646 */ + case 564: +#line 2993 "./util/configparser.y" /* yacc.c:1646 */ { 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 6149 "util/configparser.c" /* yacc.c:1646 */ +#line 6180 "util/configparser.c" /* yacc.c:1646 */ break; - case 561: -#line 2984 "./util/configparser.y" /* yacc.c:1646 */ + case 565: +#line 3000 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -6157,30 +6188,30 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 6161 "util/configparser.c" /* yacc.c:1646 */ +#line 6192 "util/configparser.c" /* yacc.c:1646 */ break; - case 562: -#line 2993 "./util/configparser.y" /* yacc.c:1646 */ + case 566: +#line 3009 "./util/configparser.y" /* yacc.c:1646 */ { 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 6172 "util/configparser.c" /* yacc.c:1646 */ +#line 6203 "util/configparser.c" /* yacc.c:1646 */ break; - case 563: -#line 3001 "./util/configparser.y" /* yacc.c:1646 */ + case 567: +#line 3017 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnscrypt:)\n")); } -#line 6180 "util/configparser.c" /* yacc.c:1646 */ +#line 6211 "util/configparser.c" /* yacc.c:1646 */ break; - case 576: -#line 3017 "./util/configparser.y" /* yacc.c:1646 */ + case 580: +#line 3033 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6188,11 +6219,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6192 "util/configparser.c" /* yacc.c:1646 */ +#line 6223 "util/configparser.c" /* yacc.c:1646 */ break; - case 577: -#line 3027 "./util/configparser.y" /* yacc.c:1646 */ + case 581: +#line 3043 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6200,21 +6231,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6204 "util/configparser.c" /* yacc.c:1646 */ +#line 6235 "util/configparser.c" /* yacc.c:1646 */ break; - case 578: -#line 3036 "./util/configparser.y" /* yacc.c:1646 */ + case 582: +#line 3052 "./util/configparser.y" /* yacc.c:1646 */ { 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 6214 "util/configparser.c" /* yacc.c:1646 */ +#line 6245 "util/configparser.c" /* yacc.c:1646 */ break; - case 579: -#line 3043 "./util/configparser.y" /* yacc.c:1646 */ + case 583: +#line 3059 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) @@ -6222,21 +6253,21 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 6226 "util/configparser.c" /* yacc.c:1646 */ +#line 6257 "util/configparser.c" /* yacc.c:1646 */ break; - case 580: -#line 3052 "./util/configparser.y" /* yacc.c:1646 */ + case 584: +#line 3068 "./util/configparser.y" /* yacc.c:1646 */ { 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 6236 "util/configparser.c" /* yacc.c:1646 */ +#line 6267 "util/configparser.c" /* yacc.c:1646 */ break; - case 581: -#line 3059 "./util/configparser.y" /* yacc.c:1646 */ + case 585: +#line 3075 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) @@ -6244,22 +6275,22 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 6248 "util/configparser.c" /* yacc.c:1646 */ +#line 6279 "util/configparser.c" /* yacc.c:1646 */ break; - case 582: -#line 3068 "./util/configparser.y" /* yacc.c:1646 */ + case 586: +#line 3084 "./util/configparser.y" /* yacc.c:1646 */ { 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 6259 "util/configparser.c" /* yacc.c:1646 */ +#line 6290 "util/configparser.c" /* yacc.c:1646 */ break; - case 583: -#line 3076 "./util/configparser.y" /* yacc.c:1646 */ + case 587: +#line 3092 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6271,22 +6302,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 6275 "util/configparser.c" /* yacc.c:1646 */ +#line 6306 "util/configparser.c" /* yacc.c:1646 */ break; - case 584: -#line 3089 "./util/configparser.y" /* yacc.c:1646 */ + case 588: +#line 3105 "./util/configparser.y" /* yacc.c:1646 */ { 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 6286 "util/configparser.c" /* yacc.c:1646 */ +#line 6317 "util/configparser.c" /* yacc.c:1646 */ break; - case 585: -#line 3097 "./util/configparser.y" /* yacc.c:1646 */ + case 589: +#line 3113 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6298,19 +6329,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 6302 "util/configparser.c" /* yacc.c:1646 */ +#line 6333 "util/configparser.c" /* yacc.c:1646 */ break; - case 586: -#line 3110 "./util/configparser.y" /* yacc.c:1646 */ + case 590: +#line 3126 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(cachedb:)\n")); } -#line 6310 "util/configparser.c" /* yacc.c:1646 */ +#line 6341 "util/configparser.c" /* yacc.c:1646 */ break; - case 595: -#line 3121 "./util/configparser.y" /* yacc.c:1646 */ + case 599: +#line 3137 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -6321,11 +6352,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6325 "util/configparser.c" /* yacc.c:1646 */ +#line 6356 "util/configparser.c" /* yacc.c:1646 */ break; - case 596: -#line 3133 "./util/configparser.y" /* yacc.c:1646 */ + case 600: +#line 3149 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -6336,11 +6367,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6340 "util/configparser.c" /* yacc.c:1646 */ +#line 6371 "util/configparser.c" /* yacc.c:1646 */ break; - case 597: -#line 3145 "./util/configparser.y" /* yacc.c:1646 */ + case 601: +#line 3161 "./util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -6351,11 +6382,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6355 "util/configparser.c" /* yacc.c:1646 */ +#line 6386 "util/configparser.c" /* yacc.c:1646 */ break; - case 598: -#line 3157 "./util/configparser.y" /* yacc.c:1646 */ + case 602: +#line 3173 "./util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -6369,11 +6400,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6373 "util/configparser.c" /* yacc.c:1646 */ +#line 6404 "util/configparser.c" /* yacc.c:1646 */ break; - case 599: -#line 3172 "./util/configparser.y" /* yacc.c:1646 */ + case 603: +#line 3188 "./util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -6385,11 +6416,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6389 "util/configparser.c" /* yacc.c:1646 */ +#line 6420 "util/configparser.c" /* yacc.c:1646 */ break; - case 600: -#line 3185 "./util/configparser.y" /* yacc.c:1646 */ + case 604: +#line 3201 "./util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str))); @@ -6401,11 +6432,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6405 "util/configparser.c" /* yacc.c:1646 */ +#line 6436 "util/configparser.c" /* yacc.c:1646 */ break; - case 601: -#line 3198 "./util/configparser.y" /* yacc.c:1646 */ + case 605: +#line 3214 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if (atoi((yyvsp[0].str)) < 0) @@ -6415,19 +6446,19 @@ yyreduce: fatal_exit("out of memory adding tcp connection limit"); } } -#line 6419 "util/configparser.c" /* yacc.c:1646 */ +#line 6450 "util/configparser.c" /* yacc.c:1646 */ break; - case 602: -#line 3209 "./util/configparser.y" /* yacc.c:1646 */ + case 606: +#line 3225 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(ipset:)\n")); } -#line 6427 "util/configparser.c" /* yacc.c:1646 */ +#line 6458 "util/configparser.c" /* yacc.c:1646 */ break; - case 607: -#line 3218 "./util/configparser.y" /* yacc.c:1646 */ + case 611: +#line 3234 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSET OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str))); @@ -6441,11 +6472,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6445 "util/configparser.c" /* yacc.c:1646 */ +#line 6476 "util/configparser.c" /* yacc.c:1646 */ break; - case 608: -#line 3233 "./util/configparser.y" /* yacc.c:1646 */ + case 612: +#line 3249 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSET OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str))); @@ -6459,11 +6490,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6463 "util/configparser.c" /* yacc.c:1646 */ +#line 6494 "util/configparser.c" /* yacc.c:1646 */ break; -#line 6467 "util/configparser.c" /* yacc.c:1646 */ +#line 6498 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -6691,7 +6722,7 @@ yyreturn: #endif return yyresult; } -#line 3247 "./util/configparser.y" /* yacc.c:1906 */ +#line 3263 "./util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 1548199c6..053f40035 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -53,286 +53,288 @@ extern int yydebug; ANY = 263, ZONESTR = 264, STRING_ARG = 265, - VAR_SERVER = 266, - VAR_VERBOSITY = 267, - VAR_NUM_THREADS = 268, - VAR_PORT = 269, - VAR_OUTGOING_RANGE = 270, - VAR_INTERFACE = 271, - VAR_PREFER_IP4 = 272, - VAR_DO_IP4 = 273, - VAR_DO_IP6 = 274, - VAR_PREFER_IP6 = 275, - VAR_DO_UDP = 276, - VAR_DO_TCP = 277, - VAR_TCP_MSS = 278, - VAR_OUTGOING_TCP_MSS = 279, - VAR_TCP_IDLE_TIMEOUT = 280, - VAR_EDNS_TCP_KEEPALIVE = 281, - VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 282, - VAR_CHROOT = 283, - VAR_USERNAME = 284, - VAR_DIRECTORY = 285, - VAR_LOGFILE = 286, - VAR_PIDFILE = 287, - VAR_MSG_CACHE_SIZE = 288, - VAR_MSG_CACHE_SLABS = 289, - VAR_NUM_QUERIES_PER_THREAD = 290, - VAR_RRSET_CACHE_SIZE = 291, - VAR_RRSET_CACHE_SLABS = 292, - VAR_OUTGOING_NUM_TCP = 293, - VAR_INFRA_HOST_TTL = 294, - VAR_INFRA_LAME_TTL = 295, - VAR_INFRA_CACHE_SLABS = 296, - VAR_INFRA_CACHE_NUMHOSTS = 297, - VAR_INFRA_CACHE_LAME_SIZE = 298, - VAR_NAME = 299, - VAR_STUB_ZONE = 300, - VAR_STUB_HOST = 301, - VAR_STUB_ADDR = 302, - VAR_TARGET_FETCH_POLICY = 303, - VAR_HARDEN_SHORT_BUFSIZE = 304, - VAR_HARDEN_LARGE_QUERIES = 305, - VAR_FORWARD_ZONE = 306, - VAR_FORWARD_HOST = 307, - VAR_FORWARD_ADDR = 308, - VAR_DO_NOT_QUERY_ADDRESS = 309, - VAR_HIDE_IDENTITY = 310, - VAR_HIDE_VERSION = 311, - VAR_IDENTITY = 312, - VAR_VERSION = 313, - VAR_HARDEN_GLUE = 314, - VAR_MODULE_CONF = 315, - VAR_TRUST_ANCHOR_FILE = 316, - VAR_TRUST_ANCHOR = 317, - VAR_VAL_OVERRIDE_DATE = 318, - VAR_BOGUS_TTL = 319, - VAR_VAL_CLEAN_ADDITIONAL = 320, - VAR_VAL_PERMISSIVE_MODE = 321, - VAR_INCOMING_NUM_TCP = 322, - VAR_MSG_BUFFER_SIZE = 323, - VAR_KEY_CACHE_SIZE = 324, - VAR_KEY_CACHE_SLABS = 325, - VAR_TRUSTED_KEYS_FILE = 326, - VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 327, - VAR_USE_SYSLOG = 328, - VAR_OUTGOING_INTERFACE = 329, - VAR_ROOT_HINTS = 330, - VAR_DO_NOT_QUERY_LOCALHOST = 331, - VAR_CACHE_MAX_TTL = 332, - VAR_HARDEN_DNSSEC_STRIPPED = 333, - VAR_ACCESS_CONTROL = 334, - VAR_LOCAL_ZONE = 335, - VAR_LOCAL_DATA = 336, - VAR_INTERFACE_AUTOMATIC = 337, - VAR_STATISTICS_INTERVAL = 338, - VAR_DO_DAEMONIZE = 339, - VAR_USE_CAPS_FOR_ID = 340, - VAR_STATISTICS_CUMULATIVE = 341, - VAR_OUTGOING_PORT_PERMIT = 342, - VAR_OUTGOING_PORT_AVOID = 343, - VAR_DLV_ANCHOR_FILE = 344, - VAR_DLV_ANCHOR = 345, - VAR_NEG_CACHE_SIZE = 346, - VAR_HARDEN_REFERRAL_PATH = 347, - VAR_PRIVATE_ADDRESS = 348, - VAR_PRIVATE_DOMAIN = 349, - VAR_REMOTE_CONTROL = 350, - VAR_CONTROL_ENABLE = 351, - VAR_CONTROL_INTERFACE = 352, - VAR_CONTROL_PORT = 353, - VAR_SERVER_KEY_FILE = 354, - VAR_SERVER_CERT_FILE = 355, - VAR_CONTROL_KEY_FILE = 356, - VAR_CONTROL_CERT_FILE = 357, - VAR_CONTROL_USE_CERT = 358, - VAR_EXTENDED_STATISTICS = 359, - VAR_LOCAL_DATA_PTR = 360, - VAR_JOSTLE_TIMEOUT = 361, - VAR_STUB_PRIME = 362, - VAR_UNWANTED_REPLY_THRESHOLD = 363, - VAR_LOG_TIME_ASCII = 364, - VAR_DOMAIN_INSECURE = 365, - VAR_PYTHON = 366, - VAR_PYTHON_SCRIPT = 367, - VAR_VAL_SIG_SKEW_MIN = 368, - VAR_VAL_SIG_SKEW_MAX = 369, - VAR_CACHE_MIN_TTL = 370, - VAR_VAL_LOG_LEVEL = 371, - VAR_AUTO_TRUST_ANCHOR_FILE = 372, - VAR_KEEP_MISSING = 373, - VAR_ADD_HOLDDOWN = 374, - VAR_DEL_HOLDDOWN = 375, - VAR_SO_RCVBUF = 376, - VAR_EDNS_BUFFER_SIZE = 377, - VAR_PREFETCH = 378, - VAR_PREFETCH_KEY = 379, - VAR_SO_SNDBUF = 380, - VAR_SO_REUSEPORT = 381, - VAR_HARDEN_BELOW_NXDOMAIN = 382, - VAR_IGNORE_CD_FLAG = 383, - VAR_LOG_QUERIES = 384, - VAR_LOG_REPLIES = 385, - VAR_LOG_LOCAL_ACTIONS = 386, - VAR_TCP_UPSTREAM = 387, - VAR_SSL_UPSTREAM = 388, - VAR_SSL_SERVICE_KEY = 389, - VAR_SSL_SERVICE_PEM = 390, - VAR_SSL_PORT = 391, - VAR_FORWARD_FIRST = 392, - VAR_STUB_SSL_UPSTREAM = 393, - VAR_FORWARD_SSL_UPSTREAM = 394, - VAR_TLS_CERT_BUNDLE = 395, - VAR_STUB_FIRST = 396, - VAR_MINIMAL_RESPONSES = 397, - VAR_RRSET_ROUNDROBIN = 398, - VAR_MAX_UDP_SIZE = 399, - VAR_DELAY_CLOSE = 400, - VAR_UNBLOCK_LAN_ZONES = 401, - VAR_INSECURE_LAN_ZONES = 402, - VAR_INFRA_CACHE_MIN_RTT = 403, - VAR_DNS64_PREFIX = 404, - VAR_DNS64_SYNTHALL = 405, - VAR_DNS64_IGNORE_AAAA = 406, - VAR_DNSTAP = 407, - VAR_DNSTAP_ENABLE = 408, - VAR_DNSTAP_SOCKET_PATH = 409, - VAR_DNSTAP_IP = 410, - VAR_DNSTAP_TLS = 411, - VAR_DNSTAP_TLS_SERVER_NAME = 412, - VAR_DNSTAP_TLS_CERT_BUNDLE = 413, - VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 414, - VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 415, - VAR_DNSTAP_SEND_IDENTITY = 416, - VAR_DNSTAP_SEND_VERSION = 417, - VAR_DNSTAP_IDENTITY = 418, - VAR_DNSTAP_VERSION = 419, - VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 420, - VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 421, - VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 422, - VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 423, - VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 424, - VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 425, - VAR_RESPONSE_IP_TAG = 426, - VAR_RESPONSE_IP = 427, - VAR_RESPONSE_IP_DATA = 428, - VAR_HARDEN_ALGO_DOWNGRADE = 429, - VAR_IP_TRANSPARENT = 430, - VAR_IP_DSCP = 431, - VAR_DISABLE_DNSSEC_LAME_CHECK = 432, - VAR_IP_RATELIMIT = 433, - VAR_IP_RATELIMIT_SLABS = 434, - VAR_IP_RATELIMIT_SIZE = 435, - VAR_RATELIMIT = 436, - VAR_RATELIMIT_SLABS = 437, - VAR_RATELIMIT_SIZE = 438, - VAR_RATELIMIT_FOR_DOMAIN = 439, - VAR_RATELIMIT_BELOW_DOMAIN = 440, - VAR_IP_RATELIMIT_FACTOR = 441, - VAR_RATELIMIT_FACTOR = 442, - VAR_SEND_CLIENT_SUBNET = 443, - VAR_CLIENT_SUBNET_ZONE = 444, - VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 445, - VAR_CLIENT_SUBNET_OPCODE = 446, - VAR_MAX_CLIENT_SUBNET_IPV4 = 447, - VAR_MAX_CLIENT_SUBNET_IPV6 = 448, - VAR_MIN_CLIENT_SUBNET_IPV4 = 449, - VAR_MIN_CLIENT_SUBNET_IPV6 = 450, - VAR_MAX_ECS_TREE_SIZE_IPV4 = 451, - VAR_MAX_ECS_TREE_SIZE_IPV6 = 452, - VAR_CAPS_WHITELIST = 453, - VAR_CACHE_MAX_NEGATIVE_TTL = 454, - VAR_PERMIT_SMALL_HOLDDOWN = 455, - VAR_QNAME_MINIMISATION = 456, - VAR_QNAME_MINIMISATION_STRICT = 457, - VAR_IP_FREEBIND = 458, - VAR_DEFINE_TAG = 459, - VAR_LOCAL_ZONE_TAG = 460, - VAR_ACCESS_CONTROL_TAG = 461, - VAR_LOCAL_ZONE_OVERRIDE = 462, - VAR_ACCESS_CONTROL_TAG_ACTION = 463, - VAR_ACCESS_CONTROL_TAG_DATA = 464, - VAR_VIEW = 465, - VAR_ACCESS_CONTROL_VIEW = 466, - VAR_VIEW_FIRST = 467, - VAR_SERVE_EXPIRED = 468, - VAR_SERVE_EXPIRED_TTL = 469, - VAR_SERVE_EXPIRED_TTL_RESET = 470, - VAR_SERVE_EXPIRED_REPLY_TTL = 471, - VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 472, - VAR_SERVE_ORIGINAL_TTL = 473, - VAR_FAKE_DSA = 474, - VAR_FAKE_SHA1 = 475, - VAR_LOG_IDENTITY = 476, - VAR_HIDE_TRUSTANCHOR = 477, - VAR_TRUST_ANCHOR_SIGNALING = 478, - VAR_AGGRESSIVE_NSEC = 479, - VAR_USE_SYSTEMD = 480, - VAR_SHM_ENABLE = 481, - VAR_SHM_KEY = 482, - VAR_ROOT_KEY_SENTINEL = 483, - VAR_DNSCRYPT = 484, - VAR_DNSCRYPT_ENABLE = 485, - VAR_DNSCRYPT_PORT = 486, - VAR_DNSCRYPT_PROVIDER = 487, - VAR_DNSCRYPT_SECRET_KEY = 488, - VAR_DNSCRYPT_PROVIDER_CERT = 489, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 490, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 491, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 492, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 493, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 494, - VAR_IPSECMOD_ENABLED = 495, - VAR_IPSECMOD_HOOK = 496, - VAR_IPSECMOD_IGNORE_BOGUS = 497, - VAR_IPSECMOD_MAX_TTL = 498, - VAR_IPSECMOD_WHITELIST = 499, - VAR_IPSECMOD_STRICT = 500, - VAR_CACHEDB = 501, - VAR_CACHEDB_BACKEND = 502, - VAR_CACHEDB_SECRETSEED = 503, - VAR_CACHEDB_REDISHOST = 504, - VAR_CACHEDB_REDISPORT = 505, - VAR_CACHEDB_REDISTIMEOUT = 506, - VAR_CACHEDB_REDISEXPIRERECORDS = 507, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 508, - VAR_FOR_UPSTREAM = 509, - VAR_AUTH_ZONE = 510, - VAR_ZONEFILE = 511, - VAR_MASTER = 512, - VAR_URL = 513, - VAR_FOR_DOWNSTREAM = 514, - VAR_FALLBACK_ENABLED = 515, - VAR_TLS_ADDITIONAL_PORT = 516, - VAR_LOW_RTT = 517, - VAR_LOW_RTT_PERMIL = 518, - VAR_FAST_SERVER_PERMIL = 519, - VAR_FAST_SERVER_NUM = 520, - VAR_ALLOW_NOTIFY = 521, - VAR_TLS_WIN_CERT = 522, - VAR_TCP_CONNECTION_LIMIT = 523, - VAR_FORWARD_NO_CACHE = 524, - VAR_STUB_NO_CACHE = 525, - VAR_LOG_SERVFAIL = 526, - VAR_DENY_ANY = 527, - VAR_UNKNOWN_SERVER_TIME_LIMIT = 528, - VAR_LOG_TAG_QUERYREPLY = 529, - VAR_STREAM_WAIT_SIZE = 530, - VAR_TLS_CIPHERS = 531, - VAR_TLS_CIPHERSUITES = 532, - VAR_TLS_USE_SNI = 533, - VAR_IPSET = 534, - VAR_IPSET_NAME_V4 = 535, - VAR_IPSET_NAME_V6 = 536, - VAR_TLS_SESSION_TICKET_KEYS = 537, - VAR_RPZ = 538, - VAR_TAGS = 539, - VAR_RPZ_ACTION_OVERRIDE = 540, - VAR_RPZ_CNAME_OVERRIDE = 541, - VAR_RPZ_LOG = 542, - VAR_RPZ_LOG_NAME = 543, - VAR_DYNLIB = 544, - VAR_DYNLIB_FILE = 545 + VAR_FORCE_TOPLEVEL = 266, + VAR_SERVER = 267, + VAR_VERBOSITY = 268, + VAR_NUM_THREADS = 269, + VAR_PORT = 270, + VAR_OUTGOING_RANGE = 271, + VAR_INTERFACE = 272, + VAR_PREFER_IP4 = 273, + VAR_DO_IP4 = 274, + VAR_DO_IP6 = 275, + VAR_PREFER_IP6 = 276, + VAR_DO_UDP = 277, + VAR_DO_TCP = 278, + VAR_TCP_MSS = 279, + VAR_OUTGOING_TCP_MSS = 280, + VAR_TCP_IDLE_TIMEOUT = 281, + VAR_EDNS_TCP_KEEPALIVE = 282, + VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 283, + VAR_CHROOT = 284, + VAR_USERNAME = 285, + VAR_DIRECTORY = 286, + VAR_LOGFILE = 287, + VAR_PIDFILE = 288, + VAR_MSG_CACHE_SIZE = 289, + VAR_MSG_CACHE_SLABS = 290, + VAR_NUM_QUERIES_PER_THREAD = 291, + VAR_RRSET_CACHE_SIZE = 292, + VAR_RRSET_CACHE_SLABS = 293, + VAR_OUTGOING_NUM_TCP = 294, + VAR_INFRA_HOST_TTL = 295, + VAR_INFRA_LAME_TTL = 296, + VAR_INFRA_CACHE_SLABS = 297, + VAR_INFRA_CACHE_NUMHOSTS = 298, + VAR_INFRA_CACHE_LAME_SIZE = 299, + VAR_NAME = 300, + VAR_STUB_ZONE = 301, + VAR_STUB_HOST = 302, + VAR_STUB_ADDR = 303, + VAR_TARGET_FETCH_POLICY = 304, + VAR_HARDEN_SHORT_BUFSIZE = 305, + VAR_HARDEN_LARGE_QUERIES = 306, + VAR_FORWARD_ZONE = 307, + VAR_FORWARD_HOST = 308, + VAR_FORWARD_ADDR = 309, + VAR_DO_NOT_QUERY_ADDRESS = 310, + VAR_HIDE_IDENTITY = 311, + VAR_HIDE_VERSION = 312, + VAR_IDENTITY = 313, + VAR_VERSION = 314, + VAR_HARDEN_GLUE = 315, + VAR_MODULE_CONF = 316, + VAR_TRUST_ANCHOR_FILE = 317, + VAR_TRUST_ANCHOR = 318, + VAR_VAL_OVERRIDE_DATE = 319, + VAR_BOGUS_TTL = 320, + VAR_VAL_CLEAN_ADDITIONAL = 321, + VAR_VAL_PERMISSIVE_MODE = 322, + VAR_INCOMING_NUM_TCP = 323, + VAR_MSG_BUFFER_SIZE = 324, + VAR_KEY_CACHE_SIZE = 325, + VAR_KEY_CACHE_SLABS = 326, + VAR_TRUSTED_KEYS_FILE = 327, + VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 328, + VAR_USE_SYSLOG = 329, + VAR_OUTGOING_INTERFACE = 330, + VAR_ROOT_HINTS = 331, + VAR_DO_NOT_QUERY_LOCALHOST = 332, + VAR_CACHE_MAX_TTL = 333, + VAR_HARDEN_DNSSEC_STRIPPED = 334, + VAR_ACCESS_CONTROL = 335, + VAR_LOCAL_ZONE = 336, + VAR_LOCAL_DATA = 337, + VAR_INTERFACE_AUTOMATIC = 338, + VAR_STATISTICS_INTERVAL = 339, + VAR_DO_DAEMONIZE = 340, + VAR_USE_CAPS_FOR_ID = 341, + VAR_STATISTICS_CUMULATIVE = 342, + VAR_OUTGOING_PORT_PERMIT = 343, + VAR_OUTGOING_PORT_AVOID = 344, + VAR_DLV_ANCHOR_FILE = 345, + VAR_DLV_ANCHOR = 346, + VAR_NEG_CACHE_SIZE = 347, + VAR_HARDEN_REFERRAL_PATH = 348, + VAR_PRIVATE_ADDRESS = 349, + VAR_PRIVATE_DOMAIN = 350, + VAR_REMOTE_CONTROL = 351, + VAR_CONTROL_ENABLE = 352, + VAR_CONTROL_INTERFACE = 353, + VAR_CONTROL_PORT = 354, + VAR_SERVER_KEY_FILE = 355, + VAR_SERVER_CERT_FILE = 356, + VAR_CONTROL_KEY_FILE = 357, + VAR_CONTROL_CERT_FILE = 358, + VAR_CONTROL_USE_CERT = 359, + VAR_EXTENDED_STATISTICS = 360, + VAR_LOCAL_DATA_PTR = 361, + VAR_JOSTLE_TIMEOUT = 362, + VAR_STUB_PRIME = 363, + VAR_UNWANTED_REPLY_THRESHOLD = 364, + VAR_LOG_TIME_ASCII = 365, + VAR_DOMAIN_INSECURE = 366, + VAR_PYTHON = 367, + VAR_PYTHON_SCRIPT = 368, + VAR_VAL_SIG_SKEW_MIN = 369, + VAR_VAL_SIG_SKEW_MAX = 370, + VAR_CACHE_MIN_TTL = 371, + VAR_VAL_LOG_LEVEL = 372, + VAR_AUTO_TRUST_ANCHOR_FILE = 373, + VAR_KEEP_MISSING = 374, + VAR_ADD_HOLDDOWN = 375, + VAR_DEL_HOLDDOWN = 376, + VAR_SO_RCVBUF = 377, + VAR_EDNS_BUFFER_SIZE = 378, + VAR_PREFETCH = 379, + VAR_PREFETCH_KEY = 380, + VAR_SO_SNDBUF = 381, + VAR_SO_REUSEPORT = 382, + VAR_HARDEN_BELOW_NXDOMAIN = 383, + VAR_IGNORE_CD_FLAG = 384, + VAR_LOG_QUERIES = 385, + VAR_LOG_REPLIES = 386, + VAR_LOG_LOCAL_ACTIONS = 387, + VAR_TCP_UPSTREAM = 388, + VAR_SSL_UPSTREAM = 389, + VAR_SSL_SERVICE_KEY = 390, + VAR_SSL_SERVICE_PEM = 391, + VAR_SSL_PORT = 392, + VAR_FORWARD_FIRST = 393, + VAR_STUB_SSL_UPSTREAM = 394, + VAR_FORWARD_SSL_UPSTREAM = 395, + VAR_TLS_CERT_BUNDLE = 396, + VAR_STUB_FIRST = 397, + VAR_MINIMAL_RESPONSES = 398, + VAR_RRSET_ROUNDROBIN = 399, + VAR_MAX_UDP_SIZE = 400, + VAR_DELAY_CLOSE = 401, + VAR_UNBLOCK_LAN_ZONES = 402, + VAR_INSECURE_LAN_ZONES = 403, + VAR_INFRA_CACHE_MIN_RTT = 404, + VAR_DNS64_PREFIX = 405, + VAR_DNS64_SYNTHALL = 406, + VAR_DNS64_IGNORE_AAAA = 407, + VAR_DNSTAP = 408, + VAR_DNSTAP_ENABLE = 409, + VAR_DNSTAP_SOCKET_PATH = 410, + VAR_DNSTAP_IP = 411, + VAR_DNSTAP_TLS = 412, + VAR_DNSTAP_TLS_SERVER_NAME = 413, + VAR_DNSTAP_TLS_CERT_BUNDLE = 414, + VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 415, + VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 416, + VAR_DNSTAP_SEND_IDENTITY = 417, + VAR_DNSTAP_SEND_VERSION = 418, + VAR_DNSTAP_BIDIRECTIONAL = 419, + VAR_DNSTAP_IDENTITY = 420, + VAR_DNSTAP_VERSION = 421, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 422, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 423, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 424, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 425, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 426, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 427, + VAR_RESPONSE_IP_TAG = 428, + VAR_RESPONSE_IP = 429, + VAR_RESPONSE_IP_DATA = 430, + VAR_HARDEN_ALGO_DOWNGRADE = 431, + VAR_IP_TRANSPARENT = 432, + VAR_IP_DSCP = 433, + VAR_DISABLE_DNSSEC_LAME_CHECK = 434, + VAR_IP_RATELIMIT = 435, + VAR_IP_RATELIMIT_SLABS = 436, + VAR_IP_RATELIMIT_SIZE = 437, + VAR_RATELIMIT = 438, + VAR_RATELIMIT_SLABS = 439, + VAR_RATELIMIT_SIZE = 440, + VAR_RATELIMIT_FOR_DOMAIN = 441, + VAR_RATELIMIT_BELOW_DOMAIN = 442, + VAR_IP_RATELIMIT_FACTOR = 443, + VAR_RATELIMIT_FACTOR = 444, + VAR_SEND_CLIENT_SUBNET = 445, + VAR_CLIENT_SUBNET_ZONE = 446, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 447, + VAR_CLIENT_SUBNET_OPCODE = 448, + VAR_MAX_CLIENT_SUBNET_IPV4 = 449, + VAR_MAX_CLIENT_SUBNET_IPV6 = 450, + VAR_MIN_CLIENT_SUBNET_IPV4 = 451, + VAR_MIN_CLIENT_SUBNET_IPV6 = 452, + VAR_MAX_ECS_TREE_SIZE_IPV4 = 453, + VAR_MAX_ECS_TREE_SIZE_IPV6 = 454, + VAR_CAPS_WHITELIST = 455, + VAR_CACHE_MAX_NEGATIVE_TTL = 456, + VAR_PERMIT_SMALL_HOLDDOWN = 457, + VAR_QNAME_MINIMISATION = 458, + VAR_QNAME_MINIMISATION_STRICT = 459, + VAR_IP_FREEBIND = 460, + VAR_DEFINE_TAG = 461, + VAR_LOCAL_ZONE_TAG = 462, + VAR_ACCESS_CONTROL_TAG = 463, + VAR_LOCAL_ZONE_OVERRIDE = 464, + VAR_ACCESS_CONTROL_TAG_ACTION = 465, + VAR_ACCESS_CONTROL_TAG_DATA = 466, + VAR_VIEW = 467, + VAR_ACCESS_CONTROL_VIEW = 468, + VAR_VIEW_FIRST = 469, + VAR_SERVE_EXPIRED = 470, + VAR_SERVE_EXPIRED_TTL = 471, + VAR_SERVE_EXPIRED_TTL_RESET = 472, + VAR_SERVE_EXPIRED_REPLY_TTL = 473, + VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 474, + VAR_SERVE_ORIGINAL_TTL = 475, + VAR_FAKE_DSA = 476, + VAR_FAKE_SHA1 = 477, + VAR_LOG_IDENTITY = 478, + VAR_HIDE_TRUSTANCHOR = 479, + VAR_TRUST_ANCHOR_SIGNALING = 480, + VAR_AGGRESSIVE_NSEC = 481, + VAR_USE_SYSTEMD = 482, + VAR_SHM_ENABLE = 483, + VAR_SHM_KEY = 484, + VAR_ROOT_KEY_SENTINEL = 485, + VAR_DNSCRYPT = 486, + VAR_DNSCRYPT_ENABLE = 487, + VAR_DNSCRYPT_PORT = 488, + VAR_DNSCRYPT_PROVIDER = 489, + VAR_DNSCRYPT_SECRET_KEY = 490, + VAR_DNSCRYPT_PROVIDER_CERT = 491, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 492, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 493, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 494, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 495, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 496, + VAR_IPSECMOD_ENABLED = 497, + VAR_IPSECMOD_HOOK = 498, + VAR_IPSECMOD_IGNORE_BOGUS = 499, + VAR_IPSECMOD_MAX_TTL = 500, + VAR_IPSECMOD_WHITELIST = 501, + VAR_IPSECMOD_STRICT = 502, + VAR_CACHEDB = 503, + VAR_CACHEDB_BACKEND = 504, + VAR_CACHEDB_SECRETSEED = 505, + VAR_CACHEDB_REDISHOST = 506, + VAR_CACHEDB_REDISPORT = 507, + VAR_CACHEDB_REDISTIMEOUT = 508, + VAR_CACHEDB_REDISEXPIRERECORDS = 509, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 510, + VAR_FOR_UPSTREAM = 511, + VAR_AUTH_ZONE = 512, + VAR_ZONEFILE = 513, + VAR_MASTER = 514, + VAR_URL = 515, + VAR_FOR_DOWNSTREAM = 516, + VAR_FALLBACK_ENABLED = 517, + VAR_TLS_ADDITIONAL_PORT = 518, + VAR_LOW_RTT = 519, + VAR_LOW_RTT_PERMIL = 520, + VAR_FAST_SERVER_PERMIL = 521, + VAR_FAST_SERVER_NUM = 522, + VAR_ALLOW_NOTIFY = 523, + VAR_TLS_WIN_CERT = 524, + VAR_TCP_CONNECTION_LIMIT = 525, + VAR_FORWARD_NO_CACHE = 526, + VAR_STUB_NO_CACHE = 527, + VAR_LOG_SERVFAIL = 528, + VAR_DENY_ANY = 529, + VAR_UNKNOWN_SERVER_TIME_LIMIT = 530, + VAR_LOG_TAG_QUERYREPLY = 531, + VAR_STREAM_WAIT_SIZE = 532, + VAR_TLS_CIPHERS = 533, + VAR_TLS_CIPHERSUITES = 534, + VAR_TLS_USE_SNI = 535, + VAR_IPSET = 536, + VAR_IPSET_NAME_V4 = 537, + VAR_IPSET_NAME_V6 = 538, + VAR_TLS_SESSION_TICKET_KEYS = 539, + VAR_RPZ = 540, + VAR_TAGS = 541, + VAR_RPZ_ACTION_OVERRIDE = 542, + VAR_RPZ_CNAME_OVERRIDE = 543, + VAR_RPZ_LOG = 544, + VAR_RPZ_LOG_NAME = 545, + VAR_DYNLIB = 546, + VAR_DYNLIB_FILE = 547 }; #endif /* Tokens. */ @@ -344,286 +346,288 @@ extern int yydebug; #define ANY 263 #define ZONESTR 264 #define STRING_ARG 265 -#define VAR_SERVER 266 -#define VAR_VERBOSITY 267 -#define VAR_NUM_THREADS 268 -#define VAR_PORT 269 -#define VAR_OUTGOING_RANGE 270 -#define VAR_INTERFACE 271 -#define VAR_PREFER_IP4 272 -#define VAR_DO_IP4 273 -#define VAR_DO_IP6 274 -#define VAR_PREFER_IP6 275 -#define VAR_DO_UDP 276 -#define VAR_DO_TCP 277 -#define VAR_TCP_MSS 278 -#define VAR_OUTGOING_TCP_MSS 279 -#define VAR_TCP_IDLE_TIMEOUT 280 -#define VAR_EDNS_TCP_KEEPALIVE 281 -#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 282 -#define VAR_CHROOT 283 -#define VAR_USERNAME 284 -#define VAR_DIRECTORY 285 -#define VAR_LOGFILE 286 -#define VAR_PIDFILE 287 -#define VAR_MSG_CACHE_SIZE 288 -#define VAR_MSG_CACHE_SLABS 289 -#define VAR_NUM_QUERIES_PER_THREAD 290 -#define VAR_RRSET_CACHE_SIZE 291 -#define VAR_RRSET_CACHE_SLABS 292 -#define VAR_OUTGOING_NUM_TCP 293 -#define VAR_INFRA_HOST_TTL 294 -#define VAR_INFRA_LAME_TTL 295 -#define VAR_INFRA_CACHE_SLABS 296 -#define VAR_INFRA_CACHE_NUMHOSTS 297 -#define VAR_INFRA_CACHE_LAME_SIZE 298 -#define VAR_NAME 299 -#define VAR_STUB_ZONE 300 -#define VAR_STUB_HOST 301 -#define VAR_STUB_ADDR 302 -#define VAR_TARGET_FETCH_POLICY 303 -#define VAR_HARDEN_SHORT_BUFSIZE 304 -#define VAR_HARDEN_LARGE_QUERIES 305 -#define VAR_FORWARD_ZONE 306 -#define VAR_FORWARD_HOST 307 -#define VAR_FORWARD_ADDR 308 -#define VAR_DO_NOT_QUERY_ADDRESS 309 -#define VAR_HIDE_IDENTITY 310 -#define VAR_HIDE_VERSION 311 -#define VAR_IDENTITY 312 -#define VAR_VERSION 313 -#define VAR_HARDEN_GLUE 314 -#define VAR_MODULE_CONF 315 -#define VAR_TRUST_ANCHOR_FILE 316 -#define VAR_TRUST_ANCHOR 317 -#define VAR_VAL_OVERRIDE_DATE 318 -#define VAR_BOGUS_TTL 319 -#define VAR_VAL_CLEAN_ADDITIONAL 320 -#define VAR_VAL_PERMISSIVE_MODE 321 -#define VAR_INCOMING_NUM_TCP 322 -#define VAR_MSG_BUFFER_SIZE 323 -#define VAR_KEY_CACHE_SIZE 324 -#define VAR_KEY_CACHE_SLABS 325 -#define VAR_TRUSTED_KEYS_FILE 326 -#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 327 -#define VAR_USE_SYSLOG 328 -#define VAR_OUTGOING_INTERFACE 329 -#define VAR_ROOT_HINTS 330 -#define VAR_DO_NOT_QUERY_LOCALHOST 331 -#define VAR_CACHE_MAX_TTL 332 -#define VAR_HARDEN_DNSSEC_STRIPPED 333 -#define VAR_ACCESS_CONTROL 334 -#define VAR_LOCAL_ZONE 335 -#define VAR_LOCAL_DATA 336 -#define VAR_INTERFACE_AUTOMATIC 337 -#define VAR_STATISTICS_INTERVAL 338 -#define VAR_DO_DAEMONIZE 339 -#define VAR_USE_CAPS_FOR_ID 340 -#define VAR_STATISTICS_CUMULATIVE 341 -#define VAR_OUTGOING_PORT_PERMIT 342 -#define VAR_OUTGOING_PORT_AVOID 343 -#define VAR_DLV_ANCHOR_FILE 344 -#define VAR_DLV_ANCHOR 345 -#define VAR_NEG_CACHE_SIZE 346 -#define VAR_HARDEN_REFERRAL_PATH 347 -#define VAR_PRIVATE_ADDRESS 348 -#define VAR_PRIVATE_DOMAIN 349 -#define VAR_REMOTE_CONTROL 350 -#define VAR_CONTROL_ENABLE 351 -#define VAR_CONTROL_INTERFACE 352 -#define VAR_CONTROL_PORT 353 -#define VAR_SERVER_KEY_FILE 354 -#define VAR_SERVER_CERT_FILE 355 -#define VAR_CONTROL_KEY_FILE 356 -#define VAR_CONTROL_CERT_FILE 357 -#define VAR_CONTROL_USE_CERT 358 -#define VAR_EXTENDED_STATISTICS 359 -#define VAR_LOCAL_DATA_PTR 360 -#define VAR_JOSTLE_TIMEOUT 361 -#define VAR_STUB_PRIME 362 -#define VAR_UNWANTED_REPLY_THRESHOLD 363 -#define VAR_LOG_TIME_ASCII 364 -#define VAR_DOMAIN_INSECURE 365 -#define VAR_PYTHON 366 -#define VAR_PYTHON_SCRIPT 367 -#define VAR_VAL_SIG_SKEW_MIN 368 -#define VAR_VAL_SIG_SKEW_MAX 369 -#define VAR_CACHE_MIN_TTL 370 -#define VAR_VAL_LOG_LEVEL 371 -#define VAR_AUTO_TRUST_ANCHOR_FILE 372 -#define VAR_KEEP_MISSING 373 -#define VAR_ADD_HOLDDOWN 374 -#define VAR_DEL_HOLDDOWN 375 -#define VAR_SO_RCVBUF 376 -#define VAR_EDNS_BUFFER_SIZE 377 -#define VAR_PREFETCH 378 -#define VAR_PREFETCH_KEY 379 -#define VAR_SO_SNDBUF 380 -#define VAR_SO_REUSEPORT 381 -#define VAR_HARDEN_BELOW_NXDOMAIN 382 -#define VAR_IGNORE_CD_FLAG 383 -#define VAR_LOG_QUERIES 384 -#define VAR_LOG_REPLIES 385 -#define VAR_LOG_LOCAL_ACTIONS 386 -#define VAR_TCP_UPSTREAM 387 -#define VAR_SSL_UPSTREAM 388 -#define VAR_SSL_SERVICE_KEY 389 -#define VAR_SSL_SERVICE_PEM 390 -#define VAR_SSL_PORT 391 -#define VAR_FORWARD_FIRST 392 -#define VAR_STUB_SSL_UPSTREAM 393 -#define VAR_FORWARD_SSL_UPSTREAM 394 -#define VAR_TLS_CERT_BUNDLE 395 -#define VAR_STUB_FIRST 396 -#define VAR_MINIMAL_RESPONSES 397 -#define VAR_RRSET_ROUNDROBIN 398 -#define VAR_MAX_UDP_SIZE 399 -#define VAR_DELAY_CLOSE 400 -#define VAR_UNBLOCK_LAN_ZONES 401 -#define VAR_INSECURE_LAN_ZONES 402 -#define VAR_INFRA_CACHE_MIN_RTT 403 -#define VAR_DNS64_PREFIX 404 -#define VAR_DNS64_SYNTHALL 405 -#define VAR_DNS64_IGNORE_AAAA 406 -#define VAR_DNSTAP 407 -#define VAR_DNSTAP_ENABLE 408 -#define VAR_DNSTAP_SOCKET_PATH 409 -#define VAR_DNSTAP_IP 410 -#define VAR_DNSTAP_TLS 411 -#define VAR_DNSTAP_TLS_SERVER_NAME 412 -#define VAR_DNSTAP_TLS_CERT_BUNDLE 413 -#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 414 -#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 415 -#define VAR_DNSTAP_SEND_IDENTITY 416 -#define VAR_DNSTAP_SEND_VERSION 417 -#define VAR_DNSTAP_IDENTITY 418 -#define VAR_DNSTAP_VERSION 419 -#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 420 -#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 421 -#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 422 -#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 423 -#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 424 -#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 425 -#define VAR_RESPONSE_IP_TAG 426 -#define VAR_RESPONSE_IP 427 -#define VAR_RESPONSE_IP_DATA 428 -#define VAR_HARDEN_ALGO_DOWNGRADE 429 -#define VAR_IP_TRANSPARENT 430 -#define VAR_IP_DSCP 431 -#define VAR_DISABLE_DNSSEC_LAME_CHECK 432 -#define VAR_IP_RATELIMIT 433 -#define VAR_IP_RATELIMIT_SLABS 434 -#define VAR_IP_RATELIMIT_SIZE 435 -#define VAR_RATELIMIT 436 -#define VAR_RATELIMIT_SLABS 437 -#define VAR_RATELIMIT_SIZE 438 -#define VAR_RATELIMIT_FOR_DOMAIN 439 -#define VAR_RATELIMIT_BELOW_DOMAIN 440 -#define VAR_IP_RATELIMIT_FACTOR 441 -#define VAR_RATELIMIT_FACTOR 442 -#define VAR_SEND_CLIENT_SUBNET 443 -#define VAR_CLIENT_SUBNET_ZONE 444 -#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 445 -#define VAR_CLIENT_SUBNET_OPCODE 446 -#define VAR_MAX_CLIENT_SUBNET_IPV4 447 -#define VAR_MAX_CLIENT_SUBNET_IPV6 448 -#define VAR_MIN_CLIENT_SUBNET_IPV4 449 -#define VAR_MIN_CLIENT_SUBNET_IPV6 450 -#define VAR_MAX_ECS_TREE_SIZE_IPV4 451 -#define VAR_MAX_ECS_TREE_SIZE_IPV6 452 -#define VAR_CAPS_WHITELIST 453 -#define VAR_CACHE_MAX_NEGATIVE_TTL 454 -#define VAR_PERMIT_SMALL_HOLDDOWN 455 -#define VAR_QNAME_MINIMISATION 456 -#define VAR_QNAME_MINIMISATION_STRICT 457 -#define VAR_IP_FREEBIND 458 -#define VAR_DEFINE_TAG 459 -#define VAR_LOCAL_ZONE_TAG 460 -#define VAR_ACCESS_CONTROL_TAG 461 -#define VAR_LOCAL_ZONE_OVERRIDE 462 -#define VAR_ACCESS_CONTROL_TAG_ACTION 463 -#define VAR_ACCESS_CONTROL_TAG_DATA 464 -#define VAR_VIEW 465 -#define VAR_ACCESS_CONTROL_VIEW 466 -#define VAR_VIEW_FIRST 467 -#define VAR_SERVE_EXPIRED 468 -#define VAR_SERVE_EXPIRED_TTL 469 -#define VAR_SERVE_EXPIRED_TTL_RESET 470 -#define VAR_SERVE_EXPIRED_REPLY_TTL 471 -#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 472 -#define VAR_SERVE_ORIGINAL_TTL 473 -#define VAR_FAKE_DSA 474 -#define VAR_FAKE_SHA1 475 -#define VAR_LOG_IDENTITY 476 -#define VAR_HIDE_TRUSTANCHOR 477 -#define VAR_TRUST_ANCHOR_SIGNALING 478 -#define VAR_AGGRESSIVE_NSEC 479 -#define VAR_USE_SYSTEMD 480 -#define VAR_SHM_ENABLE 481 -#define VAR_SHM_KEY 482 -#define VAR_ROOT_KEY_SENTINEL 483 -#define VAR_DNSCRYPT 484 -#define VAR_DNSCRYPT_ENABLE 485 -#define VAR_DNSCRYPT_PORT 486 -#define VAR_DNSCRYPT_PROVIDER 487 -#define VAR_DNSCRYPT_SECRET_KEY 488 -#define VAR_DNSCRYPT_PROVIDER_CERT 489 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 490 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 491 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 492 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 493 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 494 -#define VAR_IPSECMOD_ENABLED 495 -#define VAR_IPSECMOD_HOOK 496 -#define VAR_IPSECMOD_IGNORE_BOGUS 497 -#define VAR_IPSECMOD_MAX_TTL 498 -#define VAR_IPSECMOD_WHITELIST 499 -#define VAR_IPSECMOD_STRICT 500 -#define VAR_CACHEDB 501 -#define VAR_CACHEDB_BACKEND 502 -#define VAR_CACHEDB_SECRETSEED 503 -#define VAR_CACHEDB_REDISHOST 504 -#define VAR_CACHEDB_REDISPORT 505 -#define VAR_CACHEDB_REDISTIMEOUT 506 -#define VAR_CACHEDB_REDISEXPIRERECORDS 507 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 508 -#define VAR_FOR_UPSTREAM 509 -#define VAR_AUTH_ZONE 510 -#define VAR_ZONEFILE 511 -#define VAR_MASTER 512 -#define VAR_URL 513 -#define VAR_FOR_DOWNSTREAM 514 -#define VAR_FALLBACK_ENABLED 515 -#define VAR_TLS_ADDITIONAL_PORT 516 -#define VAR_LOW_RTT 517 -#define VAR_LOW_RTT_PERMIL 518 -#define VAR_FAST_SERVER_PERMIL 519 -#define VAR_FAST_SERVER_NUM 520 -#define VAR_ALLOW_NOTIFY 521 -#define VAR_TLS_WIN_CERT 522 -#define VAR_TCP_CONNECTION_LIMIT 523 -#define VAR_FORWARD_NO_CACHE 524 -#define VAR_STUB_NO_CACHE 525 -#define VAR_LOG_SERVFAIL 526 -#define VAR_DENY_ANY 527 -#define VAR_UNKNOWN_SERVER_TIME_LIMIT 528 -#define VAR_LOG_TAG_QUERYREPLY 529 -#define VAR_STREAM_WAIT_SIZE 530 -#define VAR_TLS_CIPHERS 531 -#define VAR_TLS_CIPHERSUITES 532 -#define VAR_TLS_USE_SNI 533 -#define VAR_IPSET 534 -#define VAR_IPSET_NAME_V4 535 -#define VAR_IPSET_NAME_V6 536 -#define VAR_TLS_SESSION_TICKET_KEYS 537 -#define VAR_RPZ 538 -#define VAR_TAGS 539 -#define VAR_RPZ_ACTION_OVERRIDE 540 -#define VAR_RPZ_CNAME_OVERRIDE 541 -#define VAR_RPZ_LOG 542 -#define VAR_RPZ_LOG_NAME 543 -#define VAR_DYNLIB 544 -#define VAR_DYNLIB_FILE 545 +#define VAR_FORCE_TOPLEVEL 266 +#define VAR_SERVER 267 +#define VAR_VERBOSITY 268 +#define VAR_NUM_THREADS 269 +#define VAR_PORT 270 +#define VAR_OUTGOING_RANGE 271 +#define VAR_INTERFACE 272 +#define VAR_PREFER_IP4 273 +#define VAR_DO_IP4 274 +#define VAR_DO_IP6 275 +#define VAR_PREFER_IP6 276 +#define VAR_DO_UDP 277 +#define VAR_DO_TCP 278 +#define VAR_TCP_MSS 279 +#define VAR_OUTGOING_TCP_MSS 280 +#define VAR_TCP_IDLE_TIMEOUT 281 +#define VAR_EDNS_TCP_KEEPALIVE 282 +#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 283 +#define VAR_CHROOT 284 +#define VAR_USERNAME 285 +#define VAR_DIRECTORY 286 +#define VAR_LOGFILE 287 +#define VAR_PIDFILE 288 +#define VAR_MSG_CACHE_SIZE 289 +#define VAR_MSG_CACHE_SLABS 290 +#define VAR_NUM_QUERIES_PER_THREAD 291 +#define VAR_RRSET_CACHE_SIZE 292 +#define VAR_RRSET_CACHE_SLABS 293 +#define VAR_OUTGOING_NUM_TCP 294 +#define VAR_INFRA_HOST_TTL 295 +#define VAR_INFRA_LAME_TTL 296 +#define VAR_INFRA_CACHE_SLABS 297 +#define VAR_INFRA_CACHE_NUMHOSTS 298 +#define VAR_INFRA_CACHE_LAME_SIZE 299 +#define VAR_NAME 300 +#define VAR_STUB_ZONE 301 +#define VAR_STUB_HOST 302 +#define VAR_STUB_ADDR 303 +#define VAR_TARGET_FETCH_POLICY 304 +#define VAR_HARDEN_SHORT_BUFSIZE 305 +#define VAR_HARDEN_LARGE_QUERIES 306 +#define VAR_FORWARD_ZONE 307 +#define VAR_FORWARD_HOST 308 +#define VAR_FORWARD_ADDR 309 +#define VAR_DO_NOT_QUERY_ADDRESS 310 +#define VAR_HIDE_IDENTITY 311 +#define VAR_HIDE_VERSION 312 +#define VAR_IDENTITY 313 +#define VAR_VERSION 314 +#define VAR_HARDEN_GLUE 315 +#define VAR_MODULE_CONF 316 +#define VAR_TRUST_ANCHOR_FILE 317 +#define VAR_TRUST_ANCHOR 318 +#define VAR_VAL_OVERRIDE_DATE 319 +#define VAR_BOGUS_TTL 320 +#define VAR_VAL_CLEAN_ADDITIONAL 321 +#define VAR_VAL_PERMISSIVE_MODE 322 +#define VAR_INCOMING_NUM_TCP 323 +#define VAR_MSG_BUFFER_SIZE 324 +#define VAR_KEY_CACHE_SIZE 325 +#define VAR_KEY_CACHE_SLABS 326 +#define VAR_TRUSTED_KEYS_FILE 327 +#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 328 +#define VAR_USE_SYSLOG 329 +#define VAR_OUTGOING_INTERFACE 330 +#define VAR_ROOT_HINTS 331 +#define VAR_DO_NOT_QUERY_LOCALHOST 332 +#define VAR_CACHE_MAX_TTL 333 +#define VAR_HARDEN_DNSSEC_STRIPPED 334 +#define VAR_ACCESS_CONTROL 335 +#define VAR_LOCAL_ZONE 336 +#define VAR_LOCAL_DATA 337 +#define VAR_INTERFACE_AUTOMATIC 338 +#define VAR_STATISTICS_INTERVAL 339 +#define VAR_DO_DAEMONIZE 340 +#define VAR_USE_CAPS_FOR_ID 341 +#define VAR_STATISTICS_CUMULATIVE 342 +#define VAR_OUTGOING_PORT_PERMIT 343 +#define VAR_OUTGOING_PORT_AVOID 344 +#define VAR_DLV_ANCHOR_FILE 345 +#define VAR_DLV_ANCHOR 346 +#define VAR_NEG_CACHE_SIZE 347 +#define VAR_HARDEN_REFERRAL_PATH 348 +#define VAR_PRIVATE_ADDRESS 349 +#define VAR_PRIVATE_DOMAIN 350 +#define VAR_REMOTE_CONTROL 351 +#define VAR_CONTROL_ENABLE 352 +#define VAR_CONTROL_INTERFACE 353 +#define VAR_CONTROL_PORT 354 +#define VAR_SERVER_KEY_FILE 355 +#define VAR_SERVER_CERT_FILE 356 +#define VAR_CONTROL_KEY_FILE 357 +#define VAR_CONTROL_CERT_FILE 358 +#define VAR_CONTROL_USE_CERT 359 +#define VAR_EXTENDED_STATISTICS 360 +#define VAR_LOCAL_DATA_PTR 361 +#define VAR_JOSTLE_TIMEOUT 362 +#define VAR_STUB_PRIME 363 +#define VAR_UNWANTED_REPLY_THRESHOLD 364 +#define VAR_LOG_TIME_ASCII 365 +#define VAR_DOMAIN_INSECURE 366 +#define VAR_PYTHON 367 +#define VAR_PYTHON_SCRIPT 368 +#define VAR_VAL_SIG_SKEW_MIN 369 +#define VAR_VAL_SIG_SKEW_MAX 370 +#define VAR_CACHE_MIN_TTL 371 +#define VAR_VAL_LOG_LEVEL 372 +#define VAR_AUTO_TRUST_ANCHOR_FILE 373 +#define VAR_KEEP_MISSING 374 +#define VAR_ADD_HOLDDOWN 375 +#define VAR_DEL_HOLDDOWN 376 +#define VAR_SO_RCVBUF 377 +#define VAR_EDNS_BUFFER_SIZE 378 +#define VAR_PREFETCH 379 +#define VAR_PREFETCH_KEY 380 +#define VAR_SO_SNDBUF 381 +#define VAR_SO_REUSEPORT 382 +#define VAR_HARDEN_BELOW_NXDOMAIN 383 +#define VAR_IGNORE_CD_FLAG 384 +#define VAR_LOG_QUERIES 385 +#define VAR_LOG_REPLIES 386 +#define VAR_LOG_LOCAL_ACTIONS 387 +#define VAR_TCP_UPSTREAM 388 +#define VAR_SSL_UPSTREAM 389 +#define VAR_SSL_SERVICE_KEY 390 +#define VAR_SSL_SERVICE_PEM 391 +#define VAR_SSL_PORT 392 +#define VAR_FORWARD_FIRST 393 +#define VAR_STUB_SSL_UPSTREAM 394 +#define VAR_FORWARD_SSL_UPSTREAM 395 +#define VAR_TLS_CERT_BUNDLE 396 +#define VAR_STUB_FIRST 397 +#define VAR_MINIMAL_RESPONSES 398 +#define VAR_RRSET_ROUNDROBIN 399 +#define VAR_MAX_UDP_SIZE 400 +#define VAR_DELAY_CLOSE 401 +#define VAR_UNBLOCK_LAN_ZONES 402 +#define VAR_INSECURE_LAN_ZONES 403 +#define VAR_INFRA_CACHE_MIN_RTT 404 +#define VAR_DNS64_PREFIX 405 +#define VAR_DNS64_SYNTHALL 406 +#define VAR_DNS64_IGNORE_AAAA 407 +#define VAR_DNSTAP 408 +#define VAR_DNSTAP_ENABLE 409 +#define VAR_DNSTAP_SOCKET_PATH 410 +#define VAR_DNSTAP_IP 411 +#define VAR_DNSTAP_TLS 412 +#define VAR_DNSTAP_TLS_SERVER_NAME 413 +#define VAR_DNSTAP_TLS_CERT_BUNDLE 414 +#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 415 +#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 416 +#define VAR_DNSTAP_SEND_IDENTITY 417 +#define VAR_DNSTAP_SEND_VERSION 418 +#define VAR_DNSTAP_BIDIRECTIONAL 419 +#define VAR_DNSTAP_IDENTITY 420 +#define VAR_DNSTAP_VERSION 421 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 422 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 423 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 424 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 425 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 426 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 427 +#define VAR_RESPONSE_IP_TAG 428 +#define VAR_RESPONSE_IP 429 +#define VAR_RESPONSE_IP_DATA 430 +#define VAR_HARDEN_ALGO_DOWNGRADE 431 +#define VAR_IP_TRANSPARENT 432 +#define VAR_IP_DSCP 433 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 434 +#define VAR_IP_RATELIMIT 435 +#define VAR_IP_RATELIMIT_SLABS 436 +#define VAR_IP_RATELIMIT_SIZE 437 +#define VAR_RATELIMIT 438 +#define VAR_RATELIMIT_SLABS 439 +#define VAR_RATELIMIT_SIZE 440 +#define VAR_RATELIMIT_FOR_DOMAIN 441 +#define VAR_RATELIMIT_BELOW_DOMAIN 442 +#define VAR_IP_RATELIMIT_FACTOR 443 +#define VAR_RATELIMIT_FACTOR 444 +#define VAR_SEND_CLIENT_SUBNET 445 +#define VAR_CLIENT_SUBNET_ZONE 446 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 447 +#define VAR_CLIENT_SUBNET_OPCODE 448 +#define VAR_MAX_CLIENT_SUBNET_IPV4 449 +#define VAR_MAX_CLIENT_SUBNET_IPV6 450 +#define VAR_MIN_CLIENT_SUBNET_IPV4 451 +#define VAR_MIN_CLIENT_SUBNET_IPV6 452 +#define VAR_MAX_ECS_TREE_SIZE_IPV4 453 +#define VAR_MAX_ECS_TREE_SIZE_IPV6 454 +#define VAR_CAPS_WHITELIST 455 +#define VAR_CACHE_MAX_NEGATIVE_TTL 456 +#define VAR_PERMIT_SMALL_HOLDDOWN 457 +#define VAR_QNAME_MINIMISATION 458 +#define VAR_QNAME_MINIMISATION_STRICT 459 +#define VAR_IP_FREEBIND 460 +#define VAR_DEFINE_TAG 461 +#define VAR_LOCAL_ZONE_TAG 462 +#define VAR_ACCESS_CONTROL_TAG 463 +#define VAR_LOCAL_ZONE_OVERRIDE 464 +#define VAR_ACCESS_CONTROL_TAG_ACTION 465 +#define VAR_ACCESS_CONTROL_TAG_DATA 466 +#define VAR_VIEW 467 +#define VAR_ACCESS_CONTROL_VIEW 468 +#define VAR_VIEW_FIRST 469 +#define VAR_SERVE_EXPIRED 470 +#define VAR_SERVE_EXPIRED_TTL 471 +#define VAR_SERVE_EXPIRED_TTL_RESET 472 +#define VAR_SERVE_EXPIRED_REPLY_TTL 473 +#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 474 +#define VAR_SERVE_ORIGINAL_TTL 475 +#define VAR_FAKE_DSA 476 +#define VAR_FAKE_SHA1 477 +#define VAR_LOG_IDENTITY 478 +#define VAR_HIDE_TRUSTANCHOR 479 +#define VAR_TRUST_ANCHOR_SIGNALING 480 +#define VAR_AGGRESSIVE_NSEC 481 +#define VAR_USE_SYSTEMD 482 +#define VAR_SHM_ENABLE 483 +#define VAR_SHM_KEY 484 +#define VAR_ROOT_KEY_SENTINEL 485 +#define VAR_DNSCRYPT 486 +#define VAR_DNSCRYPT_ENABLE 487 +#define VAR_DNSCRYPT_PORT 488 +#define VAR_DNSCRYPT_PROVIDER 489 +#define VAR_DNSCRYPT_SECRET_KEY 490 +#define VAR_DNSCRYPT_PROVIDER_CERT 491 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 492 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 493 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 494 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 495 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 496 +#define VAR_IPSECMOD_ENABLED 497 +#define VAR_IPSECMOD_HOOK 498 +#define VAR_IPSECMOD_IGNORE_BOGUS 499 +#define VAR_IPSECMOD_MAX_TTL 500 +#define VAR_IPSECMOD_WHITELIST 501 +#define VAR_IPSECMOD_STRICT 502 +#define VAR_CACHEDB 503 +#define VAR_CACHEDB_BACKEND 504 +#define VAR_CACHEDB_SECRETSEED 505 +#define VAR_CACHEDB_REDISHOST 506 +#define VAR_CACHEDB_REDISPORT 507 +#define VAR_CACHEDB_REDISTIMEOUT 508 +#define VAR_CACHEDB_REDISEXPIRERECORDS 509 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 510 +#define VAR_FOR_UPSTREAM 511 +#define VAR_AUTH_ZONE 512 +#define VAR_ZONEFILE 513 +#define VAR_MASTER 514 +#define VAR_URL 515 +#define VAR_FOR_DOWNSTREAM 516 +#define VAR_FALLBACK_ENABLED 517 +#define VAR_TLS_ADDITIONAL_PORT 518 +#define VAR_LOW_RTT 519 +#define VAR_LOW_RTT_PERMIL 520 +#define VAR_FAST_SERVER_PERMIL 521 +#define VAR_FAST_SERVER_NUM 522 +#define VAR_ALLOW_NOTIFY 523 +#define VAR_TLS_WIN_CERT 524 +#define VAR_TCP_CONNECTION_LIMIT 525 +#define VAR_FORWARD_NO_CACHE 526 +#define VAR_STUB_NO_CACHE 527 +#define VAR_LOG_SERVFAIL 528 +#define VAR_DENY_ANY 529 +#define VAR_UNKNOWN_SERVER_TIME_LIMIT 530 +#define VAR_LOG_TAG_QUERYREPLY 531 +#define VAR_STREAM_WAIT_SIZE 532 +#define VAR_TLS_CIPHERS 533 +#define VAR_TLS_CIPHERSUITES 534 +#define VAR_TLS_USE_SNI 535 +#define VAR_IPSET 536 +#define VAR_IPSET_NAME_V4 537 +#define VAR_IPSET_NAME_V6 538 +#define VAR_TLS_SESSION_TICKET_KEYS 539 +#define VAR_RPZ 540 +#define VAR_TAGS 541 +#define VAR_RPZ_ACTION_OVERRIDE 542 +#define VAR_RPZ_CNAME_OVERRIDE 543 +#define VAR_RPZ_LOG 544 +#define VAR_RPZ_LOG_NAME 545 +#define VAR_DYNLIB 546 +#define VAR_DYNLIB_FILE 547 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -634,7 +638,7 @@ union YYSTYPE char* str; -#line 638 "util/configparser.h" /* yacc.c:1909 */ +#line 642 "util/configparser.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index 9b300324c..513e90e16 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -69,6 +69,7 @@ extern struct config_parser_state* cfg_parser; %token SPACE LETTER NEWLINE COMMENT COLON ANY ZONESTR %token STRING_ARG +%token VAR_FORCE_TOPLEVEL %token VAR_SERVER VAR_VERBOSITY VAR_NUM_THREADS VAR_PORT %token VAR_OUTGOING_RANGE VAR_INTERFACE VAR_PREFER_IP4 %token VAR_DO_IP4 VAR_DO_IP6 VAR_PREFER_IP6 VAR_DO_UDP VAR_DO_TCP @@ -119,7 +120,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_DNSTAP VAR_DNSTAP_ENABLE VAR_DNSTAP_SOCKET_PATH VAR_DNSTAP_IP %token VAR_DNSTAP_TLS VAR_DNSTAP_TLS_SERVER_NAME VAR_DNSTAP_TLS_CERT_BUNDLE %token VAR_DNSTAP_TLS_CLIENT_KEY_FILE VAR_DNSTAP_TLS_CLIENT_CERT_FILE -%token VAR_DNSTAP_SEND_IDENTITY VAR_DNSTAP_SEND_VERSION +%token VAR_DNSTAP_SEND_IDENTITY VAR_DNSTAP_SEND_VERSION VAR_DNSTAP_BIDIRECTIONAL %token VAR_DNSTAP_IDENTITY VAR_DNSTAP_VERSION %token VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES %token VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES @@ -183,16 +184,21 @@ toplevelvar: serverstart contents_server | stubstart contents_stub | rcstart contents_rc | dtstart contents_dt | viewstart contents_view | dnscstart contents_dnsc | cachedbstart contents_cachedb | ipsetstart contents_ipset | authstart contents_auth | - rpzstart contents_rpz | dynlibstart contents_dl + rpzstart contents_rpz | dynlibstart contents_dl | + force_toplevel + ; +force_toplevel: VAR_FORCE_TOPLEVEL + { + OUTYY(("\nP(force-toplevel)\n")); + } ; - /* server: declaration */ serverstart: VAR_SERVER { - OUTYY(("\nP(server:)\n")); + OUTYY(("\nP(server:)\n")); } ; -contents_server: contents_server content_server +contents_server: contents_server content_server | ; content_server: server_num_threads | server_verbosity | server_port | server_outgoing_range | server_do_ip4 | @@ -2768,7 +2774,7 @@ dtstart: VAR_DNSTAP ; contents_dt: contents_dt content_dt | ; -content_dt: dt_dnstap_enable | dt_dnstap_socket_path | +content_dt: dt_dnstap_enable | dt_dnstap_socket_path | dt_dnstap_bidirectional | 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 | @@ -2790,6 +2796,16 @@ dt_dnstap_enable: VAR_DNSTAP_ENABLE STRING_ARG free($2); } ; +dt_dnstap_bidirectional: VAR_DNSTAP_BIDIRECTIONAL STRING_ARG + { + OUTYY(("P(dt_dnstap_bidirectional:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->dnstap_bidirectional = + (strcmp($2, "yes")==0); + free($2); + } + ; dt_dnstap_socket_path: VAR_DNSTAP_SOCKET_PATH STRING_ARG { OUTYY(("P(dt_dnstap_socket_path:%s)\n", $2)); diff --git a/util/net_help.c b/util/net_help.c index a00fe2e2f..f59a4d653 100644 --- a/util/net_help.c +++ b/util/net_help.c @@ -97,6 +97,7 @@ static struct tls_session_ticket_key { * @return 0 on no ticket, 1 for okay, and 2 for okay but renew the ticket * (the ticket is decrypt only). and <0 for failures. */ +#ifdef HAVE_SSL int tls_session_ticket_key_cb(SSL *s, unsigned char* key_name, unsigned char* iv, EVP_CIPHER_CTX *evp_ctx, #ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB @@ -105,6 +106,7 @@ int tls_session_ticket_key_cb(SSL *s, unsigned char* key_name, HMAC_CTX* hmac_ctx, #endif int enc); +#endif /* HAVE_SSL */ /* returns true is string addr is an ip6 specced address */ int @@ -1267,6 +1269,7 @@ int set_auth_name_on_ssl(void* ssl, char* auth_name, int use_sni) } #else (void)ssl; + (void)use_sni; #endif #ifdef HAVE_SSL_SET1_HOST SSL_set_verify(ssl, SSL_VERIFY_PEER, NULL); @@ -1434,6 +1437,7 @@ int listen_sslctx_setup_ticket_keys(void* sslctx, struct config_strlist* tls_ses } +#ifdef HAVE_SSL int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name, unsigned char* iv, EVP_CIPHER_CTX *evp_sctx, #ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB @@ -1531,6 +1535,7 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name, return 0; #endif } +#endif /* HAVE_SSL */ void listen_sslctx_delete_ticket_keys(void) diff --git a/util/netevent.c b/util/netevent.c index f7bb9b897..3e7a433e5 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -447,7 +447,10 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, ssize_t sent; struct msghdr msg; struct iovec iov[1]; - char control[256]; + union { + struct cmsghdr hdr; + char buf[256]; + } control; #ifndef S_SPLINT_S struct cmsghdr *cmsg; #endif /* S_SPLINT_S */ @@ -465,9 +468,9 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, iov[0].iov_len = sldns_buffer_remaining(packet); msg.msg_iov = iov; msg.msg_iovlen = 1; - msg.msg_control = control; + msg.msg_control = control.buf; #ifndef S_SPLINT_S - msg.msg_controllen = sizeof(control); + msg.msg_controllen = sizeof(control.buf); #endif /* S_SPLINT_S */ msg.msg_flags = 0; @@ -477,7 +480,7 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, #ifdef IP_PKTINFO void* cmsg_data; msg.msg_controllen = CMSG_SPACE(sizeof(struct in_pktinfo)); - log_assert(msg.msg_controllen <= sizeof(control)); + log_assert(msg.msg_controllen <= sizeof(control.buf)); cmsg->cmsg_level = IPPROTO_IP; cmsg->cmsg_type = IP_PKTINFO; memmove(CMSG_DATA(cmsg), &r->pktinfo.v4info, @@ -488,7 +491,7 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo)); #elif defined(IP_SENDSRCADDR) msg.msg_controllen = CMSG_SPACE(sizeof(struct in_addr)); - log_assert(msg.msg_controllen <= sizeof(control)); + log_assert(msg.msg_controllen <= sizeof(control.buf)); cmsg->cmsg_level = IPPROTO_IP; cmsg->cmsg_type = IP_SENDSRCADDR; memmove(CMSG_DATA(cmsg), &r->pktinfo.v4addr, @@ -501,7 +504,7 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, } else if(r->srctype == 6) { void* cmsg_data; msg.msg_controllen = CMSG_SPACE(sizeof(struct in6_pktinfo)); - log_assert(msg.msg_controllen <= sizeof(control)); + log_assert(msg.msg_controllen <= sizeof(control.buf)); cmsg->cmsg_level = IPPROTO_IPV6; cmsg->cmsg_type = IPV6_PKTINFO; memmove(CMSG_DATA(cmsg), &r->pktinfo.v6info, @@ -513,7 +516,7 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, } else { /* try to pass all 0 to use default route */ msg.msg_controllen = CMSG_SPACE(sizeof(struct in6_pktinfo)); - log_assert(msg.msg_controllen <= sizeof(control)); + log_assert(msg.msg_controllen <= sizeof(control.buf)); cmsg->cmsg_level = IPPROTO_IPV6; cmsg->cmsg_type = IPV6_PKTINFO; memset(CMSG_DATA(cmsg), 0, sizeof(struct in6_pktinfo)); @@ -584,7 +587,10 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg) struct msghdr msg; struct iovec iov[1]; ssize_t rcv; - char ancil[256]; + union { + struct cmsghdr hdr; + char buf[256]; + } ancil; int i; #ifndef S_SPLINT_S struct cmsghdr* cmsg; @@ -608,9 +614,9 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg) iov[0].iov_len = sldns_buffer_remaining(rep.c->buffer); msg.msg_iov = iov; msg.msg_iovlen = 1; - msg.msg_control = ancil; + msg.msg_control = ancil.buf; #ifndef S_SPLINT_S - msg.msg_controllen = sizeof(ancil); + msg.msg_controllen = sizeof(ancil.buf); #endif /* S_SPLINT_S */ msg.msg_flags = 0; rcv = recvmsg(fd, &msg, 0);