diff --git a/doc/Changelog b/doc/Changelog index 3b911d686..2cd29f2ae 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +26 April 2017: Ralph + - Implemented trust anchor signaling using key tag query. + 26 April 2017: Wouter - Based on #1257: check parse limit before t increment in sldns RR string parse routine. diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 3b65de2f3..bf24f8467 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -804,6 +804,9 @@ the trusted\-keys { name flag proto algo "key"; }; clauses are read. It is possible to use wildcards with this statement, the wildcard is expanded on start and on reload. .TP +.B trust\-anchor\-signaling: \fI +Send RFC8145 key tag query after trust anchor priming. Default is off. +.TP .B dlv\-anchor\-file: \fI This option was used during early days DNSSEC deployment when no parent-side DS record registrations were easily available. Nowadays, it is best to have diff --git a/util/config_file.c b/util/config_file.c index 9690bc1de..a7d680154 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -206,6 +206,7 @@ config_create(void) cfg->trust_anchor_file_list = NULL; cfg->trust_anchor_list = NULL; cfg->trusted_keys_file_list = NULL; + cfg->trust_anchor_signaling = 0; cfg->dlv_anchor_file = NULL; cfg->dlv_anchor_list = NULL; cfg->domain_insecure = NULL; @@ -480,6 +481,7 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_STRLIST("trust-anchor-file:", trust_anchor_file_list) else S_STRLIST("trust-anchor:", trust_anchor_list) else S_STRLIST("trusted-keys-file:", trusted_keys_file_list) + else S_YNO("trust-anchor-signaling:", trust_anchor_signaling) else S_STR("dlv-anchor-file:", dlv_anchor_file) else S_STRLIST("dlv-anchor:", dlv_anchor_list) else S_STRLIST("domain-insecure:", domain_insecure) @@ -861,6 +863,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_LST(opt, "trust-anchor-file", trust_anchor_file_list) else O_LST(opt, "trust-anchor", trust_anchor_list) else O_LST(opt, "trusted-keys-file", trusted_keys_file_list) + else O_YNO(opt, "trust-anchor-signaling", trust_anchor_signaling) else O_LST(opt, "dlv-anchor", dlv_anchor_list) else O_LST(opt, "control-interface", control_ifs) else O_LST(opt, "domain-insecure", domain_insecure) diff --git a/util/config_file.h b/util/config_file.h index 79b094894..6795fda48 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -274,6 +274,8 @@ struct config_file { struct config_strlist* dlv_anchor_list; /** insecure domain list */ struct config_strlist* domain_insecure; + /** send key tag query */ + int trust_anchor_signaling; /** if not 0, this value is the validation date for RRSIGs */ int32_t val_date_override; diff --git a/util/configlexer.c b/util/configlexer.c index b530d32d6..4ae510f75 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 0 +#define YY_FLEX_SUBMINOR_VERSION 1 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -89,25 +89,13 @@ typedef unsigned int flex_uint32_t; #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ @@ -168,7 +156,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; @@ -184,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 \ @@ -207,12 +195,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -235,7 +223,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. */ @@ -263,7 +251,7 @@ struct yy_buffer_state /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -282,11 +270,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -311,7 +299,7 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); 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,yy_size_t len ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); void *yyalloc (yy_size_t ); void *yyrealloc (void *,yy_size_t ); @@ -345,7 +333,7 @@ void yyfree (void * ); typedef unsigned char YY_CHAR; -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; @@ -362,10 +350,7 @@ extern char *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 ); -#if defined(__GNUC__) && __GNUC__ >= 3 -__attribute__((__noreturn__)) -#endif -static void yy_fatal_error (yyconst char msg[] ); +static void yynoreturn yy_fatal_error (yyconst char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -373,13 +358,13 @@ static void yy_fatal_error (yyconst char msg[] ); #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ (yytext_ptr) -= (yy_more_len); \ - yyleng = (size_t) (yy_cp - (yytext_ptr)); \ + yyleng = (int) (yy_cp - (yytext_ptr)); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 221 -#define YY_END_OF_BUFFER 222 +#define YY_NUM_RULES 222 +#define YY_END_OF_BUFFER 223 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -387,246 +372,247 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[2165] = +static yyconst flex_int16_t yy_accept[2175] = { 0, - 1, 1, 203, 203, 207, 207, 211, 211, 215, 215, - 1, 1, 222, 219, 1, 201, 201, 220, 2, 220, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 203, 204, 204, 205, 220, 207, 208, 208, 209, 220, - 214, 211, 212, 212, 213, 220, 215, 216, 216, 217, - 220, 218, 202, 2, 206, 220, 218, 219, 0, 1, - 2, 2, 2, 2, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 1, 1, 204, 204, 208, 208, 212, 212, 216, 216, + 1, 1, 223, 220, 1, 202, 202, 221, 2, 221, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 204, 205, 205, 206, 221, 208, 209, 209, 210, 221, + 215, 212, 213, 213, 214, 221, 216, 217, 217, 218, + 221, 219, 203, 2, 207, 221, 219, 220, 0, 1, + 2, 2, 2, 2, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 203, 0, 207, 0, 214, 0, 211, 215, 0, 218, - 0, 2, 2, 218, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 204, 0, 208, 0, 215, 0, 212, 216, 0, 219, + 0, 2, 2, 219, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 218, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 219, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 218, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 77, 219, 219, 219, - 219, 219, 219, 8, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 219, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 77, 220, 220, 220, + 220, 220, 220, 8, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 88, 218, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 88, 219, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 218, - 219, 219, 219, 219, 219, 37, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 168, 219, - 14, 15, 219, 18, 17, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 154, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 219, + 220, 220, 220, 220, 220, 37, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 169, 220, + 14, 15, 220, 18, 17, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 155, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 219, 3, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 218, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 210, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 220, 3, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 219, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 211, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 40, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 41, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 143, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 20, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 102, 219, 210, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 195, 219, 219, 219, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 40, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 41, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 144, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 20, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 102, 220, 211, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 196, 220, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 118, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 101, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 75, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 25, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 38, 219, 219, 219, 219, 219, 219, 219, + 220, 220, 220, 119, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 101, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 75, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 25, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 38, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 39, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 119, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 28, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 183, 219, 219, 219, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 39, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 120, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 28, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 184, 220, 220, 220, - 219, 219, 219, 219, 219, 219, 219, 32, 219, 33, - 219, 219, 219, 78, 219, 79, 219, 219, 76, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 7, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 161, 219, 219, 219, 219, 104, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 29, 219, 219, 219, + 220, 220, 220, 220, 220, 220, 220, 32, 220, 33, + 220, 220, 220, 78, 220, 79, 220, 220, 76, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 7, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 162, 220, 220, 220, 220, 104, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 29, 220, 220, 220, - 219, 219, 219, 219, 135, 219, 134, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 16, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 42, 219, 219, - 219, 219, 219, 219, 142, 219, 219, 219, 219, 81, - 80, 219, 219, 219, 219, 219, 219, 219, 219, 129, - 219, 219, 219, 219, 219, 219, 219, 219, 89, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 60, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 136, 220, 135, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 16, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 42, 220, 220, + 220, 220, 220, 220, 143, 220, 220, 220, 220, 81, + 80, 220, 220, 220, 220, 220, 220, 220, 220, 130, + 220, 220, 220, 220, 220, 220, 220, 220, 89, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 60, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 64, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 36, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 132, - 133, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 6, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 193, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 26, 219, 219, 219, 219, 219, 219, 219, 219, 125, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 64, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 36, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 133, + 134, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 6, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 194, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 26, 220, 220, 220, 220, 220, 220, 220, 220, 126, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 147, 219, 126, 219, 219, 159, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 27, 219, 219, 219, 219, 84, 219, 85, 219, 83, - 219, 219, 219, 219, 219, 219, 219, 219, 99, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 182, 219, 219, 127, 219, 219, 219, 219, 219, 130, - 219, 219, 158, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 74, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 148, 220, 127, 220, 220, 160, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 27, 220, 220, 220, 220, 84, 220, 85, 220, 83, + 220, 220, 220, 220, 220, 220, 220, 220, 99, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 183, 220, 220, 128, 220, 220, 220, 220, 220, 131, + 220, 220, 159, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 74, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 219, 34, 219, 219, 22, 219, - 219, 219, 219, 19, 219, 109, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 49, 51, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 197, 219, 219, 169, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 86, 219, 219, 219, 219, 219, 219, 219, 98, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 103, 219, 219, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 220, 34, 220, 220, 22, 220, + 220, 220, 220, 19, 220, 109, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 49, 51, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 198, 220, 220, 170, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 86, 220, 220, 220, 220, 220, 220, 220, 98, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 103, 220, 220, 220, 220, 220, 220, 220, - 219, 219, 219, 219, 219, 219, 153, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 117, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 113, 219, 120, 219, 219, 219, - 219, 219, 92, 219, 219, 70, 219, 219, 219, 145, - 219, 219, 219, 219, 219, 160, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 174, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 116, 219, 219, 219, 219, 219, 52, 53, 219, 219, - 219, 219, 219, 35, 59, 121, 219, 136, 219, 162, + 220, 220, 220, 220, 220, 220, 154, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 118, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 114, 220, 121, 220, 220, + 220, 220, 220, 92, 220, 220, 70, 220, 220, 220, + 146, 220, 220, 220, 220, 220, 161, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 175, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 117, 220, 220, 220, 220, 220, 52, 53, 220, + 220, 220, 220, 220, 35, 59, 122, 220, 137, 220, - 131, 219, 219, 219, 45, 219, 123, 219, 219, 219, - 219, 219, 9, 219, 219, 219, 73, 219, 219, 219, - 219, 187, 219, 144, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 105, 196, 219, 219, 173, 219, 219, 219, 219, 219, - 219, 219, 219, 155, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 122, 219, 219, 219, 44, 46, + 163, 132, 220, 220, 220, 45, 220, 124, 220, 220, + 220, 220, 220, 9, 220, 220, 220, 73, 220, 220, + 220, 220, 188, 220, 145, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 105, 197, 220, 220, 174, 220, 220, 220, + 220, 220, 220, 220, 220, 156, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 123, 220, 220, 220, - 219, 219, 219, 219, 219, 219, 219, 72, 219, 219, - 219, 219, 185, 219, 192, 219, 219, 219, 219, 219, - 149, 23, 24, 219, 219, 219, 219, 219, 219, 219, - 219, 69, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 151, 148, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 43, - 219, 219, 219, 219, 219, 219, 219, 219, 100, 13, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 12, 219, 219, 21, 219, 219, - 219, 191, 219, 194, 47, 219, 157, 219, 150, 219, + 44, 46, 220, 220, 220, 220, 220, 220, 220, 72, + 220, 220, 220, 220, 186, 220, 193, 220, 220, 220, + 220, 220, 150, 23, 24, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 69, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 152, + 149, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 43, 220, 220, 220, 220, 220, 220, 220, + 220, 100, 13, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 12, 220, 220, + 21, 220, 220, 220, 192, 220, 195, 47, 220, 158, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 112, 111, 219, 219, 219, 219, 219, 219, 152, - 146, 219, 219, 198, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 54, 219, 219, 219, 186, 219, - 219, 219, 156, 219, 219, 219, 219, 219, 219, 219, - 219, 48, 219, 219, 219, 82, 219, 106, 108, 137, - 219, 219, 219, 110, 219, 219, 163, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 170, 219, 219, 219, 219, 219, 219, 219, 219, + 220, 151, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 113, 112, 220, 220, 220, + 220, 220, 220, 153, 147, 220, 220, 199, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 54, 220, + 220, 220, 187, 220, 220, 220, 157, 220, 220, 220, + 220, 220, 220, 220, 220, 48, 220, 220, 220, 82, + 220, 106, 220, 108, 138, 220, 220, 220, 111, 220, + 220, 164, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 171, 220, 220, 220, - 219, 219, 219, 219, 219, 138, 219, 219, 184, 219, - 219, 219, 30, 219, 219, 219, 219, 4, 219, 219, - 93, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 166, 219, 219, 219, 219, 219, 219, 199, 219, 219, - 219, 219, 219, 172, 219, 219, 141, 219, 219, 219, - 219, 219, 219, 219, 219, 57, 219, 31, 190, 167, - 219, 219, 11, 219, 219, 219, 219, 219, 219, 139, - 61, 219, 219, 219, 115, 219, 219, 219, 219, 219, - 95, 219, 219, 219, 219, 219, 219, 219, 171, 90, - 219, 87, 219, 219, 219, 63, 67, 62, 219, 55, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 139, 220, 220, 185, 220, 220, 220, 30, 220, 220, + 220, 220, 4, 220, 220, 93, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 167, 220, 220, 220, + 220, 220, 220, 200, 220, 220, 220, 220, 220, 173, + 220, 220, 142, 220, 220, 220, 220, 220, 220, 220, + 220, 57, 220, 31, 191, 168, 220, 220, 11, 220, + 220, 220, 220, 220, 220, 140, 61, 220, 220, 220, + 220, 116, 220, 220, 220, 220, 220, 95, 220, 220, + 220, 220, 220, 220, 220, 172, 90, 220, 87, 220, - 219, 219, 10, 219, 219, 219, 188, 219, 219, 114, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 68, 66, 219, 56, 219, - 219, 219, 128, 219, 219, 140, 219, 219, 219, 219, - 107, 50, 219, 219, 200, 219, 219, 219, 219, 219, - 219, 91, 65, 96, 97, 58, 219, 189, 219, 219, - 219, 165, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 71, 219, 164, 219, 181, 219, 219, - 219, 219, 219, 219, 5, 219, 219, 219, 219, 219, + 220, 220, 63, 67, 62, 220, 55, 220, 220, 10, + 220, 220, 220, 189, 220, 220, 220, 115, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 68, 66, 220, 56, 220, 220, 220, + 129, 220, 220, 141, 220, 220, 220, 220, 220, 107, + 50, 220, 220, 201, 220, 220, 220, 220, 220, 220, + 91, 65, 96, 97, 58, 220, 190, 110, 220, 220, + 220, 166, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 71, 220, 165, 220, 182, 220, 220, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 94, 219, 219, 219, 219, 219, 219, 124, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 177, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 175, 219, 178, 179, 219, 219, 219, 219, - 219, 176, 180, 0 + 220, 220, 220, 220, 5, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 94, 220, 220, 220, 220, 220, 220, 125, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 178, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 176, 220, 179, 180, 220, 220, 220, 220, + 220, 177, 181, 0 } ; static yyconst YY_CHAR yy_ec[256] = @@ -669,15 +655,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[2179] = +static yyconst flex_uint16_t yy_base[2189] = { 0, 0, 0, 38, 41, 44, 46, 59, 65, 71, 77, - 90, 112, 2240, 2121, 81, 4265, 4265, 4265, 96, 52, + 90, 112, 2240, 2121, 81, 4282, 4282, 4282, 96, 52, 72, 107, 111, 70, 91, 109, 124, 98, 127, 114, 133, 136, 64, 144, 146, 150, 156, 177, 167, 182, - 2077, 4265, 4265, 4265, 182, 2049, 4265, 4265, 4265, 173, - 1931, 1589, 4265, 4265, 4265, 206, 1411, 4265, 4265, 4265, - 194, 1269, 4265, 210, 4265, 214, 174, 948, 218, 147, + 2077, 4282, 4282, 4282, 182, 2049, 4282, 4282, 4282, 173, + 1931, 1589, 4282, 4282, 4282, 206, 1411, 4282, 4282, 4282, + 194, 1269, 4282, 210, 4282, 214, 174, 948, 218, 147, 0, 225, 0, 0, 189, 143, 97, 219, 212, 145, 179, 214, 221, 223, 227, 234, 229, 170, 231, 232, 233, 237, 244, 238, 253, 63, 236, 257, 258, 254, @@ -709,13 +695,13 @@ static yyconst flex_uint16_t yy_base[2179] = 737, 739, 743, 747, 645, 748, 749, 751, 750, 754, 756, 762, 766, 771, 778, 758, 775, 773, 782, 783, 784, 786, 788, 789, 798, 793, 794, 795, 796, 799, - 802, 804, 806, 812, 809, 818, 4265, 820, 810, 816, - 813, 823, 825, 4265, 826, 827, 828, 835, 832, 833, + 802, 804, 806, 812, 809, 818, 4282, 820, 810, 816, + 813, 823, 825, 4282, 826, 827, 828, 835, 832, 833, 834, 845, 855, 836, 856, 840, 852, 851, 858, 859, 860, 861, 862, 864, 884, 867, 869, 865, 877, 886, 876, 893, 870, 897, 891, 868, 899, 901, 902, 904, - 907, 908, 911, 912, 4265, 913, 921, 919, 905, 922, + 907, 908, 911, 912, 4282, 913, 921, 919, 905, 922, 925, 929, 936, 932, 940, 937, 938, 939, 942, 943, 945, 950, 957, 952, 959, 963, 973, 969, 971, 978, 953, 955, 975, 976, 977, 985, 982, 980, 983, 987, @@ -728,16 +714,16 @@ static yyconst flex_uint16_t yy_base[2179] = 1108, 1110, 1124, 1111, 1120, 1128, 1122, 1126, 1130, 1132, 1135, 1134, 1137, 1144, 1136, 1146, 1147, 1148, 1150, 1152, - 1155, 1160, 1151, 1165, 1161, 4265, 1163, 1173, 1168, 1171, - 1169, 1176, 1183, 1178, 1179, 1180, 1184, 1187, 4265, 1185, - 4265, 4265, 1190, 4265, 4265, 1189, 1195, 1208, 1202, 1210, + 1155, 1160, 1151, 1165, 1161, 4282, 1163, 1173, 1168, 1171, + 1169, 1176, 1183, 1178, 1179, 1180, 1184, 1187, 4282, 1185, + 4282, 4282, 1190, 4282, 4282, 1189, 1195, 1208, 1202, 1210, 1219, 1220, 1218, 1193, 1215, 1191, 1225, 1230, 1234, 1235, 1231, 1242, 1240, 1244, 1248, 1249, 1250, 1237, 1252, 1254, 1255, 1257, 1259, 1261, 1260, 1264, 1265, 1267, 1277, 1285, 1286, 1268, 1281, 1283, 1284, 1288, 1289, 1290, 1293, 1296, - 1217, 1299, 1304, 1300, 4265, 1301, 1302, 1305, 1309, 1303, + 1217, 1299, 1304, 1300, 4282, 1301, 1302, 1305, 1309, 1303, - 1315, 1313, 1318, 1320, 1321, 4265, 1323, 1330, 1322, 1326, + 1315, 1313, 1318, 1320, 1321, 4282, 1323, 1330, 1322, 1326, 1333, 1335, 1334, 1337, 1336, 1338, 1340, 1341, 1339, 1347, 1349, 1346, 1351, 1353, 1361, 1368, 1370, 1365, 1366, 1367, 1371, 1372, 1377, 1380, 1381, 1382, 1383, 1392, 1388, 1390, @@ -745,417 +731,419 @@ static yyconst flex_uint16_t yy_base[2179] = 1406, 1410, 1413, 1415, 1416, 1419, 1437, 1421, 1445, 1433, 1446, 1441, 1449, 1452, 1451, 1453, 1455, 1423, 1466, 1459, 1467, 1470, 1461, 1463, 1472, 1475, 1479, 1477, 1483, 1481, - 1484, 1485, 1493, 1490, 4265, 1505, 1497, 1488, 1498, 1508, + 1484, 1485, 1493, 1490, 4282, 1505, 1497, 1488, 1498, 1508, 1501, 1509, 1422, 1510, 1513, 1512, 1514, 1515, 1516, 1517, - 1518, 1523, 1525, 1530, 4265, 1526, 1522, 1527, 1535, 1537, - 1539, 1543, 1546, 1551, 1553, 1549, 4265, 1554, 1564, 1556, + 1518, 1523, 1525, 1530, 4282, 1526, 1522, 1527, 1535, 1537, + 1539, 1543, 1546, 1551, 1553, 1549, 4282, 1554, 1564, 1556, 1565, 1559, 1561, 1567, 1572, 1569, 1571, 1575, 1578, 1576, - 1579, 1580, 1586, 4265, 1587, 1588, 1591, 1595, 1590, 1600, - 1602, 1601, 1603, 1606, 1607, 1614, 1610, 1611, 4265, 1609, + 1579, 1580, 1586, 4282, 1587, 1588, 1591, 1595, 1590, 1600, + 1602, 1601, 1603, 1606, 1607, 1614, 1610, 1611, 4282, 1609, 1621, 1612, 1613, 1634, 1635, 1617, 1631, 1638, 1630, 1633, - 1639, 1644, 1641, 1643, 1642, 1645, 4265, 1646, 130, 1648, + 1639, 1644, 1641, 1643, 1642, 1645, 4282, 1646, 130, 1648, 1653, 1654, 1656, 1663, 1655, 1664, 1667, 1669, 1671, 1673, 1675, 1658, 1679, 1676, 1680, 1682, 1684, 1687, 1688, 1689, - 1692, 4265, 1695, 1701, 1693, 1702, 1704, 1703, 1710, 1712, + 1692, 4282, 1695, 1701, 1693, 1702, 1704, 1703, 1710, 1712, - 1713, 1715, 1714, 4265, 1723, 1724, 1718, 1725, 1726, 1729, + 1713, 1715, 1714, 4282, 1723, 1724, 1718, 1725, 1726, 1729, 1730, 1731, 1734, 1735, 1736, 1741, 1742, 1738, 1739, 1746, - 4265, 1766, 1748, 1761, 1750, 1763, 1752, 1773, 1765, 1771, + 4282, 1766, 1748, 1761, 1750, 1763, 1752, 1773, 1765, 1771, 1774, 1775, 1777, 1779, 1786, 1781, 1778, 1789, 1791, 1792, 1793, 1795, 1799, 1800, 1802, 1801, 1809, 1810, 1806, 1813, - 1812, 1822, 1751, 1807, 4265, 1820, 1814, 1825, 1827, 1839, + 1812, 1822, 1751, 1807, 4282, 1820, 1814, 1825, 1827, 1839, 1831, 1835, 1834, 1840, 1837, 1841, 1847, 1842, 1846, 1849, - 1858, 1850, 1862, 4265, 1863, 1859, 1867, 1869, 1852, 1874, + 1858, 1850, 1862, 4282, 1863, 1859, 1867, 1869, 1852, 1874, 1870, 1876, 1878, 1879, 1880, 1881, 1882, 1883, 1888, 1890, - 1891, 1892, 4265, 1900, 1901, 1902, 1909, 1904, 1893, 1908, + 1891, 1892, 4282, 1900, 1901, 1902, 1909, 1904, 1893, 1908, 1911, 1914, 1915, 1916, 1923, 1918, 1920, 1921, 1922, 1924, - 1925, 1927, 1928, 1930, 1941, 1944, 1929, 1945, 4265, 1937, + 1925, 1927, 1928, 1930, 1941, 1944, 1929, 1945, 4282, 1937, 1955, 1951, 1957, 1958, 1959, 1961, 1962, 1967, 1969, 1971, - 1968, 1970, 1973, 1976, 1978, 1980, 1982, 4265, 1984, 1985, + 1968, 1970, 1973, 1976, 1978, 1980, 1982, 4282, 1984, 1985, 1986, 1992, 1987, 1991, 1993, 1990, 1995, 2007, 2010, 2011, 2012, 1996, 2013, 2016, 2017, 2018, 2025, 2026, 2030, 2032, - 4265, 2035, 2036, 2037, 2024, 2039, 2027, 2043, 2051, 2053, + 4282, 2035, 2036, 2037, 2024, 2039, 2027, 2043, 2051, 2053, 2048, 2054, 2055, 2056, 2063, 2058, 2059, 2060, 2067, 2064, 2069, 2070, 2071, 2065, 2072, 2076, 2080, 2082, 2086, 2095, - 2087, 2096, 2097, 2099, 2101, 2103, 4265, 2104, 2102, 2107, + 2087, 2096, 2097, 2099, 2101, 2103, 4282, 2104, 2102, 2107, - 2111, 2113, 2112, 2115, 2119, 2126, 2128, 4265, 2123, 4265, - 2125, 2134, 2137, 4265, 2143, 4265, 2145, 2136, 4265, 2146, + 2111, 2113, 2112, 2115, 2119, 2126, 2128, 4282, 2123, 4282, + 2125, 2134, 2137, 4282, 2143, 4282, 2145, 2136, 4282, 2146, 2147, 2138, 2129, 2150, 2151, 2140, 2158, 2159, 2160, 2161, - 2165, 2166, 2167, 2169, 2168, 4265, 2175, 2172, 2170, 2178, + 2165, 2166, 2167, 2169, 2168, 4282, 2175, 2172, 2170, 2178, 2176, 2182, 2183, 2185, 2186, 2189, 2193, 2192, 2204, 2196, - 2205, 4265, 2200, 2207, 2201, 2211, 4265, 2208, 2212, 2218, + 2205, 4282, 2200, 2207, 2201, 2211, 4282, 2208, 2212, 2218, 2210, 2215, 2221, 2222, 2223, 2233, 2231, 2235, 2229, 2237, 2227, 2241, 2253, 2245, 2248, 2249, 2250, 2260, 2256, 2263, 2255, 2259, 2272, 2262, 2258, 2265, 2269, 2273, 2274, 2279, - 2277, 2281, 2280, 2282, 2283, 2284, 4265, 2293, 2286, 2294, + 2277, 2281, 2280, 2282, 2283, 2284, 4282, 2293, 2286, 2294, - 2295, 2296, 2304, 2298, 4265, 2307, 4265, 2301, 2309, 2312, + 2295, 2296, 2304, 2298, 4282, 2307, 4282, 2301, 2309, 2312, 2315, 2317, 2319, 2321, 2320, 2323, 2331, 2325, 2338, 2345, - 2328, 2333, 2335, 2341, 2347, 2339, 4265, 2349, 2350, 2356, - 2354, 2352, 2359, 2365, 2360, 2358, 2379, 4265, 2377, 2367, - 2381, 2382, 2389, 2384, 4265, 2386, 2394, 2391, 2392, 4265, - 4265, 2393, 2397, 2396, 2398, 2399, 2408, 2403, 2407, 4265, - 2411, 2400, 2413, 2421, 2422, 2423, 2415, 2414, 4265, 2429, + 2328, 2333, 2335, 2341, 2347, 2339, 4282, 2349, 2350, 2356, + 2354, 2352, 2359, 2365, 2360, 2358, 2379, 4282, 2377, 2367, + 2381, 2382, 2389, 2384, 4282, 2386, 2394, 2391, 2392, 4282, + 4282, 2393, 2397, 2396, 2398, 2399, 2408, 2403, 2407, 4282, + 2411, 2400, 2413, 2421, 2422, 2423, 2415, 2414, 4282, 2429, 2431, 2432, 2433, 2435, 2436, 2434, 2438, 2445, 2442, 2441, - 2443, 2451, 2452, 2457, 4265, 2460, 2461, 2463, 2464, 2466, + 2443, 2451, 2452, 2457, 4282, 2460, 2461, 2463, 2464, 2466, 2467, 2469, 2471, 2472, 2473, 2474, 2475, 2478, 2479, 2480, 2481, 2485, 2498, 2493, 2494, 2495, 2503, 2497, 2505, 2499, - 2507, 2508, 2516, 2518, 4265, 2525, 2509, 2528, 2511, 2523, - 2530, 2531, 2539, 2534, 2524, 2535, 2543, 2538, 4265, 2551, - 2540, 2541, 2557, 2542, 2559, 2549, 2552, 2563, 2566, 4265, - 4265, 2561, 2567, 2572, 2575, 2573, 2576, 2577, 2578, 2581, - 2582, 4265, 2584, 2592, 2591, 2587, 2599, 2601, 2597, 2600, + 2507, 2508, 2516, 2518, 4282, 2525, 2509, 2528, 2511, 2523, + 2530, 2531, 2539, 2534, 2524, 2535, 2543, 2538, 4282, 2551, + 2540, 2541, 2557, 2542, 2559, 2549, 2552, 2563, 2566, 4282, + 4282, 2561, 2567, 2572, 2575, 2573, 2576, 2577, 2578, 2581, + 2582, 4282, 2584, 2592, 2591, 2587, 2599, 2601, 2597, 2600, 2604, 2602, 2606, 2608, 2609, 2610, 2614, 2615, 2617, 2619, - 4265, 2618, 2621, 2624, 2626, 2627, 2629, 2635, 2631, 2645, + 4282, 2618, 2621, 2624, 2626, 2627, 2629, 2635, 2631, 2645, 2641, 2646, 2648, 2655, 2651, 2658, 2659, 2654, 2661, 2669, - 4265, 2664, 2666, 2665, 2656, 2678, 2667, 2685, 2671, 4265, + 4282, 2664, 2666, 2665, 2656, 2678, 2667, 2685, 2671, 4282, 2684, 2674, 2691, 2693, 2682, 2694, 2695, 2698, 2699, 2697, - 4265, 2704, 4265, 2707, 2696, 4265, 2700, 2711, 2714, 2715, + 4282, 2704, 4282, 2707, 2696, 4282, 2700, 2711, 2714, 2715, 2716, 2718, 2719, 2720, 2722, 2725, 2726, 2727, 2734, 2731, - 4265, 2735, 2733, 2737, 2741, 4265, 2743, 4265, 2738, 4265, - 2748, 2752, 2755, 2753, 2756, 2758, 2762, 2759, 4265, 2764, + 4282, 2735, 2733, 2737, 2741, 4282, 2743, 4282, 2738, 4282, + 2748, 2752, 2755, 2753, 2756, 2758, 2762, 2759, 4282, 2764, 2765, 2768, 2772, 2773, 2774, 2775, 2776, 2777, 2778, 2783, - 4265, 2779, 2780, 4265, 2790, 2782, 2791, 2792, 2798, 4265, - 2801, 2804, 4265, 2807, 2812, 2796, 2808, 2814, 2815, 2818, - 2817, 2819, 2830, 2826, 2825, 2828, 4265, 2827, 2829, 2833, + 4282, 2779, 2780, 4282, 2790, 2782, 2791, 2792, 2798, 4282, + 2801, 2804, 4282, 2807, 2812, 2796, 2808, 2814, 2815, 2818, + 2817, 2819, 2830, 2826, 2825, 2828, 4282, 2827, 2829, 2833, 2840, 2834, 2837, 2848, 2845, 2851, 2844, 2854, 2858, 2852, - 2860, 2847, 2866, 2863, 2867, 4265, 2869, 2870, 4265, 2871, - 2873, 2876, 2880, 4265, 2877, 4265, 2881, 2882, 2878, 2886, - 2889, 2890, 2892, 2885, 2898, 2900, 2901, 2912, 2907, 2908, - 4265, 4265, 2910, 2916, 2913, 2919, 2920, 2923, 2924, 2932, - 2925, 2934, 2936, 4265, 2939, 2927, 4265, 2929, 2940, 2937, - 2938, 2944, 2946, 2950, 2952, 2955, 2948, 2956, 2957, 2958, - 4265, 2962, 2965, 2967, 2968, 2969, 2970, 2971, 4265, 2974, - 2973, 2975, 2980, 2984, 2986, 2994, 2997, 3001, 3002, 3003, - 3004, 3006, 3008, 3010, 3012, 3013, 3020, 3021, 3023, 3025, - 3014, 3026, 4265, 3029, 3031, 3027, 3036, 3033, 2979, 3037, + 2860, 2847, 2866, 2863, 2867, 4282, 2869, 2870, 4282, 2871, + 2873, 2876, 2880, 4282, 2881, 4282, 2877, 2882, 2878, 2886, + 2889, 2890, 2892, 2885, 2898, 2901, 2905, 2913, 2908, 2909, + 4282, 4282, 2911, 2919, 2914, 2922, 2924, 2915, 2917, 2932, + 2928, 2931, 2936, 4282, 2938, 2937, 4282, 2939, 2940, 2943, + 2944, 2946, 2947, 2952, 2949, 2950, 2955, 2953, 2956, 2960, + 4282, 2961, 2962, 2963, 2967, 2969, 2971, 2972, 4282, 2973, + 2975, 2978, 2976, 2977, 2984, 2994, 2999, 3001, 2992, 2996, + 3002, 3004, 3006, 3011, 3015, 3008, 3018, 3012, 3020, 3022, + 3023, 3024, 4282, 3026, 3029, 3025, 3033, 3034, 3035, 3036, - 3041, 3044, 3047, 3038, 3048, 3050, 4265, 3052, 3054, 3055, - 3056, 3059, 3061, 3063, 3064, 3068, 3065, 3073, 3069, 3079, - 4265, 3071, 3082, 3076, 3085, 3086, 3088, 3089, 3090, 3095, - 3097, 3096, 3108, 3099, 4265, 3092, 4265, 3100, 3113, 3117, - 3115, 3118, 4265, 3119, 3120, 4265, 3121, 3123, 3125, 4265, - 3127, 3126, 3122, 3132, 3136, 4265, 3146, 3143, 3147, 3150, - 3151, 3152, 3154, 3155, 3156, 3157, 4265, 3159, 3161, 3168, - 3171, 3160, 3162, 3170, 3173, 3172, 3174, 3187, 3183, 3178, - 4265, 3185, 3186, 3194, 3190, 3193, 4265, 4265, 3197, 3199, - 3202, 3203, 3206, 4265, 4265, 4265, 3209, 4265, 3204, 4265, + 3045, 3048, 3038, 3040, 3049, 3051, 4282, 3042, 3053, 3054, + 3056, 3059, 3063, 3065, 3066, 3067, 3070, 3071, 3075, 3077, + 4282, 3073, 3078, 3080, 3081, 3087, 3088, 3090, 3089, 3091, + 3092, 3097, 3098, 3109, 3107, 4282, 3099, 4282, 3113, 3114, + 3116, 3117, 3120, 4282, 3121, 3123, 4282, 3125, 3127, 3129, + 4282, 3128, 3130, 3124, 3133, 3139, 4282, 3147, 3148, 3155, + 3151, 3152, 3156, 3158, 3154, 3159, 3160, 4282, 3163, 3162, + 3172, 3164, 3173, 3174, 3175, 3176, 3177, 3179, 3187, 3182, + 3183, 4282, 3186, 3185, 3198, 3191, 3203, 4282, 4282, 3195, + 3206, 3208, 3196, 3212, 4282, 4282, 4282, 3215, 4282, 3200, - 4265, 3210, 3212, 3214, 4265, 3219, 4265, 3226, 3223, 3216, - 3221, 3225, 4265, 3227, 3228, 3234, 4265, 3235, 3237, 3236, - 3238, 4265, 3242, 4265, 3247, 3250, 3251, 3255, 3245, 3252, - 3258, 3261, 3265, 3268, 3262, 3269, 3270, 3272, 3273, 3276, - 3275, 3277, 3279, 3281, 3282, 3283, 3286, 3289, 3291, 3292, - 3295, 3294, 3296, 3298, 3306, 3302, 3310, 3301, 3317, 3319, - 4265, 4265, 3311, 3314, 4265, 3322, 3323, 3324, 3327, 3326, - 3328, 3331, 3332, 4265, 3337, 3330, 3334, 3338, 3340, 3343, - 3344, 3350, 3351, 3354, 3357, 3364, 3359, 3360, 3363, 3367, - 3365, 3368, 3369, 3371, 4265, 3378, 3376, 3379, 4265, 4265, + 4282, 4282, 3216, 3219, 3226, 4282, 3228, 4282, 3210, 3229, + 3217, 3220, 3231, 4282, 3232, 3223, 3238, 4282, 3234, 3245, + 3240, 3241, 4282, 3247, 4282, 3248, 3253, 3250, 3257, 3254, + 3260, 3261, 3263, 3265, 3270, 3267, 3271, 3272, 3275, 3276, + 3277, 3278, 3280, 3281, 3283, 3286, 3291, 3292, 3293, 3294, + 3296, 3297, 3299, 3302, 3300, 3303, 3304, 3309, 3311, 3324, + 3328, 3329, 4282, 4282, 3313, 3321, 4282, 3305, 3315, 3319, + 3334, 3335, 3336, 3337, 3338, 4282, 3343, 3340, 3345, 3346, + 3347, 3348, 3350, 3351, 3352, 3358, 3360, 3370, 3361, 3365, + 3369, 3372, 3373, 3374, 3376, 3382, 4282, 3378, 3375, 3383, - 3380, 3381, 3390, 3386, 3391, 3393, 3395, 4265, 3397, 3402, - 3404, 3394, 4265, 3411, 4265, 3414, 3405, 3416, 3417, 3419, - 4265, 4265, 4265, 3420, 3408, 3423, 3425, 3426, 3427, 3428, - 3429, 4265, 3433, 3435, 3438, 3439, 3442, 3445, 3446, 3450, - 3457, 3456, 3458, 3449, 3463, 3466, 4265, 4265, 3460, 3475, - 3467, 3476, 3477, 3478, 3471, 3479, 3482, 3484, 3485, 4265, - 3488, 3487, 3468, 3493, 3495, 3496, 3498, 3500, 4265, 4265, - 3501, 3502, 3507, 3511, 3508, 3503, 3513, 3515, 3516, 3517, - 3524, 3530, 3523, 3532, 4265, 3525, 3533, 4265, 3536, 3538, - 3539, 4265, 3541, 4265, 4265, 3544, 4265, 3545, 4265, 3547, + 4282, 4282, 3385, 3386, 3391, 3392, 3396, 3398, 3399, 4282, + 3400, 3404, 3410, 3406, 4282, 3412, 4282, 3417, 3401, 3422, + 3413, 3424, 4282, 4282, 4282, 3425, 3427, 3428, 3429, 3430, + 3431, 3432, 3433, 3434, 4282, 3436, 3439, 3443, 3440, 3447, + 3454, 3450, 3456, 3464, 3460, 3462, 3459, 3467, 3469, 4282, + 4282, 3470, 3477, 3473, 3481, 3480, 3482, 3479, 3485, 3486, + 3490, 3489, 4282, 3493, 3492, 3491, 3498, 3499, 3503, 3504, + 3506, 4282, 4282, 3502, 3507, 3510, 3514, 3516, 3517, 3518, + 3520, 3522, 3524, 3531, 3537, 3530, 3534, 4282, 3523, 3540, + 4282, 3542, 3543, 3544, 4282, 3547, 4282, 4282, 3550, 4282, - 3548, 3551, 3553, 3558, 3560, 3562, 3555, 3563, 3570, 3569, - 3571, 4265, 4265, 3580, 3566, 3572, 3582, 3581, 3583, 4265, - 4265, 3585, 3588, 4265, 3584, 3586, 3592, 3593, 3594, 3596, - 3599, 3600, 3605, 3601, 3607, 3615, 3617, 3612, 3621, 3602, - 3623, 3624, 3625, 3627, 4265, 3630, 3631, 3632, 4265, 3636, - 3637, 3639, 4265, 3638, 3641, 3651, 3643, 3644, 3663, 3653, - 3658, 4265, 3661, 3664, 3665, 4265, 3646, 4265, 4265, 4265, - 3669, 3675, 3670, 4265, 3678, 3680, 4265, 3686, 3682, 3668, - 3687, 3689, 3696, 3692, 3699, 3672, 3695, 3701, 3708, 3703, - 3705, 4265, 3707, 3709, 3711, 3712, 3713, 3714, 3715, 3716, + 3545, 4282, 3551, 3554, 3561, 3563, 3568, 3569, 3573, 3575, + 3558, 3564, 3562, 3580, 3577, 4282, 4282, 3588, 3583, 3584, + 3591, 3586, 3589, 4282, 4282, 3592, 3595, 4282, 3594, 3596, + 3599, 3600, 3601, 3602, 3608, 3603, 3609, 3605, 3625, 3627, + 3629, 3615, 3632, 3620, 3610, 3633, 3623, 3634, 4282, 3639, + 3641, 3635, 4282, 3646, 3647, 3648, 4282, 3649, 3651, 3655, + 3656, 3658, 3669, 3661, 3662, 4282, 3676, 3670, 3660, 4282, + 3664, 4282, 3666, 4282, 4282, 3677, 3680, 3683, 4282, 3685, + 3687, 4282, 3694, 3686, 3684, 3696, 3697, 3705, 3698, 3701, + 3706, 3707, 3708, 3716, 3709, 3714, 4282, 3711, 3717, 3719, - 3721, 3722, 3718, 3733, 3720, 4265, 3737, 3741, 4265, 3743, - 3730, 3745, 4265, 3748, 3734, 3738, 3749, 4265, 3751, 3753, - 4265, 3755, 3757, 3759, 3760, 3762, 3763, 3765, 3766, 3770, - 4265, 3772, 3773, 3781, 3786, 3787, 3776, 4265, 3791, 3778, - 3788, 3789, 3799, 4265, 3801, 3792, 4265, 3803, 3804, 3805, - 3808, 3815, 3817, 3821, 3818, 4265, 3825, 4265, 4265, 4265, - 3810, 3826, 4265, 3829, 3822, 3830, 3831, 3834, 3837, 4265, - 4265, 3835, 3839, 3841, 4265, 3844, 3845, 3847, 3848, 3849, - 4265, 3851, 3853, 3854, 3858, 3861, 3856, 3857, 4265, 4265, - 3863, 4265, 3867, 3869, 3871, 4265, 4265, 4265, 3881, 4265, + 3720, 3721, 3722, 3723, 3724, 3728, 3735, 3729, 3738, 3741, + 4282, 3745, 3747, 4282, 3749, 3742, 3751, 4282, 3753, 3750, + 3754, 3757, 4282, 3761, 3759, 4282, 3763, 3765, 3767, 3769, + 3768, 3771, 3772, 3775, 3779, 3780, 4282, 3784, 3786, 3794, + 3790, 3795, 3791, 4282, 3797, 3793, 3805, 3800, 3804, 4282, + 3808, 3801, 4282, 3811, 3814, 3813, 3816, 3823, 3825, 3829, + 3826, 4282, 3833, 4282, 4282, 4282, 3815, 3834, 4282, 3839, + 3830, 3836, 3840, 3842, 3843, 4282, 4282, 3845, 3846, 3851, + 3847, 4282, 3853, 3855, 3857, 3858, 3860, 4282, 3861, 3863, + 3864, 3865, 3867, 3868, 3871, 4282, 4282, 3872, 4282, 3878, - 3887, 3882, 4265, 3889, 3876, 3890, 4265, 3892, 3780, 4265, - 3893, 3896, 3897, 3900, 3902, 3895, 3903, 3907, 3909, 3912, - 3914, 3913, 3915, 3917, 3922, 4265, 4265, 3924, 4265, 3926, - 3929, 3931, 4265, 3932, 3938, 4265, 3933, 3939, 3942, 3944, - 4265, 4265, 3946, 3916, 4265, 3953, 3948, 3949, 3950, 3952, - 3951, 4265, 4265, 4265, 4265, 4265, 3955, 4265, 3956, 3959, - 3961, 4265, 3963, 3965, 3968, 3966, 3971, 3972, 3973, 3977, - 3974, 3983, 3978, 3991, 3995, 4000, 3997, 4001, 3980, 3993, - 4009, 4004, 4011, 4265, 4007, 4265, 4012, 4265, 4013, 4020, - 4021, 4017, 4016, 4019, 4265, 4023, 4024, 4025, 4026, 4027, + 3880, 3886, 4282, 4282, 4282, 3888, 4282, 3896, 3891, 4282, + 3898, 3899, 3900, 4282, 3902, 3903, 3904, 4282, 3905, 3906, + 3907, 3912, 3921, 3909, 3913, 3926, 3916, 3922, 3927, 3928, + 3929, 3930, 3932, 4282, 4282, 3936, 4282, 3939, 3943, 3945, + 4282, 3946, 3951, 4282, 3953, 3947, 3956, 3954, 3961, 4282, + 4282, 3940, 3962, 4282, 3970, 3963, 3966, 3967, 3972, 3968, + 4282, 4282, 4282, 4282, 4282, 3973, 4282, 4282, 3974, 3975, + 3979, 4282, 3980, 3981, 3983, 3982, 3987, 3988, 3985, 3991, + 3989, 3998, 3999, 4012, 4013, 4016, 4002, 4017, 3994, 4018, + 4026, 4021, 4024, 4282, 4025, 4282, 4027, 4282, 4028, 4036, - 4033, 4036, 4042, 4034, 4046, 4048, 4050, 4051, 4054, 4043, - 4063, 4061, 4265, 4058, 4064, 4066, 4073, 4068, 4069, 4265, - 4070, 4071, 4072, 4076, 4077, 4074, 4080, 4092, 4094, 4081, - 4096, 4088, 4098, 4101, 4102, 4100, 4105, 4104, 4265, 4106, - 4112, 4113, 4114, 4115, 4118, 4120, 4121, 4125, 4127, 4129, - 4131, 4135, 4265, 4136, 4265, 4265, 4138, 4126, 4140, 4147, - 4149, 4265, 4265, 4265, 4173, 4180, 4187, 4194, 4201, 101, - 4208, 4215, 4222, 4229, 4236, 4243, 4250, 4257 + 4037, 4029, 4038, 4034, 4282, 4032, 4044, 4039, 4041, 4042, + 4049, 4052, 4056, 4050, 4060, 4062, 4065, 4066, 4067, 4064, + 4079, 4075, 4282, 4077, 4076, 4078, 4086, 4081, 4085, 4282, + 4082, 4088, 4089, 4090, 4091, 4094, 4093, 4101, 4104, 4106, + 4109, 4096, 4114, 4110, 4118, 4119, 4121, 4120, 4282, 4122, + 4123, 4124, 4129, 4130, 4132, 4133, 4134, 4137, 4140, 4142, + 4145, 4146, 4282, 4149, 4282, 4282, 4150, 4156, 4157, 4159, + 4161, 4282, 4282, 4282, 4190, 4197, 4204, 4211, 4218, 101, + 4225, 4232, 4239, 4246, 4253, 4260, 4267, 4274 } ; -static yyconst flex_int16_t yy_def[2179] = +static yyconst flex_int16_t yy_def[2189] = { 0, - 2164, 1, 2165, 2165, 2166, 2166, 2167, 2167, 2168, 2168, - 2169, 2169, 2164, 2170, 2164, 2164, 2164, 2164, 2171, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2172, 2164, 2164, 2164, 2172, 2173, 2164, 2164, 2164, 2173, - 2174, 2164, 2164, 2164, 2164, 2174, 2175, 2164, 2164, 2164, - 2175, 2176, 2164, 2177, 2164, 2176, 2176, 2170, 2170, 2164, - 2178, 2171, 2178, 2171, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2174, 1, 2175, 2175, 2176, 2176, 2177, 2177, 2178, 2178, + 2179, 2179, 2174, 2180, 2174, 2174, 2174, 2174, 2181, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2182, 2174, 2174, 2174, 2182, 2183, 2174, 2174, 2174, 2183, + 2184, 2174, 2174, 2174, 2174, 2184, 2185, 2174, 2174, 2174, + 2185, 2186, 2174, 2187, 2174, 2186, 2186, 2180, 2180, 2174, + 2188, 2181, 2188, 2181, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2172, 2172, 2173, 2173, 2174, 2174, 2164, 2175, 2175, 2176, - 2176, 2177, 2177, 2176, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2182, 2182, 2183, 2183, 2184, 2184, 2174, 2185, 2185, 2186, + 2186, 2187, 2187, 2186, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2176, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2186, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2176, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2186, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2164, 2176, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2174, 2186, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2176, - 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, - 2164, 2164, 2170, 2164, 2164, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2186, + 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, + 2174, 2174, 2180, 2174, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2176, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2186, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2176, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2186, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2164, - 2170, 2170, 2170, 2164, 2170, 2164, 2170, 2170, 2164, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2164, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2174, + 2180, 2180, 2180, 2174, 2180, 2174, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2174, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2164, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2164, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2174, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, + 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2174, + 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, + 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2164, 2170, 2170, 2164, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2164, 2170, 2164, 2170, 2164, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2164, - 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2174, 2180, 2180, 2174, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2180, 2180, 2180, 2174, 2180, 2174, 2180, 2174, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2174, + 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2164, 2170, - 2170, 2170, 2170, 2164, 2170, 2164, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2164, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2174, 2180, 2174, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2174, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2164, 2170, 2170, 2164, 2170, 2170, 2170, 2164, - 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2164, 2164, 2170, 2170, - 2170, 2170, 2170, 2164, 2164, 2164, 2170, 2164, 2170, 2164, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2174, 2180, 2180, + 2180, 2180, 2180, 2174, 2180, 2180, 2174, 2180, 2180, 2180, + 2174, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2174, 2174, 2180, + 2180, 2180, 2180, 2180, 2174, 2174, 2174, 2180, 2174, 2180, - 2164, 2170, 2170, 2170, 2164, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2164, 2170, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2164, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2164, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2164, 2164, + 2174, 2174, 2180, 2180, 2180, 2174, 2180, 2174, 2180, 2180, + 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2174, 2180, 2180, + 2180, 2180, 2174, 2180, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2174, 2174, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, - 2170, 2170, 2164, 2170, 2164, 2170, 2170, 2170, 2170, 2170, - 2164, 2164, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2164, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2164, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2164, 2170, 2170, - 2170, 2164, 2170, 2164, 2164, 2170, 2164, 2170, 2164, 2170, + 2174, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, + 2180, 2180, 2180, 2180, 2174, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2174, 2174, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, + 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2174, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, + 2174, 2180, 2180, 2180, 2174, 2180, 2174, 2174, 2180, 2174, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2164, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2164, - 2164, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2164, 2170, - 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2164, 2170, 2170, 2170, 2164, 2170, 2164, 2164, 2164, - 2170, 2170, 2170, 2164, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, + 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2174, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2174, 2174, 2180, 2180, 2174, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, + 2180, 2180, 2174, 2180, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2174, + 2180, 2174, 2180, 2174, 2174, 2180, 2180, 2180, 2174, 2180, + 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2164, 2170, - 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2164, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2170, - 2170, 2170, 2170, 2164, 2170, 2170, 2164, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2164, 2170, 2164, 2164, 2164, - 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2164, - 2164, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, - 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2164, - 2170, 2164, 2170, 2170, 2170, 2164, 2164, 2164, 2170, 2164, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2180, 2180, 2174, 2180, 2180, 2180, 2174, 2180, 2180, + 2180, 2180, 2174, 2180, 2180, 2174, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, + 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2174, + 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2174, 2180, 2174, 2174, 2174, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2180, 2180, 2174, 2174, 2180, 2180, 2180, + 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2174, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2174, 2174, 2180, 2174, 2180, - 2170, 2170, 2164, 2170, 2170, 2170, 2164, 2170, 2170, 2164, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2164, 2164, 2170, 2164, 2170, - 2170, 2170, 2164, 2170, 2170, 2164, 2170, 2170, 2170, 2170, - 2164, 2164, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, - 2170, 2164, 2164, 2164, 2164, 2164, 2170, 2164, 2170, 2170, - 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2164, 2170, 2164, 2170, 2164, 2170, 2170, - 2170, 2170, 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, + 2180, 2180, 2174, 2174, 2174, 2180, 2174, 2180, 2180, 2174, + 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2174, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2174, 2174, 2180, 2174, 2180, 2180, 2180, + 2174, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2174, + 2174, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, + 2174, 2174, 2174, 2174, 2174, 2180, 2174, 2174, 2180, 2180, + 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2174, 2180, 2174, 2180, 2174, 2180, 2180, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2164, 2170, 2170, 2170, 2170, 2170, 2170, 2164, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2164, 2170, - 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, 2170, - 2170, 2170, 2164, 2170, 2164, 2164, 2170, 2170, 2170, 2170, - 2170, 2164, 2164, 0, 2164, 2164, 2164, 2164, 2164, 2164, - 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164 + 2180, 2180, 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2174, 2180, 2180, 2180, 2180, 2180, 2180, 2174, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2174, 2180, + 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, 2180, + 2180, 2180, 2174, 2180, 2174, 2174, 2180, 2180, 2180, 2180, + 2180, 2174, 2174, 0, 2174, 2174, 2174, 2174, 2174, 2174, + 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174 } ; -static yyconst flex_uint16_t yy_nxt[4306] = +static yyconst flex_uint16_t yy_nxt[4323] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 14, 18, 20, 21, 14, 22, 23, 24, 25, @@ -1402,7 +1390,7 @@ static yyconst flex_uint16_t yy_nxt[4306] = 1164, 1167, 69, 1170, 1177, 69, 69, 1176, 1179, 69, 1180, 1181, 1183, 69, 69, 1174, 1175, 69, 69, 1185, 69, 69, 1178, 69, 69, 69, 1189, 1184, 69, 1182, - 1187, 69, 1190, 1186, 69, 69, 69, 1193, 1199, 2164, + 1187, 69, 1190, 1186, 69, 69, 69, 1193, 1199, 2174, 69, 1191, 69, 1192, 69, 1188, 69, 1194, 69, 1196, 69, 1201, 1197, 1200, 69, 1202, 1195, 1204, 69, 1206, 1205, 69, 69, 69, 1198, 1203, 69, 1210, 69, 69, @@ -1414,10 +1402,10 @@ static yyconst flex_uint16_t yy_nxt[4306] = 1227, 69, 1231, 1225, 69, 1226, 1233, 69, 1228, 1230, 69, 1240, 69, 1232, 1241, 69, 1234, 1236, 69, 1235, 69, 1242, 69, 69, 69, 1237, 69, 1244, 69, 1239, - 1238, 69, 1246, 2164, 69, 1251, 69, 1250, 69, 1243, + 1238, 69, 1246, 2174, 69, 1251, 69, 1250, 69, 1243, 1245, 69, 69, 1248, 69, 1247, 1249, 1252, 69, 1254, 69, 1253, 69, 69, 1258, 69, 1255, 69, 1256, 69, - 1261, 69, 69, 69, 1263, 2164, 1257, 1264, 69, 1265, + 1261, 69, 69, 69, 1263, 2174, 1257, 1264, 69, 1265, 69, 1260, 1267, 1262, 1272, 1268, 1270, 1259, 1274, 1269, 69, 1271, 69, 1266, 69, 69, 1276, 69, 1273, 69, @@ -1441,7 +1429,7 @@ static yyconst flex_uint16_t yy_nxt[4306] = 1353, 1354, 69, 1361, 69, 69, 1355, 1362, 1357, 1364, 69, 1359, 69, 1366, 69, 1363, 69, 1369, 1370, 69, 69, 1365, 1367, 1371, 1373, 69, 69, 1368, 69, 69, - 69, 69, 1378, 1375, 69, 69, 2164, 69, 1376, 1382, + 69, 69, 1378, 1375, 69, 69, 2174, 69, 1376, 1382, 69, 1372, 1381, 1374, 69, 69, 1385, 1384, 1386, 1387, 69, 1380, 69, 69, 69, 69, 1377, 69, 1388, 69, @@ -1452,7 +1440,7 @@ static yyconst flex_uint16_t yy_nxt[4306] = 1408, 69, 1413, 1414, 69, 1415, 1417, 69, 69, 69, 1416, 69, 69, 1411, 69, 1410, 1420, 69, 69, 69, 69, 1412, 69, 1422, 69, 1425, 1419, 69, 1430, 1421, - 1423, 69, 1427, 1418, 1424, 69, 1428, 69, 69, 2164, + 1423, 69, 1427, 1418, 1424, 69, 1428, 69, 69, 2174, 1429, 1434, 1426, 1431, 69, 1432, 69, 69, 69, 69, 69, 69, 69, 69, 1435, 1433, 1436, 69, 1437, 1438, @@ -1474,166 +1462,168 @@ static yyconst flex_uint16_t yy_nxt[4306] = 69, 69, 1509, 1512, 69, 69, 1513, 69, 1515, 1514, 1510, 69, 1516, 69, 1517, 1519, 69, 1518, 1521, 69, 69, 1520, 69, 69, 69, 1522, 69, 1524, 1525, 69, - 69, 69, 1523, 69, 69, 69, 1530, 1526, 69, 69, + 69, 69, 1523, 69, 69, 69, 1532, 1526, 69, 69, - 1531, 1535, 69, 69, 1537, 69, 1527, 1528, 1534, 1529, - 1532, 69, 1536, 69, 69, 1539, 1533, 1538, 1540, 1542, - 69, 69, 1546, 69, 1543, 69, 69, 1541, 1544, 69, - 1547, 1550, 69, 69, 1551, 1549, 69, 69, 69, 1554, - 69, 1545, 69, 1555, 1548, 69, 1556, 69, 1552, 69, - 69, 69, 69, 69, 1557, 1553, 1558, 69, 1561, 69, - 1559, 69, 1564, 69, 1567, 69, 1563, 1560, 69, 69, - 69, 69, 1568, 1562, 1570, 69, 1569, 1565, 69, 1566, - 69, 69, 69, 69, 69, 1581, 69, 69, 69, 2164, - 1572, 1582, 69, 69, 1573, 1578, 1571, 69, 1609, 69, + 1530, 1536, 69, 69, 1538, 69, 1527, 1528, 1535, 1529, + 1533, 69, 1537, 1531, 69, 1540, 1534, 1539, 69, 1541, + 1543, 69, 69, 1547, 69, 1544, 69, 69, 69, 1545, + 69, 1542, 69, 1548, 1551, 69, 1550, 69, 1552, 1555, + 1553, 69, 1546, 1557, 69, 69, 1556, 1549, 1554, 69, + 69, 69, 69, 69, 1558, 1559, 69, 69, 1562, 69, + 69, 1568, 69, 69, 1565, 69, 69, 1569, 69, 69, + 1560, 1571, 1564, 69, 69, 69, 69, 1561, 1566, 1563, + 69, 1567, 69, 1570, 69, 69, 69, 1582, 69, 69, + 69, 69, 1573, 1574, 1583, 1572, 1579, 69, 1575, 1577, - 1576, 1574, 1580, 1577, 1575, 1579, 1583, 69, 1586, 1587, - 69, 1584, 1585, 1588, 69, 69, 69, 69, 1591, 69, - 1594, 69, 1595, 69, 1596, 69, 69, 69, 1592, 1590, - 1589, 1593, 1598, 69, 69, 1600, 69, 1601, 69, 69, - 69, 1602, 69, 1605, 69, 1597, 69, 1604, 1607, 69, - 69, 69, 1599, 1610, 69, 1611, 1613, 69, 1603, 1606, - 69, 69, 1617, 69, 1608, 69, 1615, 69, 69, 69, - 1612, 1622, 69, 1621, 69, 1624, 69, 69, 69, 1614, - 1616, 69, 69, 1620, 69, 1618, 69, 1628, 1626, 69, - 1619, 1629, 69, 1623, 1630, 69, 1631, 1625, 69, 69, + 1576, 1581, 1584, 1578, 1585, 69, 1580, 69, 1587, 69, + 1586, 1588, 69, 1589, 69, 69, 1592, 69, 1595, 69, + 1590, 69, 1591, 1596, 69, 69, 1593, 1597, 69, 1594, + 1599, 69, 1601, 69, 1602, 69, 69, 69, 69, 69, + 1598, 1606, 69, 1600, 1605, 1608, 69, 69, 69, 69, + 1603, 69, 1611, 69, 1610, 69, 1604, 1607, 69, 1612, + 1614, 69, 69, 1618, 69, 1609, 69, 69, 1616, 69, + 1615, 1623, 69, 1622, 1613, 1619, 69, 1625, 69, 69, + 69, 1617, 1621, 69, 69, 1629, 69, 1627, 69, 1620, + 69, 69, 1631, 69, 69, 1624, 1633, 1630, 1632, 1626, - 1632, 69, 69, 69, 1627, 69, 1636, 1637, 69, 69, - 69, 1634, 69, 69, 1633, 1642, 1643, 1639, 1638, 1640, - 1635, 69, 1645, 1641, 1647, 1644, 69, 1646, 69, 1648, - 69, 69, 69, 69, 69, 69, 69, 1649, 69, 69, - 69, 2164, 1653, 1657, 1658, 69, 1654, 1652, 1661, 69, - 1656, 1650, 1655, 1651, 1664, 1659, 69, 1660, 1662, 69, - 69, 1663, 1665, 69, 69, 69, 1667, 69, 69, 69, - 69, 1671, 69, 69, 69, 69, 1672, 1673, 1666, 1668, - 1674, 69, 1669, 69, 69, 69, 69, 69, 1670, 1675, - 1679, 69, 1681, 1676, 1682, 1677, 69, 1678, 69, 69, + 69, 69, 69, 69, 69, 69, 1637, 1635, 1638, 1628, + 69, 69, 69, 1640, 1641, 2174, 1644, 1639, 1634, 1642, + 69, 1636, 69, 1649, 1645, 1643, 69, 69, 1648, 69, + 69, 1650, 1646, 69, 69, 1647, 69, 69, 69, 1651, + 69, 69, 69, 69, 1659, 1655, 69, 2174, 1660, 1654, + 1656, 1663, 69, 1652, 1658, 1653, 1657, 1661, 1662, 1664, + 69, 69, 1666, 1667, 69, 69, 1665, 69, 69, 69, + 1669, 69, 69, 69, 1673, 69, 69, 69, 1675, 1668, + 1674, 1671, 1677, 1670, 1676, 69, 69, 69, 69, 69, + 69, 1672, 69, 1681, 1684, 69, 69, 1683, 69, 69, - 69, 1687, 1683, 69, 1686, 1680, 69, 69, 1689, 1684, - 69, 1688, 69, 1691, 1685, 69, 69, 69, 1692, 69, - 1694, 1695, 69, 69, 1690, 69, 1699, 69, 1697, 69, - 1698, 1700, 69, 1701, 69, 1696, 69, 1702, 69, 69, - 69, 69, 1693, 1705, 1710, 1703, 1708, 69, 69, 69, - 69, 69, 2164, 1707, 1713, 69, 1704, 1709, 69, 1706, - 69, 1714, 1715, 69, 69, 69, 1712, 1711, 69, 1716, - 1717, 69, 1718, 1721, 69, 69, 1720, 1722, 69, 1719, - 1723, 69, 69, 69, 1726, 69, 69, 1724, 69, 69, - 69, 1732, 69, 1730, 69, 69, 69, 1727, 1728, 69, + 69, 1685, 1680, 1688, 69, 1689, 1678, 1679, 69, 69, + 1682, 69, 1690, 69, 1686, 1687, 69, 1703, 1691, 69, + 1693, 69, 1692, 69, 1694, 69, 1696, 1697, 69, 69, + 69, 1698, 69, 69, 1699, 1695, 69, 1700, 1701, 69, + 1702, 69, 69, 1704, 69, 69, 1705, 69, 1709, 1707, + 1710, 69, 1712, 69, 69, 1706, 1711, 2174, 69, 1715, + 69, 69, 1716, 69, 1708, 1717, 69, 69, 1718, 1714, + 69, 1713, 1719, 69, 69, 1723, 69, 1724, 69, 1722, + 69, 1720, 1725, 69, 69, 69, 1728, 1721, 69, 69, + 69, 69, 1726, 69, 69, 1735, 69, 1731, 1733, 69, - 1725, 1729, 69, 1733, 69, 69, 1739, 69, 69, 69, - 1731, 69, 1736, 1747, 69, 69, 1735, 1740, 1738, 69, - 1745, 1734, 1744, 69, 69, 1741, 1737, 69, 1746, 1748, - 69, 1742, 69, 1749, 1743, 69, 69, 69, 1751, 69, - 69, 69, 1750, 69, 69, 69, 1759, 69, 1756, 1760, - 69, 69, 1761, 69, 1753, 1752, 69, 69, 1763, 1754, - 1755, 1757, 1758, 69, 69, 1762, 1769, 69, 1764, 1770, - 69, 1771, 69, 69, 1765, 1766, 69, 69, 69, 1767, - 69, 69, 69, 1768, 69, 1775, 1779, 1778, 1773, 69, - 1772, 69, 69, 69, 69, 1774, 2164, 1784, 1776, 69, + 1729, 1730, 1727, 1732, 69, 69, 69, 69, 1736, 69, + 69, 1742, 69, 69, 1734, 69, 69, 69, 69, 1739, + 1747, 1743, 69, 1741, 69, 1738, 69, 1748, 69, 1749, + 1737, 1740, 69, 1744, 69, 1745, 1750, 69, 1755, 1746, + 1751, 69, 69, 1752, 1753, 1754, 1756, 69, 69, 69, + 69, 69, 1762, 69, 1757, 1763, 69, 1759, 69, 69, + 69, 69, 1764, 69, 69, 69, 1766, 1758, 1761, 1760, + 1772, 69, 1773, 69, 69, 1767, 1765, 1774, 69, 1768, + 1770, 1769, 69, 69, 1771, 69, 69, 69, 69, 69, + 1778, 69, 1775, 1776, 1781, 69, 69, 1782, 69, 69, - 1780, 1777, 1785, 69, 69, 1788, 69, 69, 69, 1781, - 69, 1782, 1789, 1783, 1786, 69, 1792, 69, 69, 1791, - 1793, 69, 1787, 1794, 69, 1790, 1795, 69, 1797, 69, - 69, 1799, 69, 69, 1800, 1798, 69, 1796, 69, 69, - 69, 69, 69, 1801, 1804, 1805, 69, 1803, 69, 1802, - 1807, 69, 69, 1809, 1812, 69, 1810, 1813, 69, 69, - 1806, 1808, 69, 69, 1816, 2164, 1814, 1811, 1815, 69, - 69, 69, 1818, 69, 1817, 1820, 69, 1819, 1821, 69, - 69, 69, 1823, 1826, 69, 1825, 1822, 1824, 69, 69, - 69, 69, 69, 1829, 1827, 69, 1828, 69, 69, 1836, + 1783, 1777, 1787, 1788, 69, 69, 1779, 1780, 1784, 69, + 1791, 69, 69, 69, 69, 1785, 1792, 69, 1786, 69, + 1789, 1794, 1795, 69, 1797, 69, 69, 1790, 1793, 1798, + 69, 1801, 1796, 1799, 1800, 69, 1802, 69, 69, 1803, + 69, 69, 69, 69, 69, 69, 69, 69, 1807, 69, + 1809, 1806, 69, 69, 1805, 1811, 69, 1813, 1808, 1816, + 69, 1814, 1804, 69, 1812, 1810, 1817, 69, 1815, 69, + 1818, 1820, 69, 69, 1819, 69, 1822, 69, 1821, 1824, + 69, 1825, 69, 69, 1827, 2174, 69, 1823, 1830, 1828, + 69, 1829, 69, 69, 69, 69, 1826, 1831, 69, 69, - 69, 69, 1832, 1831, 1834, 1835, 69, 1830, 69, 69, - 1833, 69, 1840, 69, 69, 69, 69, 1838, 1839, 1837, - 69, 69, 1841, 1845, 69, 1847, 69, 1849, 69, 69, - 69, 1852, 2164, 1842, 1851, 1843, 69, 69, 69, 1844, - 1846, 1848, 1853, 69, 1854, 69, 69, 1856, 1850, 69, - 1855, 69, 69, 1858, 69, 1861, 1862, 69, 69, 1857, - 69, 69, 1865, 1866, 69, 1859, 69, 1860, 69, 1867, - 1868, 69, 1869, 69, 1870, 69, 69, 1873, 1863, 69, - 1864, 1874, 69, 69, 69, 69, 1871, 1876, 1875, 1880, - 1872, 1879, 1877, 69, 69, 69, 69, 69, 69, 69, + 1832, 1833, 69, 69, 69, 69, 69, 1835, 1836, 1838, + 1839, 69, 69, 1834, 1837, 69, 69, 69, 1844, 69, + 69, 1842, 1840, 69, 1841, 1843, 1849, 69, 1845, 69, + 69, 69, 1853, 69, 1846, 69, 69, 69, 1856, 1851, + 1847, 1855, 1848, 69, 69, 1860, 1852, 69, 1850, 1857, + 69, 1858, 1859, 69, 1854, 69, 69, 69, 69, 1862, + 69, 1865, 1866, 69, 69, 2174, 1861, 69, 1869, 1878, + 1863, 69, 1864, 1870, 69, 69, 69, 69, 1867, 1871, + 1872, 69, 69, 1873, 1868, 1874, 69, 1875, 69, 1876, + 69, 1877, 1879, 69, 1880, 1881, 69, 69, 1885, 69, - 1882, 69, 1878, 1883, 1884, 69, 69, 69, 2164, 69, - 1888, 1892, 69, 69, 69, 69, 1886, 1887, 69, 1881, - 69, 1896, 1885, 1891, 1889, 69, 1894, 1890, 69, 1897, - 69, 1898, 1893, 1895, 69, 1901, 69, 69, 69, 1900, - 69, 1899, 1906, 69, 69, 69, 1903, 1907, 1909, 69, - 69, 69, 69, 1913, 69, 1910, 69, 69, 1904, 69, - 1905, 1911, 1902, 1908, 69, 1915, 69, 2164, 1914, 1912, - 1917, 69, 1916, 1921, 69, 1918, 69, 69, 69, 1919, - 1920, 69, 69, 69, 1924, 69, 1922, 1925, 69, 1926, - 1923, 69, 1927, 69, 1929, 69, 1928, 1930, 1931, 69, + 1882, 69, 69, 1884, 69, 69, 1887, 69, 69, 69, + 1888, 1889, 69, 69, 69, 69, 69, 1893, 69, 1883, + 1897, 69, 69, 69, 1886, 2174, 1891, 1892, 69, 1896, + 1899, 1894, 1890, 69, 1895, 1898, 69, 1900, 69, 1901, + 69, 1902, 69, 1903, 1904, 69, 69, 69, 69, 1907, + 1905, 1911, 69, 1906, 69, 1908, 1909, 1912, 1914, 69, + 69, 69, 69, 1918, 69, 1915, 1913, 1910, 69, 69, + 1916, 69, 1919, 69, 69, 69, 1922, 69, 1920, 69, + 1917, 1923, 69, 69, 1925, 1928, 1921, 1924, 1926, 69, + 69, 1930, 1927, 69, 1932, 1931, 69, 69, 69, 69, - 69, 1933, 69, 1936, 1932, 69, 1939, 1935, 69, 69, - 1937, 1938, 69, 1940, 69, 1942, 69, 1944, 69, 1934, - 69, 69, 69, 1947, 69, 69, 69, 69, 69, 69, - 1949, 69, 1941, 69, 69, 69, 1950, 1946, 1948, 1945, - 1954, 1943, 1953, 69, 1951, 1956, 69, 69, 1952, 1958, - 69, 69, 1957, 1959, 69, 1960, 69, 1955, 69, 1961, - 1963, 69, 69, 1962, 69, 1967, 69, 1964, 69, 1970, - 69, 1971, 69, 69, 1965, 69, 69, 1975, 69, 69, - 1968, 1966, 1976, 69, 1977, 69, 69, 1973, 1980, 69, - 1969, 69, 1972, 69, 69, 1986, 1974, 1978, 1981, 69, + 69, 1935, 1929, 1934, 1936, 1933, 1937, 69, 1938, 69, + 69, 69, 1942, 1944, 69, 1941, 1943, 1939, 69, 69, + 69, 69, 69, 1948, 69, 1946, 1950, 69, 1940, 69, + 69, 1953, 69, 69, 69, 69, 69, 69, 1955, 1947, + 1945, 69, 69, 1951, 1956, 1952, 1954, 1949, 69, 1959, + 1962, 69, 1957, 1960, 69, 69, 1958, 1964, 69, 1965, + 69, 1966, 69, 69, 69, 1969, 69, 69, 1961, 1968, + 69, 1967, 69, 1963, 69, 1973, 69, 1976, 69, 1977, + 69, 69, 69, 1970, 69, 69, 1974, 1982, 69, 1972, + 1971, 1978, 69, 69, 1984, 1983, 1980, 69, 1975, 69, - 69, 69, 69, 1982, 69, 69, 1979, 1983, 2037, 1984, - 1985, 1989, 69, 1990, 69, 1992, 69, 69, 69, 1987, - 1988, 69, 1993, 69, 1991, 2164, 1995, 1996, 69, 1997, - 69, 69, 1994, 1998, 69, 69, 1999, 2000, 69, 69, - 2002, 2003, 69, 69, 69, 2001, 2007, 69, 69, 2004, - 69, 2010, 69, 2006, 69, 2008, 2009, 69, 69, 2011, - 69, 69, 69, 2005, 69, 2014, 69, 69, 2016, 69, - 69, 69, 2017, 2015, 69, 2024, 69, 2012, 2013, 2026, - 69, 2027, 69, 2164, 69, 2019, 2018, 2020, 2028, 69, - 2023, 2021, 2022, 2029, 69, 69, 2025, 2030, 2031, 2032, + 1979, 1987, 1988, 69, 69, 1981, 69, 69, 69, 1985, + 69, 1989, 1993, 69, 69, 1991, 1996, 69, 69, 1986, + 1997, 69, 1990, 1999, 69, 1992, 69, 69, 69, 69, + 1994, 1995, 2000, 1998, 2002, 2003, 69, 2004, 69, 69, + 2001, 2005, 69, 69, 2006, 2007, 69, 69, 2009, 69, + 2008, 2010, 69, 69, 2014, 69, 69, 2011, 69, 69, + 69, 2015, 2013, 2018, 69, 2019, 69, 2017, 69, 2012, + 69, 69, 2016, 69, 69, 2022, 69, 69, 69, 2024, + 69, 69, 2025, 2023, 69, 69, 2020, 2174, 2021, 2032, + 2034, 69, 2035, 69, 2028, 2027, 2026, 2029, 2030, 69, - 69, 2033, 69, 69, 2036, 69, 69, 2034, 69, 69, - 69, 2040, 2041, 69, 2042, 69, 69, 2035, 2039, 2045, - 69, 2044, 69, 2043, 2038, 69, 69, 69, 69, 69, - 69, 2049, 2064, 2050, 2052, 69, 2053, 69, 2054, 69, - 2047, 2055, 69, 2056, 69, 69, 69, 2046, 2048, 2051, - 2058, 69, 69, 2060, 2057, 69, 2062, 69, 2059, 69, - 2065, 69, 69, 69, 69, 69, 69, 2067, 69, 69, - 2061, 2071, 69, 2072, 69, 2066, 69, 2063, 69, 69, - 2070, 69, 2068, 2069, 69, 69, 69, 69, 2074, 2076, - 69, 69, 2073, 69, 2077, 2084, 69, 2164, 2078, 2075, + 2037, 69, 2031, 2036, 69, 2033, 2038, 2039, 2040, 69, + 2041, 69, 69, 69, 2044, 69, 69, 69, 69, 69, + 69, 2049, 69, 2045, 2050, 69, 69, 2043, 2048, 69, + 2042, 2053, 2046, 2051, 69, 69, 2047, 2052, 2054, 69, + 69, 69, 69, 69, 2061, 69, 2058, 2059, 2062, 69, + 2056, 2063, 69, 69, 2055, 2064, 69, 2065, 69, 69, + 69, 2057, 2060, 2067, 69, 2068, 69, 69, 2066, 69, + 2070, 2073, 2069, 2072, 69, 69, 69, 2075, 2074, 69, + 69, 69, 2071, 69, 2077, 69, 69, 69, 69, 2081, + 2076, 2082, 69, 69, 69, 69, 69, 2080, 69, 2078, - 2085, 2080, 2079, 2086, 69, 2082, 69, 2083, 69, 2087, - 69, 2081, 2088, 69, 69, 2089, 2093, 69, 2091, 2090, - 69, 2092, 69, 2095, 69, 69, 69, 2099, 2100, 69, - 69, 2094, 69, 69, 69, 2096, 69, 69, 69, 69, - 69, 2105, 2102, 2097, 2101, 2098, 69, 69, 2164, 69, - 2104, 2103, 2107, 2108, 2110, 69, 69, 2106, 2113, 69, - 2111, 69, 2114, 69, 69, 2109, 2112, 69, 2115, 2116, - 2119, 69, 2117, 2120, 69, 2118, 69, 69, 2121, 69, - 2124, 69, 69, 69, 69, 69, 69, 69, 2127, 69, - 69, 2131, 2132, 69, 69, 2126, 2122, 2164, 2123, 2136, + 69, 69, 69, 2079, 69, 2086, 2084, 69, 2083, 2087, + 2094, 69, 69, 2174, 2088, 69, 2085, 2090, 2089, 2092, + 2099, 2095, 2093, 2091, 2096, 69, 69, 2097, 2098, 69, + 69, 69, 2101, 2103, 69, 2100, 2105, 69, 69, 69, + 69, 69, 69, 2109, 2110, 69, 2102, 69, 2104, 69, + 69, 69, 69, 2106, 69, 69, 2111, 69, 2107, 2114, + 2108, 2115, 69, 69, 2112, 69, 2113, 2117, 2118, 69, + 2120, 2116, 2123, 69, 2121, 69, 2124, 69, 69, 69, + 69, 2119, 2122, 2125, 2126, 2127, 2129, 2130, 69, 69, + 69, 69, 69, 2134, 69, 69, 2128, 2131, 69, 69, - 2125, 69, 2130, 2128, 2129, 69, 2134, 69, 2135, 69, - 2139, 69, 2133, 69, 69, 69, 2137, 69, 69, 69, - 2138, 2140, 2141, 2143, 2145, 69, 69, 69, 69, 2149, - 2146, 69, 2142, 69, 69, 2152, 2144, 2153, 69, 69, - 69, 2155, 69, 2156, 69, 2147, 2148, 2154, 69, 69, - 2150, 69, 2151, 69, 2158, 2157, 2159, 2164, 2160, 2162, - 69, 2163, 69, 2164, 2164, 2164, 2164, 2164, 2164, 2164, - 2164, 2164, 2161, 41, 41, 41, 41, 41, 41, 41, - 46, 46, 46, 46, 46, 46, 46, 51, 51, 51, - 51, 51, 51, 51, 57, 57, 57, 57, 57, 57, + 2137, 69, 69, 69, 69, 2141, 69, 69, 2132, 69, + 2133, 2136, 2142, 2135, 69, 2144, 2140, 69, 2145, 69, + 2138, 2139, 69, 69, 2146, 2143, 2149, 69, 2148, 2147, + 2150, 69, 69, 69, 69, 69, 69, 69, 2151, 2153, + 2155, 2156, 69, 69, 2159, 69, 69, 69, 2162, 2163, + 69, 2152, 2154, 69, 2165, 69, 2157, 2166, 69, 69, + 2164, 2158, 69, 69, 2160, 2161, 2167, 2168, 2169, 69, + 69, 2172, 69, 2173, 69, 2174, 2174, 2174, 2174, 2174, + 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2170, 2171, + 41, 41, 41, 41, 41, 41, 41, 46, 46, 46, - 57, 62, 62, 62, 62, 62, 62, 62, 72, 72, - 2164, 72, 72, 72, 72, 131, 131, 2164, 2164, 2164, - 131, 131, 133, 133, 2164, 2164, 133, 2164, 133, 135, - 2164, 2164, 2164, 2164, 2164, 135, 138, 138, 2164, 2164, - 2164, 138, 138, 140, 2164, 2164, 2164, 2164, 2164, 140, - 142, 142, 2164, 142, 142, 142, 142, 73, 73, 2164, - 73, 73, 73, 73, 13, 2164, 2164, 2164, 2164, 2164, - 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, - 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, - 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, + 46, 46, 46, 46, 51, 51, 51, 51, 51, 51, + 51, 57, 57, 57, 57, 57, 57, 57, 62, 62, + 62, 62, 62, 62, 62, 72, 72, 2174, 72, 72, + 72, 72, 131, 131, 2174, 2174, 2174, 131, 131, 133, + 133, 2174, 2174, 133, 2174, 133, 135, 2174, 2174, 2174, + 2174, 2174, 135, 138, 138, 2174, 2174, 2174, 138, 138, + 140, 2174, 2174, 2174, 2174, 2174, 140, 142, 142, 2174, + 142, 142, 142, 142, 73, 73, 2174, 73, 73, 73, + 73, 13, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, + 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, - 2164, 2164, 2164, 2164, 2164 + 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, + 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, + 2174, 2174 } ; -static yyconst flex_int16_t yy_chk[4306] = +static yyconst flex_int16_t yy_chk[4323] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1646,7 +1636,7 @@ static yyconst flex_int16_t yy_chk[4306] = 10, 10, 15, 24, 9, 21, 15, 24, 21, 21, 10, 11, 11, 11, 11, 11, 11, 19, 33, 19, - 19, 2170, 19, 11, 25, 25, 21, 24, 19, 19, + 19, 2180, 19, 11, 25, 25, 21, 24, 19, 19, 77, 28, 11, 12, 12, 12, 12, 12, 12, 25, 22, 22, 26, 26, 23, 12, 28, 30, 22, 23, 77, 26, 22, 23, 12, 22, 23, 27, 23, 23, @@ -1952,163 +1942,165 @@ static yyconst flex_int16_t yy_chk[4306] = 1402, 1394, 1392, 1395, 1396, 1400, 1396, 1398, 1398, 1397, 1393, 1399, 1399, 1401, 1400, 1401, 1404, 1400, 1403, 1403, 1405, 1402, 1407, 1408, 1410, 1404, 1411, 1407, 1408, 1412, - 1415, 1419, 1405, 1413, 1417, 1418, 1415, 1410, 1424, 1420, + 1417, 1419, 1405, 1413, 1415, 1418, 1417, 1410, 1424, 1420, - 1417, 1421, 1421, 1422, 1423, 1423, 1411, 1412, 1420, 1413, - 1418, 1425, 1422, 1426, 1427, 1425, 1419, 1424, 1426, 1428, - 1429, 1430, 1433, 1433, 1428, 1428, 1435, 1427, 1429, 1434, - 1434, 1436, 1436, 1437, 1437, 1435, 1438, 1439, 1441, 1440, - 1446, 1430, 1448, 1441, 1434, 1440, 1442, 1442, 1438, 1443, - 1450, 1451, 1445, 1449, 1443, 1439, 1445, 1452, 1449, 1453, - 1446, 1457, 1452, 1454, 1455, 1455, 1451, 1448, 1456, 1458, - 1459, 1460, 1456, 1450, 1458, 1462, 1457, 1453, 1463, 1454, - 1464, 1465, 1466, 1467, 1468, 1471, 1471, 1470, 1472, 0, - 1460, 1472, 1499, 1473, 1462, 1467, 1459, 1474, 1499, 1475, + 1415, 1421, 1421, 1422, 1423, 1423, 1411, 1412, 1420, 1413, + 1418, 1425, 1422, 1415, 1426, 1425, 1419, 1424, 1427, 1426, + 1428, 1429, 1430, 1433, 1433, 1428, 1428, 1435, 1438, 1429, + 1439, 1427, 1434, 1434, 1436, 1436, 1435, 1437, 1437, 1440, + 1438, 1441, 1430, 1442, 1442, 1440, 1441, 1434, 1439, 1443, + 1446, 1445, 1448, 1449, 1443, 1445, 1450, 1451, 1449, 1452, + 1453, 1455, 1455, 1456, 1452, 1454, 1458, 1456, 1457, 1459, + 1446, 1458, 1451, 1460, 1462, 1463, 1464, 1448, 1453, 1450, + 1465, 1454, 1466, 1457, 1467, 1468, 1470, 1471, 1471, 1473, + 1474, 1472, 1460, 1462, 1472, 1459, 1467, 1475, 1463, 1465, - 1465, 1463, 1470, 1466, 1464, 1468, 1473, 1476, 1476, 1477, - 1477, 1474, 1475, 1478, 1478, 1479, 1480, 1481, 1481, 1482, - 1483, 1483, 1484, 1484, 1485, 1485, 1486, 1491, 1482, 1480, - 1479, 1482, 1487, 1487, 1488, 1489, 1489, 1490, 1490, 1492, - 1496, 1491, 1494, 1495, 1495, 1486, 1498, 1494, 1497, 1497, - 1500, 1504, 1488, 1500, 1501, 1501, 1502, 1502, 1492, 1496, - 1503, 1505, 1506, 1506, 1498, 1508, 1504, 1509, 1510, 1511, - 1501, 1512, 1512, 1511, 1513, 1514, 1514, 1515, 1517, 1503, - 1505, 1516, 1519, 1510, 1522, 1508, 1518, 1518, 1516, 1524, - 1509, 1519, 1520, 1513, 1520, 1523, 1522, 1515, 1525, 1526, + 1464, 1470, 1473, 1466, 1474, 1479, 1468, 1476, 1476, 1480, + 1475, 1477, 1477, 1478, 1478, 1481, 1481, 1482, 1483, 1483, + 1479, 1486, 1480, 1484, 1484, 1488, 1482, 1485, 1485, 1482, + 1487, 1487, 1489, 1489, 1490, 1490, 1491, 1492, 1496, 1494, + 1486, 1495, 1495, 1488, 1494, 1497, 1497, 1498, 1499, 1500, + 1491, 1503, 1500, 1504, 1499, 1508, 1492, 1496, 1501, 1501, + 1502, 1502, 1505, 1506, 1506, 1498, 1509, 1510, 1504, 1511, + 1503, 1512, 1512, 1511, 1501, 1508, 1513, 1514, 1514, 1515, + 1516, 1505, 1510, 1517, 1518, 1518, 1522, 1516, 1519, 1509, + 1520, 1523, 1520, 1524, 1525, 1513, 1523, 1519, 1522, 1515, - 1523, 1527, 1528, 1529, 1517, 1536, 1527, 1528, 1530, 1532, - 1531, 1525, 1534, 1538, 1524, 1533, 1534, 1530, 1529, 1531, - 1526, 1533, 1538, 1532, 1540, 1536, 1539, 1539, 1541, 1541, - 1540, 1542, 1544, 1545, 1547, 1553, 1548, 1541, 1549, 1552, - 1551, 0, 1545, 1551, 1552, 1554, 1547, 1544, 1555, 1555, - 1549, 1542, 1548, 1542, 1559, 1553, 1558, 1554, 1557, 1557, - 1559, 1558, 1560, 1560, 1561, 1562, 1562, 1563, 1564, 1565, - 1566, 1566, 1568, 1572, 1569, 1573, 1568, 1569, 1561, 1563, - 1570, 1570, 1564, 1574, 1571, 1576, 1575, 1577, 1565, 1571, - 1575, 1580, 1577, 1572, 1578, 1573, 1579, 1574, 1582, 1583, + 1526, 1527, 1529, 1528, 1530, 1531, 1527, 1525, 1528, 1517, + 1532, 1533, 1537, 1530, 1531, 0, 1534, 1529, 1524, 1532, + 1535, 1526, 1534, 1541, 1535, 1533, 1539, 1540, 1540, 1541, + 1542, 1542, 1537, 1543, 1545, 1539, 1546, 1554, 1548, 1542, + 1549, 1552, 1550, 1553, 1552, 1546, 1555, 0, 1553, 1545, + 1548, 1556, 1556, 1543, 1550, 1543, 1549, 1554, 1555, 1558, + 1558, 1559, 1560, 1561, 1561, 1562, 1559, 1565, 1560, 1563, + 1563, 1564, 1566, 1567, 1567, 1570, 1569, 1572, 1570, 1562, + 1569, 1565, 1572, 1564, 1571, 1571, 1573, 1574, 1575, 1576, + 1577, 1566, 1578, 1576, 1579, 1580, 1581, 1578, 1584, 1583, - 1578, 1584, 1579, 1585, 1583, 1576, 1586, 1584, 1586, 1580, - 1589, 1585, 1590, 1590, 1582, 1591, 1592, 1599, 1591, 1593, - 1593, 1597, 1597, 1602, 1589, 1603, 1604, 1604, 1602, 1610, - 1603, 1606, 1606, 1608, 1611, 1599, 1609, 1609, 1612, 1608, - 1614, 1615, 1592, 1612, 1619, 1610, 1616, 1616, 1618, 1620, - 1619, 1621, 0, 1615, 1623, 1623, 1611, 1618, 1629, 1614, - 1625, 1625, 1626, 1626, 1627, 1630, 1621, 1620, 1628, 1627, - 1628, 1631, 1629, 1632, 1632, 1635, 1631, 1633, 1633, 1630, - 1634, 1634, 1636, 1637, 1637, 1638, 1639, 1635, 1641, 1640, - 1642, 1643, 1643, 1641, 1644, 1645, 1646, 1638, 1639, 1647, + 1579, 1580, 1575, 1584, 1586, 1585, 1573, 1574, 1590, 1593, + 1577, 1585, 1586, 1600, 1581, 1583, 1587, 1609, 1587, 1591, + 1591, 1592, 1590, 1609, 1592, 1594, 1594, 1598, 1598, 1603, + 1611, 1600, 1604, 1612, 1603, 1593, 1616, 1604, 1605, 1605, + 1607, 1607, 1610, 1610, 1613, 1615, 1611, 1619, 1616, 1613, + 1617, 1617, 1620, 1621, 1622, 1612, 1619, 0, 1620, 1624, + 1624, 1626, 1626, 1628, 1615, 1627, 1627, 1630, 1628, 1622, + 1629, 1621, 1629, 1631, 1632, 1633, 1633, 1634, 1634, 1632, + 1636, 1630, 1635, 1635, 1637, 1638, 1638, 1631, 1639, 1640, + 1641, 1642, 1636, 1643, 1644, 1645, 1645, 1641, 1643, 1646, - 1636, 1640, 1648, 1644, 1649, 1650, 1650, 1652, 1651, 1653, - 1642, 1654, 1647, 1658, 1658, 1656, 1646, 1651, 1649, 1655, - 1656, 1645, 1655, 1657, 1663, 1652, 1648, 1664, 1657, 1659, - 1659, 1653, 1660, 1660, 1654, 1666, 1667, 1668, 1664, 1670, - 1669, 1671, 1663, 1676, 1672, 1673, 1673, 1677, 1670, 1675, - 1675, 1678, 1676, 1679, 1667, 1666, 1680, 1681, 1678, 1668, - 1669, 1671, 1672, 1682, 1683, 1677, 1684, 1684, 1679, 1685, - 1685, 1686, 1687, 1688, 1680, 1681, 1689, 1686, 1691, 1682, - 1690, 1692, 1693, 1683, 1694, 1690, 1694, 1693, 1688, 1697, - 1687, 1696, 1698, 1701, 1702, 1689, 0, 1702, 1691, 1704, + 1639, 1640, 1637, 1642, 1647, 1648, 1649, 1650, 1646, 1651, + 1652, 1652, 1653, 1655, 1644, 1654, 1656, 1657, 1668, 1649, + 1657, 1653, 1658, 1651, 1659, 1648, 1665, 1658, 1669, 1659, + 1647, 1650, 1670, 1654, 1666, 1655, 1660, 1660, 1668, 1656, + 1661, 1661, 1662, 1662, 1665, 1666, 1669, 1671, 1672, 1673, + 1674, 1675, 1675, 1678, 1670, 1677, 1677, 1672, 1679, 1680, + 1681, 1682, 1678, 1683, 1684, 1685, 1680, 1671, 1674, 1673, + 1686, 1686, 1687, 1687, 1689, 1681, 1679, 1688, 1690, 1682, + 1684, 1683, 1691, 1688, 1685, 1692, 1693, 1694, 1699, 1695, + 1692, 1698, 1689, 1690, 1695, 1696, 1700, 1696, 1703, 1704, - 1696, 1692, 1703, 1703, 1705, 1706, 1706, 1712, 1707, 1697, - 1709, 1698, 1707, 1701, 1704, 1710, 1711, 1711, 1717, 1710, - 1712, 1725, 1705, 1714, 1714, 1709, 1716, 1716, 1718, 1718, - 1719, 1720, 1720, 1724, 1724, 1719, 1726, 1717, 1727, 1728, - 1729, 1730, 1731, 1725, 1728, 1729, 1733, 1727, 1734, 1726, - 1731, 1735, 1736, 1734, 1737, 1737, 1735, 1738, 1738, 1739, - 1730, 1733, 1744, 1740, 1741, 0, 1739, 1736, 1740, 1742, - 1741, 1743, 1743, 1749, 1742, 1745, 1745, 1744, 1746, 1746, - 1751, 1763, 1750, 1752, 1755, 1751, 1749, 1750, 1750, 1752, - 1753, 1754, 1756, 1755, 1753, 1757, 1754, 1758, 1759, 1763, + 1698, 1691, 1704, 1705, 1705, 1706, 1693, 1694, 1699, 1707, + 1708, 1708, 1709, 1711, 1719, 1700, 1709, 1712, 1703, 1714, + 1706, 1712, 1713, 1713, 1716, 1716, 1721, 1707, 1711, 1718, + 1718, 1721, 1714, 1719, 1720, 1720, 1722, 1722, 1726, 1726, + 1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, 1730, 1736, + 1732, 1729, 1737, 1739, 1728, 1734, 1738, 1737, 1731, 1740, + 1740, 1738, 1727, 1742, 1736, 1733, 1741, 1741, 1739, 1743, + 1742, 1744, 1747, 1745, 1743, 1746, 1746, 1744, 1745, 1748, + 1748, 1749, 1749, 1752, 1753, 0, 1754, 1747, 1755, 1753, + 1753, 1754, 1758, 1756, 1755, 1757, 1752, 1756, 1759, 1760, - 1762, 1761, 1758, 1757, 1761, 1762, 1764, 1756, 1765, 1766, - 1759, 1767, 1767, 1768, 1771, 1772, 1776, 1765, 1766, 1764, - 1773, 1775, 1768, 1774, 1774, 1776, 1777, 1778, 1778, 1779, - 1780, 1781, 0, 1771, 1780, 1772, 1783, 1781, 1786, 1773, - 1775, 1777, 1782, 1782, 1783, 1784, 1787, 1786, 1779, 1789, - 1784, 1790, 1791, 1789, 1793, 1793, 1796, 1796, 1798, 1787, - 1800, 1801, 1801, 1802, 1802, 1790, 1803, 1791, 1807, 1803, - 1804, 1804, 1805, 1805, 1806, 1806, 1808, 1809, 1798, 1815, - 1800, 1810, 1810, 1809, 1811, 1816, 1807, 1814, 1811, 1817, - 1808, 1816, 1814, 1814, 1818, 1817, 1819, 1825, 1822, 1826, + 1757, 1758, 1762, 1761, 1766, 1765, 1764, 1760, 1761, 1764, + 1765, 1767, 1768, 1759, 1762, 1774, 1769, 1770, 1770, 1771, + 1775, 1768, 1766, 1776, 1767, 1769, 1777, 1777, 1771, 1778, + 1779, 1780, 1781, 1781, 1774, 1782, 1789, 1783, 1784, 1779, + 1775, 1783, 1776, 1786, 1784, 1789, 1780, 1787, 1778, 1785, + 1785, 1786, 1787, 1790, 1782, 1792, 1793, 1794, 1801, 1792, + 1796, 1796, 1799, 1799, 1803, 0, 1790, 1804, 1804, 1813, + 1793, 1811, 1794, 1805, 1805, 1813, 1806, 1812, 1801, 1806, + 1807, 1807, 1808, 1808, 1803, 1809, 1809, 1810, 1810, 1811, + 1815, 1812, 1814, 1814, 1815, 1818, 1819, 1820, 1821, 1822, - 1819, 1823, 1815, 1822, 1823, 1827, 1828, 1829, 0, 1830, - 1827, 1831, 1831, 1832, 1834, 1840, 1826, 1826, 1833, 1818, - 1835, 1835, 1825, 1830, 1828, 1838, 1833, 1829, 1836, 1836, - 1837, 1837, 1832, 1834, 1839, 1840, 1841, 1842, 1843, 1839, - 1844, 1838, 1846, 1846, 1847, 1848, 1842, 1847, 1850, 1850, - 1851, 1854, 1852, 1855, 1855, 1851, 1857, 1858, 1843, 1867, - 1844, 1852, 1841, 1848, 1856, 1857, 1860, 0, 1856, 1854, - 1859, 1861, 1858, 1863, 1863, 1859, 1859, 1864, 1865, 1860, - 1861, 1880, 1871, 1873, 1867, 1886, 1864, 1871, 1872, 1872, - 1865, 1875, 1873, 1876, 1876, 1879, 1875, 1876, 1878, 1878, + 1818, 1818, 1823, 1820, 1821, 1826, 1823, 1829, 1827, 1830, + 1826, 1827, 1831, 1832, 1833, 1834, 1836, 1831, 1838, 1819, + 1835, 1835, 1837, 1845, 1822, 0, 1830, 1830, 1842, 1834, + 1837, 1832, 1829, 1844, 1833, 1836, 1847, 1838, 1839, 1839, + 1840, 1840, 1841, 1841, 1842, 1843, 1846, 1848, 1852, 1845, + 1843, 1850, 1850, 1844, 1851, 1846, 1847, 1851, 1854, 1854, + 1855, 1856, 1858, 1859, 1859, 1855, 1852, 1848, 1860, 1861, + 1856, 1862, 1860, 1869, 1864, 1865, 1863, 1871, 1861, 1873, + 1858, 1863, 1863, 1868, 1865, 1869, 1862, 1864, 1867, 1867, + 1876, 1873, 1868, 1877, 1877, 1876, 1878, 1885, 1880, 1884, - 1881, 1880, 1882, 1883, 1879, 1884, 1886, 1882, 1887, 1883, - 1884, 1885, 1885, 1887, 1888, 1889, 1890, 1891, 1891, 1881, - 1893, 1889, 1894, 1895, 1895, 1896, 1897, 1898, 1899, 1900, - 1897, 1903, 1888, 1905, 1901, 1902, 1898, 1894, 1896, 1893, - 1902, 1890, 1901, 1911, 1899, 1904, 1904, 1915, 1900, 1907, - 1907, 1916, 1905, 1908, 1908, 1910, 1910, 1903, 1912, 1911, - 1914, 1914, 1917, 1912, 1919, 1919, 1920, 1915, 1922, 1923, - 1923, 1924, 1924, 1925, 1916, 1926, 1927, 1928, 1928, 1929, - 1920, 1917, 1929, 1930, 1930, 1932, 1933, 1926, 1934, 1937, - 1922, 1940, 1925, 2009, 1934, 1941, 1927, 1932, 1935, 1935, + 1881, 1881, 1871, 1880, 1881, 1878, 1883, 1883, 1884, 1886, + 1887, 1889, 1888, 1890, 1890, 1887, 1889, 1885, 1888, 1891, + 1892, 1893, 1895, 1894, 1898, 1892, 1896, 1896, 1886, 1894, + 1899, 1900, 1900, 1901, 1902, 1903, 1904, 1905, 1902, 1893, + 1891, 1906, 1908, 1898, 1903, 1899, 1901, 1895, 1907, 1906, + 1909, 1909, 1904, 1907, 1910, 1916, 1905, 1912, 1912, 1913, + 1913, 1915, 1915, 1920, 1917, 1919, 1919, 1921, 1908, 1917, + 1922, 1916, 1925, 1910, 1924, 1924, 1927, 1928, 1928, 1929, + 1929, 1931, 1930, 1920, 1932, 1933, 1925, 1934, 1934, 1922, + 1921, 1930, 1935, 1936, 1936, 1935, 1932, 1938, 1927, 1939, - 1936, 1941, 1942, 1936, 1939, 1946, 1933, 1937, 2009, 1939, - 1940, 1943, 1943, 1945, 1945, 1948, 1948, 1949, 1950, 1942, - 1942, 1951, 1949, 1961, 1946, 0, 1951, 1952, 1952, 1953, - 1953, 1955, 1950, 1954, 1954, 1965, 1955, 1957, 1957, 1962, - 1962, 1964, 1964, 1966, 1967, 1961, 1968, 1968, 1972, 1965, - 1969, 1973, 1973, 1967, 1974, 1969, 1972, 1976, 1977, 1974, - 1978, 1979, 1980, 1966, 1982, 1978, 1983, 1984, 1980, 1987, - 1988, 1985, 1982, 1979, 1986, 1988, 1991, 1976, 1977, 1993, - 1993, 1994, 1994, 0, 1995, 1984, 1983, 1985, 1995, 2005, - 1987, 1986, 1986, 1999, 1999, 2002, 1991, 2001, 2001, 2002, + 1931, 1940, 1941, 1941, 1943, 1933, 1946, 1940, 1942, 1938, + 1945, 1942, 1947, 1948, 1952, 1945, 1949, 1949, 1947, 1939, + 1951, 1951, 1943, 1954, 1954, 1946, 1956, 1955, 1967, 1957, + 1948, 1948, 1955, 1952, 1957, 1958, 1958, 1959, 1959, 1961, + 1956, 1960, 1960, 1971, 1961, 1963, 1963, 1968, 1968, 1972, + 1967, 1970, 1970, 1973, 1974, 1974, 1975, 1971, 1978, 1979, + 1981, 1975, 1973, 1980, 1980, 1981, 1983, 1979, 1984, 1972, + 1985, 1986, 1978, 1987, 1989, 1985, 1990, 1991, 1992, 1987, + 1993, 1994, 1989, 1986, 1995, 1998, 1983, 0, 1984, 1995, + 2000, 2000, 2001, 2001, 1992, 1991, 1990, 1993, 1993, 2002, - 2001, 2004, 2004, 2006, 2008, 2008, 2011, 2005, 2016, 2012, - 2013, 2013, 2014, 2014, 2015, 2015, 2017, 2006, 2012, 2018, - 2018, 2017, 2019, 2016, 2011, 2020, 2022, 2021, 2023, 2044, - 2024, 2022, 2044, 2023, 2025, 2025, 2028, 2028, 2030, 2030, - 2020, 2031, 2031, 2032, 2032, 2034, 2037, 2019, 2021, 2024, - 2035, 2035, 2038, 2038, 2034, 2039, 2040, 2040, 2037, 2043, - 2046, 2047, 2048, 2049, 2051, 2050, 2046, 2048, 2057, 2059, - 2039, 2057, 2060, 2059, 2061, 2047, 2063, 2043, 2064, 2066, - 2051, 2065, 2049, 2050, 2067, 2068, 2069, 2071, 2061, 2064, - 2070, 2073, 2060, 2079, 2065, 2072, 2072, 0, 2066, 2063, + 2006, 2006, 1994, 2002, 2009, 1998, 2008, 2008, 2009, 2008, + 2011, 2011, 2012, 2013, 2015, 2015, 2016, 2017, 2019, 2020, + 2021, 2021, 2024, 2016, 2022, 2022, 2025, 2013, 2020, 2027, + 2012, 2025, 2017, 2023, 2023, 2028, 2019, 2024, 2026, 2026, + 2029, 2030, 2031, 2032, 2033, 2033, 2030, 2031, 2036, 2036, + 2028, 2038, 2038, 2052, 2027, 2039, 2039, 2040, 2040, 2042, + 2046, 2029, 2032, 2043, 2043, 2045, 2045, 2048, 2042, 2047, + 2047, 2052, 2046, 2049, 2049, 2053, 2056, 2055, 2053, 2057, + 2058, 2060, 2048, 2055, 2057, 2059, 2066, 2069, 2070, 2066, + 2056, 2069, 2071, 2073, 2074, 2076, 2075, 2060, 2079, 2058, - 2073, 2068, 2067, 2074, 2074, 2070, 2080, 2071, 2075, 2075, - 2077, 2069, 2076, 2076, 2078, 2077, 2081, 2082, 2079, 2078, - 2085, 2080, 2081, 2083, 2083, 2087, 2089, 2090, 2091, 2093, - 2092, 2082, 2094, 2090, 2091, 2085, 2096, 2097, 2098, 2099, - 2100, 2097, 2093, 2087, 2092, 2089, 2101, 2104, 0, 2102, - 2096, 2094, 2099, 2100, 2102, 2103, 2110, 2098, 2105, 2105, - 2103, 2106, 2106, 2107, 2108, 2101, 2104, 2109, 2107, 2108, - 2111, 2114, 2109, 2112, 2112, 2110, 2111, 2115, 2114, 2116, - 2117, 2118, 2119, 2121, 2122, 2123, 2117, 2126, 2121, 2124, - 2125, 2125, 2126, 2127, 2130, 2119, 2115, 0, 2116, 2130, + 2077, 2078, 2081, 2059, 2080, 2074, 2071, 2089, 2070, 2075, + 2082, 2082, 2083, 0, 2076, 2087, 2073, 2078, 2077, 2080, + 2087, 2083, 2081, 2079, 2084, 2084, 2085, 2085, 2086, 2086, + 2088, 2090, 2089, 2091, 2092, 2088, 2093, 2093, 2095, 2091, + 2097, 2099, 2102, 2100, 2101, 2106, 2090, 2104, 2092, 2100, + 2101, 2103, 2108, 2095, 2109, 2110, 2102, 2107, 2097, 2106, + 2099, 2107, 2111, 2114, 2103, 2112, 2104, 2109, 2110, 2113, + 2112, 2108, 2115, 2115, 2113, 2116, 2116, 2120, 2117, 2118, + 2119, 2111, 2114, 2117, 2118, 2119, 2121, 2122, 2122, 2125, + 2124, 2126, 2121, 2127, 2128, 2131, 2120, 2124, 2129, 2127, - 2118, 2132, 2124, 2122, 2123, 2128, 2128, 2129, 2129, 2131, - 2133, 2133, 2127, 2136, 2134, 2135, 2131, 2138, 2137, 2140, - 2132, 2134, 2135, 2137, 2140, 2141, 2142, 2143, 2144, 2144, - 2141, 2145, 2136, 2146, 2147, 2147, 2138, 2148, 2148, 2158, - 2149, 2150, 2150, 2151, 2151, 2142, 2143, 2149, 2152, 2154, - 2145, 2157, 2146, 2159, 2154, 2152, 2157, 0, 2158, 2160, - 2160, 2161, 2161, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2159, 2165, 2165, 2165, 2165, 2165, 2165, 2165, - 2166, 2166, 2166, 2166, 2166, 2166, 2166, 2167, 2167, 2167, - 2167, 2167, 2167, 2167, 2168, 2168, 2168, 2168, 2168, 2168, + 2131, 2132, 2133, 2134, 2135, 2135, 2137, 2136, 2125, 2142, + 2126, 2129, 2136, 2128, 2138, 2138, 2134, 2139, 2139, 2140, + 2132, 2133, 2141, 2144, 2140, 2137, 2143, 2143, 2142, 2141, + 2144, 2145, 2146, 2148, 2147, 2150, 2151, 2152, 2145, 2147, + 2150, 2151, 2153, 2154, 2154, 2155, 2156, 2157, 2157, 2158, + 2158, 2146, 2148, 2159, 2160, 2160, 2152, 2161, 2161, 2162, + 2159, 2153, 2164, 2167, 2155, 2156, 2162, 2164, 2167, 2168, + 2169, 2170, 2170, 2171, 2171, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2168, 2169, + 2175, 2175, 2175, 2175, 2175, 2175, 2175, 2176, 2176, 2176, - 2168, 2169, 2169, 2169, 2169, 2169, 2169, 2169, 2171, 2171, - 0, 2171, 2171, 2171, 2171, 2172, 2172, 0, 0, 0, - 2172, 2172, 2173, 2173, 0, 0, 2173, 0, 2173, 2174, - 0, 0, 0, 0, 0, 2174, 2175, 2175, 0, 0, - 0, 2175, 2175, 2176, 0, 0, 0, 0, 0, 2176, - 2177, 2177, 0, 2177, 2177, 2177, 2177, 2178, 2178, 0, - 2178, 2178, 2178, 2178, 2164, 2164, 2164, 2164, 2164, 2164, - 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, - 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, - 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, 2164, + 2176, 2176, 2176, 2176, 2177, 2177, 2177, 2177, 2177, 2177, + 2177, 2178, 2178, 2178, 2178, 2178, 2178, 2178, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2181, 2181, 0, 2181, 2181, + 2181, 2181, 2182, 2182, 0, 0, 0, 2182, 2182, 2183, + 2183, 0, 0, 2183, 0, 2183, 2184, 0, 0, 0, + 0, 0, 2184, 2185, 2185, 0, 0, 0, 2185, 2185, + 2186, 0, 0, 0, 0, 0, 2186, 2187, 2187, 0, + 2187, 2187, 2187, 2187, 2188, 2188, 0, 2188, 2188, 2188, + 2188, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, + 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, - 2164, 2164, 2164, 2164, 2164 + 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, + 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, 2174, + 2174, 2174 } ; static yy_state_type yy_last_accepting_state; @@ -2319,7 +2311,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 2321 "" +#line 2313 "" #define INITIAL 0 #define quotedstring 1 @@ -2363,7 +2355,7 @@ FILE *yyget_out (void ); void yyset_out (FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng (void ); char *yyget_text (void ); @@ -2420,7 +2412,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -2444,7 +2436,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -2542,7 +2534,7 @@ YY_DECL { #line 207 "./util/configlexer.lex" -#line 2544 "" +#line 2536 "" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -2575,13 +2567,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 >= 2165 ) + if ( yy_current_state >= 2175 ) yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 4265 ); + while ( yy_base[yy_current_state] != 4282 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -3156,500 +3148,505 @@ YY_RULE_SETUP case 110: YY_RULE_SETUP #line 320 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } +{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } YY_BREAK case 111: YY_RULE_SETUP #line 321 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } +{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 112: YY_RULE_SETUP #line 322 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 113: YY_RULE_SETUP #line 323 "./util/configlexer.lex" -{ YDVAR(1, VAR_BOGUS_TTL) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 114: YY_RULE_SETUP #line 324 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } +{ YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 115: YY_RULE_SETUP #line 325 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } +{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 116: YY_RULE_SETUP #line 326 "./util/configlexer.lex" -{ YDVAR(1, VAR_IGNORE_CD_FLAG) } +{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 117: YY_RULE_SETUP #line 327 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED) } +{ YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 118: YY_RULE_SETUP #line 328 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_DSA) } +{ YDVAR(1, VAR_SERVE_EXPIRED) } YY_BREAK case 119: YY_RULE_SETUP #line 329 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_SHA1) } +{ YDVAR(1, VAR_FAKE_DSA) } YY_BREAK case 120: YY_RULE_SETUP #line 330 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_FAKE_SHA1) } YY_BREAK case 121: YY_RULE_SETUP #line 331 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 122: YY_RULE_SETUP #line 332 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 123: YY_RULE_SETUP #line 333 "./util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 124: YY_RULE_SETUP #line 334 "./util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 125: YY_RULE_SETUP -#line 336 "./util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 335 "./util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 126: YY_RULE_SETUP #line 337 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 127: YY_RULE_SETUP #line 338 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 128: YY_RULE_SETUP #line 339 "./util/configlexer.lex" -{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 129: YY_RULE_SETUP #line 340 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } YY_BREAK case 130: YY_RULE_SETUP #line 341 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_IDENTITY) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 131: YY_RULE_SETUP #line 342 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_LOG_IDENTITY) } YY_BREAK case 132: YY_RULE_SETUP #line 343 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 133: YY_RULE_SETUP #line 344 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_REPLIES) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 134: YY_RULE_SETUP #line 345 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_REPLIES) } YY_BREAK case 135: YY_RULE_SETUP #line 346 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 136: YY_RULE_SETUP #line 347 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 137: YY_RULE_SETUP #line 348 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 138: YY_RULE_SETUP #line 349 "./util/configlexer.lex" -{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } +{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 139: YY_RULE_SETUP #line 350 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } YY_BREAK case 140: YY_RULE_SETUP #line 351 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 141: YY_RULE_SETUP #line 352 "./util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 142: YY_RULE_SETUP #line 353 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_ENABLE) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 143: YY_RULE_SETUP #line 354 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_KEY) } +{ YDVAR(1, VAR_SHM_ENABLE) } YY_BREAK case 144: YY_RULE_SETUP #line 355 "./util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_SHM_KEY) } YY_BREAK case 145: YY_RULE_SETUP #line 356 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 146: YY_RULE_SETUP #line 357 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 147: YY_RULE_SETUP #line 358 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 148: YY_RULE_SETUP #line 359 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_USE_CERT) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 149: YY_RULE_SETUP #line 360 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 150: YY_RULE_SETUP #line 361 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 151: YY_RULE_SETUP #line 362 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 152: YY_RULE_SETUP #line 363 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 153: YY_RULE_SETUP #line 364 "./util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 154: YY_RULE_SETUP #line 365 "./util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 155: YY_RULE_SETUP #line 366 "./util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 156: YY_RULE_SETUP #line 367 "./util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 157: YY_RULE_SETUP #line 368 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 158: YY_RULE_SETUP #line 369 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 159: YY_RULE_SETUP #line 370 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_PREFIX) } +{ YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 160: YY_RULE_SETUP #line 371 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_SYNTHALL) } +{ YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 161: YY_RULE_SETUP #line 372 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEFINE_TAG) } +{ YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 162: YY_RULE_SETUP #line 373 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } +{ YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 163: YY_RULE_SETUP #line 374 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } +{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 164: YY_RULE_SETUP #line 375 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } +{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 165: YY_RULE_SETUP #line 376 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 166: YY_RULE_SETUP #line 377 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 167: YY_RULE_SETUP #line 378 "./util/configlexer.lex" -{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } +{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 168: YY_RULE_SETUP #line 379 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSTAP) } +{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 169: YY_RULE_SETUP #line 380 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_ENABLE) } +{ YDVAR(0, VAR_DNSTAP) } YY_BREAK case 170: YY_RULE_SETUP #line 381 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } +{ YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 171: YY_RULE_SETUP #line 382 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 172: YY_RULE_SETUP #line 383 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 173: YY_RULE_SETUP #line 384 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 174: YY_RULE_SETUP #line 385 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_VERSION) } +{ YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 175: YY_RULE_SETUP #line 386 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } +{ YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 176: YY_RULE_SETUP -#line 388 "./util/configlexer.lex" +#line 387 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 177: YY_RULE_SETUP -#line 390 "./util/configlexer.lex" +#line 389 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 178: YY_RULE_SETUP -#line 392 "./util/configlexer.lex" +#line 391 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 179: YY_RULE_SETUP -#line 394 "./util/configlexer.lex" +#line 393 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 180: YY_RULE_SETUP -#line 396 "./util/configlexer.lex" +#line 395 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 181: YY_RULE_SETUP -#line 398 "./util/configlexer.lex" -{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } +#line 397 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 182: YY_RULE_SETUP #line 399 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT) } +{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 183: YY_RULE_SETUP #line 400 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT) } +{ YDVAR(1, VAR_IP_RATELIMIT) } YY_BREAK case 184: YY_RULE_SETUP #line 401 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 185: YY_RULE_SETUP #line 402 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } YY_BREAK case 186: YY_RULE_SETUP #line 403 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 187: YY_RULE_SETUP #line 404 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } YY_BREAK case 188: YY_RULE_SETUP #line 405 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } +{ YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 189: YY_RULE_SETUP #line 406 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 190: YY_RULE_SETUP #line 407 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 191: YY_RULE_SETUP #line 408 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_FACTOR) } +{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } YY_BREAK case 192: YY_RULE_SETUP #line 409 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_TAG) } +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } YY_BREAK case 193: YY_RULE_SETUP #line 410 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP) } +{ YDVAR(2, VAR_RESPONSE_IP_TAG) } YY_BREAK case 194: YY_RULE_SETUP #line 411 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_DATA) } +{ YDVAR(2, VAR_RESPONSE_IP) } YY_BREAK case 195: YY_RULE_SETUP #line 412 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSCRYPT) } +{ YDVAR(2, VAR_RESPONSE_IP_DATA) } YY_BREAK case 196: YY_RULE_SETUP #line 413 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } +{ YDVAR(0, VAR_DNSCRYPT) } YY_BREAK case 197: YY_RULE_SETUP #line 414 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PORT) } +{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } YY_BREAK case 198: YY_RULE_SETUP #line 415 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } +{ YDVAR(1, VAR_DNSCRYPT_PORT) } YY_BREAK case 199: YY_RULE_SETUP #line 416 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } YY_BREAK case 200: YY_RULE_SETUP #line 417 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } +{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } YY_BREAK case 201: -/* rule 201 can match eol */ YY_RULE_SETUP #line 418 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } + YY_BREAK +case 202: +/* rule 202 can match eol */ +YY_RULE_SETUP +#line 419 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 202: +case 203: YY_RULE_SETUP -#line 421 "./util/configlexer.lex" +#line 422 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 422 "./util/configlexer.lex" +#line 423 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 203: -YY_RULE_SETUP -#line 427 "./util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 204: -/* rule 204 can match eol */ YY_RULE_SETUP #line 428 "./util/configlexer.lex" +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } + YY_BREAK +case 205: +/* rule 205 can match eol */ +YY_RULE_SETUP +#line 429 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 205: +case 206: YY_RULE_SETUP -#line 430 "./util/configlexer.lex" +#line 431 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3662,34 +3659,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 206: +case 207: YY_RULE_SETUP -#line 442 "./util/configlexer.lex" +#line 443 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 443 "./util/configlexer.lex" +#line 444 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 207: -YY_RULE_SETUP -#line 448 "./util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 208: -/* rule 208 can match eol */ YY_RULE_SETUP #line 449 "./util/configlexer.lex" +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } + YY_BREAK +case 209: +/* rule 209 can match eol */ +YY_RULE_SETUP +#line 450 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 209: +case 210: YY_RULE_SETUP -#line 451 "./util/configlexer.lex" +#line 452 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3702,38 +3699,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 210: +case 211: YY_RULE_SETUP -#line 463 "./util/configlexer.lex" +#line 464 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 465 "./util/configlexer.lex" +#line 466 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 211: -YY_RULE_SETUP -#line 469 "./util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 212: -/* rule 212 can match eol */ YY_RULE_SETUP #line 470 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 213: +/* rule 213 can match eol */ YY_RULE_SETUP #line 471 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 214: YY_RULE_SETUP #line 472 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 215: +YY_RULE_SETUP +#line 473 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -3741,27 +3738,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 477 "./util/configlexer.lex" +#line 478 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 215: -YY_RULE_SETUP -#line 481 "./util/configlexer.lex" -{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } - YY_BREAK case 216: -/* rule 216 can match eol */ YY_RULE_SETUP #line 482 "./util/configlexer.lex" +{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } + YY_BREAK +case 217: +/* rule 217 can match eol */ +YY_RULE_SETUP +#line 483 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 217: +case 218: YY_RULE_SETUP -#line 484 "./util/configlexer.lex" +#line 485 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -3771,7 +3768,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 490 "./util/configlexer.lex" +#line 491 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -3783,33 +3780,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 218: +case 219: YY_RULE_SETUP -#line 501 "./util/configlexer.lex" +#line 502 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 219: +case 220: YY_RULE_SETUP -#line 505 "./util/configlexer.lex" +#line 506 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 220: +case 221: YY_RULE_SETUP -#line 509 "./util/configlexer.lex" +#line 510 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 221: +case 222: YY_RULE_SETUP -#line 513 "./util/configlexer.lex" +#line 514 "./util/configlexer.lex" ECHO; YY_BREAK -#line 3811 "" +#line 3808 "" case YY_END_OF_BUFFER: { @@ -4008,7 +4005,7 @@ static int yy_get_next_buffer (void) if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -4021,7 +4018,7 @@ static int yy_get_next_buffer (void) } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -4063,9 +4060,9 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if ((int) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + 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,new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); @@ -4100,10 +4097,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 >= 2165 ) + if ( yy_current_state >= 2175 ) yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; } return yy_current_state; @@ -4128,11 +4125,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 >= 2165 ) + if ( yy_current_state >= 2175 ) yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 2164); + yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_is_jam = (yy_current_state == 2174); return yy_is_jam ? 0 : yy_current_state; } @@ -4165,7 +4162,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -4189,7 +4186,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( yywrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -4437,7 +4434,7 @@ void yypop_buffer_state (void) */ static void yyensure_buffer_stack (void) { - yy_size_t num_to_alloc; + int num_to_alloc; if (!(yy_buffer_stack)) { @@ -4451,9 +4448,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; @@ -4482,7 +4479,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 ) { @@ -4492,7 +4489,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) @@ -4501,7 +4498,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; @@ -4524,7 +4521,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) { - return yy_scan_bytes(yystr,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 @@ -4534,7 +4531,7 @@ 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, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; @@ -4542,7 +4539,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len yy_size_t i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; + n = (yy_size_t) _yybytes_len + 2; buf = (char *) yyalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -4568,7 +4565,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (yyconst char* msg ) { (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); @@ -4581,7 +4578,7 @@ static void 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; \ @@ -4598,7 +4595,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -4621,7 +4618,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -4677,10 +4674,10 @@ static int yy_init_globals (void) * This function is called from yylex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -4689,8 +4686,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -4748,7 +4745,7 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) @@ -4761,7 +4758,7 @@ void *yyrealloc (void * ptr, yy_size_t size ) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) @@ -4771,7 +4768,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 513 "./util/configlexer.lex" +#line 514 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index a6323f2c1..ecb9b4c56 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -317,6 +317,7 @@ trust-anchor-file{COLON} { YDVAR(1, VAR_TRUST_ANCHOR_FILE) } auto-trust-anchor-file{COLON} { YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } trusted-keys-file{COLON} { YDVAR(1, VAR_TRUSTED_KEYS_FILE) } trust-anchor{COLON} { YDVAR(1, VAR_TRUST_ANCHOR) } +trust-anchor-signaling{COLON} { YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } val-override-date{COLON} { YDVAR(1, VAR_VAL_OVERRIDE_DATE) } val-sig-skew-min{COLON} { YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } val-sig-skew-max{COLON} { YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } diff --git a/util/configparser.c b/util/configparser.c index 058725451..faba4768f 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -322,15 +322,16 @@ extern int yydebug; VAR_FAKE_SHA1 = 451, VAR_LOG_IDENTITY = 452, VAR_HIDE_TRUSTANCHOR = 453, - VAR_USE_SYSTEMD = 454, - VAR_SHM_ENABLE = 455, - VAR_SHM_KEY = 456, - VAR_DNSCRYPT = 457, - VAR_DNSCRYPT_ENABLE = 458, - VAR_DNSCRYPT_PORT = 459, - VAR_DNSCRYPT_PROVIDER = 460, - VAR_DNSCRYPT_SECRET_KEY = 461, - VAR_DNSCRYPT_PROVIDER_CERT = 462 + VAR_TRUST_ANCHOR_SIGNALING = 454, + VAR_USE_SYSTEMD = 455, + VAR_SHM_ENABLE = 456, + VAR_SHM_KEY = 457, + VAR_DNSCRYPT = 458, + VAR_DNSCRYPT_ENABLE = 459, + VAR_DNSCRYPT_PORT = 460, + VAR_DNSCRYPT_PROVIDER = 461, + VAR_DNSCRYPT_SECRET_KEY = 462, + VAR_DNSCRYPT_PROVIDER_CERT = 463 }; #endif /* Tokens. */ @@ -530,15 +531,16 @@ extern int yydebug; #define VAR_FAKE_SHA1 451 #define VAR_LOG_IDENTITY 452 #define VAR_HIDE_TRUSTANCHOR 453 -#define VAR_USE_SYSTEMD 454 -#define VAR_SHM_ENABLE 455 -#define VAR_SHM_KEY 456 -#define VAR_DNSCRYPT 457 -#define VAR_DNSCRYPT_ENABLE 458 -#define VAR_DNSCRYPT_PORT 459 -#define VAR_DNSCRYPT_PROVIDER 460 -#define VAR_DNSCRYPT_SECRET_KEY 461 -#define VAR_DNSCRYPT_PROVIDER_CERT 462 +#define VAR_TRUST_ANCHOR_SIGNALING 454 +#define VAR_USE_SYSTEMD 455 +#define VAR_SHM_ENABLE 456 +#define VAR_SHM_KEY 457 +#define VAR_DNSCRYPT 458 +#define VAR_DNSCRYPT_ENABLE 459 +#define VAR_DNSCRYPT_PORT 460 +#define VAR_DNSCRYPT_PROVIDER 461 +#define VAR_DNSCRYPT_SECRET_KEY 462 +#define VAR_DNSCRYPT_PROVIDER_CERT 463 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -549,7 +551,7 @@ union YYSTYPE char* str; -#line 553 "util/configparser.c" /* yacc.c:355 */ +#line 555 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -566,7 +568,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 570 "util/configparser.c" /* yacc.c:358 */ +#line 572 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -808,21 +810,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 421 +#define YYLAST 422 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 208 +#define YYNTOKENS 209 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 223 +#define YYNNTS 224 /* YYNRULES -- Number of rules. */ -#define YYNRULES 427 +#define YYNRULES 429 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 643 +#define YYNSTATES 646 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 462 +#define YYMAXUTOK 463 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -877,7 +879,7 @@ static const yytype_uint8 yytranslate[] = 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 207 + 205, 206, 207, 208 }; #if YYDEBUG @@ -900,33 +902,33 @@ static const yytype_uint16 yyrline[] = 213, 214, 214, 215, 216, 216, 217, 217, 218, 219, 220, 220, 221, 221, 222, 222, 223, 223, 223, 224, 224, 225, 225, 226, 226, 227, 227, 228, 228, 228, - 229, 229, 229, 230, 230, 230, 231, 233, 245, 246, - 247, 247, 247, 247, 247, 248, 250, 262, 263, 264, - 264, 264, 264, 265, 267, 281, 282, 283, 283, 283, - 283, 284, 284, 284, 286, 295, 304, 315, 324, 333, - 342, 353, 362, 374, 389, 400, 417, 434, 447, 462, - 471, 480, 489, 498, 507, 516, 525, 534, 543, 552, - 561, 570, 579, 588, 597, 604, 611, 620, 629, 638, - 652, 661, 670, 679, 686, 693, 719, 727, 734, 741, - 748, 755, 763, 771, 779, 786, 793, 802, 811, 820, - 827, 834, 842, 850, 860, 870, 880, 893, 904, 912, - 925, 934, 943, 952, 962, 972, 980, 993, 1002, 1010, - 1019, 1027, 1040, 1049, 1056, 1066, 1076, 1086, 1096, 1106, - 1116, 1126, 1136, 1143, 1150, 1157, 1166, 1175, 1184, 1191, - 1201, 1218, 1225, 1243, 1256, 1269, 1278, 1287, 1296, 1305, - 1315, 1325, 1334, 1343, 1356, 1369, 1378, 1385, 1394, 1403, - 1412, 1421, 1429, 1442, 1450, 1478, 1485, 1500, 1510, 1520, - 1527, 1534, 1543, 1557, 1576, 1595, 1607, 1619, 1631, 1642, - 1661, 1671, 1680, 1688, 1696, 1709, 1722, 1735, 1748, 1757, - 1766, 1776, 1786, 1796, 1803, 1810, 1819, 1829, 1839, 1849, - 1856, 1863, 1872, 1882, 1892, 1921, 1931, 1939, 1948, 1963, - 1972, 1977, 1978, 1979, 1979, 1979, 1980, 1980, 1980, 1981, - 1981, 1983, 1993, 2002, 2009, 2019, 2026, 2033, 2040, 2047, - 2052, 2053, 2054, 2054, 2055, 2055, 2056, 2056, 2057, 2058, - 2059, 2060, 2061, 2062, 2064, 2072, 2079, 2087, 2095, 2102, - 2109, 2118, 2127, 2136, 2145, 2154, 2163, 2168, 2169, 2170, - 2172, 2178, 2188, 2195, 2204, 2212, 2218, 2219, 2221, 2221, - 2221, 2222, 2222, 2224, 2233, 2243, 2250, 2257 + 229, 229, 229, 230, 230, 230, 231, 231, 233, 245, + 246, 247, 247, 247, 247, 247, 248, 250, 262, 263, + 264, 264, 264, 264, 265, 267, 281, 282, 283, 283, + 283, 283, 284, 284, 284, 286, 295, 304, 315, 324, + 333, 342, 353, 362, 374, 389, 400, 417, 434, 447, + 462, 471, 480, 489, 498, 507, 516, 525, 534, 543, + 552, 561, 570, 579, 588, 597, 604, 611, 620, 629, + 638, 652, 661, 670, 679, 686, 693, 719, 727, 734, + 741, 748, 755, 763, 771, 779, 786, 797, 804, 813, + 822, 831, 838, 845, 853, 861, 871, 881, 891, 904, + 915, 923, 936, 945, 954, 963, 973, 983, 991, 1004, + 1013, 1021, 1030, 1038, 1051, 1060, 1067, 1077, 1087, 1097, + 1107, 1117, 1127, 1137, 1147, 1154, 1161, 1168, 1177, 1186, + 1195, 1202, 1212, 1229, 1236, 1254, 1267, 1280, 1289, 1298, + 1307, 1316, 1326, 1336, 1345, 1354, 1367, 1380, 1389, 1396, + 1405, 1414, 1423, 1432, 1440, 1453, 1461, 1489, 1496, 1511, + 1521, 1531, 1538, 1545, 1554, 1568, 1587, 1606, 1618, 1630, + 1642, 1653, 1672, 1682, 1691, 1699, 1707, 1720, 1733, 1746, + 1759, 1768, 1777, 1787, 1797, 1807, 1814, 1821, 1830, 1840, + 1850, 1860, 1867, 1874, 1883, 1893, 1903, 1932, 1942, 1950, + 1959, 1974, 1983, 1988, 1989, 1990, 1990, 1990, 1991, 1991, + 1991, 1992, 1992, 1994, 2004, 2013, 2020, 2030, 2037, 2044, + 2051, 2058, 2063, 2064, 2065, 2065, 2066, 2066, 2067, 2067, + 2068, 2069, 2070, 2071, 2072, 2073, 2075, 2083, 2090, 2098, + 2106, 2113, 2120, 2129, 2138, 2147, 2156, 2165, 2174, 2179, + 2180, 2181, 2183, 2189, 2199, 2206, 2215, 2223, 2229, 2230, + 2232, 2232, 2232, 2233, 2233, 2235, 2244, 2254, 2261, 2268 }; #endif @@ -1005,8 +1007,8 @@ static const char *const yytname[] = "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_LOG_IDENTITY", - "VAR_HIDE_TRUSTANCHOR", "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", - "VAR_SHM_KEY", "VAR_DNSCRYPT", "VAR_DNSCRYPT_ENABLE", + "VAR_HIDE_TRUSTANCHOR", "VAR_TRUST_ANCHOR_SIGNALING", "VAR_USE_SYSTEMD", + "VAR_SHM_ENABLE", "VAR_SHM_KEY", "VAR_DNSCRYPT", "VAR_DNSCRYPT_ENABLE", "VAR_DNSCRYPT_PORT", "VAR_DNSCRYPT_PROVIDER", "VAR_DNSCRYPT_SECRET_KEY", "VAR_DNSCRYPT_PROVIDER_CERT", "$accept", "toplevelvars", "toplevelvar", "serverstart", "contents_server", "content_server", "stubstart", @@ -1031,36 +1033,36 @@ static const char *const yytname[] = "server_pidfile", "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor", "server_auto_trust_anchor_file", "server_trust_anchor_file", "server_trusted_keys_file", - "server_trust_anchor", "server_domain_insecure", "server_hide_identity", - "server_hide_version", "server_hide_trustanchor", "server_identity", - "server_version", "server_so_rcvbuf", "server_so_sndbuf", - "server_so_reuseport", "server_ip_transparent", "server_ip_freebind", - "server_edns_buffer_size", "server_msg_buffer_size", - "server_msg_cache_size", "server_msg_cache_slabs", - "server_num_queries_per_thread", "server_jostle_timeout", - "server_delay_close", "server_unblock_lan_zones", - "server_insecure_lan_zones", "server_rrset_cache_size", - "server_rrset_cache_slabs", "server_infra_host_ttl", - "server_infra_lame_ttl", "server_infra_cache_numhosts", - "server_infra_cache_lame_size", "server_infra_cache_slabs", - "server_infra_cache_min_rtt", "server_target_fetch_policy", - "server_harden_short_bufsize", "server_harden_large_queries", - "server_harden_glue", "server_harden_dnssec_stripped", - "server_harden_below_nxdomain", "server_harden_referral_path", - "server_harden_algo_downgrade", "server_use_caps_for_id", - "server_caps_whitelist", "server_private_address", - "server_private_domain", "server_prefetch", "server_prefetch_key", - "server_unwanted_reply_threshold", "server_do_not_query_address", - "server_do_not_query_localhost", "server_access_control", - "server_module_conf", "server_val_override_date", - "server_val_sig_skew_min", "server_val_sig_skew_max", - "server_cache_max_ttl", "server_cache_max_negative_ttl", - "server_cache_min_ttl", "server_bogus_ttl", - "server_val_clean_additional", "server_val_permissive_mode", - "server_ignore_cd_flag", "server_serve_expired", "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_trust_anchor", "server_trust_anchor_signaling", + "server_domain_insecure", "server_hide_identity", "server_hide_version", + "server_hide_trustanchor", "server_identity", "server_version", + "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport", + "server_ip_transparent", "server_ip_freebind", "server_edns_buffer_size", + "server_msg_buffer_size", "server_msg_cache_size", + "server_msg_cache_slabs", "server_num_queries_per_thread", + "server_jostle_timeout", "server_delay_close", + "server_unblock_lan_zones", "server_insecure_lan_zones", + "server_rrset_cache_size", "server_rrset_cache_slabs", + "server_infra_host_ttl", "server_infra_lame_ttl", + "server_infra_cache_numhosts", "server_infra_cache_lame_size", + "server_infra_cache_slabs", "server_infra_cache_min_rtt", + "server_target_fetch_policy", "server_harden_short_bufsize", + "server_harden_large_queries", "server_harden_glue", + "server_harden_dnssec_stripped", "server_harden_below_nxdomain", + "server_harden_referral_path", "server_harden_algo_downgrade", + "server_use_caps_for_id", "server_caps_whitelist", + "server_private_address", "server_private_domain", "server_prefetch", + "server_prefetch_key", "server_unwanted_reply_threshold", + "server_do_not_query_address", "server_do_not_query_localhost", + "server_access_control", "server_module_conf", + "server_val_override_date", "server_val_sig_skew_min", + "server_val_sig_skew_max", "server_cache_max_ttl", + "server_cache_max_negative_ttl", "server_cache_min_ttl", + "server_bogus_ttl", "server_val_clean_additional", + "server_val_permissive_mode", "server_ignore_cd_flag", + "server_serve_expired", "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", "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone", "server_local_data", "server_local_data_ptr", "server_minimal_responses", @@ -1126,14 +1128,14 @@ static const yytype_uint16 yytoknum[] = 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 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 + 455, 456, 457, 458, 459, 460, 461, 462, 463 }; # endif -#define YYPACT_NINF -162 +#define YYPACT_NINF -199 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-162))) + (!!((Yystate) == (-199))) #define YYTABLE_NINF -1 @@ -1144,71 +1146,71 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -162, 0, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - 191, -38, -34, -39, -64, -130, -105, -161, -3, -2, - -1, 2, 3, 26, 29, 30, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 53, 54, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 82, 83, 84, - 86, 89, 91, 92, 93, 94, 95, 96, 98, 99, - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 136, 137, 138, 139, 140, 141, 142, - 143, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 221, 222, 223, 224, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, 228, 229, 230, 272, 273, 274, -162, - -162, -162, -162, -162, -162, -162, 275, 276, 277, 278, - 279, -162, -162, -162, -162, -162, -162, 280, 284, 288, - 289, 313, 314, 315, -162, -162, -162, -162, -162, -162, - -162, -162, 316, 326, 327, 328, 329, 330, 331, 332, - -162, -162, -162, -162, -162, -162, -162, -162, -162, 333, - 334, 335, 336, 337, 338, 372, 374, 383, 384, 385, - 386, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, 387, -162, -162, 388, 389, 390, - 391, 392, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, 393, 394, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, 395, 396, - 397, -162, -162, -162, -162, -162, -162, -162, -162, -162, - 398, 399, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, 400, 401, 402, 403, - 404, 405, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, 406, -162, -162, 407, 408, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, 409, 410, 411, -162, -162, -162, -162, - -162, -162, -162 + -199, 0, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + 96, -39, -35, 152, -65, -131, -106, -198, 2, 25, + 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 55, 56, 57, 58, + 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 82, 83, 85, 88, 90, 91, 92, 93, + 94, 95, 126, 127, 128, 129, 133, 134, 177, 178, + 179, 180, 183, 184, 185, 189, 194, 220, 221, 231, + 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, + 242, 277, 279, 289, 290, 291, 292, 293, 294, 295, + 296, 297, 298, 299, 300, 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, 336, 337, 338, + 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, + 349, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, 350, 351, 352, 353, 354, + 355, -199, -199, -199, -199, -199, -199, -199, 356, 357, + 358, 359, 360, -199, -199, -199, -199, -199, -199, 361, + 362, 363, 364, 365, 366, 367, -199, -199, -199, -199, + -199, -199, -199, -199, 368, 369, 370, 371, 372, 373, + 374, 375, -199, -199, -199, -199, -199, -199, -199, -199, + -199, 376, 377, 378, 379, 380, 381, 382, 383, 384, + 385, 386, 387, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, 388, -199, -199, 389, + 390, 391, 392, 393, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, 394, 395, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + 396, 397, 398, -199, -199, -199, -199, -199, -199, -199, + -199, -199, 399, 400, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, 401, 402, + 403, 404, 405, 406, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, 407, -199, -199, 408, 409, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, 410, 411, 412, -199, + -199, -199, -199, -199, -199, -199 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1216,8 +1218,8 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 12, 167, 176, 360, 406, 379, 184, - 415, 3, 14, 169, 178, 186, 362, 381, 408, 417, + 2, 0, 1, 12, 168, 177, 362, 408, 381, 185, + 417, 3, 14, 170, 179, 187, 364, 383, 410, 419, 4, 5, 6, 10, 8, 9, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1234,109 +1236,109 @@ 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, - 13, 15, 16, 75, 78, 87, 163, 164, 17, 137, - 138, 139, 140, 141, 26, 66, 18, 79, 80, 37, - 59, 74, 19, 20, 22, 23, 21, 24, 25, 110, - 111, 112, 113, 114, 159, 76, 65, 91, 108, 109, - 27, 28, 29, 30, 31, 67, 81, 82, 97, 53, - 63, 54, 92, 47, 48, 166, 49, 50, 101, 105, - 118, 126, 146, 102, 60, 32, 33, 34, 89, 119, - 120, 121, 35, 36, 38, 39, 41, 42, 40, 124, - 43, 44, 45, 51, 70, 106, 84, 125, 77, 142, - 85, 86, 103, 104, 90, 46, 68, 71, 52, 55, - 93, 94, 69, 143, 95, 56, 57, 58, 107, 156, - 157, 165, 96, 64, 98, 99, 100, 144, 61, 62, - 83, 72, 73, 88, 115, 116, 117, 122, 123, 147, - 148, 150, 152, 153, 151, 154, 160, 127, 128, 131, - 132, 129, 130, 133, 134, 136, 135, 145, 155, 149, - 158, 161, 162, 0, 0, 0, 0, 0, 0, 168, - 170, 171, 172, 174, 175, 173, 0, 0, 0, 0, - 0, 177, 179, 180, 181, 182, 183, 0, 0, 0, - 0, 0, 0, 0, 185, 187, 188, 191, 192, 189, - 193, 190, 0, 0, 0, 0, 0, 0, 0, 0, - 361, 363, 365, 364, 370, 366, 367, 368, 369, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 380, 382, 383, 384, 385, 386, 387, 388, 389, - 390, 391, 392, 393, 0, 407, 409, 0, 0, 0, - 0, 0, 416, 418, 419, 420, 422, 421, 195, 194, - 201, 209, 207, 215, 216, 219, 217, 218, 220, 221, - 233, 234, 235, 236, 237, 258, 259, 260, 265, 266, - 212, 267, 268, 271, 269, 270, 273, 274, 275, 288, - 246, 247, 249, 250, 276, 291, 242, 244, 292, 298, - 299, 300, 213, 257, 311, 312, 243, 306, 229, 208, - 238, 289, 295, 277, 0, 0, 315, 214, 196, 228, - 281, 197, 210, 211, 239, 240, 313, 279, 283, 284, - 198, 316, 261, 287, 230, 245, 293, 294, 297, 305, - 241, 309, 307, 308, 251, 256, 285, 286, 252, 253, - 278, 301, 231, 232, 222, 223, 224, 225, 226, 317, - 318, 319, 262, 263, 264, 272, 320, 321, 0, 0, - 0, 280, 254, 411, 330, 334, 332, 331, 335, 333, - 0, 0, 338, 339, 202, 203, 204, 205, 206, 282, - 296, 310, 340, 341, 255, 322, 0, 0, 0, 0, - 0, 0, 302, 303, 304, 412, 248, 227, 199, 200, - 342, 343, 344, 347, 346, 345, 348, 349, 350, 351, - 352, 353, 0, 357, 358, 0, 0, 359, 371, 373, - 372, 375, 376, 377, 378, 374, 394, 395, 396, 397, - 398, 399, 400, 401, 402, 403, 404, 405, 410, 423, - 424, 425, 427, 426, 290, 314, 329, 413, 414, 336, - 337, 323, 324, 0, 0, 0, 328, 354, 355, 356, - 327, 325, 326 + 0, 13, 15, 16, 75, 78, 87, 163, 164, 17, + 137, 138, 139, 140, 141, 26, 66, 18, 79, 80, + 37, 59, 74, 19, 20, 22, 23, 21, 24, 25, + 110, 111, 112, 113, 114, 159, 76, 65, 91, 108, + 109, 27, 28, 29, 30, 31, 67, 81, 82, 97, + 53, 63, 54, 167, 92, 47, 48, 166, 49, 50, + 101, 105, 118, 126, 146, 102, 60, 32, 33, 34, + 89, 119, 120, 121, 35, 36, 38, 39, 41, 42, + 40, 124, 43, 44, 45, 51, 70, 106, 84, 125, + 77, 142, 85, 86, 103, 104, 90, 46, 68, 71, + 52, 55, 93, 94, 69, 143, 95, 56, 57, 58, + 107, 156, 157, 165, 96, 64, 98, 99, 100, 144, + 61, 62, 83, 72, 73, 88, 115, 116, 117, 122, + 123, 147, 148, 150, 152, 153, 151, 154, 160, 127, + 128, 131, 132, 129, 130, 133, 134, 136, 135, 145, + 155, 149, 158, 161, 162, 0, 0, 0, 0, 0, + 0, 169, 171, 172, 173, 175, 176, 174, 0, 0, + 0, 0, 0, 178, 180, 181, 182, 183, 184, 0, + 0, 0, 0, 0, 0, 0, 186, 188, 189, 192, + 193, 190, 194, 191, 0, 0, 0, 0, 0, 0, + 0, 0, 363, 365, 367, 366, 372, 368, 369, 370, + 371, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 382, 384, 385, 386, 387, 388, 389, + 390, 391, 392, 393, 394, 395, 0, 409, 411, 0, + 0, 0, 0, 0, 418, 420, 421, 422, 424, 423, + 196, 195, 202, 210, 208, 216, 217, 220, 218, 219, + 221, 222, 234, 235, 236, 237, 238, 260, 261, 262, + 267, 268, 213, 269, 270, 273, 271, 272, 275, 276, + 277, 290, 248, 249, 251, 252, 278, 293, 243, 245, + 294, 300, 301, 302, 214, 259, 313, 314, 244, 308, + 230, 209, 239, 291, 297, 279, 0, 0, 317, 215, + 197, 229, 283, 198, 211, 212, 240, 241, 315, 281, + 285, 286, 199, 318, 263, 289, 231, 247, 295, 296, + 299, 307, 242, 311, 309, 310, 253, 258, 287, 288, + 254, 255, 280, 303, 232, 233, 223, 224, 225, 226, + 227, 319, 320, 321, 264, 265, 266, 274, 322, 323, + 0, 0, 0, 282, 256, 413, 332, 336, 334, 333, + 337, 335, 0, 0, 340, 341, 203, 204, 205, 206, + 207, 284, 298, 312, 342, 343, 257, 324, 0, 0, + 0, 0, 0, 0, 304, 305, 306, 414, 250, 246, + 228, 200, 201, 344, 345, 346, 349, 348, 347, 350, + 351, 352, 353, 354, 355, 0, 359, 360, 0, 0, + 361, 373, 375, 374, 377, 378, 379, 380, 376, 396, + 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, + 407, 412, 425, 426, 427, 429, 428, 292, 316, 331, + 415, 416, 338, 339, 325, 326, 0, 0, 0, 330, + 356, 357, 358, 329, 327, 328 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162, -162, -162, -162, -162, -162, -162, -162, - -162, -162, -162 + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199, -199, -199, -199, -199, -199, -199, + -199, -199, -199, -199 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 11, 12, 20, 180, 13, 21, 339, 14, - 22, 351, 15, 23, 364, 181, 182, 183, 184, 185, - 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, - 226, 227, 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, 340, 341, 342, 343, 344, 345, 352, - 353, 354, 355, 356, 365, 366, 367, 368, 369, 370, - 371, 16, 24, 380, 381, 382, 383, 384, 385, 386, - 387, 388, 17, 25, 401, 402, 403, 404, 405, 406, - 407, 408, 409, 410, 411, 412, 413, 18, 26, 415, - 416, 329, 330, 331, 332, 19, 27, 422, 423, 424, - 425, 426, 427 + -1, 1, 11, 12, 20, 181, 13, 21, 341, 14, + 22, 353, 15, 23, 366, 182, 183, 184, 185, 186, + 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 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, 342, 343, 344, 345, 346, 347, + 354, 355, 356, 357, 358, 367, 368, 369, 370, 371, + 372, 373, 16, 24, 382, 383, 384, 385, 386, 387, + 388, 389, 390, 17, 25, 403, 404, 405, 406, 407, + 408, 409, 410, 411, 412, 413, 414, 415, 18, 26, + 417, 418, 331, 332, 333, 334, 19, 27, 424, 425, + 426, 427, 428, 429 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1344,105 +1346,105 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 357, 333, 414, 334, 335, 346, 428, 429, 430, - 0, 3, 431, 432, 347, 348, 389, 390, 391, 392, - 393, 394, 395, 396, 397, 398, 399, 400, 372, 373, - 374, 375, 376, 377, 378, 379, 433, 358, 359, 434, - 435, 4, 417, 418, 419, 420, 421, 5, 436, 437, - 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, - 448, 449, 360, 450, 451, 336, 452, 453, 454, 455, - 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, - 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, - 476, 6, 477, 478, 479, 337, 480, 338, 349, 481, - 350, 482, 483, 484, 485, 486, 487, 7, 488, 489, - 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, - 361, 362, 500, 501, 502, 503, 504, 505, 506, 507, - 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, - 518, 519, 520, 521, 522, 8, 523, 524, 525, 526, - 527, 528, 529, 530, 363, 531, 532, 533, 534, 535, - 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, - 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, - 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, - 566, 9, 567, 568, 569, 570, 571, 572, 573, 574, - 575, 0, 10, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 576, 577, 578, 579, 56, 57, 58, 580, 581, - 582, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 583, 584, 585, 586, 587, 588, 589, 590, - 591, 100, 101, 102, 592, 103, 104, 105, 593, 594, - 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 595, 596, 597, 598, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 599, 600, 601, 602, - 603, 604, 605, 606, 607, 608, 609, 610, 611, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 612, 171, 613, 172, 173, 174, 175, 176, - 177, 178, 179, 614, 615, 616, 617, 618, 619, 620, - 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, - 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, - 641, 642 + 2, 335, 416, 336, 337, 348, 419, 420, 421, 422, + 423, 3, 430, 349, 350, 391, 392, 393, 394, 395, + 396, 397, 398, 399, 400, 401, 402, 374, 375, 376, + 377, 378, 379, 380, 381, 431, 432, 433, 434, 435, + 436, 4, 437, 438, 439, 440, 441, 5, 442, 443, + 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, + 454, 455, 456, 457, 338, 458, 459, 460, 461, 462, + 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, + 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, + 483, 6, 484, 485, 339, 486, 340, 351, 487, 352, + 488, 489, 490, 491, 492, 493, 0, 7, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 494, 495, 496, 497, + 56, 57, 58, 498, 499, 8, 59, 60, 61, 62, + 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, + 93, 94, 95, 96, 97, 98, 99, 500, 501, 502, + 503, 9, 359, 504, 505, 506, 100, 101, 102, 507, + 103, 104, 105, 10, 508, 106, 107, 108, 109, 110, + 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 360, 361, + 509, 510, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 511, 512, 513, 514, 515, 516, 517, 518, 519, + 520, 521, 522, 362, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 523, 171, 524, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 525, + 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, + 536, 363, 364, 537, 538, 539, 540, 541, 542, 543, + 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, + 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, + 564, 565, 566, 567, 568, 365, 569, 570, 571, 572, + 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, + 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, + 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, + 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, + 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, + 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, + 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, + 643, 644, 645 }; static const yytype_int16 yycheck[] = { - 0, 40, 40, 108, 42, 43, 40, 10, 10, 10, - -1, 11, 10, 10, 48, 49, 146, 147, 148, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 92, 93, - 94, 95, 96, 97, 98, 99, 10, 76, 77, 10, - 10, 41, 203, 204, 205, 206, 207, 47, 10, 10, + 0, 40, 108, 42, 43, 40, 204, 205, 206, 207, + 208, 11, 10, 48, 49, 146, 147, 148, 149, 150, + 151, 152, 153, 154, 155, 156, 157, 92, 93, 94, + 95, 96, 97, 98, 99, 10, 10, 10, 10, 10, + 10, 41, 10, 10, 10, 10, 10, 47, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 101, 10, 10, 103, 10, 10, 10, 10, + 10, 10, 10, 10, 103, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 91, 10, 10, 10, 133, 10, 135, 132, 10, - 134, 10, 10, 10, 10, 10, 10, 107, 10, 10, + 10, 91, 10, 10, 133, 10, 135, 132, 10, 134, + 10, 10, 10, 10, 10, 10, -1, 107, 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, 10, 10, 10, 10, + 44, 45, 46, 10, 10, 145, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 10, 10, 10, + 10, 191, 40, 10, 10, 10, 100, 101, 102, 10, + 104, 105, 106, 203, 10, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 76, 77, + 10, 10, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 101, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 10, 192, 10, + 194, 195, 196, 197, 198, 199, 200, 201, 202, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 159, 160, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 159, 160, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 145, 10, 10, 10, 10, - 10, 10, 10, 10, 193, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 193, 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, 191, 10, 10, 10, 10, 10, 10, 10, 10, - 10, -1, 202, 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, 10, 10, 10, 10, 44, 45, 46, 10, 10, - 10, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 100, 101, 102, 10, 104, 105, 106, 10, 10, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 10, 10, 10, 10, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 158, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 10, 192, 10, 194, 195, 196, 197, 198, - 199, 200, 201, 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, 209, 0, 11, 41, 47, 91, 107, 145, 191, - 202, 210, 211, 214, 217, 220, 389, 400, 415, 423, - 212, 215, 218, 221, 390, 401, 416, 424, 12, 13, + 0, 210, 0, 11, 41, 47, 91, 107, 145, 191, + 203, 211, 212, 215, 218, 221, 391, 402, 417, 425, + 213, 216, 219, 222, 392, 403, 418, 426, 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, 44, 45, 46, 50, @@ -1458,7 +1460,7 @@ static const yytype_uint16 yystos[] = 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 192, 194, 195, 196, 197, 198, 199, 200, 201, - 213, 223, 224, 225, 226, 227, 228, 229, 230, 231, + 202, 214, 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, @@ -1472,17 +1474,17 @@ static const yytype_uint16 yystos[] = 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, 419, - 420, 421, 422, 40, 42, 43, 103, 133, 135, 216, - 371, 372, 373, 374, 375, 376, 40, 48, 49, 132, - 134, 219, 377, 378, 379, 380, 381, 40, 76, 77, - 101, 159, 160, 193, 222, 382, 383, 384, 385, 386, - 387, 388, 92, 93, 94, 95, 96, 97, 98, 99, - 391, 392, 393, 394, 395, 396, 397, 398, 399, 146, - 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, - 157, 402, 403, 404, 405, 406, 407, 408, 409, 410, - 411, 412, 413, 414, 108, 417, 418, 203, 204, 205, - 206, 207, 425, 426, 427, 428, 429, 430, 10, 10, + 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, + 372, 421, 422, 423, 424, 40, 42, 43, 103, 133, + 135, 217, 373, 374, 375, 376, 377, 378, 40, 48, + 49, 132, 134, 220, 379, 380, 381, 382, 383, 40, + 76, 77, 101, 159, 160, 193, 223, 384, 385, 386, + 387, 388, 389, 390, 92, 93, 94, 95, 96, 97, + 98, 99, 393, 394, 395, 396, 397, 398, 399, 400, + 401, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 404, 405, 406, 407, 408, 409, 410, + 411, 412, 413, 414, 415, 416, 108, 419, 420, 204, + 205, 206, 207, 208, 427, 428, 429, 430, 431, 432, 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, @@ -1504,32 +1506,32 @@ static const yytype_uint16 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10 + 10, 10, 10, 10, 10, 10 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 208, 209, 209, 210, 210, 210, 210, 210, 210, - 210, 210, 211, 212, 212, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 213, 213, 214, 215, 215, - 216, 216, 216, 216, 216, 216, 217, 218, 218, 219, - 219, 219, 219, 219, 220, 221, 221, 222, 222, 222, - 222, 222, 222, 222, 223, 224, 225, 226, 227, 228, + 0, 209, 210, 210, 211, 211, 211, 211, 211, 211, + 211, 211, 212, 213, 213, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 215, 216, + 216, 217, 217, 217, 217, 217, 217, 218, 219, 219, + 220, 220, 220, 220, 220, 221, 222, 222, 223, 223, + 223, 223, 223, 223, 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, @@ -1546,13 +1548,13 @@ static const yytype_uint16 yyr1[] = 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, 390, 391, 391, 391, 391, 391, 391, 391, - 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, - 401, 401, 402, 402, 402, 402, 402, 402, 402, 402, - 402, 402, 402, 402, 403, 404, 405, 406, 407, 408, - 409, 410, 411, 412, 413, 414, 415, 416, 416, 417, - 418, 419, 420, 421, 422, 423, 424, 424, 425, 425, - 425, 425, 425, 426, 427, 428, 429, 430 + 389, 390, 391, 392, 392, 393, 393, 393, 393, 393, + 393, 393, 393, 394, 395, 396, 397, 398, 399, 400, + 401, 402, 403, 403, 404, 404, 404, 404, 404, 404, + 404, 404, 404, 404, 404, 404, 405, 406, 407, 408, + 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, + 418, 419, 420, 421, 422, 423, 424, 425, 426, 426, + 427, 427, 427, 427, 427, 428, 429, 430, 431, 432 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1574,10 +1576,10 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 1, 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, 2, 0, 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, @@ -1587,20 +1589,20 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 3, 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, 3, 3, 4, 4, 4, 3, 3, - 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, + 2, 2, 2, 2, 2, 2, 3, 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, 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, 2, 2, 1, 2, 0, 1, - 2, 2, 2, 3, 3, 1, 2, 0, 1, 1, - 1, 1, 1, 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, 2, 2, 1, 2, + 0, 1, 2, 2, 2, 3, 3, 1, 2, 0, + 1, 1, 1, 1, 1, 2, 2, 2, 2, 2 }; @@ -2281,10 +2283,10 @@ yyreduce: { OUTYY(("\nP(server:)\n")); } -#line 2285 "util/configparser.c" /* yacc.c:1646 */ +#line 2287 "util/configparser.c" /* yacc.c:1646 */ break; - case 167: + case 168: #line 234 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; @@ -2296,10 +2298,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2300 "util/configparser.c" /* yacc.c:1646 */ +#line 2302 "util/configparser.c" /* yacc.c:1646 */ break; - case 176: + case 177: #line 251 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; @@ -2311,10 +2313,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2315 "util/configparser.c" /* yacc.c:1646 */ +#line 2317 "util/configparser.c" /* yacc.c:1646 */ break; - case 184: + case 185: #line 268 "./util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; @@ -2328,10 +2330,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2332 "util/configparser.c" /* yacc.c:1646 */ +#line 2334 "util/configparser.c" /* yacc.c:1646 */ break; - case 194: + case 195: #line 287 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); @@ -2340,10 +2342,10 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2344 "util/configparser.c" /* yacc.c:1646 */ +#line 2346 "util/configparser.c" /* yacc.c:1646 */ break; - case 195: + case 196: #line 296 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); @@ -2352,10 +2354,10 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2356 "util/configparser.c" /* yacc.c:1646 */ +#line 2358 "util/configparser.c" /* yacc.c:1646 */ break; - case 196: + case 197: #line 305 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); @@ -2366,10 +2368,10 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2370 "util/configparser.c" /* yacc.c:1646 */ +#line 2372 "util/configparser.c" /* yacc.c:1646 */ break; - case 197: + case 198: #line 316 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); @@ -2378,10 +2380,10 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2382 "util/configparser.c" /* yacc.c:1646 */ +#line 2384 "util/configparser.c" /* yacc.c:1646 */ break; - case 198: + case 199: #line 325 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); @@ -2390,10 +2392,10 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2394 "util/configparser.c" /* yacc.c:1646 */ +#line 2396 "util/configparser.c" /* yacc.c:1646 */ break; - case 199: + case 200: #line 334 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); @@ -2402,10 +2404,10 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2406 "util/configparser.c" /* yacc.c:1646 */ +#line 2408 "util/configparser.c" /* yacc.c:1646 */ break; - case 200: + case 201: #line 343 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); @@ -2416,10 +2418,10 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2420 "util/configparser.c" /* yacc.c:1646 */ +#line 2422 "util/configparser.c" /* yacc.c:1646 */ break; - case 201: + case 202: #line 354 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); @@ -2428,10 +2430,10 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2432 "util/configparser.c" /* yacc.c:1646 */ +#line 2434 "util/configparser.c" /* yacc.c:1646 */ break; - case 202: + case 203: #line 363 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2442,10 +2444,10 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2446 "util/configparser.c" /* yacc.c:1646 */ +#line 2448 "util/configparser.c" /* yacc.c:1646 */ break; - case 203: + case 204: #line 375 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2460,10 +2462,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2464 "util/configparser.c" /* yacc.c:1646 */ +#line 2466 "util/configparser.c" /* yacc.c:1646 */ break; - case 204: + case 205: #line 390 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2474,10 +2476,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2478 "util/configparser.c" /* yacc.c:1646 */ +#line 2480 "util/configparser.c" /* yacc.c:1646 */ break; - case 205: + case 206: #line 401 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2494,10 +2496,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2498 "util/configparser.c" /* yacc.c:1646 */ +#line 2500 "util/configparser.c" /* yacc.c:1646 */ break; - case 206: + case 207: #line 418 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2514,10 +2516,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2518 "util/configparser.c" /* yacc.c:1646 */ +#line 2520 "util/configparser.c" /* yacc.c:1646 */ break; - case 207: + case 208: #line 435 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); @@ -2530,10 +2532,10 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2534 "util/configparser.c" /* yacc.c:1646 */ +#line 2536 "util/configparser.c" /* yacc.c:1646 */ break; - case 208: + case 209: #line 448 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); @@ -2548,10 +2550,10 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2552 "util/configparser.c" /* yacc.c:1646 */ +#line 2554 "util/configparser.c" /* yacc.c:1646 */ break; - case 209: + case 210: #line 463 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); @@ -2560,10 +2562,10 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2564 "util/configparser.c" /* yacc.c:1646 */ +#line 2566 "util/configparser.c" /* yacc.c:1646 */ break; - case 210: + case 211: #line 472 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); @@ -2572,10 +2574,10 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2576 "util/configparser.c" /* yacc.c:1646 */ +#line 2578 "util/configparser.c" /* yacc.c:1646 */ break; - case 211: + case 212: #line 481 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); @@ -2584,10 +2586,10 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2588 "util/configparser.c" /* yacc.c:1646 */ +#line 2590 "util/configparser.c" /* yacc.c:1646 */ break; - case 212: + case 213: #line 490 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); @@ -2596,10 +2598,10 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2600 "util/configparser.c" /* yacc.c:1646 */ +#line 2602 "util/configparser.c" /* yacc.c:1646 */ break; - case 213: + case 214: #line 499 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); @@ -2608,10 +2610,10 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2612 "util/configparser.c" /* yacc.c:1646 */ +#line 2614 "util/configparser.c" /* yacc.c:1646 */ break; - case 214: + case 215: #line 508 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); @@ -2620,10 +2622,10 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2624 "util/configparser.c" /* yacc.c:1646 */ +#line 2626 "util/configparser.c" /* yacc.c:1646 */ break; - case 215: + case 216: #line 517 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); @@ -2632,10 +2634,10 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2636 "util/configparser.c" /* yacc.c:1646 */ +#line 2638 "util/configparser.c" /* yacc.c:1646 */ break; - case 216: + case 217: #line 526 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); @@ -2644,10 +2646,10 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2648 "util/configparser.c" /* yacc.c:1646 */ +#line 2650 "util/configparser.c" /* yacc.c:1646 */ break; - case 217: + case 218: #line 535 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); @@ -2656,10 +2658,10 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2660 "util/configparser.c" /* yacc.c:1646 */ +#line 2662 "util/configparser.c" /* yacc.c:1646 */ break; - case 218: + case 219: #line 544 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); @@ -2668,10 +2670,10 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2672 "util/configparser.c" /* yacc.c:1646 */ +#line 2674 "util/configparser.c" /* yacc.c:1646 */ break; - case 219: + case 220: #line 553 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); @@ -2680,10 +2682,10 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2684 "util/configparser.c" /* yacc.c:1646 */ +#line 2686 "util/configparser.c" /* yacc.c:1646 */ break; - case 220: + case 221: #line 562 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); @@ -2692,10 +2694,10 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2696 "util/configparser.c" /* yacc.c:1646 */ +#line 2698 "util/configparser.c" /* yacc.c:1646 */ break; - case 221: + case 222: #line 571 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); @@ -2704,10 +2706,10 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2708 "util/configparser.c" /* yacc.c:1646 */ +#line 2710 "util/configparser.c" /* yacc.c:1646 */ break; - case 222: + case 223: #line 580 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); @@ -2716,10 +2718,10 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2720 "util/configparser.c" /* yacc.c:1646 */ +#line 2722 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: + case 224: #line 589 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); @@ -2728,30 +2730,30 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2732 "util/configparser.c" /* yacc.c:1646 */ +#line 2734 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: + case 225: #line 598 "./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 2742 "util/configparser.c" /* yacc.c:1646 */ +#line 2744 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: + case 226: #line 605 "./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 2752 "util/configparser.c" /* yacc.c:1646 */ +#line 2754 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: + case 227: #line 612 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); @@ -2760,10 +2762,10 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2764 "util/configparser.c" /* yacc.c:1646 */ +#line 2766 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: + case 228: #line 621 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); @@ -2772,10 +2774,10 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2776 "util/configparser.c" /* yacc.c:1646 */ +#line 2778 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: + case 229: #line 630 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); @@ -2784,10 +2786,10 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2788 "util/configparser.c" /* yacc.c:1646 */ +#line 2790 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: + case 230: #line 639 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); @@ -2801,10 +2803,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2805 "util/configparser.c" /* yacc.c:1646 */ +#line 2807 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: + case 231: #line 653 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); @@ -2813,10 +2815,10 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2817 "util/configparser.c" /* yacc.c:1646 */ +#line 2819 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: + case 232: #line 662 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); @@ -2825,10 +2827,10 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2829 "util/configparser.c" /* yacc.c:1646 */ +#line 2831 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: + case 233: #line 671 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); @@ -2837,30 +2839,30 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2841 "util/configparser.c" /* yacc.c:1646 */ +#line 2843 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: + case 234: #line 680 "./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 2851 "util/configparser.c" /* yacc.c:1646 */ +#line 2853 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: + case 235: #line 687 "./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 2861 "util/configparser.c" /* yacc.c:1646 */ +#line 2863 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: + case 236: #line 694 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); @@ -2886,10 +2888,10 @@ yyreduce: } } } -#line 2890 "util/configparser.c" /* yacc.c:1646 */ +#line 2892 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: + case 237: #line 720 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str))); @@ -2897,50 +2899,50 @@ yyreduce: cfg_parser->cfg->logfile = (yyvsp[0].str); cfg_parser->cfg->use_syslog = 0; } -#line 2901 "util/configparser.c" /* yacc.c:1646 */ +#line 2903 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: + case 238: #line 728 "./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 2911 "util/configparser.c" /* yacc.c:1646 */ +#line 2913 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: + case 239: #line 735 "./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 2921 "util/configparser.c" /* yacc.c:1646 */ +#line 2923 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: + case 240: #line 742 "./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 2931 "util/configparser.c" /* yacc.c:1646 */ +#line 2933 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: + case 241: #line 749 "./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 2941 "util/configparser.c" /* yacc.c:1646 */ +#line 2943 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: + case 242: #line 756 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str))); @@ -2948,10 +2950,10 @@ yyreduce: auto_trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 2952 "util/configparser.c" /* yacc.c:1646 */ +#line 2954 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: + case 243: #line 764 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str))); @@ -2959,10 +2961,10 @@ yyreduce: trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 2963 "util/configparser.c" /* yacc.c:1646 */ +#line 2965 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: + case 244: #line 772 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str))); @@ -2970,31 +2972,45 @@ yyreduce: trusted_keys_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 2974 "util/configparser.c" /* yacc.c:1646 */ +#line 2976 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: + case 245: #line 780 "./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 2984 "util/configparser.c" /* yacc.c:1646 */ +#line 2986 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: + case 246: #line 787 "./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) + yyerror("expected yes or no."); + else + cfg_parser->cfg->trust_anchor_signaling = + (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 3000 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 247: +#line 798 "./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 2994 "util/configparser.c" /* yacc.c:1646 */ +#line 3010 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 794 "./util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 805 "./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) @@ -3002,11 +3018,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3006 "util/configparser.c" /* yacc.c:1646 */ +#line 3022 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 803 "./util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 814 "./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) @@ -3014,11 +3030,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3018 "util/configparser.c" /* yacc.c:1646 */ +#line 3034 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 812 "./util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 823 "./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) @@ -3026,53 +3042,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3030 "util/configparser.c" /* yacc.c:1646 */ +#line 3046 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 821 "./util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 832 "./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 3040 "util/configparser.c" /* yacc.c:1646 */ +#line 3056 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 828 "./util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 839 "./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 3050 "util/configparser.c" /* yacc.c:1646 */ +#line 3066 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 835 "./util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 846 "./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 3061 "util/configparser.c" /* yacc.c:1646 */ +#line 3077 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 843 "./util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 854 "./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 3072 "util/configparser.c" /* yacc.c:1646 */ +#line 3088 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 851 "./util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 862 "./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) @@ -3081,11 +3097,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3085 "util/configparser.c" /* yacc.c:1646 */ +#line 3101 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 861 "./util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 872 "./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) @@ -3094,11 +3110,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3098 "util/configparser.c" /* yacc.c:1646 */ +#line 3114 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 871 "./util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 882 "./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) @@ -3107,11 +3123,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3111 "util/configparser.c" /* yacc.c:1646 */ +#line 3127 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 881 "./util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 892 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3123,11 +3139,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3127 "util/configparser.c" /* yacc.c:1646 */ +#line 3143 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 894 "./util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 905 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3137,22 +3153,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3141 "util/configparser.c" /* yacc.c:1646 */ +#line 3157 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 905 "./util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 916 "./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 3152 "util/configparser.c" /* yacc.c:1646 */ +#line 3168 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 913 "./util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 924 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3164,11 +3180,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3168 "util/configparser.c" /* yacc.c:1646 */ +#line 3184 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 926 "./util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 937 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3176,11 +3192,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3180 "util/configparser.c" /* yacc.c:1646 */ +#line 3196 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 935 "./util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 946 "./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) @@ -3188,11 +3204,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3192 "util/configparser.c" /* yacc.c:1646 */ +#line 3208 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 944 "./util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 955 "./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) @@ -3200,11 +3216,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3204 "util/configparser.c" /* yacc.c:1646 */ +#line 3220 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 953 "./util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 964 "./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) @@ -3213,11 +3229,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3217 "util/configparser.c" /* yacc.c:1646 */ +#line 3233 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 963 "./util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 974 "./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) @@ -3226,22 +3242,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3230 "util/configparser.c" /* yacc.c:1646 */ +#line 3246 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 973 "./util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 984 "./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 3241 "util/configparser.c" /* yacc.c:1646 */ +#line 3257 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 981 "./util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 992 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3253,11 +3269,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3257 "util/configparser.c" /* yacc.c:1646 */ +#line 3273 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 994 "./util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 1005 "./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) @@ -3265,22 +3281,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3269 "util/configparser.c" /* yacc.c:1646 */ +#line 3285 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 1003 "./util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 1014 "./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 3280 "util/configparser.c" /* yacc.c:1646 */ +#line 3296 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 1011 "./util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 1022 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3288,22 +3304,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3292 "util/configparser.c" /* yacc.c:1646 */ +#line 3308 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 1020 "./util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 1031 "./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 3303 "util/configparser.c" /* yacc.c:1646 */ +#line 3319 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 1028 "./util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 1039 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3315,11 +3331,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3319 "util/configparser.c" /* yacc.c:1646 */ +#line 3335 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 1041 "./util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 1052 "./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) @@ -3327,21 +3343,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3331 "util/configparser.c" /* yacc.c:1646 */ +#line 3347 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 1050 "./util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 1061 "./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 3341 "util/configparser.c" /* yacc.c:1646 */ +#line 3357 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 1057 "./util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 1068 "./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) @@ -3350,11 +3366,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3354 "util/configparser.c" /* yacc.c:1646 */ +#line 3370 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 1067 "./util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 1078 "./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) @@ -3363,11 +3379,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3367 "util/configparser.c" /* yacc.c:1646 */ +#line 3383 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 1077 "./util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 1088 "./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) @@ -3376,11 +3392,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3380 "util/configparser.c" /* yacc.c:1646 */ +#line 3396 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 1087 "./util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 1098 "./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) @@ -3389,11 +3405,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3393 "util/configparser.c" /* yacc.c:1646 */ +#line 3409 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 1097 "./util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 1108 "./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) @@ -3402,11 +3418,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3406 "util/configparser.c" /* yacc.c:1646 */ +#line 3422 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 1107 "./util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 1118 "./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) @@ -3415,11 +3431,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3419 "util/configparser.c" /* yacc.c:1646 */ +#line 3435 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 1117 "./util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 1128 "./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) @@ -3428,11 +3444,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3432 "util/configparser.c" /* yacc.c:1646 */ +#line 3448 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 1127 "./util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 1138 "./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) @@ -3441,41 +3457,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3445 "util/configparser.c" /* yacc.c:1646 */ +#line 3461 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 1137 "./util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 1148 "./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 3455 "util/configparser.c" /* yacc.c:1646 */ +#line 3471 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 1144 "./util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 1155 "./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 3465 "util/configparser.c" /* yacc.c:1646 */ +#line 3481 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 1151 "./util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 1162 "./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 3475 "util/configparser.c" /* yacc.c:1646 */ +#line 3491 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 1158 "./util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 1169 "./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) @@ -3483,11 +3499,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3487 "util/configparser.c" /* yacc.c:1646 */ +#line 3503 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 1167 "./util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 1178 "./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) @@ -3495,11 +3511,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3499 "util/configparser.c" /* yacc.c:1646 */ +#line 3515 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 1176 "./util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 1187 "./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) @@ -3507,21 +3523,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3511 "util/configparser.c" /* yacc.c:1646 */ +#line 3527 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 1185 "./util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 1196 "./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 3521 "util/configparser.c" /* yacc.c:1646 */ +#line 3537 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 1192 "./util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 1203 "./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) @@ -3530,11 +3546,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3534 "util/configparser.c" /* yacc.c:1646 */ +#line 3550 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 1202 "./util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 1213 "./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 && @@ -3550,21 +3566,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3554 "util/configparser.c" /* yacc.c:1646 */ +#line 3570 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 1219 "./util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 1230 "./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 3564 "util/configparser.c" /* yacc.c:1646 */ +#line 3580 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 1226 "./util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 1237 "./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) { @@ -3581,11 +3597,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3585 "util/configparser.c" /* yacc.c:1646 */ +#line 3601 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1244 "./util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 1255 "./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) { @@ -3597,11 +3613,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3601 "util/configparser.c" /* yacc.c:1646 */ +#line 3617 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1257 "./util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 1268 "./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) { @@ -3613,11 +3629,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3617 "util/configparser.c" /* yacc.c:1646 */ +#line 3633 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1270 "./util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 1281 "./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) @@ -3625,11 +3641,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3629 "util/configparser.c" /* yacc.c:1646 */ +#line 3645 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1279 "./util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 1290 "./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) @@ -3637,11 +3653,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3641 "util/configparser.c" /* yacc.c:1646 */ +#line 3657 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1288 "./util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 1299 "./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) @@ -3649,11 +3665,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3653 "util/configparser.c" /* yacc.c:1646 */ +#line 3669 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1297 "./util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 1308 "./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) @@ -3661,11 +3677,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3665 "util/configparser.c" /* yacc.c:1646 */ +#line 3681 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1306 "./util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 1317 "./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) @@ -3674,11 +3690,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3678 "util/configparser.c" /* yacc.c:1646 */ +#line 3694 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1316 "./util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 1327 "./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) @@ -3687,11 +3703,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3691 "util/configparser.c" /* yacc.c:1646 */ +#line 3707 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1326 "./util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1337 "./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) @@ -3699,11 +3715,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3703 "util/configparser.c" /* yacc.c:1646 */ +#line 3719 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1335 "./util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1346 "./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) @@ -3711,11 +3727,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3715 "util/configparser.c" /* yacc.c:1646 */ +#line 3731 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1344 "./util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1355 "./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) @@ -3727,11 +3743,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3731 "util/configparser.c" /* yacc.c:1646 */ +#line 3747 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1357 "./util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1368 "./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) @@ -3743,11 +3759,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3747 "util/configparser.c" /* yacc.c:1646 */ +#line 3763 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1370 "./util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1381 "./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) @@ -3755,21 +3771,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3759 "util/configparser.c" /* yacc.c:1646 */ +#line 3775 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1379 "./util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1390 "./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 3769 "util/configparser.c" /* yacc.c:1646 */ +#line 3785 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1386 "./util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1397 "./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) @@ -3777,11 +3793,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3781 "util/configparser.c" /* yacc.c:1646 */ +#line 3797 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1395 "./util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1406 "./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) @@ -3789,11 +3805,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3793 "util/configparser.c" /* yacc.c:1646 */ +#line 3809 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1404 "./util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1415 "./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) @@ -3801,11 +3817,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3805 "util/configparser.c" /* yacc.c:1646 */ +#line 3821 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1413 "./util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1424 "./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) @@ -3814,22 +3830,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3818 "util/configparser.c" /* yacc.c:1646 */ +#line 3834 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1422 "./util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1433 "./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 3829 "util/configparser.c" /* yacc.c:1646 */ +#line 3845 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1430 "./util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1441 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3841,22 +3857,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3845 "util/configparser.c" /* yacc.c:1646 */ +#line 3861 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1443 "./util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1454 "./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 3856 "util/configparser.c" /* yacc.c:1646 */ +#line 3872 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1451 "./util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1462 "./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 && @@ -3883,21 +3899,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 3887 "util/configparser.c" /* yacc.c:1646 */ +#line 3903 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1479 "./util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1490 "./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 3897 "util/configparser.c" /* yacc.c:1646 */ +#line 3913 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1486 "./util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1497 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -3911,11 +3927,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 3915 "util/configparser.c" /* yacc.c:1646 */ +#line 3931 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1501 "./util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1512 "./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) @@ -3924,11 +3940,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3928 "util/configparser.c" /* yacc.c:1646 */ +#line 3944 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1511 "./util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1522 "./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) @@ -3937,31 +3953,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3941 "util/configparser.c" /* yacc.c:1646 */ +#line 3957 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1521 "./util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1532 "./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 3951 "util/configparser.c" /* yacc.c:1646 */ +#line 3967 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1528 "./util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1539 "./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 3961 "util/configparser.c" /* yacc.c:1646 */ +#line 3977 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1535 "./util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1546 "./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) @@ -3969,11 +3985,11 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3973 "util/configparser.c" /* yacc.c:1646 */ +#line 3989 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1544 "./util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1555 "./util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -3986,11 +4002,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3990 "util/configparser.c" /* yacc.c:1646 */ +#line 4006 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1558 "./util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1569 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4008,11 +4024,11 @@ yyreduce: } } } -#line 4012 "util/configparser.c" /* yacc.c:1646 */ +#line 4028 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1577 "./util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1588 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4030,11 +4046,11 @@ yyreduce: } } } -#line 4034 "util/configparser.c" /* yacc.c:1646 */ +#line 4050 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1596 "./util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1607 "./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, @@ -4045,11 +4061,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4049 "util/configparser.c" /* yacc.c:1646 */ +#line 4065 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1608 "./util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1619 "./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, @@ -4060,11 +4076,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4064 "util/configparser.c" /* yacc.c:1646 */ +#line 4080 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1620 "./util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1631 "./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, @@ -4075,11 +4091,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4079 "util/configparser.c" /* yacc.c:1646 */ +#line 4095 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1632 "./util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1643 "./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, @@ -4089,11 +4105,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4093 "util/configparser.c" /* yacc.c:1646 */ +#line 4109 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1643 "./util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1654 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4111,11 +4127,11 @@ yyreduce: } } } -#line 4115 "util/configparser.c" /* yacc.c:1646 */ +#line 4131 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1662 "./util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1673 "./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) @@ -4123,11 +4139,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4127 "util/configparser.c" /* yacc.c:1646 */ +#line 4143 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1672 "./util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1683 "./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) @@ -4135,33 +4151,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4139 "util/configparser.c" /* yacc.c:1646 */ +#line 4155 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1681 "./util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1692 "./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 4150 "util/configparser.c" /* yacc.c:1646 */ +#line 4166 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1689 "./util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1700 "./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 4161 "util/configparser.c" /* yacc.c:1646 */ +#line 4177 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1697 "./util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1708 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4173,11 +4189,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4177 "util/configparser.c" /* yacc.c:1646 */ +#line 4193 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1710 "./util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1721 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4189,11 +4205,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4193 "util/configparser.c" /* yacc.c:1646 */ +#line 4209 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1723 "./util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1734 "./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) { @@ -4205,11 +4221,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4209 "util/configparser.c" /* yacc.c:1646 */ +#line 4225 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1736 "./util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1747 "./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) { @@ -4221,11 +4237,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4225 "util/configparser.c" /* yacc.c:1646 */ +#line 4241 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1749 "./util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1760 "./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) @@ -4233,11 +4249,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4237 "util/configparser.c" /* yacc.c:1646 */ +#line 4253 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1758 "./util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1769 "./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) @@ -4245,11 +4261,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4249 "util/configparser.c" /* yacc.c:1646 */ +#line 4265 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1767 "./util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1778 "./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) @@ -4258,11 +4274,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4262 "util/configparser.c" /* yacc.c:1646 */ +#line 4278 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1777 "./util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1788 "./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) @@ -4271,11 +4287,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4275 "util/configparser.c" /* yacc.c:1646 */ +#line 4291 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1787 "./util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1798 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4284,31 +4300,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4288 "util/configparser.c" /* yacc.c:1646 */ +#line 4304 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1797 "./util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1808 "./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 4298 "util/configparser.c" /* yacc.c:1646 */ +#line 4314 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1804 "./util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1815 "./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 4308 "util/configparser.c" /* yacc.c:1646 */ +#line 4324 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1811 "./util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1822 "./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) @@ -4316,11 +4332,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4320 "util/configparser.c" /* yacc.c:1646 */ +#line 4336 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1820 "./util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1831 "./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) @@ -4329,11 +4345,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4333 "util/configparser.c" /* yacc.c:1646 */ +#line 4349 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1830 "./util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1841 "./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) @@ -4342,11 +4358,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4346 "util/configparser.c" /* yacc.c:1646 */ +#line 4362 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1840 "./util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1851 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4355,31 +4371,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4359 "util/configparser.c" /* yacc.c:1646 */ +#line 4375 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1850 "./util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1861 "./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 4369 "util/configparser.c" /* yacc.c:1646 */ +#line 4385 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1857 "./util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1868 "./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 4379 "util/configparser.c" /* yacc.c:1646 */ +#line 4395 "util/configparser.c" /* yacc.c:1646 */ break; - case 351: -#line 1864 "./util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1875 "./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) @@ -4387,11 +4403,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4391 "util/configparser.c" /* yacc.c:1646 */ +#line 4407 "util/configparser.c" /* yacc.c:1646 */ break; - case 352: -#line 1873 "./util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1884 "./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) @@ -4400,11 +4416,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4404 "util/configparser.c" /* yacc.c:1646 */ +#line 4420 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1883 "./util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1894 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4413,11 +4429,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4417 "util/configparser.c" /* yacc.c:1646 */ +#line 4433 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1893 "./util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1904 "./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 && @@ -4445,11 +4461,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4449 "util/configparser.c" /* yacc.c:1646 */ +#line 4465 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1922 "./util/configparser.y" /* yacc.c:1646 */ + case 357: +#line 1933 "./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)); @@ -4458,22 +4474,22 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 4462 "util/configparser.c" /* yacc.c:1646 */ +#line 4478 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1932 "./util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1943 "./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 4473 "util/configparser.c" /* yacc.c:1646 */ +#line 4489 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1940 "./util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1951 "./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))) { @@ -4481,11 +4497,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4485 "util/configparser.c" /* yacc.c:1646 */ +#line 4501 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1949 "./util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1960 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4499,11 +4515,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4503 "util/configparser.c" /* yacc.c:1646 */ +#line 4519 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1964 "./util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1975 "./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) @@ -4511,19 +4527,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4515 "util/configparser.c" /* yacc.c:1646 */ +#line 4531 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1973 "./util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1984 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 4523 "util/configparser.c" /* yacc.c:1646 */ +#line 4539 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1984 "./util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1995 "./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) @@ -4532,11 +4548,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4536 "util/configparser.c" /* yacc.c:1646 */ +#line 4552 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 1994 "./util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 2005 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4544,21 +4560,21 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4548 "util/configparser.c" /* yacc.c:1646 */ +#line 4564 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 2003 "./util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 2014 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4558 "util/configparser.c" /* yacc.c:1646 */ +#line 4574 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 2010 "./util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 2021 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4567,122 +4583,122 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4571 "util/configparser.c" /* yacc.c:1646 */ +#line 4587 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 2020 "./util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 2031 "./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 4581 "util/configparser.c" /* yacc.c:1646 */ +#line 4597 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 2027 "./util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 2038 "./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 4591 "util/configparser.c" /* yacc.c:1646 */ +#line 4607 "util/configparser.c" /* yacc.c:1646 */ break; - case 377: -#line 2034 "./util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 2045 "./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 4601 "util/configparser.c" /* yacc.c:1646 */ +#line 4617 "util/configparser.c" /* yacc.c:1646 */ break; - case 378: -#line 2041 "./util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 2052 "./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 4611 "util/configparser.c" /* yacc.c:1646 */ +#line 4627 "util/configparser.c" /* yacc.c:1646 */ break; - case 379: -#line 2048 "./util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 2059 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 4619 "util/configparser.c" /* yacc.c:1646 */ +#line 4635 "util/configparser.c" /* yacc.c:1646 */ break; - case 394: -#line 2065 "./util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 2076 "./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 4630 "util/configparser.c" /* yacc.c:1646 */ +#line 4646 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 2073 "./util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 2084 "./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 4640 "util/configparser.c" /* yacc.c:1646 */ +#line 4656 "util/configparser.c" /* yacc.c:1646 */ break; - case 396: -#line 2080 "./util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 2091 "./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 4651 "util/configparser.c" /* yacc.c:1646 */ +#line 4667 "util/configparser.c" /* yacc.c:1646 */ break; - case 397: -#line 2088 "./util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 2099 "./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 4662 "util/configparser.c" /* yacc.c:1646 */ +#line 4678 "util/configparser.c" /* yacc.c:1646 */ break; - case 398: -#line 2096 "./util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 2107 "./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 4672 "util/configparser.c" /* yacc.c:1646 */ +#line 4688 "util/configparser.c" /* yacc.c:1646 */ break; - case 399: -#line 2103 "./util/configparser.y" /* yacc.c:1646 */ + case 401: +#line 2114 "./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 4682 "util/configparser.c" /* yacc.c:1646 */ +#line 4698 "util/configparser.c" /* yacc.c:1646 */ break; - case 400: -#line 2110 "./util/configparser.y" /* yacc.c:1646 */ + case 402: +#line 2121 "./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) @@ -4690,11 +4706,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4694 "util/configparser.c" /* yacc.c:1646 */ +#line 4710 "util/configparser.c" /* yacc.c:1646 */ break; - case 401: -#line 2119 "./util/configparser.y" /* yacc.c:1646 */ + case 403: +#line 2130 "./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) @@ -4702,11 +4718,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4706 "util/configparser.c" /* yacc.c:1646 */ +#line 4722 "util/configparser.c" /* yacc.c:1646 */ break; - case 402: -#line 2128 "./util/configparser.y" /* yacc.c:1646 */ + case 404: +#line 2139 "./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) @@ -4714,11 +4730,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4718 "util/configparser.c" /* yacc.c:1646 */ +#line 4734 "util/configparser.c" /* yacc.c:1646 */ break; - case 403: -#line 2137 "./util/configparser.y" /* yacc.c:1646 */ + case 405: +#line 2148 "./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) @@ -4726,11 +4742,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4730 "util/configparser.c" /* yacc.c:1646 */ +#line 4746 "util/configparser.c" /* yacc.c:1646 */ break; - case 404: -#line 2146 "./util/configparser.y" /* yacc.c:1646 */ + case 406: +#line 2157 "./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) @@ -4738,11 +4754,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4742 "util/configparser.c" /* yacc.c:1646 */ +#line 4758 "util/configparser.c" /* yacc.c:1646 */ break; - case 405: -#line 2155 "./util/configparser.y" /* yacc.c:1646 */ + case 407: +#line 2166 "./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) @@ -4750,29 +4766,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4754 "util/configparser.c" /* yacc.c:1646 */ +#line 4770 "util/configparser.c" /* yacc.c:1646 */ break; - case 406: -#line 2164 "./util/configparser.y" /* yacc.c:1646 */ + case 408: +#line 2175 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(python:)\n")); } -#line 4762 "util/configparser.c" /* yacc.c:1646 */ +#line 4778 "util/configparser.c" /* yacc.c:1646 */ break; - case 410: -#line 2173 "./util/configparser.y" /* yacc.c:1646 */ + case 412: +#line 2184 "./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 4772 "util/configparser.c" /* yacc.c:1646 */ +#line 4788 "util/configparser.c" /* yacc.c:1646 */ break; - case 411: -#line 2179 "./util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 2190 "./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) @@ -4781,21 +4797,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4785 "util/configparser.c" /* yacc.c:1646 */ +#line 4801 "util/configparser.c" /* yacc.c:1646 */ break; - case 412: -#line 2189 "./util/configparser.y" /* yacc.c:1646 */ + case 414: +#line 2200 "./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 4795 "util/configparser.c" /* yacc.c:1646 */ +#line 4811 "util/configparser.c" /* yacc.c:1646 */ break; - case 413: -#line 2196 "./util/configparser.y" /* yacc.c:1646 */ + case 415: +#line 2207 "./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)); @@ -4803,42 +4819,42 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 4807 "util/configparser.c" /* yacc.c:1646 */ +#line 4823 "util/configparser.c" /* yacc.c:1646 */ break; - case 414: -#line 2205 "./util/configparser.y" /* yacc.c:1646 */ + case 416: +#line 2216 "./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 4818 "util/configparser.c" /* yacc.c:1646 */ +#line 4834 "util/configparser.c" /* yacc.c:1646 */ break; - case 415: -#line 2213 "./util/configparser.y" /* yacc.c:1646 */ + case 417: +#line 2224 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnscrypt:)\n")); OUTYY(("\nP(dnscrypt:)\n")); } -#line 4827 "util/configparser.c" /* yacc.c:1646 */ +#line 4843 "util/configparser.c" /* yacc.c:1646 */ break; - case 423: -#line 2225 "./util/configparser.y" /* yacc.c:1646 */ + case 425: +#line 2236 "./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) yyerror("expected yes or no."); else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4838 "util/configparser.c" /* yacc.c:1646 */ +#line 4854 "util/configparser.c" /* yacc.c:1646 */ break; - case 424: -#line 2234 "./util/configparser.y" /* yacc.c:1646 */ + case 426: +#line 2245 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); @@ -4847,41 +4863,41 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4851 "util/configparser.c" /* yacc.c:1646 */ +#line 4867 "util/configparser.c" /* yacc.c:1646 */ break; - case 425: -#line 2244 "./util/configparser.y" /* yacc.c:1646 */ + case 427: +#line 2255 "./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 4861 "util/configparser.c" /* yacc.c:1646 */ +#line 4877 "util/configparser.c" /* yacc.c:1646 */ break; - case 426: -#line 2251 "./util/configparser.y" /* yacc.c:1646 */ + case 428: +#line 2262 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 4871 "util/configparser.c" /* yacc.c:1646 */ +#line 4887 "util/configparser.c" /* yacc.c:1646 */ break; - case 427: -#line 2258 "./util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2269 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 4881 "util/configparser.c" /* yacc.c:1646 */ +#line 4897 "util/configparser.c" /* yacc.c:1646 */ break; -#line 4885 "util/configparser.c" /* yacc.c:1646 */ +#line 4901 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5109,7 +5125,7 @@ yyreturn: #endif return yyresult; } -#line 2264 "./util/configparser.y" /* yacc.c:1906 */ +#line 2275 "./util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 4bb4c6e99..394abfce1 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -241,15 +241,16 @@ extern int yydebug; VAR_FAKE_SHA1 = 451, VAR_LOG_IDENTITY = 452, VAR_HIDE_TRUSTANCHOR = 453, - VAR_USE_SYSTEMD = 454, - VAR_SHM_ENABLE = 455, - VAR_SHM_KEY = 456, - VAR_DNSCRYPT = 457, - VAR_DNSCRYPT_ENABLE = 458, - VAR_DNSCRYPT_PORT = 459, - VAR_DNSCRYPT_PROVIDER = 460, - VAR_DNSCRYPT_SECRET_KEY = 461, - VAR_DNSCRYPT_PROVIDER_CERT = 462 + VAR_TRUST_ANCHOR_SIGNALING = 454, + VAR_USE_SYSTEMD = 455, + VAR_SHM_ENABLE = 456, + VAR_SHM_KEY = 457, + VAR_DNSCRYPT = 458, + VAR_DNSCRYPT_ENABLE = 459, + VAR_DNSCRYPT_PORT = 460, + VAR_DNSCRYPT_PROVIDER = 461, + VAR_DNSCRYPT_SECRET_KEY = 462, + VAR_DNSCRYPT_PROVIDER_CERT = 463 }; #endif /* Tokens. */ @@ -449,15 +450,16 @@ extern int yydebug; #define VAR_FAKE_SHA1 451 #define VAR_LOG_IDENTITY 452 #define VAR_HIDE_TRUSTANCHOR 453 -#define VAR_USE_SYSTEMD 454 -#define VAR_SHM_ENABLE 455 -#define VAR_SHM_KEY 456 -#define VAR_DNSCRYPT 457 -#define VAR_DNSCRYPT_ENABLE 458 -#define VAR_DNSCRYPT_PORT 459 -#define VAR_DNSCRYPT_PROVIDER 460 -#define VAR_DNSCRYPT_SECRET_KEY 461 -#define VAR_DNSCRYPT_PROVIDER_CERT 462 +#define VAR_TRUST_ANCHOR_SIGNALING 454 +#define VAR_USE_SYSTEMD 455 +#define VAR_SHM_ENABLE 456 +#define VAR_SHM_KEY 457 +#define VAR_DNSCRYPT 458 +#define VAR_DNSCRYPT_ENABLE 459 +#define VAR_DNSCRYPT_PORT 460 +#define VAR_DNSCRYPT_PROVIDER 461 +#define VAR_DNSCRYPT_SECRET_KEY 462 +#define VAR_DNSCRYPT_PROVIDER_CERT 463 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -468,7 +470,7 @@ union YYSTYPE char* str; -#line 472 "util/configparser.h" /* yacc.c:1909 */ +#line 474 "util/configparser.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index 4a04367f4..1be2bc876 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -140,7 +140,7 @@ extern struct config_parser_state* cfg_parser; %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_LOG_IDENTITY VAR_HIDE_TRUSTANCHOR +%token VAR_LOG_IDENTITY VAR_HIDE_TRUSTANCHOR VAR_TRUST_ANCHOR_SIGNALING %token VAR_USE_SYSTEMD VAR_SHM_ENABLE VAR_SHM_KEY %token VAR_DNSCRYPT VAR_DNSCRYPT_ENABLE VAR_DNSCRYPT_PORT VAR_DNSCRYPT_PROVIDER %token VAR_DNSCRYPT_SECRET_KEY VAR_DNSCRYPT_PROVIDER_CERT @@ -228,7 +228,7 @@ content_server: server_num_threads | server_verbosity | server_port | 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 | - server_hide_trustanchor + server_hide_trustanchor | server_trust_anchor_signaling ; stubstart: VAR_STUB_ZONE { @@ -783,6 +783,17 @@ server_trust_anchor: VAR_TRUST_ANCHOR STRING_ARG yyerror("out of memory"); } ; +server_trust_anchor_signaling: VAR_TRUST_ANCHOR_SIGNALING STRING_ARG + { + OUTYY(("P(server_trust_anchor_signaling:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else + cfg_parser->cfg->trust_anchor_signaling = + (strcmp($2, "yes")==0); + free($2); + } + ; server_domain_insecure: VAR_DOMAIN_INSECURE STRING_ARG { OUTYY(("P(server_domain_insecure:%s)\n", $2)); diff --git a/validator/validator.c b/validator/validator.c index 81ba5fa17..a9ab1fda5 100644 --- a/validator/validator.c +++ b/validator/validator.c @@ -60,6 +60,7 @@ #include "util/fptr_wlist.h" #include "sldns/rrdef.h" #include "sldns/wire2str.h" +#include "sldns/str2wire.h" /* forward decl for cache response and normal super inform calls of a DS */ static void process_ds_response(struct module_qstate* qstate, @@ -439,6 +440,65 @@ prime_trust_anchor(struct module_qstate* qstate, struct val_qstate* vq, return 1; } +/** + * Generate, send and detach key tag signaling query. + * + * @param qstate: query state. + * @param id: module id. + * @param ta: trust anchor, locked. + * @return false on a processing error. + */ +static int +generate_keytag_query(struct module_qstate* qstate, int id, + struct trust_anchor* ta) +{ + /* 3 bytes for "_ta", 5 bytes per tag (4 bytes + "-") */ +#define MAX_LABEL_TAGS (LDNS_MAX_LABELLEN-3)/5 + size_t i, numtag; + uint16_t tags[MAX_LABEL_TAGS]; + char tagstr[LDNS_MAX_LABELLEN+1] = "_ta"; /* +1 for NULL byte */ + char* tagstr_pos = tagstr + strlen(tagstr); + uint8_t dnamebuf[LDNS_MAX_DOMAINLEN+1]; /* +1 for label length byte */ + size_t dnamebuf_len = sizeof(dnamebuf); + uint8_t* keytagdname; + + numtag = anchor_list_keytags(ta, tags, MAX_LABEL_TAGS); + if(numtag == 0) + return 0; + + for(i=0; iname, ta->namelen); + if(!(keytagdname = (uint8_t*)regional_alloc(qstate->region, + dnamebuf_len))) { + log_err("could not generate key tag query: out of memory"); + return 0; + } + memcpy(keytagdname, dnamebuf, dnamebuf_len); + + log_nametypeclass(VERB_ALGO, "keytag query", keytagdname, + LDNS_RR_TYPE_NULL, ta->dclass); + if(!generate_request(qstate, id, keytagdname, dnamebuf_len, + LDNS_RR_TYPE_NULL, ta->dclass, 0)) { + log_err("failed to generate key tag signaling request"); + return 0; + } + + /* We are not interrested in the response, detach this (and all other!) + * subqueries. */ + fptr_ok(fptr_whitelist_modenv_detach_subs(qstate->env->detach_subs)); + (*qstate->env->detach_subs)(qstate); + + return 1; +} + /** * Validate if the ANSWER and AUTHORITY sections contain valid rrsets. * They must be validly signed with the given key. @@ -2857,6 +2917,13 @@ process_prime_response(struct module_qstate* qstate, struct val_qstate* vq, ta->name, ta->namelen, LDNS_RR_TYPE_DNSKEY, ta->dclass); } + + if(qstate->env->cfg->trust_anchor_signaling && + !generate_keytag_query(qstate, id, ta)) { + log_err("keytag signaling query failed"); + return; + } + if(ta->autr) { if(!autr_process_prime(qstate->env, ve, ta, dnskey_rrset)) { /* trust anchor revoked, restart with less anchors */