- DNS64 from Viagenie (BSD Licensed), written by Simon Perrault.

  Initial commit of the patch from the FreeBSD base (with its fixes).
  This adds a module (for module-config in unbound.conf) dns64 that
  performs DNS64 processing, see README.DNS64.

git-svn-id: file:///svn/unbound/trunk@3198 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index 63a67ec29185ba91e35c7954582736b2a95259c2..6971bc3d7d053bae1b9a645bed8b04bde0c61a85 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,7 +106,7 @@ util/winsock_event.c validator/autotrust.c validator/val_anchor.c \
 validator/validator.c validator/val_kcache.c validator/val_kentry.c \
 validator/val_neg.c validator/val_nsec3.c validator/val_nsec.c \
 validator/val_secalgo.c validator/val_sigcrypt.c \
-validator/val_utils.c $(CHECKLOCK_SRC)
+validator/val_utils.c dns64/dns64.c $(CHECKLOCK_SRC)
 COMMON_OBJ_WITHOUT_NETCALL=dns.lo infra.lo rrset.lo dname.lo msgencode.lo \
 msgparse.lo msgreply.lo packed_rrset.lo iterator.lo iter_delegpt.lo \
 iter_donotq.lo iter_fwd.lo iter_hints.lo iter_priv.lo iter_resptype.lo \
@@ -116,7 +116,8 @@ fptr_wlist.lo locks.lo log.lo mini_event.lo module.lo net_help.lo \
 random.lo rbtree.lo regional.lo rtt.lo dnstree.lo lookup3.lo lruhash.lo \
 slabhash.lo timehist.lo tube.lo winsock_event.lo autotrust.lo val_anchor.lo \
 validator.lo val_kcache.lo val_kentry.lo val_neg.lo val_nsec3.lo val_nsec.lo \
-val_secalgo.lo val_sigcrypt.lo val_utils.lo $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ)
+val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo \
+$(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ)
 COMMON_OBJ=$(COMMON_OBJ_WITHOUT_NETCALL) netevent.lo listen_dnsport.lo \
 outside_network.lo
 # set to $COMMON_OBJ or to "" if --enableallsymbols
@@ -1179,3 +1180,4 @@ arc4random.lo arc4random.o: $(srcdir)/compat/arc4random.c $(srcdir)/compat/chach
 arc4random_uniform.lo arc4random_uniform.o: $(srcdir)/compat/arc4random_uniform.c $(srcdir)/compat/chacha_private.h
 arc4_lock.lo arc4_lock.o: $(srcdir)/compat/arc4_lock.c
 sha512.lo sha512.o: $(srcdir)/compat/sha512.c
+dns64.lo: $(srcdir)/dns64/dns64.c config.h $(srcdir)/util/module.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/config_file.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h

diff --git a/dns64/dns64.c b/dns64/dns64.c
new file mode 100644 (file)
index 0000000..3fe177a
--- /dev/null
+++ b/dns64/dns64.c
@@ -0,0 +1,864 @@
+/*
+ * iterator/iterator.h - DNS64 module
+ *
+ * Copyright (c) 2009, Viagénie. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Viagénie nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * This file contains a module that performs DNS64 query processing.
+ */
+
+#include <config.h>
+#include "dns64/dns64.h"
+#include "services/cache/dns.h"
+#include "services/cache/rrset.h"
+#include "util/config_file.h"
+#include "util/data/msgreply.h"
+#include "util/fptr_wlist.h"
+#include "util/net_help.h"
+#include "util/regional.h"
+
+/******************************************************************************
+ *                                                                            *
+ *                             STATIC CONSTANTS                               *
+ *                                                                            *
+ ******************************************************************************/
+
+/**
+ * This is the default DNS64 prefix that is used whent he dns64 module is listed
+ * in module-config but when the dns64-prefix variable is not present.
+ */
+static const char DEFAULT_DNS64_PREFIX[] = "64:ff9b::/96";
+
+/**
+ * Maximum length of a domain name in a PTR query in the .in-addr.arpa tree.
+ */
+static const int MAX_PTR_QNAME_IPV4 = 30;
+
+/**
+ * Per-query module-specific state. This is usually a dynamically-allocated
+ * structure, but in our case we only need to store one variable describing the
+ * state the query is in. So we repurpose the minfo pointer by storing an
+ * integer in there.
+ */
+enum dns64_qstate {
+    DNS64_INTERNAL_QUERY,    /**< Internally-generated query, no DNS64
+                                  processing. */
+    DNS64_NEW_QUERY,         /**< Query for which we're the first module in
+                                  line. */
+    DNS64_SUBQUERY_FINISHED  /**< Query for which we generated a sub-query, and
+                                  for which this sub-query is finished. */
+};
+
+
+/******************************************************************************
+ *                                                                            *
+ *                                 STRUCTURES                                 *
+ *                                                                            *
+ ******************************************************************************/
+
+/**
+ * This structure contains module configuration information. One instance of
+ * this structure exists per instance of the module. Normally there is only one
+ * instance of the module.
+ */
+struct dns64_env {
+    /**
+     * DNS64 prefix address. We're using a full sockaddr instead of just an
+     * in6_addr because we can reuse Unbound's generic string parsing functions.
+     * It will always contain a sockaddr_in6, and only the sin6_addr member will
+     * ever be used.
+     */
+    struct sockaddr_storage prefix_addr;
+
+    /**
+     * This is always sizeof(sockaddr_in6).
+     */
+    socklen_t prefix_addrlen;
+
+    /**
+     * This is the CIDR length of the prefix. It needs to be between 0 and 96.
+     */
+    int prefix_net;
+};
+
+
+/******************************************************************************
+ *                                                                            *
+ *                             UTILITY FUNCTIONS                              *
+ *                                                                            *
+ ******************************************************************************/
+
+/**
+ * Generic macro for swapping two variables.
+ *
+ * \param t Type of the variables. (e.g. int)
+ * \param a First variable.
+ * \param b Second variable.
+ *
+ * \warning Do not attempt something foolish such as swap(int,a++,b++)!
+ */
+#define swap(t,a,b) do {t x = a; a = b; b = x;} while(0)
+
+/**
+ * Reverses a string.
+ *
+ * \param begin Points to the first character of the string.
+ * \param end   Points one past the last character of the string.
+ */
+static void
+reverse(char* begin, char* end)
+{
+    while ( begin < --end ) {
+        swap(char, *begin, *end);
+        ++begin;
+    }
+}
+
+/**
+ * Convert an unsigned integer to a string. The point of this function is that
+ * of being faster than sprintf().
+ *
+ * \param n The number to be converted.
+ * \param s The result will be written here. Must be large enough, be careful!
+ *
+ * \return The number of characters written.
+ */
+static int
+uitoa(unsigned n, char* s)
+{
+    char* ss = s;
+    do {
+        *ss++ = '0' + n % 10;
+    } while (n /= 10);
+    reverse(s, ss);
+    return ss - s;
+}
+
+/**
+ * Extract an IPv4 address embedded in the IPv6 address \a ipv6 at offset \a
+ * offset (in bits). Note that bits are not necessarily aligned on bytes so we
+ * need to be careful.
+ *
+ * \param ipv6   IPv6 address represented as a 128-bit array in big-endian
+ *               order.
+ * \param offset Index of the MSB of the IPv4 address embedded in the IPv6
+ *               address.
+ */
+static uint32_t
+extract_ipv4(const uint8_t ipv6[16], const int offset)
+{
+    uint32_t ipv4 = (uint32_t)ipv6[offset/8+0] << (24 + (offset%8))
+                  | (uint32_t)ipv6[offset/8+1] << (16 + (offset%8))
+                  | (uint32_t)ipv6[offset/8+2] << ( 8 + (offset%8))
+                  | (uint32_t)ipv6[offset/8+3] << ( 0 + (offset%8));
+    if (offset/8+4 < 16)
+        ipv4 |= (uint32_t)ipv6[offset/8+4] >> (8 - offset%8);
+    return ipv4;
+}
+
+/**
+ * Builds the PTR query name corresponding to an IPv4 address. For example,
+ * given the number 3,464,175,361, this will build the string
+ * "\03206\03123\0231\011\07in-addr\04arpa".
+ *
+ * \param ipv4 IPv4 address represented as an unsigned 32-bit number.
+ * \param ptr  The result will be written here. Must be large enough, be
+ *             careful!
+ *
+ * \return The number of characters written.
+ */
+static int
+ipv4_to_ptr(uint32_t ipv4, char ptr[MAX_PTR_QNAME_IPV4])
+{
+    static const char IPV4_PTR_SUFFIX[] = "\07in-addr\04arpa";
+    int i;
+    char* c = ptr;
+
+    for (i = 0; i < 4; ++i) {
+        *c = uitoa(ipv4 % 256, c + 1);
+        c += *c + 1;
+        ipv4 /= 256;
+    }
+
+    strcpy(c, IPV4_PTR_SUFFIX);
+
+    return c + sizeof(IPV4_PTR_SUFFIX) - ptr;
+}
+
+/**
+ * Converts an IPv6-related domain name string from a PTR query into an IPv6
+ * address represented as a 128-bit array.
+ *
+ * \param ptr  The domain name. (e.g. "\011[...]\010\012\016\012\03ip6\04arpa")
+ * \param ipv6 The result will be written here, in network byte order.
+ *
+ * \return 1 on success, 0 on failure.
+ */
+static int
+ptr_to_ipv6(const char* ptr, uint8_t ipv6[16])
+{
+    int i;
+
+    for (i = 0; i < 64; i++) {
+        int x;
+
+        if (ptr[i++] != 1)
+            return 0;
+
+        if (ptr[i] >= '0' && ptr[i] <= '9') {
+            x = ptr[i] - '0';
+        } else if (ptr[i] >= 'a' && ptr[i] <= 'f') {
+            x = ptr[i] - 'a' + 10;
+        } else if (ptr[i] >= 'A' && ptr[i] <= 'F') {
+            x = ptr[i] - 'A' + 10;
+        } else {
+            return 0;
+        }
+
+        ipv6[15-i/4] |= x << (2 * ((i-1) % 4));
+    }
+
+    return 1;
+}
+
+/**
+ * Synthesize an IPv6 address based on an IPv4 address and the DNS64 prefix.
+ *
+ * \param prefix_addr DNS64 prefix address.
+ * \param prefix_net  CIDR length of the DNS64 prefix. Must be between 0 and 96.
+ * \param a           IPv4 address.
+ * \param aaaa        IPv6 address. The result will be written here.
+ */
+static void
+synthesize_aaaa(const uint8_t prefix_addr[16], int prefix_net,
+        const uint8_t a[4], uint8_t aaaa[16])
+{
+    memcpy(aaaa, prefix_addr, 16);
+    aaaa[prefix_net/8+0] |= a[0] >> (0+prefix_net%8);
+    aaaa[prefix_net/8+1] |= a[0] << (8-prefix_net%8);
+    aaaa[prefix_net/8+1] |= a[1] >> (0+prefix_net%8);
+    aaaa[prefix_net/8+2] |= a[1] << (8-prefix_net%8);
+    aaaa[prefix_net/8+2] |= a[2] >> (0+prefix_net%8);
+    aaaa[prefix_net/8+3] |= a[2] << (8-prefix_net%8);
+    aaaa[prefix_net/8+3] |= a[3] >> (0+prefix_net%8);
+    if (prefix_net/8/4 < 16)  /* <-- my beautiful symmetry is destroyed! */
+    aaaa[prefix_net/8+4] |= a[3] << (8-prefix_net%8);
+}
+
+
+/******************************************************************************
+ *                                                                            *
+ *                           DNS64 MODULE FUNCTIONS                           *
+ *                                                                            *
+ ******************************************************************************/
+
+/**
+ * This function applies the configuration found in the parsed configuration
+ * file \a cfg to this instance of the dns64 module. Currently only the DNS64
+ * prefix (a.k.a. Pref64) is configurable.
+ *
+ * \param dns64_env Module-specific global parameters.
+ * \param cfg       Parsed configuration file.
+ */
+static int
+dns64_apply_cfg(struct dns64_env* dns64_env, struct config_file* cfg)
+{
+    verbose(VERB_ALGO, "dns64-prefix: %s", cfg->dns64_prefix);
+    if (!netblockstrtoaddr(cfg->dns64_prefix ? cfg->dns64_prefix :
+                DEFAULT_DNS64_PREFIX, 0, &dns64_env->prefix_addr,
+                &dns64_env->prefix_addrlen, &dns64_env->prefix_net)) {
+        log_err("cannot parse dns64-prefix netblock: %s", cfg->dns64_prefix);
+        return 0;
+    }
+    if (!addr_is_ip6(&dns64_env->prefix_addr, dns64_env->prefix_addrlen)) {
+        log_err("dns64_prefix is not IPv6: %s", cfg->dns64_prefix);
+        return 0;
+    }
+    if (dns64_env->prefix_net < 0 || dns64_env->prefix_net > 96) {
+        log_err("dns64-prefix length it not between 0 and 96: %s",
+                cfg->dns64_prefix);
+        return 0;
+    }
+    return 1;
+}
+
+/**
+ * Initializes this instance of the dns64 module.
+ *
+ * \param env Global state of all module instances.
+ * \param id  This instance's ID number.
+ */
+int
+dns64_init(struct module_env* env, int id)
+{
+    struct dns64_env* dns64_env =
+        (struct dns64_env*)calloc(1, sizeof(struct dns64_env));
+    if (!dns64_env) {
+        log_err("malloc failure");
+        return 0;
+    }
+       env->modinfo[id] = (void*)dns64_env;
+    if (!dns64_apply_cfg(dns64_env, env->cfg)) {
+        log_err("dns64: could not apply configuration settings.");
+        return 0;
+    }
+       return 1;
+}
+
+/**
+ * Deinitializes this instance of the dns64 module.
+ *
+ * \param env Global state of all module instances.
+ * \param id  This instance's ID number.
+ */
+void
+dns64_deinit(struct module_env* env, int id)
+{
+    if (!env)
+        return;
+    free(env->modinfo[id]);
+    env->modinfo[id] = NULL;
+}
+
+/**
+ * Handle PTR queries for IPv6 addresses. If the address belongs to the DNS64
+ * prefix, we must do a PTR query for the corresponding IPv4 address instead.
+ *
+ * \param qstate Query state structure.
+ * \param id     This module instance's ID number.
+ *
+ * \return The new state of the query.
+ */
+static enum module_ext_state
+handle_ipv6_ptr(struct module_qstate* qstate, int id)
+{
+    struct dns64_env* dns64_env = (struct dns64_env*)qstate->env->modinfo[id];
+    struct module_qstate* subq = NULL;
+    struct query_info qinfo;
+    struct sockaddr_in6 sin6;
+
+    /* Convert the PTR query string to an IPv6 address. */
+    memset(&sin6, 0, sizeof(sin6));
+    sin6.sin6_family = AF_INET6;
+    if (!ptr_to_ipv6((char*)qstate->qinfo.qname, sin6.sin6_addr.s6_addr))
+        return module_wait_module;  /* Let other module handle this. */
+
+    /*
+     * If this IPv6 address is not part of our DNS64 prefix, then we don't need
+     * to do anything. Let another module handle the query.
+     */
+    if (addr_in_common((struct sockaddr_storage*)&sin6, 128,
+                &dns64_env->prefix_addr, dns64_env->prefix_net,
+                sizeof(sin6)) != dns64_env->prefix_net)
+        return module_wait_module;
+
+    verbose(VERB_ALGO, "dns64: rewrite PTR record");
+
+    /*
+     * Create a new PTR query info for the domain name corresponding to the IPv4
+     * address corresponding to the IPv6 address corresponding to the original
+     * PTR query domain name.
+     */
+    qinfo = qstate->qinfo;
+    if (!(qinfo.qname = regional_alloc(qstate->region, MAX_PTR_QNAME_IPV4)))
+        return module_error;
+    qinfo.qname_len = ipv4_to_ptr(extract_ipv4(sin6.sin6_addr.s6_addr,
+                dns64_env->prefix_net), (char*)qinfo.qname);
+
+    /* Create the new sub-query. */
+    fptr_ok(fptr_whitelist_modenv_attach_sub(qstate->env->attach_sub));
+    if(!(*qstate->env->attach_sub)(qstate, &qinfo, qstate->query_flags, 0,
+                &subq))
+        return module_error;
+    if (subq) {
+        subq->curmod = id;
+        subq->ext_state[id] = module_state_initial;
+        subq->minfo[id] = NULL;
+    }
+
+    return module_wait_subquery;
+}
+
+/** allocate (special) rrset keys, return 0 on error */
+static int
+repinfo_alloc_rrset_keys(struct reply_info* rep, 
+       struct regional* region)
+{
+       size_t i;
+       for(i=0; i<rep->rrset_count; i++) {
+               if(region) {
+                       rep->rrsets[i] = (struct ub_packed_rrset_key*)
+                               regional_alloc(region, 
+                               sizeof(struct ub_packed_rrset_key));
+                       if(rep->rrsets[i]) {
+                               memset(rep->rrsets[i], 0, 
+                                       sizeof(struct ub_packed_rrset_key));
+                               rep->rrsets[i]->entry.key = rep->rrsets[i];
+                       }
+               }
+               else return 0;/*        rep->rrsets[i] = alloc_special_obtain(alloc);*/
+               if(!rep->rrsets[i])
+                       return 0;
+               rep->rrsets[i]->entry.data = NULL;
+       }
+       return 1;
+}
+
+static enum module_ext_state
+generate_type_A_query(struct module_qstate* qstate, int id)
+{
+       struct module_qstate* subq = NULL;
+       struct query_info qinfo;
+
+       verbose(VERB_ALGO, "dns64: query A record");
+
+       /* Create a new query info. */
+       qinfo = qstate->qinfo;
+       qinfo.qtype = LDNS_RR_TYPE_A;
+
+       /* Start the sub-query. */
+       fptr_ok(fptr_whitelist_modenv_attach_sub(qstate->env->attach_sub));
+       if(!(*qstate->env->attach_sub)(qstate, &qinfo, qstate->query_flags, 0,
+                                      &subq))
+       {
+               verbose(VERB_ALGO, "dns64: sub-query creation failed");
+               return module_error;
+       }
+       if (subq) {
+               subq->curmod = id;
+               subq->ext_state[id] = module_state_initial;
+               subq->minfo[id] = NULL;
+       }
+
+       return module_wait_subquery;
+}
+
+/**
+ * Handles the "pass" event for a query. This event is received when a new query
+ * is received by this module. The query may have been generated internally by
+ * another module, in which case we don't want to do any special processing
+ * (this is an interesting discussion topic),  or it may be brand new, e.g.
+ * received over a socket, in which case we do want to apply DNS64 processing.
+ *
+ * \param qstate A structure representing the state of the query that has just
+ *               received the "pass" event.
+ * \param id     This module's instance ID.
+ *
+ * \return The new state of the query.
+ */
+static enum module_ext_state
+handle_event_pass(struct module_qstate* qstate, int id)
+{
+       if ((uintptr_t)qstate->minfo[id] == DNS64_NEW_QUERY
+            && qstate->qinfo.qtype == LDNS_RR_TYPE_PTR
+            && qstate->qinfo.qname_len == 74
+            && !strcmp((char*)&qstate->qinfo.qname[64], "\03ip6\04arpa"))
+        /* Handle PTR queries for IPv6 addresses. */
+        return handle_ipv6_ptr(qstate, id);
+
+       if (qstate->env->cfg->dns64_synthall &&
+           (uintptr_t)qstate->minfo[id] == DNS64_NEW_QUERY
+           && qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA)
+               return generate_type_A_query(qstate, id);
+
+    /* We are finished when our sub-query is finished. */
+       if ((uintptr_t)qstate->minfo[id] == DNS64_SUBQUERY_FINISHED)
+               return module_finished;
+
+    /* Otherwise, pass request to next module. */
+    verbose(VERB_ALGO, "dns64: pass to next module");
+    return module_wait_module;
+}
+
+/**
+ * Handles the "done" event for a query. We need to analyze the response and
+ * maybe issue a new sub-query for the A record.
+ *
+ * \param qstate A structure representing the state of the query that has just
+ *               received the "pass" event.
+ * \param id     This module's instance ID.
+ *
+ * \return The new state of the query.
+ */
+static enum module_ext_state
+handle_event_moddone(struct module_qstate* qstate, int id)
+{
+    /*
+     * In many cases we have nothing special to do. From most to least common:
+     *
+     *   - An internal query.
+     *   - A query for a record type other than AAAA.
+     *   - An AAAA query for which an error was returned.
+     *   - A successful AAAA query with an answer.
+     */
+       if (qstate->minfo[id] == DNS64_INTERNAL_QUERY
+            || qstate->qinfo.qtype != LDNS_RR_TYPE_AAAA
+           || qstate->return_rcode != LDNS_RCODE_NOERROR  
+           || (qstate->return_msg &&
+                   qstate->return_msg->rep &&
+                   reply_find_answer_rrset(&qstate->qinfo,
+                           qstate->return_msg->rep)))
+               return module_finished;
+
+       return generate_type_A_query(qstate, id);
+}
+
+/**
+ * This is the module's main() function. It gets called each time a query
+ * receives an event which we may need to handle. We respond by updating the
+ * state of the query.
+ *
+ * \param qstate   Structure containing the state of the query.
+ * \param event    Event that has just been received.
+ * \param id       This module's instance ID.
+ * \param outbound State of a DNS query on an authoritative server. We never do
+ *                 our own queries ourselves (other modules do it for us), so
+ *                 this is unused.
+ */
+void
+dns64_operate(struct module_qstate* qstate, enum module_ev event, int id,
+               struct outbound_entry* ATTR_UNUSED(outbound))
+{
+       verbose(VERB_QUERY, "dns64[module %d] operate: extstate:%s event:%s",
+                       id, strextstate(qstate->ext_state[id]),
+                       strmodulevent(event));
+       log_query_info(VERB_QUERY, "dns64 operate: query", &qstate->qinfo);
+
+       switch(event) {
+               case module_event_new:
+                       /* Tag this query as being new and fall through. */
+                       qstate->minfo[id] = (void*)DNS64_NEW_QUERY;
+               case module_event_pass:
+                       qstate->ext_state[id] = handle_event_pass(qstate, id);
+                       break;
+               case module_event_moddone:
+                       qstate->ext_state[id] = handle_event_moddone(qstate, id);
+                       break;
+               default:
+                       qstate->ext_state[id] = module_finished;
+                       break;
+       }
+}
+
+static void
+dns64_synth_aaaa_data(const struct ub_packed_rrset_key* fk, 
+                     const struct packed_rrset_data* fd, 
+                     struct ub_packed_rrset_key *dk, 
+                     struct packed_rrset_data **dd_out, struct regional *region, 
+                     struct dns64_env* dns64_env )
+{
+       struct packed_rrset_data *dd;
+       size_t i;
+       /*
+        * Create synthesized AAAA RR set data. We need to allocated extra memory
+        * for the RRs themselves. Each RR has a length, TTL, pointer to wireformat
+        * data, 2 bytes of data length, and 16 bytes of IPv6 address.
+        */
+       if (!(dd = *dd_out = regional_alloc(region,
+                 sizeof(struct packed_rrset_data)
+                 + fd->count * (sizeof(size_t) + sizeof(uint32_t) +
+                            sizeof(uint8_t*) + 2 + 16)))) {
+               log_err("out of memory");
+               return;
+       }
+
+       /* Copy attributes from A RR set. */
+       dd->ttl = fd->ttl;
+       dd->count = fd->count;
+       dd->rrsig_count = 0;
+       dd->trust = fd->trust;
+       dd->security = fd->security;
+
+       /*
+        * Synthesize AAAA records. Adjust pointers in structure.
+        */
+       dd->rr_len =
+           (size_t*)((uint8_t*)dd + sizeof(struct packed_rrset_data));
+       dd->rr_data = (uint8_t**)&dd->rr_len[dd->count];
+       dd->rr_ttl = (uint32_t*)&dd->rr_data[dd->count];
+       for(i = 0; i < fd->count; ++i) {
+               if (fd->rr_len[i] != 6 || fd->rr_data[i][0] != 0
+                   || fd->rr_data[i][1] != 4)
+                       return;
+               dd->rr_len[i] = 18;
+               dd->rr_data[i] =
+                   (uint8_t*)&dd->rr_ttl[dd->count] + 18*i;
+               dd->rr_data[i][0] = 0;
+               dd->rr_data[i][1] = 16;
+               synthesize_aaaa(
+                               ((struct sockaddr_in6*)&dns64_env->prefix_addr)->sin6_addr.s6_addr,
+                               dns64_env->prefix_net, &fd->rr_data[i][2],
+                               &dd->rr_data[i][2] );
+               dd->rr_ttl[i] = fd->rr_ttl[i];
+       }
+
+       /*
+        * Create synthesized AAAA RR set key. This is mostly just bookkeeping,
+        * nothing interesting here.
+        */
+       if(!dk) {
+               log_err("no key");
+               return;
+       }
+
+       dk->rk.dname = (uint8_t*)regional_alloc_init(region,
+                    fk->rk.dname, fk->rk.dname_len);
+
+       if(!dk->rk.dname) {
+               log_err("out of memory");
+               return;
+       }
+
+       dk->rk.type = htons(LDNS_RR_TYPE_AAAA);
+       memset(&dk->entry, 0, sizeof(dk->entry));
+       dk->entry.key = dk;
+       dk->entry.hash = rrset_key_hash(&dk->rk);
+       dk->entry.data = dd;
+
+}
+
+/**
+ * Synthesize an AAAA RR set from an A sub-query's answer and add it to the
+ * original empty response.
+ *
+ * \param id     This module's instance ID.
+ * \param answer The answer RR set located in the sub-query's response.
+ * \param super  Original AAAA query.
+ * \param qstate A query.
+ */
+static void
+dns64_adjust_a(int id, struct module_qstate* super, struct module_qstate* qstate)
+{
+       struct dns64_env* dns64_env = (struct dns64_env*)super->env->modinfo[id];
+       struct reply_info *rep, *cp;
+       size_t i, s;
+       struct packed_rrset_data* fd, *dd;
+       struct ub_packed_rrset_key* fk, *dk;
+
+       verbose(VERB_ALGO, "converting A answers to AAAA answers");
+
+       log_assert(super->region);
+       log_assert(qstate->return_msg);
+       log_assert(qstate->return_msg->rep);
+       log_assert(qstate->region);
+
+       /* If dns64-synthall is enabled, return_msg is not initialized */
+       if(!super->return_msg) {
+               super->return_msg = (struct dns_msg*)regional_alloc(
+                   super->region, sizeof(struct dns_msg));
+               if(!super->return_msg)
+                       return;
+               memset(super->return_msg, 0, sizeof(*super->return_msg));
+               super->return_msg->qinfo = super->qinfo;
+       }
+
+       rep = qstate->return_msg->rep;
+
+       /*
+        * Build the actual reply.
+        */
+       cp = construct_reply_info_base(qstate->region, rep->flags, rep->qdcount,
+               rep->ttl, rep->prefetch_ttl, rep->an_numrrsets, rep->ns_numrrsets,
+               rep->ar_numrrsets, rep->rrset_count, rep->security);
+       if(!cp)
+               return;
+
+       /* allocate ub_key structures special or not */
+       if(!repinfo_alloc_rrset_keys(cp, qstate->region)) {
+               return;
+       }
+
+       /* copy everything and replace A by AAAA */
+       for(i=0; i<cp->rrset_count; i++) {
+               fk = rep->rrsets[i];
+               dk = cp->rrsets[i];
+               fd = (struct packed_rrset_data*)fk->entry.data;
+               dk->entry.hash = fk->entry.hash;
+               dk->rk = fk->rk;
+               dk->id = fk->id;
+
+               if(i<rep->an_numrrsets && fk->rk.type == htons(LDNS_RR_TYPE_A)) {
+                       dns64_synth_aaaa_data(fk, fd, dk, &dd, super->region, dns64_env);
+                       /* Delete negative AAAA record from cache stored by
+                        * the iterator module */
+                       rrset_cache_remove(super->env->rrset_cache, dk->rk.dname, 
+                                          dk->rk.dname_len, LDNS_RR_TYPE_AAAA, 
+                                          LDNS_RR_CLASS_IN, 0);
+               } else {
+                       dk->rk.dname = (uint8_t*)regional_alloc_init(qstate->region,
+                               fk->rk.dname, fk->rk.dname_len);
+
+                       if(!dk->rk.dname)
+                               return;
+
+                       s = packed_rrset_sizeof(fd);
+                       dd = (struct packed_rrset_data*)regional_alloc_init(
+                               qstate->region, fd, s);
+
+                       if(!dd)
+                               return;
+               }
+
+               packed_rrset_ptr_fixup(dd);
+               dk->entry.data = (void*)dd;
+       }
+
+       /* Commit changes. */
+       super->return_msg->rep = cp;
+}
+
+/**
+ * Generate a response for the original IPv6 PTR query based on an IPv4 PTR
+ * sub-query's response.
+ *
+ * \param qstate IPv4 PTR sub-query.
+ * \param super  Original IPv6 PTR query.
+ */
+static void
+dns64_adjust_ptr(struct module_qstate* qstate, struct module_qstate* super)
+{
+    struct ub_packed_rrset_key* answer;
+
+    verbose(VERB_ALGO, "adjusting PTR reply");
+
+    /* Copy the sub-query's reply to the parent. */
+    if (!(super->return_msg = (struct dns_msg*)regional_alloc(super->region,
+                    sizeof(struct dns_msg))))
+        return;
+    super->return_msg->qinfo = super->qinfo;
+    super->return_msg->rep = reply_info_copy(qstate->return_msg->rep, NULL,
+            super->region);
+
+    /*
+     * Adjust the domain name of the answer RR set so that it matches the
+     * initial query's domain name.
+     */
+    answer = reply_find_answer_rrset(&qstate->qinfo, super->return_msg->rep);
+    log_assert(answer);
+    answer->rk.dname = super->qinfo.qname;
+    answer->rk.dname_len = super->qinfo.qname_len;
+}
+
+/**
+ * This function is called when a sub-query finishes to inform the parent query.
+ *
+ * We issue two kinds of sub-queries: PTR and A.
+ *
+ * \param qstate State of the sub-query.
+ * \param id     This module's instance ID.
+ * \param super  State of the super-query.
+ */
+void
+dns64_inform_super(struct module_qstate* qstate, int id,
+               struct module_qstate* super)
+{
+       log_query_info(VERB_ALGO, "dns64: inform_super, sub is",
+                      &qstate->qinfo);
+       log_query_info(VERB_ALGO, "super is", &super->qinfo);
+
+       /*
+        * Signal that the sub-query is finished, no matter whether we are
+        * successful or not. This lets the state machine terminate.
+        */
+       super->minfo[id] = (void*)DNS64_SUBQUERY_FINISHED;
+
+       /* If there is no successful answer, we're done. */
+       if (qstate->return_rcode != LDNS_RCODE_NOERROR
+           || !qstate->return_msg
+           || !qstate->return_msg->rep
+           || !reply_find_answer_rrset(&qstate->qinfo,
+                                       qstate->return_msg->rep))
+               return;
+
+       /* Generate a response suitable for the original query. */
+       if (qstate->qinfo.qtype == LDNS_RR_TYPE_A) {
+               dns64_adjust_a(id, super, qstate);
+       } else {
+               log_assert(qstate->qinfo.qtype == LDNS_RR_TYPE_PTR);
+               dns64_adjust_ptr(qstate, super);
+       }
+
+       /* Store the generated response in cache. */
+       if (!dns_cache_store(super->env, &super->qinfo, super->return_msg->rep,
+           0, 0, 0, NULL))
+               log_err("out of memory");
+}
+
+/**
+ * Clear module-specific data from query state. Since we do not allocate memory,
+ * it's just a matter of setting a pointer to NULL.
+ *
+ * \param qstate Query state.
+ * \param id     This module's instance ID.
+ */
+void
+dns64_clear(struct module_qstate* qstate, int id)
+{
+    qstate->minfo[id] = NULL;
+}
+
+/**
+ * Returns the amount of global memory that this module uses, not including
+ * per-query data.
+ *
+ * \param env Module environment.
+ * \param id  This module's instance ID.
+ */
+size_t
+dns64_get_mem(struct module_env* env, int id)
+{
+    struct dns64_env* dns64_env = (struct dns64_env*)env->modinfo[id];
+    if (!dns64_env)
+        return 0;
+    return sizeof(*dns64_env);
+}
+
+/**
+ * The dns64 function block.
+ */
+static struct module_func_block dns64_block = {
+       "dns64",
+       &dns64_init, &dns64_deinit, &dns64_operate, &dns64_inform_super,
+       &dns64_clear, &dns64_get_mem
+};
+
+/**
+ * Function for returning the above function block.
+ */
+struct module_func_block *
+dns64_get_funcblock()
+{
+       return &dns64_block;
+}

diff --git a/dns64/dns64.h b/dns64/dns64.h
new file mode 100644 (file)
index 0000000..2f0c01a
--- /dev/null
+++ b/dns64/dns64.h
@@ -0,0 +1,71 @@
+/*
+ * dns64/dns64.h - DNS64 module
+ *
+ * Copyright (c) 2009, Viagénie. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * This file contains a module that performs DNS64 query processing.
+ */
+
+#ifndef DNS64_DNS64_H
+#define DNS64_DNS64_H
+#include "util/module.h"
+
+/**
+ * Get the dns64 function block.
+ * @return: function block with function pointers to dns64 methods.
+ */
+struct module_func_block *dns64_get_funcblock(void);
+
+/** dns64 init */
+int dns64_init(struct module_env* env, int id);
+
+/** dns64 deinit */
+void dns64_deinit(struct module_env* env, int id);
+
+/** dns64 operate on a query */
+void dns64_operate(struct module_qstate* qstate, enum module_ev event, int id,
+               struct outbound_entry* outbound);
+
+void dns64_inform_super(struct module_qstate* qstate, int id,
+    struct module_qstate* super);
+
+/** dns64 cleanup query state */
+void dns64_clear(struct module_qstate* qstate, int id);
+
+/** dns64 alloc size routine */
+size_t dns64_get_mem(struct module_env* env, int id);
+
+#endif /* DNS64_DNS64_H */

diff --git a/doc/Changelog b/doc/Changelog
index 8ae8ee30f21885ee3e42c10e91f214af521a66f6..5ad423529793459d4d71c62e3371a88d4a00e732 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,9 @@
+31 July 2014: Wouter
+       - DNS64 from Viagenie (BSD Licensed), written by Simon Perrault.
+         Initial commit of the patch from the FreeBSD base (with its fixes).
+         This adds a module (for module-config in unbound.conf) dns64 that
+         performs DNS64 processing, see README.DNS64.
+
 29 July 2014: Wouter
        - Patch from Dag-Erling Smorgrav that implements feature, unbound -dd
          does not fork in the background and also logs to stderr.

diff --git a/doc/README.DNS64 b/doc/README.DNS64
new file mode 100644 (file)
index 0000000..23ee188
--- /dev/null
+++ b/doc/README.DNS64
@@ -0,0 +1,26 @@
+To enable DNS64 functionality in Unbound, two directives in unbound.conf must
+be edited:
+
+1. The "module-config" directive must start with "dns64". For example:
+
+    module-config: "dns64 validator iterator"
+
+If you're not using DNSSEC then you may remove "validator".
+
+2. The "dns64-prefix" directive indicates your DNS64 prefix. For example:
+
+    dns64-prefix: 64:FF9B::/96
+
+The prefix must be a /96 or shorter.
+
+To test that things are working right, perform a query against Unbound for a
+domain name for which no AAAA record exists. You should see a AAAA record in
+the answer section. The corresponding IPv6 address will be inside the DNS64
+prefix. For example:
+
+    $ unbound -c unbound.conf
+    $ dig @localhost jazz-v4.viagenie.ca aaaa
+    [...]
+    ;; ANSWER SECTION:
+    jazz-v4.viagenie.ca.        86400   IN      AAAA    64:ff9b::ce7b:1f02
+

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 9cc7e02008ce5e3e7feaa078ef07dd7665c47c59..154f8ff893624701b8252e919766c0a24e074492 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -331,8 +331,8 @@ server:
        # minimal-responses: no
 
        # module configuration of the server. A string with identifiers
-       # separated by spaces. "iterator" or "validator iterator"
-       # module-config: "validator iterator"
+       # separated by spaces. Syntax: [dns64] [validator] iterator
+       # module-config: "dns64 iterator"
 
        # File with trusted keys, kept uptodate using RFC5011 probes,
        # initial file like trust-anchor-file, then it stores metadata.
@@ -534,6 +534,9 @@ server:
        # Default is no.  Can be turned on and off with unbound-control.
        # ssl-upstream: no
 
+       # DNS64 prefix. Must be specified when DNS64 is in use.
+       # dns64-prefix: 64:ff9b::0/96
+
 # Python config section. To enable:
 # o use --with-pythonmodule to configure before compiling.
 # o list python in the module-config string (above) to enable.

diff --git a/services/modstack.c b/services/modstack.c
index 56515a61f3698ce4031a988cc4ec354345f603ae..a99030bc3defdb1194bb41c10a1f04b76529e850 100644 (file)
--- a/services/modstack.c
+++ b/services/modstack.c
@@ -43,6 +43,7 @@
 #include "services/modstack.h"
 #include "util/module.h"
 #include "util/fptr_wlist.h"
+#include "dns64/dns64.h"
 #include "iterator/iterator.h"
 #include "validator/validator.h"
 
@@ -116,6 +117,7 @@ module_list_avail(void)
 {
         /* these are the modules available */
         static const char* names[] = {
+               "dns64",
 #ifdef WITH_PYTHONMODULE
                "python", 
 #endif
@@ -133,6 +135,7 @@ static fbgetfunctype*
 module_funcs_avail(void)
 {
         static struct module_func_block* (*fb[])(void) = {
+               &dns64_get_funcblock,
 #ifdef WITH_PYTHONMODULE
                &pythonmod_get_funcblock, 
 #endif

diff --git a/util/config_file.h b/util/config_file.h
index f041df1051e6757f0931b065719ecc30cc211939..6c7ea53c511bd1a1b6093e99e55743e45c94577c 100644 (file)
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -305,6 +305,12 @@ struct config_file {
 
        /* maximum UDP response size */
        size_t max_udp_size;
+
+       /* DNS64 prefix */
+       char* dns64_prefix;
+
+       /* Synthetize all AAAA record despite the presence of an authoritative one */
+       int dns64_synthall;
 };
 
 /**

diff --git a/util/configlexer.c b/util/configlexer.c
index 3dac9c55a82f7ca2c896133c5f83cad0e4510aa7..b4c36bd02d34ecab2eaaa83d8285553fb2607b8b 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -10,7 +10,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 36
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -363,8 +363,8 @@ static void yy_fatal_error (yyconst char msg[]  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 147
-#define YY_END_OF_BUFFER 148
+#define YY_NUM_RULES 149
+#define YY_END_OF_BUFFER 150
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -372,162 +372,164 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[1399] =
+static yyconst flex_int16_t yy_accept[1420] =
     {   0,
-        1,    1,  129,  129,  133,  133,  137,  137,  141,  141,
-        1,    1,  148,  145,    1,  127,  127,  146,    2,  146,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  129,
-      130,  130,  131,  146,  133,  134,  134,  135,  146,  140,
-      137,  138,  138,  139,  146,  141,  142,  142,  143,  146,
-      144,  128,    2,  132,  146,  144,  145,    0,    1,    2,
-        2,    2,    2,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  129,    0,  133,    0,  140,    0,  137,  141,    0,
-      144,    0,    2,    2,  144,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  144,  145,  145,  145,  145,  145,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  144,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,   65,
-
-      145,  145,  145,  145,  145,    6,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  144,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  144,  145,  145,  145,  145,   29,  145,
-      145,  145,  145,  145,  145,   12,   13,  145,   15,   14,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  122,  145,  145,
-      145,  145,  145,    3,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  144,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  136,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,   32,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,   33,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-
-      145,  145,  145,  145,   80,  136,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,   79,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,   63,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,   20,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,   30,  145,  145,  145,  145,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,   31,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,   22,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,   26,
-      145,   27,  145,  145,  145,   66,  145,   67,  145,   64,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,    5,  145,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,   82,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,   23,  145,  145,  145,  145,  107,  106,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,   34,
-      145,  145,  145,  145,  145,  145,  145,  145,   69,   68,
-      145,  145,  145,  145,  145,  145,  145,  103,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,   50,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,   54,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  105,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,    4,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      100,  145,  145,  145,  145,  145,  145,  145,  116,  101,
-      145,   21,  145,  145,  145,  145,   71,  145,   72,   70,
-      145,  145,  145,  145,  145,  145,   78,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  102,  145,  145,  145,
-      145,  126,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,   62,  145,  145,  145,  145,  145,  145,
-      145,  145,   28,  145,  145,   17,  145,  145,  145,   16,
-      145,   87,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,   41,   42,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,   73,  145,  145,
-      145,  145,  145,   77,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,   81,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-
-      121,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,   91,  145,   95,
-      145,  145,  145,  145,   76,  145,  145,  114,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,   94,  145,  145,  145,  145,   43,   44,  145,   49,
-       96,  145,  108,  104,  145,  145,   37,  145,   98,  145,
-      145,  145,  145,  145,    7,  145,   61,  113,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,   83,  145,  145,  123,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,   97,
-      145,   36,   38,  145,  145,  145,  145,  145,   60,  145,
-      145,  145,  145,  117,   18,   19,  145,  145,  145,  145,
-      145,  145,  145,   58,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  119,  145,  145,   35,  145,  145,  145,
-      145,  145,  145,   11,  145,  145,  145,  145,  145,  145,
-      145,   10,  145,  145,   39,  145,  125,  118,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,   90,
-       89,  145,  120,  115,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,   45,  145,  124,  145,  145,  145,
-
-      145,   40,  145,  145,  145,   84,   86,  109,  145,  145,
-      145,   88,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,   24,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  112,
-      145,  145,  145,  145,  145,  145,  145,   25,  145,    9,
-      145,  145,  110,   51,  145,  145,  145,   93,  145,   74,
-      145,  145,  145,   53,   57,   52,  145,   46,  145,    8,
-      145,  145,   92,  145,  145,  145,   56,  145,   47,  145,
-      111,  145,  145,   85,   75,   55,   48,  145,  145,  145,
-      145,   59,  145,  145,  145,  145,   99,    0
-
+        1,    1,  131,  131,  135,  135,  139,  139,  143,  143,
+        1,    1,  150,  147,    1,  129,  129,  148,    2,  148,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  131,
+      132,  132,  133,  148,  135,  136,  136,  137,  148,  142,
+      139,  140,  140,  141,  148,  143,  144,  144,  145,  148,
+      146,  130,    2,  134,  148,  146,  147,    0,    1,    2,
+        2,    2,    2,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  131,    0,  135,    0,  142,    0,  139,  143,
+        0,  146,    0,    2,    2,  146,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  146,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  146,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,   65,  147,  147,  147,  147,  147,    6,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  146,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  146,  147,
+      147,  147,  147,   29,  147,  147,  147,  147,  147,  147,
+      147,  147,   12,   13,  147,   15,   14,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  122,  147,  147,  147,  147,  147,
+        3,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  146,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      138,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,   32,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,   33,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,   80,  138,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,   79,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,   63,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,   20,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,   30,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,   31,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,   22,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,   26,  147,   27,  147,  147,  147,   66,  147,
+       67,  147,   64,  147,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,    5,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,   82,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,   23,  147,
+      147,  147,  147,  107,  106,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,   34,  147,  147,  147,  147,  147,
+      147,  147,  147,   69,   68,  147,  147,  147,  147,  147,
+      147,  147,  103,  147,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,   50,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,   54,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  105,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,    4,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  100,  147,  147,
+      147,  147,  147,  147,  147,  116,  101,  147,  127,  147,
+
+       21,  147,  147,  147,  147,   71,  147,   72,   70,  147,
+      147,  147,  147,  147,  147,   78,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  102,  147,  147,  147,  147,
+      126,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,   62,  147,  147,  147,  147,  147,  147,  147,
+      147,   28,  147,  147,   17,  147,  147,  147,   16,  147,
+       87,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,   41,   42,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,   73,  147,  147,
+      147,  147,  147,   77,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,   81,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      121,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,   91,  147,   95,
+      147,  147,  147,  147,   76,  147,  147,  114,  147,  147,
+      147,  128,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,   94,  147,  147,  147,  147,   43,   44,  147,
+       49,   96,  147,  108,  104,  147,  147,   37,  147,   98,
+      147,  147,  147,  147,  147,    7,  147,   61,  113,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,   83,  147,  147,  123,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+       97,  147,   36,   38,  147,  147,  147,  147,  147,   60,
+      147,  147,  147,  147,  117,   18,   19,  147,  147,  147,
+      147,  147,  147,  147,   58,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  119,  147,  147,   35,  147,  147,
+      147,  147,  147,  147,   11,  147,  147,  147,  147,  147,
+      147,  147,   10,  147,  147,   39,  147,  125,  118,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+
+       90,   89,  147,  120,  115,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,   45,  147,  124,  147,  147,
+      147,  147,   40,  147,  147,  147,   84,   86,  109,  147,
+      147,  147,   88,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,   24,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      112,  147,  147,  147,  147,  147,  147,  147,   25,  147,
+        9,  147,  147,  110,   51,  147,  147,  147,   93,  147,
+       74,  147,  147,  147,   53,   57,   52,  147,   46,  147,
+        8,  147,  147,   92,  147,  147,  147,   56,  147,   47,
+
+      147,  111,  147,  147,   85,   75,   55,   48,  147,  147,
+      147,  147,   59,  147,  147,  147,  147,   99,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -570,643 +572,651 @@ static yyconst flex_int32_t yy_meta[40] =
         1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[1413] =
+static yyconst flex_int16_t yy_base[1434] =
     {   0,
         0,    0,   37,   40,   44,   51,   63,   75,   56,   68,
-       87,  108, 2067, 1442,   50, 2793, 2793, 2793,  129,   94,
-       70,  104,  122,   90,   92,  115,  126,   95,   84,  132,
-      135,  138,   50,  146,  148,  157,  167,  160,  151, 1368,
-     2793, 2793, 2793,   70, 1259, 2793, 2793, 2793,   42, 1197,
-     1142, 2793, 2793, 2793,  189,  824, 2793, 2793, 2793,  195,
-      789, 2793,  199, 2793,  203,  111,  761,  209,  120,    0,
-      220,    0,    0,  103,  141,  149,  202,  189,  182,  204,
-      206,  210,  218,  215,  217,  221,  222,  223,  225,  228,
-      235,  248,  165,  244,  247,  233,  245,  252,  246,  251,
-
-      258,  260,  261,  262,  267,  263,  270,  271,  158,  274,
-      276,  280,  277,  278,  282,  286,  283,  295,  287,  291,
-      288,  653,  316,  558,  307,  417,  320,  388,  347,  324,
-      236,  328,  332,    0,  310,  325,  333,  327,  226,  329,
-      331,  339,  336,  343,  352,  345,  335,  348,   49,  355,
-      357,  349,  350,  364,  360,  369,  367,  370,  371,  380,
-      381,  388,  389,  296,  337,  391,  392,  398,  400,  396,
-      399,  401,  402,  385,  404,  409,  406,  410,  411,  413,
-      419,  416,  418,  422,  428,  425,  427,  434,  442,  443,
-      445,  440,  430,  446,  453,  450,  441,  451,  457,  458,
-
-      459,  466,  470,  461,  463,  472,  476,  473,  479,  481,
-      484,  486,  492,  468,  489,  490,  493,  496,  494,  498,
-      501,  504,  500,  505,  508,  509,  510,  514,  520,  519,
-      516,  523,  524,  530,  529,  534,  535,  536,  539,  542,
-      548,  546,  547,  550,  549,  551,  556,  564,  568,  557,
-      560,  561,  569,  571,  575,  591,  577,  579,  581,  582,
-      584,  595,  609,  596,  585,  597,  613,  598,  611,  614,
-      623,  617,  622,  624,  627,  626,  629,  630,  631,  634,
-      635,  642,  632,  646,  654,  651,  658,  659,  639,  586,
-      665,  650,  661,  663,  668,  666,  669,  673,  676, 2793,
-
-      678,  680,  681,  682,  683, 2793,  684,  685,  686,  687,
-      688,  698,  690,  697,  699,  702,  703,  707,  709,  710,
-      730,  713,  711,  721,  714,  715,  722,  724,  739,  728,
-      732,  737,  734,  741,  742,  745,  748,  750,  751,  762,
-      758,  759,  760,  769,  764,  766,  771,  772,  779,  775,
-      781,  784,  790,  792,  794,  800,  786,  796,  798,  804,
-      805,  803,  797,  811,  810,  812,  813,  818,  814,  827,
-      820,  828,  830,  833,  823,  835,  837,  839,  846,  842,
-      844,  849,  845,  843,  854,  855,  859,  858,  870,  871,
-      864,  872,  879,  880,  857,  881,  867,  877,  884,  886,
-
-      887,  888,  889,  892,  893,  899,  896,  900,  898,  905,
-      907,  909,  911,  913,  914,  917,  920,  918,  919,  928,
-      929,  931,  933,  932,  935,  939,  934,  941, 2793,  949,
-      948,  945,  951,  953,  956, 2793, 2793,  958, 2793, 2793,
-      954,  959,  960,  967,  976,  968,  966,  972,  974,  982,
-      979,  989,  970,  991,  993,  998,  987,  999, 1000, 1001,
-     1004, 1005, 1006, 1010, 1017, 1020, 1013, 1021, 1014, 1024,
-     1025, 1026, 1028, 1030, 1033, 1039, 1036, 2793, 1037, 1038,
-     1044, 1042, 1047, 2793, 1046, 1048, 1049, 1051, 1054, 1059,
-     1056, 1060, 1062, 1063, 1066, 1069, 1068, 1061, 1072, 1078,
-
-     1089, 1087, 1077, 1085, 1088, 1090, 1094, 1103, 1099, 1092,
-     1100, 1106, 1104, 1108, 1115, 1105, 1112, 1109, 1117, 1118,
-     1142, 1119, 1121, 1125, 1122, 1126, 1127, 1129, 1133, 1135,
-     1154, 1144, 1138, 1134, 1156, 1159, 1161, 1163, 1165, 1167,
-     1168, 2793, 1175, 1171, 1173, 1176, 1178, 1179, 1181, 1182,
-     1186, 1185, 1188, 1187, 1199, 2793, 1193, 1195, 1200, 1203,
-     1204, 1206, 1207, 1217, 1219, 2793, 1225, 1222, 1227, 1221,
-     1228, 1229, 1210, 1233, 1234, 1235, 1237, 1240, 1243, 1245,
-     1244, 1247, 1249, 1251, 1252, 1255, 1256, 1258, 1257, 1266,
-     1260, 1264, 1278, 1279, 1265, 1282, 1277, 1283, 1286, 1288,
-
-     1285, 1290, 1287, 1289, 2793,  175, 1291, 1292, 1293, 1300,
-     1309, 1310, 1294, 1302, 1312, 1311, 1318, 1301, 1322, 1319,
-     1323, 1324, 1325, 1330, 1327, 1334, 1331, 1328, 1336, 1341,
-     1339, 1342, 1347, 1348, 1345, 1349, 1350, 2793, 1357, 1356,
-     1364, 1355, 1361, 1378, 1362, 1367, 1374, 1376, 1384, 1382,
-     1386, 1388, 1390, 1392, 1379, 1394, 1400, 1401, 1398, 1402,
-     1404, 1405, 2793, 1407, 1408, 1409, 1410, 1414, 1417, 1415,
-     1419, 1421, 1431, 1426, 1435, 2793, 1436, 1438, 1428, 1445,
-     1432, 1449, 1450, 1454, 1440, 1451, 1457, 1458, 1461, 1459,
-     1464, 1466, 2793, 1472, 1474, 1471, 1480, 1478, 1479, 1481,
-
-     1483, 1468, 1484, 1490, 1486, 1489, 1493, 1494, 1496, 1497,
-     1499, 1491, 1500, 2793, 1513, 1501, 1502, 1510, 1503, 1504,
-     1519, 1518, 1525, 1526, 1528, 1529, 1530, 1531, 1532, 1533,
-     1541, 1534, 1539, 1542, 1547, 1558, 1559, 1555, 2793, 1561,
-     1557, 1564, 1546, 1571, 1568, 1569, 1572, 1573, 1574, 1575,
-     1582, 1576, 1579, 1583, 1584, 1580, 1585, 1586, 1589, 1587,
-     1596, 1597, 1604, 1605, 1608, 1609, 1611, 1612, 1621, 2793,
-     1617, 2793, 1618, 1619, 1627, 2793, 1629, 2793, 1631, 2793,
-     1633, 1637, 1624, 1626, 1634, 1640, 1641, 1643, 1644, 1646,
-     1649, 1650, 1653, 1654, 1655, 2793, 1652, 1658, 1662, 1659,
-
-     1665, 1666, 1667, 1675, 1681, 1668, 1677, 1683, 1678, 2793,
-     1687, 1674, 1690, 1694, 1695, 1697, 1698, 1700, 1701, 1702,
-     1703, 1705, 1707, 1709, 1710, 1711, 1714, 1721, 1713, 1723,
-     1716, 1719, 1722, 2793, 1729, 1734, 1737, 1724, 2793, 2793,
-     1748, 1732, 1745, 1738, 1742, 1752, 1753, 1755, 1761, 1758,
-     1759, 1760, 1763, 1766, 1767, 1768, 1769, 1772, 1775, 2793,
-     1782, 1776, 1783, 1784, 1785, 1796, 1774, 1795, 2793, 2793,
-     1789, 1799, 1800, 1801, 1807, 1803, 1806, 2793, 1808, 1809,
-     1810, 1811, 1817, 1814, 1821, 1825, 1827, 1829, 1830, 1833,
-     1836, 1834, 1832, 1835, 1838, 1848, 2793, 1849, 1852, 1859,
-
-     1839, 1853, 1855, 1857, 1861, 1863, 1865, 1871, 1867, 2793,
-     1873, 1869, 1879, 1876, 1878, 1882, 1885, 1884, 1886, 1888,
-     1889, 1890, 1892, 1893, 1894, 1897, 2793, 1904, 1900, 1905,
-     1907, 1912, 1902, 1915, 1910, 1918, 2793, 1922, 1929, 1923,
-     1925, 1931, 1933, 1926, 1937, 1939, 1940, 1941, 1942, 1944,
-     1946, 1947, 1950, 1951, 1952, 1960, 1962, 1969, 1970, 1967,
-     1971, 1978, 1974, 1975, 1976, 1977, 1985, 1981, 1987, 1984,
-     2793, 1989, 1991, 1995, 1998, 2000, 2001, 1997, 2793, 2793,
-     1999, 2793, 2008, 2010, 2012, 2013, 2793, 2015, 2793, 2793,
-     2016, 2023, 2017, 2024, 2027, 2032, 2793, 2019, 2033, 2035,
-
-     2037, 2038, 2039, 2040, 2041, 2042, 2793, 2043, 2044, 2045,
-     2055, 2793, 2047, 2060, 2049, 2065, 2066, 2067, 2069, 2071,
-     2057, 2078, 2076, 2793, 2079, 2080, 2083, 2084, 2088, 2085,
-     2086, 2090, 2793, 2099, 2101, 2793, 2092, 2091, 2093, 2793,
-     2107, 2793, 2108, 2103, 2110, 2112, 2116, 2117, 2120, 2122,
-     2123, 2124, 2125, 2131, 2128, 2793, 2793, 2133, 2140, 2143,
-     2134, 2132, 2145, 2147, 2148, 2150, 2151, 2793, 2154, 2152,
-     2156, 2155, 2158, 2793, 2160, 2161, 2168, 2169, 2165, 2173,
-     2175, 2180, 2184, 2186, 2187, 2189, 2191, 2192, 2793, 2194,
-     2196, 2197, 2201, 2202, 2157, 2204, 2208, 2213, 2198, 2215,
-
-     2793, 2219, 2203, 2221, 2223, 2225, 2205, 2226, 2227, 2228,
-     2230, 2231, 2233, 2234, 2236, 2244, 2241, 2793, 2238, 2793,
-     2247, 2252, 2259, 2260, 2793, 2248, 2255, 2793, 2262, 2266,
-     2273, 2264, 2274, 2276, 2278, 2270, 2280, 2279, 2281, 2287,
-     2285, 2793, 2288, 2289, 2292, 2293, 2793, 2793, 2296, 2793,
-     2793, 2302, 2793, 2793, 2298, 2306, 2793, 2308, 2793, 2314,
-     2310, 2312, 2313, 2315, 2793, 2317, 2793, 2793, 2318, 2319,
-     2322, 2324, 2326, 2331, 2333, 2327, 2334, 2337, 2338, 2341,
-     2340, 2342, 2344, 2346, 2347, 2348, 2351, 2354, 2356, 2357,
-     2358, 2360, 2367, 2793, 2359, 2371, 2793, 2380, 2374, 2361,
-
-     2369, 2381, 2382, 2384, 2386, 2393, 2389, 2390, 2391, 2793,
-     2394, 2793, 2793, 2392, 2397, 2396, 2401, 2402, 2793, 2406,
-     2407, 2415, 2418, 2793, 2793, 2793, 2421, 2408, 2410, 2423,
-     2424, 2425, 2427, 2793, 2431, 2432, 2433, 2434, 2440, 2442,
-     2448, 2451, 2453, 2793, 2454, 2445, 2793, 2455, 2447, 2456,
-     2461, 2462, 2464, 2793, 2466, 2467, 2469, 2471, 2475, 2476,
-     2472, 2793, 2478, 2479, 2793, 2482, 2793, 2793, 2483, 2488,
-     2490, 2495, 2497, 2499, 2491, 2500, 2506, 2505, 2507, 2793,
-     2793, 2502, 2793, 2793, 2510, 2512, 2513, 2515, 2517, 2518,
-     2519, 2521, 2522, 2524, 2793, 2525, 2793, 2527, 2535, 2526,
-
-     2537, 2793, 2540, 2536, 2538, 2793, 2793, 2793, 2550, 2541,
-     2543, 2793, 2551, 2553, 2554, 2557, 2559, 2560, 2561, 2564,
-     2566, 2565, 2567, 2568, 2576, 2579, 2793, 2581, 2571, 2578,
-     2586, 2589, 2582, 2590, 2592, 2595, 2596, 2598, 2599, 2793,
-     2603, 2604, 2606, 2611, 2614, 2615, 2622, 2793, 2623, 2793,
-     2626, 2627, 2793, 2793, 2628, 2630, 2633, 2793, 2634, 2793,
-     2631, 2641, 2642, 2793, 2793, 2793, 2644, 2793, 2645, 2793,
-     2648, 2635, 2793, 2619, 2653, 2655, 2793, 2657, 2793, 2659,
-     2793, 2660, 2661, 2793, 2793, 2793, 2793, 2663, 2664, 2666,
-     2607, 2793, 2668, 2671, 2669, 2674, 2793, 2793, 2701, 2708,
-
-     2715, 2722, 2729,   94, 2736, 2743, 2750, 2757, 2764, 2771,
-     2778, 2785
+       87,  108, 2308, 1868,   50, 2836, 2836, 2836,  129,   94,
+       70,  104,  130,   90,   92,  115,  127,   95,   84,  111,
+      137,  148,   50,  150,  155,  157,  163,  171,  178, 1613,
+     2836, 2836, 2836,   70, 1321, 2836, 2836, 2836,   42, 1271,
+     1231, 2836, 2836, 2836,  195, 1162, 2836, 2836, 2836,  141,
+      980, 2836,  202, 2836,  206,  122,  800,  212,  120,    0,
+      223,    0,    0,  103,  147,  154,  158,  192,  199,  207,
+      208,  205,  209,  221,  218,  220,  224,  225,  229,  230,
+      231,  238,  251,  236,  247,  250,  237,  248,  256,  259,
+
+      167,  263,  254,  249,  264,  265,  271,  273,  274,  125,
+      275,  277,  284,  278,  281,  285,  288,  286,  289,  292,
+      296,  298,  763,  308,  643,  315,  616,  326,  439,  381,
+      319,  301,  330,  334,    0,  327,  331,  337,  314,  305,
+      333,  335,  343,  340,  346,  349,  356,  350,  339,  352,
+       49,  359,  361,  353,  354,  368,  364,  373,  371,  342,
+      374,  384,  385,  392,  393,  391,  375,  394,  397,  404,
+      406,  403,  182,  395,  405,  407,  408,  409,  412,  413,
+      414,  419,  422,  420,  421,  426,  430,  427,  431,  434,
+      444,  447,  448,  441,  445,  449,  456,  454,  455,  458,
+
+      452,  461,  463,  468,  474,  472,  465,  475,  477,  478,
+      479,  489,  483,  491,  493,  499,  485,  495,  487,  496,
+      500,  502,  503,  504,  511,  512,  510,  514,  517,  518,
+      519,  521,  525,  524,  535,  529,  530,  541,  537,  542,
+      543,  540,  548,  556,  552,  553,  554,  560,  561,  562,
+      569,  565,  563,  566,  573,  567,  575,  576,  595,  585,
+      583,  587,  593,  589,  579,  596,  601,  602,  603,  620,
+      605,  613,  624,  623,  632,  606,  622,  631,  634,  633,
+      636,  637,  639,  641,  642,  644,  652,  645,  662,  658,
+      661,  666,  646,  667,  674,  660,  670,  672,  673,  675,
+
+      678,  680,  685, 2836,  687,  682,  689,  690,  692, 2836,
+      691,  693,  694,  695,  698,  707,  696,  705,  709,  712,
+      710,  715,  717,  718,  738,  721,  719,  729,  723,  722,
+      731,  728,  747,  736,  740,  743,  749,  745,  750,  756,
+      757,  759,  762,  775,  760,  761,  769,  778,  771,  773,
+      781,  780,  786,  787,  788,  791,  793,  799,  797,  805,
+      807,  798,  808,  810,  816,  817,  815,  809,  823,  822,
+      812,  825,  830,  824,  839,  832,  835,  836,  843,  844,
+      845,  847,  846,  854,  853,  852,  861,  851,  860,  865,
+      866,  867,  868,  877,  874,  875,  880,  886,  887,  882,
+
+      888,  891,  892,  893,  894,  895,  896,  900,  902,  903,
+      911,  897,  907,  913,  919,  921,  922,  904,  924,  925,
+      928,  927,  931,  935,  929,  939,  941,  942,  943,  949,
+      951,  944,  953, 2836,  963,  957,  959,  960,  964,  966,
+      945,  967, 2836, 2836,  968, 2836, 2836,  974,  969,  973,
+      981,  986,  987,  979,  989,  991,  996,  999, 1000, 1002,
+     1007, 1009, 1010, 1003, 1011, 1013, 1018, 1016, 1020, 1022,
+     1025, 1033, 1034, 1032, 1036, 1037, 1039, 1026, 1041, 1043,
+     1049, 1051, 1057, 1053, 2836, 1055, 1040, 1060, 1056, 1062,
+     2836, 1063, 1064, 1066, 1068, 1067, 1070, 1074, 1075, 1076,
+
+     1077, 1082, 1078, 1080, 1081, 1085, 1098, 1100, 1102, 1097,
+     1103, 1104, 1105, 1107, 1117, 1110, 1111, 1114, 1123, 1119,
+     1121, 1125, 1122, 1128, 1130, 1131, 1133, 1156, 1134, 1135,
+     1141, 1136, 1140, 1143, 1144, 1142, 1146, 1148, 1169, 1170,
+     1168, 1174, 1175, 1152, 1177, 1181, 1179, 1180, 1184, 1186,
+     2836, 1197, 1191, 1185, 1195, 1198, 1200, 1201, 1202, 1206,
+     1205, 1209, 1207, 1217, 2836, 1213, 1215, 1214, 1222, 1226,
+     1230, 1228, 1238, 1241, 2836, 1245, 1242, 1247, 1234, 1248,
+     1251, 1252, 1253, 1255, 1218, 1256, 1257, 1262, 1265, 1259,
+     1264, 1266, 1269, 1270, 1276, 1275, 1278, 1279, 1282, 1281,
+
+     1286, 1296, 1299, 1287, 1301, 1293, 1295, 1303, 1308, 1305,
+     1307, 1306, 1310, 2836,  239, 1313, 1311, 1314, 1322, 1324,
+     1328, 1318, 1329, 1331, 1330, 1337, 1320, 1341, 1338, 1342,
+     1344, 1346, 1349, 1347, 1353, 1350, 1357, 1351, 1359, 1362,
+     1363, 1365, 1367, 1368, 1370, 1372, 1371, 1373, 2836, 1383,
+     1379, 1381, 1380, 1385, 1397, 1394, 1395, 1398, 1404, 1401,
+     1405, 1406, 1414, 1403, 1416, 1409, 1417, 1424, 1425, 1422,
+     1426, 1428, 1418, 2836, 1432, 1433, 1431, 1438, 1434, 1439,
+     1440, 1441, 1443, 1451, 1445, 1456, 2836, 1458, 1457, 1463,
+     1465, 1466, 1470, 1467, 1474, 1471, 1475, 1476, 1478, 1487,
+
+     1477, 1479, 1489, 2836, 1497, 1498, 1494, 1505, 1481, 1501,
+     1502, 1504, 1506, 1507, 1514, 1508, 1511, 1515, 1516, 1512,
+     1510, 1518, 1519, 1522, 2836, 1539, 1537, 1521, 1523, 1525,
+     1540, 1541, 1524, 1547, 1548, 1550, 1553, 1555, 1552, 1556,
+     1557, 1558, 1554, 1565, 1560, 1562, 1573, 1576, 1582, 1583,
+     1579, 2836, 1585, 1586, 1587, 1588, 1597, 1590, 1593, 1595,
+     1598, 1599, 1600, 1608, 1602, 1604, 1609, 1610, 1605, 1611,
+     1615, 1616, 1620, 1622, 1627, 1633, 1631, 1635, 1636, 1639,
+     1637, 1649, 2836, 1638, 2836, 1645, 1646, 1653, 2836, 1655,
+     2836, 1659, 2836, 1660, 1661, 1652, 1664, 1665, 1666, 1668,
+
+     1670, 1672, 1673, 1675, 1676, 1677, 1680, 1685, 2836, 1678,
+     1684, 1693, 1682, 1686, 1688, 1701, 1695, 1709, 1691, 1705,
+     1713, 1710, 2836, 1707, 1714, 1717, 1718, 1720, 1726, 1724,
+     1727, 1728, 1729, 1730, 1732, 1733, 1737, 1734, 1740, 1741,
+     1742, 1746, 1744, 1750, 1753, 1751, 1752, 1754, 2836, 1759,
+     1757, 1767, 1765, 2836, 2836, 1769, 1770, 1777, 1778, 1780,
+     1766, 1783, 1784, 1791, 1788, 1790, 1796, 1797, 1798, 1799,
+     1800, 1801, 1803, 1804, 2836, 1811, 1805, 1813, 1814, 1807,
+     1821, 1817, 1825, 2836, 2836, 1829, 1826, 1831, 1832, 1838,
+     1836, 1835, 2836, 1840, 1841, 1842, 1843, 1850, 1854, 1844,
+
+     1846, 1857, 1858, 1859, 1862, 1869, 1865, 1866, 1870, 1879,
+     1881, 2836, 1873, 1886, 1875, 1889, 1895, 1883, 1891, 1892,
+     1894, 1896, 1898, 1900, 1906, 1902, 2836, 1908, 1907, 1914,
+     1911, 1918, 1919, 1926, 1915, 1913, 1922, 1923, 1924, 1931,
+     1928, 1937, 1932, 2836, 1935, 1940, 1941, 1946, 1948, 1947,
+     1949, 1951, 1955, 2836, 1958, 1964, 1960, 1961, 1966, 1962,
+     1969, 1970, 1972, 1974, 1976, 1975, 1979, 1983, 1984, 1986,
+     1989, 1992, 1999, 1997, 2003, 2009, 2001, 2005, 2012, 2008,
+     2011, 2013, 2014, 2021, 2018, 2024, 2022, 2836, 2023, 2029,
+     2031, 2032, 2036, 2037, 2033, 2836, 2836, 2035, 2836, 2044,
+
+     2836, 2045, 2048, 2049, 2050, 2836, 2052, 2836, 2836, 2053,
+     2060, 2054, 2061, 2063, 2069, 2836, 2070, 2064, 2072, 2074,
+     2075, 2076, 2078, 2079, 2080, 2836, 2081, 2083, 2089, 2082,
+     2836, 2092, 2097, 2093, 2098, 2099, 2104, 2105, 2102, 2108,
+     2116, 2112, 2836, 2113, 2115, 2122, 2114, 2118, 2123, 2124,
+     2131, 2836, 2134, 2135, 2836, 2136, 2137, 2138, 2836, 2141,
+     2836, 2142, 2144, 2145, 2146, 2151, 2152, 2163, 2153, 2156,
+     2164, 2158, 2166, 2167, 2836, 2836, 2168, 2174, 2178, 2176,
+     2180, 2182, 2183, 2184, 2186, 2189, 2190, 2836, 2192, 2193,
+     2196, 2194, 2197, 2836, 2201, 2195, 2207, 2208, 2202, 2205,
+
+     2211, 2213, 2223, 2225, 2214, 2228, 2230, 2219, 2836, 2231,
+     2235, 2232, 2240, 2237, 2241, 2242, 2243, 2249, 2246, 2253,
+     2836, 2257, 2250, 2260, 2254, 2258, 2262, 2264, 2266, 2269,
+     2268, 2271, 2272, 2274, 2277, 2280, 2278, 2836, 2284, 2836,
+     2285, 2287, 2297, 2298, 2836, 2293, 2300, 2836, 2302, 2296,
+     2310, 2836, 2311, 2303, 2314, 2316, 2317, 2318, 2319, 2320,
+     2328, 2324, 2836, 2326, 2327, 2333, 2329, 2836, 2836, 2334,
+     2836, 2836, 2344, 2836, 2836, 2340, 2347, 2836, 2349, 2836,
+     2355, 2351, 2338, 2336, 2356, 2836, 2360, 2836, 2836, 2357,
+     2363, 2353, 2364, 2371, 2373, 2375, 2366, 2368, 2376, 2377,
+
+     2379, 2380, 2381, 2383, 2384, 2387, 2390, 2392, 2394, 2395,
+     2396, 2397, 2398, 2400, 2836, 2404, 2406, 2836, 2412, 2408,
+     2415, 2416, 2419, 2420, 2421, 2424, 2431, 2427, 2425, 2428,
+     2836, 2432, 2836, 2836, 2429, 2435, 2446, 2439, 2441, 2836,
+     2453, 2443, 2456, 2458, 2836, 2836, 2836, 2460, 2447, 2463,
+     2465, 2466, 2464, 2467, 2836, 2473, 2474, 2476, 2477, 2485,
+     2487, 2494, 2491, 2496, 2836, 2493, 2468, 2836, 2497, 2499,
+     2501, 2502, 2503, 2505, 2836, 2506, 2507, 2509, 2513, 2516,
+     2519, 2518, 2836, 2520, 2517, 2836, 2532, 2836, 2836, 2521,
+     2533, 2535, 2537, 2540, 2543, 2528, 2544, 2550, 2548, 2478,
+
+     2836, 2836, 2549, 2836, 2836, 2551, 2552, 2553, 2556, 2559,
+     2561, 2554, 2562, 2564, 2563, 2836, 2565, 2836, 2567, 2577,
+     2578, 2571, 2836, 2581, 2579, 2569, 2836, 2836, 2836, 2584,
+     2586, 2592, 2836, 2593, 2595, 2596, 2597, 2600, 2602, 2603,
+     2605, 2606, 2608, 2607, 2609, 2617, 2618, 2836, 2621, 2610,
+     2622, 2626, 2632, 2627, 2629, 2634, 2636, 2637, 2639, 2640,
+     2836, 2642, 2643, 2651, 2653, 2658, 2655, 2662, 2836, 2663,
+     2836, 2666, 2667, 2836, 2836, 2668, 2670, 2673, 2836, 2674,
+     2836, 2671, 2681, 2682, 2836, 2836, 2836, 2684, 2836, 2685,
+     2836, 2688, 2675, 2836, 2677, 2693, 2697, 2836, 2699, 2836,
+
+     2701, 2836, 2694, 2702, 2836, 2836, 2836, 2836, 2704, 2705,
+     2710, 2707, 2836, 2711, 2713, 2712, 2715, 2836, 2836, 2744,
+     2751, 2758, 2765, 2772,   94, 2779, 2786, 2793, 2800, 2807,
+     2814, 2821, 2828
     } ;
 
-static yyconst flex_int16_t yy_def[1413] =
+static yyconst flex_int16_t yy_def[1434] =
     {   0,
-     1398,    1, 1399, 1399, 1400, 1400, 1401, 1401, 1402, 1402,
-     1403, 1403, 1398, 1404, 1398, 1398, 1398, 1398, 1405, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1406,
-     1398, 1398, 1398, 1406, 1407, 1398, 1398, 1398, 1407, 1408,
-     1398, 1398, 1398, 1398, 1408, 1409, 1398, 1398, 1398, 1409,
-     1410, 1398, 1411, 1398, 1410, 1410, 1404, 1404, 1398, 1412,
-     1405, 1412, 1405, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1406, 1406, 1407, 1407, 1408, 1408, 1398, 1409, 1409,
-     1410, 1410, 1411, 1411, 1410, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1410, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1410, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398,
-
-     1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1410, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1410, 1404, 1404, 1404, 1404, 1398, 1404,
-     1404, 1404, 1404, 1404, 1404, 1398, 1398, 1404, 1398, 1398,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404,
-     1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1410, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1398, 1410, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398,
-     1404, 1398, 1404, 1404, 1404, 1398, 1404, 1398, 1404, 1398,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1398, 1398,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1398,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1398,
-     1404, 1398, 1404, 1404, 1404, 1404, 1398, 1404, 1398, 1398,
-     1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404,
-     1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1398, 1404, 1404, 1398, 1404, 1404, 1404, 1398,
-     1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1398, 1398, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404,
-     1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-
-     1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1398,
-     1404, 1404, 1404, 1404, 1398, 1404, 1404, 1398, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1398, 1404, 1404, 1404, 1404, 1398, 1398, 1404, 1398,
-     1398, 1404, 1398, 1398, 1404, 1404, 1398, 1404, 1398, 1404,
-     1404, 1404, 1404, 1404, 1398, 1404, 1398, 1398, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1398, 1404, 1404, 1398, 1404, 1404, 1404,
-
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398,
-     1404, 1398, 1398, 1404, 1404, 1404, 1404, 1404, 1398, 1404,
-     1404, 1404, 1404, 1398, 1398, 1398, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1398, 1404, 1404, 1398, 1404, 1404, 1404,
-     1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1398, 1404, 1404, 1398, 1404, 1398, 1398, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398,
-     1398, 1404, 1398, 1398, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1398, 1404, 1398, 1404, 1404, 1404,
-
-     1404, 1398, 1404, 1404, 1404, 1398, 1398, 1398, 1404, 1404,
-     1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398,
-     1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1398,
-     1404, 1404, 1398, 1398, 1404, 1404, 1404, 1398, 1404, 1398,
-     1404, 1404, 1404, 1398, 1398, 1398, 1404, 1398, 1404, 1398,
-     1404, 1404, 1398, 1404, 1404, 1404, 1398, 1404, 1398, 1404,
-     1398, 1404, 1404, 1398, 1398, 1398, 1398, 1404, 1404, 1404,
-     1404, 1398, 1404, 1404, 1404, 1404, 1398,    0, 1398, 1398,
-
-     1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398,
-     1398, 1398
+     1419,    1, 1420, 1420, 1421, 1421, 1422, 1422, 1423, 1423,
+     1424, 1424, 1419, 1425, 1419, 1419, 1419, 1419, 1426, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1427,
+     1419, 1419, 1419, 1427, 1428, 1419, 1419, 1419, 1428, 1429,
+     1419, 1419, 1419, 1419, 1429, 1430, 1419, 1419, 1419, 1430,
+     1431, 1419, 1432, 1419, 1431, 1431, 1425, 1425, 1419, 1433,
+     1426, 1433, 1426, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1427, 1427, 1428, 1428, 1429, 1429, 1419, 1430,
+     1430, 1431, 1431, 1432, 1432, 1431, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1431, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1431, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1419,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1431, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1431, 1425,
+     1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1419, 1419, 1425, 1419, 1419, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425,
+     1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1431, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1419, 1431, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1419, 1425, 1419, 1425, 1425, 1425, 1419, 1425,
+     1419, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425,
+     1425, 1425, 1425, 1419, 1419, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1419, 1419, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1419, 1419, 1425, 1419, 1425,
+
+     1419, 1425, 1425, 1425, 1425, 1419, 1425, 1419, 1419, 1425,
+     1425, 1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425,
+     1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1419, 1425, 1425, 1419, 1425, 1425, 1425, 1419, 1425,
+     1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1419, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425, 1425,
+     1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425, 1419,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1419, 1425, 1425,
+     1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1419, 1425, 1425, 1425, 1425, 1419, 1419, 1425,
+     1419, 1419, 1425, 1419, 1419, 1425, 1425, 1419, 1425, 1419,
+     1425, 1425, 1425, 1425, 1425, 1419, 1425, 1419, 1419, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1419, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1419, 1425, 1419, 1419, 1425, 1425, 1425, 1425, 1425, 1419,
+     1425, 1425, 1425, 1425, 1419, 1419, 1419, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1419, 1425, 1425,
+     1425, 1425, 1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1419, 1425, 1425, 1419, 1425, 1419, 1419, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+
+     1419, 1419, 1425, 1419, 1419, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1419, 1425, 1419, 1425, 1425,
+     1425, 1425, 1419, 1425, 1425, 1425, 1419, 1419, 1419, 1425,
+     1425, 1425, 1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425, 1425,
+     1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1425,
+     1419, 1425, 1425, 1425, 1425, 1425, 1425, 1425, 1419, 1425,
+     1419, 1425, 1425, 1419, 1419, 1425, 1425, 1425, 1419, 1425,
+     1419, 1425, 1425, 1425, 1419, 1419, 1419, 1425, 1419, 1425,
+     1419, 1425, 1425, 1419, 1425, 1425, 1425, 1419, 1425, 1419,
+
+     1425, 1419, 1425, 1425, 1419, 1419, 1419, 1419, 1425, 1425,
+     1425, 1425, 1419, 1425, 1425, 1425, 1425, 1419,    0, 1419,
+     1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419,
+     1419, 1419, 1419
     } ;
 
-static yyconst flex_int16_t yy_nxt[2833] =
+static yyconst flex_int16_t yy_nxt[2876] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   18,   20,   21,   14,   22,   23,   24,   25,   14,
        26,   27,   28,   29,   30,   31,   32,   33,   34,   14,
        35,   36,   37,   38,   39,   14,   14,   14,   14,   41,
-       42,   43,   41,   42,   43,  124,   46,   47,  124,   44,
+       42,   43,   41,   42,   43,  125,   46,   47,  125,   44,
        48,   69,   44,   46,   47,   70,   49,   48,   57,   58,
        59,   68,   68,   49,   51,   52,   53,   54,   60,   18,
-       57,   58,   59,  122,  122,   55,   51,   52,   53,   54,
-       60,   18,   68,  103,  211,   74,   75,   55,   15,   16,
+       57,   58,   59,  123,  123,   55,   51,   52,   53,   54,
+       60,   18,   68,  104,  214,   74,   75,   55,   15,   16,
        17,   62,   63,   64,   67,   67,   68,   67,   67,   65,
 
-       67,   94,   68,   76,   68,   67,   84,   68,   66,   15,
-       16,   17,   62,   63,   64,   68,   68,   77,  136,   86,
-       65,   69,   93,  132,   78,   70,   85,   68,   87,   66,
-       72,   79,   72,   72,   68,   72,   88,  135,   68,   80,
-       72,   73,   89,   81,   68,   90,   82,   68,   96,   83,
-       68,  100,   91,   68,   92,  101,   97,  137,   68,   95,
-       68,   68,   98,   68,  120,  108,   99,  104,  121,   68,
-       68,  102,   68,  105,  111,  109,  106,   68,  110,   68,
-      115,  138,  116,  107,  112,  177,  118,  132,  113,  114,
-      126,  119,  126,  126,   68,  126,  158,  117,  129,  129,
-
-       72,   68,   72,   72,  131,   72,  131,  131,  141,  131,
-       67,  134,   67,   67,   68,   67,   68,  139,   68,  140,
-       67,   72,   68,   72,   72,  145,   72,   68,  142,   68,
-       68,   72,   73,   68,   68,   68,  143,   68,   68,  151,
-       68,  147,  152,  146,  144,   68,  196,   68,  132,  148,
-      154,  149,  150,  155,  153,  157,   68,   68,   68,   68,
-       68,  159,  161,   68,   68,  166,  162,  156,  165,  163,
-       68,  164,   68,   68,   68,   68,  167,  168,  171,   68,
-      173,  160,   68,   68,  174,  169,   68,  180,   68,   68,
-       68,  182,   68,  170,   68,   68,  176,  172,   68,   68,
-
-       68,  181,  175,   68,  189,  178,  179,   68,   68,  187,
-      124,  183,  184,  124,  185,  190,  186,  228,  191,  122,
-      122,  126,  132,  126,  126,  192,  126,  129,  129,  131,
-      188,  131,  131,   72,  131,   72,   72,   68,   72,   68,
-      194,   68,  193,   68,  134,   68,  199,   68,   68,   68,
-      202,   68,  200,  201,  195,   68,  197,   68,  208,  130,
-       68,   68,   68,  198,   68,  210,  209,   68,  203,   68,
-      229,  212,   68,  204,  213,  214,   68,  215,  205,   68,
-      220,   68,   68,   68,  206,  207,  219,  223,  216,  128,
-      218,  217,   68,   68,  224,  225,  227,   68,  230,  222,
-
-       68,   68,  221,   68,   68,  232,  226,  233,   68,  231,
-       68,   68,   68,   68,   68,  234,   68,  235,   68,  238,
-      237,   68,   68,   68,  239,   68,  246,  242,   68,  127,
-       68,   68,  248,  236,   68,  250,  240,   68,  241,   68,
-       68,  249,   68,  244,  245,  243,   68,  253,  247,  254,
-      256,  252,  132,   68,   68,   68,  251,   68,   68,  257,
-      262,  260,   68,   68,  259,   68,  261,  263,  264,   68,
-       68,   68,  255,   68,  268,   68,  258,  266,   68,  269,
-       68,  265,   68,  270,   68,   68,  276,  273,   68,  271,
-      272,   68,  274,   68,  275,  267,   68,  278,   68,  280,
-
-      281,   68,   68,  279,   68,   68,   68,  277,   68,  285,
-       68,  289,   68,   68,  287,  290,   68,   68,  284,  282,
-       68,   68,   68,  283,  286,  288,   68,  300,   68,  291,
-      294,   68,   68,  298,  299,   68,   68,  292,  301,  296,
-      293,   68,   68,  295,  297,  306,   68,   68,   68,  308,
-      305,   68,  307,  302,   68,  311,  303,  304,   68,   68,
-       68,   68,   68,   68,  313,  314,  309,  315,   68,   68,
-      125,  321,   68,   68,  310,  316,   68,  320,  312,  317,
-       68,   68,  318,   68,  319,  322,  327,   68,  325,   68,
-      323,   68,  324,  132,   68,  326,   68,   68,   68,  372,
-
-      338,  329,  328,   68,  337,  330,  331,   68,   68,   68,
-       68,  341,  345,  340,  339,  332,  343,  333,  334,  335,
-      347,   68,  336,   68,  346,   68,   68,  342,  344,   68,
-      348,  350,  351,  352,   68,   68,   68,  349,   68,   68,
-      357,   68,   68,   68,   68,  358,   68,   68,  365,  353,
-      354,   68,  355,  356,   68,  361,  363,  360,   68,  364,
-      359,  367,   68,   68,  371,  123,   68,  366,  362,  368,
-       68,   68,  373,   68,  369,   68,  370,   68,   68,  378,
-       68,   68,  375,  374,  377,   68,  379,  376,   68,  381,
-       68,  382,   68,   68,   68,   68,   68,   68,   68,   68,
-
-       68,  384,   68,  385,  390,  392,  380,  386,  391,   68,
-       68,   68,  389,  383,   68,   68,  387,  388,  396,   68,
-      393,   68,   68,   68,  398,   68,   68,   68,  408,  410,
-      397,  394,  395,   68,   68,  412,   68,  399,  409,  407,
-       68,  400,   68,  401,   68,  406,   68,  411,  402,   68,
-      403,   68,  414,   68,   68,  415,  416,   68,  404,  420,
-       68,  413,   68,  132,  417,  418,  421,  424,  405,  425,
-       68,   68,   68,   68,   68,  419,   68,  423,   68,  422,
-      429,   68,  426,   68,   68,  428,  432,   68,  430,  427,
-      431,   68,  436,   68,  434,  437,   68,  438,   68,  433,
-
-      435,  132,   68,  439,   68,  440,   68,  441,   68,   68,
-       68,  445,   68,  443,  444,   68,   68,   68,  449,  442,
-      447,  446,   68,   68,   68,   68,   68,  450,  452,  448,
-       68,  455,   68,  453,  457,   68,  130,  454,  451,   68,
-       68,  458,   68,  459,  456,   68,  460,   68,  463,   68,
-      462,   68,  464,  467,   68,   68,   68,   68,   68,  469,
-      468,   68,  471,  466,  470,  465,   68,   68,  461,   68,
-       68,   68,  474,  472,  475,  476,   68,  477,  479,   68,
-      473,  478,   68,   68,   68,  480,  483,  481,  486,   68,
-      484,   68,   68,   68,  485,  487,   68,  488,   68,   68,
-
-       68,   68,  482,  492,   68,   68,  497,  489,   68,  493,
-       68,   68,   68,  499,  500,  490,  494,   68,  491,   68,
-      496,   68,  495,   68,  502,   68,   68,  498,  501,   68,
-       68,   68,   68,  506,  507,  509,  510,  503,  505,  508,
-       68,   68,  504,   68,  132,   68,   68,   68,  512,  515,
-      516,   68,  513,   68,  519,  517,  521,   68,  511,  514,
-       68,   68,  520,   68,  522,   68,   68,  518,   68,  523,
-       68,   68,   68,  525,  531,  528,  530,  529,   68,   68,
-       68,  524,   68,  526,   68,  538,   68,  527,   68,  541,
-      532,   68,  533,  542,   68,  534,  539,  545,  543,   68,
-
-      535,   68,  544,   68,  546,   68,  536,  537,  547,  540,
-       68,   68,   68,   68,  552,  548,   68,   68,   68,  549,
-      551,  556,   68,  555,  557,   68,   68,  558,  559,   68,
-      550,  553,   68,   68,  561,  554,   68,   68,   68,  560,
-       68,  566,   68,  564,  562,   68,  568,  565,   68,   68,
-       68,   68,  570,  567,   68,  563,   68,  572,   68,   68,
-       68,   68,  574,   68,  571,  577,   68,  569,   68,  573,
-      575,   68,   68,   68,   68,   68,  583,  582,   68,  576,
-       68,   68,  578,  579,   68,  591,  588,  586,  580,   68,
-       68,  581,  584,  589,  585,  587,  592,   68,  590,   68,
-
-       68,   68,   68,  593,   68,  596,   68,  598,  594,  595,
-      599,   68,   68,  603,  600,   68,   68,   68,   68,  605,
-       68,   68,  601,  597,   68,  602,  606,  132,  608,   68,
-       68,   68,  607,   68,   68,  617,  604,   68,   68,   68,
-      609,   68,  625,  128,  611,   68,   68,   68,  618,  620,
-       68,  624,  621,  610,   68,  623,   68,  612,  632,  613,
-      622,  630,  619,  614,  631,  615,   68,  626,   68,  633,
-      616,   68,  627,   68,  628,   68,  634,   68,  638,   68,
-       68,  635,  640,   68,  639,   68,  641,   68,   68,  636,
-       68,   68,  629,   68,   68,  644,  637,   68,   68,   68,
-
-       68,  643,  646,  648,  642,   68,  652,   68,  651,  127,
-      645,   68,   68,  647,  650,   68,   68,  649,   68,   68,
-      656,  657,   68,  658,  653,  654,  661,  655,  659,   68,
-      660,   68,  662,   68,   68,  664,  663,   68,  665,   68,
-       68,   68,  666,  670,  669,   68,   68,   68,  667,   68,
-      671,  672,   68,  673,  676,   68,   68,   68,  675,   68,
-      668,   68,  679,   68,   68,  674,  677,   68,   68,   68,
-       68,  125,   68,  684,  678,  685,   68,   68,   68,  680,
-      683,  687,  681,  688,  682,  690,  691,  686,  689,   68,
-       68,   68,  692,  693,   68,   68,  697,   68,   68,   68,
-
-       68,   68,   68,   68,   68,   68,   68,  705,  694,  695,
-      696,  699,   68,   68,   68,  698,  706,  702,  700,  703,
-      708,   68,   68,   68,   68,  704,  701,  707,  709,  710,
-       68,   68,  713,  714,   68,   68,   68,   68,  711,   68,
-       68,  717,   68,   68,  716,  712,   68,  719,   68,  715,
-      721,   68,  722,   68,   68,  723,  718,   68,  720,   68,
-       68,   68,   68,  724,  733,  725,  729,   68,   68,   68,
-      726,  732,  730,   68,   68,  727,   68,  728,  737,   68,
-      123,  731,  734,  743,  735,  738,   68,  736,   68,  739,
-       68,   68,  741,  740,   68,  742,   68,  744,   68,  745,
-
-       68,  747,   68,  746,   68,  750,   68,  752,  753,  749,
-       68,  748,   68,   68,   68,  754,   68,   68,  755,   68,
-       68,   68,   68,  761,  751,  756,   68,   68,  760,   68,
-      757,   68,  758,   68,  759,  762,  764,  766,   68,  763,
-       68,  767,  770,   68,   68,  765,  772,   68,   68,  768,
-       68,  773,   68,  771,   68,  774,  776,   68,  769,  775,
-      778,   68,   68,   68,  777,  780,   68,  779,  782,   68,
-       68,   68,  781,   68,  785,  784,   68,  783,   68,  789,
-       68,  790,  787,   68,   68,  788,   68,  792,  791,  786,
-       68,   68,   68,   68,  796,   68,   68,  799,   68,  793,
-
-      797,   68,   68,   68,  795,   68,   68,  803,   68,   68,
-      794,   68,   68,   68,   68,   68,   68,  808,  800,  798,
-      809,  801,   68,  802,  810,   68,  807,  813,  804,  806,
-       68,   68,  812,  814,  805,  816,  815,   68,   68,  811,
-       68,   68,   68,   68,   68,   68,   68,  822,  817,  824,
-      823,   68,  819,   68,   68,  820,  818,  828,   68,   68,
-      821,  827,  826,  825,  830,  831,  832,   68,  833,   68,
-       68,   68,  834,   68,  835,  829,   68,  837,  838,  840,
-       68,   68,  839,   68,   68,   68,   68,   68,   68,  846,
-      836,   68,   68,  845,   68,   68,   68,   68,   68,   68,
-
-      841,   68,  854,  842,  855,  844,  851,  847,   68,   68,
-      848,  843,  856,  853,  849,  850,   68,   68,  852,  860,
-       68,   68,  857,   68,   68,  858,  861,  862,  864,   68,
-       68,   68,  867,   68,  868,  866,   68,  859,   68,   68,
-      869,   68,  870,   68,  863,   68,   68,  865,  871,   68,
-      872,  873,   68,   68,  878,   68,   68,  876,   68,  880,
-      875,   68,   68,  874,   68,   68,   68,   68,  877,  883,
-       68,   68,  885,  882,   68,  888,  879,   68,   68,   68,
-       68,  892,  886,  881,  887,  884,   68,   68,  894,   68,
-       68,  889,  893,   68,  897,   68,  898,  890,  891,   68,
-
-      895,  902,   68,  896,  899,  901,   68,   68,  903,   68,
-       68,  900,   68,   68,   68,   68,  910,   68,  907,   68,
-      909,   68,   68,   68,  911,   68,   68,  904,   68,  905,
-      918,   68,  906,   68,   68,   68,   68,  908,  917,  912,
-      915,   68,  913,  914,   68,  916,   68,  928,  919,   68,
-       68,  920,  926,  923,   68,  921,  922,   68,  924,  927,
-       68,  925,  929,  931,   68,   68,  930,   68,  936,  937,
-       68,   68,   68,   68,  933,   68,  935,  934,   68,   68,
-       68,   68,  944,  932,   68,  939,   68,   68,   68,  947,
-      949,  938,  941,  940,   68,   68,   68,   68,  943,  953,
-
-      945,   68,  950,  952,  942,  946,  948,   68,   68,  956,
-      954,   68,   68,   68,  960,   68,  955,  951,   68,   68,
-       68,   68,   68,   68,  957,  964,   68,  965,  966,   68,
-      958,  961,  959,   68,  967,  968,  962,   68,  971,   68,
-      963,   68,   68,  975,   68,   68,   68,   68,   68,  979,
-       68,   68,  970,  978,  973,  972,  969,  974,  976,  980,
-       68,   68,  977,  982,   68,   68,  983,   68,  987,   68,
-      981,   68,  984,   68,  989,   68,  990,   68,  991,   68,
-      993,   68,  992,   68,  985,   68,  995,  986,   68,  997,
-       68,   68,  999,  988,   68,  998,   68,   68,   68,  994,
-
-       68,   68,   68, 1007,   68,   68,   68, 1009, 1000,   68,
-     1001, 1012,   68,  996,   68, 1002,   68,   68, 1003,   68,
-     1004, 1005,   68, 1006,   68, 1011, 1014,   68, 1017, 1010,
-       68, 1008, 1013, 1015,   68,   68, 1021,   68,   68, 1020,
-     1016,   68, 1024,   68, 1023,   68, 1019, 1026, 1018,   68,
-     1025,   68,   68,   68,   68, 1022,   68, 1033,   68,   68,
-     1031, 1036,   68,   68,   68, 1032, 1028, 1039, 1030, 1027,
-     1034, 1029,   68, 1040,   68, 1035, 1041, 1043, 1038,   68,
-     1042,   68,   68,   68, 1037, 1046,   68,   68,   68,   68,
-       68, 1048, 1051,   68, 1053, 1045,   68,   68, 1047,   68,
-
-     1049,   68, 1056,   68, 1055, 1044, 1057,   68, 1054,   68,
-       68,   68,   68,   68, 1050, 1052, 1058, 1059, 1061, 1060,
-       68, 1063,   68, 1062,   68,   68, 1068,   68,   68,   68,
-     1070,   68, 1064, 1066, 1067,   68,   68, 1072, 1075,   68,
-     1065, 1073, 1069, 1074,   68,   68, 1071,   68, 1077,   68,
-       68,   68,   68,   68,   68,   68,   68,   68, 1085,   68,
-     1084,   68, 1079, 1080, 1081, 1076, 1398,   68, 1082,   68,
-     1078, 1089,   68, 1088, 1083, 1086, 1087,   68,   68,   68,
-     1092,   68, 1091,   68, 1093, 1097, 1094, 1090,   68, 1096,
-       68,   68,   68, 1098, 1101,   68,   68,   68,   68, 1105,
-
-       68, 1095,   68,   68,   68,   68, 1100, 1106, 1102, 1103,
-     1099,   68, 1104,   68, 1107,   68, 1108, 1110, 1109,   68,
-       68, 1112,   68, 1111,   68, 1113, 1114, 1118,   68,   68,
-     1115, 1120,   68, 1117,   68,   68,   68,   68, 1119, 1122,
-       68, 1123, 1125,   68,   68,   68,   68, 1116, 1126, 1131,
-     1124, 1128,   68, 1121, 1127,   68, 1129,   68, 1130,   68,
-       68, 1132,   68,   68,   68, 1134,   68,   68,   68,   68,
-       68, 1142,   68,   68, 1133, 1161, 1143,   68, 1146, 1140,
-       68,   68, 1136, 1138, 1147,   68, 1148,   68, 1135, 1139,
-     1137, 1141,   68, 1144, 1145, 1150,   68, 1151,   68,   68,
-
-     1153,   68, 1154,   68,   68, 1149,   68, 1157,   68,   68,
-       68, 1156, 1159,   68,   68,   68,   68,   68, 1152, 1162,
-       68, 1163, 1173, 1155, 1165,   68, 1167,   68, 1158, 1166,
-     1168,   68, 1160,   68, 1170,   68, 1164,   68,   68,   68,
-       68, 1169,   68,   68, 1171,   68,   68, 1177,   68, 1172,
-       68, 1182, 1175,   68, 1179, 1180,   68, 1183, 1178,   68,
-       68, 1176, 1181, 1174,   68, 1186, 1187,   68, 1185, 1398,
-     1184,   68,   68, 1188,   68, 1190,   68, 1192,   68, 1191,
-     1195, 1189,   68, 1193, 1194,   68,   68, 1197,   68, 1196,
-       68,   68,   68,   68, 1203, 1198, 1200,   68, 1202,   68,
-
-       68,   68, 1199, 1204,   68,   68, 1206, 1208,   68, 1209,
-       68, 1201, 1207, 1210,   68, 1211, 1205, 1212,   68, 1213,
-       68, 1214,   68, 1215,   68,   68,   68,   68, 1219,   68,
-       68,   68, 1218, 1221,   68, 1220,   68, 1224,   68,   68,
-     1216, 1223, 1225,   68, 1226,   68,   68, 1217, 1222,   68,
-       68, 1227,   68,   68,   68, 1234,   68, 1232,   68,   68,
-       68, 1229, 1230,   68, 1228, 1231,   68, 1235,   68,   68,
-       68,   68,   68,   68, 1233, 1242, 1238, 1243, 1244,   68,
-     1237,   68, 1240,   68, 1246, 1236,   68, 1241, 1249, 1245,
-     1239, 1247,   68,   68,   68, 1248,   68, 1254,   68, 1250,
-
-     1255,   68,   68,   68,   68,   68,   68, 1262,   68,   68,
-     1252, 1251, 1261,   68,   68, 1253, 1256, 1265,   68,   68,
-       68, 1257,   68, 1258, 1260, 1259, 1267,   68, 1263, 1268,
-       68, 1271, 1264,   68, 1269,   68,   68,   68, 1266,   68,
-     1272, 1273, 1270,   68,   68,   68,   68, 1275, 1398, 1277,
-     1278, 1280,   68, 1281,   68, 1282, 1274,   68, 1276,   68,
-       68, 1279, 1283,   68, 1284,   68,   68,   68,   68, 1286,
-     1287, 1285, 1288,   68,   68, 1291,   68, 1289,   68,   68,
-     1295,   68, 1290,   68,   68, 1292, 1297,   68,   68, 1299,
-       68,   68, 1296, 1302,   68,   68, 1298, 1293, 1294, 1300,
-
-       68, 1304,   68,   68, 1301, 1305, 1306,   68, 1307,   68,
-     1308,   68,   68, 1311,   68, 1303, 1312,   68,   68,   68,
-     1314, 1309,   68, 1313,   68,   68, 1310,   68, 1318,   68,
-       68,   68, 1316,   68,   68, 1320,   68,   68,   68,   68,
-     1325, 1315, 1328, 1323, 1317, 1319, 1327,   68,   68,   68,
-       68, 1321,   68,   68, 1334,   68, 1324, 1326, 1329, 1322,
-     1331, 1330,   68,   68, 1335,   68,   68, 1333, 1336,   68,
-     1340,   68,   68,   68, 1337, 1332,   68,   68,   68,   68,
-       68, 1341, 1345,   68, 1339, 1338, 1344, 1348,   68, 1342,
-       68,   68, 1350,   68,   68, 1343, 1349, 1353,   68, 1347,
-
-     1354,   68,   68, 1351,   68, 1346, 1358,   68,   68, 1360,
-       68,   68, 1352, 1355, 1356,   68,   68, 1364,   68,   68,
-     1359, 1363, 1365,   68, 1357, 1366,   68,   68, 1393, 1362,
-     1361,   68, 1367, 1368,   68,   68, 1369, 1370,   68,   68,
-       68, 1373,   68,   68, 1371,   68,   68,   68, 1372, 1383,
-     1374, 1375, 1377,   68,   68, 1379,   68,   68, 1378, 1381,
-       68, 1380, 1382, 1376, 1384,   68, 1385,   68, 1386,   68,
-     1387,   68,   68,   68, 1389,   68,   68, 1392,   68, 1390,
-       68,   68, 1398,   68, 1388, 1397,   68, 1398, 1398, 1398,
-     1398, 1398, 1398, 1398, 1398, 1394, 1391, 1395, 1398, 1398,
-
-     1396,   40,   40,   40,   40,   40,   40,   40,   45,   45,
-       45,   45,   45,   45,   45,   50,   50,   50,   50,   50,
-       50,   50,   56,   56,   56,   56,   56,   56,   56,   61,
-       61,   61,   61,   61,   61,   61,   71,   71, 1398,   71,
-       71,   71,   71,  122,  122, 1398, 1398, 1398,  122,  122,
-      124,  124, 1398, 1398,  124, 1398,  124,  126, 1398, 1398,
-     1398, 1398, 1398,  126,  129,  129, 1398, 1398, 1398,  129,
-      129,  131, 1398, 1398, 1398, 1398, 1398,  131,  133,  133,
-     1398,  133,  133,  133,  133,   72,   72, 1398,   72,   72,
-       72,   72,   13, 1398, 1398, 1398, 1398, 1398, 1398, 1398,
-
-     1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398,
-     1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398,
-     1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398,
-     1398, 1398
+       67,   95,   68,   76,   68,   67,   85,   68,   66,   15,
+       16,   17,   62,   63,   64,   68,   68,   77,  137,   87,
+       65,   69,   94,   68,   78,   70,   86,   68,   88,   66,
+       72,   79,   72,   72,  133,   72,   89,   68,   96,   68,
+       72,   73,   68,   90,  130,  130,   91,   80,  136,   68,
+       97,   81,  179,   92,   82,   93,   83,   84,   98,   68,
+       68,  101,   68,  138,   99,  102,   68,   68,  100,   68,
+       68,  105,  109,  140,  112,   68,  116,  106,  117,   68,
+      107,  103,  110,   68,  113,  111,  139,  108,  114,  115,
+       68,  121,  169,  118,   68,  122,  127,  119,  127,  127,
+
+      238,  127,  120,   72,   68,   72,   72,  132,   72,  132,
+      132,   68,  132,   67,  135,   67,   67,   68,   67,   68,
+       68,   68,  141,   67,   72,  142,   72,   72,  147,   72,
+       68,  143,   68,   68,   72,   73,   68,   68,  144,  145,
+      146,   68,   68,   68,  149,  153,  148,  154,   68,   68,
+       68,  133,  150,  156,  151,  152,  157,  155,  159,   68,
+       68,   68,   68,   68,  161,  163,   68,  160,   68,  164,
+      158,   68,  167,  165,  166,   68,   68,   68,  168,  171,
+      173,  172,  170,   68,  162,   68,   68,   68,  175,   68,
+       68,  182,  176,   68,  184,  174,   68,   68,   68,  178,
+
+       68,   68,  183,  189,   68,  177,  180,  181,   68,  191,
+       68,  123,  123,  133,  185,  186,  187,   68,  125,  188,
+      192,  125,  130,  130,  190,  198,   68,  127,  193,  127,
+      127,  132,  127,  132,  132,   72,  132,   72,   72,  133,
+       72,  197,  194,   68,  196,   68,  135,   68,  195,   68,
+      201,   68,   68,  204,   68,   68,  202,  203,   68,  205,
+      199,   68,   68,  211,   68,   68,   68,  200,   68,  213,
+      212,   68,  206,   68,  224,  215,   68,  207,  216,  217,
+       68,  218,  208,   68,  223,   68,   68,   68,  209,  210,
+      222,  226,  219,  131,  221,  220,   68,   68,  227,  228,
+
+      230,  233,  225,   68,   68,   68,   68,   68,  232,   68,
+      229,  235,  231,  236,  234,   68,   68,   68,   68,   68,
+       68,   68,  237,  240,   68,   68,   68,  239,  242,  249,
+      245,   68,   68,   68,   68,  251,  243,  253,   68,   68,
+      129,  241,   68,   68,  244,  252,   68,  256,  246,  247,
+      248,  257,  250,  133,  259,  255,   68,   68,  254,   68,
+       68,   68,  260,  265,   68,  262,   68,   68,   68,  264,
+       68,  266,  269,   68,  258,   68,  263,   68,  271,  261,
+       68,  272,  267,  273,   68,  274,   68,   68,  268,   68,
+       68,   68,  277,  275,  278,   68,  280,   68,  270,   68,
+
+      279,   68,  276,   68,  282,   68,  284,   68,   68,  281,
+      283,   68,   68,  289,   68,   68,   68,  285,  293,  291,
+      287,  288,   68,   68,   68,  286,   68,  294,  292,   68,
+       68,   68,  290,   68,  295,  304,   68,   68,  298,  302,
+      303,   68,   68,  296,  300,  301,  297,   68,  310,   68,
+      305,  299,   68,   68,   68,   68,  312,  308,  306,  311,
+       68,  307,  309,  315,   68,   68,   68,  313,   68,  318,
+      317,  319,   68,   68,   68,   68,  325,   68,   68,   68,
+      314,   68,  326,  324,  316,   68,  320,   68,   68,  321,
+      331,   68,  322,  330,  323,   68,  327,   68,  328,  133,
+
+      329,   68,  333,  347,  342,   68,  332,   68,   68,  334,
+      335,  346,  341,   68,   68,   68,  345,   68,   68,  336,
+      343,  337,  338,  339,  344,   68,  340,  351,  128,  349,
+      350,  354,   68,  348,   68,   68,   68,  352,  358,  353,
+      355,  356,  357,   68,   68,   68,   68,  362,   68,   68,
+      359,   68,  363,   68,   68,  126,   68,   68,   68,  360,
+      361,  369,  366,  368,   68,  365,  371,  364,  370,  372,
+       68,  376,   68,   68,   68,  367,  373,  374,   68,   68,
+      377,  378,   68,  375,   68,   68,   68,   68,  383,  382,
+       68,  380,   68,  379,   68,  384,  381,   68,  386,   68,
+
+      387,   68,   68,   68,   68,   68,   68,   68,   68,  389,
+       68,  390,  395,  385,  397,  388,  391,   68,  396,   68,
+      394,   68,   68,  392,   68,  393,  398,   68,  401,   68,
+       68,   68,  403,   68,   68,   68,  413,  402,  415,  399,
+       68,   68,  400,   68,  417,  404,  414,  412,   68,  405,
+       68,  406,   68,  411,  416,   68,  407,   68,  408,   68,
+      419,   68,   68,  420,  421,  418,  409,  425,   68,   68,
+      422,   68,   68,   68,  133,  124,  410,  426,  429,  424,
+      423,   68,  430,   68,  431,   68,  428,   68,  427,  434,
+       68,  432,   68,   68,  433,  435,  437,  436,   68,   68,
+
+       68,  439,  443,   68,  444,   68,  445,  438,  446,   68,
+       68,   68,   68,  442,  448,  440,  447,   68,  441,   68,
+       68,   68,   68,  452,   68,  450,  451,   68,   68,   68,
+      456,  449,  454,  453,   68,   68,   68,   68,  458,  457,
+      459,  455,   68,  462,   68,  460,  464,   68,   68,  461,
+      466,   68,  467,  465,  463,   68,   68,   68,   68,   68,
+      469,  474,  471,   68,   68,   68,   68,  476,  478,  470,
+      473,  475,   68,   68,  468,  472,  477,   68,   68,   68,
+       68,  486,  482,  481,  484,  483,   68,   68,  485,   68,
+      479,  480,   68,  490,   68,  488,  487,  491,   68,   68,
+
+       68,  492,  494,   68,   68,   68,   68,   68,   68,   68,
+      489,  499,   68,  493,   68,   68,   68,  500,  504,   68,
+      506,  495,  496,   68,  497,   68,  498,  501,  505,  507,
+      503,   68,  502,   68,   68,  511,   68,   68,  509,   68,
+       68,   68,  508,   68,  513,  514,  515,   68,  516,  512,
+      510,   68,  517,   68,   68,  133,   68,   68,  519,  518,
+      522,   68,  520,   68,  523,   68,  526,  524,  521,   68,
+      528,   68,   68,  529,  527,   68,   68,  525,   68,   68,
+       68,   68,  534,  530,  532,   68,   68,  538,  540,  539,
+      531,   68,  133,   68,  535,  537,  533,  536,   68,   68,
+
+      541,   68,  542,   68,  547,  543,  550,  551,   68,  548,
+      544,   68,   68,  553,   68,   68,  545,  546,  552,   68,
+      555,   68,   68,   68,  556,   68,  549,  557,   68,  554,
+       68,  561,   68,  560,   68,  558,  565,   68,   68,  564,
+      566,  567,  559,  562,   68,   68,   68,  568,   68,   68,
+      563,   68,   68,   68,  569,   68,  572,  570,  573,  571,
+      575,   68,  574,   68,  577,   68,  580,   68,   68,   68,
+      579,  576,   68,  581,   68,   68,   68,  583,   68,   68,
+       68,  586,   68,  582,  578,  584,   68,   68,   68,   68,
+       68,  592,   68,   68,   68,  591,  585,   68,  597,  587,
+
+      588,  589,  590,  595,  596,  600,  593,  601,  594,   68,
+       68,  599,   68,  598,   68,   68,   68,   68,  602,   68,
+      607,  605,   68,   68,  608,  609,   68,  604,  603,   68,
+      612,   68,  614,   68,   68,   68,  615,  133,  606,  611,
+       68,  610,   68,   68,  617,   68,   68,   68,   68,  616,
+      626,  613,   68,   68,   68,   68,   68,  630,   68,  620,
+       68,  618,  627,  629,   68,  644,  635,  619,   68,  631,
+      632,  621,  634,  622,  131,  633,  636,  623,  628,  624,
+       68,   68,   68,  637,  625,  641,   68,   68,  638,   68,
+      639,   68,   68,   68,  645,  649,   68,   68,   68,  643,
+
+      642,  646,  650,   68,  651,  647,  652,   68,  640,   68,
+       68,  648,   68,   68,   68,  655,  653,   68,   68,   68,
+      654,   68,  657,  659,  663,   68,   68,   68,  662,   68,
+       68,  656,  129,  658,   68,  661,  684,  660,   68,  667,
+       68,  666,   68,  668,  664,  665,   68,  669,  672,  670,
+       68,  671,  673,   68,   68,  675,  674,   68,  676,   68,
+       68,  678,  677,   68,   68,   68,  680,   68,   68,   68,
+      682,   68,  683,  687,   68,  686,   68,   68,   68,  690,
+      679,   68,   68,  128,  685,  681,  688,   68,   68,  689,
+       68,   68,  695,   68,   68,  696,  691,  698,   68,   68,
+
+      692,  694,  693,  701,  699,   68,  702,   68,   68,  697,
+      700,   68,  704,   68,  703,   68,  708,   68,   68,   68,
+       68,  706,   68,   68,  705,   68,   68,  707,  710,  716,
+       68,  717,   68,  126,   68,  709,   68,  711,  714,  713,
+       68,   68,   68,   68,  719,  718,  715,  712,  721,   68,
+       68,  724,  725,   68,   68,  720,   68,  722,   68,   68,
+      727,   68,   68,   68,  723,   68,  730,  729,  726,   68,
+      732,   68,  735,  734,   68,   68,  728,   68,  731,   68,
+       68,  733,   68,   68,   68,   68,  736,  738,  742,  737,
+      746,   68,   68,   68,  745,   68,  739,   68,  741,  743,
+
+      740,  748,  750,  744,  751,  747,   68,   68,  752,   68,
+       68,  756,  749,   68,  757,   68,   68,   68,   68,  755,
+      754,   68,  758,  759,  761,  753,   68,  760,   68,   68,
+       68,  765,  766,  762,   68,  763,   68,   68,   68,  767,
+       68,  773,  768,   68,   68,   68,   68,  764,  774,  769,
+       68,   68,   68,   68,  770,   68,  771,   68,  772,  779,
+      775,  776,  783,   68,  777,  778,  780,  785,   68,   68,
+       68,  781,  784,  786,  787,   68,  789,   68,   68,   68,
+      782,  791,   68,   68,  792,  793,   68,   68,   68,   68,
+       68,   68,  795,   68,  788,  797,  796,  800,  790,   68,
+
+      798,   68,  806,  794,  802,  803,   68,  799,  801,   68,
+       68,  804,  805,   68,   68,  809,   68,   68,   68,   68,
+       68,  812,   68,   68,   68,  808,   68,   68,   68,  816,
+       68,   68,  807,   68,   68,   68,   68,   68,  810,  821,
+      813,  825,  811,  814,  817,  815,  822,  818,  819,   68,
+      823,   68,   68,   68,  820,  827,  830,  828,  824,   68,
+       68,  826,   68,  831,   68,   68,   68,   68,   68,   68,
+       68,  829,   68,  837,   68,  839,  838,   68,  832,  834,
+      843,  833,  835,  836,  840,   68,  841,  842,   68,  846,
+      847,   68,  848,  845,   68,   68,  849,   68,   68,   68,
+
+       68,  855,   68,  850,  853,   68,  844,   68,  854,   68,
+       68,   68,   68,  851,   68,  861,   68,   68,  860,  852,
+       68,   68,   68,   68,  856,  124,  857,   68,   68,  869,
+      859,  866,   68,  862,   68,  863,  858,  870,  871,   68,
+      864,  865,  868,   68,  867,   68,  875,   68,   68,   68,
+       68,   68,  872,  876,  873,  877,  879,   68,   68,  882,
+      883,   68,  881,  874,   68,   68,  884,   68,  880,  878,
+      885,   68,   68,   68,  887,  886,   68,   68,   68,  888,
+       68,  893,   68,  891,   68,   68,  895,   68,   68,   68,
+       68,  890,   68,  898,   68,  892,   68,   68,   68,  897,
+
+       68,  889,  900,   68,  894,   68,  903,   68,  901,  896,
+      902,  899,  908,   68,  904,  907,  909,   68,  905,   68,
+      906,   68,   68,  910,  912,   68,   68,  915,  913,   68,
+       68,  911,   68,  919,  916,  918,   68,  920,   68,   68,
+       68,   68,   68,  914,   68,   68,   68,  924,  927,   68,
+      926,  928,   68,   68,   68,  917,   68,  921,   68,  922,
+      935,  923,   68,   68,   68,   68,   68,  925,  933,   68,
+      929,   68,  932,  930,  931,  934,  940,   68,   68,   68,
+      944,   68,   68,  936,  937,  945,  939,  938,  941,   68,
+       68,  942,   68,  943,  946,   68,   68,  949,  953,  954,
+
+       68,  948,   68,   68,  950,  952,  947,  951,   68,   68,
+       68,   68,   68,   68,  961,   68,   68,   68,  964,   68,
+      966,  956,  955,   68,  958,   68,   68,  957,  969,   68,
+      960,  962,  967,   68,  963,  965,  959,   68,   68,  968,
+      971,   68,  970,   68,   68,  977,  972,   68,   68,  973,
+       68,  974,   68,   68,   68,   68,   68,  981,   68,  982,
+      983,  975,   68,  976,  978,  979,   68,  984,  988,   68,
+       68,   68,  980,  987,   68,  985,  992,   68,   68,  986,
+       68,   68,   68,  990,  989,   68,  991,   68,  995,  993,
+      996,   68,  997,   68,  998,   68,  994,  999,   68, 1000,
+
+     1001,   68, 1002,   68,   68, 1006,   68,   68,   68, 1008,
+       68, 1009,   68, 1010,   68, 1012, 1003, 1011,   68,   68,
+       68, 1014, 1004,   68, 1005,   68,   68,   68, 1007, 1016,
+       68,   68, 1017, 1018,   68,   68,   68, 1013,   68, 1019,
+       68, 1020, 1026,   68,   68, 1022, 1021,   68, 1015,   68,
+     1028, 1031,   68,   68, 1023, 1024, 1030, 1025,   68,   68,
+       68,   68, 1036,   68, 1029, 1033, 1027,   68, 1032, 1034,
+       68, 1040,   68,   68,   68, 1039,   68, 1043,   68, 1044,
+     1042,   68,   68, 1038,   68, 1035,   68,   68,   68, 1037,
+     1045,   68, 1041, 1050, 1052,   68,   68, 1055,   68, 1047,
+
+     1051,   68, 1046, 1049,   68, 1048, 1058, 1053, 1059,   68,
+     1060,   68, 1054,   68, 1061,   68, 1062,   68, 1057, 1065,
+       68,   68, 1056,   68,   68,   68,   68, 1067, 1070, 1064,
+       68, 1072, 1066,   68,   68,   68,   68, 1068, 1074, 1063,
+     1075,   68, 1076,   68,   68,   68, 1073,   68,   68,   68,
+     1077, 1069, 1071, 1078, 1080, 1079,   68,   68, 1083, 1081,
+       68,   68,   68, 1088,   68,   68,   68, 1090, 1082, 1084,
+     1086, 1087,   68,   68, 1092,   68,   68, 1093, 1085, 1089,
+     1094,   68,   68, 1091,   68, 1097,   68,   68,   68, 1095,
+       68,   68,   68,   68,   68,   68, 1096, 1105, 1104, 1099,
+
+     1100,   68, 1101, 1107,   68,   68, 1102, 1098, 1109,   68,
+       68,   68, 1103, 1112,   68, 1111,   68,   68, 1108, 1106,
+       68, 1113, 1114, 1117,   68,   68,   68,   68,   68, 1118,
+       68, 1110, 1115, 1121,   68,   68,   68, 1125, 1122, 1123,
+     1116, 1120, 1124,   68, 1119, 1126,   68,   68,   68,   68,
+       68, 1128, 1129,   68,   68, 1127,   68,   68,   68, 1133,
+     1134, 1130, 1138,   68,   68,   68, 1132, 1137,   68, 1131,
+       68, 1135, 1142, 1139, 1140,   68,   68, 1145,   68,   68,
+       68, 1143, 1136, 1144, 1141, 1148,   68, 1146,   68, 1147,
+       68, 1149,   68, 1152,   68,   68,   68, 1151,   68, 1153,
+
+     1150,   68,   68, 1155,   68,   68,   68,   68,   68,   68,
+     1164, 1154, 1163,   68,   68, 1167, 1168,   68, 1161,   68,
+       68, 1157, 1169,   68, 1159,   68,   68, 1156, 1158, 1160,
+     1162,   68, 1165, 1166, 1171,   68, 1172,   68, 1170, 1174,
+       68, 1175,   68,   68,   68, 1173, 1178,   68, 1177,   68,
+     1176, 1180,   68,   68,   68,   68, 1184, 1183,   68, 1182,
+     1186,   68,   68, 1179, 1188,   68,   68, 1181, 1189,   68,
+       68, 1185,   68, 1191,   68, 1192,   68, 1187,   68, 1194,
+       68,   68, 1193,   68,   68, 1198,   68, 1203, 1190,   68,
+       68, 1196,   68, 1200, 1204, 1201,   68,   68, 1199,   68,
+
+     1207, 1195, 1197, 1202, 1208,   68, 1206, 1419,   68,   68,
+       68, 1209,   68, 1214,   68,   68, 1205, 1213, 1217, 1210,
+     1211, 1215,   68,   68, 1212, 1218,   68, 1216,   68,   68,
+       68,   68,   68, 1219, 1221, 1224,   68, 1223,   68,   68,
+       68,   68, 1225, 1229, 1227,   68,   68, 1230,   68, 1220,
+       68, 1222,   68, 1228, 1226, 1231,   68, 1232, 1233,   68,
+     1234,   68, 1235,   68, 1236,   68, 1237,   68,   68,   68,
+     1238, 1240,   68, 1239, 1241,   68,   68, 1242,   68, 1243,
+       68, 1244, 1245,   68, 1246,   68, 1247,   68,   68,   68,
+     1248,   68,   68,   68, 1255,   68,   68, 1253, 1249,   68,
+
+     1250, 1251,   68, 1252,   68, 1256,   68,   68,   68,   68,
+       68, 1265,   68, 1254, 1263, 1264,   68, 1259,   68, 1267,
+       68, 1261, 1258, 1268,   68, 1257, 1262,   68,   68, 1269,
+     1260,   68,   68,   68, 1266, 1275,   68,   68, 1276,   68,
+       68,   68, 1270,   68,   68, 1419, 1271,   68, 1273, 1272,
+     1282,   68, 1274,   68, 1277,   68, 1278, 1283,   68,   68,
+     1279, 1281, 1419, 1280, 1286,   68, 1284, 1288,   68, 1289,
+       68, 1285,   68, 1290, 1287,   68,   68,   68,   68,   68,
+       68, 1291, 1293, 1294, 1292,   68,   68, 1296,   68,   68,
+       68, 1298, 1307, 1299, 1334, 1295, 1301,   68, 1302,   68,
+
+     1297, 1303, 1304,   68, 1300,   68,   68, 1305,   68,   68,
+     1306,   68, 1308,   68,   68,   68, 1312,   68,   68,   68,
+     1316,   68, 1310, 1311, 1309,   68, 1313, 1318,   68,   68,
+       68,   68,   68,   68, 1317, 1320, 1419, 1314, 1315, 1319,
+       68, 1321, 1322, 1323,   68,   68, 1325,   68, 1327,   68,
+     1326, 1328,   68, 1324, 1329,   68,   68, 1332, 1330, 1333,
+       68,   68,   68,   68,   68,   68,   68, 1335,   68, 1339,
+     1331,   68, 1337,   68,   68,   68,   68,   68, 1341,   68,
+     1346,   68, 1336,   68, 1338, 1344, 1342, 1340, 1348,   68,
+       68,   68, 1350,   68, 1349, 1345,   68, 1347,   68, 1355,
+
+     1343, 1354, 1351, 1352,   68,   68, 1353,   68,   68,   68,
+     1357, 1361,   68, 1356,   68,   68, 1358,   68,   68,   68,
+       68,   68,   68, 1362, 1360, 1366, 1365, 1359, 1369,   68,
+       68, 1363, 1371,   68,   68, 1370, 1364, 1374,   68,   68,
+     1368,   68, 1372, 1375,   68, 1367,   68, 1379,   68,   68,
+     1381,   68,   68, 1377,   68,   68, 1373, 1419, 1376, 1419,
+     1384, 1380, 1385,   68, 1386,   68, 1378,   68, 1383, 1387,
+       68, 1382, 1388, 1389,   68,   68, 1390, 1391,   68,   68,
+       68, 1394,   68,   68, 1392,   68,   68,   68, 1393,   68,
+     1395, 1396, 1398,   68,   68, 1400,   68,   68, 1399, 1402,
+
+       68, 1401, 1403, 1397, 1405,   68,   68, 1404, 1406,   68,
+     1407,   68, 1408,   68,   68, 1410,   68,   68, 1409,   68,
+     1411, 1413,   68,   68,   68,   68, 1418,   68, 1414, 1419,
+     1419, 1419, 1419, 1419, 1419, 1419, 1419, 1412, 1415, 1416,
+     1419, 1419, 1419, 1417,   40,   40,   40,   40,   40,   40,
+       40,   45,   45,   45,   45,   45,   45,   45,   50,   50,
+       50,   50,   50,   50,   50,   56,   56,   56,   56,   56,
+       56,   56,   61,   61,   61,   61,   61,   61,   61,   71,
+       71, 1419,   71,   71,   71,   71,  123,  123, 1419, 1419,
+     1419,  123,  123,  125,  125, 1419, 1419,  125, 1419,  125,
+
+      127, 1419, 1419, 1419, 1419, 1419,  127,  130,  130, 1419,
+     1419, 1419,  130,  130,  132, 1419, 1419, 1419, 1419, 1419,
+      132,  134,  134, 1419,  134,  134,  134,  134,   72,   72,
+     1419,   72,   72,   72,   72,   13, 1419, 1419, 1419, 1419,
+     1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419,
+     1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419,
+     1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419,
+     1419, 1419, 1419, 1419, 1419
     } ;
 
-static yyconst flex_int16_t yy_chk[2833] =
+static yyconst flex_int16_t yy_chk[2876] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1214,312 +1224,316 @@ static yyconst flex_int16_t yy_chk[2833] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    3,
         3,    3,    4,    4,    4,   49,    5,    5,   49,    3,
         5,   15,    4,    6,    6,   15,    5,    6,    9,    9,
-        9,  149,   33,    6,    7,    7,    7,    7,    9,    7,
+        9,  151,   33,    6,    7,    7,    7,    7,    9,    7,
        10,   10,   10,   44,   44,    7,    8,    8,    8,    8,
-       10,    8,   21,   33,  149,   21,   21,    8,   11,   11,
-       11,   11,   11,   11, 1404,   20,   29,   20,   20,   11,
+       10,    8,   21,   33,  151,   21,   21,    8,   11,   11,
+       11,   11,   11,   11, 1425,   20,   29,   20,   20,   11,
 
        20,   29,   24,   21,   25,   20,   24,   28,   11,   12,
        12,   12,   12,   12,   12,   74,   22,   22,   74,   25,
-       12,   69,   28,   66,   22,   69,   24,   26,   26,   12,
-       19,   22,   19,   19,   23,   19,   26,   66,   27,   23,
-       19,   19,   27,   23,   30,   27,   23,   31,   31,   23,
-       32,   32,   27,   75,   27,   32,   31,   75,   34,   30,
-       35,   76,   31,   39,   39,   35,   31,   34,   39,   36,
-      109,   32,   38,   34,   36,   35,   34,   93,   35,   37,
-       37,   76,   37,   34,   36,  109,   38,  606,   36,   36,
-       55,   38,   55,   55,   79,   55,   93,   37,   60,   60,
-
-       63,   78,   63,   63,   65,   63,   65,   65,   79,   65,
-       68,   63,   68,   68,   77,   68,   80,   77,   81,   78,
-       68,   71,   82,   71,   71,   83,   71,   84,   80,   85,
-       83,   71,   71,   86,   87,   88,   81,   89,  139,   88,
-       90,   84,   89,   83,   82,   96,  139,   91,  131,   85,
-       91,   86,   87,   91,   90,   92,   94,   97,   99,   95,
-       92,   94,   95,  100,   98,   99,   95,   91,   98,   96,
-      101,   97,  102,  103,  104,  106,  100,  101,  104,  105,
-      106,   94,  107,  108,  106,  102,  110,  112,  111,  113,
-      114,  114,  112,  103,  115,  117,  108,  105,  116,  119,
-
-      121,  113,  107,  120,  119,  110,  111,  118,  164,  118,
-      125,  114,  115,  125,  116,  120,  117,  164,  121,  123,
-      123,  127,  135,  127,  127,  135,  127,  130,  130,  132,
-      118,  132,  132,  133,  132,  133,  133,  136,  133,  138,
-      137,  140,  136,  141,  133,  137,  142,  147,  143,  165,
-      144,  142,  142,  143,  138,  144,  140,  146,  146,  129,
-      148,  152,  153,  141,  145,  148,  147,  150,  145,  151,
-      165,  150,  155,  145,  151,  152,  154,  153,  145,  157,
-      157,  156,  158,  159,  145,  145,  156,  160,  154,  128,
-      155,  154,  160,  161,  161,  162,  163,  174,  166,  159,
-
-      162,  163,  158,  166,  167,  168,  162,  169,  170,  167,
-      168,  171,  169,  172,  173,  170,  175,  171,  177,  174,
-      173,  176,  178,  179,  175,  180,  181,  178,  182,  126,
-      183,  181,  183,  172,  184,  185,  176,  186,  177,  187,
-      185,  184,  193,  180,  180,  179,  188,  188,  182,  189,
-      190,  187,  192,  197,  189,  190,  186,  191,  194,  191,
-      195,  193,  196,  198,  192,  195,  194,  196,  197,  199,
-      200,  201,  189,  204,  201,  205,  191,  199,  202,  202,
-      214,  198,  203,  203,  206,  208,  209,  206,  207,  204,
-      205,  209,  207,  210,  208,  200,  211,  211,  212,  213,
-
-      214,  215,  216,  212,  213,  217,  219,  210,  218,  218,
-      220,  222,  223,  221,  220,  223,  222,  224,  217,  215,
-      225,  226,  227,  216,  219,  221,  228,  231,  231,  224,
-      226,  230,  229,  230,  230,  232,  233,  225,  232,  228,
-      225,  235,  234,  227,  229,  236,  236,  237,  238,  238,
-      235,  239,  237,  233,  240,  241,  233,  234,  242,  243,
-      241,  245,  244,  246,  243,  244,  239,  244,  247,  250,
-      124,  248,  251,  252,  240,  245,  248,  247,  242,  246,
-      249,  253,  246,  254,  246,  249,  254,  255,  252,  257,
-      250,  258,  251,  259,  260,  253,  261,  265,  290,  290,
-
-      258,  255,  254,  256,  257,  256,  256,  262,  264,  266,
-      268,  261,  265,  260,  259,  256,  263,  256,  256,  256,
-      267,  263,  256,  269,  266,  267,  270,  262,  264,  272,
-      268,  270,  271,  271,  273,  271,  274,  269,  276,  275,
-      276,  277,  278,  279,  283,  277,  280,  281,  283,  272,
-      273,  289,  274,  275,  282,  280,  281,  279,  284,  282,
-      278,  285,  292,  286,  289,  122,  285,  284,  280,  286,
-      287,  288,  291,  293,  287,  294,  288,  291,  296,  296,
-      295,  297,  293,  292,  295,  298,  297,  294,  299,  299,
-      301,  301,  302,  303,  304,  305,  307,  308,  309,  310,
-
-      311,  303,  313,  304,  310,  312,  298,  305,  311,  314,
-      312,  315,  309,  302,  316,  317,  307,  308,  316,  318,
-      313,  319,  320,  323,  318,  322,  325,  326,  324,  325,
-      317,  314,  315,  324,  327,  327,  328,  319,  324,  323,
-      330,  320,  321,  321,  331,  322,  333,  326,  321,  332,
-      321,  329,  329,  334,  335,  330,  331,  336,  321,  335,
-      337,  328,  338,  339,  332,  333,  336,  339,  321,  340,
-      341,  342,  343,   67,  340,  334,  345,  338,  346,  337,
-      344,  344,  341,  347,  348,  343,  347,  350,  345,  342,
-      346,  349,  351,  351,  349,  352,  352,  353,  357,  348,
-
-      350,   61,  353,  354,  354,  355,  355,  356,  358,  363,
-      359,  360,  356,  358,  359,  362,  360,  361,  364,  357,
-      362,  361,  365,  364,  366,  367,  369,  365,  367,  363,
-      368,  368,  371,  367,  370,  375,   56,  367,  366,  370,
-      372,  371,  373,  372,  369,  374,  373,  376,  375,  377,
-      374,  378,  376,  379,  380,  384,  381,  383,  379,  381,
-      380,  382,  383,  378,  382,  377,  385,  386,  373,  395,
-      388,  387,  386,  384,  387,  388,  391,  389,  390,  397,
-      385,  389,  389,  390,  392,  391,  393,  392,  395,  398,
-      393,  393,  394,  396,  394,  396,  399,  397,  400,  401,
-
-      402,  403,  392,  401,  404,  405,  406,  398,  407,  402,
-      409,  406,  408,  408,  409,  399,  403,  410,  400,  411,
-      405,  412,  404,  413,  411,  414,  415,  407,  410,  416,
-      418,  419,  417,  415,  416,  418,  419,  412,  414,  417,
-      420,  421,  413,  422,  424,  423,  427,  425,  421,  424,
-      425,  426,  422,  428,  428,  426,  430,  432,  420,  423,
-      431,  430,  428,  433,  431,  434,  441,  427,  435,  432,
-      438,  442,  443,  434,  444,  441,  443,  442,  447,  444,
-      446,  433,  453,  435,  448,  446,  449,  438,  445,  449,
-      445,  451,  445,  450,  450,  445,  447,  453,  451,  457,
-
-      445,  452,  452,  454,  454,  455,  445,  445,  455,  448,
-      456,  458,  459,  460,  460,  456,  461,  462,  463,  457,
-      459,  464,  464,  463,  465,  467,  469,  466,  467,  465,
-      458,  461,  466,  468,  469,  462,  470,  471,  472,  468,
-      473,  474,  474,  472,  470,  475,  476,  473,  477,  479,
-      480,  476,  479,  475,  482,  471,  481,  481,  485,  483,
-      486,  487,  483,  488,  480,  486,  489,  477,  491,  482,
-      483,  490,  492,  498,  493,  494,  492,  491,  495,  485,
-      497,  496,  487,  488,  499,  500,  497,  495,  489,  503,
-      500,  490,  493,  498,  494,  496,  501,  504,  499,  502,
-
-      505,  501,  506,  502,  510,  505,  507,  507,  503,  504,
-      508,  509,  511,  512,  509,  508,  513,  516,  512,  514,
-      514,  518,  510,  506,  517,  511,  515,  515,  517,  519,
-      520,  522,  516,  523,  525,  522,  513,  524,  526,  527,
-      518,  528,  530,   51,  520,  529,  534,  530,  523,  525,
-      533,  529,  526,  519,  521,  528,  532,  521,  534,  521,
-      527,  532,  524,  521,  533,  521,  531,  531,  535,  535,
-      521,  536,  531,  537,  531,  538,  536,  539,  540,  540,
-      541,  537,  543,  544,  541,  545,  544,  543,  546,  538,
-      547,  548,  531,  549,  550,  547,  539,  552,  551,  554,
-
-      553,  546,  549,  551,  545,  557,  555,  558,  554,   50,
-      548,  555,  559,  550,  553,  560,  561,  552,  562,  563,
-      560,  561,  573,  562,  557,  558,  565,  559,  563,  564,
-      564,  565,  567,  570,  568,  568,  567,  567,  568,  569,
-      571,  572,  569,  573,  572,  574,  575,  576,  570,  577,
-      574,  575,  578,  576,  579,  579,  581,  580,  578,  582,
-      571,  583,  582,  584,  585,  577,  580,  586,  587,  589,
-      588,   45,  591,  587,  581,  588,  592,  595,  590,  583,
-      586,  590,  584,  591,  585,  593,  594,  589,  592,  597,
-      593,  594,  595,  596,  596,  598,  600,  601,  599,  603,
-
-      600,  604,  602,  607,  608,  609,  613,  610,  597,  598,
-      599,  602,  610,  618,  614,  601,  611,  607,  603,  608,
-      613,  611,  612,  616,  615,  609,  604,  612,  614,  615,
-      617,  620,  618,  619,  619,  621,  622,  623,  616,  625,
-      628,  622,  624,  627,  621,  617,  626,  624,  629,  620,
-      626,  631,  627,  630,  632,  628,  623,  635,  625,  633,
-      634,  636,  637,  629,  639,  630,  634,  642,  640,  639,
-      631,  637,  635,  643,  645,  632,  641,  633,  643,  646,
-       40,  636,  640,  648,  641,  644,  647,  642,  648,  644,
-      644,  655,  646,  645,  650,  647,  649,  649,  651,  650,
-
-      652,  652,  653,  651,  654,  655,  656,  657,  658,  654,
-      659,  653,  657,  658,  660,  659,  661,  662,  660,  664,
-      665,  666,  667,  664,  656,  661,  668,  670,  662,  669,
-      661,  671,  661,  672,  661,  665,  667,  669,  674,  666,
-      679,  670,  673,  673,  681,  668,  675,  675,  677,  671,
-      678,  677,  685,  674,   14,  678,  680,  680,  672,  679,
-      682,  682,  683,  686,  681,  684,  684,  683,  686,  687,
-      688,  690,  685,  689,  689,  688,  691,  687,  692,  694,
-      702,  695,  691,  696,  694,  692,  695,  697,  696,  690,
-      698,  699,  697,  700,  701,  701,  703,  704,  705,  698,
-
-      702,  706,  704,  712,  700,  707,  708,  708,  709,  710,
-      699,  711,  713,  716,  717,  719,  720,  713,  705,  703,
-      715,  706,  718,  707,  715,  715,  712,  718,  709,  711,
-      722,  721,  717,  719,  710,  721,  720,  723,  724,  716,
-      725,  726,  727,  728,  729,  730,  732,  727,  722,  729,
-      728,  733,  724,  731,  734,  725,  723,  733,  743,  735,
-      726,  732,  731,  730,  735,  736,  737,  738,  738,  741,
-      736,  737,  740,  740,  741,  734,  742,  743,  744,  745,
-      745,  746,  744,  744,  747,  748,  749,  750,  752,  751,
-      742,  753,  756,  750,  751,  754,  755,  757,  758,  760,
-
-      746,  759,  759,  747,  760,  749,  756,  752,  761,  762,
-      753,  748,  761,  758,  754,  755,  763,  764,  757,  765,
-      765,  766,  762,  767,  768,  763,  766,  767,  769,  771,
-      773,  774,  774,  769,  775,  773,  783,  764,  784,  775,
-      777,  777,  779,  779,  768,  781,  785,  771,  781,  782,
-      782,  783,  786,  787,  788,  788,  789,  786,  790,  790,
-      785,  791,  792,  784,  797,  793,  794,  795,  787,  793,
-      798,  800,  795,  792,  799,  799,  789,  801,  802,  803,
-      806,  803,  797,  791,  798,  794,  812,  804,  805,  807,
-      809,  800,  804,  805,  808,  808,  809,  801,  802,  811,
-
-      806,  814,  813,  807,  811,  813,  814,  815,  815,  816,
-      817,  812,  818,  819,  820,  821,  822,  822,  819,  823,
-      821,  824,  825,  826,  823,  829,  827,  816,  831,  817,
-      830,  832,  818,  828,  833,  830,  838,  820,  829,  824,
-      827,  835,  825,  826,  842,  828,  836,  842,  831,  837,
-      844,  832,  838,  836,  845,  833,  835,  843,  837,  841,
-      841,  837,  843,  845,  846,  847,  844,  848,  849,  850,
-      850,  851,  852,  849,  847,  853,  848,  847,  854,  855,
-      856,  857,  857,  846,  858,  852,  867,  859,  862,  861,
-      863,  851,  854,  853,  861,  863,  864,  865,  856,  867,
-
-      858,  871,  864,  866,  855,  859,  862,  868,  866,  871,
-      868,  872,  873,  874,  875,  876,  868,  865,  877,  875,
-      879,  880,  881,  882,  872,  880,  884,  881,  882,  883,
-      873,  876,  874,  885,  883,  884,  877,  886,  887,  887,
-      879,  888,  889,  891,  893,  890,  892,  894,  891,  895,
-      895,  901,  886,  894,  889,  888,  885,  890,  892,  896,
-      896,  898,  893,  899,  899,  902,  900,  903,  904,  904,
-      898,  900,  901,  905,  906,  906,  907,  907,  908,  909,
-      911,  912,  909,  908,  902,  911,  913,  903,  914,  915,
-      915,  913,  917,  905,  916,  916,  918,  917,  919,  912,
-
-      920,  921,  922,  923,  923,  924,  925,  925,  918,  926,
-      918,  929,  929,  914,  933,  918,  928,  930,  919,  931,
-      920,  921,  935,  922,  932,  928,  931,  934,  934,  926,
-      936,  924,  930,  932,  938,  940,  939,  941,  944,  938,
-      933,  939,  942,  942,  941,  943,  936,  944,  935,  945,
-      943,  946,  947,  948,  949,  940,  950,  951,  951,  952,
-      949,  953,  953,  954,  955,  950,  946,  956,  948,  945,
-      952,  947,  956,  957,  957,  952,  958,  959,  955,  960,
-      958,  958,  959,  961,  954,  962,  963,  964,  965,  966,
-      962,  964,  967,  968,  969,  961,  970,  967,  963,  969,
-
-      965,  972,  973,  973,  972,  960,  974,  974,  970,  978,
-      975,  981,  976,  977,  966,  968,  975,  976,  978,  977,
-      983,  983,  984,  981,  985,  986,  988,  988,  991,  993,
-      992,  998,  983,  985,  986,  992,  994,  994,  998,  995,
-      984,  995,  991,  996,  996,  999,  993, 1000, 1000, 1001,
-     1002, 1003, 1004, 1005, 1006, 1008, 1009, 1010, 1009, 1013,
-     1008, 1015, 1002, 1003, 1004,  999,   13, 1011, 1005, 1021,
-     1001, 1014, 1014, 1013, 1006, 1010, 1011, 1016, 1017, 1018,
-     1017, 1019, 1016, 1020, 1018, 1022, 1019, 1015, 1023, 1021,
-     1022, 1025, 1026, 1023, 1027, 1027, 1028, 1030, 1031, 1030,
-
-     1029, 1020, 1032, 1038, 1037, 1039, 1026, 1031, 1028, 1029,
-     1025, 1034, 1029, 1035, 1032, 1044, 1034, 1037, 1035, 1041,
-     1043, 1039, 1045, 1038, 1046, 1041, 1043, 1047, 1047, 1048,
-     1044, 1049, 1049, 1046, 1050, 1051, 1052, 1053, 1048, 1051,
-     1055, 1052, 1054, 1054, 1062, 1058, 1061, 1045, 1055, 1062,
-     1053, 1059, 1059, 1050, 1058, 1060, 1060, 1063, 1061, 1064,
-     1065, 1063, 1066, 1067, 1070, 1065, 1069, 1072, 1071, 1095,
-     1073, 1075, 1075, 1076, 1064, 1095, 1076, 1079, 1079, 1072,
-     1077, 1078, 1067, 1070, 1080, 1080, 1081, 1081, 1066, 1071,
-     1069, 1073, 1082, 1077, 1078, 1083, 1083, 1084, 1084, 1085,
-
-     1086, 1086, 1087, 1087, 1088, 1082, 1090, 1091, 1091, 1092,
-     1099, 1090, 1093, 1093, 1094, 1103, 1096, 1107, 1085, 1096,
-     1097, 1097, 1107, 1088, 1098, 1098, 1100, 1100, 1092, 1099,
-     1102, 1102, 1094, 1104, 1104, 1105, 1097, 1106, 1108, 1109,
-     1110, 1103, 1111, 1112, 1105, 1113, 1114, 1111, 1115, 1106,
-     1119, 1116, 1109, 1117, 1113, 1114, 1116, 1117, 1112, 1121,
-     1126, 1110, 1115, 1108, 1122, 1122, 1123, 1127, 1121,    0,
-     1119, 1123, 1124, 1124, 1129, 1126, 1132, 1129, 1130, 1127,
-     1132, 1124, 1136, 1130, 1131, 1131, 1133, 1134, 1134, 1133,
-     1135, 1138, 1137, 1139, 1140, 1135, 1137, 1141, 1139, 1140,
-
-     1143, 1144, 1136, 1141, 1145, 1146, 1144, 1146, 1149, 1149,
-     1155, 1138, 1145, 1152, 1152, 1155, 1143, 1156, 1156, 1158,
-     1158, 1160, 1161, 1161, 1162, 1163, 1160, 1164, 1166, 1166,
-     1169, 1170, 1164, 1170, 1171, 1169, 1172, 1173, 1173, 1176,
-     1162, 1172, 1174, 1174, 1175, 1175, 1177, 1163, 1171, 1178,
-     1179, 1176, 1181, 1180, 1182, 1183, 1183, 1181, 1184, 1185,
-     1186, 1178, 1179, 1187, 1177, 1180, 1188, 1184, 1189, 1190,
-     1191, 1195, 1192, 1200, 1182, 1191, 1187, 1192, 1193, 1193,
-     1186, 1201, 1189, 1196, 1196, 1185, 1199, 1190, 1200, 1195,
-     1188, 1198, 1198, 1202, 1203, 1199, 1204, 1205, 1205, 1201,
-
-     1206, 1207, 1208, 1209, 1214, 1206, 1211, 1216, 1216, 1215,
-     1203, 1202, 1215, 1217, 1218, 1204, 1207, 1220, 1220, 1221,
-     1228, 1208, 1229, 1209, 1214, 1211, 1222, 1222, 1217, 1223,
-     1223, 1229, 1218, 1227, 1227, 1230, 1231, 1232, 1221, 1233,
-     1230, 1231, 1228, 1235, 1236, 1237, 1238, 1233,    0, 1236,
-     1237, 1239, 1239, 1240, 1240, 1241, 1232, 1246, 1235, 1249,
-     1241, 1238, 1242, 1242, 1243, 1243, 1245, 1248, 1250, 1246,
-     1248, 1245, 1249, 1251, 1252, 1252, 1253, 1250, 1255, 1256,
-     1257, 1257, 1251, 1258, 1261, 1253, 1259, 1259, 1260, 1261,
-     1263, 1264, 1258, 1266, 1266, 1269, 1260, 1255, 1256, 1263,
-
-     1270, 1270, 1271, 1275, 1264, 1271, 1272, 1272, 1273, 1273,
-     1274, 1274, 1276, 1277, 1282, 1269, 1278, 1278, 1277, 1279,
-     1282, 1275, 1285, 1279, 1286, 1287, 1276, 1288, 1288, 1289,
-     1290, 1291, 1286, 1292, 1293, 1290, 1294, 1296, 1300, 1298,
-     1296, 1285, 1300, 1293, 1287, 1289, 1299, 1299, 1304, 1301,
-     1305, 1291, 1303, 1310, 1310, 1311, 1294, 1298, 1301, 1292,
-     1304, 1303, 1309, 1313, 1311, 1314, 1315, 1309, 1313, 1316,
-     1317, 1317, 1318, 1319, 1314, 1305, 1320, 1322, 1321, 1323,
-     1324, 1318, 1322, 1329, 1316, 1315, 1321, 1325, 1325, 1319,
-     1330, 1326, 1328, 1328, 1333, 1320, 1326, 1331, 1331, 1324,
-
-     1332, 1332, 1334, 1329, 1335, 1323, 1336, 1336, 1337, 1338,
-     1338, 1339, 1330, 1333, 1334, 1341, 1342, 1343, 1343, 1391,
-     1337, 1342, 1344, 1344, 1335, 1345, 1345, 1346, 1391, 1341,
-     1339, 1374, 1346, 1347, 1347, 1349, 1349, 1351, 1351, 1352,
-     1355, 1356, 1356, 1361, 1352, 1357, 1359, 1372, 1355, 1374,
-     1357, 1359, 1362, 1362, 1363, 1367, 1367, 1369, 1363, 1371,
-     1371, 1369, 1372, 1361, 1375, 1375, 1376, 1376, 1378, 1378,
-     1380, 1380, 1382, 1383, 1383, 1388, 1389, 1390, 1390, 1388,
-     1393, 1395,    0, 1394, 1382, 1396, 1396,    0,    0,    0,
-        0,    0,    0,    0,    0, 1393, 1389, 1394,    0,    0,
-
-     1395, 1399, 1399, 1399, 1399, 1399, 1399, 1399, 1400, 1400,
-     1400, 1400, 1400, 1400, 1400, 1401, 1401, 1401, 1401, 1401,
-     1401, 1401, 1402, 1402, 1402, 1402, 1402, 1402, 1402, 1403,
-     1403, 1403, 1403, 1403, 1403, 1403, 1405, 1405,    0, 1405,
-     1405, 1405, 1405, 1406, 1406,    0,    0,    0, 1406, 1406,
-     1407, 1407,    0,    0, 1407,    0, 1407, 1408,    0,    0,
-        0,    0,    0, 1408, 1409, 1409,    0,    0,    0, 1409,
-     1409, 1410,    0,    0,    0,    0,    0, 1410, 1411, 1411,
-        0, 1411, 1411, 1411, 1411, 1412, 1412,    0, 1412, 1412,
-     1412, 1412, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398,
-
-     1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398,
-     1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398,
-     1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398,
-     1398, 1398
+       12,   69,   28,   30,   22,   69,   24,   26,   26,   12,
+       19,   22,   19,   19,   66,   19,   26,  110,   30,   27,
+       19,   19,   23,   27,   60,   60,   27,   23,   66,   31,
+       31,   23,  110,   27,   23,   27,   23,   23,   31,   75,
+       32,   32,   34,   75,   31,   32,   76,   35,   31,   36,
+       77,   34,   35,   77,   36,   37,   37,   34,   37,  101,
+       34,   32,   35,   38,   36,   35,   76,   34,   36,   36,
+       39,   39,  101,   37,  173,   39,   55,   38,   55,   55,
+
+      173,   55,   38,   63,   78,   63,   63,   65,   63,   65,
+       65,   79,   65,   68,   63,   68,   68,   82,   68,   80,
+       81,   83,   78,   68,   71,   79,   71,   71,   84,   71,
+       85,   80,   86,   84,   71,   71,   87,   88,   81,   82,
+       83,   89,   90,   91,   85,   89,   84,   90,   94,   97,
+       92,  615,   86,   92,   87,   88,   92,   91,   93,   95,
+       98,  104,   96,   93,   95,   96,  103,   94,   99,   96,
+       92,  100,   99,   97,   98,  102,  105,  106,  100,  103,
+      105,  104,  102,  107,   95,  108,  109,  111,  107,  112,
+      114,  113,  107,  115,  115,  106,  113,  116,  118,  109,
+
+      117,  119,  114,  119,  120,  108,  111,  112,  121,  120,
+      122,  124,  124,  132,  115,  116,  117,  140,  126,  118,
+      121,  126,  131,  131,  119,  140,  139,  128,  122,  128,
+      128,  133,  128,  133,  133,  134,  133,  134,  134,  136,
+      134,  139,  136,  137,  138,  141,  134,  142,  137,  138,
+      143,  149,  144,  145,  160,  143,  143,  144,  145,  146,
+      141,  146,  148,  148,  150,  154,  155,  142,  147,  150,
+      149,  152,  147,  153,  160,  152,  157,  147,  153,  154,
+      156,  155,  147,  159,  159,  158,  161,  167,  147,  147,
+      158,  162,  156,  130,  157,  156,  162,  163,  163,  164,
+
+      165,  168,  161,  166,  164,  165,  168,  174,  167,  169,
+      164,  170,  166,  171,  169,  172,  170,  175,  171,  176,
+      177,  178,  172,  175,  179,  180,  181,  174,  177,  183,
+      180,  182,  184,  185,  183,  185,  178,  187,  186,  188,
+      129,  176,  187,  189,  179,  186,  190,  190,  181,  182,
+      182,  191,  184,  194,  192,  189,  191,  195,  188,  192,
+      193,  196,  193,  197,  201,  194,  198,  199,  197,  196,
+      200,  198,  201,  202,  191,  203,  195,  207,  203,  193,
+      204,  204,  199,  205,  206,  206,  205,  208,  200,  209,
+      210,  211,  209,  207,  210,  213,  212,  217,  202,  219,
+
+      211,  212,  208,  214,  214,  215,  216,  218,  220,  213,
+      215,  216,  221,  221,  222,  223,  224,  217,  225,  223,
+      219,  220,  227,  225,  226,  218,  228,  226,  224,  229,
+      230,  231,  222,  232,  227,  234,  234,  233,  229,  233,
+      233,  236,  237,  228,  231,  232,  228,  235,  239,  239,
+      235,  230,  242,  238,  240,  241,  241,  237,  236,  240,
+      243,  236,  238,  244,  245,  246,  247,  242,  244,  247,
+      246,  247,  248,  249,  250,  253,  251,  252,  254,  256,
+      243,  251,  252,  250,  245,  255,  248,  257,  258,  249,
+      257,  265,  249,  256,  249,  261,  253,  260,  254,  262,
+
+      255,  264,  258,  266,  261,  263,  257,  259,  266,  259,
+      259,  265,  260,  267,  268,  269,  264,  271,  276,  259,
+      262,  259,  259,  259,  263,  272,  259,  270,  127,  268,
+      269,  273,  270,  267,  277,  274,  273,  271,  276,  272,
+      274,  275,  275,  278,  275,  280,  279,  280,  281,  282,
+      277,  283,  281,  284,  285,  125,  286,  288,  293,  278,
+      279,  286,  284,  285,  287,  283,  288,  282,  287,  289,
+      290,  293,  296,  291,  289,  284,  290,  291,  292,  294,
+      294,  295,  297,  292,  298,  299,  295,  300,  300,  299,
+      301,  297,  302,  296,  306,  301,  298,  303,  303,  305,
+
+      305,  307,  308,  311,  309,  312,  313,  314,  317,  307,
+      315,  308,  314,  302,  316,  306,  309,  318,  315,  316,
+      313,  319,  321,  311,  320,  312,  317,  322,  320,  323,
+      324,  327,  322,  326,  330,  329,  328,  321,  329,  318,
+      332,  328,  319,  331,  331,  323,  328,  327,  334,  324,
+      325,  325,  335,  326,  330,  336,  325,  338,  325,  333,
+      333,  337,  339,  334,  335,  332,  325,  339,  340,  341,
+      336,  342,  345,  346,  343,  123,  325,  340,  343,  338,
+      337,  347,  344,  349,  345,  350,  342,  344,  341,  348,
+      348,  346,  352,  351,  347,  349,  351,  350,  353,  354,
+
+      355,  353,  356,  356,  357,  357,  358,  352,  359,  359,
+      362,  358,   67,  355,  361,  354,  360,  360,  354,  361,
+      363,  368,  364,  365,  371,  363,  364,  367,  365,  366,
+      369,  362,  367,  366,  370,  369,  374,  372,  371,  370,
+      372,  368,  373,  373,  376,  372,  375,  377,  378,  372,
+      377,  375,  378,  376,  374,  379,  380,  381,  383,  382,
+      379,  384,  381,  388,  386,  385,  384,  386,  388,  380,
+      383,  385,  389,  387,  378,  382,  387,  390,  391,  392,
+      393,  395,  392,  391,  394,  393,  395,  396,  394,  394,
+      389,  390,  397,  398,  400,  397,  396,  398,  398,  399,
+
+      401,  399,  401,  402,  403,  404,  405,  406,  407,  412,
+      397,  406,  408,  400,  409,  410,  418,  407,  411,  413,
+      413,  402,  403,  411,  404,  414,  405,  408,  412,  414,
+      410,  415,  409,  416,  417,  418,  419,  420,  416,  422,
+      421,  425,  415,  423,  420,  421,  422,  424,  423,  419,
+      417,  426,  424,  427,  428,  429,  432,  441,  426,  425,
+      429,  430,  427,  431,  430,  433,  433,  431,  428,  436,
+      435,  437,  438,  436,  433,  435,  439,  432,  440,  442,
+      445,  449,  441,  437,  439,  450,  448,  449,  451,  450,
+      438,  454,   61,  451,  442,  448,  440,  445,  452,  453,
+
+      452,  455,  452,  456,  453,  452,  456,  457,  457,  454,
+      452,  458,  459,  459,  460,  464,  452,  452,  458,  461,
+      461,  462,  463,  465,  462,  466,  455,  463,  468,  460,
+      467,  467,  469,  466,  470,  464,  471,  471,  478,  470,
+      472,  473,  465,  468,  474,  472,  473,  474,  475,  476,
+      469,  477,  487,  479,  475,  480,  478,  476,  479,  477,
+      481,  481,  480,  482,  483,  484,  487,  486,  489,  483,
+      486,  482,  488,  488,  490,  492,  493,  490,  494,  496,
+      495,  493,  497,  489,  484,  490,  498,  499,  500,  501,
+      503,  499,  504,  505,  502,  498,  492,  506,  504,  494,
+
+      495,  496,  497,  502,  503,  507,  500,  508,  501,  510,
+      507,  506,  508,  505,  509,  511,  512,  513,  509,  514,
+      514,  512,  516,  517,  515,  516,  518,  511,  510,  515,
+      519,  520,  521,  521,  523,  519,  522,  522,  513,  518,
+      524,  517,  525,  526,  524,  527,  529,  530,  532,  523,
+      529,  520,  533,  531,  536,  534,  535,  533,  537,  527,
+      538,  525,  530,  532,  544,  544,  538,  526,  528,  534,
+      535,  528,  537,  528,   56,  536,  539,  528,  531,  528,
+      541,  539,  540,  540,  528,  541,  542,  543,  540,  545,
+      540,  547,  548,  546,  545,  549,  549,  554,  550,  543,
+
+      542,  546,  550,  553,  552,  547,  553,  555,  540,  552,
+      556,  548,  557,  558,  559,  556,  554,  561,  560,  563,
+      555,  562,  558,  560,  564,  566,  568,  567,  563,  564,
+      585,  557,   51,  559,  569,  562,  585,  561,  570,  569,
+      572,  568,  571,  570,  566,  567,  579,  571,  574,  572,
+      573,  573,  576,  574,  577,  577,  576,  576,  577,  578,
+      580,  579,  578,  581,  582,  583,  581,  584,  586,  587,
+      583,  590,  584,  588,  588,  587,  591,  589,  592,  591,
+      580,  593,  594,   50,  586,  582,  589,  596,  595,  590,
+      597,  598,  596,  600,  599,  597,  592,  599,  601,  604,
+
+      593,  595,  594,  602,  600,  606,  603,  607,  602,  598,
+      601,  603,  605,  605,  604,  608,  609,  610,  612,  611,
+      609,  607,  613,  617,  606,  616,  618,  608,  611,  619,
+      622,  620,  627,   45,  619,  610,  620,  612,  617,  616,
+      621,  623,  625,  624,  622,  621,  618,  613,  624,  626,
+      629,  627,  628,  628,  630,  623,  631,  625,  632,  634,
+      630,  633,  636,  638,  626,  635,  633,  632,  629,  637,
+      635,  639,  638,  637,  640,  641,  631,  642,  634,  643,
+      644,  636,  645,  647,  646,  648,  639,  641,  645,  640,
+      650,  651,  653,  652,  648,  650,  642,  654,  644,  646,
+
+      643,  652,  654,  647,  655,  651,  656,  657,  655,  655,
+      658,  659,  653,  660,  660,  664,  659,  661,  662,  658,
+      657,  666,  661,  662,  664,  656,  663,  663,  665,  667,
+      673,  668,  669,  665,  670,  666,  668,  669,  671,  670,
+      672,  673,  671,  677,  675,  676,  679,  667,  675,  672,
+      678,  680,  681,  682,  672,  683,  672,  685,  672,  680,
+      676,  677,  684,  684,  678,  679,  681,  686,  686,  689,
+      688,  682,  685,  688,  689,  690,  691,  691,  692,  694,
+      683,  693,  693,  696,  694,  695,  695,  697,  698,  701,
+      699,  702,  697,  709,  690,  699,  698,  702,  692,  700,
+
+      700,  703,  709,  696,  705,  706,  707,  701,  703,  705,
+      706,  707,  708,  710,  711,  712,  712,  708,  713,  714,
+      716,  715,  721,  717,  720,  711,  715,  718,  719,  719,
+      722,  723,  710,  728,  724,  729,  733,  730,  713,  724,
+      716,  728,  714,  717,  720,  718,  726,  721,  722,  727,
+      726,  726,  731,  732,  723,  730,  733,  731,  727,  734,
+      735,  729,  736,  734,  739,  737,  743,  738,  740,  741,
+      742,  732,  745,  740,  746,  742,  741,  744,  735,  737,
+      746,  736,  738,  739,  743,  747,  744,  745,  748,  749,
+      750,  751,  751,  748,  749,  750,  753,  753,  754,  755,
+
+      756,  758,  758,  754,  757,  759,  747,  760,  757,  757,
+      761,  762,  763,  755,  765,  764,  766,  769,  763,  756,
+      764,  767,  768,  770,  759,   40,  760,  771,  772,  772,
+      762,  769,  773,  765,  774,  766,  761,  773,  774,  775,
+      767,  768,  771,  777,  770,  776,  778,  778,  779,  781,
+      784,  780,  775,  779,  776,  780,  782,  786,  787,  787,
+      788,  782,  786,  777,  796,  788,  790,  790,  784,  781,
+      792,  792,  794,  795,  795,  794,  797,  798,  799,  796,
+      800,  801,  801,  799,  802,  803,  803,  804,  805,  806,
+      810,  798,  807,  806,  813,  800,  811,  808,  814,  805,
+
+      815,  797,  808,  819,  802,  812,  812,  817,  810,  804,
+      811,  807,  817,  816,  813,  816,  818,  820,  814,  824,
+      815,  818,  822,  819,  821,  821,  825,  825,  822,  826,
+      827,  820,  828,  829,  826,  828,  830,  830,  829,  831,
+      832,  833,  834,  824,  835,  836,  838,  834,  837,  837,
+      836,  838,  839,  840,  841,  827,  843,  831,  842,  832,
+      845,  833,  844,  846,  847,  845,  848,  835,  843,  851,
+      839,  850,  842,  840,  841,  844,  851,  853,  861,  852,
+      856,  856,  857,  846,  847,  857,  850,  848,  852,  858,
+      859,  852,  860,  853,  858,  862,  863,  861,  864,  865,
+
+      865,  860,  866,  864,  862,  863,  859,  862,  867,  868,
+      869,  870,  871,  872,  872,  873,  874,  877,  876,  880,
+      878,  867,  866,  876,  869,  878,  879,  868,  881,  882,
+      871,  873,  879,  881,  874,  877,  870,  883,  887,  880,
+      883,  886,  882,  888,  889,  890,  883,  892,  891,  886,
+      890,  887,  894,  895,  896,  897,  900,  895,  901,  896,
+      897,  888,  898,  889,  891,  892,  899,  898,  902,  902,
+      903,  904,  894,  901,  905,  899,  906,  907,  908,  900,
+       14,  906,  909,  904,  903,  913,  905,  915,  909,  907,
+      910,  910,  911,  911,  913,  918,  908,  914,  914,  915,
+
+      916,  916,  917,  919,  920,  921,  921,  917,  922,  923,
+      923,  924,  924,  925,  926,  928,  918,  926,  925,  929,
+      928,  930,  919,  931,  920,  936,  930,  935,  922,  932,
+      932,  933,  933,  934,  937,  938,  939,  929,  934,  935,
+      941,  935,  940,  940,  943,  936,  935,  945,  931,  942,
+      942,  946,  946,  947,  937,  938,  945,  939,  948,  950,
+      949,  951,  951,  952,  943,  948,  941,  953,  947,  949,
+      955,  956,  957,  958,  960,  955,  956,  959,  959,  960,
+      958,  961,  962,  953,  963,  950,  964,  966,  965,  952,
+      961,  967,  957,  966,  968,  968,  969,  970,  970,  963,
+
+      967,  971,  962,  965,  972,  964,  973,  969,  974,  974,
+      975,  973,  969,  977,  975,  975,  976,  978,  972,  979,
+      980,  976,  971,  981,  979,  982,  983,  981,  984,  978,
+      985,  986,  980,  984,  987,  989,  986,  982,  989,  977,
+      990,  990,  991,  991,  992,  995,  987,  998,  993,  994,
+      992,  983,  985,  993,  995,  994, 1000, 1002, 1002,  998,
+     1003, 1004, 1005, 1007, 1007, 1010, 1012, 1011, 1000, 1002,
+     1004, 1005, 1011, 1013, 1013, 1014, 1018, 1014, 1003, 1010,
+     1015, 1015, 1017, 1012, 1019, 1019, 1020, 1021, 1022, 1017,
+     1023, 1024, 1025, 1027, 1030, 1028, 1018, 1028, 1027, 1021,
+
+     1022, 1029, 1023, 1030, 1032, 1034, 1024, 1020, 1033, 1033,
+     1035, 1036, 1025, 1036, 1039, 1035, 1037, 1038, 1032, 1029,
+     1040, 1037, 1038, 1041, 1042, 1044, 1047, 1045, 1041, 1042,
+     1048, 1034, 1039, 1046, 1046, 1049, 1050, 1049, 1047, 1048,
+     1040, 1045, 1048, 1051, 1044, 1050, 1053, 1054, 1056, 1057,
+     1058, 1053, 1054, 1060, 1062, 1051, 1063, 1064, 1065, 1060,
+     1062, 1056, 1066, 1066, 1067, 1069, 1058, 1065, 1070, 1057,
+     1072, 1063, 1070, 1067, 1068, 1068, 1071, 1073, 1073, 1074,
+     1077, 1071, 1064, 1072, 1069, 1078, 1078, 1074, 1080, 1077,
+     1079, 1079, 1081, 1082, 1082, 1083, 1084, 1081, 1085, 1083,
+
+     1080, 1086, 1087, 1085, 1089, 1090, 1092, 1096, 1091, 1093,
+     1096, 1084, 1095, 1095, 1099, 1099, 1100, 1100, 1092, 1097,
+     1098, 1087, 1101, 1101, 1090, 1102, 1105, 1086, 1089, 1091,
+     1093, 1108, 1097, 1098, 1103, 1103, 1104, 1104, 1102, 1106,
+     1106, 1107, 1107, 1110, 1112, 1105, 1111, 1111, 1110, 1114,
+     1108, 1113, 1113, 1115, 1116, 1117, 1117, 1116, 1119, 1115,
+     1118, 1118, 1123, 1112, 1120, 1120, 1125, 1114, 1122, 1122,
+     1126, 1117, 1124, 1124, 1127, 1125, 1128, 1119, 1129, 1127,
+     1131, 1130, 1126, 1132, 1133, 1131, 1134, 1136, 1123, 1135,
+     1137, 1129, 1136, 1133, 1137, 1134, 1139, 1141, 1132, 1142,
+
+     1142, 1128, 1130, 1135, 1143, 1146, 1141,   13, 1150, 1143,
+     1144, 1144, 1147, 1150, 1149, 1154, 1139, 1149, 1154, 1144,
+     1146, 1151, 1151, 1153, 1147, 1155, 1155, 1153, 1156, 1157,
+     1158, 1159, 1160, 1156, 1158, 1161, 1162, 1160, 1164, 1165,
+     1161, 1167, 1162, 1167, 1165, 1166, 1170, 1170, 1184, 1157,
+     1183, 1159, 1176, 1166, 1164, 1173, 1173, 1176, 1177, 1177,
+     1179, 1179, 1181, 1182, 1182, 1192, 1183, 1181, 1185, 1190,
+     1184, 1187, 1187, 1185, 1190, 1191, 1193, 1191, 1197, 1192,
+     1198, 1193, 1194, 1194, 1195, 1195, 1196, 1196, 1199, 1200,
+     1197, 1201, 1202, 1203, 1204, 1204, 1205, 1202, 1198, 1206,
+
+     1199, 1200, 1207, 1201, 1208, 1205, 1209, 1210, 1211, 1212,
+     1213, 1214, 1214, 1203, 1212, 1213, 1216, 1208, 1217, 1217,
+     1220, 1210, 1207, 1219, 1219, 1206, 1211, 1221, 1222, 1220,
+     1209, 1223, 1224, 1225, 1216, 1226, 1226, 1229, 1227, 1228,
+     1230, 1235, 1221, 1227, 1232,    0, 1222, 1236, 1224, 1223,
+     1236, 1238, 1225, 1239, 1228, 1242, 1229, 1237, 1237, 1249,
+     1230, 1235,    0, 1232, 1241, 1241, 1238, 1243, 1243, 1244,
+     1244, 1239, 1248, 1248, 1242, 1250, 1253, 1251, 1252, 1254,
+     1267, 1249, 1251, 1252, 1250, 1256, 1257, 1254, 1258, 1259,
+     1300, 1257, 1267, 1258, 1300, 1253, 1260, 1260, 1261, 1261,
+
+     1256, 1262, 1263, 1263, 1259, 1266, 1262, 1264, 1264, 1269,
+     1266, 1270, 1269, 1271, 1272, 1273, 1273, 1274, 1276, 1277,
+     1278, 1278, 1271, 1272, 1270, 1279, 1274, 1280, 1280, 1285,
+     1282, 1281, 1284, 1290, 1279, 1282,    0, 1276, 1277, 1281,
+     1296, 1284, 1285, 1287, 1287, 1291, 1291, 1292, 1293, 1293,
+     1292, 1294, 1294, 1290, 1295, 1295, 1297, 1298, 1296, 1299,
+     1299, 1303, 1298, 1306, 1307, 1308, 1312, 1303, 1309, 1309,
+     1297, 1310, 1307, 1311, 1313, 1315, 1314, 1317, 1311, 1319,
+     1317, 1326, 1306, 1322, 1308, 1314, 1312, 1310, 1320, 1320,
+     1321, 1325, 1322, 1324, 1321, 1315, 1330, 1319, 1331, 1331,
+
+     1313, 1330, 1324, 1325, 1332, 1334, 1326, 1335, 1336, 1337,
+     1334, 1338, 1338, 1332, 1339, 1340, 1335, 1341, 1342, 1344,
+     1343, 1345, 1350, 1339, 1337, 1343, 1342, 1336, 1346, 1346,
+     1347, 1340, 1349, 1349, 1351, 1347, 1341, 1352, 1352, 1354,
+     1345, 1355, 1350, 1353, 1353, 1344, 1356, 1357, 1357, 1358,
+     1359, 1359, 1360, 1355, 1362, 1363, 1351,    0, 1354,    0,
+     1363, 1358, 1364, 1364, 1365, 1365, 1356, 1367, 1362, 1366,
+     1366, 1360, 1367, 1368, 1368, 1370, 1370, 1372, 1372, 1373,
+     1376, 1377, 1377, 1382, 1373, 1378, 1380, 1393, 1376, 1395,
+     1378, 1380, 1383, 1383, 1384, 1388, 1388, 1390, 1384, 1392,
+
+     1392, 1390, 1393, 1382, 1396, 1396, 1403, 1395, 1397, 1397,
+     1399, 1399, 1401, 1401, 1404, 1404, 1409, 1410, 1403, 1412,
+     1409, 1411, 1411, 1414, 1416, 1415, 1417, 1417, 1412,    0,
+        0,    0,    0,    0,    0,    0,    0, 1410, 1414, 1415,
+        0,    0,    0, 1416, 1420, 1420, 1420, 1420, 1420, 1420,
+     1420, 1421, 1421, 1421, 1421, 1421, 1421, 1421, 1422, 1422,
+     1422, 1422, 1422, 1422, 1422, 1423, 1423, 1423, 1423, 1423,
+     1423, 1423, 1424, 1424, 1424, 1424, 1424, 1424, 1424, 1426,
+     1426,    0, 1426, 1426, 1426, 1426, 1427, 1427,    0,    0,
+        0, 1427, 1427, 1428, 1428,    0,    0, 1428,    0, 1428,
+
+     1429,    0,    0,    0,    0,    0, 1429, 1430, 1430,    0,
+        0,    0, 1430, 1430, 1431,    0,    0,    0,    0,    0,
+     1431, 1432, 1432,    0, 1432, 1432, 1432, 1432, 1433, 1433,
+        0, 1433, 1433, 1433, 1433, 1419, 1419, 1419, 1419, 1419,
+     1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419,
+     1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419,
+     1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419, 1419,
+     1419, 1419, 1419, 1419, 1419
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -1549,6 +1563,8 @@ char *yytext;
  *
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
@@ -1713,7 +1729,7 @@ static void config_end_include(void)
 #endif
 
 #define YY_NO_INPUT 1
-#line 178 "./util/configlexer.lex"
+#line 180 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
 #define YY_NO_UNPUT 1
 #endif
@@ -1721,7 +1737,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 1723 "<stdout>"
+#line 1739 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -1906,9 +1922,9 @@ YY_DECL
        register char *yy_cp, *yy_bp;
        register int yy_act;
     
-#line 198 "./util/configlexer.lex"
+#line 200 "./util/configlexer.lex"
 
-#line 1910 "<stdout>"
+#line 1926 "<stdout>"
 
        if ( !(yy_init) )
                {
@@ -1967,13 +1983,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 >= 1399 )
+                               if ( yy_current_state >= 1420 )
                                        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] != 2793 );
+               while ( yy_base[yy_current_state] != 2836 );
 
 yy_find_action:
                yy_act = yy_accept[yy_current_state];
@@ -1999,673 +2015,683 @@ do_action:    /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 199 "./util/configlexer.lex"
+#line 201 "./util/configlexer.lex"
 { 
        LEXOUT(("SP ")); /* ignore */ }
        YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 201 "./util/configlexer.lex"
+#line 203 "./util/configlexer.lex"
 { 
        /* note that flex makes the longest match and '.' is any but not nl */
        LEXOUT(("comment(%s) ", yytext)); /* ignore */ }
        YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 204 "./util/configlexer.lex"
+#line 206 "./util/configlexer.lex"
 { YDVAR(0, VAR_SERVER) }
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 205 "./util/configlexer.lex"
+#line 207 "./util/configlexer.lex"
 { YDVAR(1, VAR_NUM_THREADS) }
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 206 "./util/configlexer.lex"
+#line 208 "./util/configlexer.lex"
 { YDVAR(1, VAR_VERBOSITY) }
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 207 "./util/configlexer.lex"
+#line 209 "./util/configlexer.lex"
 { YDVAR(1, VAR_PORT) }
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 208 "./util/configlexer.lex"
+#line 210 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_RANGE) }
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 209 "./util/configlexer.lex"
+#line 211 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_PORT_PERMIT) }
        YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 210 "./util/configlexer.lex"
+#line 212 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_PORT_AVOID) }
        YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 211 "./util/configlexer.lex"
+#line 213 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_NUM_TCP) }
        YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 212 "./util/configlexer.lex"
+#line 214 "./util/configlexer.lex"
 { YDVAR(1, VAR_INCOMING_NUM_TCP) }
        YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 213 "./util/configlexer.lex"
+#line 215 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_IP4) }
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 214 "./util/configlexer.lex"
+#line 216 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_IP6) }
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 215 "./util/configlexer.lex"
+#line 217 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_UDP) }
        YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 216 "./util/configlexer.lex"
+#line 218 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_TCP) }
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 217 "./util/configlexer.lex"
+#line 219 "./util/configlexer.lex"
 { YDVAR(1, VAR_TCP_UPSTREAM) }
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 218 "./util/configlexer.lex"
+#line 220 "./util/configlexer.lex"
 { YDVAR(1, VAR_SSL_UPSTREAM) }
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 219 "./util/configlexer.lex"
+#line 221 "./util/configlexer.lex"
 { YDVAR(1, VAR_SSL_SERVICE_KEY) }
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 220 "./util/configlexer.lex"
+#line 222 "./util/configlexer.lex"
 { YDVAR(1, VAR_SSL_SERVICE_PEM) }
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 221 "./util/configlexer.lex"
+#line 223 "./util/configlexer.lex"
 { YDVAR(1, VAR_SSL_PORT) }
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 222 "./util/configlexer.lex"
+#line 224 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_DAEMONIZE) }
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 223 "./util/configlexer.lex"
+#line 225 "./util/configlexer.lex"
 { YDVAR(1, VAR_INTERFACE) }
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 224 "./util/configlexer.lex"
+#line 226 "./util/configlexer.lex"
 { YDVAR(1, VAR_INTERFACE) }
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 225 "./util/configlexer.lex"
+#line 227 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_INTERFACE) }
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 226 "./util/configlexer.lex"
+#line 228 "./util/configlexer.lex"
 { YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
        YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 227 "./util/configlexer.lex"
+#line 229 "./util/configlexer.lex"
 { YDVAR(1, VAR_SO_RCVBUF) }
        YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 228 "./util/configlexer.lex"
+#line 230 "./util/configlexer.lex"
 { YDVAR(1, VAR_SO_SNDBUF) }
        YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 229 "./util/configlexer.lex"
+#line 231 "./util/configlexer.lex"
 { YDVAR(1, VAR_SO_REUSEPORT) }
        YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 230 "./util/configlexer.lex"
+#line 232 "./util/configlexer.lex"
 { YDVAR(1, VAR_CHROOT) }
        YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 231 "./util/configlexer.lex"
+#line 233 "./util/configlexer.lex"
 { YDVAR(1, VAR_USERNAME) }
        YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 232 "./util/configlexer.lex"
+#line 234 "./util/configlexer.lex"
 { YDVAR(1, VAR_DIRECTORY) }
        YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 233 "./util/configlexer.lex"
+#line 235 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOGFILE) }
        YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 234 "./util/configlexer.lex"
+#line 236 "./util/configlexer.lex"
 { YDVAR(1, VAR_PIDFILE) }
        YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 235 "./util/configlexer.lex"
+#line 237 "./util/configlexer.lex"
 { YDVAR(1, VAR_ROOT_HINTS) }
        YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 236 "./util/configlexer.lex"
+#line 238 "./util/configlexer.lex"
 { YDVAR(1, VAR_EDNS_BUFFER_SIZE) }
        YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 237 "./util/configlexer.lex"
+#line 239 "./util/configlexer.lex"
 { YDVAR(1, VAR_MSG_BUFFER_SIZE) }
        YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 238 "./util/configlexer.lex"
+#line 240 "./util/configlexer.lex"
 { YDVAR(1, VAR_MSG_CACHE_SIZE) }
        YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 239 "./util/configlexer.lex"
+#line 241 "./util/configlexer.lex"
 { YDVAR(1, VAR_MSG_CACHE_SLABS) }
        YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 240 "./util/configlexer.lex"
+#line 242 "./util/configlexer.lex"
 { YDVAR(1, VAR_RRSET_CACHE_SIZE) }
        YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 241 "./util/configlexer.lex"
+#line 243 "./util/configlexer.lex"
 { YDVAR(1, VAR_RRSET_CACHE_SLABS) }
        YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 242 "./util/configlexer.lex"
+#line 244 "./util/configlexer.lex"
 { YDVAR(1, VAR_CACHE_MAX_TTL) }
        YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 243 "./util/configlexer.lex"
+#line 245 "./util/configlexer.lex"
 { YDVAR(1, VAR_CACHE_MIN_TTL) }
        YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 244 "./util/configlexer.lex"
+#line 246 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_HOST_TTL) }
        YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 245 "./util/configlexer.lex"
+#line 247 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_LAME_TTL) }
        YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 246 "./util/configlexer.lex"
+#line 248 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_CACHE_SLABS) }
        YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 247 "./util/configlexer.lex"
+#line 249 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
        YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 248 "./util/configlexer.lex"
+#line 250 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
        YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 249 "./util/configlexer.lex"
+#line 251 "./util/configlexer.lex"
 { YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
        YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 250 "./util/configlexer.lex"
+#line 252 "./util/configlexer.lex"
 { YDVAR(1, VAR_JOSTLE_TIMEOUT) }
        YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 251 "./util/configlexer.lex"
+#line 253 "./util/configlexer.lex"
 { YDVAR(1, VAR_DELAY_CLOSE) }
        YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 252 "./util/configlexer.lex"
+#line 254 "./util/configlexer.lex"
 { YDVAR(1, VAR_TARGET_FETCH_POLICY) }
        YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 253 "./util/configlexer.lex"
+#line 255 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
        YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 254 "./util/configlexer.lex"
+#line 256 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
        YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 255 "./util/configlexer.lex"
+#line 257 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_GLUE) }
        YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 256 "./util/configlexer.lex"
+#line 258 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
        YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 257 "./util/configlexer.lex"
+#line 259 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
        YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 258 "./util/configlexer.lex"
+#line 260 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
        YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 259 "./util/configlexer.lex"
+#line 261 "./util/configlexer.lex"
 { YDVAR(1, VAR_USE_CAPS_FOR_ID) }
        YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 260 "./util/configlexer.lex"
+#line 262 "./util/configlexer.lex"
 { YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
        YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 261 "./util/configlexer.lex"
+#line 263 "./util/configlexer.lex"
 { YDVAR(1, VAR_PRIVATE_ADDRESS) }
        YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 262 "./util/configlexer.lex"
+#line 264 "./util/configlexer.lex"
 { YDVAR(1, VAR_PRIVATE_DOMAIN) }
        YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 263 "./util/configlexer.lex"
+#line 265 "./util/configlexer.lex"
 { YDVAR(1, VAR_PREFETCH_KEY) }
        YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 264 "./util/configlexer.lex"
+#line 266 "./util/configlexer.lex"
 { YDVAR(1, VAR_PREFETCH) }
        YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 265 "./util/configlexer.lex"
+#line 267 "./util/configlexer.lex"
 { YDVAR(0, VAR_STUB_ZONE) }
        YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 266 "./util/configlexer.lex"
+#line 268 "./util/configlexer.lex"
 { YDVAR(1, VAR_NAME) }
        YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 267 "./util/configlexer.lex"
+#line 269 "./util/configlexer.lex"
 { YDVAR(1, VAR_STUB_ADDR) }
        YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 268 "./util/configlexer.lex"
+#line 270 "./util/configlexer.lex"
 { YDVAR(1, VAR_STUB_HOST) }
        YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 269 "./util/configlexer.lex"
+#line 271 "./util/configlexer.lex"
 { YDVAR(1, VAR_STUB_PRIME) }
        YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 270 "./util/configlexer.lex"
+#line 272 "./util/configlexer.lex"
 { YDVAR(1, VAR_STUB_FIRST) }
        YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 271 "./util/configlexer.lex"
+#line 273 "./util/configlexer.lex"
 { YDVAR(0, VAR_FORWARD_ZONE) }
        YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 272 "./util/configlexer.lex"
+#line 274 "./util/configlexer.lex"
 { YDVAR(1, VAR_FORWARD_ADDR) }
        YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 273 "./util/configlexer.lex"
+#line 275 "./util/configlexer.lex"
 { YDVAR(1, VAR_FORWARD_HOST) }
        YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 274 "./util/configlexer.lex"
+#line 276 "./util/configlexer.lex"
 { YDVAR(1, VAR_FORWARD_FIRST) }
        YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 275 "./util/configlexer.lex"
+#line 277 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
        YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 276 "./util/configlexer.lex"
+#line 278 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
        YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 277 "./util/configlexer.lex"
+#line 279 "./util/configlexer.lex"
 { YDVAR(2, VAR_ACCESS_CONTROL) }
        YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 278 "./util/configlexer.lex"
+#line 280 "./util/configlexer.lex"
 { YDVAR(1, VAR_HIDE_IDENTITY) }
        YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 279 "./util/configlexer.lex"
+#line 281 "./util/configlexer.lex"
 { YDVAR(1, VAR_HIDE_VERSION) }
        YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 280 "./util/configlexer.lex"
+#line 282 "./util/configlexer.lex"
 { YDVAR(1, VAR_IDENTITY) }
        YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 281 "./util/configlexer.lex"
+#line 283 "./util/configlexer.lex"
 { YDVAR(1, VAR_VERSION) }
        YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 282 "./util/configlexer.lex"
+#line 284 "./util/configlexer.lex"
 { YDVAR(1, VAR_MODULE_CONF) }
        YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 283 "./util/configlexer.lex"
+#line 285 "./util/configlexer.lex"
 { YDVAR(1, VAR_DLV_ANCHOR) }
        YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 284 "./util/configlexer.lex"
+#line 286 "./util/configlexer.lex"
 { YDVAR(1, VAR_DLV_ANCHOR_FILE) }
        YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 285 "./util/configlexer.lex"
+#line 287 "./util/configlexer.lex"
 { YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
        YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 286 "./util/configlexer.lex"
+#line 288 "./util/configlexer.lex"
 { YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
        YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 287 "./util/configlexer.lex"
+#line 289 "./util/configlexer.lex"
 { YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
        YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 288 "./util/configlexer.lex"
+#line 290 "./util/configlexer.lex"
 { YDVAR(1, VAR_TRUST_ANCHOR) }
        YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 289 "./util/configlexer.lex"
+#line 291 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
        YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 290 "./util/configlexer.lex"
+#line 292 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
        YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 291 "./util/configlexer.lex"
+#line 293 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
        YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 292 "./util/configlexer.lex"
+#line 294 "./util/configlexer.lex"
 { YDVAR(1, VAR_BOGUS_TTL) }
        YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 293 "./util/configlexer.lex"
+#line 295 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
        YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 294 "./util/configlexer.lex"
+#line 296 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
        YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 295 "./util/configlexer.lex"
+#line 297 "./util/configlexer.lex"
 { YDVAR(1, VAR_IGNORE_CD_FLAG) }
        YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 296 "./util/configlexer.lex"
+#line 298 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_LOG_LEVEL) }
        YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 297 "./util/configlexer.lex"
+#line 299 "./util/configlexer.lex"
 { YDVAR(1, VAR_KEY_CACHE_SIZE) }
        YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 298 "./util/configlexer.lex"
+#line 300 "./util/configlexer.lex"
 { YDVAR(1, VAR_KEY_CACHE_SLABS) }
        YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 299 "./util/configlexer.lex"
+#line 301 "./util/configlexer.lex"
 { YDVAR(1, VAR_NEG_CACHE_SIZE) }
        YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 300 "./util/configlexer.lex"
+#line 302 "./util/configlexer.lex"
 { 
                                  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
        YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 302 "./util/configlexer.lex"
+#line 304 "./util/configlexer.lex"
 { YDVAR(1, VAR_ADD_HOLDDOWN) }
        YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 303 "./util/configlexer.lex"
+#line 305 "./util/configlexer.lex"
 { YDVAR(1, VAR_DEL_HOLDDOWN) }
        YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 304 "./util/configlexer.lex"
+#line 306 "./util/configlexer.lex"
 { YDVAR(1, VAR_KEEP_MISSING) }
        YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 305 "./util/configlexer.lex"
+#line 307 "./util/configlexer.lex"
 { YDVAR(1, VAR_USE_SYSLOG) }
        YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 306 "./util/configlexer.lex"
+#line 308 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOG_TIME_ASCII) }
        YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 307 "./util/configlexer.lex"
+#line 309 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOG_QUERIES) }
        YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 308 "./util/configlexer.lex"
+#line 310 "./util/configlexer.lex"
 { YDVAR(2, VAR_LOCAL_ZONE) }
        YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 309 "./util/configlexer.lex"
+#line 311 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOCAL_DATA) }
        YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 310 "./util/configlexer.lex"
+#line 312 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOCAL_DATA_PTR) }
        YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 311 "./util/configlexer.lex"
+#line 313 "./util/configlexer.lex"
 { YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
        YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 312 "./util/configlexer.lex"
+#line 314 "./util/configlexer.lex"
 { YDVAR(1, VAR_STATISTICS_INTERVAL) }
        YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 313 "./util/configlexer.lex"
+#line 315 "./util/configlexer.lex"
 { YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
        YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 314 "./util/configlexer.lex"
+#line 316 "./util/configlexer.lex"
 { YDVAR(1, VAR_EXTENDED_STATISTICS) }
        YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 315 "./util/configlexer.lex"
+#line 317 "./util/configlexer.lex"
 { YDVAR(0, VAR_REMOTE_CONTROL) }
        YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 316 "./util/configlexer.lex"
+#line 318 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_ENABLE) }
        YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 317 "./util/configlexer.lex"
+#line 319 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_INTERFACE) }
        YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 318 "./util/configlexer.lex"
+#line 320 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_PORT) }
        YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 319 "./util/configlexer.lex"
+#line 321 "./util/configlexer.lex"
 { YDVAR(1, VAR_SERVER_KEY_FILE) }
        YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 320 "./util/configlexer.lex"
+#line 322 "./util/configlexer.lex"
 { YDVAR(1, VAR_SERVER_CERT_FILE) }
        YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 321 "./util/configlexer.lex"
+#line 323 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_KEY_FILE) }
        YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 322 "./util/configlexer.lex"
+#line 324 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_CERT_FILE) }
        YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 323 "./util/configlexer.lex"
+#line 325 "./util/configlexer.lex"
 { YDVAR(1, VAR_PYTHON_SCRIPT) }
        YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 324 "./util/configlexer.lex"
+#line 326 "./util/configlexer.lex"
 { YDVAR(0, VAR_PYTHON) }
        YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 325 "./util/configlexer.lex"
+#line 327 "./util/configlexer.lex"
 { YDVAR(1, VAR_DOMAIN_INSECURE) }
        YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 326 "./util/configlexer.lex"
+#line 328 "./util/configlexer.lex"
 { YDVAR(1, VAR_MINIMAL_RESPONSES) }
        YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 327 "./util/configlexer.lex"
+#line 329 "./util/configlexer.lex"
 { YDVAR(1, VAR_RRSET_ROUNDROBIN) }
        YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 328 "./util/configlexer.lex"
+#line 330 "./util/configlexer.lex"
 { YDVAR(1, VAR_MAX_UDP_SIZE) }
        YY_BREAK
 case 127:
-/* rule 127 can match eol */
 YY_RULE_SETUP
-#line 329 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
+#line 331 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNS64_PREFIX) }
        YY_BREAK
-/* Quoted strings. Strip leading and ending quotes */
 case 128:
 YY_RULE_SETUP
 #line 332 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+       YY_BREAK
+case 129:
+/* rule 129 can match eol */
+YY_RULE_SETUP
+#line 333 "./util/configlexer.lex"
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
+       YY_BREAK
+/* Quoted strings. Strip leading and ending quotes */
+case 130:
+YY_RULE_SETUP
+#line 336 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
        YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 333 "./util/configlexer.lex"
+#line 337 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 129:
+case 131:
 YY_RULE_SETUP
-#line 338 "./util/configlexer.lex"
+#line 342 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 130:
-/* rule 130 can match eol */
+case 132:
+/* rule 132 can match eol */
 YY_RULE_SETUP
-#line 339 "./util/configlexer.lex"
+#line 343 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
                          cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 131:
+case 133:
 YY_RULE_SETUP
-#line 341 "./util/configlexer.lex"
+#line 345 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2678,34 +2704,34 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 132:
+case 134:
 YY_RULE_SETUP
-#line 353 "./util/configlexer.lex"
+#line 357 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
        YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 354 "./util/configlexer.lex"
+#line 358 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 133:
+case 135:
 YY_RULE_SETUP
-#line 359 "./util/configlexer.lex"
+#line 363 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 134:
-/* rule 134 can match eol */
+case 136:
+/* rule 136 can match eol */
 YY_RULE_SETUP
-#line 360 "./util/configlexer.lex"
+#line 364 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
                             cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 135:
+case 137:
 YY_RULE_SETUP
-#line 362 "./util/configlexer.lex"
+#line 366 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2718,38 +2744,38 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* include: directive */
-case 136:
+case 138:
 YY_RULE_SETUP
-#line 374 "./util/configlexer.lex"
+#line 378 "./util/configlexer.lex"
 { 
        LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
        YY_BREAK
 case YY_STATE_EOF(include):
-#line 376 "./util/configlexer.lex"
+#line 380 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 137:
+case 139:
 YY_RULE_SETUP
-#line 380 "./util/configlexer.lex"
+#line 384 "./util/configlexer.lex"
 { LEXOUT(("ISP ")); /* ignore */ }
        YY_BREAK
-case 138:
-/* rule 138 can match eol */
+case 140:
+/* rule 140 can match eol */
 YY_RULE_SETUP
-#line 381 "./util/configlexer.lex"
+#line 385 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++;}
        YY_BREAK
-case 139:
+case 141:
 YY_RULE_SETUP
-#line 382 "./util/configlexer.lex"
+#line 386 "./util/configlexer.lex"
 { LEXOUT(("IQS ")); BEGIN(include_quoted); }
        YY_BREAK
-case 140:
+case 142:
 YY_RULE_SETUP
-#line 383 "./util/configlexer.lex"
+#line 387 "./util/configlexer.lex"
 {
        LEXOUT(("Iunquotedstr(%s) ", yytext));
        config_start_include_glob(yytext);
@@ -2757,27 +2783,27 @@ YY_RULE_SETUP
 }
        YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 388 "./util/configlexer.lex"
+#line 392 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 141:
+case 143:
 YY_RULE_SETUP
-#line 392 "./util/configlexer.lex"
+#line 396 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 142:
-/* rule 142 can match eol */
+case 144:
+/* rule 144 can match eol */
 YY_RULE_SETUP
-#line 393 "./util/configlexer.lex"
+#line 397 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
                                  cfg_parser->line++; BEGIN(inc_prev); }
        YY_BREAK
-case 143:
+case 145:
 YY_RULE_SETUP
-#line 395 "./util/configlexer.lex"
+#line 399 "./util/configlexer.lex"
 {
        LEXOUT(("IQE "));
        yytext[yyleng - 1] = '\0';
@@ -2787,7 +2813,7 @@ YY_RULE_SETUP
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 401 "./util/configlexer.lex"
+#line 405 "./util/configlexer.lex"
 {
        LEXOUT(("LEXEOF "));
        yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -2799,33 +2825,33 @@ case YY_STATE_EOF(val):
        }
 }
        YY_BREAK
-case 144:
+case 146:
 YY_RULE_SETUP
-#line 412 "./util/configlexer.lex"
+#line 416 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
                        if(--num_args == 0) { BEGIN(INITIAL); }
                        yylval.str = strdup(yytext); return STRING_ARG; }
        YY_BREAK
-case 145:
+case 147:
 YY_RULE_SETUP
-#line 416 "./util/configlexer.lex"
+#line 420 "./util/configlexer.lex"
 {
        ub_c_error_msg("unknown keyword '%s'", yytext);
        }
        YY_BREAK
-case 146:
+case 148:
 YY_RULE_SETUP
-#line 420 "./util/configlexer.lex"
+#line 424 "./util/configlexer.lex"
 {
        ub_c_error_msg("stray '%s'", yytext);
        }
        YY_BREAK
-case 147:
+case 149:
 YY_RULE_SETUP
-#line 424 "./util/configlexer.lex"
+#line 428 "./util/configlexer.lex"
 ECHO;
        YY_BREAK
-#line 2827 "<stdout>"
+#line 2853 "<stdout>"
 
        case YY_END_OF_BUFFER:
                {
@@ -3115,7 +3141,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 >= 1399 )
+                       if ( yy_current_state >= 1420 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -3143,11 +3169,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 >= 1399 )
+               if ( yy_current_state >= 1420 )
                        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 == 1398);
+       yy_is_jam = (yy_current_state == 1419);
 
                return yy_is_jam ? 0 : yy_current_state;
 }
@@ -3550,7 +3576,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
        YY_BUFFER_STATE b;
        char *buf;
        yy_size_t n;
-       yy_size_t i;
+       int i;
     
        /* Get memory for full buffer, including space for trailing EOB's. */
        n = _yybytes_len + 2;
@@ -3780,7 +3806,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 424 "./util/configlexer.lex"
+#line 428 "./util/configlexer.lex"
 
 
 

diff --git a/util/configlexer.lex b/util/configlexer.lex
index 9e7d6960aaabe9776aa1ca7dc77690a2eb5645ee..e33086879f7bd312eb36cd11040246f6b72122ec 100644 (file)
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -8,6 +8,8 @@
  *
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
@@ -326,6 +328,8 @@ domain-insecure{COLON}              { YDVAR(1, VAR_DOMAIN_INSECURE) }
 minimal-responses{COLON}       { YDVAR(1, VAR_MINIMAL_RESPONSES) }
 rrset-roundrobin{COLON}                { YDVAR(1, VAR_RRSET_ROUNDROBIN) }
 max-udp-size{COLON}            { YDVAR(1, VAR_MAX_UDP_SIZE) }
+dns64-prefix{COLON}            { YDVAR(1, VAR_DNS64_PREFIX) }
+dns64-synthall{COLON}          { YDVAR(1, VAR_DNS64_SYNTHALL) }
 <INITIAL,val>{NEWLINE}         { LEXOUT(("NL\n")); cfg_parser->line++; }
 
        /* Quoted strings. Strip leading and ending quotes */

diff --git a/util/configparser.c b/util/configparser.c
index 44ca691f3df7c34a60df8b76956ca08998d25e07..c53c75cc49c24d79bba86c012e64bb73a8b2dc93 100644 (file)
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -257,7 +257,9 @@ extern int yydebug;
      VAR_RRSET_ROUNDROBIN = 385,
      VAR_MAX_UDP_SIZE = 386,
      VAR_DELAY_CLOSE = 387,
-     VAR_UNBLOCK_LAN_ZONES = 388
+     VAR_UNBLOCK_LAN_ZONES = 388,
+     VAR_DNS64_PREFIX = 389,
+     VAR_DNS64_SYNTHALL = 390
    };
 #endif
 /* Tokens.  */
@@ -392,6 +394,8 @@ extern int yydebug;
 #define VAR_MAX_UDP_SIZE 386
 #define VAR_DELAY_CLOSE 387
 #define VAR_UNBLOCK_LAN_ZONES 388
+#define VAR_DNS64_PREFIX 389
+#define VAR_DNS64_SYNTHALL 390
 
 
 
@@ -405,7 +409,7 @@ typedef union YYSTYPE
 
 
 /* Line 350 of yacc.c  */
-#line 409 "util/configparser.c"
+#line 413 "util/configparser.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -433,7 +437,7 @@ int yyparse ();
 /* Copy the second part of user declarations.  */
 
 /* Line 353 of yacc.c  */
-#line 437 "util/configparser.c"
+#line 441 "util/configparser.c"
 
 #ifdef short
 # undef short
@@ -653,20 +657,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   246
+#define YYLAST   250
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  134
+#define YYNTOKENS  136
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  137
+#define YYNNTS  139
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  261
+#define YYNRULES  265
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  383
+#define YYNSTATES  389
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   388
+#define YYMAXUTOK   390
 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -712,7 +716,8 @@ static const yytype_uint8 yytranslate[] =
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135
 };
 
 #if YYDEBUG
@@ -731,124 +736,125 @@ static const yytype_uint16 yyprhs[] =
      164,   166,   168,   170,   172,   174,   176,   178,   180,   182,
      184,   186,   188,   190,   192,   194,   196,   198,   200,   202,
      204,   206,   208,   210,   212,   214,   216,   218,   220,   222,
-     224,   226,   228,   230,   232,   234,   237,   238,   240,   242,
-     244,   246,   248,   250,   253,   254,   256,   258,   260,   262,
-     265,   268,   271,   274,   277,   280,   283,   286,   289,   292,
-     295,   298,   301,   304,   307,   310,   313,   316,   319,   322,
-     325,   328,   331,   334,   337,   340,   343,   346,   349,   352,
-     355,   358,   361,   364,   367,   370,   373,   376,   379,   382,
-     385,   388,   391,   394,   397,   400,   403,   406,   409,   412,
-     415,   418,   421,   424,   427,   430,   433,   436,   439,   442,
-     445,   448,   451,   454,   457,   460,   463,   466,   469,   472,
-     475,   478,   481,   484,   487,   490,   493,   497,   500,   503,
-     506,   509,   512,   515,   518,   521,   524,   527,   530,   533,
-     536,   539,   542,   545,   548,   551,   555,   558,   561,   564,
-     567,   570,   573,   576,   579,   582,   585,   588,   591,   594,
-     597,   599,   602,   603,   605,   607,   609,   611,   613,   615,
-     617,   620,   623,   626,   629,   632,   635,   638,   640,   643,
-     644,   646
+     224,   226,   228,   230,   232,   234,   236,   238,   241,   242,
+     244,   246,   248,   250,   252,   254,   257,   258,   260,   262,
+     264,   266,   269,   272,   275,   278,   281,   284,   287,   290,
+     293,   296,   299,   302,   305,   308,   311,   314,   317,   320,
+     323,   326,   329,   332,   335,   338,   341,   344,   347,   350,
+     353,   356,   359,   362,   365,   368,   371,   374,   377,   380,
+     383,   386,   389,   392,   395,   398,   401,   404,   407,   410,
+     413,   416,   419,   422,   425,   428,   431,   434,   437,   440,
+     443,   446,   449,   452,   455,   458,   461,   464,   467,   470,
+     473,   476,   479,   482,   485,   488,   491,   494,   497,   501,
+     504,   507,   510,   513,   516,   519,   522,   525,   528,   531,
+     534,   537,   540,   543,   546,   549,   552,   555,   559,   562,
+     565,   568,   571,   574,   577,   580,   583,   586,   589,   592,
+     595,   598,   601,   604,   607,   609,   612,   613,   615,   617,
+     619,   621,   623,   625,   627,   630,   633,   636,   639,   642,
+     645,   648,   650,   653,   654,   656
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     135,     0,    -1,    -1,   135,   136,    -1,   137,   138,    -1,
-     140,   141,    -1,   143,   144,    -1,   267,   268,    -1,   257,
-     258,    -1,    11,    -1,   138,   139,    -1,    -1,   146,    -1,
-     147,    -1,   151,    -1,   154,    -1,   160,    -1,   161,    -1,
-     162,    -1,   163,    -1,   152,    -1,   173,    -1,   174,    -1,
-     175,    -1,   176,    -1,   177,    -1,   195,    -1,   196,    -1,
-     197,    -1,   201,    -1,   202,    -1,   157,    -1,   203,    -1,
-     204,    -1,   207,    -1,   205,    -1,   206,    -1,   208,    -1,
-     209,    -1,   210,    -1,   221,    -1,   186,    -1,   187,    -1,
-     188,    -1,   189,    -1,   211,    -1,   224,    -1,   182,    -1,
-     184,    -1,   225,    -1,   230,    -1,   231,    -1,   232,    -1,
-     158,    -1,   194,    -1,   239,    -1,   240,    -1,   183,    -1,
-     235,    -1,   170,    -1,   153,    -1,   178,    -1,   222,    -1,
-     228,    -1,   212,    -1,   223,    -1,   242,    -1,   243,    -1,
-     159,    -1,   148,    -1,   169,    -1,   215,    -1,   149,    -1,
-     155,    -1,   156,    -1,   179,    -1,   180,    -1,   241,    -1,
-     214,    -1,   216,    -1,   217,    -1,   150,    -1,   244,    -1,
-     198,    -1,   220,    -1,   171,    -1,   185,    -1,   226,    -1,
-     227,    -1,   229,    -1,   234,    -1,   181,    -1,   236,    -1,
-     237,    -1,   238,    -1,   190,    -1,   193,    -1,   218,    -1,
-     219,    -1,   191,    -1,   213,    -1,   233,    -1,   172,    -1,
-     164,    -1,   165,    -1,   166,    -1,   167,    -1,   168,    -1,
-     245,    -1,   246,    -1,   247,    -1,   192,    -1,   199,    -1,
-     200,    -1,    38,    -1,   141,   142,    -1,    -1,   248,    -1,
-     249,    -1,   250,    -1,   252,    -1,   251,    -1,    44,    -1,
-     144,   145,    -1,    -1,   253,    -1,   254,    -1,   255,    -1,
-     256,    -1,    13,    10,    -1,    12,    10,    -1,    76,    10,
-      -1,    79,    10,    -1,    96,    10,    -1,    14,    10,    -1,
-      16,    10,    -1,    67,    10,    -1,    15,    10,    -1,    80,
-      10,    -1,    81,    10,    -1,    31,    10,    -1,    60,    10,
-      -1,    75,    10,    -1,    17,    10,    -1,    18,    10,    -1,
-      19,    10,    -1,    20,    10,    -1,   122,    10,    -1,   123,
-      10,    -1,   124,    10,    -1,   125,    10,    -1,   126,    10,
-      -1,    77,    10,    -1,    66,    10,    -1,   101,    10,    -1,
-     121,    10,    -1,    21,    10,    -1,    22,    10,    -1,    23,
-      10,    -1,    24,    10,    -1,    25,    10,    -1,    68,    10,
-      -1,    82,    10,    -1,    83,    10,    -1,   109,    10,    -1,
-      54,    10,    -1,    64,    10,    -1,    55,    10,    -1,   102,
-      10,    -1,    48,    10,    -1,    49,    10,    -1,    50,    10,
-      -1,    51,    10,    -1,   113,    10,    -1,   117,    10,    -1,
-     118,    10,    -1,   114,    10,    -1,    61,    10,    -1,    26,
-      10,    -1,    27,    10,    -1,    28,    10,    -1,    98,    10,
-      -1,   132,    10,    -1,   133,    10,    -1,    29,    10,    -1,
-      30,    10,    -1,    32,    10,    -1,    33,    10,    -1,    35,
-      10,    -1,    36,    10,    -1,    34,    10,    -1,    41,    10,
-      -1,    42,    10,    -1,    43,    10,    -1,    52,    10,    -1,
-      71,    10,    -1,   119,    10,    -1,    85,    10,    -1,    78,
-      10,    -1,    86,    10,    -1,    87,    10,    -1,   115,    10,
-      -1,   116,    10,    -1,   100,    10,    -1,    47,    10,    -1,
-      69,    10,    -1,    72,    10,    10,    -1,    53,    10,    -1,
-      56,    10,    -1,   105,    10,    -1,   106,    10,    -1,    70,
-      10,    -1,   107,    10,    -1,    57,    10,    -1,    58,    10,
-      -1,    59,    10,    -1,   120,    10,    -1,   108,    10,    -1,
-      65,    10,    -1,   111,    10,    -1,   112,    10,    -1,   110,
-      10,    -1,    62,    10,    -1,    63,    10,    -1,    84,    10,
-      -1,    73,    10,    10,    -1,    74,    10,    -1,    97,    10,
-      -1,   129,    10,    -1,   130,    10,    -1,   131,    10,    -1,
+     137,     0,    -1,    -1,   137,   138,    -1,   139,   140,    -1,
+     142,   143,    -1,   145,   146,    -1,   271,   272,    -1,   261,
+     262,    -1,    11,    -1,   140,   141,    -1,    -1,   148,    -1,
+     149,    -1,   153,    -1,   156,    -1,   162,    -1,   163,    -1,
+     164,    -1,   165,    -1,   154,    -1,   175,    -1,   176,    -1,
+     177,    -1,   178,    -1,   179,    -1,   197,    -1,   198,    -1,
+     199,    -1,   203,    -1,   204,    -1,   159,    -1,   205,    -1,
+     206,    -1,   209,    -1,   207,    -1,   208,    -1,   210,    -1,
+     211,    -1,   212,    -1,   223,    -1,   188,    -1,   189,    -1,
+     190,    -1,   191,    -1,   213,    -1,   226,    -1,   184,    -1,
+     186,    -1,   227,    -1,   232,    -1,   233,    -1,   234,    -1,
+     160,    -1,   196,    -1,   241,    -1,   242,    -1,   185,    -1,
+     237,    -1,   172,    -1,   155,    -1,   180,    -1,   224,    -1,
+     230,    -1,   214,    -1,   225,    -1,   244,    -1,   245,    -1,
+     161,    -1,   150,    -1,   171,    -1,   217,    -1,   151,    -1,
+     157,    -1,   158,    -1,   181,    -1,   182,    -1,   243,    -1,
+     216,    -1,   218,    -1,   219,    -1,   152,    -1,   246,    -1,
+     200,    -1,   222,    -1,   173,    -1,   187,    -1,   228,    -1,
+     229,    -1,   231,    -1,   236,    -1,   183,    -1,   238,    -1,
+     239,    -1,   240,    -1,   192,    -1,   195,    -1,   220,    -1,
+     221,    -1,   193,    -1,   215,    -1,   235,    -1,   174,    -1,
+     166,    -1,   167,    -1,   168,    -1,   169,    -1,   170,    -1,
+     247,    -1,   248,    -1,   249,    -1,   194,    -1,   201,    -1,
+     202,    -1,   250,    -1,   251,    -1,    38,    -1,   143,   144,
+      -1,    -1,   252,    -1,   253,    -1,   254,    -1,   256,    -1,
+     255,    -1,    44,    -1,   146,   147,    -1,    -1,   257,    -1,
+     258,    -1,   259,    -1,   260,    -1,    13,    10,    -1,    12,
+      10,    -1,    76,    10,    -1,    79,    10,    -1,    96,    10,
+      -1,    14,    10,    -1,    16,    10,    -1,    67,    10,    -1,
+      15,    10,    -1,    80,    10,    -1,    81,    10,    -1,    31,
+      10,    -1,    60,    10,    -1,    75,    10,    -1,    17,    10,
+      -1,    18,    10,    -1,    19,    10,    -1,    20,    10,    -1,
+     122,    10,    -1,   123,    10,    -1,   124,    10,    -1,   125,
+      10,    -1,   126,    10,    -1,    77,    10,    -1,    66,    10,
+      -1,   101,    10,    -1,   121,    10,    -1,    21,    10,    -1,
+      22,    10,    -1,    23,    10,    -1,    24,    10,    -1,    25,
+      10,    -1,    68,    10,    -1,    82,    10,    -1,    83,    10,
+      -1,   109,    10,    -1,    54,    10,    -1,    64,    10,    -1,
+      55,    10,    -1,   102,    10,    -1,    48,    10,    -1,    49,
+      10,    -1,    50,    10,    -1,    51,    10,    -1,   113,    10,
+      -1,   117,    10,    -1,   118,    10,    -1,   114,    10,    -1,
+      61,    10,    -1,    26,    10,    -1,    27,    10,    -1,    28,
+      10,    -1,    98,    10,    -1,   132,    10,    -1,   133,    10,
+      -1,    29,    10,    -1,    30,    10,    -1,    32,    10,    -1,
+      33,    10,    -1,    35,    10,    -1,    36,    10,    -1,    34,
+      10,    -1,    41,    10,    -1,    42,    10,    -1,    43,    10,
+      -1,    52,    10,    -1,    71,    10,    -1,   119,    10,    -1,
+      85,    10,    -1,    78,    10,    -1,    86,    10,    -1,    87,
+      10,    -1,   115,    10,    -1,   116,    10,    -1,   100,    10,
+      -1,    47,    10,    -1,    69,    10,    -1,    72,    10,    10,
+      -1,    53,    10,    -1,    56,    10,    -1,   105,    10,    -1,
+     106,    10,    -1,    70,    10,    -1,   107,    10,    -1,    57,
+      10,    -1,    58,    10,    -1,    59,    10,    -1,   120,    10,
+      -1,   108,    10,    -1,    65,    10,    -1,   111,    10,    -1,
+     112,    10,    -1,   110,    10,    -1,    62,    10,    -1,    63,
+      10,    -1,    84,    10,    -1,    73,    10,    10,    -1,    74,
+      10,    -1,    97,    10,    -1,   129,    10,    -1,   130,    10,
+      -1,   131,    10,    -1,   134,    10,    -1,   135,    10,    -1,
       37,    10,    -1,    39,    10,    -1,    40,    10,    -1,   128,
       10,    -1,    99,    10,    -1,    37,    10,    -1,    45,    10,
-      -1,    46,    10,    -1,   127,    10,    -1,    88,    -1,   258,
-     259,    -1,    -1,   260,    -1,   262,    -1,   261,    -1,   263,
-      -1,   264,    -1,   265,    -1,   266,    -1,    89,    10,    -1,
+      -1,    46,    10,    -1,   127,    10,    -1,    88,    -1,   262,
+     263,    -1,    -1,   264,    -1,   266,    -1,   265,    -1,   267,
+      -1,   268,    -1,   269,    -1,   270,    -1,    89,    10,    -1,
       91,    10,    -1,    90,    10,    -1,    92,    10,    -1,    93,
       10,    -1,    94,    10,    -1,    95,    10,    -1,   103,    -1,
-     268,   269,    -1,    -1,   270,    -1,   104,    10,    -1
+     272,   273,    -1,    -1,   274,    -1,   104,    10,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   111,   111,   111,   112,   112,   113,   113,   114,   118,
-     123,   124,   125,   125,   125,   126,   126,   127,   127,   127,
-     128,   128,   128,   129,   129,   129,   130,   130,   131,   131,
-     132,   132,   133,   133,   134,   134,   135,   135,   136,   136,
-     137,   137,   138,   138,   138,   139,   139,   139,   140,   140,
-     140,   141,   141,   142,   142,   143,   143,   144,   144,   145,
-     145,   145,   146,   146,   147,   147,   148,   148,   148,   149,
-     149,   150,   150,   151,   151,   152,   152,   152,   153,   153,
-     154,   154,   155,   155,   156,   156,   157,   157,   158,   158,
-     158,   159,   159,   160,   160,   160,   161,   161,   161,   162,
-     162,   162,   163,   163,   163,   164,   164,   164,   165,   165,
-     165,   166,   166,   166,   168,   180,   181,   182,   182,   182,
-     182,   182,   184,   196,   197,   198,   198,   198,   198,   200,
-     209,   218,   229,   238,   247,   256,   269,   284,   293,   302,
-     311,   320,   329,   338,   347,   356,   365,   374,   383,   392,
-     399,   406,   415,   424,   438,   447,   456,   463,   470,   477,
-     485,   492,   499,   506,   513,   521,   529,   537,   544,   551,
-     560,   569,   576,   583,   591,   599,   609,   622,   633,   641,
-     654,   663,   672,   681,   691,   699,   712,   721,   729,   738,
-     746,   759,   766,   776,   786,   796,   806,   816,   826,   836,
-     843,   850,   859,   868,   877,   884,   894,   911,   918,   936,
-     949,   962,   971,   980,   989,   999,  1009,  1018,  1027,  1034,
-    1043,  1052,  1061,  1069,  1082,  1090,  1112,  1119,  1134,  1144,
-    1154,  1161,  1171,  1178,  1185,  1194,  1204,  1214,  1221,  1228,
-    1237,  1242,  1243,  1244,  1244,  1244,  1245,  1245,  1245,  1246,
-    1248,  1258,  1267,  1274,  1281,  1288,  1295,  1302,  1307,  1308,
-    1309,  1311
+       0,   112,   112,   112,   113,   113,   114,   114,   115,   119,
+     124,   125,   126,   126,   126,   127,   127,   128,   128,   128,
+     129,   129,   129,   130,   130,   130,   131,   131,   132,   132,
+     133,   133,   134,   134,   135,   135,   136,   136,   137,   137,
+     138,   138,   139,   139,   139,   140,   140,   140,   141,   141,
+     141,   142,   142,   143,   143,   144,   144,   145,   145,   146,
+     146,   146,   147,   147,   148,   148,   149,   149,   149,   150,
+     150,   151,   151,   152,   152,   153,   153,   153,   154,   154,
+     155,   155,   156,   156,   157,   157,   158,   158,   159,   159,
+     159,   160,   160,   161,   161,   161,   162,   162,   162,   163,
+     163,   163,   164,   164,   164,   165,   165,   165,   166,   166,
+     166,   167,   167,   167,   168,   168,   170,   182,   183,   184,
+     184,   184,   184,   184,   186,   198,   199,   200,   200,   200,
+     200,   202,   211,   220,   231,   240,   249,   258,   271,   286,
+     295,   304,   313,   322,   331,   340,   349,   358,   367,   376,
+     385,   394,   401,   408,   417,   426,   440,   449,   458,   465,
+     472,   479,   487,   494,   501,   508,   515,   523,   531,   539,
+     546,   553,   562,   571,   578,   585,   593,   601,   611,   624,
+     635,   643,   656,   665,   674,   683,   693,   701,   714,   723,
+     731,   740,   748,   761,   768,   778,   788,   798,   808,   818,
+     828,   838,   845,   852,   861,   870,   879,   886,   896,   913,
+     920,   938,   951,   964,   973,   982,   991,  1001,  1011,  1020,
+    1029,  1036,  1045,  1054,  1063,  1071,  1084,  1092,  1114,  1121,
+    1136,  1146,  1156,  1163,  1170,  1179,  1189,  1196,  1203,  1212,
+    1222,  1232,  1239,  1246,  1255,  1260,  1261,  1262,  1262,  1262,
+    1263,  1263,  1263,  1264,  1266,  1276,  1285,  1292,  1299,  1306,
+    1313,  1320,  1325,  1326,  1327,  1329
 };
 #endif
 
@@ -899,17 +905,18 @@ static const char *const yytname[] =
   "VAR_SSL_UPSTREAM", "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM",
   "VAR_SSL_PORT", "VAR_FORWARD_FIRST", "VAR_STUB_FIRST",
   "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE",
-  "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES", "$accept", "toplevelvars",
-  "toplevelvar", "serverstart", "contents_server", "content_server",
-  "stubstart", "contents_stub", "content_stub", "forwardstart",
-  "contents_forward", "content_forward", "server_num_threads",
-  "server_verbosity", "server_statistics_interval",
-  "server_statistics_cumulative", "server_extended_statistics",
-  "server_port", "server_interface", "server_outgoing_interface",
-  "server_outgoing_range", "server_outgoing_port_permit",
-  "server_outgoing_port_avoid", "server_outgoing_num_tcp",
-  "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4",
-  "server_do_ip6", "server_do_udp", "server_do_tcp", "server_tcp_upstream",
+  "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES", "VAR_DNS64_PREFIX",
+  "VAR_DNS64_SYNTHALL", "$accept", "toplevelvars", "toplevelvar",
+  "serverstart", "contents_server", "content_server", "stubstart",
+  "contents_stub", "content_stub", "forwardstart", "contents_forward",
+  "content_forward", "server_num_threads", "server_verbosity",
+  "server_statistics_interval", "server_statistics_cumulative",
+  "server_extended_statistics", "server_port", "server_interface",
+  "server_outgoing_interface", "server_outgoing_range",
+  "server_outgoing_port_permit", "server_outgoing_port_avoid",
+  "server_outgoing_num_tcp", "server_incoming_num_tcp",
+  "server_interface_automatic", "server_do_ip4", "server_do_ip6",
+  "server_do_udp", "server_do_tcp", "server_tcp_upstream",
   "server_ssl_upstream", "server_ssl_service_key",
   "server_ssl_service_pem", "server_ssl_port", "server_do_daemonize",
   "server_use_syslog", "server_log_time_ascii", "server_log_queries",
@@ -944,13 +951,14 @@ static const char *const yytname[] =
   "server_del_holddown", "server_keep_missing", "server_key_cache_size",
   "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone",
   "server_local_data", "server_local_data_ptr", "server_minimal_responses",
-  "server_rrset_roundrobin", "server_max_udp_size", "stub_name",
-  "stub_host", "stub_addr", "stub_first", "stub_prime", "forward_name",
-  "forward_host", "forward_addr", "forward_first", "rcstart",
-  "contents_rc", "content_rc", "rc_control_enable", "rc_control_port",
-  "rc_control_interface", "rc_server_key_file", "rc_server_cert_file",
-  "rc_control_key_file", "rc_control_cert_file", "pythonstart",
-  "contents_py", "content_py", "py_script", YY_NULL
+  "server_rrset_roundrobin", "server_max_udp_size", "server_dns64_prefix",
+  "server_dns64_synthall", "stub_name", "stub_host", "stub_addr",
+  "stub_first", "stub_prime", "forward_name", "forward_host",
+  "forward_addr", "forward_first", "rcstart", "contents_rc", "content_rc",
+  "rc_control_enable", "rc_control_port", "rc_control_interface",
+  "rc_server_key_file", "rc_server_cert_file", "rc_control_key_file",
+  "rc_control_cert_file", "pythonstart", "contents_py", "content_py",
+  "py_script", YY_NULL
 };
 #endif
 
@@ -972,26 +980,26 @@ static const yytype_uint16 yytoknum[] =
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388
+     385,   386,   387,   388,   389,   390
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   134,   135,   135,   136,   136,   136,   136,   136,   137,
-     138,   138,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   140,   141,   141,   142,   142,   142,
-     142,   142,   143,   144,   144,   145,   145,   145,   145,   146,
+       0,   136,   137,   137,   138,   138,   138,   138,   138,   139,
+     140,   140,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
+     141,   141,   141,   141,   141,   141,   142,   143,   143,   144,
+     144,   144,   144,   144,   145,   146,   146,   147,   147,   147,
      147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
      157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
      167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
@@ -1003,9 +1011,9 @@ static const yytype_uint16 yyr1[] =
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
      237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
      247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   258,   259,   259,   259,   259,   259,   259,   259,
-     260,   261,   262,   263,   264,   265,   266,   267,   268,   268,
-     269,   270
+     257,   258,   259,   260,   261,   262,   262,   263,   263,   263,
+     263,   263,   263,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   272,   273,   274
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1022,22 +1030,22 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     0,     1,
        1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     2,     0,     1,     1,     1,     1,     2,
+       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     3,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     3,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     3,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     3,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
-       2,     2,     2,     2,     2,     2,     2,     1,     2,     0,
-       1,     2
+       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
+       2,     1,     2,     0,     1,     2
 };
 
 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -1045,8 +1053,8 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,     9,   114,   122,   240,   257,     3,    11,
-     116,   124,   242,   259,     4,     5,     6,     8,     7,     0,
+       2,     0,     1,     9,   116,   124,   244,   261,     3,    11,
+     118,   126,   246,   263,     4,     5,     6,     8,     7,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1057,52 +1065,52 @@ static const yytype_uint16 yydefact[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    10,    12,    13,    69,    72,    81,    14,    20,    60,
-      15,    73,    74,    31,    53,    68,    16,    17,    18,    19,
-     103,   104,   105,   106,   107,    70,    59,    85,   102,    21,
-      22,    23,    24,    25,    61,    75,    76,    91,    47,    57,
-      48,    86,    41,    42,    43,    44,    95,    99,   111,    96,
-      54,    26,    27,    28,    83,   112,   113,    29,    30,    32,
-      33,    35,    36,    34,    37,    38,    39,    45,    64,   100,
-      78,    71,    79,    80,    97,    98,    84,    40,    62,    65,
-      46,    49,    87,    88,    63,    89,    50,    51,    52,   101,
-      90,    58,    92,    93,    94,    55,    56,    77,    66,    67,
-      82,   108,   109,   110,     0,     0,     0,     0,     0,   115,
-     117,   118,   119,   121,   120,     0,     0,     0,     0,   123,
-     125,   126,   127,   128,     0,     0,     0,     0,     0,     0,
-       0,   241,   243,   245,   244,   246,   247,   248,   249,     0,
-     258,   260,   130,   129,   134,   137,   135,   143,   144,   145,
-     146,   156,   157,   158,   159,   160,   178,   179,   180,   184,
-     185,   140,   186,   187,   190,   188,   189,   191,   192,   193,
-     204,   169,   170,   171,   172,   194,   207,   165,   167,   208,
-     213,   214,   215,   141,   177,   222,   223,   166,   218,   153,
-     136,   161,   205,   211,   195,     0,     0,   226,   142,   131,
-     152,   198,   132,   138,   139,   162,   163,   224,   197,   199,
-     200,   133,   227,   181,   203,   154,   168,   209,   210,   212,
-     217,   164,   221,   219,   220,   173,   176,   201,   202,   174,
-     175,   196,   216,   155,   147,   148,   149,   150,   151,   228,
-     229,   230,   182,   183,   231,   232,   233,   235,   234,   236,
-     237,   238,   239,   250,   252,   251,   253,   254,   255,   256,
-     261,   206,   225
+       0,     0,     0,    10,    12,    13,    69,    72,    81,    14,
+      20,    60,    15,    73,    74,    31,    53,    68,    16,    17,
+      18,    19,   103,   104,   105,   106,   107,    70,    59,    85,
+     102,    21,    22,    23,    24,    25,    61,    75,    76,    91,
+      47,    57,    48,    86,    41,    42,    43,    44,    95,    99,
+     111,    96,    54,    26,    27,    28,    83,   112,   113,    29,
+      30,    32,    33,    35,    36,    34,    37,    38,    39,    45,
+      64,   100,    78,    71,    79,    80,    97,    98,    84,    40,
+      62,    65,    46,    49,    87,    88,    63,    89,    50,    51,
+      52,   101,    90,    58,    92,    93,    94,    55,    56,    77,
+      66,    67,    82,   108,   109,   110,   114,   115,     0,     0,
+       0,     0,     0,   117,   119,   120,   121,   123,   122,     0,
+       0,     0,     0,   125,   127,   128,   129,   130,     0,     0,
+       0,     0,     0,     0,     0,   245,   247,   249,   248,   250,
+     251,   252,   253,     0,   262,   264,   132,   131,   136,   139,
+     137,   145,   146,   147,   148,   158,   159,   160,   161,   162,
+     180,   181,   182,   186,   187,   142,   188,   189,   192,   190,
+     191,   193,   194,   195,   206,   171,   172,   173,   174,   196,
+     209,   167,   169,   210,   215,   216,   217,   143,   179,   224,
+     225,   168,   220,   155,   138,   163,   207,   213,   197,     0,
+       0,   228,   144,   133,   154,   200,   134,   140,   141,   164,
+     165,   226,   199,   201,   202,   135,   229,   183,   205,   156,
+     170,   211,   212,   214,   219,   166,   223,   221,   222,   175,
+     178,   203,   204,   176,   177,   198,   218,   157,   149,   150,
+     151,   152,   153,   230,   231,   232,   184,   185,   233,   234,
+     235,   236,   237,   239,   238,   240,   241,   242,   243,   254,
+     256,   255,   257,   258,   259,   260,   265,   208,   227
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     8,     9,    14,   121,    10,    15,   229,    11,
-      16,   239,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
-     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
-     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,   230,   231,   232,   233,   234,   240,
-     241,   242,   243,    12,    17,   251,   252,   253,   254,   255,
-     256,   257,   258,    13,    18,   260,   261
+      -1,     1,     8,     9,    14,   123,    10,    15,   233,    11,
+      16,   243,   124,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   234,   235,   236,   237,
+     238,   244,   245,   246,   247,    12,    17,   255,   256,   257,
+     258,   259,   260,   261,   262,    13,    18,   264,   265
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -1113,18 +1121,16 @@ static const yytype_int16 yypact[] =
      -80,   115,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -12,    39,    46,    38,   -79,    16,
       17,    18,    22,    23,    24,    67,    70,    71,    72,    77,
-     106,   112,   113,   114,   124,   125,   126,   127,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   144,   145,   146,   147,   148,   150,   151,   152,
-     153,   154,   155,   156,   158,   159,   160,   161,   162,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   194,   195,
-     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
-     206,   207,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     106,   114,   124,   125,   126,   127,   129,   130,   131,   132,
+     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
+     144,   145,   146,   147,   148,   150,   151,   152,   153,   154,
+     155,   156,   158,   159,   160,   161,   162,   164,   165,   166,
+     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
+     219,   220,   221,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
@@ -1132,23 +1138,25 @@ static const yytype_int16 yypact[] =
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   218,   219,   220,   221,   222,   -80,
-     -80,   -80,   -80,   -80,   -80,   223,   224,   225,   226,   -80,
-     -80,   -80,   -80,   -80,   227,   228,   229,   230,   231,   232,
-     233,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   234,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   222,   223,
+     224,   225,   226,   -80,   -80,   -80,   -80,   -80,   -80,   227,
+     228,   229,   230,   -80,   -80,   -80,   -80,   -80,   231,   232,
+     233,   234,   235,   236,   237,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   -80,   238,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   235,   236,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   239,
+     240,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80
 };
 
 /* YYPGOTO[NTERM-NUM].  */
@@ -1167,7 +1175,7 @@ static const yytype_int8 yypgoto[] =
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1178,29 +1186,30 @@ static const yytype_uint16 yytable[] =
 {
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
       29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,   259,   262,   263,   264,    44,
-      45,    46,   265,   266,   267,    47,    48,    49,    50,    51,
+      39,    40,    41,    42,    43,   263,   266,   267,   268,    44,
+      45,    46,   269,   270,   271,    47,    48,    49,    50,    51,
       52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,   224,   268,   225,   226,
-     269,   270,   271,   235,    88,    89,    90,   272,    91,    92,
-      93,   236,   237,    94,    95,    96,    97,    98,    99,   100,
+      82,    83,    84,    85,    86,    87,   228,   272,   229,   230,
+     273,   274,   275,   239,    88,    89,    90,   276,    91,    92,
+      93,   240,   241,    94,    95,    96,    97,    98,    99,   100,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,     2,   273,   116,   117,   118,
-     119,   120,   274,   275,   276,     0,     3,   244,   245,   246,
-     247,   248,   249,   250,   277,   278,   279,   280,   227,   281,
-     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,   294,     4,   295,   296,   297,   298,   299,     5,
-     300,   301,   302,   303,   304,   305,   306,   228,   307,   308,
-     309,   310,   311,   238,   312,   313,   314,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
-     338,   339,   340,     6,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,   351,   352,   353,   354,     7,   355,
-     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   379,   380,   381,   382
+     111,   112,   113,   114,   115,     2,   277,   116,   117,   118,
+     119,   120,   121,   122,   278,     0,     3,   248,   249,   250,
+     251,   252,   253,   254,   279,   280,   281,   282,   231,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,     4,   297,   298,   299,   300,   301,     5,
+     302,   303,   304,   305,   306,   307,   308,   232,   309,   310,
+     311,   312,   313,   242,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
+     340,   341,   342,     6,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,   354,   355,   356,     7,   357,
+     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388
 };
 
 #define yypact_value_is_default(yystate) \
@@ -1223,7 +1232,7 @@ static const yytype_int16 yycheck[] =
      102,    45,    46,   105,   106,   107,   108,   109,   110,   111,
      112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
      122,   123,   124,   125,   126,     0,    10,   129,   130,   131,
-     132,   133,    10,    10,    10,    -1,    11,    89,    90,    91,
+     132,   133,   134,   135,    10,    -1,    11,    89,    90,    91,
       92,    93,    94,    95,    10,    10,    10,    10,    99,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    38,    10,    10,    10,    10,    10,    44,
@@ -1235,15 +1244,16 @@ static const yytype_int16 yycheck[] =
       10,    10,    10,    10,    10,    10,    10,    10,   103,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   135,     0,    11,    38,    44,    88,   103,   136,   137,
-     140,   143,   257,   267,   138,   141,   144,   258,   268,    12,
+       0,   137,     0,    11,    38,    44,    88,   103,   138,   139,
+     142,   145,   261,   271,   140,   143,   146,   262,   272,    12,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
       23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
       33,    34,    35,    36,    41,    42,    43,    47,    48,    49,
@@ -1254,7 +1264,7 @@ static const yytype_uint16 yystos[] =
       98,   100,   101,   102,   105,   106,   107,   108,   109,   110,
      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
      121,   122,   123,   124,   125,   126,   129,   130,   131,   132,
-     133,   139,   146,   147,   148,   149,   150,   151,   152,   153,
+     133,   134,   135,   141,   148,   149,   150,   151,   152,   153,
      154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
      164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
@@ -1264,11 +1274,11 @@ static const yytype_uint16 yystos[] =
      214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
      224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
      234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,    37,    39,    40,    99,   128,   142,
-     248,   249,   250,   251,   252,    37,    45,    46,   127,   145,
-     253,   254,   255,   256,    89,    90,    91,    92,    93,    94,
-      95,   259,   260,   261,   262,   263,   264,   265,   266,   104,
-     269,   270,    10,    10,    10,    10,    10,    10,    10,    10,
+     244,   245,   246,   247,   248,   249,   250,   251,    37,    39,
+      40,    99,   128,   144,   252,   253,   254,   255,   256,    37,
+      45,    46,   127,   147,   257,   258,   259,   260,    89,    90,
+      91,    92,    93,    94,    95,   263,   264,   265,   266,   267,
+     268,   269,   270,   104,   273,   274,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1280,7 +1290,7 @@ static const yytype_uint16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10
 };
 
 #define yyerrok                (yyerrstatus = 0)
@@ -2105,15 +2115,15 @@ yyreduce:
     {
         case 9:
 /* Line 1787 of yacc.c  */
-#line 119 "./util/configparser.y"
+#line 120 "./util/configparser.y"
     { 
                OUTYY(("\nP(server:)\n")); 
        }
     break;
 
-  case 114:
+  case 116:
 /* Line 1787 of yacc.c  */
-#line 169 "./util/configparser.y"
+#line 171 "./util/configparser.y"
     {
                struct config_stub* s;
                OUTYY(("\nP(stub_zone:)\n")); 
@@ -2126,9 +2136,9 @@ yyreduce:
        }
     break;
 
-  case 122:
+  case 124:
 /* Line 1787 of yacc.c  */
-#line 185 "./util/configparser.y"
+#line 187 "./util/configparser.y"
     {
                struct config_stub* s;
                OUTYY(("\nP(forward_zone:)\n")); 
@@ -2141,9 +2151,9 @@ yyreduce:
        }
     break;
 
-  case 129:
+  case 131:
 /* Line 1787 of yacc.c  */
-#line 201 "./util/configparser.y"
+#line 203 "./util/configparser.y"
     { 
                OUTYY(("P(server_num_threads:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2153,9 +2163,9 @@ yyreduce:
        }
     break;
 
-  case 130:
+  case 132:
 /* Line 1787 of yacc.c  */
-#line 210 "./util/configparser.y"
+#line 212 "./util/configparser.y"
     { 
                OUTYY(("P(server_verbosity:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2165,9 +2175,9 @@ yyreduce:
        }
     break;
 
-  case 131:
+  case 133:
 /* Line 1787 of yacc.c  */
-#line 219 "./util/configparser.y"
+#line 221 "./util/configparser.y"
     { 
                OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(strcmp((yyvsp[(2) - (2)].str), "") == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0)
@@ -2179,9 +2189,9 @@ yyreduce:
        }
     break;
 
-  case 132:
+  case 134:
 /* Line 1787 of yacc.c  */
-#line 230 "./util/configparser.y"
+#line 232 "./util/configparser.y"
     {
                OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2191,9 +2201,9 @@ yyreduce:
        }
     break;
 
-  case 133:
+  case 135:
 /* Line 1787 of yacc.c  */
-#line 239 "./util/configparser.y"
+#line 241 "./util/configparser.y"
     {
                OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2203,9 +2213,9 @@ yyreduce:
        }
     break;
 
-  case 134:
+  case 136:
 /* Line 1787 of yacc.c  */
-#line 248 "./util/configparser.y"
+#line 250 "./util/configparser.y"
     {
                OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2215,9 +2225,9 @@ yyreduce:
        }
     break;
 
-  case 135:
+  case 137:
 /* Line 1787 of yacc.c  */
-#line 257 "./util/configparser.y"
+#line 259 "./util/configparser.y"
     {
                OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->num_ifs == 0)
@@ -2231,9 +2241,9 @@ yyreduce:
        }
     break;
 
-  case 136:
+  case 138:
 /* Line 1787 of yacc.c  */
-#line 270 "./util/configparser.y"
+#line 272 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->num_out_ifs == 0)
@@ -2249,9 +2259,9 @@ yyreduce:
        }
     break;
 
-  case 137:
+  case 139:
 /* Line 1787 of yacc.c  */
-#line 285 "./util/configparser.y"
+#line 287 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2261,9 +2271,9 @@ yyreduce:
        }
     break;
 
-  case 138:
+  case 140:
 /* Line 1787 of yacc.c  */
-#line 294 "./util/configparser.y"
+#line 296 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, 
@@ -2273,9 +2283,9 @@ yyreduce:
        }
     break;
 
-  case 139:
+  case 141:
 /* Line 1787 of yacc.c  */
-#line 303 "./util/configparser.y"
+#line 305 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, 
@@ -2285,9 +2295,9 @@ yyreduce:
        }
     break;
 
-  case 140:
+  case 142:
 /* Line 1787 of yacc.c  */
-#line 312 "./util/configparser.y"
+#line 314 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2297,9 +2307,9 @@ yyreduce:
        }
     break;
 
-  case 141:
+  case 143:
 /* Line 1787 of yacc.c  */
-#line 321 "./util/configparser.y"
+#line 323 "./util/configparser.y"
     {
                OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2309,9 +2319,9 @@ yyreduce:
        }
     break;
 
-  case 142:
+  case 144:
 /* Line 1787 of yacc.c  */
-#line 330 "./util/configparser.y"
+#line 332 "./util/configparser.y"
     {
                OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2321,9 +2331,9 @@ yyreduce:
        }
     break;
 
-  case 143:
+  case 145:
 /* Line 1787 of yacc.c  */
-#line 339 "./util/configparser.y"
+#line 341 "./util/configparser.y"
     {
                OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2333,9 +2343,9 @@ yyreduce:
        }
     break;
 
-  case 144:
+  case 146:
 /* Line 1787 of yacc.c  */
-#line 348 "./util/configparser.y"
+#line 350 "./util/configparser.y"
     {
                OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2345,9 +2355,9 @@ yyreduce:
        }
     break;
 
-  case 145:
+  case 147:
 /* Line 1787 of yacc.c  */
-#line 357 "./util/configparser.y"
+#line 359 "./util/configparser.y"
     {
                OUTYY(("P(server_do_udp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2357,9 +2367,9 @@ yyreduce:
        }
     break;
 
-  case 146:
+  case 148:
 /* Line 1787 of yacc.c  */
-#line 366 "./util/configparser.y"
+#line 368 "./util/configparser.y"
     {
                OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2369,9 +2379,9 @@ yyreduce:
        }
     break;
 
-  case 147:
+  case 149:
 /* Line 1787 of yacc.c  */
-#line 375 "./util/configparser.y"
+#line 377 "./util/configparser.y"
     {
                OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2381,9 +2391,9 @@ yyreduce:
        }
     break;
 
-  case 148:
+  case 150:
 /* Line 1787 of yacc.c  */
-#line 384 "./util/configparser.y"
+#line 386 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2393,9 +2403,9 @@ yyreduce:
        }
     break;
 
-  case 149:
+  case 151:
 /* Line 1787 of yacc.c  */
-#line 393 "./util/configparser.y"
+#line 395 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->ssl_service_key);
@@ -2403,9 +2413,9 @@ yyreduce:
        }
     break;
 
-  case 150:
+  case 152:
 /* Line 1787 of yacc.c  */
-#line 400 "./util/configparser.y"
+#line 402 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->ssl_service_pem);
@@ -2413,9 +2423,9 @@ yyreduce:
        }
     break;
 
-  case 151:
+  case 153:
 /* Line 1787 of yacc.c  */
-#line 407 "./util/configparser.y"
+#line 409 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2425,9 +2435,9 @@ yyreduce:
        }
     break;
 
-  case 152:
+  case 154:
 /* Line 1787 of yacc.c  */
-#line 416 "./util/configparser.y"
+#line 418 "./util/configparser.y"
     {
                OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2437,9 +2447,9 @@ yyreduce:
        }
     break;
 
-  case 153:
+  case 155:
 /* Line 1787 of yacc.c  */
-#line 425 "./util/configparser.y"
+#line 427 "./util/configparser.y"
     {
                OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2454,9 +2464,9 @@ yyreduce:
        }
     break;
 
-  case 154:
+  case 156:
 /* Line 1787 of yacc.c  */
-#line 439 "./util/configparser.y"
+#line 441 "./util/configparser.y"
     {
                OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2466,9 +2476,9 @@ yyreduce:
        }
     break;
 
-  case 155:
+  case 157:
 /* Line 1787 of yacc.c  */
-#line 448 "./util/configparser.y"
+#line 450 "./util/configparser.y"
     {
                OUTYY(("P(server_log_queries:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2478,9 +2488,9 @@ yyreduce:
        }
     break;
 
-  case 156:
+  case 158:
 /* Line 1787 of yacc.c  */
-#line 457 "./util/configparser.y"
+#line 459 "./util/configparser.y"
     {
                OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->chrootdir);
@@ -2488,9 +2498,9 @@ yyreduce:
        }
     break;
 
-  case 157:
+  case 159:
 /* Line 1787 of yacc.c  */
-#line 464 "./util/configparser.y"
+#line 466 "./util/configparser.y"
     {
                OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->username);
@@ -2498,9 +2508,9 @@ yyreduce:
        }
     break;
 
-  case 158:
+  case 160:
 /* Line 1787 of yacc.c  */
-#line 471 "./util/configparser.y"
+#line 473 "./util/configparser.y"
     {
                OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->directory);
@@ -2508,9 +2518,9 @@ yyreduce:
        }
     break;
 
-  case 159:
+  case 161:
 /* Line 1787 of yacc.c  */
-#line 478 "./util/configparser.y"
+#line 480 "./util/configparser.y"
     {
                OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->logfile);
@@ -2519,9 +2529,9 @@ yyreduce:
        }
     break;
 
-  case 160:
+  case 162:
 /* Line 1787 of yacc.c  */
-#line 486 "./util/configparser.y"
+#line 488 "./util/configparser.y"
     {
                OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->pidfile);
@@ -2529,9 +2539,9 @@ yyreduce:
        }
     break;
 
-  case 161:
+  case 163:
 /* Line 1787 of yacc.c  */
-#line 493 "./util/configparser.y"
+#line 495 "./util/configparser.y"
     {
                OUTYY(("P(server_root_hints:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[(2) - (2)].str)))
@@ -2539,9 +2549,9 @@ yyreduce:
        }
     break;
 
-  case 162:
+  case 164:
 /* Line 1787 of yacc.c  */
-#line 500 "./util/configparser.y"
+#line 502 "./util/configparser.y"
     {
                OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->dlv_anchor_file);
@@ -2549,9 +2559,9 @@ yyreduce:
        }
     break;
 
-  case 163:
+  case 165:
 /* Line 1787 of yacc.c  */
-#line 507 "./util/configparser.y"
+#line 509 "./util/configparser.y"
     {
                OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2559,9 +2569,9 @@ yyreduce:
        }
     break;
 
-  case 164:
+  case 166:
 /* Line 1787 of yacc.c  */
-#line 514 "./util/configparser.y"
+#line 516 "./util/configparser.y"
     {
                OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2570,9 +2580,9 @@ yyreduce:
        }
     break;
 
-  case 165:
+  case 167:
 /* Line 1787 of yacc.c  */
-#line 522 "./util/configparser.y"
+#line 524 "./util/configparser.y"
     {
                OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2581,9 +2591,9 @@ yyreduce:
        }
     break;
 
-  case 166:
+  case 168:
 /* Line 1787 of yacc.c  */
-#line 530 "./util/configparser.y"
+#line 532 "./util/configparser.y"
     {
                OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2592,9 +2602,9 @@ yyreduce:
        }
     break;
 
-  case 167:
+  case 169:
 /* Line 1787 of yacc.c  */
-#line 538 "./util/configparser.y"
+#line 540 "./util/configparser.y"
     {
                OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2602,9 +2612,9 @@ yyreduce:
        }
     break;
 
-  case 168:
+  case 170:
 /* Line 1787 of yacc.c  */
-#line 545 "./util/configparser.y"
+#line 547 "./util/configparser.y"
     {
                OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[(2) - (2)].str)))
@@ -2612,9 +2622,9 @@ yyreduce:
        }
     break;
 
-  case 169:
+  case 171:
 /* Line 1787 of yacc.c  */
-#line 552 "./util/configparser.y"
+#line 554 "./util/configparser.y"
     {
                OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2624,9 +2634,9 @@ yyreduce:
        }
     break;
 
-  case 170:
+  case 172:
 /* Line 1787 of yacc.c  */
-#line 561 "./util/configparser.y"
+#line 563 "./util/configparser.y"
     {
                OUTYY(("P(server_hide_version:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2636,9 +2646,9 @@ yyreduce:
        }
     break;
 
-  case 171:
+  case 173:
 /* Line 1787 of yacc.c  */
-#line 570 "./util/configparser.y"
+#line 572 "./util/configparser.y"
     {
                OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->identity);
@@ -2646,9 +2656,9 @@ yyreduce:
        }
     break;
 
-  case 172:
+  case 174:
 /* Line 1787 of yacc.c  */
-#line 577 "./util/configparser.y"
+#line 579 "./util/configparser.y"
     {
                OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->version);
@@ -2656,9 +2666,9 @@ yyreduce:
        }
     break;
 
-  case 173:
+  case 175:
 /* Line 1787 of yacc.c  */
-#line 584 "./util/configparser.y"
+#line 586 "./util/configparser.y"
     {
                OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_rcvbuf))
@@ -2667,9 +2677,9 @@ yyreduce:
        }
     break;
 
-  case 174:
+  case 176:
 /* Line 1787 of yacc.c  */
-#line 592 "./util/configparser.y"
+#line 594 "./util/configparser.y"
     {
                OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_sndbuf))
@@ -2678,9 +2688,9 @@ yyreduce:
        }
     break;
 
-  case 175:
+  case 177:
 /* Line 1787 of yacc.c  */
-#line 600 "./util/configparser.y"
+#line 602 "./util/configparser.y"
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[(2) - (2)].str)));
         if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2691,9 +2701,9 @@ yyreduce:
     }
     break;
 
-  case 176:
+  case 178:
 /* Line 1787 of yacc.c  */
-#line 610 "./util/configparser.y"
+#line 612 "./util/configparser.y"
     {
                OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2707,9 +2717,9 @@ yyreduce:
        }
     break;
 
-  case 177:
+  case 179:
 /* Line 1787 of yacc.c  */
-#line 623 "./util/configparser.y"
+#line 625 "./util/configparser.y"
     {
                OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2721,9 +2731,9 @@ yyreduce:
        }
     break;
 
-  case 178:
+  case 180:
 /* Line 1787 of yacc.c  */
-#line 634 "./util/configparser.y"
+#line 636 "./util/configparser.y"
     {
                OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->msg_cache_size))
@@ -2732,9 +2742,9 @@ yyreduce:
        }
     break;
 
-  case 179:
+  case 181:
 /* Line 1787 of yacc.c  */
-#line 642 "./util/configparser.y"
+#line 644 "./util/configparser.y"
     {
                OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2748,9 +2758,9 @@ yyreduce:
        }
     break;
 
-  case 180:
+  case 182:
 /* Line 1787 of yacc.c  */
-#line 655 "./util/configparser.y"
+#line 657 "./util/configparser.y"
     {
                OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2760,9 +2770,9 @@ yyreduce:
        }
     break;
 
-  case 181:
+  case 183:
 /* Line 1787 of yacc.c  */
-#line 664 "./util/configparser.y"
+#line 666 "./util/configparser.y"
     {
                OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2772,9 +2782,9 @@ yyreduce:
        }
     break;
 
-  case 182:
+  case 184:
 /* Line 1787 of yacc.c  */
-#line 673 "./util/configparser.y"
+#line 675 "./util/configparser.y"
     {
                OUTYY(("P(server_delay_close:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2784,9 +2794,9 @@ yyreduce:
        }
     break;
 
-  case 183:
+  case 185:
 /* Line 1787 of yacc.c  */
-#line 682 "./util/configparser.y"
+#line 684 "./util/configparser.y"
     {
                OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2797,9 +2807,9 @@ yyreduce:
        }
     break;
 
-  case 184:
+  case 186:
 /* Line 1787 of yacc.c  */
-#line 692 "./util/configparser.y"
+#line 694 "./util/configparser.y"
     {
                OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->rrset_cache_size))
@@ -2808,9 +2818,9 @@ yyreduce:
        }
     break;
 
-  case 185:
+  case 187:
 /* Line 1787 of yacc.c  */
-#line 700 "./util/configparser.y"
+#line 702 "./util/configparser.y"
     {
                OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2824,9 +2834,9 @@ yyreduce:
        }
     break;
 
-  case 186:
+  case 188:
 /* Line 1787 of yacc.c  */
-#line 713 "./util/configparser.y"
+#line 715 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2836,9 +2846,9 @@ yyreduce:
        }
     break;
 
-  case 187:
+  case 189:
 /* Line 1787 of yacc.c  */
-#line 722 "./util/configparser.y"
+#line 724 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
@@ -2847,9 +2857,9 @@ yyreduce:
        }
     break;
 
-  case 188:
+  case 190:
 /* Line 1787 of yacc.c  */
-#line 730 "./util/configparser.y"
+#line 732 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2859,9 +2869,9 @@ yyreduce:
        }
     break;
 
-  case 189:
+  case 191:
 /* Line 1787 of yacc.c  */
-#line 739 "./util/configparser.y"
+#line 741 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str)));
                verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
@@ -2870,9 +2880,9 @@ yyreduce:
        }
     break;
 
-  case 190:
+  case 192:
 /* Line 1787 of yacc.c  */
-#line 747 "./util/configparser.y"
+#line 749 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2886,9 +2896,9 @@ yyreduce:
        }
     break;
 
-  case 191:
+  case 193:
 /* Line 1787 of yacc.c  */
-#line 760 "./util/configparser.y"
+#line 762 "./util/configparser.y"
     {
                OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->target_fetch_policy);
@@ -2896,9 +2906,9 @@ yyreduce:
        }
     break;
 
-  case 192:
+  case 194:
 /* Line 1787 of yacc.c  */
-#line 767 "./util/configparser.y"
+#line 769 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2909,9 +2919,9 @@ yyreduce:
        }
     break;
 
-  case 193:
+  case 195:
 /* Line 1787 of yacc.c  */
-#line 777 "./util/configparser.y"
+#line 779 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2922,9 +2932,9 @@ yyreduce:
        }
     break;
 
-  case 194:
+  case 196:
 /* Line 1787 of yacc.c  */
-#line 787 "./util/configparser.y"
+#line 789 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2935,9 +2945,9 @@ yyreduce:
        }
     break;
 
-  case 195:
+  case 197:
 /* Line 1787 of yacc.c  */
-#line 797 "./util/configparser.y"
+#line 799 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2948,9 +2958,9 @@ yyreduce:
        }
     break;
 
-  case 196:
+  case 198:
 /* Line 1787 of yacc.c  */
-#line 807 "./util/configparser.y"
+#line 809 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2961,9 +2971,9 @@ yyreduce:
        }
     break;
 
-  case 197:
+  case 199:
 /* Line 1787 of yacc.c  */
-#line 817 "./util/configparser.y"
+#line 819 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2974,9 +2984,9 @@ yyreduce:
        }
     break;
 
-  case 198:
+  case 200:
 /* Line 1787 of yacc.c  */
-#line 827 "./util/configparser.y"
+#line 829 "./util/configparser.y"
     {
                OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2987,9 +2997,9 @@ yyreduce:
        }
     break;
 
-  case 199:
+  case 201:
 /* Line 1787 of yacc.c  */
-#line 837 "./util/configparser.y"
+#line 839 "./util/configparser.y"
     {
                OUTYY(("P(server_private_address:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[(2) - (2)].str)))
@@ -2997,9 +3007,9 @@ yyreduce:
        }
     break;
 
-  case 200:
+  case 202:
 /* Line 1787 of yacc.c  */
-#line 844 "./util/configparser.y"
+#line 846 "./util/configparser.y"
     {
                OUTYY(("P(server_private_domain:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[(2) - (2)].str)))
@@ -3007,9 +3017,9 @@ yyreduce:
        }
     break;
 
-  case 201:
+  case 203:
 /* Line 1787 of yacc.c  */
-#line 851 "./util/configparser.y"
+#line 853 "./util/configparser.y"
     {
                OUTYY(("P(server_prefetch:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3019,9 +3029,9 @@ yyreduce:
        }
     break;
 
-  case 202:
+  case 204:
 /* Line 1787 of yacc.c  */
-#line 860 "./util/configparser.y"
+#line 862 "./util/configparser.y"
     {
                OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3031,9 +3041,9 @@ yyreduce:
        }
     break;
 
-  case 203:
+  case 205:
 /* Line 1787 of yacc.c  */
-#line 869 "./util/configparser.y"
+#line 871 "./util/configparser.y"
     {
                OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3043,9 +3053,9 @@ yyreduce:
        }
     break;
 
-  case 204:
+  case 206:
 /* Line 1787 of yacc.c  */
-#line 878 "./util/configparser.y"
+#line 880 "./util/configparser.y"
     {
                OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[(2) - (2)].str)))
@@ -3053,9 +3063,9 @@ yyreduce:
        }
     break;
 
-  case 205:
+  case 207:
 /* Line 1787 of yacc.c  */
-#line 885 "./util/configparser.y"
+#line 887 "./util/configparser.y"
     {
                OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3066,9 +3076,9 @@ yyreduce:
        }
     break;
 
-  case 206:
+  case 208:
 /* Line 1787 of yacc.c  */
-#line 895 "./util/configparser.y"
+#line 897 "./util/configparser.y"
     {
                OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
                if(strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 &&
@@ -3086,9 +3096,9 @@ yyreduce:
        }
     break;
 
-  case 207:
+  case 209:
 /* Line 1787 of yacc.c  */
-#line 912 "./util/configparser.y"
+#line 914 "./util/configparser.y"
     {
                OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->module_conf);
@@ -3096,9 +3106,9 @@ yyreduce:
        }
     break;
 
-  case 208:
+  case 210:
 /* Line 1787 of yacc.c  */
-#line 919 "./util/configparser.y"
+#line 921 "./util/configparser.y"
     {
                OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3117,9 +3127,9 @@ yyreduce:
        }
     break;
 
-  case 209:
+  case 211:
 /* Line 1787 of yacc.c  */
-#line 937 "./util/configparser.y"
+#line 939 "./util/configparser.y"
     {
                OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3133,9 +3143,9 @@ yyreduce:
        }
     break;
 
-  case 210:
+  case 212:
 /* Line 1787 of yacc.c  */
-#line 950 "./util/configparser.y"
+#line 952 "./util/configparser.y"
     {
                OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3149,9 +3159,9 @@ yyreduce:
        }
     break;
 
-  case 211:
+  case 213:
 /* Line 1787 of yacc.c  */
-#line 963 "./util/configparser.y"
+#line 965 "./util/configparser.y"
     {
                OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3161,9 +3171,9 @@ yyreduce:
        }
     break;
 
-  case 212:
+  case 214:
 /* Line 1787 of yacc.c  */
-#line 972 "./util/configparser.y"
+#line 974 "./util/configparser.y"
     {
                OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3173,9 +3183,9 @@ yyreduce:
        }
     break;
 
-  case 213:
+  case 215:
 /* Line 1787 of yacc.c  */
-#line 981 "./util/configparser.y"
+#line 983 "./util/configparser.y"
     {
                OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3185,9 +3195,9 @@ yyreduce:
        }
     break;
 
-  case 214:
+  case 216:
 /* Line 1787 of yacc.c  */
-#line 990 "./util/configparser.y"
+#line 992 "./util/configparser.y"
     {
                OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3198,9 +3208,9 @@ yyreduce:
        }
     break;
 
-  case 215:
+  case 217:
 /* Line 1787 of yacc.c  */
-#line 1000 "./util/configparser.y"
+#line 1002 "./util/configparser.y"
     {
                OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3211,9 +3221,9 @@ yyreduce:
        }
     break;
 
-  case 216:
+  case 218:
 /* Line 1787 of yacc.c  */
-#line 1010 "./util/configparser.y"
+#line 1012 "./util/configparser.y"
     {
                OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3223,9 +3233,9 @@ yyreduce:
        }
     break;
 
-  case 217:
+  case 219:
 /* Line 1787 of yacc.c  */
-#line 1019 "./util/configparser.y"
+#line 1021 "./util/configparser.y"
     {
                OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3235,9 +3245,9 @@ yyreduce:
        }
     break;
 
-  case 218:
+  case 220:
 /* Line 1787 of yacc.c  */
-#line 1028 "./util/configparser.y"
+#line 1030 "./util/configparser.y"
     {
                OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->val_nsec3_key_iterations);
@@ -3245,9 +3255,9 @@ yyreduce:
        }
     break;
 
-  case 219:
+  case 221:
 /* Line 1787 of yacc.c  */
-#line 1035 "./util/configparser.y"
+#line 1037 "./util/configparser.y"
     {
                OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3257,9 +3267,9 @@ yyreduce:
        }
     break;
 
-  case 220:
+  case 222:
 /* Line 1787 of yacc.c  */
-#line 1044 "./util/configparser.y"
+#line 1046 "./util/configparser.y"
     {
                OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3269,9 +3279,9 @@ yyreduce:
        }
     break;
 
-  case 221:
+  case 223:
 /* Line 1787 of yacc.c  */
-#line 1053 "./util/configparser.y"
+#line 1055 "./util/configparser.y"
     {
                OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3281,9 +3291,9 @@ yyreduce:
        }
     break;
 
-  case 222:
+  case 224:
 /* Line 1787 of yacc.c  */
-#line 1062 "./util/configparser.y"
+#line 1064 "./util/configparser.y"
     {
                OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->key_cache_size))
@@ -3292,9 +3302,9 @@ yyreduce:
        }
     break;
 
-  case 223:
+  case 225:
 /* Line 1787 of yacc.c  */
-#line 1070 "./util/configparser.y"
+#line 1072 "./util/configparser.y"
     {
                OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -3308,9 +3318,9 @@ yyreduce:
        }
     break;
 
-  case 224:
+  case 226:
 /* Line 1787 of yacc.c  */
-#line 1083 "./util/configparser.y"
+#line 1085 "./util/configparser.y"
     {
                OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->neg_cache_size))
@@ -3319,9 +3329,9 @@ yyreduce:
        }
     break;
 
-  case 225:
+  case 227:
 /* Line 1787 of yacc.c  */
-#line 1091 "./util/configparser.y"
+#line 1093 "./util/configparser.y"
     {
                OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
                if(strcmp((yyvsp[(3) - (3)].str), "static")!=0 && strcmp((yyvsp[(3) - (3)].str), "deny")!=0 &&
@@ -3344,9 +3354,9 @@ yyreduce:
        }
     break;
 
-  case 226:
+  case 228:
 /* Line 1787 of yacc.c  */
-#line 1113 "./util/configparser.y"
+#line 1115 "./util/configparser.y"
     {
                OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[(2) - (2)].str)))
@@ -3354,9 +3364,9 @@ yyreduce:
        }
     break;
 
-  case 227:
+  case 229:
 /* Line 1787 of yacc.c  */
-#line 1120 "./util/configparser.y"
+#line 1122 "./util/configparser.y"
     {
                char* ptr;
                OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str)));
@@ -3372,9 +3382,9 @@ yyreduce:
        }
     break;
 
-  case 228:
+  case 230:
 /* Line 1787 of yacc.c  */
-#line 1135 "./util/configparser.y"
+#line 1137 "./util/configparser.y"
     {
                OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3385,9 +3395,9 @@ yyreduce:
        }
     break;
 
-  case 229:
+  case 231:
 /* Line 1787 of yacc.c  */
-#line 1145 "./util/configparser.y"
+#line 1147 "./util/configparser.y"
     {
                OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3398,9 +3408,9 @@ yyreduce:
        }
     break;
 
-  case 230:
+  case 232:
 /* Line 1787 of yacc.c  */
-#line 1155 "./util/configparser.y"
+#line 1157 "./util/configparser.y"
     {
                OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[(2) - (2)].str)));
                cfg_parser->cfg->max_udp_size = atoi((yyvsp[(2) - (2)].str));
@@ -3408,9 +3418,31 @@ yyreduce:
        }
     break;
 
-  case 231:
+  case 233:
+/* Line 1787 of yacc.c  */
+#line 1164 "./util/configparser.y"
+    {
+               OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[(2) - (2)].str)));
+               free(cfg_parser->cfg->dns64_prefix);
+               cfg_parser->cfg->dns64_prefix = (yyvsp[(2) - (2)].str);
+       }
+    break;
+
+  case 234:
+/* Line 1787 of yacc.c  */
+#line 1171 "./util/configparser.y"
+    {
+               OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[(2) - (2)].str)));
+               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+                       yyerror("expected yes or no.");
+               else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
+               free((yyvsp[(2) - (2)].str));
+       }
+    break;
+
+  case 235:
 /* Line 1787 of yacc.c  */
-#line 1162 "./util/configparser.y"
+#line 1180 "./util/configparser.y"
     {
                OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->stubs->name)
@@ -3421,9 +3453,9 @@ yyreduce:
        }
     break;
 
-  case 232:
+  case 236:
 /* Line 1787 of yacc.c  */
-#line 1172 "./util/configparser.y"
+#line 1190 "./util/configparser.y"
     {
                OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str)))
@@ -3431,9 +3463,9 @@ yyreduce:
        }
     break;
 
-  case 233:
+  case 237:
 /* Line 1787 of yacc.c  */
-#line 1179 "./util/configparser.y"
+#line 1197 "./util/configparser.y"
     {
                OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str)))
@@ -3441,9 +3473,9 @@ yyreduce:
        }
     break;
 
-  case 234:
+  case 238:
 /* Line 1787 of yacc.c  */
-#line 1186 "./util/configparser.y"
+#line 1204 "./util/configparser.y"
     {
                OUTYY(("P(stub-first:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3453,9 +3485,9 @@ yyreduce:
        }
     break;
 
-  case 235:
+  case 239:
 /* Line 1787 of yacc.c  */
-#line 1195 "./util/configparser.y"
+#line 1213 "./util/configparser.y"
     {
                OUTYY(("P(stub-prime:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3466,9 +3498,9 @@ yyreduce:
        }
     break;
 
-  case 236:
+  case 240:
 /* Line 1787 of yacc.c  */
-#line 1205 "./util/configparser.y"
+#line 1223 "./util/configparser.y"
     {
                OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->forwards->name)
@@ -3479,9 +3511,9 @@ yyreduce:
        }
     break;
 
-  case 237:
+  case 241:
 /* Line 1787 of yacc.c  */
-#line 1215 "./util/configparser.y"
+#line 1233 "./util/configparser.y"
     {
                OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str)))
@@ -3489,9 +3521,9 @@ yyreduce:
        }
     break;
 
-  case 238:
+  case 242:
 /* Line 1787 of yacc.c  */
-#line 1222 "./util/configparser.y"
+#line 1240 "./util/configparser.y"
     {
                OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str)))
@@ -3499,9 +3531,9 @@ yyreduce:
        }
     break;
 
-  case 239:
+  case 243:
 /* Line 1787 of yacc.c  */
-#line 1229 "./util/configparser.y"
+#line 1247 "./util/configparser.y"
     {
                OUTYY(("P(forward-first:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3511,17 +3543,17 @@ yyreduce:
        }
     break;
 
-  case 240:
+  case 244:
 /* Line 1787 of yacc.c  */
-#line 1238 "./util/configparser.y"
+#line 1256 "./util/configparser.y"
     { 
                OUTYY(("\nP(remote-control:)\n")); 
        }
     break;
 
-  case 250:
+  case 254:
 /* Line 1787 of yacc.c  */
-#line 1249 "./util/configparser.y"
+#line 1267 "./util/configparser.y"
     {
                OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3532,9 +3564,9 @@ yyreduce:
        }
     break;
 
-  case 251:
+  case 255:
 /* Line 1787 of yacc.c  */
-#line 1259 "./util/configparser.y"
+#line 1277 "./util/configparser.y"
     {
                OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -3544,9 +3576,9 @@ yyreduce:
        }
     break;
 
-  case 252:
+  case 256:
 /* Line 1787 of yacc.c  */
-#line 1268 "./util/configparser.y"
+#line 1286 "./util/configparser.y"
     {
                OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str)))
@@ -3554,9 +3586,9 @@ yyreduce:
        }
     break;
 
-  case 253:
+  case 257:
 /* Line 1787 of yacc.c  */
-#line 1275 "./util/configparser.y"
+#line 1293 "./util/configparser.y"
     {
                OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->server_key_file);
@@ -3564,9 +3596,9 @@ yyreduce:
        }
     break;
 
-  case 254:
+  case 258:
 /* Line 1787 of yacc.c  */
-#line 1282 "./util/configparser.y"
+#line 1300 "./util/configparser.y"
     {
                OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->server_cert_file);
@@ -3574,9 +3606,9 @@ yyreduce:
        }
     break;
 
-  case 255:
+  case 259:
 /* Line 1787 of yacc.c  */
-#line 1289 "./util/configparser.y"
+#line 1307 "./util/configparser.y"
     {
                OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->control_key_file);
@@ -3584,9 +3616,9 @@ yyreduce:
        }
     break;
 
-  case 256:
+  case 260:
 /* Line 1787 of yacc.c  */
-#line 1296 "./util/configparser.y"
+#line 1314 "./util/configparser.y"
     {
                OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->control_cert_file);
@@ -3594,17 +3626,17 @@ yyreduce:
        }
     break;
 
-  case 257:
+  case 261:
 /* Line 1787 of yacc.c  */
-#line 1303 "./util/configparser.y"
+#line 1321 "./util/configparser.y"
     { 
                OUTYY(("\nP(python:)\n")); 
        }
     break;
 
-  case 261:
+  case 265:
 /* Line 1787 of yacc.c  */
-#line 1312 "./util/configparser.y"
+#line 1330 "./util/configparser.y"
     {
                OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->python_script);
@@ -3614,7 +3646,7 @@ yyreduce:
 
 
 /* Line 1787 of yacc.c  */
-#line 3618 "util/configparser.c"
+#line 3650 "util/configparser.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -3844,7 +3876,7 @@ yyreturn:
 
 
 /* Line 2048 of yacc.c  */
-#line 1317 "./util/configparser.y"
+#line 1335 "./util/configparser.y"
 
 
 /* parse helper routines could be here */

diff --git a/util/configparser.h b/util/configparser.h
index 14405202d353a6d174b7e16ca5a016a0408124d9..83dc1d549a5d8d4c6ac096bd4e3962265905b914 100644 (file)
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -176,7 +176,9 @@ extern int yydebug;
      VAR_RRSET_ROUNDROBIN = 385,
      VAR_MAX_UDP_SIZE = 386,
      VAR_DELAY_CLOSE = 387,
-     VAR_UNBLOCK_LAN_ZONES = 388
+     VAR_UNBLOCK_LAN_ZONES = 388,
+     VAR_DNS64_PREFIX = 389,
+     VAR_DNS64_SYNTHALL = 390
    };
 #endif
 /* Tokens.  */
@@ -311,6 +313,8 @@ extern int yydebug;
 #define VAR_MAX_UDP_SIZE 386
 #define VAR_DELAY_CLOSE 387
 #define VAR_UNBLOCK_LAN_ZONES 388
+#define VAR_DNS64_PREFIX 389
+#define VAR_DNS64_SYNTHALL 390
 
 
 
@@ -324,7 +328,7 @@ typedef union YYSTYPE
 
 
 /* Line 2049 of yacc.c  */
-#line 328 "util/configparser.h"
+#line 332 "util/configparser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

diff --git a/util/configparser.y b/util/configparser.y
index 22fc9b7d9876bd763c1bb205471bfce5e07eaab2..c44f2c019e66dca47d15970dcc67aa502919eed5 100644 (file)
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -106,6 +106,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM VAR_SSL_PORT VAR_FORWARD_FIRST
 %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN
 %token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE VAR_UNBLOCK_LAN_ZONES
+%token VAR_DNS64_PREFIX VAR_DNS64_SYNTHALL
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -163,7 +164,8 @@ content_server: server_num_threads | server_verbosity | server_port |
        server_log_queries | server_tcp_upstream | server_ssl_upstream |
        server_ssl_service_key | server_ssl_service_pem | server_ssl_port |
        server_minimal_responses | server_rrset_roundrobin | server_max_udp_size |
-       server_so_reuseport | server_delay_close | server_unblock_lan_zones
+       server_so_reuseport | server_delay_close | server_unblock_lan_zones |
+       server_dns64_prefix | server_dns64_synthall
        ;
 stubstart: VAR_STUB_ZONE
        {
@@ -1158,6 +1160,22 @@ server_max_udp_size: VAR_MAX_UDP_SIZE STRING_ARG
                free($2);
        }
        ;
+server_dns64_prefix: VAR_DNS64_PREFIX STRING_ARG
+       {
+               OUTYY(("P(dns64_prefix:%s)\n", $2));
+               free(cfg_parser->cfg->dns64_prefix);
+               cfg_parser->cfg->dns64_prefix = $2;
+       }
+       ;
+server_dns64_synthall: VAR_DNS64_SYNTHALL STRING_ARG
+       {
+               OUTYY(("P(server_dns64_synthall:%s)\n", $2));
+               if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+                       yyerror("expected yes or no.");
+               else cfg_parser->cfg->dns64_synthall = (strcmp($2, "yes")==0);
+               free($2);
+       }
+       ;
 stub_name: VAR_NAME STRING_ARG
        {
                OUTYY(("P(name:%s)\n", $2));

diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index cfdf3fe11031c25e4348d15333c8ec59a1a0a981..126e7bef45b7c5b0f12a345d1571aed3be9b1a61 100644 (file)
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -78,7 +78,7 @@ parse_create_qinfo(sldns_buffer* pkt, struct msg_parse* msg,
 }
 
 /** constructor for replyinfo */
-static struct reply_info*
+struct reply_info*
 construct_reply_info_base(struct regional* region, uint16_t flags, size_t qd,
        time_t ttl, time_t prettl, size_t an, size_t ns, size_t ar, 
        size_t total, enum sec_status sec)

diff --git a/util/data/msgreply.h b/util/data/msgreply.h
index f920108f952d2451af8c75e068fa3c90022e49f1..8f72e145e8cdb8683f23a33d0d8224405daf34a1 100644 (file)
--- a/util/data/msgreply.h
+++ b/util/data/msgreply.h
@@ -192,6 +192,11 @@ struct msgreply_entry {
        struct lruhash_entry entry;
 };
 
+struct reply_info*
+construct_reply_info_base(struct regional* region, uint16_t flags, size_t qd,
+               time_t ttl, time_t prettl, size_t an, size_t ns, size_t ar,
+               size_t total, enum sec_status sec);
+
 /** 
  * Parse wire query into a queryinfo structure, return 0 on parse error. 
  * initialises the (prealloced) queryinfo structure as well.

diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index 35fcd8c7eaa1937fcc670cfbc0f225c1ea4d9d0f..3a5fc5f0611abc3b0582de4ae29fe2fc4ff1e50b 100644 (file)
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -51,6 +51,7 @@
 #include "services/localzone.h"
 #include "services/cache/infra.h"
 #include "services/cache/rrset.h"
+#include "dns64/dns64.h"
 #include "iterator/iterator.h"
 #include "iterator/iter_fwd.h"
 #include "validator/validator.h"
@@ -306,6 +307,7 @@ fptr_whitelist_mod_init(int (*fptr)(struct module_env* env, int id))
 {
        if(fptr == &iter_init) return 1;
        else if(fptr == &val_init) return 1;
+       else if(fptr == &dns64_init) return 1;
 #ifdef WITH_PYTHONMODULE
        else if(fptr == &pythonmod_init) return 1;
 #endif
@@ -317,6 +319,7 @@ fptr_whitelist_mod_deinit(void (*fptr)(struct module_env* env, int id))
 {
        if(fptr == &iter_deinit) return 1;
        else if(fptr == &val_deinit) return 1;
+       else if(fptr == &dns64_deinit) return 1;
 #ifdef WITH_PYTHONMODULE
        else if(fptr == &pythonmod_deinit) return 1;
 #endif
@@ -329,6 +332,7 @@ fptr_whitelist_mod_operate(void (*fptr)(struct module_qstate* qstate,
 {
        if(fptr == &iter_operate) return 1;
        else if(fptr == &val_operate) return 1;
+       else if(fptr == &dns64_operate) return 1;
 #ifdef WITH_PYTHONMODULE
        else if(fptr == &pythonmod_operate) return 1;
 #endif
@@ -341,6 +345,7 @@ fptr_whitelist_mod_inform_super(void (*fptr)(
 {
        if(fptr == &iter_inform_super) return 1;
        else if(fptr == &val_inform_super) return 1;
+       else if(fptr == &dns64_inform_super) return 1;
 #ifdef WITH_PYTHONMODULE
        else if(fptr == &pythonmod_inform_super) return 1;
 #endif
@@ -353,6 +358,7 @@ fptr_whitelist_mod_clear(void (*fptr)(struct module_qstate* qstate,
 {
        if(fptr == &iter_clear) return 1;
        else if(fptr == &val_clear) return 1;
+       else if(fptr == &dns64_clear) return 1;
 #ifdef WITH_PYTHONMODULE
        else if(fptr == &pythonmod_clear) return 1;
 #endif
@@ -364,6 +370,7 @@ fptr_whitelist_mod_get_mem(size_t (*fptr)(struct module_env* env, int id))
 {
        if(fptr == &iter_get_mem) return 1;
        else if(fptr == &val_get_mem) return 1;
+       else if(fptr == &dns64_get_mem) return 1;
 #ifdef WITH_PYTHONMODULE
        else if(fptr == &pythonmod_get_mem) return 1;
 #endif