From: Wouter Wijngaards Date: Fri, 24 Jan 2014 11:43:38 +0000 (+0000) Subject: - so-reuseport: yesno option to distribute queries evenly over X-Git-Tag: release-1.4.22rc1~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60511959abe8c068268bb467f9b193866ef5a949;p=thirdparty%2Funbound.git - so-reuseport: yesno option to distribute queries evenly over threads on Linux (Thanks Robert Edmonds). git-svn-id: file:///svn/unbound/trunk@3049 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/daemon/daemon.c b/daemon/daemon.c index 2df2de1cb..c234eee11 100644 --- a/daemon/daemon.c +++ b/daemon/daemon.c @@ -255,9 +255,35 @@ daemon_open_shared_ports(struct daemon* daemon) { log_assert(daemon); if(daemon->cfg->port != daemon->listening_port) { - listening_ports_free(daemon->ports); - if(!(daemon->ports=listening_ports_open(daemon->cfg))) + int i; +#if defined(__linux__) && defined(SO_REUSEPORT) + if(daemon->cfg->so_reuseport && daemon->cfg->num_threads > 0) + daemon->num_ports = daemon->cfg->num_threads; + else + daemon->num_ports = 1; +#else + daemon->num_ports = 1; +#endif + if(daemon->ports != NULL) { + for(i=0; inum_ports; i++) + listening_ports_free(daemon->ports[i]); + free(daemon->ports); + daemon->ports = NULL; + } + if(!(daemon->ports = (struct listen_port**)calloc( + daemon->num_ports, sizeof(*daemon->ports)))) { return 0; + } + for(i=0; inum_ports; i++) { + if(!(daemon->ports[i]= + listening_ports_open(daemon->cfg))) { + for(i=0; inum_ports; i++) + listening_ports_free(daemon->ports[i]); + free(daemon->ports); + daemon->ports = NULL; + return 0; + } + } daemon->listening_port = daemon->cfg->port; } if(!daemon->cfg->remote_control_enable && daemon->rc_port) { @@ -394,6 +420,7 @@ static void* thread_start(void* arg) { struct worker* worker = (struct worker*)arg; + int port_num = 0; log_thread_set(&worker->thread_num); ub_thread_blocksigs(); #ifdef THREADS_DISABLED @@ -401,7 +428,14 @@ thread_start(void* arg) tube_close_write(worker->cmd); close_other_pipes(worker->daemon, worker->thread_num); #endif - if(!worker_init(worker, worker->daemon->cfg, worker->daemon->ports, 0)) +#if defined(__linux__) && defined(SO_REUSEPORT) + if(worker->daemon->cfg->so_reuseport) + port_num = worker->thread_num; + else + port_num = 0; +#endif + if(!worker_init(worker, worker->daemon->cfg, + worker->daemon->ports[port_num], 0)) fatal_exit("Could not initialize thread"); worker_work(worker); @@ -474,7 +508,7 @@ daemon_fork(struct daemon* daemon) #if defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP) /* in libev the first inited base gets signals */ - if(!worker_init(daemon->workers[0], daemon->cfg, daemon->ports, 1)) + if(!worker_init(daemon->workers[0], daemon->cfg, daemon->ports[0], 1)) fatal_exit("Could not initialize main thread"); #endif @@ -488,7 +522,7 @@ daemon_fork(struct daemon* daemon) */ #if !(defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)) /* libevent has the last inited base get signals (or any base) */ - if(!worker_init(daemon->workers[0], daemon->cfg, daemon->ports, 1)) + if(!worker_init(daemon->workers[0], daemon->cfg, daemon->ports[0], 1)) fatal_exit("Could not initialize main thread"); #endif signal_handling_playback(daemon->workers[0]); @@ -534,11 +568,14 @@ daemon_cleanup(struct daemon* daemon) void daemon_delete(struct daemon* daemon) { + int i; if(!daemon) return; modstack_desetup(&daemon->mods, daemon->env); daemon_remote_delete(daemon->rc); - listening_ports_free(daemon->ports); + for(i = 0; i < daemon->num_ports; i++) + listening_ports_free(daemon->ports[i]); + free(daemon->ports); listening_ports_free(daemon->rc_ports); if(daemon->env) { slabhash_delete(daemon->env->msg_cache); diff --git a/daemon/daemon.h b/daemon/daemon.h index 8e47ea00b..f91232be6 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -72,8 +72,11 @@ struct daemon { char* pidfile; /** port number that has ports opened. */ int listening_port; - /** listening ports, opened, to be shared by threads */ - struct listen_port* ports; + /** array of listening ports, opened. Listening ports per worker, + * or just one element[0] shared by the worker threads. */ + struct listen_port** ports; + /** size of ports array */ + int num_ports; /** port number for remote that has ports opened. */ int rc_port; /** listening ports for remote control */ diff --git a/daemon/remote.c b/daemon/remote.c index 0db1f48b8..9525aa6e4 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -271,7 +271,7 @@ add_open(const char* ip, int nr, struct listen_port** list, int noproto_is_err) } /* open fd */ - fd = create_tcp_accept_sock(res, 1, &noproto); + fd = create_tcp_accept_sock(res, 1, &noproto, 0); freeaddrinfo(res); if(fd == -1 && noproto) { if(!noproto_is_err) diff --git a/doc/Changelog b/doc/Changelog index 2cf92384f..27a1f6ecd 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -4,6 +4,8 @@ - unbound-event.h is installed if you configure --enable-event-api. - speed up unbound (reports say it could be up to 10%), by reducing lock contention on localzones.lock. It is changed to an rwlock. + - so-reuseport: yesno option to distribute queries evenly over + threads on Linux (Thanks Robert Edmonds). 21 January 2014: Wouter - Fix #547: no trustanchor written if filesystem full, fclose checked. diff --git a/doc/example.conf.in b/doc/example.conf.in index 3054eccab..9a496f9f5 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -84,6 +84,9 @@ server: # buffer size for UDP port 53 outgoing (SO_SNDBUF socket option). # 0 is system default. Use 4m to handle spikes on very busy servers. # so-sndbuf: 0 + + # on Linux(3.9+) use SO_REUSEPORT to distribute queries over threads. + # so-reuseport: no # EDNS reassembly buffer to advertise to UDP peers (the actual buffer # is set with msg-buffer-size). 1480 can solve fragmentation (timeouts). diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index ac060568c..d4ae222d5 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -250,6 +250,12 @@ linux unbound needs root permission to bypass the limit, or the admin can use sysctl net.core.wmem_max. On BSD, Solaris changes are similar to so\-rcvbuf. .TP +.B so\-reuseport: \fI +If yes, then open dedicated listening sockets for incoming queries for each +thread and try to set the SO_REUSEPORT socket option on each socket. May +distribute incoming queries to threads more evenly. Default is no. Only +supported on Linux >= 3.9. +.TP .B rrset\-cache\-size: \fI Number of bytes size of the RRset cache. Default is 4 megabytes. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index f37c3fc26..cd9bce8af 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -92,10 +92,10 @@ verbose_print_addr(struct addrinfo *addr) int create_udp_sock(int family, int socktype, struct sockaddr* addr, socklen_t addrlen, int v6only, int* inuse, int* noproto, - int rcv, int snd, int listen) + int rcv, int snd, int listen, int reuseport) { int s; -#if defined(SO_REUSEADDR) || defined(IPV6_USE_MIN_MTU) +#if defined(SO_REUSEADDR) || defined(SO_REUSEPORT) || defined(IPV6_USE_MIN_MTU) int on=1; #endif #ifdef IPV6_MTU @@ -148,6 +148,23 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, return -1; } #endif /* SO_REUSEADDR */ +#if defined(__linux__) && defined(SO_REUSEPORT) + /* Linux specific: try to set SO_REUSEPORT so that incoming + * queries are distributed evenly among the receiving threads. + * Each thread must have its own socket bound to the same port, + * with SO_REUSEPORT set on each socket. + */ + if (reuseport && + setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void*)&on, + (socklen_t)sizeof(on)) < 0) { + log_err("setsockopt(.. SO_REUSEPORT ..) failed: %s", + strerror(errno)); + close(s); + *noproto = 0; + *inuse = 0; + return -1; + } +#endif /* defined(__linux__) && defined(SO_REUSEPORT) */ } if(rcv) { #ifdef SO_RCVBUF @@ -411,10 +428,11 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, } int -create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto) +create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto, + int reuseport) { int s; -#if defined(SO_REUSEADDR) || defined(IPV6_V6ONLY) +#if defined(SO_REUSEADDR) || defined(SO_REUSEPORT) || defined(IPV6_V6ONLY) int on = 1; #endif /* SO_REUSEADDR || IPV6_V6ONLY */ verbose_print_addr(addr); @@ -452,6 +470,20 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto) return -1; } #endif /* SO_REUSEADDR */ +#if defined(__linux__) && defined(SO_REUSEPORT) + /* Linux specific: try to set SO_REUSEPORT so that incoming + * connections are distributed evenly among the receiving threads. + * Each thread must have its own socket bound to the same port, + * with SO_REUSEPORT set on each socket. + */ + if (reuseport && setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void*)&on, + (socklen_t)sizeof(on)) < 0) { + log_err("setsockopt(.. SO_REUSEPORT ..) failed: %s", + strerror(errno)); + close(s); + return -1; + } +#endif /* defined(__linux__) && defined(SO_REUSEPORT) */ #if defined(IPV6_V6ONLY) if(addr->ai_family == AF_INET6 && v6only) { if(setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, @@ -519,7 +551,8 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto) */ static int make_sock(int stype, const char* ifname, const char* port, - struct addrinfo *hints, int v6only, int* noip6, size_t rcv, size_t snd) + struct addrinfo *hints, int v6only, int* noip6, size_t rcv, size_t snd, + int reuseport) { struct addrinfo *res = NULL; int r, s, inuse, noproto; @@ -546,14 +579,15 @@ make_sock(int stype, const char* ifname, const char* port, verbose_print_addr(res); s = create_udp_sock(res->ai_family, res->ai_socktype, (struct sockaddr*)res->ai_addr, res->ai_addrlen, - v6only, &inuse, &noproto, (int)rcv, (int)snd, 1); + v6only, &inuse, &noproto, (int)rcv, (int)snd, 1, + reuseport); if(s == -1 && inuse) { log_err("bind: address already in use"); } else if(s == -1 && noproto && hints->ai_family == AF_INET6){ *noip6 = 1; } } else { - s = create_tcp_accept_sock(res, v6only, &noproto); + s = create_tcp_accept_sock(res, v6only, &noproto, reuseport); if(s == -1 && noproto && hints->ai_family == AF_INET6){ *noip6 = 1; } @@ -565,7 +599,8 @@ make_sock(int stype, const char* ifname, const char* port, /** make socket and first see if ifname contains port override info */ static int make_sock_port(int stype, const char* ifname, const char* port, - struct addrinfo *hints, int v6only, int* noip6, size_t rcv, size_t snd) + struct addrinfo *hints, int v6only, int* noip6, size_t rcv, size_t snd, + int reuseport) { char* s = strchr(ifname, '@'); if(s) { @@ -587,9 +622,10 @@ make_sock_port(int stype, const char* ifname, const char* port, strlcpy(p, s+1, sizeof(p)); p[strlen(s+1)]=0; return make_sock(stype, newif, p, hints, v6only, noip6, - rcv, snd); + rcv, snd, reuseport); } - return make_sock(stype, ifname, port, hints, v6only, noip6, rcv, snd); + return make_sock(stype, ifname, port, hints, v6only, noip6, rcv, snd, + reuseport); } /** @@ -681,19 +717,20 @@ set_recvpktinfo(int s, int family) * @param rcv: receive buffer size for UDP * @param snd: send buffer size for UDP * @param ssl_port: ssl service port number + * @param reuseport: try to set SO_REUSEPORT. * @return: returns false on error. */ static int ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp, struct addrinfo *hints, const char* port, struct listen_port** list, - size_t rcv, size_t snd, int ssl_port) + size_t rcv, size_t snd, int ssl_port, int reuseport) { int s, noip6=0; if(!do_udp && !do_tcp) return 0; if(do_auto) { if((s = make_sock_port(SOCK_DGRAM, ifname, port, hints, 1, - &noip6, rcv, snd)) == -1) { + &noip6, rcv, snd, reuseport)) == -1) { if(noip6) { log_warn("IPv6 protocol not available"); return 1; @@ -720,7 +757,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp, } else if(do_udp) { /* regular udp socket */ if((s = make_sock_port(SOCK_DGRAM, ifname, port, hints, 1, - &noip6, rcv, snd)) == -1) { + &noip6, rcv, snd, reuseport)) == -1) { if(noip6) { log_warn("IPv6 protocol not available"); return 1; @@ -741,7 +778,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp, atoi(strchr(ifname, '@')+1) == ssl_port) || (!strchr(ifname, '@') && atoi(port) == ssl_port)); if((s = make_sock_port(SOCK_STREAM, ifname, port, hints, 1, - &noip6, 0, 0)) == -1) { + &noip6, 0, 0, reuseport)) == -1) { if(noip6) { /*log_warn("IPv6 protocol not available");*/ return 1; @@ -896,7 +933,7 @@ listening_ports_open(struct config_file* cfg) do_auto, cfg->do_udp, do_tcp, &hints, portbuf, &list, cfg->so_rcvbuf, cfg->so_sndbuf, - cfg->ssl_port)) { + cfg->ssl_port, cfg->so_reuseport)) { listening_ports_free(list); return NULL; } @@ -907,7 +944,7 @@ listening_ports_open(struct config_file* cfg) do_auto, cfg->do_udp, do_tcp, &hints, portbuf, &list, cfg->so_rcvbuf, cfg->so_sndbuf, - cfg->ssl_port)) { + cfg->ssl_port, cfg->so_reuseport)) { listening_ports_free(list); return NULL; } @@ -920,7 +957,7 @@ listening_ports_open(struct config_file* cfg) if(!ports_create_if(cfg->ifs[i], 0, cfg->do_udp, do_tcp, &hints, portbuf, &list, cfg->so_rcvbuf, cfg->so_sndbuf, - cfg->ssl_port)) { + cfg->ssl_port, cfg->so_reuseport)) { listening_ports_free(list); return NULL; } @@ -931,7 +968,7 @@ listening_ports_open(struct config_file* cfg) if(!ports_create_if(cfg->ifs[i], 0, cfg->do_udp, do_tcp, &hints, portbuf, &list, cfg->so_rcvbuf, cfg->so_sndbuf, - cfg->ssl_port)) { + cfg->ssl_port, cfg->so_reuseport)) { listening_ports_free(list); return NULL; } diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h index 28274c937..fee355401 100644 --- a/services/listen_dnsport.h +++ b/services/listen_dnsport.h @@ -181,19 +181,22 @@ void listen_start_accept(struct listen_dnsport* listen); * @param snd: set size on sndbuf with socket option, if 0 it is not set. * @param listen: if true, this is a listening UDP port, eg port 53, and * set SO_REUSEADDR on it. + * @param reuseport: if true, try to set SO_REUSEPORT on listening UDP port. * @return: the socket. -1 on error. */ int create_udp_sock(int family, int socktype, struct sockaddr* addr, socklen_t addrlen, int v6only, int* inuse, int* noproto, int rcv, - int snd, int listen); + int snd, int listen, int reuseport); /** * Create and bind TCP listening socket * @param addr: address info ready to make socket. * @param v6only: enable ip6 only flag on ip6 sockets. * @param noproto: if error caused by lack of protocol support. + * @param reuseport: if true, try to set SO_REUSEPORT. * @return: the socket. -1 on error. */ -int create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto); +int create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto, + int reuseport); #endif /* LISTEN_DNSPORT_H */ diff --git a/services/outside_network.c b/services/outside_network.c index ebb35156a..21a6effd0 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -849,13 +849,13 @@ udp_sockport(struct sockaddr_storage* addr, socklen_t addrlen, int port, sa->sin6_port = (in_port_t)htons((uint16_t)port); fd = create_udp_sock(AF_INET6, SOCK_DGRAM, (struct sockaddr*)addr, addrlen, 1, inuse, &noproto, - 0, 0, 0); + 0, 0, 0, 0); } else { struct sockaddr_in* sa = (struct sockaddr_in*)addr; sa->sin_port = (in_port_t)htons((uint16_t)port); fd = create_udp_sock(AF_INET, SOCK_DGRAM, (struct sockaddr*)addr, addrlen, 1, inuse, &noproto, - 0, 0, 0); + 0, 0, 0, 0); } return fd; } diff --git a/util/config_file.c b/util/config_file.c index aa80f924e..931605f44 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -156,6 +156,7 @@ config_create(void) cfg->if_automatic = 0; cfg->so_rcvbuf = 0; cfg->so_sndbuf = 0; + cfg->so_reuseport = 0; cfg->num_ifs = 0; cfg->ifs = NULL; cfg->num_out_ifs = 0; @@ -365,6 +366,7 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_SIZET_OR_ZERO("jostle-timeout:", jostle_time) else S_MEMSIZE("so-rcvbuf:", so_rcvbuf) else S_MEMSIZE("so-sndbuf:", so_sndbuf) + else S_YNO("so-reuseport:", so_reuseport) else S_MEMSIZE("rrset-cache-size:", rrset_cache_size) else S_POW2("rrset-cache-slabs:", rrset_cache_slabs) else S_YNO("prefetch:", prefetch) @@ -610,6 +612,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_UNS(opt, "jostle-timeout", jostle_time) else O_MEM(opt, "so-rcvbuf", so_rcvbuf) else O_MEM(opt, "so-sndbuf", so_sndbuf) + else O_YNO(opt, "so-reuseport", so_reuseport) else O_MEM(opt, "rrset-cache-size", rrset_cache_size) else O_DEC(opt, "rrset-cache-slabs", rrset_cache_slabs) else O_YNO(opt, "prefetch-key", prefetch_key) diff --git a/util/config_file.h b/util/config_file.h index 6161302ec..afc2ec943 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -130,6 +130,8 @@ struct config_file { size_t so_rcvbuf; /** SO_SNDBUF size to set on port 53 UDP socket */ size_t so_sndbuf; + /** SO_REUSEPORT requested on port 53 sockets */ + int so_reuseport; /** number of interfaces to open. If 0 default all interfaces. */ int num_ifs; diff --git a/util/configlexer.c b/util/configlexer.c index 6fcb1e6da..96247fa68 100644 --- 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 144 -#define YY_END_OF_BUFFER 145 +#define YY_NUM_RULES 145 +#define YY_END_OF_BUFFER 146 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -372,158 +372,159 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1365] = +static yyconst flex_int16_t yy_accept[1374] = { 0, - 1, 1, 126, 126, 130, 130, 134, 134, 138, 138, - 1, 1, 145, 142, 1, 124, 124, 143, 2, 143, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 126, - 127, 127, 128, 143, 130, 131, 131, 132, 143, 137, - 134, 135, 135, 136, 143, 138, 139, 139, 140, 143, - 141, 125, 2, 129, 143, 141, 142, 0, 1, 2, - 2, 2, 2, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 126, 0, 130, 0, 137, 0, 134, 138, 0, - 141, 0, 2, 2, 141, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 141, 142, 142, 142, 142, 142, 142, 142, 142, 142, - - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 141, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 63, 142, 142, 142, 142, - - 142, 6, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 141, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 141, 142, 142, 142, 142, 28, - 142, 142, 142, 142, 142, 12, 13, 142, 15, 14, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 119, 142, 142, - 142, 142, 142, 3, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - - 142, 142, 141, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 133, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 31, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 32, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 78, - 133, 142, 142, 142, 142, 142, 142, 142, 142, 142, - - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 77, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 61, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 20, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 29, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 30, 142, 142, 142, 142, 142, - - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 22, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 26, 27, 142, 142, 142, 64, 142, 65, 142, 62, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 5, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 80, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 23, 142, 142, 142, 142, 105, 104, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 33, 142, 142, - 142, 142, 142, 142, 142, 67, 66, 142, 142, 142, - 142, 142, 142, 101, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 52, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - - 142, 103, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 4, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 98, 142, 142, 142, 142, 142, 142, - 142, 113, 99, 142, 21, 142, 142, 142, 142, 69, - 142, 70, 68, 142, 142, 142, 142, 142, 142, 76, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 100, - 142, 142, 142, 142, 123, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 60, 142, 142, 142, - - 142, 142, 142, 142, 142, 142, 142, 17, 142, 142, - 142, 16, 142, 85, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 40, 41, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 71, 142, - 142, 142, 142, 142, 75, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 79, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 118, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 89, 142, 93, - 142, 142, 142, 142, 74, 142, 142, 111, 142, 142, - - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 92, 142, 142, 142, 142, 42, 43, 142, 48, - 94, 142, 106, 102, 142, 142, 36, 142, 96, 142, - 142, 142, 142, 142, 7, 142, 59, 110, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 81, 142, 142, 120, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 95, 142, - 35, 37, 142, 142, 142, 142, 142, 58, 142, 142, - 142, 142, 114, 18, 19, 142, 142, 142, 142, 142, - - 142, 56, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 116, 142, 142, 34, 142, 142, 142, 142, 142, - 142, 11, 142, 142, 142, 142, 142, 142, 142, 10, - 142, 142, 38, 142, 122, 115, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 88, 87, 142, 117, - 112, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 44, 142, 121, 142, 142, 142, 142, 39, 142, - 142, 142, 82, 84, 142, 142, 142, 86, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 24, 142, 142, 142, 142, 142, 142, 142, - - 142, 142, 142, 142, 142, 109, 142, 142, 142, 142, - 142, 142, 142, 25, 142, 9, 142, 142, 107, 49, - 142, 142, 142, 91, 142, 72, 142, 142, 142, 51, - 55, 50, 142, 45, 142, 8, 142, 142, 90, 142, - 142, 142, 54, 142, 46, 142, 108, 142, 142, 83, - 73, 53, 47, 142, 142, 142, 142, 57, 142, 142, - 142, 142, 97, 0 + 1, 1, 127, 127, 131, 131, 135, 135, 139, 139, + 1, 1, 146, 143, 1, 125, 125, 144, 2, 144, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 127, + 128, 128, 129, 144, 131, 132, 132, 133, 144, 138, + 135, 136, 136, 137, 144, 139, 140, 140, 141, 144, + 142, 126, 2, 130, 144, 142, 143, 0, 1, 2, + 2, 2, 2, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 127, 0, 131, 0, 138, 0, 135, 139, 0, + 142, 0, 2, 2, 142, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 142, 143, 143, 143, 143, 143, 143, 143, 143, 143, + + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 142, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 64, 143, 143, 143, 143, + + 143, 6, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 142, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 142, 143, 143, 143, + 143, 29, 143, 143, 143, 143, 143, 12, 13, 143, + 15, 14, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 120, + 143, 143, 143, 143, 143, 3, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + + 143, 143, 143, 143, 143, 142, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 134, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 32, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 33, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 79, 134, 143, 143, 143, 143, 143, + + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 78, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 62, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 20, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 30, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 31, + + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 22, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 26, 143, 27, 143, 143, + 143, 65, 143, 66, 143, 63, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 5, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 81, 143, 143, 143, 143, 143, 143, + + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 23, 143, 143, + 143, 143, 106, 105, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 34, 143, 143, 143, 143, 143, 143, + 143, 143, 68, 67, 143, 143, 143, 143, 143, 143, + 102, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 53, 143, 143, 143, 143, 143, 143, 143, 143, + + 143, 143, 143, 143, 143, 143, 143, 143, 104, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 4, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 99, 143, 143, 143, 143, 143, 143, 143, 114, + 100, 143, 21, 143, 143, 143, 143, 70, 143, 71, + 69, 143, 143, 143, 143, 143, 143, 77, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 101, 143, 143, + 143, 143, 124, 143, 143, 143, 143, 143, 143, 143, + + 143, 143, 143, 143, 61, 143, 143, 143, 143, 143, + 143, 143, 143, 28, 143, 143, 17, 143, 143, 143, + 16, 143, 86, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 41, 42, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 72, 143, 143, + 143, 143, 143, 76, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 80, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 119, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 90, 143, 94, 143, + + 143, 143, 143, 75, 143, 143, 112, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 93, 143, 143, 143, 143, 43, 44, 143, 49, 95, + 143, 107, 103, 143, 143, 37, 143, 97, 143, 143, + 143, 143, 143, 7, 143, 60, 111, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 82, 143, 143, 121, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 96, 143, 36, + 38, 143, 143, 143, 143, 143, 59, 143, 143, 143, + + 143, 115, 18, 19, 143, 143, 143, 143, 143, 143, + 57, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 117, 143, 143, 35, 143, 143, 143, 143, 143, 143, + 11, 143, 143, 143, 143, 143, 143, 143, 10, 143, + 143, 39, 143, 123, 116, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 89, 88, 143, 118, 113, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 45, 143, 122, 143, 143, 143, 143, 40, 143, 143, + 143, 83, 85, 143, 143, 143, 87, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + + 143, 24, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 110, 143, 143, 143, 143, 143, + 143, 143, 25, 143, 9, 143, 143, 108, 50, 143, + 143, 143, 92, 143, 73, 143, 143, 143, 52, 56, + 51, 143, 46, 143, 8, 143, 143, 91, 143, 143, + 143, 55, 143, 47, 143, 109, 143, 143, 84, 74, + 54, 48, 143, 143, 143, 143, 58, 143, 143, 143, + 143, 98, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -566,22 +567,22 @@ static yyconst flex_int32_t yy_meta[40] = 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[1379] = +static yyconst flex_int16_t yy_base[1388] = { 0, 0, 0, 37, 40, 44, 51, 63, 75, 56, 68, - 87, 108, 1947, 1728, 50, 2731, 2731, 2731, 129, 94, + 87, 108, 2567, 2432, 50, 2744, 2744, 2744, 129, 94, 70, 104, 122, 90, 92, 115, 126, 95, 84, 132, - 135, 138, 50, 146, 148, 157, 167, 160, 151, 1503, - 2731, 2731, 2731, 70, 1460, 2731, 2731, 2731, 42, 1224, - 1187, 2731, 2731, 2731, 189, 1166, 2731, 2731, 2731, 195, - 1101, 2731, 199, 2731, 203, 111, 987, 209, 120, 0, + 135, 138, 50, 146, 148, 157, 167, 160, 151, 2387, + 2744, 2744, 2744, 70, 2247, 2744, 2744, 2744, 42, 2211, + 2022, 2744, 2744, 2744, 189, 1580, 2744, 2744, 2744, 195, + 1490, 2744, 199, 2744, 203, 111, 1105, 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, 49, 287, 291, - 288, 952, 304, 840, 307, 626, 316, 420, 297, 320, + 288, 804, 304, 766, 307, 586, 316, 420, 297, 320, 236, 324, 328, 0, 321, 309, 330, 323, 226, 326, 327, 334, 331, 337, 348, 339, 335, 344, 333, 342, 345, 351, 343, 355, 353, 359, 360, 363, 366, 377, @@ -594,289 +595,291 @@ static yyconst flex_int16_t yy_base[1379] = 483, 481, 482, 484, 486, 487, 489, 490, 491, 497, 493, 498, 495, 502, 504, 506, 508, 514, 522, 523, 513, 509, 518, 529, 531, 534, 532, 537, 543, 539, - 540, 541, 542, 546, 549, 553, 550, 551, 554, 552, - 560, 561, 580, 569, 564, 568, 571, 570, 577, 581, - 578, 586, 587, 588, 591, 604, 613, 600, 603, 606, - 593, 612, 617, 615, 616, 618, 623, 624, 631, 625, - 641, 637, 638, 639, 645, 646, 653, 628, 650, 651, - 652, 654, 657, 660, 664, 2731, 666, 661, 668, 669, - - 671, 2731, 670, 672, 673, 674, 677, 680, 684, 686, - 689, 688, 691, 694, 695, 715, 697, 704, 706, 698, - 699, 705, 712, 707, 724, 719, 709, 725, 727, 726, - 729, 737, 738, 744, 733, 740, 743, 750, 751, 753, - 746, 754, 755, 760, 767, 769, 771, 773, 779, 762, - 775, 777, 787, 784, 785, 776, 791, 789, 778, 795, - 799, 793, 802, 801, 805, 809, 812, 806, 815, 814, - 804, 823, 821, 822, 826, 828, 824, 831, 832, 836, - 838, 849, 846, 847, 850, 859, 855, 860, 834, 851, - 861, 863, 866, 864, 867, 871, 872, 879, 865, 875, - - 877, 885, 878, 886, 888, 891, 892, 893, 899, 902, - 895, 896, 906, 908, 909, 916, 917, 910, 911, 2731, - 923, 924, 925, 926, 927, 2731, 2731, 929, 2731, 2731, - 930, 932, 933, 940, 947, 936, 944, 945, 950, 956, - 957, 960, 948, 967, 969, 971, 958, 973, 974, 979, - 975, 977, 981, 984, 993, 994, 996, 985, 997, 998, - 1000, 1002, 1001, 1004, 1009, 1015, 1011, 2731, 1013, 1012, - 1019, 1014, 1021, 2731, 1022, 1023, 1025, 1027, 1028, 1031, - 1033, 1034, 1035, 1038, 1036, 1051, 1039, 1041, 1058, 1042, - 1056, 1060, 1061, 1062, 1063, 1070, 1068, 1067, 1069, 1078, - - 1074, 1077, 1080, 1081, 1084, 1086, 1087, 1089, 1112, 1091, - 1093, 1092, 1090, 1098, 1099, 1100, 1102, 1108, 1120, 1110, - 1126, 1129, 1122, 1131, 1132, 1133, 1136, 1137, 2731, 1145, - 1144, 1142, 1143, 1148, 1149, 1150, 1151, 1155, 1154, 1157, - 1158, 1169, 2731, 1162, 1165, 1163, 1172, 1175, 1179, 1173, - 1185, 1192, 2731, 1194, 1195, 1188, 1190, 1197, 1198, 1200, - 1202, 1203, 1204, 1206, 1214, 1209, 1211, 1216, 1215, 1220, - 1222, 1223, 1225, 1226, 1227, 1232, 1237, 1243, 1246, 1234, - 1251, 1228, 1240, 1244, 1257, 1252, 1255, 1258, 1259, 2731, - 175, 1260, 1261, 1262, 1268, 1271, 1267, 1265, 1269, 1273, - - 1275, 1280, 1286, 1281, 1287, 1288, 1289, 1292, 1291, 1294, - 1300, 1301, 1302, 1303, 1304, 1305, 1306, 1307, 1312, 1311, - 1319, 2731, 1325, 1318, 1314, 1321, 1329, 1338, 1330, 1335, - 1336, 1344, 1342, 1346, 1347, 1353, 1350, 1355, 1356, 1340, - 1362, 1366, 1363, 1365, 1364, 1372, 2731, 1367, 1374, 1375, - 1376, 1377, 1379, 1381, 1384, 1385, 1392, 1398, 2731, 1400, - 1394, 1386, 1407, 1388, 1412, 1404, 1414, 1401, 1415, 1416, - 1417, 1418, 1419, 1423, 2731, 1431, 1432, 1428, 1434, 1435, - 1437, 1438, 1440, 1441, 1442, 1448, 1446, 1447, 1445, 1450, - 1452, 1453, 1455, 1454, 2731, 1469, 1457, 1458, 1470, 1462, - - 1459, 1481, 1471, 1474, 1482, 1484, 1486, 1487, 1488, 1497, - 1490, 1491, 1494, 1498, 1501, 1506, 1512, 1515, 1513, 2731, - 1517, 1518, 1519, 1520, 1526, 1528, 1524, 1529, 1530, 1531, - 1532, 1540, 1534, 1536, 1541, 1542, 1537, 1544, 1547, 1545, - 1549, 1559, 1557, 1558, 1552, 1569, 1566, 1573, 1564, 1579, - 2731, 2731, 1575, 1581, 1583, 2731, 1586, 2731, 1588, 2731, - 1589, 1590, 1593, 1576, 1594, 1595, 1597, 1598, 1602, 1600, - 1604, 1605, 1606, 1607, 2731, 1611, 1613, 1616, 1614, 1619, - 1620, 1621, 1626, 1633, 1624, 1632, 1630, 2731, 1637, 1635, - 1638, 1648, 1649, 1645, 1647, 1651, 1652, 1653, 1654, 1656, - - 1662, 1661, 1658, 1664, 1668, 1665, 1670, 1674, 1672, 1673, - 1675, 2731, 1680, 1681, 1685, 1686, 2731, 2731, 1690, 1698, - 1699, 1687, 1691, 1705, 1706, 1707, 1713, 1710, 1711, 1712, - 1714, 1719, 1717, 1720, 1721, 1723, 1726, 2731, 1734, 1727, - 1735, 1737, 1741, 1740, 1746, 2731, 2731, 1748, 1747, 1750, - 1751, 1757, 1754, 2731, 1758, 1759, 1761, 1762, 1764, 1765, - 1752, 1771, 1777, 1779, 1780, 1782, 1788, 1784, 1781, 1785, - 1790, 1798, 1795, 1801, 1807, 1787, 1803, 1805, 1810, 1806, - 1812, 1814, 1820, 1816, 2731, 1823, 1817, 1829, 1821, 1828, - 1830, 1837, 1833, 1834, 1836, 1838, 1839, 1841, 1842, 1843, - - 1849, 2731, 1848, 1851, 1855, 1859, 1853, 1861, 1863, 1865, - 1867, 2731, 1871, 1877, 1873, 1874, 1879, 1875, 1885, 1882, - 1884, 1886, 1888, 1889, 1892, 1896, 1898, 1890, 1900, 1909, - 1916, 1918, 1924, 1908, 1926, 1910, 1923, 1925, 1906, 1933, - 1929, 1935, 1932, 2731, 1936, 1941, 1943, 1946, 1945, 1947, - 1948, 2731, 2731, 1949, 2731, 1954, 1938, 1958, 1959, 2731, - 1963, 2731, 2731, 1960, 1969, 1965, 1970, 1973, 1977, 2731, - 1972, 1978, 1980, 1983, 1984, 1985, 1987, 1986, 1988, 2731, - 1989, 1990, 1991, 1993, 2731, 2000, 2006, 1995, 2007, 2011, - 2010, 2017, 2016, 2003, 2024, 2020, 2731, 2018, 2026, 2028, - - 2029, 2030, 2031, 2035, 2036, 2038, 2045, 2731, 2046, 2032, - 2047, 2731, 2049, 2731, 2051, 2053, 2056, 2061, 2058, 2069, - 2054, 2062, 2070, 2064, 2072, 2074, 2731, 2731, 2076, 2080, - 2083, 2081, 2086, 2088, 2087, 2089, 2090, 2095, 2731, 2096, - 2098, 2097, 2099, 2100, 2731, 2104, 2105, 2106, 2109, 2112, - 2124, 2126, 2115, 2130, 2132, 2127, 2134, 2136, 2137, 2731, - 2138, 2140, 2141, 2145, 2147, 2101, 2148, 2152, 2150, 2142, - 2155, 2731, 2158, 2159, 2162, 2164, 2166, 2167, 2169, 2170, - 2171, 2174, 2175, 2177, 2180, 2181, 2184, 2731, 2182, 2731, - 2187, 2197, 2200, 2203, 2731, 2191, 2193, 2731, 2207, 2208, - - 2215, 2216, 2218, 2223, 2219, 2209, 2226, 2211, 2227, 2233, - 2234, 2731, 2201, 2236, 2235, 2237, 2731, 2731, 2244, 2731, - 2731, 2247, 2731, 2731, 2248, 2250, 2731, 2252, 2731, 2259, - 2255, 2242, 2238, 2257, 2731, 2264, 2731, 2731, 2261, 2265, - 2268, 2269, 2271, 2273, 2276, 2277, 2278, 2279, 2280, 2281, - 2283, 2285, 2286, 2199, 2287, 2288, 2290, 2294, 2297, 2299, - 2300, 2310, 2731, 2298, 2311, 2731, 2318, 2313, 2306, 2302, - 2319, 2323, 2324, 2326, 2332, 2329, 2328, 2330, 2731, 2333, - 2731, 2731, 2331, 2335, 2341, 2334, 2336, 2731, 2346, 2342, - 2356, 2358, 2731, 2731, 2731, 2359, 2348, 2353, 2363, 2364, - - 2365, 2731, 2366, 2367, 2371, 2374, 2378, 2380, 2387, 2384, - 2386, 2731, 2388, 2390, 2731, 2391, 2392, 2395, 2397, 2398, - 2400, 2731, 2396, 2401, 2408, 2403, 2411, 2413, 2414, 2731, - 2416, 2417, 2731, 2423, 2731, 2731, 2418, 2426, 2428, 2433, - 2435, 2424, 2429, 2441, 2440, 2444, 2731, 2731, 2445, 2731, - 2731, 2437, 2446, 2447, 2449, 2452, 2453, 2455, 2457, 2460, - 2459, 2731, 2461, 2731, 2462, 2471, 2463, 2465, 2731, 2472, - 2473, 2476, 2731, 2731, 2477, 2486, 2484, 2731, 2489, 2488, - 2490, 2491, 2496, 2498, 2492, 2499, 2502, 2500, 2478, 2503, - 2512, 2514, 2731, 2516, 2513, 2517, 2521, 2524, 2525, 2526, - - 2527, 2529, 2530, 2532, 2534, 2731, 2535, 2536, 2546, 2551, - 2555, 2543, 2557, 2731, 2558, 2731, 2561, 2562, 2731, 2731, - 2563, 2565, 2568, 2731, 2569, 2731, 2552, 2576, 2566, 2731, - 2731, 2731, 2578, 2731, 2579, 2731, 2581, 2582, 2731, 2584, - 2586, 2588, 2731, 2590, 2731, 2592, 2731, 2593, 2594, 2731, - 2731, 2731, 2731, 2596, 2598, 2604, 2599, 2731, 2601, 2606, - 2607, 2610, 2731, 2731, 2639, 2646, 2653, 2660, 2667, 94, - 2674, 2681, 2688, 2695, 2702, 2709, 2716, 2723 + 540, 541, 542, 548, 549, 555, 560, 551, 553, 552, + 568, 561, 588, 562, 554, 574, 570, 578, 576, 584, + 581, 582, 583, 585, 580, 606, 612, 599, 592, 613, + 614, 615, 616, 618, 621, 622, 623, 625, 633, 634, + 645, 641, 638, 646, 626, 648, 655, 652, 653, 654, + 656, 657, 659, 661, 667, 2744, 669, 663, 671, 665, + + 675, 2744, 672, 676, 677, 678, 680, 686, 685, 689, + 693, 690, 695, 697, 699, 698, 718, 700, 705, 727, + 708, 706, 704, 712, 701, 723, 725, 730, 709, 733, + 736, 737, 739, 742, 748, 741, 747, 750, 752, 755, + 757, 758, 624, 759, 761, 771, 779, 776, 778, 785, + 762, 781, 764, 787, 784, 789, 790, 796, 792, 793, + 800, 798, 795, 806, 802, 814, 805, 815, 816, 818, + 819, 821, 827, 824, 825, 834, 836, 826, 832, 838, + 839, 840, 852, 853, 849, 854, 860, 861, 850, 862, + 856, 865, 866, 867, 871, 868, 873, 876, 878, 884, + + 870, 880, 882, 890, 891, 892, 896, 897, 898, 899, + 900, 908, 901, 910, 912, 902, 915, 922, 914, 923, + 926, 2744, 929, 928, 930, 931, 934, 2744, 2744, 933, + 2744, 2744, 936, 937, 938, 946, 951, 947, 954, 940, + 956, 961, 957, 966, 962, 973, 968, 975, 976, 978, + 979, 981, 983, 984, 985, 989, 991, 999, 992, 1000, + 993, 1003, 1004, 1005, 1007, 1009, 1012, 1018, 1015, 2744, + 1016, 1017, 1023, 1021, 1026, 2744, 1025, 1027, 1028, 1030, + 1033, 1038, 1035, 1039, 1041, 1042, 1045, 1048, 1047, 1040, + 1051, 1057, 1063, 1056, 1064, 1066, 1068, 1069, 1077, 1078, + + 1073, 1074, 1084, 1080, 1083, 1086, 1088, 1090, 1092, 1093, + 1095, 1118, 1097, 1099, 1098, 1096, 1104, 1102, 1106, 1119, + 1130, 1115, 1108, 1128, 1132, 1137, 1135, 1139, 1107, 1145, + 1146, 2744, 1152, 1148, 1141, 1149, 1154, 1155, 1157, 1158, + 1163, 1161, 1164, 1167, 1170, 2744, 1169, 1171, 1172, 1175, + 1179, 1185, 1173, 1191, 1198, 2744, 1200, 1201, 1183, 1194, + 1196, 1203, 1197, 1207, 1208, 1204, 1211, 1214, 1222, 1215, + 1217, 1223, 1219, 1225, 1228, 1229, 1231, 1233, 1232, 1240, + 1230, 1239, 1251, 1245, 1253, 1247, 1249, 1255, 1258, 1256, + 1259, 1257, 1261, 2744, 175, 1264, 1262, 1265, 1275, 1284, + + 1282, 1269, 1280, 1288, 1281, 1289, 1272, 1273, 1290, 1292, + 1295, 1298, 1300, 1301, 1302, 1306, 1307, 1308, 1309, 1310, + 1312, 1317, 1318, 1315, 1316, 2744, 1329, 1313, 1326, 1332, + 1336, 1343, 1337, 1340, 1339, 1349, 1345, 1350, 1354, 1357, + 1351, 1361, 1362, 1347, 1368, 1369, 1367, 1370, 1371, 1373, + 2744, 1375, 1377, 1378, 1381, 1382, 1383, 1386, 1388, 1390, + 1394, 1397, 1399, 2744, 1402, 1403, 1404, 1410, 1407, 1414, + 1411, 1418, 1419, 1420, 1421, 1426, 1422, 1424, 1428, 2744, + 1437, 1438, 1436, 1447, 1434, 1444, 1445, 1449, 1446, 1450, + 1457, 1451, 1454, 1458, 1459, 1455, 1453, 1461, 1462, 2744, + + 1469, 1465, 1470, 1467, 1477, 1480, 1482, 1481, 1483, 1484, + 1489, 1487, 1492, 1494, 1503, 1493, 1496, 1507, 1509, 1510, + 1512, 1518, 1519, 1520, 2744, 1524, 1525, 1526, 1516, 1533, + 1537, 1527, 1529, 1534, 1538, 1539, 1547, 1543, 1544, 1549, + 1550, 1541, 1551, 1552, 1553, 1556, 1566, 1558, 1564, 1559, + 1575, 1576, 1578, 1565, 1588, 2744, 1577, 2744, 1584, 1586, + 1596, 2744, 1593, 2744, 1598, 2744, 1599, 1600, 1590, 1594, + 1603, 1606, 1610, 1604, 1611, 1607, 1614, 1613, 1615, 1618, + 2744, 1620, 1616, 1626, 1622, 1628, 1631, 1633, 1632, 1641, + 1639, 1640, 1643, 2744, 1645, 1644, 1652, 1658, 1646, 1656, + + 1657, 1660, 1661, 1662, 1663, 1665, 1667, 1670, 1671, 1673, + 1675, 1678, 1679, 1682, 1681, 1683, 1684, 2744, 1687, 1697, + 1686, 1694, 2744, 2744, 1700, 1706, 1707, 1708, 1711, 1696, + 1713, 1714, 1721, 1718, 1719, 1727, 1726, 1728, 1729, 1730, + 1731, 1733, 1734, 2744, 1741, 1735, 1743, 1745, 1737, 1755, + 1746, 1758, 2744, 2744, 1756, 1747, 1762, 1763, 1765, 1766, + 2744, 1768, 1769, 1770, 1771, 1772, 1774, 1778, 1779, 1786, + 1789, 1787, 1790, 1796, 1792, 1793, 1800, 1798, 1808, 1805, + 1810, 1817, 1795, 1813, 1815, 1819, 1820, 1822, 1824, 1830, + 1826, 2744, 1833, 1827, 1836, 1834, 1838, 1841, 1844, 1843, + + 1846, 1847, 1848, 1849, 1851, 1852, 1853, 1856, 2744, 1860, + 1864, 1858, 1865, 1871, 1861, 1874, 1877, 1879, 2744, 1881, + 1888, 1882, 1884, 1890, 1892, 1885, 1893, 1896, 1898, 1899, + 1900, 1901, 1905, 1907, 1909, 1912, 1915, 1921, 1920, 1927, + 1930, 1924, 1937, 1928, 1931, 1934, 1938, 1944, 1942, 1948, + 1941, 2744, 1947, 1952, 1955, 1956, 1960, 1961, 1949, 2744, + 2744, 1945, 2744, 1968, 1959, 1966, 1970, 2744, 1972, 2744, + 2744, 1973, 1981, 1974, 1982, 1984, 1989, 2744, 1978, 1990, + 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2744, 2000, 2001, + 2002, 2012, 2744, 2004, 2017, 2006, 2022, 2023, 2024, 2026, + + 2028, 2014, 2035, 2033, 2744, 2036, 2037, 2040, 2041, 2045, + 2042, 2043, 2047, 2744, 2056, 2058, 2744, 2049, 2048, 2050, + 2744, 2064, 2744, 2065, 2060, 2067, 2073, 2069, 2075, 2077, + 2079, 2081, 2080, 2088, 2082, 2744, 2744, 2089, 2092, 2094, + 2097, 2099, 2101, 2100, 2102, 2084, 2103, 2744, 2106, 2108, + 2111, 2112, 2113, 2744, 2117, 2118, 2120, 2123, 2125, 2129, + 2138, 2131, 2140, 2142, 2135, 2146, 2148, 2143, 2744, 2114, + 2150, 2151, 2153, 2155, 2157, 2156, 2160, 2165, 2158, 2167, + 2744, 2169, 2171, 2174, 2172, 2178, 2179, 2180, 2182, 2183, + 2186, 2185, 2187, 2189, 2193, 2199, 2744, 2192, 2744, 2201, + + 2206, 2213, 2214, 2744, 2194, 2216, 2744, 2217, 2219, 2222, + 2225, 2227, 2232, 2233, 2226, 2235, 2234, 2236, 2242, 2243, + 2744, 2202, 2240, 2244, 2248, 2744, 2744, 2255, 2744, 2744, + 2258, 2744, 2744, 2259, 2261, 2744, 2263, 2744, 2270, 2266, + 2253, 2251, 2271, 2744, 2275, 2744, 2744, 2272, 2278, 2268, + 2279, 2286, 2288, 2290, 2281, 2283, 2291, 2292, 2294, 2295, + 2297, 2298, 2299, 2300, 2305, 2302, 2308, 2309, 2311, 2312, + 2314, 2744, 2310, 2323, 2744, 2330, 2331, 2319, 2321, 2332, + 2333, 2335, 2337, 2343, 2341, 2342, 2344, 2744, 2346, 2744, + 2744, 2347, 2345, 2352, 2353, 2355, 2744, 2358, 2359, 2363, + + 2370, 2744, 2744, 2744, 2371, 2360, 2366, 2374, 2376, 2377, + 2744, 2380, 2383, 2384, 2386, 2391, 2393, 2399, 2397, 2403, + 2744, 2400, 2398, 2744, 2404, 2406, 2408, 2409, 2411, 2413, + 2744, 2414, 2415, 2421, 2416, 2424, 2427, 2426, 2744, 2428, + 2429, 2744, 2439, 2744, 2744, 2430, 2440, 2443, 2445, 2448, + 2436, 2449, 2456, 2453, 2455, 2744, 2744, 2458, 2744, 2744, + 2457, 2460, 2461, 2465, 2462, 2467, 2469, 2470, 2473, 2471, + 2744, 2474, 2744, 2475, 2484, 2481, 2479, 2744, 2486, 2487, + 2490, 2744, 2744, 2492, 2500, 2494, 2744, 2502, 2504, 2498, + 2505, 2509, 2510, 2506, 2511, 2516, 2518, 2512, 2514, 2526, + + 2527, 2744, 2529, 2521, 2531, 2535, 2537, 2539, 2540, 2542, + 2544, 2545, 2547, 2548, 2744, 2549, 2550, 2560, 2565, 2569, + 2551, 2571, 2744, 2572, 2744, 2575, 2561, 2744, 2744, 2576, + 2578, 2580, 2744, 2581, 2744, 2579, 2583, 2587, 2744, 2744, + 2744, 2589, 2744, 2590, 2744, 2593, 2595, 2744, 2596, 2598, + 2601, 2744, 2603, 2744, 2605, 2744, 2606, 2607, 2744, 2744, + 2744, 2744, 2609, 2611, 2616, 2612, 2744, 2617, 2619, 2620, + 2623, 2744, 2744, 2652, 2659, 2666, 2673, 2680, 94, 2687, + 2694, 2701, 2708, 2715, 2722, 2729, 2736 } ; -static yyconst flex_int16_t yy_def[1379] = +static yyconst flex_int16_t yy_def[1388] = { 0, - 1364, 1, 1365, 1365, 1366, 1366, 1367, 1367, 1368, 1368, - 1369, 1369, 1364, 1370, 1364, 1364, 1364, 1364, 1371, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1372, - 1364, 1364, 1364, 1372, 1373, 1364, 1364, 1364, 1373, 1374, - 1364, 1364, 1364, 1364, 1374, 1375, 1364, 1364, 1364, 1375, - 1376, 1364, 1377, 1364, 1376, 1376, 1370, 1370, 1364, 1378, - 1371, 1378, 1371, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1372, 1372, 1373, 1373, 1374, 1374, 1364, 1375, 1375, - 1376, 1376, 1377, 1377, 1376, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1376, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1376, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, - - 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1376, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1376, 1370, 1370, 1370, 1370, 1364, - 1370, 1370, 1370, 1370, 1370, 1364, 1364, 1370, 1364, 1364, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1370, - 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - - 1370, 1370, 1376, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, - 1376, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, - - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1364, 1364, 1370, 1370, 1370, 1364, 1370, 1364, 1370, 1364, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1364, 1370, 1370, 1370, 1370, 1364, 1364, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1364, 1364, 1370, 1370, 1370, - 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - - 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1364, 1364, 1370, 1364, 1370, 1370, 1370, 1370, 1364, - 1370, 1364, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1364, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, - 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, - - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1370, - 1370, 1364, 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1364, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, - 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1364, - 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1364, 1370, 1370, - - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1364, 1370, 1370, 1370, 1370, 1364, 1364, 1370, 1364, - 1364, 1370, 1364, 1364, 1370, 1370, 1364, 1370, 1364, 1370, - 1370, 1370, 1370, 1370, 1364, 1370, 1364, 1364, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1364, 1370, 1370, 1364, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1370, - 1364, 1364, 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1370, - 1370, 1370, 1364, 1364, 1364, 1370, 1370, 1370, 1370, 1370, - - 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1364, 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, - 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1364, - 1370, 1370, 1364, 1370, 1364, 1364, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1364, 1364, 1370, 1364, - 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1364, 1370, 1364, 1370, 1370, 1370, 1370, 1364, 1370, - 1370, 1370, 1364, 1364, 1370, 1370, 1370, 1364, 1370, 1370, - 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - 1370, 1370, 1364, 1370, 1370, 1370, 1370, 1370, 1370, 1370, - - 1370, 1370, 1370, 1370, 1370, 1364, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1364, 1370, 1364, 1370, 1370, 1364, 1364, - 1370, 1370, 1370, 1364, 1370, 1364, 1370, 1370, 1370, 1364, - 1364, 1364, 1370, 1364, 1370, 1364, 1370, 1370, 1364, 1370, - 1370, 1370, 1364, 1370, 1364, 1370, 1364, 1370, 1370, 1364, - 1364, 1364, 1364, 1370, 1370, 1370, 1370, 1364, 1370, 1370, - 1370, 1370, 1364, 0, 1364, 1364, 1364, 1364, 1364, 1364, - 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364 + 1373, 1, 1374, 1374, 1375, 1375, 1376, 1376, 1377, 1377, + 1378, 1378, 1373, 1379, 1373, 1373, 1373, 1373, 1380, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1381, + 1373, 1373, 1373, 1381, 1382, 1373, 1373, 1373, 1382, 1383, + 1373, 1373, 1373, 1373, 1383, 1384, 1373, 1373, 1373, 1384, + 1385, 1373, 1386, 1373, 1385, 1385, 1379, 1379, 1373, 1387, + 1380, 1387, 1380, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1381, 1381, 1382, 1382, 1383, 1383, 1373, 1384, 1384, + 1385, 1385, 1386, 1386, 1385, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1385, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1385, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, + + 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1385, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1385, 1379, 1379, 1379, + 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1373, 1373, 1379, + 1373, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, + 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + + 1379, 1379, 1379, 1379, 1379, 1385, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1373, 1385, 1379, 1379, 1379, 1379, 1379, + + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, + + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1373, 1379, 1379, + 1379, 1373, 1379, 1373, 1379, 1373, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, + + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, + 1379, 1379, 1373, 1373, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1373, 1373, 1379, 1379, 1379, 1379, 1379, 1379, + 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, + 1373, 1379, 1373, 1379, 1379, 1379, 1379, 1373, 1379, 1373, + 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, + 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + + 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1373, 1379, 1379, 1373, 1379, 1379, 1379, + 1373, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1373, 1373, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, + 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1373, 1379, + + 1379, 1379, 1379, 1373, 1379, 1379, 1373, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1373, 1379, 1379, 1379, 1379, 1373, 1373, 1379, 1373, 1373, + 1379, 1373, 1373, 1379, 1379, 1373, 1379, 1373, 1379, 1379, + 1379, 1379, 1379, 1373, 1379, 1373, 1373, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1373, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1373, + 1373, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, + + 1379, 1373, 1373, 1373, 1379, 1379, 1379, 1379, 1379, 1379, + 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1373, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, + 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, + 1379, 1373, 1379, 1373, 1373, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1373, 1373, 1379, 1373, 1373, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1373, 1379, 1373, 1379, 1379, 1379, 1379, 1373, 1379, 1379, + 1379, 1373, 1373, 1379, 1379, 1379, 1373, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + + 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, + 1379, 1379, 1373, 1379, 1373, 1379, 1379, 1373, 1373, 1379, + 1379, 1379, 1373, 1379, 1373, 1379, 1379, 1379, 1373, 1373, + 1373, 1379, 1373, 1379, 1373, 1379, 1379, 1373, 1379, 1379, + 1379, 1373, 1379, 1373, 1379, 1373, 1379, 1379, 1373, 1373, + 1373, 1373, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, + 1379, 1373, 0, 1373, 1373, 1373, 1373, 1373, 1373, 1373, + 1373, 1373, 1373, 1373, 1373, 1373, 1373 } ; -static yyconst flex_int16_t yy_nxt[2771] = +static yyconst flex_int16_t yy_nxt[2784] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 18, 20, 21, 14, 22, 23, 24, 25, 14, @@ -938,253 +941,255 @@ static yyconst flex_int16_t yy_nxt[2771] = 68, 68, 287, 290, 288, 68, 68, 289, 294, 295, 68, 292, 293, 296, 68, 68, 300, 291, 297, 301, 302, 68, 298, 68, 68, 299, 68, 304, 303, 68, - 307, 68, 68, 68, 68, 68, 310, 309, 68, 305, - 316, 68, 68, 68, 68, 68, 68, 317, 311, 306, - 315, 308, 68, 68, 312, 321, 68, 313, 320, 314, - 132, 68, 68, 68, 318, 332, 319, 323, 337, 68, - 68, 322, 68, 68, 324, 325, 331, 335, 68, 68, - - 68, 333, 334, 68, 326, 68, 327, 328, 329, 336, - 338, 330, 68, 339, 340, 68, 68, 342, 68, 349, - 341, 343, 344, 345, 68, 68, 350, 68, 68, 68, - 68, 347, 346, 351, 348, 68, 68, 68, 127, 354, - 68, 357, 353, 68, 356, 352, 359, 358, 360, 68, - 68, 68, 355, 68, 362, 361, 363, 68, 68, 365, - 366, 367, 68, 68, 68, 68, 68, 371, 370, 68, - 364, 368, 68, 68, 372, 369, 68, 374, 68, 375, - 68, 68, 68, 68, 68, 68, 68, 385, 377, 68, - 378, 383, 68, 373, 376, 379, 68, 384, 68, 382, - - 68, 68, 380, 68, 381, 388, 68, 68, 390, 68, - 68, 68, 403, 400, 386, 389, 68, 68, 68, 68, - 387, 68, 391, 401, 68, 405, 392, 68, 393, 398, - 402, 68, 399, 394, 406, 395, 68, 68, 68, 68, - 409, 68, 404, 396, 411, 68, 408, 412, 407, 68, - 132, 416, 68, 397, 415, 68, 68, 417, 68, 410, - 413, 420, 68, 68, 414, 68, 68, 68, 419, 424, - 418, 426, 68, 423, 68, 421, 428, 422, 427, 68, - 425, 68, 429, 68, 430, 68, 431, 68, 68, 68, - 68, 68, 433, 434, 435, 432, 68, 68, 439, 68, - - 436, 68, 437, 68, 441, 68, 440, 68, 438, 447, - 442, 68, 445, 68, 68, 443, 68, 68, 68, 444, - 449, 68, 448, 446, 68, 450, 68, 68, 456, 452, - 457, 453, 454, 68, 68, 68, 68, 459, 68, 458, - 68, 460, 455, 68, 68, 461, 68, 451, 68, 464, - 68, 465, 125, 469, 462, 466, 467, 463, 68, 68, - 468, 68, 68, 68, 477, 471, 473, 68, 470, 475, - 474, 68, 68, 68, 476, 68, 68, 68, 68, 68, - 472, 478, 481, 68, 68, 482, 486, 68, 488, 68, - 68, 68, 479, 489, 483, 480, 487, 68, 68, 485, - - 68, 484, 490, 68, 68, 68, 491, 68, 68, 495, - 494, 68, 496, 493, 68, 500, 497, 492, 68, 498, - 68, 132, 68, 68, 507, 499, 503, 501, 68, 68, - 509, 504, 508, 505, 502, 68, 68, 68, 68, 68, - 510, 68, 68, 506, 68, 68, 512, 518, 68, 517, - 516, 515, 68, 525, 513, 511, 68, 68, 514, 68, - 68, 519, 68, 520, 123, 528, 521, 529, 68, 68, - 68, 522, 68, 531, 526, 532, 530, 523, 524, 68, - 533, 68, 527, 68, 534, 68, 68, 68, 535, 68, - 536, 68, 539, 68, 538, 543, 68, 68, 542, 68, - - 544, 545, 540, 547, 537, 68, 68, 541, 68, 68, - 68, 546, 68, 68, 68, 553, 68, 548, 549, 551, - 552, 68, 555, 68, 68, 68, 68, 68, 557, 554, - 550, 68, 559, 68, 68, 68, 561, 68, 558, 68, - 68, 560, 556, 68, 562, 68, 68, 68, 68, 569, - 68, 68, 568, 68, 68, 563, 564, 565, 578, 572, - 567, 566, 573, 68, 570, 577, 571, 576, 68, 574, - 68, 575, 68, 68, 68, 68, 583, 584, 581, 68, - 68, 68, 68, 585, 580, 588, 68, 579, 590, 68, - 68, 591, 132, 68, 587, 582, 68, 586, 68, 68, - - 593, 68, 68, 68, 68, 68, 589, 602, 592, 609, - 68, 68, 68, 132, 68, 596, 605, 594, 608, 604, - 68, 610, 68, 595, 68, 607, 611, 597, 612, 598, - 603, 606, 68, 599, 68, 600, 615, 614, 68, 618, - 601, 68, 617, 68, 68, 68, 613, 622, 68, 68, - 616, 619, 624, 623, 68, 68, 68, 68, 620, 625, - 68, 68, 68, 68, 621, 628, 68, 68, 627, 68, - 68, 630, 632, 626, 68, 68, 636, 68, 130, 635, - 629, 68, 631, 634, 68, 68, 633, 68, 128, 640, - 639, 68, 641, 637, 643, 638, 642, 68, 644, 645, - - 68, 646, 68, 650, 68, 647, 68, 68, 648, 68, - 68, 649, 68, 653, 68, 68, 68, 651, 68, 655, - 656, 68, 657, 68, 658, 659, 68, 68, 68, 652, - 660, 662, 68, 654, 68, 68, 127, 68, 68, 68, - 68, 661, 667, 668, 68, 663, 68, 670, 666, 68, - 672, 664, 68, 673, 665, 68, 68, 669, 68, 676, - 671, 674, 675, 68, 68, 679, 677, 68, 678, 68, - 68, 68, 68, 68, 68, 687, 681, 68, 688, 68, - 68, 68, 680, 68, 689, 68, 684, 68, 685, 682, - 692, 690, 68, 68, 686, 691, 683, 695, 68, 68, - - 68, 68, 693, 68, 68, 698, 68, 694, 697, 700, - 702, 696, 68, 68, 68, 68, 68, 68, 68, 68, - 699, 703, 701, 68, 68, 710, 68, 706, 704, 705, - 68, 68, 714, 68, 716, 707, 709, 68, 708, 711, - 713, 68, 68, 712, 715, 719, 718, 68, 68, 720, - 68, 724, 68, 717, 68, 725, 68, 723, 68, 68, - 722, 721, 68, 726, 727, 68, 728, 68, 68, 733, - 732, 729, 730, 734, 68, 68, 68, 68, 68, 68, - 735, 736, 731, 742, 68, 737, 68, 68, 68, 68, - 738, 68, 739, 68, 740, 741, 68, 68, 68, 747, - - 68, 743, 745, 751, 68, 744, 68, 748, 746, 752, - 68, 754, 68, 68, 749, 753, 68, 755, 756, 68, - 757, 759, 750, 758, 68, 760, 68, 68, 68, 68, - 68, 68, 762, 761, 764, 68, 763, 766, 768, 769, - 68, 771, 767, 68, 68, 770, 68, 68, 765, 68, - 68, 775, 68, 68, 68, 778, 772, 68, 68, 68, - 68, 774, 68, 782, 68, 68, 68, 68, 773, 68, - 68, 68, 125, 776, 68, 781, 787, 777, 779, 780, - 788, 68, 68, 68, 783, 785, 68, 791, 790, 786, - 784, 793, 792, 68, 68, 789, 68, 794, 68, 68, - - 68, 795, 68, 68, 800, 796, 68, 801, 797, 68, - 68, 798, 804, 68, 802, 123, 806, 799, 68, 809, - 803, 805, 810, 808, 68, 68, 811, 68, 812, 68, - 68, 68, 68, 816, 807, 813, 68, 817, 68, 818, - 68, 68, 68, 68, 68, 814, 68, 824, 68, 68, - 823, 815, 68, 68, 68, 819, 68, 68, 832, 68, - 820, 68, 822, 829, 68, 825, 833, 826, 821, 68, - 68, 68, 827, 828, 831, 834, 68, 830, 68, 836, - 838, 68, 835, 839, 837, 68, 842, 68, 68, 840, - 845, 68, 843, 68, 844, 68, 841, 846, 68, 847, - - 68, 68, 68, 849, 848, 68, 68, 68, 854, 68, - 68, 852, 68, 851, 68, 856, 68, 68, 68, 68, - 850, 859, 853, 68, 861, 68, 68, 858, 68, 864, - 855, 68, 68, 68, 857, 868, 68, 860, 68, 863, - 870, 862, 68, 869, 68, 68, 865, 68, 873, 68, - 68, 866, 867, 876, 874, 877, 871, 68, 872, 68, - 68, 68, 878, 68, 68, 68, 68, 885, 68, 882, - 68, 884, 875, 68, 68, 879, 68, 68, 880, 886, - 68, 893, 68, 881, 68, 68, 68, 68, 883, 891, - 888, 887, 68, 68, 890, 892, 889, 68, 68, 68, - - 898, 902, 68, 68, 894, 895, 899, 897, 896, 900, - 68, 68, 906, 903, 901, 905, 904, 68, 68, 68, - 911, 912, 68, 68, 68, 68, 68, 908, 910, 68, - 909, 68, 68, 68, 919, 68, 907, 914, 68, 68, - 68, 922, 924, 913, 915, 916, 68, 68, 926, 68, - 918, 920, 68, 68, 917, 925, 921, 923, 68, 68, - 68, 928, 68, 68, 68, 927, 68, 929, 930, 68, - 68, 68, 931, 68, 68, 937, 68, 68, 938, 939, - 932, 940, 933, 68, 935, 934, 941, 942, 944, 68, - 936, 68, 68, 68, 68, 948, 68, 68, 943, 68, - - 68, 952, 68, 951, 946, 945, 947, 68, 949, 953, - 68, 950, 955, 68, 956, 68, 954, 68, 68, 68, - 957, 960, 68, 962, 68, 963, 68, 964, 68, 68, - 966, 965, 68, 68, 958, 68, 968, 959, 961, 970, - 68, 68, 68, 971, 972, 68, 68, 967, 68, 68, - 68, 68, 980, 68, 68, 68, 982, 973, 969, 974, - 68, 68, 985, 68, 975, 68, 976, 68, 977, 984, - 978, 68, 979, 68, 988, 68, 990, 68, 987, 68, - 981, 983, 986, 68, 994, 68, 68, 68, 993, 68, - 997, 68, 998, 996, 68, 992, 68, 68, 68, 989, - - 68, 68, 68, 991, 68, 995, 999, 1004, 68, 1008, - 68, 1001, 68, 1005, 1000, 1003, 1011, 1002, 68, 1006, - 68, 68, 68, 1009, 1007, 1013, 1010, 1012, 68, 1014, - 68, 1015, 1016, 1017, 1018, 68, 68, 68, 68, 1019, - 1022, 68, 1024, 1021, 68, 68, 1364, 68, 68, 1020, - 68, 1026, 1027, 68, 1028, 68, 1025, 68, 68, 68, - 68, 68, 1030, 1023, 1029, 1031, 68, 1034, 1036, 1032, - 68, 68, 68, 1033, 1039, 68, 1041, 68, 1035, 1037, - 1038, 68, 68, 1043, 68, 68, 1040, 1044, 1045, 68, - 68, 1046, 68, 1048, 1042, 68, 68, 68, 68, 68, - - 68, 68, 68, 68, 1056, 68, 1055, 68, 1050, 1051, - 1047, 1052, 68, 1053, 1058, 68, 1049, 1060, 68, 68, - 1054, 1057, 68, 68, 1062, 1063, 1059, 1064, 68, 68, - 68, 1068, 68, 1061, 1065, 1067, 68, 1069, 68, 1072, - 68, 68, 68, 68, 68, 1076, 1066, 68, 68, 1070, - 68, 1074, 1071, 1073, 1075, 1079, 1077, 68, 68, 68, - 1078, 68, 1080, 68, 1082, 68, 68, 1084, 68, 1085, - 68, 1081, 1088, 68, 68, 1083, 68, 1087, 1092, 1089, - 1090, 68, 68, 1095, 68, 1091, 68, 1093, 68, 1094, - 1086, 1098, 68, 68, 1096, 68, 1099, 1097, 68, 68, - - 68, 68, 68, 1101, 1102, 1100, 1104, 68, 68, 68, - 68, 68, 68, 68, 1103, 1112, 68, 68, 68, 1131, - 1113, 68, 1364, 1110, 68, 1116, 1106, 68, 1105, 1108, - 1109, 1114, 1107, 1111, 1115, 1117, 68, 1118, 68, 68, - 1119, 1120, 68, 1121, 68, 1123, 68, 1124, 68, 68, - 68, 1127, 68, 68, 68, 1126, 1129, 68, 1122, 68, - 68, 1135, 68, 1132, 68, 1133, 1137, 68, 1125, 1138, - 68, 68, 1128, 1136, 68, 1140, 68, 1130, 68, 68, - 1134, 68, 68, 68, 1143, 1141, 68, 68, 1151, 68, - 1142, 1147, 68, 68, 68, 1145, 68, 1139, 1149, 68, - - 1152, 1150, 1148, 68, 1146, 68, 1144, 1156, 1154, 68, - 1155, 68, 68, 68, 1153, 68, 1157, 1160, 1159, 68, - 68, 68, 1161, 68, 1158, 1162, 1163, 68, 68, 1174, - 68, 68, 1164, 1165, 1166, 68, 1167, 1204, 68, 68, - 1172, 1168, 1169, 1170, 1171, 68, 68, 68, 68, 68, - 68, 1177, 1173, 1175, 68, 1176, 68, 1178, 1179, 68, - 68, 1181, 68, 1182, 68, 1180, 1183, 68, 1184, 68, - 1185, 68, 1186, 68, 1187, 1188, 68, 68, 1189, 1190, - 68, 68, 1193, 68, 1194, 68, 1192, 1195, 68, 68, - 68, 68, 68, 68, 1191, 68, 1202, 68, 68, 68, - - 68, 1196, 68, 1198, 1199, 1200, 68, 1203, 1197, 68, - 68, 68, 68, 1206, 68, 1201, 1210, 1211, 68, 1205, - 1208, 1212, 68, 68, 1214, 68, 1207, 1209, 1213, 1215, - 68, 68, 1218, 1217, 1216, 68, 68, 1222, 68, 1223, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 1219, - 1229, 1220, 1230, 68, 68, 1221, 1224, 1233, 68, 1225, - 68, 1231, 1226, 1228, 1227, 68, 1232, 1235, 68, 1236, - 68, 68, 1237, 1234, 1239, 68, 68, 68, 68, 68, - 1240, 1241, 1238, 68, 1244, 1242, 68, 1364, 1245, 1247, - 68, 1248, 68, 1243, 1249, 1250, 68, 1251, 68, 68, - - 68, 1246, 68, 68, 68, 1252, 1254, 68, 68, 68, - 68, 1258, 68, 68, 1253, 68, 1256, 1255, 1257, 1262, - 68, 1259, 1264, 68, 1263, 68, 68, 1260, 68, 68, - 68, 1266, 1261, 1265, 1269, 68, 68, 1267, 68, 1271, - 68, 68, 1268, 1272, 1273, 68, 1274, 68, 1277, 68, - 1270, 1278, 68, 68, 1275, 1276, 68, 68, 68, 68, - 1279, 68, 1284, 1280, 68, 68, 1282, 68, 1281, 68, - 1286, 68, 68, 68, 68, 68, 1291, 68, 1283, 1294, - 1285, 1289, 1293, 68, 68, 68, 1295, 1287, 68, 68, - 68, 1290, 1292, 1296, 1299, 1288, 68, 1297, 68, 1300, - - 68, 68, 68, 68, 68, 1301, 1302, 1306, 68, 1303, - 68, 68, 68, 1298, 68, 68, 1312, 1311, 1305, 1307, - 1308, 1304, 1310, 1314, 68, 68, 68, 1316, 68, 68, - 1309, 1315, 1319, 68, 1313, 1320, 68, 68, 68, 68, - 1324, 68, 68, 1326, 68, 1317, 68, 68, 68, 1364, - 1322, 1318, 1364, 1329, 1325, 68, 1321, 1330, 68, 1323, - 1333, 1328, 1331, 68, 68, 1327, 1332, 68, 1334, 68, - 68, 1335, 1336, 68, 68, 68, 1339, 68, 68, 1337, - 68, 68, 1344, 1338, 1342, 1340, 1341, 1343, 68, 1345, - 68, 68, 1347, 68, 68, 1346, 68, 1350, 68, 1351, - - 68, 1352, 68, 1353, 68, 68, 68, 1355, 68, 1348, - 68, 68, 1356, 68, 1349, 1358, 68, 1354, 68, 68, - 1359, 1363, 68, 1364, 1364, 1364, 1364, 1364, 1360, 1364, - 1357, 1364, 1361, 1364, 1364, 1364, 1364, 1364, 1362, 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, 1364, 71, 71, 71, - 71, 122, 122, 1364, 1364, 1364, 122, 122, 124, 124, - 1364, 1364, 124, 1364, 124, 126, 1364, 1364, 1364, 1364, - - 1364, 126, 129, 129, 1364, 1364, 1364, 129, 129, 131, - 1364, 1364, 1364, 1364, 1364, 131, 133, 133, 1364, 133, - 133, 133, 133, 72, 72, 1364, 72, 72, 72, 72, - 13, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, - 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, - 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, - 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364 + 307, 68, 68, 68, 68, 68, 310, 309, 311, 305, + 68, 68, 317, 68, 68, 68, 68, 68, 312, 306, + 316, 308, 68, 68, 68, 333, 313, 318, 321, 314, + 68, 315, 68, 322, 319, 320, 132, 324, 68, 332, + 68, 338, 68, 68, 68, 68, 68, 68, 127, 323, + + 68, 335, 325, 326, 68, 336, 343, 334, 337, 340, + 341, 68, 327, 339, 328, 329, 330, 342, 68, 331, + 348, 345, 346, 344, 68, 68, 68, 68, 68, 351, + 68, 347, 352, 68, 68, 68, 68, 68, 68, 426, + 350, 349, 358, 355, 357, 68, 68, 354, 353, 359, + 68, 365, 361, 68, 363, 360, 356, 68, 68, 362, + 68, 366, 367, 364, 68, 68, 68, 68, 68, 68, + 372, 68, 371, 68, 369, 68, 373, 68, 370, 68, + 375, 68, 376, 68, 68, 368, 379, 68, 68, 68, + 68, 378, 68, 386, 374, 384, 377, 68, 68, 380, + + 385, 68, 68, 383, 381, 68, 390, 68, 382, 68, + 68, 68, 68, 68, 392, 387, 68, 68, 68, 405, + 68, 68, 391, 388, 68, 407, 389, 393, 408, 394, + 68, 395, 400, 401, 402, 68, 396, 68, 397, 68, + 404, 406, 68, 412, 403, 68, 398, 409, 68, 68, + 413, 68, 410, 68, 132, 418, 399, 414, 417, 68, + 68, 411, 68, 422, 68, 419, 416, 68, 415, 68, + 68, 68, 428, 68, 68, 421, 68, 420, 125, 423, + 436, 424, 429, 68, 427, 425, 430, 431, 68, 432, + 68, 68, 433, 68, 437, 434, 68, 68, 435, 68, + + 438, 68, 68, 441, 68, 68, 439, 68, 68, 442, + 68, 447, 68, 449, 68, 444, 123, 68, 68, 443, + 445, 452, 440, 450, 446, 448, 68, 68, 68, 451, + 68, 68, 454, 68, 459, 456, 68, 68, 68, 68, + 461, 455, 460, 453, 68, 458, 68, 457, 68, 462, + 68, 68, 68, 463, 467, 466, 464, 468, 465, 469, + 471, 68, 68, 470, 68, 68, 68, 475, 68, 473, + 472, 476, 68, 68, 68, 477, 479, 68, 68, 68, + 68, 478, 68, 68, 474, 68, 480, 484, 68, 485, + 68, 489, 68, 491, 68, 481, 68, 482, 492, 483, + + 486, 490, 68, 68, 68, 488, 487, 493, 68, 68, + 68, 68, 68, 68, 68, 498, 497, 500, 499, 494, + 68, 496, 68, 495, 68, 501, 68, 132, 505, 503, + 508, 502, 506, 504, 68, 68, 512, 507, 68, 510, + 68, 68, 68, 68, 513, 68, 68, 511, 68, 68, + 68, 515, 68, 521, 520, 519, 509, 518, 68, 68, + 514, 516, 517, 68, 528, 522, 68, 523, 68, 68, + 524, 531, 532, 68, 68, 525, 533, 530, 68, 534, + 68, 526, 527, 537, 529, 68, 536, 68, 68, 535, + 68, 68, 538, 68, 542, 68, 68, 68, 547, 541, + + 546, 68, 545, 68, 68, 68, 548, 549, 539, 540, + 543, 68, 68, 551, 544, 68, 68, 68, 550, 68, + 556, 68, 554, 552, 68, 558, 555, 68, 68, 68, + 68, 560, 557, 68, 553, 68, 562, 68, 68, 68, + 68, 564, 68, 561, 567, 68, 559, 68, 563, 565, + 68, 68, 68, 68, 68, 573, 572, 68, 566, 68, + 68, 568, 569, 68, 581, 578, 576, 570, 68, 68, + 571, 574, 579, 575, 577, 68, 68, 580, 68, 582, + 68, 68, 587, 585, 588, 68, 68, 583, 584, 68, + 68, 592, 68, 589, 594, 68, 68, 595, 132, 591, + + 68, 586, 68, 590, 68, 68, 597, 68, 68, 68, + 68, 68, 593, 606, 68, 596, 68, 68, 68, 68, + 68, 600, 609, 598, 612, 608, 613, 68, 611, 599, + 68, 68, 618, 601, 619, 602, 607, 610, 625, 603, + 68, 604, 68, 614, 68, 621, 605, 68, 615, 68, + 616, 68, 620, 68, 622, 623, 626, 68, 68, 628, + 68, 68, 627, 629, 68, 624, 68, 68, 617, 68, + 68, 632, 630, 68, 631, 68, 68, 640, 634, 68, + 636, 68, 68, 68, 68, 68, 633, 68, 639, 635, + 638, 68, 644, 637, 647, 68, 645, 68, 654, 643, + + 641, 642, 646, 68, 648, 649, 68, 650, 68, 68, + 68, 651, 68, 68, 652, 68, 68, 653, 657, 68, + 68, 655, 661, 68, 659, 660, 68, 68, 656, 68, + 658, 68, 663, 664, 68, 68, 665, 68, 667, 662, + 68, 68, 68, 68, 68, 68, 677, 666, 672, 668, + 673, 68, 68, 676, 671, 675, 669, 68, 678, 68, + 670, 68, 674, 68, 680, 68, 684, 68, 68, 68, + 68, 68, 679, 68, 68, 682, 68, 68, 681, 683, + 686, 68, 692, 700, 68, 68, 685, 68, 687, 690, + 689, 693, 68, 68, 68, 695, 68, 691, 688, 694, + + 68, 68, 68, 701, 68, 697, 696, 68, 698, 703, + 68, 702, 68, 68, 68, 705, 699, 707, 68, 68, + 68, 68, 68, 708, 68, 68, 704, 68, 68, 68, + 68, 706, 711, 709, 710, 715, 719, 718, 68, 720, + 712, 68, 714, 713, 68, 716, 721, 717, 68, 68, + 724, 68, 68, 723, 725, 68, 729, 68, 730, 68, + 728, 68, 68, 68, 722, 727, 68, 731, 726, 68, + 733, 732, 734, 68, 68, 738, 739, 737, 735, 68, + 68, 68, 68, 68, 740, 68, 741, 68, 736, 68, + 68, 747, 742, 68, 68, 68, 746, 743, 68, 744, + + 68, 745, 68, 752, 748, 756, 68, 750, 749, 68, + 758, 68, 753, 751, 68, 68, 68, 759, 754, 68, + 760, 762, 68, 68, 757, 764, 68, 755, 765, 766, + 68, 68, 68, 68, 68, 761, 68, 768, 68, 763, + 68, 769, 772, 770, 774, 775, 68, 773, 68, 68, + 68, 767, 771, 776, 777, 778, 68, 68, 68, 68, + 781, 68, 68, 68, 784, 68, 68, 68, 780, 68, + 68, 68, 788, 68, 68, 779, 793, 68, 782, 68, + 794, 68, 68, 785, 797, 783, 786, 789, 787, 68, + 790, 791, 68, 68, 68, 68, 68, 792, 800, 68, + + 796, 68, 132, 795, 68, 68, 68, 798, 68, 806, + 803, 801, 799, 807, 802, 68, 804, 810, 805, 68, + 808, 68, 68, 809, 68, 815, 816, 812, 68, 814, + 68, 68, 68, 817, 811, 818, 68, 68, 68, 68, + 822, 68, 819, 813, 823, 68, 68, 821, 824, 68, + 68, 68, 820, 68, 830, 68, 68, 829, 825, 68, + 826, 68, 68, 68, 68, 68, 838, 835, 68, 828, + 68, 68, 827, 839, 831, 832, 68, 68, 68, 837, + 833, 834, 840, 841, 836, 842, 844, 68, 68, 68, + 68, 843, 130, 845, 846, 848, 68, 847, 68, 851, + + 68, 850, 68, 852, 853, 68, 68, 849, 68, 854, + 68, 68, 68, 856, 855, 68, 68, 857, 68, 68, + 859, 861, 68, 68, 863, 68, 68, 68, 68, 866, + 68, 858, 68, 860, 68, 868, 862, 865, 68, 871, + 68, 864, 870, 68, 68, 68, 867, 875, 877, 876, + 869, 68, 68, 68, 872, 68, 68, 68, 68, 885, + 873, 880, 881, 874, 68, 884, 879, 883, 68, 68, + 68, 878, 68, 68, 68, 68, 892, 68, 889, 68, + 891, 882, 68, 68, 893, 68, 886, 68, 887, 900, + 68, 68, 888, 68, 68, 68, 68, 890, 68, 68, + + 894, 897, 898, 895, 899, 896, 68, 906, 68, 68, + 907, 909, 68, 901, 904, 902, 905, 903, 68, 68, + 68, 910, 908, 68, 911, 68, 68, 914, 918, 919, + 68, 68, 913, 68, 915, 917, 912, 916, 68, 68, + 68, 68, 68, 68, 926, 68, 68, 68, 929, 68, + 931, 920, 921, 68, 923, 68, 922, 68, 68, 68, + 925, 927, 934, 932, 928, 930, 924, 68, 68, 933, + 68, 935, 939, 936, 68, 68, 938, 68, 68, 937, + 68, 68, 68, 68, 68, 945, 68, 946, 947, 948, + 68, 68, 940, 942, 941, 949, 943, 952, 68, 68, + + 944, 68, 68, 956, 68, 68, 951, 68, 68, 960, + 68, 954, 68, 950, 955, 953, 957, 68, 959, 961, + 68, 963, 68, 958, 964, 68, 962, 68, 965, 68, + 968, 68, 68, 970, 68, 971, 68, 972, 68, 68, + 974, 973, 68, 976, 966, 68, 68, 967, 68, 978, + 68, 980, 969, 68, 979, 68, 68, 975, 68, 68, + 68, 68, 988, 68, 68, 68, 990, 981, 68, 982, + 68, 977, 68, 68, 983, 993, 68, 68, 984, 985, + 986, 992, 987, 68, 995, 994, 68, 998, 991, 68, + 989, 68, 996, 68, 68, 1002, 68, 68, 1001, 997, + + 68, 1005, 68, 1004, 68, 68, 1007, 1000, 68, 1006, + 68, 68, 68, 68, 1003, 999, 1014, 68, 1012, 68, + 1017, 68, 1013, 1009, 68, 1008, 1011, 68, 1020, 1010, + 1015, 1021, 68, 68, 1022, 1016, 68, 1024, 1023, 68, + 68, 1019, 68, 68, 1026, 1018, 68, 1028, 1025, 68, + 68, 1031, 1027, 68, 68, 1033, 68, 68, 1029, 68, + 68, 68, 1035, 1036, 68, 1034, 1037, 68, 68, 1042, + 1041, 68, 68, 68, 1038, 1030, 1032, 1039, 68, 1040, + 68, 1043, 68, 1048, 68, 68, 68, 1046, 1050, 1045, + 68, 1047, 1044, 68, 68, 1052, 68, 1055, 1053, 1049, + + 1054, 68, 68, 1051, 68, 1057, 68, 68, 68, 68, + 68, 68, 68, 68, 68, 1065, 68, 1064, 68, 1059, + 1060, 1061, 1056, 128, 68, 1062, 68, 1058, 1069, 68, + 1068, 1063, 1066, 1067, 68, 68, 68, 1072, 68, 1071, + 68, 1073, 1077, 1074, 1070, 68, 1076, 68, 68, 68, + 1078, 1081, 68, 68, 68, 68, 1085, 68, 1075, 68, + 68, 68, 68, 1080, 1086, 1082, 1083, 1079, 68, 1084, + 68, 1087, 68, 1088, 1090, 1089, 68, 68, 1092, 68, + 1091, 68, 1093, 1094, 1097, 68, 1099, 68, 1096, 68, + 1098, 68, 68, 68, 68, 1101, 68, 1095, 1102, 1104, + + 68, 68, 1105, 1107, 68, 1103, 68, 1108, 1100, 68, + 1106, 68, 68, 68, 68, 68, 1110, 1111, 68, 1113, + 68, 1109, 1114, 68, 68, 68, 68, 1112, 1121, 68, + 68, 1135, 68, 1122, 1115, 68, 1119, 68, 1125, 1117, + 1126, 68, 1116, 68, 1118, 1123, 1120, 68, 1124, 1127, + 68, 1129, 68, 1130, 68, 68, 1128, 1132, 68, 1133, + 68, 1136, 68, 68, 1138, 68, 1131, 68, 68, 68, + 68, 1141, 68, 1142, 1134, 1140, 1144, 68, 1146, 68, + 1147, 68, 1137, 68, 68, 1139, 68, 1149, 1143, 1145, + 68, 68, 68, 1150, 68, 68, 1152, 68, 68, 68, + + 1160, 68, 1151, 1156, 68, 68, 68, 1154, 1158, 1148, + 1159, 68, 1157, 68, 68, 1161, 1155, 1153, 68, 1164, + 1165, 1168, 1163, 127, 1162, 68, 68, 1166, 68, 68, + 1183, 68, 1170, 1172, 68, 1167, 1171, 68, 68, 68, + 1169, 1173, 1174, 1175, 68, 68, 68, 68, 68, 1181, + 1176, 1178, 68, 1180, 68, 68, 68, 1184, 1177, 125, + 68, 1182, 1186, 68, 1185, 68, 1179, 68, 1187, 1188, + 68, 68, 1190, 68, 1191, 68, 1189, 1192, 68, 1193, + 68, 1194, 68, 68, 68, 1195, 1197, 68, 1196, 1198, + 68, 68, 1199, 68, 1200, 68, 1201, 1202, 68, 1203, + + 68, 1204, 68, 68, 68, 1205, 68, 68, 1211, 68, + 68, 68, 68, 1206, 68, 1207, 1208, 68, 1209, 1212, + 68, 68, 68, 68, 68, 1221, 68, 1210, 1219, 1220, + 1215, 68, 1214, 68, 1217, 68, 1223, 1213, 1216, 1218, + 1222, 1224, 68, 68, 68, 68, 1226, 68, 1231, 68, + 1232, 1227, 1225, 68, 68, 68, 68, 68, 68, 68, + 1238, 1229, 1228, 1239, 68, 68, 1230, 68, 1233, 1242, + 68, 68, 68, 1234, 1244, 68, 1235, 1236, 68, 1237, + 1240, 1245, 68, 68, 1246, 1241, 68, 1248, 68, 68, + 1243, 1249, 68, 1250, 1247, 68, 68, 1251, 68, 123, + + 1253, 1254, 1256, 68, 1257, 68, 1258, 1252, 1259, 68, + 68, 68, 68, 1255, 1260, 68, 68, 1261, 68, 1263, + 68, 68, 1262, 68, 1267, 68, 68, 68, 68, 1265, + 1266, 1264, 1271, 68, 1268, 1273, 68, 1272, 68, 68, + 68, 68, 68, 1275, 68, 1269, 1270, 1274, 68, 1276, + 1278, 68, 68, 1280, 1277, 68, 1282, 68, 1281, 1283, + 68, 68, 1279, 1286, 1287, 68, 1284, 68, 68, 68, + 68, 1288, 68, 68, 68, 1285, 1289, 68, 1293, 68, + 1291, 68, 68, 68, 1295, 68, 68, 68, 1290, 1300, + 1294, 68, 1292, 68, 1298, 1302, 68, 1303, 68, 68, + + 1304, 1296, 68, 1299, 68, 1301, 68, 1305, 1297, 1308, + 68, 1306, 68, 1309, 68, 1310, 68, 68, 68, 1311, + 1315, 68, 68, 68, 68, 1312, 68, 1307, 68, 1313, + 68, 1316, 1314, 68, 1317, 1320, 1319, 1323, 68, 68, + 1325, 68, 1318, 68, 1324, 1322, 1328, 68, 1329, 68, + 1321, 68, 68, 1326, 68, 1333, 68, 68, 1335, 68, + 68, 68, 68, 68, 1331, 1327, 1373, 1338, 1342, 1334, + 1330, 1339, 68, 68, 1332, 1337, 1340, 68, 1346, 1336, + 1341, 68, 1343, 68, 68, 1344, 1345, 68, 68, 1348, + 68, 68, 68, 68, 1352, 68, 1347, 1349, 1350, 68, + + 1354, 68, 68, 1353, 1356, 68, 1355, 68, 68, 1359, + 68, 1351, 1360, 68, 1361, 68, 1362, 68, 68, 68, + 1364, 68, 1357, 68, 68, 1365, 1358, 1367, 68, 68, + 1363, 68, 68, 1368, 1372, 68, 1373, 1373, 1373, 1373, + 1373, 1373, 1373, 1366, 1369, 1370, 1373, 1373, 1373, 1373, + 1373, 1371, 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, 1373, + 71, 71, 71, 71, 122, 122, 1373, 1373, 1373, 122, + + 122, 124, 124, 1373, 1373, 124, 1373, 124, 126, 1373, + 1373, 1373, 1373, 1373, 126, 129, 129, 1373, 1373, 1373, + 129, 129, 131, 1373, 1373, 1373, 1373, 1373, 131, 133, + 133, 1373, 133, 133, 133, 133, 72, 72, 1373, 72, + 72, 72, 72, 13, 1373, 1373, 1373, 1373, 1373, 1373, + 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, + 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, + 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, + 1373, 1373, 1373 } ; -static yyconst flex_int16_t yy_chk[2771] = +static yyconst flex_int16_t yy_chk[2784] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1195,7 +1200,7 @@ static yyconst flex_int16_t yy_chk[2771] = 9, 118, 33, 6, 7, 7, 7, 7, 9, 7, 10, 10, 10, 44, 44, 7, 8, 8, 8, 8, 10, 8, 21, 33, 118, 21, 21, 8, 11, 11, - 11, 11, 11, 11, 1370, 20, 29, 20, 20, 11, + 11, 11, 11, 11, 1379, 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, @@ -1205,7 +1210,7 @@ static yyconst flex_int16_t yy_chk[2771] = 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, 591, 36, 36, + 37, 76, 37, 34, 36, 109, 38, 595, 36, 36, 55, 38, 55, 55, 79, 55, 93, 37, 60, 60, 63, 78, 63, 63, 65, 63, 65, 65, 79, 65, @@ -1246,250 +1251,252 @@ static yyconst flex_int16_t yy_chk[2771] = 227, 232, 222, 224, 223, 231, 228, 223, 228, 228, 233, 226, 227, 229, 229, 230, 232, 225, 230, 233, 234, 234, 231, 235, 237, 231, 236, 236, 235, 238, - 239, 240, 241, 242, 243, 239, 242, 241, 244, 237, - 246, 245, 247, 248, 250, 246, 249, 247, 243, 238, - 245, 240, 251, 252, 244, 251, 255, 244, 250, 244, - 256, 254, 258, 257, 248, 255, 249, 252, 260, 259, - 261, 251, 253, 260, 253, 253, 254, 258, 262, 263, - - 264, 256, 257, 265, 253, 271, 253, 253, 253, 259, - 261, 253, 268, 262, 263, 269, 266, 265, 270, 271, - 264, 266, 267, 267, 272, 267, 272, 274, 275, 273, - 276, 269, 268, 273, 270, 277, 278, 280, 126, 276, - 288, 278, 275, 279, 277, 274, 280, 279, 281, 282, - 283, 284, 276, 281, 283, 282, 284, 285, 286, 286, - 287, 288, 289, 290, 291, 287, 292, 292, 291, 293, - 285, 289, 294, 298, 293, 290, 295, 295, 297, 297, - 299, 300, 303, 301, 304, 305, 306, 308, 299, 307, - 300, 306, 308, 294, 298, 301, 309, 307, 310, 305, - - 312, 311, 303, 313, 304, 311, 314, 315, 313, 317, - 320, 321, 321, 319, 309, 312, 318, 322, 319, 324, - 310, 327, 314, 319, 323, 323, 315, 316, 316, 317, - 320, 326, 318, 316, 324, 316, 325, 328, 330, 329, - 327, 331, 322, 316, 329, 335, 326, 330, 325, 332, - 333, 334, 336, 316, 333, 337, 334, 335, 341, 328, - 331, 338, 338, 339, 332, 340, 342, 343, 337, 342, - 336, 344, 344, 341, 350, 339, 346, 340, 345, 345, - 343, 346, 347, 347, 348, 348, 349, 351, 356, 352, - 359, 349, 351, 352, 353, 350, 354, 355, 357, 353, - - 354, 358, 355, 357, 359, 362, 358, 360, 356, 363, - 360, 361, 361, 364, 363, 360, 371, 365, 368, 360, - 365, 366, 364, 362, 367, 366, 370, 369, 371, 367, - 372, 368, 369, 373, 374, 372, 377, 374, 375, 373, - 376, 375, 370, 378, 379, 376, 389, 366, 380, 379, - 381, 380, 124, 383, 377, 381, 382, 378, 383, 384, - 382, 382, 385, 390, 389, 385, 386, 387, 384, 387, - 386, 386, 388, 391, 388, 392, 394, 399, 393, 395, - 385, 390, 393, 396, 397, 394, 398, 400, 400, 401, - 403, 398, 391, 401, 395, 392, 399, 402, 404, 397, - - 405, 396, 402, 406, 407, 408, 403, 411, 412, 407, - 406, 409, 408, 405, 410, 412, 409, 404, 413, 410, - 414, 415, 418, 419, 419, 411, 415, 413, 416, 417, - 421, 416, 419, 417, 414, 421, 422, 423, 424, 425, - 422, 428, 431, 418, 432, 433, 424, 434, 436, 433, - 432, 431, 434, 436, 425, 423, 437, 438, 428, 435, - 443, 435, 439, 435, 122, 439, 435, 440, 440, 441, - 447, 435, 442, 442, 437, 443, 441, 435, 435, 444, - 444, 445, 438, 446, 445, 448, 449, 451, 446, 452, - 447, 450, 450, 453, 449, 454, 454, 458, 453, 67, - - 455, 456, 451, 458, 448, 455, 456, 452, 457, 459, - 460, 457, 461, 463, 462, 464, 464, 459, 460, 462, - 463, 465, 466, 467, 470, 469, 472, 466, 469, 465, - 461, 471, 471, 473, 475, 476, 473, 477, 470, 478, - 479, 472, 467, 480, 473, 481, 482, 483, 485, 481, - 484, 487, 480, 488, 490, 475, 476, 477, 490, 484, - 479, 478, 485, 486, 482, 489, 483, 488, 491, 486, - 489, 487, 492, 493, 494, 495, 495, 496, 493, 498, - 497, 499, 496, 497, 492, 500, 501, 491, 502, 502, - 500, 503, 503, 504, 499, 494, 505, 498, 506, 507, - - 505, 508, 513, 510, 512, 511, 501, 510, 504, 517, - 514, 515, 516, 61, 517, 508, 513, 506, 516, 512, - 518, 518, 520, 507, 509, 515, 518, 509, 518, 509, - 511, 514, 519, 509, 523, 509, 520, 519, 521, 523, - 509, 522, 522, 524, 525, 526, 518, 527, 527, 528, - 521, 524, 530, 528, 532, 533, 531, 530, 525, 531, - 534, 535, 536, 537, 526, 534, 539, 538, 533, 540, - 541, 536, 538, 532, 544, 546, 542, 545, 56, 541, - 535, 542, 537, 540, 547, 550, 539, 548, 51, 547, - 546, 549, 548, 544, 550, 545, 549, 551, 551, 552, - - 556, 554, 557, 556, 552, 554, 554, 555, 555, 558, - 559, 555, 560, 559, 561, 562, 563, 557, 564, 561, - 562, 566, 563, 567, 564, 565, 565, 569, 568, 558, - 566, 568, 570, 560, 571, 572, 50, 573, 574, 575, - 582, 567, 573, 574, 576, 569, 580, 576, 572, 577, - 578, 570, 583, 579, 571, 578, 584, 575, 579, 582, - 577, 580, 581, 581, 586, 585, 583, 587, 584, 585, - 588, 589, 592, 593, 594, 595, 587, 598, 596, 597, - 595, 599, 586, 596, 597, 600, 592, 601, 593, 588, - 600, 598, 602, 604, 594, 599, 589, 603, 603, 605, - - 606, 607, 601, 609, 608, 606, 610, 602, 605, 608, - 610, 604, 611, 612, 613, 614, 615, 616, 617, 618, - 607, 611, 609, 620, 619, 618, 625, 614, 612, 613, - 624, 621, 623, 626, 625, 615, 617, 623, 616, 619, - 621, 627, 629, 620, 624, 628, 627, 630, 631, 628, - 628, 632, 640, 626, 633, 633, 632, 631, 634, 635, - 630, 629, 637, 634, 635, 636, 636, 638, 639, 641, - 640, 637, 638, 642, 641, 643, 645, 644, 642, 648, - 643, 644, 639, 648, 646, 645, 649, 650, 651, 652, - 645, 653, 645, 654, 645, 646, 655, 656, 662, 653, - - 664, 649, 651, 657, 657, 650, 661, 654, 652, 658, - 658, 661, 660, 668, 655, 660, 666, 662, 663, 663, - 664, 666, 656, 665, 665, 667, 667, 669, 670, 671, - 672, 673, 669, 668, 671, 674, 670, 673, 676, 677, - 678, 679, 674, 676, 677, 678, 679, 680, 672, 681, - 682, 683, 683, 684, 685, 686, 680, 689, 687, 688, - 686, 682, 690, 690, 691, 692, 694, 693, 681, 697, - 698, 701, 45, 684, 700, 689, 696, 685, 687, 688, - 696, 696, 699, 703, 691, 693, 704, 699, 698, 694, - 692, 701, 700, 702, 705, 697, 706, 702, 707, 708, - - 709, 703, 711, 712, 708, 704, 713, 709, 705, 710, - 714, 706, 712, 715, 710, 40, 714, 707, 716, 717, - 711, 713, 718, 716, 717, 719, 719, 718, 721, 721, - 722, 723, 724, 725, 715, 722, 727, 725, 725, 726, - 726, 728, 729, 730, 731, 723, 733, 732, 734, 737, - 731, 724, 732, 735, 736, 727, 738, 740, 740, 739, - 728, 741, 730, 737, 745, 733, 741, 734, 729, 743, - 744, 742, 735, 736, 739, 742, 749, 738, 747, 744, - 746, 746, 743, 747, 745, 748, 750, 753, 764, 748, - 755, 750, 753, 754, 754, 755, 749, 757, 757, 759, - - 759, 761, 762, 762, 761, 763, 765, 766, 767, 767, - 768, 765, 770, 764, 769, 769, 771, 772, 773, 774, - 763, 772, 766, 776, 774, 777, 779, 771, 778, 778, - 768, 780, 781, 782, 770, 782, 785, 773, 783, 777, - 784, 776, 787, 783, 786, 784, 779, 790, 787, 789, - 791, 780, 781, 791, 789, 792, 785, 794, 786, 795, - 792, 793, 793, 796, 797, 798, 799, 800, 800, 797, - 803, 799, 790, 802, 801, 794, 804, 806, 795, 801, - 805, 808, 807, 796, 809, 810, 808, 811, 798, 806, - 803, 802, 813, 814, 805, 807, 804, 815, 816, 822, - - 814, 819, 819, 823, 809, 810, 815, 813, 811, 815, - 820, 821, 823, 820, 816, 822, 821, 824, 825, 826, - 827, 828, 828, 829, 830, 827, 831, 825, 826, 833, - 825, 832, 834, 835, 835, 836, 824, 830, 837, 840, - 14, 839, 841, 829, 831, 832, 839, 841, 843, 842, - 834, 836, 844, 843, 833, 842, 837, 840, 845, 849, - 848, 845, 850, 851, 861, 844, 853, 845, 848, 852, - 855, 856, 849, 857, 858, 856, 859, 860, 857, 858, - 850, 859, 851, 862, 853, 852, 860, 861, 863, 863, - 855, 864, 865, 869, 866, 867, 868, 870, 862, 876, - - 867, 871, 871, 870, 865, 864, 866, 873, 868, 872, - 872, 869, 874, 874, 875, 877, 873, 878, 880, 875, - 876, 879, 879, 881, 881, 882, 882, 883, 884, 887, - 886, 884, 883, 889, 877, 886, 888, 878, 880, 890, - 890, 888, 891, 891, 892, 893, 894, 887, 895, 892, - 896, 897, 898, 898, 899, 900, 900, 893, 889, 893, - 903, 901, 904, 904, 893, 907, 894, 905, 895, 903, - 896, 906, 897, 908, 907, 909, 909, 910, 906, 911, - 899, 901, 905, 913, 914, 915, 916, 918, 913, 914, - 917, 917, 918, 916, 920, 911, 921, 919, 922, 908, - - 923, 924, 928, 910, 925, 915, 919, 924, 926, 927, - 927, 921, 929, 925, 920, 923, 930, 922, 939, 926, - 934, 930, 936, 928, 926, 932, 929, 931, 931, 932, - 932, 933, 934, 935, 936, 937, 933, 938, 935, 937, - 940, 941, 942, 939, 943, 940, 13, 942, 945, 938, - 957, 945, 946, 946, 947, 947, 943, 949, 948, 950, - 951, 954, 949, 941, 948, 950, 956, 956, 957, 951, - 958, 959, 964, 954, 961, 961, 965, 966, 956, 958, - 959, 965, 967, 967, 971, 968, 964, 968, 969, 969, - 972, 971, 973, 973, 966, 974, 975, 976, 978, 977, - - 979, 981, 982, 983, 982, 984, 981, 988, 975, 976, - 972, 977, 986, 978, 984, 994, 974, 987, 987, 989, - 979, 983, 991, 990, 989, 990, 986, 991, 993, 992, - 998, 995, 996, 988, 992, 994, 995, 996, 999, 1000, - 1000, 1001, 1002, 1003, 1010, 1003, 993, 1004, 1005, 998, - 1006, 1002, 999, 1001, 1002, 1006, 1004, 1007, 1009, 1011, - 1005, 1013, 1007, 1015, 1010, 1016, 1021, 1013, 1017, 1015, - 1019, 1009, 1018, 1018, 1022, 1011, 1024, 1017, 1022, 1019, - 1020, 1020, 1023, 1025, 1025, 1021, 1026, 1023, 1029, 1024, - 1016, 1030, 1030, 1032, 1026, 1031, 1031, 1029, 1033, 1035, - - 1034, 1036, 1037, 1033, 1034, 1032, 1036, 1038, 1040, 1042, - 1041, 1043, 1044, 1066, 1035, 1046, 1046, 1047, 1048, 1066, - 1047, 1049, 0, 1043, 1050, 1050, 1038, 1053, 1037, 1041, - 1042, 1048, 1040, 1044, 1049, 1051, 1051, 1052, 1052, 1056, - 1053, 1054, 1054, 1055, 1055, 1057, 1057, 1058, 1058, 1059, - 1061, 1062, 1062, 1063, 1070, 1061, 1064, 1064, 1056, 1065, - 1067, 1069, 1069, 1067, 1068, 1068, 1071, 1071, 1059, 1073, - 1073, 1074, 1063, 1070, 1075, 1075, 1076, 1065, 1077, 1078, - 1068, 1079, 1080, 1081, 1078, 1076, 1082, 1083, 1086, 1084, - 1077, 1082, 1085, 1086, 1089, 1080, 1087, 1074, 1084, 1091, - - 1087, 1085, 1083, 1096, 1081, 1097, 1079, 1093, 1091, 1092, - 1092, 1154, 1093, 1113, 1089, 1094, 1094, 1097, 1096, 1099, - 1100, 1106, 1099, 1108, 1094, 1100, 1101, 1101, 1102, 1113, - 1103, 1105, 1102, 1103, 1104, 1104, 1105, 1154, 1107, 1109, - 1110, 1106, 1107, 1108, 1109, 1110, 1111, 1115, 1114, 1116, - 1133, 1116, 1111, 1114, 1132, 1115, 1119, 1119, 1122, 1122, - 1125, 1126, 1126, 1128, 1128, 1125, 1130, 1131, 1131, 1134, - 1132, 1130, 1133, 1139, 1134, 1136, 1136, 1140, 1139, 1140, - 1141, 1142, 1143, 1143, 1144, 1144, 1142, 1145, 1145, 1146, - 1147, 1148, 1149, 1150, 1141, 1151, 1152, 1152, 1153, 1155, - - 1156, 1146, 1157, 1148, 1149, 1150, 1158, 1153, 1147, 1159, - 1164, 1160, 1161, 1156, 1170, 1151, 1160, 1161, 1169, 1155, - 1158, 1162, 1162, 1165, 1165, 1168, 1157, 1159, 1164, 1167, - 1167, 1171, 1170, 1169, 1168, 1172, 1173, 1174, 1174, 1175, - 1177, 1176, 1178, 1183, 1175, 1180, 1186, 1184, 1187, 1171, - 1184, 1172, 1185, 1185, 1190, 1173, 1176, 1189, 1189, 1177, - 1197, 1186, 1178, 1183, 1180, 1198, 1187, 1191, 1191, 1192, - 1192, 1196, 1196, 1190, 1198, 1199, 1200, 1201, 1203, 1204, - 1199, 1200, 1197, 1205, 1204, 1201, 1206, 0, 1205, 1207, - 1207, 1208, 1208, 1203, 1209, 1210, 1210, 1211, 1211, 1209, - - 1213, 1206, 1214, 1216, 1217, 1213, 1216, 1218, 1223, 1219, - 1220, 1220, 1221, 1224, 1214, 1226, 1218, 1217, 1219, 1225, - 1225, 1221, 1227, 1227, 1226, 1228, 1229, 1223, 1231, 1232, - 1237, 1229, 1224, 1228, 1234, 1234, 1242, 1231, 1238, 1238, - 1239, 1243, 1232, 1239, 1240, 1240, 1241, 1241, 1244, 1252, - 1237, 1245, 1245, 1244, 1242, 1243, 1246, 1249, 1253, 1254, - 1246, 1255, 1255, 1249, 1256, 1257, 1253, 1258, 1252, 1259, - 1257, 1261, 1260, 1263, 1265, 1267, 1263, 1268, 1254, 1267, - 1256, 1260, 1266, 1266, 1270, 1271, 1268, 1258, 1272, 1275, - 1289, 1261, 1265, 1270, 1275, 1259, 1277, 1271, 1276, 1276, - - 1280, 1279, 1281, 1282, 1285, 1277, 1279, 1283, 1283, 1280, - 1284, 1286, 1288, 1272, 1287, 1290, 1289, 1288, 1282, 1284, - 1285, 1281, 1287, 1291, 1291, 1295, 1292, 1294, 1294, 1296, - 1286, 1292, 1297, 1297, 1290, 1298, 1298, 1299, 1300, 1301, - 1302, 1302, 1303, 1304, 1304, 1295, 1305, 1307, 1308, 0, - 1300, 1296, 0, 1308, 1303, 1312, 1299, 1309, 1309, 1301, - 1312, 1307, 1310, 1310, 1327, 1305, 1311, 1311, 1313, 1313, - 1315, 1315, 1317, 1317, 1318, 1321, 1322, 1322, 1329, 1318, - 1323, 1325, 1329, 1321, 1327, 1323, 1325, 1328, 1328, 1333, - 1333, 1335, 1337, 1337, 1338, 1335, 1340, 1341, 1341, 1342, - - 1342, 1344, 1344, 1346, 1346, 1348, 1349, 1349, 1354, 1338, - 1355, 1357, 1354, 1359, 1340, 1356, 1356, 1348, 1360, 1361, - 1357, 1362, 1362, 0, 0, 0, 0, 0, 1359, 0, - 1355, 0, 1360, 0, 0, 0, 0, 0, 1361, 1365, - 1365, 1365, 1365, 1365, 1365, 1365, 1366, 1366, 1366, 1366, - 1366, 1366, 1366, 1367, 1367, 1367, 1367, 1367, 1367, 1367, - 1368, 1368, 1368, 1368, 1368, 1368, 1368, 1369, 1369, 1369, - 1369, 1369, 1369, 1369, 1371, 1371, 0, 1371, 1371, 1371, - 1371, 1372, 1372, 0, 0, 0, 1372, 1372, 1373, 1373, - 0, 0, 1373, 0, 1373, 1374, 0, 0, 0, 0, - - 0, 1374, 1375, 1375, 0, 0, 0, 1375, 1375, 1376, - 0, 0, 0, 0, 0, 1376, 1377, 1377, 0, 1377, - 1377, 1377, 1377, 1378, 1378, 0, 1378, 1378, 1378, 1378, - 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, - 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, - 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, - 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364, 1364 + 239, 240, 241, 242, 243, 239, 242, 241, 242, 237, + 244, 245, 246, 248, 250, 249, 255, 246, 243, 238, + 245, 240, 247, 252, 254, 255, 244, 247, 250, 244, + 251, 244, 257, 251, 248, 249, 256, 252, 259, 254, + 258, 260, 265, 261, 262, 263, 260, 264, 126, 251, + + 253, 257, 253, 253, 269, 258, 265, 256, 259, 262, + 263, 268, 253, 261, 253, 253, 253, 264, 266, 253, + 269, 267, 267, 266, 267, 270, 271, 272, 273, 272, + 274, 268, 273, 275, 276, 277, 343, 278, 285, 343, + 271, 270, 278, 276, 277, 279, 280, 275, 274, 279, + 283, 285, 281, 282, 283, 280, 276, 281, 284, 282, + 286, 286, 287, 284, 288, 289, 290, 287, 291, 292, + 292, 293, 291, 294, 289, 298, 293, 300, 290, 295, + 295, 297, 297, 299, 303, 288, 300, 301, 304, 305, + 306, 299, 307, 308, 294, 306, 298, 309, 308, 301, + + 307, 310, 312, 305, 303, 311, 312, 313, 304, 314, + 316, 315, 318, 325, 314, 309, 323, 319, 322, 322, + 321, 329, 313, 310, 324, 324, 311, 315, 325, 316, + 317, 317, 318, 319, 320, 326, 317, 327, 317, 320, + 321, 323, 328, 329, 320, 330, 317, 326, 331, 332, + 330, 333, 327, 336, 334, 335, 317, 331, 334, 337, + 335, 328, 338, 339, 339, 336, 333, 340, 332, 341, + 342, 344, 345, 345, 351, 338, 353, 337, 124, 340, + 353, 341, 346, 346, 344, 342, 347, 348, 348, 349, + 349, 347, 350, 352, 354, 351, 355, 350, 352, 354, + + 355, 356, 357, 358, 359, 360, 356, 363, 358, 359, + 362, 362, 361, 364, 365, 361, 122, 367, 364, 360, + 361, 367, 357, 365, 361, 363, 366, 368, 369, 366, + 370, 371, 368, 372, 373, 370, 374, 375, 378, 373, + 375, 369, 374, 367, 379, 372, 376, 371, 377, 376, + 380, 381, 382, 377, 381, 380, 378, 382, 379, 383, + 384, 385, 389, 383, 383, 384, 386, 387, 391, 386, + 385, 387, 387, 388, 390, 388, 390, 392, 393, 394, + 396, 389, 401, 395, 386, 397, 391, 395, 398, 396, + 399, 400, 402, 402, 403, 392, 400, 393, 403, 394, + + 397, 401, 404, 405, 406, 399, 398, 404, 407, 408, + 409, 410, 411, 413, 416, 409, 408, 411, 410, 405, + 412, 407, 414, 406, 415, 412, 419, 417, 416, 414, + 419, 413, 417, 415, 418, 420, 423, 418, 421, 421, + 424, 423, 425, 426, 424, 430, 427, 421, 433, 434, + 435, 426, 440, 436, 435, 434, 420, 433, 436, 438, + 425, 427, 430, 437, 438, 437, 439, 437, 441, 443, + 437, 441, 442, 442, 445, 437, 443, 440, 444, 444, + 447, 437, 437, 447, 439, 446, 446, 448, 449, 445, + 450, 451, 448, 452, 452, 453, 454, 455, 457, 451, + + 456, 456, 455, 457, 459, 461, 458, 459, 449, 450, + 453, 458, 460, 461, 454, 462, 463, 464, 460, 465, + 466, 466, 464, 462, 467, 468, 465, 469, 471, 472, + 468, 471, 467, 474, 463, 473, 473, 477, 475, 478, + 479, 475, 480, 472, 478, 481, 469, 483, 474, 475, + 482, 484, 490, 485, 486, 484, 483, 487, 477, 489, + 488, 479, 480, 491, 492, 489, 487, 481, 494, 492, + 482, 485, 490, 486, 488, 493, 495, 491, 496, 493, + 497, 498, 498, 496, 499, 501, 502, 494, 495, 499, + 500, 503, 504, 500, 505, 505, 503, 506, 506, 502, + + 507, 497, 508, 501, 509, 510, 508, 511, 516, 513, + 515, 514, 504, 513, 518, 507, 517, 67, 519, 529, + 523, 511, 516, 509, 519, 515, 520, 522, 518, 510, + 512, 520, 522, 512, 523, 512, 514, 517, 529, 512, + 524, 512, 521, 521, 525, 525, 512, 527, 521, 526, + 521, 528, 524, 535, 526, 527, 530, 530, 531, 533, + 534, 536, 531, 534, 533, 528, 537, 538, 521, 539, + 540, 537, 535, 542, 536, 541, 543, 545, 539, 544, + 541, 547, 545, 548, 549, 553, 538, 550, 544, 540, + 543, 551, 550, 542, 553, 559, 551, 552, 559, 549, + + 547, 548, 552, 554, 554, 555, 560, 557, 561, 563, + 555, 557, 557, 558, 558, 562, 566, 558, 562, 564, + 565, 560, 566, 567, 564, 565, 568, 570, 561, 571, + 563, 573, 568, 569, 569, 572, 570, 574, 572, 567, + 575, 576, 581, 577, 579, 578, 582, 571, 577, 573, + 578, 582, 580, 581, 576, 580, 574, 584, 583, 586, + 575, 587, 579, 583, 585, 585, 589, 588, 590, 592, + 589, 591, 584, 593, 597, 587, 596, 598, 586, 588, + 591, 602, 599, 607, 607, 608, 590, 599, 592, 597, + 596, 600, 603, 605, 601, 602, 600, 598, 593, 601, + + 604, 606, 609, 608, 610, 604, 603, 611, 605, 610, + 612, 609, 613, 614, 615, 612, 606, 614, 616, 617, + 618, 619, 620, 615, 621, 628, 611, 624, 625, 622, + 623, 613, 618, 616, 617, 622, 627, 625, 629, 628, + 619, 627, 621, 620, 630, 623, 629, 624, 631, 633, + 632, 635, 634, 631, 632, 632, 636, 637, 637, 644, + 635, 636, 638, 641, 630, 634, 639, 638, 633, 640, + 640, 639, 641, 642, 643, 645, 646, 644, 642, 647, + 645, 646, 648, 649, 647, 650, 648, 652, 643, 653, + 654, 652, 649, 655, 656, 657, 650, 649, 658, 649, + + 659, 649, 660, 657, 653, 661, 661, 655, 654, 662, + 663, 663, 658, 656, 665, 666, 667, 665, 659, 669, + 666, 668, 668, 671, 662, 670, 670, 660, 671, 672, + 672, 673, 674, 675, 677, 667, 678, 674, 676, 669, + 679, 675, 678, 676, 681, 682, 685, 679, 683, 681, + 682, 673, 677, 683, 684, 685, 686, 687, 689, 684, + 688, 688, 690, 692, 691, 697, 693, 696, 687, 691, + 694, 695, 695, 698, 699, 686, 701, 702, 689, 704, + 701, 701, 703, 692, 704, 690, 693, 696, 694, 705, + 697, 698, 706, 708, 707, 709, 710, 699, 707, 712, + + 703, 711, 61, 702, 713, 716, 714, 705, 717, 713, + 710, 708, 706, 714, 709, 715, 711, 717, 712, 718, + 715, 719, 720, 716, 721, 722, 723, 719, 729, 721, + 722, 723, 724, 724, 718, 726, 726, 727, 728, 732, + 730, 733, 727, 720, 730, 730, 734, 729, 731, 731, + 735, 736, 728, 742, 737, 738, 739, 736, 732, 737, + 733, 740, 741, 743, 744, 745, 745, 742, 746, 735, + 748, 750, 734, 746, 738, 739, 749, 754, 747, 744, + 740, 741, 747, 748, 743, 749, 751, 751, 752, 757, + 753, 750, 56, 752, 753, 755, 759, 754, 760, 760, + + 755, 759, 769, 761, 763, 763, 770, 757, 761, 765, + 765, 767, 768, 768, 767, 771, 774, 769, 772, 776, + 771, 773, 773, 775, 775, 778, 777, 779, 783, 778, + 780, 770, 782, 772, 785, 780, 774, 777, 784, 784, + 786, 776, 783, 787, 789, 788, 779, 788, 790, 789, + 782, 791, 792, 790, 785, 793, 796, 795, 799, 799, + 786, 793, 795, 787, 797, 798, 792, 797, 800, 801, + 798, 791, 802, 803, 804, 805, 806, 806, 803, 807, + 805, 796, 808, 809, 807, 810, 800, 811, 801, 814, + 812, 813, 802, 815, 814, 816, 817, 804, 821, 819, + + 808, 811, 812, 809, 813, 810, 822, 821, 830, 820, + 821, 825, 825, 815, 819, 816, 820, 817, 826, 827, + 828, 826, 822, 829, 827, 831, 832, 830, 833, 834, + 834, 835, 829, 833, 831, 832, 828, 831, 837, 836, + 838, 839, 840, 841, 841, 842, 843, 846, 845, 849, + 847, 835, 836, 845, 838, 847, 837, 848, 851, 856, + 840, 842, 850, 848, 843, 846, 839, 850, 855, 849, + 852, 851, 856, 852, 857, 858, 855, 859, 860, 852, + 862, 863, 864, 865, 866, 863, 867, 864, 865, 866, + 868, 869, 857, 859, 858, 867, 860, 870, 870, 872, + + 862, 871, 873, 874, 875, 876, 869, 883, 874, 878, + 878, 872, 877, 868, 873, 871, 875, 880, 877, 879, + 879, 881, 881, 876, 882, 884, 880, 885, 883, 882, + 886, 886, 887, 888, 888, 889, 889, 890, 891, 894, + 893, 891, 890, 895, 884, 893, 896, 885, 895, 897, + 897, 899, 887, 898, 898, 900, 899, 894, 901, 902, + 903, 904, 905, 905, 906, 907, 907, 900, 908, 900, + 912, 896, 910, 915, 900, 911, 911, 913, 901, 902, + 903, 910, 904, 914, 913, 912, 916, 916, 908, 917, + 906, 918, 914, 920, 922, 921, 923, 926, 920, 915, + + 921, 924, 924, 923, 925, 927, 926, 918, 928, 925, + 929, 930, 931, 932, 922, 917, 933, 933, 931, 934, + 935, 935, 932, 928, 936, 927, 930, 937, 938, 929, + 934, 939, 939, 938, 940, 934, 942, 941, 940, 940, + 944, 937, 941, 945, 943, 936, 946, 945, 942, 943, + 947, 948, 944, 951, 949, 950, 948, 962, 946, 953, + 950, 959, 953, 954, 954, 951, 955, 955, 956, 962, + 959, 965, 957, 958, 956, 947, 949, 957, 966, 958, + 964, 964, 967, 969, 969, 972, 974, 966, 973, 965, + 979, 967, 964, 973, 975, 975, 976, 979, 976, 972, + + 977, 977, 980, 974, 981, 981, 982, 983, 984, 985, + 986, 987, 989, 990, 991, 990, 994, 989, 996, 983, + 984, 985, 980, 51, 992, 986, 1002, 982, 995, 995, + 994, 987, 991, 992, 997, 998, 999, 998, 1000, 997, + 1001, 999, 1003, 1000, 996, 1004, 1002, 1003, 1006, 1007, + 1004, 1008, 1008, 1009, 1011, 1012, 1011, 1010, 1001, 1013, + 1019, 1018, 1020, 1007, 1012, 1009, 1010, 1006, 1015, 1010, + 1016, 1013, 1025, 1015, 1018, 1016, 1022, 1024, 1020, 1026, + 1019, 1028, 1022, 1024, 1027, 1027, 1029, 1029, 1026, 1030, + 1028, 1031, 1033, 1032, 1035, 1031, 1046, 1025, 1032, 1034, + + 1034, 1038, 1035, 1039, 1039, 1033, 1040, 1040, 1030, 1041, + 1038, 1042, 1044, 1043, 1045, 1047, 1042, 1043, 1049, 1045, + 1050, 1041, 1046, 1051, 1052, 1053, 1070, 1044, 1055, 1055, + 1056, 1070, 1057, 1056, 1047, 1058, 1052, 1059, 1059, 1050, + 1060, 1060, 1049, 1062, 1051, 1057, 1053, 1065, 1058, 1061, + 1061, 1063, 1063, 1064, 1064, 1068, 1062, 1066, 1066, 1067, + 1067, 1071, 1071, 1072, 1073, 1073, 1065, 1074, 1076, 1075, + 1079, 1076, 1077, 1077, 1068, 1075, 1078, 1078, 1080, 1080, + 1082, 1082, 1072, 1083, 1085, 1074, 1084, 1084, 1077, 1079, + 1086, 1087, 1088, 1085, 1089, 1090, 1087, 1092, 1091, 1093, + + 1095, 1094, 1086, 1091, 1098, 1095, 1105, 1089, 1093, 1083, + 1094, 1096, 1092, 1100, 1122, 1096, 1090, 1088, 1101, 1101, + 1102, 1105, 1100, 50, 1098, 1102, 1103, 1103, 1106, 1108, + 1122, 1109, 1108, 1110, 1110, 1103, 1109, 1111, 1115, 1112, + 1106, 1111, 1112, 1113, 1113, 1114, 1117, 1116, 1118, 1119, + 1114, 1116, 1123, 1118, 1119, 1120, 1124, 1123, 1115, 45, + 1125, 1120, 1125, 1142, 1124, 1141, 1117, 1128, 1128, 1131, + 1131, 1134, 1135, 1135, 1137, 1137, 1134, 1139, 1140, 1140, + 1150, 1141, 1139, 1143, 1148, 1142, 1145, 1145, 1143, 1148, + 1149, 1151, 1149, 1155, 1150, 1156, 1151, 1152, 1152, 1153, + + 1153, 1154, 1154, 1157, 1158, 1155, 1159, 1160, 1161, 1161, + 1162, 1163, 1164, 1156, 1166, 1157, 1158, 1165, 1159, 1162, + 1167, 1168, 1173, 1169, 1170, 1171, 1171, 1160, 1169, 1170, + 1165, 1178, 1164, 1179, 1167, 1174, 1174, 1163, 1166, 1168, + 1173, 1176, 1176, 1177, 1180, 1181, 1178, 1182, 1183, 1183, + 1184, 1179, 1177, 1185, 1186, 1184, 1187, 1193, 1189, 1192, + 1193, 1181, 1180, 1194, 1194, 1195, 1182, 1196, 1185, 1198, + 1198, 1199, 1206, 1186, 1200, 1200, 1187, 1189, 1207, 1192, + 1195, 1201, 1201, 1205, 1205, 1196, 1208, 1207, 1209, 1210, + 1199, 1208, 1212, 1209, 1206, 1213, 1214, 1210, 1215, 40, + + 1213, 1214, 1216, 1216, 1217, 1217, 1218, 1212, 1219, 1219, + 1223, 1218, 1222, 1215, 1220, 1220, 1225, 1222, 1226, 1225, + 1227, 1228, 1223, 1229, 1229, 1230, 1232, 1233, 1235, 1227, + 1228, 1226, 1234, 1234, 1230, 1236, 1236, 1235, 1238, 1237, + 1240, 1241, 1246, 1238, 14, 1232, 1233, 1237, 1251, 1240, + 1243, 1243, 1247, 1247, 1241, 1248, 1249, 1249, 1248, 1250, + 1250, 1252, 1246, 1253, 1254, 1254, 1251, 1255, 1253, 1261, + 1258, 1255, 1262, 1263, 1265, 1252, 1258, 1264, 1264, 1266, + 1262, 1267, 1268, 1270, 1266, 1269, 1272, 1274, 1261, 1272, + 1265, 1277, 1263, 1276, 1269, 1275, 1275, 1276, 1279, 1280, + + 1277, 1267, 1281, 1270, 1284, 1274, 1286, 1279, 1268, 1284, + 1290, 1280, 1285, 1285, 1288, 1286, 1289, 1291, 1294, 1288, + 1292, 1292, 1293, 1295, 1298, 1289, 1299, 1281, 1296, 1290, + 1297, 1293, 1291, 1304, 1294, 1297, 1296, 1300, 1300, 1301, + 1303, 1303, 1295, 1305, 1301, 1299, 1306, 1306, 1307, 1307, + 1298, 1308, 1309, 1304, 1310, 1311, 1311, 1312, 1313, 1313, + 1314, 1316, 1317, 1321, 1309, 1305, 13, 1317, 1321, 1312, + 1308, 1318, 1318, 1327, 1310, 1316, 1319, 1319, 1327, 1314, + 1320, 1320, 1322, 1322, 1324, 1324, 1326, 1326, 1330, 1331, + 1331, 1336, 1332, 1334, 1337, 1337, 1330, 1332, 1334, 1338, + + 1342, 1342, 1344, 1338, 1346, 1346, 1344, 1347, 1349, 1350, + 1350, 1336, 1351, 1351, 1353, 1353, 1355, 1355, 1357, 1358, + 1358, 1363, 1347, 1364, 1366, 1363, 1349, 1365, 1365, 1368, + 1357, 1369, 1370, 1366, 1371, 1371, 0, 0, 0, 0, + 0, 0, 0, 1364, 1368, 1369, 0, 0, 0, 0, + 0, 1370, 1374, 1374, 1374, 1374, 1374, 1374, 1374, 1375, + 1375, 1375, 1375, 1375, 1375, 1375, 1376, 1376, 1376, 1376, + 1376, 1376, 1376, 1377, 1377, 1377, 1377, 1377, 1377, 1377, + 1378, 1378, 1378, 1378, 1378, 1378, 1378, 1380, 1380, 0, + 1380, 1380, 1380, 1380, 1381, 1381, 0, 0, 0, 1381, + + 1381, 1382, 1382, 0, 0, 1382, 0, 1382, 1383, 0, + 0, 0, 0, 0, 1383, 1384, 1384, 0, 0, 0, + 1384, 1384, 1385, 0, 0, 0, 0, 0, 1385, 1386, + 1386, 0, 1386, 1386, 1386, 1386, 1387, 1387, 0, 1387, + 1387, 1387, 1387, 1373, 1373, 1373, 1373, 1373, 1373, 1373, + 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, + 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, + 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, + 1373, 1373, 1373 } ; static yy_state_type yy_last_accepting_state; @@ -1691,7 +1698,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 1693 "" +#line 1700 "" #define INITIAL 0 #define quotedstring 1 @@ -1878,7 +1885,7 @@ YY_DECL #line 198 "./util/configlexer.lex" -#line 1880 "" +#line 1887 "" if ( !(yy_init) ) { @@ -1937,13 +1944,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 >= 1365 ) + if ( yy_current_state >= 1374 ) 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] != 2731 ); + while ( yy_base[yy_current_state] != 2744 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2108,519 +2115,524 @@ YY_RULE_SETUP case 28: YY_RULE_SETUP #line 229 "./util/configlexer.lex" -{ YDVAR(1, VAR_CHROOT) } +{ YDVAR(1, VAR_SO_REUSEPORT) } YY_BREAK case 29: YY_RULE_SETUP #line 230 "./util/configlexer.lex" -{ YDVAR(1, VAR_USERNAME) } +{ YDVAR(1, VAR_CHROOT) } YY_BREAK case 30: YY_RULE_SETUP #line 231 "./util/configlexer.lex" -{ YDVAR(1, VAR_DIRECTORY) } +{ YDVAR(1, VAR_USERNAME) } YY_BREAK case 31: YY_RULE_SETUP #line 232 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOGFILE) } +{ YDVAR(1, VAR_DIRECTORY) } YY_BREAK case 32: YY_RULE_SETUP #line 233 "./util/configlexer.lex" -{ YDVAR(1, VAR_PIDFILE) } +{ YDVAR(1, VAR_LOGFILE) } YY_BREAK case 33: YY_RULE_SETUP #line 234 "./util/configlexer.lex" -{ YDVAR(1, VAR_ROOT_HINTS) } +{ YDVAR(1, VAR_PIDFILE) } YY_BREAK case 34: YY_RULE_SETUP #line 235 "./util/configlexer.lex" -{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } +{ YDVAR(1, VAR_ROOT_HINTS) } YY_BREAK case 35: YY_RULE_SETUP #line 236 "./util/configlexer.lex" -{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } +{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } YY_BREAK case 36: YY_RULE_SETUP #line 237 "./util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SIZE) } +{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } YY_BREAK case 37: YY_RULE_SETUP #line 238 "./util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SLABS) } +{ YDVAR(1, VAR_MSG_CACHE_SIZE) } YY_BREAK case 38: YY_RULE_SETUP #line 239 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } +{ YDVAR(1, VAR_MSG_CACHE_SLABS) } YY_BREAK case 39: YY_RULE_SETUP #line 240 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } +{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } YY_BREAK case 40: YY_RULE_SETUP #line 241 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MAX_TTL) } +{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } YY_BREAK case 41: YY_RULE_SETUP #line 242 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MIN_TTL) } +{ YDVAR(1, VAR_CACHE_MAX_TTL) } YY_BREAK case 42: YY_RULE_SETUP #line 243 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_HOST_TTL) } +{ YDVAR(1, VAR_CACHE_MIN_TTL) } YY_BREAK case 43: YY_RULE_SETUP #line 244 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_LAME_TTL) } +{ YDVAR(1, VAR_INFRA_HOST_TTL) } YY_BREAK case 44: YY_RULE_SETUP #line 245 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } +{ YDVAR(1, VAR_INFRA_LAME_TTL) } YY_BREAK case 45: YY_RULE_SETUP #line 246 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } +{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } YY_BREAK case 46: YY_RULE_SETUP #line 247 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } +{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } YY_BREAK case 47: YY_RULE_SETUP #line 248 "./util/configlexer.lex" -{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } +{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } YY_BREAK case 48: YY_RULE_SETUP #line 249 "./util/configlexer.lex" -{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } +{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } YY_BREAK case 49: YY_RULE_SETUP #line 250 "./util/configlexer.lex" -{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } +{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } YY_BREAK case 50: YY_RULE_SETUP #line 251 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } +{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } YY_BREAK case 51: YY_RULE_SETUP #line 252 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } +{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } YY_BREAK case 52: YY_RULE_SETUP #line 253 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_GLUE) } +{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } YY_BREAK case 53: YY_RULE_SETUP #line 254 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } +{ YDVAR(1, VAR_HARDEN_GLUE) } YY_BREAK case 54: YY_RULE_SETUP #line 255 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } +{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 55: YY_RULE_SETUP #line 256 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } +{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } YY_BREAK case 56: YY_RULE_SETUP #line 257 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } +{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } YY_BREAK case 57: YY_RULE_SETUP #line 258 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } +{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } YY_BREAK case 58: YY_RULE_SETUP #line 259 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_ADDRESS) } +{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } YY_BREAK case 59: YY_RULE_SETUP #line 260 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_DOMAIN) } +{ YDVAR(1, VAR_PRIVATE_ADDRESS) } YY_BREAK case 60: YY_RULE_SETUP #line 261 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH_KEY) } +{ YDVAR(1, VAR_PRIVATE_DOMAIN) } YY_BREAK case 61: YY_RULE_SETUP #line 262 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH) } +{ YDVAR(1, VAR_PREFETCH_KEY) } YY_BREAK case 62: YY_RULE_SETUP #line 263 "./util/configlexer.lex" -{ YDVAR(0, VAR_STUB_ZONE) } +{ YDVAR(1, VAR_PREFETCH) } YY_BREAK case 63: YY_RULE_SETUP #line 264 "./util/configlexer.lex" -{ YDVAR(1, VAR_NAME) } +{ YDVAR(0, VAR_STUB_ZONE) } YY_BREAK case 64: YY_RULE_SETUP #line 265 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_ADDR) } +{ YDVAR(1, VAR_NAME) } YY_BREAK case 65: YY_RULE_SETUP #line 266 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_HOST) } +{ YDVAR(1, VAR_STUB_ADDR) } YY_BREAK case 66: YY_RULE_SETUP #line 267 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_PRIME) } +{ YDVAR(1, VAR_STUB_HOST) } YY_BREAK case 67: YY_RULE_SETUP #line 268 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_FIRST) } +{ YDVAR(1, VAR_STUB_PRIME) } YY_BREAK case 68: YY_RULE_SETUP #line 269 "./util/configlexer.lex" -{ YDVAR(0, VAR_FORWARD_ZONE) } +{ YDVAR(1, VAR_STUB_FIRST) } YY_BREAK case 69: YY_RULE_SETUP #line 270 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_ADDR) } +{ YDVAR(0, VAR_FORWARD_ZONE) } YY_BREAK case 70: YY_RULE_SETUP #line 271 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_HOST) } +{ YDVAR(1, VAR_FORWARD_ADDR) } YY_BREAK case 71: YY_RULE_SETUP #line 272 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_FIRST) } +{ YDVAR(1, VAR_FORWARD_HOST) } YY_BREAK case 72: YY_RULE_SETUP #line 273 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } +{ YDVAR(1, VAR_FORWARD_FIRST) } YY_BREAK case 73: YY_RULE_SETUP #line 274 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } +{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } YY_BREAK case 74: YY_RULE_SETUP #line 275 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL) } +{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } YY_BREAK case 75: YY_RULE_SETUP #line 276 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_IDENTITY) } +{ YDVAR(2, VAR_ACCESS_CONTROL) } YY_BREAK case 76: YY_RULE_SETUP #line 277 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_VERSION) } +{ YDVAR(1, VAR_HIDE_IDENTITY) } YY_BREAK case 77: YY_RULE_SETUP #line 278 "./util/configlexer.lex" -{ YDVAR(1, VAR_IDENTITY) } +{ YDVAR(1, VAR_HIDE_VERSION) } YY_BREAK case 78: YY_RULE_SETUP #line 279 "./util/configlexer.lex" -{ YDVAR(1, VAR_VERSION) } +{ YDVAR(1, VAR_IDENTITY) } YY_BREAK case 79: YY_RULE_SETUP #line 280 "./util/configlexer.lex" -{ YDVAR(1, VAR_MODULE_CONF) } +{ YDVAR(1, VAR_VERSION) } YY_BREAK case 80: YY_RULE_SETUP #line 281 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR) } +{ YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 81: YY_RULE_SETUP #line 282 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 82: YY_RULE_SETUP #line 283 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 83: YY_RULE_SETUP #line 284 "./util/configlexer.lex" -{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 84: YY_RULE_SETUP #line 285 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } +{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 85: YY_RULE_SETUP #line 286 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR) } +{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 86: YY_RULE_SETUP #line 287 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } +{ YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 87: YY_RULE_SETUP #line 288 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } +{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 88: YY_RULE_SETUP #line 289 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 89: YY_RULE_SETUP #line 290 "./util/configlexer.lex" -{ YDVAR(1, VAR_BOGUS_TTL) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 90: YY_RULE_SETUP #line 291 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } +{ YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 91: YY_RULE_SETUP #line 292 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } +{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 92: YY_RULE_SETUP #line 293 "./util/configlexer.lex" -{ YDVAR(1, VAR_IGNORE_CD_FLAG) } +{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 93: YY_RULE_SETUP #line 294 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 94: YY_RULE_SETUP #line 295 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 95: YY_RULE_SETUP #line 296 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 96: YY_RULE_SETUP #line 297 "./util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 97: YY_RULE_SETUP #line 298 "./util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 98: YY_RULE_SETUP -#line 300 "./util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 299 "./util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 99: YY_RULE_SETUP #line 301 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 100: YY_RULE_SETUP #line 302 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 101: YY_RULE_SETUP #line 303 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 102: YY_RULE_SETUP #line 304 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 103: YY_RULE_SETUP #line 305 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 104: YY_RULE_SETUP #line 306 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 105: YY_RULE_SETUP #line 307 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 106: YY_RULE_SETUP #line 308 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 107: YY_RULE_SETUP #line 309 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 108: YY_RULE_SETUP #line 310 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 109: YY_RULE_SETUP #line 311 "./util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 110: YY_RULE_SETUP #line 312 "./util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 111: YY_RULE_SETUP #line 313 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 112: YY_RULE_SETUP #line 314 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 113: YY_RULE_SETUP #line 315 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 114: YY_RULE_SETUP #line 316 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 115: YY_RULE_SETUP #line 317 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 116: YY_RULE_SETUP #line 318 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 117: YY_RULE_SETUP #line 319 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 118: YY_RULE_SETUP #line 320 "./util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 119: YY_RULE_SETUP #line 321 "./util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 120: YY_RULE_SETUP #line 322 "./util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 121: YY_RULE_SETUP #line 323 "./util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 122: YY_RULE_SETUP #line 324 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 123: YY_RULE_SETUP #line 325 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 124: -/* rule 124 can match eol */ YY_RULE_SETUP #line 326 "./util/configlexer.lex" +{ YDVAR(1, VAR_MAX_UDP_SIZE) } + YY_BREAK +case 125: +/* rule 125 can match eol */ +YY_RULE_SETUP +#line 327 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 125: +case 126: YY_RULE_SETUP -#line 329 "./util/configlexer.lex" +#line 330 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 330 "./util/configlexer.lex" +#line 331 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 126: +case 127: YY_RULE_SETUP -#line 335 "./util/configlexer.lex" +#line 336 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 127: -/* rule 127 can match eol */ +case 128: +/* rule 128 can match eol */ YY_RULE_SETUP -#line 336 "./util/configlexer.lex" +#line 337 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 128: +case 129: YY_RULE_SETUP -#line 338 "./util/configlexer.lex" +#line 339 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -2633,34 +2645,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 129: +case 130: YY_RULE_SETUP -#line 350 "./util/configlexer.lex" +#line 351 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 351 "./util/configlexer.lex" +#line 352 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 130: +case 131: YY_RULE_SETUP -#line 356 "./util/configlexer.lex" +#line 357 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 131: -/* rule 131 can match eol */ +case 132: +/* rule 132 can match eol */ YY_RULE_SETUP -#line 357 "./util/configlexer.lex" +#line 358 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 132: +case 133: YY_RULE_SETUP -#line 359 "./util/configlexer.lex" +#line 360 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -2673,38 +2685,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 133: +case 134: YY_RULE_SETUP -#line 371 "./util/configlexer.lex" +#line 372 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 373 "./util/configlexer.lex" +#line 374 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 134: -YY_RULE_SETUP -#line 377 "./util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 135: -/* rule 135 can match eol */ YY_RULE_SETUP #line 378 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 136: +/* rule 136 can match eol */ YY_RULE_SETUP #line 379 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 137: YY_RULE_SETUP #line 380 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 138: +YY_RULE_SETUP +#line 381 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -2712,27 +2724,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 385 "./util/configlexer.lex" +#line 386 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 138: +case 139: YY_RULE_SETUP -#line 389 "./util/configlexer.lex" +#line 390 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 139: -/* rule 139 can match eol */ +case 140: +/* rule 140 can match eol */ YY_RULE_SETUP -#line 390 "./util/configlexer.lex" +#line 391 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 140: +case 141: YY_RULE_SETUP -#line 392 "./util/configlexer.lex" +#line 393 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -2742,7 +2754,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 398 "./util/configlexer.lex" +#line 399 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -2754,33 +2766,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 141: +case 142: YY_RULE_SETUP -#line 409 "./util/configlexer.lex" +#line 410 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 142: +case 143: YY_RULE_SETUP -#line 413 "./util/configlexer.lex" +#line 414 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 143: +case 144: YY_RULE_SETUP -#line 417 "./util/configlexer.lex" +#line 418 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 144: +case 145: YY_RULE_SETUP -#line 421 "./util/configlexer.lex" +#line 422 "./util/configlexer.lex" ECHO; YY_BREAK -#line 2782 "" +#line 2794 "" case YY_END_OF_BUFFER: { @@ -3070,7 +3082,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 >= 1365 ) + if ( yy_current_state >= 1374 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3098,11 +3110,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 >= 1365 ) + if ( yy_current_state >= 1374 ) 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 == 1364); + yy_is_jam = (yy_current_state == 1373); return yy_is_jam ? 0 : yy_current_state; } @@ -3505,7 +3517,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; @@ -3735,7 +3747,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 421 "./util/configlexer.lex" +#line 422 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 0b3738fa1..5e625c850 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -226,6 +226,7 @@ outgoing-interface{COLON} { YDVAR(1, VAR_OUTGOING_INTERFACE) } interface-automatic{COLON} { YDVAR(1, VAR_INTERFACE_AUTOMATIC) } so-rcvbuf{COLON} { YDVAR(1, VAR_SO_RCVBUF) } so-sndbuf{COLON} { YDVAR(1, VAR_SO_SNDBUF) } +so-reuseport{COLON} { YDVAR(1, VAR_SO_REUSEPORT) } chroot{COLON} { YDVAR(1, VAR_CHROOT) } username{COLON} { YDVAR(1, VAR_USERNAME) } directory{COLON} { YDVAR(1, VAR_DIRECTORY) } diff --git a/util/configparser.c b/util/configparser.c index 69720ed24..f07d2d26d 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -242,19 +242,20 @@ extern int yydebug; VAR_PREFETCH = 370, VAR_PREFETCH_KEY = 371, VAR_SO_SNDBUF = 372, - VAR_HARDEN_BELOW_NXDOMAIN = 373, - VAR_IGNORE_CD_FLAG = 374, - VAR_LOG_QUERIES = 375, - VAR_TCP_UPSTREAM = 376, - VAR_SSL_UPSTREAM = 377, - VAR_SSL_SERVICE_KEY = 378, - VAR_SSL_SERVICE_PEM = 379, - VAR_SSL_PORT = 380, - VAR_FORWARD_FIRST = 381, - VAR_STUB_FIRST = 382, - VAR_MINIMAL_RESPONSES = 383, - VAR_RRSET_ROUNDROBIN = 384, - VAR_MAX_UDP_SIZE = 385 + VAR_SO_REUSEPORT = 373, + VAR_HARDEN_BELOW_NXDOMAIN = 374, + VAR_IGNORE_CD_FLAG = 375, + VAR_LOG_QUERIES = 376, + VAR_TCP_UPSTREAM = 377, + VAR_SSL_UPSTREAM = 378, + VAR_SSL_SERVICE_KEY = 379, + VAR_SSL_SERVICE_PEM = 380, + VAR_SSL_PORT = 381, + VAR_FORWARD_FIRST = 382, + VAR_STUB_FIRST = 383, + VAR_MINIMAL_RESPONSES = 384, + VAR_RRSET_ROUNDROBIN = 385, + VAR_MAX_UDP_SIZE = 386 }; #endif /* Tokens. */ @@ -373,19 +374,20 @@ extern int yydebug; #define VAR_PREFETCH 370 #define VAR_PREFETCH_KEY 371 #define VAR_SO_SNDBUF 372 -#define VAR_HARDEN_BELOW_NXDOMAIN 373 -#define VAR_IGNORE_CD_FLAG 374 -#define VAR_LOG_QUERIES 375 -#define VAR_TCP_UPSTREAM 376 -#define VAR_SSL_UPSTREAM 377 -#define VAR_SSL_SERVICE_KEY 378 -#define VAR_SSL_SERVICE_PEM 379 -#define VAR_SSL_PORT 380 -#define VAR_FORWARD_FIRST 381 -#define VAR_STUB_FIRST 382 -#define VAR_MINIMAL_RESPONSES 383 -#define VAR_RRSET_ROUNDROBIN 384 -#define VAR_MAX_UDP_SIZE 385 +#define VAR_SO_REUSEPORT 373 +#define VAR_HARDEN_BELOW_NXDOMAIN 374 +#define VAR_IGNORE_CD_FLAG 375 +#define VAR_LOG_QUERIES 376 +#define VAR_TCP_UPSTREAM 377 +#define VAR_SSL_UPSTREAM 378 +#define VAR_SSL_SERVICE_KEY 379 +#define VAR_SSL_SERVICE_PEM 380 +#define VAR_SSL_PORT 381 +#define VAR_FORWARD_FIRST 382 +#define VAR_STUB_FIRST 383 +#define VAR_MINIMAL_RESPONSES 384 +#define VAR_RRSET_ROUNDROBIN 385 +#define VAR_MAX_UDP_SIZE 386 @@ -399,7 +401,7 @@ typedef union YYSTYPE /* Line 350 of yacc.c */ -#line 403 "util/configparser.c" +#line 405 "util/configparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -427,7 +429,7 @@ int yyparse (); /* Copy the second part of user declarations. */ /* Line 353 of yacc.c */ -#line 431 "util/configparser.c" +#line 433 "util/configparser.c" #ifdef short # undef short @@ -647,20 +649,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 239 +#define YYLAST 242 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 131 +#define YYNTOKENS 132 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 134 +#define YYNNTS 135 /* YYNRULES -- Number of rules. */ -#define YYNRULES 255 +#define YYNRULES 257 /* YYNRULES -- Number of states. */ -#define YYNSTATES 374 +#define YYNSTATES 377 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 385 +#define YYMAXUTOK 386 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -706,7 +708,7 @@ 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 + 125, 126, 127, 128, 129, 130, 131 }; #if YYDEBUG @@ -725,90 +727,90 @@ 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, 231, 232, 234, 236, 238, 240, 242, - 244, 247, 248, 250, 252, 254, 256, 259, 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, 482, 485, 488, 491, 494, 497, 500, 503, 506, - 509, 512, 515, 518, 521, 524, 527, 530, 533, 536, - 540, 543, 546, 549, 552, 555, 558, 561, 564, 567, - 570, 573, 576, 579, 582, 584, 587, 588, 590, 592, - 594, 596, 598, 600, 602, 605, 608, 611, 614, 617, - 620, 623, 625, 628, 629, 631 + 224, 226, 228, 230, 233, 234, 236, 238, 240, 242, + 244, 246, 249, 250, 252, 254, 256, 258, 261, 264, + 267, 270, 273, 276, 279, 282, 285, 288, 291, 294, + 297, 300, 303, 306, 309, 312, 315, 318, 321, 324, + 327, 330, 333, 336, 339, 342, 345, 348, 351, 354, + 357, 360, 363, 366, 369, 372, 375, 378, 381, 384, + 387, 390, 393, 396, 399, 402, 405, 408, 411, 414, + 417, 420, 423, 426, 429, 432, 435, 438, 441, 444, + 447, 450, 453, 456, 459, 462, 465, 468, 471, 474, + 477, 480, 483, 487, 490, 493, 496, 499, 502, 505, + 508, 511, 514, 517, 520, 523, 526, 529, 532, 535, + 538, 541, 545, 548, 551, 554, 557, 560, 563, 566, + 569, 572, 575, 578, 581, 584, 587, 589, 592, 593, + 595, 597, 599, 601, 603, 605, 607, 610, 613, 616, + 619, 622, 625, 628, 630, 633, 634, 636 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 132, 0, -1, -1, 132, 133, -1, 134, 135, -1, - 137, 138, -1, 140, 141, -1, 261, 262, -1, 251, - 252, -1, 11, -1, 135, 136, -1, -1, 143, -1, - 144, -1, 148, -1, 151, -1, 157, -1, 158, -1, - 159, -1, 160, -1, 149, -1, 170, -1, 171, -1, - 172, -1, 173, -1, 174, -1, 191, -1, 192, -1, - 193, -1, 195, -1, 196, -1, 154, -1, 197, -1, - 198, -1, 201, -1, 199, -1, 200, -1, 202, -1, - 203, -1, 204, -1, 215, -1, 183, -1, 184, -1, - 185, -1, 186, -1, 205, -1, 218, -1, 179, -1, - 181, -1, 219, -1, 224, -1, 225, -1, 226, -1, - 155, -1, 190, -1, 233, -1, 234, -1, 180, -1, - 229, -1, 167, -1, 150, -1, 175, -1, 216, -1, - 222, -1, 206, -1, 217, -1, 236, -1, 237, -1, - 156, -1, 145, -1, 166, -1, 209, -1, 146, -1, - 152, -1, 153, -1, 176, -1, 177, -1, 235, -1, - 208, -1, 210, -1, 211, -1, 147, -1, 238, -1, - 194, -1, 214, -1, 168, -1, 182, -1, 220, -1, - 221, -1, 223, -1, 228, -1, 178, -1, 230, -1, - 231, -1, 232, -1, 187, -1, 189, -1, 212, -1, - 213, -1, 188, -1, 207, -1, 227, -1, 169, -1, - 161, -1, 162, -1, 163, -1, 164, -1, 165, -1, - 239, -1, 240, -1, 241, -1, 38, -1, 138, 139, - -1, -1, 242, -1, 243, -1, 244, -1, 246, -1, - 245, -1, 44, -1, 141, 142, -1, -1, 247, -1, - 248, -1, 249, -1, 250, -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, - 121, 10, -1, 122, 10, -1, 123, 10, -1, 124, - 10, -1, 125, 10, -1, 77, 10, -1, 66, 10, - -1, 101, 10, -1, 120, 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, 114, 10, -1, 61, 10, -1, - 26, 10, -1, 27, 10, -1, 28, 10, -1, 98, - 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, 118, 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, 119, - 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, 128, 10, -1, 129, - 10, -1, 130, 10, -1, 37, 10, -1, 39, 10, - -1, 40, 10, -1, 127, 10, -1, 99, 10, -1, - 37, 10, -1, 45, 10, -1, 46, 10, -1, 126, - 10, -1, 88, -1, 252, 253, -1, -1, 254, -1, - 256, -1, 255, -1, 257, -1, 258, -1, 259, -1, - 260, -1, 89, 10, -1, 91, 10, -1, 90, 10, - -1, 92, 10, -1, 93, 10, -1, 94, 10, -1, - 95, 10, -1, 103, -1, 262, 263, -1, -1, 264, - -1, 104, 10, -1 + 133, 0, -1, -1, 133, 134, -1, 135, 136, -1, + 138, 139, -1, 141, 142, -1, 263, 264, -1, 253, + 254, -1, 11, -1, 136, 137, -1, -1, 144, -1, + 145, -1, 149, -1, 152, -1, 158, -1, 159, -1, + 160, -1, 161, -1, 150, -1, 171, -1, 172, -1, + 173, -1, 174, -1, 175, -1, 193, -1, 194, -1, + 195, -1, 197, -1, 198, -1, 155, -1, 199, -1, + 200, -1, 203, -1, 201, -1, 202, -1, 204, -1, + 205, -1, 206, -1, 217, -1, 184, -1, 185, -1, + 186, -1, 187, -1, 207, -1, 220, -1, 180, -1, + 182, -1, 221, -1, 226, -1, 227, -1, 228, -1, + 156, -1, 192, -1, 235, -1, 236, -1, 181, -1, + 231, -1, 168, -1, 151, -1, 176, -1, 218, -1, + 224, -1, 208, -1, 219, -1, 238, -1, 239, -1, + 157, -1, 146, -1, 167, -1, 211, -1, 147, -1, + 153, -1, 154, -1, 177, -1, 178, -1, 237, -1, + 210, -1, 212, -1, 213, -1, 148, -1, 240, -1, + 196, -1, 216, -1, 169, -1, 183, -1, 222, -1, + 223, -1, 225, -1, 230, -1, 179, -1, 232, -1, + 233, -1, 234, -1, 188, -1, 191, -1, 214, -1, + 215, -1, 189, -1, 209, -1, 229, -1, 170, -1, + 162, -1, 163, -1, 164, -1, 165, -1, 166, -1, + 241, -1, 242, -1, 243, -1, 190, -1, 38, -1, + 139, 140, -1, -1, 244, -1, 245, -1, 246, -1, + 248, -1, 247, -1, 44, -1, 142, 143, -1, -1, + 249, -1, 250, -1, 251, -1, 252, -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, 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, + 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, 254, + 255, -1, -1, 256, -1, 258, -1, 257, -1, 259, + -1, 260, -1, 261, -1, 262, -1, 89, 10, -1, + 91, 10, -1, 90, 10, -1, 92, 10, -1, 93, + 10, -1, 94, 10, -1, 95, 10, -1, 103, -1, + 264, 265, -1, -1, 266, -1, 104, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -825,21 +827,21 @@ static const yytype_uint16 yyrline[] = 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, 167, 179, 180, 181, 181, 181, 181, 181, 183, - 195, 196, 197, 197, 197, 197, 199, 208, 217, 228, - 237, 246, 255, 268, 283, 292, 301, 310, 319, 328, - 337, 346, 355, 364, 373, 382, 391, 398, 405, 414, - 423, 437, 446, 455, 462, 469, 476, 484, 491, 498, - 505, 512, 520, 528, 536, 543, 550, 559, 568, 575, - 582, 590, 598, 611, 622, 630, 643, 652, 661, 669, - 682, 691, 699, 708, 716, 729, 736, 746, 756, 766, - 776, 786, 796, 806, 813, 820, 829, 838, 847, 854, - 864, 881, 888, 906, 919, 932, 941, 950, 959, 969, - 979, 988, 997, 1004, 1013, 1022, 1031, 1039, 1052, 1060, - 1082, 1089, 1104, 1114, 1124, 1131, 1141, 1148, 1155, 1164, - 1174, 1184, 1191, 1198, 1207, 1212, 1213, 1214, 1214, 1214, - 1215, 1215, 1215, 1216, 1218, 1228, 1237, 1244, 1251, 1258, - 1265, 1272, 1277, 1278, 1279, 1281 + 165, 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, 680, 693, 702, 710, 719, 727, 740, 747, 757, + 767, 777, 787, 797, 807, 817, 824, 831, 840, 849, + 858, 865, 875, 892, 899, 917, 930, 943, 952, 961, + 970, 980, 990, 999, 1008, 1015, 1024, 1033, 1042, 1050, + 1063, 1071, 1093, 1100, 1115, 1125, 1135, 1142, 1152, 1159, + 1166, 1175, 1185, 1195, 1202, 1209, 1218, 1223, 1224, 1225, + 1225, 1225, 1226, 1226, 1226, 1227, 1229, 1239, 1248, 1255, + 1262, 1269, 1276, 1283, 1288, 1289, 1290, 1292 }; #endif @@ -885,15 +887,15 @@ static const char *const yytname[] = "VAR_VAL_LOG_LEVEL", "VAR_AUTO_TRUST_ANCHOR_FILE", "VAR_KEEP_MISSING", "VAR_ADD_HOLDDOWN", "VAR_DEL_HOLDDOWN", "VAR_SO_RCVBUF", "VAR_EDNS_BUFFER_SIZE", "VAR_PREFETCH", "VAR_PREFETCH_KEY", - "VAR_SO_SNDBUF", "VAR_HARDEN_BELOW_NXDOMAIN", "VAR_IGNORE_CD_FLAG", - "VAR_LOG_QUERIES", "VAR_TCP_UPSTREAM", "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", "$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", + "VAR_SO_SNDBUF", "VAR_SO_REUSEPORT", "VAR_HARDEN_BELOW_NXDOMAIN", + "VAR_IGNORE_CD_FLAG", "VAR_LOG_QUERIES", "VAR_TCP_UPSTREAM", + "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", + "$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", @@ -909,24 +911,24 @@ static const char *const yytname[] = "server_trust_anchor_file", "server_trusted_keys_file", "server_trust_anchor", "server_domain_insecure", "server_hide_identity", "server_hide_version", "server_identity", "server_version", - "server_so_rcvbuf", "server_so_sndbuf", "server_edns_buffer_size", - "server_msg_buffer_size", "server_msg_cache_size", - "server_msg_cache_slabs", "server_num_queries_per_thread", - "server_jostle_timeout", "server_rrset_cache_size", - "server_rrset_cache_slabs", "server_infra_host_ttl", - "server_infra_lame_ttl", "server_infra_cache_numhosts", - "server_infra_cache_lame_size", "server_infra_cache_slabs", - "server_target_fetch_policy", "server_harden_short_bufsize", - "server_harden_large_queries", "server_harden_glue", - "server_harden_dnssec_stripped", "server_harden_below_nxdomain", - "server_harden_referral_path", "server_use_caps_for_id", - "server_private_address", "server_private_domain", "server_prefetch", - "server_prefetch_key", "server_unwanted_reply_threshold", - "server_do_not_query_address", "server_do_not_query_localhost", - "server_access_control", "server_module_conf", - "server_val_override_date", "server_val_sig_skew_min", - "server_val_sig_skew_max", "server_cache_max_ttl", - "server_cache_min_ttl", "server_bogus_ttl", + "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport", + "server_edns_buffer_size", "server_msg_buffer_size", + "server_msg_cache_size", "server_msg_cache_slabs", + "server_num_queries_per_thread", "server_jostle_timeout", + "server_rrset_cache_size", "server_rrset_cache_slabs", + "server_infra_host_ttl", "server_infra_lame_ttl", + "server_infra_cache_numhosts", "server_infra_cache_lame_size", + "server_infra_cache_slabs", "server_target_fetch_policy", + "server_harden_short_bufsize", "server_harden_large_queries", + "server_harden_glue", "server_harden_dnssec_stripped", + "server_harden_below_nxdomain", "server_harden_referral_path", + "server_use_caps_for_id", "server_private_address", + "server_private_domain", "server_prefetch", "server_prefetch_key", + "server_unwanted_reply_threshold", "server_do_not_query_address", + "server_do_not_query_localhost", "server_access_control", + "server_module_conf", "server_val_override_date", + "server_val_sig_skew_min", "server_val_sig_skew_max", + "server_cache_max_ttl", "server_cache_min_ttl", "server_bogus_ttl", "server_val_clean_additional", "server_val_permissive_mode", "server_ignore_cd_flag", "server_val_log_level", "server_val_nsec3_keysize_iterations", "server_add_holddown", @@ -961,26 +963,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 + 385, 386 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 131, 132, 132, 133, 133, 133, 133, 133, 134, - 135, 135, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 137, 138, 138, 139, 139, 139, 139, 139, 140, - 141, 141, 142, 142, 142, 142, 143, 144, 145, 146, + 0, 132, 133, 133, 134, 134, 134, 134, 134, 135, + 136, 136, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 138, 139, 139, 140, 140, 140, 140, 140, + 141, 142, 142, 143, 143, 143, 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, @@ -991,9 +993,9 @@ static const yytype_uint16 yyr1[] = 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, 248, 249, 250, 251, 252, 252, 253, 253, 253, - 253, 253, 253, 253, 254, 255, 256, 257, 258, 259, - 260, 261, 262, 262, 263, 264 + 247, 248, 249, 250, 251, 252, 253, 254, 254, 255, + 255, 255, 255, 255, 255, 255, 256, 257, 258, 259, + 260, 261, 262, 263, 264, 264, 265, 266 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1010,8 +1012,8 @@ 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, 2, 0, 1, 1, 1, 1, 1, 1, - 2, 0, 1, 1, 1, 1, 2, 2, 2, 2, + 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, + 1, 2, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1019,21 +1021,21 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, + 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 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, 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 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. Performed when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const yytype_uint8 yydefact[] = +static const yytype_uint16 yydefact[] = { - 2, 0, 1, 9, 111, 119, 234, 251, 3, 11, - 113, 121, 236, 253, 4, 5, 6, 8, 7, 0, + 2, 0, 1, 9, 112, 120, 236, 253, 3, 11, + 114, 122, 238, 255, 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, @@ -1043,52 +1045,52 @@ static const yytype_uint8 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 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, 96, 54, 26, 27, 28, - 83, 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, 112, 114, 115, 116, 118, 117, 0, - 0, 0, 0, 120, 122, 123, 124, 125, 0, 0, - 0, 0, 0, 0, 0, 235, 237, 239, 238, 240, - 241, 242, 243, 0, 252, 254, 127, 126, 131, 134, - 132, 140, 141, 142, 143, 153, 154, 155, 156, 157, - 174, 175, 176, 178, 179, 137, 180, 181, 184, 182, - 183, 185, 186, 187, 198, 166, 167, 168, 169, 188, - 201, 162, 164, 202, 207, 208, 209, 138, 173, 216, - 217, 163, 212, 150, 133, 158, 199, 205, 189, 0, - 0, 220, 139, 128, 149, 192, 129, 135, 136, 159, - 160, 218, 191, 193, 194, 130, 221, 177, 197, 151, - 165, 203, 204, 206, 211, 161, 215, 213, 214, 170, - 172, 195, 196, 171, 190, 210, 152, 144, 145, 146, - 147, 148, 222, 223, 224, 225, 226, 227, 229, 228, - 230, 231, 232, 233, 244, 246, 245, 247, 248, 249, - 250, 255, 200, 219 + 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, 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, 113, 115, 116, 117, 119, + 118, 0, 0, 0, 0, 121, 123, 124, 125, 126, + 0, 0, 0, 0, 0, 0, 0, 237, 239, 241, + 240, 242, 243, 244, 245, 0, 254, 256, 128, 127, + 132, 135, 133, 141, 142, 143, 144, 154, 155, 156, + 157, 158, 176, 177, 178, 180, 181, 138, 182, 183, + 186, 184, 185, 187, 188, 189, 200, 167, 168, 169, + 170, 190, 203, 163, 165, 204, 209, 210, 211, 139, + 175, 218, 219, 164, 214, 151, 134, 159, 201, 207, + 191, 0, 0, 222, 140, 129, 150, 194, 130, 136, + 137, 160, 161, 220, 193, 195, 196, 131, 223, 179, + 199, 152, 166, 205, 206, 208, 213, 162, 217, 215, + 216, 171, 174, 197, 198, 172, 173, 192, 212, 153, + 145, 146, 147, 148, 149, 224, 225, 226, 227, 228, + 229, 231, 230, 232, 233, 234, 235, 246, 248, 247, + 249, 250, 251, 252, 257, 202, 221 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 8, 9, 14, 118, 10, 15, 223, 11, - 16, 233, 119, 120, 121, 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, 224, 225, 226, 227, 228, 234, 235, 236, 237, - 12, 17, 245, 246, 247, 248, 249, 250, 251, 252, - 13, 18, 254, 255 + -1, 1, 8, 9, 14, 119, 10, 15, 225, 11, + 16, 235, 120, 121, 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, 226, 227, 228, 229, 230, 236, 237, 238, + 239, 12, 17, 247, 248, 249, 250, 251, 252, 253, + 254, 13, 18, 256, 257 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -1096,18 +1098,18 @@ static const yytype_int16 yydefgoto[] = #define YYPACT_NINF -80 static const yytype_int16 yypact[] = { - -80, 76, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80, -12, 40, 46, 32, -79, 16, - 17, 18, 22, 23, 24, 68, 71, 72, 105, 109, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 151, 152, 153, 155, 156, 158, 159, 160, - 161, 163, 164, 165, 166, 167, 168, 170, 171, 172, + -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, 110, 111, 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, - 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 207, 208, 209, 210, -80, -80, + 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 209, 210, 211, 212, 213, -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, @@ -1117,23 +1119,23 @@ 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, -80, -80, -80, -80, 211, 212, - 213, 214, 215, -80, -80, -80, -80, -80, -80, 216, - 217, 218, 219, -80, -80, -80, -80, -80, 220, 221, - 222, 223, 224, 225, 226, -80, -80, -80, -80, -80, - -80, -80, -80, 227, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, + 214, 215, 216, 217, 218, -80, -80, -80, -80, -80, + -80, 219, 220, 221, 222, -80, -80, -80, -80, -80, + 223, 224, 225, 226, 227, 228, 229, -80, -80, -80, + -80, -80, -80, -80, -80, 230, -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, 228, - 229, -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, 231, 232, -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]. */ @@ -1152,7 +1154,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 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1163,28 +1165,29 @@ 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, 253, 256, 257, 258, 44, - 45, 46, 259, 260, 261, 47, 48, 49, 50, 51, + 39, 40, 41, 42, 43, 255, 258, 259, 260, 44, + 45, 46, 261, 262, 263, 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, 2, 218, 262, 219, - 220, 263, 264, 229, 88, 89, 90, 3, 91, 92, - 93, 230, 231, 94, 95, 96, 97, 98, 99, 100, + 82, 83, 84, 85, 86, 87, 220, 264, 221, 222, + 265, 266, 267, 231, 88, 89, 90, 268, 91, 92, + 93, 232, 233, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 114, 4, 265, 115, 116, 117, 266, - 5, 238, 239, 240, 241, 242, 243, 244, 267, 268, - 269, 270, 271, 272, 273, 274, 275, 276, 277, 221, - 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, - 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, - 298, 299, 300, 301, 6, 302, 303, 222, 304, 305, - 306, 307, 232, 308, 309, 310, 311, 312, 313, 7, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, - 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, - 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, + 111, 112, 113, 114, 115, 2, 269, 116, 117, 118, + 270, 271, 272, 273, 274, 0, 3, 240, 241, 242, + 243, 244, 245, 246, 275, 276, 277, 278, 223, 279, + 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, + 290, 291, 292, 4, 293, 294, 295, 296, 297, 5, + 298, 299, 300, 301, 302, 303, 304, 224, 305, 306, + 307, 308, 309, 234, 310, 311, 312, 313, 314, 315, + 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, + 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, + 336, 337, 338, 6, 339, 340, 341, 342, 343, 344, + 345, 346, 347, 348, 349, 350, 351, 352, 7, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, - 364, 365, 366, 367, 368, 369, 370, 371, 372, 373 + 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, + 374, 375, 376 }; #define yypact_value_is_default(yystate) \ @@ -1193,7 +1196,7 @@ static const yytype_uint16 yytable[] = #define yytable_value_is_error(yytable_value) \ YYID (0) -static const yytype_uint8 yycheck[] = +static const yytype_int16 yycheck[] = { 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, @@ -1202,31 +1205,32 @@ static const yytype_uint8 yycheck[] = 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, 0, 37, 10, 39, - 40, 10, 10, 37, 96, 97, 98, 11, 100, 101, + 82, 83, 84, 85, 86, 87, 37, 10, 39, 40, + 10, 10, 10, 37, 96, 97, 98, 10, 100, 101, 102, 45, 46, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 38, 10, 128, 129, 130, 10, - 44, 89, 90, 91, 92, 93, 94, 95, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 99, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 88, 10, 10, 127, 10, 10, - 10, 10, 126, 10, 10, 10, 10, 10, 10, 103, + 122, 123, 124, 125, 126, 0, 10, 129, 130, 131, + 10, 10, 10, 10, 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, + 10, 10, 10, 10, 10, 10, 10, 128, 10, 10, + 10, 10, 10, 127, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 88, 10, 10, 10, 10, 10, 10, + 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 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 132, 0, 11, 38, 44, 88, 103, 133, 134, - 137, 140, 251, 261, 135, 138, 141, 252, 262, 12, + 0, 133, 0, 11, 38, 44, 88, 103, 134, 135, + 138, 141, 253, 263, 136, 139, 142, 254, 264, 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, @@ -1236,7 +1240,7 @@ static const yytype_uint16 yystos[] = 80, 81, 82, 83, 84, 85, 86, 87, 96, 97, 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, 128, 129, 130, 136, 143, + 121, 122, 123, 124, 125, 126, 129, 130, 131, 137, 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, @@ -1246,11 +1250,11 @@ static const yytype_uint16 yystos[] = 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 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, 37, 39, - 40, 99, 127, 139, 242, 243, 244, 245, 246, 37, - 45, 46, 126, 142, 247, 248, 249, 250, 89, 90, - 91, 92, 93, 94, 95, 253, 254, 255, 256, 257, - 258, 259, 260, 104, 263, 264, 10, 10, 10, 10, + 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, + 37, 39, 40, 99, 128, 140, 244, 245, 246, 247, + 248, 37, 45, 46, 127, 143, 249, 250, 251, 252, + 89, 90, 91, 92, 93, 94, 95, 255, 256, 257, + 258, 259, 260, 261, 262, 104, 265, 266, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1262,7 +1266,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 }; #define yyerrok (yyerrstatus = 0) @@ -2093,9 +2097,9 @@ yyreduce: } break; - case 111: + case 112: /* Line 1787 of yacc.c */ -#line 168 "./util/configparser.y" +#line 169 "./util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2108,9 +2112,9 @@ yyreduce: } break; - case 119: + case 120: /* Line 1787 of yacc.c */ -#line 184 "./util/configparser.y" +#line 185 "./util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2123,9 +2127,9 @@ yyreduce: } break; - case 126: + case 127: /* Line 1787 of yacc.c */ -#line 200 "./util/configparser.y" +#line 201 "./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) @@ -2135,9 +2139,9 @@ yyreduce: } break; - case 127: + case 128: /* Line 1787 of yacc.c */ -#line 209 "./util/configparser.y" +#line 210 "./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) @@ -2147,9 +2151,9 @@ yyreduce: } break; - case 128: + case 129: /* Line 1787 of yacc.c */ -#line 218 "./util/configparser.y" +#line 219 "./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) @@ -2161,9 +2165,9 @@ yyreduce: } break; - case 129: + case 130: /* Line 1787 of yacc.c */ -#line 229 "./util/configparser.y" +#line 230 "./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) @@ -2173,9 +2177,9 @@ yyreduce: } break; - case 130: + case 131: /* Line 1787 of yacc.c */ -#line 238 "./util/configparser.y" +#line 239 "./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) @@ -2185,9 +2189,9 @@ yyreduce: } break; - case 131: + case 132: /* Line 1787 of yacc.c */ -#line 247 "./util/configparser.y" +#line 248 "./util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2197,9 +2201,9 @@ yyreduce: } break; - case 132: + case 133: /* Line 1787 of yacc.c */ -#line 256 "./util/configparser.y" +#line 257 "./util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2213,9 +2217,9 @@ yyreduce: } break; - case 133: + case 134: /* Line 1787 of yacc.c */ -#line 269 "./util/configparser.y" +#line 270 "./util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2231,9 +2235,9 @@ yyreduce: } break; - case 134: + case 135: /* Line 1787 of yacc.c */ -#line 284 "./util/configparser.y" +#line 285 "./util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2243,9 +2247,9 @@ yyreduce: } break; - case 135: + case 136: /* Line 1787 of yacc.c */ -#line 293 "./util/configparser.y" +#line 294 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, @@ -2255,9 +2259,9 @@ yyreduce: } break; - case 136: + case 137: /* Line 1787 of yacc.c */ -#line 302 "./util/configparser.y" +#line 303 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, @@ -2267,9 +2271,9 @@ yyreduce: } break; - case 137: + case 138: /* Line 1787 of yacc.c */ -#line 311 "./util/configparser.y" +#line 312 "./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) @@ -2279,9 +2283,9 @@ yyreduce: } break; - case 138: + case 139: /* Line 1787 of yacc.c */ -#line 320 "./util/configparser.y" +#line 321 "./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) @@ -2291,9 +2295,9 @@ yyreduce: } break; - case 139: + case 140: /* Line 1787 of yacc.c */ -#line 329 "./util/configparser.y" +#line 330 "./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) @@ -2303,9 +2307,9 @@ yyreduce: } break; - case 140: + case 141: /* Line 1787 of yacc.c */ -#line 338 "./util/configparser.y" +#line 339 "./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) @@ -2315,9 +2319,9 @@ yyreduce: } break; - case 141: + case 142: /* Line 1787 of yacc.c */ -#line 347 "./util/configparser.y" +#line 348 "./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) @@ -2327,9 +2331,9 @@ yyreduce: } break; - case 142: + case 143: /* Line 1787 of yacc.c */ -#line 356 "./util/configparser.y" +#line 357 "./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) @@ -2339,9 +2343,9 @@ yyreduce: } break; - case 143: + case 144: /* Line 1787 of yacc.c */ -#line 365 "./util/configparser.y" +#line 366 "./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) @@ -2351,9 +2355,9 @@ yyreduce: } break; - case 144: + case 145: /* Line 1787 of yacc.c */ -#line 374 "./util/configparser.y" +#line 375 "./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) @@ -2363,9 +2367,9 @@ yyreduce: } break; - case 145: + case 146: /* Line 1787 of yacc.c */ -#line 383 "./util/configparser.y" +#line 384 "./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) @@ -2375,9 +2379,9 @@ yyreduce: } break; - case 146: + case 147: /* Line 1787 of yacc.c */ -#line 392 "./util/configparser.y" +#line 393 "./util/configparser.y" { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->ssl_service_key); @@ -2385,9 +2389,9 @@ yyreduce: } break; - case 147: + case 148: /* Line 1787 of yacc.c */ -#line 399 "./util/configparser.y" +#line 400 "./util/configparser.y" { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->ssl_service_pem); @@ -2395,9 +2399,9 @@ yyreduce: } break; - case 148: + case 149: /* Line 1787 of yacc.c */ -#line 406 "./util/configparser.y" +#line 407 "./util/configparser.y" { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2407,9 +2411,9 @@ yyreduce: } break; - case 149: + case 150: /* Line 1787 of yacc.c */ -#line 415 "./util/configparser.y" +#line 416 "./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) @@ -2419,9 +2423,9 @@ yyreduce: } break; - case 150: + case 151: /* Line 1787 of yacc.c */ -#line 424 "./util/configparser.y" +#line 425 "./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) @@ -2436,9 +2440,9 @@ yyreduce: } break; - case 151: + case 152: /* Line 1787 of yacc.c */ -#line 438 "./util/configparser.y" +#line 439 "./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) @@ -2448,9 +2452,9 @@ yyreduce: } break; - case 152: + case 153: /* Line 1787 of yacc.c */ -#line 447 "./util/configparser.y" +#line 448 "./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) @@ -2460,9 +2464,9 @@ yyreduce: } break; - case 153: + case 154: /* Line 1787 of yacc.c */ -#line 456 "./util/configparser.y" +#line 457 "./util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -2470,9 +2474,9 @@ yyreduce: } break; - case 154: + case 155: /* Line 1787 of yacc.c */ -#line 463 "./util/configparser.y" +#line 464 "./util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -2480,9 +2484,9 @@ yyreduce: } break; - case 155: + case 156: /* Line 1787 of yacc.c */ -#line 470 "./util/configparser.y" +#line 471 "./util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -2490,9 +2494,9 @@ yyreduce: } break; - case 156: + case 157: /* Line 1787 of yacc.c */ -#line 477 "./util/configparser.y" +#line 478 "./util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -2501,9 +2505,9 @@ yyreduce: } break; - case 157: + case 158: /* Line 1787 of yacc.c */ -#line 485 "./util/configparser.y" +#line 486 "./util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -2511,9 +2515,9 @@ yyreduce: } break; - case 158: + case 159: /* Line 1787 of yacc.c */ -#line 492 "./util/configparser.y" +#line 493 "./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))) @@ -2521,9 +2525,9 @@ yyreduce: } break; - case 159: + case 160: /* Line 1787 of yacc.c */ -#line 499 "./util/configparser.y" +#line 500 "./util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dlv_anchor_file); @@ -2531,9 +2535,9 @@ yyreduce: } break; - case 160: + case 161: /* Line 1787 of yacc.c */ -#line 506 "./util/configparser.y" +#line 507 "./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))) @@ -2541,9 +2545,9 @@ yyreduce: } break; - case 161: + case 162: /* Line 1787 of yacc.c */ -#line 513 "./util/configparser.y" +#line 514 "./util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2552,9 +2556,9 @@ yyreduce: } break; - case 162: + case 163: /* Line 1787 of yacc.c */ -#line 521 "./util/configparser.y" +#line 522 "./util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2563,9 +2567,9 @@ yyreduce: } break; - case 163: + case 164: /* Line 1787 of yacc.c */ -#line 529 "./util/configparser.y" +#line 530 "./util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2574,9 +2578,9 @@ yyreduce: } break; - case 164: + case 165: /* Line 1787 of yacc.c */ -#line 537 "./util/configparser.y" +#line 538 "./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))) @@ -2584,9 +2588,9 @@ yyreduce: } break; - case 165: + case 166: /* Line 1787 of yacc.c */ -#line 544 "./util/configparser.y" +#line 545 "./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))) @@ -2594,9 +2598,9 @@ yyreduce: } break; - case 166: + case 167: /* Line 1787 of yacc.c */ -#line 551 "./util/configparser.y" +#line 552 "./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) @@ -2606,9 +2610,9 @@ yyreduce: } break; - case 167: + case 168: /* Line 1787 of yacc.c */ -#line 560 "./util/configparser.y" +#line 561 "./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) @@ -2618,9 +2622,9 @@ yyreduce: } break; - case 168: + case 169: /* Line 1787 of yacc.c */ -#line 569 "./util/configparser.y" +#line 570 "./util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -2628,9 +2632,9 @@ yyreduce: } break; - case 169: + case 170: /* Line 1787 of yacc.c */ -#line 576 "./util/configparser.y" +#line 577 "./util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -2638,9 +2642,9 @@ yyreduce: } break; - case 170: + case 171: /* Line 1787 of yacc.c */ -#line 583 "./util/configparser.y" +#line 584 "./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)) @@ -2649,9 +2653,9 @@ yyreduce: } break; - case 171: + case 172: /* Line 1787 of yacc.c */ -#line 591 "./util/configparser.y" +#line 592 "./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)) @@ -2660,9 +2664,22 @@ yyreduce: } break; - case 172: + case 173: /* Line 1787 of yacc.c */ -#line 599 "./util/configparser.y" +#line 600 "./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) + yyerror("expected yes or no."); + else cfg_parser->cfg->so_reuseport = + (strcmp((yyvsp[(2) - (2)].str), "yes")==0); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 174: +/* Line 1787 of yacc.c */ +#line 610 "./util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2676,9 +2693,9 @@ yyreduce: } break; - case 173: + case 175: /* Line 1787 of yacc.c */ -#line 612 "./util/configparser.y" +#line 623 "./util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2690,9 +2707,9 @@ yyreduce: } break; - case 174: + case 176: /* Line 1787 of yacc.c */ -#line 623 "./util/configparser.y" +#line 634 "./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)) @@ -2701,9 +2718,9 @@ yyreduce: } break; - case 175: + case 177: /* Line 1787 of yacc.c */ -#line 631 "./util/configparser.y" +#line 642 "./util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2717,9 +2734,9 @@ yyreduce: } break; - case 176: + case 178: /* Line 1787 of yacc.c */ -#line 644 "./util/configparser.y" +#line 655 "./util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2729,9 +2746,9 @@ yyreduce: } break; - case 177: + case 179: /* Line 1787 of yacc.c */ -#line 653 "./util/configparser.y" +#line 664 "./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) @@ -2741,9 +2758,9 @@ yyreduce: } break; - case 178: + case 180: /* Line 1787 of yacc.c */ -#line 662 "./util/configparser.y" +#line 673 "./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)) @@ -2752,9 +2769,9 @@ yyreduce: } break; - case 179: + case 181: /* Line 1787 of yacc.c */ -#line 670 "./util/configparser.y" +#line 681 "./util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2768,9 +2785,9 @@ yyreduce: } break; - case 180: + case 182: /* Line 1787 of yacc.c */ -#line 683 "./util/configparser.y" +#line 694 "./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) @@ -2780,9 +2797,9 @@ yyreduce: } break; - case 181: + case 183: /* Line 1787 of yacc.c */ -#line 692 "./util/configparser.y" +#line 703 "./util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " @@ -2791,9 +2808,9 @@ yyreduce: } break; - case 182: + case 184: /* Line 1787 of yacc.c */ -#line 700 "./util/configparser.y" +#line 711 "./util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2803,9 +2820,9 @@ yyreduce: } break; - case 183: + case 185: /* Line 1787 of yacc.c */ -#line 709 "./util/configparser.y" +#line 720 "./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 " @@ -2814,9 +2831,9 @@ yyreduce: } break; - case 184: + case 186: /* Line 1787 of yacc.c */ -#line 717 "./util/configparser.y" +#line 728 "./util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2830,9 +2847,9 @@ yyreduce: } break; - case 185: + case 187: /* Line 1787 of yacc.c */ -#line 730 "./util/configparser.y" +#line 741 "./util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2840,9 +2857,9 @@ yyreduce: } break; - case 186: + case 188: /* Line 1787 of yacc.c */ -#line 737 "./util/configparser.y" +#line 748 "./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) @@ -2853,9 +2870,9 @@ yyreduce: } break; - case 187: + case 189: /* Line 1787 of yacc.c */ -#line 747 "./util/configparser.y" +#line 758 "./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) @@ -2866,9 +2883,9 @@ yyreduce: } break; - case 188: + case 190: /* Line 1787 of yacc.c */ -#line 757 "./util/configparser.y" +#line 768 "./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) @@ -2879,9 +2896,9 @@ yyreduce: } break; - case 189: + case 191: /* Line 1787 of yacc.c */ -#line 767 "./util/configparser.y" +#line 778 "./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) @@ -2892,9 +2909,9 @@ yyreduce: } break; - case 190: + case 192: /* Line 1787 of yacc.c */ -#line 777 "./util/configparser.y" +#line 788 "./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) @@ -2905,9 +2922,9 @@ yyreduce: } break; - case 191: + case 193: /* Line 1787 of yacc.c */ -#line 787 "./util/configparser.y" +#line 798 "./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) @@ -2918,9 +2935,9 @@ yyreduce: } break; - case 192: + case 194: /* Line 1787 of yacc.c */ -#line 797 "./util/configparser.y" +#line 808 "./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) @@ -2931,9 +2948,9 @@ yyreduce: } break; - case 193: + case 195: /* Line 1787 of yacc.c */ -#line 807 "./util/configparser.y" +#line 818 "./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))) @@ -2941,9 +2958,9 @@ yyreduce: } break; - case 194: + case 196: /* Line 1787 of yacc.c */ -#line 814 "./util/configparser.y" +#line 825 "./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))) @@ -2951,9 +2968,9 @@ yyreduce: } break; - case 195: + case 197: /* Line 1787 of yacc.c */ -#line 821 "./util/configparser.y" +#line 832 "./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) @@ -2963,9 +2980,9 @@ yyreduce: } break; - case 196: + case 198: /* Line 1787 of yacc.c */ -#line 830 "./util/configparser.y" +#line 841 "./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) @@ -2975,9 +2992,9 @@ yyreduce: } break; - case 197: + case 199: /* Line 1787 of yacc.c */ -#line 839 "./util/configparser.y" +#line 850 "./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) @@ -2987,9 +3004,9 @@ yyreduce: } break; - case 198: + case 200: /* Line 1787 of yacc.c */ -#line 848 "./util/configparser.y" +#line 859 "./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))) @@ -2997,9 +3014,9 @@ yyreduce: } break; - case 199: + case 201: /* Line 1787 of yacc.c */ -#line 855 "./util/configparser.y" +#line 866 "./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) @@ -3010,9 +3027,9 @@ yyreduce: } break; - case 200: + case 202: /* Line 1787 of yacc.c */ -#line 865 "./util/configparser.y" +#line 876 "./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 && @@ -3030,9 +3047,9 @@ yyreduce: } break; - case 201: + case 203: /* Line 1787 of yacc.c */ -#line 882 "./util/configparser.y" +#line 893 "./util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -3040,9 +3057,9 @@ yyreduce: } break; - case 202: + case 204: /* Line 1787 of yacc.c */ -#line 889 "./util/configparser.y" +#line 900 "./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) { @@ -3061,9 +3078,9 @@ yyreduce: } break; - case 203: + case 205: /* Line 1787 of yacc.c */ -#line 907 "./util/configparser.y" +#line 918 "./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) { @@ -3077,9 +3094,9 @@ yyreduce: } break; - case 204: + case 206: /* Line 1787 of yacc.c */ -#line 920 "./util/configparser.y" +#line 931 "./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) { @@ -3093,9 +3110,9 @@ yyreduce: } break; - case 205: + case 207: /* Line 1787 of yacc.c */ -#line 933 "./util/configparser.y" +#line 944 "./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) @@ -3105,9 +3122,9 @@ yyreduce: } break; - case 206: + case 208: /* Line 1787 of yacc.c */ -#line 942 "./util/configparser.y" +#line 953 "./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) @@ -3117,9 +3134,9 @@ yyreduce: } break; - case 207: + case 209: /* Line 1787 of yacc.c */ -#line 951 "./util/configparser.y" +#line 962 "./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) @@ -3129,9 +3146,9 @@ yyreduce: } break; - case 208: + case 210: /* Line 1787 of yacc.c */ -#line 960 "./util/configparser.y" +#line 971 "./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) @@ -3142,9 +3159,9 @@ yyreduce: } break; - case 209: + case 211: /* Line 1787 of yacc.c */ -#line 970 "./util/configparser.y" +#line 981 "./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) @@ -3155,9 +3172,9 @@ yyreduce: } break; - case 210: + case 212: /* Line 1787 of yacc.c */ -#line 980 "./util/configparser.y" +#line 991 "./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) @@ -3167,9 +3184,9 @@ yyreduce: } break; - case 211: + case 213: /* Line 1787 of yacc.c */ -#line 989 "./util/configparser.y" +#line 1000 "./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) @@ -3179,9 +3196,9 @@ yyreduce: } break; - case 212: + case 214: /* Line 1787 of yacc.c */ -#line 998 "./util/configparser.y" +#line 1009 "./util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -3189,9 +3206,9 @@ yyreduce: } break; - case 213: + case 215: /* Line 1787 of yacc.c */ -#line 1005 "./util/configparser.y" +#line 1016 "./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) @@ -3201,9 +3218,9 @@ yyreduce: } break; - case 214: + case 216: /* Line 1787 of yacc.c */ -#line 1014 "./util/configparser.y" +#line 1025 "./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) @@ -3213,9 +3230,9 @@ yyreduce: } break; - case 215: + case 217: /* Line 1787 of yacc.c */ -#line 1023 "./util/configparser.y" +#line 1034 "./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) @@ -3225,9 +3242,9 @@ yyreduce: } break; - case 216: + case 218: /* Line 1787 of yacc.c */ -#line 1032 "./util/configparser.y" +#line 1043 "./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)) @@ -3236,9 +3253,9 @@ yyreduce: } break; - case 217: + case 219: /* Line 1787 of yacc.c */ -#line 1040 "./util/configparser.y" +#line 1051 "./util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3252,9 +3269,9 @@ yyreduce: } break; - case 218: + case 220: /* Line 1787 of yacc.c */ -#line 1053 "./util/configparser.y" +#line 1064 "./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)) @@ -3263,9 +3280,9 @@ yyreduce: } break; - case 219: + case 221: /* Line 1787 of yacc.c */ -#line 1061 "./util/configparser.y" +#line 1072 "./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 && @@ -3288,9 +3305,9 @@ yyreduce: } break; - case 220: + case 222: /* Line 1787 of yacc.c */ -#line 1083 "./util/configparser.y" +#line 1094 "./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))) @@ -3298,9 +3315,9 @@ yyreduce: } break; - case 221: + case 223: /* Line 1787 of yacc.c */ -#line 1090 "./util/configparser.y" +#line 1101 "./util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3316,9 +3333,9 @@ yyreduce: } break; - case 222: + case 224: /* Line 1787 of yacc.c */ -#line 1105 "./util/configparser.y" +#line 1116 "./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) @@ -3329,9 +3346,9 @@ yyreduce: } break; - case 223: + case 225: /* Line 1787 of yacc.c */ -#line 1115 "./util/configparser.y" +#line 1126 "./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) @@ -3342,9 +3359,9 @@ yyreduce: } break; - case 224: + case 226: /* Line 1787 of yacc.c */ -#line 1125 "./util/configparser.y" +#line 1136 "./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)); @@ -3352,9 +3369,9 @@ yyreduce: } break; - case 225: + case 227: /* Line 1787 of yacc.c */ -#line 1132 "./util/configparser.y" +#line 1143 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->stubs->name) @@ -3365,9 +3382,9 @@ yyreduce: } break; - case 226: + case 228: /* Line 1787 of yacc.c */ -#line 1142 "./util/configparser.y" +#line 1153 "./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))) @@ -3375,9 +3392,9 @@ yyreduce: } break; - case 227: + case 229: /* Line 1787 of yacc.c */ -#line 1149 "./util/configparser.y" +#line 1160 "./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))) @@ -3385,9 +3402,9 @@ yyreduce: } break; - case 228: + case 230: /* Line 1787 of yacc.c */ -#line 1156 "./util/configparser.y" +#line 1167 "./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) @@ -3397,9 +3414,9 @@ yyreduce: } break; - case 229: + case 231: /* Line 1787 of yacc.c */ -#line 1165 "./util/configparser.y" +#line 1176 "./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) @@ -3410,9 +3427,9 @@ yyreduce: } break; - case 230: + case 232: /* Line 1787 of yacc.c */ -#line 1175 "./util/configparser.y" +#line 1186 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->forwards->name) @@ -3423,9 +3440,9 @@ yyreduce: } break; - case 231: + case 233: /* Line 1787 of yacc.c */ -#line 1185 "./util/configparser.y" +#line 1196 "./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))) @@ -3433,9 +3450,9 @@ yyreduce: } break; - case 232: + case 234: /* Line 1787 of yacc.c */ -#line 1192 "./util/configparser.y" +#line 1203 "./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))) @@ -3443,9 +3460,9 @@ yyreduce: } break; - case 233: + case 235: /* Line 1787 of yacc.c */ -#line 1199 "./util/configparser.y" +#line 1210 "./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) @@ -3455,17 +3472,17 @@ yyreduce: } break; - case 234: + case 236: /* Line 1787 of yacc.c */ -#line 1208 "./util/configparser.y" +#line 1219 "./util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } break; - case 244: + case 246: /* Line 1787 of yacc.c */ -#line 1219 "./util/configparser.y" +#line 1230 "./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) @@ -3476,9 +3493,9 @@ yyreduce: } break; - case 245: + case 247: /* Line 1787 of yacc.c */ -#line 1229 "./util/configparser.y" +#line 1240 "./util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3488,9 +3505,9 @@ yyreduce: } break; - case 246: + case 248: /* Line 1787 of yacc.c */ -#line 1238 "./util/configparser.y" +#line 1249 "./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))) @@ -3498,9 +3515,9 @@ yyreduce: } break; - case 247: + case 249: /* Line 1787 of yacc.c */ -#line 1245 "./util/configparser.y" +#line 1256 "./util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_key_file); @@ -3508,9 +3525,9 @@ yyreduce: } break; - case 248: + case 250: /* Line 1787 of yacc.c */ -#line 1252 "./util/configparser.y" +#line 1263 "./util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_cert_file); @@ -3518,9 +3535,9 @@ yyreduce: } break; - case 249: + case 251: /* Line 1787 of yacc.c */ -#line 1259 "./util/configparser.y" +#line 1270 "./util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_key_file); @@ -3528,9 +3545,9 @@ yyreduce: } break; - case 250: + case 252: /* Line 1787 of yacc.c */ -#line 1266 "./util/configparser.y" +#line 1277 "./util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_cert_file); @@ -3538,17 +3555,17 @@ yyreduce: } break; - case 251: + case 253: /* Line 1787 of yacc.c */ -#line 1273 "./util/configparser.y" +#line 1284 "./util/configparser.y" { OUTYY(("\nP(python:)\n")); } break; - case 255: + case 257: /* Line 1787 of yacc.c */ -#line 1282 "./util/configparser.y" +#line 1293 "./util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->python_script); @@ -3558,7 +3575,7 @@ yyreduce: /* Line 1787 of yacc.c */ -#line 3562 "util/configparser.c" +#line 3579 "util/configparser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3788,7 +3805,7 @@ yyreturn: /* Line 2048 of yacc.c */ -#line 1287 "./util/configparser.y" +#line 1298 "./util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index a862769de..407be5e9c 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -161,19 +161,20 @@ extern int yydebug; VAR_PREFETCH = 370, VAR_PREFETCH_KEY = 371, VAR_SO_SNDBUF = 372, - VAR_HARDEN_BELOW_NXDOMAIN = 373, - VAR_IGNORE_CD_FLAG = 374, - VAR_LOG_QUERIES = 375, - VAR_TCP_UPSTREAM = 376, - VAR_SSL_UPSTREAM = 377, - VAR_SSL_SERVICE_KEY = 378, - VAR_SSL_SERVICE_PEM = 379, - VAR_SSL_PORT = 380, - VAR_FORWARD_FIRST = 381, - VAR_STUB_FIRST = 382, - VAR_MINIMAL_RESPONSES = 383, - VAR_RRSET_ROUNDROBIN = 384, - VAR_MAX_UDP_SIZE = 385 + VAR_SO_REUSEPORT = 373, + VAR_HARDEN_BELOW_NXDOMAIN = 374, + VAR_IGNORE_CD_FLAG = 375, + VAR_LOG_QUERIES = 376, + VAR_TCP_UPSTREAM = 377, + VAR_SSL_UPSTREAM = 378, + VAR_SSL_SERVICE_KEY = 379, + VAR_SSL_SERVICE_PEM = 380, + VAR_SSL_PORT = 381, + VAR_FORWARD_FIRST = 382, + VAR_STUB_FIRST = 383, + VAR_MINIMAL_RESPONSES = 384, + VAR_RRSET_ROUNDROBIN = 385, + VAR_MAX_UDP_SIZE = 386 }; #endif /* Tokens. */ @@ -292,19 +293,20 @@ extern int yydebug; #define VAR_PREFETCH 370 #define VAR_PREFETCH_KEY 371 #define VAR_SO_SNDBUF 372 -#define VAR_HARDEN_BELOW_NXDOMAIN 373 -#define VAR_IGNORE_CD_FLAG 374 -#define VAR_LOG_QUERIES 375 -#define VAR_TCP_UPSTREAM 376 -#define VAR_SSL_UPSTREAM 377 -#define VAR_SSL_SERVICE_KEY 378 -#define VAR_SSL_SERVICE_PEM 379 -#define VAR_SSL_PORT 380 -#define VAR_FORWARD_FIRST 381 -#define VAR_STUB_FIRST 382 -#define VAR_MINIMAL_RESPONSES 383 -#define VAR_RRSET_ROUNDROBIN 384 -#define VAR_MAX_UDP_SIZE 385 +#define VAR_SO_REUSEPORT 373 +#define VAR_HARDEN_BELOW_NXDOMAIN 374 +#define VAR_IGNORE_CD_FLAG 375 +#define VAR_LOG_QUERIES 376 +#define VAR_TCP_UPSTREAM 377 +#define VAR_SSL_UPSTREAM 378 +#define VAR_SSL_SERVICE_KEY 379 +#define VAR_SSL_SERVICE_PEM 380 +#define VAR_SSL_PORT 381 +#define VAR_FORWARD_FIRST 382 +#define VAR_STUB_FIRST 383 +#define VAR_MINIMAL_RESPONSES 384 +#define VAR_RRSET_ROUNDROBIN 385 +#define VAR_MAX_UDP_SIZE 386 @@ -318,7 +320,7 @@ typedef union YYSTYPE /* Line 2049 of yacc.c */ -#line 322 "util/configparser.h" +#line 324 "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 b11d7d43f..5b69d6671 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -101,7 +101,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_VAL_SIG_SKEW_MAX VAR_CACHE_MIN_TTL VAR_VAL_LOG_LEVEL %token VAR_AUTO_TRUST_ANCHOR_FILE VAR_KEEP_MISSING VAR_ADD_HOLDDOWN %token VAR_DEL_HOLDDOWN VAR_SO_RCVBUF VAR_EDNS_BUFFER_SIZE VAR_PREFETCH -%token VAR_PREFETCH_KEY VAR_SO_SNDBUF VAR_HARDEN_BELOW_NXDOMAIN +%token VAR_PREFETCH_KEY VAR_SO_SNDBUF VAR_SO_REUSEPORT VAR_HARDEN_BELOW_NXDOMAIN %token VAR_IGNORE_CD_FLAG VAR_LOG_QUERIES VAR_TCP_UPSTREAM VAR_SSL_UPSTREAM %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 @@ -162,7 +162,8 @@ content_server: server_num_threads | server_verbosity | server_port | server_so_sndbuf | server_harden_below_nxdomain | server_ignore_cd_flag | 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_minimal_responses | server_rrset_roundrobin | server_max_udp_size | + server_so_reuseport ; stubstart: VAR_STUB_ZONE { @@ -595,6 +596,16 @@ server_so_sndbuf: VAR_SO_SNDBUF STRING_ARG free($2); } ; +server_so_reuseport: VAR_SO_REUSEPORT STRING_ARG + { + OUTYY(("P(server_so_reuseport:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->so_reuseport = + (strcmp($2, "yes")==0); + free($2); + } + ; server_edns_buffer_size: VAR_EDNS_BUFFER_SIZE STRING_ARG { OUTYY(("P(server_edns_buffer_size:%s)\n", $2));