From 2e5e31e8ac618e1c902c31135edc355e2cacaa7f Mon Sep 17 00:00:00 2001 From: Ralph Dolmans Date: Tue, 28 Aug 2018 14:21:56 +0000 Subject: [PATCH] - Added serve-expired-ttl and serve-expired-ttl-reset options. git-svn-id: file:///svn/unbound/trunk@4876 be551aaa-1e26-0410-a405-d3ace91eadb9 --- cachedb/cachedb.c | 1 + daemon/cachedump.c | 1 + daemon/remote.c | 1 + daemon/worker.c | 4 +- dns64/dns64.c | 5 +- doc/Changelog | 1 + doc/example.conf.in | 10 + doc/unbound.conf.5.in | 11 + ipsecmod/ipsecmod.c | 2 + iterator/iterator.c | 17 +- respip/respip.c | 5 +- services/authzone.c | 3 + services/cache/dns.c | 4 + util/config_file.c | 8 + util/config_file.h | 4 + util/configlexer.c | 2838 +++++++++++++++++++++-------------------- util/configlexer.lex | 2 + util/configparser.c | 2570 +++++++++++++++++++------------------ util/configparser.h | 206 +-- util/configparser.y | 22 +- util/data/msgparse.h | 2 + util/data/msgreply.c | 17 +- util/data/msgreply.h | 11 +- validator/validator.c | 2 + 24 files changed, 2949 insertions(+), 2798 deletions(-) diff --git a/cachedb/cachedb.c b/cachedb/cachedb.c index a6a609dcb..5a179a2bb 100644 --- a/cachedb/cachedb.c +++ b/cachedb/cachedb.c @@ -446,6 +446,7 @@ adjust_msg_ttl(struct dns_msg* msg, time_t adjust) msg->rep->ttl -= adjust; else msg->rep->ttl = 0; msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl); + msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL; for(i=0; irep->rrset_count; i++) { packed_rrset_ttl_subtract((struct packed_rrset_data*)msg-> diff --git a/daemon/cachedump.c b/daemon/cachedump.c index 5a72e9d11..b1ce53b59 100644 --- a/daemon/cachedump.c +++ b/daemon/cachedump.c @@ -653,6 +653,7 @@ load_msg(RES* ssl, sldns_buffer* buf, struct worker* worker) rep.qdcount = (uint16_t)qdcount; rep.ttl = (time_t)ttl; rep.prefetch_ttl = PREFETCH_TTL_CALC(rep.ttl); + rep.serve_expired_ttl = rep.ttl + SERVE_EXPIRED_TTL; rep.security = (enum sec_status)security; if(an > RR_COUNT_MAX || ns > RR_COUNT_MAX || ar > RR_COUNT_MAX) { log_warn("error too many rrsets"); diff --git a/daemon/remote.c b/daemon/remote.c index 6c14a57f6..91e5609f5 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1633,6 +1633,7 @@ zone_del_msg(struct lruhash_entry* e, void* arg) if(d->ttl > inf->expired) { d->ttl = inf->expired; d->prefetch_ttl = inf->expired; + d->serve_expired_ttl = inf->expired; inf->num_msgs++; } } diff --git a/daemon/worker.c b/daemon/worker.c index 5ce5ef3a9..9551c60f4 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -629,7 +629,9 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo, && worker->env.need_to_validate; *partial_repp = NULL; /* avoid accidental further pass */ if(worker->env.cfg->serve_expired) { - /* always lock rrsets, rep->ttl is ignored */ + if(worker->env.cfg->serve_expired_ttl && + rep->serve_expired_ttl < timenow) + return 0; if(!rrset_array_lock(rep->ref, rep->rrset_count, 0)) return 0; /* below, rrsets with ttl before timenow become TTL 0 in diff --git a/dns64/dns64.c b/dns64/dns64.c index 2d1fcc88b..eadfabb08 100644 --- a/dns64/dns64.c +++ b/dns64/dns64.c @@ -781,8 +781,9 @@ dns64_adjust_a(int id, struct module_qstate* super, struct module_qstate* qstate * Build the actual reply. */ cp = construct_reply_info_base(super->region, rep->flags, rep->qdcount, - rep->ttl, rep->prefetch_ttl, rep->an_numrrsets, rep->ns_numrrsets, - rep->ar_numrrsets, rep->rrset_count, rep->security); + rep->ttl, rep->prefetch_ttl, rep->serve_expired_ttl, + rep->an_numrrsets, rep->ns_numrrsets, rep->ar_numrrsets, + rep->rrset_count, rep->security); if(!cp) return; diff --git a/doc/Changelog b/doc/Changelog index 31addfcf4..d78642d4b 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,6 @@ 28 August 2018: Ralph - Disable minimal-responses in ipsecmod unit tests. + - Added serve-expired-ttl and serve-expired-ttl-reset options. 27 August 2018: Wouter - Set defaults to yes for a number of options to increase speed and diff --git a/doc/example.conf.in b/doc/example.conf.in index 7eb8b776d..682c829e3 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -543,6 +543,16 @@ server: # Serve expired responses from cache, with TTL 0 in the response, # and then attempt to fetch the data afresh. # serve-expired: no + # + # Limit serving of expired responses to configured seconds after + # expiration. 0 disables the limit. + # serve-expired-ttl: 0 + # + # Set the TTL of expired records to the serve-expired-ttl value after a + # failed attempt to retrieve the record from upstream. This makes sure + # that the expired records will be served as long as there are queries + # for it. + # serve-expired-ttl-reset: no # Have the validator log failed validations for your diagnosis. # 0: off. 1: A line per failed user query. 2: With reason and bad IP. diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 6b24d47d3..70c2c9aeb 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -1013,6 +1013,17 @@ If enabled, unbound attempts to serve old responses from cache with a TTL of 0 in the response without waiting for the actual resolution to finish. The actual resolution answer ends up in the cache later on. Default is "no". .TP +.B serve\-expired\-ttl: \fI +Limit serving of expired responses to configured seconds after expiration. 0 +disables the limit. This option only applies when \fBserve\-expired\fR is +enabled. The default is 0. +.TP +.B serve\-expired\-ttl\-reset: \fI +Set the TTL of expired records to the \fBserve\-expired\-ttl\fR value after a +failed attempt to retrieve the record from upstream. This makes sure that the +expired records will be served as long as there are queries for it. Default is +"no". +.TP .B val\-nsec3\-keysize\-iterations: \fI<"list of values"> List of keysize and iteration count values, separated by spaces, surrounded by quotes. Default is "1024 150 2048 500 4096 2500". This determines the diff --git a/ipsecmod/ipsecmod.c b/ipsecmod/ipsecmod.c index 3e4ee6a53..ba2384510 100644 --- a/ipsecmod/ipsecmod.c +++ b/ipsecmod/ipsecmod.c @@ -341,6 +341,8 @@ ipsecmod_handle_query(struct module_qstate* qstate, qstate->env->cfg->ipsecmod_max_ttl; qstate->return_msg->rep->prefetch_ttl = PREFETCH_TTL_CALC( qstate->return_msg->rep->ttl); + qstate->return_msg->rep->prefetch_ttl = qstate->return_msg->rep->ttl + + qstate->env->cfg->serve_expired_ttl; } } } diff --git a/iterator/iterator.c b/iterator/iterator.c index 54bcc887d..e99a559fa 100644 --- a/iterator/iterator.c +++ b/iterator/iterator.c @@ -304,8 +304,20 @@ error_response_cache(struct module_qstate* qstate, int id, int rcode) if((msg=msg_cache_lookup(qstate->env, qstate->qinfo.qname, qstate->qinfo.qname_len, qstate->qinfo.qtype, qstate->qinfo.qclass, - qstate->query_flags, 0, 0)) + qstate->query_flags, 0, + qstate->env->cfg->serve_expired_ttl_reset)) != NULL) { + if(qstate->env->cfg->serve_expired_ttl_reset) { + struct reply_info* rep = + (struct reply_info*)msg->entry.data; + if(rep && *qstate->env->now + + qstate->env->cfg->serve_expired_ttl > + rep->serve_expired_ttl) { + rep->serve_expired_ttl = + *qstate->env->now + + qstate->env->cfg->serve_expired_ttl; + } + } lock_rw_unlock(&msg->entry.lock); return error_response(qstate, id, rcode); } @@ -319,6 +331,7 @@ error_response_cache(struct module_qstate* qstate, int id, int rcode) err.qdcount = 1; err.ttl = NORR_TTL; err.prefetch_ttl = PREFETCH_TTL_CALC(err.ttl); + err.serve_expired_ttl = NORR_TTL; /* do not waste time trying to validate this servfail */ err.security = sec_status_indeterminate; verbose(VERB_ALGO, "store error response in message cache"); @@ -3318,6 +3331,8 @@ processClassResponse(struct module_qstate* qstate, int id, to->rep->ttl = from->rep->ttl; if(from->rep->prefetch_ttl < to->rep->prefetch_ttl) to->rep->prefetch_ttl = from->rep->prefetch_ttl; + if(from->rep->serve_expired_ttl < to->rep->serve_expired_ttl) + to->rep->serve_expired_ttl = from->rep->serve_expired_ttl; } /* are we done? */ foriq->num_current_queries --; diff --git a/respip/respip.c b/respip/respip.c index 2e9313f27..135c45fe5 100644 --- a/respip/respip.c +++ b/respip/respip.c @@ -611,8 +611,9 @@ make_new_reply_info(const struct reply_info* rep, struct regional* region, * EDNS0 OPT RR in the additional section appended on sending it out), * so the total number of RRsets is an_numrrsets. */ new_rep = construct_reply_info_base(region, rep->flags, - rep->qdcount, rep->ttl, rep->prefetch_ttl, an_numrrsets, - 0, 0, an_numrrsets, sec_status_insecure); + rep->qdcount, rep->ttl, rep->prefetch_ttl, + rep->serve_expired_ttl, an_numrrsets, 0, 0, an_numrrsets, + sec_status_insecure); if(!new_rep) return NULL; if(!reply_info_alloc_rrset_keys(new_rep, NULL, region)) diff --git a/services/authzone.c b/services/authzone.c index 9a4fb5a50..fe56c9f81 100644 --- a/services/authzone.c +++ b/services/authzone.c @@ -185,11 +185,13 @@ msg_ttl(struct dns_msg* msg) if(msg->rep->rrset_count == 1) { msg->rep->ttl = get_rrset_ttl(msg->rep->rrsets[0]); msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl); + msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL; } else if(get_rrset_ttl(msg->rep->rrsets[msg->rep->rrset_count-1]) < msg->rep->ttl) { msg->rep->ttl = get_rrset_ttl(msg->rep->rrsets[ msg->rep->rrset_count-1]); msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl); + msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL; } } @@ -2285,6 +2287,7 @@ az_add_negative_soa(struct auth_zone* z, struct regional* region, d->rr_ttl[0] = (time_t)minimum; msg->rep->ttl = get_rrset_ttl(msg->rep->rrsets[0]); msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl); + msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL; return 1; } diff --git a/services/cache/dns.c b/services/cache/dns.c index 52b9ff013..01c9a8c5c 100644 --- a/services/cache/dns.c +++ b/services/cache/dns.c @@ -547,6 +547,7 @@ tomsg(struct module_env* env, struct query_info* q, struct reply_info* r, if(r->prefetch_ttl > now) msg->rep->prefetch_ttl = r->prefetch_ttl - now; else msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl); + msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL; msg->rep->security = r->security; msg->rep->an_numrrsets = r->an_numrrsets; msg->rep->ns_numrrsets = r->ns_numrrsets; @@ -601,6 +602,7 @@ rrset_msg(struct ub_packed_rrset_key* rrset, struct regional* region, msg->rep->qdcount = 1; msg->rep->ttl = d->ttl - now; msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl); + msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL; msg->rep->security = sec_status_unchecked; msg->rep->an_numrrsets = 1; msg->rep->ns_numrrsets = 0; @@ -638,6 +640,7 @@ synth_dname_msg(struct ub_packed_rrset_key* rrset, struct regional* region, msg->rep->qdcount = 1; msg->rep->ttl = d->ttl - now; msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl); + msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL; msg->rep->security = sec_status_unchecked; msg->rep->an_numrrsets = 1; msg->rep->ns_numrrsets = 0; @@ -696,6 +699,7 @@ synth_dname_msg(struct ub_packed_rrset_key* rrset, struct regional* region, newd->rr_ttl[0] = newd->ttl; msg->rep->ttl = newd->ttl; msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(newd->ttl); + msg->rep->serve_expired_ttl = newd->ttl + SERVE_EXPIRED_TTL; sldns_write_uint16(newd->rr_data[0], newlen); memmove(newd->rr_data[0] + sizeof(uint16_t), newname, newlen); msg->rep->an_numrrsets ++; diff --git a/util/config_file.c b/util/config_file.c index 3d7b4800b..5dffa37eb 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -234,6 +234,8 @@ config_create(void) cfg->aggressive_nsec = 0; cfg->ignore_cd = 0; cfg->serve_expired = 0; + cfg->serve_expired_ttl = 0; + cfg->serve_expired_ttl_reset = 0; cfg->add_holddown = 30*24*3600; cfg->del_holddown = 30*24*3600; cfg->keep_missing = 366*24*3600; /* one year plus a little leeway */ @@ -556,6 +558,9 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_YNO("aggressive-nsec:", aggressive_nsec) else S_YNO("ignore-cd-flag:", ignore_cd) else S_YNO("serve-expired:", serve_expired) + else if(strcmp(opt, "serve_expired_ttl:") == 0) + { IS_NUMBER_OR_ZERO; cfg->serve_expired_ttl = atoi(val); SERVE_EXPIRED_TTL=(time_t)cfg->serve_expired_ttl;} + else S_YNO("serve-expired-ttl-reset:", serve_expired_ttl_reset) else S_STR("val-nsec3-keysize-iterations:", val_nsec3_key_iterations) else S_UNSIGNED_OR_ZERO("add-holddown:", add_holddown) else S_UNSIGNED_OR_ZERO("del-holddown:", del_holddown) @@ -937,6 +942,8 @@ config_get_option(struct config_file* cfg, const char* opt, else O_YNO(opt, "aggressive-nsec", aggressive_nsec) else O_YNO(opt, "ignore-cd-flag", ignore_cd) else O_YNO(opt, "serve-expired", serve_expired) + else O_DEC(opt, "serve-expired-ttl", serve_expired_ttl) + else O_YNO(opt, "serve-expired-ttl-reset", serve_expired_ttl_reset) else O_STR(opt, "val-nsec3-keysize-iterations",val_nsec3_key_iterations) else O_UNS(opt, "add-holddown", add_holddown) else O_UNS(opt, "del-holddown", del_holddown) @@ -1860,6 +1867,7 @@ config_apply(struct config_file* config) { MAX_TTL = (time_t)config->max_ttl; MIN_TTL = (time_t)config->min_ttl; + SERVE_EXPIRED_TTL = (time_t)config->serve_expired_ttl; MAX_NEG_TTL = (time_t)config->max_negative_ttl; RTT_MIN_TIMEOUT = config->infra_cache_min_rtt; EDNS_ADVERTISED_SIZE = (uint16_t)config->edns_buffer_size; diff --git a/util/config_file.h b/util/config_file.h index 0d8f7990f..d1bce1b69 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -339,6 +339,10 @@ struct config_file { int ignore_cd; /** serve expired entries and prefetch them */ int serve_expired; + /** serve expired entries until TTL after expiration */ + int serve_expired_ttl; + /** reset serve expired TTL after failed update attempt */ + int serve_expired_ttl_reset; /** nsec3 maximum iterations per key size, string */ char* val_nsec3_key_iterations; /** autotrust add holddown time, in seconds */ diff --git a/util/configlexer.c b/util/configlexer.c index dd6b1c46d..d9f70de3d 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -10,7 +10,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 1 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -85,10 +85,16 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ +/* begin standard C++ headers. */ + /* TODO: this is always defined, so inline it */ #define yyconst const @@ -101,32 +107,26 @@ typedef unsigned int flex_uint32_t; /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -163,7 +163,7 @@ extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -172,7 +172,7 @@ extern FILE *yyin, *yyout; do \ { \ /* Undo effects of setting up yytext. */ \ - yy_size_t yyless_macro_arg = (n); \ + int yyless_macro_arg = (n); \ YY_LESS_LINENO(yyless_macro_arg);\ *yy_cp = (yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ @@ -180,7 +180,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -223,7 +222,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -262,7 +261,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -283,62 +281,56 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ - -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; @@ -347,10 +339,10 @@ extern char *yytext; #endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yynoreturn yy_fatal_error (yyconst char* msg ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -362,9 +354,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ); (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - -#define YY_NUM_RULES 276 -#define YY_END_OF_BUFFER 277 +#define YY_NUM_RULES 278 +#define YY_END_OF_BUFFER 279 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -372,312 +363,313 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[2738] = +static const flex_int16_t yy_accept[2750] = { 0, - 1, 1, 258, 258, 262, 262, 266, 266, 270, 270, - 1, 1, 277, 274, 1, 256, 256, 275, 2, 275, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 258, 259, 259, 260, 275, 262, 263, 263, - 264, 275, 269, 266, 267, 267, 268, 275, 270, 271, - 271, 272, 275, 273, 257, 2, 261, 275, 273, 274, - 0, 1, 2, 2, 2, 2, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 1, 1, 260, 260, 264, 264, 268, 268, 272, 272, + 1, 1, 279, 276, 1, 258, 258, 277, 2, 277, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 260, 261, 261, 262, 277, 264, 265, 265, + 266, 277, 271, 268, 269, 269, 270, 277, 272, 273, + 273, 274, 277, 275, 259, 2, 263, 277, 275, 276, + 0, 1, 2, 2, 2, 2, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 258, - 0, 262, 0, 269, 0, 266, 270, 0, 273, 0, - 2, 2, 273, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 260, + 0, 264, 0, 271, 0, 268, 272, 0, 275, 0, + 2, 2, 275, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 273, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 275, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 109, 274, 274, 274, 274, 274, 274, 274, 273, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 109, 276, 276, 276, 276, 276, 276, 276, 275, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 91, 274, 274, - 274, 274, 274, 274, 8, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 114, 274, 273, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 91, 276, 276, + 276, 276, 276, 276, 8, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 114, 276, 275, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 273, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 51, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 201, 274, 14, 15, 274, 18, 17, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 108, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 275, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 51, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 203, 276, 14, 15, 276, 18, 17, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 108, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 186, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 3, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 273, - 274, 274, 274, 274, 274, 274, 274, 249, 274, 274, - 248, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 188, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 3, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 275, + 276, 276, 276, 276, 276, 276, 276, 251, 276, 276, + 250, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 265, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 54, 274, 225, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 55, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 175, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 267, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 54, 276, 227, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 55, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 177, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 20, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 129, 274, 274, 265, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 231, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 148, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 128, 274, 274, 274, 274, 274, 274, 274, + 276, 20, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 129, 276, 276, 267, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 233, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 150, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 128, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 89, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 31, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 32, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 52, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 107, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 89, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 31, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 32, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 52, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 107, 276, 276, 276, 276, 276, - 106, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 53, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 149, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 42, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 106, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 53, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 151, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 42, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 216, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 46, 274, 47, 274, - 274, 274, 274, 92, 274, 93, 274, 274, 274, 274, - 90, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 7, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 194, 274, 274, 274, 274, 131, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 218, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 46, 276, 47, 276, + 276, 276, 276, 92, 276, 93, 276, 276, 276, 276, + 90, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 7, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 196, 276, 276, 276, 276, 131, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 43, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 167, 274, 166, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 16, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 56, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 43, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 169, 276, 168, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 16, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 56, 276, 276, 276, 276, 276, 276, 276, 276, - 174, 274, 274, 274, 274, 274, 95, 274, 94, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 159, 274, 274, 274, - 274, 274, 274, 274, 274, 115, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 74, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 78, 274, 274, 274, 274, 274, + 176, 276, 276, 276, 276, 276, 95, 276, 94, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 161, 276, 276, 276, + 276, 276, 276, 276, 276, 115, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 74, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 78, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 50, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 162, 163, 274, 274, - 226, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 6, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 229, 274, 274, 274, 250, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 40, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 50, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 164, 165, 276, 276, + 228, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 6, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 231, 276, 276, 276, 252, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 40, 276, 276, 276, 276, - 274, 274, 274, 274, 155, 274, 274, 274, 110, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 179, - 274, 156, 274, 274, 274, 191, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 41, 274, 274, 274, 274, 274, 274, 274, - 112, 100, 274, 101, 274, 274, 274, 99, 274, 274, - 274, 274, 274, 274, 274, 274, 126, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 215, 274, - 274, 274, 274, 274, 274, 274, 274, 157, 274, 274, - 274, 274, 274, 160, 274, 165, 274, 274, 274, 190, + 276, 276, 276, 276, 157, 276, 276, 276, 110, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 181, + 276, 158, 276, 276, 276, 193, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 41, 276, 276, 276, 276, 276, 276, 276, + 112, 100, 276, 101, 276, 276, 276, 99, 276, 276, + 276, 276, 276, 276, 276, 276, 126, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 217, 276, + 276, 276, 276, 276, 276, 276, 276, 159, 276, 276, + 276, 276, 276, 162, 276, 167, 276, 276, 276, 192, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 88, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 48, 274, 274, 274, 25, - 274, 274, 274, 274, 274, 274, 274, 274, 19, 274, - 274, 274, 274, 26, 35, 274, 136, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 63, 65, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 233, 274, 274, 274, 202, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 88, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 48, 276, 276, 276, 25, + 276, 276, 276, 276, 276, 276, 276, 276, 19, 276, + 276, 276, 276, 26, 35, 276, 136, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 63, 65, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 235, 276, 276, 276, 204, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 102, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 125, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 244, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 130, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 185, 274, 274, - 274, 274, 274, 274, 274, 274, 253, 274, 274, 274, - 274, 274, 274, 274, 274, 147, 274, 274, 274, 274, - 274, 274, 274, 96, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 102, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 125, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 246, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 130, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 187, 276, 276, + 276, 276, 276, 276, 276, 276, 255, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 147, 276, 276, 276, + 276, 276, 276, 276, 96, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 142, 274, 150, 274, 274, 274, 274, 274, 118, 274, - 274, 274, 274, 274, 84, 274, 274, 274, 274, 177, - 274, 274, 274, 274, 274, 274, 192, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 207, - 274, 274, 274, 274, 274, 274, 274, 111, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 146, 274, - 274, 274, 274, 274, 66, 67, 274, 274, 274, 274, - 274, 49, 274, 274, 274, 274, 274, 73, 151, 274, - 168, 274, 195, 274, 161, 227, 274, 274, 274, 59, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 142, 276, 152, 276, 276, 276, 276, 276, 118, + 276, 276, 276, 276, 276, 84, 276, 276, 276, 276, + 179, 276, 276, 276, 276, 276, 276, 194, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 209, 276, 276, 276, 276, 276, 276, 276, 111, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 146, + 276, 276, 276, 276, 276, 66, 67, 276, 276, 276, + 276, 276, 49, 276, 276, 276, 276, 276, 73, 153, + 276, 170, 276, 197, 276, 163, 229, 276, 276, 276, - 274, 153, 274, 274, 274, 274, 274, 9, 274, 274, - 274, 87, 274, 274, 274, 274, 220, 274, 274, 274, - 176, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 145, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 132, 274, 232, 274, 274, 274, 274, 206, - 274, 274, 274, 274, 274, 274, 274, 274, 187, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 59, 276, 155, 276, 276, 276, 276, 276, 9, 276, + 276, 276, 87, 276, 276, 276, 276, 222, 276, 276, + 276, 178, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 145, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 132, 276, 234, 276, 276, 276, + 276, 208, 276, 276, 276, 276, 276, 276, 276, 276, + 189, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 247, 274, 152, 274, - 274, 274, 274, 58, 60, 274, 274, 274, 274, 274, - 274, 274, 86, 274, 274, 274, 274, 218, 274, 274, - 274, 228, 274, 274, 274, 274, 274, 274, 181, 33, - 27, 29, 274, 274, 274, 274, 274, 274, 274, 274, - 34, 28, 30, 274, 274, 274, 274, 274, 274, 83, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 183, 180, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 249, 276, + 154, 276, 276, 276, 276, 58, 60, 276, 276, 276, + 276, 276, 276, 276, 86, 276, 276, 276, 276, 220, + 276, 276, 276, 230, 276, 276, 276, 276, 276, 276, + 276, 183, 33, 27, 29, 276, 276, 276, 276, 276, + 276, 276, 276, 34, 28, 30, 276, 276, 276, 276, + 276, 276, 83, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 185, 182, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 57, 274, 274, 113, 103, 274, 274, - 274, 274, 274, 274, 274, 274, 127, 13, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 242, 274, 245, - 274, 274, 274, 274, 274, 274, 274, 12, 274, 274, - 21, 274, 274, 274, 224, 274, 274, 274, 230, 274, - 61, 274, 189, 274, 182, 274, 274, 274, 274, 274, - 274, 22, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 141, 140, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 184, 178, 274, 193, 274, 274, - 234, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 276, 57, 276, 276, 113, + 103, 276, 276, 276, 276, 276, 276, 276, 276, 127, + 13, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 244, 276, 247, 276, 276, 276, 276, 276, 276, 276, + 12, 276, 276, 21, 276, 276, 276, 226, 276, 276, + 276, 232, 276, 61, 276, 191, 276, 276, 184, 276, + 276, 276, 276, 276, 276, 22, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 141, 140, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 186, 180, + 276, 195, 276, 276, 236, 276, 276, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 68, 274, 274, 274, 219, 274, - 274, 274, 274, 164, 274, 188, 274, 274, 274, 274, - 274, 274, 274, 274, 251, 252, 138, 62, 274, 274, - 274, 97, 98, 274, 274, 274, 133, 274, 135, 274, - 169, 274, 274, 274, 139, 274, 274, 196, 274, 274, - 274, 274, 274, 274, 274, 120, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 203, 274, 274, - 274, 23, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 170, 274, 274, 217, 274, 246, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 68, 276, + 276, 276, 221, 276, 276, 276, 276, 166, 276, 190, + 276, 276, 276, 276, 276, 276, 276, 276, 253, 254, + 138, 62, 276, 276, 148, 276, 276, 97, 98, 276, + 276, 276, 133, 276, 135, 276, 171, 276, 276, 276, + 139, 276, 276, 198, 276, 276, 276, 276, 276, 276, + 276, 120, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 205, 276, 276, 276, 23, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - 274, 274, 274, 44, 274, 274, 274, 274, 4, 274, - 274, 119, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 199, 36, 37, 274, 274, - 274, 274, 274, 274, 274, 235, 274, 274, 274, 274, - 274, 274, 205, 274, 274, 274, 173, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 71, 274, 45, 223, - 274, 200, 274, 274, 11, 274, 274, 274, 274, 274, - 274, 171, 75, 274, 39, 274, 274, 274, 274, 274, - 274, 144, 274, 274, 274, 274, 274, 122, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 204, 116, 274, + 172, 276, 276, 219, 276, 248, 276, 276, 276, 44, + 276, 276, 276, 276, 4, 276, 276, 119, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 201, 36, 37, 276, 276, 276, 276, 276, + 276, 276, 237, 276, 276, 276, 276, 276, 276, 207, + 276, 276, 276, 175, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 71, 276, 45, 225, 276, 202, 276, + 276, 11, 276, 276, 276, 276, 276, 276, 276, 173, + 75, 276, 39, 276, 276, 276, 276, 276, 276, 144, + 276, 276, 276, 276, 276, 122, 276, 276, 276, 276, - 274, 104, 105, 274, 274, 274, 77, 81, 76, 274, - 69, 274, 274, 274, 10, 274, 274, 274, 221, 274, - 255, 38, 274, 274, 274, 143, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 82, 80, 274, 70, 243, 274, - 274, 274, 158, 274, 274, 172, 274, 274, 274, 274, - 274, 274, 134, 64, 274, 274, 274, 274, 274, 236, - 274, 274, 274, 274, 274, 274, 274, 117, 274, 79, - 123, 124, 72, 274, 222, 137, 274, 274, 274, 274, - 198, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 276, 276, 276, 276, 206, 116, 276, 276, 104, + 105, 276, 276, 276, 77, 81, 76, 276, 69, 276, + 276, 276, 10, 276, 276, 276, 223, 276, 276, 257, + 38, 276, 276, 276, 143, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 82, 80, 276, 70, 245, 276, 276, + 276, 160, 276, 276, 276, 174, 276, 276, 276, 276, + 276, 276, 134, 64, 276, 276, 276, 276, 276, 238, + 276, 276, 276, 276, 276, 276, 276, 117, 276, 79, + 123, 124, 72, 276, 224, 276, 137, 276, 276, 276, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 85, 274, 197, 274, 214, 240, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 5, 274, 274, 274, 241, 274, 274, 274, 274, 274, - 274, 274, 274, 24, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 121, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 154, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 237, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 276, 200, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 149, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 85, 276, 199, 276, + 216, 242, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 5, 276, 276, 276, 243, 276, 276, 276, + 276, 276, 276, 276, 276, 24, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 121, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 156, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 239, - 274, 274, 274, 274, 274, 254, 274, 274, 210, 274, - 274, 274, 274, 274, 238, 274, 274, 274, 274, 274, - 274, 239, 274, 274, 274, 208, 274, 211, 212, 274, - 274, 274, 274, 274, 209, 213, 0 + 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 256, 276, 276, + 212, 276, 276, 276, 276, 276, 240, 276, 276, 276, + 276, 276, 276, 241, 276, 276, 276, 210, 276, 213, + 214, 276, 276, 276, 276, 276, 211, 215, 0 } ; -static yyconst YY_CHAR yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, @@ -709,7 +701,7 @@ static yyconst YY_CHAR yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst YY_CHAR yy_meta[41] = +static const YY_CHAR yy_meta[41] = { 0, 1, 2, 3, 4, 5, 1, 6, 1, 1, 1, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, @@ -717,15 +709,15 @@ static yyconst YY_CHAR yy_meta[41] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_uint16_t yy_base[2752] = +static const flex_int16_t yy_base[2764] = { 0, 0, 0, 38, 41, 44, 46, 59, 65, 71, 77, - 90, 112, 1790, 1729, 81, 5354, 5354, 5354, 96, 52, + 90, 112, 1790, 1729, 81, 5372, 5372, 5372, 96, 52, 106, 63, 107, 111, 70, 128, 130, 133, 57, 88, 76, 135, 141, 117, 148, 145, 160, 164, 185, 176, - 191, 152, 1617, 5354, 5354, 5354, 107, 1360, 5354, 5354, - 5354, 165, 1128, 1078, 5354, 5354, 5354, 211, 783, 5354, - 5354, 5354, 180, 731, 5354, 217, 5354, 221, 168, 648, + 191, 152, 1617, 5372, 5372, 5372, 107, 1360, 5372, 5372, + 5372, 165, 1128, 1078, 5372, 5372, 5372, 211, 783, 5372, + 5372, 5372, 180, 731, 5372, 217, 5372, 221, 168, 648, 225, 189, 0, 232, 0, 0, 226, 189, 85, 221, 114, 227, 234, 156, 219, 235, 236, 238, 239, 132, 246, 241, 243, 253, 244, 251, 254, 247, 260, 267, @@ -755,7 +747,7 @@ static yyconst flex_uint16_t yy_base[2752] = 700, 708, 709, 712, 720, 713, 721, 722, 723, 724, 726, 729, 734, 730, 732, 739, 740, 742, 749, 741, 748, 756, 763, 761, 759, 781, 738, 770, 760, 771, - 5354, 773, 774, 805, 778, 777, 795, 790, 801, 779, + 5372, 773, 774, 805, 778, 777, 795, 790, 801, 779, 799, 803, 787, 815, 810, 811, 813, 829, 816, 818, 825, 826, 830, 828, 840, 832, 837, 842, 850, 846, 847, 848, 857, 858, 851, 859, 860, 862, 861, 866, @@ -763,13 +755,13 @@ static yyconst flex_uint16_t yy_base[2752] = 902, 883, 900, 903, 893, 905, 908, 910, 911, 913, 914, 918, 917, 919, 920, 922, 924, 928, 930, 931, - 932, 933, 935, 943, 947, 936, 948, 5354, 953, 938, - 955, 956, 940, 946, 5354, 961, 962, 964, 972, 967, + 932, 933, 935, 943, 947, 936, 948, 5372, 953, 938, + 955, 956, 940, 946, 5372, 961, 962, 964, 972, 967, 974, 970, 969, 977, 986, 971, 984, 995, 990, 992, 993, 973, 996, 998, 999, 1001, 1002, 1005, 1025, 1007, 1008, 1012, 1009, 1019, 1017, 1029, 1022, 1038, 1020, 1040, 1048, 1030, 1047, 1032, 1010, 1054, 1055, 1057, 1058, 1059, - 1061, 1060, 1062, 1064, 1065, 1063, 1069, 5354, 1068, 1081, + 1061, 1060, 1062, 1064, 1065, 1063, 1069, 5372, 1068, 1081, 1089, 1076, 1071, 1087, 1090, 1092, 1091, 1093, 1095, 1094, 1102, 1099, 1111, 1100, 1119, 1103, 1114, 1101, 1118, 1121, 1120, 1122, 1131, 1127, 1133, 1135, 1143, 1142, 1145, 1152, @@ -787,551 +779,553 @@ static yyconst flex_uint16_t yy_base[2752] = 1345, 1347, 1354, 1356, 1359, 1358, 1368, 1369, 1357, 1370, 1371, 1372, 1376, 1378, 1379, 1388, 1383, 1381, 1389, 1382, - 1392, 1393, 1400, 1401, 1404, 1396, 5354, 1394, 1415, 1407, + 1392, 1393, 1400, 1401, 1404, 1396, 5372, 1394, 1415, 1407, 1408, 1411, 1416, 1424, 1417, 1419, 1420, 1421, 1422, 1428, - 5354, 1429, 5354, 5354, 1431, 5354, 5354, 1430, 1435, 1436, + 5372, 1429, 5372, 5372, 1431, 5372, 5372, 1430, 1435, 1436, 1445, 1453, 1455, 1432, 1451, 1457, 1464, 1478, 1461, 1460, 1468, 1459, 1467, 1463, 1469, 1471, 1473, 1474, 1487, 1491, 1493, 1499, 1483, 1489, 1500, 1502, 1505, 1503, 1506, 1510, - 1509, 1512, 1514, 1515, 1516, 1521, 1518, 1534, 5354, 1530, + 1509, 1512, 1514, 1515, 1516, 1521, 1518, 1534, 5372, 1530, 1537, 1542, 1540, 1539, 1541, 1544, 1529, 1546, 1548, 1550, - 1520, 1553, 1556, 1560, 1557, 5354, 1558, 1559, 1561, 1563, + 1520, 1553, 1556, 1560, 1557, 5372, 1558, 1559, 1561, 1563, 1570, 1574, 1571, 1565, 1577, 1580, 1575, 1582, 1175, 1581, - 5354, 1586, 1597, 1583, 1593, 1587, 1589, 1599, 1600, 1601, + 5372, 1586, 1597, 1583, 1593, 1587, 1589, 1599, 1600, 1601, 1602, 1603, 1605, 1606, 1616, 1615, 1614, 1612, 1613, 1628, 1618, 1630, 1637, 1620, 1629, 1633, 1639, 1641, 1642, 1649, 1644, 1651, 1646, 1654, 1652, 1650, 1655, 1660, 1647, 1670, 1678, 1661, 1673, 1674, 1682, 1657, 1680, 1681, 1683, 1685, - 1686, 1689, 1694, 1690, 1696, 1692, 1698, 5354, 1700, 1704, - 5354, 1702, 1705, 1727, 1706, 1709, 1708, 1703, 1710, 1719, + 1686, 1689, 1694, 1690, 1696, 1692, 1698, 5372, 1700, 1704, + 5372, 1702, 1705, 1727, 1706, 1709, 1708, 1703, 1710, 1719, 1711, 1715, 1721, 1745, 1733, 1737, 1731, 1749, 1750, 1742, 1740, 1751, 1752, 1759, 1763, 1767, 1773, 1775, 1760, 1762, 1781, 1771, 1772, 1770, 1774, 1790, 1788, 1794, 1778, 1785, - 1796, 1798, 1799, 5354, 1811, 1806, 1808, 1810, 1818, 1814, + 1796, 1798, 1799, 5372, 1811, 1806, 1808, 1810, 1818, 1814, 1813, 1816, 1817, 1820, 1828, 1821, 1824, 1829, 1831, 1833, - 1835, 1837, 1839, 1841, 1838, 1846, 5354, 1842, 5354, 1845, + 1835, 1837, 1839, 1841, 1838, 1846, 5372, 1842, 5372, 1845, 1852, 1854, 1853, 1856, 1857, 1860, 1864, 1866, 1869, 1870, - 5354, 1874, 1881, 1878, 1884, 1877, 1876, 1885, 1886, 1889, + 5372, 1874, 1881, 1878, 1884, 1877, 1876, 1885, 1886, 1889, 1894, 1892, 1901, 1897, 1893, 1902, 1905, 1906, 1908, 1911, - 1909, 5354, 1917, 1915, 1918, 1925, 1927, 1920, 1928, 1930, + 1909, 5372, 1917, 1915, 1918, 1925, 1927, 1920, 1928, 1930, 1932, 1934, 1935, 1936, 1938, 1943, 1947, 1940, 1944, 1952, - 1948, 5354, 1954, 1956, 1964, 1960, 1961, 1962, 1963, 1965, + 1948, 5372, 1954, 1956, 1964, 1960, 1961, 1962, 1963, 1965, 1967, 1969, 1971, 1979, 1981, 1974, 1977, 1985, 1986, 1988, - 1991, 1994, 1992, 1995, 1993, 1996, 5354, 1997, 1999, 124, + 1991, 1994, 1992, 1995, 1993, 1996, 5372, 1997, 1999, 124, 2000, 2007, 2001, 2006, 2008, 2019, 2009, 2026, 2030, 2023, 2025, 2031, 2032, 2033, 2034, 2035, 2037, 2038, 2040, 2041, - 2043, 2044, 2048, 2049, 2051, 2052, 2054, 5354, 2061, 2069, + 2043, 2044, 2048, 2049, 2051, 2052, 2054, 5372, 2061, 2069, 2071, 2053, 2076, 2063, 2075, 2077, 2080, 2083, 2085, 2086, - 5354, 2090, 2087, 2091, 2093, 2097, 2094, 2095, 2100, 2102, + 5372, 2090, 2087, 2091, 2093, 2097, 2094, 2095, 2100, 2102, 2104, 2107, 2106, 2108, 2109, 2112, 2114, 2117, 2119, 2118, - 2124, 2126, 5354, 2131, 2127, 2129, 2130, 2140, 2136, 2152, + 2124, 2126, 5372, 2131, 2127, 2129, 2130, 2140, 2136, 2152, 2139, 2142, 2147, 2153, 2161, 2149, 2155, 2163, 2167, 2171, 2172, 2165, 2173, 2177, 2185, 2187, 2189, 2175, 2190, 2191, 2179, 2183, 2203, 2204, 2200, 2202, 2207, 2208, 2212, 2211, - 5354, 2213, 2214, 2215, 2219, 2232, 2218, 2230, 2220, 2236, + 5372, 2213, 2214, 2215, 2219, 2232, 2218, 2230, 2220, 2236, 2224, 2237, 2238, 2239, 2242, 2241, 2248, 2244, 2249, 2254, - 2251, 2252, 2261, 2263, 5354, 2266, 2268, 2258, 2271, 2264, + 2251, 2252, 2261, 2263, 5372, 2266, 2268, 2258, 2271, 2264, 2276, 2278, 2280, 2272, 2281, 2283, 2286, 2287, 2288, 2289, - 2291, 2295, 5354, 2296, 2298, 2304, 2305, 2307, 2310, 2316, - 2301, 2314, 2311, 2321, 5354, 2328, 2329, 2325, 2332, 2324, - 2327, 2331, 2336, 2337, 5354, 2338, 2339, 2347, 2349, 2344, + 2291, 2295, 5372, 2296, 2298, 2304, 2305, 2307, 2310, 2316, + 2301, 2314, 2311, 2321, 5372, 2328, 2329, 2325, 2332, 2324, + 2327, 2331, 2336, 2337, 5372, 2338, 2339, 2347, 2349, 2344, - 5354, 2351, 2340, 2348, 2352, 2353, 2355, 2365, 2356, 2359, - 2361, 2369, 2371, 2363, 2372, 5354, 2375, 2388, 2378, 2380, + 5372, 2351, 2340, 2348, 2352, 2353, 2355, 2365, 2356, 2359, + 2361, 2369, 2371, 2363, 2372, 5372, 2375, 2388, 2378, 2380, 2383, 2381, 2385, 2390, 2393, 2397, 2392, 2409, 2407, 2402, - 2404, 2410, 2412, 2414, 2415, 2416, 2417, 5354, 2418, 2420, + 2404, 2410, 2412, 2414, 2415, 2416, 2417, 5372, 2418, 2420, 2424, 2422, 2427, 2428, 2435, 2431, 2434, 2440, 2441, 2442, 2439, 2444, 2448, 2446, 2450, 2452, 2459, 2462, 2463, 2464, - 2465, 2472, 2473, 2474, 2478, 5354, 2481, 2482, 2483, 2471, + 2465, 2472, 2473, 2474, 2478, 5372, 2481, 2482, 2483, 2471, 2476, 2484, 2487, 2495, 2488, 2493, 2497, 2491, 2498, 2510, 2512, 2500, 2513, 2503, 2507, 2515, 2516, 2518, 2519, 2527, 2523, 2525, 2528, 2536, 2529, 2531, 2532, 2533, 2539, 2540, 2541, 2542, 2554, 2546, 2560, 2562, 2564, 2563, 2565, 2566, - 2569, 5354, 2572, 2555, 2573, 2578, 2581, 2582, 2584, 2586, - 2591, 2583, 2592, 2585, 2602, 2598, 5354, 2599, 5354, 2600, - 2601, 2607, 2615, 5354, 2612, 5354, 2613, 2619, 2604, 2614, - 5354, 2622, 2623, 2624, 2626, 2629, 2628, 2631, 2634, 2632, + 2569, 5372, 2572, 2555, 2573, 2578, 2581, 2582, 2584, 2586, + 2591, 2583, 2592, 2585, 2602, 2598, 5372, 2599, 5372, 2600, + 2601, 2607, 2615, 5372, 2612, 5372, 2613, 2619, 2604, 2614, + 5372, 2622, 2623, 2624, 2626, 2629, 2628, 2631, 2634, 2632, 2637, 2638, 2639, 2641, 2642, 2645, 2654, 2657, 2646, 2658, - 2648, 2651, 2664, 2656, 2667, 5354, 2674, 2665, 2671, 2669, + 2648, 2651, 2664, 2656, 2667, 5372, 2674, 2665, 2671, 2669, 2676, 2677, 2678, 2681, 2680, 2684, 2682, 2687, 2693, 2545, - 2694, 2701, 2696, 2703, 5354, 2698, 2706, 2707, 2708, 5354, + 2694, 2701, 2696, 2703, 5372, 2698, 2706, 2707, 2708, 5372, 2710, 2709, 2717, 2719, 2711, 2721, 2722, 2724, 2728, 2723, 2730, 2738, 2740, 2731, 2742, 2743, 2732, 2746, 2753, 2754, 2760, 2762, 2764, 2745, 2752, 2755, 2765, 2768, 2772, 2773, 2775, 2782, 2777, 2778, 2787, 2779, 2781, 2788, 2789, 2790, - 2791, 2794, 2797, 2798, 2793, 2795, 2802, 2796, 5354, 2812, + 2791, 2794, 2797, 2798, 2793, 2795, 2802, 2796, 5372, 2812, 2801, 2814, 2822, 2803, 2820, 2807, 2824, 2826, 2825, 2829, - 2832, 2827, 5354, 2830, 5354, 2828, 2846, 2838, 2848, 2839, + 2832, 2827, 5372, 2830, 5372, 2828, 2846, 2838, 2848, 2839, 2852, 2857, 2854, 2858, 2859, 2860, 2861, 2862, 2863, 2865, - 2879, 2869, 2866, 2871, 2878, 2880, 2882, 2883, 5354, 2885, + 2879, 2869, 2866, 2871, 2878, 2880, 2882, 2883, 5372, 2885, 2887, 2888, 2890, 2891, 2892, 2901, 2899, 2903, 2893, 2904, - 2913, 5354, 2909, 2924, 2915, 2920, 2931, 2927, 2934, 2929, + 2913, 5372, 2909, 2924, 2915, 2920, 2931, 2927, 2934, 2929, - 5354, 2917, 2926, 2936, 2938, 2939, 5354, 2941, 5354, 2943, + 5372, 2917, 2926, 2936, 2938, 2939, 5372, 2941, 5372, 2943, 2944, 2945, 2946, 2947, 2952, 2950, 2954, 2967, 2956, 2957, - 2958, 2959, 2966, 2980, 2970, 2971, 5354, 2973, 2975, 2981, - 2982, 2983, 2991, 2984, 2990, 5354, 2992, 2998, 2999, 2994, + 2958, 2959, 2966, 2980, 2970, 2971, 5372, 2973, 2975, 2981, + 2982, 2983, 2991, 2984, 2990, 5372, 2992, 2998, 2999, 2994, 3000, 3002, 3003, 3004, 3008, 3009, 3005, 3010, 3022, 3014, - 3015, 3023, 3028, 3031, 3036, 5354, 3032, 3038, 3045, 3041, + 3015, 3023, 3028, 3031, 3036, 5372, 3032, 3038, 3045, 3041, 3042, 3044, 3048, 3043, 3049, 3050, 3052, 3053, 3055, 3057, 3059, 3056, 3066, 3060, 3062, 3073, 3082, 3065, 3078, 3067, 3079, 3085, 3089, 3092, 3094, 3081, 3096, 3102, 3084, 3098, - 3107, 3100, 3114, 3109, 5354, 3116, 3111, 3121, 3113, 3117, + 3107, 3100, 3114, 3109, 5372, 3116, 3111, 3121, 3113, 3117, - 3123, 3124, 3132, 3127, 3128, 3130, 3137, 3133, 5354, 3155, + 3123, 3124, 3132, 3127, 3128, 3130, 3137, 3133, 5372, 3155, 3142, 3134, 3147, 3144, 3151, 3143, 3157, 3160, 3162, 3163, - 3164, 3166, 3168, 3169, 3172, 3167, 5354, 5354, 3174, 3175, - 5354, 3176, 3178, 3180, 3182, 3188, 3183, 3191, 3193, 3196, - 3198, 5354, 3200, 3207, 3203, 3202, 3210, 3212, 3216, 3208, + 3164, 3166, 3168, 3169, 3172, 3167, 5372, 5372, 3174, 3175, + 5372, 3176, 3178, 3180, 3182, 3188, 3183, 3191, 3193, 3196, + 3198, 5372, 3200, 3207, 3203, 3202, 3210, 3212, 3216, 3208, 3211, 3218, 3221, 3219, 3224, 3225, 3226, 3228, 3236, 3233, - 3232, 3235, 5354, 3234, 3237, 3242, 5354, 3241, 3244, 3245, + 3232, 3235, 5372, 3234, 3237, 3242, 5372, 3241, 3244, 3245, 3249, 3262, 3246, 3259, 3264, 3265, 3266, 3267, 3268, 3269, 3277, 3276, 3273, 3282, 3283, 3290, 3285, 3293, 3298, 3305, - 3306, 3308, 3287, 3295, 3309, 5354, 3310, 3311, 3312, 3314, + 3306, 3308, 3287, 3295, 3309, 5372, 3310, 3311, 3312, 3314, - 3323, 3316, 3325, 3318, 5354, 3320, 3321, 3274, 5354, 3326, - 3327, 3334, 3336, 3331, 3343, 3341, 3344, 3342, 3345, 5354, - 3350, 5354, 3353, 3346, 3359, 5354, 3352, 3357, 3361, 3363, + 3323, 3316, 3325, 3318, 5372, 3320, 3321, 3274, 5372, 3326, + 3327, 3334, 3336, 3331, 3343, 3341, 3344, 3342, 3345, 5372, + 3350, 5372, 3353, 3346, 3359, 5372, 3352, 3357, 3361, 3363, 3365, 3367, 3368, 3371, 3375, 3376, 3378, 3379, 3377, 3382, - 3386, 3383, 5354, 3388, 3384, 3390, 3391, 3394, 3393, 3012, - 5354, 5354, 3407, 5354, 3401, 3408, 3409, 5354, 3411, 3413, - 3416, 3118, 3414, 3417, 3421, 3422, 5354, 3428, 3412, 3433, - 3429, 3418, 3431, 3436, 3437, 3440, 3441, 3444, 5354, 3442, - 3445, 3447, 3451, 3452, 3455, 3454, 3453, 5354, 3460, 3468, - 3461, 3471, 3467, 5354, 3475, 5354, 3477, 3478, 3480, 5354, + 3386, 3383, 5372, 3388, 3384, 3390, 3391, 3394, 3393, 3012, + 5372, 5372, 3407, 5372, 3401, 3408, 3409, 5372, 3411, 3413, + 3416, 3118, 3414, 3417, 3421, 3422, 5372, 3428, 3412, 3433, + 3429, 3418, 3431, 3436, 3437, 3440, 3441, 3444, 5372, 3442, + 3445, 3447, 3451, 3452, 3455, 3454, 3453, 5372, 3460, 3468, + 3461, 3471, 3467, 5372, 3475, 5372, 3477, 3478, 3480, 5372, 3481, 3488, 3483, 3489, 3491, 3492, 3496, 3485, 3498, 3505, - 3502, 3500, 3504, 5354, 3506, 3508, 3511, 3514, 3516, 3517, + 3502, 3500, 3504, 5372, 3506, 3508, 3511, 3514, 3516, 3517, 3526, 3519, 3521, 3527, 3529, 3530, 3532, 3538, 3536, 3540, - 3544, 3534, 3548, 3541, 3551, 5354, 3553, 3554, 3556, 5354, - 3557, 3558, 3567, 3562, 3564, 3560, 3569, 3571, 5354, 3572, - 3573, 3574, 3587, 5354, 5354, 3575, 5354, 3589, 3568, 3588, - 3577, 3590, 3597, 3598, 3601, 3593, 3604, 3605, 3606, 3615, - 3617, 3622, 3618, 3620, 3613, 5354, 5354, 3624, 3625, 3627, - 3630, 3631, 3634, 3635, 3643, 3639, 3641, 3648, 3645, 3655, - 5354, 3652, 3638, 3657, 5354, 3654, 3659, 3660, 3662, 3663, + 3544, 3534, 3554, 3541, 3547, 5372, 3551, 3556, 3557, 5372, + 3558, 3560, 3565, 3566, 3567, 3570, 3568, 3572, 5372, 3569, + 3576, 3573, 3574, 5372, 5372, 3577, 5372, 3589, 3575, 3590, + 3591, 3592, 3594, 3597, 3600, 3602, 3603, 3604, 3610, 3614, + 3617, 3618, 3619, 3620, 3615, 5372, 5372, 3625, 3626, 3629, + 3631, 3632, 3634, 3636, 3643, 3639, 3647, 3650, 3640, 3657, + 5372, 3655, 3642, 3656, 5372, 3653, 3658, 3661, 3664, 3665, - 3666, 3665, 3670, 3667, 3672, 3673, 3674, 3676, 3675, 3680, - 3690, 5354, 3691, 3682, 3686, 3692, 3693, 3695, 3697, 3696, - 3698, 5354, 3706, 3703, 3704, 3709, 3710, 3712, 3726, 3729, - 3731, 3720, 3723, 3732, 3734, 3738, 3711, 5354, 3739, 3740, - 3741, 3742, 3748, 3750, 3745, 3752, 3753, 3756, 3757, 3759, - 3763, 3765, 3766, 5354, 3768, 3770, 3767, 3775, 3776, 3777, - 3778, 3787, 3790, 3780, 3782, 3791, 3793, 5354, 3784, 3795, - 3796, 3798, 3801, 3805, 3806, 3807, 5354, 3809, 3812, 3813, - 3814, 3815, 3816, 3825, 3827, 5354, 3819, 3830, 3833, 3823, - 3826, 3836, 3837, 5354, 3840, 3844, 3843, 3852, 3847, 3856, + 3667, 3666, 3669, 3671, 3672, 3676, 3673, 3674, 3677, 3683, + 3690, 5372, 3692, 3691, 3693, 3680, 3694, 3695, 3698, 3697, + 3701, 5372, 3702, 3705, 3708, 3707, 3713, 3715, 3723, 3726, + 3730, 3706, 3731, 3732, 3734, 3736, 3737, 5372, 3740, 3738, + 3739, 3741, 3748, 3750, 3751, 3755, 3756, 3761, 3752, 3763, + 3765, 3757, 3766, 5372, 3768, 3776, 3769, 3778, 3772, 3780, + 3779, 3783, 3792, 3781, 3787, 3789, 3794, 5372, 3795, 3796, + 3797, 3801, 3804, 3798, 3806, 3807, 5372, 3810, 3811, 3813, + 3814, 3816, 3823, 3818, 3830, 3825, 5372, 3826, 3829, 3835, + 3833, 3836, 3839, 3841, 5372, 3843, 3847, 3844, 3856, 3851, - 3854, 3851, 3853, 3855, 3860, 3861, 3862, 3863, 3873, 3874, - 5354, 3865, 5354, 3872, 3879, 3888, 3883, 3875, 5354, 3886, - 3887, 3890, 3891, 3896, 5354, 3898, 3893, 3899, 3900, 5354, - 3901, 3908, 3907, 3911, 3916, 3917, 5354, 3920, 3921, 3925, - 3928, 3932, 3934, 3929, 3935, 3937, 3931, 3938, 3939, 5354, - 3942, 3941, 3948, 3950, 3951, 3952, 3954, 5354, 3956, 3953, - 3959, 3962, 3963, 3964, 3965, 3974, 3969, 3971, 5354, 3966, - 3978, 3986, 3977, 3988, 5354, 5354, 3981, 3991, 3993, 3987, - 3997, 5354, 3999, 4000, 4002, 4005, 4001, 5354, 5354, 4007, - 5354, 4008, 5354, 4009, 5354, 5354, 4011, 4012, 4019, 5354, + 3861, 3857, 3853, 3854, 3864, 3865, 3866, 3868, 3869, 3876, + 3880, 5372, 3871, 5372, 3879, 3881, 3892, 3889, 3885, 5372, + 3887, 3893, 3895, 3896, 3897, 5372, 3900, 3899, 3901, 3902, + 5372, 3910, 3917, 3904, 3908, 3919, 3925, 5372, 3928, 3929, + 3930, 3937, 3939, 3941, 3934, 3942, 3938, 3944, 3936, 3945, + 5372, 3947, 3949, 3954, 3956, 3957, 3959, 3960, 5372, 3962, + 3963, 3965, 3968, 3969, 3970, 3971, 3978, 3974, 3975, 5372, + 3981, 3984, 3992, 3987, 3921, 5372, 5372, 3977, 3998, 4000, + 3837, 4001, 5372, 4004, 3994, 4005, 4007, 4009, 5372, 5372, + 4011, 5372, 3996, 5372, 4012, 5372, 5372, 4015, 4016, 4023, - 4021, 5354, 4028, 4024, 4015, 4027, 4029, 5354, 4032, 4030, - 4036, 5354, 4037, 4039, 4038, 4040, 5354, 4044, 4041, 4045, - 5354, 4047, 4053, 4054, 4057, 4064, 4058, 4061, 4065, 4068, - 4074, 4077, 4079, 4069, 4071, 4082, 4084, 4080, 4086, 4087, - 4088, 4091, 4094, 4096, 4097, 4099, 4100, 4101, 4103, 4102, - 4111, 4105, 4113, 4115, 4116, 4117, 4118, 4119, 4124, 4123, - 4125, 5354, 4126, 4127, 4128, 4131, 4136, 4137, 4143, 4146, - 4153, 4154, 5354, 4156, 5354, 4158, 4147, 4160, 4161, 5354, - 4162, 4163, 4164, 4167, 4166, 4168, 4172, 4169, 5354, 4174, - 4176, 4183, 4178, 4185, 4179, 4189, 4193, 4191, 4194, 4195, + 5372, 4025, 5372, 4019, 4027, 4029, 4030, 4031, 5372, 4032, + 4034, 4038, 5372, 4033, 4041, 4039, 4040, 5372, 4044, 4047, + 4049, 5372, 4053, 4059, 4056, 4060, 4048, 4062, 4063, 4064, + 4068, 4070, 4072, 4075, 4079, 4080, 4081, 4082, 4085, 4088, + 4089, 4087, 4090, 4094, 4096, 4098, 4091, 4102, 4104, 4105, + 4108, 4110, 4112, 4114, 4115, 4117, 4118, 4119, 4120, 4121, + 4124, 4127, 4129, 5372, 4128, 4126, 4132, 4135, 4136, 4140, + 4147, 4154, 4157, 4158, 5372, 4160, 5372, 4162, 4149, 4164, + 4151, 5372, 4165, 4166, 4168, 4169, 4171, 4172, 4173, 4176, + 5372, 4179, 4174, 4186, 4182, 4188, 4183, 4193, 4197, 4194, - 4199, 4201, 4203, 4205, 4214, 4209, 4196, 4210, 4216, 4217, - 4218, 4219, 4223, 4231, 4226, 4233, 5354, 4222, 5354, 4234, - 4235, 4236, 4239, 5354, 5354, 4240, 4242, 4247, 4244, 4248, - 4250, 4251, 5354, 4252, 4253, 4262, 4263, 5354, 4264, 4265, - 4269, 5354, 4270, 4272, 4273, 4275, 4278, 4280, 5354, 5354, - 5354, 5354, 4286, 4277, 4281, 4288, 4289, 4291, 4296, 4290, - 5354, 5354, 5354, 4297, 4293, 4303, 4304, 4306, 4309, 5354, - 4311, 4310, 4313, 4314, 4320, 4322, 4316, 4327, 4324, 4328, - 4336, 4333, 4334, 4337, 4339, 4341, 4348, 5354, 5354, 4343, - 4350, 4351, 4359, 4355, 4357, 4367, 4364, 4365, 4363, 4366, + 4198, 4199, 4202, 4200, 4206, 4208, 4220, 4203, 4210, 4212, + 4222, 4213, 4215, 4223, 4224, 4230, 4232, 4237, 5372, 4238, + 5372, 4239, 4240, 4241, 4243, 5372, 5372, 4244, 4242, 4247, + 4250, 4249, 4252, 4254, 5372, 4253, 4256, 4270, 4263, 5372, + 4255, 4266, 4272, 5372, 4273, 4278, 4274, 4280, 4282, 4283, + 4289, 5372, 5372, 5372, 5372, 4290, 4281, 4284, 4292, 4298, + 4299, 4301, 4294, 5372, 5372, 5372, 4306, 4296, 4312, 4313, + 4304, 4314, 5372, 4315, 4319, 4320, 4316, 4327, 4329, 4332, + 4333, 4318, 4334, 4341, 4337, 4343, 4340, 4345, 4347, 4349, + 5372, 5372, 4351, 4354, 4356, 4363, 4360, 4361, 4373, 4368, - 4369, 4371, 4373, 5354, 4374, 4375, 5354, 5354, 4382, 4383, - 4380, 4384, 4386, 4390, 4391, 4393, 5354, 5354, 4389, 4394, - 4396, 4401, 4403, 4404, 4405, 4407, 4409, 5354, 4410, 5354, - 4411, 4412, 4418, 4427, 4424, 4426, 4430, 5354, 4429, 4419, - 5354, 4433, 4331, 4436, 5354, 4439, 4442, 4444, 5354, 4446, - 5354, 4448, 5354, 4449, 5354, 4450, 4452, 4455, 4457, 4458, - 4459, 5354, 4460, 4463, 4464, 4467, 4468, 4474, 4471, 4476, - 4481, 4480, 4482, 5354, 5354, 4493, 4477, 4484, 4485, 4488, - 4497, 4495, 4498, 4507, 5354, 5354, 4496, 5354, 4503, 4509, - 5354, 4499, 4510, 4508, 4514, 4515, 4516, 4517, 4522, 4518, + 4369, 4370, 4371, 4375, 4376, 4377, 5372, 4380, 4384, 5372, + 5372, 4388, 4390, 4378, 4391, 4392, 4394, 4397, 4399, 5372, + 5372, 4400, 4382, 4405, 4407, 4409, 4411, 4410, 4413, 4414, + 5372, 4415, 5372, 4416, 4417, 4423, 4432, 4435, 4429, 4438, + 5372, 4418, 4431, 5372, 4441, 4439, 4440, 5372, 4446, 4449, + 4451, 5372, 4457, 5372, 4459, 5372, 4442, 4466, 5372, 4452, + 4463, 4468, 4470, 4471, 4473, 5372, 4461, 4476, 4477, 4481, + 4482, 4484, 4485, 4487, 4494, 4490, 4491, 5372, 5372, 4499, + 4492, 4496, 4500, 4502, 4510, 4505, 4507, 4513, 5372, 5372, + 4509, 5372, 4517, 4518, 5372, 4506, 4519, 4523, 4524, 4526, - 4527, 4529, 4530, 4538, 4540, 4542, 4544, 4532, 4546, 4534, - 4547, 4550, 4552, 4555, 5354, 4557, 4558, 4553, 5354, 4563, - 4560, 4565, 4569, 5354, 4568, 5354, 4566, 4579, 4576, 4581, - 4570, 4588, 4583, 4586, 5354, 5354, 5354, 5354, 4592, 4589, - 4593, 5354, 5354, 4594, 4597, 4600, 5354, 4599, 5354, 4601, - 5354, 4602, 4603, 4608, 5354, 4609, 4612, 5354, 4624, 4626, - 4628, 4621, 4615, 4610, 4631, 5354, 4638, 4634, 4637, 4641, - 4633, 4643, 4644, 4645, 4652, 4647, 4654, 5354, 4648, 4650, - 4655, 5354, 4657, 4658, 4660, 4662, 4659, 4661, 4669, 4670, - 4674, 4676, 4681, 4682, 5354, 4684, 4686, 5354, 4687, 5354, + 4527, 4528, 4533, 4534, 4535, 4551, 4536, 4537, 4548, 4556, + 4558, 4546, 4560, 4552, 4554, 4561, 4563, 4564, 5372, 4567, + 4568, 4569, 5372, 4574, 4575, 4577, 4581, 5372, 4579, 5372, + 4578, 4590, 4591, 4585, 4592, 4599, 4597, 4600, 5372, 5372, + 5372, 5372, 4602, 4603, 5372, 4604, 4605, 5372, 5372, 4606, + 4611, 4608, 5372, 4612, 5372, 4614, 5372, 4618, 4615, 4625, + 5372, 4622, 4629, 5372, 4637, 4639, 4641, 4642, 4626, 4643, + 4644, 5372, 4653, 4645, 4652, 4655, 4648, 4656, 4658, 4660, + 4665, 4661, 4668, 5372, 4664, 4669, 4670, 5372, 4672, 4619, + 4674, 4675, 4673, 4676, 4680, 4681, 4688, 4685, 4695, 4691, - 4690, 4691, 4692, 5354, 4694, 4695, 4696, 4698, 5354, 4699, - 4704, 5354, 4703, 4706, 4710, 4711, 4713, 4714, 4716, 4720, - 4721, 4722, 4727, 4734, 4728, 5354, 5354, 5354, 4735, 4724, - 4746, 4749, 4738, 4751, 4743, 5354, 4750, 4752, 4753, 4760, - 4756, 4759, 5354, 4763, 4764, 4766, 5354, 4768, 4770, 4771, - 4765, 4777, 4781, 4785, 4787, 4788, 5354, 4790, 5354, 5354, - 4778, 5354, 4791, 4794, 5354, 4799, 4792, 4796, 4800, 4802, - 4803, 5354, 5354, 4805, 5354, 4811, 4807, 4818, 4814, 4820, - 4823, 5354, 4815, 4817, 4824, 4826, 4825, 5354, 4832, 4827, - 4830, 4833, 4834, 4839, 4841, 4836, 4842, 5354, 5354, 4843, + 5372, 4697, 4701, 5372, 4698, 5372, 4703, 4704, 4707, 5372, + 4706, 4708, 4709, 4714, 5372, 4715, 4713, 5372, 4717, 4718, + 4724, 4726, 4721, 4730, 4734, 4731, 4735, 4736, 4737, 4739, + 4742, 4746, 5372, 5372, 5372, 4744, 4750, 4758, 4760, 4761, + 4768, 4753, 5372, 4767, 4769, 4763, 4779, 4766, 4776, 5372, + 4778, 4780, 4781, 5372, 4786, 4788, 4789, 4791, 4792, 4796, + 4801, 4803, 4793, 5372, 4807, 5372, 5372, 4804, 5372, 4808, + 4809, 5372, 4812, 4813, 4814, 4815, 4817, 4818, 4820, 5372, + 5372, 4822, 5372, 4829, 4819, 4832, 4831, 4836, 4838, 5372, + 4840, 4841, 4842, 4844, 4845, 5372, 4846, 4848, 4849, 4850, - 4848, 5354, 5354, 4845, 4865, 4856, 5354, 5354, 5354, 4867, - 5354, 4869, 4873, 4872, 5354, 4875, 4862, 4877, 5354, 4879, - 5354, 5354, 4881, 4882, 4883, 5354, 4884, 4885, 4889, 4893, - 4896, 4897, 4849, 4899, 4906, 4907, 4903, 4904, 4909, 4910, - 4913, 4914, 4917, 4920, 5354, 5354, 4922, 5354, 5354, 4924, - 4927, 4932, 5354, 4929, 4935, 5354, 4937, 4939, 4940, 4941, - 4943, 4945, 5354, 5354, 4946, 4947, 4948, 4955, 4949, 5354, - 4957, 4959, 4951, 4961, 4962, 4968, 4963, 5354, 4969, 5354, - 5354, 5354, 5354, 4970, 5354, 5354, 4971, 4972, 4975, 4977, - 5354, 4978, 4982, 4980, 4987, 4983, 4996, 4990, 4988, 4992, + 4853, 4852, 4855, 4857, 4858, 5372, 5372, 4859, 4862, 5372, + 5372, 4865, 4877, 4880, 5372, 5372, 5372, 4882, 5372, 4886, + 4890, 4889, 5372, 4892, 4883, 4894, 5372, 4895, 4897, 5372, + 5372, 4898, 4899, 4902, 5372, 4904, 4906, 4909, 4912, 4914, + 4916, 4918, 4920, 4925, 4927, 4926, 4928, 4933, 4930, 4934, + 4936, 4938, 4940, 5372, 5372, 4942, 5372, 5372, 4947, 4949, + 4953, 5372, 4950, 4957, 4944, 5372, 4961, 4958, 4962, 4965, + 4963, 4968, 5372, 5372, 4969, 4972, 4970, 4976, 4971, 5372, + 4979, 4986, 4981, 4983, 4984, 4990, 4985, 5372, 4991, 5372, + 5372, 5372, 5372, 4994, 5372, 4993, 5372, 4998, 5000, 4999, - 4999, 5000, 5002, 5005, 5004, 5006, 5009, 5012, 5014, 5018, - 5023, 5028, 5011, 5016, 5029, 5033, 5034, 5031, 5035, 5043, - 5040, 5041, 5045, 5046, 5354, 5042, 5354, 5048, 5354, 5354, - 5052, 5058, 5047, 5049, 5069, 5070, 5053, 5060, 5062, 5072, - 5354, 5074, 5075, 5076, 5354, 5077, 5078, 5079, 5082, 5086, - 5084, 5085, 5087, 5354, 5088, 5091, 5101, 5102, 5111, 5108, - 5112, 5113, 5114, 5096, 5122, 5120, 5124, 5354, 5126, 5121, - 5127, 5128, 5129, 5137, 5132, 5133, 5135, 5354, 5139, 5141, - 5144, 5142, 5143, 5145, 5154, 5152, 5156, 5354, 5159, 5163, - 5160, 5165, 5167, 5170, 5171, 5172, 5174, 5176, 5180, 5184, + 5002, 5372, 5005, 5007, 5009, 5010, 5011, 5022, 5017, 5013, + 5015, 5020, 5024, 5025, 5027, 5031, 5372, 5029, 5035, 5037, + 5039, 5041, 5045, 5053, 5047, 5050, 5054, 5055, 5056, 5058, + 5059, 5068, 5063, 5064, 5072, 5067, 5372, 5065, 5372, 5069, + 5372, 5372, 5076, 5078, 4866, 5073, 5088, 5091, 5081, 5089, + 5090, 5094, 5372, 5096, 5097, 5099, 5372, 5098, 5100, 5101, + 5104, 5106, 5107, 5108, 5110, 5372, 5112, 5114, 5122, 5123, + 5131, 5134, 5124, 5127, 5136, 5137, 5144, 5140, 5143, 5372, + 5146, 5139, 5147, 5148, 5149, 5157, 5152, 5153, 5159, 5372, + 5162, 5163, 5164, 5155, 5165, 5170, 5176, 5173, 5179, 5372, - 5186, 5187, 5177, 5190, 5188, 5354, 5198, 5189, 5354, 5199, - 5200, 5192, 5201, 5202, 5354, 5210, 5206, 5212, 5213, 5216, - 5217, 5354, 5219, 5222, 5223, 5354, 5227, 5354, 5354, 5228, - 5226, 5229, 5235, 5237, 5354, 5354, 5354, 5262, 5269, 5276, - 5283, 5290, 88, 5297, 5304, 5311, 5318, 5325, 5332, 5339, - 5346 + 5180, 5181, 5185, 5186, 5188, 5190, 5191, 5193, 5197, 5194, + 5200, 5208, 5203, 5209, 5201, 5213, 5205, 5372, 5215, 5211, + 5372, 5217, 5221, 5219, 5223, 5227, 5372, 5232, 5225, 5229, + 5233, 5236, 5239, 5372, 5241, 5250, 5245, 5372, 5251, 5372, + 5372, 5253, 5243, 5247, 5255, 5260, 5372, 5372, 5372, 5280, + 5287, 5294, 5301, 5308, 88, 5315, 5322, 5329, 5336, 5343, + 5350, 5357, 5364 } ; -static yyconst flex_int16_t yy_def[2752] = +static const flex_int16_t yy_def[2764] = { 0, - 2737, 1, 2738, 2738, 2739, 2739, 2740, 2740, 2741, 2741, - 2742, 2742, 2737, 2743, 2737, 2737, 2737, 2737, 2744, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2745, 2737, 2737, 2737, 2745, 2746, 2737, 2737, - 2737, 2746, 2747, 2737, 2737, 2737, 2737, 2747, 2748, 2737, - 2737, 2737, 2748, 2749, 2737, 2750, 2737, 2749, 2749, 2743, - 2743, 2737, 2751, 2744, 2751, 2744, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2749, 1, 2750, 2750, 2751, 2751, 2752, 2752, 2753, 2753, + 2754, 2754, 2749, 2755, 2749, 2749, 2749, 2749, 2756, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2757, 2749, 2749, 2749, 2757, 2758, 2749, 2749, + 2749, 2758, 2759, 2749, 2749, 2749, 2749, 2759, 2760, 2749, + 2749, 2749, 2760, 2761, 2749, 2762, 2749, 2761, 2761, 2755, + 2755, 2749, 2763, 2756, 2763, 2756, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2745, - 2745, 2746, 2746, 2747, 2747, 2737, 2748, 2748, 2749, 2749, - 2750, 2750, 2749, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2757, + 2757, 2758, 2758, 2759, 2759, 2749, 2760, 2760, 2761, 2761, + 2762, 2762, 2761, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2749, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2761, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2749, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2761, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2749, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2761, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2749, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2743, 2737, 2737, 2743, 2737, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2761, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2749, 2749, 2755, 2749, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2749, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2761, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2749, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2761, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2737, 2743, - 2743, 2743, 2743, 2737, 2743, 2737, 2743, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2737, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2749, 2755, + 2755, 2755, 2755, 2749, 2755, 2749, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2737, 2743, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2755, 2749, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2737, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, + 2749, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2737, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2737, 2743, 2743, 2743, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2749, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, - 2743, 2737, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2737, 2743, 2737, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2737, 2743, 2737, 2743, 2743, 2743, 2737, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, + 2755, 2749, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2749, 2755, 2749, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2749, 2755, 2749, 2755, 2755, 2755, 2749, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2737, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2737, 2737, 2743, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2755, 2749, 2749, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2737, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2737, 2737, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2737, 2737, 2743, - 2737, 2743, 2737, 2743, 2737, 2737, 2743, 2743, 2743, 2737, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2749, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2755, 2755, 2749, 2749, 2755, 2755, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2749, 2749, + 2755, 2749, 2755, 2749, 2755, 2749, 2749, 2755, 2755, 2755, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2737, 2743, 2737, 2743, 2743, 2743, 2743, 2737, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2749, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2749, 2755, 2749, 2755, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2737, 2743, - 2743, 2743, 2743, 2737, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2737, - 2737, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2737, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2737, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2737, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2749, 2755, 2755, 2755, 2755, 2749, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2749, 2749, 2749, 2749, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2749, 2749, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2737, 2743, 2743, 2737, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2737, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2737, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2737, 2743, - 2737, 2743, 2737, 2743, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2737, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2737, 2743, 2737, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2749, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, + 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2749, 2755, 2755, 2749, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2749, 2755, 2749, 2755, 2749, 2755, 2755, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2749, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2749, + 2755, 2749, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2737, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2737, 2737, 2737, 2743, 2743, - 2743, 2737, 2737, 2743, 2743, 2743, 2737, 2743, 2737, 2743, - 2737, 2743, 2743, 2743, 2737, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2737, 2743, 2737, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2749, 2755, 2749, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2749, + 2749, 2749, 2755, 2755, 2749, 2755, 2755, 2749, 2749, 2755, + 2755, 2755, 2749, 2755, 2749, 2755, 2749, 2755, 2755, 2755, + 2749, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, - 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2737, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2737, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2737, 2743, 2743, 2743, 2737, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2737, 2737, - 2743, 2737, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2737, 2743, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2737, 2743, + 2749, 2755, 2755, 2749, 2755, 2749, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2749, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2749, 2749, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2749, 2755, 2749, 2749, 2755, 2749, 2755, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, + 2749, 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, - 2743, 2737, 2737, 2743, 2743, 2743, 2737, 2737, 2737, 2743, - 2737, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2737, 2743, - 2737, 2737, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2737, 2743, 2737, 2737, 2743, - 2743, 2743, 2737, 2743, 2743, 2737, 2743, 2743, 2743, 2743, - 2743, 2743, 2737, 2737, 2743, 2743, 2743, 2743, 2743, 2737, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2737, - 2737, 2737, 2737, 2743, 2737, 2737, 2743, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2755, 2755, 2755, 2755, 2749, 2749, 2755, 2755, 2749, + 2749, 2755, 2755, 2755, 2749, 2749, 2749, 2755, 2749, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2749, 2755, 2755, 2749, + 2749, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2749, 2749, 2755, 2749, 2749, 2755, 2755, + 2755, 2749, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2749, 2755, 2755, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2749, + 2749, 2749, 2749, 2755, 2749, 2755, 2749, 2755, 2755, 2755, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2737, 2743, 2737, 2737, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, - 2737, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, - 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, 2743, + 2755, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2749, 2755, + 2749, 2749, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2749, 2755, 2755, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, - 2743, 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2737, 2743, - 2743, 2743, 2743, 2743, 2737, 2743, 2743, 2743, 2743, 2743, - 2743, 2737, 2743, 2743, 2743, 2737, 2743, 2737, 2737, 2743, - 2743, 2743, 2743, 2743, 2737, 2737, 0, 2737, 2737, 2737, - 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, - 2737 + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2755, + 2755, 2755, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, + 2749, 2755, 2755, 2755, 2755, 2755, 2749, 2755, 2755, 2755, + 2755, 2755, 2755, 2749, 2755, 2755, 2755, 2749, 2755, 2749, + 2749, 2755, 2755, 2755, 2755, 2755, 2749, 2749, 0, 2749, + 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, + 2749, 2749, 2749 } ; -static yyconst flex_uint16_t yy_nxt[5395] = +static const flex_int16_t yy_nxt[5413] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 14, 18, 20, 21, 22, 23, 24, 25, 26, @@ -1528,7 +1522,7 @@ static yyconst flex_uint16_t yy_nxt[5395] = 71, 945, 957, 71, 960, 71, 946, 958, 71, 961, 959, 947, 71, 71, 71, 71, 969, 962, 964, 965, 970, 968, 71, 71, 966, 71, 71, 963, 967, 971, - 71, 972, 973, 71, 71, 71, 71, 71, 71, 2737, + 71, 972, 973, 71, 71, 71, 71, 71, 71, 2749, 984, 71, 974, 975, 71, 976, 983, 985, 71, 986, 977, 71, 978, 71, 987, 990, 988, 71, 979, 71, @@ -1543,7 +1537,7 @@ static yyconst flex_uint16_t yy_nxt[5395] = 71, 71, 1032, 1031, 71, 1033, 1028, 71, 71, 71, 1034, 1040, 71, 1029, 1035, 71, 71, 71, 1042, 1036, - 71, 2737, 1038, 1043, 71, 71, 1037, 1039, 71, 71, + 71, 2749, 1038, 1043, 71, 71, 1037, 1039, 71, 71, 1045, 71, 71, 1046, 71, 1041, 1048, 1044, 71, 1049, 71, 71, 1054, 71, 1050, 1047, 1051, 1053, 71, 1055, 71, 71, 1056, 71, 1052, 71, 1058, 71, 71, 71, @@ -1555,12 +1549,12 @@ static yyconst flex_uint16_t yy_nxt[5395] = 1079, 71, 1083, 1089, 71, 71, 71, 71, 71, 71, 71, 1095, 71, 71, 71, 1087, 1088, 1091, 1086, 71, - 71, 71, 71, 1090, 1099, 1092, 1098, 1096, 2737, 1094, + 71, 71, 71, 1090, 1099, 1092, 1098, 1096, 2749, 1094, 1100, 1101, 71, 1103, 1093, 1097, 71, 1104, 71, 71, 1106, 1105, 1102, 71, 71, 71, 71, 71, 71, 1107, 71, 71, 1110, 71, 71, 1116, 71, 71, 1113, 1108, 1109, 71, 71, 1111, 71, 71, 71, 71, 1114, 1112, - 1120, 1117, 1122, 1115, 71, 1126, 71, 1119, 2737, 1118, + 1120, 1117, 1122, 1115, 71, 1126, 71, 1119, 2749, 1118, 1129, 1123, 71, 1124, 71, 1121, 1125, 1127, 71, 71, 71, 1128, 1130, 71, 1131, 1133, 71, 1132, 71, 71, @@ -1569,7 +1563,7 @@ static yyconst flex_uint16_t yy_nxt[5395] = 71, 71, 71, 1144, 1140, 71, 1149, 71, 1145, 1147, 71, 71, 71, 1150, 1146, 1148, 1154, 71, 1159, 71, 71, 1151, 71, 71, 71, 1153, 1152, 1155, 1158, 71, - 1161, 1156, 71, 71, 1160, 71, 2737, 1157, 1163, 1165, + 1161, 1156, 71, 71, 1160, 71, 2749, 1157, 1163, 1165, 71, 1164, 71, 1162, 1166, 71, 71, 1170, 71, 1168, 1179, 1167, 1183, 1169, 71, 1177, 71, 1178, 71, 1171, 71, 1180, 1172, 1173, 71, 71, 71, 1174, 71, 1181, @@ -1586,7 +1580,7 @@ static yyconst flex_uint16_t yy_nxt[5395] = 1228, 71, 1231, 1234, 71, 71, 1232, 1225, 1236, 71, 1233, 71, 1237, 71, 71, 1241, 71, 1235, 1238, 71, - 71, 71, 71, 1243, 71, 2737, 1239, 1245, 71, 71, + 71, 71, 71, 1243, 71, 2749, 1239, 1245, 71, 71, 1247, 71, 1248, 1246, 71, 1240, 1249, 71, 71, 1242, 71, 1244, 1250, 71, 71, 1252, 1251, 71, 1253, 71, 1254, 1257, 1255, 1256, 71, 1259, 1260, 71, 71, 1262, @@ -1645,7 +1639,7 @@ static yyconst flex_uint16_t yy_nxt[5395] = 71, 71, 1497, 1493, 71, 71, 71, 1500, 1501, 1502, 71, 1498, 1499, 1503, 1509, 71, 1505, 71, 1506, 1507, 1508, 1513, 1511, 71, 1510, 71, 1512, 71, 71, 71, - 71, 71, 71, 71, 1515, 71, 2737, 1514, 1517, 1519, + 71, 71, 71, 71, 1515, 71, 2749, 1514, 1517, 1519, 1527, 71, 71, 1518, 1520, 1516, 1522, 1521, 1523, 71, 1528, 71, 1526, 1524, 1529, 71, 1525, 71, 1530, 1531, 71, 71, 71, 71, 71, 71, 71, 1534, 71, 71, @@ -1710,11 +1704,11 @@ static yyconst flex_uint16_t yy_nxt[5395] = 1801, 71, 1804, 71, 71, 1808, 71, 71, 1796, 1798, 1803, 1799, 1807, 1805, 71, 1806, 1809, 1813, 1810, 1812, 71, 71, 71, 1818, 71, 71, 71, 71, 1820, 71, - 71, 71, 1821, 1822, 71, 71, 2737, 1814, 1815, 1816, + 71, 71, 1821, 1822, 71, 71, 2749, 1814, 1815, 1816, 1817, 71, 71, 1823, 71, 1825, 71, 1826, 1824, 71, 71, 1827, 1828, 71, 71, 71, 1829, 71, 71, 1838, 71, 1830, 1831, 1834, 71, 71, 71, 71, 71, 1833, - 1837, 1841, 1842, 71, 71, 1836, 1835, 2737, 1844, 1832, + 1837, 1841, 1842, 71, 71, 1836, 1835, 2749, 1844, 1832, 71, 71, 1839, 1845, 71, 1840, 1843, 1848, 71, 1847, 71, 71, 1846, 71, 71, 1852, 71, 1849, 71, 1850, @@ -1724,212 +1718,214 @@ static yyconst flex_uint16_t yy_nxt[5395] = 71, 1861, 71, 1872, 71, 1867, 1874, 1873, 1866, 71, 71, 1877, 71, 71, 1870, 71, 1879, 71, 1875, 71, 1871, 71, 1880, 71, 71, 1878, 1876, 71, 1881, 1884, - 1886, 71, 1882, 1887, 71, 1883, 71, 71, 1885, 71, - 71, 71, 1890, 71, 1891, 71, 1888, 71, 1889, 1894, - 71, 71, 71, 1892, 71, 71, 71, 71, 71, 1897, - 71, 1893, 1902, 1895, 1904, 1896, 1898, 1900, 1901, 1899, + 71, 1886, 1882, 1888, 71, 1883, 1887, 71, 1885, 71, + 71, 71, 1889, 71, 1891, 1892, 1890, 1895, 71, 71, + 71, 71, 71, 71, 1893, 71, 71, 71, 71, 71, + 71, 1903, 1904, 1894, 1901, 1899, 1905, 1896, 1897, 1898, - 71, 71, 71, 71, 1907, 1903, 71, 1905, 1906, 1911, - 71, 71, 1910, 1913, 71, 1909, 1908, 71, 71, 71, - 1912, 1915, 1918, 1916, 1920, 1914, 71, 1919, 71, 1921, - 71, 71, 1917, 71, 1922, 71, 1925, 71, 71, 1926, - 71, 1923, 1930, 71, 71, 1931, 1924, 71, 71, 1929, - 1934, 71, 71, 1927, 71, 1936, 71, 1935, 71, 1932, - 1937, 71, 1939, 1938, 1928, 71, 1933, 71, 71, 1940, - 71, 1941, 71, 71, 1942, 71, 71, 1944, 71, 71, - 71, 1947, 1950, 71, 1951, 71, 71, 71, 71, 71, - 1946, 1953, 1943, 71, 1949, 71, 1945, 1948, 1957, 71, + 1900, 1902, 71, 71, 71, 71, 1912, 71, 1907, 1906, + 71, 1908, 1914, 71, 1911, 71, 71, 71, 1909, 1913, + 1916, 1919, 1917, 71, 1921, 1922, 1920, 71, 71, 1910, + 71, 71, 71, 71, 1915, 1923, 1918, 1926, 71, 71, + 1927, 1924, 71, 1931, 71, 71, 1932, 71, 1925, 71, + 1935, 1930, 71, 71, 1928, 71, 71, 1936, 1939, 1933, + 71, 1937, 1938, 71, 1940, 1929, 71, 1934, 71, 71, + 71, 71, 1941, 1943, 71, 1942, 1945, 71, 71, 71, + 71, 1951, 71, 1948, 71, 71, 71, 71, 1952, 71, + 71, 1944, 1947, 71, 1954, 1950, 71, 1946, 1949, 1956, - 1952, 1955, 1958, 71, 71, 71, 71, 1956, 71, 71, - 71, 71, 1959, 1954, 1960, 1969, 71, 71, 1961, 71, - 1970, 1966, 71, 71, 71, 71, 2737, 1964, 1962, 1983, - 1963, 1965, 1967, 71, 1968, 1971, 71, 1972, 1973, 71, - 1974, 1975, 71, 1976, 71, 71, 1979, 71, 1977, 1978, - 1982, 71, 71, 71, 71, 71, 1980, 1984, 71, 1981, - 1988, 71, 1989, 71, 1991, 71, 71, 1987, 1993, 71, - 71, 1995, 71, 1985, 1986, 1996, 71, 1990, 71, 71, - 71, 71, 2000, 71, 1992, 1994, 1999, 2002, 71, 71, - 71, 71, 1997, 71, 2005, 71, 2004, 71, 1998, 2001, + 1953, 1958, 1959, 71, 71, 71, 71, 71, 71, 1957, + 71, 71, 1955, 1960, 71, 71, 1963, 1970, 71, 71, + 71, 71, 1967, 1961, 1971, 1962, 71, 1965, 71, 2749, + 1969, 1964, 1966, 1972, 1978, 1968, 71, 1975, 1976, 71, + 1973, 1974, 1977, 71, 71, 71, 1980, 71, 1983, 71, + 71, 71, 71, 71, 71, 1984, 1981, 1979, 1985, 1982, + 1989, 71, 1990, 71, 71, 71, 1988, 1992, 71, 71, + 71, 1986, 1987, 1994, 71, 1996, 71, 1997, 71, 71, + 1995, 71, 71, 1991, 1998, 71, 2000, 1993, 2001, 71, + 2003, 71, 71, 71, 71, 2006, 71, 2007, 1999, 2005, - 71, 2006, 2008, 71, 71, 2012, 71, 2003, 71, 71, - 2010, 71, 2009, 2017, 71, 2016, 2007, 2013, 71, 71, - 71, 2021, 71, 2011, 2015, 71, 71, 71, 71, 71, - 2026, 2014, 71, 2023, 2019, 2020, 71, 2018, 71, 71, - 71, 2024, 2028, 71, 2029, 2022, 71, 2027, 2030, 71, - 71, 2031, 2033, 71, 2025, 2035, 71, 71, 2036, 2039, - 71, 2032, 2037, 2041, 71, 71, 71, 71, 71, 71, - 2034, 2038, 2042, 71, 71, 71, 71, 2045, 71, 2044, - 2050, 2040, 2046, 2047, 2048, 71, 71, 71, 71, 2043, - 2049, 2051, 71, 2054, 2053, 2055, 71, 2056, 2052, 71, + 71, 2002, 71, 2004, 2009, 71, 2013, 71, 71, 71, + 71, 71, 2008, 2010, 71, 2011, 2018, 71, 2017, 71, + 71, 2012, 2022, 71, 71, 2016, 71, 71, 2014, 71, + 2019, 71, 2015, 2024, 2020, 2021, 71, 2027, 71, 71, + 2028, 2025, 71, 71, 2023, 2029, 71, 2032, 71, 71, + 71, 2031, 71, 2033, 71, 2026, 71, 71, 2030, 2037, + 71, 2038, 2035, 2041, 71, 2039, 71, 71, 2043, 71, + 71, 2034, 2040, 2036, 71, 2044, 2114, 71, 71, 71, + 2046, 71, 71, 2052, 71, 2042, 2047, 2048, 2049, 71, + 2050, 2045, 71, 71, 71, 2056, 2051, 2053, 71, 2057, - 71, 71, 2062, 71, 71, 2057, 71, 2737, 2058, 71, - 2059, 71, 71, 71, 71, 2060, 2061, 2069, 2064, 2063, - 71, 71, 2066, 2065, 71, 2068, 2070, 2067, 2073, 71, - 71, 2074, 2075, 71, 71, 2078, 2072, 2076, 71, 2079, - 2071, 71, 71, 2077, 71, 71, 2080, 71, 71, 2082, - 71, 71, 71, 2086, 71, 71, 2081, 2088, 2084, 2087, - 2089, 71, 2083, 71, 71, 71, 71, 71, 2090, 71, - 2085, 2093, 71, 2091, 2094, 71, 71, 71, 71, 71, - 2098, 2101, 71, 2100, 71, 2092, 2095, 71, 2102, 2097, - 71, 71, 2096, 2106, 71, 2104, 2105, 2099, 2107, 71, + 71, 2055, 71, 2058, 2054, 71, 71, 2064, 71, 71, + 71, 2059, 71, 71, 71, 71, 2062, 71, 2060, 2066, + 2061, 71, 2063, 71, 2065, 2067, 2071, 2070, 2068, 2069, + 71, 2075, 71, 2074, 71, 2072, 2110, 2073, 71, 2076, + 2077, 71, 71, 71, 2080, 2078, 2081, 71, 2079, 71, + 71, 71, 71, 2082, 71, 71, 2084, 71, 71, 2088, + 71, 2083, 71, 2085, 2089, 2090, 2091, 71, 2087, 71, + 71, 2086, 71, 71, 2092, 71, 71, 2095, 71, 2093, + 2096, 71, 71, 71, 71, 2103, 2100, 71, 71, 2102, + 71, 71, 2094, 2104, 71, 2099, 2097, 71, 2098, 2108, - 71, 71, 2103, 2108, 71, 2110, 71, 2115, 2109, 2111, - 71, 2113, 71, 71, 71, 71, 2114, 2117, 71, 2119, - 71, 71, 71, 2118, 71, 71, 2112, 2116, 71, 2122, - 2123, 2124, 71, 2125, 71, 2126, 2121, 71, 2127, 2120, - 71, 71, 71, 71, 2128, 71, 2135, 2130, 2133, 71, - 71, 71, 71, 71, 71, 2132, 2138, 71, 71, 2134, - 71, 2141, 2129, 2737, 2131, 2142, 71, 71, 2137, 2136, - 71, 71, 2143, 2139, 71, 2144, 2140, 71, 71, 2145, - 2149, 71, 71, 2148, 71, 2146, 2150, 71, 2147, 2151, - 71, 2152, 71, 71, 2153, 71, 2155, 71, 2156, 71, + 71, 2117, 2107, 2101, 2111, 71, 2105, 71, 2109, 71, + 2106, 71, 2112, 71, 71, 2115, 2113, 71, 71, 2119, + 71, 2116, 71, 2121, 71, 71, 2128, 2122, 71, 71, + 2118, 2120, 71, 2124, 2125, 2126, 71, 2127, 71, 2123, + 71, 2129, 71, 71, 71, 71, 71, 71, 2137, 2132, + 2135, 71, 71, 71, 71, 2136, 2140, 71, 2130, 2134, + 71, 71, 71, 2147, 2133, 2131, 71, 2143, 2139, 71, + 2138, 2144, 71, 71, 2145, 71, 71, 71, 2146, 2141, + 2142, 71, 2152, 71, 2153, 71, 2151, 2154, 71, 2148, + 2149, 2155, 71, 71, 71, 71, 2158, 2150, 71, 2159, - 71, 71, 2154, 2161, 71, 2157, 2162, 71, 2163, 71, - 71, 2158, 71, 71, 71, 71, 71, 2160, 71, 2165, - 2159, 2168, 2164, 2170, 71, 2166, 71, 2171, 71, 71, - 71, 71, 71, 2177, 2167, 2169, 71, 71, 71, 71, - 71, 71, 2174, 2737, 71, 2176, 2178, 2184, 2173, 71, - 71, 2179, 2172, 2180, 2175, 2186, 71, 2181, 2188, 71, - 71, 2187, 2182, 2185, 2183, 2189, 71, 71, 2190, 71, - 2191, 71, 2192, 71, 71, 71, 71, 71, 2193, 71, - 71, 71, 71, 2203, 2194, 71, 2204, 71, 2200, 71, - 2207, 71, 71, 2195, 2197, 2196, 71, 2208, 71, 2198, + 71, 71, 71, 71, 71, 2156, 2164, 71, 2165, 71, + 2166, 71, 2157, 2160, 2161, 71, 2167, 71, 71, 2163, + 2162, 71, 2168, 71, 2173, 71, 2171, 71, 71, 2169, + 71, 71, 71, 71, 71, 2180, 2174, 71, 2170, 71, + 71, 71, 71, 2172, 2177, 71, 2181, 2179, 71, 71, + 2176, 2187, 2749, 71, 2175, 2182, 2178, 2183, 2189, 2184, + 71, 2185, 71, 2188, 71, 2190, 2191, 71, 2186, 2192, + 71, 71, 2193, 71, 2194, 71, 2195, 71, 71, 71, + 2196, 71, 71, 2198, 71, 71, 71, 71, 2197, 71, + 2206, 2207, 71, 2203, 2210, 71, 71, 2200, 2199, 71, - 2199, 2201, 71, 2202, 71, 2206, 71, 71, 71, 71, - 2209, 2205, 71, 2211, 71, 2217, 71, 2218, 71, 2212, - 2210, 2219, 71, 71, 2221, 2213, 2214, 71, 2215, 71, - 71, 71, 71, 2216, 2223, 71, 71, 2226, 2227, 71, - 2220, 2229, 2222, 2228, 71, 2230, 71, 71, 71, 71, - 2224, 2225, 71, 71, 2231, 71, 2232, 71, 2237, 2238, - 71, 71, 2241, 71, 71, 71, 71, 2233, 2242, 2234, - 2244, 2235, 2239, 2236, 2245, 71, 71, 71, 71, 2240, - 2243, 2249, 71, 71, 2251, 71, 71, 2253, 71, 2246, - 71, 71, 2255, 71, 71, 2250, 2254, 2247, 2248, 71, + 2211, 71, 2202, 2201, 2205, 2204, 71, 71, 2209, 2208, + 71, 71, 71, 71, 2212, 71, 71, 2214, 2220, 71, + 2221, 71, 2215, 71, 2213, 71, 71, 2222, 71, 2216, + 2217, 2218, 2219, 71, 2223, 71, 71, 71, 2224, 2230, + 2226, 2229, 2231, 71, 2225, 71, 2227, 2232, 2228, 2233, + 71, 71, 71, 71, 71, 71, 71, 71, 2240, 2241, + 71, 2235, 71, 71, 2244, 71, 71, 71, 71, 71, + 2234, 2245, 2236, 2247, 2237, 2238, 71, 2239, 2242, 71, + 2243, 2246, 2248, 71, 2252, 71, 71, 71, 2250, 2249, + 2254, 71, 2256, 71, 71, 71, 71, 71, 2253, 2251, - 2256, 71, 71, 71, 71, 2252, 71, 2258, 2262, 71, - 71, 2260, 2257, 2261, 2259, 2264, 71, 71, 2263, 71, - 2265, 2266, 71, 71, 71, 2267, 71, 71, 2271, 71, - 2269, 2272, 2274, 71, 2275, 71, 2276, 71, 2268, 2270, - 71, 71, 2273, 2280, 71, 2277, 71, 71, 2282, 71, - 71, 2281, 71, 2285, 71, 2278, 71, 2284, 2332, 2279, - 2286, 71, 2288, 71, 71, 2283, 2290, 2289, 71, 2287, - 71, 2291, 71, 2292, 2294, 2293, 71, 71, 71, 71, - 71, 2295, 71, 2296, 71, 2297, 71, 71, 71, 2300, - 2299, 2303, 2302, 71, 2298, 71, 71, 71, 2301, 71, + 2257, 2259, 71, 71, 2260, 71, 2255, 71, 2258, 71, + 2262, 71, 71, 2266, 71, 2749, 2261, 71, 2263, 71, + 2264, 2265, 2267, 2269, 2268, 71, 71, 71, 71, 71, + 2270, 71, 71, 71, 2271, 2273, 2272, 2275, 2276, 2278, + 71, 2279, 71, 2274, 2277, 71, 71, 71, 2284, 2282, + 71, 2281, 2280, 71, 71, 2285, 71, 2286, 71, 2289, + 71, 2290, 71, 2288, 71, 2283, 2292, 71, 2287, 71, + 2294, 2749, 2293, 71, 71, 2295, 71, 2291, 2296, 2297, + 2298, 71, 71, 71, 71, 2299, 71, 2300, 71, 71, + 71, 71, 2301, 71, 2304, 71, 2303, 71, 2306, 2302, - 2304, 2305, 71, 71, 71, 2310, 71, 71, 2308, 71, - 2307, 2306, 2309, 2315, 71, 2311, 71, 71, 71, 2319, - 71, 2312, 71, 71, 71, 71, 2317, 2313, 2314, 2323, - 2324, 71, 71, 2318, 2325, 2316, 2326, 71, 2321, 71, - 71, 2320, 71, 71, 2322, 2330, 71, 2327, 2328, 71, - 2331, 2329, 71, 2334, 2335, 71, 2336, 71, 2337, 71, - 2338, 71, 71, 71, 2333, 71, 2341, 2342, 71, 2343, - 71, 71, 71, 71, 2344, 2347, 71, 71, 2348, 2349, - 71, 71, 2339, 2340, 71, 2345, 2351, 71, 2354, 71, - 71, 2346, 2355, 71, 71, 71, 2350, 71, 71, 2356, + 2307, 71, 2305, 71, 71, 71, 2308, 71, 2309, 2310, + 71, 2314, 71, 71, 2312, 2317, 2313, 2311, 71, 2319, + 71, 2315, 71, 71, 71, 2323, 71, 71, 71, 71, + 71, 71, 2316, 2321, 2327, 2328, 71, 2318, 2322, 2329, + 2333, 2320, 71, 2325, 71, 71, 2324, 2330, 71, 2326, + 2331, 71, 71, 71, 71, 71, 2332, 2334, 2335, 71, + 2338, 2339, 71, 2340, 71, 71, 2336, 2749, 2337, 2341, + 71, 2342, 71, 2344, 71, 2343, 71, 2347, 2345, 71, + 2348, 71, 2349, 71, 71, 2346, 71, 2350, 2353, 71, + 71, 2354, 2352, 2355, 71, 71, 2357, 71, 71, 2351, - 2357, 71, 2352, 2353, 2363, 2358, 71, 2362, 71, 71, - 71, 71, 71, 2359, 2367, 2365, 71, 2360, 2361, 2366, - 71, 71, 71, 71, 2368, 2369, 2371, 71, 71, 71, - 71, 71, 2374, 2364, 2378, 71, 2381, 2370, 2372, 2373, - 71, 2382, 71, 71, 2377, 71, 2375, 71, 2380, 2376, - 2379, 71, 2384, 71, 2385, 71, 2386, 71, 2387, 71, - 71, 2388, 2383, 71, 2389, 71, 71, 2390, 71, 2395, - 71, 71, 2392, 71, 2396, 2398, 71, 2400, 71, 71, - 2399, 71, 71, 71, 2397, 2393, 2391, 2401, 2394, 71, - 2402, 2404, 71, 2405, 71, 2408, 71, 2403, 2407, 71, + 71, 2360, 2361, 71, 71, 71, 2363, 71, 2362, 71, + 2356, 2364, 71, 71, 2359, 71, 2358, 2369, 71, 71, + 71, 2368, 71, 71, 2371, 2372, 71, 2373, 2365, 2366, + 71, 71, 71, 2367, 2375, 2377, 71, 71, 2374, 71, + 71, 71, 2380, 2370, 2376, 2384, 71, 71, 71, 71, + 71, 2390, 2749, 2378, 2379, 2383, 2386, 2381, 2387, 71, + 2382, 71, 2391, 2388, 71, 71, 2385, 71, 2389, 71, + 2392, 71, 2393, 71, 71, 2394, 71, 71, 2395, 2401, + 71, 71, 71, 2398, 2402, 2396, 2404, 71, 71, 2406, + 71, 71, 71, 2397, 71, 2405, 2399, 2400, 71, 2407, - 2409, 71, 71, 2406, 2412, 71, 71, 71, 2411, 2410, - 71, 2413, 71, 71, 71, 71, 71, 2421, 2414, 2416, - 2420, 71, 71, 71, 2418, 71, 2424, 2423, 71, 2425, - 2422, 2737, 2415, 2417, 71, 2419, 2426, 71, 2427, 71, - 2428, 71, 2431, 2429, 71, 2433, 71, 71, 2430, 2432, - 71, 71, 2434, 2436, 71, 2435, 71, 71, 71, 2441, - 71, 71, 2439, 71, 2437, 71, 2443, 71, 71, 2447, - 71, 71, 71, 71, 71, 71, 2440, 2438, 2445, 2450, - 2444, 2451, 71, 71, 2448, 2442, 2449, 71, 2446, 71, - 2452, 2454, 2455, 2457, 71, 71, 2459, 71, 2460, 71, + 2403, 2408, 2410, 71, 71, 71, 2414, 2412, 2411, 2409, + 71, 2415, 71, 71, 2418, 71, 71, 71, 71, 71, + 2413, 71, 2417, 2416, 71, 71, 2420, 71, 71, 2428, + 2421, 71, 71, 2423, 2419, 71, 2427, 2425, 71, 71, + 2430, 2424, 71, 2431, 2422, 2455, 2432, 2429, 2426, 2433, + 71, 2434, 71, 2435, 71, 71, 71, 71, 71, 2437, + 2440, 71, 2439, 2441, 2436, 71, 71, 2443, 71, 71, + 2442, 71, 2448, 71, 71, 2438, 2446, 71, 71, 2444, + 2450, 71, 71, 71, 2454, 71, 71, 71, 71, 71, + 2445, 2447, 2457, 71, 71, 2458, 2451, 2452, 71, 2449, - 71, 2453, 2462, 71, 71, 71, 2465, 71, 71, 71, - 2464, 71, 71, 2469, 2458, 2456, 71, 71, 2472, 71, - 2463, 2461, 2473, 71, 71, 2475, 71, 71, 2466, 71, - 2468, 2470, 2467, 71, 71, 71, 2477, 71, 2471, 2482, - 71, 71, 2484, 2737, 2474, 2476, 2480, 71, 71, 2478, - 2483, 71, 2479, 2487, 2489, 2481, 71, 2486, 2490, 71, - 2485, 2488, 71, 71, 71, 71, 71, 2495, 2492, 71, - 2493, 2498, 71, 71, 2491, 2499, 71, 71, 71, 71, - 2502, 71, 2503, 71, 71, 2494, 2496, 2497, 2501, 2504, - 71, 71, 2505, 2507, 71, 2506, 2500, 2508, 71, 2509, + 2456, 71, 2461, 2453, 71, 2459, 2462, 2464, 71, 2466, + 71, 71, 2460, 2467, 71, 2469, 71, 71, 2472, 71, + 71, 71, 71, 2465, 2463, 2471, 71, 71, 71, 2476, + 71, 71, 2468, 2470, 71, 2478, 2480, 71, 2481, 71, + 2477, 2473, 2483, 71, 71, 2474, 2475, 71, 71, 71, + 71, 2490, 71, 2479, 2482, 71, 2485, 71, 2491, 71, + 2492, 2488, 2484, 71, 2486, 2495, 71, 2487, 2749, 2493, + 2489, 71, 2496, 71, 71, 2498, 71, 2497, 2749, 71, + 71, 71, 71, 2494, 2499, 2500, 2503, 2501, 2506, 71, + 2507, 71, 71, 71, 71, 2502, 2504, 2505, 2510, 71, - 71, 71, 2511, 71, 71, 71, 2510, 71, 2514, 71, - 2512, 2515, 71, 71, 2519, 71, 71, 2521, 71, 2516, - 71, 2520, 2518, 2522, 71, 2524, 2513, 71, 71, 2517, - 71, 71, 2526, 71, 2523, 2525, 71, 71, 71, 71, - 71, 2527, 2530, 71, 2532, 71, 71, 71, 2528, 71, - 2529, 2531, 71, 2533, 71, 71, 71, 2545, 71, 2534, - 2542, 71, 71, 2535, 2737, 2537, 2536, 2566, 2538, 71, - 2541, 2539, 2540, 2547, 2544, 71, 2543, 2546, 71, 2548, - 71, 2549, 71, 2550, 2551, 71, 71, 2553, 71, 2552, - 71, 2556, 71, 2554, 71, 71, 71, 71, 71, 2558, + 2511, 71, 71, 2509, 71, 71, 71, 2512, 2515, 71, + 2514, 2518, 2508, 2516, 71, 2517, 71, 71, 2513, 2519, + 71, 71, 71, 2522, 2523, 71, 71, 71, 71, 2527, + 71, 71, 71, 71, 2530, 71, 2520, 2526, 2529, 2533, + 2524, 2531, 71, 2521, 71, 71, 2532, 2525, 2535, 71, + 2528, 71, 2534, 71, 71, 71, 2536, 71, 71, 71, + 2539, 71, 71, 71, 2541, 71, 71, 2542, 71, 2540, + 71, 71, 71, 2537, 2538, 71, 2551, 2554, 71, 71, + 2543, 2547, 2544, 2545, 2546, 2548, 2549, 2659, 2553, 2555, + 71, 2550, 2552, 71, 2557, 71, 71, 2556, 2558, 71, - 2737, 2557, 71, 2562, 2555, 2563, 71, 2561, 2564, 71, - 71, 2559, 71, 2569, 2571, 2560, 71, 71, 2570, 71, - 71, 2567, 71, 71, 2568, 2565, 71, 71, 2575, 2578, - 71, 2576, 2573, 71, 2580, 71, 2581, 71, 2579, 2582, - 71, 2572, 71, 2574, 2583, 71, 2577, 2585, 71, 2586, - 71, 2584, 71, 71, 71, 2589, 71, 2591, 71, 71, - 71, 71, 71, 2593, 71, 2588, 2598, 2587, 71, 2595, - 71, 2590, 71, 2597, 71, 71, 71, 2592, 2599, 2600, - 2596, 71, 71, 71, 71, 71, 2605, 2594, 71, 2607, - 71, 71, 2603, 71, 2601, 71, 71, 2604, 2612, 2602, + 2559, 2560, 71, 71, 2562, 71, 2561, 71, 71, 2566, + 71, 71, 71, 2565, 2563, 71, 2568, 71, 2567, 71, + 2749, 2564, 71, 2572, 2573, 71, 2574, 71, 2571, 71, + 2569, 71, 2579, 71, 2581, 2570, 2576, 2580, 71, 71, + 71, 71, 2577, 71, 2575, 2578, 71, 71, 2585, 71, + 2588, 71, 2586, 71, 2590, 71, 2583, 71, 2589, 2591, + 71, 2592, 71, 71, 2582, 2593, 71, 2584, 2587, 2595, + 71, 71, 2594, 2597, 71, 71, 71, 2596, 71, 2600, + 2602, 71, 71, 71, 71, 71, 2598, 2599, 2604, 71, + 2606, 2601, 71, 2609, 71, 2608, 71, 71, 71, 71, - 71, 71, 2613, 71, 2609, 71, 2611, 2606, 2608, 71, - 2615, 2614, 71, 71, 2610, 71, 2616, 71, 71, 71, - 2617, 2625, 71, 2618, 71, 71, 2627, 71, 2619, 71, - 2621, 71, 2628, 2624, 2626, 2629, 71, 2623, 2620, 2622, - 2630, 71, 71, 2631, 71, 2633, 71, 71, 71, 2632, - 2638, 2634, 2635, 71, 71, 71, 71, 2641, 71, 71, - 71, 71, 71, 2637, 2645, 71, 71, 2639, 2647, 2636, - 2643, 71, 2646, 71, 2640, 71, 2649, 2650, 2642, 2644, - 2651, 2648, 71, 71, 2654, 71, 2652, 71, 71, 71, - 71, 71, 71, 2657, 2653, 71, 2659, 71, 71, 71, + 2603, 2611, 2607, 71, 71, 2617, 71, 71, 2610, 2605, + 2616, 71, 71, 71, 2614, 71, 2612, 2619, 71, 2615, + 71, 2613, 71, 71, 71, 2625, 71, 2624, 71, 2621, + 71, 2623, 2620, 71, 2618, 71, 2627, 71, 71, 2626, + 71, 2622, 71, 2628, 71, 2629, 2630, 2637, 71, 2631, + 71, 2639, 71, 2633, 71, 2640, 2636, 2641, 71, 2638, + 71, 2634, 2632, 71, 2635, 2642, 71, 71, 71, 71, + 2645, 71, 71, 2646, 2647, 2650, 71, 71, 71, 2643, + 71, 71, 71, 2644, 2653, 71, 71, 2649, 2657, 71, + 2651, 71, 2658, 2655, 71, 2661, 2648, 2652, 2662, 2654, - 71, 71, 2656, 2664, 71, 2665, 2737, 2655, 2661, 71, - 2658, 2660, 2662, 2668, 71, 71, 2663, 2737, 2670, 2666, - 2669, 71, 2671, 2667, 71, 71, 71, 71, 2675, 2676, - 2672, 2673, 2674, 71, 71, 71, 2678, 71, 2677, 71, - 71, 71, 71, 2679, 2684, 71, 71, 2681, 71, 2687, - 71, 2688, 71, 2680, 71, 71, 71, 71, 71, 2686, - 2682, 2683, 2691, 2689, 2685, 71, 2690, 71, 2695, 71, - 2696, 2694, 71, 71, 2692, 2693, 71, 2699, 71, 2701, - 71, 2702, 2697, 71, 71, 71, 2706, 71, 2703, 71, - 71, 2704, 2700, 71, 2707, 2708, 2709, 71, 2698, 71, + 2656, 71, 71, 71, 71, 2660, 2666, 71, 2663, 71, + 71, 71, 71, 71, 71, 2664, 2669, 71, 2671, 71, + 71, 71, 2665, 71, 2668, 71, 2676, 71, 2677, 2667, + 2673, 2670, 2674, 2672, 2680, 71, 71, 71, 2682, 2675, + 71, 2681, 2684, 2678, 71, 2685, 2679, 71, 2683, 71, + 71, 2688, 71, 71, 2686, 2690, 71, 71, 2689, 71, + 71, 71, 71, 2691, 2696, 71, 71, 2693, 71, 2687, + 71, 2692, 71, 2699, 2700, 71, 71, 71, 71, 2698, + 2694, 2695, 2703, 71, 2697, 2701, 71, 2704, 2702, 71, + 2707, 2708, 71, 71, 71, 2711, 2706, 2705, 71, 71, - 71, 71, 71, 71, 2705, 71, 2710, 2711, 2713, 2712, - 2715, 71, 71, 71, 71, 71, 2721, 2717, 2718, 71, - 2714, 2716, 2722, 71, 2719, 71, 71, 2725, 2726, 71, - 71, 2728, 71, 2720, 2729, 71, 71, 2727, 2723, 71, - 71, 71, 71, 2730, 2724, 2731, 2732, 2735, 71, 2736, - 71, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2733, 2737, - 2737, 2734, 43, 43, 43, 43, 43, 43, 43, 48, - 48, 48, 48, 48, 48, 48, 53, 53, 53, 53, - 53, 53, 53, 59, 59, 59, 59, 59, 59, 59, - 64, 64, 64, 64, 64, 64, 64, 74, 74, 2737, + 2713, 71, 2714, 71, 71, 2709, 71, 71, 2715, 2718, + 71, 2716, 2719, 71, 71, 2720, 71, 2712, 71, 2710, + 2721, 71, 71, 2722, 71, 2717, 71, 2727, 71, 2723, + 71, 2725, 71, 2724, 71, 2729, 71, 2726, 71, 2730, + 71, 2733, 71, 2728, 2734, 71, 71, 2737, 2738, 71, + 2749, 2731, 71, 2740, 71, 2732, 71, 2735, 71, 2739, + 71, 2736, 2741, 71, 71, 2742, 71, 2747, 71, 2743, + 2749, 2744, 2748, 71, 2749, 2745, 2749, 2749, 2749, 2746, + 43, 43, 43, 43, 43, 43, 43, 48, 48, 48, + 48, 48, 48, 48, 53, 53, 53, 53, 53, 53, - 74, 74, 74, 74, 140, 140, 2737, 2737, 2737, 140, - 140, 142, 142, 2737, 2737, 142, 2737, 142, 144, 2737, - 2737, 2737, 2737, 2737, 144, 147, 147, 2737, 2737, 2737, - 147, 147, 149, 2737, 2737, 2737, 2737, 2737, 149, 151, - 151, 2737, 151, 151, 151, 151, 75, 75, 2737, 75, - 75, 75, 75, 13, 2737, 2737, 2737, 2737, 2737, 2737, - 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, - 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, - 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, - 2737, 2737, 2737, 2737 + 53, 59, 59, 59, 59, 59, 59, 59, 64, 64, + 64, 64, 64, 64, 64, 74, 74, 2749, 74, 74, + 74, 74, 140, 140, 2749, 2749, 2749, 140, 140, 142, + 142, 2749, 2749, 142, 2749, 142, 144, 2749, 2749, 2749, + 2749, 2749, 144, 147, 147, 2749, 2749, 2749, 147, 147, + 149, 2749, 2749, 2749, 2749, 2749, 149, 151, 151, 2749, + 151, 151, 151, 151, 75, 75, 2749, 75, 75, 75, + 75, 13, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, + 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, + 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, + 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, + 2749, 2749 } ; -static yyconst flex_int16_t yy_chk[5395] = +static const flex_int16_t yy_chk[5413] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1939,7 +1935,7 @@ static yyconst flex_int16_t yy_chk[5395] = 5, 3, 6, 20, 4, 20, 20, 5, 20, 6, 7, 7, 7, 7, 20, 7, 8, 8, 8, 8, 29, 8, 7, 9, 9, 9, 22, 22, 8, 10, - 10, 10, 15, 25, 9, 29, 15, 25, 2743, 31, + 10, 10, 15, 25, 9, 29, 15, 25, 2755, 31, 10, 11, 11, 11, 11, 11, 11, 19, 79, 19, 19, 30, 19, 11, 31, 79, 30, 25, 19, 19, @@ -2322,209 +2318,211 @@ static yyconst flex_int16_t yy_chk[5395] = 1720, 1709, 1722, 1721, 1723, 1716, 1723, 1722, 1715, 1721, 1724, 1725, 1725, 1726, 1719, 1727, 1727, 1732, 1724, 1729, 1720, 1728, 1728, 1730, 1734, 1726, 1724, 1731, 1729, 1731, - 1733, 1733, 1730, 1734, 1735, 1730, 1737, 1738, 1732, 1739, - 1741, 1742, 1738, 1746, 1739, 1744, 1735, 1745, 1737, 1743, - 1743, 1759, 1747, 1741, 1748, 1750, 1751, 1752, 1756, 1746, - 1761, 1742, 1752, 1744, 1756, 1745, 1747, 1750, 1751, 1748, + 1735, 1733, 1730, 1734, 1737, 1730, 1733, 1733, 1732, 1738, + 1739, 1741, 1735, 1742, 1738, 1739, 1737, 1743, 1743, 1744, + 1745, 1747, 1750, 1746, 1741, 1748, 1752, 1753, 1759, 1751, + 1756, 1752, 1753, 1742, 1750, 1747, 1756, 1744, 1745, 1746, - 1753, 1760, 1758, 1762, 1759, 1753, 1766, 1756, 1758, 1763, - 1763, 1764, 1762, 1765, 1765, 1761, 1760, 1767, 1768, 1769, - 1764, 1767, 1770, 1768, 1771, 1766, 1775, 1770, 1770, 1772, - 1771, 1773, 1769, 1774, 1773, 1772, 1778, 1778, 1779, 1779, - 1780, 1774, 1781, 1781, 1782, 1782, 1775, 1783, 1784, 1780, - 1785, 1793, 1786, 1779, 1787, 1787, 1785, 1786, 1789, 1783, - 1788, 1788, 1790, 1789, 1779, 1792, 1784, 1796, 1790, 1792, - 1794, 1793, 1797, 1798, 1794, 1799, 1800, 1797, 1802, 1801, - 1804, 1800, 1803, 1803, 1804, 1805, 1806, 1807, 1809, 1808, - 1799, 1806, 1796, 1810, 1802, 1814, 1798, 1801, 1810, 1815, + 1748, 1751, 1758, 1760, 1761, 1762, 1763, 1763, 1758, 1756, + 1764, 1759, 1765, 1765, 1762, 1766, 1767, 1768, 1760, 1764, + 1767, 1770, 1768, 1769, 1771, 1772, 1770, 1770, 1775, 1761, + 1771, 1772, 1773, 1774, 1766, 1773, 1769, 1778, 1778, 1779, + 1779, 1774, 1780, 1781, 1781, 1782, 1782, 1783, 1775, 1784, + 1785, 1780, 1786, 1789, 1779, 1793, 1785, 1786, 1789, 1783, + 1787, 1787, 1788, 1788, 1790, 1779, 1796, 1784, 1792, 1794, + 1790, 1797, 1792, 1794, 1798, 1793, 1797, 1799, 1800, 1802, + 1801, 1803, 1803, 1800, 1804, 1805, 1807, 1808, 1804, 1806, + 1809, 1796, 1799, 1816, 1806, 1802, 1810, 1798, 1801, 1808, - 1805, 1808, 1811, 1811, 1813, 1816, 1817, 1809, 1818, 1820, - 1819, 1821, 1813, 1807, 1814, 1824, 1824, 1825, 1815, 1823, - 1825, 1820, 1826, 1827, 1837, 1828, 0, 1818, 1816, 1837, - 1817, 1819, 1821, 1832, 1823, 1826, 1833, 1827, 1828, 1829, - 1829, 1830, 1830, 1831, 1831, 1834, 1834, 1835, 1832, 1833, - 1836, 1836, 1839, 1840, 1841, 1842, 1835, 1839, 1845, 1835, - 1843, 1843, 1844, 1844, 1846, 1846, 1847, 1842, 1848, 1848, - 1849, 1850, 1850, 1840, 1841, 1851, 1851, 1845, 1852, 1853, - 1857, 1855, 1856, 1856, 1847, 1849, 1855, 1858, 1858, 1859, - 1860, 1861, 1852, 1864, 1861, 1865, 1860, 1869, 1853, 1857, + 1805, 1810, 1811, 1811, 1814, 1813, 1815, 1817, 1818, 1809, + 1820, 1819, 1807, 1813, 1821, 1823, 1816, 1824, 1824, 1832, + 1826, 1825, 1820, 1814, 1825, 1815, 1827, 1818, 1828, 0, + 1823, 1817, 1819, 1826, 1832, 1821, 1829, 1829, 1830, 1830, + 1827, 1828, 1831, 1831, 1833, 1834, 1834, 1835, 1836, 1836, + 1837, 1840, 1841, 1839, 1842, 1837, 1835, 1833, 1839, 1835, + 1843, 1843, 1844, 1844, 1845, 1849, 1842, 1846, 1846, 1847, + 1852, 1840, 1841, 1848, 1848, 1850, 1850, 1851, 1851, 1853, + 1849, 1855, 1857, 1845, 1852, 1859, 1855, 1847, 1856, 1856, + 1858, 1858, 1861, 1860, 1864, 1861, 1862, 1862, 1853, 1860, - 1862, 1862, 1863, 1863, 1866, 1867, 1867, 1859, 1870, 1871, - 1865, 1872, 1864, 1873, 1873, 1872, 1862, 1869, 1874, 1875, - 1876, 1878, 1878, 1866, 1871, 1879, 1880, 1881, 1882, 1883, - 1883, 1870, 1887, 1880, 1875, 1876, 1890, 1874, 1884, 1891, - 1885, 1881, 1885, 1888, 1887, 1879, 1889, 1884, 1888, 1892, - 1893, 1889, 1891, 1895, 1882, 1893, 1897, 1896, 1895, 1898, - 1899, 1890, 1896, 1900, 1902, 1898, 1903, 1901, 1904, 1900, - 1892, 1897, 1901, 1905, 1906, 1907, 1908, 1904, 1912, 1903, - 1909, 1899, 1905, 1906, 1907, 1914, 1909, 1910, 1918, 1902, - 1908, 1910, 1915, 1915, 1914, 1916, 1917, 1917, 1912, 1920, + 1865, 1857, 1866, 1859, 1863, 1863, 1867, 1867, 1869, 1870, + 1871, 1874, 1862, 1864, 1872, 1865, 1873, 1873, 1872, 1875, + 1876, 1866, 1878, 1878, 1879, 1871, 1880, 1881, 1869, 1882, + 1874, 1884, 1870, 1880, 1875, 1876, 1883, 1883, 1886, 1888, + 1884, 1881, 1889, 1885, 1879, 1885, 1891, 1889, 1890, 1892, + 1981, 1888, 1893, 1890, 1894, 1882, 1896, 1898, 1886, 1894, + 1897, 1896, 1892, 1899, 1900, 1897, 1903, 1904, 1901, 1899, + 1902, 1891, 1898, 1893, 1901, 1902, 1981, 1905, 1906, 1907, + 1904, 1908, 1909, 1910, 1913, 1900, 1905, 1906, 1907, 1910, + 1908, 1903, 1915, 1911, 1916, 1916, 1909, 1911, 1919, 1917, - 1921, 1916, 1922, 1922, 1923, 1917, 1927, 0, 1918, 1924, - 1918, 1926, 1928, 1929, 1931, 1920, 1921, 1931, 1924, 1923, - 1933, 1932, 1927, 1926, 1934, 1929, 1932, 1928, 1935, 1935, - 1936, 1936, 1938, 1938, 1939, 1941, 1934, 1939, 1940, 1942, - 1933, 1941, 1944, 1940, 1947, 1942, 1943, 1943, 1945, 1945, - 1946, 1948, 1949, 1949, 1952, 1951, 1944, 1952, 1947, 1951, - 1953, 1953, 1946, 1954, 1955, 1956, 1960, 1957, 1954, 1959, - 1948, 1957, 1961, 1955, 1959, 1962, 1963, 1964, 1965, 1970, - 1963, 1966, 1967, 1965, 1968, 1956, 1960, 1966, 1967, 1962, - 1973, 1971, 1961, 1972, 1977, 1970, 1971, 1964, 1973, 1972, + 1921, 1915, 1918, 1918, 1913, 1917, 1922, 1923, 1923, 1924, + 1925, 1918, 1928, 1927, 1929, 1930, 1921, 1934, 1919, 1925, + 1919, 1935, 1922, 1932, 1924, 1927, 1932, 1930, 1928, 1929, + 1933, 1936, 1936, 1935, 1975, 1933, 1975, 1934, 1937, 1937, + 1939, 1939, 1940, 1941, 1942, 1940, 1943, 1945, 1941, 1949, + 1942, 1947, 1943, 1944, 1944, 1946, 1946, 1948, 1950, 1950, + 1952, 1945, 1953, 1947, 1952, 1953, 1954, 1954, 1949, 1955, + 1956, 1948, 1957, 1958, 1955, 1960, 1961, 1958, 1962, 1956, + 1960, 1963, 1964, 1965, 1966, 1967, 1964, 1968, 1969, 1966, + 1978, 1967, 1957, 1968, 1971, 1963, 1961, 1972, 1962, 1973, - 1980, 1974, 1968, 1974, 1978, 1978, 1979, 1984, 1977, 1979, - 1981, 1981, 1983, 1984, 1987, 1985, 1983, 1986, 1986, 1990, - 1990, 1992, 1994, 1987, 1997, 1998, 1980, 1985, 2005, 1997, - 1998, 1999, 1999, 2001, 2001, 2003, 1994, 2004, 2004, 1992, - 2006, 2003, 2007, 2010, 2005, 2009, 2014, 2007, 2011, 2011, - 2013, 2015, 2014, 2016, 2019, 2010, 2018, 2018, 2020, 2013, - 2022, 2022, 2006, 0, 2009, 2023, 2023, 2024, 2016, 2015, - 2025, 2027, 2024, 2019, 2028, 2025, 2020, 2026, 2029, 2026, - 2030, 2030, 2034, 2029, 2035, 2027, 2031, 2031, 2028, 2032, - 2032, 2033, 2033, 2038, 2034, 2036, 2036, 2037, 2037, 2039, + 1974, 1985, 1972, 1965, 1978, 1973, 1969, 1985, 1974, 1993, + 1971, 1979, 1979, 1980, 1982, 1982, 1980, 1984, 1986, 1987, + 1987, 1984, 1988, 1991, 1991, 1995, 2004, 1993, 1998, 1999, + 1986, 1988, 2004, 1998, 1999, 2000, 2000, 2002, 2002, 1995, + 2005, 2005, 2006, 2007, 2008, 2010, 2014, 2011, 2015, 2008, + 2012, 2012, 2016, 2017, 2015, 2014, 2019, 2019, 2006, 2011, + 2020, 2027, 2021, 2027, 2010, 2007, 2023, 2023, 2017, 2025, + 2016, 2024, 2024, 2026, 2025, 2028, 2029, 2030, 2026, 2020, + 2021, 2031, 2032, 2032, 2033, 2033, 2031, 2034, 2034, 2028, + 2029, 2035, 2035, 2036, 2037, 2038, 2038, 2030, 2039, 2039, - 2040, 2041, 2035, 2042, 2042, 2038, 2043, 2043, 2044, 2044, - 2045, 2039, 2046, 2047, 2048, 2050, 2049, 2041, 2052, 2046, - 2040, 2049, 2045, 2051, 2051, 2047, 2053, 2052, 2054, 2055, - 2056, 2057, 2058, 2058, 2048, 2050, 2060, 2059, 2061, 2063, - 2064, 2065, 2055, 0, 2066, 2057, 2059, 2066, 2054, 2067, - 2068, 2060, 2053, 2061, 2056, 2068, 2069, 2063, 2070, 2070, - 2077, 2069, 2064, 2067, 2065, 2071, 2071, 2072, 2072, 2074, - 2074, 2076, 2076, 2078, 2079, 2081, 2082, 2083, 2077, 2085, - 2084, 2086, 2088, 2088, 2078, 2087, 2090, 2090, 2085, 2091, - 2093, 2093, 2095, 2079, 2082, 2081, 2092, 2094, 2094, 2083, + 2042, 2040, 2041, 2043, 2047, 2036, 2044, 2044, 2045, 2045, + 2046, 2046, 2037, 2040, 2041, 2048, 2047, 2049, 2050, 2043, + 2042, 2051, 2048, 2052, 2053, 2053, 2051, 2054, 2055, 2049, + 2056, 2057, 2058, 2059, 2060, 2060, 2054, 2061, 2050, 2066, + 2062, 2065, 2063, 2052, 2057, 2067, 2061, 2059, 2068, 2069, + 2056, 2068, 0, 2070, 2055, 2062, 2058, 2063, 2070, 2065, + 2071, 2066, 2079, 2069, 2081, 2071, 2072, 2072, 2067, 2073, + 2073, 2074, 2074, 2076, 2076, 2078, 2078, 2080, 2083, 2084, + 2079, 2085, 2086, 2081, 2087, 2088, 2089, 2093, 2080, 2090, + 2090, 2092, 2092, 2087, 2095, 2095, 2097, 2084, 2083, 2094, - 2084, 2086, 2096, 2087, 2098, 2092, 2097, 2099, 2100, 2107, - 2095, 2091, 2101, 2097, 2102, 2103, 2103, 2104, 2104, 2098, - 2096, 2105, 2106, 2108, 2107, 2099, 2100, 2105, 2101, 2109, - 2110, 2111, 2112, 2102, 2109, 2118, 2113, 2112, 2113, 2115, - 2106, 2115, 2108, 2114, 2114, 2116, 2116, 2120, 2121, 2122, - 2110, 2111, 2123, 2126, 2118, 2127, 2120, 2129, 2127, 2128, - 2128, 2130, 2131, 2131, 2132, 2134, 2135, 2121, 2132, 2122, - 2135, 2123, 2129, 2126, 2136, 2136, 2137, 2139, 2140, 2130, - 2134, 2141, 2141, 2143, 2144, 2144, 2145, 2146, 2146, 2137, - 2154, 2147, 2148, 2148, 2155, 2143, 2147, 2139, 2140, 2153, + 2096, 2096, 2086, 2085, 2089, 2088, 2098, 2100, 2094, 2093, + 2099, 2101, 2102, 2104, 2097, 2103, 2108, 2099, 2105, 2105, + 2106, 2106, 2100, 2109, 2098, 2110, 2112, 2107, 2113, 2101, + 2102, 2103, 2104, 2107, 2108, 2111, 2114, 2115, 2109, 2115, + 2111, 2114, 2116, 2116, 2110, 2117, 2112, 2117, 2113, 2118, + 2118, 2120, 2122, 2123, 2124, 2129, 2125, 2128, 2129, 2130, + 2130, 2122, 2132, 2131, 2133, 2133, 2136, 2134, 2141, 2137, + 2120, 2134, 2123, 2137, 2124, 2125, 2139, 2128, 2131, 2142, + 2132, 2136, 2138, 2138, 2143, 2143, 2145, 2147, 2141, 2139, + 2146, 2146, 2148, 2148, 2157, 2149, 2150, 2158, 2145, 2142, - 2153, 2156, 2157, 2160, 2158, 2145, 2165, 2155, 2159, 2159, - 2164, 2157, 2154, 2158, 2156, 2164, 2166, 2167, 2160, 2168, - 2165, 2166, 2169, 2172, 2171, 2167, 2173, 2174, 2172, 2177, - 2169, 2173, 2175, 2175, 2176, 2176, 2177, 2179, 2168, 2171, - 2178, 2180, 2174, 2181, 2243, 2178, 2182, 2183, 2183, 2181, - 2184, 2182, 2185, 2186, 2186, 2179, 2190, 2185, 2243, 2180, - 2187, 2187, 2191, 2191, 2192, 2184, 2193, 2192, 2194, 2190, - 2195, 2193, 2193, 2194, 2196, 2195, 2199, 2197, 2198, 2200, - 2196, 2197, 2201, 2198, 2202, 2199, 2203, 2205, 2206, 2202, - 2201, 2206, 2205, 2211, 2200, 2209, 2210, 2212, 2203, 2213, + 2149, 2151, 2151, 2156, 2156, 2159, 2147, 2163, 2150, 2168, + 2158, 2160, 2161, 2162, 2162, 0, 2157, 2171, 2159, 2167, + 2160, 2161, 2163, 2168, 2167, 2169, 2170, 2172, 2174, 2177, + 2169, 2182, 2175, 2176, 2170, 2172, 2171, 2175, 2176, 2178, + 2178, 2179, 2179, 2174, 2177, 2180, 2181, 2183, 2184, 2182, + 2185, 2181, 2180, 2187, 2184, 2185, 2186, 2186, 2188, 2189, + 2189, 2190, 2190, 2188, 2193, 2183, 2194, 2194, 2187, 2195, + 2196, 0, 2195, 2197, 2198, 2196, 2196, 2193, 2197, 2198, + 2199, 2200, 2201, 2202, 2203, 2200, 2199, 2201, 2204, 2205, + 2206, 2214, 2202, 2208, 2205, 2223, 2204, 2209, 2208, 2203, - 2209, 2210, 2219, 2214, 2215, 2215, 2216, 2220, 2213, 2221, - 2212, 2211, 2214, 2222, 2222, 2216, 2223, 2224, 2225, 2226, - 2226, 2219, 2227, 2229, 2231, 2232, 2224, 2220, 2221, 2232, - 2233, 2233, 2240, 2225, 2234, 2223, 2235, 2235, 2229, 2236, - 2234, 2227, 2239, 2237, 2231, 2240, 2242, 2236, 2237, 2244, - 2242, 2239, 2246, 2246, 2247, 2247, 2248, 2248, 2250, 2250, - 2252, 2252, 2254, 2256, 2244, 2257, 2257, 2258, 2258, 2259, - 2259, 2260, 2261, 2263, 2260, 2264, 2264, 2265, 2265, 2266, - 2266, 2267, 2254, 2256, 2269, 2261, 2268, 2268, 2271, 2270, - 2277, 2263, 2272, 2272, 2271, 2273, 2267, 2278, 2279, 2273, + 2209, 2212, 2206, 2213, 2215, 2216, 2212, 2217, 2213, 2214, + 2218, 2218, 2219, 2222, 2216, 2223, 2217, 2215, 2224, 2225, + 2225, 2219, 2226, 2228, 2227, 2229, 2229, 2230, 2232, 2234, + 2235, 2242, 2222, 2227, 2235, 2236, 2236, 2224, 2228, 2237, + 2242, 2226, 2239, 2232, 2243, 2237, 2230, 2238, 2238, 2234, + 2239, 2240, 2246, 2247, 2245, 2257, 2240, 2243, 2245, 2249, + 2249, 2250, 2250, 2251, 2251, 2260, 2246, 0, 2247, 2253, + 2253, 2255, 2255, 2258, 2267, 2257, 2261, 2261, 2258, 2258, + 2262, 2262, 2263, 2263, 2264, 2260, 2265, 2264, 2268, 2268, + 2269, 2269, 2267, 2270, 2270, 2271, 2272, 2272, 2273, 2265, - 2276, 2280, 2269, 2270, 2281, 2276, 2276, 2280, 2282, 2287, - 2281, 2283, 2292, 2277, 2287, 2283, 2289, 2278, 2279, 2284, - 2284, 2294, 2290, 2293, 2289, 2290, 2293, 2295, 2296, 2297, - 2298, 2300, 2295, 2282, 2299, 2299, 2302, 2292, 2294, 2294, - 2301, 2302, 2302, 2303, 2298, 2308, 2296, 2310, 2301, 2297, - 2300, 2304, 2304, 2305, 2305, 2306, 2306, 2307, 2307, 2309, - 2311, 2308, 2303, 2312, 2309, 2313, 2318, 2310, 2314, 2316, - 2316, 2317, 2312, 2321, 2317, 2320, 2320, 2322, 2322, 2327, - 2321, 2325, 2323, 2331, 2318, 2313, 2311, 2323, 2314, 2329, - 2325, 2328, 2328, 2329, 2330, 2332, 2333, 2327, 2331, 2334, + 2274, 2275, 2276, 2276, 2277, 2281, 2280, 2275, 2277, 2282, + 2271, 2280, 2280, 2283, 2274, 2284, 2273, 2285, 2286, 2296, + 2287, 2284, 2291, 2285, 2287, 2288, 2288, 2291, 2281, 2282, + 2293, 2294, 2297, 2283, 2294, 2297, 2298, 2299, 2293, 2300, + 2301, 2302, 2299, 2286, 2296, 2303, 2303, 2304, 2305, 2307, + 2308, 2308, 0, 2298, 2298, 2302, 2305, 2300, 2306, 2312, + 2301, 2309, 2309, 2306, 2306, 2314, 2304, 2315, 2307, 2310, + 2310, 2311, 2311, 2313, 2316, 2312, 2317, 2318, 2313, 2320, + 2320, 2321, 2322, 2316, 2321, 2314, 2324, 2324, 2325, 2326, + 2326, 2331, 2329, 2315, 2327, 2325, 2317, 2318, 2334, 2327, - 2332, 2332, 2340, 2330, 2339, 2339, 2341, 2344, 2334, 2333, - 2345, 2340, 2348, 2346, 2350, 2352, 2353, 2353, 2341, 2345, - 2352, 2354, 2356, 2364, 2348, 2357, 2357, 2356, 2363, 2357, - 2354, 0, 2344, 2346, 2362, 2350, 2359, 2359, 2360, 2360, - 2361, 2361, 2364, 2362, 2365, 2367, 2371, 2368, 2363, 2365, - 2369, 2367, 2368, 2370, 2370, 2369, 2372, 2373, 2374, 2375, - 2376, 2379, 2373, 2380, 2371, 2375, 2377, 2377, 2381, 2383, - 2383, 2384, 2387, 2385, 2388, 2386, 2374, 2372, 2380, 2386, - 2379, 2387, 2389, 2390, 2384, 2376, 2385, 2391, 2381, 2392, - 2388, 2390, 2391, 2393, 2393, 2394, 2396, 2396, 2397, 2397, + 2322, 2329, 2332, 2332, 2333, 2335, 2336, 2334, 2333, 2331, + 2337, 2336, 2336, 2338, 2343, 2343, 2344, 2346, 2347, 2350, + 2335, 2352, 2338, 2337, 2351, 2354, 2346, 2356, 2359, 2359, + 2347, 2358, 2390, 2351, 2344, 2362, 2358, 2354, 2360, 2369, + 2362, 2352, 2363, 2363, 2350, 2390, 2363, 2360, 2356, 2365, + 2365, 2366, 2366, 2367, 2367, 2368, 2370, 2371, 2374, 2369, + 2373, 2377, 2371, 2374, 2368, 2375, 2373, 2376, 2376, 2378, + 2375, 2379, 2381, 2380, 2382, 2370, 2379, 2385, 2381, 2377, + 2383, 2383, 2386, 2387, 2389, 2389, 2393, 2391, 2392, 2394, + 2378, 2380, 2392, 2395, 2396, 2393, 2385, 2386, 2398, 2382, - 2399, 2389, 2401, 2401, 2402, 2403, 2405, 2405, 2406, 2407, - 2403, 2408, 2410, 2410, 2394, 2392, 2413, 2411, 2414, 2414, - 2402, 2399, 2415, 2415, 2416, 2417, 2417, 2418, 2406, 2419, - 2408, 2411, 2407, 2420, 2421, 2422, 2418, 2430, 2413, 2423, - 2423, 2425, 2425, 0, 2416, 2417, 2421, 2424, 2429, 2419, - 2424, 2433, 2420, 2431, 2433, 2422, 2435, 2430, 2434, 2431, - 2429, 2432, 2432, 2437, 2434, 2438, 2439, 2440, 2437, 2441, - 2438, 2442, 2442, 2440, 2435, 2444, 2444, 2445, 2451, 2446, - 2448, 2448, 2449, 2449, 2450, 2439, 2441, 2441, 2446, 2450, - 2452, 2461, 2451, 2453, 2453, 2452, 2445, 2454, 2454, 2455, + 2391, 2397, 2396, 2387, 2400, 2394, 2397, 2399, 2399, 2402, + 2402, 2405, 2395, 2403, 2403, 2407, 2407, 2408, 2411, 2411, + 2409, 2412, 2413, 2400, 2398, 2409, 2417, 2414, 2416, 2416, + 2419, 2420, 2405, 2408, 2423, 2419, 2421, 2421, 2422, 2422, + 2417, 2412, 2424, 2424, 2426, 2413, 2414, 2425, 2427, 2428, + 2429, 2430, 2430, 2420, 2423, 2431, 2425, 2436, 2431, 2432, + 2432, 2428, 2424, 2437, 2426, 2438, 2442, 2427, 0, 2436, + 2429, 2438, 2439, 2439, 2440, 2441, 2446, 2440, 0, 2448, + 2444, 2441, 2445, 2437, 2442, 2444, 2447, 2445, 2449, 2449, + 2451, 2451, 2447, 2452, 2453, 2446, 2448, 2448, 2455, 2455, - 2455, 2456, 2458, 2458, 2463, 2467, 2456, 2464, 2464, 2468, - 2461, 2466, 2466, 2469, 2470, 2470, 2471, 2474, 2474, 2467, - 2477, 2471, 2469, 2476, 2476, 2478, 2463, 2479, 2483, 2468, - 2484, 2478, 2480, 2480, 2477, 2479, 2481, 2485, 2487, 2486, - 2490, 2481, 2485, 2491, 2487, 2489, 2492, 2493, 2483, 2496, - 2484, 2486, 2494, 2489, 2495, 2497, 2500, 2504, 2504, 2490, - 2497, 2501, 2533, 2491, 0, 2493, 2492, 2533, 2494, 2506, - 2496, 2495, 2495, 2506, 2501, 2517, 2500, 2505, 2505, 2510, - 2510, 2512, 2512, 2513, 2513, 2514, 2513, 2516, 2516, 2514, - 2518, 2520, 2520, 2517, 2523, 2524, 2525, 2527, 2528, 2524, + 2456, 2456, 2457, 2453, 2458, 2459, 2463, 2457, 2460, 2460, + 2459, 2463, 2452, 2461, 2461, 2462, 2462, 2468, 2458, 2465, + 2465, 2470, 2471, 2471, 2473, 2473, 2474, 2475, 2476, 2477, + 2477, 2478, 2485, 2479, 2482, 2482, 2468, 2476, 2479, 2486, + 2474, 2484, 2484, 2470, 2487, 2486, 2485, 2475, 2488, 2488, + 2478, 2489, 2487, 2491, 2492, 2493, 2489, 2494, 2495, 2497, + 2493, 2498, 2499, 2500, 2495, 2502, 2501, 2497, 2503, 2494, + 2504, 2505, 2508, 2491, 2492, 2509, 2505, 2512, 2512, 2645, + 2498, 2502, 2499, 2500, 2501, 2503, 2503, 2645, 2509, 2513, + 2513, 2504, 2508, 2514, 2518, 2518, 2525, 2514, 2520, 2520, - 0, 2523, 2529, 2529, 2518, 2530, 2530, 2528, 2531, 2531, - 2532, 2525, 2534, 2535, 2536, 2527, 2537, 2538, 2535, 2535, - 2536, 2534, 2539, 2540, 2534, 2532, 2541, 2542, 2540, 2543, - 2543, 2541, 2538, 2544, 2547, 2547, 2550, 2550, 2544, 2551, - 2551, 2537, 2554, 2539, 2552, 2552, 2542, 2555, 2555, 2557, - 2557, 2554, 2558, 2559, 2560, 2560, 2561, 2562, 2562, 2565, - 2566, 2567, 2569, 2566, 2573, 2559, 2572, 2558, 2568, 2568, - 2571, 2561, 2572, 2571, 2574, 2575, 2577, 2565, 2573, 2574, - 2569, 2576, 2579, 2584, 2587, 2588, 2584, 2567, 2589, 2588, - 2590, 2592, 2577, 2594, 2575, 2593, 2596, 2579, 2594, 2576, + 2521, 2521, 2522, 2521, 2524, 2524, 2522, 2526, 2528, 2529, + 2529, 2532, 2533, 2528, 2525, 2534, 2533, 2536, 2532, 2537, + 0, 2526, 2538, 2538, 2539, 2539, 2540, 2540, 2537, 2541, + 2534, 2542, 2544, 2543, 2545, 2536, 2542, 2544, 2544, 2546, + 2545, 2547, 2543, 2549, 2541, 2543, 2548, 2550, 2549, 2551, + 2552, 2552, 2550, 2553, 2556, 2556, 2547, 2565, 2553, 2559, + 2559, 2560, 2560, 2563, 2546, 2561, 2561, 2548, 2551, 2564, + 2564, 2568, 2563, 2567, 2567, 2569, 2571, 2565, 2570, 2570, + 2572, 2572, 2575, 2577, 2579, 2576, 2568, 2569, 2576, 2578, + 2578, 2571, 2581, 2582, 2583, 2581, 2584, 2585, 2587, 2582, - 2595, 2599, 2595, 2598, 2590, 2600, 2593, 2587, 2589, 2597, - 2597, 2596, 2601, 2602, 2592, 2603, 2598, 2605, 2604, 2606, - 2599, 2607, 2607, 2600, 2613, 2608, 2609, 2609, 2601, 2614, - 2603, 2610, 2610, 2606, 2608, 2611, 2611, 2605, 2602, 2604, - 2612, 2612, 2615, 2613, 2618, 2615, 2616, 2617, 2619, 2614, - 2620, 2616, 2617, 2621, 2622, 2626, 2620, 2623, 2623, 2624, - 2633, 2628, 2634, 2619, 2631, 2631, 2637, 2621, 2633, 2618, - 2626, 2632, 2632, 2638, 2622, 2639, 2635, 2636, 2624, 2628, - 2637, 2634, 2635, 2636, 2640, 2640, 2638, 2642, 2643, 2644, - 2646, 2647, 2648, 2644, 2639, 2649, 2647, 2651, 2652, 2650, + 2575, 2584, 2579, 2586, 2589, 2596, 2596, 2594, 2583, 2577, + 2594, 2598, 2600, 2599, 2587, 2601, 2585, 2599, 2603, 2589, + 2604, 2586, 2605, 2606, 2607, 2606, 2610, 2605, 2611, 2601, + 2609, 2604, 2600, 2612, 2598, 2608, 2608, 2613, 2614, 2607, + 2615, 2603, 2618, 2609, 2616, 2610, 2611, 2619, 2619, 2612, + 2620, 2621, 2621, 2614, 2622, 2622, 2618, 2623, 2623, 2620, + 2625, 2615, 2613, 2626, 2616, 2624, 2624, 2627, 2628, 2629, + 2627, 2630, 2631, 2628, 2629, 2632, 2633, 2634, 2638, 2625, + 2636, 2632, 2640, 2626, 2635, 2635, 2646, 2631, 2643, 2643, + 2633, 2644, 2644, 2638, 2649, 2647, 2630, 2634, 2648, 2636, - 2653, 2655, 2643, 2652, 2656, 2653, 0, 2642, 2649, 2664, - 2646, 2648, 2650, 2657, 2657, 2658, 2651, 0, 2659, 2655, - 2658, 2660, 2660, 2656, 2659, 2661, 2662, 2663, 2664, 2665, - 2661, 2662, 2663, 2666, 2670, 2665, 2667, 2667, 2666, 2669, - 2671, 2672, 2673, 2669, 2674, 2675, 2676, 2671, 2677, 2677, - 2674, 2679, 2679, 2670, 2680, 2682, 2683, 2681, 2684, 2676, - 2672, 2673, 2681, 2680, 2675, 2686, 2680, 2685, 2685, 2687, - 2686, 2684, 2689, 2691, 2682, 2683, 2690, 2690, 2692, 2692, - 2693, 2693, 2687, 2694, 2695, 2696, 2697, 2697, 2694, 2698, - 2703, 2695, 2691, 2699, 2698, 2699, 2700, 2700, 2689, 2701, + 2640, 2647, 2650, 2651, 2648, 2646, 2652, 2652, 2649, 2654, + 2655, 2658, 2656, 2659, 2660, 2650, 2656, 2661, 2659, 2662, + 2663, 2664, 2651, 2665, 2655, 2667, 2664, 2668, 2665, 2654, + 2661, 2658, 2662, 2660, 2669, 2669, 2670, 2673, 2671, 2663, + 2674, 2670, 2673, 2667, 2671, 2674, 2668, 2672, 2672, 2675, + 2676, 2677, 2682, 2678, 2675, 2679, 2679, 2677, 2678, 2681, + 2683, 2684, 2685, 2681, 2686, 2687, 2688, 2683, 2694, 2676, + 2686, 2682, 2689, 2689, 2691, 2691, 2692, 2693, 2695, 2688, + 2684, 2685, 2693, 2696, 2687, 2692, 2698, 2694, 2692, 2697, + 2697, 2698, 2699, 2701, 2702, 2702, 2696, 2695, 2703, 2704, - 2702, 2705, 2708, 2704, 2696, 2712, 2701, 2702, 2704, 2703, - 2707, 2707, 2710, 2711, 2713, 2714, 2714, 2710, 2711, 2717, - 2705, 2708, 2716, 2716, 2712, 2718, 2719, 2719, 2720, 2720, - 2721, 2723, 2723, 2713, 2724, 2724, 2725, 2721, 2717, 2731, - 2727, 2730, 2732, 2725, 2718, 2727, 2730, 2733, 2733, 2734, - 2734, 0, 0, 0, 0, 0, 0, 0, 2731, 0, - 0, 2732, 2738, 2738, 2738, 2738, 2738, 2738, 2738, 2739, - 2739, 2739, 2739, 2739, 2739, 2739, 2740, 2740, 2740, 2740, - 2740, 2740, 2740, 2741, 2741, 2741, 2741, 2741, 2741, 2741, - 2742, 2742, 2742, 2742, 2742, 2742, 2742, 2744, 2744, 0, + 2704, 2705, 2705, 2706, 2707, 2699, 2708, 2710, 2706, 2709, + 2709, 2707, 2710, 2711, 2715, 2711, 2713, 2703, 2717, 2701, + 2712, 2712, 2714, 2713, 2720, 2708, 2716, 2719, 2719, 2714, + 2722, 2716, 2724, 2715, 2723, 2722, 2725, 2717, 2729, 2723, + 2726, 2726, 2730, 2720, 2728, 2728, 2731, 2731, 2732, 2732, + 0, 2724, 2733, 2735, 2735, 2725, 2743, 2729, 2737, 2733, + 2744, 2730, 2736, 2736, 2739, 2737, 2742, 2745, 2745, 2739, + 0, 2742, 2746, 2746, 0, 2743, 0, 0, 0, 2744, + 2750, 2750, 2750, 2750, 2750, 2750, 2750, 2751, 2751, 2751, + 2751, 2751, 2751, 2751, 2752, 2752, 2752, 2752, 2752, 2752, - 2744, 2744, 2744, 2744, 2745, 2745, 0, 0, 0, 2745, - 2745, 2746, 2746, 0, 0, 2746, 0, 2746, 2747, 0, - 0, 0, 0, 0, 2747, 2748, 2748, 0, 0, 0, - 2748, 2748, 2749, 0, 0, 0, 0, 0, 2749, 2750, - 2750, 0, 2750, 2750, 2750, 2750, 2751, 2751, 0, 2751, - 2751, 2751, 2751, 2737, 2737, 2737, 2737, 2737, 2737, 2737, - 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, - 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, - 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, 2737, - 2737, 2737, 2737, 2737 + 2752, 2753, 2753, 2753, 2753, 2753, 2753, 2753, 2754, 2754, + 2754, 2754, 2754, 2754, 2754, 2756, 2756, 0, 2756, 2756, + 2756, 2756, 2757, 2757, 0, 0, 0, 2757, 2757, 2758, + 2758, 0, 0, 2758, 0, 2758, 2759, 0, 0, 0, + 0, 0, 2759, 2760, 2760, 0, 0, 0, 2760, 2760, + 2761, 0, 0, 0, 0, 0, 2761, 2762, 2762, 0, + 2762, 2762, 2762, 2762, 2763, 2763, 0, 2763, 2763, 2763, + 2763, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, + 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, + 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, + 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, 2749, + 2749, 2749 } ; static yy_state_type yy_last_accepting_state; @@ -2649,7 +2647,7 @@ static void config_start_include(const char* filename) config_include_stack = s; cfg_parser->filename = nm; cfg_parser->line = 1; - yy_switch_to_buffer(yy_create_buffer(input,YY_BUF_SIZE)); + yy_switch_to_buffer(yy_create_buffer(input, YY_BUF_SIZE)); } static void config_start_include_glob(const char* filename) @@ -2720,11 +2718,12 @@ static void config_end_include(void) #define yy_set_bol(at_bol) \ { \ if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ yy_current_buffer->yy_ch_buf[0] = ((at_bol)?'\n':' '); \ } #endif +#line 2725 "" #define YY_NO_INPUT 1 #line 186 "./util/configlexer.lex" #ifndef YY_NO_UNPUT @@ -2733,6 +2732,7 @@ static void config_end_include(void) #ifndef YY_NO_INPUT #define YY_NO_INPUT 1 #endif +#line 2734 "" #line 2736 "" @@ -2755,36 +2755,36 @@ static void config_end_include(void) #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * _in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * _out_str ); +void yyset_out ( FILE * _out_str ); - int yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int _line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -2792,9 +2792,9 @@ void yyset_lineno (int _line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif @@ -2803,19 +2803,18 @@ extern int yywrap (void ); #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif @@ -2948,23 +2947,23 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } { #line 206 "./util/configlexer.lex" -#line 2959 "" +#line 2958 "" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { (yy_more_len) = 0; if ( (yy_more_flag) ) { - (yy_more_len) = (yy_c_buf_p) - (yytext_ptr); + (yy_more_len) = (int) ((yy_c_buf_p) - (yytext_ptr)); (yy_more_flag) = 0; } yy_cp = (yy_c_buf_p); @@ -2990,13 +2989,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 >= 2738 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 2750 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 5354 ); + while ( yy_base[yy_current_state] != 5372 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -3761,587 +3760,597 @@ YY_RULE_SETUP case 148: YY_RULE_SETUP #line 357 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_DSA) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) } YY_BREAK case 149: YY_RULE_SETUP #line 358 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_SHA1) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } YY_BREAK case 150: YY_RULE_SETUP #line 359 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_FAKE_DSA) } YY_BREAK case 151: YY_RULE_SETUP #line 360 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_FAKE_SHA1) } YY_BREAK case 152: YY_RULE_SETUP #line 361 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 153: YY_RULE_SETUP #line 362 "./util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 154: YY_RULE_SETUP #line 363 "./util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 155: YY_RULE_SETUP -#line 365 "./util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 364 "./util/configlexer.lex" +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 156: YY_RULE_SETUP -#line 366 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +#line 365 "./util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 157: YY_RULE_SETUP #line 367 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 158: YY_RULE_SETUP #line 368 "./util/configlexer.lex" -{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 159: YY_RULE_SETUP #line 369 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 160: YY_RULE_SETUP #line 370 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_IDENTITY) } +{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } YY_BREAK case 161: YY_RULE_SETUP #line 371 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 162: YY_RULE_SETUP #line 372 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_LOG_IDENTITY) } YY_BREAK case 163: YY_RULE_SETUP #line 373 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_REPLIES) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 164: YY_RULE_SETUP #line 374 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 165: YY_RULE_SETUP #line 375 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_SERVFAIL) } +{ YDVAR(1, VAR_LOG_REPLIES) } YY_BREAK case 166: YY_RULE_SETUP #line 376 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } YY_BREAK case 167: YY_RULE_SETUP #line 377 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(1, VAR_LOG_SERVFAIL) } YY_BREAK case 168: YY_RULE_SETUP #line 378 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 169: YY_RULE_SETUP #line 379 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 170: YY_RULE_SETUP #line 380 "./util/configlexer.lex" -{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 171: YY_RULE_SETUP #line 381 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 172: YY_RULE_SETUP #line 382 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } YY_BREAK case 173: YY_RULE_SETUP #line 383 "./util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 174: YY_RULE_SETUP #line 384 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_ENABLE) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 175: YY_RULE_SETUP #line 385 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_KEY) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 176: YY_RULE_SETUP #line 386 "./util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_SHM_ENABLE) } YY_BREAK case 177: YY_RULE_SETUP #line 387 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(1, VAR_SHM_KEY) } YY_BREAK case 178: YY_RULE_SETUP #line 388 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 179: YY_RULE_SETUP #line 389 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 180: YY_RULE_SETUP #line 390 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_USE_CERT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 181: YY_RULE_SETUP #line 391 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 182: YY_RULE_SETUP #line 392 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 183: YY_RULE_SETUP #line 393 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 184: YY_RULE_SETUP #line 394 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 185: YY_RULE_SETUP #line 395 "./util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 186: YY_RULE_SETUP #line 396 "./util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 187: YY_RULE_SETUP #line 397 "./util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 188: YY_RULE_SETUP #line 398 "./util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 189: YY_RULE_SETUP #line 399 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 190: YY_RULE_SETUP #line 400 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 191: YY_RULE_SETUP #line 401 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_PREFIX) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 192: YY_RULE_SETUP #line 402 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_SYNTHALL) } +{ YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 193: YY_RULE_SETUP #line 403 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } +{ YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 194: YY_RULE_SETUP #line 404 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEFINE_TAG) } +{ YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 195: YY_RULE_SETUP #line 405 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } +{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } YY_BREAK case 196: YY_RULE_SETUP #line 406 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } +{ YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 197: YY_RULE_SETUP #line 407 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } +{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 198: YY_RULE_SETUP #line 408 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } +{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 199: YY_RULE_SETUP #line 409 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 200: YY_RULE_SETUP #line 410 "./util/configlexer.lex" -{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 201: YY_RULE_SETUP #line 411 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSTAP) } +{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 202: YY_RULE_SETUP #line 412 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_ENABLE) } +{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 203: YY_RULE_SETUP #line 413 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } +{ YDVAR(0, VAR_DNSTAP) } YY_BREAK case 204: YY_RULE_SETUP #line 414 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 205: YY_RULE_SETUP #line 415 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 206: YY_RULE_SETUP #line 416 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 207: YY_RULE_SETUP #line 417 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 208: YY_RULE_SETUP #line 418 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } +{ YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 209: YY_RULE_SETUP -#line 420 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } +#line 419 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 210: YY_RULE_SETUP -#line 422 "./util/configlexer.lex" +#line 420 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 211: YY_RULE_SETUP -#line 424 "./util/configlexer.lex" +#line 422 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 212: YY_RULE_SETUP -#line 426 "./util/configlexer.lex" +#line 424 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 213: YY_RULE_SETUP -#line 428 "./util/configlexer.lex" +#line 426 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 214: YY_RULE_SETUP -#line 430 "./util/configlexer.lex" -{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } +#line 428 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 215: YY_RULE_SETUP -#line 431 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT) } +#line 430 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 216: YY_RULE_SETUP #line 432 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT) } +{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 217: YY_RULE_SETUP #line 433 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_IP_RATELIMIT) } YY_BREAK case 218: YY_RULE_SETUP #line 434 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 219: YY_RULE_SETUP #line 435 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } YY_BREAK case 220: YY_RULE_SETUP #line 436 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 221: YY_RULE_SETUP #line 437 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } +{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } YY_BREAK case 222: YY_RULE_SETUP #line 438 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +{ YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 223: YY_RULE_SETUP #line 439 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 224: YY_RULE_SETUP #line 440 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 225: YY_RULE_SETUP #line 441 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOW_RTT) } +{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } YY_BREAK case 226: YY_RULE_SETUP #line 442 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOW_RTT_PERMIL) } +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } YY_BREAK case 227: YY_RULE_SETUP #line 443 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOW_RTT_PERMIL) } +{ YDVAR(1, VAR_LOW_RTT) } YY_BREAK case 228: YY_RULE_SETUP #line 444 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_TAG) } +{ YDVAR(1, VAR_LOW_RTT_PERMIL) } YY_BREAK case 229: YY_RULE_SETUP #line 445 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP) } +{ YDVAR(1, VAR_LOW_RTT_PERMIL) } YY_BREAK case 230: YY_RULE_SETUP #line 446 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_DATA) } +{ YDVAR(2, VAR_RESPONSE_IP_TAG) } YY_BREAK case 231: YY_RULE_SETUP #line 447 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSCRYPT) } +{ YDVAR(2, VAR_RESPONSE_IP) } YY_BREAK case 232: YY_RULE_SETUP #line 448 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } +{ YDVAR(2, VAR_RESPONSE_IP_DATA) } YY_BREAK case 233: YY_RULE_SETUP #line 449 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PORT) } +{ YDVAR(0, VAR_DNSCRYPT) } YY_BREAK case 234: YY_RULE_SETUP #line 450 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } +{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } YY_BREAK case 235: YY_RULE_SETUP #line 451 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } +{ YDVAR(1, VAR_DNSCRYPT_PORT) } YY_BREAK case 236: YY_RULE_SETUP #line 452 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } YY_BREAK case 237: YY_RULE_SETUP #line 453 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } +{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } YY_BREAK case 238: YY_RULE_SETUP #line 454 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } YY_BREAK case 239: YY_RULE_SETUP -#line 456 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } +#line 455 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } YY_BREAK case 240: YY_RULE_SETUP -#line 458 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } +#line 456 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } YY_BREAK case 241: YY_RULE_SETUP -#line 459 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } +#line 458 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } YY_BREAK case 242: YY_RULE_SETUP #line 460 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_ENABLED) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } YY_BREAK case 243: YY_RULE_SETUP #line 461 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } YY_BREAK case 244: YY_RULE_SETUP #line 462 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_HOOK) } +{ YDVAR(1, VAR_IPSECMOD_ENABLED) } YY_BREAK case 245: YY_RULE_SETUP #line 463 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } +{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } YY_BREAK case 246: YY_RULE_SETUP #line 464 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } +{ YDVAR(1, VAR_IPSECMOD_HOOK) } YY_BREAK case 247: YY_RULE_SETUP #line 465 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_STRICT) } +{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } YY_BREAK case 248: YY_RULE_SETUP #line 466 "./util/configlexer.lex" -{ YDVAR(0, VAR_CACHEDB) } +{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } YY_BREAK case 249: YY_RULE_SETUP #line 467 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_BACKEND) } +{ YDVAR(1, VAR_IPSECMOD_STRICT) } YY_BREAK case 250: YY_RULE_SETUP #line 468 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } +{ YDVAR(0, VAR_CACHEDB) } YY_BREAK case 251: YY_RULE_SETUP #line 469 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISHOST) } +{ YDVAR(1, VAR_CACHEDB_BACKEND) } YY_BREAK case 252: YY_RULE_SETUP #line 470 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISPORT) } +{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } YY_BREAK case 253: YY_RULE_SETUP #line 471 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } +{ YDVAR(1, VAR_CACHEDB_REDISHOST) } YY_BREAK case 254: YY_RULE_SETUP #line 472 "./util/configlexer.lex" -{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } +{ YDVAR(1, VAR_CACHEDB_REDISPORT) } YY_BREAK case 255: YY_RULE_SETUP #line 473 "./util/configlexer.lex" -{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } +{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } YY_BREAK case 256: -/* rule 256 can match eol */ YY_RULE_SETUP #line 474 "./util/configlexer.lex" +{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } + YY_BREAK +case 257: +YY_RULE_SETUP +#line 475 "./util/configlexer.lex" +{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } + YY_BREAK +case 258: +/* rule 258 can match eol */ +YY_RULE_SETUP +#line 476 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 257: +case 259: YY_RULE_SETUP -#line 477 "./util/configlexer.lex" +#line 479 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 478 "./util/configlexer.lex" +#line 480 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 258: +case 260: YY_RULE_SETUP -#line 483 "./util/configlexer.lex" +#line 485 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 259: -/* rule 259 can match eol */ +case 261: +/* rule 261 can match eol */ YY_RULE_SETUP -#line 484 "./util/configlexer.lex" +#line 486 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 260: +case 262: YY_RULE_SETUP -#line 486 "./util/configlexer.lex" +#line 488 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -4354,34 +4363,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 261: +case 263: YY_RULE_SETUP -#line 498 "./util/configlexer.lex" +#line 500 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 499 "./util/configlexer.lex" +#line 501 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 262: +case 264: YY_RULE_SETUP -#line 504 "./util/configlexer.lex" +#line 506 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 263: -/* rule 263 can match eol */ +case 265: +/* rule 265 can match eol */ YY_RULE_SETUP -#line 505 "./util/configlexer.lex" +#line 507 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 264: +case 266: YY_RULE_SETUP -#line 507 "./util/configlexer.lex" +#line 509 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -4394,38 +4403,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 265: +case 267: YY_RULE_SETUP -#line 519 "./util/configlexer.lex" +#line 521 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 521 "./util/configlexer.lex" +#line 523 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 266: -YY_RULE_SETUP -#line 525 "./util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK -case 267: -/* rule 267 can match eol */ -YY_RULE_SETUP -#line 526 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} - YY_BREAK case 268: YY_RULE_SETUP #line 527 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 269: +/* rule 269 can match eol */ YY_RULE_SETUP #line 528 "./util/configlexer.lex" +{ LEXOUT(("NL\n")); cfg_parser->line++;} + YY_BREAK +case 270: +YY_RULE_SETUP +#line 529 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 271: +YY_RULE_SETUP +#line 530 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -4433,27 +4442,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 533 "./util/configlexer.lex" +#line 535 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 270: +case 272: YY_RULE_SETUP -#line 537 "./util/configlexer.lex" +#line 539 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 271: -/* rule 271 can match eol */ +case 273: +/* rule 273 can match eol */ YY_RULE_SETUP -#line 538 "./util/configlexer.lex" +#line 540 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 272: +case 274: YY_RULE_SETUP -#line 540 "./util/configlexer.lex" +#line 542 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -4463,7 +4472,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 546 "./util/configlexer.lex" +#line 548 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -4475,33 +4484,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 273: +case 275: YY_RULE_SETUP -#line 557 "./util/configlexer.lex" +#line 559 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 274: +case 276: YY_RULE_SETUP -#line 561 "./util/configlexer.lex" +#line 563 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 275: +case 277: YY_RULE_SETUP -#line 565 "./util/configlexer.lex" +#line 567 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 276: +case 278: YY_RULE_SETUP -#line 569 "./util/configlexer.lex" +#line 571 "./util/configlexer.lex" ECHO; YY_BREAK -#line 4503 "" +#line 4512 "" case YY_END_OF_BUFFER: { @@ -4577,7 +4586,7 @@ ECHO; { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -4644,7 +4653,7 @@ static int yy_get_next_buffer (void) { char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = (yytext_ptr); - yy_size_t number_to_move, i; + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -4673,7 +4682,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -4709,7 +4718,8 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,(yy_size_t) (b->yy_buf_size + 2) ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ @@ -4741,7 +4751,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -4755,12 +4765,15 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((int) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,(yy_size_t) new_size ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -4792,10 +4805,10 @@ 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 >= 2738 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 2750 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -4820,11 +4833,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 >= 2738 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 2750 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - yy_is_jam = (yy_current_state == 2737); + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + yy_is_jam = (yy_current_state == 2749); return yy_is_jam ? 0 : yy_current_state; } @@ -4857,7 +4870,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -4874,13 +4887,13 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( ) ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) @@ -4918,11 +4931,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -4950,7 +4963,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -4978,7 +4991,7 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -4987,13 +5000,13 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc((yy_size_t) (b->yy_buf_size + 2) ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -5012,9 +5025,9 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } /* Initializes or reinitializes a buffer. @@ -5026,7 +5039,7 @@ static void yy_load_buffer_state (void) { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -5069,7 +5082,7 @@ static void yy_load_buffer_state (void) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -5100,7 +5113,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -5119,7 +5132,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -5129,7 +5142,7 @@ void yypop_buffer_state (void) */ static void yyensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -5143,9 +5156,9 @@ static void yyensure_buffer_stack (void) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -5174,7 +5187,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -5186,7 +5199,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /* They forgot to leave room for the EOB's. */ return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); @@ -5200,7 +5213,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -5213,10 +5226,10 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,(int) strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -5226,16 +5239,16 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = (yy_size_t) _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -5244,7 +5257,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -5260,9 +5273,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) #define YY_EXIT_FAILURE 2 #endif -static void yynoreturn yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -5273,7 +5286,7 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ) do \ { \ /* Undo effects of setting up yytext. */ \ - yy_size_t yyless_macro_arg = (n); \ + int yyless_macro_arg = (n); \ YY_LESS_LINENO(yyless_macro_arg);\ yytext[yyleng] = (yy_hold_char); \ (yy_c_buf_p) = yytext + yyless_macro_arg; \ @@ -5290,7 +5303,7 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -5397,7 +5410,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -5418,7 +5431,7 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { int i; @@ -5428,7 +5441,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { int n; for ( n = 0; s[n]; ++n ) @@ -5463,7 +5476,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 569 "./util/configlexer.lex" - +#line 571 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 148886c8e..757960484 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -354,6 +354,8 @@ val-permissive-mode{COLON} { YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } aggressive-nsec{COLON} { YDVAR(1, VAR_AGGRESSIVE_NSEC) } ignore-cd-flag{COLON} { YDVAR(1, VAR_IGNORE_CD_FLAG) } serve-expired{COLON} { YDVAR(1, VAR_SERVE_EXPIRED) } +serve-expired-ttl{COLON} { YDVAR(1, VAR_SERVE_EXPIRED_TTL) } +serve-expired-ttl-reset{COLON} { YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } fake-dsa{COLON} { YDVAR(1, VAR_FAKE_DSA) } fake-sha1{COLON} { YDVAR(1, VAR_FAKE_SHA1) } val-log-level{COLON} { YDVAR(1, VAR_VAL_LOG_LEVEL) } diff --git a/util/configparser.c b/util/configparser.c index 151580028..2fe80487e 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -325,56 +325,58 @@ extern int yydebug; VAR_ACCESS_CONTROL_VIEW = 454, VAR_VIEW_FIRST = 455, VAR_SERVE_EXPIRED = 456, - VAR_FAKE_DSA = 457, - VAR_FAKE_SHA1 = 458, - VAR_LOG_IDENTITY = 459, - VAR_HIDE_TRUSTANCHOR = 460, - VAR_TRUST_ANCHOR_SIGNALING = 461, - VAR_AGGRESSIVE_NSEC = 462, - VAR_USE_SYSTEMD = 463, - VAR_SHM_ENABLE = 464, - VAR_SHM_KEY = 465, - VAR_ROOT_KEY_SENTINEL = 466, - VAR_DNSCRYPT = 467, - VAR_DNSCRYPT_ENABLE = 468, - VAR_DNSCRYPT_PORT = 469, - VAR_DNSCRYPT_PROVIDER = 470, - VAR_DNSCRYPT_SECRET_KEY = 471, - VAR_DNSCRYPT_PROVIDER_CERT = 472, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 473, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 474, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 475, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 476, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 477, - VAR_IPSECMOD_ENABLED = 478, - VAR_IPSECMOD_HOOK = 479, - VAR_IPSECMOD_IGNORE_BOGUS = 480, - VAR_IPSECMOD_MAX_TTL = 481, - VAR_IPSECMOD_WHITELIST = 482, - VAR_IPSECMOD_STRICT = 483, - VAR_CACHEDB = 484, - VAR_CACHEDB_BACKEND = 485, - VAR_CACHEDB_SECRETSEED = 486, - VAR_CACHEDB_REDISHOST = 487, - VAR_CACHEDB_REDISPORT = 488, - VAR_CACHEDB_REDISTIMEOUT = 489, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 490, - VAR_FOR_UPSTREAM = 491, - VAR_AUTH_ZONE = 492, - VAR_ZONEFILE = 493, - VAR_MASTER = 494, - VAR_URL = 495, - VAR_FOR_DOWNSTREAM = 496, - VAR_FALLBACK_ENABLED = 497, - VAR_TLS_ADDITIONAL_PORT = 498, - VAR_LOW_RTT = 499, - VAR_LOW_RTT_PERMIL = 500, - VAR_ALLOW_NOTIFY = 501, - VAR_TLS_WIN_CERT = 502, - VAR_TCP_CONNECTION_LIMIT = 503, - VAR_FORWARD_NO_CACHE = 504, - VAR_STUB_NO_CACHE = 505, - VAR_LOG_SERVFAIL = 506 + VAR_SERVE_EXPIRED_TTL = 457, + VAR_SERVE_EXPIRED_TTL_RESET = 458, + VAR_FAKE_DSA = 459, + VAR_FAKE_SHA1 = 460, + VAR_LOG_IDENTITY = 461, + VAR_HIDE_TRUSTANCHOR = 462, + VAR_TRUST_ANCHOR_SIGNALING = 463, + VAR_AGGRESSIVE_NSEC = 464, + VAR_USE_SYSTEMD = 465, + VAR_SHM_ENABLE = 466, + VAR_SHM_KEY = 467, + VAR_ROOT_KEY_SENTINEL = 468, + VAR_DNSCRYPT = 469, + VAR_DNSCRYPT_ENABLE = 470, + VAR_DNSCRYPT_PORT = 471, + VAR_DNSCRYPT_PROVIDER = 472, + VAR_DNSCRYPT_SECRET_KEY = 473, + VAR_DNSCRYPT_PROVIDER_CERT = 474, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 475, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 476, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 477, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 478, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 479, + VAR_IPSECMOD_ENABLED = 480, + VAR_IPSECMOD_HOOK = 481, + VAR_IPSECMOD_IGNORE_BOGUS = 482, + VAR_IPSECMOD_MAX_TTL = 483, + VAR_IPSECMOD_WHITELIST = 484, + VAR_IPSECMOD_STRICT = 485, + VAR_CACHEDB = 486, + VAR_CACHEDB_BACKEND = 487, + VAR_CACHEDB_SECRETSEED = 488, + VAR_CACHEDB_REDISHOST = 489, + VAR_CACHEDB_REDISPORT = 490, + VAR_CACHEDB_REDISTIMEOUT = 491, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 492, + VAR_FOR_UPSTREAM = 493, + VAR_AUTH_ZONE = 494, + VAR_ZONEFILE = 495, + VAR_MASTER = 496, + VAR_URL = 497, + VAR_FOR_DOWNSTREAM = 498, + VAR_FALLBACK_ENABLED = 499, + VAR_TLS_ADDITIONAL_PORT = 500, + VAR_LOW_RTT = 501, + VAR_LOW_RTT_PERMIL = 502, + VAR_ALLOW_NOTIFY = 503, + VAR_TLS_WIN_CERT = 504, + VAR_TCP_CONNECTION_LIMIT = 505, + VAR_FORWARD_NO_CACHE = 506, + VAR_STUB_NO_CACHE = 507, + VAR_LOG_SERVFAIL = 508 }; #endif /* Tokens. */ @@ -577,56 +579,58 @@ extern int yydebug; #define VAR_ACCESS_CONTROL_VIEW 454 #define VAR_VIEW_FIRST 455 #define VAR_SERVE_EXPIRED 456 -#define VAR_FAKE_DSA 457 -#define VAR_FAKE_SHA1 458 -#define VAR_LOG_IDENTITY 459 -#define VAR_HIDE_TRUSTANCHOR 460 -#define VAR_TRUST_ANCHOR_SIGNALING 461 -#define VAR_AGGRESSIVE_NSEC 462 -#define VAR_USE_SYSTEMD 463 -#define VAR_SHM_ENABLE 464 -#define VAR_SHM_KEY 465 -#define VAR_ROOT_KEY_SENTINEL 466 -#define VAR_DNSCRYPT 467 -#define VAR_DNSCRYPT_ENABLE 468 -#define VAR_DNSCRYPT_PORT 469 -#define VAR_DNSCRYPT_PROVIDER 470 -#define VAR_DNSCRYPT_SECRET_KEY 471 -#define VAR_DNSCRYPT_PROVIDER_CERT 472 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 473 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 474 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 475 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 476 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 477 -#define VAR_IPSECMOD_ENABLED 478 -#define VAR_IPSECMOD_HOOK 479 -#define VAR_IPSECMOD_IGNORE_BOGUS 480 -#define VAR_IPSECMOD_MAX_TTL 481 -#define VAR_IPSECMOD_WHITELIST 482 -#define VAR_IPSECMOD_STRICT 483 -#define VAR_CACHEDB 484 -#define VAR_CACHEDB_BACKEND 485 -#define VAR_CACHEDB_SECRETSEED 486 -#define VAR_CACHEDB_REDISHOST 487 -#define VAR_CACHEDB_REDISPORT 488 -#define VAR_CACHEDB_REDISTIMEOUT 489 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 490 -#define VAR_FOR_UPSTREAM 491 -#define VAR_AUTH_ZONE 492 -#define VAR_ZONEFILE 493 -#define VAR_MASTER 494 -#define VAR_URL 495 -#define VAR_FOR_DOWNSTREAM 496 -#define VAR_FALLBACK_ENABLED 497 -#define VAR_TLS_ADDITIONAL_PORT 498 -#define VAR_LOW_RTT 499 -#define VAR_LOW_RTT_PERMIL 500 -#define VAR_ALLOW_NOTIFY 501 -#define VAR_TLS_WIN_CERT 502 -#define VAR_TCP_CONNECTION_LIMIT 503 -#define VAR_FORWARD_NO_CACHE 504 -#define VAR_STUB_NO_CACHE 505 -#define VAR_LOG_SERVFAIL 506 +#define VAR_SERVE_EXPIRED_TTL 457 +#define VAR_SERVE_EXPIRED_TTL_RESET 458 +#define VAR_FAKE_DSA 459 +#define VAR_FAKE_SHA1 460 +#define VAR_LOG_IDENTITY 461 +#define VAR_HIDE_TRUSTANCHOR 462 +#define VAR_TRUST_ANCHOR_SIGNALING 463 +#define VAR_AGGRESSIVE_NSEC 464 +#define VAR_USE_SYSTEMD 465 +#define VAR_SHM_ENABLE 466 +#define VAR_SHM_KEY 467 +#define VAR_ROOT_KEY_SENTINEL 468 +#define VAR_DNSCRYPT 469 +#define VAR_DNSCRYPT_ENABLE 470 +#define VAR_DNSCRYPT_PORT 471 +#define VAR_DNSCRYPT_PROVIDER 472 +#define VAR_DNSCRYPT_SECRET_KEY 473 +#define VAR_DNSCRYPT_PROVIDER_CERT 474 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 475 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 476 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 477 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 478 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 479 +#define VAR_IPSECMOD_ENABLED 480 +#define VAR_IPSECMOD_HOOK 481 +#define VAR_IPSECMOD_IGNORE_BOGUS 482 +#define VAR_IPSECMOD_MAX_TTL 483 +#define VAR_IPSECMOD_WHITELIST 484 +#define VAR_IPSECMOD_STRICT 485 +#define VAR_CACHEDB 486 +#define VAR_CACHEDB_BACKEND 487 +#define VAR_CACHEDB_SECRETSEED 488 +#define VAR_CACHEDB_REDISHOST 489 +#define VAR_CACHEDB_REDISPORT 490 +#define VAR_CACHEDB_REDISTIMEOUT 491 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 492 +#define VAR_FOR_UPSTREAM 493 +#define VAR_AUTH_ZONE 494 +#define VAR_ZONEFILE 495 +#define VAR_MASTER 496 +#define VAR_URL 497 +#define VAR_FOR_DOWNSTREAM 498 +#define VAR_FALLBACK_ENABLED 499 +#define VAR_TLS_ADDITIONAL_PORT 500 +#define VAR_LOW_RTT 501 +#define VAR_LOW_RTT_PERMIL 502 +#define VAR_ALLOW_NOTIFY 503 +#define VAR_TLS_WIN_CERT 504 +#define VAR_TCP_CONNECTION_LIMIT 505 +#define VAR_FORWARD_NO_CACHE 506 +#define VAR_STUB_NO_CACHE 507 +#define VAR_LOG_SERVFAIL 508 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -637,7 +641,7 @@ union YYSTYPE char* str; -#line 641 "util/configparser.c" /* yacc.c:355 */ +#line 645 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -654,7 +658,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 658 "util/configparser.c" /* yacc.c:358 */ +#line 662 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -896,21 +900,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 508 +#define YYLAST 512 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 252 +#define YYNTOKENS 254 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 272 +#define YYNNTS 274 /* YYNRULES -- Number of rules. */ -#define YYNRULES 521 +#define YYNRULES 525 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 781 +#define YYNSTATES 787 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 506 +#define YYMAXUTOK 508 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -969,66 +973,66 @@ static const yytype_uint8 yytranslate[] = 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, - 245, 246, 247, 248, 249, 250, 251 + 245, 246, 247, 248, 249, 250, 251, 252, 253 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 165, 165, 165, 166, 166, 167, 167, 168, 168, - 168, 169, 169, 170, 174, 179, 180, 181, 181, 181, - 182, 182, 183, 183, 184, 184, 185, 185, 185, 186, - 186, 187, 187, 187, 188, 188, 188, 189, 189, 190, - 190, 191, 191, 192, 192, 193, 193, 194, 194, 195, - 195, 196, 196, 197, 197, 197, 198, 198, 198, 199, - 199, 199, 200, 200, 201, 201, 202, 202, 203, 203, - 204, 204, 204, 205, 205, 206, 206, 207, 207, 207, - 208, 208, 209, 209, 210, 210, 211, 211, 211, 212, - 212, 213, 213, 214, 214, 215, 215, 216, 216, 217, - 217, 217, 218, 218, 219, 219, 219, 220, 220, 220, - 221, 221, 221, 222, 222, 222, 222, 223, 224, 224, - 224, 225, 225, 225, 226, 226, 227, 227, 228, 228, - 228, 229, 229, 230, 230, 230, 231, 231, 232, 232, - 233, 234, 234, 235, 235, 236, 236, 237, 238, 238, - 239, 239, 240, 240, 241, 241, 241, 242, 242, 243, - 243, 244, 244, 245, 245, 246, 246, 246, 247, 247, - 247, 248, 248, 248, 249, 249, 250, 251, 251, 252, - 252, 253, 253, 254, 254, 255, 255, 255, 256, 256, - 257, 257, 259, 271, 272, 273, 273, 273, 273, 273, - 274, 274, 276, 288, 289, 290, 290, 290, 290, 291, - 291, 293, 307, 308, 309, 309, 309, 309, 310, 310, - 310, 312, 328, 329, 330, 330, 330, 330, 331, 331, - 331, 332, 334, 343, 352, 363, 372, 381, 390, 401, - 410, 421, 434, 449, 460, 477, 494, 507, 522, 531, - 540, 549, 558, 567, 576, 585, 594, 603, 612, 621, - 630, 639, 652, 661, 674, 683, 692, 701, 708, 715, - 724, 731, 740, 748, 757, 766, 780, 789, 798, 807, - 816, 825, 832, 839, 865, 873, 880, 887, 894, 901, - 909, 917, 925, 932, 943, 954, 961, 970, 979, 988, - 995, 1002, 1010, 1018, 1028, 1038, 1048, 1061, 1072, 1080, - 1093, 1102, 1111, 1120, 1130, 1140, 1148, 1161, 1170, 1178, - 1187, 1195, 1208, 1217, 1224, 1234, 1244, 1254, 1264, 1274, - 1284, 1294, 1304, 1311, 1318, 1325, 1334, 1343, 1352, 1359, - 1369, 1387, 1394, 1412, 1425, 1438, 1447, 1456, 1465, 1474, - 1484, 1494, 1505, 1514, 1523, 1536, 1549, 1558, 1565, 1574, - 1583, 1592, 1601, 1609, 1622, 1630, 1659, 1666, 1681, 1691, - 1701, 1708, 1715, 1724, 1732, 1746, 1765, 1784, 1796, 1808, - 1820, 1831, 1850, 1860, 1869, 1877, 1885, 1898, 1911, 1924, - 1937, 1946, 1955, 1964, 1973, 1983, 1993, 2006, 2019, 2030, - 2043, 2054, 2067, 2077, 2084, 2091, 2100, 2109, 2119, 2129, - 2139, 2146, 2153, 2162, 2171, 2181, 2191, 2198, 2205, 2212, - 2220, 2230, 2240, 2250, 2260, 2290, 2300, 2308, 2317, 2332, - 2341, 2346, 2347, 2348, 2348, 2348, 2349, 2349, 2349, 2350, - 2350, 2352, 2362, 2371, 2378, 2385, 2392, 2399, 2406, 2413, - 2418, 2419, 2420, 2420, 2421, 2421, 2422, 2422, 2423, 2424, - 2425, 2426, 2427, 2428, 2430, 2438, 2445, 2453, 2461, 2468, - 2475, 2484, 2493, 2502, 2511, 2520, 2529, 2534, 2535, 2536, - 2538, 2544, 2554, 2561, 2570, 2578, 2584, 2585, 2587, 2587, - 2587, 2588, 2588, 2589, 2590, 2591, 2592, 2593, 2595, 2605, - 2615, 2622, 2631, 2638, 2647, 2655, 2668, 2676, 2689, 2694, - 2695, 2696, 2696, 2697, 2697, 2697, 2699, 2713, 2728, 2740, - 2755, 2768 + 0, 166, 166, 166, 167, 167, 168, 168, 169, 169, + 169, 170, 170, 171, 175, 180, 181, 182, 182, 182, + 183, 183, 184, 184, 185, 185, 186, 186, 186, 187, + 187, 188, 188, 188, 189, 189, 189, 190, 190, 191, + 191, 192, 192, 193, 193, 194, 194, 195, 195, 196, + 196, 197, 197, 198, 198, 198, 199, 199, 199, 200, + 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, + 205, 205, 205, 206, 206, 207, 207, 208, 208, 208, + 209, 209, 210, 210, 211, 211, 212, 212, 212, 213, + 213, 214, 214, 215, 215, 216, 216, 217, 217, 218, + 218, 218, 219, 219, 220, 220, 220, 221, 221, 221, + 222, 222, 222, 223, 223, 223, 223, 224, 225, 225, + 225, 226, 226, 226, 227, 227, 228, 228, 229, 229, + 229, 230, 230, 231, 231, 231, 232, 232, 233, 233, + 234, 235, 235, 236, 236, 237, 237, 238, 239, 239, + 240, 240, 241, 241, 242, 242, 242, 243, 243, 244, + 244, 245, 245, 246, 246, 247, 247, 248, 248, 248, + 249, 249, 249, 250, 250, 250, 251, 251, 252, 253, + 253, 254, 254, 255, 255, 256, 256, 257, 257, 257, + 258, 258, 259, 259, 261, 273, 274, 275, 275, 275, + 275, 275, 276, 276, 278, 290, 291, 292, 292, 292, + 292, 293, 293, 295, 309, 310, 311, 311, 311, 311, + 312, 312, 312, 314, 330, 331, 332, 332, 332, 332, + 333, 333, 333, 334, 336, 345, 354, 365, 374, 383, + 392, 403, 412, 423, 436, 451, 462, 479, 496, 509, + 524, 533, 542, 551, 560, 569, 578, 587, 596, 605, + 614, 623, 632, 641, 654, 663, 676, 685, 694, 703, + 710, 717, 726, 733, 742, 750, 759, 768, 782, 791, + 800, 809, 818, 827, 834, 841, 867, 875, 882, 889, + 896, 903, 911, 919, 927, 934, 945, 956, 963, 972, + 981, 990, 997, 1004, 1012, 1020, 1030, 1040, 1050, 1063, + 1074, 1082, 1095, 1104, 1113, 1122, 1132, 1142, 1150, 1163, + 1172, 1180, 1189, 1197, 1210, 1219, 1226, 1236, 1246, 1256, + 1266, 1276, 1286, 1296, 1306, 1313, 1320, 1327, 1336, 1345, + 1354, 1361, 1371, 1389, 1396, 1414, 1427, 1440, 1449, 1458, + 1467, 1476, 1486, 1496, 1507, 1516, 1525, 1534, 1543, 1556, + 1569, 1578, 1585, 1594, 1603, 1612, 1621, 1629, 1642, 1650, + 1679, 1686, 1701, 1711, 1721, 1728, 1735, 1744, 1752, 1766, + 1785, 1804, 1816, 1828, 1840, 1851, 1870, 1880, 1889, 1897, + 1905, 1918, 1931, 1944, 1957, 1966, 1975, 1984, 1993, 2003, + 2013, 2026, 2039, 2050, 2063, 2074, 2087, 2097, 2104, 2111, + 2120, 2129, 2139, 2149, 2159, 2166, 2173, 2182, 2191, 2201, + 2211, 2218, 2225, 2232, 2240, 2250, 2260, 2270, 2280, 2310, + 2320, 2328, 2337, 2352, 2361, 2366, 2367, 2368, 2368, 2368, + 2369, 2369, 2369, 2370, 2370, 2372, 2382, 2391, 2398, 2405, + 2412, 2419, 2426, 2433, 2438, 2439, 2440, 2440, 2441, 2441, + 2442, 2442, 2443, 2444, 2445, 2446, 2447, 2448, 2450, 2458, + 2465, 2473, 2481, 2488, 2495, 2504, 2513, 2522, 2531, 2540, + 2549, 2554, 2555, 2556, 2558, 2564, 2574, 2581, 2590, 2598, + 2604, 2605, 2607, 2607, 2607, 2608, 2608, 2609, 2610, 2611, + 2612, 2613, 2615, 2625, 2635, 2642, 2651, 2658, 2667, 2675, + 2688, 2696, 2709, 2714, 2715, 2716, 2716, 2717, 2717, 2717, + 2719, 2733, 2748, 2760, 2775, 2788 }; #endif @@ -1109,7 +1113,8 @@ static const char *const yytname[] = "VAR_LOCAL_ZONE_TAG", "VAR_ACCESS_CONTROL_TAG", "VAR_LOCAL_ZONE_OVERRIDE", "VAR_ACCESS_CONTROL_TAG_ACTION", "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", - "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", + "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_SERVE_EXPIRED_TTL", + "VAR_SERVE_EXPIRED_TTL_RESET", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", "VAR_LOG_IDENTITY", "VAR_HIDE_TRUSTANCHOR", "VAR_TRUST_ANCHOR_SIGNALING", "VAR_AGGRESSIVE_NSEC", "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", "VAR_SHM_KEY", "VAR_ROOT_KEY_SENTINEL", "VAR_DNSCRYPT", @@ -1186,8 +1191,9 @@ static const char *const yytname[] = "server_cache_max_negative_ttl", "server_cache_min_ttl", "server_bogus_ttl", "server_val_clean_additional", "server_val_permissive_mode", "server_aggressive_nsec", - "server_ignore_cd_flag", "server_serve_expired", "server_fake_dsa", - "server_fake_sha1", "server_val_log_level", + "server_ignore_cd_flag", "server_serve_expired", + "server_serve_expired_ttl", "server_serve_expired_ttl_reset", + "server_fake_dsa", "server_fake_sha1", "server_val_log_level", "server_val_nsec3_keysize_iterations", "server_add_holddown", "server_del_holddown", "server_keep_missing", "server_permit_small_holddown", "server_key_cache_size", @@ -1272,14 +1278,14 @@ static const yytype_uint16 yytoknum[] = 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, - 505, 506 + 505, 506, 507, 508 }; # endif -#define YYPACT_NINF -148 +#define YYPACT_NINF -150 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-148))) + (!!((Yystate) == (-150))) #define YYTABLE_NINF -1 @@ -1290,85 +1296,85 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -148, 206, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -12, 97, 157, 145, 39, 49, - 105, -80, 104, -147, 22, 23, 24, 28, 29, 30, + -150, 208, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -12, 99, 159, 143, 39, 215, + 107, -80, 104, -149, 22, 23, 24, 28, 29, 30, 78, 79, 80, 84, 88, 89, 114, 115, 116, 118, - 129, 131, 176, 191, 192, 194, 195, 197, 200, 208, - 209, 210, 211, 212, 216, 217, 218, 219, 220, 228, - 230, 231, 232, 233, 234, 235, 236, 237, 238, 241, - 242, 243, 244, 245, 259, 260, 261, 262, 263, 264, - 266, 272, 273, 274, 276, 277, 278, 279, 280, 281, - 282, 284, 286, 287, 288, 289, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 302, 303, 304, 305, 317, - 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, - 328, 329, 330, 331, 332, 333, 334, 336, 338, 339, - 340, 341, 342, 343, 344, 345, 346, 348, 349, 350, - 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, - 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, - 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, - 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, - 391, 392, 393, 395, 397, 398, 399, 400, 401, 402, - 403, 404, 405, 406, 407, 409, 410, 411, 412, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, 413, 414, 415, 416, 417, - 418, 419, -148, -148, -148, -148, -148, -148, -148, -148, - 420, 421, 422, 423, 424, 426, -148, -148, -148, -148, - -148, -148, -148, 427, 428, 429, 430, 431, 432, 434, - -148, -148, -148, -148, -148, -148, -148, -148, 435, 436, - 437, 438, 439, 440, 441, 442, -148, -148, -148, -148, - -148, -148, -148, -148, -148, 443, 444, 445, 446, 447, - 448, 449, 450, -148, -148, -148, -148, -148, -148, -148, - -148, -148, 451, 452, 453, 454, 455, 456, 457, 458, - 459, 460, 461, 462, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, 463, -148, -148, - 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, 474, 475, 476, 477, 478, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, 479, 480, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, 481, 482, - 483, -148, -148, -148, -148, -148, -148, -148, -148, -148, - 484, 485, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, 486, 487, 488, - 489, 490, 491, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, 492, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, 493, -148, -148, 494, 495, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - 496, 497, 498, -148, -148, -148, -148, -148, -148, -148, - -148 + 129, 130, 131, 133, 136, 137, 138, 139, 140, 141, + 178, 193, 194, 196, 197, 199, 202, 210, 211, 214, + 216, 217, 218, 219, 220, 221, 222, 230, 232, 233, + 234, 235, 236, 238, 239, 240, 241, 243, 244, 245, + 246, 247, 261, 262, 263, 264, 265, 266, 268, 274, + 275, 276, 278, 279, 280, 281, 282, 283, 284, 286, + 288, 289, 290, 291, 293, 294, 295, 296, 297, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 334, 335, 336, 337, 338, 339, 340, + 342, 343, 344, 345, 346, 347, 348, 350, 351, 352, + 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, + 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, + 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, + 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, + 393, 394, 395, 397, 398, 399, 401, 402, 403, 404, + 405, 406, 407, 408, 409, 410, 411, 413, 414, 415, + 416, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, 417, + 418, 419, 420, 421, 422, 423, -150, -150, -150, -150, + -150, -150, -150, -150, 424, 425, 426, 427, 428, 430, + -150, -150, -150, -150, -150, -150, -150, 431, 432, 433, + 434, 435, 436, 438, -150, -150, -150, -150, -150, -150, + -150, -150, 439, 440, 441, 442, 443, 444, 445, 446, + -150, -150, -150, -150, -150, -150, -150, -150, -150, 447, + 448, 449, 450, 451, 452, 453, 454, -150, -150, -150, + -150, -150, -150, -150, -150, -150, 455, 456, 457, 458, + 459, 460, 461, 462, 463, 464, 465, 466, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, 467, -150, -150, 468, 469, 470, 471, 472, 473, + 474, 475, 476, 477, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, 478, 479, 480, 481, 482, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, 483, 484, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, 485, 486, 487, -150, -150, -150, -150, -150, + -150, -150, -150, -150, 488, 489, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, 490, 491, 492, 493, 494, 495, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, 496, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, 497, -150, -150, + 498, 499, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, 500, 501, 502, -150, + -150, -150, -150, -150, -150, -150, -150 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1376,9 +1382,9 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 14, 192, 202, 430, 476, 449, 211, - 485, 508, 221, 3, 16, 194, 204, 213, 223, 432, - 451, 478, 487, 510, 4, 5, 6, 10, 13, 8, + 2, 0, 1, 14, 194, 204, 434, 480, 453, 213, + 489, 512, 223, 3, 16, 196, 206, 215, 225, 436, + 455, 482, 491, 514, 4, 5, 6, 10, 13, 8, 9, 7, 11, 12, 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, @@ -1396,131 +1402,131 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, - 17, 18, 80, 83, 92, 171, 172, 19, 144, 145, - 146, 147, 148, 149, 31, 71, 20, 84, 85, 42, - 64, 79, 21, 22, 24, 25, 23, 26, 27, 28, - 29, 30, 115, 183, 116, 118, 119, 120, 185, 189, - 186, 167, 81, 70, 96, 113, 114, 191, 117, 32, - 33, 34, 35, 36, 72, 86, 87, 102, 58, 68, - 59, 175, 176, 97, 52, 53, 174, 54, 55, 106, - 110, 124, 133, 154, 107, 65, 37, 38, 39, 94, - 125, 126, 127, 40, 41, 43, 44, 46, 47, 45, - 131, 48, 49, 50, 56, 75, 111, 89, 132, 82, - 150, 90, 91, 108, 109, 95, 51, 73, 76, 57, - 60, 98, 99, 74, 151, 100, 61, 62, 63, 184, - 112, 164, 165, 173, 101, 69, 103, 104, 105, 152, - 66, 67, 88, 77, 78, 93, 121, 122, 123, 128, - 129, 130, 155, 156, 158, 160, 161, 159, 162, 168, - 134, 135, 138, 139, 136, 137, 140, 141, 143, 142, - 187, 188, 153, 163, 177, 179, 178, 180, 181, 182, - 157, 166, 169, 170, 190, 0, 0, 0, 0, 0, - 0, 0, 193, 195, 196, 197, 199, 200, 201, 198, - 0, 0, 0, 0, 0, 0, 203, 205, 206, 207, - 208, 209, 210, 0, 0, 0, 0, 0, 0, 0, - 212, 214, 215, 218, 219, 216, 220, 217, 0, 0, - 0, 0, 0, 0, 0, 0, 222, 224, 225, 226, - 227, 231, 228, 229, 230, 0, 0, 0, 0, 0, - 0, 0, 0, 431, 433, 435, 434, 440, 436, 437, - 438, 439, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 450, 452, 453, 454, 455, 456, - 457, 458, 459, 460, 461, 462, 463, 0, 477, 479, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 486, 488, 489, 490, 492, 493, 491, 494, 495, 496, - 497, 0, 0, 0, 0, 0, 509, 511, 512, 513, - 514, 515, 233, 232, 239, 248, 246, 254, 255, 258, - 256, 257, 259, 260, 261, 262, 263, 281, 282, 283, - 284, 285, 308, 309, 310, 315, 316, 251, 317, 318, - 321, 319, 320, 323, 324, 325, 338, 296, 297, 299, - 300, 326, 341, 290, 292, 342, 348, 349, 350, 252, - 307, 362, 363, 291, 357, 275, 247, 286, 339, 345, - 327, 0, 0, 366, 253, 234, 274, 331, 235, 249, - 250, 287, 288, 364, 329, 333, 334, 236, 367, 311, - 337, 276, 295, 343, 344, 347, 356, 289, 360, 358, - 359, 301, 306, 335, 336, 302, 303, 328, 352, 277, - 278, 280, 264, 266, 267, 268, 269, 270, 368, 369, - 370, 312, 313, 314, 322, 371, 372, 373, 0, 0, - 0, 330, 304, 481, 382, 386, 384, 383, 387, 385, - 0, 0, 390, 391, 240, 241, 242, 243, 244, 245, - 332, 346, 361, 394, 395, 305, 374, 0, 0, 0, - 0, 0, 0, 353, 354, 355, 482, 298, 293, 351, - 273, 237, 238, 294, 396, 398, 397, 399, 400, 401, - 265, 272, 392, 393, 271, 0, 279, 402, 403, 404, - 408, 407, 405, 406, 409, 410, 411, 412, 414, 413, - 423, 0, 427, 428, 0, 0, 429, 415, 421, 416, - 417, 418, 420, 422, 419, 441, 443, 442, 445, 446, - 447, 448, 444, 464, 465, 466, 467, 468, 469, 470, - 471, 472, 473, 474, 475, 480, 498, 499, 500, 503, - 501, 502, 504, 505, 506, 507, 516, 517, 518, 519, - 520, 340, 365, 381, 483, 484, 388, 389, 375, 376, - 0, 0, 0, 380, 521, 424, 425, 426, 379, 377, - 378 + 0, 15, 17, 18, 80, 83, 92, 173, 174, 19, + 144, 145, 146, 147, 148, 149, 31, 71, 20, 84, + 85, 42, 64, 79, 21, 22, 24, 25, 23, 26, + 27, 28, 29, 30, 115, 185, 116, 118, 119, 120, + 187, 191, 188, 169, 81, 70, 96, 113, 114, 193, + 117, 32, 33, 34, 35, 36, 72, 86, 87, 102, + 58, 68, 59, 177, 178, 97, 52, 53, 176, 54, + 55, 106, 110, 124, 133, 154, 107, 65, 37, 38, + 39, 94, 125, 126, 127, 40, 41, 43, 44, 46, + 47, 45, 131, 48, 49, 50, 56, 75, 111, 89, + 132, 82, 150, 90, 91, 108, 109, 95, 51, 73, + 76, 57, 60, 98, 99, 74, 151, 100, 61, 62, + 63, 186, 112, 164, 165, 166, 167, 175, 101, 69, + 103, 104, 105, 152, 66, 67, 88, 77, 78, 93, + 121, 122, 123, 128, 129, 130, 155, 156, 158, 160, + 161, 159, 162, 170, 134, 135, 138, 139, 136, 137, + 140, 141, 143, 142, 189, 190, 153, 163, 179, 181, + 180, 182, 183, 184, 157, 168, 171, 172, 192, 0, + 0, 0, 0, 0, 0, 0, 195, 197, 198, 199, + 201, 202, 203, 200, 0, 0, 0, 0, 0, 0, + 205, 207, 208, 209, 210, 211, 212, 0, 0, 0, + 0, 0, 0, 0, 214, 216, 217, 220, 221, 218, + 222, 219, 0, 0, 0, 0, 0, 0, 0, 0, + 224, 226, 227, 228, 229, 233, 230, 231, 232, 0, + 0, 0, 0, 0, 0, 0, 0, 435, 437, 439, + 438, 444, 440, 441, 442, 443, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 454, 456, + 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, + 467, 0, 481, 483, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 490, 492, 493, 494, 496, 497, + 495, 498, 499, 500, 501, 0, 0, 0, 0, 0, + 513, 515, 516, 517, 518, 519, 235, 234, 241, 250, + 248, 256, 257, 260, 258, 259, 261, 262, 263, 264, + 265, 283, 284, 285, 286, 287, 310, 311, 312, 317, + 318, 253, 319, 320, 323, 321, 322, 325, 326, 327, + 340, 298, 299, 301, 302, 328, 343, 292, 294, 344, + 350, 351, 352, 254, 309, 366, 367, 293, 361, 277, + 249, 288, 341, 347, 329, 0, 0, 370, 255, 236, + 276, 333, 237, 251, 252, 289, 290, 368, 331, 335, + 336, 238, 371, 313, 339, 278, 297, 345, 346, 349, + 360, 291, 364, 362, 363, 303, 308, 337, 338, 304, + 305, 330, 354, 279, 280, 282, 266, 268, 269, 270, + 271, 272, 372, 373, 374, 314, 315, 316, 324, 375, + 376, 377, 0, 0, 0, 332, 306, 485, 386, 390, + 388, 387, 391, 389, 0, 0, 394, 395, 242, 243, + 244, 245, 246, 247, 334, 348, 365, 398, 399, 307, + 378, 0, 0, 0, 0, 0, 0, 355, 356, 357, + 358, 359, 486, 300, 295, 353, 275, 239, 240, 296, + 400, 402, 401, 403, 404, 405, 267, 274, 396, 397, + 273, 0, 281, 406, 407, 408, 412, 411, 409, 410, + 413, 414, 415, 416, 418, 417, 427, 0, 431, 432, + 0, 0, 433, 419, 425, 420, 421, 422, 424, 426, + 423, 445, 447, 446, 449, 450, 451, 452, 448, 468, + 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, + 479, 484, 502, 503, 504, 507, 505, 506, 508, 509, + 510, 511, 520, 521, 522, 523, 524, 342, 369, 385, + 487, 488, 392, 393, 379, 380, 0, 0, 0, 384, + 525, 428, 429, 430, 383, 381, 382 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148 + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 13, 14, 24, 209, 15, 25, 392, 16, - 26, 406, 17, 27, 420, 18, 28, 436, 210, 211, - 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, - 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, - 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, - 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, - 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, - 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, - 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, - 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, - 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, - 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, - 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, - 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, - 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, - 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, - 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, - 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, - 372, 373, 374, 375, 376, 377, 378, 379, 393, 394, - 395, 396, 397, 398, 399, 407, 408, 409, 410, 411, - 412, 437, 438, 439, 440, 441, 442, 443, 444, 421, - 422, 423, 424, 425, 426, 427, 19, 29, 453, 454, - 455, 456, 457, 458, 459, 460, 461, 20, 30, 474, - 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, - 485, 486, 21, 31, 488, 489, 380, 381, 382, 383, - 22, 32, 500, 501, 502, 503, 504, 505, 506, 507, - 508, 509, 510, 23, 33, 516, 517, 518, 519, 520, - 521, 384 + -1, 1, 13, 14, 24, 211, 15, 25, 396, 16, + 26, 410, 17, 27, 424, 18, 28, 440, 212, 213, + 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, + 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, + 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, + 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, + 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, + 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, + 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, + 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, + 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, + 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, + 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, + 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, + 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, + 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, + 397, 398, 399, 400, 401, 402, 403, 411, 412, 413, + 414, 415, 416, 441, 442, 443, 444, 445, 446, 447, + 448, 425, 426, 427, 428, 429, 430, 431, 19, 29, + 457, 458, 459, 460, 461, 462, 463, 464, 465, 20, + 30, 478, 479, 480, 481, 482, 483, 484, 485, 486, + 487, 488, 489, 490, 21, 31, 492, 493, 384, 385, + 386, 387, 22, 32, 504, 505, 506, 507, 508, 509, + 510, 511, 512, 513, 514, 23, 33, 520, 521, 522, + 523, 524, 525, 388 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1531,54 +1537,55 @@ static const yytype_uint16 yytable[] = 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 487, 522, 523, 524, 65, 66, 67, 525, 526, - 527, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 64, 491, 526, 527, 528, 65, 66, 67, 529, 530, + 531, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 428, 511, 512, 513, 514, 515, 528, 529, - 530, 109, 110, 111, 531, 112, 113, 114, 532, 533, + 107, 108, 432, 515, 516, 517, 518, 519, 532, 533, + 534, 109, 110, 111, 535, 112, 113, 114, 536, 537, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 534, 535, 536, 139, 537, 140, - 141, 142, 143, 144, 145, 146, 147, 148, 149, 538, - 385, 539, 386, 387, 445, 446, 447, 448, 449, 450, - 451, 452, 150, 151, 152, 153, 154, 155, 156, 157, + 135, 136, 137, 138, 538, 539, 540, 139, 541, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 542, + 543, 544, 389, 545, 390, 391, 546, 547, 548, 549, + 550, 551, 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, 540, 184, 413, 185, + 178, 179, 180, 181, 182, 183, 417, 184, 552, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, - 400, 541, 542, 388, 543, 544, 2, 545, 401, 402, - 546, 196, 197, 198, 199, 200, 201, 3, 547, 548, - 549, 550, 551, 202, 414, 415, 552, 553, 554, 555, - 556, 203, 204, 205, 389, 206, 207, 390, 557, 208, - 558, 559, 560, 561, 562, 563, 564, 565, 566, 416, - 4, 567, 568, 569, 570, 571, 5, 462, 463, 464, - 465, 466, 467, 468, 469, 470, 471, 472, 473, 572, - 573, 574, 575, 576, 577, 429, 578, 430, 431, 432, - 433, 434, 579, 580, 581, 435, 582, 583, 584, 585, - 586, 587, 588, 403, 589, 404, 590, 591, 592, 593, - 6, 594, 595, 596, 597, 598, 599, 600, 601, 602, - 417, 418, 603, 604, 605, 606, 7, 490, 491, 492, - 493, 494, 495, 496, 497, 498, 499, 607, 608, 609, - 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, - 620, 621, 622, 623, 624, 419, 625, 391, 626, 627, - 628, 629, 630, 631, 632, 633, 634, 8, 635, 636, - 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, - 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, - 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, - 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, - 677, 678, 679, 680, 9, 681, 405, 682, 683, 684, - 685, 686, 687, 688, 689, 690, 691, 692, 10, 693, - 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, - 704, 705, 706, 707, 708, 11, 709, 710, 711, 712, - 713, 714, 715, 12, 716, 717, 718, 719, 720, 721, - 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, - 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, - 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, - 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, - 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, - 772, 773, 774, 775, 776, 777, 778, 779, 780 + 196, 197, 404, 553, 554, 392, 555, 556, 2, 557, + 405, 406, 558, 198, 199, 200, 201, 202, 203, 3, + 559, 560, 418, 419, 561, 204, 562, 563, 564, 565, + 566, 567, 568, 205, 206, 207, 393, 208, 209, 394, + 569, 210, 570, 571, 572, 573, 574, 420, 575, 576, + 577, 578, 4, 579, 580, 581, 582, 583, 5, 466, + 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, + 477, 584, 585, 586, 587, 588, 589, 433, 590, 434, + 435, 436, 437, 438, 591, 592, 593, 439, 594, 595, + 596, 597, 598, 599, 600, 407, 601, 408, 602, 603, + 604, 605, 6, 606, 607, 608, 609, 610, 421, 422, + 449, 450, 451, 452, 453, 454, 455, 456, 7, 494, + 495, 496, 497, 498, 499, 500, 501, 502, 503, 611, + 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, + 622, 623, 624, 423, 625, 626, 627, 628, 629, 630, + 631, 395, 632, 633, 634, 635, 636, 637, 638, 8, + 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, + 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, + 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, + 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, + 679, 680, 681, 682, 683, 684, 9, 685, 686, 687, + 409, 688, 689, 690, 691, 692, 693, 694, 695, 696, + 697, 698, 10, 699, 700, 701, 702, 703, 704, 705, + 706, 707, 708, 709, 710, 711, 712, 713, 714, 11, + 715, 716, 717, 718, 719, 720, 721, 12, 722, 723, + 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, + 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, + 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, + 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, + 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, + 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, + 784, 785, 786 }; static const yytype_uint8 yycheck[] = @@ -1591,59 +1598,60 @@ static const yytype_uint8 yycheck[] = 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 43, 230, 231, 232, 233, 234, 10, 10, + 92, 93, 43, 232, 233, 234, 235, 236, 10, 10, 10, 103, 104, 105, 10, 107, 108, 109, 10, 10, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 10, 10, 10, 139, 10, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 10, - 43, 10, 45, 46, 95, 96, 97, 98, 99, 100, - 101, 102, 164, 165, 166, 167, 168, 169, 170, 171, + 10, 10, 43, 10, 45, 46, 10, 10, 10, 10, + 10, 10, 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, 10, 199, 43, 201, + 192, 193, 194, 195, 196, 197, 43, 199, 10, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, - 43, 10, 10, 106, 10, 10, 0, 10, 51, 52, - 10, 223, 224, 225, 226, 227, 228, 11, 10, 10, - 10, 10, 10, 235, 79, 80, 10, 10, 10, 10, - 10, 243, 244, 245, 137, 247, 248, 140, 10, 251, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 104, - 44, 10, 10, 10, 10, 10, 50, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 10, - 10, 10, 10, 10, 10, 236, 10, 238, 239, 240, - 241, 242, 10, 10, 10, 246, 10, 10, 10, 10, - 10, 10, 10, 136, 10, 138, 10, 10, 10, 10, - 94, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 165, 166, 10, 10, 10, 10, 110, 213, 214, 215, - 216, 217, 218, 219, 220, 221, 222, 10, 10, 10, + 212, 213, 43, 10, 10, 106, 10, 10, 0, 10, + 51, 52, 10, 225, 226, 227, 228, 229, 230, 11, + 10, 10, 79, 80, 10, 237, 10, 10, 10, 10, + 10, 10, 10, 245, 246, 247, 137, 249, 250, 140, + 10, 253, 10, 10, 10, 10, 10, 104, 10, 10, + 10, 10, 44, 10, 10, 10, 10, 10, 50, 152, + 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, + 163, 10, 10, 10, 10, 10, 10, 238, 10, 240, + 241, 242, 243, 244, 10, 10, 10, 248, 10, 10, + 10, 10, 10, 10, 10, 136, 10, 138, 10, 10, + 10, 10, 94, 10, 10, 10, 10, 10, 165, 166, + 95, 96, 97, 98, 99, 100, 101, 102, 110, 215, + 216, 217, 218, 219, 220, 221, 222, 223, 224, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 200, 10, 250, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 151, 10, 10, + 10, 10, 10, 200, 10, 10, 10, 10, 10, 10, + 10, 252, 10, 10, 10, 10, 10, 10, 10, 151, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 198, 10, 249, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 212, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 229, 10, 10, 10, 10, - 10, 10, 10, 237, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 198, 10, 10, 10, + 251, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 214, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 231, + 10, 10, 10, 10, 10, 10, 10, 239, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 253, 0, 11, 44, 50, 94, 110, 151, 198, - 212, 229, 237, 254, 255, 258, 261, 264, 267, 468, - 479, 494, 502, 515, 256, 259, 262, 265, 268, 469, - 480, 495, 503, 516, 12, 13, 14, 15, 16, 17, + 0, 255, 0, 11, 44, 50, 94, 110, 151, 198, + 214, 231, 239, 256, 257, 260, 263, 266, 269, 472, + 483, 498, 506, 519, 258, 261, 264, 267, 270, 473, + 484, 499, 507, 520, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 47, 48, 49, 53, 54, @@ -1659,9 +1667,9 @@ static const yytype_uint16 yystos[] = 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 199, 201, 202, 203, 204, 205, - 206, 207, 208, 209, 210, 211, 223, 224, 225, 226, - 227, 228, 235, 243, 244, 245, 247, 248, 251, 257, - 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, + 206, 207, 208, 209, 210, 211, 212, 213, 225, 226, + 227, 228, 229, 230, 237, 245, 246, 247, 249, 250, + 253, 259, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, @@ -1678,21 +1686,21 @@ static const yytype_uint16 yystos[] = 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, - 498, 499, 500, 501, 523, 43, 45, 46, 106, 137, - 140, 250, 260, 440, 441, 442, 443, 444, 445, 446, - 43, 51, 52, 136, 138, 249, 263, 447, 448, 449, - 450, 451, 452, 43, 79, 80, 104, 165, 166, 200, - 266, 461, 462, 463, 464, 465, 466, 467, 43, 236, - 238, 239, 240, 241, 242, 246, 269, 453, 454, 455, - 456, 457, 458, 459, 460, 95, 96, 97, 98, 99, - 100, 101, 102, 470, 471, 472, 473, 474, 475, 476, - 477, 478, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 481, 482, 483, 484, 485, 486, - 487, 488, 489, 490, 491, 492, 493, 111, 496, 497, - 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, - 514, 230, 231, 232, 233, 234, 517, 518, 519, 520, - 521, 522, 10, 10, 10, 10, 10, 10, 10, 10, + 440, 441, 442, 443, 502, 503, 504, 505, 527, 43, + 45, 46, 106, 137, 140, 252, 262, 444, 445, 446, + 447, 448, 449, 450, 43, 51, 52, 136, 138, 251, + 265, 451, 452, 453, 454, 455, 456, 43, 79, 80, + 104, 165, 166, 200, 268, 465, 466, 467, 468, 469, + 470, 471, 43, 238, 240, 241, 242, 243, 244, 248, + 271, 457, 458, 459, 460, 461, 462, 463, 464, 95, + 96, 97, 98, 99, 100, 101, 102, 474, 475, 476, + 477, 478, 479, 480, 481, 482, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 161, 162, 163, 485, 486, + 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, + 497, 111, 500, 501, 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 508, 509, 510, 511, 512, 513, + 514, 515, 516, 517, 518, 232, 233, 234, 235, 236, + 521, 522, 523, 524, 525, 526, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1718,36 +1726,36 @@ static const yytype_uint16 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10 + 10, 10, 10, 10, 10, 10, 10 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 252, 253, 253, 254, 254, 254, 254, 254, 254, - 254, 254, 254, 254, 255, 256, 256, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, - 257, 257, 258, 259, 259, 260, 260, 260, 260, 260, - 260, 260, 261, 262, 262, 263, 263, 263, 263, 263, - 263, 264, 265, 265, 266, 266, 266, 266, 266, 266, - 266, 267, 268, 268, 269, 269, 269, 269, 269, 269, - 269, 269, 270, 271, 272, 273, 274, 275, 276, 277, + 0, 254, 255, 255, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 257, 258, 258, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 260, 261, 261, 262, 262, 262, + 262, 262, 262, 262, 263, 264, 264, 265, 265, 265, + 265, 265, 265, 266, 267, 267, 268, 268, 268, 268, + 268, 268, 268, 269, 270, 270, 271, 271, 271, 271, + 271, 271, 271, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, @@ -1767,16 +1775,16 @@ static const yytype_uint16 yyr1[] = 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, - 468, 469, 469, 470, 470, 470, 470, 470, 470, 470, - 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, - 480, 480, 481, 481, 481, 481, 481, 481, 481, 481, - 481, 481, 481, 481, 482, 483, 484, 485, 486, 487, - 488, 489, 490, 491, 492, 493, 494, 495, 495, 496, - 497, 498, 499, 500, 501, 502, 503, 503, 504, 504, - 504, 504, 504, 504, 504, 504, 504, 504, 505, 506, - 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, - 516, 517, 517, 517, 517, 517, 518, 519, 520, 521, - 522, 523 + 468, 469, 470, 471, 472, 473, 473, 474, 474, 474, + 474, 474, 474, 474, 474, 475, 476, 477, 478, 479, + 480, 481, 482, 483, 484, 484, 485, 485, 485, 485, + 485, 485, 485, 485, 485, 485, 485, 485, 486, 487, + 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, + 498, 499, 499, 500, 501, 502, 503, 504, 505, 506, + 507, 507, 508, 508, 508, 508, 508, 508, 508, 508, + 508, 508, 509, 510, 511, 512, 513, 514, 515, 516, + 517, 518, 519, 520, 520, 521, 521, 521, 521, 521, + 522, 523, 524, 525, 526, 527 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1801,40 +1809,40 @@ 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, 2, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, - 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 3, 3, 4, 4, 4, - 3, 3, 2, 2, 2, 2, 2, 2, 3, 3, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, - 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, - 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, - 2, 2, 2, 3, 3, 1, 2, 0, 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, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, + 3, 4, 4, 4, 3, 3, 2, 2, 2, 2, + 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, + 3, 2, 2, 2, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, - 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, - 2, 3 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 2, 0, 1, 2, 2, 2, 3, 3, 1, + 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, + 2, 2, 2, 2, 2, 3 }; @@ -2511,15 +2519,15 @@ yyreduce: switch (yyn) { case 14: -#line 175 "./util/configparser.y" /* yacc.c:1646 */ +#line 176 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(server:)\n")); } -#line 2519 "util/configparser.c" /* yacc.c:1646 */ +#line 2527 "util/configparser.c" /* yacc.c:1646 */ break; - case 192: -#line 260 "./util/configparser.y" /* yacc.c:1646 */ + case 194: +#line 262 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2530,11 +2538,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2534 "util/configparser.c" /* yacc.c:1646 */ +#line 2542 "util/configparser.c" /* yacc.c:1646 */ break; - case 202: -#line 277 "./util/configparser.y" /* yacc.c:1646 */ + case 204: +#line 279 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2545,11 +2553,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2549 "util/configparser.c" /* yacc.c:1646 */ +#line 2557 "util/configparser.c" /* yacc.c:1646 */ break; - case 211: -#line 294 "./util/configparser.y" /* yacc.c:1646 */ + case 213: +#line 296 "./util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2562,11 +2570,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2566 "util/configparser.c" /* yacc.c:1646 */ +#line 2574 "util/configparser.c" /* yacc.c:1646 */ break; - case 221: -#line 313 "./util/configparser.y" /* yacc.c:1646 */ + case 223: +#line 315 "./util/configparser.y" /* yacc.c:1646 */ { struct config_auth* s; OUTYY(("\nP(auth_zone:)\n")); @@ -2581,11 +2589,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2585 "util/configparser.c" /* yacc.c:1646 */ +#line 2593 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: -#line 335 "./util/configparser.y" /* yacc.c:1646 */ + case 234: +#line 337 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2593,11 +2601,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2597 "util/configparser.c" /* yacc.c:1646 */ +#line 2605 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: -#line 344 "./util/configparser.y" /* yacc.c:1646 */ + case 235: +#line 346 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2605,11 +2613,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2609 "util/configparser.c" /* yacc.c:1646 */ +#line 2617 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 353 "./util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 355 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2619,11 +2627,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2623 "util/configparser.c" /* yacc.c:1646 */ +#line 2631 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: -#line 364 "./util/configparser.y" /* yacc.c:1646 */ + case 237: +#line 366 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2631,11 +2639,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2635 "util/configparser.c" /* yacc.c:1646 */ +#line 2643 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: -#line 373 "./util/configparser.y" /* yacc.c:1646 */ + case 238: +#line 375 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2643,11 +2651,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2647 "util/configparser.c" /* yacc.c:1646 */ +#line 2655 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: -#line 382 "./util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 384 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2655,11 +2663,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2659 "util/configparser.c" /* yacc.c:1646 */ +#line 2667 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: -#line 391 "./util/configparser.y" /* yacc.c:1646 */ + case 240: +#line 393 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2669,11 +2677,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2673 "util/configparser.c" /* yacc.c:1646 */ +#line 2681 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: -#line 402 "./util/configparser.y" /* yacc.c:1646 */ + case 241: +#line 404 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2681,11 +2689,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2685 "util/configparser.c" /* yacc.c:1646 */ +#line 2693 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: -#line 411 "./util/configparser.y" /* yacc.c:1646 */ + case 242: +#line 413 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -2695,11 +2703,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2699 "util/configparser.c" /* yacc.c:1646 */ +#line 2707 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: -#line 422 "./util/configparser.y" /* yacc.c:1646 */ + case 243: +#line 424 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -2710,11 +2718,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2714 "util/configparser.c" /* yacc.c:1646 */ +#line 2722 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: -#line 435 "./util/configparser.y" /* yacc.c:1646 */ + case 244: +#line 437 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -2728,11 +2736,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2732 "util/configparser.c" /* yacc.c:1646 */ +#line 2740 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: -#line 450 "./util/configparser.y" /* yacc.c:1646 */ + case 245: +#line 452 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -2742,11 +2750,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2746 "util/configparser.c" /* yacc.c:1646 */ +#line 2754 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 461 "./util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 463 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2762,11 +2770,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2766 "util/configparser.c" /* yacc.c:1646 */ +#line 2774 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: -#line 478 "./util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 480 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2782,11 +2790,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2786 "util/configparser.c" /* yacc.c:1646 */ +#line 2794 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 495 "./util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 497 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2798,11 +2806,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2802 "util/configparser.c" /* yacc.c:1646 */ +#line 2810 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 508 "./util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 510 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2816,11 +2824,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2820 "util/configparser.c" /* yacc.c:1646 */ +#line 2828 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 523 "./util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 525 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2828,11 +2836,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2832 "util/configparser.c" /* yacc.c:1646 */ +#line 2840 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 532 "./util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 534 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -2840,11 +2848,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2844 "util/configparser.c" /* yacc.c:1646 */ +#line 2852 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 541 "./util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 543 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -2852,11 +2860,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2856 "util/configparser.c" /* yacc.c:1646 */ +#line 2864 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 550 "./util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 552 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2864,11 +2872,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2868 "util/configparser.c" /* yacc.c:1646 */ +#line 2876 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 559 "./util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 561 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2876,11 +2884,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2880 "util/configparser.c" /* yacc.c:1646 */ +#line 2888 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 568 "./util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 570 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2888,11 +2896,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2892 "util/configparser.c" /* yacc.c:1646 */ +#line 2900 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 577 "./util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 579 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2900,11 +2908,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2904 "util/configparser.c" /* yacc.c:1646 */ +#line 2912 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 586 "./util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 588 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2912,11 +2920,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2916 "util/configparser.c" /* yacc.c:1646 */ +#line 2924 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 595 "./util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 597 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2924,11 +2932,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2928 "util/configparser.c" /* yacc.c:1646 */ +#line 2936 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 604 "./util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 606 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2936,11 +2944,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2940 "util/configparser.c" /* yacc.c:1646 */ +#line 2948 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 613 "./util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 615 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2948,11 +2956,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2952 "util/configparser.c" /* yacc.c:1646 */ +#line 2960 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 622 "./util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 624 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2960,11 +2968,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2964 "util/configparser.c" /* yacc.c:1646 */ +#line 2972 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 631 "./util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 633 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2972,11 +2980,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2976 "util/configparser.c" /* yacc.c:1646 */ +#line 2984 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 640 "./util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 642 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2988,11 +2996,11 @@ yyreduce: else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2992 "util/configparser.c" /* yacc.c:1646 */ +#line 3000 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 653 "./util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 655 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3000,11 +3008,11 @@ yyreduce: else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3004 "util/configparser.c" /* yacc.c:1646 */ +#line 3012 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 662 "./util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 664 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3016,11 +3024,11 @@ yyreduce: else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3020 "util/configparser.c" /* yacc.c:1646 */ +#line 3028 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 675 "./util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 677 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3028,11 +3036,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3032 "util/configparser.c" /* yacc.c:1646 */ +#line 3040 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 684 "./util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 686 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3040,11 +3048,11 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3044 "util/configparser.c" /* yacc.c:1646 */ +#line 3052 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 693 "./util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 695 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3052,31 +3060,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3056 "util/configparser.c" /* yacc.c:1646 */ +#line 3064 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 702 "./util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 704 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_key); cfg_parser->cfg->ssl_service_key = (yyvsp[0].str); } -#line 3066 "util/configparser.c" /* yacc.c:1646 */ +#line 3074 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 709 "./util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 711 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_pem); cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str); } -#line 3076 "util/configparser.c" /* yacc.c:1646 */ +#line 3084 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 716 "./util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 718 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3084,21 +3092,21 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3088 "util/configparser.c" /* yacc.c:1646 */ +#line 3096 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 725 "./util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 727 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->tls_cert_bundle); cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str); } -#line 3098 "util/configparser.c" /* yacc.c:1646 */ +#line 3106 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 732 "./util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 734 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3106,22 +3114,22 @@ yyreduce: else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3110 "util/configparser.c" /* yacc.c:1646 */ +#line 3118 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 741 "./util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 743 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3121 "util/configparser.c" /* yacc.c:1646 */ +#line 3129 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 749 "./util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 751 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3129,11 +3137,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3133 "util/configparser.c" /* yacc.c:1646 */ +#line 3141 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 758 "./util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 760 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3141,11 +3149,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3145 "util/configparser.c" /* yacc.c:1646 */ +#line 3153 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 767 "./util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 769 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3158,11 +3166,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3162 "util/configparser.c" /* yacc.c:1646 */ +#line 3170 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 781 "./util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 783 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3170,11 +3178,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3174 "util/configparser.c" /* yacc.c:1646 */ +#line 3182 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 790 "./util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 792 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3182,11 +3190,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3186 "util/configparser.c" /* yacc.c:1646 */ +#line 3194 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 799 "./util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 801 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3194,11 +3202,11 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3198 "util/configparser.c" /* yacc.c:1646 */ +#line 3206 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 808 "./util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 810 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3206,11 +3214,11 @@ yyreduce: else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3210 "util/configparser.c" /* yacc.c:1646 */ +#line 3218 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 817 "./util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 819 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3218,31 +3226,31 @@ yyreduce: else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3222 "util/configparser.c" /* yacc.c:1646 */ +#line 3230 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 826 "./util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 828 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 3232 "util/configparser.c" /* yacc.c:1646 */ +#line 3240 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 833 "./util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 835 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 3242 "util/configparser.c" /* yacc.c:1646 */ +#line 3250 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 840 "./util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 842 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3267,105 +3275,105 @@ yyreduce: } } } -#line 3271 "util/configparser.c" /* yacc.c:1646 */ +#line 3279 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 866 "./util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 868 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->logfile); cfg_parser->cfg->logfile = (yyvsp[0].str); cfg_parser->cfg->use_syslog = 0; } -#line 3282 "util/configparser.c" /* yacc.c:1646 */ +#line 3290 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 874 "./util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 876 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 3292 "util/configparser.c" /* yacc.c:1646 */ +#line 3300 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 881 "./util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 883 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3302 "util/configparser.c" /* yacc.c:1646 */ +#line 3310 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 888 "./util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 890 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dlv_anchor_file); cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str); } -#line 3312 "util/configparser.c" /* yacc.c:1646 */ +#line 3320 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 895 "./util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 897 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3322 "util/configparser.c" /* yacc.c:1646 */ +#line 3330 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 902 "./util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 904 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> auto_trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3333 "util/configparser.c" /* yacc.c:1646 */ +#line 3341 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 910 "./util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 912 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3344 "util/configparser.c" /* yacc.c:1646 */ +#line 3352 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 918 "./util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 920 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trusted_keys_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3355 "util/configparser.c" /* yacc.c:1646 */ +#line 3363 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 926 "./util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 928 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3365 "util/configparser.c" /* yacc.c:1646 */ +#line 3373 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 933 "./util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 935 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3375,11 +3383,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3379 "util/configparser.c" /* yacc.c:1646 */ +#line 3387 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 944 "./util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 946 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3389,21 +3397,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3393 "util/configparser.c" /* yacc.c:1646 */ +#line 3401 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 955 "./util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 957 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3403 "util/configparser.c" /* yacc.c:1646 */ +#line 3411 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 962 "./util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 964 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3411,11 +3419,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3415 "util/configparser.c" /* yacc.c:1646 */ +#line 3423 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 971 "./util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 973 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3423,11 +3431,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3427 "util/configparser.c" /* yacc.c:1646 */ +#line 3435 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 980 "./util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 982 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3435,53 +3443,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3439 "util/configparser.c" /* yacc.c:1646 */ +#line 3447 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 989 "./util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 991 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 3449 "util/configparser.c" /* yacc.c:1646 */ +#line 3457 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 996 "./util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 998 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 3459 "util/configparser.c" /* yacc.c:1646 */ +#line 3467 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1003 "./util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1005 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3470 "util/configparser.c" /* yacc.c:1646 */ +#line 3478 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1011 "./util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1013 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3481 "util/configparser.c" /* yacc.c:1646 */ +#line 3489 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1019 "./util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1021 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3490,11 +3498,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3494 "util/configparser.c" /* yacc.c:1646 */ +#line 3502 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1029 "./util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1031 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3503,11 +3511,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3507 "util/configparser.c" /* yacc.c:1646 */ +#line 3515 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1039 "./util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1041 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3516,11 +3524,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3520 "util/configparser.c" /* yacc.c:1646 */ +#line 3528 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1049 "./util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1051 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3532,11 +3540,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3536 "util/configparser.c" /* yacc.c:1646 */ +#line 3544 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1062 "./util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1064 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3546,22 +3554,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3550 "util/configparser.c" /* yacc.c:1646 */ +#line 3558 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1073 "./util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1075 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3561 "util/configparser.c" /* yacc.c:1646 */ +#line 3569 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1081 "./util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1083 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3573,11 +3581,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3577 "util/configparser.c" /* yacc.c:1646 */ +#line 3585 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1094 "./util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1096 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3585,11 +3593,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3589 "util/configparser.c" /* yacc.c:1646 */ +#line 3597 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1103 "./util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1105 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3597,11 +3605,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3601 "util/configparser.c" /* yacc.c:1646 */ +#line 3609 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1112 "./util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1114 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3609,11 +3617,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3613 "util/configparser.c" /* yacc.c:1646 */ +#line 3621 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1121 "./util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1123 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3622,11 +3630,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3626 "util/configparser.c" /* yacc.c:1646 */ +#line 3634 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1131 "./util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1133 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3635,22 +3643,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3639 "util/configparser.c" /* yacc.c:1646 */ +#line 3647 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1141 "./util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1143 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3650 "util/configparser.c" /* yacc.c:1646 */ +#line 3658 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1149 "./util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1151 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3662,11 +3670,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3666 "util/configparser.c" /* yacc.c:1646 */ +#line 3674 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1162 "./util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1164 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3674,22 +3682,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3678 "util/configparser.c" /* yacc.c:1646 */ +#line 3686 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1171 "./util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1173 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " "removed, use infra-host-ttl)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3689 "util/configparser.c" /* yacc.c:1646 */ +#line 3697 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1179 "./util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1181 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3697,22 +3705,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3701 "util/configparser.c" /* yacc.c:1646 */ +#line 3709 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1188 "./util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1190 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " "(option removed, use infra-cache-numhosts)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3712 "util/configparser.c" /* yacc.c:1646 */ +#line 3720 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1196 "./util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1198 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3724,11 +3732,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3728 "util/configparser.c" /* yacc.c:1646 */ +#line 3736 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1209 "./util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1211 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3736,21 +3744,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3740 "util/configparser.c" /* yacc.c:1646 */ +#line 3748 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1218 "./util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1220 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->target_fetch_policy); cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str); } -#line 3750 "util/configparser.c" /* yacc.c:1646 */ +#line 3758 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1225 "./util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1227 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3759,11 +3767,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3763 "util/configparser.c" /* yacc.c:1646 */ +#line 3771 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1235 "./util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1237 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3772,11 +3780,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3776 "util/configparser.c" /* yacc.c:1646 */ +#line 3784 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1245 "./util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1247 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3785,11 +3793,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3789 "util/configparser.c" /* yacc.c:1646 */ +#line 3797 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1255 "./util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1257 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3798,11 +3806,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3802 "util/configparser.c" /* yacc.c:1646 */ +#line 3810 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1265 "./util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1267 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3811,11 +3819,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3815 "util/configparser.c" /* yacc.c:1646 */ +#line 3823 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1275 "./util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1277 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3824,11 +3832,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3828 "util/configparser.c" /* yacc.c:1646 */ +#line 3836 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1285 "./util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1287 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3837,11 +3845,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3841 "util/configparser.c" /* yacc.c:1646 */ +#line 3849 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1295 "./util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1297 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3850,41 +3858,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3854 "util/configparser.c" /* yacc.c:1646 */ +#line 3862 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1305 "./util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1307 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3864 "util/configparser.c" /* yacc.c:1646 */ +#line 3872 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1312 "./util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1314 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3874 "util/configparser.c" /* yacc.c:1646 */ +#line 3882 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1319 "./util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1321 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3884 "util/configparser.c" /* yacc.c:1646 */ +#line 3892 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1326 "./util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1328 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3892,11 +3900,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3896 "util/configparser.c" /* yacc.c:1646 */ +#line 3904 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1335 "./util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1337 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3904,11 +3912,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3908 "util/configparser.c" /* yacc.c:1646 */ +#line 3916 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1344 "./util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1346 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3916,21 +3924,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3920 "util/configparser.c" /* yacc.c:1646 */ +#line 3928 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1353 "./util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1355 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3930 "util/configparser.c" /* yacc.c:1646 */ +#line 3938 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1360 "./util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1362 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3939,11 +3947,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3943 "util/configparser.c" /* yacc.c:1646 */ +#line 3951 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1370 "./util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1372 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 && @@ -3960,21 +3968,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3964 "util/configparser.c" /* yacc.c:1646 */ +#line 3972 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1388 "./util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1390 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->module_conf); cfg_parser->cfg->module_conf = (yyvsp[0].str); } -#line 3974 "util/configparser.c" /* yacc.c:1646 */ +#line 3982 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1395 "./util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1397 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3991,11 +3999,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3995 "util/configparser.c" /* yacc.c:1646 */ +#line 4003 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1413 "./util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1415 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4007,11 +4015,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4011 "util/configparser.c" /* yacc.c:1646 */ +#line 4019 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1426 "./util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1428 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4023,11 +4031,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4027 "util/configparser.c" /* yacc.c:1646 */ +#line 4035 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1439 "./util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1441 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4035,11 +4043,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4039 "util/configparser.c" /* yacc.c:1646 */ +#line 4047 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1448 "./util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1450 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4047,11 +4055,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4051 "util/configparser.c" /* yacc.c:1646 */ +#line 4059 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1457 "./util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1459 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4059,11 +4067,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4063 "util/configparser.c" /* yacc.c:1646 */ +#line 4071 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1466 "./util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1468 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4071,11 +4079,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4075 "util/configparser.c" /* yacc.c:1646 */ +#line 4083 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1475 "./util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1477 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4084,11 +4092,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4088 "util/configparser.c" /* yacc.c:1646 */ +#line 4096 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1485 "./util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1487 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4097,11 +4105,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4101 "util/configparser.c" /* yacc.c:1646 */ +#line 4109 "util/configparser.c" /* yacc.c:1646 */ break; - case 351: -#line 1495 "./util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1497 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4111,11 +4119,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4115 "util/configparser.c" /* yacc.c:1646 */ +#line 4123 "util/configparser.c" /* yacc.c:1646 */ break; - case 352: -#line 1506 "./util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1508 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4123,11 +4131,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4127 "util/configparser.c" /* yacc.c:1646 */ +#line 4135 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1515 "./util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1517 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4135,11 +4143,35 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4139 "util/configparser.c" /* yacc.c:1646 */ +#line 4147 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1524 "./util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1526 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str))); + if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 4159 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 357: +#line 1535 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4171 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 358: +#line 1544 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4151,11 +4183,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4155 "util/configparser.c" /* yacc.c:1646 */ +#line 4187 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1537 "./util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1557 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4167,11 +4199,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4171 "util/configparser.c" /* yacc.c:1646 */ +#line 4203 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1550 "./util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1570 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4179,21 +4211,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4183 "util/configparser.c" /* yacc.c:1646 */ +#line 4215 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1559 "./util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1579 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str); } -#line 4193 "util/configparser.c" /* yacc.c:1646 */ +#line 4225 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1566 "./util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1586 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4201,11 +4233,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4205 "util/configparser.c" /* yacc.c:1646 */ +#line 4237 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1575 "./util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1595 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4213,11 +4245,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4217 "util/configparser.c" /* yacc.c:1646 */ +#line 4249 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1584 "./util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1604 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4225,11 +4257,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4229 "util/configparser.c" /* yacc.c:1646 */ +#line 4261 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1593 "./util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1613 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4238,22 +4270,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4242 "util/configparser.c" /* yacc.c:1646 */ +#line 4274 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1602 "./util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1622 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4253 "util/configparser.c" /* yacc.c:1646 */ +#line 4285 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1610 "./util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1630 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4265,22 +4297,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4269 "util/configparser.c" /* yacc.c:1646 */ +#line 4301 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1623 "./util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1643 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4280 "util/configparser.c" /* yacc.c:1646 */ +#line 4312 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1631 "./util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1651 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -4308,21 +4340,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4312 "util/configparser.c" /* yacc.c:1646 */ +#line 4344 "util/configparser.c" /* yacc.c:1646 */ break; - case 366: -#line 1660 "./util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1680 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str))) fatal_exit("out of memory adding local-data"); } -#line 4322 "util/configparser.c" /* yacc.c:1646 */ +#line 4354 "util/configparser.c" /* yacc.c:1646 */ break; - case 367: -#line 1667 "./util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1687 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4336,11 +4368,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4340 "util/configparser.c" /* yacc.c:1646 */ +#line 4372 "util/configparser.c" /* yacc.c:1646 */ break; - case 368: -#line 1682 "./util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1702 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4349,11 +4381,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4353 "util/configparser.c" /* yacc.c:1646 */ +#line 4385 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1692 "./util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1712 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4362,31 +4394,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4366 "util/configparser.c" /* yacc.c:1646 */ +#line 4398 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1702 "./util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1722 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4376 "util/configparser.c" /* yacc.c:1646 */ +#line 4408 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1709 "./util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1729 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 4386 "util/configparser.c" /* yacc.c:1646 */ +#line 4418 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 1716 "./util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 1736 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4394,22 +4426,22 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4398 "util/configparser.c" /* yacc.c:1646 */ +#line 4430 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 1725 "./util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 1745 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa, (yyvsp[0].str))) fatal_exit("out of memory adding dns64-ignore-aaaa"); } -#line 4409 "util/configparser.c" /* yacc.c:1646 */ +#line 4441 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 1733 "./util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 1753 "./util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4422,11 +4454,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4426 "util/configparser.c" /* yacc.c:1646 */ +#line 4458 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 1747 "./util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 1767 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4444,11 +4476,11 @@ yyreduce: } } } -#line 4448 "util/configparser.c" /* yacc.c:1646 */ +#line 4480 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 1766 "./util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 1786 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4466,11 +4498,11 @@ yyreduce: } } } -#line 4470 "util/configparser.c" /* yacc.c:1646 */ +#line 4502 "util/configparser.c" /* yacc.c:1646 */ break; - case 377: -#line 1785 "./util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1805 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions, @@ -4481,11 +4513,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4485 "util/configparser.c" /* yacc.c:1646 */ +#line 4517 "util/configparser.c" /* yacc.c:1646 */ break; - case 378: -#line 1797 "./util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 1817 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas, @@ -4496,11 +4528,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4500 "util/configparser.c" /* yacc.c:1646 */ +#line 4532 "util/configparser.c" /* yacc.c:1646 */ break; - case 379: -#line 1809 "./util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 1829 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides, @@ -4511,11 +4543,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4515 "util/configparser.c" /* yacc.c:1646 */ +#line 4547 "util/configparser.c" /* yacc.c:1646 */ break; - case 380: -#line 1821 "./util/configparser.y" /* yacc.c:1646 */ + case 384: +#line 1841 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -4525,11 +4557,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4529 "util/configparser.c" /* yacc.c:1646 */ +#line 4561 "util/configparser.c" /* yacc.c:1646 */ break; - case 381: -#line 1832 "./util/configparser.y" /* yacc.c:1646 */ + case 385: +#line 1852 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4547,11 +4579,11 @@ yyreduce: } } } -#line 4551 "util/configparser.c" /* yacc.c:1646 */ +#line 4583 "util/configparser.c" /* yacc.c:1646 */ break; - case 382: -#line 1851 "./util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 1871 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4559,11 +4591,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4563 "util/configparser.c" /* yacc.c:1646 */ +#line 4595 "util/configparser.c" /* yacc.c:1646 */ break; - case 383: -#line 1861 "./util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 1881 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4571,33 +4603,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4575 "util/configparser.c" /* yacc.c:1646 */ +#line 4607 "util/configparser.c" /* yacc.c:1646 */ break; - case 384: -#line 1870 "./util/configparser.y" /* yacc.c:1646 */ + case 388: +#line 1890 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4586 "util/configparser.c" /* yacc.c:1646 */ +#line 4618 "util/configparser.c" /* yacc.c:1646 */ break; - case 385: -#line 1878 "./util/configparser.y" /* yacc.c:1646 */ + case 389: +#line 1898 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4597 "util/configparser.c" /* yacc.c:1646 */ +#line 4629 "util/configparser.c" /* yacc.c:1646 */ break; - case 386: -#line 1886 "./util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 1906 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4609,11 +4641,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4613 "util/configparser.c" /* yacc.c:1646 */ +#line 4645 "util/configparser.c" /* yacc.c:1646 */ break; - case 387: -#line 1899 "./util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 1919 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4625,11 +4657,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4629 "util/configparser.c" /* yacc.c:1646 */ +#line 4661 "util/configparser.c" /* yacc.c:1646 */ break; - case 388: -#line 1912 "./util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 1932 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4641,11 +4673,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4645 "util/configparser.c" /* yacc.c:1646 */ +#line 4677 "util/configparser.c" /* yacc.c:1646 */ break; - case 389: -#line 1925 "./util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 1945 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4657,11 +4689,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4661 "util/configparser.c" /* yacc.c:1646 */ +#line 4693 "util/configparser.c" /* yacc.c:1646 */ break; - case 390: -#line 1938 "./util/configparser.y" /* yacc.c:1646 */ + case 394: +#line 1958 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4669,11 +4701,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4673 "util/configparser.c" /* yacc.c:1646 */ +#line 4705 "util/configparser.c" /* yacc.c:1646 */ break; - case 391: -#line 1947 "./util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 1967 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4681,11 +4713,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4685 "util/configparser.c" /* yacc.c:1646 */ +#line 4717 "util/configparser.c" /* yacc.c:1646 */ break; - case 392: -#line 1956 "./util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 1976 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_low_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4693,11 +4725,11 @@ yyreduce: else cfg_parser->cfg->low_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4697 "util/configparser.c" /* yacc.c:1646 */ +#line 4729 "util/configparser.c" /* yacc.c:1646 */ break; - case 393: -#line 1965 "./util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 1985 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_low_rtt_permil:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4705,11 +4737,11 @@ yyreduce: else cfg_parser->cfg->low_rtt_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4709 "util/configparser.c" /* yacc.c:1646 */ +#line 4741 "util/configparser.c" /* yacc.c:1646 */ break; - case 394: -#line 1974 "./util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 1994 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4718,11 +4750,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4722 "util/configparser.c" /* yacc.c:1646 */ +#line 4754 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 1984 "./util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 2004 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4731,11 +4763,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4735 "util/configparser.c" /* yacc.c:1646 */ +#line 4767 "util/configparser.c" /* yacc.c:1646 */ break; - case 396: -#line 1994 "./util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 2014 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -4747,11 +4779,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4751 "util/configparser.c" /* yacc.c:1646 */ +#line 4783 "util/configparser.c" /* yacc.c:1646 */ break; - case 397: -#line 2007 "./util/configparser.y" /* yacc.c:1646 */ + case 401: +#line 2027 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -4763,11 +4795,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4767 "util/configparser.c" /* yacc.c:1646 */ +#line 4799 "util/configparser.c" /* yacc.c:1646 */ break; - case 398: -#line 2020 "./util/configparser.y" /* yacc.c:1646 */ + case 402: +#line 2040 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -4777,11 +4809,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4781 "util/configparser.c" /* yacc.c:1646 */ +#line 4813 "util/configparser.c" /* yacc.c:1646 */ break; - case 399: -#line 2031 "./util/configparser.y" /* yacc.c:1646 */ + case 403: +#line 2051 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -4793,11 +4825,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4797 "util/configparser.c" /* yacc.c:1646 */ +#line 4829 "util/configparser.c" /* yacc.c:1646 */ break; - case 400: -#line 2044 "./util/configparser.y" /* yacc.c:1646 */ + case 404: +#line 2064 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -4807,11 +4839,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4811 "util/configparser.c" /* yacc.c:1646 */ +#line 4843 "util/configparser.c" /* yacc.c:1646 */ break; - case 401: -#line 2055 "./util/configparser.y" /* yacc.c:1646 */ + case 405: +#line 2075 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -4823,11 +4855,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4827 "util/configparser.c" /* yacc.c:1646 */ +#line 4859 "util/configparser.c" /* yacc.c:1646 */ break; - case 402: -#line 2068 "./util/configparser.y" /* yacc.c:1646 */ + case 406: +#line 2088 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4836,31 +4868,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4840 "util/configparser.c" /* yacc.c:1646 */ +#line 4872 "util/configparser.c" /* yacc.c:1646 */ break; - case 403: -#line 2078 "./util/configparser.y" /* yacc.c:1646 */ + case 407: +#line 2098 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4850 "util/configparser.c" /* yacc.c:1646 */ +#line 4882 "util/configparser.c" /* yacc.c:1646 */ break; - case 404: -#line 2085 "./util/configparser.y" /* yacc.c:1646 */ + case 408: +#line 2105 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4860 "util/configparser.c" /* yacc.c:1646 */ +#line 4892 "util/configparser.c" /* yacc.c:1646 */ break; - case 405: -#line 2092 "./util/configparser.y" /* yacc.c:1646 */ + case 409: +#line 2112 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4868,11 +4900,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4872 "util/configparser.c" /* yacc.c:1646 */ +#line 4904 "util/configparser.c" /* yacc.c:1646 */ break; - case 406: -#line 2101 "./util/configparser.y" /* yacc.c:1646 */ + case 410: +#line 2121 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4880,11 +4912,11 @@ yyreduce: else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4884 "util/configparser.c" /* yacc.c:1646 */ +#line 4916 "util/configparser.c" /* yacc.c:1646 */ break; - case 407: -#line 2110 "./util/configparser.y" /* yacc.c:1646 */ + case 411: +#line 2130 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4893,11 +4925,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4897 "util/configparser.c" /* yacc.c:1646 */ +#line 4929 "util/configparser.c" /* yacc.c:1646 */ break; - case 408: -#line 2120 "./util/configparser.y" /* yacc.c:1646 */ + case 412: +#line 2140 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4906,11 +4938,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4910 "util/configparser.c" /* yacc.c:1646 */ +#line 4942 "util/configparser.c" /* yacc.c:1646 */ break; - case 409: -#line 2130 "./util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 2150 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4919,31 +4951,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4923 "util/configparser.c" /* yacc.c:1646 */ +#line 4955 "util/configparser.c" /* yacc.c:1646 */ break; - case 410: -#line 2140 "./util/configparser.y" /* yacc.c:1646 */ + case 414: +#line 2160 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4933 "util/configparser.c" /* yacc.c:1646 */ +#line 4965 "util/configparser.c" /* yacc.c:1646 */ break; - case 411: -#line 2147 "./util/configparser.y" /* yacc.c:1646 */ + case 415: +#line 2167 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4943 "util/configparser.c" /* yacc.c:1646 */ +#line 4975 "util/configparser.c" /* yacc.c:1646 */ break; - case 412: -#line 2154 "./util/configparser.y" /* yacc.c:1646 */ + case 416: +#line 2174 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4951,11 +4983,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4955 "util/configparser.c" /* yacc.c:1646 */ +#line 4987 "util/configparser.c" /* yacc.c:1646 */ break; - case 413: -#line 2163 "./util/configparser.y" /* yacc.c:1646 */ + case 417: +#line 2183 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4963,11 +4995,11 @@ yyreduce: else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4967 "util/configparser.c" /* yacc.c:1646 */ +#line 4999 "util/configparser.c" /* yacc.c:1646 */ break; - case 414: -#line 2172 "./util/configparser.y" /* yacc.c:1646 */ + case 418: +#line 2192 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4976,11 +5008,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4980 "util/configparser.c" /* yacc.c:1646 */ +#line 5012 "util/configparser.c" /* yacc.c:1646 */ break; - case 415: -#line 2182 "./util/configparser.y" /* yacc.c:1646 */ + case 419: +#line 2202 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -4989,52 +5021,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 4993 "util/configparser.c" /* yacc.c:1646 */ +#line 5025 "util/configparser.c" /* yacc.c:1646 */ break; - case 416: -#line 2192 "./util/configparser.y" /* yacc.c:1646 */ + case 420: +#line 2212 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->zonefile); cfg_parser->cfg->auths->zonefile = (yyvsp[0].str); } -#line 5003 "util/configparser.c" /* yacc.c:1646 */ +#line 5035 "util/configparser.c" /* yacc.c:1646 */ break; - case 417: -#line 2199 "./util/configparser.y" /* yacc.c:1646 */ + case 421: +#line 2219 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(master:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5013 "util/configparser.c" /* yacc.c:1646 */ +#line 5045 "util/configparser.c" /* yacc.c:1646 */ break; - case 418: -#line 2206 "./util/configparser.y" /* yacc.c:1646 */ + case 422: +#line 2226 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(url:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5023 "util/configparser.c" /* yacc.c:1646 */ +#line 5055 "util/configparser.c" /* yacc.c:1646 */ break; - case 419: -#line 2213 "./util/configparser.y" /* yacc.c:1646 */ + case 423: +#line 2233 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5034 "util/configparser.c" /* yacc.c:1646 */ +#line 5066 "util/configparser.c" /* yacc.c:1646 */ break; - case 420: -#line 2221 "./util/configparser.y" /* yacc.c:1646 */ + case 424: +#line 2241 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5043,11 +5075,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5047 "util/configparser.c" /* yacc.c:1646 */ +#line 5079 "util/configparser.c" /* yacc.c:1646 */ break; - case 421: -#line 2231 "./util/configparser.y" /* yacc.c:1646 */ + case 425: +#line 2251 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5056,11 +5088,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5060 "util/configparser.c" /* yacc.c:1646 */ +#line 5092 "util/configparser.c" /* yacc.c:1646 */ break; - case 422: -#line 2241 "./util/configparser.y" /* yacc.c:1646 */ + case 426: +#line 2261 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5069,11 +5101,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5073 "util/configparser.c" /* yacc.c:1646 */ +#line 5105 "util/configparser.c" /* yacc.c:1646 */ break; - case 423: -#line 2251 "./util/configparser.y" /* yacc.c:1646 */ + case 427: +#line 2271 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -5082,11 +5114,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 5086 "util/configparser.c" /* yacc.c:1646 */ +#line 5118 "util/configparser.c" /* yacc.c:1646 */ break; - case 424: -#line 2261 "./util/configparser.y" /* yacc.c:1646 */ + case 428: +#line 2281 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -5115,11 +5147,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 5119 "util/configparser.c" /* yacc.c:1646 */ +#line 5151 "util/configparser.c" /* yacc.c:1646 */ break; - case 425: -#line 2291 "./util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2311 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5128,22 +5160,22 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 5132 "util/configparser.c" /* yacc.c:1646 */ +#line 5164 "util/configparser.c" /* yacc.c:1646 */ break; - case 426: -#line 2301 "./util/configparser.y" /* yacc.c:1646 */ + case 430: +#line 2321 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert( &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 5143 "util/configparser.c" /* yacc.c:1646 */ +#line 5175 "util/configparser.c" /* yacc.c:1646 */ break; - case 427: -#line 2309 "./util/configparser.y" /* yacc.c:1646 */ + case 431: +#line 2329 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) { @@ -5151,11 +5183,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5155 "util/configparser.c" /* yacc.c:1646 */ +#line 5187 "util/configparser.c" /* yacc.c:1646 */ break; - case 428: -#line 2318 "./util/configparser.y" /* yacc.c:1646 */ + case 432: +#line 2338 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5169,11 +5201,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5173 "util/configparser.c" /* yacc.c:1646 */ +#line 5205 "util/configparser.c" /* yacc.c:1646 */ break; - case 429: -#line 2333 "./util/configparser.y" /* yacc.c:1646 */ + case 433: +#line 2353 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5181,19 +5213,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5185 "util/configparser.c" /* yacc.c:1646 */ +#line 5217 "util/configparser.c" /* yacc.c:1646 */ break; - case 430: -#line 2342 "./util/configparser.y" /* yacc.c:1646 */ + case 434: +#line 2362 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 5193 "util/configparser.c" /* yacc.c:1646 */ +#line 5225 "util/configparser.c" /* yacc.c:1646 */ break; - case 441: -#line 2353 "./util/configparser.y" /* yacc.c:1646 */ + case 445: +#line 2373 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5202,11 +5234,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5206 "util/configparser.c" /* yacc.c:1646 */ +#line 5238 "util/configparser.c" /* yacc.c:1646 */ break; - case 442: -#line 2363 "./util/configparser.y" /* yacc.c:1646 */ + case 446: +#line 2383 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5214,142 +5246,142 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5218 "util/configparser.c" /* yacc.c:1646 */ +#line 5250 "util/configparser.c" /* yacc.c:1646 */ break; - case 443: -#line 2372 "./util/configparser.y" /* yacc.c:1646 */ + case 447: +#line 2392 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5228 "util/configparser.c" /* yacc.c:1646 */ +#line 5260 "util/configparser.c" /* yacc.c:1646 */ break; - case 444: -#line 2379 "./util/configparser.y" /* yacc.c:1646 */ + case 448: +#line 2399 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5238 "util/configparser.c" /* yacc.c:1646 */ +#line 5270 "util/configparser.c" /* yacc.c:1646 */ break; - case 445: -#line 2386 "./util/configparser.y" /* yacc.c:1646 */ + case 449: +#line 2406 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_key_file); cfg_parser->cfg->server_key_file = (yyvsp[0].str); } -#line 5248 "util/configparser.c" /* yacc.c:1646 */ +#line 5280 "util/configparser.c" /* yacc.c:1646 */ break; - case 446: -#line 2393 "./util/configparser.y" /* yacc.c:1646 */ + case 450: +#line 2413 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_cert_file); cfg_parser->cfg->server_cert_file = (yyvsp[0].str); } -#line 5258 "util/configparser.c" /* yacc.c:1646 */ +#line 5290 "util/configparser.c" /* yacc.c:1646 */ break; - case 447: -#line 2400 "./util/configparser.y" /* yacc.c:1646 */ + case 451: +#line 2420 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_key_file); cfg_parser->cfg->control_key_file = (yyvsp[0].str); } -#line 5268 "util/configparser.c" /* yacc.c:1646 */ +#line 5300 "util/configparser.c" /* yacc.c:1646 */ break; - case 448: -#line 2407 "./util/configparser.y" /* yacc.c:1646 */ + case 452: +#line 2427 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_cert_file); cfg_parser->cfg->control_cert_file = (yyvsp[0].str); } -#line 5278 "util/configparser.c" /* yacc.c:1646 */ +#line 5310 "util/configparser.c" /* yacc.c:1646 */ break; - case 449: -#line 2414 "./util/configparser.y" /* yacc.c:1646 */ + case 453: +#line 2434 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 5286 "util/configparser.c" /* yacc.c:1646 */ +#line 5318 "util/configparser.c" /* yacc.c:1646 */ break; - case 464: -#line 2431 "./util/configparser.y" /* yacc.c:1646 */ + case 468: +#line 2451 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5297 "util/configparser.c" /* yacc.c:1646 */ +#line 5329 "util/configparser.c" /* yacc.c:1646 */ break; - case 465: -#line 2439 "./util/configparser.y" /* yacc.c:1646 */ + case 469: +#line 2459 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_socket_path); cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str); } -#line 5307 "util/configparser.c" /* yacc.c:1646 */ +#line 5339 "util/configparser.c" /* yacc.c:1646 */ break; - case 466: -#line 2446 "./util/configparser.y" /* yacc.c:1646 */ + case 470: +#line 2466 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5318 "util/configparser.c" /* yacc.c:1646 */ +#line 5350 "util/configparser.c" /* yacc.c:1646 */ break; - case 467: -#line 2454 "./util/configparser.y" /* yacc.c:1646 */ + case 471: +#line 2474 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5329 "util/configparser.c" /* yacc.c:1646 */ +#line 5361 "util/configparser.c" /* yacc.c:1646 */ break; - case 468: -#line 2462 "./util/configparser.y" /* yacc.c:1646 */ + case 472: +#line 2482 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_identity); cfg_parser->cfg->dnstap_identity = (yyvsp[0].str); } -#line 5339 "util/configparser.c" /* yacc.c:1646 */ +#line 5371 "util/configparser.c" /* yacc.c:1646 */ break; - case 469: -#line 2469 "./util/configparser.y" /* yacc.c:1646 */ + case 473: +#line 2489 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_version); cfg_parser->cfg->dnstap_version = (yyvsp[0].str); } -#line 5349 "util/configparser.c" /* yacc.c:1646 */ +#line 5381 "util/configparser.c" /* yacc.c:1646 */ break; - case 470: -#line 2476 "./util/configparser.y" /* yacc.c:1646 */ + case 474: +#line 2496 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5357,11 +5389,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5361 "util/configparser.c" /* yacc.c:1646 */ +#line 5393 "util/configparser.c" /* yacc.c:1646 */ break; - case 471: -#line 2485 "./util/configparser.y" /* yacc.c:1646 */ + case 475: +#line 2505 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5369,11 +5401,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5373 "util/configparser.c" /* yacc.c:1646 */ +#line 5405 "util/configparser.c" /* yacc.c:1646 */ break; - case 472: -#line 2494 "./util/configparser.y" /* yacc.c:1646 */ + case 476: +#line 2514 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5381,11 +5413,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5385 "util/configparser.c" /* yacc.c:1646 */ +#line 5417 "util/configparser.c" /* yacc.c:1646 */ break; - case 473: -#line 2503 "./util/configparser.y" /* yacc.c:1646 */ + case 477: +#line 2523 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5393,11 +5425,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5397 "util/configparser.c" /* yacc.c:1646 */ +#line 5429 "util/configparser.c" /* yacc.c:1646 */ break; - case 474: -#line 2512 "./util/configparser.y" /* yacc.c:1646 */ + case 478: +#line 2532 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5405,11 +5437,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5409 "util/configparser.c" /* yacc.c:1646 */ +#line 5441 "util/configparser.c" /* yacc.c:1646 */ break; - case 475: -#line 2521 "./util/configparser.y" /* yacc.c:1646 */ + case 479: +#line 2541 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5417,29 +5449,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5421 "util/configparser.c" /* yacc.c:1646 */ - break; - - case 476: -#line 2530 "./util/configparser.y" /* yacc.c:1646 */ - { - OUTYY(("\nP(python:)\n")); - } -#line 5429 "util/configparser.c" /* yacc.c:1646 */ +#line 5453 "util/configparser.c" /* yacc.c:1646 */ break; case 480: -#line 2539 "./util/configparser.y" /* yacc.c:1646 */ +#line 2550 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("\nP(python:)\n")); + } +#line 5461 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 484: +#line 2559 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->python_script); cfg_parser->cfg->python_script = (yyvsp[0].str); } -#line 5439 "util/configparser.c" /* yacc.c:1646 */ +#line 5471 "util/configparser.c" /* yacc.c:1646 */ break; - case 481: -#line 2545 "./util/configparser.y" /* yacc.c:1646 */ + case 485: +#line 2565 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5448,21 +5480,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5452 "util/configparser.c" /* yacc.c:1646 */ +#line 5484 "util/configparser.c" /* yacc.c:1646 */ break; - case 482: -#line 2555 "./util/configparser.y" /* yacc.c:1646 */ + case 486: +#line 2575 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->log_identity); cfg_parser->cfg->log_identity = (yyvsp[0].str); } -#line 5462 "util/configparser.c" /* yacc.c:1646 */ +#line 5494 "util/configparser.c" /* yacc.c:1646 */ break; - case 483: -#line 2562 "./util/configparser.y" /* yacc.c:1646 */ + case 487: +#line 2582 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5470,31 +5502,31 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 5474 "util/configparser.c" /* yacc.c:1646 */ +#line 5506 "util/configparser.c" /* yacc.c:1646 */ break; - case 484: -#line 2571 "./util/configparser.y" /* yacc.c:1646 */ + case 488: +#line 2591 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 5485 "util/configparser.c" /* yacc.c:1646 */ +#line 5517 "util/configparser.c" /* yacc.c:1646 */ break; - case 485: -#line 2579 "./util/configparser.y" /* yacc.c:1646 */ + case 489: +#line 2599 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnscrypt:)\n")); OUTYY(("\nP(dnscrypt:)\n")); } -#line 5494 "util/configparser.c" /* yacc.c:1646 */ +#line 5526 "util/configparser.c" /* yacc.c:1646 */ break; - case 498: -#line 2596 "./util/configparser.y" /* yacc.c:1646 */ + case 502: +#line 2616 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5502,11 +5534,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5506 "util/configparser.c" /* yacc.c:1646 */ +#line 5538 "util/configparser.c" /* yacc.c:1646 */ break; - case 499: -#line 2606 "./util/configparser.y" /* yacc.c:1646 */ + case 503: +#line 2626 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); @@ -5515,21 +5547,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5519 "util/configparser.c" /* yacc.c:1646 */ +#line 5551 "util/configparser.c" /* yacc.c:1646 */ break; - case 500: -#line 2616 "./util/configparser.y" /* yacc.c:1646 */ + case 504: +#line 2636 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnscrypt_provider); cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str); } -#line 5529 "util/configparser.c" /* yacc.c:1646 */ +#line 5561 "util/configparser.c" /* yacc.c:1646 */ break; - case 501: -#line 2623 "./util/configparser.y" /* yacc.c:1646 */ + case 505: +#line 2643 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) @@ -5537,21 +5569,21 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 5541 "util/configparser.c" /* yacc.c:1646 */ +#line 5573 "util/configparser.c" /* yacc.c:1646 */ break; - case 502: -#line 2632 "./util/configparser.y" /* yacc.c:1646 */ + case 506: +#line 2652 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert-rotated"); } -#line 5551 "util/configparser.c" /* yacc.c:1646 */ +#line 5583 "util/configparser.c" /* yacc.c:1646 */ break; - case 503: -#line 2639 "./util/configparser.y" /* yacc.c:1646 */ + case 507: +#line 2659 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) @@ -5559,22 +5591,22 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 5563 "util/configparser.c" /* yacc.c:1646 */ +#line 5595 "util/configparser.c" /* yacc.c:1646 */ break; - case 504: -#line 2648 "./util/configparser.y" /* yacc.c:1646 */ + case 508: +#line 2668 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5574 "util/configparser.c" /* yacc.c:1646 */ +#line 5606 "util/configparser.c" /* yacc.c:1646 */ break; - case 505: -#line 2656 "./util/configparser.y" /* yacc.c:1646 */ + case 509: +#line 2676 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5586,22 +5618,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5590 "util/configparser.c" /* yacc.c:1646 */ +#line 5622 "util/configparser.c" /* yacc.c:1646 */ break; - case 506: -#line 2669 "./util/configparser.y" /* yacc.c:1646 */ + case 510: +#line 2689 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5601 "util/configparser.c" /* yacc.c:1646 */ +#line 5633 "util/configparser.c" /* yacc.c:1646 */ break; - case 507: -#line 2677 "./util/configparser.y" /* yacc.c:1646 */ + case 511: +#line 2697 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5613,19 +5645,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5617 "util/configparser.c" /* yacc.c:1646 */ +#line 5649 "util/configparser.c" /* yacc.c:1646 */ break; - case 508: -#line 2690 "./util/configparser.y" /* yacc.c:1646 */ + case 512: +#line 2710 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(cachedb:)\n")); } -#line 5625 "util/configparser.c" /* yacc.c:1646 */ +#line 5657 "util/configparser.c" /* yacc.c:1646 */ break; - case 516: -#line 2700 "./util/configparser.y" /* yacc.c:1646 */ + case 520: +#line 2720 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -5638,11 +5670,11 @@ yyreduce: OUTYY(("P(Compiled without cachedb, ignoring)\n")); #endif } -#line 5642 "util/configparser.c" /* yacc.c:1646 */ +#line 5674 "util/configparser.c" /* yacc.c:1646 */ break; - case 517: -#line 2714 "./util/configparser.y" /* yacc.c:1646 */ + case 521: +#line 2734 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -5656,11 +5688,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5660 "util/configparser.c" /* yacc.c:1646 */ +#line 5692 "util/configparser.c" /* yacc.c:1646 */ break; - case 518: -#line 2729 "./util/configparser.y" /* yacc.c:1646 */ + case 522: +#line 2749 "./util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -5671,11 +5703,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5675 "util/configparser.c" /* yacc.c:1646 */ +#line 5707 "util/configparser.c" /* yacc.c:1646 */ break; - case 519: -#line 2741 "./util/configparser.y" /* yacc.c:1646 */ + case 523: +#line 2761 "./util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -5689,11 +5721,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5693 "util/configparser.c" /* yacc.c:1646 */ +#line 5725 "util/configparser.c" /* yacc.c:1646 */ break; - case 520: -#line 2756 "./util/configparser.y" /* yacc.c:1646 */ + case 524: +#line 2776 "./util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -5705,11 +5737,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5709 "util/configparser.c" /* yacc.c:1646 */ +#line 5741 "util/configparser.c" /* yacc.c:1646 */ break; - case 521: -#line 2769 "./util/configparser.y" /* yacc.c:1646 */ + case 525: +#line 2789 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if (atoi((yyvsp[0].str)) < 0) @@ -5719,11 +5751,11 @@ yyreduce: fatal_exit("out of memory adding tcp connection limit"); } } -#line 5723 "util/configparser.c" /* yacc.c:1646 */ +#line 5755 "util/configparser.c" /* yacc.c:1646 */ break; -#line 5727 "util/configparser.c" /* yacc.c:1646 */ +#line 5759 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5951,7 +5983,7 @@ yyreturn: #endif return yyresult; } -#line 2779 "./util/configparser.y" /* yacc.c:1906 */ +#line 2799 "./util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 7c48c2fa0..d8b1ec174 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -244,56 +244,58 @@ extern int yydebug; VAR_ACCESS_CONTROL_VIEW = 454, VAR_VIEW_FIRST = 455, VAR_SERVE_EXPIRED = 456, - VAR_FAKE_DSA = 457, - VAR_FAKE_SHA1 = 458, - VAR_LOG_IDENTITY = 459, - VAR_HIDE_TRUSTANCHOR = 460, - VAR_TRUST_ANCHOR_SIGNALING = 461, - VAR_AGGRESSIVE_NSEC = 462, - VAR_USE_SYSTEMD = 463, - VAR_SHM_ENABLE = 464, - VAR_SHM_KEY = 465, - VAR_ROOT_KEY_SENTINEL = 466, - VAR_DNSCRYPT = 467, - VAR_DNSCRYPT_ENABLE = 468, - VAR_DNSCRYPT_PORT = 469, - VAR_DNSCRYPT_PROVIDER = 470, - VAR_DNSCRYPT_SECRET_KEY = 471, - VAR_DNSCRYPT_PROVIDER_CERT = 472, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 473, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 474, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 475, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 476, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 477, - VAR_IPSECMOD_ENABLED = 478, - VAR_IPSECMOD_HOOK = 479, - VAR_IPSECMOD_IGNORE_BOGUS = 480, - VAR_IPSECMOD_MAX_TTL = 481, - VAR_IPSECMOD_WHITELIST = 482, - VAR_IPSECMOD_STRICT = 483, - VAR_CACHEDB = 484, - VAR_CACHEDB_BACKEND = 485, - VAR_CACHEDB_SECRETSEED = 486, - VAR_CACHEDB_REDISHOST = 487, - VAR_CACHEDB_REDISPORT = 488, - VAR_CACHEDB_REDISTIMEOUT = 489, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 490, - VAR_FOR_UPSTREAM = 491, - VAR_AUTH_ZONE = 492, - VAR_ZONEFILE = 493, - VAR_MASTER = 494, - VAR_URL = 495, - VAR_FOR_DOWNSTREAM = 496, - VAR_FALLBACK_ENABLED = 497, - VAR_TLS_ADDITIONAL_PORT = 498, - VAR_LOW_RTT = 499, - VAR_LOW_RTT_PERMIL = 500, - VAR_ALLOW_NOTIFY = 501, - VAR_TLS_WIN_CERT = 502, - VAR_TCP_CONNECTION_LIMIT = 503, - VAR_FORWARD_NO_CACHE = 504, - VAR_STUB_NO_CACHE = 505, - VAR_LOG_SERVFAIL = 506 + VAR_SERVE_EXPIRED_TTL = 457, + VAR_SERVE_EXPIRED_TTL_RESET = 458, + VAR_FAKE_DSA = 459, + VAR_FAKE_SHA1 = 460, + VAR_LOG_IDENTITY = 461, + VAR_HIDE_TRUSTANCHOR = 462, + VAR_TRUST_ANCHOR_SIGNALING = 463, + VAR_AGGRESSIVE_NSEC = 464, + VAR_USE_SYSTEMD = 465, + VAR_SHM_ENABLE = 466, + VAR_SHM_KEY = 467, + VAR_ROOT_KEY_SENTINEL = 468, + VAR_DNSCRYPT = 469, + VAR_DNSCRYPT_ENABLE = 470, + VAR_DNSCRYPT_PORT = 471, + VAR_DNSCRYPT_PROVIDER = 472, + VAR_DNSCRYPT_SECRET_KEY = 473, + VAR_DNSCRYPT_PROVIDER_CERT = 474, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 475, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 476, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 477, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 478, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 479, + VAR_IPSECMOD_ENABLED = 480, + VAR_IPSECMOD_HOOK = 481, + VAR_IPSECMOD_IGNORE_BOGUS = 482, + VAR_IPSECMOD_MAX_TTL = 483, + VAR_IPSECMOD_WHITELIST = 484, + VAR_IPSECMOD_STRICT = 485, + VAR_CACHEDB = 486, + VAR_CACHEDB_BACKEND = 487, + VAR_CACHEDB_SECRETSEED = 488, + VAR_CACHEDB_REDISHOST = 489, + VAR_CACHEDB_REDISPORT = 490, + VAR_CACHEDB_REDISTIMEOUT = 491, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 492, + VAR_FOR_UPSTREAM = 493, + VAR_AUTH_ZONE = 494, + VAR_ZONEFILE = 495, + VAR_MASTER = 496, + VAR_URL = 497, + VAR_FOR_DOWNSTREAM = 498, + VAR_FALLBACK_ENABLED = 499, + VAR_TLS_ADDITIONAL_PORT = 500, + VAR_LOW_RTT = 501, + VAR_LOW_RTT_PERMIL = 502, + VAR_ALLOW_NOTIFY = 503, + VAR_TLS_WIN_CERT = 504, + VAR_TCP_CONNECTION_LIMIT = 505, + VAR_FORWARD_NO_CACHE = 506, + VAR_STUB_NO_CACHE = 507, + VAR_LOG_SERVFAIL = 508 }; #endif /* Tokens. */ @@ -496,56 +498,58 @@ extern int yydebug; #define VAR_ACCESS_CONTROL_VIEW 454 #define VAR_VIEW_FIRST 455 #define VAR_SERVE_EXPIRED 456 -#define VAR_FAKE_DSA 457 -#define VAR_FAKE_SHA1 458 -#define VAR_LOG_IDENTITY 459 -#define VAR_HIDE_TRUSTANCHOR 460 -#define VAR_TRUST_ANCHOR_SIGNALING 461 -#define VAR_AGGRESSIVE_NSEC 462 -#define VAR_USE_SYSTEMD 463 -#define VAR_SHM_ENABLE 464 -#define VAR_SHM_KEY 465 -#define VAR_ROOT_KEY_SENTINEL 466 -#define VAR_DNSCRYPT 467 -#define VAR_DNSCRYPT_ENABLE 468 -#define VAR_DNSCRYPT_PORT 469 -#define VAR_DNSCRYPT_PROVIDER 470 -#define VAR_DNSCRYPT_SECRET_KEY 471 -#define VAR_DNSCRYPT_PROVIDER_CERT 472 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 473 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 474 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 475 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 476 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 477 -#define VAR_IPSECMOD_ENABLED 478 -#define VAR_IPSECMOD_HOOK 479 -#define VAR_IPSECMOD_IGNORE_BOGUS 480 -#define VAR_IPSECMOD_MAX_TTL 481 -#define VAR_IPSECMOD_WHITELIST 482 -#define VAR_IPSECMOD_STRICT 483 -#define VAR_CACHEDB 484 -#define VAR_CACHEDB_BACKEND 485 -#define VAR_CACHEDB_SECRETSEED 486 -#define VAR_CACHEDB_REDISHOST 487 -#define VAR_CACHEDB_REDISPORT 488 -#define VAR_CACHEDB_REDISTIMEOUT 489 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 490 -#define VAR_FOR_UPSTREAM 491 -#define VAR_AUTH_ZONE 492 -#define VAR_ZONEFILE 493 -#define VAR_MASTER 494 -#define VAR_URL 495 -#define VAR_FOR_DOWNSTREAM 496 -#define VAR_FALLBACK_ENABLED 497 -#define VAR_TLS_ADDITIONAL_PORT 498 -#define VAR_LOW_RTT 499 -#define VAR_LOW_RTT_PERMIL 500 -#define VAR_ALLOW_NOTIFY 501 -#define VAR_TLS_WIN_CERT 502 -#define VAR_TCP_CONNECTION_LIMIT 503 -#define VAR_FORWARD_NO_CACHE 504 -#define VAR_STUB_NO_CACHE 505 -#define VAR_LOG_SERVFAIL 506 +#define VAR_SERVE_EXPIRED_TTL 457 +#define VAR_SERVE_EXPIRED_TTL_RESET 458 +#define VAR_FAKE_DSA 459 +#define VAR_FAKE_SHA1 460 +#define VAR_LOG_IDENTITY 461 +#define VAR_HIDE_TRUSTANCHOR 462 +#define VAR_TRUST_ANCHOR_SIGNALING 463 +#define VAR_AGGRESSIVE_NSEC 464 +#define VAR_USE_SYSTEMD 465 +#define VAR_SHM_ENABLE 466 +#define VAR_SHM_KEY 467 +#define VAR_ROOT_KEY_SENTINEL 468 +#define VAR_DNSCRYPT 469 +#define VAR_DNSCRYPT_ENABLE 470 +#define VAR_DNSCRYPT_PORT 471 +#define VAR_DNSCRYPT_PROVIDER 472 +#define VAR_DNSCRYPT_SECRET_KEY 473 +#define VAR_DNSCRYPT_PROVIDER_CERT 474 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 475 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 476 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 477 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 478 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 479 +#define VAR_IPSECMOD_ENABLED 480 +#define VAR_IPSECMOD_HOOK 481 +#define VAR_IPSECMOD_IGNORE_BOGUS 482 +#define VAR_IPSECMOD_MAX_TTL 483 +#define VAR_IPSECMOD_WHITELIST 484 +#define VAR_IPSECMOD_STRICT 485 +#define VAR_CACHEDB 486 +#define VAR_CACHEDB_BACKEND 487 +#define VAR_CACHEDB_SECRETSEED 488 +#define VAR_CACHEDB_REDISHOST 489 +#define VAR_CACHEDB_REDISPORT 490 +#define VAR_CACHEDB_REDISTIMEOUT 491 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 492 +#define VAR_FOR_UPSTREAM 493 +#define VAR_AUTH_ZONE 494 +#define VAR_ZONEFILE 495 +#define VAR_MASTER 496 +#define VAR_URL 497 +#define VAR_FOR_DOWNSTREAM 498 +#define VAR_FALLBACK_ENABLED 499 +#define VAR_TLS_ADDITIONAL_PORT 500 +#define VAR_LOW_RTT 501 +#define VAR_LOW_RTT_PERMIL 502 +#define VAR_ALLOW_NOTIFY 503 +#define VAR_TLS_WIN_CERT 504 +#define VAR_TCP_CONNECTION_LIMIT 505 +#define VAR_FORWARD_NO_CACHE 506 +#define VAR_STUB_NO_CACHE 507 +#define VAR_LOG_SERVFAIL 508 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -556,7 +560,7 @@ union YYSTYPE char* str; -#line 560 "util/configparser.h" /* yacc.c:1909 */ +#line 564 "util/configparser.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index 9285d7ba3..24c5b2d1e 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -140,7 +140,8 @@ extern struct config_parser_state* cfg_parser; %token VAR_DEFINE_TAG VAR_LOCAL_ZONE_TAG VAR_ACCESS_CONTROL_TAG %token VAR_LOCAL_ZONE_OVERRIDE VAR_ACCESS_CONTROL_TAG_ACTION %token VAR_ACCESS_CONTROL_TAG_DATA VAR_VIEW VAR_ACCESS_CONTROL_VIEW -%token VAR_VIEW_FIRST VAR_SERVE_EXPIRED VAR_FAKE_DSA VAR_FAKE_SHA1 +%token VAR_VIEW_FIRST VAR_SERVE_EXPIRED VAR_SERVE_EXPIRED_TTL +%token VAR_SERVE_EXPIRED_TTL_RESET VAR_FAKE_DSA VAR_FAKE_SHA1 %token VAR_LOG_IDENTITY VAR_HIDE_TRUSTANCHOR VAR_TRUST_ANCHOR_SIGNALING %token VAR_AGGRESSIVE_NSEC VAR_USE_SYSTEMD VAR_SHM_ENABLE VAR_SHM_KEY %token VAR_ROOT_KEY_SENTINEL @@ -243,6 +244,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_local_zone_override | server_access_control_tag_action | server_access_control_tag_data | server_access_control_view | server_qname_minimisation_strict | server_serve_expired | + server_serve_expired_ttl | server_serve_expired_ttl_reset | server_fake_dsa | server_log_identity | server_use_systemd | server_response_ip_tag | server_response_ip | server_response_ip_data | server_shm_enable | server_shm_key | server_fake_sha1 | @@ -1520,6 +1522,24 @@ server_serve_expired: VAR_SERVE_EXPIRED STRING_ARG free($2); } ; +server_serve_expired_ttl: VAR_SERVE_EXPIRED_TTL STRING_ARG + { + OUTYY(("P(server_serve_expired_ttl:%s)\n", $2)); + if(atoi($2) == 0 && strcmp($2, "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->serve_expired_ttl = atoi($2); + free($2); + } + ; +server_serve_expired_ttl_reset: VAR_SERVE_EXPIRED_TTL_RESET STRING_ARG + { + OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp($2, "yes")==0); + free($2); + } + ; server_fake_dsa: VAR_FAKE_DSA STRING_ARG { OUTYY(("P(server_fake_dsa:%s)\n", $2)); diff --git a/util/data/msgparse.h b/util/data/msgparse.h index e21f8504e..c0c6ff5fd 100644 --- a/util/data/msgparse.h +++ b/util/data/msgparse.h @@ -79,6 +79,8 @@ extern time_t MAX_TTL; extern time_t MIN_TTL; /** Maximum Negative TTL that is allowed */ extern time_t MAX_NEG_TTL; +/** Time to serve records after expiration */ +extern time_t SERVE_EXPIRED_TTL; /** Negative cache time (for entries without any RRs.) */ #define NORR_TTL 5 /* seconds */ diff --git a/util/data/msgreply.c b/util/data/msgreply.c index 248ecb8eb..540d7d4b3 100644 --- a/util/data/msgreply.c +++ b/util/data/msgreply.c @@ -61,6 +61,8 @@ time_t MAX_TTL = 3600 * 24 * 10; /* ten days */ time_t MIN_TTL = 0; /** MAX Negative TTL, for SOA records in authority section */ time_t MAX_NEG_TTL = 3600; /* one hour */ +/** Time to serve records after expiration */ +time_t SERVE_EXPIRED_TTL = 0; /** allocate qinfo, return 0 on error */ static int @@ -85,8 +87,8 @@ parse_create_qinfo(sldns_buffer* pkt, struct msg_parse* msg, /** constructor for replyinfo */ struct reply_info* construct_reply_info_base(struct regional* region, uint16_t flags, size_t qd, - time_t ttl, time_t prettl, size_t an, size_t ns, size_t ar, - size_t total, enum sec_status sec) + time_t ttl, time_t prettl, time_t expttl, size_t an, size_t ns, + size_t ar, size_t total, enum sec_status sec) { struct reply_info* rep; /* rrset_count-1 because the first ref is part of the struct. */ @@ -103,6 +105,7 @@ construct_reply_info_base(struct regional* region, uint16_t flags, size_t qd, rep->qdcount = qd; rep->ttl = ttl; rep->prefetch_ttl = prettl; + rep->serve_expired_ttl = expttl; rep->an_numrrsets = an; rep->ns_numrrsets = ns; rep->ar_numrrsets = ar; @@ -126,7 +129,7 @@ parse_create_repinfo(struct msg_parse* msg, struct reply_info** rep, struct regional* region) { *rep = construct_reply_info_base(region, msg->flags, msg->qdcount, 0, - 0, msg->an_rrsets, msg->ns_rrsets, msg->ar_rrsets, + 0, 0, msg->an_rrsets, msg->ns_rrsets, msg->ar_rrsets, msg->rrset_count, sec_status_unchecked); if(!*rep) return 0; @@ -424,6 +427,7 @@ parse_copy_decompress(sldns_buffer* pkt, struct msg_parse* msg, pset = pset->rrset_all_next; } rep->prefetch_ttl = PREFETCH_TTL_CALC(rep->ttl); + rep->serve_expired_ttl = rep->ttl + SERVE_EXPIRED_TTL; return 1; } @@ -502,6 +506,7 @@ reply_info_set_ttls(struct reply_info* rep, time_t timenow) size_t i, j; rep->ttl += timenow; rep->prefetch_ttl += timenow; + rep->serve_expired_ttl += timenow; for(i=0; irrset_count; i++) { struct packed_rrset_data* data = (struct packed_rrset_data*) rep->ref[i].key->entry.data; @@ -687,9 +692,9 @@ reply_info_copy(struct reply_info* rep, struct alloc_cache* alloc, { struct reply_info* cp; cp = construct_reply_info_base(region, rep->flags, rep->qdcount, - rep->ttl, rep->prefetch_ttl, rep->an_numrrsets, - rep->ns_numrrsets, rep->ar_numrrsets, rep->rrset_count, - rep->security); + rep->ttl, rep->prefetch_ttl, rep->serve_expired_ttl, + rep->an_numrrsets, rep->ns_numrrsets, rep->ar_numrrsets, + rep->rrset_count, rep->security); if(!cp) return NULL; /* allocate ub_key structures special or not */ diff --git a/util/data/msgreply.h b/util/data/msgreply.h index 73103b7c0..a455c4d2b 100644 --- a/util/data/msgreply.h +++ b/util/data/msgreply.h @@ -156,6 +156,12 @@ struct reply_info { */ time_t prefetch_ttl; + /** + * Reply TTL extended with serve exipred TTL, to limit time to serve + * expired message. + */ + time_t serve_expired_ttl; + /** * The security status from DNSSEC validation of this message. */ @@ -222,6 +228,7 @@ struct msgreply_entry { * @param qd: qd count * @param ttl: TTL of replyinfo * @param prettl: prefetch ttl + * @param expttl: serve expired ttl * @param an: an count * @param ns: ns count * @param ar: ar count @@ -232,8 +239,8 @@ struct msgreply_entry { */ struct reply_info* construct_reply_info_base(struct regional* region, uint16_t flags, size_t qd, - time_t ttl, time_t prettl, size_t an, size_t ns, size_t ar, - size_t total, enum sec_status sec); + time_t ttl, time_t prettl, time_t expttl, size_t an, size_t ns, + size_t ar, size_t total, enum sec_status sec); /** * Parse wire query into a queryinfo structure, return 0 on parse error. diff --git a/validator/validator.c b/validator/validator.c index 880ee7159..fa8d5419a 100644 --- a/validator/validator.c +++ b/validator/validator.c @@ -2235,6 +2235,8 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq, vq->orig_msg->rep->ttl = ve->bogus_ttl; vq->orig_msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(vq->orig_msg->rep->ttl); + vq->orig_msg->rep->serve_expired_ttl = + vq->orig_msg->rep->ttl + qstate->env->cfg->serve_expired_ttl; if((qstate->env->cfg->val_log_level >= 1 || qstate->env->cfg->log_servfail) && !qstate->env->cfg->val_log_squelch) {