sync to libunbound 1.16.2; heavy lifting by sthen

diff --git a/sbin/unwind/libunbound/config.h b/sbin/unwind/libunbound/config.h
index 9588b75..d195a89 100644 (file)
--- a/sbin/unwind/libunbound/config.h
+++ b/sbin/unwind/libunbound/config.h
@@ -223,6 +223,10 @@
 /* Define to 1 if you have the `EVP_cleanup' function. */
 #define HAVE_EVP_CLEANUP 1
 
+/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled'
+   function. */
+/* #undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED */
+
 /* Define to 1 if you have the `EVP_DigestVerify' function. */
 #define HAVE_EVP_DIGESTVERIFY 1
 
@@ -548,7 +552,7 @@
 #define HAVE_SSL_CTX_SET_CIPHERSUITES 1
 
 /* Define to 1 if you have the `SSL_CTX_set_security_level' function. */
-/* #undef HAVE_SSL_CTX_SET_SECURITY_LEVEL */
+#define HAVE_SSL_CTX_SET_SECURITY_LEVEL 1
 
 /* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb'
    function. */
@@ -760,7 +764,7 @@
 #define PACKAGE_NAME "unbound"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "unbound 1.16.0"
+#define PACKAGE_STRING "unbound 1.16.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "unbound"
@@ -769,7 +773,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.16.0"
+#define PACKAGE_VERSION "1.16.2"
 
 /* default pidfile location */
 #define PIDFILE ""
@@ -792,7 +796,7 @@
 #define ROOT_CERT_FILE "/var/unbound/etc/icannbundle.pem"
 
 /* version number for resource files */
-#define RSRC_PACKAGE_VERSION 1,16,0,0
+#define RSRC_PACKAGE_VERSION 1,16,2,0
 
 /* Directory to chdir to */
 #define RUN_DIR "/var/unbound/etc"

diff --git a/sbin/unwind/libunbound/dns64/dns64.c b/sbin/unwind/libunbound/dns64/dns64.c
index d01b436..4b98b60 100644 (file)
--- a/sbin/unwind/libunbound/dns64/dns64.c
+++ b/sbin/unwind/libunbound/dns64/dns64.c
@@ -652,7 +652,7 @@ handle_event_moddone(struct module_qstate* qstate, int id)
        if ( (!iq || !iq->started_no_cache_store) &&
                qstate->return_msg && qstate->return_msg->rep &&
                !dns_cache_store(qstate->env, &qstate->qinfo, qstate->return_msg->rep,
-               0, 0, 0, NULL, qstate->query_flags))
+               0, 0, 0, NULL, qstate->query_flags, qstate->qstarttime))
                log_err("out of memory");
 
        /* do nothing */
@@ -991,7 +991,7 @@ dns64_inform_super(struct module_qstate* qstate, int id,
        /* Store the generated response in cache. */
        if ( (!super_dq || !super_dq->started_no_cache_store) &&
                !dns_cache_store(super->env, &super->qinfo, super->return_msg->rep,
-               0, 0, 0, NULL, super->query_flags))
+               0, 0, 0, NULL, super->query_flags, qstate->qstarttime))
                log_err("out of memory");
 }
 

diff --git a/sbin/unwind/libunbound/iterator/iter_delegpt.c b/sbin/unwind/libunbound/iterator/iter_delegpt.c
index 80148e8..4bffa1b 100644 (file)
--- a/sbin/unwind/libunbound/iterator/iter_delegpt.c
+++ b/sbin/unwind/libunbound/iterator/iter_delegpt.c
@@ -185,6 +185,10 @@ delegpt_add_target(struct delegpt* dp, struct regional* region,
                else    ns->got4 = 1;
                if(ns->got4 && ns->got6)
                        ns->resolved = 1;
+       } else {
+               if(addr_is_ip6(addr, addrlen))
+                       ns->done_pside6 = 1;
+               else    ns->done_pside4 = 1;
        }
        log_assert(ns->port>0);
        return delegpt_add_addr(dp, region, addr, addrlen, bogus, lame,
@@ -338,13 +342,16 @@ delegpt_count_targets(struct delegpt* dp)
 }
 
 size_t 
-delegpt_count_missing_targets(struct delegpt* dp)
+delegpt_count_missing_targets(struct delegpt* dp, int* alllame)
 {
        struct delegpt_ns* ns;
-       size_t n = 0;
-       for(ns = dp->nslist; ns; ns = ns->next)
-               if(!ns->resolved)
-                       n++;
+       size_t n = 0, nlame = 0;
+       for(ns = dp->nslist; ns; ns = ns->next) {
+               if(ns->resolved) continue;
+               n++;
+               if(ns->lame) nlame++;
+       }
+       if(alllame && n == nlame) *alllame = 1;
        return n;
 }
 
@@ -694,6 +701,10 @@ int delegpt_add_target_mlc(struct delegpt* dp, uint8_t* name, size_t namelen,
                else    ns->got4 = 1;
                if(ns->got4 && ns->got6)
                        ns->resolved = 1;
+       } else {
+               if(addr_is_ip6(addr, addrlen))
+                       ns->done_pside6 = 1;
+               else    ns->done_pside4 = 1;
        }
        log_assert(ns->port>0);
        return delegpt_add_addr_mlc(dp, addr, addrlen, bogus, lame,

diff --git a/sbin/unwind/libunbound/iterator/iter_delegpt.h b/sbin/unwind/libunbound/iterator/iter_delegpt.h
index 998b98c..62c8edc 100644 (file)
--- a/sbin/unwind/libunbound/iterator/iter_delegpt.h
+++ b/sbin/unwind/libunbound/iterator/iter_delegpt.h
@@ -330,9 +330,10 @@ void delegpt_add_unused_targets(struct delegpt* dp);
 /**
  * Count number of missing targets. These are ns names with no resolved flag.
  * @param dp: delegation point.
+ * @param alllame: if set, check if all the missing targets are lame.
  * @return number of missing targets (or 0).
  */
-size_t delegpt_count_missing_targets(struct delegpt* dp);
+size_t delegpt_count_missing_targets(struct delegpt* dp, int* alllame);
 
 /** count total number of targets in dp */
 size_t delegpt_count_targets(struct delegpt* dp);

diff --git a/sbin/unwind/libunbound/iterator/iter_utils.c b/sbin/unwind/libunbound/iterator/iter_utils.c
index f3bea46..3e13e59 100644 (file)
--- a/sbin/unwind/libunbound/iterator/iter_utils.c
+++ b/sbin/unwind/libunbound/iterator/iter_utils.c
@@ -70,8 +70,6 @@
 
 /** time when nameserver glue is said to be 'recent' */
 #define SUSPICION_RECENT_EXPIRY 86400
-/** penalty to validation failed blacklisted IPs */
-#define BLACKLIST_PENALTY (USEFUL_SERVER_TOP_TIMEOUT*4)
 
 /** fillup fetch policy array */
 static void
@@ -367,6 +365,7 @@ iter_filter_order(struct iter_env* iter_env, struct module_env* env,
        struct sock_list* blacklist, time_t prefetch)
 {
        int got_num = 0, low_rtt = 0, swap_to_front, rtt_band = RTT_BAND, nth;
+       int alllame = 0;
        size_t num_results;
        struct delegpt_addr* a, *n, *prev=NULL;
 
@@ -376,7 +375,10 @@ iter_filter_order(struct iter_env* iter_env, struct module_env* env,
        if(got_num == 0)
                return 0;
        if(low_rtt >= USEFUL_SERVER_TOP_TIMEOUT &&
-               (delegpt_count_missing_targets(dp) > 0 || open_target > 0)) {
+               /* If all missing (or not fully resolved) targets are lame,
+                * then use the remaining lame address. */
+               ((delegpt_count_missing_targets(dp, &alllame) > 0 && !alllame) ||
+               open_target > 0)) {
                verbose(VERB_ALGO, "Bad choices, trying to get more choice");
                return 0; /* we want more choice. The best choice is a bad one.
                             return 0 to force the caller to fetch more */
@@ -657,10 +659,10 @@ dns_copy_msg(struct dns_msg* from, struct regional* region)
 void
 iter_dns_store(struct module_env* env, struct query_info* msgqinf,
        struct reply_info* msgrep, int is_referral, time_t leeway, int pside,
-       struct regional* region, uint16_t flags)
+       struct regional* region, uint16_t flags, time_t qstarttime)
 {
        if(!dns_cache_store(env, msgqinf, msgrep, is_referral, leeway,
-               pside, region, flags))
+               pside, region, flags, qstarttime))
                log_err("out of memory: cannot store data in cache");
 }
 

diff --git a/sbin/unwind/libunbound/iterator/iter_utils.h b/sbin/unwind/libunbound/iterator/iter_utils.h
index c0e5181..8583fde 100644 (file)
--- a/sbin/unwind/libunbound/iterator/iter_utils.h
+++ b/sbin/unwind/libunbound/iterator/iter_utils.h
@@ -132,6 +132,7 @@ struct dns_msg* dns_copy_msg(struct dns_msg* from, struct regional* regional);
  *     can be prefetch-updates.
  * @param region: to copy modified (cache is better) rrs back to.
  * @param flags: with BIT_CD for dns64 AAAA translated queries.
+ * @param qstarttime: time of query start.
  * return void, because we are not interested in alloc errors,
  *     the iterator and validator can operate on the results in their
  *     scratch space (the qstate.region) and are not dependent on the cache.
@@ -140,7 +141,7 @@ struct dns_msg* dns_copy_msg(struct dns_msg* from, struct regional* regional);
  */
 void iter_dns_store(struct module_env* env, struct query_info* qinf,
        struct reply_info* rep, int is_referral, time_t leeway, int pside,
-       struct regional* region, uint16_t flags);
+       struct regional* region, uint16_t flags, time_t qstarttime);
 
 /**
  * Select randomly with n/m probability.

diff --git a/sbin/unwind/libunbound/iterator/iterator.c b/sbin/unwind/libunbound/iterator/iterator.c
index 3cfb286..25e5cfe 100644 (file)
--- a/sbin/unwind/libunbound/iterator/iterator.c
+++ b/sbin/unwind/libunbound/iterator/iterator.c
@@ -71,6 +71,10 @@
 
 /* in msec */
 int UNKNOWN_SERVER_NICENESS = 376;
+/* in msec */
+int USEFUL_SERVER_TOP_TIMEOUT = 120000;
+/* Equals USEFUL_SERVER_TOP_TIMEOUT*4 */
+int BLACKLIST_PENALTY = (120000*4);
 
 static void target_count_increase_nx(struct iter_qstate* iq, int num);
 
@@ -253,8 +257,9 @@ error_supers(struct module_qstate* qstate, int id, struct module_qstate* super)
                delegpt_mark_neg(dpns, qstate->qinfo.qtype);
                dpns->resolved = 1; /* mark as failed */
                if((dpns->got4 == 2 || !ie->supports_ipv4) &&
-                       (dpns->got6 == 2 || !ie->supports_ipv6))
+                       (dpns->got6 == 2 || !ie->supports_ipv6)) {
                        target_count_increase_nx(super_iq, 1);
+               }
        }
        if(qstate->qinfo.qtype == LDNS_RR_TYPE_NS) {
                /* prime failed to get delegation */
@@ -370,7 +375,7 @@ error_response_cache(struct module_qstate* qstate, int id, int rcode)
                err.security = sec_status_indeterminate;
                verbose(VERB_ALGO, "store error response in message cache");
                iter_dns_store(qstate->env, &qstate->qinfo, &err, 0, 0, 0, NULL,
-                       qstate->query_flags);
+                       qstate->query_flags, qstate->qstarttime);
        }
        return error_response(qstate, id, rcode);
 }
@@ -678,15 +683,20 @@ is_caps_whitelisted(struct iter_env* ie, struct iter_qstate* iq)
                iq->qchase.qclass) != NULL;
 }
 
-/** create target count structure for this query */
+/**
+ * Create target count structure for this query. This is always explicitly
+ * created for the parent query.
+ */
 static void
 target_count_create(struct iter_qstate* iq)
 {
        if(!iq->target_count) {
-               iq->target_count = (int*)calloc(3, sizeof(int));
+               iq->target_count = (int*)calloc(TARGET_COUNT_MAX, sizeof(int));
                /* if calloc fails we simply do not track this number */
-               if(iq->target_count)
-                       iq->target_count[0] = 1;
+               if(iq->target_count) {
+                       iq->target_count[TARGET_COUNT_REF] = 1;
+                       iq->nxns_dp = (uint8_t**)calloc(1, sizeof(uint8_t*));
+               }
        }
 }
 
@@ -695,7 +705,7 @@ target_count_increase(struct iter_qstate* iq, int num)
 {
        target_count_create(iq);
        if(iq->target_count)
-               iq->target_count[1] += num;
+               iq->target_count[TARGET_COUNT_QUERIES] += num;
        iq->dp_target_count++;
 }
 
@@ -704,7 +714,7 @@ target_count_increase_nx(struct iter_qstate* iq, int num)
 {
        target_count_create(iq);
        if(iq->target_count)
-               iq->target_count[2] += num;
+               iq->target_count[TARGET_COUNT_NX] += num;
 }
 
 /**
@@ -799,8 +809,10 @@ generate_sub_request(uint8_t* qname, size_t qnamelen, uint16_t qtype,
                subiq->num_target_queries = 0;
                target_count_create(iq);
                subiq->target_count = iq->target_count;
-               if(iq->target_count)
-                       iq->target_count[0] ++; /* extra reference */
+               if(iq->target_count) {
+                       iq->target_count[TARGET_COUNT_REF] ++; /* extra reference */
+                       subiq->nxns_dp = iq->nxns_dp;
+               }
                subiq->dp_target_count = 0;
                subiq->num_current_queries = 0;
                subiq->depth = iq->depth+1;
@@ -1477,7 +1489,8 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                     iq->dp = dns_cache_find_delegation(qstate->env, delname, 
                        delnamelen, iq->qchase.qtype, iq->qchase.qclass, 
                        qstate->region, &iq->deleg_msg,
-                       *qstate->env->now+qstate->prefetch_leeway);
+                       *qstate->env->now+qstate->prefetch_leeway, 1,
+                       dpname, dpnamelen);
                else iq->dp = NULL;
 
                /* If the cache has returned nothing, then we have a 
@@ -1769,7 +1782,8 @@ generate_parentside_target_query(struct module_qstate* qstate,
                        subiq->dp = dns_cache_find_delegation(qstate->env, 
                                name, namelen, qtype, qclass, subq->region,
                                &subiq->deleg_msg,
-                               *qstate->env->now+subq->prefetch_leeway); 
+                               *qstate->env->now+subq->prefetch_leeway,
+                               1, NULL, 0);
                        /* if no dp, then it's from root, refetch unneeded */
                        if(subiq->dp) { 
                                subiq->dnssec_expected = iter_indicates_dnssec(
@@ -1832,7 +1846,7 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
        int toget = 0;
 
        iter_mark_cycle_targets(qstate, iq->dp);
-       missing = (int)delegpt_count_missing_targets(iq->dp);
+       missing = (int)delegpt_count_missing_targets(iq->dp, NULL);
        log_assert(maxtargets != 0); /* that would not be useful */
 
        /* Generate target requests. Basically, any missing targets
@@ -1851,11 +1865,12 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
        if(iq->depth == ie->max_dependency_depth)
                return 0;
        if(iq->depth > 0 && iq->target_count &&
-               iq->target_count[1] > MAX_TARGET_COUNT) {
+               iq->target_count[TARGET_COUNT_QUERIES] > MAX_TARGET_COUNT) {
                char s[LDNS_MAX_DOMAINLEN+1];
                dname_str(qstate->qinfo.qname, s);
                verbose(VERB_QUERY, "request %s has exceeded the maximum "
-                       "number of glue fetches %d", s, iq->target_count[1]);
+                       "number of glue fetches %d", s,
+                       iq->target_count[TARGET_COUNT_QUERIES]);
                return 0;
        }
        if(iq->dp_target_count > MAX_DP_TARGET_COUNT) {
@@ -1883,7 +1898,9 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
                        continue;
                }
 
-               if(ie->supports_ipv6 && !ns->got6) {
+               if(ie->supports_ipv6 &&
+                       ((ns->lame && !ns->done_pside6) ||
+                       (!ns->lame && !ns->got6))) {
                        /* Send the AAAA request. */
                        if(!generate_target_query(qstate, iq, id, 
                                ns->name, ns->namelen,
@@ -1896,7 +1913,9 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
                        query_count++;
                }
                /* Send the A request. */
-               if(ie->supports_ipv4 && !ns->got4) {
+               if(ie->supports_ipv4 &&
+                       ((ns->lame && !ns->done_pside4) ||
+                       (!ns->lame && !ns->got4))) {
                        if(!generate_target_query(qstate, iq, id, 
                                ns->name, ns->namelen, 
                                LDNS_RR_TYPE_A, iq->qchase.qclass)) {
@@ -2006,7 +2025,7 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq,
                return next_state(iq, QUERYTARGETS_STATE);
        }
        /* query for an extra name added by the parent-NS record */
-       if(delegpt_count_missing_targets(iq->dp) > 0) {
+       if(delegpt_count_missing_targets(iq->dp, NULL) > 0) {
                int qs = 0;
                verbose(VERB_ALGO, "try parent-side target name");
                if(!query_for_targets(qstate, iq, ie, id, 1, &qs)) {
@@ -2027,11 +2046,12 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq,
                return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
        }
        if(iq->depth > 0 && iq->target_count &&
-               iq->target_count[1] > MAX_TARGET_COUNT) {
+               iq->target_count[TARGET_COUNT_QUERIES] > MAX_TARGET_COUNT) {
                char s[LDNS_MAX_DOMAINLEN+1];
                dname_str(qstate->qinfo.qname, s);
                verbose(VERB_QUERY, "request %s has exceeded the maximum "
-                       "number of glue fetches %d", s, iq->target_count[1]);
+                       "number of glue fetches %d", s,
+                       iq->target_count[TARGET_COUNT_QUERIES]);
                errinf(qstate, "exceeded the maximum number of glue fetches");
                return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
        }
@@ -2158,6 +2178,32 @@ processDSNSFind(struct module_qstate* qstate, struct iter_qstate* iq, int id)
 
        return 0;
 }
+
+/**
+ * Check if we wait responses for sent queries and update the iterator's
+ * external state.
+ */
+static void
+check_waiting_queries(struct iter_qstate* iq, struct module_qstate* qstate,
+       int id)
+{
+       if(iq->num_target_queries>0 && iq->num_current_queries>0) {
+               verbose(VERB_ALGO, "waiting for %d targets to "
+                       "resolve or %d outstanding queries to "
+                       "respond", iq->num_target_queries,
+                       iq->num_current_queries);
+               qstate->ext_state[id] = module_wait_reply;
+       } else if(iq->num_target_queries>0) {
+               verbose(VERB_ALGO, "waiting for %d targets to "
+                       "resolve", iq->num_target_queries);
+               qstate->ext_state[id] = module_wait_subquery;
+       } else {
+               verbose(VERB_ALGO, "waiting for %d "
+                       "outstanding queries to respond",
+                       iq->num_current_queries);
+               qstate->ext_state[id] = module_wait_reply;
+       }
+}
        
 /** 
  * This is the request event state where the request will be sent to one of
@@ -2211,12 +2257,91 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                errinf(qstate, "exceeded the maximum number of sends");
                return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
        }
-       if(iq->target_count && iq->target_count[2] > MAX_TARGET_NX) {
-               verbose(VERB_QUERY, "request has exceeded the maximum "
-                       " number of nxdomain nameserver lookups with %d",
-                       iq->target_count[2]);
-               errinf(qstate, "exceeded the maximum nameserver nxdomains");
-               return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+
+       /* Check if we reached MAX_TARGET_NX limit without a fallback activation. */
+       if(iq->target_count && !*iq->nxns_dp &&
+               iq->target_count[TARGET_COUNT_NX] > MAX_TARGET_NX) {
+               struct delegpt_ns* ns;
+               /* If we can wait for resolution, do so. */
+               if(iq->num_target_queries>0 || iq->num_current_queries>0) {
+                       check_waiting_queries(iq, qstate, id);
+                       return 0;
+               }
+               verbose(VERB_ALGO, "request has exceeded the maximum "
+                       "number of nxdomain nameserver lookups (%d) with %d",
+                       MAX_TARGET_NX, iq->target_count[TARGET_COUNT_NX]);
+               /* Check for dp because we require one below */
+               if(!iq->dp) {
+                       verbose(VERB_QUERY, "Failed to get a delegation, "
+                               "giving up");
+                       errinf(qstate, "failed to get a delegation (eg. prime "
+                               "failure)");
+                       return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+               }
+               /* We reached the limit but we already have parent side
+                * information; stop resolution */
+               if(iq->dp->has_parent_side_NS) {
+                       verbose(VERB_ALGO, "parent-side information is "
+                               "already present for the delegation point, no "
+                               "fallback possible");
+                       errinf(qstate, "exceeded the maximum nameserver nxdomains");
+                       return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+               }
+               verbose(VERB_ALGO, "initiating parent-side fallback for "
+                       "nxdomain nameserver lookups");
+               /* Mark all the current NSes as resolved to allow for parent
+                * fallback */
+               for(ns=iq->dp->nslist; ns; ns=ns->next) {
+                       ns->resolved = 1;
+               }
+               /* Note the delegation point that triggered the NXNS fallback;
+                * no reason for shared queries to keep trying there.
+                * This also marks the fallback activation. */
+               *iq->nxns_dp = malloc(iq->dp->namelen);
+               if(!*iq->nxns_dp) {
+                       verbose(VERB_ALGO, "out of memory while initiating "
+                               "fallback");
+                       errinf(qstate, "exceeded the maximum nameserver "
+                               "nxdomains (malloc)");
+                       return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+               }
+               memcpy(*iq->nxns_dp, iq->dp->name, iq->dp->namelen);
+       } else if(iq->target_count && *iq->nxns_dp) {
+               /* Handle the NXNS fallback case. */
+               /* If we can wait for resolution, do so. */
+               if(iq->num_target_queries>0 || iq->num_current_queries>0) {
+                       check_waiting_queries(iq, qstate, id);
+                       return 0;
+               }
+               /* Check for dp because we require one below */
+               if(!iq->dp) {
+                       verbose(VERB_QUERY, "Failed to get a delegation, "
+                               "giving up");
+                       errinf(qstate, "failed to get a delegation (eg. prime "
+                               "failure)");
+                       return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+               }
+
+               if(iq->target_count[TARGET_COUNT_NX] > MAX_TARGET_NX_FALLBACK) {
+                       verbose(VERB_ALGO, "request has exceeded the maximum "
+                               "number of fallback nxdomain nameserver "
+                               "lookups (%d) with %d", MAX_TARGET_NX_FALLBACK,
+                               iq->target_count[TARGET_COUNT_NX]);
+                       errinf(qstate, "exceeded the maximum nameserver nxdomains");
+                       return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+               }
+
+               if(!iq->dp->has_parent_side_NS) {
+                       struct delegpt_ns* ns;
+                       if(!dname_canonical_compare(*iq->nxns_dp, iq->dp->name)) {
+                               verbose(VERB_ALGO, "this delegation point "
+                                       "initiated the fallback, marking the "
+                                       "nslist as resolved");
+                               for(ns=iq->dp->nslist; ns; ns=ns->next) {
+                                       ns->resolved = 1;
+                               }
+                       }
+               }
        }
        
        /* Make sure we have a delegation point, otherwise priming failed
@@ -2434,7 +2559,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
         * that servfail is cached, which is not good as opportunism goes. */
        if(iq->depth < ie->max_dependency_depth
                && iq->num_target_queries == 0
-               && (!iq->target_count || iq->target_count[2]==0)
+               && (!iq->target_count || iq->target_count[TARGET_COUNT_NX]==0)
                && iq->sent_count < TARGET_FETCH_STOP) {
                tf_policy = ie->target_fetch_policy[iq->depth];
        }
@@ -2523,9 +2648,9 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
        }
 
        /* Select the next usable target, filtering out unsuitable targets. */
-       target = iter_server_selection(ie, qstate->env, iq->dp, 
+       target = iter_server_selection(ie, qstate->env, iq->dp,
                iq->dp->name, iq->dp->namelen, iq->qchase.qtype,
-               &iq->dnssec_lame_query, &iq->chase_to_rd, 
+               &iq->dnssec_lame_query, &iq->chase_to_rd,
                iq->num_target_queries, qstate->blacklist,
                qstate->prefetch_leeway);
 
@@ -2544,7 +2669,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                        /* If there is nothing to wait for, then we need 
                         * to distinguish between generating (a) new target 
                         * query, or failing. */
-                       if(delegpt_count_missing_targets(iq->dp) > 0) {
+                       if(delegpt_count_missing_targets(iq->dp, NULL) > 0) {
                                int qs = 0;
                                verbose(VERB_ALGO, "querying for next "
                                        "missing target");
@@ -2556,7 +2681,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                                                LDNS_RCODE_SERVFAIL);
                                }
                                if(qs == 0 && 
-                                  delegpt_count_missing_targets(iq->dp) == 0){
+                                  delegpt_count_missing_targets(iq->dp, NULL) == 0){
                                        /* it looked like there were missing
                                         * targets, but they did not turn up.
                                         * Try the bad choices again (if any),
@@ -2595,23 +2720,8 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 
                /* otherwise, we have no current targets, so submerge 
                 * until one of the target or direct queries return. */
-               if(iq->num_target_queries>0 && iq->num_current_queries>0) {
-                       verbose(VERB_ALGO, "no current targets -- waiting "
-                               "for %d targets to resolve or %d outstanding"
-                               " queries to respond", iq->num_target_queries, 
-                               iq->num_current_queries);
-                       qstate->ext_state[id] = module_wait_reply;
-               } else if(iq->num_target_queries>0) {
-                       verbose(VERB_ALGO, "no current targets -- waiting "
-                               "for %d targets to resolve.",
-                               iq->num_target_queries);
-                       qstate->ext_state[id] = module_wait_subquery;
-               } else {
-                       verbose(VERB_ALGO, "no current targets -- waiting "
-                               "for %d outstanding queries to respond.",
-                               iq->num_current_queries);
-                       qstate->ext_state[id] = module_wait_reply;
-               }
+               verbose(VERB_ALGO, "no current targets");
+               check_waiting_queries(iq, qstate, id);
                /* undo qname minimise step because we'll get back here
                 * to do it again */
                if(qout_orig && iq->minimise_count > 0) {
@@ -2839,7 +2949,8 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
                                iq->qchase.qtype != iq->response->qinfo.qtype,
                                qstate->prefetch_leeway,
                                iq->dp&&iq->dp->has_parent_side_NS,
-                               qstate->region, qstate->query_flags);
+                               qstate->region, qstate->query_flags,
+                               qstate->qstarttime);
                /* close down outstanding requests to be discarded */
                outbound_list_clear(&iq->outlist);
                iq->num_current_queries = 0;
@@ -2928,7 +3039,8 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
                        /* Store the referral under the current query */
                        /* no prefetch-leeway, since its not the answer */
                        iter_dns_store(qstate->env, &iq->response->qinfo,
-                               iq->response->rep, 1, 0, 0, NULL, 0);
+                               iq->response->rep, 1, 0, 0, NULL, 0,
+                               qstate->qstarttime);
                        if(iq->store_parent_NS)
                                iter_store_parentside_NS(qstate->env, 
                                        iq->response->rep);
@@ -3042,7 +3154,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
                        iter_dns_store(qstate->env, &iq->response->qinfo,
                                iq->response->rep, 1, qstate->prefetch_leeway,
                                iq->dp&&iq->dp->has_parent_side_NS, NULL,
-                               qstate->query_flags);
+                               qstate->query_flags, qstate->qstarttime);
                /* set the current request's qname to the new value. */
                iq->qchase.qname = sname;
                iq->qchase.qname_len = snamelen;
@@ -3383,8 +3495,11 @@ processTargetResponse(struct module_qstate* qstate, int id,
                delegpt_mark_neg(dpns, qstate->qinfo.qtype);
                dpns->resolved = 1; /* fail the target */
                if((dpns->got4 == 2 || !ie->supports_ipv4) &&
-                       (dpns->got6 == 2 || !ie->supports_ipv6))
+                       (dpns->got6 == 2 || !ie->supports_ipv6) &&
+                       /* do not count cached answers */
+                       (qstate->reply_origin && qstate->reply_origin->len != 0)) {
                        target_count_increase_nx(foriq, 1);
+               }
        }
 }
 
@@ -3645,7 +3760,8 @@ processFinished(struct module_qstate* qstate, struct iter_qstate* iq,
                        iter_dns_store(qstate->env, &qstate->qinfo, 
                                iq->response->rep, 0, qstate->prefetch_leeway,
                                iq->dp&&iq->dp->has_parent_side_NS,
-                               qstate->region, qstate->query_flags);
+                               qstate->region, qstate->query_flags,
+                               qstate->qstarttime);
                }
        }
        qstate->return_rcode = LDNS_RCODE_NOERROR;
@@ -4002,8 +4118,11 @@ iter_clear(struct module_qstate* qstate, int id)
        iq = (struct iter_qstate*)qstate->minfo[id];
        if(iq) {
                outbound_list_clear(&iq->outlist);
-               if(iq->target_count && --iq->target_count[0] == 0)
+               if(iq->target_count && --iq->target_count[TARGET_COUNT_REF] == 0) {
                        free(iq->target_count);
+                       if(*iq->nxns_dp) free(*iq->nxns_dp);
+                       free(iq->nxns_dp);
+               }
                iq->num_current_queries = 0;
        }
        qstate->minfo[id] = NULL;

diff --git a/sbin/unwind/libunbound/iterator/iterator.h b/sbin/unwind/libunbound/iterator/iterator.h
index 8b84052..b71b7fe 100644 (file)
--- a/sbin/unwind/libunbound/iterator/iterator.h
+++ b/sbin/unwind/libunbound/iterator/iterator.h
@@ -60,6 +60,9 @@ struct rbtree_type;
 /** max number of nxdomains allowed for target lookups for a query and
  * its subqueries */
 #define MAX_TARGET_NX          5
+/** max number of nxdomains allowed for target lookups for a query and
+ * its subqueries when fallback has kicked in */
+#define MAX_TARGET_NX_FALLBACK (MAX_TARGET_NX*2)
 /** max number of query restarts. Determines max number of CNAME chain. */
 #define MAX_RESTART_COUNT      11
 /** max number of referrals. Makes sure resolver does not run away */
@@ -91,15 +94,17 @@ struct rbtree_type;
 extern int UNKNOWN_SERVER_NICENESS;
 /** maximum timeout before a host is deemed unsuitable, in msec. 
  * After host_ttl this will be timed out and the host will be tried again. 
- * Equals RTT_MAX_TIMEOUT
- */
-#define USEFUL_SERVER_TOP_TIMEOUT      120000
+ * Equals RTT_MAX_TIMEOUT, and thus when RTT_MAX_TIMEOUT is overwritten by
+ * config infra_cache_max_rtt, it will be overwritten as well. */
+extern int USEFUL_SERVER_TOP_TIMEOUT;
+/** penalty to validation failed blacklisted IPs
+ * Equals USEFUL_SERVER_TOP_TIMEOUT*4, and thus when RTT_MAX_TIMEOUT is
+ * overwritten by config infra_cache_max_rtt, it will be overwritten as well. */
+extern int BLACKLIST_PENALTY;
 /** RTT band, within this amount from the best, servers are chosen randomly.
  * Chosen so that the UNKNOWN_SERVER_NICENESS falls within the band of a 
  * fast server, this causes server exploration as a side benefit. msec. */
 #define RTT_BAND 400
-/** Start value for blacklisting a host, 2*USEFUL_SERVER_TOP_TIMEOUT in sec */
-#define INFRA_BACKOFF_INITIAL 240
 
 /**
  * Global state for the iterator. 
@@ -217,6 +222,21 @@ enum iter_state {
        FINISHED_STATE
 };
 
+/**
+ * Shared counters for queries.
+ */
+enum target_count_variables {
+       /** Reference count for the shared iter_qstate->target_count. */
+       TARGET_COUNT_REF = 0,
+       /** Number of target queries spawned for the query and subqueries. */
+       TARGET_COUNT_QUERIES,
+       /** Number of nxdomain responses encountered. */
+       TARGET_COUNT_NX,
+
+       /** This should stay last here, it is used for the allocation */
+       TARGET_COUNT_MAX,
+};
+
 /**
  * Per query state for the iterator module.
  */
@@ -310,15 +330,20 @@ struct iter_qstate {
        /** number of queries fired off */
        int sent_count;
        
-       /** number of target queries spawned in [1], for this query and its
-        * subqueries, the malloced-array is shared, [0] refcount.
-        * in [2] the number of nxdomains is counted. */
+       /** malloced-array shared with this query and its subqueries. It keeps
+        * track of the defined enum target_count_variables counters. */
        int* target_count;
 
        /** number of target lookups per delegation point. Reset to 0 after
         * receiving referral answer. Not shared with subqueries. */
        int dp_target_count;
 
+       /** Delegation point that triggered the NXNS fallback; shared with
+        * this query and its subqueries, count-referenced by the reference
+        * counter in target_count.
+        * This also marks the fallback activation. */
+       uint8_t** nxns_dp;
+
        /** if true, already tested for ratelimiting and passed the test */
        int ratelimit_ok;
 

diff --git a/sbin/unwind/libunbound/libunbound/unbound.h b/sbin/unwind/libunbound/libunbound/unbound.h
index ee85587..c779d18 100644 (file)
--- a/sbin/unwind/libunbound/libunbound/unbound.h
+++ b/sbin/unwind/libunbound/libunbound/unbound.h
@@ -725,6 +725,8 @@ struct ub_server_stats {
        long long qtcp;
        /** number of outgoing queries over TCP */
        long long qtcp_outgoing;
+       /** number of outgoing queries over UDP */
+       long long qudp_outgoing;
        /** number of queries over (DNS over) TLS */
        long long qtls;
        /** number of queries over (DNS over) HTTPS */

diff --git a/sbin/unwind/libunbound/services/authzone.c b/sbin/unwind/libunbound/services/authzone.c
index 02fb621..b9e0b11 100644 (file)
--- a/sbin/unwind/libunbound/services/authzone.c
+++ b/sbin/unwind/libunbound/services/authzone.c
@@ -3967,7 +3967,7 @@ probe_copy_masters_for_allow_notify(struct auth_xfer* xfr)
        struct auth_master* list = NULL, *last = NULL;
        struct auth_master* p;
        /* build up new list with copies */
-       for(p = xfr->task_probe->masters; p; p=p->next) {
+       for(p = xfr->task_transfer->masters; p; p=p->next) {
                struct auth_master* m = auth_master_copy(p);
                if(!m) {
                        auth_free_masters(list);
@@ -5512,6 +5512,8 @@ xfr_transfer_init_fetch(struct auth_xfer* xfr, struct module_env* env)
                        addr_to_str(&addr, addrlen, as, sizeof(as));
                        verbose(VERB_ALGO, "auth zone %s transfer next HTTP fetch from %s started", zname, as);
                }
+               /* Create or refresh the list of allow_notify addrs */
+               probe_copy_masters_for_allow_notify(xfr);
                return 1;
        }
 
@@ -8187,7 +8189,6 @@ auth_zone_verify_zonemd_key_with_ds(struct auth_zone* z,
        keystorage->rk.type = htons(LDNS_RR_TYPE_DNSKEY);
        keystorage->rk.rrset_class = htons(z->dclass);
        auth_zone_log(z->name, VERB_QUERY, "zonemd: verify zone DNSKEY with DS");
-       // @TODO add EDE here? we currently just pass NULL
        sec = val_verify_DNSKEY_with_DS(env, ve, keystorage, ds, sigalg,
                why_bogus, NULL, NULL);
        regional_free_all(env->scratch);

diff --git a/sbin/unwind/libunbound/services/cache/dns.c b/sbin/unwind/libunbound/services/cache/dns.c
index f6c1145..6bca8d8 100644 (file)
--- a/sbin/unwind/libunbound/services/cache/dns.c
+++ b/sbin/unwind/libunbound/services/cache/dns.c
@@ -68,11 +68,16 @@
  *     in a prefetch situation to be updated (without becoming sticky).
  * @param qrep: update rrsets here if cache is better
  * @param region: for qrep allocs.
+ * @param qstarttime: time when delegations were looked up, this is perhaps
+ *     earlier than the time in now. The time is used to determine if RRsets
+ *     of type NS have expired, so that they can only be updated using
+ *     lookups of delegation points that did not use them, since they had
+ *     expired then.
  */
 static void
 store_rrsets(struct module_env* env, struct reply_info* rep, time_t now,
        time_t leeway, int pside, struct reply_info* qrep,
-       struct regional* region)
+       struct regional* region, time_t qstarttime)
 {
        size_t i;
        /* see if rrset already exists in cache, if not insert it. */
@@ -81,8 +86,8 @@ store_rrsets(struct module_env* env, struct reply_info* rep, time_t now,
                rep->ref[i].id = rep->rrsets[i]->id;
                /* update ref if it was in the cache */
                switch(rrset_cache_update(env->rrset_cache, &rep->ref[i],
-                               env->alloc, now + ((ntohs(rep->ref[i].key->rk.type)==
-                               LDNS_RR_TYPE_NS && !pside)?0:leeway))) {
+                               env->alloc, ((ntohs(rep->ref[i].key->rk.type)==
+                               LDNS_RR_TYPE_NS && !pside)?qstarttime:now + leeway))) {
                case 0: /* ref unchanged, item inserted */
                        break;
                case 2: /* ref updated, cache is superior */
@@ -155,7 +160,8 @@ msg_del_servfail(struct module_env* env, struct query_info* qinfo,
 void 
 dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
        hashvalue_type hash, struct reply_info* rep, time_t leeway, int pside,
-       struct reply_info* qrep, uint32_t flags, struct regional* region)
+       struct reply_info* qrep, uint32_t flags, struct regional* region,
+       time_t qstarttime)
 {
        struct msgreply_entry* e;
        time_t ttl = rep->ttl;
@@ -170,7 +176,8 @@ dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
        /* there was a reply_info_sortref(rep) here but it seems to be
         * unnecessary, because the cache gets locked per rrset. */
        reply_info_set_ttls(rep, *env->now);
-       store_rrsets(env, rep, *env->now, leeway, pside, qrep, region);
+       store_rrsets(env, rep, *env->now, leeway, pside, qrep, region,
+               qstarttime);
        if(ttl == 0 && !(flags & DNSCACHE_STORE_ZEROTTL)) {
                /* we do not store the message, but we did store the RRs,
                 * which could be useful for delegation information */
@@ -194,10 +201,51 @@ dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
        slabhash_insert(env->msg_cache, hash, &e->entry, rep, env->alloc);
 }
 
+/** see if an rrset is expired above the qname, return upper qname. */
+static int
+rrset_expired_above(struct module_env* env, uint8_t** qname, size_t* qnamelen,
+       uint16_t searchtype, uint16_t qclass, time_t now, uint8_t* expiretop,
+       size_t expiretoplen)
+{
+       struct ub_packed_rrset_key *rrset;
+       uint8_t lablen;
+
+       while(*qnamelen > 0) {
+               /* look one label higher */
+               lablen = **qname;
+               *qname += lablen + 1;
+               *qnamelen -= lablen + 1;
+               if(*qnamelen <= 0)
+                       break;
+
+               /* looks up with a time of 0, to see expired entries */
+               if((rrset = rrset_cache_lookup(env->rrset_cache, *qname,
+                       *qnamelen, searchtype, qclass, 0, 0, 0))) {
+                       struct packed_rrset_data* data =
+                               (struct packed_rrset_data*)rrset->entry.data;
+                       if(now > data->ttl) {
+                               /* it is expired, this is not wanted */
+                               lock_rw_unlock(&rrset->entry.lock);
+                               log_nametypeclass(VERB_ALGO, "this rrset is expired", *qname, searchtype, qclass);
+                               return 1;
+                       }
+                       /* it is not expired, continue looking */
+                       lock_rw_unlock(&rrset->entry.lock);
+               }
+
+               /* do not look above the expiretop. */
+               if(expiretop && *qnamelen == expiretoplen &&
+                       query_dname_compare(*qname, expiretop)==0)
+                       break;
+       }
+       return 0;
+}
+
 /** find closest NS or DNAME and returns the rrset (locked) */
 static struct ub_packed_rrset_key*
 find_closest_of_type(struct module_env* env, uint8_t* qname, size_t qnamelen, 
-       uint16_t qclass, time_t now, uint16_t searchtype, int stripfront)
+       uint16_t qclass, time_t now, uint16_t searchtype, int stripfront,
+       int noexpiredabove, uint8_t* expiretop, size_t expiretoplen)
 {
        struct ub_packed_rrset_key *rrset;
        uint8_t lablen;
@@ -212,8 +260,40 @@ find_closest_of_type(struct module_env* env, uint8_t* qname, size_t qnamelen,
        /* snip off front part of qname until the type is found */
        while(qnamelen > 0) {
                if((rrset = rrset_cache_lookup(env->rrset_cache, qname, 
-                       qnamelen, searchtype, qclass, 0, now, 0)))
-                       return rrset;
+                       qnamelen, searchtype, qclass, 0, now, 0))) {
+                       uint8_t* origqname = qname;
+                       size_t origqnamelen = qnamelen;
+                       if(!noexpiredabove)
+                               return rrset;
+                       /* if expiretop set, do not look above it, but
+                        * qname is equal, so the just found result is also
+                        * the nonexpired above part. */
+                       if(expiretop && qnamelen == expiretoplen &&
+                               query_dname_compare(qname, expiretop)==0)
+                               return rrset;
+                       /* check for expiry, but we have to let go of the rrset
+                        * for the lock ordering */
+                       lock_rw_unlock(&rrset->entry.lock);
+                       /* the expired_above function always takes off one
+                        * label (if qnamelen>0) and returns the final qname
+                        * where it searched, so we can continue from there
+                        * turning the O N*N search into O N. */
+                       if(!rrset_expired_above(env, &qname, &qnamelen,
+                               searchtype, qclass, now, expiretop,
+                               expiretoplen)) {
+                               /* we want to return rrset, but it may be
+                                * gone from cache, if so, just loop like
+                                * it was not in the cache in the first place.
+                                */
+                               if((rrset = rrset_cache_lookup(env->
+                                       rrset_cache, origqname, origqnamelen,
+                                       searchtype, qclass, 0, now, 0))) {
+                                       return rrset;
+                               }
+                       }
+                       log_nametypeclass(VERB_ALGO, "ignoring rrset because expired rrsets exist above it", origqname, searchtype, qclass);
+                       continue;
+               }
 
                /* snip off front label */
                lablen = *qname;
@@ -462,7 +542,8 @@ dns_msg_ansadd(struct dns_msg* msg, struct regional* region,
 struct delegpt* 
 dns_cache_find_delegation(struct module_env* env, uint8_t* qname, 
        size_t qnamelen, uint16_t qtype, uint16_t qclass, 
-       struct regional* region, struct dns_msg** msg, time_t now)
+       struct regional* region, struct dns_msg** msg, time_t now,
+       int noexpiredabove, uint8_t* expiretop, size_t expiretoplen)
 {
        /* try to find closest NS rrset */
        struct ub_packed_rrset_key* nskey;
@@ -470,7 +551,7 @@ dns_cache_find_delegation(struct module_env* env, uint8_t* qname,
        struct delegpt* dp;
 
        nskey = find_closest_of_type(env, qname, qnamelen, qclass, now,
-               LDNS_RR_TYPE_NS, 0);
+               LDNS_RR_TYPE_NS, 0, noexpiredabove, expiretop, expiretoplen);
        if(!nskey) /* hope the caller has hints to prime or something */
                return NULL;
        nsdata = (struct packed_rrset_data*)nskey->entry.data;
@@ -840,7 +921,7 @@ dns_cache_lookup(struct module_env* env,
         * consistent with the DNAME */
        if(!no_partial &&
                (rrset=find_closest_of_type(env, qname, qnamelen, qclass, now,
-               LDNS_RR_TYPE_DNAME, 1))) {
+               LDNS_RR_TYPE_DNAME, 1, 0, NULL, 0))) {
                /* synthesize a DNAME+CNAME message based on this */
                enum sec_status sec_status = sec_status_unchecked;
                struct dns_msg* msg = synth_dname_msg(rrset, region, now, &k,
@@ -973,7 +1054,7 @@ dns_cache_lookup(struct module_env* env,
 int
 dns_cache_store(struct module_env* env, struct query_info* msgqinf,
         struct reply_info* msgrep, int is_referral, time_t leeway, int pside,
-       struct regional* region, uint32_t flags)
+       struct regional* region, uint32_t flags, time_t qstarttime)
 {
        struct reply_info* rep = NULL;
        /* alloc, malloc properly (not in region, like msg is) */
@@ -996,9 +1077,9 @@ dns_cache_store(struct module_env* env, struct query_info* msgqinf,
                        /*ignore ret: it was in the cache, ref updated */
                        /* no leeway for typeNS */
                        (void)rrset_cache_update(env->rrset_cache, &ref, 
-                               env->alloc, *env->now + 
+                               env->alloc,
                                ((ntohs(ref.key->rk.type)==LDNS_RR_TYPE_NS
-                                && !pside) ? 0:leeway));
+                                && !pside) ? qstarttime:*env->now + leeway));
                }
                free(rep);
                return 1;
@@ -1020,7 +1101,7 @@ dns_cache_store(struct module_env* env, struct query_info* msgqinf,
                rep->flags &= ~(BIT_AA | BIT_CD);
                h = query_info_hash(&qinf, (uint16_t)flags);
                dns_cache_store_msg(env, &qinf, h, rep, leeway, pside, msgrep,
-                       flags, region);
+                       flags, region, qstarttime);
                /* qname is used inside query_info_entrysetup, and set to 
                 * NULL. If it has not been used, free it. free(0) is safe. */
                free(qinf.qname);

diff --git a/sbin/unwind/libunbound/services/cache/dns.h b/sbin/unwind/libunbound/services/cache/dns.h
index bece837..147f992 100644 (file)
--- a/sbin/unwind/libunbound/services/cache/dns.h
+++ b/sbin/unwind/libunbound/services/cache/dns.h
@@ -88,11 +88,13 @@ struct dns_msg {
  * @param flags: flags with BIT_CD for AAAA queries in dns64 translation.
  *   The higher 16 bits are used internally to customize the cache policy.
  *   (See DNSCACHE_STORE_xxx flags).
+ * @param qstarttime: time when the query was started, and thus when the
+ *     delegations were looked up.
  * @return 0 on alloc error (out of memory).
  */
 int dns_cache_store(struct module_env* env, struct query_info* qinf,
         struct reply_info* rep, int is_referral, time_t leeway, int pside,
-       struct regional* region, uint32_t flags);
+       struct regional* region, uint32_t flags, time_t qstarttime);
 
 /**
  * Store message in the cache. Stores in message cache and rrset cache.
@@ -112,11 +114,14 @@ int dns_cache_store(struct module_env* env, struct query_info* qinf,
  *     can be updated to full TTL even in prefetch situations.
  * @param qrep: message that can be altered with better rrs from cache.
  * @param flags: customization flags for the cache policy.
+ * @param qstarttime: time when the query was started, and thus when the
+ *     delegations were looked up.
  * @param region: to allocate into for qmsg.
  */
 void dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
        hashvalue_type hash, struct reply_info* rep, time_t leeway, int pside,
-       struct reply_info* qrep, uint32_t flags, struct regional* region);
+       struct reply_info* qrep, uint32_t flags, struct regional* region,
+       time_t qstarttime);
 
 /**
  * Find a delegation from the cache.
@@ -129,11 +134,18 @@ void dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
  * @param msg: if not NULL, delegation message is returned here, synthesized
  *     from the cache.
  * @param timenow: the time now, for checking if TTL on cache entries is OK.
+ * @param noexpiredabove: if set, no expired NS rrsets above the one found
+ *     are tolerated. It only returns delegations where the delegations above
+ *     it are valid.
+ * @param expiretop: if not NULL, name where check for expiry ends for
+ *     noexpiredabove.
+ * @param expiretoplen: length of expiretop dname.
  * @return new delegation or NULL on error or if not found in cache.
  */
 struct delegpt* dns_cache_find_delegation(struct module_env* env, 
        uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, 
-       struct regional* region, struct dns_msg** msg, time_t timenow);
+       struct regional* region, struct dns_msg** msg, time_t timenow,
+       int noexpiredabove, uint8_t* expiretop, size_t expiretoplen);
 
 /**
  * generate dns_msg from cached message

diff --git a/sbin/unwind/libunbound/services/cache/infra.c b/sbin/unwind/libunbound/services/cache/infra.c
index 252e1e2..0461c81 100644 (file)
--- a/sbin/unwind/libunbound/services/cache/infra.c
+++ b/sbin/unwind/libunbound/services/cache/infra.c
@@ -721,13 +721,13 @@ infra_get_lame_rtt(struct infra_cache* infra,
                        else    *rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
                }
        }
+       /* expired entry */
        if(timenow > host->ttl) {
-               /* expired entry */
+
                /* see if this can be a re-probe of an unresponsive server */
                /* minus 1000 because that is outside of the RTTBAND, so
                 * blacklisted servers stay blacklisted if this is chosen */
-               if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT ||
-                       infra->infra_keep_probing) {
+               if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT) {
                        lock_rw_unlock(&e->lock);
                        *rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
                        *lame = 0;

diff --git a/sbin/unwind/libunbound/services/listen_dnsport.c b/sbin/unwind/libunbound/services/listen_dnsport.c
index 03153bd..1c7c177 100644 (file)
--- a/sbin/unwind/libunbound/services/listen_dnsport.c
+++ b/sbin/unwind/libunbound/services/listen_dnsport.c
@@ -490,6 +490,7 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
                        return -1;
                }
 # elif defined(IPV6_MTU)
+#   ifndef USE_WINSOCK
                /*
                 * On Linux, to send no larger than 1280, the PMTUD is
                 * disabled by default for datagrams anyway, so we set
@@ -497,13 +498,27 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
                 */
                if (setsockopt(s, IPPROTO_IPV6, IPV6_MTU,
                        (void*)&mtu, (socklen_t)sizeof(mtu)) < 0) {
-                       log_err("setsockopt(..., IPV6_MTU, ...) failed: %s", 
+                       log_err("setsockopt(..., IPV6_MTU, ...) failed: %s",
                                sock_strerror(errno));
                        sock_close(s);
                        *noproto = 0;
                        *inuse = 0;
                        return -1;
                }
+#   elif defined(IPV6_USER_MTU)
+               /* As later versions of the mingw crosscompiler define
+                * IPV6_MTU, do the same for windows but use IPV6_USER_MTU
+                * instead which is writable; IPV6_MTU is readonly there. */
+               if (setsockopt(s, IPPROTO_IPV6, IPV6_USER_MTU,
+                       (void*)&mtu, (socklen_t)sizeof(mtu)) < 0) {
+                       log_err("setsockopt(..., IPV6_USER_MTU, ...) failed: %s",
+                               wsa_strerror(WSAGetLastError()));
+                       sock_close(s);
+                       *noproto = 0;
+                       *inuse = 0;
+                       return -1;
+               }
+#   endif /* USE_WINSOCK */
 # endif /* IPv6 MTU */
 # if defined(IPV6_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
 #  if defined(IP_PMTUDISC_OMIT)

diff --git a/sbin/unwind/libunbound/services/mesh.c b/sbin/unwind/libunbound/services/mesh.c
index fbaa966..30bcf7c 100644 (file)
--- a/sbin/unwind/libunbound/services/mesh.c
+++ b/sbin/unwind/libunbound/services/mesh.c
@@ -811,7 +811,8 @@ static void mesh_schedule_prefetch_subnet(struct mesh_area* mesh,
                        log_err("prefetch_subnet subnet_option_from_ss: invalid data");
                        return;
                }
-               subnet_ecs_opt_list_append(&ecs, &s->s.edns_opts_front_in, &s->s);
+               subnet_ecs_opt_list_append(&ecs, &s->s.edns_opts_front_in,
+                       &s->s, s->s.region);
                if(!s->s.edns_opts_front_in) {
                        log_err("prefetch_subnet subnet_ecs_opt_list_append: out of memory");
                        return;
@@ -953,6 +954,7 @@ mesh_state_create(struct module_env* env, struct query_info* qinfo,
        mstate->s.no_cache_store = 0;
        mstate->s.need_refetch = 0;
        mstate->s.was_ratelimited = 0;
+       mstate->s.qstarttime = *env->now;
 
        /* init modules */
        for(i=0; i<env->mesh->mods.num; i++) {

diff --git a/sbin/unwind/libunbound/services/outside_network.c b/sbin/unwind/libunbound/services/outside_network.c
index ec37a4a..3f479a3 100644 (file)
--- a/sbin/unwind/libunbound/services/outside_network.c
+++ b/sbin/unwind/libunbound/services/outside_network.c
@@ -271,7 +271,7 @@ outnet_get_tcp_fd(struct sockaddr_storage* addr, socklen_t addrlen, int tcp_mss,
        int s;
        int af;
        char* err;
-#ifdef SO_REUSEADDR
+#if defined(SO_REUSEADDR) || defined(IP_BIND_ADDRESS_NO_PORT)
        int on = 1;
 #endif
 #ifdef INET6
@@ -317,7 +317,13 @@ outnet_get_tcp_fd(struct sockaddr_storage* addr, socklen_t addrlen, int tcp_mss,
                        " setsockopt(TCP_MAXSEG) unsupported");
 #endif /* defined(IPPROTO_TCP) && defined(TCP_MAXSEG) */
        }
-
+#ifdef IP_BIND_ADDRESS_NO_PORT
+       if(setsockopt(s, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, (void*)&on,
+               (socklen_t)sizeof(on)) < 0) {
+               verbose(VERB_ALGO, "outgoing tcp:"
+                       " setsockopt(.. IP_BIND_ADDRESS_NO_PORT ..) failed");
+       }
+#endif /* IP_BIND_ADDRESS_NO_PORT */
        return s;
 }
 
@@ -1608,6 +1614,7 @@ outside_network_create(struct comm_base *base, size_t bufsize,
        outnet->tcp_reuse_timeout= tcp_reuse_timeout;
        outnet->tcp_auth_query_timeout = tcp_auth_query_timeout;
        outnet->num_tcp_outgoing = 0;
+       outnet->num_udp_outgoing = 0;
        outnet->infra = infra;
        outnet->rnd = rnd;
        outnet->sslctx = sslctx;
@@ -2142,6 +2149,7 @@ randomize_and_send_udp(struct pending* pend, sldns_buffer* packet, int timeout)
                portcomm_loweruse(outnet, pend->pc);
                return 0;
        }
+       outnet->num_udp_outgoing++;
 
        /* system calls to set timeout after sending UDP to make roundtrip
           smaller. */

diff --git a/sbin/unwind/libunbound/services/outside_network.h b/sbin/unwind/libunbound/services/outside_network.h
index 4c5b96f..c383b8f 100644 (file)
--- a/sbin/unwind/libunbound/services/outside_network.h
+++ b/sbin/unwind/libunbound/services/outside_network.h
@@ -113,6 +113,8 @@ struct outside_network {
        /** if we perform udp-connect, connect() for UDP socket to mitigate
         * ICMP side channel leakage */
        int udp_connect;
+       /** number of udp packets sent. */
+       size_t num_udp_outgoing;
 
        /** array of outgoing IP4 interfaces */
        struct port_if* ip4_ifs;

diff --git a/sbin/unwind/libunbound/sldns/parse.c b/sbin/unwind/libunbound/sldns/parse.c
index 491c8f5..8ea0846 100644 (file)
--- a/sbin/unwind/libunbound/sldns/parse.c
+++ b/sbin/unwind/libunbound/sldns/parse.c
@@ -34,7 +34,7 @@ sldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *l
 {
        int c, prev_c;
        int p; /* 0 -> no parentheses seen, >0 nr of ( seen */
-       int com, quoted;
+       int com, quoted, only_blank;
        char *t;
        size_t i;
        const char *d;
@@ -53,6 +53,7 @@ sldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *l
        com = 0;
        quoted = 0;
        prev_c = 0;
+       only_blank = 1; /* Assume we got only <blank> until now */
        t = token;
        if (del[0] == '"') {
                quoted = 1;
@@ -101,6 +102,22 @@ sldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *l
                        if (line_nr) {
                                *line_nr = *line_nr + 1;
                        }
+                       if (only_blank && i > 0) {
+                               /* Got only <blank> so far. Reset and try
+                                * again with the next line.
+                                */
+                               i = 0;
+                               t = token;
+                       }
+                       if (p == 0) {
+                               /* If p != 0 then the next line is a continuation. So
+                                * we assume that the next line starts with a blank only
+                                * if it is actually a new line.
+                                */
+                               only_blank = 1; /* Assume next line starts with
+                                                * <blank>.
+                                                */
+                       }
                        if (p == 0 && i > 0) {
                                goto tokenread;
                        } else {
@@ -131,12 +148,29 @@ sldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *l
 
                /* check if we hit the delim */
                for (d = del; *d; d++) {
-                       if (c == *d && i > 0 && prev_c != '\\' && p == 0) {
-                               if (c == '\n' && line_nr) {
-                                       *line_nr = *line_nr + 1;
-                               }
-                               goto tokenread;
+                       if (c == *d)
+                               break;
+               }
+
+               if (c == *d && i > 0 && prev_c != '\\' && p == 0) {
+                       if (c == '\n' && line_nr) {
+                               *line_nr = *line_nr + 1;
                        }
+                       if (only_blank) {
+                               /* Got only <blank> so far. Reset and
+                                * try again with the next line.
+                                */
+                               i = 0;
+                               t = token;
+                               only_blank = 1;
+                               prev_c = c;
+                               continue;
+                       }
+                       goto tokenread;
+               }
+               if (c != ' ' && c != '\t') {
+                       /* Found something that is not <blank> */
+                       only_blank= 0;
                }
                if (c != '\0' && c != '\n') {
                        i++;
@@ -149,8 +183,13 @@ sldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *l
                if (c != '\0' && c != '\n') {
                        *t++ = c;
                }
-               if (c == '\n' && line_nr) {
-                       *line_nr = *line_nr + 1;
+               if (c == '\n') {
+                       if (line_nr) {
+                               *line_nr = *line_nr + 1;
+                       }
+                       only_blank = 1; /* Assume next line starts with
+                                        * <blank>.
+                                        */
                }
                if (c == '\\' && prev_c == '\\')
                        prev_c = 0;

diff --git a/sbin/unwind/libunbound/sldns/rrdef.c b/sbin/unwind/libunbound/sldns/rrdef.c
index fe5c8e1..322eff0 100644 (file)
--- a/sbin/unwind/libunbound/sldns/rrdef.c
+++ b/sbin/unwind/libunbound/sldns/rrdef.c
@@ -381,9 +381,9 @@ static sldns_rr_descriptor rdata_field_descriptors[] = {
        /* 63 */
        {LDNS_RR_TYPE_ZONEMD, "ZONEMD", 4, 4, type_zonemd_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 64 */
-       {LDNS_RR_TYPE_SVCB, "SVCB", 2, 2, type_svcb_wireformat, LDNS_RDF_TYPE_SVCPARAM, LDNS_RR_NO_COMPRESS, 0 },
+       {LDNS_RR_TYPE_SVCB, "SVCB", 2, 2, type_svcb_wireformat, LDNS_RDF_TYPE_SVCPARAM, LDNS_RR_NO_COMPRESS, 1 },
        /* 65 */
-       {LDNS_RR_TYPE_HTTPS, "HTTPS", 2, 2, type_svcb_wireformat, LDNS_RDF_TYPE_SVCPARAM, LDNS_RR_NO_COMPRESS, 0 },
+       {LDNS_RR_TYPE_HTTPS, "HTTPS", 2, 2, type_svcb_wireformat, LDNS_RDF_TYPE_SVCPARAM, LDNS_RR_NO_COMPRESS, 1 },
 {(enum sldns_enum_rr_type)0, "TYPE66", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {(enum sldns_enum_rr_type)0, "TYPE67", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {(enum sldns_enum_rr_type)0, "TYPE68", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },

diff --git a/sbin/unwind/libunbound/sldns/wire2str.c b/sbin/unwind/libunbound/sldns/wire2str.c
index d6fb289..74d1b62 100644 (file)
--- a/sbin/unwind/libunbound/sldns/wire2str.c
+++ b/sbin/unwind/libunbound/sldns/wire2str.c
@@ -1071,7 +1071,7 @@ static int sldns_wire2str_svcparam_mandatory2str(char** s,
        assert(data_len > 0);
 
        if (data_len % sizeof(uint16_t))
-               return -1; // wireformat error, data_len must be multiple of shorts
+               return -1; /* wireformat error, data_len must be multiple of shorts */
        w += sldns_str_print(s, slen, "=");
        w += sldns_print_svcparamkey(s, slen, sldns_read_uint16(data));
        data += 2;

diff --git a/sbin/unwind/libunbound/util/config_file.c b/sbin/unwind/libunbound/util/config_file.c
index d7bd37a..cd9389a 100644 (file)
--- a/sbin/unwind/libunbound/util/config_file.c
+++ b/sbin/unwind/libunbound/util/config_file.c
@@ -173,6 +173,7 @@ config_create(void)
        cfg->infra_cache_slabs = 4;
        cfg->infra_cache_numhosts = 10000;
        cfg->infra_cache_min_rtt = 50;
+       cfg->infra_cache_max_rtt = 120000;
        cfg->infra_keep_probing = 0;
        cfg->delay_close = 0;
        cfg->udp_connect = 1;
@@ -595,8 +596,14 @@ int config_set_option(struct config_file* cfg, const char* opt,
        else if(strcmp(opt, "cache-min-ttl:") == 0)
        { IS_NUMBER_OR_ZERO; cfg->min_ttl = atoi(val); MIN_TTL=(time_t)cfg->min_ttl;}
        else if(strcmp(opt, "infra-cache-min-rtt:") == 0) {
-           IS_NUMBER_OR_ZERO; cfg->infra_cache_min_rtt = atoi(val);
-           RTT_MIN_TIMEOUT=cfg->infra_cache_min_rtt;
+               IS_NUMBER_OR_ZERO; cfg->infra_cache_min_rtt = atoi(val);
+               RTT_MIN_TIMEOUT=cfg->infra_cache_min_rtt;
+       }
+       else if(strcmp(opt, "infra-cache-max-rtt:") == 0) {
+               IS_NUMBER_OR_ZERO; cfg->infra_cache_max_rtt = atoi(val);
+               RTT_MAX_TIMEOUT=cfg->infra_cache_max_rtt;
+               USEFUL_SERVER_TOP_TIMEOUT = RTT_MAX_TIMEOUT;
+               BLACKLIST_PENALTY = USEFUL_SERVER_TOP_TIMEOUT*4;
        }
        else S_YNO("infra-keep-probing:", infra_keep_probing)
        else S_NUMBER_OR_ZERO("infra-host-ttl:", host_ttl)
@@ -1026,6 +1033,7 @@ config_get_option(struct config_file* cfg, const char* opt,
        else O_DEC(opt, "infra-host-ttl", host_ttl)
        else O_DEC(opt, "infra-cache-slabs", infra_cache_slabs)
        else O_DEC(opt, "infra-cache-min-rtt", infra_cache_min_rtt)
+       else O_UNS(opt, "infra-cache-max-rtt", infra_cache_max_rtt)
        else O_YNO(opt, "infra-keep-probing", infra_keep_probing)
        else O_MEM(opt, "infra-cache-numhosts", infra_cache_numhosts)
        else O_UNS(opt, "delay-close", delay_close)
@@ -2222,11 +2230,14 @@ config_apply(struct config_file* config)
        SERVE_ORIGINAL_TTL = config->serve_original_ttl;
        MAX_NEG_TTL = (time_t)config->max_negative_ttl;
        RTT_MIN_TIMEOUT = config->infra_cache_min_rtt;
+       RTT_MAX_TIMEOUT = config->infra_cache_max_rtt;
        EDNS_ADVERTISED_SIZE = (uint16_t)config->edns_buffer_size;
        MINIMAL_RESPONSES = config->minimal_responses;
        RRSET_ROUNDROBIN = config->rrset_roundrobin;
        LOG_TAG_QUERYREPLY = config->log_tag_queryreply;
        UNKNOWN_SERVER_NICENESS = config->unknown_server_time_limit;
+       USEFUL_SERVER_TOP_TIMEOUT = RTT_MAX_TIMEOUT;
+       BLACKLIST_PENALTY = USEFUL_SERVER_TOP_TIMEOUT*4;
        log_set_time_asc(config->log_time_ascii);
        autr_permit_small_holddown = config->permit_small_holddown;
        stream_wait_max = config->stream_wait_size;

diff --git a/sbin/unwind/libunbound/util/config_file.h b/sbin/unwind/libunbound/util/config_file.h
index 0b457e3..ed37252 100644 (file)
--- a/sbin/unwind/libunbound/util/config_file.h
+++ b/sbin/unwind/libunbound/util/config_file.h
@@ -186,8 +186,10 @@ struct config_file {
        size_t infra_cache_slabs;
        /** max number of hosts in the infra cache */
        size_t infra_cache_numhosts;
-       /** min value for infra cache rtt */
+       /** min value for infra cache rtt (min retransmit timeout) */
        int infra_cache_min_rtt;
+       /** max value for infra cache rtt (max retransmit timeout) */
+       int infra_cache_max_rtt;
        /** keep probing hosts that are down */
        int infra_keep_probing;
        /** delay close of udp-timeouted ports, if 0 no delayclose. in msec */

diff --git a/sbin/unwind/libunbound/util/configlexer.c b/sbin/unwind/libunbound/util/configlexer.c
index 9f6324f..ca66128 100644 (file)
--- a/sbin/unwind/libunbound/util/configlexer.c
+++ b/sbin/unwind/libunbound/util/configlexer.c
@@ -5,7 +5,7 @@
 
 #define  YY_INT_ALIGNED short int
 
-/*     $OpenBSD: configlexer.c,v 1.13 2022/06/18 16:20:14 florian Exp $        */
+/*     $OpenBSD: configlexer.c,v 1.14 2022/08/30 05:46:51 florian Exp $        */
 
 /* A lexical scanner generated by flex */
 
@@ -27,7 +27,7 @@
 
 /* end standard C headers. */
 
-/* $OpenBSD: configlexer.c,v 1.13 2022/06/18 16:20:14 florian Exp $ */
+/* $OpenBSD: configlexer.c,v 1.14 2022/08/30 05:46:51 florian Exp $ */
 
 /* flex integer type definitions */
 
@@ -368,8 +368,8 @@ static void yy_fatal_error (yyconst char msg[]  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 362
-#define YY_END_OF_BUFFER 363
+#define YY_NUM_RULES 363
+#define YY_END_OF_BUFFER 364
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -377,403 +377,403 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[3593] =
+static yyconst flex_int16_t yy_accept[3600] =
     {   0,
-        1,    1,  336,  336,  340,  340,  344,  344,  348,  348,
-        1,    1,  352,  352,  356,  356,  363,  360,    1,  334,
-      334,  361,    2,  361,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  336,  337,  337,  338,
-      361,  340,  341,  341,  342,  361,  347,  344,  345,  345,
-      346,  361,  348,  349,  349,  350,  361,  359,  335,    2,
-      339,  361,  359,  355,  352,  353,  353,  354,  361,  356,
-      357,  357,  358,  361,  360,    0,    1,    2,    2,    2,
-        2,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  336,
-        0,  340,    0,  347,    0,  344,  348,    0,  359,    0,
-        2,    2,  359,  355,    0,  352,  356,    0,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  359,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  333,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  132,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  142,  360,  360,  360,  360,  360,  360,
-      360,  359,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  114,  360,  332,  360,  360,  360,  360,  360,
-      360,  360,  360,    8,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  133,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  147,  360,
-      360,  359,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  325,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  359,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,   69,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  254,  360,   14,   15,  360,   19,   18,
-      360,  360,  238,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  140,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  236,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,    3,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  359,  360,  360,  360,  360,
-      360,  360,  360,  319,  360,  360,  318,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  343,  360,  360,
-      360,  360,  360,  360,  360,  360,   68,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,   72,  360,  288,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  326,  327,  360,  360,  360,
-      360,  360,  360,  360,  360,   73,  360,  360,  141,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  136,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  225,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,   21,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      167,  360,  360,  360,  360,  360,  359,  343,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  112,
-      360,  360,  360,  360,  360,  360,  360,  296,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  194,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  166,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  111,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,   35,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,   36,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,   70,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  139,  360,  360,  360,
-      359,  360,  360,  360,  360,  360,  131,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,   71,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  258,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      195,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,   58,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  276,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,   63,  360,   64,
-      360,  360,  360,  360,  360,  115,  360,  116,  360,  360,
-      360,  360,  360,  113,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,    7,  360,  360,
-      360,  360,  359,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  247,  360,  360,  360,  360,  170,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  259,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,   49,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,   59,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  217,
-      360,  216,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,   16,   17,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,   74,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  224,  360,  360,  360,  360,  360,  360,  118,  360,
-      117,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  208,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  148,  360,  360,
-
-      360,  359,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  106,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,   94,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  237,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,   99,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,   67,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  211,  212,  360,  360,  360,  290,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,    6,  360,  360,  360,  360,  360,  360,  360,  309,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  294,  360,
-      360,  360,  360,  360,  360,  360,  320,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,   46,  360,  360,  360,  360,  360,   48,  360,  360,
-
-      360,   95,  360,  360,  360,  360,  360,   56,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  359,
-      360,  204,  360,  360,  360,  143,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  229,  360,  205,  360,
-      360,  360,  244,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,   57,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  145,  124,  360,  125,  360,
-      360,  360,  360,  123,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  163,  360,  360,   54,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  275,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  206,  360,  360,  360,  360,  360,
-      209,  360,  215,  360,  360,  360,  360,  360,  360,  243,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  110,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  137,  360,  360,
-      360,  360,  360,  360,  360,  360,   65,  360,  360,  360,
-       29,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,   20,  360,  360,  360,  360,  360,  360,
-      360,   30,   39,  360,  175,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  202,
-      360,  360,  359,  360,  360,  360,  360,  360,  360,   82,
-       84,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  298,  360,  360,  360,  360,  255,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  126,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  162,  360,   50,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  313,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  169,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  307,  360,  360,  360,  235,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      323,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  187,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  119,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  182,  360,  196,
-      360,  360,  360,  360,  360,  360,  360,  359,  360,  151,
-      360,  360,  360,  360,  360,  105,  360,  360,  360,  360,
-      227,  360,  360,  360,  360,  360,  360,  245,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  267,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  144,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  186,  360,  360,  360,  360,  360,
-
-      360,   85,  360,   86,  360,  360,  360,  360,  360,  360,
-       66,  316,  360,  360,  360,  360,  360,   93,  197,  360,
-      218,  360,  248,  360,  360,  210,  291,  360,  360,  360,
-      360,  360,  360,   78,  360,  199,  360,  360,  360,  360,
-      360,  360,    9,  360,  360,  360,  360,  360,  109,  360,
-      360,  360,  360,  360,  280,  360,  360,  360,  360,  226,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  359,  360,  360,  360,  360,  185,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      171,  360,  297,  360,  360,  360,  360,  360,  266,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      239,  360,  360,  360,  360,  360,  360,  289,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  168,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  317,  360,  198,  360,  360,  360,  360,  360,
-
-      360,  360,  360,   77,   79,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  108,  360,  360,  360,  360,
-      360,  278,  360,  360,  360,  360,  293,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      231,   37,   31,   33,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,   38,  360,   32,   34,
-      360,   40,  360,  360,  360,  360,  360,  360,  360,  104,
-      360,  181,  360,  360,  360,  360,  360,  360,  360,  359,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  233,  230,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,   76,  360,  360,  360,  146,  360,  127,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  164,
-       51,  360,  360,  360,  351,   13,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  311,  360,  314,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,   12,  360,  360,   22,  360,  360,  360,  360,
-      360,  360,  284,  360,  360,  360,  360,  295,  360,  360,
-      360,  360,   80,  360,  241,  360,  360,  360,  360,  360,
-      232,  360,  360,   75,  360,  360,  360,  360,  360,  360,
-
-       23,  360,  360,   47,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  180,  179,  360,  360,
-      351,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      234,  228,  360,  246,  360,  360,  299,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  192,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,   87,  360,  360,  360,  360,  360,  279,  360,
-      360,  360,  360,  214,  360,  360,  360,  360,  360,  240,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  286,
-
-      360,  360,  360,  321,  322,  177,  360,  360,  360,   81,
-      360,  360,  360,  360,  188,  360,  360,  360,  120,  122,
-      121,  360,  360,  360,   25,  360,  360,  172,  360,  174,
-      360,  219,  360,  360,  360,  360,  178,  360,  360,  360,
-      360,  249,  360,  360,  360,  360,  360,  360,  360,  153,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  257,  360,  360,  360,  360,  360,  360,  360,
-      330,  360,   27,  360,  292,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,   91,  220,  360,  360,  360,  277,  360,  315,  360,
-
-      213,  360,  360,  360,  360,  360,  287,   60,  360,  360,
-      360,  360,  360,  360,    4,  360,  360,  360,  360,  135,
-      360,  152,  360,  360,  360,  193,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  252,   41,   42,  360,  360,  360,
-      360,  360,  360,  360,  300,  360,  360,  360,  360,  360,
-      360,  360,  265,  360,  360,  360,  360,  360,  360,  360,
-      360,  223,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,   90,  360,  360,   61,
-      360,  283,  360,  253,  360,  360,  360,  360,  360,   11,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  134,  360,
-      360,  360,  360,  360,  221,   96,  360,  360,   44,  360,
-      360,  360,  360,  360,  360,  360,  360,  184,  360,  360,
-      360,  360,  360,  360,  360,  155,  360,  360,  360,  360,
-      256,  360,  360,  360,  360,  360,  264,  360,  360,  360,
-      360,  149,  360,  360,  360,  128,  130,  129,  360,  360,
-      360,   98,  102,   97,  165,  360,  360,  360,  360,   88,
-      360,  285,  360,  360,  360,  360,  360,  360,   10,  360,
-      360,  360,  360,  360,  281,  324,  360,  360,  360,  360,
-      360,  360,  329,   43,  360,  360,  360,  360,  360,  183,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  103,  101,  360,   55,  360,
-      360,   89,  360,  312,  360,  360,  360,  360,   24,  360,
-      360,  360,  360,  360,  207,  360,  360,  360,  360,  360,
-      360,  222,  360,  360,  360,  360,  360,  360,  360,  360,
-      203,  360,  360,  173,   83,  360,  360,  360,  360,  360,
-      301,  360,  360,  360,  360,  360,  360,  360,  261,  360,
-      360,  260,  150,  360,  360,  100,   52,  360,  360,  156,
-      157,  160,  161,  158,  159,   92,  310,  360,  360,  282,
-
-      138,  360,  360,  360,   26,  360,  176,  360,  360,  360,
-      360,  201,  360,  251,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  190,  189,   45,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  308,  360,  360,  360,  360,  107,  360,  250,  360,
-      274,  305,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  331,  360,   53,   62,    5,  360,  360,
-      242,  360,  360,  306,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  262,   28,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  263,  360,  360,
-      360,  154,  360,  360,  360,  360,  360,  360,  360,  360,
-      191,  360,  200,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  302,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      328,  360,  360,  270,  360,  360,  360,  360,  360,  303,
-      360,  360,  360,  360,  360,  360,  304,  360,  360,  360,
-      268,  360,  271,  272,  360,  360,  360,  360,  360,  269,
-      273,    0
+        1,    1,  337,  337,  341,  341,  345,  345,  349,  349,
+        1,    1,  353,  353,  357,  357,  364,  361,    1,  335,
+      335,  362,    2,  362,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  337,  338,  338,  339,
+      362,  341,  342,  342,  343,  362,  348,  345,  346,  346,
+      347,  362,  349,  350,  350,  351,  362,  360,  336,    2,
+      340,  362,  360,  356,  353,  354,  354,  355,  362,  357,
+      358,  358,  359,  362,  361,    0,    1,    2,    2,    2,
+        2,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  337,
+        0,  341,    0,  348,    0,  345,  349,    0,  360,    0,
+        2,    2,  360,  356,    0,  353,  357,    0,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  360,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  334,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  133,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  143,  361,  361,  361,  361,  361,  361,
+      361,  360,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  115,  361,  333,  361,  361,  361,  361,  361,
+      361,  361,  361,    8,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  134,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  148,  361,
+      361,  360,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  326,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  360,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,   69,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  255,  361,   14,   15,  361,   19,   18,
+      361,  361,  239,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  141,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  237,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,    3,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  360,  361,  361,  361,  361,
+      361,  361,  361,  320,  361,  361,  319,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  344,  361,  361,
+      361,  361,  361,  361,  361,  361,   68,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,   72,  361,  289,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  327,  328,  361,  361,  361,
+      361,  361,  361,  361,  361,   73,  361,  361,  142,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  137,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  226,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,   21,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      168,  361,  361,  361,  361,  361,  360,  344,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  113,
+      361,  361,  361,  361,  361,  361,  361,  297,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  195,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  167,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  112,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,   35,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,   36,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,   70,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  140,  361,  361,  361,
+      360,  361,  361,  361,  361,  361,  132,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,   71,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  259,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      196,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,   58,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  277,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,   63,  361,   64,
+      361,  361,  361,  361,  361,  116,  361,  117,  361,  361,
+      361,  361,  361,  114,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,    7,  361,  361,
+      361,  361,  360,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  248,  361,  361,  361,  361,  171,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  260,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,   49,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,   59,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  218,
+      361,  217,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,   16,   17,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,   74,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  225,  361,  361,  361,  361,  361,  361,  119,  361,
+      118,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  209,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  149,  361,  361,
+
+      361,  360,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  107,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,   95,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  238,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  100,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,   67,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  212,  213,  361,  361,  361,  291,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,    6,  361,  361,  361,  361,  361,  361,  361,  310,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  295,  361,
+      361,  361,  361,  361,  361,  361,  321,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,   46,  361,  361,  361,  361,  361,   48,  361,  361,
+
+      361,   96,  361,  361,  361,  361,  361,   56,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  360,
+      361,  205,  361,  361,  361,  144,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  230,  361,  206,  361,
+      361,  361,  245,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,   57,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  146,  125,  361,  126,  361,
+      361,  361,  361,  124,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  164,  361,  361,   54,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  276,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  207,  361,  361,  361,  361,  361,
+      210,  361,  216,  361,  361,  361,  361,  361,  361,  244,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  111,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  138,  361,  361,
+      361,  361,  361,  361,  361,  361,   65,  361,  361,  361,
+       29,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,   20,  361,  361,  361,  361,  361,  361,
+      361,   30,   39,  361,  176,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  203,
+      361,  361,  360,  361,  361,  361,  361,  361,  361,   82,
+       84,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  299,  361,  361,  361,  361,  256,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  127,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  163,  361,   50,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  314,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  170,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  308,  361,  361,  361,
+      236,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  324,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  188,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  120,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  183,  361,
+      197,  361,  361,  361,  361,  361,  361,  361,  360,  361,
+      152,  361,  361,  361,  361,  361,  106,  361,  361,  361,
+      361,  228,  361,  361,  361,  361,  361,  361,  246,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  268,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  145,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  187,  361,  361,  361,  361,
+
+      361,  361,  361,   85,  361,   86,  361,  361,  361,  361,
+      361,  361,   66,  317,  361,  361,  361,  361,  361,   94,
+      198,  361,  219,  361,  249,  361,  361,  211,  292,  361,
+      361,  361,  361,  361,  361,   78,  361,  200,  361,  361,
+      361,  361,  361,  361,    9,  361,  361,  361,  361,  361,
+      110,  361,  361,  361,  361,  361,  281,  361,  361,  361,
+      361,  227,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  360,  361,  361,  361,
+      361,  186,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  172,  361,  298,  361,  361,  361,  361,  361,
+      267,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  240,  361,  361,  361,  361,  361,  361,  290,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  169,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  318,  361,  199,  361,  361,
+
+      361,  361,  361,  361,  361,  361,   77,   79,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  109,  361,
+      361,  361,  361,  361,  279,  361,  361,  361,  361,  294,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  232,   37,   31,   33,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,   38,
+      361,   32,   34,  361,   40,  361,  361,  361,  361,  361,
+      361,  361,  105,  361,  182,  361,  361,  361,  361,  361,
+      361,  361,  360,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  234,  231,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,   76,  361,  361,  361,  147,
+      361,  128,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  165,   51,  361,  361,  361,  352,   13,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  312,  361,  315,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,   12,  361,  361,   22,
+      361,  361,  361,  361,  361,  361,  285,  361,  361,  361,
+      361,  296,  361,  361,  361,  361,   80,  361,  242,  361,
+      361,  361,  361,  361,  233,  361,  361,   75,  361,  361,
+
+      361,  361,  361,  361,   23,  361,  361,   47,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      181,  180,  361,  361,  352,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  235,  229,  361,  247,  361,  361,
+      300,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  193,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,   87,  361,  361,
+      361,  361,  361,  280,  361,  361,  361,  361,  215,  361,
+      361,  361,  361,  361,  241,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  287,  361,  361,  361,  322,  323,
+      178,  361,  361,  361,   81,  361,  361,  361,  361,  189,
+      361,  361,  361,  121,  123,  122,  361,  361,  361,   25,
+      361,  361,  173,  361,  175,  361,  220,  361,  361,  361,
+      361,  179,  361,  361,  361,  361,  250,  361,  361,  361,
+      361,  361,  361,  361,  154,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  258,  361,  361,
+      361,  361,  361,  361,  361,  331,  361,   27,  361,  293,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,   92,  221,  361,
+
+      361,  361,  278,  361,  316,  361,  214,  361,  361,  361,
+      361,  361,  288,   60,  361,  361,  361,  361,  361,  361,
+        4,  361,  361,  361,  361,  136,  361,  153,  361,  361,
+      361,  194,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      253,   41,   42,  361,  361,  361,  361,  361,  361,  361,
+      301,  361,  361,  361,  361,  361,  361,  361,  266,  361,
+      361,  361,  361,  361,  361,  361,  361,  224,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,   91,   90,  361,  361,   61,  361,  284,  361,
+
+      254,  361,  361,  361,  361,  361,   11,  361,  361,  361,
+      361,  361,  361,  361,  361,  135,  361,  361,  361,  361,
+      361,  222,   97,  361,  361,   44,  361,  361,  361,  361,
+      361,  361,  361,  361,  185,  361,  361,  361,  361,  361,
+      361,  361,  156,  361,  361,  361,  361,  257,  361,  361,
+      361,  361,  361,  265,  361,  361,  361,  361,  150,  361,
+      361,  361,  129,  131,  130,  361,  361,  361,   99,  103,
+       98,  166,  361,  361,  361,  361,   88,  361,  286,  361,
+      361,  361,  361,  361,  361,   10,  361,  361,  361,  361,
+      361,  282,  325,  361,  361,  361,  361,  361,  361,  330,
+
+       43,  361,  361,  361,  361,  361,  184,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  104,  102,  361,   55,  361,  361,   89,  361,
+      313,  361,  361,  361,  361,   24,  361,  361,  361,  361,
+      361,  208,  361,  361,  361,  361,  361,  361,  223,  361,
+      361,  361,  361,  361,  361,  361,  361,  204,  361,  361,
+      174,   83,  361,  361,  361,  361,  361,  302,  361,  361,
+      361,  361,  361,  361,  361,  262,  361,  361,  261,  151,
+      361,  361,  101,   52,  361,  361,  157,  158,  161,  162,
+
+      159,  160,   93,  311,  361,  361,  283,  139,  361,  361,
+      361,   26,  361,  177,  361,  361,  361,  361,  202,  361,
+      252,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  191,  190,   45,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  309,  361,
+      361,  361,  361,  108,  361,  251,  361,  275,  306,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      332,  361,   53,   62,    5,  361,  361,  243,  361,  361,
+
+      307,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      263,   28,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  264,  361,  361,  361,  155,  361,
+      361,  361,  361,  361,  361,  361,  361,  192,  361,  201,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  303,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  329,  361,  361,
+      271,  361,  361,  361,  361,  361,  304,  361,  361,  361,
+      361,  361,  361,  305,  361,  361,  361,  269,  361,  272,
+      273,  361,  361,  361,  361,  361,  270,  274,    0
 
     } ;
 
@@ -817,17 +817,17 @@ static yyconst flex_int32_t yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[3611] =
+static yyconst flex_int16_t yy_base[3618] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112,   96,  118,  124,  136, 4340, 4181,   81, 7005,
-     7005, 7005,  129,   52,  130,   63,  131,  152,   70,  140,
+       90,  112,   96,  118,  124,  136, 4341, 4181,   81, 7019,
+     7019, 7019,  129,   52,  130,   63,  131,  152,   70,  140,
       149,  156,   57,   88,   76,  173,  175,   95,  197,  145,
-      185,  199,  208,  213,  178,  123, 3534, 7005, 7005, 7005,
-      107, 3162, 7005, 7005, 7005,  154, 3102, 2669, 7005, 7005,
-     7005,  245, 2592, 7005, 7005, 7005,  163, 2519, 7005,  249,
-     7005,  253,  148, 2320, 2287, 7005, 7005, 7005,  257, 2134,
-     7005, 7005, 7005,  233, 1825,  263,  201,    0,  267,    0,
+      185,  199,  208,  213,  178,  123, 3534, 7019, 7019, 7019,
+      107, 3162, 7019, 7019, 7019,  154, 3102, 2669, 7019, 7019,
+     7019,  245, 2592, 7019, 7019, 7019,  163, 2519, 7019,  249,
+     7019,  253,  148, 2320, 2287, 7019, 7019, 7019,  257, 2134,
+     7019, 7019, 7019,  233, 1825,  263,  201,    0,  267,    0,
         0,  165,  191,  221,  252,  205,  181,  265,   92,  261,
 
       216,  263,  271,  272,  210,  279,  274,  282,  278,  291,
@@ -852,15 +852,15 @@ static yyconst flex_int16_t yy_base[3611] =
       660,  663,  670,  669,  671,  672,  673,  675,  652,  682,
       678,  686,  679,  692,  691,  693,  695,  697,  699,  698,
 
-      700,  702,  703,  705, 7005,  716,  706,  721,  717,  728,
+      700,  702,  703,  705, 7019,  716,  706,  721,  717,  728,
       723,  707,  725,  732,  735,  718,  731,  734,  733,  736,
       739,  740,  741,  743,  747,  750,  748,  753,  752,  763,
       767,  759,  774,  760,  761,  772,  782,  775,  768,  776,
       795,  790,  796,  802,  804,  805,  807,  808,  806,  809,
       811,  812,  813,  827,  816,  829,  823,  819,  830,  832,
-      839,  840, 7005,  836,  837,  851,  844,  853,  857,  854,
+      839,  840, 7019,  836,  837,  851,  844,  853,  857,  854,
       863,  846,  869,  867,  872,  873,  885,  907,  875,  880,
-      874,  876,  890, 7005,  893,  897,  931,  877,  900,  919,
+      874,  876,  890, 7019,  893,  897,  931,  877,  900,  919,
       914,  881,  905,  917,  916,  921,  935,  915,  922,  937,
 
       954,  952,  936,  939,  938,  955,  949,  967,  962,  965,
@@ -870,15 +870,15 @@ static yyconst flex_int16_t yy_base[3611] =
      1016, 1038, 1036, 1045, 1049, 1041, 1051, 1053, 1056, 1057,
      1058, 1059, 1069, 1064, 1065, 1067, 1070, 1072, 1073, 1078,
      1076, 1079, 1081, 1083, 1084, 1087, 1092, 1094, 1098, 1085,
-     1099, 1101, 7005, 1107, 7005, 1105, 1102, 1109, 1111, 1112,
-     1113, 1114, 1115, 7005, 1117, 1121, 1116, 1124, 1125, 1122,
+     1099, 1101, 7019, 1107, 7019, 1105, 1102, 1109, 1111, 1112,
+     1113, 1114, 1115, 7019, 1117, 1121, 1116, 1124, 1125, 1122,
      1146, 1142, 1129, 1141, 1145, 1144, 1150, 1151, 1159, 1154,
 
      1161, 1162, 1155, 1163, 1157, 1166, 1128, 1167, 1170, 1171,
-     1173, 1175, 1177, 1195, 7005, 1178, 1181, 1182, 1184, 1186,
+     1173, 1175, 1177, 1195, 7019, 1178, 1181, 1182, 1184, 1186,
      1199, 1191, 1206, 1208, 1212, 1218, 1200, 1183, 1226, 1222,
      1224, 1225, 1229, 1230, 1232, 1234, 1235, 1238, 1239, 1241,
-     1244, 1242, 1246, 1249, 1248, 1247, 1255, 1258, 7005, 1260,
+     1244, 1242, 1246, 1249, 1248, 1247, 1255, 1258, 7019, 1260,
      1263, 1271, 1278, 1262, 1265, 1273, 1276, 1279, 1277, 1281,
      1283, 1282, 1286, 1289, 1288, 1299, 1291, 1304, 1300, 1302,
      1301, 1306, 1308, 1311, 1307, 1309, 1328, 1317, 1319, 1332,
@@ -887,7 +887,7 @@ static yyconst flex_int16_t yy_base[3611] =
 
      1364, 1366, 1370, 1372, 1374, 1375, 1380, 1379, 1377, 1381,
      1392, 1390, 1388, 1397, 1394, 1403, 1399, 1391, 1406, 1410,
-     1413, 1414, 7005, 1422, 1419, 1418, 1420, 1425, 1423, 1431,
+     1413, 1414, 7019, 1422, 1419, 1418, 1420, 1425, 1423, 1431,
      1432, 1433, 1434, 1437, 1435, 1438, 1443, 1444, 1445, 1439,
      1447, 1452, 1454, 1455, 1456, 1465, 1472, 1471, 1473, 1457,
      1467, 1476, 1477, 1479, 1486, 1483, 1491, 1484, 1489, 1492,
@@ -900,21 +900,21 @@ static yyconst flex_int16_t yy_base[3611] =
      1599, 1595, 1606, 1614, 1608, 1596, 1616, 1617, 1619, 1620,
      1621, 1625, 1623, 1628, 1632, 1626, 1629, 1637, 1635, 1641,
      1643, 1644, 1645, 1586, 1655, 1646, 1656, 1657, 1660, 1662,
-     1663, 1665, 1647, 1667, 1672, 1670, 1675, 1676, 7005, 1664,
+     1663, 1665, 1647, 1667, 1672, 1670, 1675, 1676, 7019, 1664,
      1688, 1677, 1686, 1684, 1687, 1689, 1698, 1691, 1693, 1695,
-     1694, 1701, 1722, 7005, 1702, 7005, 7005,  848, 7005, 7005,
-     1705, 1703, 7005, 1704, 1710, 1706, 1720, 1725, 1732, 1737,
+     1694, 1701, 1722, 7019, 1702, 7019, 7019,  848, 7019, 7019,
+     1705, 1703, 7019, 1704, 1710, 1706, 1720, 1725, 1732, 1737,
      1728, 1730, 1735, 1723, 1746, 1750, 1745, 1753, 1755, 1756,
      1759, 1747, 1760, 1761, 1767, 1770, 1772, 1773, 1708, 1783,
 
      1778, 1788, 1779, 1790, 1791, 1796, 1781, 1797, 1800, 1803,
      1804, 1793, 1806, 1807, 1809, 1811, 1813, 1808, 1815, 1817,
-     1820, 1821, 1822, 1830, 1826, 1835, 1842, 7005, 1832, 1845,
+     1820, 1821, 1822, 1830, 1826, 1835, 1842, 7019, 1832, 1845,
      1840, 1849, 1846, 1853, 1852, 1848, 1850, 1857, 1861, 1862,
      1863, 1864, 1867, 1865, 1866, 1873, 1868, 1875, 1876, 1878,
-     1880, 1883, 1882, 7005, 1888, 1890, 1891, 1893, 1894, 1892,
+     1880, 1883, 1882, 7019, 1888, 1890, 1891, 1893, 1894, 1892,
      1900, 1896, 1902, 1904, 1906, 1917, 1907, 1908, 1914, 1912,
-     1923, 1918, 1920, 1922, 7005, 1924, 1935, 1928, 1936, 1930,
+     1923, 1918, 1920, 1922, 7019, 1924, 1935, 1928, 1936, 1930,
      1937, 1939, 1940, 1943, 1944, 1945, 1946, 1947, 1948, 1958,
      1955, 1954, 1956, 1960, 1961, 1970, 1969, 1971, 1973, 1981,
 
@@ -922,704 +922,706 @@ static yyconst flex_int16_t yy_base[3611] =
      1996, 2003, 1998, 2005, 2000, 2001, 2019, 2022, 2020, 2006,
      2017, 2018, 2009, 2026, 2034, 2038, 2033, 2031, 2035, 2045,
      2040, 2042, 2043, 2046, 2047, 2058, 2044, 2062, 2053, 2055,
-     2056, 2064, 2067, 7005, 2068, 2070, 7005, 2072, 2071, 2073,
+     2056, 2064, 2067, 7019, 2068, 2070, 7019, 2072, 2071, 2073,
      2095, 2074, 2078, 2081, 2080, 2083, 2089, 2087, 2099, 2105,
      2101, 2118, 2088, 2107, 2119, 2109, 2122, 2114, 2120, 2128,
      2129, 2130, 2131, 2133, 2139, 2136, 2149, 2152, 2148, 2156,
      2159, 2132, 2155, 2157, 2176, 2158, 2160, 2164, 2161, 2162,
      2166, 2172, 2167, 2179, 2168, 2169, 2181, 2191, 2189, 2186,
 
-     2192, 2199, 2200, 2201, 2204, 2205, 2206, 7005, 2213, 2208,
-     2212, 2216, 2090, 2220, 2217, 2223, 7005, 2224, 2225, 2227,
+     2192, 2199, 2200, 2201, 2204, 2205, 2206, 7019, 2213, 2208,
+     2212, 2216, 2090, 2220, 2217, 2223, 7019, 2224, 2225, 2227,
      2235, 2228, 2230, 2236, 2232, 2239, 2238, 2244, 2245, 2246,
-     2251, 2247, 2265, 7005, 2250, 7005, 2248, 2240, 2263, 2261,
-     2267, 2269, 2270, 2271, 2272, 7005, 7005, 2273, 2274, 2288,
-     2290, 2292, 2282, 2279, 2293, 7005, 2295, 2302, 7005, 2299,
+     2251, 2247, 2265, 7019, 2250, 7019, 2248, 2240, 2263, 2261,
+     2267, 2269, 2270, 2271, 2272, 7019, 7019, 2273, 2274, 2288,
+     2290, 2292, 2282, 2279, 2293, 7019, 2295, 2302, 7019, 2299,
      2304, 2298, 2297, 2305, 2308, 2309, 2310, 2319, 2314, 2324,
-     2315, 2323, 2327, 7005, 2331, 2333, 2316, 2335, 2338, 2329,
-     2339, 2342, 2344, 2346, 7005, 2350, 2351, 2353, 2360, 2362,
+     2315, 2323, 2327, 7019, 2331, 2333, 2316, 2335, 2338, 2329,
+     2339, 2342, 2344, 2346, 7019, 2350, 2351, 2353, 2360, 2362,
      2355, 2352, 2363, 2368, 2357, 2365, 2371, 2373, 2372, 2380,
 
-     2383, 2387, 2388, 2389, 2392, 2390, 2402, 7005, 2398, 2379,
+     2383, 2387, 2388, 2389, 2392, 2390, 2402, 7019, 2398, 2379,
      2399, 2406, 2404, 2408, 2401, 2405, 2411, 2412, 2413, 2415,
      2417, 2422, 2421, 2423, 2424, 2425, 2434, 2435, 2427, 2438,
      2440, 2431, 2437, 2445, 2446, 2382, 2447, 2449, 2448, 2452,
-     7005, 2453, 2455, 2460, 2456, 2466, 2459,  171, 2462, 2463,
+     7019, 2453, 2455, 2460, 2456, 2466, 2459,  171, 2462, 2463,
      2469, 2470, 2473, 2484, 2474, 2486, 2491, 2487, 2488, 2490,
-     2495, 2496, 2497, 2499, 2498, 2489, 2502, 2501, 2505, 7005,
-     2507, 2512, 2514, 2515, 2517, 2518, 2520, 7005, 2527, 2521,
+     2495, 2496, 2497, 2499, 2498, 2489, 2502, 2501, 2505, 7019,
+     2507, 2512, 2514, 2515, 2517, 2518, 2520, 7019, 2527, 2521,
      2528, 2541, 2535, 2529, 2544, 2537, 2545, 2546, 2548, 2549,
-     2550, 2557, 2554, 2552, 2558, 2560, 7005, 2565, 2567, 2570,
+     2550, 2557, 2554, 2552, 2558, 2560, 7019, 2565, 2567, 2570,
 
      2561, 2571, 2573, 2574, 2578, 2580, 2582, 2584, 2585, 2590,
      2586, 2588, 2589, 2591, 2599, 2602, 2612, 2594, 2603, 2604,
-     2611, 2608, 2616, 2615, 2618, 2620, 2625, 2621, 7005, 2630,
+     2611, 2608, 2616, 2615, 2618, 2620, 2625, 2621, 7019, 2630,
      2622, 2631, 2632, 2629, 2636, 2633, 2639, 2648, 2644, 2646,
      2653, 2654, 2667, 2656, 2650, 2664, 2661, 2665, 2673, 2677,
      2674, 2678, 2684, 2681, 2687, 2689, 2691, 2695, 2699, 2696,
      2697, 2698, 2700, 2701, 2710, 2712, 2715, 2718, 2708, 2716,
-     2723, 2724, 2726, 2742, 2733, 7005, 2731, 2737, 2729, 2741,
+     2723, 2724, 2726, 2742, 2733, 7019, 2731, 2737, 2729, 2741,
      2749, 2745, 2746, 2751, 2753, 2755, 2757, 2758, 2759, 2766,
      2761, 2763, 2770, 2765, 2769, 2771, 2772, 2780, 2782, 2783,
 
-     2784, 2791, 2786, 2793, 2707, 7005, 2794, 2798, 2788, 2795,
+     2784, 2791, 2786, 2793, 2707, 7019, 2794, 2798, 2788, 2795,
      2806, 2796, 2810, 2811, 2813, 2799, 2802, 2814, 2822, 2817,
-     2815, 2824, 2819, 2831, 2828, 2829, 2834, 2826, 7005, 2840,
+     2815, 2824, 2819, 2831, 2828, 2829, 2834, 2826, 7019, 2840,
      2830, 2841, 2842, 2846, 2848, 2849, 2850, 2856, 2858, 2851,
-     2861, 2862, 2864, 2865, 2868, 7005, 2873, 2875, 2871, 2874,
-     2883, 2878, 2882, 2884, 2886, 2888, 7005, 2889, 2891, 2890,
-     2892, 2893, 2896, 2903, 2904, 2899, 7005, 2912, 2902, 2910,
+     2861, 2862, 2864, 2865, 2868, 7019, 2873, 2875, 2871, 2874,
+     2883, 2878, 2882, 2884, 2886, 2888, 7019, 2889, 2891, 2890,
+     2892, 2893, 2896, 2903, 2904, 2899, 7019, 2912, 2902, 2910,
      2911, 2914, 2915, 2917, 2920, 2918, 2923, 2924, 2927, 2934,
-     2928, 2936, 7005, 2925, 2946, 2937, 2943, 2939, 2949, 2950,
-     2953, 2954, 2957, 2956, 2960, 7005, 2967, 2969, 2964, 2978,
+     2928, 2936, 7019, 2925, 2946, 2937, 2943, 2939, 2949, 2950,
+     2953, 2954, 2957, 2956, 2960, 7019, 2967, 2969, 2964, 2978,
 
      2970, 2976, 2979, 2980, 2981, 2982, 2983, 2984, 2988, 2990,
-     7005, 2991, 2994, 2995, 2998, 2992, 3000, 3003, 3014, 3007,
+     7019, 2991, 2994, 2995, 2998, 2992, 3000, 3003, 3014, 3007,
      3009, 3011, 3006, 3016, 3017, 3015, 3021, 3028, 3024, 3023,
      3027, 3033, 3036, 3038, 3040, 3039, 3043, 3051, 3052, 3047,
      3054, 3057, 3058, 3050, 3060, 3062, 3069, 3071, 3074, 3072,
-     3075, 7005, 3078, 3079, 3080, 3070, 3082, 3084, 3085, 3086,
+     3075, 7019, 3078, 3079, 3080, 3070, 3082, 3084, 3085, 3086,
      3090, 3087, 3095, 3092, 3096, 3099, 3112, 3114, 3101, 3104,
      3109, 3115, 3116, 3117, 3119, 3120, 3123, 3130, 3126, 3127,
      3129, 3139, 3132, 3136, 3143, 3135, 3144, 3145, 3146, 3148,
      3152, 3149, 3153, 3156, 3158, 3150, 3159, 3160, 3174, 3176,
 
-     3177, 3179, 3171, 3180, 3181, 3185, 7005, 3188, 3190, 3186,
+     3177, 3179, 3171, 3180, 3181, 3185, 7019, 3188, 3190, 3186,
      3192, 3193, 3197, 3198, 3205, 3200, 3207, 3208, 3211, 3210,
-     3213, 3218, 3219, 3221, 3222, 3229, 3225, 7005, 3226, 7005,
-     3227, 3228, 3231, 3240, 3235, 7005, 3246, 7005, 3236, 3250,
-     3241, 3243, 3247, 7005, 3251, 3252, 3256, 3253, 3258, 3260,
+     3213, 3218, 3219, 3221, 3222, 3229, 3225, 7019, 3226, 7019,
+     3227, 3228, 3231, 3240, 3235, 7019, 3246, 7019, 3236, 3250,
+     3241, 3243, 3247, 7019, 3251, 3252, 3256, 3253, 3258, 3260,
      3264, 3265, 3266, 3267, 3268, 3275, 3270, 3274, 3277, 3281,
      3280, 3284, 3287, 3289, 3290, 3292, 3291, 3294, 3298, 3299,
-     3300, 3307, 3309, 3310, 3311, 3312, 3313, 7005, 3317, 3320,
+     3300, 3307, 3309, 3310, 3311, 3312, 3313, 7019, 3317, 3320,
      3314, 3325, 3322, 3324, 3326, 3332, 3333, 3334, 3335, 3339,
      3337, 3341, 3346, 3349, 3343, 3350, 3353, 3360, 3362, 3354,
 
-     3369, 7005, 3364, 3367, 3368, 3371, 7005, 3375, 3372, 3381,
+     3369, 7019, 3364, 3367, 3368, 3371, 7019, 3375, 3372, 3381,
      3383, 3376, 3373, 3379, 3385, 3392, 3386, 3389, 3395, 3399,
-     3403, 3406, 3407, 7005, 3400, 3408, 3398, 3416, 3421, 3412,
+     3403, 3406, 3407, 7019, 3400, 3408, 3398, 3416, 3421, 3412,
      3424, 3428, 3425, 3431, 3433, 3435, 3437, 3414, 3438, 3439,
      3440, 3441, 3449, 3451, 3452, 3448, 3461, 3447, 3454, 3463,
      3464, 3450, 3457, 3465, 3466, 3467, 3471, 3473, 3472, 3474,
-     3475, 3476, 3482, 3488, 7005, 3480, 3491, 3483, 3500, 3489,
-     3497, 3498, 3493, 3502, 7005, 3505, 3506, 3510, 3508, 3511,
-     3514, 3516, 3517, 3519, 3522, 3521, 3525, 3533, 3524, 7005,
-     3528, 7005, 3527, 3535, 3547, 3550, 3539, 3544, 3553, 3555,
+     3475, 3476, 3482, 3488, 7019, 3480, 3491, 3483, 3500, 3489,
+     3497, 3498, 3493, 3502, 7019, 3505, 3506, 3510, 3508, 3511,
+     3514, 3516, 3517, 3519, 3522, 3521, 3525, 3533, 3524, 7019,
+     3528, 7019, 3527, 3535, 3547, 3550, 3539, 3544, 3553, 3555,
 
      3557, 3558, 3559, 3560, 3561, 3565, 3567, 3569, 3568, 3573,
      3571, 3581, 3589, 3572, 3574, 3586, 3590, 3591, 3576, 3601,
-     3593, 3597, 7005, 7005, 3596, 3602, 3603, 3606, 3607, 3610,
-     3612, 3614, 3619, 3617, 3618, 3625, 3634, 7005, 3630, 3631,
+     3593, 3597, 7019, 7019, 3596, 3602, 3603, 3606, 3607, 3610,
+     3612, 3614, 3619, 3617, 3618, 3625, 3634, 7019, 3630, 3631,
      3629, 3632, 3636, 3647, 3638, 3649, 3658, 3640, 3653, 3660,
-     3655, 7005, 3642, 3657, 3665, 3663, 3666, 3670, 7005, 3672,
-     7005, 3668, 3673, 3674, 3677, 3678, 3679, 3681, 3682, 3684,
+     3655, 7019, 3642, 3657, 3665, 3663, 3666, 3670, 7019, 3672,
+     7019, 3668, 3673, 3674, 3677, 3678, 3679, 3681, 3682, 3684,
      3686, 3689, 3696, 3704, 3705, 3706, 3701, 3708, 3690, 3702,
-     3711, 3713, 3715, 3722, 3718, 3719, 3721, 7005, 3724, 3725,
-     3727, 3729, 3726, 3732, 3733, 3741, 3736, 7005, 3742, 3743,
+     3711, 3713, 3715, 3722, 3718, 3719, 3721, 7019, 3724, 3725,
+     3727, 3729, 3726, 3732, 3733, 3741, 3736, 7019, 3742, 3743,
 
      3744, 3748, 3749, 3755, 3751, 3756, 3757, 3762, 3758, 3766,
-     3763, 3765, 7005, 3767, 3769, 3780, 3771, 3778, 3779, 3782,
-     3784, 3791, 7005, 3788, 3792, 3800, 3798, 3795, 3802, 3803,
+     3763, 3765, 7019, 3767, 3769, 3780, 3771, 3778, 3779, 3782,
+     3784, 3791, 7019, 3788, 3792, 3800, 3798, 3795, 3802, 3803,
      3799, 3805, 3808, 3810, 3809, 3811, 3812, 3813, 3815, 3817,
-     3820, 3818, 3831, 3832, 3824, 3834, 3841, 3823, 7005, 3840,
+     3820, 3818, 3831, 3832, 3824, 3834, 3841, 3823, 7019, 3840,
      3845, 3846, 3847, 3848, 3849, 3853, 3854, 3858, 3860, 3850,
-     3862, 3871, 3852, 3866, 3874, 3876, 3877, 3884, 3879, 7005,
+     3862, 3871, 3852, 3866, 3874, 3876, 3877, 3884, 3879, 7019,
      3886, 3883, 3891, 3888, 3889, 3894, 3899, 3890, 3900, 3903,
      3892, 3896, 3904, 3906, 3912, 3915, 3922, 3918, 3908, 3921,
-     3923, 3925, 3924, 7005, 3935, 3926, 3927, 3936, 3941, 3933,
+     3923, 3925, 3924, 7019, 3935, 3926, 3927, 3936, 3941, 3933,
 
      3951, 3946, 3947, 3949, 3954, 3950, 3956, 3958, 3959, 3960,
-     3963, 3964, 7005, 7005, 3966, 3968, 3971, 7005, 3973, 3969,
+     3963, 3964, 7019, 7019, 3966, 3968, 3971, 7019, 3973, 3969,
      3983, 3972, 3975, 3979, 3986, 3985, 3987, 3989, 3994, 3991,
-     3997, 7005, 4004, 4002, 4005, 4003, 4009, 4012, 4008, 7005,
+     3997, 7019, 4004, 4002, 4005, 4003, 4009, 4012, 4008, 7019,
      4011, 4020, 4019, 4021, 4022, 4024, 4027, 4025, 4029, 4032,
-     4033, 4034, 4036, 4045, 4048, 4038, 4040, 4043, 7005, 4049,
-     4050, 4052, 4054, 4056, 4059, 4061, 7005, 4062, 4064, 4065,
+     4033, 4034, 4036, 4045, 4048, 4038, 4040, 4043, 7019, 4049,
+     4050, 4052, 4054, 4056, 4059, 4061, 7019, 4062, 4064, 4065,
      4067, 4070, 4075, 4082, 4077, 4084, 4071, 4085, 4087, 4089,
      4090, 4091, 4095, 4102, 4098, 4097, 4100, 4101, 4104, 4107,
-     4109, 7005, 4117, 4118, 4119, 4120, 4122, 7005, 4124, 4133,
+     4109, 7019, 4117, 4118, 4119, 4120, 4122, 7019, 4124, 4133,
 
-     4136, 7005, 4137, 4128, 4135, 4138, 4147, 7005, 4143, 4142,
+     4136, 7019, 4137, 4128, 4135, 4138, 4147, 7019, 4143, 4142,
      4144, 4148, 4145, 4157, 4152, 4159, 4161, 4158, 4162, 4163,
-     4164, 7005, 4166, 4165, 4167, 7005, 4180, 4185, 4188, 4190,
-     4171, 4175, 4173, 4192, 4193, 4194, 7005, 4195, 7005, 4198,
-     4196, 4204, 7005, 4202, 4206, 4207, 4210, 4211, 4216, 4217,
+     4164, 7019, 4166, 4165, 4167, 7019, 4180, 4185, 4188, 4190,
+     4171, 4175, 4173, 4192, 4193, 4194, 7019, 4195, 7019, 4198,
+     4196, 4204, 7019, 4202, 4206, 4207, 4210, 4211, 4216, 4217,
      4223, 4225, 4213, 4219, 4227, 4215, 4231, 4232, 4236, 4229,
-     4239, 4238, 4240, 7005, 4241, 4243, 4246, 4249, 4244, 4250,
-     4257, 4259, 4252, 4260, 4262, 7005, 7005, 4268, 7005, 4269,
-     4263, 4270, 4274, 7005, 4276, 4278, 4283, 4280, 4281, 4285,
-     4284, 4289, 4293, 7005, 4295, 4298, 7005, 4296, 4300, 4309,
-
-     4304, 4305, 4307, 4308, 4310, 4313, 4314, 4315, 4320, 4316,
-     4321, 4317, 4323, 4334, 7005, 4324, 4325, 4330, 4346, 4337,
-     4339, 4347, 4349, 4341, 7005, 4351, 4358, 4352, 4357, 4364,
-     7005, 4363, 7005, 4365, 4366, 4367, 4374, 4368, 4384, 7005,
-     4380, 4377, 4386, 4369, 4388, 4390, 4389, 4396, 4381, 4397,
-     4398, 4406, 4402, 4403, 4405, 4410, 4411, 7005, 4408, 4412,
-     4414, 4420, 4422, 4423, 4424, 4431, 4429, 4428, 4432, 4435,
-     4437, 4440, 4441, 4445, 4439, 4449, 4447, 7005, 4453, 4455,
-     4456, 4459, 4469, 4460, 4461, 4462, 7005, 4466, 4471, 4477,
-     7005, 4473, 4475, 4479, 4484, 4481, 4485, 4487, 4490, 4489,
-
-     4493, 4494, 4491, 7005, 4492, 4498, 4497, 4508, 4511, 4512,
-     4500, 7005, 7005, 4519, 7005, 4520, 4501, 4515, 4522, 4502,
-     4523, 4529, 4533, 4535, 4531, 4536, 4537, 4539, 4543, 7005,
-     4545, 4552, 4547, 4554, 4557, 4565, 4558, 4560, 4550, 7005,
-     7005, 4563, 4566, 4571, 4573, 4574, 4576, 4577, 4584, 4582,
-     4585, 4590, 4591, 4599, 7005, 4579, 4594, 4597, 4598, 7005,
-     4600, 4602, 4603, 4604, 4605, 4606, 4611, 4608, 4612, 4609,
-     4616, 4629, 4620, 4632, 4621, 4622, 4623, 4630, 4634, 4638,
-     4636, 4640, 4645, 7005, 4646, 4647, 4650, 4651, 4652, 4655,
-     4657, 4656, 4659, 4660, 4667, 7005, 4663, 7005, 4672, 4668,
-
-     4674, 4662, 4673, 4684, 4686, 4687, 4688, 4689, 4692, 4694,
-     4697, 4698, 4707, 4699, 4702, 4708, 4710, 4704, 4718, 4720,
-     4721, 7005, 4722, 4712, 4723, 4724, 4729, 4731, 4725, 4734,
-     4735, 4738, 4739, 4740, 4742, 4747, 4748, 4749, 4750, 4751,
-     4752, 7005, 4755, 4757, 4759, 4764, 4761, 4768, 4766, 4774,
-     4769, 4776, 4780, 4781, 4782, 7005, 4783, 4786, 4788, 7005,
-     4789, 4791, 4790, 4792, 4793, 4795, 4800, 4803, 4801, 4802,
-     7005, 4811, 4804, 4814, 4812, 4815, 4818, 4820, 4822, 4827,
-     4823, 4829, 4834, 7005, 4844, 4830, 4840, 4841, 4825, 4843,
-     4839, 4853, 4847, 7005, 4857, 4859, 4861, 4855, 4869, 4871,
-
-     4851, 4867, 4874, 4875, 4876, 4877, 4878, 4883, 4879, 4884,
-     4885, 4887, 4888, 4889, 4898, 4901, 4900, 7005, 4890, 7005,
-     4905, 4906, 4907, 4917, 4912, 4909, 4919, 4922, 4914, 7005,
-     4916, 4923, 4929, 4926, 4924, 7005, 4930, 4931, 4935, 4937,
-     7005, 4940, 4946, 4938, 4944, 4953, 4954, 7005, 4960, 4945,
-     4957, 4967, 4969, 4964, 4966, 4968, 4970, 4972, 4974, 4975,
-     4976, 4985, 4978, 4981, 7005, 4983, 4990, 4996, 4997, 4998,
-     4980, 4991, 4999, 5001, 5007, 5004, 7005, 5008, 5009, 5010,
-     5011, 5012, 5014, 5015, 5016, 5028, 5027, 5023, 5020, 5025,
-     5032, 5034, 5036, 5041, 7005, 5037, 5042, 5043, 5052, 5045,
-
-     5054, 7005, 5050, 7005, 5047, 5062, 5064, 5065, 5055, 5069,
-     7005, 7005, 5071, 5066, 5072, 5074, 5076, 7005, 7005, 5078,
-     7005, 5079, 7005, 5080, 5082, 7005, 7005, 5083, 5086, 5087,
-     5090, 5091, 5093, 7005, 5100, 7005, 5107, 5089, 5102, 5104,
-     5105, 5106, 7005, 5110, 5113, 5114, 5118, 5122, 7005, 5115,
-     5117, 5125, 5128, 5132, 7005, 5134, 5135, 5131, 5136, 7005,
-     5139, 5142, 5143, 5137, 5144, 5145, 5151, 5157, 5149, 5152,
-     5160, 5162, 5161, 5164, 5165, 5169, 5174, 5176, 5178, 5171,
-     5179, 5180, 5186, 5188, 5190, 5182, 5192, 5193, 5195, 5196,
-     5198, 5200, 5201, 5203, 5207, 5208, 5210, 5204, 5211, 5213,
-
-     5221, 5222, 5223, 5224, 5229, 5226, 5231, 5232, 5233, 5234,
-     5236, 5237, 5239, 5238, 5242, 5245, 5248, 5249, 5250, 7005,
-     5252, 5255, 5256, 5259, 5266, 5263, 5267, 5274, 5276, 5281,
-     7005, 5283, 7005, 5285, 5269, 5278, 5271, 5288, 7005, 5291,
-     5292, 5293, 5294, 5295, 5296, 5297, 5298, 5301, 5302, 5305,
-     7005, 5308, 5322, 5309, 5307, 5317, 5325, 7005, 5327, 5331,
-     5328, 5332, 5333, 5334, 5337, 5335, 5338, 5339, 5340, 5342,
-     5344, 5348, 5345, 5354, 5357, 7005, 5361, 5367, 5364, 5362,
-     5368, 5369, 5370, 5371, 5373, 5374, 5375, 5377, 5379, 5387,
-     5389, 5397, 7005, 5390, 7005, 5392, 5394, 5398, 5399, 5400,
-
-     5402, 5403, 5406, 7005, 7005, 5404, 5408, 5411, 5416, 5412,
-     5417, 5421, 5418, 5422, 5428, 7005, 5430, 5433, 5434, 5441,
-     5300, 7005, 5431, 5436, 5442, 5444, 7005, 5447, 5448, 5449,
-     5450, 5455, 5452, 5461, 5458, 5464, 5465, 5466, 5467, 5469,
-     7005, 7005, 7005, 7005, 5474, 5470, 5477, 5472, 5480, 5482,
-     5479, 5489, 5490, 5484, 5486, 5494, 7005, 5497, 7005, 7005,
-     5500, 7005, 5502, 5501, 5503, 5504, 5491, 5511, 5513, 7005,
-     5514, 7005, 5517, 5518, 5516, 5525, 5527, 5528, 5519, 5535,
-     5530, 5536, 5532, 5539, 5546, 5542, 5543, 5545, 5548, 5552,
-     5555, 7005, 7005, 5549, 5559, 5561, 5569, 5565, 5566, 5567,
-
-     5578, 5573, 5574, 5575, 5576, 5580, 5582, 5589, 5592, 5585,
-     5587, 5594, 7005, 5595, 5596, 5597, 7005, 5598, 7005, 5604,
-     5606, 5607, 5605, 5608, 5613, 5615, 5616, 5618, 5614, 7005,
-     7005, 5620, 5631, 5626, 7005, 7005, 5628, 5629, 5633, 5635,
-     5630, 5636, 5639, 5641, 5642, 5644, 5640, 7005, 5645, 7005,
-     5646, 5650, 5662, 5651, 5664, 5669, 5653, 5673, 5675, 5670,
-     5665, 5672, 7005, 5679, 5668, 7005, 5686, 5682, 5683, 5684,
-     5692, 5689, 7005, 5693, 5695, 5697, 5700, 7005, 5702, 5703,
-     5705, 5706, 7005, 5709, 7005, 5711, 5712, 5714, 5722, 5718,
-     7005, 5719, 5723, 7005, 5728, 5733, 5735, 5737, 5725, 5729,
-
-     7005, 5744, 5736, 7005, 5741, 5746, 5747, 5750, 5751, 5753,
-     5755, 5756, 5757, 5764, 5760, 5763, 7005, 7005, 5775, 5765,
-      135, 5778, 5762, 5773, 5776, 5780, 5787, 5779, 5784, 5783,
-     7005, 7005, 5789, 7005, 5790, 5792, 7005, 5791, 5797, 5801,
-     5803, 5805, 5799, 5806, 5808, 5812, 5809, 5824, 5814, 5813,
-     5807, 7005, 5831, 5839, 5818, 5841, 5842, 5844, 5846, 5848,
-     5850, 5836, 5829, 5853, 5854, 5855, 5856, 5857, 5858, 5859,
-     5862, 5864, 7005, 5866, 5871, 5872, 5877, 5860, 7005, 5886,
-     5867, 5888, 5889, 7005, 5891, 5892, 5893, 5895, 5896, 7005,
-     5879, 5899, 5907, 5908, 5900, 5903, 5910, 5911, 5919, 7005,
-
-     5914, 5915, 5916, 7005, 7005, 7005, 5923, 5930, 5917, 7005,
-     5933, 5925, 5934, 5935, 7005, 5937, 5938, 5940, 7005, 7005,
-     7005, 5941, 5943, 5942, 7005, 5944, 5955, 7005, 5945, 7005,
-     5946, 7005, 5956, 5958, 5968, 5962, 7005, 5960, 5970, 5972,
-     5973, 7005, 5976, 5979, 5981, 5982, 5984, 5987, 5985, 7005,
-     5994, 5992, 5993, 5996, 5989, 5999, 6000, 6003, 6001, 6015,
-     6002, 6013, 7005, 5950, 6005, 6017, 6023, 6014, 6016, 6020,
-     7005, 6018, 7005, 6026, 7005, 6028, 6029, 6030, 6032, 6037,
-     6034, 6039, 6040, 6044, 6045, 6051, 6047, 6053, 6054, 6060,
-     6055, 7005, 7005, 6063, 6061, 6069, 7005, 6064, 7005, 6073,
-
-     7005, 6066, 6070, 6076, 6075, 6078, 7005, 7005, 6088, 6077,
-     6084, 6095, 6079, 6090, 7005, 6098, 6092, 6094, 6101, 7005,
-     6110, 7005, 6096, 6111, 6103, 7005, 6107, 6115, 6118, 6112,
-     6119, 6121, 6122, 6123, 6124, 6131, 6126, 6130, 6128, 6135,
-     6136, 6138, 6143, 6149, 7005, 7005, 7005, 6147, 6137, 6158,
-     6154, 6160, 6161, 6156, 7005, 6162, 6165, 6166, 6168, 6175,
-     6172, 6177, 7005, 6170, 6173, 6178, 6179, 6181, 6183, 6184,
-     6185, 7005, 6196, 6198, 6205, 6188, 6199, 6201, 6208, 6210,
-     6212, 6215, 6216, 6217, 6224, 6220, 7005, 6222, 6219, 7005,
-     6227, 7005, 6223, 7005, 6228, 6230, 6232, 6231, 6233, 7005,
-
-     6237, 6238, 6239, 6240, 6241, 6246, 6245, 6248, 7005, 6249,
-     6262, 6257, 6259, 6260, 7005, 7005, 6263, 6269, 7005, 6271,
-     6274, 6266, 6281, 6273, 6282, 6287, 6283, 7005, 6272, 6289,
-     6291, 6292, 6293, 6295, 6296, 7005, 6297, 6299, 6300, 6301,
-     7005, 6304, 6303, 6306, 6308, 6309, 7005, 6310, 6313, 6331,
-     6327, 7005, 6316, 6334, 6317, 7005, 7005, 7005, 6339, 6341,
-     6342, 7005, 7005, 7005, 7005, 6344, 6345, 6328, 6349, 7005,
-     6351, 7005, 6353, 6357, 6361, 6363, 6367, 6356, 7005, 6368,
-     6326, 6370, 6371, 6372, 7005, 7005, 6374, 6376, 6377, 6378,
-     6380, 6381, 7005, 7005, 6382, 6384, 6388, 6385, 6387, 7005,
-
-     6390, 6393, 6400, 6395, 6405, 6410, 6412, 6403, 6414, 6413,
-     6421, 6423, 6416, 6424, 6426, 6427, 6428, 6429, 6431, 6440,
-     6436, 6438, 6444, 6435, 6446, 7005, 7005, 6453, 7005, 6455,
-     6449, 7005, 6445, 7005, 6457, 6460, 6462, 6465, 7005, 6467,
-     6469, 6471, 6473, 6474, 7005, 6475, 6477, 6479, 6480, 6481,
-     6482, 7005, 6486, 6487, 6491, 6483, 6488, 6492, 6494, 6497,
-     7005, 6499, 6508, 7005, 7005, 6503, 6509, 6505, 6510, 6515,
-     7005, 6513, 6523, 6518, 6519, 6520, 6522, 6525, 7005, 6528,
-     6526, 7005, 7005, 6538, 6529, 7005, 7005, 6527, 6530, 7005,
-     7005, 7005, 7005, 7005, 7005, 7005, 7005, 6543, 6546, 7005,
-
-     7005, 6545, 6537, 6552, 7005, 6555, 7005, 6547, 6556, 6557,
-     6559, 7005, 6560, 7005, 6562, 6564, 6563, 6567, 6566, 6571,
-     6573, 6576, 6578, 6577, 6580, 6582, 6583, 6587, 6584, 6588,
-     6598, 6591, 6601, 6594, 6602, 7005, 7005, 7005, 6590, 6606,
-     6612, 6608, 6616, 6618, 6621, 6623, 6613, 6624, 6625, 6629,
-     6630, 6627, 6631, 6639, 6636, 6637, 6638, 6641, 6642, 6648,
-     6654, 7005, 6656, 6645, 6651, 6658, 7005, 6659, 7005, 6661,
-     7005, 7005, 6664, 6665, 6667, 6668, 6677, 6678, 6669, 6673,
-     6676, 6680, 6682, 7005, 6689, 7005, 7005, 7005, 6684, 6690,
-     7005, 6692, 6693, 7005, 6691, 6694, 6696, 6700, 6701, 6698,
-
-     6702, 6703, 6719, 7005, 7005, 6704, 6709, 6712, 6721, 6723,
-     6722, 6725, 6729, 6730, 6732, 6733, 6742, 7005, 6739, 6740,
-     6744, 7005, 6746, 6741, 6747, 6748, 6749, 6757, 6753, 6756,
-     7005, 6758, 7005, 6762, 6764, 6765, 6755, 6763, 6766, 6777,
-     6775, 6771, 7005, 6781, 6785, 6783, 6787, 6789, 6791, 6792,
-     6793, 6795, 6798, 6804, 6801, 6808, 6809, 6805, 6813, 6810,
-     7005, 6820, 6811, 7005, 6817, 6821, 6814, 6823, 6827, 7005,
-     6832, 6825, 6834, 6835, 6838, 6839, 7005, 6841, 6848, 6843,
-     7005, 6849, 7005, 7005, 6851, 6845, 6852, 6858, 6860, 7005,
-     7005, 7005, 6885, 6892, 6899, 6906, 6913, 6920, 6927,   88,
-
-     6934, 6941, 6948, 6955, 6962, 6969, 6976, 6983, 6990, 6997
+     4239, 4238, 4240, 7019, 4241, 4243, 4246, 4249, 4244, 4250,
+     4257, 4259, 4252, 4260, 4262, 7019, 7019, 4268, 7019, 4269,
+     4263, 4270, 4274, 7019, 4276, 4278, 4283, 4280, 4281, 4285,
+     4284, 4289, 4293, 7019, 4295, 4298, 7019, 4296, 4300, 4309,
+
+     4304, 4305, 4307, 4308, 4310, 4313, 4315, 4320, 4321, 4316,
+     4323, 4317, 4324, 4338, 7019, 4325, 4326, 4330, 4347, 4334,
+     4341, 4348, 4350, 4353, 7019, 4354, 4356, 4360, 4362, 4363,
+     7019, 4365, 7019, 4364, 4366, 4368, 4369, 4372, 4383, 7019,
+     4379, 4376, 4385, 4386, 4387, 4393, 4389, 4396, 4388, 4397,
+     4398, 4405, 4402, 4400, 4404, 4409, 4411, 7019, 4410, 4414,
+     4421, 4422, 4424, 4417, 4425, 4433, 4426, 4434, 4430, 4438,
+     4440, 4437, 4441, 4443, 4447, 4450, 4451, 7019, 4453, 4452,
+     4458, 4459, 4468, 4463, 4465, 4466, 7019, 4470, 4471, 4472,
+     7019, 4473, 4479, 4481, 4484, 4485, 4487, 4488, 4491, 4489,
+
+     4494, 4495, 4492, 7019, 4500, 4501, 4496, 4493, 4504, 4502,
+     4515, 7019, 7019, 4517, 7019, 4518, 4519, 4520, 4521, 4522,
+     4525, 4527, 4528, 4530, 4531, 4532, 4540, 4538, 4541, 7019,
+     4545, 4552, 4548, 4556, 4559, 4563, 4558, 4560, 4562, 7019,
+     7019, 4566, 4571, 4567, 4574, 4577, 4569, 4575, 4585, 4583,
+     4589, 4592, 4594, 4601, 7019, 4580, 4587, 4596, 4598, 7019,
+     4602, 4603, 4605, 4604, 4606, 4612, 4609, 4613, 4610, 4614,
+     4617, 4620, 4622, 4621, 4623, 4629, 4631, 4632, 4634, 4635,
+     4638, 4639, 4643, 7019, 4646, 4645, 4647, 4648, 4650, 4652,
+     4656, 4658, 4659, 4660, 4668, 7019, 4663, 7019, 4661, 4669,
+
+     4680, 4670, 4665, 4688, 4677, 4689, 4684, 4690, 4691, 4693,
+     4694, 4699, 4700, 4704, 4696, 4707, 4708, 4712, 4710, 4716,
+     4718, 4721, 7019, 4723, 4724, 4725, 4727, 4730, 4732, 4733,
+     4735, 4736, 4738, 4740, 4741, 4743, 4748, 4749, 4750, 4751,
+     4753, 4756, 7019, 4757, 4761, 4758, 4765, 4766, 4769, 4770,
+     4778, 4771, 4780, 4773, 4782, 4783, 7019, 4786, 4788, 4790,
+     7019, 4791, 4793, 4794, 4795, 4796, 4799, 4802, 4804, 4803,
+     4805, 7019, 4813, 4806, 4815, 4814, 4816, 4819, 4823, 4824,
+     4829, 4827, 4831, 4839, 7019, 4841, 4832, 4840, 4843, 4846,
+     4847, 4849, 4851, 4852, 7019, 4853, 4861, 4862, 4854, 4874,
+
+     4879, 4855, 4865, 4881, 4872, 4882, 4863, 4883, 4886, 4864,
+     4885, 4890, 4891, 4892, 4893, 4903, 4904, 4902, 7019, 4895,
+     7019, 4905, 4908, 4909, 4918, 4913, 4911, 4923, 4916, 4919,
+     7019, 4926, 4927, 4929, 4930, 4931, 7019, 4932, 4933, 4935,
+     4934, 7019, 4948, 4947, 4936, 4953, 4938, 4954, 7019, 4958,
+     4959, 4961, 4969, 4970, 4967, 4972, 4960, 4977, 4968, 4973,
+     4975, 4981, 4985, 4983, 4984, 7019, 4986, 4988, 4993, 4995,
+     4996, 4998, 4999, 5002, 5005, 5004, 5006, 7019, 5010, 5011,
+     5012, 5013, 5014, 5016, 5017, 5018, 5027, 5024, 5025, 5029,
+     5034, 5035, 5036, 5038, 5040, 7019, 5043, 5042, 5044, 5051,
+
+     5052, 5048, 5060, 7019, 5057, 7019, 5050, 5067, 5069, 5070,
+     5061, 5074, 7019, 7019, 5076, 5071, 5077, 5079, 5081, 7019,
+     7019, 5083, 7019, 5084, 7019, 5085, 5088, 7019, 7019, 5086,
+     5092, 5093, 5095, 5096, 5098, 7019, 5106, 7019, 5109, 5107,
+     5110, 5108, 5094, 5112, 7019, 5113, 5119, 5121, 5123, 5126,
+     7019, 5120, 5128, 5136, 5131, 5137, 7019, 5139, 5140, 5141,
+     5144, 7019, 5145, 5148, 5150, 5151, 5154, 5153, 5156, 5157,
+     5158, 5164, 5165, 5168, 5167, 5170, 5171, 5175, 5180, 5182,
+     5184, 5185, 5186, 5188, 5191, 5194, 5198, 5189, 5196, 5200,
+     5202, 5203, 5205, 5207, 5208, 5210, 5214, 5215, 5218, 5211,
+
+     5225, 5219, 5220, 5228, 5229, 5230, 5235, 5236, 5238, 5239,
+     5241, 5242, 5243, 5244, 5246, 5251, 5247, 5256, 5254, 5260,
+     5262, 7019, 5248, 5252, 5264, 5269, 5270, 5271, 5273, 5280,
+     5282, 5285, 7019, 5288, 7019, 5290, 5283, 5292, 5293, 5294,
+     7019, 5295, 5296, 5297, 5298, 5299, 5300, 5302, 5305, 5306,
+     5310, 5316, 7019, 5307, 5322, 5313, 5323, 5326, 5330, 7019,
+     5331, 5333, 5334, 5336, 5337, 5339, 5338, 5341, 5342, 5347,
+     5343, 5344, 5349, 5357, 5350, 5358, 5361, 7019, 5365, 5369,
+     5372, 5371, 5373, 5375, 5374, 5378, 5377, 5379, 5383, 5380,
+     5381, 5385, 5396, 5401, 5398, 7019, 5388, 7019, 5402, 5404,
+
+     5405, 5406, 5408, 5409, 5410, 5412, 7019, 7019, 5415, 5416,
+     5418, 5420, 5422, 5424, 5428, 5425, 5429, 5439, 7019, 5432,
+     5440, 5441, 5449, 5438, 7019, 5450, 5433, 5452, 5455, 7019,
+     5456, 5457, 5458, 5459, 5464, 5461, 5470, 5471, 5473, 5467,
+     5474, 5475, 5478, 7019, 7019, 7019, 7019, 5484, 5479, 5488,
+     5481, 5489, 5490, 5491, 5496, 5497, 5493, 5498, 5499, 7019,
+     5508, 7019, 7019, 5504, 7019, 5510, 5511, 5512, 5513, 5516,
+     5519, 5522, 7019, 5523, 7019, 5524, 5526, 5527, 5533, 5537,
+     5534, 5540, 5544, 5541, 5545, 5546, 5547, 5555, 5551, 5552,
+     5554, 5557, 5561, 5567, 7019, 7019, 5558, 5573, 5574, 5576,
+
+     5563, 5578, 5579, 5586, 5581, 5582, 5588, 5584, 5590, 5589,
+     5600, 5601, 5591, 5592, 5603, 7019, 5605, 5606, 5613, 7019,
+     5607, 7019, 5609, 5615, 5617, 5608, 5618, 5621, 5623, 5624,
+     5627, 5628, 7019, 7019, 5629, 5640, 5635, 7019, 7019, 5637,
+     5638, 5639, 5642, 5644, 5645, 5646, 5648, 5649, 5651, 5654,
+     5650, 7019, 5655, 7019, 5660, 5663, 5672, 5662, 5674, 5679,
+     5675, 5682, 5678, 5681, 5683, 5685, 7019, 5686, 5684, 7019,
+     5694, 5696, 5698, 5691, 5701, 5692, 7019, 5703, 5706, 5710,
+     5712, 7019, 5714, 5715, 5716, 5717, 7019, 5723, 7019, 5718,
+     5720, 5727, 5734, 5729, 7019, 5730, 5731, 7019, 5736, 5743,
+
+     5745, 5737, 5746, 5747, 7019, 5749, 5751, 7019, 5752, 5754,
+     5755, 5758, 5761, 5763, 5764, 5765, 5766, 5773, 5771, 5774,
+     7019, 7019, 5781, 5779,  135, 5788, 5768, 5785, 5786, 5789,
+     5796, 5792, 5793, 5799, 7019, 7019, 5802, 7019, 5800, 5801,
+     7019, 5794, 5809, 5810, 5803, 5813, 5814, 5815, 5816, 5823,
+     5824, 5825, 5826, 5827, 5829, 7019, 5845, 5848, 5831, 5834,
+     5851, 5853, 5855, 5857, 5859, 5849, 5861, 5843, 5841, 5862,
+     5864, 5868, 5870, 5871, 5872, 5873, 5874, 7019, 5878, 5882,
+     5883, 5879, 5884, 7019, 5889, 5890, 5896, 5898, 7019, 5900,
+     5901, 5904, 5905, 5906, 7019, 5891, 5908, 5912, 5916, 5917,
+
+     5918, 5919, 5921, 5928, 7019, 5925, 5923, 5929, 7019, 7019,
+     7019, 5934, 5941, 5931, 7019, 5943, 5935, 5944, 5946, 7019,
+     5948, 5950, 5951, 7019, 7019, 7019, 5952, 5953, 5956, 7019,
+     5954, 5961, 7019, 5960, 7019, 5957, 7019, 5962, 5966, 5975,
+     5970, 7019, 5968, 5980, 5981, 5982, 7019, 5985, 5988, 5990,
+     5991, 5992, 5994, 5996, 7019, 6003, 5999, 6002, 6006, 5998,
+     6008, 6009, 6010, 6011, 6023, 6014, 6019, 7019, 6021, 6022,
+     6026, 6032, 6024, 6034, 6035, 7019, 6028, 7019, 6037, 7019,
+     6038, 6040, 6041, 6042, 6047, 6044, 6045, 6055, 6052, 6058,
+     6061, 6059, 6065, 6066, 6070, 6072, 6067, 7019, 7019, 6080,
+
+     6075, 6077, 7019, 6073, 7019, 6085, 7019, 6082, 6087, 6088,
+     6089, 6090, 7019, 7019, 6097, 6091, 6099, 6106, 6101, 6102,
+     7019, 6109, 6104, 6107, 6113, 7019, 6120, 7019, 6115, 6122,
+     6123, 7019, 6117, 6130, 6132, 6119, 6125, 6137, 6127, 6133,
+     6140, 6147, 6143, 6146, 6144, 6149, 6150, 6151, 6152, 6166,
+     7019, 7019, 7019, 6157, 6153, 6174, 6171, 6172, 6182, 6159,
+     7019, 6178, 6180, 6181, 6184, 6191, 6187, 6189, 7019, 6190,
+     6192, 6193, 6194, 6196, 6197, 6198, 6199, 7019, 6201, 6212,
+     6220, 6217, 6209, 6221, 6225, 6228, 6230, 6232, 6233, 6213,
+     6240, 6236, 7019, 7019, 6238, 6235, 7019, 6243, 7019, 6244,
+
+     7019, 6245, 6247, 6249, 6248, 6252, 7019, 6255, 6250, 6256,
+     6257, 6258, 6206, 6260, 6262, 7019, 6264, 6272, 6265, 6273,
+     6274, 7019, 7019, 6277, 6281, 7019, 6284, 6286, 6287, 6294,
+     6290, 6289, 6296, 6299, 7019, 6303, 6300, 6293, 6306, 6309,
+     6308, 6310, 7019, 6311, 6312, 6315, 6317, 7019, 6318, 6322,
+     6323, 6321, 6324, 7019, 6325, 6327, 6334, 6339, 7019, 6332,
+     6343, 6345, 7019, 7019, 7019, 6349, 6351, 6353, 7019, 7019,
+     7019, 7019, 6355, 6356, 6359, 6363, 7019, 6360, 7019, 6365,
+     6369, 6373, 6377, 6382, 6368, 7019, 6381, 6374, 6385, 6387,
+     6388, 7019, 7019, 6389, 6391, 6392, 6393, 6395, 6396, 7019,
+
+     7019, 6397, 6399, 6400, 6401, 6403, 7019, 6407, 6408, 6415,
+     6417, 6419, 6424, 6428, 6421, 6429, 6430, 6438, 6441, 6431,
+     6433, 6440, 6444, 6445, 6443, 6447, 6457, 6452, 6454, 6460,
+     6455, 6463, 7019, 7019, 6465, 7019, 6467, 6469, 7019, 6471,
+     7019, 6473, 6475, 6477, 6480, 7019, 6482, 6484, 6486, 6488,
+     6490, 7019, 6491, 6493, 6495, 6496, 6497, 6498, 7019, 6502,
+     6503, 6507, 6499, 6504, 6508, 6510, 6513, 7019, 6515, 6524,
+     7019, 7019, 6519, 6525, 6521, 6526, 6531, 7019, 6529, 6539,
+     6534, 6535, 6536, 6538, 6541, 7019, 6544, 6542, 7019, 7019,
+     6554, 6545, 7019, 7019, 6543, 6546, 7019, 7019, 7019, 7019,
+
+     7019, 7019, 7019, 7019, 6559, 6562, 7019, 7019, 6561, 6553,
+     6568, 7019, 6571, 7019, 6563, 6572, 6573, 6575, 7019, 6576,
+     7019, 6578, 6580, 6579, 6161, 6582, 6587, 6583, 6585, 6589,
+     6592, 6593, 6594, 6602, 6598, 6600, 6599, 6612, 6603, 6614,
+     6606, 6616, 7019, 7019, 7019, 6615, 6619, 6624, 6625, 6628,
+     6630, 6633, 6636, 6637, 6638, 6640, 6641, 6642, 6644, 6645,
+     6654, 6649, 6650, 6652, 6665, 6651, 6667, 6673, 7019, 6675,
+     6653, 6659, 6677, 7019, 6655, 7019, 6661, 7019, 7019, 6681,
+     6682, 6684, 6685, 6693, 6694, 6686, 6689, 6690, 6691, 6698,
+     7019, 6706, 7019, 7019, 7019, 6695, 6699, 7019, 6701, 6703,
+
+     7019, 6708, 6712, 6710, 6711, 6713, 6714, 6718, 6720, 6722,
+     7019, 7019, 6727, 6730, 6731, 6735, 6732, 6742, 6738, 6740,
+     6741, 6744, 6743, 6757, 7019, 6753, 6754, 6756, 7019, 6760,
+     6758, 6761, 6763, 6765, 6772, 6767, 6770, 7019, 6773, 7019,
+     6776, 6769, 6780, 6771, 6779, 6787, 6788, 6791, 6792, 7019,
+     6793, 6794, 6797, 6801, 6803, 6806, 6807, 6799, 6809, 6810,
+     6820, 6813, 6817, 6821, 6823, 6825, 6826, 7019, 6832, 6827,
+     7019, 6829, 6833, 6835, 6836, 6839, 7019, 6844, 6837, 6841,
+     6847, 6850, 6851, 7019, 6853, 6862, 6857, 7019, 6863, 7019,
+     7019, 6865, 6859, 6866, 6872, 6874, 7019, 7019, 7019, 6899,
+
+     6906, 6913, 6920, 6927, 6934, 6941,   88, 6948, 6955, 6962,
+     6969, 6976, 6983, 6990, 6997, 7004, 7011
     } ;
 
-static yyconst flex_int16_t yy_def[3611] =
+static yyconst flex_int16_t yy_def[3618] =
     {   0,
-     3592,    1, 3593, 3593, 3594, 3594, 3595, 3595, 3596, 3596,
-     3597, 3597, 3598, 3598, 3599, 3599, 3592, 3600, 3592, 3592,
-     3592, 3592, 3601, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3602, 3592, 3592, 3592,
-     3602, 3603, 3592, 3592, 3592, 3603, 3604, 3592, 3592, 3592,
-     3592, 3604, 3605, 3592, 3592, 3592, 3605, 3606, 3592, 3607,
-     3592, 3606, 3606, 3608, 3592, 3592, 3592, 3592, 3608, 3609,
-     3592, 3592, 3592, 3609, 3600, 3600, 3592, 3610, 3601, 3610,
-     3601, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3602,
-     3602, 3603, 3603, 3604, 3604, 3592, 3605, 3605, 3606, 3606,
-     3607, 3607, 3606, 3608, 3608, 3592, 3609, 3609, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3606, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3606, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3606, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3606, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3592, 3592, 3600, 3592, 3592,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3606, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3600, 3600, 3600, 3606, 3606, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3606, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3606, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3592, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-
-     3600, 3606, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3592, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3606,
-     3600, 3592, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3592, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3592, 3600, 3592, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3592, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3606, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3592, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3606, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3592, 3600, 3600, 3600, 3600, 3600, 3592, 3592, 3600,
-     3592, 3600, 3592, 3600, 3600, 3592, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3606, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3592, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3592, 3592, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3592, 3592,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3606,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3592, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3592, 3600, 3600, 3600, 3592, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3592, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3592, 3600, 3600,
-     3606, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3592, 3600, 3592, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-
-     3600, 3600, 3600, 3592, 3592, 3592, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3592, 3592,
-     3592, 3600, 3600, 3600, 3592, 3600, 3600, 3592, 3600, 3592,
-     3600, 3592, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3592, 3600, 3600, 3600, 3592, 3600, 3592, 3600,
-
-     3592, 3600, 3600, 3600, 3600, 3600, 3592, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3592,
-     3600, 3592, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3592, 3592, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3592,
-     3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3592,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3592, 3592, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3592, 3592, 3592, 3600, 3600,
-     3600, 3592, 3592, 3592, 3592, 3600, 3600, 3600, 3600, 3592,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3592, 3592, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3592, 3600, 3600, 3600, 3600, 3600, 3592,
-
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3592, 3600, 3592, 3600,
-     3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3592, 3592, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600,
-     3600, 3592, 3592, 3600, 3600, 3592, 3592, 3600, 3600, 3592,
-     3592, 3592, 3592, 3592, 3592, 3592, 3592, 3600, 3600, 3592,
-
-     3592, 3600, 3600, 3600, 3592, 3600, 3592, 3600, 3600, 3600,
-     3600, 3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3592, 3592, 3592, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3592, 3600, 3592, 3600,
-     3592, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3592, 3600, 3592, 3592, 3592, 3600, 3600,
-     3592, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600,
-
-     3600, 3600, 3600, 3592, 3592, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600,
-     3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600, 3600,
-     3592, 3600, 3600, 3592, 3600, 3600, 3600, 3600, 3600, 3592,
-     3600, 3600, 3600, 3600, 3600, 3600, 3592, 3600, 3600, 3600,
-     3592, 3600, 3592, 3592, 3600, 3600, 3600, 3600, 3600, 3592,
-     3592,    0, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592,
-
-     3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592
+     3599,    1, 3600, 3600, 3601, 3601, 3602, 3602, 3603, 3603,
+     3604, 3604, 3605, 3605, 3606, 3606, 3599, 3607, 3599, 3599,
+     3599, 3599, 3608, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3609, 3599, 3599, 3599,
+     3609, 3610, 3599, 3599, 3599, 3610, 3611, 3599, 3599, 3599,
+     3599, 3611, 3612, 3599, 3599, 3599, 3612, 3613, 3599, 3614,
+     3599, 3613, 3613, 3615, 3599, 3599, 3599, 3599, 3615, 3616,
+     3599, 3599, 3599, 3616, 3607, 3607, 3599, 3617, 3608, 3617,
+     3608, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3609,
+     3609, 3610, 3610, 3611, 3611, 3599, 3612, 3612, 3613, 3613,
+     3614, 3614, 3613, 3615, 3615, 3599, 3616, 3616, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3613, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3613, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3613, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3613, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3599, 3599, 3607, 3599, 3599,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3613, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3613, 3613, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3613, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3613, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3599, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+
+     3607, 3613, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3599, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3613,
+     3607, 3599, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3599, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3599, 3607, 3599, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3599, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3599, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3599, 3599, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3613, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3599, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3613, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3599, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3599, 3607, 3607, 3607, 3607, 3607, 3599,
+     3599, 3607, 3599, 3607, 3599, 3607, 3607, 3599, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3613, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3599, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3599, 3599, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3607, 3599, 3599, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3613, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3599, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3599,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3599, 3607, 3607, 3607, 3599, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3599, 3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3599, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3599, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3599, 3599, 3607, 3607, 3613, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3599, 3607, 3599, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3599, 3599,
+     3599, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3607, 3599, 3599, 3599, 3607, 3607, 3607, 3599,
+     3607, 3607, 3599, 3607, 3599, 3607, 3599, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3599, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3599, 3607,
+
+     3607, 3607, 3599, 3607, 3599, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3599, 3599, 3607, 3607, 3607, 3607, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3599, 3607, 3599, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3599, 3599, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3599, 3607, 3607, 3599, 3607, 3599, 3607,
+
+     3599, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3599, 3599, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3599, 3599, 3599, 3607, 3607, 3607, 3599, 3599,
+     3599, 3599, 3607, 3607, 3607, 3607, 3599, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3599, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+
+     3599, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3599, 3607, 3599, 3607, 3607, 3599, 3607,
+     3599, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3607,
+     3607, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3599, 3599, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3599, 3599,
+     3607, 3607, 3599, 3599, 3607, 3607, 3599, 3599, 3599, 3599,
+
+     3599, 3599, 3599, 3599, 3607, 3607, 3599, 3599, 3607, 3607,
+     3607, 3599, 3607, 3599, 3607, 3607, 3607, 3607, 3599, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3599, 3599, 3599, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3599, 3607, 3599, 3607, 3599, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3599, 3607, 3599, 3599, 3599, 3607, 3607, 3599, 3607, 3607,
+
+     3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3599, 3599, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607, 3599, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607, 3607,
+     3607, 3607, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607,
+     3599, 3607, 3607, 3607, 3607, 3607, 3599, 3607, 3607, 3607,
+     3607, 3607, 3607, 3599, 3607, 3607, 3607, 3599, 3607, 3599,
+     3599, 3607, 3607, 3607, 3607, 3607, 3599, 3599,    0, 3599,
+
+     3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599,
+     3599, 3599, 3599, 3599, 3599, 3599, 3599
     } ;
 
-static yyconst flex_int16_t yy_nxt[7046] =
+static yyconst flex_int16_t yy_nxt[7060] =
     {   0,
        18,   19,   20,   21,   22,   23,   22,   18,   18,   18,
        18,   18,   22,   24,   25,   26,   27,   28,   29,   30,
@@ -2096,309 +2098,310 @@ static yyconst flex_int16_t yy_nxt[7046] =
 
      2294, 2296,   86, 2288, 2289, 2290,   86, 2298,   86,   86,
      2292,   86, 2299,   86, 2297, 2295, 2302,   86,   86, 2301,
-       86,   86,   86,   86, 2307, 2304,   86,   86,   86,   86,
-       86, 2303, 2300,   86,   86, 2308,   86,   86,   86, 3592,
-     2310, 2306, 2305,   86, 2312, 2311, 2313,   86, 2309, 2316,
-       86, 2315,   86, 2317,   86, 2321, 2314, 2319, 2322,   86,
-       86, 2320,   86, 2325,   86,   86, 2318, 2326, 2323, 2328,
-       86,   86, 2324, 2329, 2327, 2331,   86,   86,   86,   86,
-       86,   86,   86, 2330, 2332, 2333, 3592,   86, 2335, 2337,
-       86, 2339, 2336,   86,   86, 2340, 2334,   86, 2342,   86,
-
-     2338,   86,   86,   86, 2341, 2345, 2344, 2346, 2343,   86,
-       86,   86, 2348, 2351, 2347,   86,   86, 2355,   86,   86,
-     2352,   86, 2356,   86,   86,   86, 2360,   86, 2349, 2353,
-     2354, 2350, 2357,   86, 2361,   86,   86,   86, 2365, 2359,
-     2358,   86,   86, 2367,   86,   86, 2362, 2366,   86, 2371,
-       86, 2363,   86,   86,   86, 2373, 2369, 2364,   86, 2374,
-       86, 2375,   86, 2368, 2370, 2372,   86, 2376,   86,   86,
-     2378, 2381,   86,   86,   86,   86, 2383, 2379, 2377,   86,
-     2380, 2384,   86, 2386,   86, 2385,   86, 2387,   86, 2389,
-       86, 2388,   86, 2382,   86, 2390, 2394,   86,   86, 2391,
-
-       86, 2393,   86,   86,   86,   86,   86,   86, 2392, 2402,
-       86,   86, 2395,   86,   86,   86, 2396, 2403, 2397, 2398,
-     2400,   86, 2401, 2404,   86,   86, 2406, 2399,   86, 2407,
-     2405, 2409,   86,   86, 2408,   86,   86, 2413, 2410, 2412,
-     2416, 2418,   86, 2414,   86, 2417,   86, 2420,   86,   86,
-       86, 2411,   86, 2415, 2423, 2419,   86, 2424,   86, 2427,
-      170, 2429, 2421,   86, 2431,   86, 2430,   86, 2422, 2425,
-       86,   86, 2432,   86, 2433, 2436,   86, 2426,   86,   86,
-     2437, 2434, 2428, 2435,   86, 2441,   86,   86, 2442,   86,
-       86, 2445,   86, 2440, 2438,   86, 2451,   86,   86, 2447,
-
-     2446, 2443, 2448,   86,   86, 2439, 2450,   86, 2444, 2449,
-       86,   86,   86,   86, 2453,   86,   86,   86,   86,   86,
-     2456,   86,   86, 2459,   86,   86, 3592, 2452, 2465,   86,
-     2463, 2454, 2458,   86,   86,   86,   86, 2460, 2455, 2457,
-     2461, 2462,   86,   86, 2464,   86, 2466,   86, 2467,   86,
-     2468,   86, 2469,   86, 2471, 2472, 2474, 2477,   86,   86,
-       86, 2470, 2475,   86,   86,   86, 2473, 2478,   86,   86,
-       86, 2476,   86,   86, 2488,   86,   86, 2493, 3592, 2479,
-       86,   86, 2480, 2481, 2486,   86,   86,   86, 2482, 2484,
-     2485, 2489, 2483, 2492, 2487, 2491, 2495,   86, 2490,   86,
-
-       86,   86,   86, 2497, 2496,   86, 2494,   86, 2501, 2502,
-       86,   86,   86, 2503, 2498,   86, 2499,   86, 2500, 2504,
-       86,   86, 2507,   86, 2508,   86, 2509, 2505, 2506, 2510,
-     2511,   86, 2512,   86,   86,   86,   86,   86,   86, 2513,
-     2514, 2518,   86, 2519,   86, 2515, 2521,   86,   86, 2517,
-     2523,   86,   86,   86, 2526,   86, 2516, 2520, 2525, 2527,
-       86,   86,   86,   86,   86,   86, 2522, 2524,   86, 2534,
-       86, 2529,   86, 2533,   86, 2528, 2536,   86, 2531,   86,
-     2530,   86,   86, 2541, 2532, 2539, 2538,   86, 2543,   86,
-     2540, 2535, 2537,   86,   86,   86,   86, 2546, 2542,   86,
-
-     2549,   86,   86,   86,   86,   86,   86, 2555,   86, 2545,
-     2554, 2547, 2544,   86,   86,   86,   86,   86, 2548, 2551,
-     2553, 2557, 2550, 2560,   86,   86, 2552,   86,   86, 2558,
-     2559,   86, 2556,   86, 2562,   86,   86, 2561,   86, 2563,
-       86, 2568,   86,   86, 2570, 2569, 2564,   86, 2566, 2565,
-     2571, 2574,   86,   86,   86, 2575,   86,   86, 2576, 2577,
-       86, 2567, 3592, 2578,   86, 2572,   86, 2573,   86, 2579,
-       86, 2581,   86, 2580,   86, 2583, 2587, 2584, 2588, 2585,
-       86, 2591,   86, 2586,   86, 2589, 2582,   86,   86,   86,
-       86,   86,   86, 2592, 2593, 2590,   86,   86,   86, 2596,
-
-       86,   86,   86,   86, 2595, 2603, 2598, 2599, 2604, 2600,
-     2601,   86, 2597,   86,   86, 2594, 2602, 2605,   86,   86,
-       86, 2609,   86, 2606, 2610,   86, 2611,   86, 2608,   86,
-       86, 2613,   86, 2614, 2612,  170,   86,   86, 2607,   86,
-     2615, 2620,   86,   86,   86, 2618, 2622, 2616,   86, 2617,
-       86,   86, 2619,   86, 2621, 2623, 2627,   86,   86,   86,
-     2624, 2634, 2626, 2625, 2628, 2631,   86,   86, 2632, 2630,
-       86, 2629, 2633,   86, 2636, 2635, 2637,   86, 2639,   86,
-       86,   86,   86,   86, 2641,   86, 2638,   86,   86,   86,
-     2645,   86, 2646,   86,   86, 2640,   86, 2642,   86, 2648,
-
-     2649, 2643, 2654,   86,   86, 2647, 2650, 2644, 2651,   86,
-       86,   86,   86, 2655,   86, 2652, 2653,   86, 2657, 2658,
-       86,   86,   86,   86,   86,   86, 2660,   86,   86,   86,
-     2659, 2665, 2656,   86, 2667, 2668,   86, 2670,   86, 2664,
-       86,   86, 2661, 2662, 2663,   86, 2669,   86, 2666,   86,
-       86, 2671, 2674, 2676,   86,   86,   86, 2672,   86, 2680,
-       86, 2679, 2677,   86, 2673,   86, 2681,   86,   86, 2682,
-     2675, 2678, 2683, 2691, 2684,   86, 2685,   86,   86,   86,
-     2686, 2687,   86, 2689,   86,   86, 2693,   86, 2690,   86,
-     2695,   86,   86,   86, 2688,   86,   86, 2692, 2694,   86,
-
-       86, 2699,   86,   86,   86, 2704,   86, 2697, 2702, 2703,
-     2696, 2698, 2705,   86, 2706,   86, 2708,   86,   86,   86,
-       86, 2701, 2707,   86, 2711, 2700,   86,   86,   86, 2713,
-       86,   86, 2719, 2709, 2716,   86, 2718, 2717,   86, 2714,
-     2710,   86, 2712, 2715,   86,   86, 2722,   86,   86,   86,
-       86, 2723,   86, 2726, 2727,   86,   86,   86,   86, 2720,
-     2721, 2728,   86, 2724,   86,   86, 2730, 2725, 2729, 2732,
-       86, 2731, 2733,   86,   86,   86, 2734,   86,   86, 2735,
-     2737, 2741,   86, 2740,   86, 2736, 2742,   86, 2743,   86,
-     2744,   86,   86,   86, 2738,   86, 2745, 2739, 2747,   86,
-
-     2748,   86, 2749,   86, 2750,   86,   86, 2751,   86,   86,
-     2746,   86, 2757,   86,   86, 2759,   86,   86, 2753, 2760,
-       86,   86, 2762,   86,   86, 2752,   86, 2756, 2754, 2763,
-     2755, 2764, 2761, 2758,   86,   86,   86,   86, 2765,   86,
-     2767, 2770,   86, 2772,   86,   86,   86,   86, 2771,   86,
-       86,   86,   86, 2779, 2766,  170, 2768, 2769,   86, 2781,
-     2775,   86,   86,   86, 2777,   86, 2774, 2780,   86,   86,
-     2782, 2773,   86, 2776, 2778, 2788,   86, 2783, 2784,   86,
-       86, 2790,   86, 2785,   86, 2791, 2792,   86, 2793,   86,
-     2786,   86, 2787, 2789,   86, 2794,   86, 2795,   86, 2796,
-
-     2797,   86, 2798, 2799,   86,   86,   86,   86,   86,   86,
-       86,   86, 2807,   86,   86,   86, 2800, 2805,   86, 2811,
-       86,   86,   86, 2802, 2801, 2812, 2874, 2804, 2803, 2806,
-       86, 2808, 2809, 2810, 2813,   86, 2814, 2817,   86, 2816,
-       86,   86, 2815, 2819,   86,   86,   86,   86,   86, 2818,
-       86,   86,   86,   86, 2823,   86, 2830,   86,   86, 2820,
-     2831,   86, 2829, 2821, 2822, 2824, 2825,   86, 2827, 2826,
-       86, 2837, 2828, 2835,   86,   86, 2834,   86, 2832, 2836,
-       86,   86,   86,   86,   86, 2833,   86,   86,   86, 2842,
-       86, 3592,   86, 2838, 2847, 2846, 2839, 2841, 2844, 2848,
-
-       86, 2840,   86,   86, 2849,   86, 2843,   86, 2845, 2850,
-       86,   86,   86,   86, 2852,   86,   86,   86, 2856,   86,
-     2857,   86, 2851, 2854,   86,   86, 2853, 2862, 2863,   86,
-       86,   86, 2855, 2866,   86,   86, 2858, 2860, 2859, 2861,
-     2864,   86, 2867,   86,   86, 2869,   86,   86, 2865,   86,
-     2868, 2872, 2871, 2873,   86,   86, 2878,   86, 2870, 2875,
-       86,   86,   86,   86, 2882,   86, 2881, 2883,   86, 2876,
-     2880,   86, 2879, 2885,   86, 2877, 2886,   86,   86,   86,
-       86, 2891,   86,   86, 2884,   86, 2887,   86, 2892, 2894,
-       86, 2889,   86,   86, 2888,   86, 2901,   86, 2895,   86,
-
-     2890, 2898,   86,   86,   86, 2893, 2896,   86, 2897, 2904,
-       86, 2899, 2900,   86,   86,   86,   86,   86, 2905, 2902,
-     2906, 2908, 2903, 2910,   86, 2909,   86,   86, 2907,   86,
-       86,   86,   86, 2911, 2912, 2914, 2915, 2917,   86, 2918,
-       86,   86, 2913,   86, 2916,   86, 2919, 2921,  170,   86,
-     2922, 2920,   86, 2926, 2923,   86,   86, 2928,   86,   86,
-     2927,   86,   86, 2924, 2931,   86, 2930, 2932,   86, 3592,
-     2925, 2934,   86, 2929,   86, 2933, 2936, 2935,   86,   86,
-       86, 2937,   86, 2938, 2939, 2941,   86,   86,   86,   86,
-     2942,   86, 2943,   86, 2940,   86, 2948, 2944,   86, 2949,
-
-       86, 2946,   86, 2950, 2945,   86, 2952,   86,   86,   86,
-       86,   86, 2951, 2955, 2954, 2953, 2947,   86,   86,   86,
-       86,   86, 2957, 2956, 2958, 2959,   86,   86,   86,   86,
-     2964,   86, 2966,   86, 2961, 2962, 2960, 2963, 2968,   86,
-     2965,   86,   86,   86,   86, 2969,   86, 2973,   86,   86,
-     2974, 2967,   86,   86,   86,   86, 2979,   86,   86,   86,
-     2970, 2976, 2971,   86,   86, 2972,   86, 2983, 2975, 2977,
-     2978, 2986, 2980, 2981, 2984,   86, 2987,   86,   86, 2982,
-     2989,   86,   86,   86, 2988,   86,   86, 2990,   86, 2985,
-     2993, 2991,   86, 2996, 2995,   86,   86,   86, 2997,   86,
-
-     2998, 2994,   86, 2992, 3000,   86,   86, 3002,   86, 3004,
-       86, 2999, 3005,   86, 3006,   86,   86, 3001,   86,   86,
-     3007, 3010,   86, 3008,   86,   86, 3003,   86, 3009, 3014,
-     3012,   86,   86, 3592, 3015,   86,   86, 3018,   86, 3013,
-     3019,   86,   86, 3016, 3011, 3020,   86, 3021,   86,   86,
-       86, 3023, 3017, 3022,   86, 3024, 3025,   86, 3028,   86,
-       86, 3029, 3030,   86,   86, 3032,   86, 3026,   86,   86,
-       86, 3036, 3037,   86, 3027,   86,   86,   86,   86, 3031,
-     3038, 3033, 3039, 3040, 3035, 3041,   86, 3034,   86,   86,
-     3042,   86,   86,   86, 3047, 3050,   86,   86, 3043, 3046,
-
-       86, 3049,   86,   86,   86,   86, 3044, 3051, 3053, 3045,
-       86, 3052,   86, 3055,   86, 3056,   86, 3048,   86,   86,
-       86,   86,   86, 3059, 3063,   86,   86,   86, 3069, 3054,
-     3060,   86, 3592, 3057, 3058, 3062, 3064,   86, 3070, 3061,
-     3065, 3067,   86, 3071,   86, 3068, 3072, 3082, 3066,   86,
-     3074, 3073,   86, 3075,   86,   86, 3076,   86, 3077,   86,
-     3078,   86, 3079,   86, 3080, 3081,   86,   86,   86,   86,
-       86,   86,   86,   86, 3086,   86, 3088,   86, 3092,   86,
-       86, 3089, 3085, 3093,   86,   86, 3083, 3098, 3094, 3087,
-       86, 3096,   86, 3084, 3592, 3090, 3095, 3091, 3097,   86,
-
-     3099,   86,   86, 3101,   86,   86,   86, 3100,   86,   86,
-     3106, 3107,   86,   86, 3102, 3103,   86, 3104, 3105, 3108,
-       86,   86, 3110,   86,   86, 3109, 3114,   86,   86,   86,
-       86, 3115,   86, 3118, 3112, 3111,   86, 3117,   86, 3113,
-     3116, 3119, 3120,   86, 3121, 3122,   86,   86,   86, 3126,
-       86,   86, 3123,   86,   86,   86,   86,   86,   86,   86,
-     3127, 3130, 3133,   86, 3131, 3128, 3125, 3164,   86,   86,
-     3134,   86, 3124,   86, 3136,   86, 3137, 3132, 3140, 3129,
-     3135,   86, 3138,   86, 3139,   86,   86, 3143, 3145,   86,
-     3144, 3146,   86, 3147,   86,   86, 3141,   86,   86, 3142,
-
-       86, 3152,   86, 3151, 3148,   86,   86,   86, 3155,   86,
-     3153, 3154,   86,   86,   86,   86,   86, 3149,   86, 3150,
-     3156, 3159, 3161, 3165, 3157, 3163,   86,   86,   86,   86,
-       86,   86, 3160,   86, 3158, 3166,   86, 3167, 3172,   86,
-     3162,   86,   86,   86, 3169,   86, 3168,   86, 3170, 3176,
-       86, 3171,   86,   86, 3173, 3174, 3175,   86,   86, 3177,
-       86, 3180, 3181, 3178,   86, 3183,   86,   86,   86, 3184,
-     3189, 3179, 3187,   86,   86, 3190,   86,   86, 3182,   86,
-     3191, 3192,   86,   86, 3185, 3194,   86, 3188,   86,   86,
-       86,   86,   86, 3186, 3197, 3195, 3199,   86, 3193, 3196,
-
-     3200,   86, 3203,   86, 3198,   86, 3202,   86,   86,   86,
-     3201,   86, 3206, 3209,   86, 3204,   86, 3210, 3212, 3207,
-       86, 3213, 3205,   86,   86,   86, 3208, 3215,   86, 3211,
-     3216,   86,   86, 3219,   86,   86,   86,   86, 3224,   86,
-     3217,   86, 3214,   86,   86, 3222, 3221, 3228,   86,   86,
-       86,   86, 3218, 3220, 3230, 3226,   86, 3223, 3225, 3231,
-       86, 3227,   86, 3232, 3229, 3235, 3236,   86, 3238,   86,
-     3234,   86, 3233,   86,   86,   86, 3237, 3241,   86,   86,
-     3240,   86, 3244,   86, 3242,   86,   86, 3239,   86, 3247,
-       86,   86,   86, 3252,   86, 3248,   86,   86,   86, 3592,
-
-     3243,   86, 3245, 3246, 3249, 3251, 3259, 3255, 3256,   86,
-     3257,   86,   86, 3254,   86, 3253, 3250, 3258,   86, 3261,
-     3262,   86, 3263,   86, 3264,   86, 3260, 3265,   86,   86,
-       86, 3268,   86,   86, 3270,   86,   86,   86, 3269, 3272,
-       86,   86, 3266,   86,   86,   86,   86, 3278, 3271, 3279,
-       86,   86,   86,   86,   86, 3273, 3267, 3285,   86,   86,
-     3286,   86,   86, 3274, 3276, 3275, 3277, 3282, 3284, 3288,
-       86, 3281,   86,   86, 3283,   86,   86, 3280, 3291,   86,
-     3287, 3293,   86, 3294,   86,   86,   86,   86, 3297, 3302,
-     3289, 3290, 3295, 3296,   86,   86,   86, 3292, 3298, 3300,
-
-       86, 3301,   86, 3299,   86,   86,   86, 3303,   86,   86,
-       86, 3306,   86,   86,   86, 3308,   86,   86, 3309,   86,
-     3307,   86,   86,   86, 3304, 3305,   86, 3318, 3319,   86,
-       86, 3310, 3314, 3311, 3312, 3313, 3315, 3316, 3321,   86,
-       86,   86, 3317, 3325,   86, 3322, 3320,   86, 3344, 3323,
-     3324, 3326,   86, 3327,   86,   86, 3329,   86,   86, 3328,
-     3331, 3332,   86, 3330,   86, 3334,   86, 3335, 3336,   86,
-       86, 3337, 3338, 3342,   86, 3339,   86, 3340, 3341, 3333,
-       86,   86, 3345,   86,   86,   86, 3343,   86, 3348,   86,
-       86,   86, 3352,   86,   86,   86, 3351,   86,   86, 3347,
-
-       86,   86, 3346,   86, 3355, 3356,   86, 3357,   86, 3349,
-     3350, 3360, 3361,   86, 3353, 3358,   86, 3362,   86, 3363,
-     3354, 3359, 3364,   86, 3365,   86,   86,   86, 3370,   86,
-     3372, 3366, 3367, 3371,   86, 3368,   86,   86, 3369,   86,
-       86,   86,   86, 3379,   86, 3376, 3377, 3380,   86,   86,
-     3382,   86, 3374,   86, 3373, 3381, 3383,   86,   86,   86,
-     3375, 3378,   86, 3384, 3385, 3386,   86, 3387,   86, 3390,
-       86, 3388, 3391,   86, 3392,   86, 3389, 3393,   86, 3394,
-       86, 3395,   86, 3396,   86, 3397,   86,   86,   86, 3400,
-       86, 3401,   86,   86,   86,   86,   86, 3399, 3405,   86,
-
-       86,   86, 3402, 3407,   86,   86, 3403,   86, 3411, 3412,
-       86, 3408,   86, 3398, 3409, 3404,   86, 3410,   86, 3406,
-     3414,   86,   86,   86, 3418, 3416,   86, 3413,   86, 3420,
-     3421,   86,   86,   86, 3415,   86,   86, 3423,   86,   86,
-       86,   86,   86,   86, 3417, 3422, 3419, 3427, 3428, 3436,
-       86,   86, 3424, 3425, 3426, 3429,   86, 3430,   86,   86,
-       86, 3433, 3434, 3432, 3437,   86, 3431, 3438,   86,   86,
-       86, 3435,   86,   86, 3441,   86,   86,   86, 3440,   86,
-       86, 3446, 3447, 3439,   86, 3449,   86, 3443, 3445,   86,
-       86,   86, 3442,   86, 3448,   86,   86,   86, 3444, 3450,
-
-       86,   86, 3458,   86,   86, 3456, 3453,   86, 3451, 3452,
-     3455,   86, 3457, 3462,   86,   86, 3460, 3465, 3454,   86,
-     3464,   86, 3459, 3461, 3467,   86,   86, 3463, 3469,   86,
-     3468,   86, 3470, 3471,   86, 3472,   86,   86,   86, 3466,
-       86, 3475,   86,   86,   86, 3473, 3480, 3476, 3477,   86,
-       86,   86,   86, 3484,   86,   86, 3483, 3474,   86, 3479,
-     3486,   86, 3482, 3481,   86, 3478, 3487,   86, 3488,   86,
-     3491,   86,   86, 3489,   86, 3485, 3494,   86,   86, 3495,
-       86,   86,   86, 3490, 3498, 3499,   86, 3492, 3496,   86,
-       86,   86, 3493,   86, 3504,   86, 3500,   86, 3503, 3501,
-
-     3497, 3505,   86,   86,   86,   86,   86,   86, 3502,   86,
-     3509,   86, 3511,   86,   86,   86,   86,   86, 3506, 3508,
-     3516, 3517,   86, 3507, 3510,   86, 3513, 3514, 3512, 3524,
-     3515, 3518,   86, 3522,   86,   86,   86, 3519,   86, 3525,
-     3520, 3523,   86,   86, 3521,   86,   86, 3526, 3527, 3530,
-     3528, 3531,   86,   86,   86,   86, 3533,   86, 3532,   86,
-       86,   86,   86, 3534, 3539, 3529,   86, 3536,   86,   86,
-       86,   86, 3542, 3535, 3543,   86,   86,   86,   86,   86,
-     3537, 3538, 3541, 3546,   86, 3540, 3544, 3547,   86, 3545,
-       86, 3550, 3549, 3551,   86, 3548,   86, 3552,   86, 3554,
-
-       86, 3556,   86, 3557,   86,   86,   86, 3561,   86, 3558,
-     3592,   86, 3559, 3564,   86, 3555, 3562,   86,   86, 3563,
-     3553,   86,   86,   86,   86, 3560,   86,   86, 3565, 3566,
-       86, 3568, 3570,   86,   86, 3572,   86, 3567,   86, 3573,
-       86, 3576, 3569, 3571, 3577,   86, 3574,   86,   86, 3580,
-     3581,   86,   86, 3583,   86, 3575,   86, 3578,   86, 3582,
-     3584,   86,   86, 3585,   86,   86, 3579, 3586, 3592, 3587,
-     3590,   86, 3591,   86, 3592, 3592, 3592, 3588, 3592, 3592,
-     3592, 3592, 3592, 3592, 3589,   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, 3592,   89,   89,   89,
-       89,  160,  160, 3592, 3592, 3592,  160,  160,  162,  162,
-     3592, 3592,  162, 3592,  162,  164, 3592, 3592, 3592, 3592,
-     3592,  164,  167,  167, 3592, 3592, 3592,  167,  167,  169,
-     3592, 3592, 3592, 3592, 3592,  169,  171,  171, 3592,  171,
-      171,  171,  171,  174, 3592, 3592, 3592, 3592, 3592,  174,
-      177,  177, 3592, 3592, 3592,  177,  177,   90,   90, 3592,
-
-       90,   90,   90,   90,   17, 3592, 3592, 3592, 3592, 3592,
-     3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592,
-     3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592,
-     3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592,
-     3592, 3592, 3592, 3592, 3592
+       86,   86,   86,   86, 2307, 2304,   86, 2308,   86,   86,
+       86, 2303, 2300,   86,   86, 2309,   86,   86,   86,   86,
+     3599, 2306, 2305,   86, 2313, 2311, 2312,   86, 2314, 2310,
+     3599,   86, 2316, 2317,   86, 2322, 2315, 2318, 2320, 2323,
+       86,   86, 2321,   86, 2326, 2324,   86,   86, 2327,   86,
+     2319, 2330, 2329,   86, 2325,   86,   86,   86,   86,   86,
+     2332,   86,   86, 2333, 2338,   86, 2328, 2334, 2336,   86,
+     2340, 2331,   86, 2337, 2341, 2335,   86, 2343,   86,   86,
+
+       86,   86,   86, 2342, 2339, 2345,   86, 2347, 2346,   86,
+       86,   86, 2352,   86, 2348,   86, 2356,   86,   86, 2349,
+     2353, 2357,   86,   86,   86, 2344, 2354,   86, 2350, 2355,
+       86, 2351, 2358, 2361,   86,   86, 2362,   86,   86,   86,
+     2366, 2360, 2359,   86, 2367, 2364,   86,   86, 2363, 2368,
+       86,   86, 2372,   86,   86, 2374,   86, 2375, 2365, 2370,
+       86, 2369, 2373,   86,   86,   86,   86, 2371, 2377, 2376,
+     2379,   86,   86, 2382, 2380, 2384,   86, 2381,   86,   86,
+     2385,   86, 2378,   86,   86,   86,   86, 2387, 2386, 2390,
+     2391, 2388,   86, 2383,   86, 2389, 2395,   86,   86, 2392,
+
+       86,   86,   86, 2394,   86,   86,   86,   86,   86,   86,
+     2403, 2407, 2393,   86,   86,   86, 2396,   86, 2397, 2398,
+     2399, 2401, 2408, 2402, 2409, 2404, 2405, 2400,   86, 2406,
+       86,   86,   86,   86,   86,   86, 2411, 2413,   86, 2419,
+       86,   86, 2421,   86,   86,   86, 2410, 2418, 2415, 2412,
+     2420,   86, 2416,   86,   86, 2414, 2425, 2424,   86, 2428,
+     2417,  170, 2422, 2430, 2423,   86, 2432, 2426, 2431,   86,
+     2433,   86,   86,   86, 2434,   86,   86, 2427, 2437,   86,
+       86, 2435,   86, 2429,   86, 2438, 2442,   86,   86, 2441,
+       86, 2443, 2446,   86, 2444, 2436,   86, 2452,   86, 2439,
+
+       86, 2447,   86, 2448, 2449,   86, 2445,   86, 2451,   86,
+     2440,   86, 2450, 2454,   86,   86,   86,   86,   86,   86,
+     2453, 2457,   86,   86, 2460,   86,   86,   86, 2464, 2466,
+       86, 2455, 2459,   86,   86,   86,   86, 2467, 2462, 2469,
+     2456, 2458,   86, 2461,   86,   86, 2463,   86,   86, 2465,
+     2468,   86,   86, 2475, 2470, 2478,   86, 2473,   86,   86,
+       86,   86, 2472,   86, 2476,   86, 2474, 2479, 2471,   86,
+     2477,   86,   86,   86,   86, 2489,   86, 2480,   86, 2481,
+     2482,   86,   86,   86, 2487, 2494, 2483, 2491, 2485, 2484,
+       86, 2490, 2486,   86, 2488, 2497, 2492,   86, 2495, 2493,
+
+     2496,   86,   86,   86,   86, 2498,   86,   86, 2503,   86,
+     2499, 2504,   86,   86, 3599, 2505, 2506,   86, 2501, 2502,
+       86,   86, 2509,   86, 2507,   86, 2510, 2500, 2513,   86,
+     2514,   86, 2511, 2508,   86, 2512,   86,   86,   86, 2515,
+       86, 2516, 2520,   86, 2521,   86,   86, 2523,   86,   86,
+     2525,   86, 2519,   86,   86, 2528,   86, 2517, 2518, 2527,
+     2529,   86,   86,   86,   86, 2522,   86, 2524, 2526,   86,
+       86,   86, 2531, 2536,   86, 2535, 2530, 2538,   86,   86,
+     2533, 2532,   86,   86,   86, 2543,   86, 2540, 2534, 2541,
+     2537,   86, 2545,   86, 2542,   86,   86, 2539, 2548,   86,
+
+     2544,   86, 2551,   86,   86, 2546,   86,   86,   86,   86,
+     2547, 2557,   86, 2556, 2549,   86,   86,   86,   86,   86,
+     2550, 2553, 2559, 2555, 2552, 2562,   86,   86,   86,   86,
+     2554, 2560,   86, 2561, 2558, 2564,   86,   86, 3599, 2563,
+       86, 2565,   86, 2570,   86,   86, 2572, 2566, 2576, 2571,
+     2567, 2568,   86,   86,   86, 2573,   86, 2577, 2578,   86,
+       86, 2579,   86, 2569,   86,   86,   86,   86,   86, 2583,
+     2574, 2585, 2575, 2581,   86,   86,   86,   86,   86, 2586,
+     2587, 2589, 2588, 2582, 2580,   86, 2590,   86, 2593, 2591,
+     2594, 2584,   86, 2592,   86,   86,   86, 2599,   86,   86,
+
+     2595, 2596, 2598,   86,   86,   86,   86, 2600,   86, 2597,
+     2605, 2606, 2601, 2602, 2603,   86,   86,   86,   86, 2607,
+     2604,   86,   86, 2611,   86, 2612,   86, 2613, 2608,  170,
+     2610,   86,   86, 2615, 2617, 2614,   86, 2616, 2609,   86,
+       86, 2622,   86,   86,   86,   86,   86,   86,   86,   86,
+     2633,   86, 2618, 2624, 2619, 2620, 2621, 2625, 2623, 2628,
+       86,   86, 2626, 2627, 2629, 2630,   86,   86, 2634, 2631,
+     2635,   86,   86,   86,   86, 2636, 2638, 2639, 2632, 2637,
+       86,   86,   86,   86, 2641,   86,   86, 2642,   86, 2640,
+       86, 2643, 2648, 2644,   86, 2647,   86,   86,   86,   86,
+
+     2645,   86, 2650, 2651, 2652, 2653,   86, 2646,   86,   86,
+     2649,   86,   86, 2654, 2655,   86, 2660,   86,   86,   86,
+     2656, 2657, 2659,   86,   86,   86,   86,   86, 2662,   86,
+       86,   86, 2661, 2667, 2670, 2658, 2669,   86,   86, 2672,
+       86, 2666,   86, 2671, 2663, 2664, 2665,   86,   86,   86,
+     2668,   86, 2678,   86, 2676,   86,   86,   86, 2682, 2683,
+     2673,   86, 2681,   86,   86,   86, 2674, 2675, 2679, 2684,
+       86, 2680, 2677,   86,   86, 2685, 3599, 2687, 2694, 2686,
+       86, 2688,   86,   86,   86, 2689, 2690,   86, 2692,   86,
+       86, 2696,   86, 2693,   86, 2698,   86,   86,   86,   86,
+
+     2691,   86, 2695, 2697, 2702,   86,   86,   86,   86,   86,
+     2707,   86, 2700, 2705, 2706, 2699, 2709, 2701, 2708,   86,
+       86,   86,   86,   86, 2711,   86,   86, 2704, 3599, 2713,
+     2714, 2703,   86,   86,   86, 2716,   86, 2712, 2719,   86,
+     2710,   86, 2720, 2722,   86, 2715, 2717, 2721, 2718,   86,
+       86, 2725,   86,   86,   86, 3599, 2726,   86,   86, 2729,
+     2730,   86, 2723,   86,   86, 2724,   86,   86, 2731,   86,
+       86,   86, 2736, 2727, 2735, 2728, 2733,   86,   86, 2734,
+       86,   86, 2732,   86,   86, 2737, 2740, 2744,   86, 2743,
+     2739, 2738, 2745,   86, 2746,   86, 2747,   86,   86,   86,
+
+     2741,   86,   86, 2742,   86, 2751, 2750,   86, 2752,   86,
+     2748,   86, 2753,   86, 2754,   86,   86, 2749,   86, 2760,
+       86,   86, 2762,   86,   86, 2756, 2763,   86,   86, 2755,
+     2765,   86,   86,   86, 2759, 2757, 2766, 2758,   86, 2764,
+     2761,   86,   86,   86, 2768, 2767, 2770, 2773,   86,   86,
+     2775,   86,   86, 2769,   86,   86,   86,   86, 2774,   86,
+      170,   86, 2771, 2772,   86,   86, 2782,   86, 2778,   86,
+     2784, 2780, 2783,   86, 2777,   86, 2785,   86, 2776, 2788,
+     2779, 2781,   86,   86,   86, 2791,   86, 2789, 2786, 2793,
+     2787, 2794, 2795,   86, 2796,   86,   86, 2792,   86, 2797,
+
+     2790,   86, 2798,   86, 2799,   86,   86,   86,   86,   86,
+       86,   86,   86,   86, 2800,   86, 2801, 2810,   86,   86,
+       86, 2808, 2803,   86, 2815, 2802,   86, 2805, 2804,   86,
+     2814, 2807, 2806, 2809, 2816,   86,   86, 2812, 2811,   86,
+     2817, 2813, 2820,   86,   86, 2822,   86,   86, 2819,   86,
+       86,   86,   86, 2821,   86,   86,   86,   86, 2818, 2826,
+       86, 2833,   86,   86, 2832, 2823, 2827, 2824, 2825, 2834,
+       86,   86, 2828, 2829,   86, 2831, 2830, 2838,   86, 2840,
+     2837, 2839,   86, 2835,   86,   86,   86,   86,   86, 2836,
+       86,   86,   86,   86,   86, 2846,   86, 3599,   86, 2850,
+
+     2851,   86, 2841, 2843, 2842, 2845, 2844, 2848, 2852,   86,
+     2854,   86, 2847, 2849,   86,   86, 2853,   86,   86,   86,
+     2855,   86,   86,   86, 2856,   86, 2860, 2861,   86,   86,
+     2858,   86, 2867,   86, 2866,   86, 2857,   86,   86, 2859,
+     2870,   86,   86, 2862, 2863,   86,   86, 2865, 2864, 2871,
+     2868,   86,   86,   86,   86, 2869, 2873, 2872, 2876, 2875,
+     2874, 2877,   86,   86, 2878,   86, 2880, 2882,   86,   86,
+       86,   86,   86, 2886,   86, 2885, 2887,   86, 2879, 2884,
+       86, 2883, 2889,   86,   86, 2881,   86,   86,   86, 2890,
+     2895,   86,   86, 2888,   86, 2891, 2892,   86, 2896, 2893,
+
+     2898,   86,   86,   86,   86, 2905,   86, 2899, 2894,   86,
+       86,   86,   86, 2902, 2897, 2900, 2901,   86, 2903, 2904,
+     2908,   86, 2909,   86,   86,   86,   86, 2907, 2910,   86,
+     2912, 2906,   86, 3599, 2913,   86,   86,   86, 2911,   86,
+       86, 2915, 2918, 2916, 2919, 2921,   86,   86, 2914, 2922,
+       86, 2917, 2923,   86,   86, 2920, 2925,  170,   86,   86,
+       86, 2926, 2930, 2927,   86,   86, 2932,   86,   86, 2931,
+       86,   86, 2924, 2935,   86, 2934,   86, 2928, 2929, 2936,
+       86, 2942, 2933, 2940, 2937, 2938,   86,   86, 2941,   86,
+     2939,   86,   86, 2945,   86,   86, 2943,   86, 2946,   86,
+
+     2947,   86,   86,   86,   86,   86, 2944, 2952, 2953, 2954,
+     2948, 2950, 2949,   86,   86, 2956,   86, 2955,   86,   86,
+       86,   86,   86, 2951, 2958, 2957,   86, 2961,   86, 2959,
+       86,   86, 2960, 2962,   86, 2963,   86,   86, 2968, 2964,
+       86,   86,   86, 2966, 2965, 2967, 2970, 2972,   86, 2969,
+       86,   86,   86,   86, 2973,   86, 2978,   86,   86,   86,
+     2971,   86,   86,   86,   86, 2979, 2984,   86,   86, 2974,
+     2981, 2975, 2976,   86, 2977,   86,   86, 2982, 2980, 2983,
+     2988, 2991, 2985, 2986, 2989,   86, 2992,   86,   86, 2994,
+     2995,   86,   86, 2987,   86,   86,   86,   86,   86,   86,
+
+     2990, 3001, 2996, 2998,   86,   86, 2993,   86, 2999,   86,
+     3000,   86, 3002, 3005,   86, 3003,   86, 3007, 3004,   86,
+     3006, 2997, 3009,   86, 3010,   86, 3011,   86,   86,   86,
+       86,   86, 3012,   86, 3013, 3015,   86, 3008, 3017, 3014,
+       86, 3019,   86,   86,   86, 3023, 3020,   86, 3024,   86,
+       86, 3016, 3018, 3027, 3021, 3025,   86, 3026,   86,   86,
+       86, 3030,   86, 3022,   86,   86, 3033,   86,   86, 3034,
+     3035,   86, 3028, 3029,   86, 3037,   86,   86,   86,   86,
+     3041,   86, 3031, 3042,   86, 3032,   86,   86, 3044, 3036,
+     3038, 3043,   86, 3040,   86, 3046, 3039, 3045,   86,   86,
+
+     3047,   86,   86, 3052, 3048,   86,   86,   86, 3051,   86,
+     3054, 3055,   86,   86,   86,   86,   86, 3058, 3049, 3050,
+     3056, 3057,   86,   86, 3061, 3060,   86,   86,   86,   86,
+     3053, 3064, 3059, 3062, 3063, 3068,   86,   86,   86,   86,
+       86, 3070,   86, 3067,   86, 3065, 3080,   86, 3066, 3071,
+     3074, 3069, 3075, 3072,   86, 3077,   86, 3076,   86, 3073,
+     3078,   86,   86, 3079,   86, 3081,   86, 3082,   86, 3083,
+       86, 3084,   86, 3085,   86,   86, 3088,   86, 3086, 3087,
+     3089,   86, 3091,   86,   86,   86,   86,   86, 3093, 3090,
+     3098,   86,   86, 3094, 3099,   86,   86,   86, 3101, 3100,
+
+     3092, 3103,   86,   86,   86, 3095, 3096, 3097, 3105,   86,
+     3104,   86, 3107,   86,   86, 3102, 3106,   86,   86,   86,
+     3113,   86, 3112, 3108, 3114,   86, 3109, 3110, 3111,   86,
+       86,   86,   86, 3115,   86, 3120,   86, 3599,   86, 3116,
+     3121,   86,   86, 3118,   86, 3123, 3124,   86,   86, 3119,
+     3117, 3122, 3125, 3126,   86, 3128,   86,   86, 3127,   86,
+     3132,   86, 3129,   86,   86,   86,   86,   86, 3139,   86,
+       86, 3136, 3133,   86,   86,   86, 3134, 3131, 3137,   86,
+     3142,   86, 3130,   86, 3143, 3140, 3146, 3138,   86, 3144,
+     3135, 3141, 3145,   86,   86,   86, 3149, 3151,   86, 3150,
+
+     3152,   86, 3153,   86,   86,   86, 3147,   86, 3148,   86,
+     3158,   86,   86, 3154, 3157,   86,   86, 3159, 3161,   86,
+     3160,   86,   86,   86,   86, 3155, 3156,   86, 3165, 3162,
+     3167, 3169,   86, 3163,   86,   86,   86,   86, 3170,   86,
+     3171,   86, 3166, 3164, 3172,   86, 3173,   86,   86, 3178,
+       86,   86, 3168,   86,   86,   86, 3174,   86,   86, 3182,
+       86, 3177, 3175, 3176, 3179,   86, 3180, 3181,   86, 3183,
+     3187,   86,   86, 3184,   86, 3189, 3186, 3185,   86,   86,
+       86, 3190, 3193,   86, 3194,   86,   86, 3196,   86, 3199,
+       86, 3188, 3197,   86, 3198,   86, 3191, 3201,   86, 3195,
+
+       86,   86,   86,   86,   86, 3192, 3204, 3200, 3206, 3207,
+       86, 3202,   86, 3210,   86,   86, 3203,   86, 3205,   86,
+       86, 3209,   86, 3213, 3208, 3216,   86, 3217,   86, 3219,
+       86, 3214,   86,   86, 3212,   86,   86, 3211,   86, 3215,
+       86, 3220, 3222,   86, 3223,   86,   86, 3224, 3218, 3226,
+       86, 3228, 3221,   86, 3231, 3229,   86,   86, 3225,   86,
+       86, 3235,   86,   86,   86,   86,   86, 3237, 3238, 3227,
+       86, 3233,   86, 3230,   86, 3232, 3454, 3234, 3236,   86,
+     3239, 3242, 3240, 3243,   86,   86, 3241,   86, 3244, 3245,
+     3246,   86, 3248,   86,   86,   86, 3247,   86, 3251, 3249,
+
+       86, 3254,   86,   86,   86,   86,   86,   86, 3259,   86,
+       86,   86,   86, 3263,   86, 3255, 3250, 3252, 3253,   86,
+     3258, 3262,   86, 3256, 3264,   86,   86, 3261, 3291, 3260,
+       86, 3257, 3265,   86,   86, 3266, 3267, 3269,   86, 3268,
+     3270,   86, 3271,   86, 3272,   86,   86, 3275,   86,   86,
+     3277,   86, 3274,   86, 3276, 3279,   86,   86,   86, 3273,
+       86,   86,   86,   86, 3278,   86, 3285, 3286,   86,   86,
+       86,   86, 3292,   86, 3293,   86, 3280,   86,   86, 3295,
+     3281, 3283, 3282, 3284, 3289,   86,   86,   86, 3288, 3287,
+       86, 3290, 3298, 3300,   86, 3294, 3301,   86, 3296,   86,
+
+       86, 3304,   86,   86, 3302, 3297,   86,   86, 3307,   86,
+     3306, 3299,   86,   86, 3303, 3305,   86, 3308, 3310,   86,
+     3309,   86,   86,   86,   86,   86, 3311, 3313,   86, 3315,
+       86,   86, 3316, 3314,   86,   86,   86,   86,   86, 3312,
+       86, 3328, 3325, 3326, 3317,   86, 3599,   86, 3318, 3320,
+     3319, 3321,   86, 3322, 3323, 3324,   86, 3329,   86, 3331,
+     3327, 3333,   86, 3334,   86, 3330,   86, 3336,   86,   86,
+     3335, 3332,   86,   86, 3337, 3339,   86, 3341,   86, 3342,
+     3343,   86,   86, 3344, 3345, 3349,   86,   86, 3340, 3346,
+       86, 3338, 3347, 3348,   86,   86, 3351, 3352,   86, 3350,
+
+       86,   86,   86, 3355,   86,   86,   86, 3359,   86,   86,
+       86, 3358,   86,   86,   86, 3354,   86, 3363, 3353, 3362,
+       86,   86, 3599, 3364, 3356, 3357, 3367, 3368,   86, 3360,
+       86, 3365,   86, 3370,   86, 3361, 3371,   86, 3366, 3369,
+     3372,   86,   86,   86,   86, 3377,   86, 3374, 3379, 3373,
+     3378,   86, 3375,   86,   86, 3376,   86,   86,   86, 3386,
+       86, 3381, 3383, 3384, 3387,   86, 3389,   86,   86, 3380,
+       86, 3388, 3390,   86, 3382, 3385,   86, 3393,   86, 3394,
+       86, 3392,   86, 3391,   86, 3397,   86, 3398,   86, 3399,
+       86, 3395, 3400,   86, 3401,   86, 3402,   86, 3403,   86,
+
+     3404,   86, 3396,   86,   86, 3407,   86, 3408,   86,   86,
+       86,   86,   86, 3406, 3412,   86,   86,   86, 3409, 3414,
+       86,   86, 3410,   86, 3418, 3419,   86, 3415,   86, 3405,
+     3416, 3411,   86, 3417,   86, 3413, 3421,   86,   86,   86,
+     3425, 3423,   86, 3420,   86, 3427, 3428,   86,   86,   86,
+     3422,   86,   86, 3430,   86,   86,   86,   86,   86,   86,
+     3424, 3429, 3426, 3434, 3435, 3443,   86,   86, 3431, 3432,
+     3433, 3436,   86, 3437,   86,   86,   86, 3440, 3441, 3439,
+     3444,   86, 3438, 3445,   86,   86,   86, 3442,   86,   86,
+     3448,   86,   86,   86, 3447,   86,   86, 3453,   86, 3446,
+
+       86, 3456,   86, 3450, 3452,   86,   86,   86, 3449, 3457,
+     3455,   86,   86,   86, 3451,   86,   86, 3458, 3465,   86,
+     3459, 3460, 3462, 3464, 3463,   86, 3469,   86,   86,   86,
+     3467, 3461,   86, 3466, 3471, 3468, 3474,   86,   86, 3470,
+     3476,   86, 3472,   86, 3477, 3478,   86, 3475, 3479,   86,
+       86,   86, 3473,   86,   86,   86, 3482,   86,   86, 3483,
+     3484, 3487,   86,   86,   86,   86,   86,   86,   86, 3480,
+     3490, 3481,   86, 3486,   86, 3489, 3488, 3491,   86, 3493,
+       86, 3496, 3485, 3499, 3492, 3494,   86, 3495,   86, 3498,
+       86, 3497, 3500, 3501,   86,   86, 3502,   86,   86,   86,
+
+     3505, 3506,   86,   86,   86, 3503,   86,   86,   86, 3510,
+     3511,   86,   86, 3507,   86, 3508,   86, 3504, 3512,   86,
+     3516,   86, 3509,   86,   86,   86,   86,   86, 3515, 3513,
+     3518,   86, 3514,   86, 3525,   86, 3523, 3520, 3524, 3521,
+       86, 3517, 3519,   86,   86,   86, 3522, 3529,   86, 3531,
+     3530,   86, 3532,   86,   86,   86,   86,   86, 3533, 3534,
+     3526, 3527, 3535, 3528, 3537, 3538,   86,   86, 3540,   86,
+       86,   86, 3539,   86,   86, 3536,   86, 3541,   86, 3546,
+       86, 3543,   86,   86,   86,   86,   86, 3549, 3550,   86,
+     3542, 3551,   86,   86, 3552, 3544, 3548, 3545, 3553, 3547,
+
+       86,   86, 3557, 3554,   86,   86,   86,   86, 3561, 3558,
+       86, 3555,   86, 3556,   86, 3563,   86, 3564, 3559,   86,
+       86, 3568,   86,   86, 3565, 3571,   86, 3566, 3569, 3562,
+       86, 3567, 3560,   86,   86, 3570,   86, 3572,   86,   86,
+       86, 3573,   86, 3575, 3577,   86,   86, 3579,   86,   86,
+       86, 3580,   86, 3583,   86, 3574, 3584,   86, 3576, 3578,
+       86, 3587, 3588,   86,   86, 3590,   86, 3581, 3582, 3585,
+       86, 3589,   86, 3586, 3591,   86,   86, 3592,   86,   86,
+     3599, 3593, 3599, 3594, 3597,   86, 3598,   86, 3599, 3599,
+     3599, 3595, 3599, 3599, 3599, 3599, 3599, 3599, 3596,   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,
+     3599,   89,   89,   89,   89,  160,  160, 3599, 3599, 3599,
+      160,  160,  162,  162, 3599, 3599,  162, 3599,  162,  164,
+     3599, 3599, 3599, 3599, 3599,  164,  167,  167, 3599, 3599,
+     3599,  167,  167,  169, 3599, 3599, 3599, 3599, 3599,  169,
+      171,  171, 3599,  171,  171,  171,  171,  174, 3599, 3599,
+
+     3599, 3599, 3599,  174,  177,  177, 3599, 3599, 3599,  177,
+      177,   90,   90, 3599,   90,   90,   90,   90,   17, 3599,
+     3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599,
+     3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599,
+     3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599,
+     3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599
     } ;
 
-static yyconst flex_int16_t yy_chk[7046] =
+static yyconst flex_int16_t yy_chk[7060] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2408,14 +2411,14 @@ static yyconst flex_int16_t yy_chk[7046] =
         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, 3600,   35,
+       10,   10,   19,   29,    9,   33,   19,   29, 3607,   35,
        10,   11,   11,   11,   11,   11,   11,   13,   13,   13,
 
        13,   34,   13,   11,   35,   99,   34,   29,   38,   13,
        51,   51,   11,   12,   12,   12,   12,   12,   12,   14,
        14,   14,   14,   99,   14,   12,   15,   15,   15,   38,
        23,   14,   23,   23,   12,   23,   46,   15,   16,   16,
-       16,   23,   23,   25,   27,   27,   25,   25, 2921,   16,
+       16,   23,   23,   25,   27,   27,   25,   25, 2925,   16,
        25,   46,   27,   30,   30,   25,   27,   56,   40,   27,
        56,   73,   31,   31,   25,   28,   67,   67,   30,   32,
        28,   31,   40,   32,   28,   73,   32,   28,   92,   28,
@@ -2875,306 +2878,307 @@ static yyconst flex_int16_t yy_chk[7046] =
 
      2090, 2092, 2092, 2083, 2085, 2086, 2093, 2095, 2095, 2098,
      2088, 2096, 2096, 2099, 2093, 2091, 2100, 2101, 2102, 2099,
-     2103, 2104, 2100, 2105, 2105, 2102, 2106, 2107, 2108, 2110,
-     2112, 2101, 2098, 2109, 2111, 2106, 2113, 2116, 2117,   17,
-     2108, 2104, 2103, 2118, 2110, 2109, 2111, 2114, 2107, 2114,
-     2120, 2113, 2121, 2114, 2124, 2118, 2112, 2116, 2119, 2119,
-     2122, 2117, 2123, 2122, 2126, 2128, 2114, 2123, 2120, 2126,
-     2129, 2127, 2121, 2127, 2124, 2129, 2132, 2130, 2134, 2135,
-     2136, 2138, 2144, 2128, 2130, 2132,    0, 2137, 2135, 2137,
-     2142, 2139, 2136, 2141, 2149, 2141, 2134, 2139, 2143, 2143,
-
-     2138, 2145, 2147, 2146, 2142, 2146, 2145, 2147, 2144, 2148,
-     2150, 2151, 2149, 2152, 2148, 2153, 2154, 2156, 2155, 2152,
-     2153, 2159, 2156, 2156, 2157, 2160, 2161, 2161, 2150, 2154,
-     2155, 2151, 2157, 2162, 2162, 2163, 2164, 2165, 2166, 2160,
-     2159, 2168, 2167, 2168, 2166, 2169, 2163, 2167, 2170, 2171,
-     2171, 2164, 2175, 2172, 2173, 2173, 2170, 2165, 2174, 2174,
-     2177, 2175, 2176, 2169, 2170, 2172, 2179, 2176, 2180, 2181,
-     2179, 2181, 2182, 2184, 2185, 2186, 2183, 2180, 2177, 2188,
-     2180, 2183, 2183, 2185, 2189, 2184, 2192, 2186, 2193, 2189,
-     2190, 2188, 2194, 2182, 2196, 2190, 2195, 2195, 2197, 2192,
-
-     2198, 2194, 2200, 2199, 2203, 2205, 2201, 2202, 2193, 2203,
-     2207, 2206, 2196, 2211, 2217, 2220, 2197, 2205, 2198, 2199,
-     2201, 2208, 2202, 2206, 2209, 2210, 2208, 2200, 2218, 2209,
-     2207, 2211, 2214, 2216, 2210, 2219, 2221, 2217, 2214, 2216,
-     2220, 2222, 2222, 2218, 2225, 2221, 2223, 2224, 2224, 2226,
-     2227, 2214, 2228, 2219, 2227, 2223, 2229, 2228, 2231, 2232,
-     2233, 2234, 2225, 2239, 2235, 2232, 2234, 2234, 2226, 2229,
-     2235, 2237, 2236, 2238, 2237, 2242, 2242, 2231, 2236, 2243,
-     2243, 2238, 2233, 2239, 2244, 2245, 2245, 2246, 2246, 2247,
-     2248, 2249, 2256, 2244, 2243, 2250, 2256, 2249, 2251, 2251,
-
-     2250, 2247, 2252, 2252, 2253, 2243, 2254, 2257, 2248, 2253,
-     2258, 2259, 2254, 2261, 2258, 2262, 2263, 2264, 2265, 2266,
-     2262, 2268, 2270, 2265, 2267, 2269,    0, 2257, 2271, 2271,
-     2269, 2259, 2264, 2273, 2275, 2276, 2277, 2266, 2261, 2263,
-     2267, 2268, 2272, 2278, 2270, 2274, 2272, 2279, 2273, 2281,
-     2274, 2280, 2275, 2282, 2277, 2278, 2280, 2283, 2283, 2285,
-     2286, 2276, 2281, 2287, 2288, 2289, 2279, 2285, 2290, 2292,
-     2291, 2282, 2293, 2294, 2295, 2302, 2297, 2302,    0, 2286,
-     2295, 2300, 2287, 2288, 2293, 2299, 2303, 2301, 2289, 2291,
-     2292, 2297, 2290, 2301, 2294, 2300, 2304, 2304, 2299, 2305,
-
-     2306, 2307, 2308, 2306, 2305, 2309, 2303, 2310, 2310, 2311,
-     2311, 2312, 2314, 2312, 2307, 2315, 2308, 2318, 2309, 2313,
-     2313, 2316, 2316, 2317, 2317, 2324, 2318, 2314, 2315, 2318,
-     2319, 2319, 2320, 2320, 2321, 2323, 2325, 2326, 2329, 2321,
-     2323, 2327, 2327, 2328, 2328, 2324, 2330, 2330, 2331, 2326,
-     2332, 2332, 2333, 2334, 2335, 2335, 2325, 2329, 2334, 2336,
-     2336, 2337, 2338, 2339, 2340, 2341, 2331, 2333, 2343, 2344,
-     2344, 2338, 2345, 2343, 2347, 2337, 2346, 2346, 2340, 2349,
-     2339, 2348, 2351, 2351, 2341, 2349, 2348, 2350, 2352, 2352,
-     2350, 2345, 2347, 2353, 2354, 2355, 2357, 2355, 2351, 2358,
-
-     2359, 2359, 2361, 2363, 2362, 2364, 2365, 2366, 2366, 2354,
-     2365, 2357, 2353, 2367, 2369, 2370, 2368, 2373, 2358, 2362,
-     2364, 2368, 2361, 2372, 2372, 2375, 2363, 2374, 2376, 2369,
-     2370, 2377, 2367, 2378, 2374, 2379, 2381, 2373, 2389, 2375,
-     2380, 2380, 2382, 2386, 2382, 2381, 2376, 2383, 2378, 2377,
-     2383, 2385, 2391, 2387, 2388, 2386, 2390, 2385, 2387, 2388,
-     2393, 2379,    0, 2389, 2401, 2383, 2392, 2383, 2398, 2390,
-     2395, 2392, 2396, 2391, 2397, 2395, 2399, 2396, 2400, 2397,
-     2402, 2403, 2399, 2398, 2400, 2401, 2393, 2403, 2404, 2405,
-     2406, 2407, 2409, 2404, 2405, 2402, 2408, 2410, 2411, 2408,
-
-     2412, 2413, 2414, 2419, 2407, 2415, 2410, 2411, 2416, 2412,
-     2413, 2415, 2409, 2417, 2416, 2406, 2414, 2417, 2421, 2422,
-     2423, 2423, 2426, 2419, 2424, 2425, 2425, 2429, 2422, 2431,
-     2424, 2426, 2427, 2427, 2425, 2428, 2432, 2435, 2421, 2434,
-     2428, 2433, 2433, 2437, 2438, 2431, 2435, 2429, 2439, 2429,
-     2440, 2444, 2432, 2442, 2434, 2437, 2442, 2445, 2450, 2443,
-     2438, 2450, 2440, 2439, 2443, 2446, 2446, 2447, 2447, 2445,
-     2451, 2444, 2449, 2449, 2452, 2451, 2453, 2454, 2455, 2455,
-     2452, 2456, 2453, 2457, 2457, 2458, 2454, 2459, 2460, 2461,
-     2461, 2463, 2462, 2471, 2464, 2456, 2466, 2458, 2462, 2464,
-
-     2466, 2459, 2471, 2467, 2472, 2463, 2467, 2460, 2468, 2468,
-     2469, 2470, 2473, 2472, 2474, 2469, 2470, 2476, 2474, 2475,
-     2475, 2478, 2479, 2480, 2481, 2482, 2478, 2483, 2484, 2485,
-     2476, 2483, 2473, 2489, 2485, 2486, 2488, 2488, 2490, 2482,
-     2487, 2486, 2479, 2480, 2481, 2491, 2487, 2492, 2484, 2493,
-     2496, 2489, 2492, 2494, 2494, 2497, 2498, 2490, 2500, 2499,
-     2505, 2498, 2496, 2503, 2491, 2499, 2500, 2501, 2509, 2501,
-     2493, 2497, 2503, 2514, 2505, 2506, 2506, 2507, 2508, 2514,
-     2507, 2508, 2510, 2510, 2513, 2515, 2516, 2516, 2513, 2517,
-     2520, 2520, 2522, 2524, 2509, 2525, 2528, 2515, 2517, 2529,
-
-     2530, 2528, 2538, 2531, 2532, 2533, 2533, 2524, 2531, 2532,
-     2522, 2525, 2535, 2535, 2537, 2539, 2539, 2540, 2541, 2542,
-     2537, 2530, 2538, 2544, 2542, 2529, 2545, 2546, 2550, 2545,
-     2551, 2547, 2552, 2540, 2548, 2548, 2551, 2550, 2552, 2546,
-     2541, 2553, 2544, 2547, 2558, 2554, 2556, 2556, 2557, 2559,
-     2564, 2557, 2561, 2561, 2562, 2562, 2563, 2565, 2566, 2553,
-     2554, 2563, 2569, 2558, 2567, 2570, 2565, 2559, 2564, 2567,
-     2568, 2566, 2568, 2571, 2573, 2572, 2569, 2574, 2575, 2570,
-     2572, 2576, 2576, 2575, 2580, 2571, 2577, 2577, 2578, 2578,
-     2579, 2579, 2581, 2582, 2573, 2586, 2580, 2574, 2582, 2583,
-
-     2583, 2584, 2584, 2585, 2585, 2587, 2588, 2586, 2589, 2590,
-     2581, 2591, 2592, 2592, 2593, 2594, 2594, 2598, 2588, 2595,
-     2595, 2596, 2597, 2597, 2599, 2587, 2600, 2591, 2589, 2598,
-     2590, 2599, 2596, 2593, 2601, 2602, 2603, 2604, 2600, 2606,
-     2602, 2605, 2605, 2607, 2607, 2608, 2609, 2610, 2606, 2611,
-     2612, 2614, 2613, 2614, 2601, 2615, 2603, 2604, 2616, 2616,
-     2610, 2617, 2618, 2619, 2612, 2621, 2609, 2615, 2622, 2623,
-     2617, 2608, 2624, 2611, 2613, 2624, 2626, 2618, 2619, 2625,
-     2627, 2626, 2635, 2621, 2637, 2627, 2628, 2628, 2629, 2629,
-     2622, 2636, 2623, 2625, 2630, 2630, 2632, 2632, 2634, 2634,
-
-     2635, 2638, 2636, 2637, 2640, 2641, 2642, 2643, 2644, 2645,
-     2646, 2647, 2646, 2721, 2648, 2649, 2638, 2644, 2650, 2650,
-     2655, 2652, 2654, 2641, 2640, 2652, 2721, 2643, 2642, 2645,
-     2656, 2647, 2648, 2649, 2653, 2653, 2654, 2657, 2657, 2656,
-     2659, 2661, 2655, 2660, 2660, 2662, 2663, 2664, 2666, 2659,
-     2665, 2667, 2668, 2669, 2664, 2670, 2671, 2671, 2673, 2661,
-     2672, 2672, 2670, 2662, 2663, 2665, 2666, 2674, 2668, 2667,
-     2675, 2679, 2669, 2677, 2677, 2680, 2675, 2679, 2673, 2678,
-     2678, 2681, 2682, 2683, 2684, 2674, 2685, 2686, 2687, 2684,
-     2688,    0, 2689, 2680, 2689, 2688, 2681, 2683, 2686, 2690,
-
-     2690, 2682, 2691, 2694, 2691, 2696, 2685, 2697, 2687, 2692,
-     2692, 2698, 2699, 2700, 2696, 2701, 2702, 2706, 2700, 2703,
-     2701, 2707, 2694, 2698, 2708, 2710, 2697, 2708, 2709, 2709,
-     2711, 2713, 2699, 2712, 2712, 2714, 2702, 2706, 2703, 2707,
-     2710, 2715, 2713, 2717, 2723, 2715, 2718, 2719, 2711, 2724,
-     2714, 2719, 2718, 2720, 2720, 2725, 2726, 2726, 2717, 2723,
-     2728, 2729, 2730, 2731, 2731, 2733, 2730, 2732, 2732, 2724,
-     2729, 2735, 2728, 2734, 2734, 2725, 2735, 2736, 2737, 2738,
-     2739, 2740, 2740, 2746, 2733, 2748, 2736, 2745, 2745, 2747,
-     2747, 2738, 2751, 2749, 2737, 2750, 2754, 2754, 2748, 2755,
-
-     2739, 2751, 2752, 2753, 2767, 2746, 2749, 2756, 2750, 2758,
-     2758, 2752, 2753, 2761, 2764, 2763, 2765, 2766, 2761, 2755,
-     2763, 2765, 2756, 2767, 2768, 2766, 2769, 2771, 2764, 2775,
-     2773, 2774, 2779, 2768, 2769, 2773, 2774, 2776, 2776, 2777,
-     2777, 2778, 2771, 2781, 2775, 2783, 2778, 2780, 2780, 2782,
-     2781, 2779, 2784, 2785, 2782, 2786, 2787, 2787, 2788, 2785,
-     2786, 2789, 2794, 2783, 2790, 2790, 2789, 2791, 2791,    0,
-     2784, 2795, 2795, 2788, 2796, 2794, 2797, 2796, 2798, 2799,
-     2800, 2797, 2797, 2798, 2799, 2801, 2802, 2803, 2804, 2805,
-     2802, 2801, 2803, 2806, 2800, 2807, 2808, 2804, 2810, 2809,
-
-     2811, 2806, 2808, 2810, 2805, 2809, 2812, 2812, 2814, 2815,
-     2816, 2818, 2811, 2816, 2815, 2814, 2807, 2820, 2823, 2821,
-     2822, 2824, 2820, 2818, 2821, 2822, 2825, 2829, 2826, 2827,
-     2827, 2828, 2829, 2832, 2824, 2825, 2823, 2826, 2833, 2834,
-     2828, 2837, 2838, 2841, 2833, 2834, 2839, 2840, 2840, 2842,
-     2841, 2832, 2843, 2847, 2844, 2845, 2846, 2846, 2849, 2851,
-     2837, 2843, 2838, 2852, 2854, 2839, 2857, 2852, 2842, 2844,
-     2845, 2855, 2847, 2849, 2853, 2853, 2856, 2855, 2861, 2851,
-     2858, 2865, 2856, 2860, 2857, 2862, 2858, 2859, 2859, 2854,
-     2862, 2860, 2864, 2867, 2865, 2868, 2869, 2870, 2868, 2867,
-
-     2869, 2864, 2872, 2861, 2871, 2871, 2874, 2874, 2875, 2876,
-     2876, 2870, 2877, 2877, 2879, 2879, 2880, 2872, 2881, 2882,
-     2880, 2884, 2884, 2881, 2886, 2887, 2875, 2888, 2882, 2889,
-     2887, 2890, 2892,    0, 2889, 2889, 2893, 2893, 2899, 2888,
-     2895, 2895, 2900, 2890, 2886, 2896, 2896, 2897, 2897, 2903,
-     2898, 2899, 2892, 2898, 2905, 2900, 2902, 2902, 2906, 2906,
-     2907, 2907, 2908, 2908, 2909, 2910, 2910, 2903, 2911, 2912,
-     2913, 2914, 2915, 2915, 2905, 2923, 2916, 2914, 2920, 2909,
-     2916, 2911, 2919, 2920, 2913, 2922, 2924, 2912, 2919, 2925,
-     2922, 2922, 2928, 2926, 2927, 2930, 2930, 2929, 2923, 2926,
-
-     2927, 2929, 2933, 2935, 2938, 2936, 2924, 2933, 2936, 2925,
-     2939, 2935, 2943, 2939, 2940, 2940, 2941, 2928, 2942, 2944,
-     2951, 2945, 2947, 2942, 2946, 2946, 2950, 2949, 2951, 2938,
-     2943, 2955,    0, 2941, 2941, 2945, 2947, 2948, 2953, 2944,
-     2948, 2949, 2963, 2953, 2953, 2950, 2954, 2963, 2948, 2962,
-     2955, 2954, 2954, 2956, 2956, 2957, 2957, 2958, 2958, 2959,
-     2959, 2960, 2960, 2961, 2961, 2962, 2964, 2965, 2966, 2967,
-     2968, 2969, 2970, 2978, 2967, 2971, 2969, 2972, 2974, 2974,
-     2981, 2970, 2966, 2975, 2975, 2976, 2964, 2981, 2976, 2968,
-     2977, 2978, 2991, 2965,    0, 2971, 2977, 2972, 2980, 2980,
-
-     2982, 2982, 2983, 2985, 2985, 2986, 2987, 2983, 2988, 2989,
-     2991, 2992, 2992, 2995, 2986, 2987, 2996, 2988, 2989, 2993,
-     2993, 2994, 2995, 2997, 2998, 2994, 2999, 3001, 3002, 3003,
-     3009, 2999, 2999, 3003, 2997, 2996, 3007, 3002, 3012, 2998,
-     3001, 3007, 3008, 3008, 3009, 3011, 3011, 3013, 3014, 3016,
-     3016, 3017, 3012, 3018, 3022, 3024, 3023, 3026, 3029, 3031,
-     3017, 3023, 3027, 3064, 3024, 3018, 3014, 3064, 3027, 3033,
-     3029, 3034, 3013, 3038, 3033, 3036, 3034, 3026, 3038, 3022,
-     3031, 3035, 3035, 3039, 3036, 3040, 3041, 3041, 3043, 3043,
-     3041, 3044, 3044, 3045, 3045, 3046, 3039, 3047, 3049, 3040,
-
-     3048, 3051, 3055, 3049, 3046, 3052, 3053, 3051, 3054, 3054,
-     3052, 3053, 3056, 3057, 3059, 3061, 3058, 3047, 3065, 3048,
-     3055, 3058, 3060, 3065, 3056, 3062, 3062, 3068, 3060, 3069,
-     3066, 3072, 3059, 3070, 3057, 3066, 3067, 3067, 3074, 3074,
-     3061, 3076, 3077, 3078, 3069, 3079, 3068, 3081, 3070, 3079,
-     3080, 3072, 3082, 3083, 3076, 3077, 3078, 3084, 3085, 3080,
-     3087, 3083, 3084, 3081, 3086, 3086, 3088, 3089, 3091, 3087,
-     3094, 3082, 3090, 3090, 3095, 3094, 3094, 3098, 3085, 3102,
-     3095, 3096, 3096, 3103, 3088, 3100, 3100, 3091, 3105, 3104,
-     3110, 3106, 3113, 3089, 3104, 3102, 3106, 3111, 3098, 3103,
-
-     3109, 3109, 3112, 3114, 3105, 3117, 3111, 3118, 3112, 3123,
-     3110, 3116, 3116, 3119, 3119, 3113, 3125, 3121, 3124, 3117,
-     3127, 3125, 3114, 3121, 3124, 3130, 3118, 3128, 3128, 3123,
-     3129, 3129, 3131, 3132, 3132, 3133, 3134, 3135, 3136, 3137,
-     3130, 3139, 3127, 3138, 3136, 3134, 3133, 3140, 3140, 3141,
-     3149, 3142, 3131, 3132, 3142, 3138, 3143, 3135, 3137, 3143,
-     3148, 3139, 3144, 3144, 3141, 3150, 3151, 3151, 3153, 3154,
-     3149, 3150, 3148, 3152, 3153, 3156, 3152, 3157, 3157, 3158,
-     3156, 3159, 3160, 3164, 3158, 3161, 3165, 3154, 3160, 3162,
-     3162, 3166, 3167, 3168, 3168, 3164, 3169, 3170, 3171,    0,
-
-     3159, 3176, 3161, 3161, 3165, 3167, 3176, 3171, 3173, 3173,
-     3174, 3174, 3177, 3170, 3178, 3169, 3166, 3175, 3175, 3178,
-     3179, 3179, 3180, 3180, 3181, 3181, 3177, 3182, 3182, 3183,
-     3184, 3185, 3189, 3186, 3188, 3188, 3193, 3185, 3186, 3191,
-     3191, 3195, 3183, 3196, 3198, 3197, 3199, 3199, 3189, 3201,
-     3201, 3202, 3203, 3204, 3205, 3193, 3184, 3207, 3207, 3206,
-     3208, 3208, 3210, 3195, 3197, 3196, 3198, 3204, 3206, 3211,
-     3212, 3203, 3213, 3214, 3205, 3211, 3217, 3202, 3214, 3222,
-     3210, 3218, 3218, 3220, 3220, 3229, 3224, 3221, 3223, 3229,
-     3212, 3213, 3221, 3222, 3223, 3225, 3227, 3217, 3224, 3226,
-
-     3226, 3227, 3230, 3225, 3231, 3232, 3233, 3230, 3234, 3235,
-     3237, 3233, 3238, 3239, 3240, 3235, 3243, 3242, 3237, 3244,
-     3234, 3245, 3246, 3248, 3231, 3232, 3249, 3246, 3248, 3253,
-     3255, 3238, 3243, 3239, 3240, 3242, 3244, 3244, 3250, 3281,
-     3251, 3268, 3245, 3255, 3250, 3251, 3249, 3254, 3281, 3253,
-     3254, 3259, 3259, 3260, 3260, 3261, 3266, 3266, 3267, 3261,
-     3268, 3269, 3269, 3267, 3271, 3273, 3273, 3274, 3274, 3278,
-     3274, 3275, 3275, 3278, 3275, 3276, 3276, 3277, 3277, 3271,
-     3277, 3280, 3282, 3282, 3283, 3284, 3280, 3287, 3287, 3288,
-     3289, 3290, 3291, 3291, 3292, 3295, 3290, 3296, 3298, 3284,
-
-     3299, 3297, 3283, 3301, 3296, 3297, 3302, 3298, 3304, 3288,
-     3289, 3302, 3303, 3303, 3292, 3299, 3308, 3304, 3305, 3305,
-     3295, 3301, 3306, 3306, 3307, 3307, 3310, 3309, 3311, 3313,
-     3312, 3308, 3309, 3311, 3311, 3310, 3312, 3314, 3310, 3315,
-     3316, 3317, 3318, 3319, 3319, 3316, 3317, 3320, 3324, 3321,
-     3322, 3322, 3314, 3320, 3313, 3321, 3323, 3323, 3333, 3325,
-     3315, 3318, 3331, 3324, 3325, 3328, 3328, 3330, 3330, 3335,
-     3335, 3331, 3336, 3336, 3337, 3337, 3333, 3338, 3338, 3340,
-     3340, 3341, 3341, 3342, 3342, 3343, 3343, 3344, 3346, 3347,
-     3347, 3348, 3348, 3349, 3350, 3351, 3356, 3346, 3353, 3353,
-
-     3354, 3357, 3349, 3355, 3355, 3358, 3350, 3359, 3359, 3360,
-     3360, 3356, 3362, 3344, 3357, 3351, 3366, 3358, 3368, 3354,
-     3363, 3363, 3367, 3369, 3369, 3367, 3372, 3362, 3370, 3372,
-     3373, 3374, 3375, 3376, 3366, 3377, 3373, 3375, 3378, 3381,
-     3388, 3380, 3385, 3389, 3368, 3374, 3370, 3380, 3381, 3403,
-     3403, 3384, 3376, 3377, 3378, 3384, 3398, 3385, 3402, 3399,
-     3408, 3398, 3399, 3389, 3404, 3404, 3388, 3406, 3406, 3409,
-     3410, 3402, 3411, 3413, 3410, 3415, 3417, 3416, 3409, 3419,
-     3418, 3417, 3418, 3408, 3420, 3420, 3421, 3413, 3416, 3422,
-     3424, 3423, 3411, 3425, 3419, 3426, 3427, 3429, 3415, 3421,
-
-     3428, 3430, 3429, 3439, 3432, 3427, 3424, 3434, 3422, 3423,
-     3426, 3431, 3428, 3433, 3433, 3435, 3431, 3439, 3425, 3440,
-     3435, 3442, 3430, 3432, 3441, 3441, 3447, 3434, 3443, 3443,
-     3442, 3444, 3444, 3445, 3445, 3446, 3446, 3448, 3449, 3440,
-     3452, 3449, 3450, 3451, 3453, 3447, 3454, 3450, 3451, 3455,
-     3456, 3457, 3454, 3458, 3458, 3459, 3457, 3448, 3464, 3453,
-     3460, 3460, 3456, 3455, 3465, 3452, 3461, 3461, 3463, 3463,
-     3466, 3466, 3468, 3464, 3470, 3459, 3473, 3473, 3474, 3474,
-     3475, 3476, 3479, 3465, 3477, 3478, 3480, 3468, 3475, 3481,
-     3477, 3478, 3470, 3482, 3483, 3483, 3479, 3489, 3482, 3480,
-
-     3476, 3485, 3485, 3490, 3495, 3492, 3493, 3496, 3481, 3497,
-     3493, 3500, 3496, 3498, 3499, 3501, 3502, 3506, 3489, 3492,
-     3501, 3502, 3507, 3490, 3495, 3508, 3498, 3499, 3497, 3511,
-     3500, 3503, 3503, 3509, 3509, 3511, 3510, 3506, 3512, 3512,
-     3507, 3510, 3513, 3514, 3508, 3515, 3516, 3513, 3514, 3517,
-     3515, 3519, 3519, 3520, 3524, 3517, 3521, 3521, 3520, 3523,
-     3525, 3526, 3527, 3523, 3528, 3516, 3529, 3525, 3537, 3530,
-     3528, 3532, 3532, 3524, 3534, 3534, 3538, 3535, 3536, 3539,
-     3526, 3527, 3530, 3536, 3542, 3529, 3535, 3537, 3541, 3535,
-     3540, 3540, 3539, 3541, 3544, 3538, 3546, 3542, 3545, 3545,
-
-     3547, 3547, 3548, 3548, 3549, 3550, 3551, 3552, 3552, 3549,
-        0, 3553, 3550, 3555, 3555, 3546, 3553, 3554, 3558, 3554,
-     3544, 3556, 3557, 3560, 3563, 3551, 3559, 3567, 3556, 3557,
-     3565, 3559, 3562, 3562, 3566, 3565, 3568, 3558, 3572, 3566,
-     3569, 3569, 3560, 3563, 3571, 3571, 3567, 3573, 3574, 3574,
-     3575, 3575, 3576, 3578, 3578, 3568, 3580, 3572, 3586, 3576,
-     3579, 3579, 3582, 3580, 3585, 3587, 3573, 3582,    0, 3585,
-     3588, 3588, 3589, 3589,    0,    0,    0, 3586,    0,    0,
-        0,    0,    0,    0, 3587, 3593, 3593, 3593, 3593, 3593,
-     3593, 3593, 3594, 3594, 3594, 3594, 3594, 3594, 3594, 3595,
-
-     3595, 3595, 3595, 3595, 3595, 3595, 3596, 3596, 3596, 3596,
-     3596, 3596, 3596, 3597, 3597, 3597, 3597, 3597, 3597, 3597,
-     3598, 3598, 3598, 3598, 3598, 3598, 3598, 3599, 3599, 3599,
-     3599, 3599, 3599, 3599, 3601, 3601,    0, 3601, 3601, 3601,
-     3601, 3602, 3602,    0,    0,    0, 3602, 3602, 3603, 3603,
-        0,    0, 3603,    0, 3603, 3604,    0,    0,    0,    0,
-        0, 3604, 3605, 3605,    0,    0,    0, 3605, 3605, 3606,
-        0,    0,    0,    0,    0, 3606, 3607, 3607,    0, 3607,
-     3607, 3607, 3607, 3608,    0,    0,    0,    0,    0, 3608,
-     3609, 3609,    0,    0,    0, 3609, 3609, 3610, 3610,    0,
-
-     3610, 3610, 3610, 3610, 3592, 3592, 3592, 3592, 3592, 3592,
-     3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592,
-     3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592,
-     3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592, 3592,
-     3592, 3592, 3592, 3592, 3592
+     2103, 2104, 2100, 2105, 2105, 2102, 2106, 2106, 2107, 2110,
+     2112, 2101, 2098, 2108, 2109, 2106, 2111, 2113, 2116, 2117,
+       17, 2104, 2103, 2118, 2110, 2108, 2109, 2120, 2111, 2107,
+        0, 2114, 2113, 2114, 2121, 2118, 2112, 2114, 2116, 2119,
+     2119, 2122, 2117, 2123, 2122, 2120, 2124, 2126, 2123, 2127,
+     2114, 2127, 2126, 2128, 2121, 2129, 2130, 2134, 2132, 2135,
+     2129, 2136, 2137, 2130, 2137, 2138, 2124, 2132, 2135, 2142,
+     2139, 2128, 2141, 2136, 2141, 2134, 2139, 2143, 2143, 2144,
+
+     2145, 2149, 2147, 2142, 2138, 2145, 2146, 2147, 2146, 2148,
+     2150, 2151, 2152, 2154, 2148, 2153, 2156, 2155, 2152, 2149,
+     2153, 2156, 2156, 2159, 2157, 2144, 2154, 2160, 2150, 2155,
+     2164, 2151, 2157, 2161, 2161, 2162, 2162, 2163, 2165, 2167,
+     2166, 2160, 2159, 2169, 2167, 2164, 2166, 2168, 2163, 2168,
+     2172, 2170, 2171, 2171, 2173, 2173, 2174, 2174, 2165, 2170,
+     2175, 2169, 2172, 2176, 2177, 2180, 2179, 2170, 2176, 2175,
+     2179, 2181, 2182, 2181, 2180, 2183, 2184, 2180, 2185, 2186,
+     2183, 2183, 2177, 2188, 2189, 2190, 2192, 2185, 2184, 2189,
+     2190, 2186, 2193, 2182, 2194, 2188, 2195, 2195, 2196, 2192,
+
+     2197, 2198, 2200, 2194, 2199, 2203, 2208, 2201, 2202, 2207,
+     2203, 2208, 2193, 2205, 2206, 2210, 2196, 2209, 2197, 2198,
+     2199, 2201, 2209, 2202, 2210, 2205, 2206, 2200, 2211, 2207,
+     2214, 2216, 2217, 2218, 2219, 2220, 2214, 2216, 2221, 2222,
+     2222, 2223, 2224, 2224, 2225, 2226, 2211, 2221, 2218, 2214,
+     2223, 2228, 2219, 2227, 2229, 2217, 2228, 2227, 2231, 2232,
+     2220, 2233, 2225, 2234, 2226, 2232, 2235, 2229, 2234, 2234,
+     2236, 2237, 2235, 2238, 2237, 2239, 2236, 2231, 2242, 2242,
+     2244, 2238, 2247, 2233, 2243, 2243, 2245, 2245, 2248, 2244,
+     2246, 2246, 2249, 2256, 2247, 2239, 2250, 2256, 2249, 2243,
+
+     2257, 2250, 2251, 2251, 2252, 2252, 2248, 2253, 2254, 2258,
+     2243, 2259, 2253, 2258, 2254, 2261, 2262, 2264, 2263, 2265,
+     2257, 2262, 2267, 2269, 2265, 2266, 2268, 2270, 2269, 2271,
+     2271, 2259, 2264, 2272, 2274, 2273, 2275, 2272, 2267, 2274,
+     2261, 2263, 2276, 2266, 2277, 2278, 2268, 2279, 2280, 2270,
+     2273, 2281, 2282, 2280, 2275, 2283, 2283, 2278, 2286, 2285,
+     2287, 2288, 2277, 2289, 2281, 2290, 2279, 2285, 2276, 2291,
+     2282, 2292, 2293, 2294, 2299, 2295, 2297, 2286, 2303, 2287,
+     2288, 2295, 2300, 2302, 2293, 2302, 2289, 2299, 2291, 2290,
+     2305, 2297, 2292, 2301, 2294, 2305, 2300, 2307, 2303, 2301,
+
+     2304, 2304, 2306, 2308, 2309, 2306, 2310, 2311, 2311, 2315,
+     2307, 2312, 2312, 2313,    0, 2313, 2314, 2314, 2309, 2310,
+     2316, 2317, 2317, 2319, 2315, 2318, 2318, 2308, 2320, 2320,
+     2321, 2321, 2319, 2316, 2322, 2319, 2324, 2325, 2326, 2322,
+     2327, 2324, 2328, 2328, 2329, 2329, 2330, 2331, 2331, 2332,
+     2333, 2333, 2327, 2334, 2335, 2336, 2336, 2325, 2326, 2335,
+     2337, 2337, 2338, 2339, 2340, 2330, 2341, 2332, 2334, 2342,
+     2344, 2346, 2339, 2345, 2345, 2344, 2338, 2347, 2347, 2348,
+     2341, 2340, 2349, 2350, 2352, 2352, 2354, 2349, 2342, 2350,
+     2346, 2351, 2353, 2353, 2351, 2355, 2356, 2348, 2356, 2358,
+
+     2352, 2359, 2360, 2360, 2362, 2354, 2363, 2364, 2365, 2366,
+     2355, 2367, 2367, 2366, 2358, 2368, 2370, 2369, 2371, 2374,
+     2359, 2363, 2369, 2365, 2362, 2373, 2373, 2376, 2375, 2377,
+     2364, 2370, 2378, 2371, 2368, 2375, 2379, 2380,    0, 2374,
+     2382, 2376, 2381, 2381, 2383, 2387, 2383, 2377, 2386, 2382,
+     2378, 2379, 2384, 2388, 2386, 2384, 2389, 2387, 2388, 2390,
+     2391, 2389, 2392, 2380, 2393, 2394, 2396, 2399, 2402, 2393,
+     2384, 2396, 2384, 2391, 2397, 2398, 2407, 2410, 2403, 2397,
+     2398, 2400, 2399, 2392, 2390, 2405, 2401, 2400, 2404, 2402,
+     2405, 2394, 2401, 2403, 2404, 2406, 2408, 2410, 2411, 2409,
+
+     2406, 2407, 2409, 2412, 2413, 2414, 2415, 2411, 2420, 2408,
+     2416, 2417, 2412, 2413, 2414, 2418, 2416, 2417, 2422, 2418,
+     2415, 2423, 2424, 2424, 2427, 2425, 2426, 2426, 2420, 2429,
+     2423, 2425, 2430, 2427, 2429, 2426, 2428, 2428, 2422, 2432,
+     2433, 2434, 2434, 2435, 2436, 2438, 2439, 2441, 2440, 2445,
+     2447, 2447, 2430, 2436, 2430, 2432, 2433, 2438, 2435, 2441,
+     2444, 2443, 2439, 2440, 2443, 2444, 2446, 2448, 2448, 2445,
+     2450, 2450, 2451, 2457, 2452, 2451, 2453, 2454, 2446, 2452,
+     2455, 2459, 2453, 2454, 2456, 2456, 2460, 2457, 2461, 2455,
+     2458, 2458, 2463, 2459, 2462, 2462, 2464, 2465, 2463, 2467,
+
+     2460, 2468, 2465, 2467, 2468, 2469, 2469, 2461, 2470, 2471,
+     2464, 2472, 2473, 2470, 2471, 2474, 2476, 2476, 2475, 2477,
+     2472, 2473, 2475, 2479, 2480, 2481, 2482, 2483, 2479, 2484,
+     2485, 2486, 2477, 2484, 2487, 2474, 2486, 2488, 2489, 2489,
+     2487, 2483, 2490, 2488, 2480, 2481, 2482, 2491, 2492, 2493,
+     2485, 2494, 2495, 2495, 2493, 2498, 2497, 2499, 2500, 2501,
+     2490, 2502, 2499, 2507, 2500, 2501, 2491, 2492, 2497, 2502,
+     2505, 2498, 2494, 2503, 2511, 2503,    0, 2507, 2516, 2505,
+     2508, 2508, 2509, 2510, 2516, 2509, 2510, 2512, 2512, 2515,
+     2517, 2518, 2518, 2515, 2519, 2522, 2522, 2524, 2526, 2530,
+
+     2511, 2527, 2517, 2519, 2530, 2531, 2532, 2543, 2533, 2534,
+     2535, 2535, 2526, 2533, 2534, 2524, 2539, 2527, 2537, 2537,
+     2540, 2542, 2539, 2541, 2541, 2544, 2546, 2532,    0, 2543,
+     2544, 2531, 2547, 2552, 2548, 2547, 2549, 2542, 2550, 2550,
+     2540, 2553, 2552, 2554, 2555, 2546, 2548, 2553, 2549, 2554,
+     2556, 2558, 2558, 2559, 2560,    0, 2559, 2561, 2563, 2563,
+     2564, 2564, 2555, 2565, 2566, 2556, 2568, 2567, 2565, 2569,
+     2570, 2571, 2570, 2560, 2569, 2561, 2567, 2572, 2573, 2568,
+     2575, 2574, 2566, 2576, 2577, 2571, 2574, 2578, 2578, 2577,
+     2573, 2572, 2579, 2579, 2580, 2580, 2581, 2581, 2582, 2583,
+
+     2575, 2584, 2588, 2576, 2585, 2585, 2584, 2586, 2586, 2589,
+     2582, 2587, 2587, 2590, 2588, 2591, 2592, 2583, 2593, 2594,
+     2594, 2595, 2596, 2596, 2600, 2590, 2597, 2597, 2598, 2589,
+     2599, 2599, 2602, 2603, 2593, 2591, 2600, 2592, 2601, 2598,
+     2595, 2604, 2605, 2606, 2602, 2601, 2604, 2607, 2607, 2608,
+     2609, 2609, 2610, 2603, 2611, 2612, 2613, 2614, 2608, 2615,
+     2617, 2623, 2605, 2606, 2616, 2624, 2616, 2619, 2612, 2618,
+     2618, 2614, 2617, 2620, 2611, 2621, 2619, 2625, 2610, 2623,
+     2613, 2615, 2626, 2627, 2628, 2626, 2629, 2624, 2620, 2628,
+     2621, 2629, 2630, 2630, 2631, 2631, 2637, 2627, 2632, 2632,
+
+     2625, 2634, 2634, 2636, 2636, 2638, 2639, 2640, 2642, 2643,
+     2644, 2645, 2646, 2647, 2637, 2648, 2638, 2648, 2649, 2650,
+     2654, 2646, 2640, 2651, 2654, 2639, 2656, 2643, 2642, 2652,
+     2652, 2645, 2644, 2647, 2655, 2655, 2657, 2650, 2649, 2658,
+     2656, 2651, 2659, 2659, 2661, 2662, 2662, 2663, 2658, 2664,
+     2665, 2667, 2666, 2661, 2668, 2669, 2671, 2672, 2657, 2666,
+     2670, 2673, 2673, 2675, 2672, 2663, 2667, 2664, 2665, 2674,
+     2674, 2676, 2668, 2669, 2677, 2671, 2670, 2679, 2679, 2681,
+     2677, 2680, 2680, 2675, 2682, 2681, 2683, 2685, 2684, 2676,
+     2687, 2686, 2688, 2690, 2691, 2687, 2689,    0, 2692, 2691,
+
+     2692, 2697, 2682, 2684, 2683, 2686, 2685, 2689, 2693, 2693,
+     2695, 2695, 2688, 2690, 2694, 2699, 2694, 2700, 2701, 2702,
+     2697, 2703, 2704, 2705, 2699, 2706, 2703, 2704, 2709, 2710,
+     2701, 2711, 2712, 2712, 2711, 2713, 2700, 2714, 2716, 2702,
+     2715, 2715, 2717, 2705, 2706, 2720, 2727, 2710, 2709, 2716,
+     2713, 2724, 2718, 2721, 2722, 2714, 2718, 2717, 2722, 2721,
+     2720, 2723, 2723, 2726, 2724, 2728, 2727, 2729, 2729, 2731,
+     2732, 2733, 2734, 2734, 2736, 2733, 2735, 2735, 2726, 2732,
+     2740, 2731, 2737, 2737, 2738, 2728, 2739, 2741, 2742, 2738,
+     2743, 2743, 2749, 2736, 2751, 2739, 2740, 2748, 2748, 2741,
+
+     2750, 2750, 2752, 2753, 2754, 2757, 2757, 2751, 2742, 2755,
+     2756, 2758, 2759, 2754, 2749, 2752, 2753, 2764, 2755, 2756,
+     2761, 2761, 2764, 2766, 2767, 2768, 2769, 2759, 2766, 2770,
+     2768, 2758, 2771,    0, 2769, 2772, 2774, 2776, 2767, 2777,
+     2778, 2771, 2776, 2772, 2777, 2779, 2779, 2781, 2770, 2780,
+     2780, 2774, 2781, 2782, 2784, 2778, 2783, 2783, 2785, 2786,
+     2787, 2784, 2788, 2785, 2789, 2790, 2790, 2791, 2788, 2789,
+     2792, 2797, 2782, 2793, 2793, 2792, 2801, 2786, 2787, 2794,
+     2794, 2801, 2791, 2800, 2797, 2798, 2798, 2799, 2800, 2800,
+     2799, 2802, 2803, 2804, 2805, 2806, 2802, 2808, 2805, 2804,
+
+     2806, 2807, 2810, 2809, 2813, 2814, 2803, 2811, 2812, 2813,
+     2807, 2809, 2808, 2811, 2812, 2815, 2815, 2814, 2817, 2818,
+     2821, 2826, 2823, 2810, 2818, 2817, 2819, 2823, 2824, 2819,
+     2825, 2827, 2821, 2824, 2828, 2825, 2829, 2830, 2830, 2826,
+     2831, 2832, 2835, 2828, 2827, 2829, 2832, 2836, 2837, 2831,
+     2840, 2841, 2842, 2836, 2837, 2843, 2844, 2844, 2845, 2846,
+     2835, 2847, 2848, 2851, 2849, 2845, 2850, 2850, 2853, 2840,
+     2847, 2841, 2842, 2855, 2843, 2858, 2856, 2848, 2846, 2849,
+     2856, 2859, 2851, 2853, 2857, 2857, 2860, 2859, 2861, 2862,
+     2863, 2863, 2860, 2855, 2864, 2862, 2865, 2869, 2866, 2868,
+
+     2858, 2871, 2864, 2866, 2874, 2876, 2861, 2871, 2868, 2872,
+     2869, 2873, 2872, 2875, 2875, 2873, 2878, 2878, 2874, 2879,
+     2876, 2865, 2880, 2880, 2881, 2881, 2883, 2883, 2884, 2885,
+     2886, 2890, 2884, 2891, 2885, 2888, 2888, 2879, 2891, 2886,
+     2892, 2893, 2894, 2896, 2897, 2897, 2893, 2893, 2899, 2899,
+     2902, 2890, 2892, 2902, 2894, 2900, 2900, 2901, 2901, 2903,
+     2904, 2906, 2906, 2896, 2907, 2909, 2910, 2910, 2911, 2911,
+     2912, 2912, 2903, 2904, 2913, 2914, 2914, 2915, 2916, 2917,
+     2918, 2927, 2907, 2919, 2919, 2909, 2918, 2920, 2923, 2913,
+     2915, 2920, 2924, 2917, 2923, 2926, 2916, 2924, 2928, 2929,
+
+     2926, 2926, 2930, 2931, 2927, 2932, 2933, 2942, 2930, 2931,
+     2933, 2934, 2934, 2939, 2940, 2937, 2945, 2940, 2928, 2929,
+     2937, 2939, 2943, 2944, 2944, 2943, 2946, 2947, 2948, 2949,
+     2932, 2946, 2942, 2945, 2945, 2950, 2950, 2951, 2952, 2953,
+     2954, 2952, 2955, 2949, 2959, 2947, 2960, 2960, 2948, 2952,
+     2955, 2951, 2957, 2953, 2969, 2958, 2968, 2957, 2957, 2954,
+     2958, 2958, 2966, 2959, 2961, 2961, 2962, 2962, 2963, 2963,
+     2964, 2964, 2965, 2965, 2967, 2970, 2968, 2971, 2966, 2967,
+     2969, 2972, 2971, 2973, 2974, 2975, 2976, 2977, 2973, 2970,
+     2979, 2979, 2982, 2974, 2980, 2980, 2981, 2983, 2982, 2981,
+
+     2972, 2985, 2985, 2986, 2996, 2975, 2976, 2977, 2987, 2987,
+     2986, 2988, 2990, 2990, 2991, 2983, 2988, 2992, 2993, 2994,
+     2997, 2997, 2996, 2991, 2998, 2998, 2992, 2993, 2994, 2999,
+     3000, 3001, 3002, 2999, 3003, 3004, 3007,    0, 3006, 3000,
+     3004, 3004, 3008, 3002, 3014, 3007, 3008, 3012, 3017, 3003,
+     3001, 3006, 3012, 3013, 3013, 3016, 3016, 3018, 3014, 3019,
+     3021, 3021, 3017, 3022, 3023, 3027, 3028, 3031, 3032, 3029,
+     3036, 3028, 3022, 3034, 3032, 3038, 3023, 3019, 3029, 3039,
+     3038, 3043, 3018, 3041, 3039, 3034, 3043, 3031, 3040, 3040,
+     3027, 3036, 3041, 3044, 3045, 3046, 3046, 3048, 3048, 3046,
+
+     3049, 3049, 3050, 3050, 3051, 3052, 3044, 3053, 3045, 3054,
+     3056, 3060, 3057, 3051, 3054, 3058, 3056, 3057, 3059, 3059,
+     3058, 3061, 3062, 3063, 3064, 3052, 3053, 3066, 3063, 3060,
+     3065, 3067, 3067, 3061, 3069, 3070, 3065, 3073, 3069, 3071,
+     3070, 3077, 3064, 3062, 3071, 3072, 3072, 3074, 3075, 3079,
+     3079, 3081, 3066, 3082, 3083, 3084, 3073, 3086, 3087, 3084,
+     3085, 3077, 3074, 3075, 3081, 3089, 3082, 3083, 3088, 3085,
+     3089, 3090, 3092, 3086, 3091, 3091, 3088, 3087, 3093, 3094,
+     3097, 3092, 3095, 3095, 3096, 3096, 3104, 3100, 3101, 3102,
+     3102, 3090, 3100, 3100, 3101, 3108, 3093, 3106, 3106, 3097,
+
+     3109, 3110, 3111, 3112, 3116, 3094, 3110, 3104, 3112, 3115,
+     3115, 3108, 3117, 3118, 3119, 3120, 3109, 3123, 3111, 3118,
+     3124, 3117, 3122, 3122, 3116, 3125, 3125, 3127, 3129, 3130,
+     3133, 3123, 3136, 3127, 3120, 3130, 3131, 3119, 3137, 3124,
+     3139, 3131, 3134, 3134, 3135, 3135, 3140, 3136, 3129, 3138,
+     3138, 3139, 3133, 3141, 3142, 3140, 3143, 3145, 3137, 3144,
+     3142, 3146, 3146, 3147, 3148, 3149, 3155, 3148, 3149, 3138,
+     3154, 3144, 3160, 3141, 3425, 3143, 3425, 3145, 3147, 3150,
+     3150, 3156, 3154, 3157, 3157, 3158, 3155, 3156, 3158, 3159,
+     3160, 3162, 3163, 3163, 3164, 3159, 3162, 3165, 3166, 3164,
+
+     3167, 3168, 3168, 3170, 3166, 3171, 3172, 3173, 3174, 3174,
+     3175, 3176, 3177, 3179, 3179, 3170, 3165, 3167, 3167, 3213,
+     3173, 3177, 3183, 3171, 3180, 3180, 3190, 3176, 3213, 3175,
+     3182, 3172, 3181, 3181, 3184, 3182, 3183, 3185, 3185, 3184,
+     3186, 3186, 3187, 3187, 3188, 3188, 3189, 3191, 3196, 3192,
+     3195, 3195, 3190, 3191, 3192, 3198, 3198, 3200, 3202, 3189,
+     3203, 3205, 3204, 3209, 3196, 3206, 3206, 3208, 3208, 3210,
+     3211, 3212, 3214, 3214, 3215, 3215, 3200, 3217, 3219, 3218,
+     3202, 3204, 3203, 3205, 3211, 3218, 3220, 3221, 3210, 3209,
+     3224, 3212, 3221, 3225, 3225, 3217, 3227, 3227, 3219, 3228,
+
+     3229, 3230, 3232, 3231, 3228, 3220, 3238, 3230, 3233, 3233,
+     3232, 3224, 3234, 3237, 3229, 3231, 3236, 3234, 3237, 3239,
+     3236, 3241, 3240, 3242, 3244, 3245, 3238, 3240, 3246, 3242,
+     3247, 3249, 3244, 3241, 3252, 3250, 3251, 3253, 3255, 3239,
+     3256, 3257, 3253, 3255, 3245, 3260,    0, 3257, 3246, 3249,
+     3247, 3250, 3258, 3251, 3251, 3252, 3261, 3258, 3262, 3261,
+     3256, 3266, 3266, 3267, 3267, 3260, 3268, 3273, 3273, 3274,
+     3268, 3262, 3275, 3278, 3274, 3276, 3276, 3280, 3280, 3281,
+     3281, 3285, 3281, 3282, 3282, 3285, 3282, 3288, 3278, 3283,
+     3283, 3275, 3284, 3284, 3287, 3284, 3288, 3289, 3289, 3287,
+
+     3290, 3291, 3294, 3294, 3295, 3296, 3297, 3298, 3298, 3299,
+     3302, 3297, 3303, 3304, 3305, 3291, 3306, 3304, 3290, 3303,
+     3308, 3309,    0, 3305, 3295, 3296, 3309, 3310, 3310, 3299,
+     3311, 3306, 3312, 3312, 3315, 3302, 3313, 3313, 3308, 3311,
+     3314, 3314, 3316, 3317, 3320, 3318, 3321, 3316, 3319, 3315,
+     3318, 3318, 3317, 3322, 3319, 3317, 3325, 3323, 3324, 3326,
+     3326, 3321, 3323, 3324, 3327, 3328, 3329, 3329, 3331, 3320,
+     3327, 3328, 3330, 3330, 3322, 3325, 3332, 3335, 3335, 3337,
+     3337, 3332, 3338, 3331, 3340, 3342, 3342, 3343, 3343, 3344,
+     3344, 3338, 3345, 3345, 3347, 3347, 3348, 3348, 3349, 3349,
+
+     3350, 3350, 3340, 3351, 3353, 3354, 3354, 3355, 3355, 3356,
+     3357, 3358, 3363, 3353, 3360, 3360, 3361, 3364, 3356, 3362,
+     3362, 3365, 3357, 3366, 3366, 3367, 3367, 3363, 3369, 3351,
+     3364, 3358, 3373, 3365, 3375, 3361, 3370, 3370, 3374, 3376,
+     3376, 3374, 3379, 3369, 3377, 3379, 3380, 3381, 3382, 3383,
+     3373, 3384, 3380, 3382, 3385, 3388, 3395, 3387, 3392, 3396,
+     3375, 3381, 3377, 3387, 3388, 3410, 3410, 3391, 3383, 3384,
+     3385, 3391, 3405, 3392, 3409, 3406, 3415, 3405, 3406, 3396,
+     3411, 3411, 3395, 3413, 3413, 3416, 3417, 3409, 3418, 3420,
+     3417, 3422, 3424, 3423, 3416, 3426, 3428, 3424, 3429, 3415,
+
+     3427, 3427, 3430, 3420, 3423, 3431, 3432, 3433, 3418, 3428,
+     3426, 3435, 3437, 3436, 3422, 3434, 3439, 3429, 3436, 3441,
+     3430, 3431, 3433, 3435, 3434, 3438, 3440, 3440, 3446, 3442,
+     3438, 3432, 3447, 3437, 3442, 3439, 3448, 3448, 3449, 3441,
+     3450, 3450, 3446, 3451, 3451, 3452, 3452, 3449, 3453, 3453,
+     3454, 3455, 3447, 3456, 3457, 3458, 3456, 3459, 3460, 3457,
+     3458, 3461, 3462, 3463, 3466, 3464, 3471, 3461, 3475, 3454,
+     3464, 3455, 3472, 3460, 3477, 3463, 3462, 3465, 3465, 3467,
+     3467, 3471, 3459, 3475, 3466, 3468, 3468, 3470, 3470, 3473,
+     3473, 3472, 3477, 3480, 3480, 3481, 3481, 3482, 3483, 3486,
+
+     3484, 3485, 3487, 3488, 3489, 3482, 3484, 3485, 3496, 3489,
+     3490, 3490, 3497, 3486, 3499, 3487, 3500, 3483, 3492, 3492,
+     3500, 3502, 3488, 3504, 3505, 3503, 3506, 3507, 3499, 3496,
+     3503, 3508, 3497, 3509, 3510, 3510, 3508, 3505, 3509, 3506,
+     3513, 3502, 3504, 3514, 3515, 3517, 3507, 3516, 3516, 3518,
+     3517, 3519, 3519, 3520, 3521, 3518, 3523, 3522, 3520, 3521,
+     3513, 3514, 3522, 3515, 3524, 3526, 3526, 3527, 3528, 3528,
+     3524, 3531, 3527, 3530, 3532, 3523, 3533, 3530, 3534, 3535,
+     3536, 3532, 3542, 3537, 3544, 3535, 3539, 3539, 3541, 3541,
+     3531, 3542, 3545, 3543, 3542, 3533, 3537, 3534, 3543, 3536,
+
+     3546, 3547, 3547, 3544, 3548, 3549, 3551, 3552, 3552, 3548,
+     3553, 3545, 3558, 3546, 3554, 3554, 3555, 3555, 3549, 3556,
+     3557, 3559, 3559, 3560, 3556, 3562, 3562, 3557, 3560, 3553,
+     3563, 3558, 3551, 3561, 3564, 3561, 3565, 3563, 3566, 3567,
+     3570, 3564, 3572, 3566, 3569, 3569, 3573, 3572, 3574, 3575,
+     3579, 3573, 3576, 3576, 3580, 3565, 3578, 3578, 3567, 3570,
+     3581, 3581, 3582, 3582, 3583, 3585, 3585, 3574, 3575, 3579,
+     3587, 3583, 3593, 3580, 3586, 3586, 3589, 3587, 3592, 3594,
+        0, 3589,    0, 3592, 3595, 3595, 3596, 3596,    0,    0,
+        0, 3593,    0,    0,    0,    0,    0,    0, 3594, 3600,
+
+     3600, 3600, 3600, 3600, 3600, 3600, 3601, 3601, 3601, 3601,
+     3601, 3601, 3601, 3602, 3602, 3602, 3602, 3602, 3602, 3602,
+     3603, 3603, 3603, 3603, 3603, 3603, 3603, 3604, 3604, 3604,
+     3604, 3604, 3604, 3604, 3605, 3605, 3605, 3605, 3605, 3605,
+     3605, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3608, 3608,
+        0, 3608, 3608, 3608, 3608, 3609, 3609,    0,    0,    0,
+     3609, 3609, 3610, 3610,    0,    0, 3610,    0, 3610, 3611,
+        0,    0,    0,    0,    0, 3611, 3612, 3612,    0,    0,
+        0, 3612, 3612, 3613,    0,    0,    0,    0,    0, 3613,
+     3614, 3614,    0, 3614, 3614, 3614, 3614, 3615,    0,    0,
+
+        0,    0,    0, 3615, 3616, 3616,    0,    0,    0, 3616,
+     3616, 3617, 3617,    0, 3617, 3617, 3617, 3617, 3599, 3599,
+     3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599,
+     3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599,
+     3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599,
+     3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599, 3599
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -3389,7 +3393,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 3391 "<stdout>"
+#line 3395 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3607,7 +3611,7 @@ YY_DECL
        {
 #line 211 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 
-#line 3609 "<stdout>"
+#line 3613 "<stdout>"
 
        while ( 1 )             /* loops until end-of-file is reached */
                {
@@ -3640,13 +3644,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 >= 3593 )
+                               if ( yy_current_state >= 3600 )
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        ++yy_cp;
                        }
-               while ( yy_base[yy_current_state] != 7005 );
+               while ( yy_base[yy_current_state] != 7019 );
 
 yy_find_action:
                yy_act = yy_accept[yy_current_state];
@@ -4126,77 +4130,77 @@ YY_RULE_SETUP
 case 91:
 YY_RULE_SETUP
 #line 305 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_KEEP_PROBING) }
+{ YDVAR(1, VAR_INFRA_CACHE_MAX_RTT) }
        YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 306 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
+{ YDVAR(1, VAR_INFRA_KEEP_PROBING) }
        YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 307 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
+{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
        YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 308 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DELAY_CLOSE) }
+{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
        YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 309 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_CONNECT) }
+{ YDVAR(1, VAR_DELAY_CLOSE) }
        YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 310 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
+{ YDVAR(1, VAR_UDP_CONNECT) }
        YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 311 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
+{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
        YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 312 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
+{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
        YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 313 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_GLUE) }
+{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
        YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 314 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
+{ YDVAR(1, VAR_HARDEN_GLUE) }
        YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 315 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
+{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
        YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 316 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
+{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
        YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 317 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
+{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
        YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 318 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
+{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
        YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 319 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CAPS_WHITELIST) }
+{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
        YY_BREAK
 case 106:
 YY_RULE_SETUP
@@ -4206,72 +4210,72 @@ YY_RULE_SETUP
 case 107:
 YY_RULE_SETUP
 #line 321 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
+{ YDVAR(1, VAR_CAPS_WHITELIST) }
        YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 322 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
+{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
        YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 323 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
+{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
        YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 324 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH_KEY) }
+{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
        YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 325 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH) }
+{ YDVAR(1, VAR_PREFETCH_KEY) }
        YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 326 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DENY_ANY) }
+{ YDVAR(1, VAR_PREFETCH) }
        YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 327 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_STUB_ZONE) }
+{ YDVAR(1, VAR_DENY_ANY) }
        YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 328 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_NAME) }
+{ YDVAR(0, VAR_STUB_ZONE) }
        YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 329 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_ADDR) }
+{ YDVAR(1, VAR_NAME) }
        YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 330 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_HOST) }
+{ YDVAR(1, VAR_STUB_ADDR) }
        YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 331 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_PRIME) }
+{ YDVAR(1, VAR_STUB_HOST) }
        YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 332 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_FIRST) }
+{ YDVAR(1, VAR_STUB_PRIME) }
        YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 333 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_NO_CACHE) }
+{ YDVAR(1, VAR_STUB_FIRST) }
        YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 334 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_STUB_NO_CACHE) }
        YY_BREAK
 case 121:
 YY_RULE_SETUP
@@ -4281,37 +4285,37 @@ YY_RULE_SETUP
 case 122:
 YY_RULE_SETUP
 #line 336 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_TCP_UPSTREAM) }
+{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
        YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 337 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_FORWARD_ZONE) }
+{ YDVAR(1, VAR_STUB_TCP_UPSTREAM) }
        YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 338 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_ADDR) }
+{ YDVAR(0, VAR_FORWARD_ZONE) }
        YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 339 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_HOST) }
+{ YDVAR(1, VAR_FORWARD_ADDR) }
        YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 340 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_FIRST) }
+{ YDVAR(1, VAR_FORWARD_HOST) }
        YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 341 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
+{ YDVAR(1, VAR_FORWARD_FIRST) }
        YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 342 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
        YY_BREAK
 case 129:
 YY_RULE_SETUP
@@ -4321,57 +4325,57 @@ YY_RULE_SETUP
 case 130:
 YY_RULE_SETUP
 #line 344 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_TCP_UPSTREAM) }
+{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
        YY_BREAK
 case 131:
 YY_RULE_SETUP
 #line 345 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_AUTH_ZONE) }
+{ YDVAR(1, VAR_FORWARD_TCP_UPSTREAM) }
        YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 346 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_RPZ) }
+{ YDVAR(0, VAR_AUTH_ZONE) }
        YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 347 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_TAGS) }
+{ YDVAR(0, VAR_RPZ) }
        YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 348 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
+{ YDVAR(1, VAR_TAGS) }
        YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 349 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
+{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
        YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 350 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG) }
+{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
        YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 351 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG_NAME) }
+{ YDVAR(1, VAR_RPZ_LOG) }
        YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 352 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_SIGNAL_NXDOMAIN_RA) }
+{ YDVAR(1, VAR_RPZ_LOG_NAME) }
        YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 353 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_ZONEFILE) }
+{ YDVAR(1, VAR_RPZ_SIGNAL_NXDOMAIN_RA) }
        YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 354 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MASTER) }
+{ YDVAR(1, VAR_ZONEFILE) }
        YY_BREAK
 case 141:
 YY_RULE_SETUP
@@ -4381,756 +4385,756 @@ YY_RULE_SETUP
 case 142:
 YY_RULE_SETUP
 #line 356 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_URL) }
+{ YDVAR(1, VAR_MASTER) }
        YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 357 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_ALLOW_NOTIFY) }
+{ YDVAR(1, VAR_URL) }
        YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 358 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
+{ YDVAR(1, VAR_ALLOW_NOTIFY) }
        YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 359 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_UPSTREAM) }
+{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
        YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 360 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FALLBACK_ENABLED) }
+{ YDVAR(1, VAR_FOR_UPSTREAM) }
        YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 361 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_VIEW) }
+{ YDVAR(1, VAR_FALLBACK_ENABLED) }
        YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 362 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_VIEW_FIRST) }
+{ YDVAR(0, VAR_VIEW) }
        YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 363 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
+{ YDVAR(1, VAR_VIEW_FIRST) }
        YY_BREAK
 case 150:
 YY_RULE_SETUP
 #line 364 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
        YY_BREAK
 case 151:
 YY_RULE_SETUP
 #line 365 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
        YY_BREAK
 case 152:
 YY_RULE_SETUP
 #line 366 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
+{ YDVAR(2, VAR_ACCESS_CONTROL) }
        YY_BREAK
 case 153:
 YY_RULE_SETUP
 #line 367 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
+{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
        YY_BREAK
 case 154:
 YY_RULE_SETUP
 #line 368 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
        YY_BREAK
 case 155:
 YY_RULE_SETUP
 #line 369 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
        YY_BREAK
 case 156:
 YY_RULE_SETUP
 #line 370 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
        YY_BREAK
 case 157:
 YY_RULE_SETUP
 #line 371 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
        YY_BREAK
 case 158:
 YY_RULE_SETUP
 #line 372 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
        YY_BREAK
 case 159:
 YY_RULE_SETUP
 #line 373 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
        YY_BREAK
 case 160:
 YY_RULE_SETUP
 #line 374 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
        YY_BREAK
 case 161:
 YY_RULE_SETUP
 #line 375 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
        YY_BREAK
 case 162:
 YY_RULE_SETUP
 #line 376 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_IDENTITY) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
        YY_BREAK
 case 163:
 YY_RULE_SETUP
 #line 377 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_VERSION) }
+{ YDVAR(1, VAR_HIDE_IDENTITY) }
        YY_BREAK
 case 164:
 YY_RULE_SETUP
 #line 378 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
+{ YDVAR(1, VAR_HIDE_VERSION) }
        YY_BREAK
 case 165:
 YY_RULE_SETUP
 #line 379 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_HTTP_USER_AGENT) }
+{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
        YY_BREAK
 case 166:
 YY_RULE_SETUP
 #line 380 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IDENTITY) }
+{ YDVAR(1, VAR_HIDE_HTTP_USER_AGENT) }
        YY_BREAK
 case 167:
 YY_RULE_SETUP
 #line 381 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_VERSION) }
+{ YDVAR(1, VAR_IDENTITY) }
        YY_BREAK
 case 168:
 YY_RULE_SETUP
 #line 382 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_HTTP_USER_AGENT) }
+{ YDVAR(1, VAR_VERSION) }
        YY_BREAK
 case 169:
 YY_RULE_SETUP
 #line 383 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MODULE_CONF) }
+{ YDVAR(1, VAR_HTTP_USER_AGENT) }
        YY_BREAK
 case 170:
 YY_RULE_SETUP
 #line 384 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR) }
+{ YDVAR(1, VAR_MODULE_CONF) }
        YY_BREAK
 case 171:
 YY_RULE_SETUP
 #line 385 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR) }
        YY_BREAK
 case 172:
 YY_RULE_SETUP
 #line 386 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
        YY_BREAK
 case 173:
 YY_RULE_SETUP
 #line 387 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
        YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 388 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
+{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
        YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 389 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
+{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
        YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 390 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
+{ YDVAR(1, VAR_TRUST_ANCHOR) }
        YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 391 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
        YY_BREAK
 case 178:
 YY_RULE_SETUP
 #line 392 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
+{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
        YY_BREAK
 case 179:
 YY_RULE_SETUP
 #line 393 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
+{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
        YY_BREAK
 case 180:
 YY_RULE_SETUP
 #line 394 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
        YY_BREAK
 case 181:
 YY_RULE_SETUP
 #line 395 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_MAX_RESTART) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
        YY_BREAK
 case 182:
 YY_RULE_SETUP
 #line 396 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_BOGUS_TTL) }
+{ YDVAR(1, VAR_VAL_MAX_RESTART) }
        YY_BREAK
 case 183:
 YY_RULE_SETUP
 #line 397 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
+{ YDVAR(1, VAR_BOGUS_TTL) }
        YY_BREAK
 case 184:
 YY_RULE_SETUP
 #line 398 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
+{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
        YY_BREAK
 case 185:
 YY_RULE_SETUP
 #line 399 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
+{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
        YY_BREAK
 case 186:
 YY_RULE_SETUP
 #line 400 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
+{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
        YY_BREAK
 case 187:
 YY_RULE_SETUP
 #line 401 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED) }
+{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
        YY_BREAK
 case 188:
 YY_RULE_SETUP
 #line 402 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED) }
        YY_BREAK
 case 189:
 YY_RULE_SETUP
 #line 403 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
        YY_BREAK
 case 190:
 YY_RULE_SETUP
 #line 404 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
        YY_BREAK
 case 191:
 YY_RULE_SETUP
 #line 405 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
        YY_BREAK
 case 192:
 YY_RULE_SETUP
 #line 406 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_EDE_SERVE_EXPIRED) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
        YY_BREAK
 case 193:
 YY_RULE_SETUP
 #line 407 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_ORIGINAL_TTL) }
+{ YDVAR(1, VAR_EDE_SERVE_EXPIRED) }
        YY_BREAK
 case 194:
 YY_RULE_SETUP
 #line 408 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_DSA) }
+{ YDVAR(1, VAR_SERVE_ORIGINAL_TTL) }
        YY_BREAK
 case 195:
 YY_RULE_SETUP
 #line 409 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_SHA1) }
+{ YDVAR(1, VAR_FAKE_DSA) }
        YY_BREAK
 case 196:
 YY_RULE_SETUP
 #line 410 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_FAKE_SHA1) }
        YY_BREAK
 case 197:
 YY_RULE_SETUP
 #line 411 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
        YY_BREAK
 case 198:
 YY_RULE_SETUP
 #line 412 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
        YY_BREAK
 case 199:
 YY_RULE_SETUP
 #line 413 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
        YY_BREAK
 case 200:
 YY_RULE_SETUP
 #line 414 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ 
-                                 YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
        YY_BREAK
 case 201:
 YY_RULE_SETUP
-#line 416 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_ZONEMD_PERMISSIVE_MODE) }
+#line 415 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+{ 
+                                 YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
        YY_BREAK
 case 202:
 YY_RULE_SETUP
 #line 417 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_ZONEMD_CHECK) }
+{ YDVAR(1, VAR_ZONEMD_PERMISSIVE_MODE) }
        YY_BREAK
 case 203:
 YY_RULE_SETUP
 #line 418 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_ZONEMD_REJECT_ABSENCE) }
+{ YDVAR(1, VAR_ZONEMD_CHECK) }
        YY_BREAK
 case 204:
 YY_RULE_SETUP
 #line 419 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+{ YDVAR(1, VAR_ZONEMD_REJECT_ABSENCE) }
        YY_BREAK
 case 205:
 YY_RULE_SETUP
 #line 420 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
        YY_BREAK
 case 206:
 YY_RULE_SETUP
 #line 421 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
        YY_BREAK
 case 207:
 YY_RULE_SETUP
 #line 422 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
        YY_BREAK
 case 208:
 YY_RULE_SETUP
 #line 423 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
        YY_BREAK
 case 209:
 YY_RULE_SETUP
 #line 424 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_IDENTITY) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
        YY_BREAK
 case 210:
 YY_RULE_SETUP
 #line 425 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_LOG_IDENTITY) }
        YY_BREAK
 case 211:
 YY_RULE_SETUP
 #line 426 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
        YY_BREAK
 case 212:
 YY_RULE_SETUP
 #line 427 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_REPLIES) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
        YY_BREAK
 case 213:
 YY_RULE_SETUP
 #line 428 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
+{ YDVAR(1, VAR_LOG_REPLIES) }
        YY_BREAK
 case 214:
 YY_RULE_SETUP
 #line 429 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
+{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
        YY_BREAK
 case 215:
 YY_RULE_SETUP
 #line 430 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_SERVFAIL) }
+{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
        YY_BREAK
 case 216:
 YY_RULE_SETUP
 #line 431 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_SERVFAIL) }
        YY_BREAK
 case 217:
 YY_RULE_SETUP
 #line 432 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
        YY_BREAK
 case 218:
 YY_RULE_SETUP
 #line 433 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
        YY_BREAK
 case 219:
 YY_RULE_SETUP
 #line 434 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
        YY_BREAK
 case 220:
 YY_RULE_SETUP
 #line 435 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
+{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
        YY_BREAK
 case 221:
 YY_RULE_SETUP
 #line 436 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
        YY_BREAK
 case 222:
 YY_RULE_SETUP
 #line 437 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
        YY_BREAK
 case 223:
 YY_RULE_SETUP
 #line 438 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
        YY_BREAK
 case 224:
 YY_RULE_SETUP
 #line 439 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_ENABLE) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
        YY_BREAK
 case 225:
 YY_RULE_SETUP
 #line 440 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_KEY) }
+{ YDVAR(1, VAR_SHM_ENABLE) }
        YY_BREAK
 case 226:
 YY_RULE_SETUP
 #line 441 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_SHM_KEY) }
        YY_BREAK
 case 227:
 YY_RULE_SETUP
 #line 442 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
        YY_BREAK
 case 228:
 YY_RULE_SETUP
 #line 443 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
        YY_BREAK
 case 229:
 YY_RULE_SETUP
 #line 444 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
        YY_BREAK
 case 230:
 YY_RULE_SETUP
 #line 445 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_USE_CERT) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
        YY_BREAK
 case 231:
 YY_RULE_SETUP
 #line 446 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_USE_CERT) }
        YY_BREAK
 case 232:
 YY_RULE_SETUP
 #line 447 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
        YY_BREAK
 case 233:
 YY_RULE_SETUP
 #line 448 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
        YY_BREAK
 case 234:
 YY_RULE_SETUP
 #line 449 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
        YY_BREAK
 case 235:
 YY_RULE_SETUP
 #line 450 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
        YY_BREAK
 case 236:
 YY_RULE_SETUP
 #line 451 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
        YY_BREAK
 case 237:
 YY_RULE_SETUP
 #line 452 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DYNLIB_FILE) }
+{ YDVAR(0, VAR_PYTHON) }
        YY_BREAK
 case 238:
 YY_RULE_SETUP
 #line 453 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_DYNLIB) }
+{ YDVAR(1, VAR_DYNLIB_FILE) }
        YY_BREAK
 case 239:
 YY_RULE_SETUP
 #line 454 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(0, VAR_DYNLIB) }
        YY_BREAK
 case 240:
 YY_RULE_SETUP
 #line 455 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
        YY_BREAK
 case 241:
 YY_RULE_SETUP
 #line 456 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
+{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
        YY_BREAK
 case 242:
 YY_RULE_SETUP
 #line 457 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
+{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
        YY_BREAK
 case 243:
 YY_RULE_SETUP
 #line 458 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
+{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
        YY_BREAK
 case 244:
 YY_RULE_SETUP
 #line 459 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_PREFIX) }
+{ YDVAR(1, VAR_MAX_UDP_SIZE) }
        YY_BREAK
 case 245:
 YY_RULE_SETUP
 #line 460 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+{ YDVAR(1, VAR_DNS64_PREFIX) }
        YY_BREAK
 case 246:
 YY_RULE_SETUP
 #line 461 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
        YY_BREAK
 case 247:
 YY_RULE_SETUP
 #line 462 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DEFINE_TAG) }
+{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
        YY_BREAK
 case 248:
 YY_RULE_SETUP
 #line 463 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
+{ YDVAR(1, VAR_DEFINE_TAG) }
        YY_BREAK
 case 249:
 YY_RULE_SETUP
 #line 464 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
+{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
        YY_BREAK
 case 250:
 YY_RULE_SETUP
 #line 465 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
        YY_BREAK
 case 251:
 YY_RULE_SETUP
 #line 466 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
        YY_BREAK
 case 252:
 YY_RULE_SETUP
 #line 467 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
        YY_BREAK
 case 253:
 YY_RULE_SETUP
 #line 468 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
        YY_BREAK
 case 254:
 YY_RULE_SETUP
 #line 469 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_DNSTAP) }
+{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
        YY_BREAK
 case 255:
 YY_RULE_SETUP
 #line 470 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_ENABLE) }
+{ YDVAR(0, VAR_DNSTAP) }
        YY_BREAK
 case 256:
 YY_RULE_SETUP
 #line 471 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) }
+{ YDVAR(1, VAR_DNSTAP_ENABLE) }
        YY_BREAK
 case 257:
 YY_RULE_SETUP
 #line 472 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
+{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) }
        YY_BREAK
 case 258:
 YY_RULE_SETUP
 #line 473 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IP) }
+{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
        YY_BREAK
 case 259:
 YY_RULE_SETUP
 #line 474 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS) }
+{ YDVAR(1, VAR_DNSTAP_IP) }
        YY_BREAK
 case 260:
 YY_RULE_SETUP
 #line 475 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
+{ YDVAR(1, VAR_DNSTAP_TLS) }
        YY_BREAK
 case 261:
 YY_RULE_SETUP
 #line 476 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
        YY_BREAK
 case 262:
 YY_RULE_SETUP
 #line 477 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{
-               YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
        YY_BREAK
 case 263:
 YY_RULE_SETUP
-#line 479 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 478 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
+               YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
        YY_BREAK
 case 264:
 YY_RULE_SETUP
-#line 481 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
+#line 480 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+{
+               YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
        YY_BREAK
 case 265:
 YY_RULE_SETUP
 #line 482 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
        YY_BREAK
 case 266:
 YY_RULE_SETUP
 #line 483 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
+{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
        YY_BREAK
 case 267:
 YY_RULE_SETUP
 #line 484 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
        YY_BREAK
 case 268:
 YY_RULE_SETUP
 #line 485 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{
-               YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
+{ YDVAR(1, VAR_DNSTAP_VERSION) }
        YY_BREAK
 case 269:
 YY_RULE_SETUP
-#line 487 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 486 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
        YY_BREAK
 case 270:
 YY_RULE_SETUP
-#line 489 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 488 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
        YY_BREAK
 case 271:
 YY_RULE_SETUP
-#line 491 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 490 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
        YY_BREAK
 case 272:
 YY_RULE_SETUP
-#line 493 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 492 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
        YY_BREAK
 case 273:
 YY_RULE_SETUP
-#line 495 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 494 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
        YY_BREAK
 case 274:
 YY_RULE_SETUP
-#line 497 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+#line 496 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+{
+               YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
        YY_BREAK
 case 275:
 YY_RULE_SETUP
 #line 498 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT) }
+{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
        YY_BREAK
 case 276:
 YY_RULE_SETUP
 #line 499 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
        YY_BREAK
 case 277:
 YY_RULE_SETUP
 #line 500 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_RATELIMIT) }
        YY_BREAK
 case 278:
 YY_RULE_SETUP
 #line 501 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
        YY_BREAK
 case 279:
 YY_RULE_SETUP
 #line 502 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
        YY_BREAK
 case 280:
 YY_RULE_SETUP
 #line 503 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
        YY_BREAK
 case 281:
 YY_RULE_SETUP
 #line 504 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
        YY_BREAK
 case 282:
 YY_RULE_SETUP
 #line 505 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
        YY_BREAK
 case 283:
 YY_RULE_SETUP
 #line 506 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
        YY_BREAK
 case 284:
 YY_RULE_SETUP
 #line 507 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
        YY_BREAK
 case 285:
 YY_RULE_SETUP
 #line 508 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_BACKOFF) }
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
        YY_BREAK
 case 286:
 YY_RULE_SETUP
 #line 509 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_BACKOFF) }
+{ YDVAR(1, VAR_IP_RATELIMIT_BACKOFF) }
        YY_BREAK
 case 287:
 YY_RULE_SETUP
 #line 510 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_OUTBOUND_MSG_RETRY) }
+{ YDVAR(1, VAR_RATELIMIT_BACKOFF) }
        YY_BREAK
 case 288:
 YY_RULE_SETUP
 #line 511 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_LOW_RTT) }
+{ YDVAR(1, VAR_OUTBOUND_MSG_RETRY) }
        YY_BREAK
 case 289:
 YY_RULE_SETUP
 #line 512 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_NUM) }
+{ YDVAR(1, VAR_LOW_RTT) }
        YY_BREAK
 case 290:
 YY_RULE_SETUP
 #line 513 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(1, VAR_FAST_SERVER_NUM) }
        YY_BREAK
 case 291:
 YY_RULE_SETUP
@@ -5145,119 +5149,119 @@ YY_RULE_SETUP
 case 293:
 YY_RULE_SETUP
 #line 516 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
        YY_BREAK
 case 294:
 YY_RULE_SETUP
 #line 517 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP) }
+{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
        YY_BREAK
 case 295:
 YY_RULE_SETUP
 #line 518 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+{ YDVAR(2, VAR_RESPONSE_IP) }
        YY_BREAK
 case 296:
 YY_RULE_SETUP
 #line 519 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_DNSCRYPT) }
+{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
        YY_BREAK
 case 297:
 YY_RULE_SETUP
 #line 520 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
+{ YDVAR(0, VAR_DNSCRYPT) }
        YY_BREAK
 case 298:
 YY_RULE_SETUP
 #line 521 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PORT) }
+{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
        YY_BREAK
 case 299:
 YY_RULE_SETUP
 #line 522 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
+{ YDVAR(1, VAR_DNSCRYPT_PORT) }
        YY_BREAK
 case 300:
 YY_RULE_SETUP
 #line 523 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
        YY_BREAK
 case 301:
 YY_RULE_SETUP
 #line 524 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
+{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
        YY_BREAK
 case 302:
 YY_RULE_SETUP
 #line 525 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
        YY_BREAK
 case 303:
 YY_RULE_SETUP
 #line 526 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{
-               YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
        YY_BREAK
 case 304:
 YY_RULE_SETUP
-#line 528 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 527 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
+               YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
        YY_BREAK
 case 305:
 YY_RULE_SETUP
-#line 530 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
+#line 529 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+{
+               YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
        YY_BREAK
 case 306:
 YY_RULE_SETUP
 #line 531 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
        YY_BREAK
 case 307:
 YY_RULE_SETUP
 #line 532 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PAD_RESPONSES) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
        YY_BREAK
 case 308:
 YY_RULE_SETUP
 #line 533 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PAD_RESPONSES_BLOCK_SIZE) }
+{ YDVAR(1, VAR_PAD_RESPONSES) }
        YY_BREAK
 case 309:
 YY_RULE_SETUP
 #line 534 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PAD_QUERIES) }
+{ YDVAR(1, VAR_PAD_RESPONSES_BLOCK_SIZE) }
        YY_BREAK
 case 310:
 YY_RULE_SETUP
 #line 535 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_PAD_QUERIES_BLOCK_SIZE) }
+{ YDVAR(1, VAR_PAD_QUERIES) }
        YY_BREAK
 case 311:
 YY_RULE_SETUP
 #line 536 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
+{ YDVAR(1, VAR_PAD_QUERIES_BLOCK_SIZE) }
        YY_BREAK
 case 312:
 YY_RULE_SETUP
 #line 537 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
+{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
        YY_BREAK
 case 313:
 YY_RULE_SETUP
 #line 538 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_HOOK) }
+{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
        YY_BREAK
 case 314:
 YY_RULE_SETUP
 #line 539 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
+{ YDVAR(1, VAR_IPSECMOD_HOOK) }
        YY_BREAK
 case 315:
 YY_RULE_SETUP
 #line 540 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
        YY_BREAK
 case 316:
 YY_RULE_SETUP
@@ -5267,123 +5271,128 @@ YY_RULE_SETUP
 case 317:
 YY_RULE_SETUP
 #line 542 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
        YY_BREAK
 case 318:
 YY_RULE_SETUP
 #line 543 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_CACHEDB) }
+{ YDVAR(1, VAR_IPSECMOD_STRICT) }
        YY_BREAK
 case 319:
 YY_RULE_SETUP
 #line 544 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+{ YDVAR(0, VAR_CACHEDB) }
        YY_BREAK
 case 320:
 YY_RULE_SETUP
 #line 545 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+{ YDVAR(1, VAR_CACHEDB_BACKEND) }
        YY_BREAK
 case 321:
 YY_RULE_SETUP
 #line 546 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
+{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
        YY_BREAK
 case 322:
 YY_RULE_SETUP
 #line 547 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
+{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
        YY_BREAK
 case 323:
 YY_RULE_SETUP
 #line 548 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
+{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
        YY_BREAK
 case 324:
 YY_RULE_SETUP
 #line 549 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
+{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
        YY_BREAK
 case 325:
 YY_RULE_SETUP
 #line 550 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(0, VAR_IPSET) }
+{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
        YY_BREAK
 case 326:
 YY_RULE_SETUP
 #line 551 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V4) }
+{ YDVAR(0, VAR_IPSET) }
        YY_BREAK
 case 327:
 YY_RULE_SETUP
 #line 552 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V6) }
+{ YDVAR(1, VAR_IPSET_NAME_V4) }
        YY_BREAK
 case 328:
 YY_RULE_SETUP
 #line 553 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+{ YDVAR(1, VAR_IPSET_NAME_V6) }
        YY_BREAK
 case 329:
 YY_RULE_SETUP
 #line 554 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
        YY_BREAK
 case 330:
 YY_RULE_SETUP
 #line 555 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(2, VAR_EDNS_CLIENT_STRING) }
+{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
        YY_BREAK
 case 331:
 YY_RULE_SETUP
 #line 556 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) }
+{ YDVAR(2, VAR_EDNS_CLIENT_STRING) }
        YY_BREAK
 case 332:
 YY_RULE_SETUP
 #line 557 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_NSID ) }
+{ YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) }
        YY_BREAK
 case 333:
 YY_RULE_SETUP
 #line 558 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ YDVAR(1, VAR_EDE ) }
+{ YDVAR(1, VAR_NSID ) }
        YY_BREAK
 case 334:
-/* rule 334 can match eol */
 YY_RULE_SETUP
 #line 559 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+{ YDVAR(1, VAR_EDE ) }
+       YY_BREAK
+case 335:
+/* rule 335 can match eol */
+YY_RULE_SETUP
+#line 560 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
        YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 335:
+case 336:
 YY_RULE_SETUP
-#line 562 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 563 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
        YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 563 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 564 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 336:
+case 337:
 YY_RULE_SETUP
-#line 568 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 569 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 337:
-/* rule 337 can match eol */
+case 338:
+/* rule 338 can match eol */
 YY_RULE_SETUP
-#line 569 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 570 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
                          cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 338:
+case 339:
 YY_RULE_SETUP
-#line 571 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 572 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
         LEXOUT(("QE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5396,34 +5405,34 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 339:
+case 340:
 YY_RULE_SETUP
-#line 583 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 584 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
        YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 584 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 585 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 340:
+case 341:
 YY_RULE_SETUP
-#line 589 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 590 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 341:
-/* rule 341 can match eol */
+case 342:
+/* rule 342 can match eol */
 YY_RULE_SETUP
-#line 590 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 591 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
                             cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 342:
+case 343:
 YY_RULE_SETUP
-#line 592 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 593 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
         LEXOUT(("SQE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5436,38 +5445,38 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* include: directive */
-case 343:
+case 344:
 YY_RULE_SETUP
-#line 604 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 605 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { 
        LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
        YY_BREAK
 case YY_STATE_EOF(include):
-#line 606 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 607 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 344:
-YY_RULE_SETUP
-#line 610 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-       YY_BREAK
 case 345:
-/* rule 345 can match eol */
 YY_RULE_SETUP
 #line 611 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
        YY_BREAK
 case 346:
+/* rule 346 can match eol */
 YY_RULE_SETUP
 #line 612 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
        YY_BREAK
 case 347:
 YY_RULE_SETUP
 #line 613 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+       YY_BREAK
+case 348:
+YY_RULE_SETUP
+#line 614 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        LEXOUT(("Iunquotedstr(%s) ", yytext));
        config_start_include_glob(yytext, 0);
@@ -5475,27 +5484,27 @@ YY_RULE_SETUP
 }
        YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 618 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 619 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 348:
+case 349:
 YY_RULE_SETUP
-#line 622 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 623 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 349:
-/* rule 349 can match eol */
+case 350:
+/* rule 350 can match eol */
 YY_RULE_SETUP
-#line 623 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 624 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
                                  cfg_parser->line++; BEGIN(inc_prev); }
        YY_BREAK
-case 350:
+case 351:
 YY_RULE_SETUP
-#line 625 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 626 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        LEXOUT(("IQE "));
        yytext[yyleng - 1] = '\0';
@@ -5505,7 +5514,7 @@ YY_RULE_SETUP
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 631 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 632 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        LEXOUT(("LEXEOF "));
        yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -5520,39 +5529,39 @@ case YY_STATE_EOF(val):
 }
        YY_BREAK
 /* include-toplevel: directive */
-case 351:
+case 352:
 YY_RULE_SETUP
-#line 645 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 646 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel);
 }
        YY_BREAK
 case YY_STATE_EOF(include_toplevel):
-#line 648 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 649 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        yyerror("EOF inside include_toplevel directive");
        BEGIN(inc_prev);
 }
        YY_BREAK
-case 352:
-YY_RULE_SETUP
-#line 652 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ LEXOUT(("ITSP ")); /* ignore */ }
-       YY_BREAK
 case 353:
-/* rule 353 can match eol */
 YY_RULE_SETUP
 #line 653 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
+{ LEXOUT(("ITSP ")); /* ignore */ }
        YY_BREAK
 case 354:
+/* rule 354 can match eol */
 YY_RULE_SETUP
 #line 654 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
-{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
        YY_BREAK
 case 355:
 YY_RULE_SETUP
 #line 655 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+       YY_BREAK
+case 356:
+YY_RULE_SETUP
+#line 656 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        LEXOUT(("ITunquotedstr(%s) ", yytext));
        config_start_include_glob(yytext, 1);
@@ -5561,29 +5570,29 @@ YY_RULE_SETUP
 }
        YY_BREAK
 case YY_STATE_EOF(include_toplevel_quoted):
-#line 661 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 662 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        yyerror("EOF inside quoted string");
        BEGIN(inc_prev);
 }
        YY_BREAK
-case 356:
+case 357:
 YY_RULE_SETUP
-#line 665 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 666 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 357:
-/* rule 357 can match eol */
+case 358:
+/* rule 358 can match eol */
 YY_RULE_SETUP
-#line 666 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 667 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        yyerror("newline before \" in include name");
        cfg_parser->line++; BEGIN(inc_prev);
 }
        YY_BREAK
-case 358:
+case 359:
 YY_RULE_SETUP
-#line 670 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 671 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        LEXOUT(("ITQE "));
        yytext[yyleng - 1] = '\0';
@@ -5592,33 +5601,33 @@ YY_RULE_SETUP
        return (VAR_FORCE_TOPLEVEL);
 }
        YY_BREAK
-case 359:
+case 360:
 YY_RULE_SETUP
-#line 678 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 679 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
                        if(--num_args == 0) { BEGIN(INITIAL); }
                        yylval.str = strdup(yytext); return STRING_ARG; }
        YY_BREAK
-case 360:
+case 361:
 YY_RULE_SETUP
-#line 682 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 683 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        ub_c_error_msg("unknown keyword '%s'", yytext);
        }
        YY_BREAK
-case 361:
+case 362:
 YY_RULE_SETUP
-#line 686 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 687 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 {
        ub_c_error_msg("stray '%s'", yytext);
        }
        YY_BREAK
-case 362:
+case 363:
 YY_RULE_SETUP
-#line 690 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 691 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 ECHO;
        YY_BREAK
-#line 5620 "<stdout>"
+#line 5629 "<stdout>"
 
        case YY_END_OF_BUFFER:
                {
@@ -5911,7 +5920,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 >= 3593 )
+                       if ( yy_current_state >= 3600 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -5939,11 +5948,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 >= 3593 )
+               if ( yy_current_state >= 3600 )
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-       yy_is_jam = (yy_current_state == 3592);
+       yy_is_jam = (yy_current_state == 3599);
 
        return yy_is_jam ? 0 : yy_current_state;
 }
@@ -6576,7 +6585,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 690 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
+#line 691 "/usr/src/usr.sbin/unbound/util/configlexer.lex"
 
 
 

diff --git a/sbin/unwind/libunbound/util/configlexer.lex b/sbin/unwind/libunbound/util/configlexer.lex
index 2d59fbc..a46a74f 100644 (file)
--- a/sbin/unwind/libunbound/util/configlexer.lex
+++ b/sbin/unwind/libunbound/util/configlexer.lex
@@ -302,6 +302,7 @@ infra-cache-slabs{COLON}    { YDVAR(1, VAR_INFRA_CACHE_SLABS) }
 infra-cache-numhosts{COLON}    { YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
 infra-cache-lame-size{COLON}   { YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
 infra-cache-min-rtt{COLON}     { YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) }
+infra-cache-max-rtt{COLON}     { YDVAR(1, VAR_INFRA_CACHE_MAX_RTT) }
 infra-keep-probing{COLON}      { YDVAR(1, VAR_INFRA_KEEP_PROBING) }
 num-queries-per-thread{COLON}  { YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
 jostle-timeout{COLON}          { YDVAR(1, VAR_JOSTLE_TIMEOUT) }

diff --git a/sbin/unwind/libunbound/util/configparser.h b/sbin/unwind/libunbound/util/configparser.h
index 6c51709..0d6528d 100644 (file)
--- a/sbin/unwind/libunbound/util/configparser.h
+++ b/sbin/unwind/libunbound/util/configparser.h
@@ -159,169 +159,170 @@
 #define VAR_UNBLOCK_LAN_ZONES 415
 #define VAR_INSECURE_LAN_ZONES 416
 #define VAR_INFRA_CACHE_MIN_RTT 417
-#define VAR_INFRA_KEEP_PROBING 418
-#define VAR_DNS64_PREFIX 419
-#define VAR_DNS64_SYNTHALL 420
-#define VAR_DNS64_IGNORE_AAAA 421
-#define VAR_DNSTAP 422
-#define VAR_DNSTAP_ENABLE 423
-#define VAR_DNSTAP_SOCKET_PATH 424
-#define VAR_DNSTAP_IP 425
-#define VAR_DNSTAP_TLS 426
-#define VAR_DNSTAP_TLS_SERVER_NAME 427
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 428
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 429
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 430
-#define VAR_DNSTAP_SEND_IDENTITY 431
-#define VAR_DNSTAP_SEND_VERSION 432
-#define VAR_DNSTAP_BIDIRECTIONAL 433
-#define VAR_DNSTAP_IDENTITY 434
-#define VAR_DNSTAP_VERSION 435
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 436
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 437
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 438
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 439
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 440
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 441
-#define VAR_RESPONSE_IP_TAG 442
-#define VAR_RESPONSE_IP 443
-#define VAR_RESPONSE_IP_DATA 444
-#define VAR_HARDEN_ALGO_DOWNGRADE 445
-#define VAR_IP_TRANSPARENT 446
-#define VAR_IP_DSCP 447
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 448
-#define VAR_IP_RATELIMIT 449
-#define VAR_IP_RATELIMIT_SLABS 450
-#define VAR_IP_RATELIMIT_SIZE 451
-#define VAR_RATELIMIT 452
-#define VAR_RATELIMIT_SLABS 453
-#define VAR_RATELIMIT_SIZE 454
-#define VAR_OUTBOUND_MSG_RETRY 455
-#define VAR_RATELIMIT_FOR_DOMAIN 456
-#define VAR_RATELIMIT_BELOW_DOMAIN 457
-#define VAR_IP_RATELIMIT_FACTOR 458
-#define VAR_RATELIMIT_FACTOR 459
-#define VAR_IP_RATELIMIT_BACKOFF 460
-#define VAR_RATELIMIT_BACKOFF 461
-#define VAR_SEND_CLIENT_SUBNET 462
-#define VAR_CLIENT_SUBNET_ZONE 463
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 464
-#define VAR_CLIENT_SUBNET_OPCODE 465
-#define VAR_MAX_CLIENT_SUBNET_IPV4 466
-#define VAR_MAX_CLIENT_SUBNET_IPV6 467
-#define VAR_MIN_CLIENT_SUBNET_IPV4 468
-#define VAR_MIN_CLIENT_SUBNET_IPV6 469
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 470
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 471
-#define VAR_CAPS_WHITELIST 472
-#define VAR_CACHE_MAX_NEGATIVE_TTL 473
-#define VAR_PERMIT_SMALL_HOLDDOWN 474
-#define VAR_QNAME_MINIMISATION 475
-#define VAR_QNAME_MINIMISATION_STRICT 476
-#define VAR_IP_FREEBIND 477
-#define VAR_DEFINE_TAG 478
-#define VAR_LOCAL_ZONE_TAG 479
-#define VAR_ACCESS_CONTROL_TAG 480
-#define VAR_LOCAL_ZONE_OVERRIDE 481
-#define VAR_ACCESS_CONTROL_TAG_ACTION 482
-#define VAR_ACCESS_CONTROL_TAG_DATA 483
-#define VAR_VIEW 484
-#define VAR_ACCESS_CONTROL_VIEW 485
-#define VAR_VIEW_FIRST 486
-#define VAR_SERVE_EXPIRED 487
-#define VAR_SERVE_EXPIRED_TTL 488
-#define VAR_SERVE_EXPIRED_TTL_RESET 489
-#define VAR_SERVE_EXPIRED_REPLY_TTL 490
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 491
-#define VAR_EDE_SERVE_EXPIRED 492
-#define VAR_SERVE_ORIGINAL_TTL 493
-#define VAR_FAKE_DSA 494
-#define VAR_FAKE_SHA1 495
-#define VAR_LOG_IDENTITY 496
-#define VAR_HIDE_TRUSTANCHOR 497
-#define VAR_HIDE_HTTP_USER_AGENT 498
-#define VAR_HTTP_USER_AGENT 499
-#define VAR_TRUST_ANCHOR_SIGNALING 500
-#define VAR_AGGRESSIVE_NSEC 501
-#define VAR_USE_SYSTEMD 502
-#define VAR_SHM_ENABLE 503
-#define VAR_SHM_KEY 504
-#define VAR_ROOT_KEY_SENTINEL 505
-#define VAR_DNSCRYPT 506
-#define VAR_DNSCRYPT_ENABLE 507
-#define VAR_DNSCRYPT_PORT 508
-#define VAR_DNSCRYPT_PROVIDER 509
-#define VAR_DNSCRYPT_SECRET_KEY 510
-#define VAR_DNSCRYPT_PROVIDER_CERT 511
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 512
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 513
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 514
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 515
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 516
-#define VAR_PAD_RESPONSES 517
-#define VAR_PAD_RESPONSES_BLOCK_SIZE 518
-#define VAR_PAD_QUERIES 519
-#define VAR_PAD_QUERIES_BLOCK_SIZE 520
-#define VAR_IPSECMOD_ENABLED 521
-#define VAR_IPSECMOD_HOOK 522
-#define VAR_IPSECMOD_IGNORE_BOGUS 523
-#define VAR_IPSECMOD_MAX_TTL 524
-#define VAR_IPSECMOD_WHITELIST 525
-#define VAR_IPSECMOD_STRICT 526
-#define VAR_CACHEDB 527
-#define VAR_CACHEDB_BACKEND 528
-#define VAR_CACHEDB_SECRETSEED 529
-#define VAR_CACHEDB_REDISHOST 530
-#define VAR_CACHEDB_REDISPORT 531
-#define VAR_CACHEDB_REDISTIMEOUT 532
-#define VAR_CACHEDB_REDISEXPIRERECORDS 533
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 534
-#define VAR_FOR_UPSTREAM 535
-#define VAR_AUTH_ZONE 536
-#define VAR_ZONEFILE 537
-#define VAR_MASTER 538
-#define VAR_URL 539
-#define VAR_FOR_DOWNSTREAM 540
-#define VAR_FALLBACK_ENABLED 541
-#define VAR_TLS_ADDITIONAL_PORT 542
-#define VAR_LOW_RTT 543
-#define VAR_LOW_RTT_PERMIL 544
-#define VAR_FAST_SERVER_PERMIL 545
-#define VAR_FAST_SERVER_NUM 546
-#define VAR_ALLOW_NOTIFY 547
-#define VAR_TLS_WIN_CERT 548
-#define VAR_TCP_CONNECTION_LIMIT 549
-#define VAR_FORWARD_NO_CACHE 550
-#define VAR_STUB_NO_CACHE 551
-#define VAR_LOG_SERVFAIL 552
-#define VAR_DENY_ANY 553
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 554
-#define VAR_LOG_TAG_QUERYREPLY 555
-#define VAR_STREAM_WAIT_SIZE 556
-#define VAR_TLS_CIPHERS 557
-#define VAR_TLS_CIPHERSUITES 558
-#define VAR_TLS_USE_SNI 559
-#define VAR_IPSET 560
-#define VAR_IPSET_NAME_V4 561
-#define VAR_IPSET_NAME_V6 562
-#define VAR_TLS_SESSION_TICKET_KEYS 563
-#define VAR_RPZ 564
-#define VAR_TAGS 565
-#define VAR_RPZ_ACTION_OVERRIDE 566
-#define VAR_RPZ_CNAME_OVERRIDE 567
-#define VAR_RPZ_LOG 568
-#define VAR_RPZ_LOG_NAME 569
-#define VAR_DYNLIB 570
-#define VAR_DYNLIB_FILE 571
-#define VAR_EDNS_CLIENT_STRING 572
-#define VAR_EDNS_CLIENT_STRING_OPCODE 573
-#define VAR_NSID 574
-#define VAR_ZONEMD_PERMISSIVE_MODE 575
-#define VAR_ZONEMD_CHECK 576
-#define VAR_ZONEMD_REJECT_ABSENCE 577
-#define VAR_RPZ_SIGNAL_NXDOMAIN_RA 578
-#define VAR_INTERFACE_AUTOMATIC_PORTS 579
-#define VAR_EDE 580
+#define VAR_INFRA_CACHE_MAX_RTT 418
+#define VAR_INFRA_KEEP_PROBING 419
+#define VAR_DNS64_PREFIX 420
+#define VAR_DNS64_SYNTHALL 421
+#define VAR_DNS64_IGNORE_AAAA 422
+#define VAR_DNSTAP 423
+#define VAR_DNSTAP_ENABLE 424
+#define VAR_DNSTAP_SOCKET_PATH 425
+#define VAR_DNSTAP_IP 426
+#define VAR_DNSTAP_TLS 427
+#define VAR_DNSTAP_TLS_SERVER_NAME 428
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 429
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 430
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 431
+#define VAR_DNSTAP_SEND_IDENTITY 432
+#define VAR_DNSTAP_SEND_VERSION 433
+#define VAR_DNSTAP_BIDIRECTIONAL 434
+#define VAR_DNSTAP_IDENTITY 435
+#define VAR_DNSTAP_VERSION 436
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 437
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 438
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 439
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 440
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 441
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 442
+#define VAR_RESPONSE_IP_TAG 443
+#define VAR_RESPONSE_IP 444
+#define VAR_RESPONSE_IP_DATA 445
+#define VAR_HARDEN_ALGO_DOWNGRADE 446
+#define VAR_IP_TRANSPARENT 447
+#define VAR_IP_DSCP 448
+#define VAR_DISABLE_DNSSEC_LAME_CHECK 449
+#define VAR_IP_RATELIMIT 450
+#define VAR_IP_RATELIMIT_SLABS 451
+#define VAR_IP_RATELIMIT_SIZE 452
+#define VAR_RATELIMIT 453
+#define VAR_RATELIMIT_SLABS 454
+#define VAR_RATELIMIT_SIZE 455
+#define VAR_OUTBOUND_MSG_RETRY 456
+#define VAR_RATELIMIT_FOR_DOMAIN 457
+#define VAR_RATELIMIT_BELOW_DOMAIN 458
+#define VAR_IP_RATELIMIT_FACTOR 459
+#define VAR_RATELIMIT_FACTOR 460
+#define VAR_IP_RATELIMIT_BACKOFF 461
+#define VAR_RATELIMIT_BACKOFF 462
+#define VAR_SEND_CLIENT_SUBNET 463
+#define VAR_CLIENT_SUBNET_ZONE 464
+#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 465
+#define VAR_CLIENT_SUBNET_OPCODE 466
+#define VAR_MAX_CLIENT_SUBNET_IPV4 467
+#define VAR_MAX_CLIENT_SUBNET_IPV6 468
+#define VAR_MIN_CLIENT_SUBNET_IPV4 469
+#define VAR_MIN_CLIENT_SUBNET_IPV6 470
+#define VAR_MAX_ECS_TREE_SIZE_IPV4 471
+#define VAR_MAX_ECS_TREE_SIZE_IPV6 472
+#define VAR_CAPS_WHITELIST 473
+#define VAR_CACHE_MAX_NEGATIVE_TTL 474
+#define VAR_PERMIT_SMALL_HOLDDOWN 475
+#define VAR_QNAME_MINIMISATION 476
+#define VAR_QNAME_MINIMISATION_STRICT 477
+#define VAR_IP_FREEBIND 478
+#define VAR_DEFINE_TAG 479
+#define VAR_LOCAL_ZONE_TAG 480
+#define VAR_ACCESS_CONTROL_TAG 481
+#define VAR_LOCAL_ZONE_OVERRIDE 482
+#define VAR_ACCESS_CONTROL_TAG_ACTION 483
+#define VAR_ACCESS_CONTROL_TAG_DATA 484
+#define VAR_VIEW 485
+#define VAR_ACCESS_CONTROL_VIEW 486
+#define VAR_VIEW_FIRST 487
+#define VAR_SERVE_EXPIRED 488
+#define VAR_SERVE_EXPIRED_TTL 489
+#define VAR_SERVE_EXPIRED_TTL_RESET 490
+#define VAR_SERVE_EXPIRED_REPLY_TTL 491
+#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 492
+#define VAR_EDE_SERVE_EXPIRED 493
+#define VAR_SERVE_ORIGINAL_TTL 494
+#define VAR_FAKE_DSA 495
+#define VAR_FAKE_SHA1 496
+#define VAR_LOG_IDENTITY 497
+#define VAR_HIDE_TRUSTANCHOR 498
+#define VAR_HIDE_HTTP_USER_AGENT 499
+#define VAR_HTTP_USER_AGENT 500
+#define VAR_TRUST_ANCHOR_SIGNALING 501
+#define VAR_AGGRESSIVE_NSEC 502
+#define VAR_USE_SYSTEMD 503
+#define VAR_SHM_ENABLE 504
+#define VAR_SHM_KEY 505
+#define VAR_ROOT_KEY_SENTINEL 506
+#define VAR_DNSCRYPT 507
+#define VAR_DNSCRYPT_ENABLE 508
+#define VAR_DNSCRYPT_PORT 509
+#define VAR_DNSCRYPT_PROVIDER 510
+#define VAR_DNSCRYPT_SECRET_KEY 511
+#define VAR_DNSCRYPT_PROVIDER_CERT 512
+#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 513
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 514
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 515
+#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 516
+#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 517
+#define VAR_PAD_RESPONSES 518
+#define VAR_PAD_RESPONSES_BLOCK_SIZE 519
+#define VAR_PAD_QUERIES 520
+#define VAR_PAD_QUERIES_BLOCK_SIZE 521
+#define VAR_IPSECMOD_ENABLED 522
+#define VAR_IPSECMOD_HOOK 523
+#define VAR_IPSECMOD_IGNORE_BOGUS 524
+#define VAR_IPSECMOD_MAX_TTL 525
+#define VAR_IPSECMOD_WHITELIST 526
+#define VAR_IPSECMOD_STRICT 527
+#define VAR_CACHEDB 528
+#define VAR_CACHEDB_BACKEND 529
+#define VAR_CACHEDB_SECRETSEED 530
+#define VAR_CACHEDB_REDISHOST 531
+#define VAR_CACHEDB_REDISPORT 532
+#define VAR_CACHEDB_REDISTIMEOUT 533
+#define VAR_CACHEDB_REDISEXPIRERECORDS 534
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 535
+#define VAR_FOR_UPSTREAM 536
+#define VAR_AUTH_ZONE 537
+#define VAR_ZONEFILE 538
+#define VAR_MASTER 539
+#define VAR_URL 540
+#define VAR_FOR_DOWNSTREAM 541
+#define VAR_FALLBACK_ENABLED 542
+#define VAR_TLS_ADDITIONAL_PORT 543
+#define VAR_LOW_RTT 544
+#define VAR_LOW_RTT_PERMIL 545
+#define VAR_FAST_SERVER_PERMIL 546
+#define VAR_FAST_SERVER_NUM 547
+#define VAR_ALLOW_NOTIFY 548
+#define VAR_TLS_WIN_CERT 549
+#define VAR_TCP_CONNECTION_LIMIT 550
+#define VAR_FORWARD_NO_CACHE 551
+#define VAR_STUB_NO_CACHE 552
+#define VAR_LOG_SERVFAIL 553
+#define VAR_DENY_ANY 554
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 555
+#define VAR_LOG_TAG_QUERYREPLY 556
+#define VAR_STREAM_WAIT_SIZE 557
+#define VAR_TLS_CIPHERS 558
+#define VAR_TLS_CIPHERSUITES 559
+#define VAR_TLS_USE_SNI 560
+#define VAR_IPSET 561
+#define VAR_IPSET_NAME_V4 562
+#define VAR_IPSET_NAME_V6 563
+#define VAR_TLS_SESSION_TICKET_KEYS 564
+#define VAR_RPZ 565
+#define VAR_TAGS 566
+#define VAR_RPZ_ACTION_OVERRIDE 567
+#define VAR_RPZ_CNAME_OVERRIDE 568
+#define VAR_RPZ_LOG 569
+#define VAR_RPZ_LOG_NAME 570
+#define VAR_DYNLIB 571
+#define VAR_DYNLIB_FILE 572
+#define VAR_EDNS_CLIENT_STRING 573
+#define VAR_EDNS_CLIENT_STRING_OPCODE 574
+#define VAR_NSID 575
+#define VAR_ZONEMD_PERMISSIVE_MODE 576
+#define VAR_ZONEMD_CHECK 577
+#define VAR_ZONEMD_REJECT_ABSENCE 578
+#define VAR_RPZ_SIGNAL_NXDOMAIN_RA 579
+#define VAR_INTERFACE_AUTOMATIC_PORTS 580
+#define VAR_EDE 581
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {

diff --git a/sbin/unwind/libunbound/util/configparser.y b/sbin/unwind/libunbound/util/configparser.y
index c003f33..c235340 100644 (file)
--- a/sbin/unwind/libunbound/util/configparser.y
+++ b/sbin/unwind/libunbound/util/configparser.y
@@ -120,7 +120,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN
 %token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE VAR_UDP_CONNECT
 %token VAR_UNBLOCK_LAN_ZONES VAR_INSECURE_LAN_ZONES
-%token VAR_INFRA_CACHE_MIN_RTT VAR_INFRA_KEEP_PROBING
+%token VAR_INFRA_CACHE_MIN_RTT VAR_INFRA_CACHE_MAX_RTT VAR_INFRA_KEEP_PROBING
 %token VAR_DNS64_PREFIX VAR_DNS64_SYNTHALL VAR_DNS64_IGNORE_AAAA
 %token VAR_DNSTAP VAR_DNSTAP_ENABLE VAR_DNSTAP_SOCKET_PATH VAR_DNSTAP_IP
 %token VAR_DNSTAP_TLS VAR_DNSTAP_TLS_SERVER_NAME VAR_DNSTAP_TLS_CERT_BUNDLE
@@ -267,7 +267,7 @@ content_server: server_num_threads | server_verbosity | server_port |
        server_so_reuseport | server_delay_close | server_udp_connect |
        server_unblock_lan_zones | server_insecure_lan_zones |
        server_dns64_prefix | server_dns64_synthall | server_dns64_ignore_aaaa |
-       server_infra_cache_min_rtt | server_harden_algo_downgrade |
+       server_infra_cache_min_rtt | server_infra_cache_max_rtt | server_harden_algo_downgrade |
        server_ip_transparent | server_ip_ratelimit | server_ratelimit |
        server_ip_dscp | server_infra_keep_probing |
        server_ip_ratelimit_slabs | server_ratelimit_slabs |
@@ -1659,6 +1659,15 @@ server_infra_cache_min_rtt: VAR_INFRA_CACHE_MIN_RTT STRING_ARG
                free($2);
        }
        ;
+server_infra_cache_max_rtt: VAR_INFRA_CACHE_MAX_RTT STRING_ARG
+       {
+               OUTYY(("P(server_infra_cache_max_rtt:%s)\n", $2));
+               if(atoi($2) == 0 && strcmp($2, "0") != 0)
+                       yyerror("number expected");
+               else cfg_parser->cfg->infra_cache_max_rtt = atoi($2);
+               free($2);
+       }
+       ;
 server_infra_keep_probing: VAR_INFRA_KEEP_PROBING STRING_ARG
        {
                OUTYY(("P(server_infra_keep_probing:%s)\n", $2));

diff --git a/sbin/unwind/libunbound/util/data/msgreply.c b/sbin/unwind/libunbound/util/data/msgreply.c
index e3ee607..1e6ee97 100644 (file)
--- a/sbin/unwind/libunbound/util/data/msgreply.c
+++ b/sbin/unwind/libunbound/util/data/msgreply.c
@@ -1015,7 +1015,7 @@ int edns_opt_list_append_ede(struct edns_option** list, struct regional* region,
        prevp = list;
        while(*prevp != NULL)
                prevp = &((*prevp)->next);
-       verbose(VERB_ALGO, "attached EDE code: %d with message: %s", code, txt);
+       verbose(VERB_ALGO, "attached EDE code: %d with message: %s", code, (txt?txt:"\"\""));
        *prevp = opt;
        return 1;
 }

diff --git a/sbin/unwind/libunbound/util/iana_ports.inc b/sbin/unwind/libunbound/util/iana_ports.inc
index c7662dc..80a8144 100644 (file)
--- a/sbin/unwind/libunbound/util/iana_ports.inc
+++ b/sbin/unwind/libunbound/util/iana_ports.inc
@@ -2917,6 +2917,7 @@
 3297,
 3298,
 3299,
+3301,
 3302,
 3303,
 3304,
@@ -3975,6 +3976,7 @@
 4789,
 4790,
 4791,
+4792,
 4800,
 4801,
 4802,
@@ -4342,6 +4344,13 @@
 5859,
 5863,
 5900,
+5903,
+5904,
+5905,
+5906,
+5907,
+5908,
+5909,
 5910,
 5911,
 5912,
@@ -4553,6 +4562,7 @@
 6965,
 6966,
 6969,
+6980,
 6997,
 6998,
 6999,

diff --git a/sbin/unwind/libunbound/util/module.h b/sbin/unwind/libunbound/util/module.h
index 33068a7..013c65b 100644 (file)
--- a/sbin/unwind/libunbound/util/module.h
+++ b/sbin/unwind/libunbound/util/module.h
@@ -665,6 +665,12 @@ struct module_qstate {
        int need_refetch;
        /** whether the query (or a subquery) was ratelimited */
        int was_ratelimited;
+       /** time when query was started. This is when the qstate is created.
+        * This is used so that type NS data cannot be overwritten by them
+        * expiring while the lookup is in progress, using data fetched from
+        * those servers. By comparing expiry time with qstarttime for type NS.
+        */
+       time_t qstarttime;
 
        /**
         * Attributes of clients that share the qstate that may affect IP-based

diff --git a/sbin/unwind/libunbound/util/net_help.c b/sbin/unwind/libunbound/util/net_help.c
index 114920e..8153dbd 100644 (file)
--- a/sbin/unwind/libunbound/util/net_help.c
+++ b/sbin/unwind/libunbound/util/net_help.c
@@ -1162,10 +1162,11 @@ add_WIN_cacerts_to_openssl_store(SSL_CTX* tls_ctx)
                        (const unsigned char **)&pTargetCert->pbCertEncoded,
                        pTargetCert->cbCertEncoded);
                if (!cert1) {
+                       unsigned long error = ERR_get_error();
                        /* return error if a cert fails */
                        verbose(VERB_ALGO, "%s %d:%s",
                                "Unable to parse certificate in memory",
-                               (int)ERR_get_error(), ERR_error_string(ERR_get_error(), NULL));
+                               (int)error, ERR_error_string(error, NULL));
                        return 0;
                }
                else {
@@ -1176,10 +1177,11 @@ add_WIN_cacerts_to_openssl_store(SSL_CTX* tls_ctx)
                                /* Ignore error X509_R_CERT_ALREADY_IN_HASH_TABLE which means the
                                * certificate is already in the store.  */
                                if(ERR_GET_LIB(error) != ERR_LIB_X509 ||
-                                  ERR_GET_REASON(error) != X509_R_CERT_ALREADY_IN_HASH_TABLE) {
+                                       ERR_GET_REASON(error) != X509_R_CERT_ALREADY_IN_HASH_TABLE) {
+                                       error = ERR_get_error();
                                        verbose(VERB_ALGO, "%s %d:%s\n",
-                                           "Error adding certificate", (int)ERR_get_error(),
-                                            ERR_error_string(ERR_get_error(), NULL));
+                                           "Error adding certificate", (int)error,
+                                            ERR_error_string(error, NULL));
                                        X509_free(cert1);
                                        return 0;
                                }

diff --git a/sbin/unwind/libunbound/util/rtt.c b/sbin/unwind/libunbound/util/rtt.c
index f51576f..b64206e 100644 (file)
--- a/sbin/unwind/libunbound/util/rtt.c
+++ b/sbin/unwind/libunbound/util/rtt.c
@@ -45,6 +45,9 @@
 
 /* overwritten by config: infra_cache_min_rtt: */
 int RTT_MIN_TIMEOUT = 50;
+/* overwritten by config: infra_cache_max_rtt: */
+int RTT_MAX_TIMEOUT = 120000;
+
 /** calculate RTO from rtt information */
 static int
 calc_rto(const struct rtt_info* rtt)

diff --git a/sbin/unwind/libunbound/util/rtt.h b/sbin/unwind/libunbound/util/rtt.h
index 07e65ee..63ed8ea 100644 (file)
--- a/sbin/unwind/libunbound/util/rtt.h
+++ b/sbin/unwind/libunbound/util/rtt.h
@@ -58,7 +58,7 @@ struct rtt_info {
 /** min retransmit timeout value, in milliseconds */
 extern int RTT_MIN_TIMEOUT;
 /** max retransmit timeout value, in milliseconds */
-#define RTT_MAX_TIMEOUT 120000
+extern int RTT_MAX_TIMEOUT;
 
 /**
  * Initialize RTT estimators.

diff --git a/sbin/unwind/libunbound/validator/val_secalgo.c b/sbin/unwind/libunbound/validator/val_secalgo.c
index 7abf66f..7865167 100644 (file)
--- a/sbin/unwind/libunbound/validator/val_secalgo.c
+++ b/sbin/unwind/libunbound/validator/val_secalgo.c
@@ -97,6 +97,23 @@ log_crypto_error(const char* str, unsigned long e)
        log_err("%s crypto %s", str, buf);
 }
 
+/**
+ * Output a libcrypto openssl error to the logfile as a debug message.
+ * @param level: debug level to use in verbose() call
+ * @param str: string to add to it.
+ * @param e: the error to output, error number from ERR_get_error().
+ */
+static void
+log_crypto_verbose(enum verbosity_value level, const char* str, unsigned long e)
+{
+       char buf[128];
+       /* or use ERR_error_string if ERR_error_string_n is not avail TODO */
+       ERR_error_string_n(e, buf, sizeof(buf));
+       /* buf now contains */
+       /* error:[error code]:[library name]:[function name]:[reason string] */
+       verbose(level, "%s crypto %s", str, buf);
+}
+
 /* return size of digest if supported, or 0 otherwise */
 size_t
 nsec3_hash_algo_size_supported(int id)
@@ -215,6 +232,10 @@ ds_digest_size_supported(int algo)
        switch(algo) {
                case LDNS_SHA1:
 #if defined(HAVE_EVP_SHA1) && defined(USE_SHA1)
+#ifdef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED
+                       if (EVP_default_properties_is_fips_enabled(NULL))
+                               return 0;
+#endif
                        return SHA_DIGEST_LENGTH;
 #else
                        if(fake_sha1) return 20;
@@ -325,7 +346,11 @@ dnskey_algo_id_is_supported(int id)
        case LDNS_RSASHA1:
        case LDNS_RSASHA1_NSEC3:
 #ifdef USE_SHA1
+#ifdef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED
+               return !EVP_default_properties_is_fips_enabled(NULL);
+#else
                return 1;
+#endif
 #else
                if(fake_sha1) return 1;
                return 0;
@@ -341,15 +366,22 @@ dnskey_algo_id_is_supported(int id)
        case LDNS_ECDSAP256SHA256:
        case LDNS_ECDSAP384SHA384:
 #endif
+#if (defined(HAVE_EVP_SHA256) && defined(USE_SHA2)) || (defined(HAVE_EVP_SHA512) && defined(USE_SHA2)) || defined(USE_ECDSA)
+               return 1;
+#endif
 #ifdef USE_ED25519
        case LDNS_ED25519:
 #endif
 #ifdef USE_ED448
        case LDNS_ED448:
 #endif
-#if (defined(HAVE_EVP_SHA256) && defined(USE_SHA2)) || (defined(HAVE_EVP_SHA512) && defined(USE_SHA2)) || defined(USE_ECDSA) || defined(USE_ED25519) || defined(USE_ED448)
+#if defined(USE_ED25519) || defined(USE_ED448)
+#ifdef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED
+               return !EVP_default_properties_is_fips_enabled(NULL);
+#else
                return 1;
 #endif
+#endif
 
 #ifdef USE_GOST
        case LDNS_ECC_GOST:
@@ -652,6 +684,36 @@ setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type,
        return 1;
 }
 
+static void
+digest_ctx_free(EVP_MD_CTX* ctx, EVP_PKEY *evp_key,
+       unsigned char* sigblock, int dofree, int docrypto_free)
+{
+#ifdef HAVE_EVP_MD_CTX_NEW
+       EVP_MD_CTX_destroy(ctx);
+#else
+       EVP_MD_CTX_cleanup(ctx);
+       free(ctx);
+#endif
+       EVP_PKEY_free(evp_key);
+       if(dofree) free(sigblock);
+       else if(docrypto_free) OPENSSL_free(sigblock);
+}
+
+static enum sec_status
+digest_error_status(const char *str)
+{
+       unsigned long e = ERR_get_error();
+#ifdef EVP_R_INVALID_DIGEST
+       if (ERR_GET_LIB(e) == ERR_LIB_EVP &&
+               ERR_GET_REASON(e) == EVP_R_INVALID_DIGEST) {
+               log_crypto_verbose(VERB_ALGO, str, e);
+               return sec_status_indeterminate;
+       }
+#endif
+       log_crypto_verbose(VERB_QUERY, str, e);
+       return sec_status_unchecked;
+}
+
 /**
  * Check a canonical sig+rrset and signature against a dnskey
  * @param buf: buffer with data to verify, the first rrsig part and the
@@ -663,10 +725,11 @@ setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type,
  * @param keylen: length of keydata.
  * @param reason: bogus reason in more detail.
  * @return secure if verification succeeded, bogus on crypto failure,
- *     unchecked on format errors and alloc failures.
+ *     unchecked on format errors and alloc failures, indeterminate
+ *     if digest is not supported by the crypto library (openssl3+ only).
  */
 enum sec_status
-verify_canonrrset(sldns_buffer* buf, int algo, unsigned char* sigblock, 
+verify_canonrrset(sldns_buffer* buf, int algo, unsigned char* sigblock,
        unsigned int sigblock_len, unsigned char* key, unsigned int keylen,
        char** reason)
 {
@@ -735,62 +798,36 @@ verify_canonrrset(sldns_buffer* buf, int algo, unsigned char* sigblock,
        }
 #ifndef HAVE_EVP_DIGESTVERIFY
        if(EVP_DigestInit(ctx, digest_type) == 0) {
-               verbose(VERB_QUERY, "verify: EVP_DigestInit failed");
-#ifdef HAVE_EVP_MD_CTX_NEW
-               EVP_MD_CTX_destroy(ctx);
-#else
-               EVP_MD_CTX_cleanup(ctx);
-               free(ctx);
-#endif
-               EVP_PKEY_free(evp_key);
-               if(dofree) free(sigblock);
-               else if(docrypto_free) OPENSSL_free(sigblock);
-               return sec_status_unchecked;
+               enum sec_status sec;
+               sec = digest_error_status("verify: EVP_DigestInit failed");
+               digest_ctx_free(ctx, evp_key, sigblock,
+                       dofree, docrypto_free);
+               return sec;
        }
        if(EVP_DigestUpdate(ctx, (unsigned char*)sldns_buffer_begin(buf), 
                (unsigned int)sldns_buffer_limit(buf)) == 0) {
-               verbose(VERB_QUERY, "verify: EVP_DigestUpdate failed");
-#ifdef HAVE_EVP_MD_CTX_NEW
-               EVP_MD_CTX_destroy(ctx);
-#else
-               EVP_MD_CTX_cleanup(ctx);
-               free(ctx);
-#endif
-               EVP_PKEY_free(evp_key);
-               if(dofree) free(sigblock);
-               else if(docrypto_free) OPENSSL_free(sigblock);
+               log_crypto_verbose(VERB_QUERY, "verify: EVP_DigestUpdate failed",
+                       ERR_get_error());
+               digest_ctx_free(ctx, evp_key, sigblock,
+                       dofree, docrypto_free);
                return sec_status_unchecked;
        }
 
        res = EVP_VerifyFinal(ctx, sigblock, sigblock_len, evp_key);
 #else /* HAVE_EVP_DIGESTVERIFY */
        if(EVP_DigestVerifyInit(ctx, NULL, digest_type, NULL, evp_key) == 0) {
-               verbose(VERB_QUERY, "verify: EVP_DigestVerifyInit failed");
-#ifdef HAVE_EVP_MD_CTX_NEW
-               EVP_MD_CTX_destroy(ctx);
-#else
-               EVP_MD_CTX_cleanup(ctx);
-               free(ctx);
-#endif
-               EVP_PKEY_free(evp_key);
-               if(dofree) free(sigblock);
-               else if(docrypto_free) OPENSSL_free(sigblock);
-               return sec_status_unchecked;
+               enum sec_status sec;
+               sec = digest_error_status("verify: EVP_DigestVerifyInit failed");
+               digest_ctx_free(ctx, evp_key, sigblock,
+                       dofree, docrypto_free);
+               return sec;
        }
        res = EVP_DigestVerify(ctx, sigblock, sigblock_len,
                (unsigned char*)sldns_buffer_begin(buf),
                sldns_buffer_limit(buf));
 #endif
-#ifdef HAVE_EVP_MD_CTX_NEW
-       EVP_MD_CTX_destroy(ctx);
-#else
-       EVP_MD_CTX_cleanup(ctx);
-       free(ctx);
-#endif
-       EVP_PKEY_free(evp_key);
-
-       if(dofree) free(sigblock);
-       else if(docrypto_free) OPENSSL_free(sigblock);
+       digest_ctx_free(ctx, evp_key, sigblock,
+               dofree, docrypto_free);
 
        if(res == 1) {
                return sec_status_secure;

diff --git a/sbin/unwind/libunbound/validator/val_sigcrypt.c b/sbin/unwind/libunbound/validator/val_sigcrypt.c
index d5f16b1..5ab21e2 100644 (file)
--- a/sbin/unwind/libunbound/validator/val_sigcrypt.c
+++ b/sbin/unwind/libunbound/validator/val_sigcrypt.c
@@ -513,25 +513,96 @@ size_t algo_needs_num_missing(struct algo_needs* n)
 
 int algo_needs_missing(struct algo_needs* n)
 {
-       int i;
-       /* first check if a needed algo was bogus - report that */
-       for(i=0; i<ALGO_NEEDS_MAX; i++)
+       int i, miss = -1;
+       /* check if a needed algo was bogus - report that;
+        * check the first missing algo - report that;
+        * or return 0 */
+       for(i=0; i<ALGO_NEEDS_MAX; i++) {
                if(n->needs[i] == 2)
                        return 0;
-       /* now check which algo is missing */
-       for(i=0; i<ALGO_NEEDS_MAX; i++)
-               if(n->needs[i] == 1)
-                       return i;
+               if(n->needs[i] == 1 && miss == -1)
+                       miss = i;
+       }
+       if(miss != -1) return miss;
        return 0;
 }
 
+/**
+ * verify rrset, with dnskey rrset, for a specific rrsig in rrset
+ * @param env: module environment, scratch space is used.
+ * @param ve: validator environment, date settings.
+ * @param now: current time for validation (can be overridden).
+ * @param rrset: to be validated.
+ * @param dnskey: DNSKEY rrset, keyset to try.
+ * @param sig_idx: which signature to try to validate.
+ * @param sortree: reused sorted order. Stored in region. Pass NULL at start,
+ *     and for a new rrset.
+ * @param reason: if bogus, a string returned, fixed or alloced in scratch.
+ * @param reason_bogus: EDE (RFC8914) code paired with the reason of failure.
+ * @param section: section of packet where this rrset comes from.
+ * @param qstate: qstate with region.
+ * @return secure if any key signs *this* signature. bogus if no key signs it,
+ *     unchecked on error, or indeterminate if all keys are not supported by
+ *     the crypto library (openssl3+ only).
+ */
 static enum sec_status
 dnskeyset_verify_rrset_sig(struct module_env* env, struct val_env* ve,
        time_t now, struct ub_packed_rrset_key* rrset,
        struct ub_packed_rrset_key* dnskey, size_t sig_idx,
        struct rbtree_type** sortree,
        char** reason, sldns_ede_code *reason_bogus,
-       sldns_pkt_section section, struct module_qstate* qstate);
+       sldns_pkt_section section, struct module_qstate* qstate)
+{
+       /* find matching keys and check them */
+       enum sec_status sec = sec_status_bogus;
+       uint16_t tag = rrset_get_sig_keytag(rrset, sig_idx);
+       int algo = rrset_get_sig_algo(rrset, sig_idx);
+       size_t i, num = rrset_get_count(dnskey);
+       size_t numchecked = 0;
+       size_t numindeterminate = 0;
+       int buf_canon = 0;
+       verbose(VERB_ALGO, "verify sig %d %d", (int)tag, algo);
+       if(!dnskey_algo_id_is_supported(algo)) {
+               if(reason_bogus)
+                       *reason_bogus = LDNS_EDE_UNSUPPORTED_DNSKEY_ALG;
+               verbose(VERB_QUERY, "verify sig: unknown algorithm");
+               return sec_status_insecure;
+       }
+
+       for(i=0; i<num; i++) {
+               /* see if key matches keytag and algo */
+               if(algo != dnskey_get_algo(dnskey, i) ||
+                       tag != dnskey_calc_keytag(dnskey, i))
+                       continue;
+               numchecked ++;
+
+               /* see if key verifies */
+               sec = dnskey_verify_rrset_sig(env->scratch,
+                       env->scratch_buffer, ve, now, rrset, dnskey, i,
+                       sig_idx, sortree, &buf_canon, reason, reason_bogus,
+                       section, qstate);
+               if(sec == sec_status_secure)
+                       return sec;
+               else if(sec == sec_status_indeterminate)
+                       numindeterminate ++;
+       }
+       if(numchecked == 0) {
+               *reason = "signatures from unknown keys";
+               if(reason_bogus)
+                       *reason_bogus = LDNS_EDE_DNSKEY_MISSING;
+               verbose(VERB_QUERY, "verify: could not find appropriate key");
+               return sec_status_bogus;
+       }
+       if(numindeterminate == numchecked) {
+               *reason = "unsupported algorithm by crypto library";
+               if(reason_bogus)
+                       *reason_bogus = LDNS_EDE_UNSUPPORTED_DNSKEY_ALG;
+               verbose(VERB_ALGO, "verify sig: unsupported algorithm by "
+                       "crypto library");
+               return sec_status_indeterminate;
+       }
+       return sec_status_bogus;
+}
 
 enum sec_status 
 dnskeyset_verify_rrset(struct module_env* env, struct val_env* ve,
@@ -607,14 +678,14 @@ void algo_needs_reason(struct module_env* env, int alg, char** reason, char* s)
                *reason = s;
 }
 
-enum sec_status 
+enum sec_status
 dnskey_verify_rrset(struct module_env* env, struct val_env* ve,
         struct ub_packed_rrset_key* rrset, struct ub_packed_rrset_key* dnskey,
        size_t dnskey_idx, char** reason, sldns_ede_code *reason_bogus,
        sldns_pkt_section section, struct module_qstate* qstate)
 {
        enum sec_status sec;
-       size_t i, num, numchecked = 0;
+       size_t i, num, numchecked = 0, numindeterminate = 0;
        rbtree_type* sortree = NULL;
        int buf_canon = 0;
        uint16_t tag = dnskey_calc_keytag(dnskey, dnskey_idx);
@@ -642,56 +713,21 @@ dnskey_verify_rrset(struct module_env* env, struct val_env* ve,
                if(sec == sec_status_secure)
                        return sec;
                numchecked ++;
+               if(sec == sec_status_indeterminate)
+                       numindeterminate ++;
        }
        verbose(VERB_ALGO, "rrset failed to verify: all signatures are bogus");
-       if(!numchecked) *reason = "signature missing";
-       return sec_status_bogus;
-}
-
-static enum sec_status
-dnskeyset_verify_rrset_sig(struct module_env* env, struct val_env* ve,
-       time_t now, struct ub_packed_rrset_key* rrset,
-       struct ub_packed_rrset_key* dnskey, size_t sig_idx,
-       struct rbtree_type** sortree,
-       char** reason, sldns_ede_code *reason_bogus,
-       sldns_pkt_section section, struct module_qstate* qstate)
-{
-       /* find matching keys and check them */
-       enum sec_status sec = sec_status_bogus;
-       uint16_t tag = rrset_get_sig_keytag(rrset, sig_idx);
-       int algo = rrset_get_sig_algo(rrset, sig_idx);
-       size_t i, num = rrset_get_count(dnskey);
-       size_t numchecked = 0;
-       int buf_canon = 0;
-       verbose(VERB_ALGO, "verify sig %d %d", (int)tag, algo);
-       if(!dnskey_algo_id_is_supported(algo)) {
+       if(!numchecked) {
+               *reason = "signature missing";
                if(reason_bogus)
-                       *reason_bogus = LDNS_EDE_UNSUPPORTED_DNSKEY_ALG;
-               verbose(VERB_QUERY, "verify sig: unknown algorithm");
-               return sec_status_insecure;
-       }
-
-       for(i=0; i<num; i++) {
-               /* see if key matches keytag and algo */
-               if(algo != dnskey_get_algo(dnskey, i) ||
-                       tag != dnskey_calc_keytag(dnskey, i))
-                       continue;
-               numchecked ++;
-
-               /* see if key verifies */
-               sec = dnskey_verify_rrset_sig(env->scratch,
-                       env->scratch_buffer, ve, now, rrset, dnskey, i,
-                       sig_idx, sortree, &buf_canon, reason, reason_bogus,
-                       section, qstate);
-               if(sec == sec_status_secure)
-                       return sec;
-       }
-       if(numchecked == 0) {
-               *reason = "signatures from unknown keys";
+                       *reason_bogus = LDNS_EDE_RRSIGS_MISSING;
+       } else if(numchecked == numindeterminate) {
+               verbose(VERB_ALGO, "rrset failed to verify due to algorithm "
+                       "refusal by cryptolib");
                if(reason_bogus)
-                       *reason_bogus = LDNS_EDE_DNSKEY_MISSING;
-               verbose(VERB_QUERY, "verify: could not find appropriate key");
-               return sec_status_bogus;
+                       *reason_bogus = LDNS_EDE_UNSUPPORTED_DNSKEY_ALG;
+               *reason = "algorithm refused by cryptolib";
+               return sec_status_indeterminate;
        }
        return sec_status_bogus;
 }

diff --git a/sbin/unwind/libunbound/validator/val_utils.c b/sbin/unwind/libunbound/validator/val_utils.c
index 18a7c9c..e2319ee 100644 (file)
--- a/sbin/unwind/libunbound/validator/val_utils.c
+++ b/sbin/unwind/libunbound/validator/val_utils.c
@@ -458,7 +458,7 @@ verify_dnskeys_with_ds_rr(struct module_env* env, struct val_env* ve,
                }
                /* If it didn't validate with the DNSKEY, try the next one! */
        }
-       if(numsizesupp != 0) {
+       if(numsizesupp != 0 || sec == sec_status_indeterminate) {
                /* there is a working DS, but that DNSKEY is not supported */
                return sec_status_insecure;
        }
@@ -489,7 +489,6 @@ int val_favorite_ds_algo(struct ub_packed_rrset_key* ds_rrset)
        return digest_algo;
 }
 
-// @TODO change the use of this function to _ede function in authzone.c:8111
 enum sec_status
 val_verify_DNSKEY_with_DS(struct module_env* env, struct val_env* ve,
        struct ub_packed_rrset_key* dnskey_rrset,

diff --git a/sbin/unwind/libunbound/validator/validator.c b/sbin/unwind/libunbound/validator/validator.c
index 75f3220..1723afe 100644 (file)
--- a/sbin/unwind/libunbound/validator/validator.c
+++ b/sbin/unwind/libunbound/validator/validator.c
@@ -2202,7 +2202,7 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
                if(!qstate->no_cache_store) {
                        if(!dns_cache_store(qstate->env, &vq->orig_msg->qinfo,
                                vq->orig_msg->rep, 0, qstate->prefetch_leeway, 0, NULL,
-                               qstate->query_flags)) {
+                               qstate->query_flags, qstate->qstarttime)) {
                                log_err("out of memory caching validator results");
                        }
                }
@@ -2211,7 +2211,7 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
                /* and this does not get prefetched, so no leeway */
                if(!dns_cache_store(qstate->env, &vq->orig_msg->qinfo,
                        vq->orig_msg->rep, 1, 0, 0, NULL,
-                       qstate->query_flags)) {
+                       qstate->query_flags, qstate->qstarttime)) {
                        log_err("out of memory caching validator results");
                }
        }
@@ -2493,7 +2493,8 @@ ds_response_to_ke(struct module_qstate* qstate, struct val_qstate* vq,
                        /* If they aren't usable, then we treat it like 
                         * there was no DS. */
 
-                       // @TODO add EDE Unsupported DS Digest Type
+                       /* TODO add EDE Unsupported DS Digest Type; this needs
+                        * EDE to be added on non SERVFAIL answers. */
 
                        *ke = key_entry_create_null(qstate->region, 
                                qinfo->qname, qinfo->qname_len, qinfo->qclass,