From: Wouter Wijngaards Date: Tue, 8 Nov 2011 10:56:42 +0000 (+0000) Subject: ssl_port setting, so that the dnssec-trigger server can be on one host machine. X-Git-Tag: release-1.4.14rc1~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f5596f643126c7a30fcfc6ef7a31ee3f26b813b;p=thirdparty%2Funbound.git ssl_port setting, so that the dnssec-trigger server can be on one host machine. git-svn-id: file:///svn/unbound/trunk@2539 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index eb8be376b..661648bdb 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +8 November 2011: Wouter + - can configure ssl service to one port number, and not on others. + 1 November 2011: Wouter - dns over ssl support as a client, ssl-upstream yes turns it on. It performs an SSL transaction for every DNS query (250 msec). diff --git a/doc/example.conf.in b/doc/example.conf.in index d8fcb56ad..2ddc3015f 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -458,6 +458,7 @@ server: # default is "" (disabled). requires restart to take effect. # ssl-service-key: "path/to/privatekeyfile.key" # ssl-service-pem: "path/to/publiccertfile.pem" + # ssl-port: 443 # request upstream over SSL (with plain DNS inside the SSL stream). # Default is no. Can be turned on and off with unbound-control. diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 07ad37c67..dfded963f 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -315,6 +315,10 @@ suffixes in the \fBinterface\fR config. The public key certificate pem file for the ssl service. Default is "", turned off. .TP +.B ssl\-port: \fI +The port number on which to provide TCP SSL service, default 443, only +interfaces configured with that port number as @number get the SSL service. +.TP .B do\-daemonize: \fI Enable or disable whether the unbound server forks into the background as a daemon. Default is yes. diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index 9693b437c..ea7ec3a66 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -632,12 +632,13 @@ set_recvpktinfo(int s, int family) * @param list: list of open ports, appended to, changed to point to list head. * @param rcv: receive buffer size for UDP * @param snd: send buffer size for UDP + * @param ssl_port: ssl service port number * @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) + size_t rcv, size_t snd, int ssl_port) { int s, noip6=0; if(!do_udp && !do_tcp) @@ -682,6 +683,9 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp, } } if(do_tcp) { + int is_ssl = ((strchr(ifname, '@') && + 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) { if(noip6) { @@ -690,7 +694,10 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp, } return 0; } - if(!port_insert(list, s, listen_type_tcp)) { + if(is_ssl) + verbose(VERB_ALGO, "setup TCP for SSL service"); + if(!port_insert(list, s, is_ssl?listen_type_ssl: + listen_type_tcp)) { #ifndef USE_WINSOCK close(s); #else @@ -736,9 +743,6 @@ listen_create(struct comm_base* base, struct listen_port* ports, free(front); return NULL; } - if(sslctx) { - verbose(VERB_ALGO, "setup for SSL-wrapped TCP service"); - } /* create comm points as needed */ while(ports) { @@ -746,7 +750,10 @@ listen_create(struct comm_base* base, struct listen_port* ports, if(ports->ftype == listen_type_udp) cp = comm_point_create_udp(base, ports->fd, front->udp_buff, cb, cb_arg); - else if(ports->ftype == listen_type_tcp) { + else if(ports->ftype == listen_type_tcp) + cp = comm_point_create_tcp(base, ports->fd, + tcp_accept_count, bufsize, cb, cb_arg); + else if(ports->ftype == listen_type_ssl) { cp = comm_point_create_tcp(base, ports->fd, tcp_accept_count, bufsize, cb, cb_arg); cp->ssl = sslctx; @@ -834,7 +841,8 @@ listening_ports_open(struct config_file* cfg) if(!ports_create_if(do_auto?"::0":"::1", do_auto, cfg->do_udp, do_tcp, &hints, portbuf, &list, - cfg->so_rcvbuf, cfg->so_sndbuf)) { + cfg->so_rcvbuf, cfg->so_sndbuf, + cfg->ssl_port)) { listening_ports_free(list); return NULL; } @@ -844,7 +852,8 @@ listening_ports_open(struct config_file* cfg) if(!ports_create_if(do_auto?"0.0.0.0":"127.0.0.1", do_auto, cfg->do_udp, do_tcp, &hints, portbuf, &list, - cfg->so_rcvbuf, cfg->so_sndbuf)) { + cfg->so_rcvbuf, cfg->so_sndbuf, + cfg->ssl_port)) { listening_ports_free(list); return NULL; } @@ -856,7 +865,8 @@ listening_ports_open(struct config_file* cfg) hints.ai_family = AF_INET6; if(!ports_create_if(cfg->ifs[i], 0, cfg->do_udp, do_tcp, &hints, portbuf, &list, - cfg->so_rcvbuf, cfg->so_sndbuf)) { + cfg->so_rcvbuf, cfg->so_sndbuf, + cfg->ssl_port)) { listening_ports_free(list); return NULL; } @@ -866,7 +876,8 @@ listening_ports_open(struct config_file* cfg) hints.ai_family = AF_INET; if(!ports_create_if(cfg->ifs[i], 0, cfg->do_udp, do_tcp, &hints, portbuf, &list, - cfg->so_rcvbuf, cfg->so_sndbuf)) { + cfg->so_rcvbuf, cfg->so_sndbuf, + cfg->ssl_port)) { listening_ports_free(list); return NULL; } diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h index 15328b637..22fa82804 100644 --- a/services/listen_dnsport.h +++ b/services/listen_dnsport.h @@ -82,7 +82,9 @@ enum listen_type { /** tcp type */ listen_type_tcp, /** udp ipv6 (v4mapped) for use with ancillary data */ - listen_type_udpancil + listen_type_udpancil, + /** ssl over tcp type */ + listen_type_ssl }; /** diff --git a/util/config_file.c b/util/config_file.c index 48635c74f..a63de3b66 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -90,6 +90,7 @@ config_create(void) cfg->tcp_upstream = 0; cfg->ssl_service_key = NULL; cfg->ssl_service_pem = NULL; + cfg->ssl_port = 443; cfg->ssl_upstream = 0; cfg->use_syslog = 1; cfg->log_time_ascii = 0; @@ -332,6 +333,7 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_YNO("ssl-upstream:", ssl_upstream) else S_STR("ssl-service-key:", ssl_service_key) else S_STR("ssl-service-pem:", ssl_service_pem) + else S_NUMBER_NONZERO("ssl-port:", ssl_port) else S_YNO("interface-automatic:", if_automatic) else S_YNO("do-daemonize:", do_daemonize) else S_NUMBER_NONZERO("port:", port) @@ -583,6 +585,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_YNO(opt, "ssl-upstream", ssl_upstream) else O_STR(opt, "ssl-service-key", ssl_service_key) else O_STR(opt, "ssl-service-pem", ssl_service_pem) + else O_DEC(opt, "ssl-port", ssl_port) else O_YNO(opt, "do-daemonize", do_daemonize) else O_STR(opt, "chroot", chrootdir) else O_STR(opt, "username", username) diff --git a/util/config_file.h b/util/config_file.h index 61a45629d..050c3a00b 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -83,6 +83,8 @@ struct config_file { char* ssl_service_key; /** public key file for dnstcp-ssl service */ char* ssl_service_pem; + /** port on which to provide ssl service */ + int ssl_port; /** if outgoing tcp connections use SSL */ int ssl_upstream; diff --git a/util/configlexer.c b/util/configlexer.c index 67363d800..ffbe416cf 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -362,8 +362,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 137 -#define YY_END_OF_BUFFER 138 +#define YY_NUM_RULES 138 +#define YY_END_OF_BUFFER 139 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -371,151 +371,152 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1298] = +static yyconst flex_int16_t yy_accept[1303] = { 0, - 1, 1, 119, 119, 123, 123, 127, 127, 131, 131, - 1, 1, 138, 135, 1, 117, 117, 136, 2, 136, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 119, - 120, 120, 121, 136, 123, 124, 124, 125, 136, 130, - 127, 128, 128, 129, 136, 131, 132, 132, 133, 136, - 134, 118, 2, 122, 136, 134, 135, 0, 1, 2, - 2, 2, 2, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 119, 0, - 123, 0, 130, 0, 127, 131, 0, 134, 0, 2, - 2, 134, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 134, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 134, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 61, 135, 135, 135, 135, 135, 6, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 134, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 134, 135, 135, 135, - - 135, 26, 135, 135, 135, 135, 135, 12, 13, 135, - 15, 14, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 115, 135, 135, 135, - 135, 3, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 134, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - - 135, 135, 135, 135, 126, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 29, 135, 135, - 135, 135, 135, 135, 135, 30, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 74, - 126, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 73, 135, 135, 135, 135, 135, 135, 135, 135, 135, - - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 59, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 27, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 28, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 21, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - - 135, 135, 135, 135, 135, 135, 135, 135, 24, 25, - 135, 135, 135, 62, 63, 135, 60, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 5, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 76, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 101, 100, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 31, 135, 135, 135, 135, 135, 135, 64, 135, 135, - - 135, 135, 135, 135, 97, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 50, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 99, 135, 135, 135, 135, 135, 135, 135, 4, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 94, 135, 135, 135, 135, 135, 135, 135, 109, 95, - - 135, 20, 135, 135, 135, 135, 66, 67, 65, 135, - 135, 135, 135, 135, 135, 72, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 96, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 58, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 17, 135, 135, 135, 16, 135, 81, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 38, - 39, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 71, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - - 75, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 114, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 85, 135, 89, - 135, 135, 135, 135, 70, 135, 135, 107, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 88, 135, 135, 135, 135, 40, 41, 135, 46, - 90, 135, 102, 98, 135, 34, 135, 92, 135, 135, - 135, 135, 135, 7, 135, 57, 106, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - - 77, 135, 135, 116, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 91, 33, 35, 135, - 135, 135, 135, 135, 56, 135, 135, 135, 110, 18, - 19, 135, 135, 135, 135, 135, 135, 54, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 112, 135, 135, - 32, 135, 135, 135, 135, 135, 135, 11, 135, 135, - 135, 135, 135, 135, 10, 135, 135, 36, 135, 111, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 84, 83, 135, 113, 108, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 42, 135, 135, 135, 135, - - 135, 37, 135, 135, 135, 78, 80, 135, 135, 135, - 82, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 22, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 105, 135, - 135, 135, 135, 135, 135, 135, 23, 135, 9, 135, - 135, 103, 47, 135, 135, 135, 87, 135, 68, 135, - 135, 135, 49, 53, 48, 135, 43, 135, 8, 135, - 135, 86, 135, 135, 135, 52, 135, 44, 135, 104, - 135, 135, 79, 69, 51, 45, 135, 135, 135, 135, - 55, 135, 135, 135, 135, 93, 0 - + 1, 1, 120, 120, 124, 124, 128, 128, 132, 132, + 1, 1, 139, 136, 1, 118, 118, 137, 2, 137, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 120, + 121, 121, 122, 137, 124, 125, 125, 126, 137, 131, + 128, 129, 129, 130, 137, 132, 133, 133, 134, 137, + 135, 119, 2, 123, 137, 135, 136, 0, 1, 2, + 2, 2, 2, 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, 120, 0, + 124, 0, 131, 0, 128, 132, 0, 135, 0, 2, + 2, 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, 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, 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, 62, 136, 136, 136, 136, 136, 6, + 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, + 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, 135, 136, + + 136, 136, 136, 27, 136, 136, 136, 136, 136, 12, + 13, 136, 15, 14, 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, 116, 136, + 136, 136, 136, 3, 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, 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, 127, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 30, 136, 136, 136, 136, 136, 136, 136, 31, 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, 75, 127, 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, 74, 136, 136, 136, 136, 136, + + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 60, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 20, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 28, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 29, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 22, 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, 25, 26, 136, 136, 136, 63, 64, + 136, 61, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 5, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 77, + 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, 102, 101, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 32, 136, 136, 136, 136, + + 136, 136, 65, 136, 136, 136, 136, 136, 136, 98, + 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, 51, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 100, 136, 136, 136, + 136, 136, 136, 136, 4, 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, 95, 136, 136, 136, 136, + + 136, 136, 136, 110, 96, 136, 21, 136, 136, 136, + 136, 67, 68, 66, 136, 136, 136, 136, 136, 136, + 73, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 97, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 59, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 17, 136, 136, 136, 16, + 136, 82, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 39, 40, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 72, 136, 136, 136, 136, 136, 136, 136, 136, + + 136, 136, 136, 136, 136, 76, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 115, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 86, 136, 90, 136, 136, 136, 136, 71, + 136, 136, 108, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 89, 136, 136, 136, + 136, 41, 42, 136, 47, 91, 136, 103, 99, 136, + 35, 136, 93, 136, 136, 136, 136, 136, 7, 136, + 58, 107, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + + 136, 136, 136, 136, 136, 78, 136, 136, 117, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 92, 34, 36, 136, 136, 136, 136, 136, 57, + 136, 136, 136, 111, 18, 19, 136, 136, 136, 136, + 136, 136, 55, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 113, 136, 136, 33, 136, 136, 136, 136, + 136, 136, 11, 136, 136, 136, 136, 136, 136, 10, + 136, 136, 37, 136, 112, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 85, 84, 136, 114, 109, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + + 43, 136, 136, 136, 136, 136, 38, 136, 136, 136, + 79, 81, 136, 136, 136, 83, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 23, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 106, 136, 136, 136, 136, 136, 136, + 136, 24, 136, 9, 136, 136, 104, 48, 136, 136, + 136, 88, 136, 69, 136, 136, 136, 50, 54, 49, + 136, 44, 136, 8, 136, 136, 87, 136, 136, 136, + 53, 136, 45, 136, 105, 136, 136, 80, 70, 52, + 46, 136, 136, 136, 136, 56, 136, 136, 136, 136, + + 94, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -558,22 +559,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[1312] = +static yyconst flex_int16_t yy_base[1317] = { 0, 0, 0, 37, 40, 44, 51, 63, 75, 56, 68, - 87, 108, 2492, 2415, 50, 2598, 2598, 2598, 129, 94, + 87, 108, 2502, 2488, 50, 2605, 2605, 2605, 129, 94, 70, 104, 122, 90, 92, 115, 126, 95, 84, 132, - 135, 138, 50, 142, 148, 156, 169, 164, 144, 2409, - 2598, 2598, 2598, 70, 2174, 2598, 2598, 2598, 42, 1992, - 1799, 2598, 2598, 2598, 188, 1727, 2598, 2598, 2598, 182, - 1579, 2598, 197, 2598, 201, 111, 1377, 207, 120, 0, + 135, 138, 50, 142, 148, 156, 169, 164, 144, 2487, + 2605, 2605, 2605, 70, 2486, 2605, 2605, 2605, 42, 2458, + 2079, 2605, 2605, 2605, 188, 1633, 2605, 2605, 2605, 182, + 1481, 2605, 197, 2605, 201, 111, 1314, 207, 120, 0, 218, 0, 0, 103, 158, 165, 152, 184, 194, 203, 204, 146, 216, 200, 205, 213, 219, 220, 136, 221, 227, 223, 234, 238, 228, 236, 240, 244, 248, 226, 250, 249, 255, 252, 256, 258, 257, 262, 268, 265, - 270, 266, 274, 275, 49, 278, 281, 279, 1248, 294, - 1100, 298, 895, 309, 739, 397, 296, 357, 313, 317, + 270, 266, 274, 275, 49, 278, 281, 279, 1053, 294, + 804, 298, 772, 309, 744, 397, 296, 357, 313, 317, 0, 310, 294, 319, 312, 315, 316, 318, 325, 321, 329, 339, 332, 322, 330, 328, 336, 337, 344, 334, 350, 345, 347, 346, 354, 361, 367, 369, 355, 377, @@ -586,277 +587,277 @@ static yyconst flex_int16_t yy_base[1312] = 474, 476, 480, 478, 477, 479, 484, 482, 495, 501, 502, 490, 503, 504, 509, 506, 514, 512, 516, 522, 519, 520, 521, 523, 526, 529, 533, 530, 531, 534, - 532, 540, 541, 560, 542, 544, 548, 549, 550, 551, - 561, 558, 566, 567, 564, 573, 580, 591, 570, 577, - 583, 586, 483, 592, 594, 595, 597, 598, 603, 601, - 602, 615, 614, 613, 604, 621, 628, 616, 624, 626, - 625, 627, 631, 2598, 634, 629, 636, 640, 639, 2598, - 641, 642, 643, 647, 645, 659, 646, 655, 656, 658, - - 665, 666, 667, 669, 670, 679, 671, 672, 676, 687, - 680, 678, 682, 692, 694, 698, 696, 699, 700, 702, - 709, 707, 708, 710, 713, 717, 720, 721, 722, 714, - 731, 734, 740, 738, 742, 744, 724, 743, 746, 752, - 749, 751, 754, 760, 757, 758, 761, 765, 768, 767, - 775, 777, 779, 770, 780, 787, 786, 788, 790, 789, - 795, 796, 797, 798, 799, 812, 805, 806, 814, 821, - 822, 823, 808, 809, 818, 827, 819, 829, 830, 837, - 833, 835, 839, 841, 840, 842, 844, 848, 849, 851, - 859, 860, 850, 862, 863, 853, 866, 870, 874, 875, - - 876, 2598, 884, 882, 880, 881, 887, 2598, 2598, 883, - 2598, 2598, 888, 893, 890, 906, 907, 903, 892, 891, - 912, 905, 913, 917, 921, 922, 924, 928, 930, 929, - 931, 935, 933, 934, 941, 942, 938, 946, 947, 943, - 952, 953, 959, 956, 967, 963, 2598, 965, 966, 969, - 972, 2598, 971, 973, 974, 977, 976, 984, 979, 978, - 981, 993, 986, 989, 1005, 1004, 990, 759, 1002, 991, - 1010, 1018, 1014, 1001, 1015, 1021, 1020, 1023, 1025, 1026, - 1027, 1029, 1030, 1032, 1055, 1033, 1034, 1035, 1038, 1036, - 1039, 1043, 1047, 1061, 1051, 1063, 1067, 1044, 1065, 1068, - - 1072, 1073, 1075, 1078, 2598, 1085, 1081, 1083, 1088, 1089, - 1090, 1091, 1093, 1095, 1097, 1096, 1108, 2598, 1104, 1107, - 1109, 1113, 1116, 1120, 1122, 2598, 1128, 1129, 1131, 1124, - 1106, 1132, 1136, 1137, 1138, 1140, 1143, 1145, 1147, 1148, - 1149, 1151, 1153, 1154, 1155, 1157, 1156, 1170, 1176, 1162, - 1175, 1161, 1168, 1172, 1183, 1178, 1181, 1185, 1186, 2598, - 181, 1187, 1188, 1189, 1197, 1198, 1194, 1191, 1200, 1202, - 1195, 1206, 1213, 1208, 1215, 1217, 1216, 1218, 1219, 1225, - 1227, 1228, 1220, 1230, 1231, 1233, 1234, 1239, 1236, 1237, - 2598, 1250, 1241, 1253, 1244, 1257, 1268, 1247, 1265, 1271, - - 1258, 1270, 1272, 1278, 1269, 1273, 1281, 1285, 1282, 1284, - 1286, 1290, 2598, 1289, 1292, 1294, 1296, 1297, 1298, 1299, - 1303, 1309, 1314, 1315, 1319, 1311, 1321, 1323, 1326, 1333, - 1305, 1329, 1327, 1336, 1337, 1338, 1339, 2598, 1345, 1347, - 1343, 1354, 1350, 1351, 1352, 1357, 1353, 1358, 1365, 1362, - 1364, 1361, 1366, 1368, 1369, 1371, 1372, 2598, 1391, 1374, - 1375, 1378, 1380, 1376, 1397, 1385, 1392, 1387, 1399, 1403, - 1405, 1409, 1407, 1410, 1411, 1415, 1413, 1417, 1428, 1429, - 1430, 2598, 1427, 1433, 1416, 1441, 1438, 1420, 1442, 1443, - 1450, 1444, 1446, 1448, 1451, 1452, 1453, 1454, 1455, 1457, - - 1460, 1458, 1459, 1472, 1476, 1473, 1477, 1484, 2598, 2598, - 1480, 1481, 1488, 2598, 2598, 1487, 2598, 1490, 1494, 1489, - 1491, 1496, 1498, 1500, 1502, 1505, 1503, 1507, 1508, 1509, - 1510, 2598, 1511, 1517, 1519, 1514, 1521, 1523, 1524, 1527, - 1535, 1533, 1536, 1538, 2598, 1537, 1539, 1545, 1551, 1554, - 1540, 1547, 1552, 1549, 1556, 1560, 1563, 1562, 1565, 1566, - 1569, 1570, 1571, 1578, 1574, 1575, 1576, 1577, 1581, 1587, - 1589, 2598, 2598, 1591, 1598, 1593, 1600, 1603, 1604, 1611, - 1608, 1609, 1610, 1614, 1616, 1617, 1618, 1620, 1622, 1625, - 2598, 1631, 1633, 1634, 1644, 1624, 1645, 2598, 1627, 1646, - - 1647, 1641, 1650, 1649, 2598, 1651, 1652, 1653, 1657, 1663, - 1655, 1661, 1670, 1673, 1669, 1674, 1675, 1681, 1677, 1678, - 1682, 1680, 1691, 1692, 1694, 1700, 1697, 1698, 1699, 1703, - 1705, 1707, 1713, 1709, 2598, 1715, 1711, 1721, 1714, 1723, - 1724, 1731, 1728, 1730, 1732, 1733, 1720, 1735, 1736, 1737, - 1743, 2598, 1745, 1744, 1746, 1748, 1756, 1749, 1760, 2598, - 1759, 1766, 1758, 1765, 1768, 1777, 1770, 1769, 1771, 1773, - 1781, 1784, 1780, 1795, 1783, 1785, 1802, 1801, 1808, 1810, - 1806, 1814, 1811, 1812, 1813, 1790, 1822, 1798, 1824, 1821, - 2598, 1826, 1828, 1831, 1832, 1834, 1835, 1836, 2598, 2598, - - 1837, 2598, 1842, 1840, 1844, 1846, 2598, 2598, 2598, 1847, - 1856, 1848, 1859, 1850, 1863, 2598, 1857, 1866, 1867, 1869, - 1870, 1871, 1872, 1873, 1874, 2598, 1875, 1876, 1877, 1887, - 1892, 1879, 1893, 1897, 1901, 1902, 1885, 1889, 1913, 1910, - 2598, 1881, 1904, 1912, 1914, 1916, 1920, 1919, 1917, 1927, - 2598, 1921, 1923, 1924, 2598, 1930, 2598, 1933, 1935, 1937, - 1942, 1938, 1945, 1948, 1949, 1950, 1951, 1957, 1954, 2598, - 2598, 1952, 1959, 1965, 1963, 1968, 1970, 1969, 1971, 1972, - 1977, 1978, 1980, 1979, 1981, 1982, 2598, 1986, 1987, 1988, - 1991, 1994, 2006, 2008, 1997, 2012, 2014, 2009, 2016, 2018, - - 2598, 2019, 2021, 2022, 2026, 2027, 1983, 2029, 2030, 2034, - 2023, 2036, 2598, 2038, 2039, 2043, 2040, 2048, 2047, 2049, - 2050, 2051, 2054, 2055, 2057, 2063, 2070, 2598, 2059, 2598, - 2067, 2060, 2073, 2077, 2598, 2075, 2080, 2598, 2081, 2082, - 2089, 2091, 2093, 2098, 2094, 2083, 2100, 2085, 2101, 2107, - 2108, 2598, 2109, 2110, 2111, 2116, 2598, 2598, 2112, 2598, - 2598, 2121, 2598, 2598, 2123, 2598, 2127, 2598, 2129, 2130, - 2117, 2128, 2132, 2598, 2135, 2598, 2598, 2136, 2138, 2139, - 2143, 2146, 2148, 2149, 2151, 2152, 2153, 2154, 2155, 2157, - 2158, 2159, 2160, 2163, 2162, 2168, 2170, 2172, 2173, 2184, - - 2598, 2171, 2190, 2598, 2193, 2187, 2179, 2181, 2195, 2198, - 2197, 2201, 2207, 2203, 2204, 2205, 2598, 2598, 2598, 2206, - 2208, 2210, 2212, 2215, 2598, 2220, 2217, 2222, 2598, 2598, - 2598, 2228, 2224, 2230, 2232, 2235, 2234, 2598, 2238, 2243, - 2244, 2241, 2251, 2255, 2252, 2258, 2260, 2598, 2261, 2262, - 2598, 2264, 2263, 2268, 2269, 2270, 2272, 2598, 2265, 2273, - 2280, 2282, 2275, 2285, 2598, 2286, 2287, 2598, 2289, 2598, - 2293, 2296, 2298, 2303, 2305, 2294, 2231, 2311, 2308, 2310, - 2598, 2598, 2309, 2598, 2598, 2299, 2316, 2317, 2319, 2321, - 2322, 2323, 2325, 2326, 2328, 2598, 2329, 2331, 2334, 2338, - - 2330, 2598, 2341, 2340, 2344, 2598, 2598, 2353, 2345, 2347, - 2598, 2354, 2355, 2357, 2360, 2362, 2363, 2365, 2366, 2370, - 2368, 2367, 2371, 2380, 2377, 2598, 2384, 2374, 2386, 2388, - 2392, 2395, 2389, 2396, 2398, 2399, 2403, 2400, 2598, 2404, - 2405, 2407, 2413, 2421, 2417, 2424, 2598, 2425, 2598, 2428, - 2429, 2598, 2598, 2430, 2432, 2435, 2598, 2436, 2598, 2433, - 2443, 2444, 2598, 2598, 2598, 2446, 2598, 2447, 2598, 2450, - 2437, 2598, 2439, 2455, 2459, 2598, 2461, 2598, 2463, 2598, - 2456, 2464, 2598, 2598, 2598, 2598, 2466, 2467, 2472, 2469, - 2598, 2473, 2475, 2474, 2477, 2598, 2598, 2506, 2513, 2520, - - 2527, 2534, 94, 2541, 2548, 2555, 2562, 2569, 2576, 2583, - 2590 + 532, 540, 541, 560, 549, 544, 548, 551, 550, 557, + 561, 558, 566, 567, 568, 571, 584, 593, 580, 583, + 586, 573, 483, 592, 594, 595, 597, 598, 603, 601, + 604, 615, 611, 616, 614, 622, 625, 618, 624, 626, + 629, 628, 630, 2605, 635, 632, 637, 641, 640, 2605, + 642, 643, 644, 646, 647, 659, 648, 656, 657, 660, + + 664, 665, 667, 671, 668, 673, 685, 674, 676, 670, + 682, 684, 691, 692, 693, 696, 700, 701, 698, 704, + 702, 713, 709, 711, 714, 716, 720, 722, 723, 725, + 724, 731, 736, 744, 741, 743, 750, 726, 746, 748, + 754, 753, 755, 756, 763, 759, 761, 762, 766, 773, + 769, 777, 779, 781, 771, 782, 790, 788, 789, 793, + 795, 791, 797, 798, 799, 801, 813, 815, 807, 814, + 823, 819, 824, 820, 825, 827, 828, 829, 830, 831, + 832, 839, 835, 836, 840, 850, 841, 842, 851, 852, + 853, 856, 860, 862, 866, 868, 869, 871, 872, 870, + + 876, 874, 881, 2605, 888, 887, 879, 886, 889, 2605, + 2605, 892, 2605, 2605, 893, 899, 896, 903, 910, 901, + 907, 908, 913, 919, 920, 923, 911, 930, 932, 921, + 915, 936, 937, 939, 940, 942, 946, 948, 943, 952, + 953, 950, 957, 956, 965, 959, 971, 955, 2605, 969, + 970, 975, 977, 2605, 973, 978, 981, 982, 983, 986, + 985, 979, 987, 991, 1000, 990, 993, 997, 1008, 1002, + 1011, 1009, 1013, 1015, 1022, 1024, 1018, 1019, 1025, 1026, + 1029, 1031, 1033, 1035, 1037, 1038, 1040, 1063, 1041, 1042, + 1043, 1047, 1044, 1050, 1049, 1057, 1069, 1071, 1059, 1075, + + 1080, 1078, 1082, 1084, 1085, 1089, 1092, 2605, 1091, 1094, + 1093, 1100, 1101, 1051, 1099, 1102, 1103, 1105, 1108, 1114, + 2605, 1110, 1111, 1115, 1121, 1122, 1127, 1129, 2605, 1135, + 1132, 1137, 1138, 1139, 1141, 1142, 1143, 1145, 1146, 1150, + 1154, 1155, 1157, 1156, 1158, 1162, 1161, 1164, 1165, 1167, + 1168, 1176, 1177, 1180, 1182, 1184, 1185, 1186, 1191, 1188, + 1192, 1189, 1190, 2605, 181, 1193, 1194, 1196, 1202, 1205, + 1212, 1204, 1210, 1214, 1211, 1213, 1221, 1222, 1223, 1225, + 1227, 1229, 1231, 1233, 1236, 1238, 1235, 1239, 1241, 1242, + 1243, 1244, 1245, 1248, 2605, 1261, 1252, 1255, 1254, 1264, + + 1272, 1268, 1270, 1278, 1275, 1277, 1280, 1283, 1286, 1287, + 1293, 1294, 1290, 1292, 1297, 1291, 2605, 1299, 1301, 1304, + 1298, 1307, 1309, 1310, 1308, 1319, 1321, 2605, 1324, 1325, + 1323, 1332, 1335, 1336, 1338, 1329, 1339, 1340, 1345, 1343, + 1346, 1347, 2605, 1356, 1358, 1355, 1362, 1359, 1363, 1364, + 1366, 1367, 1369, 1376, 1370, 1373, 1377, 1378, 1374, 1372, + 1380, 1381, 2605, 1389, 1383, 1385, 1386, 1396, 1399, 1401, + 1402, 1406, 1400, 1407, 1408, 1410, 1411, 1412, 1418, 1422, + 1423, 1424, 1428, 1436, 1439, 1440, 2605, 1438, 1432, 1425, + 1452, 1449, 1435, 1442, 1450, 1458, 1455, 1457, 1459, 1460, + + 1463, 1462, 1465, 1466, 1464, 1468, 1471, 1473, 1470, 1486, + 1487, 1475, 1493, 2605, 2605, 1489, 1496, 1503, 2605, 2605, + 1500, 2605, 1501, 1505, 1502, 1491, 1507, 1508, 1510, 1511, + 1513, 1515, 1518, 1520, 1519, 1521, 2605, 1522, 1525, 1527, + 1530, 1532, 1533, 1534, 1541, 1547, 1535, 1543, 1545, 2605, + 1544, 1548, 1556, 1563, 1560, 1554, 1562, 1564, 1565, 1566, + 1568, 1570, 1574, 1576, 1577, 1579, 1578, 1581, 1585, 1583, + 1584, 1586, 1587, 1591, 1599, 1589, 2605, 2605, 1601, 1606, + 1610, 1595, 1612, 1613, 1620, 1617, 1618, 1623, 1625, 1626, + 1627, 1628, 1629, 1631, 1632, 2605, 1639, 1642, 1635, 1649, + + 1645, 1648, 2605, 1653, 1654, 1655, 1656, 1660, 1659, 2605, + 1662, 1664, 1665, 1666, 1669, 1663, 1678, 1679, 1681, 1683, + 1684, 1686, 1690, 1687, 1688, 1689, 1692, 1703, 1700, 1705, + 1712, 1693, 1708, 1710, 1716, 1718, 1720, 1726, 1722, 2605, + 1728, 1711, 1736, 1713, 1733, 1734, 1742, 1739, 1724, 1740, + 1741, 1743, 1746, 1747, 1748, 1750, 2605, 1754, 1752, 1756, + 1755, 1766, 1757, 1762, 2605, 1769, 1776, 1768, 1772, 1785, + 1775, 1777, 1782, 1789, 1787, 1790, 1791, 1792, 1794, 1795, + 1797, 1810, 1799, 1814, 1812, 1815, 1822, 1818, 1819, 1820, + 1801, 1829, 1821, 1833, 1825, 2605, 1831, 1836, 1839, 1840, + + 1842, 1844, 1845, 2605, 2605, 1841, 2605, 1848, 1851, 1852, + 1855, 2605, 2605, 2605, 1856, 1862, 1858, 1865, 1871, 1868, + 2605, 1872, 1863, 1876, 1859, 1874, 1878, 1881, 1882, 1884, + 2605, 1887, 1889, 1885, 1896, 1895, 1888, 1901, 1898, 1902, + 1908, 1899, 1909, 1915, 1911, 2605, 1912, 1918, 1920, 1921, + 1925, 1926, 1924, 1922, 1923, 2605, 1930, 1938, 1939, 2605, + 1940, 2605, 1941, 1942, 1944, 1949, 1945, 1951, 1952, 1956, + 1957, 1959, 1964, 1961, 2605, 2605, 1965, 1976, 1977, 1968, + 1979, 1966, 1973, 1981, 1982, 1983, 1985, 1987, 1989, 1991, + 1990, 2605, 1993, 1994, 1999, 2000, 1995, 2005, 2015, 2007, + + 2017, 2019, 2021, 2023, 2025, 2605, 2026, 2028, 2029, 2033, + 2034, 2030, 1998, 2037, 2042, 2035, 2044, 2605, 2046, 2039, + 2049, 2047, 2051, 2055, 2057, 2058, 2061, 2060, 2062, 2063, + 2069, 2073, 2605, 2067, 2605, 2074, 2081, 2089, 2085, 2605, + 2076, 2078, 2605, 2092, 2088, 2097, 2098, 2100, 2105, 2101, + 2099, 2107, 2108, 2109, 2115, 2112, 2605, 2113, 2116, 2117, + 2120, 2605, 2605, 2123, 2605, 2605, 2127, 2605, 2605, 2131, + 2605, 2133, 2605, 2139, 2135, 2137, 2138, 2140, 2605, 2142, + 2605, 2605, 2143, 2144, 2147, 2150, 2155, 2157, 2151, 2158, + 2159, 2161, 2162, 2164, 2166, 2168, 2167, 2169, 2170, 2172, + + 2178, 2179, 2175, 2181, 2188, 2605, 2182, 2190, 2605, 2195, + 2198, 2199, 2185, 2201, 2202, 2204, 2206, 2213, 2209, 2210, + 2211, 2605, 2605, 2605, 2212, 2217, 2216, 2221, 2222, 2605, + 2226, 2227, 2234, 2605, 2605, 2605, 2237, 2228, 2230, 2242, + 2243, 2241, 2605, 2244, 2251, 2252, 2245, 2254, 2262, 2263, + 2265, 2267, 2605, 2268, 2269, 2605, 2271, 2270, 2275, 2276, + 2277, 2279, 2605, 2272, 2280, 2287, 2289, 2282, 2292, 2605, + 2293, 2294, 2605, 2296, 2605, 2235, 2300, 2303, 2305, 2309, + 2310, 2311, 2317, 2314, 2315, 2605, 2605, 2316, 2605, 2605, + 2318, 2321, 2320, 2323, 2326, 2327, 2330, 2331, 2334, 2333, + + 2605, 2335, 2336, 2341, 2344, 2346, 2605, 2347, 2349, 2345, + 2605, 2605, 2358, 2351, 2359, 2605, 2360, 2362, 2364, 2366, + 2373, 2367, 2369, 2374, 2378, 2375, 2377, 2379, 2388, 2384, + 2605, 2391, 2382, 2392, 2395, 2397, 2399, 2400, 2401, 2405, + 2407, 2409, 2406, 2605, 2410, 2411, 2423, 2427, 2429, 2415, + 2431, 2605, 2432, 2605, 2435, 2436, 2605, 2605, 2437, 2439, + 2442, 2605, 2443, 2605, 2440, 2450, 2413, 2605, 2605, 2605, + 2452, 2605, 2453, 2605, 2455, 2444, 2605, 2446, 2462, 2466, + 2605, 2468, 2605, 2470, 2605, 2463, 2471, 2605, 2605, 2605, + 2605, 2473, 2456, 2479, 2474, 2605, 2480, 2482, 2481, 2485, + + 2605, 2605, 2513, 2520, 2527, 2534, 2541, 94, 2548, 2555, + 2562, 2569, 2576, 2583, 2590, 2597 } ; -static yyconst flex_int16_t yy_def[1312] = +static yyconst flex_int16_t yy_def[1317] = { 0, - 1297, 1, 1298, 1298, 1299, 1299, 1300, 1300, 1301, 1301, - 1302, 1302, 1297, 1303, 1297, 1297, 1297, 1297, 1304, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1305, - 1297, 1297, 1297, 1305, 1306, 1297, 1297, 1297, 1306, 1307, - 1297, 1297, 1297, 1297, 1307, 1308, 1297, 1297, 1297, 1308, - 1309, 1297, 1310, 1297, 1309, 1309, 1303, 1303, 1297, 1311, - 1304, 1311, 1304, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1305, 1305, - 1306, 1306, 1307, 1307, 1297, 1308, 1308, 1309, 1309, 1310, - 1310, 1309, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1309, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1309, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, 1303, 1297, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1309, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1309, 1303, 1303, 1303, - - 1303, 1297, 1303, 1303, 1303, 1303, 1303, 1297, 1297, 1303, - 1297, 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, - 1303, 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1309, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - - 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, - 1309, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1297, - 1303, 1303, 1303, 1297, 1297, 1303, 1297, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1297, 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, - - 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1297, - - 1303, 1297, 1303, 1303, 1303, 1303, 1297, 1297, 1297, 1303, - 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1297, 1303, 1303, 1303, 1297, 1303, 1297, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, - 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - - 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1297, - 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1297, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1297, 1303, 1303, 1303, 1303, 1297, 1297, 1303, 1297, - 1297, 1303, 1297, 1297, 1303, 1297, 1303, 1297, 1303, 1303, - 1303, 1303, 1303, 1297, 1303, 1297, 1297, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - - 1297, 1303, 1303, 1297, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1297, 1297, 1303, - 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1297, 1297, - 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, - 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, - 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1297, 1303, 1297, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1297, 1297, 1303, 1297, 1297, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, - - 1303, 1297, 1303, 1303, 1303, 1297, 1297, 1303, 1303, 1303, - 1297, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1303, 1303, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, - 1303, 1303, 1303, 1303, 1303, 1303, 1297, 1303, 1297, 1303, - 1303, 1297, 1297, 1303, 1303, 1303, 1297, 1303, 1297, 1303, - 1303, 1303, 1297, 1297, 1297, 1303, 1297, 1303, 1297, 1303, - 1303, 1297, 1303, 1303, 1303, 1297, 1303, 1297, 1303, 1297, - 1303, 1303, 1297, 1297, 1297, 1297, 1303, 1303, 1303, 1303, - 1297, 1303, 1303, 1303, 1303, 1297, 0, 1297, 1297, 1297, - - 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, - 1297 + 1302, 1, 1303, 1303, 1304, 1304, 1305, 1305, 1306, 1306, + 1307, 1307, 1302, 1308, 1302, 1302, 1302, 1302, 1309, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1310, + 1302, 1302, 1302, 1310, 1311, 1302, 1302, 1302, 1311, 1312, + 1302, 1302, 1302, 1302, 1312, 1313, 1302, 1302, 1302, 1313, + 1314, 1302, 1315, 1302, 1314, 1314, 1308, 1308, 1302, 1316, + 1309, 1316, 1309, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1310, 1310, + 1311, 1311, 1312, 1312, 1302, 1313, 1313, 1314, 1314, 1315, + 1315, 1314, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1314, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1314, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1302, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1314, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1314, 1308, + + 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1302, + 1302, 1308, 1302, 1302, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, + 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1314, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1302, 1314, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, + + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1302, 1302, 1308, 1308, 1308, 1302, 1302, + 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1302, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, + + 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1302, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, + + 1308, 1308, 1308, 1302, 1302, 1308, 1302, 1308, 1308, 1308, + 1308, 1302, 1302, 1302, 1308, 1308, 1308, 1308, 1308, 1308, + 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1302, + 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1302, 1302, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + + 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1302, 1308, 1302, 1308, 1308, 1308, 1308, 1302, + 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, + 1308, 1302, 1302, 1308, 1302, 1302, 1308, 1302, 1302, 1308, + 1302, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1302, 1308, + 1302, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + + 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1302, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1302, 1302, 1302, 1308, 1308, 1308, 1308, 1308, 1302, + 1308, 1308, 1308, 1302, 1302, 1302, 1308, 1308, 1308, 1308, + 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1302, 1308, 1308, 1302, 1308, 1308, 1308, 1308, + 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1302, + 1308, 1308, 1302, 1308, 1302, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1302, 1302, 1308, 1302, 1302, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + + 1302, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, + 1302, 1302, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, + 1308, 1302, 1308, 1302, 1308, 1308, 1302, 1302, 1308, 1308, + 1308, 1302, 1308, 1302, 1308, 1308, 1308, 1302, 1302, 1302, + 1308, 1302, 1308, 1302, 1308, 1308, 1302, 1308, 1308, 1308, + 1302, 1308, 1302, 1308, 1302, 1308, 1308, 1302, 1302, 1302, + 1302, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, + + 1302, 0, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, + 1302, 1302, 1302, 1302, 1302, 1302 } ; -static yyconst flex_int16_t yy_nxt[2638] = +static yyconst flex_int16_t yy_nxt[2645] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 18, 20, 21, 14, 22, 23, 24, 25, 14, @@ -911,246 +912,247 @@ static yyconst flex_int16_t yy_nxt[2638] = 68, 252, 68, 260, 68, 68, 253, 263, 261, 68, 68, 265, 68, 68, 262, 258, 267, 259, 266, 68, 68, 68, 68, 264, 68, 272, 68, 275, 68, 68, - 68, 68, 68, 276, 68, 68, 68, 337, 269, 268, + 68, 68, 68, 276, 68, 68, 68, 338, 269, 268, 274, 277, 68, 270, 273, 280, 281, 68, 278, 282, 283, 279, 284, 68, 68, 68, 68, 285, 68, 286, 290, 68, 287, 291, 68, 289, 68, 292, 68, 295, 288, 68, 68, 68, 68, 68, 298, 297, 68, 293, - 303, 68, 68, 68, 68, 68, 68, 304, 294, 299, - 302, 296, 68, 68, 68, 308, 68, 300, 307, 301, - 129, 68, 68, 68, 305, 319, 306, 310, 324, 318, - 68, 309, 68, 68, 311, 312, 68, 322, 68, 68, - 321, 320, 68, 323, 313, 68, 314, 315, 316, 68, - 325, 317, 68, 326, 327, 68, 328, 330, 68, 329, - - 331, 332, 333, 68, 68, 334, 68, 68, 338, 68, - 68, 335, 336, 68, 68, 68, 68, 345, 341, 343, - 344, 340, 347, 346, 339, 68, 68, 68, 68, 350, - 349, 342, 348, 68, 351, 352, 68, 68, 68, 68, - 68, 68, 356, 68, 358, 354, 68, 359, 68, 353, - 355, 68, 68, 68, 68, 68, 361, 68, 68, 68, - 357, 362, 360, 363, 367, 368, 369, 68, 68, 366, - 68, 68, 372, 364, 365, 373, 370, 68, 68, 68, - 376, 68, 68, 68, 68, 385, 382, 377, 68, 371, - 68, 68, 68, 374, 68, 378, 383, 375, 381, 68, - - 387, 380, 389, 384, 68, 379, 68, 388, 68, 390, - 68, 68, 68, 386, 129, 393, 398, 394, 397, 68, - 68, 68, 68, 391, 402, 68, 68, 396, 392, 68, - 395, 399, 68, 68, 68, 401, 68, 406, 400, 407, - 125, 403, 408, 68, 404, 409, 68, 410, 405, 411, - 68, 413, 68, 412, 68, 68, 68, 414, 68, 417, - 415, 68, 416, 68, 68, 418, 68, 421, 419, 68, - 68, 68, 68, 68, 422, 428, 424, 68, 427, 68, - 68, 425, 68, 550, 423, 426, 420, 68, 429, 68, - 430, 68, 68, 431, 436, 434, 433, 435, 68, 68, - - 68, 68, 68, 438, 437, 439, 440, 68, 68, 68, - 68, 68, 448, 444, 443, 432, 445, 68, 68, 446, - 68, 68, 442, 447, 68, 441, 68, 449, 451, 450, - 68, 68, 452, 68, 68, 68, 453, 454, 455, 68, - 456, 68, 68, 458, 462, 68, 459, 68, 464, 68, - 457, 68, 68, 68, 68, 465, 68, 461, 466, 460, - 68, 68, 68, 68, 463, 68, 471, 470, 467, 469, - 472, 68, 68, 468, 68, 68, 473, 474, 129, 478, - 475, 476, 68, 479, 477, 480, 68, 68, 68, 483, - 481, 485, 68, 68, 68, 68, 68, 484, 486, 68, - - 68, 488, 68, 68, 68, 68, 493, 124, 482, 491, - 487, 492, 490, 494, 489, 68, 505, 68, 68, 68, - 501, 495, 502, 496, 68, 68, 497, 504, 503, 68, - 507, 498, 506, 68, 68, 509, 68, 499, 500, 510, - 68, 68, 68, 68, 514, 68, 68, 68, 508, 513, - 68, 517, 518, 68, 68, 68, 520, 519, 68, 68, - 511, 512, 515, 516, 68, 68, 521, 522, 68, 524, - 526, 68, 525, 523, 528, 68, 527, 68, 68, 68, - 530, 68, 532, 68, 68, 68, 68, 533, 68, 68, - 68, 68, 531, 68, 529, 534, 68, 539, 68, 542, - - 540, 68, 68, 68, 535, 68, 536, 543, 537, 538, - 541, 544, 547, 68, 68, 546, 68, 68, 545, 551, - 548, 549, 68, 553, 552, 554, 68, 68, 558, 555, - 68, 556, 68, 68, 560, 68, 561, 129, 68, 68, - 557, 68, 68, 563, 68, 68, 68, 68, 68, 572, - 68, 68, 559, 562, 579, 68, 68, 586, 566, 68, - 564, 578, 574, 68, 575, 577, 565, 68, 583, 576, - 567, 573, 568, 68, 580, 68, 569, 68, 570, 68, - 68, 581, 587, 571, 68, 68, 591, 68, 588, 584, - 68, 585, 593, 68, 592, 68, 594, 68, 589, 582, - - 68, 68, 68, 68, 590, 68, 597, 68, 68, 68, - 600, 598, 122, 596, 595, 604, 68, 603, 68, 68, - 68, 68, 599, 602, 606, 68, 607, 601, 68, 611, - 608, 605, 68, 610, 68, 612, 68, 609, 618, 613, - 68, 68, 614, 68, 68, 615, 616, 619, 68, 68, - 68, 617, 68, 620, 621, 68, 622, 68, 623, 68, - 68, 68, 626, 68, 624, 68, 68, 68, 68, 68, - 630, 631, 633, 68, 68, 625, 629, 635, 627, 634, - 68, 628, 68, 636, 68, 632, 638, 68, 68, 637, - 68, 642, 639, 68, 640, 68, 641, 68, 68, 68, - - 68, 68, 644, 68, 650, 651, 68, 68, 643, 68, - 68, 652, 68, 647, 68, 648, 645, 653, 68, 655, - 68, 649, 656, 646, 658, 68, 654, 68, 68, 68, - 68, 68, 68, 657, 661, 663, 660, 68, 659, 68, - 68, 665, 68, 68, 668, 68, 68, 662, 68, 68, - 664, 68, 672, 68, 666, 667, 68, 676, 675, 68, - 120, 669, 68, 671, 670, 68, 673, 677, 674, 68, - 68, 686, 683, 678, 680, 681, 679, 68, 685, 682, - 68, 68, 68, 68, 68, 68, 684, 687, 692, 688, - 68, 689, 693, 68, 68, 690, 68, 68, 68, 694, - - 695, 68, 68, 691, 68, 701, 68, 696, 68, 68, - 68, 68, 697, 700, 698, 68, 699, 68, 706, 702, - 709, 68, 704, 68, 703, 710, 68, 68, 705, 707, - 711, 68, 714, 68, 715, 68, 712, 718, 68, 68, - 708, 68, 713, 716, 717, 68, 719, 720, 68, 68, - 68, 68, 725, 721, 726, 68, 723, 68, 724, 68, - 727, 728, 68, 68, 68, 68, 68, 722, 732, 68, - 68, 729, 735, 68, 68, 731, 68, 68, 68, 739, - 68, 68, 730, 68, 68, 733, 68, 68, 68, 68, - 68, 738, 68, 734, 736, 748, 737, 68, 744, 68, - - 740, 742, 745, 68, 68, 747, 741, 743, 750, 68, - 749, 68, 746, 751, 754, 68, 752, 68, 753, 68, - 756, 68, 68, 68, 757, 68, 758, 68, 68, 68, - 755, 760, 68, 762, 764, 765, 766, 759, 761, 68, - 68, 68, 68, 767, 768, 68, 763, 770, 771, 773, - 68, 774, 772, 68, 68, 68, 68, 777, 68, 769, - 68, 776, 68, 68, 68, 68, 68, 68, 785, 68, - 68, 68, 68, 775, 786, 778, 787, 779, 782, 780, - 789, 784, 781, 788, 68, 68, 783, 791, 68, 68, - 792, 794, 68, 68, 796, 797, 68, 795, 798, 68, - - 68, 68, 68, 68, 790, 799, 68, 800, 68, 793, - 68, 805, 68, 803, 68, 68, 801, 68, 807, 68, - 68, 68, 68, 68, 810, 804, 68, 812, 802, 68, - 809, 68, 815, 68, 806, 68, 68, 808, 819, 68, - 811, 813, 821, 814, 820, 68, 816, 68, 68, 68, - 68, 68, 68, 817, 825, 818, 824, 68, 828, 68, - 827, 68, 823, 68, 68, 822, 68, 829, 68, 832, - 830, 835, 68, 834, 68, 68, 826, 68, 68, 831, - 836, 68, 68, 68, 833, 843, 68, 68, 68, 68, - 68, 129, 837, 68, 841, 840, 842, 838, 839, 68, - - 848, 68, 852, 68, 847, 68, 844, 845, 849, 846, - 68, 850, 68, 853, 854, 68, 68, 851, 859, 860, - 68, 68, 68, 68, 856, 858, 68, 857, 68, 68, - 68, 855, 68, 867, 68, 862, 68, 68, 870, 68, - 871, 861, 864, 68, 863, 68, 68, 877, 866, 874, - 868, 873, 872, 68, 865, 869, 68, 68, 68, 68, - 875, 68, 68, 68, 68, 68, 876, 68, 884, 68, - 885, 878, 880, 68, 886, 68, 888, 879, 881, 882, - 887, 68, 68, 883, 891, 68, 68, 68, 895, 68, - 68, 899, 68, 68, 68, 892, 889, 890, 893, 894, - - 898, 896, 900, 68, 68, 902, 68, 903, 897, 68, - 68, 68, 68, 901, 907, 68, 908, 68, 909, 68, - 910, 68, 912, 68, 911, 68, 68, 68, 914, 905, - 904, 906, 68, 68, 916, 68, 68, 917, 918, 127, - 68, 913, 68, 68, 68, 68, 926, 68, 68, 68, - 928, 915, 919, 925, 920, 68, 68, 68, 68, 921, - 68, 68, 922, 931, 923, 924, 930, 932, 68, 934, - 68, 68, 68, 938, 927, 929, 937, 68, 68, 941, - 68, 68, 68, 68, 940, 68, 933, 935, 936, 68, - 939, 943, 68, 68, 942, 68, 68, 68, 945, 947, - - 125, 944, 68, 949, 946, 948, 951, 68, 950, 954, - 68, 953, 955, 68, 68, 956, 952, 958, 68, 957, - 68, 960, 68, 68, 68, 68, 68, 964, 962, 965, - 959, 967, 966, 68, 68, 961, 68, 963, 68, 970, - 68, 969, 971, 68, 68, 968, 68, 68, 68, 68, - 972, 973, 68, 974, 68, 977, 68, 975, 68, 68, - 68, 976, 68, 983, 986, 980, 978, 981, 68, 68, - 979, 68, 985, 982, 987, 68, 988, 984, 68, 68, - 990, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 998, 68, 997, 68, 992, 993, 994, 68, 989, 68, - - 995, 68, 991, 1001, 68, 68, 996, 999, 1000, 68, - 1003, 1004, 1011, 68, 68, 1007, 68, 1002, 1005, 1006, - 1009, 1008, 68, 1013, 68, 68, 68, 1010, 68, 68, - 1012, 68, 68, 68, 1019, 68, 68, 1015, 1014, 68, - 1016, 1017, 68, 1018, 1020, 68, 1021, 68, 1024, 68, - 68, 1025, 1023, 1028, 68, 1022, 1030, 68, 1027, 1029, - 68, 68, 68, 68, 68, 1032, 68, 1033, 1035, 68, - 1038, 68, 1026, 1037, 1036, 68, 1034, 68, 1039, 1031, - 68, 68, 68, 68, 68, 1041, 1042, 1040, 1044, 68, - 68, 68, 68, 68, 68, 68, 1043, 1052, 68, 68, - - 68, 1070, 1053, 68, 124, 1050, 68, 1056, 1046, 68, - 1045, 1048, 1049, 1054, 1047, 1051, 1055, 1057, 68, 1058, - 68, 68, 1059, 1060, 68, 1061, 68, 1063, 68, 1064, - 68, 68, 1066, 68, 68, 68, 1065, 1068, 68, 68, - 1062, 68, 68, 1072, 1071, 1074, 68, 1076, 68, 1077, - 68, 68, 68, 1067, 1075, 68, 1079, 1069, 1073, 68, - 68, 68, 68, 68, 1080, 1081, 68, 68, 1085, 68, - 1089, 68, 68, 1093, 1083, 68, 1087, 1078, 1088, 68, - 1094, 1086, 68, 1084, 1082, 68, 1090, 68, 1092, 68, - 1095, 1091, 68, 68, 68, 68, 1099, 68, 1096, 1100, - - 1101, 68, 1097, 68, 1098, 68, 68, 1102, 1103, 1104, - 68, 1105, 68, 68, 1110, 1106, 1107, 1108, 1109, 68, - 68, 68, 68, 68, 68, 1116, 1111, 1113, 68, 68, - 1115, 1114, 1117, 68, 1118, 68, 1120, 1112, 1119, 68, - 68, 68, 68, 1121, 68, 1122, 1125, 68, 68, 1124, - 68, 68, 1127, 1126, 1129, 68, 1128, 1130, 68, 1131, - 68, 68, 1123, 68, 68, 68, 68, 68, 1138, 68, - 68, 68, 68, 1132, 68, 68, 1134, 1135, 1136, 1139, - 68, 1133, 68, 68, 68, 68, 122, 1137, 1142, 1146, - 1147, 68, 1141, 68, 1144, 1148, 68, 1140, 1143, 68, - - 1145, 1149, 68, 1150, 1151, 68, 1153, 68, 1152, 68, - 68, 1154, 1158, 68, 1159, 68, 68, 68, 68, 68, - 68, 1165, 68, 1164, 68, 1155, 1156, 68, 1157, 68, - 1160, 1168, 68, 1170, 68, 1161, 68, 1162, 1163, 1166, - 68, 1171, 68, 68, 68, 1167, 68, 68, 1169, 1174, - 68, 1173, 1175, 68, 1176, 68, 68, 1209, 1172, 1183, - 1178, 1179, 1181, 68, 68, 1177, 1182, 68, 1180, 1184, - 68, 1185, 68, 68, 68, 68, 68, 68, 1186, 1188, - 68, 68, 68, 1192, 68, 68, 1187, 68, 1189, 1190, - 1191, 1196, 68, 1193, 68, 1198, 1194, 68, 68, 68, - - 1202, 68, 1199, 1197, 1195, 68, 68, 1200, 68, 1204, - 68, 68, 1201, 1205, 1206, 68, 1207, 68, 1210, 1211, - 68, 68, 68, 68, 1208, 1203, 1212, 1213, 68, 68, - 1214, 68, 1217, 68, 68, 68, 1215, 68, 68, 1219, - 68, 68, 68, 68, 1224, 1226, 68, 1222, 1216, 1218, - 68, 1228, 68, 68, 1227, 1220, 68, 68, 1233, 68, - 1223, 1225, 1229, 1221, 1230, 68, 68, 68, 1234, 68, - 1232, 1235, 68, 1239, 68, 68, 1236, 68, 68, 68, - 68, 1231, 68, 68, 1240, 1244, 68, 1238, 1237, 68, - 1243, 1247, 68, 1241, 1248, 1249, 68, 1242, 68, 1252, - - 68, 68, 1246, 1253, 68, 1245, 1250, 68, 68, 1257, - 68, 68, 68, 1255, 1259, 68, 68, 68, 1263, 68, - 1251, 120, 1262, 1258, 1264, 68, 1254, 68, 1256, 68, - 1261, 1260, 1265, 68, 1266, 1267, 68, 68, 1268, 1269, - 68, 68, 68, 1272, 68, 68, 1270, 68, 68, 68, - 1271, 68, 1273, 1274, 1276, 68, 68, 1278, 68, 68, - 1277, 1280, 68, 1279, 1281, 1275, 1283, 68, 68, 1282, - 1284, 68, 1285, 68, 1286, 68, 68, 1288, 68, 68, - 1287, 68, 1289, 1291, 68, 68, 68, 68, 1296, 68, - 1292, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1290, - - 1293, 1294, 1297, 1297, 1297, 1295, 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, 1297, 71, 71, 71, 71, 119, 119, - 1297, 1297, 1297, 119, 119, 121, 121, 1297, 1297, 121, - 1297, 121, 123, 1297, 1297, 1297, 1297, 1297, 123, 126, - 126, 1297, 1297, 1297, 126, 126, 128, 1297, 1297, 1297, - 1297, 1297, 128, 130, 130, 1297, 130, 130, 130, 130, - 72, 72, 1297, 72, 72, 72, 72, 13, 1297, 1297, - - 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, - 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, - 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, - 1297, 1297, 1297, 1297, 1297, 1297, 1297 + 304, 68, 68, 68, 68, 68, 68, 305, 294, 299, + 303, 296, 68, 68, 300, 309, 68, 301, 308, 302, + 129, 68, 68, 68, 306, 320, 307, 311, 325, 68, + 68, 310, 68, 68, 312, 313, 319, 323, 68, 68, + 68, 321, 322, 68, 314, 68, 315, 316, 317, 324, + 326, 318, 68, 327, 328, 68, 68, 330, 68, 337, + + 329, 331, 332, 333, 68, 68, 68, 68, 339, 68, + 68, 335, 334, 68, 336, 68, 68, 346, 342, 344, + 345, 341, 348, 68, 340, 347, 68, 68, 68, 349, + 68, 343, 353, 350, 68, 352, 68, 68, 68, 351, + 68, 68, 68, 359, 68, 355, 357, 68, 360, 68, + 356, 354, 68, 68, 68, 68, 68, 362, 68, 68, + 68, 358, 363, 368, 364, 361, 370, 369, 68, 68, + 367, 68, 68, 373, 365, 366, 68, 68, 371, 68, + 68, 375, 68, 68, 378, 68, 68, 374, 68, 387, + 372, 379, 384, 376, 68, 389, 68, 68, 377, 380, + + 382, 383, 385, 68, 68, 68, 386, 388, 68, 381, + 68, 390, 68, 68, 129, 391, 68, 395, 399, 392, + 400, 68, 396, 68, 393, 68, 68, 404, 68, 397, + 394, 398, 68, 401, 68, 68, 68, 68, 68, 403, + 408, 402, 410, 68, 405, 125, 406, 411, 68, 409, + 407, 412, 413, 68, 414, 68, 68, 415, 68, 416, + 68, 419, 68, 417, 418, 68, 68, 68, 68, 420, + 423, 68, 421, 68, 68, 68, 424, 426, 68, 429, + 430, 68, 427, 68, 124, 68, 428, 425, 422, 68, + 431, 68, 432, 68, 68, 433, 436, 438, 435, 437, + + 68, 68, 68, 68, 440, 68, 439, 68, 441, 68, + 68, 68, 442, 68, 446, 445, 122, 434, 447, 68, + 448, 443, 450, 444, 449, 68, 68, 68, 451, 452, + 453, 68, 68, 455, 454, 68, 68, 68, 456, 68, + 68, 68, 68, 68, 68, 461, 465, 68, 68, 467, + 457, 68, 68, 68, 68, 458, 468, 462, 459, 464, + 460, 463, 68, 68, 68, 68, 466, 469, 68, 470, + 474, 473, 68, 471, 68, 475, 472, 476, 68, 477, + 68, 68, 68, 68, 129, 483, 68, 479, 68, 482, + 480, 68, 484, 68, 486, 488, 478, 481, 68, 68, + + 68, 68, 487, 489, 68, 68, 491, 485, 68, 490, + 497, 68, 496, 68, 494, 68, 492, 495, 504, 68, + 68, 493, 68, 68, 498, 68, 499, 68, 507, 500, + 508, 68, 68, 68, 501, 68, 510, 505, 511, 509, + 502, 503, 68, 512, 68, 506, 515, 513, 68, 68, + 517, 68, 68, 514, 68, 68, 516, 521, 68, 520, + 68, 523, 68, 522, 68, 68, 518, 68, 68, 68, + 519, 68, 524, 525, 527, 528, 529, 68, 531, 530, + 526, 68, 68, 68, 533, 68, 532, 68, 535, 68, + 68, 68, 536, 68, 68, 68, 534, 68, 68, 68, + + 537, 544, 68, 68, 551, 68, 538, 543, 546, 68, + 545, 539, 68, 540, 68, 542, 541, 547, 548, 550, + 68, 68, 549, 68, 552, 68, 555, 68, 557, 558, + 68, 68, 562, 553, 68, 554, 68, 68, 68, 559, + 564, 68, 565, 129, 561, 68, 556, 68, 560, 68, + 68, 567, 68, 68, 68, 68, 68, 576, 563, 68, + 566, 68, 68, 68, 583, 120, 570, 582, 568, 68, + 578, 68, 602, 579, 569, 68, 581, 580, 571, 577, + 572, 68, 584, 68, 573, 588, 574, 68, 587, 585, + 68, 575, 68, 590, 68, 591, 68, 68, 597, 589, + + 595, 68, 592, 68, 68, 68, 68, 586, 596, 598, + 593, 68, 68, 68, 68, 68, 594, 68, 601, 604, + 68, 608, 68, 68, 599, 600, 68, 68, 610, 607, + 603, 606, 611, 68, 68, 605, 615, 609, 612, 68, + 614, 68, 616, 613, 68, 618, 617, 68, 619, 68, + 68, 68, 620, 68, 68, 68, 623, 68, 68, 624, + 625, 628, 68, 626, 627, 621, 68, 68, 68, 68, + 68, 622, 631, 68, 68, 629, 68, 68, 635, 68, + 68, 636, 638, 640, 641, 630, 632, 634, 68, 68, + 633, 639, 68, 643, 68, 637, 68, 68, 68, 647, + + 68, 68, 68, 68, 68, 68, 68, 642, 68, 655, + 646, 645, 656, 649, 68, 644, 68, 68, 648, 652, + 650, 653, 68, 68, 68, 68, 68, 651, 654, 657, + 658, 660, 663, 68, 68, 68, 659, 68, 661, 68, + 662, 68, 666, 68, 665, 68, 668, 68, 68, 670, + 68, 68, 664, 68, 68, 68, 68, 68, 667, 673, + 68, 677, 669, 671, 68, 672, 68, 68, 681, 680, + 674, 678, 676, 68, 675, 683, 68, 679, 682, 686, + 68, 685, 68, 687, 68, 690, 684, 68, 691, 68, + 68, 689, 68, 688, 692, 68, 694, 693, 68, 68, + + 697, 698, 68, 68, 68, 68, 68, 699, 700, 68, + 68, 68, 695, 68, 705, 706, 68, 696, 701, 68, + 68, 68, 68, 702, 709, 703, 68, 704, 707, 711, + 714, 68, 715, 68, 708, 68, 68, 68, 710, 716, + 712, 68, 717, 719, 68, 713, 720, 68, 68, 722, + 68, 68, 68, 721, 718, 68, 724, 68, 68, 68, + 725, 723, 726, 730, 728, 731, 729, 68, 68, 733, + 68, 68, 732, 727, 68, 68, 68, 737, 68, 68, + 734, 68, 68, 740, 68, 68, 68, 736, 68, 68, + 68, 744, 68, 68, 735, 68, 749, 68, 68, 738, + + 750, 68, 741, 753, 739, 742, 745, 743, 68, 746, + 747, 68, 68, 68, 68, 752, 748, 756, 68, 68, + 68, 751, 68, 68, 68, 761, 754, 759, 763, 762, + 68, 755, 758, 757, 68, 68, 68, 68, 760, 765, + 68, 767, 764, 770, 68, 769, 771, 68, 68, 766, + 68, 68, 68, 772, 68, 773, 775, 768, 774, 776, + 778, 68, 68, 777, 68, 782, 779, 68, 781, 68, + 68, 68, 68, 780, 68, 68, 68, 68, 68, 790, + 68, 791, 68, 68, 792, 68, 783, 68, 784, 787, + 785, 786, 789, 129, 794, 788, 793, 796, 68, 68, + + 799, 68, 795, 68, 797, 68, 800, 798, 68, 801, + 802, 803, 68, 68, 68, 68, 804, 68, 805, 68, + 68, 810, 68, 68, 808, 68, 812, 68, 807, 806, + 68, 68, 68, 68, 68, 809, 815, 68, 817, 68, + 820, 814, 68, 811, 68, 68, 68, 68, 824, 813, + 816, 819, 818, 68, 826, 68, 68, 68, 825, 68, + 68, 830, 821, 829, 822, 823, 68, 827, 68, 828, + 833, 832, 68, 834, 68, 68, 68, 68, 68, 840, + 68, 837, 68, 839, 835, 831, 68, 841, 68, 68, + 68, 68, 848, 68, 836, 68, 68, 68, 68, 68, + + 838, 68, 846, 68, 842, 845, 847, 68, 843, 844, + 853, 68, 857, 68, 852, 849, 850, 856, 68, 851, + 854, 858, 68, 855, 68, 68, 860, 864, 865, 68, + 68, 859, 68, 861, 863, 68, 862, 68, 68, 68, + 68, 68, 872, 68, 68, 127, 875, 68, 867, 876, + 866, 68, 869, 877, 68, 868, 878, 68, 871, 873, + 68, 68, 874, 880, 870, 68, 68, 68, 68, 881, + 879, 68, 68, 882, 68, 68, 68, 68, 68, 883, + 889, 68, 890, 891, 893, 884, 892, 885, 886, 887, + 68, 68, 896, 68, 888, 68, 68, 900, 68, 68, + + 68, 68, 68, 904, 68, 68, 895, 903, 898, 897, + 899, 901, 68, 894, 905, 68, 907, 68, 902, 908, + 68, 906, 68, 68, 68, 68, 909, 912, 68, 913, + 68, 914, 68, 915, 68, 917, 68, 916, 68, 910, + 68, 918, 911, 919, 921, 68, 68, 922, 68, 923, + 920, 68, 68, 68, 68, 68, 927, 931, 68, 68, + 68, 933, 68, 924, 68, 925, 68, 68, 68, 68, + 926, 936, 928, 929, 68, 935, 930, 937, 68, 939, + 68, 68, 934, 943, 68, 932, 942, 68, 68, 68, + 941, 945, 947, 938, 68, 940, 946, 68, 948, 68, + + 944, 68, 68, 68, 68, 956, 68, 68, 952, 68, + 960, 68, 953, 68, 949, 954, 950, 959, 951, 963, + 955, 961, 68, 958, 68, 962, 68, 68, 957, 965, + 68, 68, 68, 68, 68, 967, 970, 68, 969, 964, + 972, 68, 966, 68, 968, 68, 974, 975, 68, 973, + 976, 68, 68, 68, 68, 971, 68, 68, 977, 978, + 68, 982, 979, 68, 68, 981, 980, 68, 68, 988, + 68, 68, 983, 985, 68, 68, 986, 68, 990, 992, + 68, 984, 987, 68, 68, 991, 68, 989, 68, 995, + 68, 993, 996, 68, 68, 994, 68, 68, 997, 68, + + 68, 68, 998, 1003, 1002, 999, 1006, 68, 68, 1000, + 68, 68, 1009, 68, 68, 1004, 1001, 1005, 1008, 1010, + 68, 68, 1014, 68, 68, 1011, 1007, 68, 1015, 1012, + 68, 1018, 68, 68, 68, 68, 68, 68, 68, 1024, + 1025, 1013, 68, 1016, 1017, 1019, 1020, 1022, 1023, 1021, + 68, 68, 68, 68, 68, 1026, 68, 68, 1029, 1030, + 1033, 68, 1035, 68, 68, 1032, 1034, 1028, 68, 68, + 1027, 68, 1037, 68, 1038, 1040, 68, 68, 68, 1031, + 68, 1041, 1047, 1036, 1039, 68, 1042, 1043, 68, 68, + 1044, 68, 1045, 68, 68, 68, 1046, 68, 1049, 68, + + 1048, 68, 68, 68, 1057, 68, 68, 68, 1061, 1058, + 68, 68, 68, 1076, 1051, 1055, 1062, 68, 1053, 68, + 1050, 1052, 1054, 1056, 1059, 1060, 1063, 68, 1065, 68, + 1066, 68, 1064, 68, 1068, 68, 1069, 68, 68, 1071, + 68, 68, 68, 1070, 1073, 68, 68, 68, 1075, 68, + 1077, 68, 1067, 1079, 68, 1081, 68, 1082, 68, 68, + 1072, 68, 1084, 68, 1074, 1078, 1080, 68, 1086, 68, + 68, 1085, 68, 68, 68, 68, 1094, 1083, 1090, 68, + 125, 68, 1088, 1092, 1093, 68, 68, 1091, 68, 1095, + 68, 1089, 1087, 68, 1098, 1097, 1099, 68, 1100, 1096, + + 68, 68, 1103, 1102, 68, 1105, 1101, 1104, 1106, 68, + 68, 68, 68, 68, 1107, 1108, 1109, 68, 1110, 68, + 68, 68, 1115, 1112, 68, 68, 1114, 68, 68, 68, + 1116, 1111, 68, 1118, 1120, 68, 1121, 1119, 1122, 68, + 1113, 1117, 1123, 68, 1124, 68, 1125, 68, 1126, 68, + 68, 68, 68, 1130, 68, 68, 68, 1129, 1132, 68, + 1131, 1134, 68, 68, 1133, 1127, 1135, 68, 1136, 68, + 68, 68, 1128, 68, 68, 1137, 68, 1143, 68, 68, + 68, 68, 68, 1139, 68, 1140, 1141, 68, 1138, 1144, + 68, 68, 1151, 68, 68, 1147, 1142, 68, 1152, 1153, + + 68, 1146, 68, 1155, 1149, 1145, 1156, 68, 1148, 1150, + 68, 68, 1154, 68, 68, 1159, 68, 1163, 68, 1157, + 1164, 68, 68, 68, 68, 68, 1158, 1170, 68, 68, + 1161, 1160, 1169, 68, 68, 1162, 1165, 1173, 68, 68, + 68, 1166, 68, 1167, 1168, 1175, 68, 68, 1171, 68, + 1176, 1178, 1172, 68, 68, 68, 68, 68, 1174, 1179, + 1180, 1181, 1177, 68, 68, 1186, 68, 1208, 1183, 1184, + 1188, 1182, 1185, 1187, 68, 68, 1189, 68, 1190, 68, + 68, 68, 68, 68, 68, 1191, 1193, 68, 68, 68, + 1197, 68, 68, 1192, 68, 1194, 1195, 1196, 1201, 68, + + 1198, 68, 1203, 1199, 68, 68, 68, 1207, 68, 1204, + 1202, 1200, 68, 1209, 1205, 68, 1211, 68, 1210, 1206, + 1212, 68, 68, 68, 1215, 1216, 68, 68, 68, 68, + 68, 1217, 68, 68, 1218, 68, 1222, 1214, 68, 68, + 1213, 1220, 68, 68, 1224, 68, 68, 68, 68, 1219, + 1229, 1221, 1231, 68, 1223, 1227, 68, 68, 68, 68, + 1232, 68, 1225, 68, 1238, 1228, 1230, 1233, 1234, 1226, + 68, 68, 68, 1235, 68, 1237, 68, 1240, 68, 68, + 1239, 68, 1236, 1241, 1244, 68, 68, 68, 1245, 68, + 68, 68, 1249, 1243, 68, 1242, 68, 1246, 1248, 1252, + + 68, 1253, 1254, 68, 68, 1247, 1257, 68, 1258, 68, + 1251, 68, 68, 68, 1255, 1250, 1262, 68, 68, 68, + 1264, 68, 68, 68, 1260, 68, 1256, 68, 1267, 1282, + 1259, 1263, 1271, 1261, 1268, 68, 1266, 1265, 1269, 68, + 1270, 68, 1272, 68, 68, 1273, 1274, 68, 68, 68, + 1277, 68, 68, 1275, 68, 68, 68, 1276, 68, 1278, + 1279, 1281, 68, 1283, 68, 68, 1285, 68, 68, 1284, + 124, 1286, 1280, 1288, 68, 68, 1287, 1289, 68, 1290, + 68, 1291, 68, 68, 1293, 68, 68, 1292, 1295, 1294, + 1296, 68, 68, 68, 68, 1297, 1301, 68, 122, 120, + + 68, 1302, 1302, 1302, 1302, 1302, 1302, 1298, 1299, 1302, + 1302, 1302, 1300, 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, + 1302, 71, 71, 71, 71, 119, 119, 1302, 1302, 1302, + 119, 119, 121, 121, 1302, 1302, 121, 1302, 121, 123, + 1302, 1302, 1302, 1302, 1302, 123, 126, 126, 1302, 1302, + 1302, 126, 126, 128, 1302, 1302, 1302, 1302, 1302, 128, + 130, 130, 1302, 130, 130, 130, 130, 72, 72, 1302, + + 72, 72, 72, 72, 13, 1302, 1302, 1302, 1302, 1302, + 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, + 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, + 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, + 1302, 1302, 1302, 1302 } ; -static yyconst flex_int16_t yy_chk[2638] = +static yyconst flex_int16_t yy_chk[2645] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1161,7 +1163,7 @@ static yyconst flex_int16_t yy_chk[2638] = 9, 115, 33, 6, 7, 7, 7, 7, 9, 7, 10, 10, 10, 44, 44, 7, 8, 8, 8, 8, 10, 8, 21, 33, 115, 21, 21, 8, 11, 11, - 11, 11, 11, 11, 1303, 20, 29, 20, 20, 11, + 11, 11, 11, 11, 1308, 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, @@ -1172,7 +1174,7 @@ static yyconst flex_int16_t yy_chk[2638] = 35, 39, 31, 34, 77, 35, 31, 77, 36, 34, 75, 32, 34, 36, 75, 35, 38, 76, 35, 34, 82, 37, 37, 36, 37, 60, 60, 36, 36, 55, - 38, 55, 55, 561, 55, 38, 78, 76, 63, 37, + 38, 55, 55, 565, 55, 38, 78, 76, 63, 37, 63, 63, 65, 63, 65, 65, 79, 65, 68, 63, 68, 68, 84, 68, 78, 80, 81, 85, 68, 71, @@ -1212,236 +1214,237 @@ static yyconst flex_int16_t yy_chk[2638] = 225, 225, 222, 226, 228, 224, 227, 227, 229, 230, 223, 231, 232, 233, 230, 234, 233, 232, 235, 228, 237, 236, 238, 239, 241, 237, 240, 238, 229, 234, - 236, 231, 242, 243, 245, 242, 246, 235, 241, 235, - 247, 248, 249, 250, 239, 246, 240, 243, 251, 245, - 252, 242, 244, 251, 244, 244, 255, 249, 253, 254, - 248, 247, 259, 250, 244, 256, 244, 244, 244, 260, - 252, 244, 257, 253, 254, 261, 255, 257, 262, 256, - - 258, 258, 259, 258, 264, 260, 265, 266, 264, 267, - 268, 261, 262, 270, 271, 269, 275, 270, 267, 268, - 269, 266, 272, 271, 265, 274, 273, 272, 278, 275, - 274, 267, 273, 276, 276, 277, 279, 281, 280, 282, - 277, 286, 281, 283, 283, 279, 285, 285, 287, 278, - 280, 289, 288, 291, 292, 293, 287, 295, 297, 294, - 282, 288, 286, 289, 294, 295, 296, 298, 299, 293, - 300, 296, 299, 291, 292, 300, 297, 301, 302, 303, - 303, 304, 305, 307, 308, 308, 306, 303, 309, 298, - 312, 306, 311, 301, 313, 303, 306, 302, 305, 310, - - 310, 304, 312, 307, 314, 303, 315, 311, 317, 313, - 316, 318, 319, 309, 320, 316, 321, 317, 320, 322, - 323, 321, 324, 314, 325, 325, 330, 319, 315, 326, - 318, 322, 327, 328, 329, 324, 337, 329, 323, 330, - 125, 326, 331, 331, 327, 332, 332, 333, 328, 334, - 334, 336, 333, 335, 335, 338, 336, 337, 339, 340, - 338, 341, 339, 342, 340, 341, 343, 344, 342, 345, - 346, 468, 344, 347, 345, 349, 347, 348, 348, 350, - 349, 347, 354, 468, 346, 347, 343, 351, 350, 352, - 351, 353, 355, 352, 356, 354, 353, 355, 357, 356, - - 358, 360, 359, 358, 357, 359, 360, 361, 362, 363, - 364, 365, 367, 364, 363, 352, 365, 367, 368, 366, - 373, 374, 362, 366, 366, 361, 369, 368, 370, 369, - 375, 377, 370, 370, 371, 372, 371, 372, 373, 376, - 374, 378, 379, 376, 380, 381, 377, 382, 382, 380, - 375, 383, 385, 384, 386, 383, 387, 379, 384, 378, - 388, 389, 393, 390, 381, 396, 389, 388, 385, 387, - 390, 391, 392, 386, 394, 395, 391, 392, 397, 396, - 393, 394, 398, 397, 395, 398, 399, 400, 401, 401, - 399, 403, 405, 406, 404, 410, 403, 401, 404, 407, - - 413, 406, 415, 420, 419, 414, 415, 123, 400, 413, - 405, 414, 410, 416, 407, 418, 422, 422, 416, 417, - 418, 417, 419, 417, 421, 423, 417, 421, 420, 424, - 424, 417, 423, 425, 426, 426, 427, 417, 417, 427, - 428, 430, 429, 431, 431, 433, 434, 432, 425, 430, - 437, 434, 435, 435, 436, 440, 437, 436, 438, 439, - 428, 429, 432, 433, 441, 442, 438, 439, 444, 441, - 443, 443, 442, 440, 445, 446, 444, 448, 449, 445, - 448, 450, 450, 453, 451, 454, 455, 451, 457, 456, - 460, 459, 449, 461, 446, 451, 458, 457, 463, 460, - - 458, 464, 467, 470, 453, 462, 454, 461, 455, 456, - 459, 462, 465, 474, 469, 464, 466, 465, 463, 469, - 466, 467, 471, 471, 470, 472, 473, 475, 476, 473, - 472, 474, 477, 476, 478, 478, 479, 479, 480, 481, - 475, 482, 483, 481, 484, 486, 487, 488, 490, 486, - 489, 491, 477, 480, 493, 492, 498, 498, 484, 493, - 482, 492, 488, 495, 489, 491, 483, 485, 495, 490, - 485, 487, 485, 494, 494, 496, 485, 499, 485, 497, - 500, 494, 499, 485, 501, 502, 503, 503, 500, 496, - 504, 497, 506, 507, 504, 508, 507, 506, 501, 494, - - 509, 510, 511, 512, 502, 513, 510, 514, 516, 515, - 513, 511, 121, 509, 508, 517, 519, 516, 531, 520, - 517, 521, 512, 515, 520, 522, 521, 514, 523, 525, - 522, 519, 524, 524, 525, 527, 530, 523, 531, 527, - 527, 528, 528, 529, 532, 528, 529, 532, 533, 534, - 535, 530, 536, 533, 534, 537, 535, 538, 536, 539, - 540, 541, 539, 542, 537, 543, 544, 545, 547, 546, - 543, 544, 546, 552, 550, 538, 542, 548, 540, 547, - 553, 541, 548, 549, 554, 545, 551, 551, 549, 550, - 556, 555, 552, 557, 553, 555, 554, 558, 559, 562, - - 563, 564, 557, 568, 565, 566, 567, 571, 556, 565, - 566, 567, 569, 562, 570, 563, 558, 568, 572, 570, - 574, 564, 571, 559, 573, 573, 569, 575, 577, 576, - 578, 579, 583, 572, 576, 578, 575, 580, 574, 581, - 582, 580, 584, 585, 583, 586, 587, 577, 589, 590, - 579, 588, 587, 593, 581, 582, 595, 592, 590, 598, - 119, 584, 592, 586, 585, 594, 588, 593, 589, 596, - 601, 601, 598, 594, 596, 597, 595, 599, 600, 597, - 597, 605, 602, 600, 603, 606, 599, 602, 607, 603, - 604, 604, 608, 607, 609, 605, 610, 608, 611, 609, - - 610, 614, 612, 606, 615, 614, 616, 611, 617, 618, - 619, 620, 611, 612, 611, 621, 611, 631, 619, 615, - 622, 622, 617, 626, 616, 623, 623, 624, 618, 620, - 624, 625, 627, 627, 628, 628, 625, 631, 629, 633, - 621, 632, 626, 629, 630, 630, 632, 633, 634, 635, - 636, 637, 639, 634, 640, 641, 636, 639, 637, 640, - 641, 642, 643, 644, 645, 647, 642, 635, 646, 646, - 648, 643, 649, 652, 650, 645, 651, 649, 653, 653, - 654, 655, 644, 656, 657, 647, 660, 661, 664, 67, - 662, 652, 663, 648, 650, 662, 651, 666, 659, 668, - - 654, 656, 659, 659, 667, 661, 655, 657, 664, 665, - 663, 669, 660, 665, 668, 670, 666, 671, 667, 673, - 670, 672, 674, 675, 671, 677, 672, 676, 685, 678, - 669, 674, 688, 676, 678, 679, 680, 673, 675, 683, - 679, 680, 681, 681, 683, 684, 677, 685, 686, 687, - 687, 688, 686, 686, 689, 690, 692, 691, 693, 684, - 694, 690, 691, 695, 696, 697, 698, 699, 699, 700, - 702, 703, 701, 689, 700, 692, 701, 693, 696, 694, - 703, 698, 695, 702, 704, 706, 697, 705, 705, 707, - 706, 708, 711, 712, 712, 713, 708, 711, 716, 716, - - 713, 720, 718, 721, 704, 718, 719, 719, 722, 707, - 723, 724, 724, 722, 725, 727, 720, 726, 726, 728, - 729, 730, 731, 733, 729, 723, 736, 731, 721, 734, - 728, 735, 735, 737, 725, 738, 739, 727, 739, 740, - 730, 733, 741, 734, 740, 742, 736, 741, 743, 746, - 744, 747, 751, 737, 746, 738, 744, 748, 749, 752, - 748, 754, 743, 749, 753, 742, 750, 750, 755, 753, - 751, 756, 756, 755, 758, 757, 747, 759, 760, 752, - 757, 761, 762, 763, 754, 764, 765, 766, 767, 768, - 764, 61, 758, 769, 762, 761, 763, 759, 760, 770, - - 769, 771, 774, 774, 768, 776, 765, 766, 770, 767, - 775, 770, 777, 775, 776, 778, 779, 771, 780, 781, - 781, 782, 783, 780, 778, 779, 784, 778, 785, 786, - 787, 777, 788, 788, 789, 783, 796, 790, 792, 799, - 793, 782, 785, 792, 784, 793, 794, 799, 787, 796, - 789, 795, 794, 802, 786, 790, 795, 797, 800, 801, - 797, 804, 803, 806, 807, 808, 797, 811, 807, 809, - 808, 800, 802, 812, 809, 810, 811, 801, 803, 804, - 810, 815, 813, 806, 814, 814, 816, 817, 818, 819, - 820, 822, 822, 818, 821, 815, 812, 813, 816, 817, - - 821, 819, 823, 823, 824, 825, 825, 826, 820, 827, - 828, 829, 826, 824, 830, 830, 831, 831, 832, 832, - 833, 834, 836, 837, 834, 833, 839, 836, 838, 828, - 827, 829, 847, 838, 840, 840, 841, 841, 842, 56, - 843, 837, 844, 842, 845, 846, 848, 848, 849, 850, - 850, 839, 843, 847, 843, 851, 854, 853, 855, 843, - 856, 858, 844, 854, 845, 846, 853, 855, 857, 857, - 863, 861, 859, 862, 849, 851, 861, 864, 862, 865, - 865, 868, 867, 869, 864, 870, 856, 858, 859, 866, - 863, 867, 873, 871, 866, 875, 872, 876, 869, 871, - - 51, 868, 886, 873, 870, 872, 874, 874, 873, 877, - 888, 876, 878, 878, 877, 879, 875, 880, 881, 879, - 879, 882, 880, 883, 884, 885, 882, 886, 884, 887, - 881, 889, 888, 890, 887, 883, 889, 885, 892, 893, - 893, 892, 894, 894, 895, 890, 896, 897, 898, 901, - 895, 896, 904, 897, 903, 903, 905, 898, 906, 910, - 912, 901, 914, 911, 914, 905, 903, 906, 911, 917, - 904, 913, 913, 910, 915, 915, 917, 912, 918, 919, - 919, 920, 921, 922, 923, 924, 925, 927, 928, 929, - 928, 932, 927, 942, 921, 922, 923, 937, 918, 930, - - 924, 938, 920, 931, 931, 933, 925, 929, 930, 934, - 933, 934, 942, 935, 936, 937, 943, 932, 935, 936, - 939, 938, 940, 944, 944, 939, 945, 940, 946, 949, - 943, 948, 947, 952, 949, 953, 954, 946, 945, 950, - 946, 947, 956, 948, 950, 958, 952, 959, 956, 960, - 962, 958, 954, 961, 961, 953, 963, 963, 960, 962, - 964, 965, 966, 967, 972, 965, 969, 966, 968, 968, - 973, 973, 959, 972, 969, 975, 967, 974, 974, 964, - 976, 978, 977, 979, 980, 976, 977, 975, 979, 981, - 982, 984, 983, 985, 986, 1007, 978, 988, 988, 989, - - 990, 1007, 989, 991, 50, 985, 992, 992, 981, 995, - 980, 983, 984, 990, 982, 986, 991, 993, 993, 994, - 994, 998, 995, 996, 996, 997, 997, 999, 999, 1000, - 1000, 1002, 1003, 1003, 1004, 1011, 1002, 1005, 1005, 1006, - 998, 1008, 1009, 1009, 1008, 1010, 1010, 1012, 1012, 1014, - 1014, 1015, 1017, 1004, 1011, 1016, 1016, 1006, 1009, 1019, - 1018, 1020, 1021, 1022, 1017, 1018, 1023, 1024, 1022, 1025, - 1026, 1029, 1032, 1032, 1020, 1026, 1024, 1015, 1025, 1031, - 1033, 1023, 1027, 1021, 1019, 1033, 1027, 1036, 1031, 1034, - 1034, 1029, 1037, 1039, 1040, 1046, 1039, 1048, 1034, 1040, - - 1041, 1041, 1036, 1042, 1037, 1043, 1045, 1042, 1043, 1044, - 1044, 1045, 1047, 1049, 1050, 1046, 1047, 1048, 1049, 1050, - 1051, 1053, 1054, 1055, 1059, 1059, 1051, 1054, 1056, 1071, - 1056, 1055, 1062, 1062, 1065, 1065, 1069, 1053, 1067, 1067, - 1072, 1069, 1070, 1070, 1073, 1071, 1075, 1075, 1078, 1073, - 1079, 1080, 1079, 1078, 1081, 1081, 1080, 1082, 1082, 1083, - 1083, 1084, 1072, 1085, 1086, 1087, 1088, 1089, 1090, 1090, - 1091, 1092, 1093, 1084, 1095, 1094, 1086, 1087, 1088, 1091, - 1096, 1085, 1097, 1102, 1098, 1099, 45, 1089, 1094, 1098, - 1099, 1107, 1093, 1108, 1096, 1100, 1100, 1092, 1095, 1106, - - 1097, 1102, 1103, 1103, 1105, 1105, 1107, 1109, 1106, 1111, - 1110, 1108, 1112, 1112, 1113, 1114, 1115, 1116, 1120, 1113, - 1121, 1122, 1122, 1121, 1123, 1109, 1110, 1124, 1111, 1127, - 1114, 1126, 1126, 1128, 1128, 1115, 1133, 1116, 1120, 1123, - 1132, 1132, 1134, 1177, 1135, 1124, 1137, 1136, 1127, 1135, - 1139, 1134, 1136, 1142, 1137, 1140, 1141, 1177, 1133, 1145, - 1140, 1141, 1143, 1143, 1145, 1139, 1144, 1144, 1142, 1146, - 1146, 1147, 1147, 1149, 1150, 1153, 1152, 1159, 1149, 1152, - 1154, 1155, 1156, 1156, 1157, 1160, 1150, 1163, 1153, 1154, - 1155, 1161, 1161, 1157, 1162, 1163, 1159, 1164, 1166, 1167, - - 1169, 1169, 1164, 1162, 1160, 1171, 1176, 1166, 1172, 1172, - 1173, 1186, 1167, 1173, 1174, 1174, 1175, 1175, 1178, 1179, - 1179, 1183, 1180, 1178, 1176, 1171, 1180, 1183, 1187, 1188, - 1186, 1189, 1189, 1190, 1191, 1192, 1187, 1193, 1194, 1191, - 1195, 1197, 1201, 1198, 1197, 1199, 1199, 1194, 1188, 1190, - 1200, 1201, 1204, 1203, 1200, 1192, 1205, 1209, 1209, 1210, - 1195, 1198, 1203, 1193, 1204, 1208, 1212, 1213, 1210, 1214, - 1208, 1212, 1215, 1216, 1216, 1217, 1213, 1218, 1219, 1222, - 1221, 1205, 1220, 1223, 1217, 1221, 1228, 1215, 1214, 1225, - 1220, 1224, 1224, 1218, 1225, 1227, 1227, 1219, 1229, 1230, - - 1230, 1233, 1223, 1231, 1231, 1222, 1228, 1232, 1234, 1235, - 1235, 1236, 1238, 1233, 1237, 1237, 1240, 1241, 1242, 1242, - 1229, 40, 1241, 1236, 1243, 1243, 1232, 14, 1234, 1245, - 1240, 1238, 1244, 1244, 1245, 1246, 1246, 1248, 1248, 1250, - 1250, 1251, 1254, 1255, 1255, 1260, 1251, 1256, 1258, 1271, - 1254, 1273, 1256, 1258, 1261, 1261, 1262, 1266, 1266, 1268, - 1262, 1270, 1270, 1268, 1271, 1260, 1274, 1274, 1281, 1273, - 1275, 1275, 1277, 1277, 1279, 1279, 1282, 1282, 1287, 1288, - 1281, 1290, 1287, 1289, 1289, 1292, 1294, 1293, 1295, 1295, - 1290, 13, 0, 0, 0, 0, 0, 0, 0, 1288, - - 1292, 1293, 0, 0, 0, 1294, 1298, 1298, 1298, 1298, - 1298, 1298, 1298, 1299, 1299, 1299, 1299, 1299, 1299, 1299, - 1300, 1300, 1300, 1300, 1300, 1300, 1300, 1301, 1301, 1301, - 1301, 1301, 1301, 1301, 1302, 1302, 1302, 1302, 1302, 1302, - 1302, 1304, 1304, 0, 1304, 1304, 1304, 1304, 1305, 1305, - 0, 0, 0, 1305, 1305, 1306, 1306, 0, 0, 1306, - 0, 1306, 1307, 0, 0, 0, 0, 0, 1307, 1308, - 1308, 0, 0, 0, 1308, 1308, 1309, 0, 0, 0, - 0, 0, 1309, 1310, 1310, 0, 1310, 1310, 1310, 1310, - 1311, 1311, 0, 1311, 1311, 1311, 1311, 1297, 1297, 1297, - - 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, - 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, - 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, 1297, - 1297, 1297, 1297, 1297, 1297, 1297, 1297 + 236, 231, 242, 243, 235, 242, 246, 235, 241, 235, + 247, 245, 249, 248, 239, 246, 240, 243, 251, 250, + 252, 242, 244, 251, 244, 244, 245, 249, 253, 254, + 255, 247, 248, 256, 244, 262, 244, 244, 244, 250, + 252, 244, 259, 253, 254, 260, 257, 256, 261, 262, + + 255, 257, 258, 258, 264, 258, 265, 266, 264, 267, + 268, 260, 259, 270, 261, 269, 271, 270, 267, 268, + 269, 266, 272, 273, 265, 271, 275, 272, 274, 273, + 278, 267, 277, 274, 276, 276, 279, 277, 280, 275, + 282, 281, 283, 283, 286, 279, 281, 285, 285, 287, + 280, 278, 289, 288, 291, 292, 293, 287, 294, 295, + 297, 282, 288, 294, 289, 286, 296, 295, 298, 299, + 293, 296, 300, 299, 291, 292, 301, 302, 297, 303, + 305, 301, 310, 304, 304, 306, 308, 300, 309, 309, + 298, 304, 307, 302, 311, 311, 312, 307, 303, 304, + + 305, 306, 307, 313, 314, 315, 308, 310, 316, 304, + 319, 312, 317, 318, 321, 313, 320, 317, 321, 314, + 322, 323, 318, 324, 315, 322, 325, 326, 326, 319, + 316, 320, 327, 323, 328, 329, 331, 330, 338, 325, + 330, 324, 332, 332, 327, 125, 328, 333, 333, 331, + 329, 334, 335, 335, 336, 336, 334, 337, 339, 338, + 340, 341, 337, 339, 340, 342, 341, 343, 344, 342, + 345, 346, 343, 347, 348, 345, 346, 348, 349, 349, + 350, 351, 348, 355, 123, 350, 348, 347, 344, 352, + 351, 353, 352, 354, 356, 353, 355, 357, 354, 356, + + 358, 359, 357, 362, 359, 360, 358, 361, 360, 363, + 364, 365, 361, 366, 365, 364, 121, 353, 366, 369, + 367, 362, 368, 363, 367, 367, 370, 368, 369, 370, + 371, 372, 374, 372, 371, 371, 373, 375, 373, 376, + 377, 378, 379, 380, 381, 378, 382, 383, 384, 384, + 374, 382, 385, 387, 388, 375, 385, 379, 376, 381, + 377, 380, 386, 389, 390, 391, 383, 386, 392, 387, + 391, 390, 393, 388, 394, 392, 389, 393, 395, 394, + 396, 397, 400, 398, 399, 400, 402, 396, 401, 399, + 397, 407, 401, 403, 403, 405, 395, 398, 408, 406, + + 405, 409, 403, 406, 412, 415, 408, 402, 417, 407, + 418, 416, 417, 420, 415, 418, 409, 416, 420, 421, + 422, 412, 419, 427, 419, 423, 419, 431, 423, 419, + 424, 424, 425, 430, 419, 426, 426, 421, 427, 425, + 419, 419, 428, 428, 429, 422, 431, 429, 432, 433, + 433, 434, 435, 430, 436, 439, 432, 437, 437, 436, + 438, 439, 442, 438, 440, 441, 434, 448, 444, 443, + 435, 446, 440, 441, 443, 444, 445, 445, 447, 446, + 442, 450, 451, 447, 450, 455, 448, 452, 452, 453, + 456, 462, 453, 457, 458, 459, 451, 461, 460, 463, + + 453, 461, 466, 464, 468, 467, 455, 460, 463, 468, + 462, 456, 465, 457, 470, 459, 458, 464, 465, 467, + 469, 472, 466, 471, 469, 473, 472, 474, 474, 475, + 477, 478, 479, 470, 475, 471, 476, 479, 480, 476, + 481, 481, 482, 482, 478, 483, 473, 484, 477, 485, + 486, 484, 487, 489, 490, 491, 493, 489, 480, 492, + 483, 495, 494, 514, 496, 119, 487, 495, 485, 496, + 491, 499, 514, 492, 486, 488, 494, 493, 488, 490, + 488, 497, 497, 498, 488, 499, 488, 500, 498, 497, + 502, 488, 501, 501, 503, 502, 504, 505, 509, 500, + + 506, 506, 503, 509, 507, 511, 510, 497, 507, 510, + 504, 515, 512, 513, 516, 517, 505, 518, 513, 516, + 519, 520, 522, 523, 511, 512, 520, 524, 523, 519, + 515, 518, 524, 525, 526, 517, 528, 522, 525, 527, + 527, 528, 530, 526, 531, 531, 530, 530, 531, 532, + 533, 534, 532, 535, 536, 537, 535, 538, 539, 536, + 537, 540, 540, 538, 539, 533, 541, 542, 544, 543, + 545, 534, 543, 547, 546, 541, 548, 549, 547, 550, + 551, 548, 550, 552, 553, 542, 544, 546, 552, 553, + 545, 551, 554, 555, 555, 549, 556, 557, 558, 559, + + 560, 562, 563, 559, 561, 566, 567, 554, 568, 569, + 558, 557, 570, 561, 569, 556, 572, 570, 560, 566, + 562, 567, 573, 575, 571, 576, 574, 563, 568, 571, + 572, 574, 577, 577, 578, 579, 573, 580, 575, 581, + 576, 582, 580, 583, 579, 584, 582, 587, 585, 584, + 586, 588, 578, 589, 590, 591, 592, 593, 581, 587, + 594, 591, 583, 585, 597, 586, 599, 598, 596, 594, + 588, 592, 590, 596, 589, 598, 600, 593, 597, 601, + 602, 600, 603, 601, 601, 604, 599, 605, 605, 606, + 604, 603, 607, 602, 606, 608, 608, 607, 609, 610, + + 611, 612, 613, 616, 614, 611, 612, 613, 614, 615, + 621, 618, 609, 619, 616, 618, 620, 610, 615, 622, + 625, 623, 624, 615, 621, 615, 67, 615, 619, 623, + 626, 626, 627, 627, 620, 631, 629, 630, 622, 629, + 624, 636, 630, 632, 632, 625, 633, 633, 634, 635, + 635, 637, 638, 634, 631, 640, 637, 639, 641, 642, + 638, 636, 639, 644, 641, 645, 642, 646, 644, 647, + 645, 648, 646, 640, 647, 649, 650, 651, 651, 652, + 648, 653, 655, 654, 660, 656, 659, 650, 654, 657, + 658, 658, 661, 662, 649, 665, 664, 666, 667, 652, + + 664, 664, 655, 667, 653, 656, 659, 657, 668, 660, + 661, 669, 673, 670, 671, 666, 662, 670, 672, 674, + 675, 665, 676, 677, 678, 675, 668, 673, 677, 676, + 679, 669, 672, 671, 680, 681, 682, 690, 674, 679, + 683, 681, 678, 684, 689, 683, 685, 693, 684, 680, + 688, 685, 686, 686, 694, 688, 690, 682, 689, 691, + 692, 692, 695, 691, 691, 696, 693, 697, 695, 698, + 696, 699, 700, 694, 702, 701, 705, 703, 704, 704, + 706, 705, 709, 707, 706, 708, 697, 712, 698, 701, + 699, 700, 703, 61, 708, 702, 707, 710, 710, 711, + + 713, 716, 709, 726, 711, 713, 716, 712, 717, 717, + 718, 721, 721, 723, 725, 718, 723, 724, 724, 727, + 728, 729, 729, 730, 727, 731, 731, 732, 726, 725, + 733, 735, 734, 736, 738, 728, 734, 739, 736, 740, + 740, 733, 741, 730, 742, 743, 744, 747, 744, 732, + 735, 739, 738, 745, 746, 748, 751, 749, 745, 746, + 752, 751, 741, 749, 742, 743, 756, 747, 753, 748, + 754, 753, 755, 755, 757, 754, 758, 759, 760, 761, + 761, 758, 762, 760, 756, 752, 763, 762, 764, 765, + 767, 766, 769, 768, 757, 770, 771, 769, 772, 773, + + 759, 776, 767, 774, 763, 766, 768, 782, 764, 765, + 774, 775, 779, 779, 773, 770, 771, 776, 780, 772, + 775, 780, 781, 775, 783, 784, 782, 785, 786, 786, + 787, 781, 785, 783, 784, 788, 783, 789, 790, 791, + 792, 793, 793, 794, 795, 56, 797, 799, 788, 798, + 787, 797, 790, 799, 798, 789, 800, 801, 792, 794, + 802, 800, 795, 802, 791, 804, 805, 806, 807, 802, + 801, 809, 808, 804, 811, 816, 812, 813, 814, 805, + 812, 815, 813, 814, 816, 806, 815, 807, 808, 809, + 817, 818, 819, 819, 811, 820, 821, 823, 822, 824, + + 825, 826, 823, 827, 827, 832, 818, 826, 821, 820, + 822, 824, 829, 817, 828, 828, 830, 830, 825, 831, + 833, 829, 834, 842, 831, 844, 832, 835, 835, 836, + 836, 837, 837, 838, 839, 841, 849, 839, 838, 833, + 841, 842, 834, 843, 845, 845, 846, 846, 843, 847, + 844, 848, 850, 851, 847, 852, 849, 853, 853, 854, + 855, 855, 856, 848, 859, 848, 858, 861, 860, 863, + 848, 859, 850, 851, 864, 858, 852, 860, 862, 862, + 868, 866, 856, 867, 869, 854, 866, 871, 867, 872, + 864, 869, 871, 861, 873, 863, 870, 870, 872, 875, + + 868, 874, 876, 877, 878, 879, 879, 880, 876, 881, + 883, 883, 877, 891, 873, 878, 874, 882, 875, 885, + 878, 884, 882, 881, 885, 884, 884, 886, 880, 887, + 888, 889, 890, 893, 887, 889, 892, 895, 891, 886, + 894, 892, 888, 897, 890, 894, 897, 898, 898, 895, + 899, 899, 900, 906, 901, 893, 902, 903, 900, 901, + 908, 908, 902, 909, 910, 906, 903, 911, 915, 916, + 917, 925, 908, 910, 916, 923, 911, 918, 918, 920, + 920, 909, 915, 919, 922, 919, 926, 917, 924, 924, + 927, 922, 925, 928, 929, 923, 930, 934, 926, 932, + + 937, 933, 927, 933, 932, 928, 936, 936, 935, 929, + 939, 942, 939, 938, 940, 934, 930, 935, 938, 940, + 941, 943, 944, 945, 947, 941, 937, 944, 945, 942, + 948, 949, 949, 950, 954, 955, 953, 951, 952, 954, + 955, 943, 957, 947, 948, 950, 951, 952, 953, 951, + 958, 959, 961, 963, 964, 957, 965, 967, 961, 963, + 966, 966, 968, 968, 969, 965, 967, 959, 970, 971, + 958, 972, 970, 974, 971, 973, 973, 977, 982, 964, + 980, 974, 982, 969, 972, 983, 977, 978, 978, 979, + 979, 981, 980, 984, 985, 986, 981, 987, 984, 988, + + 983, 989, 991, 990, 993, 993, 994, 997, 997, 994, + 1013, 995, 996, 1013, 986, 990, 998, 998, 988, 1000, + 985, 987, 989, 991, 995, 996, 999, 999, 1001, 1001, + 1002, 1002, 1000, 1003, 1004, 1004, 1005, 1005, 1007, 1008, + 1008, 1009, 1012, 1007, 1010, 1010, 1011, 1016, 1012, 1014, + 1014, 1020, 1003, 1015, 1015, 1017, 1017, 1019, 1019, 1022, + 1009, 1021, 1021, 1023, 1011, 1014, 1016, 1024, 1023, 1025, + 1026, 1022, 1028, 1027, 1029, 1030, 1031, 1020, 1027, 1034, + 51, 1031, 1025, 1029, 1030, 1032, 1036, 1028, 1041, 1032, + 1042, 1026, 1024, 1037, 1037, 1036, 1038, 1039, 1039, 1034, + + 1045, 1038, 1042, 1041, 1044, 1045, 1039, 1044, 1046, 1046, + 1047, 1051, 1048, 1050, 1047, 1048, 1049, 1049, 1050, 1052, + 1053, 1054, 1055, 1052, 1056, 1058, 1054, 1055, 1059, 1060, + 1056, 1051, 1061, 1059, 1061, 1064, 1064, 1060, 1067, 1067, + 1053, 1058, 1070, 1070, 1072, 1072, 1074, 1075, 1075, 1076, + 1077, 1074, 1078, 1080, 1080, 1083, 1084, 1078, 1084, 1085, + 1083, 1086, 1086, 1089, 1085, 1076, 1087, 1087, 1088, 1088, + 1090, 1091, 1077, 1092, 1093, 1089, 1094, 1095, 1095, 1097, + 1096, 1098, 1099, 1091, 1100, 1092, 1093, 1103, 1090, 1096, + 1101, 1102, 1103, 1104, 1107, 1099, 1094, 1113, 1104, 1105, + + 1105, 1098, 1108, 1108, 1101, 1097, 1110, 1110, 1100, 1102, + 1111, 1112, 1107, 1114, 1115, 1113, 1116, 1117, 1117, 1111, + 1118, 1119, 1120, 1121, 1125, 1118, 1112, 1127, 1127, 1126, + 1115, 1114, 1126, 1128, 1129, 1116, 1119, 1131, 1131, 1132, + 1138, 1120, 1139, 1121, 1125, 1133, 1133, 1176, 1128, 1137, + 1137, 1139, 1129, 1142, 1140, 1141, 1144, 1147, 1132, 1140, + 1141, 1142, 1138, 1145, 1146, 1148, 1148, 1176, 1145, 1146, + 1150, 1144, 1147, 1149, 1149, 1150, 1151, 1151, 1152, 1152, + 1154, 1155, 1158, 1157, 1164, 1154, 1157, 1159, 1160, 1161, + 1161, 1162, 1165, 1155, 1168, 1158, 1159, 1160, 1166, 1166, + + 1162, 1167, 1168, 1164, 1169, 1171, 1172, 1174, 1174, 1169, + 1167, 1165, 1177, 1177, 1171, 1178, 1179, 1179, 1178, 1172, + 1180, 1180, 1181, 1182, 1183, 1184, 1184, 1185, 1188, 1183, + 1191, 1185, 1193, 1192, 1188, 1194, 1194, 1182, 1195, 1196, + 1181, 1192, 1197, 1198, 1196, 1200, 1199, 1202, 1203, 1191, + 1202, 1193, 1204, 1204, 1195, 1199, 1205, 1210, 1206, 1208, + 1205, 1209, 1197, 1214, 1214, 1200, 1203, 1206, 1208, 1198, + 1213, 1215, 1217, 1209, 1218, 1213, 1219, 1217, 1220, 1222, + 1215, 1223, 1210, 1218, 1221, 1221, 1224, 1226, 1222, 1227, + 1225, 1228, 1226, 1220, 1233, 1219, 1230, 1223, 1225, 1229, + + 1229, 1230, 1232, 1232, 1234, 1224, 1235, 1235, 1236, 1236, + 1228, 1237, 1238, 1239, 1233, 1227, 1240, 1240, 1243, 1241, + 1242, 1242, 1245, 1246, 1238, 1267, 1234, 1250, 1246, 1267, + 1237, 1241, 1250, 1239, 1247, 1247, 1245, 1243, 1248, 1248, + 1249, 1249, 1251, 1251, 1253, 1253, 1255, 1255, 1256, 1259, + 1260, 1260, 1265, 1256, 1261, 1263, 1276, 1259, 1278, 1261, + 1263, 1266, 1266, 1271, 1271, 1273, 1275, 1275, 1293, 1273, + 50, 1276, 1265, 1279, 1279, 1286, 1278, 1280, 1280, 1282, + 1282, 1284, 1284, 1287, 1287, 1292, 1295, 1286, 1293, 1292, + 1294, 1294, 1297, 1299, 1298, 1295, 1300, 1300, 45, 40, + + 14, 13, 0, 0, 0, 0, 0, 1297, 1298, 0, + 0, 0, 1299, 1303, 1303, 1303, 1303, 1303, 1303, 1303, + 1304, 1304, 1304, 1304, 1304, 1304, 1304, 1305, 1305, 1305, + 1305, 1305, 1305, 1305, 1306, 1306, 1306, 1306, 1306, 1306, + 1306, 1307, 1307, 1307, 1307, 1307, 1307, 1307, 1309, 1309, + 0, 1309, 1309, 1309, 1309, 1310, 1310, 0, 0, 0, + 1310, 1310, 1311, 1311, 0, 0, 1311, 0, 1311, 1312, + 0, 0, 0, 0, 0, 1312, 1313, 1313, 0, 0, + 0, 1313, 1313, 1314, 0, 0, 0, 0, 0, 1314, + 1315, 1315, 0, 1315, 1315, 1315, 1315, 1316, 1316, 0, + + 1316, 1316, 1316, 1316, 1302, 1302, 1302, 1302, 1302, 1302, + 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, + 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, + 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, + 1302, 1302, 1302, 1302 } ; static yy_state_type yy_last_accepting_state; @@ -1565,7 +1568,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 1567 "" +#line 1570 "" #define INITIAL 0 #define quotedstring 1 @@ -1752,7 +1755,7 @@ YY_DECL #line 120 "util/configlexer.lex" -#line 1754 "" +#line 1757 "" if ( !(yy_init) ) { @@ -1811,13 +1814,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 >= 1298 ) + if ( yy_current_state >= 1303 ) 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] != 2598 ); + while ( yy_base[yy_current_state] != 2605 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1942,524 +1945,529 @@ YY_RULE_SETUP case 20: YY_RULE_SETUP #line 143 "util/configlexer.lex" -{ YDVAR(1, VAR_DO_DAEMONIZE) } +{ YDVAR(1, VAR_SSL_PORT) } YY_BREAK case 21: YY_RULE_SETUP #line 144 "util/configlexer.lex" -{ YDVAR(1, VAR_INTERFACE) } +{ YDVAR(1, VAR_DO_DAEMONIZE) } YY_BREAK case 22: YY_RULE_SETUP #line 145 "util/configlexer.lex" -{ YDVAR(1, VAR_OUTGOING_INTERFACE) } +{ YDVAR(1, VAR_INTERFACE) } YY_BREAK case 23: YY_RULE_SETUP #line 146 "util/configlexer.lex" -{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) } +{ YDVAR(1, VAR_OUTGOING_INTERFACE) } YY_BREAK case 24: YY_RULE_SETUP #line 147 "util/configlexer.lex" -{ YDVAR(1, VAR_SO_RCVBUF) } +{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) } YY_BREAK case 25: YY_RULE_SETUP #line 148 "util/configlexer.lex" -{ YDVAR(1, VAR_SO_SNDBUF) } +{ YDVAR(1, VAR_SO_RCVBUF) } YY_BREAK case 26: YY_RULE_SETUP #line 149 "util/configlexer.lex" -{ YDVAR(1, VAR_CHROOT) } +{ YDVAR(1, VAR_SO_SNDBUF) } YY_BREAK case 27: YY_RULE_SETUP #line 150 "util/configlexer.lex" -{ YDVAR(1, VAR_USERNAME) } +{ YDVAR(1, VAR_CHROOT) } YY_BREAK case 28: YY_RULE_SETUP #line 151 "util/configlexer.lex" -{ YDVAR(1, VAR_DIRECTORY) } +{ YDVAR(1, VAR_USERNAME) } YY_BREAK case 29: YY_RULE_SETUP #line 152 "util/configlexer.lex" -{ YDVAR(1, VAR_LOGFILE) } +{ YDVAR(1, VAR_DIRECTORY) } YY_BREAK case 30: YY_RULE_SETUP #line 153 "util/configlexer.lex" -{ YDVAR(1, VAR_PIDFILE) } +{ YDVAR(1, VAR_LOGFILE) } YY_BREAK case 31: YY_RULE_SETUP #line 154 "util/configlexer.lex" -{ YDVAR(1, VAR_ROOT_HINTS) } +{ YDVAR(1, VAR_PIDFILE) } YY_BREAK case 32: YY_RULE_SETUP #line 155 "util/configlexer.lex" -{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } +{ YDVAR(1, VAR_ROOT_HINTS) } YY_BREAK case 33: YY_RULE_SETUP #line 156 "util/configlexer.lex" -{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } +{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } YY_BREAK case 34: YY_RULE_SETUP #line 157 "util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SIZE) } +{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } YY_BREAK case 35: YY_RULE_SETUP #line 158 "util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SLABS) } +{ YDVAR(1, VAR_MSG_CACHE_SIZE) } YY_BREAK case 36: YY_RULE_SETUP #line 159 "util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } +{ YDVAR(1, VAR_MSG_CACHE_SLABS) } YY_BREAK case 37: YY_RULE_SETUP #line 160 "util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } +{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } YY_BREAK case 38: YY_RULE_SETUP #line 161 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MAX_TTL) } +{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } YY_BREAK case 39: YY_RULE_SETUP #line 162 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MIN_TTL) } +{ YDVAR(1, VAR_CACHE_MAX_TTL) } YY_BREAK case 40: YY_RULE_SETUP #line 163 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_HOST_TTL) } +{ YDVAR(1, VAR_CACHE_MIN_TTL) } YY_BREAK case 41: YY_RULE_SETUP #line 164 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_LAME_TTL) } +{ YDVAR(1, VAR_INFRA_HOST_TTL) } YY_BREAK case 42: YY_RULE_SETUP #line 165 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } +{ YDVAR(1, VAR_INFRA_LAME_TTL) } YY_BREAK case 43: YY_RULE_SETUP #line 166 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } +{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } YY_BREAK case 44: YY_RULE_SETUP #line 167 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } +{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } YY_BREAK case 45: YY_RULE_SETUP #line 168 "util/configlexer.lex" -{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } +{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } YY_BREAK case 46: YY_RULE_SETUP #line 169 "util/configlexer.lex" -{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } +{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } YY_BREAK case 47: YY_RULE_SETUP #line 170 "util/configlexer.lex" -{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } +{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } YY_BREAK case 48: YY_RULE_SETUP #line 171 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } +{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } YY_BREAK case 49: YY_RULE_SETUP #line 172 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } +{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } YY_BREAK case 50: YY_RULE_SETUP #line 173 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_GLUE) } +{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } YY_BREAK case 51: YY_RULE_SETUP #line 174 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } +{ YDVAR(1, VAR_HARDEN_GLUE) } YY_BREAK case 52: YY_RULE_SETUP #line 175 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } +{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 53: YY_RULE_SETUP #line 176 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } +{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } YY_BREAK case 54: YY_RULE_SETUP #line 177 "util/configlexer.lex" -{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } +{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } YY_BREAK case 55: YY_RULE_SETUP #line 178 "util/configlexer.lex" -{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } +{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } YY_BREAK case 56: YY_RULE_SETUP #line 179 "util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_ADDRESS) } +{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } YY_BREAK case 57: YY_RULE_SETUP #line 180 "util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_DOMAIN) } +{ YDVAR(1, VAR_PRIVATE_ADDRESS) } YY_BREAK case 58: YY_RULE_SETUP #line 181 "util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH_KEY) } +{ YDVAR(1, VAR_PRIVATE_DOMAIN) } YY_BREAK case 59: YY_RULE_SETUP #line 182 "util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH) } +{ YDVAR(1, VAR_PREFETCH_KEY) } YY_BREAK case 60: YY_RULE_SETUP #line 183 "util/configlexer.lex" -{ YDVAR(0, VAR_STUB_ZONE) } +{ YDVAR(1, VAR_PREFETCH) } YY_BREAK case 61: YY_RULE_SETUP #line 184 "util/configlexer.lex" -{ YDVAR(1, VAR_NAME) } +{ YDVAR(0, VAR_STUB_ZONE) } YY_BREAK case 62: YY_RULE_SETUP #line 185 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_ADDR) } +{ YDVAR(1, VAR_NAME) } YY_BREAK case 63: YY_RULE_SETUP #line 186 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_HOST) } +{ YDVAR(1, VAR_STUB_ADDR) } YY_BREAK case 64: YY_RULE_SETUP #line 187 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_PRIME) } +{ YDVAR(1, VAR_STUB_HOST) } YY_BREAK case 65: YY_RULE_SETUP #line 188 "util/configlexer.lex" -{ YDVAR(0, VAR_FORWARD_ZONE) } +{ YDVAR(1, VAR_STUB_PRIME) } YY_BREAK case 66: YY_RULE_SETUP #line 189 "util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_ADDR) } +{ YDVAR(0, VAR_FORWARD_ZONE) } YY_BREAK case 67: YY_RULE_SETUP #line 190 "util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_HOST) } +{ YDVAR(1, VAR_FORWARD_ADDR) } YY_BREAK case 68: YY_RULE_SETUP #line 191 "util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } +{ YDVAR(1, VAR_FORWARD_HOST) } YY_BREAK case 69: YY_RULE_SETUP #line 192 "util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } +{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } YY_BREAK case 70: YY_RULE_SETUP #line 193 "util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL) } +{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } YY_BREAK case 71: YY_RULE_SETUP #line 194 "util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_IDENTITY) } +{ YDVAR(2, VAR_ACCESS_CONTROL) } YY_BREAK case 72: YY_RULE_SETUP #line 195 "util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_VERSION) } +{ YDVAR(1, VAR_HIDE_IDENTITY) } YY_BREAK case 73: YY_RULE_SETUP #line 196 "util/configlexer.lex" -{ YDVAR(1, VAR_IDENTITY) } +{ YDVAR(1, VAR_HIDE_VERSION) } YY_BREAK case 74: YY_RULE_SETUP #line 197 "util/configlexer.lex" -{ YDVAR(1, VAR_VERSION) } +{ YDVAR(1, VAR_IDENTITY) } YY_BREAK case 75: YY_RULE_SETUP #line 198 "util/configlexer.lex" -{ YDVAR(1, VAR_MODULE_CONF) } +{ YDVAR(1, VAR_VERSION) } YY_BREAK case 76: YY_RULE_SETUP #line 199 "util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR) } +{ YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 77: YY_RULE_SETUP #line 200 "util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 78: YY_RULE_SETUP #line 201 "util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 79: YY_RULE_SETUP #line 202 "util/configlexer.lex" -{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 80: YY_RULE_SETUP #line 203 "util/configlexer.lex" -{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } +{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 81: YY_RULE_SETUP #line 204 "util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR) } +{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 82: YY_RULE_SETUP #line 205 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } +{ YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 83: YY_RULE_SETUP #line 206 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } +{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 84: YY_RULE_SETUP #line 207 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 85: YY_RULE_SETUP #line 208 "util/configlexer.lex" -{ YDVAR(1, VAR_BOGUS_TTL) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 86: YY_RULE_SETUP #line 209 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } +{ YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 87: YY_RULE_SETUP #line 210 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } +{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 88: YY_RULE_SETUP #line 211 "util/configlexer.lex" -{ YDVAR(1, VAR_IGNORE_CD_FLAG) } +{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 89: YY_RULE_SETUP #line 212 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 90: YY_RULE_SETUP #line 213 "util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 91: YY_RULE_SETUP #line 214 "util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 92: YY_RULE_SETUP #line 215 "util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 93: YY_RULE_SETUP #line 216 "util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 94: YY_RULE_SETUP -#line 218 "util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 217 "util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 95: YY_RULE_SETUP #line 219 "util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 96: YY_RULE_SETUP #line 220 "util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 97: YY_RULE_SETUP #line 221 "util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 98: YY_RULE_SETUP #line 222 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 99: YY_RULE_SETUP #line 223 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 100: YY_RULE_SETUP #line 224 "util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 101: YY_RULE_SETUP #line 225 "util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 102: YY_RULE_SETUP #line 226 "util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 103: YY_RULE_SETUP #line 227 "util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 104: YY_RULE_SETUP #line 228 "util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 105: YY_RULE_SETUP #line 229 "util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 106: YY_RULE_SETUP #line 230 "util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 107: YY_RULE_SETUP #line 231 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 108: YY_RULE_SETUP #line 232 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 109: YY_RULE_SETUP #line 233 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 110: YY_RULE_SETUP #line 234 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 111: YY_RULE_SETUP #line 235 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 112: YY_RULE_SETUP #line 236 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 113: YY_RULE_SETUP #line 237 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 114: YY_RULE_SETUP #line 238 "util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 115: YY_RULE_SETUP #line 239 "util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 116: YY_RULE_SETUP #line 240 "util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 117: -/* rule 117 can match eol */ YY_RULE_SETUP #line 241 "util/configlexer.lex" +{ YDVAR(1, VAR_DOMAIN_INSECURE) } + YY_BREAK +case 118: +/* rule 118 can match eol */ +YY_RULE_SETUP +#line 242 "util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 118: +case 119: YY_RULE_SETUP -#line 244 "util/configlexer.lex" +#line 245 "util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 245 "util/configlexer.lex" +#line 246 "util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 119: +case 120: YY_RULE_SETUP -#line 250 "util/configlexer.lex" +#line 251 "util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 120: -/* rule 120 can match eol */ +case 121: +/* rule 121 can match eol */ YY_RULE_SETUP -#line 251 "util/configlexer.lex" +#line 252 "util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 121: +case 122: YY_RULE_SETUP -#line 253 "util/configlexer.lex" +#line 254 "util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -2472,34 +2480,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 122: +case 123: YY_RULE_SETUP -#line 265 "util/configlexer.lex" +#line 266 "util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 266 "util/configlexer.lex" +#line 267 "util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 123: +case 124: YY_RULE_SETUP -#line 271 "util/configlexer.lex" +#line 272 "util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 124: -/* rule 124 can match eol */ +case 125: +/* rule 125 can match eol */ YY_RULE_SETUP -#line 272 "util/configlexer.lex" +#line 273 "util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 125: +case 126: YY_RULE_SETUP -#line 274 "util/configlexer.lex" +#line 275 "util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -2512,38 +2520,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 126: +case 127: YY_RULE_SETUP -#line 286 "util/configlexer.lex" +#line 287 "util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 288 "util/configlexer.lex" +#line 289 "util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 127: -YY_RULE_SETUP -#line 292 "util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 128: -/* rule 128 can match eol */ YY_RULE_SETUP #line 293 "util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 129: +/* rule 129 can match eol */ YY_RULE_SETUP #line 294 "util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 130: YY_RULE_SETUP #line 295 "util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 131: +YY_RULE_SETUP +#line 296 "util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include(yytext); @@ -2551,27 +2559,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 300 "util/configlexer.lex" +#line 301 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 131: +case 132: YY_RULE_SETUP -#line 304 "util/configlexer.lex" +#line 305 "util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 132: -/* rule 132 can match eol */ +case 133: +/* rule 133 can match eol */ YY_RULE_SETUP -#line 305 "util/configlexer.lex" +#line 306 "util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 133: +case 134: YY_RULE_SETUP -#line 307 "util/configlexer.lex" +#line 308 "util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -2581,7 +2589,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 313 "util/configlexer.lex" +#line 314 "util/configlexer.lex" { yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ if (config_include_stack_ptr == 0) { @@ -2592,33 +2600,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 134: +case 135: YY_RULE_SETUP -#line 323 "util/configlexer.lex" +#line 324 "util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 135: +case 136: YY_RULE_SETUP -#line 327 "util/configlexer.lex" +#line 328 "util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 136: +case 137: YY_RULE_SETUP -#line 331 "util/configlexer.lex" +#line 332 "util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 137: +case 138: YY_RULE_SETUP -#line 335 "util/configlexer.lex" +#line 336 "util/configlexer.lex" ECHO; YY_BREAK -#line 2620 "" +#line 2628 "" case YY_END_OF_BUFFER: { @@ -2908,7 +2916,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 >= 1298 ) + if ( yy_current_state >= 1303 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2936,11 +2944,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 >= 1298 ) + if ( yy_current_state >= 1303 ) 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 == 1297); + yy_is_jam = (yy_current_state == 1302); return yy_is_jam ? 0 : yy_current_state; } @@ -3577,7 +3585,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 335 "util/configlexer.lex" +#line 336 "util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index f1c9213ae..2661ffdf1 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -140,6 +140,7 @@ tcp-upstream{COLON} { YDVAR(1, VAR_TCP_UPSTREAM) } ssl-upstream{COLON} { YDVAR(1, VAR_SSL_UPSTREAM) } ssl-service-key{COLON} { YDVAR(1, VAR_SSL_SERVICE_KEY) } ssl-service-pem{COLON} { YDVAR(1, VAR_SSL_SERVICE_PEM) } +ssl-port{COLON} { YDVAR(1, VAR_SSL_PORT) } do-daemonize{COLON} { YDVAR(1, VAR_DO_DAEMONIZE) } interface{COLON} { YDVAR(1, VAR_INTERFACE) } outgoing-interface{COLON} { YDVAR(1, VAR_OUTGOING_INTERFACE) } diff --git a/util/configparser.c b/util/configparser.c index 8fac0d216..d40642a25 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -244,7 +244,8 @@ extern struct config_parser_state* cfg_parser; VAR_TCP_UPSTREAM = 376, VAR_SSL_UPSTREAM = 377, VAR_SSL_SERVICE_KEY = 378, - VAR_SSL_SERVICE_PEM = 379 + VAR_SSL_SERVICE_PEM = 379, + VAR_SSL_PORT = 380 }; #endif /* Tokens. */ @@ -370,6 +371,7 @@ extern struct config_parser_state* cfg_parser; #define VAR_SSL_UPSTREAM 377 #define VAR_SSL_SERVICE_KEY 378 #define VAR_SSL_SERVICE_PEM 379 +#define VAR_SSL_PORT 380 @@ -386,7 +388,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 390 "util/configparser.c" +#line 392 "util/configparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -398,7 +400,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 402 "util/configparser.c" +#line 404 "util/configparser.c" #ifdef short # undef short @@ -613,20 +615,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 227 +#define YYLAST 229 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 125 +#define YYNTOKENS 126 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 128 +#define YYNNTS 129 /* YYNRULES -- Number of rules. */ -#define YYNRULES 243 +#define YYNRULES 245 /* YYNRULES -- Number of states. */ -#define YYNSTATES 356 +#define YYNSTATES 359 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 379 +#define YYMAXUTOK 380 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -671,7 +673,8 @@ static const yytype_uint8 yytranslate[] = 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124 + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125 }; #if YYDEBUG @@ -689,87 +692,87 @@ static const yytype_uint16 yyprhs[] = 144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 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, 223, - 224, 226, 228, 230, 232, 234, 237, 238, 240, 242, - 244, 247, 250, 253, 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, 467, 470, 473, 476, 479, 482, - 485, 488, 491, 494, 497, 500, 503, 506, 509, 512, - 515, 518, 521, 525, 528, 531, 534, 537, 540, 543, - 546, 549, 552, 554, 557, 558, 560, 562, 564, 566, - 568, 570, 572, 575, 578, 581, 584, 587, 590, 593, - 595, 598, 599, 601 + 204, 206, 208, 210, 212, 214, 216, 218, 220, 222, + 225, 226, 228, 230, 232, 234, 236, 239, 240, 242, + 244, 246, 249, 252, 255, 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, 472, 475, 478, 481, + 484, 487, 490, 493, 496, 499, 502, 505, 508, 511, + 514, 517, 520, 523, 526, 530, 533, 536, 539, 542, + 545, 548, 551, 554, 557, 559, 562, 563, 565, 567, + 569, 571, 573, 575, 577, 580, 583, 586, 589, 592, + 595, 598, 600, 603, 604, 606 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 126, 0, -1, -1, 126, 127, -1, 128, 129, -1, - 131, 132, -1, 134, 135, -1, 249, 250, -1, 239, - 240, -1, 11, -1, 129, 130, -1, -1, 137, -1, - 138, -1, 142, -1, 145, -1, 151, -1, 152, -1, - 153, -1, 154, -1, 143, -1, 163, -1, 164, -1, - 165, -1, 166, -1, 167, -1, 184, -1, 185, -1, - 186, -1, 188, -1, 189, -1, 148, -1, 190, -1, - 191, -1, 194, -1, 192, -1, 193, -1, 195, -1, - 196, -1, 197, -1, 208, -1, 176, -1, 177, -1, - 178, -1, 179, -1, 198, -1, 211, -1, 172, -1, - 174, -1, 212, -1, 217, -1, 218, -1, 219, -1, - 149, -1, 183, -1, 226, -1, 227, -1, 173, -1, - 222, -1, 160, -1, 144, -1, 168, -1, 209, -1, - 215, -1, 199, -1, 210, -1, 229, -1, 230, -1, - 150, -1, 139, -1, 159, -1, 202, -1, 140, -1, - 146, -1, 147, -1, 169, -1, 170, -1, 228, -1, - 201, -1, 203, -1, 204, -1, 141, -1, 231, -1, - 187, -1, 207, -1, 161, -1, 175, -1, 213, -1, - 214, -1, 216, -1, 221, -1, 171, -1, 223, -1, - 224, -1, 225, -1, 180, -1, 182, -1, 205, -1, - 206, -1, 181, -1, 200, -1, 220, -1, 162, -1, - 155, -1, 156, -1, 157, -1, 158, -1, 38, -1, - 132, 133, -1, -1, 232, -1, 233, -1, 234, -1, - 235, -1, 44, -1, 135, 136, -1, -1, 236, -1, - 237, -1, 238, -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, - 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, 37, 10, -1, 39, 10, -1, 40, 10, -1, - 99, 10, -1, 37, 10, -1, 45, 10, -1, 46, - 10, -1, 88, -1, 240, 241, -1, -1, 242, -1, - 244, -1, 243, -1, 245, -1, 246, -1, 247, -1, - 248, -1, 89, 10, -1, 91, 10, -1, 90, 10, - -1, 92, 10, -1, 93, 10, -1, 94, 10, -1, - 95, 10, -1, 103, -1, 250, 251, -1, -1, 252, - -1, 104, 10, -1 + 127, 0, -1, -1, 127, 128, -1, 129, 130, -1, + 132, 133, -1, 135, 136, -1, 251, 252, -1, 241, + 242, -1, 11, -1, 130, 131, -1, -1, 138, -1, + 139, -1, 143, -1, 146, -1, 152, -1, 153, -1, + 154, -1, 155, -1, 144, -1, 165, -1, 166, -1, + 167, -1, 168, -1, 169, -1, 186, -1, 187, -1, + 188, -1, 190, -1, 191, -1, 149, -1, 192, -1, + 193, -1, 196, -1, 194, -1, 195, -1, 197, -1, + 198, -1, 199, -1, 210, -1, 178, -1, 179, -1, + 180, -1, 181, -1, 200, -1, 213, -1, 174, -1, + 176, -1, 214, -1, 219, -1, 220, -1, 221, -1, + 150, -1, 185, -1, 228, -1, 229, -1, 175, -1, + 224, -1, 162, -1, 145, -1, 170, -1, 211, -1, + 217, -1, 201, -1, 212, -1, 231, -1, 232, -1, + 151, -1, 140, -1, 161, -1, 204, -1, 141, -1, + 147, -1, 148, -1, 171, -1, 172, -1, 230, -1, + 203, -1, 205, -1, 206, -1, 142, -1, 233, -1, + 189, -1, 209, -1, 163, -1, 177, -1, 215, -1, + 216, -1, 218, -1, 223, -1, 173, -1, 225, -1, + 226, -1, 227, -1, 182, -1, 184, -1, 207, -1, + 208, -1, 183, -1, 202, -1, 222, -1, 164, -1, + 156, -1, 157, -1, 158, -1, 159, -1, 160, -1, + 38, -1, 133, 134, -1, -1, 234, -1, 235, -1, + 236, -1, 237, -1, 44, -1, 136, 137, -1, -1, + 238, -1, 239, -1, 240, -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, 37, 10, -1, 39, + 10, -1, 40, 10, -1, 99, 10, -1, 37, 10, + -1, 45, 10, -1, 46, 10, -1, 88, -1, 242, + 243, -1, -1, 244, -1, 246, -1, 245, -1, 247, + -1, 248, -1, 249, -1, 250, -1, 89, 10, -1, + 91, 10, -1, 90, 10, -1, 92, 10, -1, 93, + 10, -1, 94, 10, -1, 95, 10, -1, 103, -1, + 252, 253, -1, -1, 254, -1, 104, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -785,21 +788,21 @@ static const yytype_uint16 yyrline[] = 147, 148, 148, 149, 149, 150, 150, 150, 151, 151, 152, 152, 153, 153, 154, 154, 155, 155, 156, 156, 156, 157, 157, 158, 158, 158, 159, 159, 159, 160, - 160, 160, 161, 161, 161, 162, 162, 164, 176, 177, - 178, 178, 178, 178, 180, 192, 193, 194, 194, 194, - 196, 205, 214, 225, 234, 243, 252, 265, 280, 289, - 298, 307, 316, 325, 334, 343, 352, 361, 370, 379, - 388, 395, 402, 411, 425, 434, 443, 450, 457, 464, - 472, 479, 486, 493, 500, 508, 516, 524, 531, 538, - 547, 556, 563, 570, 578, 586, 599, 610, 618, 631, - 640, 649, 657, 670, 679, 687, 696, 704, 717, 724, - 734, 744, 754, 764, 774, 784, 794, 801, 808, 817, - 826, 835, 842, 852, 866, 873, 891, 904, 917, 926, - 935, 944, 954, 964, 973, 982, 989, 998, 1007, 1016, - 1024, 1037, 1045, 1067, 1074, 1089, 1099, 1106, 1113, 1123, - 1133, 1140, 1147, 1152, 1153, 1154, 1154, 1154, 1155, 1155, - 1155, 1156, 1158, 1168, 1177, 1184, 1191, 1198, 1205, 1212, - 1217, 1218, 1219, 1221 + 160, 160, 161, 161, 161, 162, 162, 162, 164, 176, + 177, 178, 178, 178, 178, 180, 192, 193, 194, 194, + 194, 196, 205, 214, 225, 234, 243, 252, 265, 280, + 289, 298, 307, 316, 325, 334, 343, 352, 361, 370, + 379, 388, 395, 402, 411, 420, 434, 443, 452, 459, + 466, 473, 481, 488, 495, 502, 509, 517, 525, 533, + 540, 547, 556, 565, 572, 579, 587, 595, 608, 619, + 627, 640, 649, 658, 666, 679, 688, 696, 705, 713, + 726, 733, 743, 753, 763, 773, 783, 793, 803, 810, + 817, 826, 835, 844, 851, 861, 875, 882, 900, 913, + 926, 935, 944, 953, 963, 973, 982, 991, 998, 1007, + 1016, 1025, 1033, 1046, 1054, 1076, 1083, 1098, 1108, 1115, + 1122, 1132, 1142, 1149, 1156, 1161, 1162, 1163, 1163, 1163, + 1164, 1164, 1164, 1165, 1167, 1177, 1186, 1193, 1200, 1207, + 1214, 1221, 1226, 1227, 1228, 1230 }; #endif @@ -847,11 +850,11 @@ static const char *const yytname[] = "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", "$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_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM", "VAR_SSL_PORT", "$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", @@ -859,9 +862,9 @@ static const char *const yytname[] = "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4", "server_do_ip6", "server_do_udp", "server_do_tcp", "server_tcp_upstream", "server_ssl_upstream", "server_ssl_service_key", - "server_ssl_service_pem", "server_do_daemonize", "server_use_syslog", - "server_log_time_ascii", "server_log_queries", "server_chroot", - "server_username", "server_directory", "server_logfile", + "server_ssl_service_pem", "server_ssl_port", "server_do_daemonize", + "server_use_syslog", "server_log_time_ascii", "server_log_queries", + "server_chroot", "server_username", "server_directory", "server_logfile", "server_pidfile", "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor", "server_auto_trust_anchor_file", "server_trust_anchor_file", "server_trusted_keys_file", @@ -917,25 +920,25 @@ static const yytype_uint16 yytoknum[] = 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, - 375, 376, 377, 378, 379 + 375, 376, 377, 378, 379, 380 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 125, 126, 126, 127, 127, 127, 127, 127, 128, - 129, 129, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 131, 132, 132, - 133, 133, 133, 133, 134, 135, 135, 136, 136, 136, + 0, 126, 127, 127, 128, 128, 128, 128, 128, 129, + 130, 130, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 132, 133, + 133, 134, 134, 134, 134, 135, 136, 136, 137, 137, 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, @@ -946,9 +949,9 @@ static const yytype_uint8 yyr1[] = 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, 240, 241, 241, 241, 241, 241, - 241, 241, 242, 243, 244, 245, 246, 247, 248, 249, - 250, 250, 251, 252 + 237, 238, 239, 240, 241, 242, 242, 243, 243, 243, + 243, 243, 243, 243, 244, 245, 246, 247, 248, 249, + 250, 251, 252, 252, 253, 254 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -964,21 +967,21 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 0, 1, 1, 1, 1, 1, 2, 0, 1, 1, + 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, - 2, 0, 1, 2 + 2, 2, 2, 2, 3, 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 rule to reduce with in state @@ -986,8 +989,8 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 2, 0, 1, 9, 107, 114, 222, 239, 3, 11, - 109, 116, 224, 241, 4, 5, 6, 8, 7, 0, + 2, 0, 1, 9, 108, 115, 224, 241, 3, 11, + 110, 117, 226, 243, 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, @@ -997,49 +1000,49 @@ 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, 10, 12, 13, 69, 72, 81, - 14, 20, 60, 15, 73, 74, 31, 53, 68, 16, - 17, 18, 19, 103, 104, 105, 106, 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, - 0, 0, 0, 0, 108, 110, 111, 112, 113, 0, - 0, 0, 115, 117, 118, 119, 0, 0, 0, 0, - 0, 0, 0, 223, 225, 227, 226, 228, 229, 230, - 231, 0, 240, 242, 121, 120, 125, 128, 126, 134, - 135, 136, 137, 146, 147, 148, 149, 150, 167, 168, - 169, 171, 172, 131, 173, 174, 177, 175, 176, 178, - 179, 180, 191, 159, 160, 161, 162, 181, 194, 155, - 157, 195, 200, 201, 202, 132, 166, 209, 210, 156, - 205, 143, 127, 151, 192, 198, 182, 0, 0, 213, - 133, 122, 142, 185, 123, 129, 130, 152, 153, 211, - 184, 186, 187, 124, 214, 170, 190, 144, 158, 196, - 197, 199, 204, 154, 208, 206, 207, 163, 165, 188, - 189, 164, 183, 203, 145, 138, 139, 140, 141, 215, - 216, 217, 218, 219, 220, 221, 232, 234, 233, 235, - 236, 237, 238, 243, 193, 212 + 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, 0, 0, 0, 0, 109, 111, 112, 113, + 114, 0, 0, 0, 116, 118, 119, 120, 0, 0, + 0, 0, 0, 0, 0, 225, 227, 229, 228, 230, + 231, 232, 233, 0, 242, 244, 122, 121, 126, 129, + 127, 135, 136, 137, 138, 148, 149, 150, 151, 152, + 169, 170, 171, 173, 174, 132, 175, 176, 179, 177, + 178, 180, 181, 182, 193, 161, 162, 163, 164, 183, + 196, 157, 159, 197, 202, 203, 204, 133, 168, 211, + 212, 158, 207, 145, 128, 153, 194, 200, 184, 0, + 0, 215, 134, 123, 144, 187, 124, 130, 131, 154, + 155, 213, 186, 188, 189, 125, 216, 172, 192, 146, + 160, 198, 199, 201, 206, 156, 210, 208, 209, 165, + 167, 190, 191, 166, 185, 205, 147, 139, 140, 141, + 142, 143, 217, 218, 219, 220, 221, 222, 223, 234, + 236, 235, 237, 238, 239, 240, 245, 195, 214 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 8, 9, 14, 114, 10, 15, 214, 11, - 16, 222, 115, 116, 117, 118, 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, 215, 216, 217, - 218, 223, 224, 225, 12, 17, 233, 234, 235, 236, - 237, 238, 239, 240, 13, 18, 242, 243 + -1, 1, 8, 9, 14, 115, 10, 15, 216, 11, + 16, 224, 116, 117, 118, 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, 217, 218, + 219, 220, 225, 226, 227, 12, 17, 235, 236, 237, + 238, 239, 240, 241, 242, 13, 18, 244, 245 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -1049,17 +1052,16 @@ 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, 103, 105, - 106, 107, 108, 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, 157, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 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, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, + 17, 18, 22, 23, 24, 68, 71, 72, 105, 106, + 107, 108, 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, + 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 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, -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, @@ -1068,21 +1070,22 @@ 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, - 201, 202, 203, 204, -80, -80, -80, -80, -80, 205, - 206, 207, -80, -80, -80, -80, 208, 209, 210, 211, - 212, 213, 214, -80, -80, -80, -80, -80, -80, -80, - -80, 215, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, + -80, -80, 203, 204, 205, 206, -80, -80, -80, -80, + -80, 207, 208, 209, -80, -80, -80, -80, 210, 211, + 212, 213, 214, 215, 216, -80, -80, -80, -80, -80, + -80, -80, -80, 217, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80, -80, -80, -80, 216, 217, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, + -80, -80, -80, -80, -80, -80, -80, -80, -80, 218, + 219, -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]. */ @@ -1100,7 +1103,7 @@ static const yytype_int8 yypgoto[] = -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80, -80, -80, -80, -80 + -80, -80, -80, -80, -80, -80, -80, -80, -80 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1112,27 +1115,27 @@ 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, 241, 244, 245, 246, 44, - 45, 46, 247, 248, 249, 47, 48, 49, 50, 51, + 39, 40, 41, 42, 43, 243, 246, 247, 248, 44, + 45, 46, 249, 250, 251, 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, 210, 250, 211, - 212, 251, 252, 219, 88, 89, 90, 3, 91, 92, - 93, 220, 221, 94, 95, 96, 97, 98, 99, 100, + 82, 83, 84, 85, 86, 87, 2, 212, 252, 213, + 214, 253, 254, 221, 88, 89, 90, 3, 91, 92, + 93, 222, 223, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 253, 4, 254, 255, 256, 257, 258, - 5, 226, 227, 228, 229, 230, 231, 232, 259, 260, - 261, 262, 263, 264, 265, 266, 267, 268, 269, 213, - 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, - 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, - 290, 291, 292, 293, 6, 294, 295, 296, 297, 298, - 299, 300, 301, 302, 303, 304, 305, 306, 307, 7, - 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, - 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, - 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, - 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, - 348, 349, 350, 351, 352, 353, 354, 355 + 111, 112, 113, 114, 4, 255, 256, 257, 258, 259, + 5, 228, 229, 230, 231, 232, 233, 234, 260, 261, + 262, 263, 264, 265, 266, 267, 268, 269, 270, 215, + 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, + 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, + 291, 292, 293, 294, 6, 295, 296, 297, 298, 299, + 300, 301, 302, 303, 304, 305, 306, 307, 308, 7, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, + 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, + 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, + 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, + 349, 350, 351, 352, 353, 354, 355, 356, 357, 358 }; static const yytype_uint8 yycheck[] = @@ -1148,7 +1151,7 @@ static const yytype_uint8 yycheck[] = 40, 10, 10, 37, 96, 97, 98, 11, 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, 10, 38, 10, 10, 10, 10, 10, + 122, 123, 124, 125, 38, 10, 10, 10, 10, 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, @@ -1159,15 +1162,15 @@ static const yytype_uint8 yycheck[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 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_uint8 yystos[] = { - 0, 126, 0, 11, 38, 44, 88, 103, 127, 128, - 131, 134, 239, 249, 129, 132, 135, 240, 250, 12, + 0, 127, 0, 11, 38, 44, 88, 103, 128, 129, + 132, 135, 241, 251, 130, 133, 136, 242, 252, 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, @@ -1177,7 +1180,7 @@ static const yytype_uint8 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, 130, 137, 138, 139, 140, 141, + 121, 122, 123, 124, 125, 131, 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, @@ -1187,10 +1190,10 @@ static const yytype_uint8 yystos[] = 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, - 37, 39, 40, 99, 133, 232, 233, 234, 235, 37, - 45, 46, 136, 236, 237, 238, 89, 90, 91, 92, - 93, 94, 95, 241, 242, 243, 244, 245, 246, 247, - 248, 104, 251, 252, 10, 10, 10, 10, 10, 10, + 232, 233, 37, 39, 40, 99, 134, 234, 235, 236, + 237, 37, 45, 46, 137, 238, 239, 240, 89, 90, + 91, 92, 93, 94, 95, 243, 244, 245, 246, 247, + 248, 249, 250, 104, 253, 254, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1201,7 +1204,7 @@ static const yytype_uint8 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10, 10, 10, 10 }; #define yyerrok (yyerrstatus = 0) @@ -2030,7 +2033,7 @@ yyreduce: } break; - case 107: + case 108: /* Line 1464 of yacc.c */ #line 165 "util/configparser.y" @@ -2046,7 +2049,7 @@ yyreduce: } break; - case 114: + case 115: /* Line 1464 of yacc.c */ #line 181 "util/configparser.y" @@ -2062,7 +2065,7 @@ yyreduce: } break; - case 120: + case 121: /* Line 1464 of yacc.c */ #line 197 "util/configparser.y" @@ -2075,7 +2078,7 @@ yyreduce: } break; - case 121: + case 122: /* Line 1464 of yacc.c */ #line 206 "util/configparser.y" @@ -2088,7 +2091,7 @@ yyreduce: } break; - case 122: + case 123: /* Line 1464 of yacc.c */ #line 215 "util/configparser.y" @@ -2103,7 +2106,7 @@ yyreduce: } break; - case 123: + case 124: /* Line 1464 of yacc.c */ #line 226 "util/configparser.y" @@ -2116,7 +2119,7 @@ yyreduce: } break; - case 124: + case 125: /* Line 1464 of yacc.c */ #line 235 "util/configparser.y" @@ -2129,7 +2132,7 @@ yyreduce: } break; - case 125: + case 126: /* Line 1464 of yacc.c */ #line 244 "util/configparser.y" @@ -2142,7 +2145,7 @@ yyreduce: } break; - case 126: + case 127: /* Line 1464 of yacc.c */ #line 253 "util/configparser.y" @@ -2159,7 +2162,7 @@ yyreduce: } break; - case 127: + case 128: /* Line 1464 of yacc.c */ #line 266 "util/configparser.y" @@ -2178,7 +2181,7 @@ yyreduce: } break; - case 128: + case 129: /* Line 1464 of yacc.c */ #line 281 "util/configparser.y" @@ -2191,7 +2194,7 @@ yyreduce: } break; - case 129: + case 130: /* Line 1464 of yacc.c */ #line 290 "util/configparser.y" @@ -2204,7 +2207,7 @@ yyreduce: } break; - case 130: + case 131: /* Line 1464 of yacc.c */ #line 299 "util/configparser.y" @@ -2217,7 +2220,7 @@ yyreduce: } break; - case 131: + case 132: /* Line 1464 of yacc.c */ #line 308 "util/configparser.y" @@ -2230,7 +2233,7 @@ yyreduce: } break; - case 132: + case 133: /* Line 1464 of yacc.c */ #line 317 "util/configparser.y" @@ -2243,7 +2246,7 @@ yyreduce: } break; - case 133: + case 134: /* Line 1464 of yacc.c */ #line 326 "util/configparser.y" @@ -2256,7 +2259,7 @@ yyreduce: } break; - case 134: + case 135: /* Line 1464 of yacc.c */ #line 335 "util/configparser.y" @@ -2269,7 +2272,7 @@ yyreduce: } break; - case 135: + case 136: /* Line 1464 of yacc.c */ #line 344 "util/configparser.y" @@ -2282,7 +2285,7 @@ yyreduce: } break; - case 136: + case 137: /* Line 1464 of yacc.c */ #line 353 "util/configparser.y" @@ -2295,7 +2298,7 @@ yyreduce: } break; - case 137: + case 138: /* Line 1464 of yacc.c */ #line 362 "util/configparser.y" @@ -2308,7 +2311,7 @@ yyreduce: } break; - case 138: + case 139: /* Line 1464 of yacc.c */ #line 371 "util/configparser.y" @@ -2321,7 +2324,7 @@ yyreduce: } break; - case 139: + case 140: /* Line 1464 of yacc.c */ #line 380 "util/configparser.y" @@ -2334,7 +2337,7 @@ yyreduce: } break; - case 140: + case 141: /* Line 1464 of yacc.c */ #line 389 "util/configparser.y" @@ -2345,7 +2348,7 @@ yyreduce: } break; - case 141: + case 142: /* Line 1464 of yacc.c */ #line 396 "util/configparser.y" @@ -2356,10 +2359,23 @@ yyreduce: } break; - case 142: + case 143: /* Line 1464 of yacc.c */ #line 403 "util/configparser.y" + { + OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str))); + if(atoi((yyvsp[(2) - (2)].str)) == 0) + yyerror("port number expected"); + else cfg_parser->cfg->ssl_port = atoi((yyvsp[(2) - (2)].str)); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 144: + +/* Line 1464 of yacc.c */ +#line 412 "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) @@ -2369,10 +2385,10 @@ yyreduce: } break; - case 143: + case 145: /* Line 1464 of yacc.c */ -#line 412 "util/configparser.y" +#line 421 "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) @@ -2387,10 +2403,10 @@ yyreduce: } break; - case 144: + case 146: /* Line 1464 of yacc.c */ -#line 426 "util/configparser.y" +#line 435 "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) @@ -2400,10 +2416,10 @@ yyreduce: } break; - case 145: + case 147: /* Line 1464 of yacc.c */ -#line 435 "util/configparser.y" +#line 444 "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) @@ -2413,10 +2429,10 @@ yyreduce: } break; - case 146: + case 148: /* Line 1464 of yacc.c */ -#line 444 "util/configparser.y" +#line 453 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -2424,10 +2440,10 @@ yyreduce: } break; - case 147: + case 149: /* Line 1464 of yacc.c */ -#line 451 "util/configparser.y" +#line 460 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -2435,10 +2451,10 @@ yyreduce: } break; - case 148: + case 150: /* Line 1464 of yacc.c */ -#line 458 "util/configparser.y" +#line 467 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -2446,10 +2462,10 @@ yyreduce: } break; - case 149: + case 151: /* Line 1464 of yacc.c */ -#line 465 "util/configparser.y" +#line 474 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -2458,10 +2474,10 @@ yyreduce: } break; - case 150: + case 152: /* Line 1464 of yacc.c */ -#line 473 "util/configparser.y" +#line 482 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -2469,10 +2485,10 @@ yyreduce: } break; - case 151: + case 153: /* Line 1464 of yacc.c */ -#line 480 "util/configparser.y" +#line 489 "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))) @@ -2480,10 +2496,10 @@ yyreduce: } break; - case 152: + case 154: /* Line 1464 of yacc.c */ -#line 487 "util/configparser.y" +#line 496 "util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dlv_anchor_file); @@ -2491,10 +2507,10 @@ yyreduce: } break; - case 153: + case 155: /* Line 1464 of yacc.c */ -#line 494 "util/configparser.y" +#line 503 "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))) @@ -2502,10 +2518,10 @@ yyreduce: } break; - case 154: + case 156: /* Line 1464 of yacc.c */ -#line 501 "util/configparser.y" +#line 510 "util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2514,10 +2530,10 @@ yyreduce: } break; - case 155: + case 157: /* Line 1464 of yacc.c */ -#line 509 "util/configparser.y" +#line 518 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2526,10 +2542,10 @@ yyreduce: } break; - case 156: + case 158: /* Line 1464 of yacc.c */ -#line 517 "util/configparser.y" +#line 526 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2538,10 +2554,10 @@ yyreduce: } break; - case 157: + case 159: /* Line 1464 of yacc.c */ -#line 525 "util/configparser.y" +#line 534 "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))) @@ -2549,10 +2565,10 @@ yyreduce: } break; - case 158: + case 160: /* Line 1464 of yacc.c */ -#line 532 "util/configparser.y" +#line 541 "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))) @@ -2560,10 +2576,10 @@ yyreduce: } break; - case 159: + case 161: /* Line 1464 of yacc.c */ -#line 539 "util/configparser.y" +#line 548 "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) @@ -2573,10 +2589,10 @@ yyreduce: } break; - case 160: + case 162: /* Line 1464 of yacc.c */ -#line 548 "util/configparser.y" +#line 557 "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) @@ -2586,10 +2602,10 @@ yyreduce: } break; - case 161: + case 163: /* Line 1464 of yacc.c */ -#line 557 "util/configparser.y" +#line 566 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -2597,10 +2613,10 @@ yyreduce: } break; - case 162: + case 164: /* Line 1464 of yacc.c */ -#line 564 "util/configparser.y" +#line 573 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -2608,10 +2624,10 @@ yyreduce: } break; - case 163: + case 165: /* Line 1464 of yacc.c */ -#line 571 "util/configparser.y" +#line 580 "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)) @@ -2620,10 +2636,10 @@ yyreduce: } break; - case 164: + case 166: /* Line 1464 of yacc.c */ -#line 579 "util/configparser.y" +#line 588 "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)) @@ -2632,10 +2648,10 @@ yyreduce: } break; - case 165: + case 167: /* Line 1464 of yacc.c */ -#line 587 "util/configparser.y" +#line 596 "util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2649,10 +2665,10 @@ yyreduce: } break; - case 166: + case 168: /* Line 1464 of yacc.c */ -#line 600 "util/configparser.y" +#line 609 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2664,10 +2680,10 @@ yyreduce: } break; - case 167: + case 169: /* Line 1464 of yacc.c */ -#line 611 "util/configparser.y" +#line 620 "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)) @@ -2676,10 +2692,10 @@ yyreduce: } break; - case 168: + case 170: /* Line 1464 of yacc.c */ -#line 619 "util/configparser.y" +#line 628 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2693,10 +2709,10 @@ yyreduce: } break; - case 169: + case 171: /* Line 1464 of yacc.c */ -#line 632 "util/configparser.y" +#line 641 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2706,10 +2722,10 @@ yyreduce: } break; - case 170: + case 172: /* Line 1464 of yacc.c */ -#line 641 "util/configparser.y" +#line 650 "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) @@ -2719,10 +2735,10 @@ yyreduce: } break; - case 171: + case 173: /* Line 1464 of yacc.c */ -#line 650 "util/configparser.y" +#line 659 "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)) @@ -2731,10 +2747,10 @@ yyreduce: } break; - case 172: + case 174: /* Line 1464 of yacc.c */ -#line 658 "util/configparser.y" +#line 667 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2748,10 +2764,10 @@ yyreduce: } break; - case 173: + case 175: /* Line 1464 of yacc.c */ -#line 671 "util/configparser.y" +#line 680 "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) @@ -2761,10 +2777,10 @@ yyreduce: } break; - case 174: + case 176: /* Line 1464 of yacc.c */ -#line 680 "util/configparser.y" +#line 689 "util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " @@ -2773,10 +2789,10 @@ yyreduce: } break; - case 175: + case 177: /* Line 1464 of yacc.c */ -#line 688 "util/configparser.y" +#line 697 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2786,10 +2802,10 @@ yyreduce: } break; - case 176: + case 178: /* Line 1464 of yacc.c */ -#line 697 "util/configparser.y" +#line 706 "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 " @@ -2798,10 +2814,10 @@ yyreduce: } break; - case 177: + case 179: /* Line 1464 of yacc.c */ -#line 705 "util/configparser.y" +#line 714 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2815,10 +2831,10 @@ yyreduce: } break; - case 178: + case 180: /* Line 1464 of yacc.c */ -#line 718 "util/configparser.y" +#line 727 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2826,10 +2842,10 @@ yyreduce: } break; - case 179: + case 181: /* Line 1464 of yacc.c */ -#line 725 "util/configparser.y" +#line 734 "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) @@ -2840,10 +2856,10 @@ yyreduce: } break; - case 180: + case 182: /* Line 1464 of yacc.c */ -#line 735 "util/configparser.y" +#line 744 "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) @@ -2854,10 +2870,10 @@ yyreduce: } break; - case 181: + case 183: /* Line 1464 of yacc.c */ -#line 745 "util/configparser.y" +#line 754 "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) @@ -2868,10 +2884,10 @@ yyreduce: } break; - case 182: + case 184: /* Line 1464 of yacc.c */ -#line 755 "util/configparser.y" +#line 764 "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) @@ -2882,10 +2898,10 @@ yyreduce: } break; - case 183: + case 185: /* Line 1464 of yacc.c */ -#line 765 "util/configparser.y" +#line 774 "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) @@ -2896,10 +2912,10 @@ yyreduce: } break; - case 184: + case 186: /* Line 1464 of yacc.c */ -#line 775 "util/configparser.y" +#line 784 "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) @@ -2910,10 +2926,10 @@ yyreduce: } break; - case 185: + case 187: /* Line 1464 of yacc.c */ -#line 785 "util/configparser.y" +#line 794 "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) @@ -2924,10 +2940,10 @@ yyreduce: } break; - case 186: + case 188: /* Line 1464 of yacc.c */ -#line 795 "util/configparser.y" +#line 804 "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))) @@ -2935,10 +2951,10 @@ yyreduce: } break; - case 187: + case 189: /* Line 1464 of yacc.c */ -#line 802 "util/configparser.y" +#line 811 "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))) @@ -2946,10 +2962,10 @@ yyreduce: } break; - case 188: + case 190: /* Line 1464 of yacc.c */ -#line 809 "util/configparser.y" +#line 818 "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) @@ -2959,10 +2975,10 @@ yyreduce: } break; - case 189: + case 191: /* Line 1464 of yacc.c */ -#line 818 "util/configparser.y" +#line 827 "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) @@ -2972,10 +2988,10 @@ yyreduce: } break; - case 190: + case 192: /* Line 1464 of yacc.c */ -#line 827 "util/configparser.y" +#line 836 "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) @@ -2985,10 +3001,10 @@ yyreduce: } break; - case 191: + case 193: /* Line 1464 of yacc.c */ -#line 836 "util/configparser.y" +#line 845 "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))) @@ -2996,10 +3012,10 @@ yyreduce: } break; - case 192: + case 194: /* Line 1464 of yacc.c */ -#line 843 "util/configparser.y" +#line 852 "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,10 +3026,10 @@ yyreduce: } break; - case 193: + case 195: /* Line 1464 of yacc.c */ -#line 853 "util/configparser.y" +#line 862 "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 && @@ -3028,10 +3044,10 @@ yyreduce: } break; - case 194: + case 196: /* Line 1464 of yacc.c */ -#line 867 "util/configparser.y" +#line 876 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -3039,10 +3055,10 @@ yyreduce: } break; - case 195: + case 197: /* Line 1464 of yacc.c */ -#line 874 "util/configparser.y" +#line 883 "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,10 +3077,10 @@ yyreduce: } break; - case 196: + case 198: /* Line 1464 of yacc.c */ -#line 892 "util/configparser.y" +#line 901 "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) { @@ -3078,10 +3094,10 @@ yyreduce: } break; - case 197: + case 199: /* Line 1464 of yacc.c */ -#line 905 "util/configparser.y" +#line 914 "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) { @@ -3095,10 +3111,10 @@ yyreduce: } break; - case 198: + case 200: /* Line 1464 of yacc.c */ -#line 918 "util/configparser.y" +#line 927 "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) @@ -3108,10 +3124,10 @@ yyreduce: } break; - case 199: + case 201: /* Line 1464 of yacc.c */ -#line 927 "util/configparser.y" +#line 936 "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) @@ -3121,10 +3137,10 @@ yyreduce: } break; - case 200: + case 202: /* Line 1464 of yacc.c */ -#line 936 "util/configparser.y" +#line 945 "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) @@ -3134,10 +3150,10 @@ yyreduce: } break; - case 201: + case 203: /* Line 1464 of yacc.c */ -#line 945 "util/configparser.y" +#line 954 "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) @@ -3148,10 +3164,10 @@ yyreduce: } break; - case 202: + case 204: /* Line 1464 of yacc.c */ -#line 955 "util/configparser.y" +#line 964 "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) @@ -3162,10 +3178,10 @@ yyreduce: } break; - case 203: + case 205: /* Line 1464 of yacc.c */ -#line 965 "util/configparser.y" +#line 974 "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) @@ -3175,10 +3191,10 @@ yyreduce: } break; - case 204: + case 206: /* Line 1464 of yacc.c */ -#line 974 "util/configparser.y" +#line 983 "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) @@ -3188,10 +3204,10 @@ yyreduce: } break; - case 205: + case 207: /* Line 1464 of yacc.c */ -#line 983 "util/configparser.y" +#line 992 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -3199,10 +3215,10 @@ yyreduce: } break; - case 206: + case 208: /* Line 1464 of yacc.c */ -#line 990 "util/configparser.y" +#line 999 "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) @@ -3212,10 +3228,10 @@ yyreduce: } break; - case 207: + case 209: /* Line 1464 of yacc.c */ -#line 999 "util/configparser.y" +#line 1008 "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) @@ -3225,10 +3241,10 @@ yyreduce: } break; - case 208: + case 210: /* Line 1464 of yacc.c */ -#line 1008 "util/configparser.y" +#line 1017 "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) @@ -3238,10 +3254,10 @@ yyreduce: } break; - case 209: + case 211: /* Line 1464 of yacc.c */ -#line 1017 "util/configparser.y" +#line 1026 "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)) @@ -3250,10 +3266,10 @@ yyreduce: } break; - case 210: + case 212: /* Line 1464 of yacc.c */ -#line 1025 "util/configparser.y" +#line 1034 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3267,10 +3283,10 @@ yyreduce: } break; - case 211: + case 213: /* Line 1464 of yacc.c */ -#line 1038 "util/configparser.y" +#line 1047 "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)) @@ -3279,10 +3295,10 @@ yyreduce: } break; - case 212: + case 214: /* Line 1464 of yacc.c */ -#line 1046 "util/configparser.y" +#line 1055 "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 && @@ -3305,10 +3321,10 @@ yyreduce: } break; - case 213: + case 215: /* Line 1464 of yacc.c */ -#line 1068 "util/configparser.y" +#line 1077 "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))) @@ -3316,10 +3332,10 @@ yyreduce: } break; - case 214: + case 216: /* Line 1464 of yacc.c */ -#line 1075 "util/configparser.y" +#line 1084 "util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3335,10 +3351,10 @@ yyreduce: } break; - case 215: + case 217: /* Line 1464 of yacc.c */ -#line 1090 "util/configparser.y" +#line 1099 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->stubs->name) @@ -3349,10 +3365,10 @@ yyreduce: } break; - case 216: + case 218: /* Line 1464 of yacc.c */ -#line 1100 "util/configparser.y" +#line 1109 "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))) @@ -3360,10 +3376,10 @@ yyreduce: } break; - case 217: + case 219: /* Line 1464 of yacc.c */ -#line 1107 "util/configparser.y" +#line 1116 "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))) @@ -3371,10 +3387,10 @@ yyreduce: } break; - case 218: + case 220: /* Line 1464 of yacc.c */ -#line 1114 "util/configparser.y" +#line 1123 "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) @@ -3385,10 +3401,10 @@ yyreduce: } break; - case 219: + case 221: /* Line 1464 of yacc.c */ -#line 1124 "util/configparser.y" +#line 1133 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->forwards->name) @@ -3399,10 +3415,10 @@ yyreduce: } break; - case 220: + case 222: /* Line 1464 of yacc.c */ -#line 1134 "util/configparser.y" +#line 1143 "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))) @@ -3410,10 +3426,10 @@ yyreduce: } break; - case 221: + case 223: /* Line 1464 of yacc.c */ -#line 1141 "util/configparser.y" +#line 1150 "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))) @@ -3421,19 +3437,19 @@ yyreduce: } break; - case 222: + case 224: /* Line 1464 of yacc.c */ -#line 1148 "util/configparser.y" +#line 1157 "util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } break; - case 232: + case 234: /* Line 1464 of yacc.c */ -#line 1159 "util/configparser.y" +#line 1168 "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) @@ -3444,10 +3460,10 @@ yyreduce: } break; - case 233: + case 235: /* Line 1464 of yacc.c */ -#line 1169 "util/configparser.y" +#line 1178 "util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3457,10 +3473,10 @@ yyreduce: } break; - case 234: + case 236: /* Line 1464 of yacc.c */ -#line 1178 "util/configparser.y" +#line 1187 "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))) @@ -3468,10 +3484,10 @@ yyreduce: } break; - case 235: + case 237: /* Line 1464 of yacc.c */ -#line 1185 "util/configparser.y" +#line 1194 "util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_key_file); @@ -3479,10 +3495,10 @@ yyreduce: } break; - case 236: + case 238: /* Line 1464 of yacc.c */ -#line 1192 "util/configparser.y" +#line 1201 "util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_cert_file); @@ -3490,10 +3506,10 @@ yyreduce: } break; - case 237: + case 239: /* Line 1464 of yacc.c */ -#line 1199 "util/configparser.y" +#line 1208 "util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_key_file); @@ -3501,10 +3517,10 @@ yyreduce: } break; - case 238: + case 240: /* Line 1464 of yacc.c */ -#line 1206 "util/configparser.y" +#line 1215 "util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_cert_file); @@ -3512,19 +3528,19 @@ yyreduce: } break; - case 239: + case 241: /* Line 1464 of yacc.c */ -#line 1213 "util/configparser.y" +#line 1222 "util/configparser.y" { OUTYY(("\nP(python:)\n")); } break; - case 243: + case 245: /* Line 1464 of yacc.c */ -#line 1222 "util/configparser.y" +#line 1231 "util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->python_script); @@ -3535,7 +3551,7 @@ yyreduce: /* Line 1464 of yacc.c */ -#line 3539 "util/configparser.c" +#line 3555 "util/configparser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3747,7 +3763,7 @@ yyreturn: /* Line 1684 of yacc.c */ -#line 1227 "util/configparser.y" +#line 1236 "util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index b17e3f010..2226a121b 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -159,7 +159,8 @@ VAR_TCP_UPSTREAM = 376, VAR_SSL_UPSTREAM = 377, VAR_SSL_SERVICE_KEY = 378, - VAR_SSL_SERVICE_PEM = 379 + VAR_SSL_SERVICE_PEM = 379, + VAR_SSL_PORT = 380 }; #endif /* Tokens. */ @@ -285,6 +286,7 @@ #define VAR_SSL_UPSTREAM 377 #define VAR_SSL_SERVICE_KEY 378 #define VAR_SSL_SERVICE_PEM 379 +#define VAR_SSL_PORT 380 @@ -301,7 +303,7 @@ typedef union YYSTYPE /* Line 1685 of yacc.c */ -#line 305 "util/configparser.h" +#line 307 "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 2cbbb870c..09f77c578 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -103,7 +103,7 @@ extern struct config_parser_state* cfg_parser; %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_IGNORE_CD_FLAG VAR_LOG_QUERIES VAR_TCP_UPSTREAM VAR_SSL_UPSTREAM -%token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM +%token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM VAR_SSL_PORT %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -159,7 +159,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_edns_buffer_size | server_prefetch | server_prefetch_key | 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_service_key | server_ssl_service_pem | server_ssl_port ; stubstart: VAR_STUB_ZONE { @@ -399,6 +399,15 @@ server_ssl_service_pem: VAR_SSL_SERVICE_PEM STRING_ARG cfg_parser->cfg->ssl_service_pem = $2; } ; +server_ssl_port: VAR_SSL_PORT STRING_ARG + { + OUTYY(("P(server_ssl_port:%s)\n", $2)); + if(atoi($2) == 0) + yyerror("port number expected"); + else cfg_parser->cfg->ssl_port = atoi($2); + free($2); + } + ; server_do_daemonize: VAR_DO_DAEMONIZE STRING_ARG { OUTYY(("P(server_do_daemonize:%s)\n", $2));