From fe44f5918a1c0d8a0304c94f6adf6e51a6ab53cf Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Wed, 31 Oct 2007 07:46:30 +0000 Subject: [PATCH] max ttl option. git-svn-id: file:///svn/unbound/trunk@721 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/unbound.c | 1 + doc/Changelog | 3 + doc/TODO | 3 - doc/example.conf | 4 + doc/unbound.conf.5 | 7 + util/config_file.c | 10 + util/config_file.h | 8 + util/configlexer.c | 1228 +++++++++++++++++++++--------------------- util/configlexer.lex | 1 + util/configparser.c | 548 ++++++++++--------- util/configparser.h | 6 +- util/configparser.y | 12 +- util/data/msgparse.h | 2 +- util/data/msgreply.c | 3 + 14 files changed, 958 insertions(+), 878 deletions(-) diff --git a/daemon/unbound.c b/daemon/unbound.c index 07b66df7c..3b5149723 100644 --- a/daemon/unbound.c +++ b/daemon/unbound.c @@ -117,6 +117,7 @@ apply_dir(struct daemon* daemon, struct config_file* cfg, int cmdline_verbose) /* apply if they have changed */ daemon->cfg = cfg; verbosity = cmdline_verbose + cfg->verbosity; + config_apply(cfg); if(cfg->directory && cfg->directory[0]) { if(!daemon->cwd || strcmp(daemon->cwd, cfg->directory) != 0) { if(chdir(cfg->directory)) { diff --git a/doc/Changelog b/doc/Changelog index 39277b291..2de831fb7 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +31 October 2007: Wouter + - cache-max-ttl config option. + 30 October 2007: Wouter - fixup assertion failure that relied on compressed names to be smaller than uncompressed names. A packet from comrite.com was seen diff --git a/doc/TODO b/doc/TODO index 58d75cafe..7f6fcf8b7 100644 --- a/doc/TODO +++ b/doc/TODO @@ -52,6 +52,3 @@ o make timeout backoffs randomized (a couple percent random) to spread traffic. o inspect date on executable, then warn user in log if its more than 1 year. o proactively prime root, stubs and trust anchors, feature. early failure, faster on first query, but more traffic. -o look into whether in incoming message should have RRsets replaced with - rrsets from the cache, if the one from the cache is more trusted, or has - lower TTL. diff --git a/doc/example.conf b/doc/example.conf index 8aacc1d4e..1125b5ba0 100644 --- a/doc/example.conf +++ b/doc/example.conf @@ -76,6 +76,10 @@ server: # the number of slabs must be a power of 2. # more slabs reduce lock contention, but fragment memory usage. # rrset-cache-slabs: 4 + + # the time to live (TTL) value cap for RRsets and messages in the + # cache. Items are not cached for longer. In seconds. + # cache-max-ttl: 864000 # the time to live (TTL) value for cached roundtrip times and # EDNS version information for hosts. In seconds. diff --git a/doc/unbound.conf.5 b/doc/unbound.conf.5 index 17d69b802..6100154d5 100644 --- a/doc/unbound.conf.5 +++ b/doc/unbound.conf.5 @@ -125,6 +125,13 @@ Number of bytes size of the RRset cache. Default is 4 megabytes. .It \fBrrset-cache-slabs:\fR Number of slabs in the RRset cache. Slabs reduce lock contention by threads. Must be set to a power of 2. +.It \fBcache-max-ttl:\fR +Time to live maximum for RRsets and messages in the cache. Default is +864000 seconds (10 days). If the maximum kicks in, responses to clients +still get decrementing TTLs based on the original (larger) values. +When the internal TTL expires, the cache item has expired. +Can be set lower to force the resolver to query for data often, and not +trust (very large) TTL values. .It \fBinfra-host-ttl:\fR Time to live for entries in the host cache. The host cache contains roundtrip timing and EDNS support information. Default is 900. diff --git a/util/config_file.c b/util/config_file.c index 46c390c17..a2a836377 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -89,6 +89,7 @@ config_create() cfg->host_ttl = 900; cfg->lame_ttl = 900; cfg->bogus_ttl = 900; + cfg->max_ttl = 3600 * 24 * 10; cfg->infra_cache_slabs = 4; cfg->infra_cache_numhosts = 10000; cfg->infra_cache_lame_size = 10240; /* easily 40 or more entries */ @@ -325,3 +326,12 @@ cfg_count_numbers(const char* s) } return num; } + +/** the MAX_TTL global */ +extern uint32_t MAX_TTL; + +void +config_apply(struct config_file* config) +{ + MAX_TTL = (uint32_t)config->max_ttl; +} diff --git a/util/config_file.h b/util/config_file.h index 34ceb91c3..bcedf9ecc 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -163,6 +163,8 @@ struct config_file { /** files with trusted DNSKEYs in named.conf format, list */ struct config_strlist* trusted_keys_file_list; + /** the number of seconds maximal TTL used for RRsets and messages */ + int max_ttl; /** if not 0, this value is the validation date for RRSIGs */ int32_t val_date_override; /** this value sets the number of seconds before revalidating bogus */ @@ -227,6 +229,12 @@ int config_read(struct config_file* config, char* filename); */ void config_delete(struct config_file* config); +/** + * Apply config to global constants; this routine is called in single thread. + * @param config: to apply. Side effect: global constants change. + */ +void config_apply(struct config_file* config); + /** * Insert string into strlist. * @param head: pointer to strlist head variable. diff --git a/util/configlexer.c b/util/configlexer.c index 9f2924bf3..979d880d6 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -365,8 +365,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 77 -#define YY_END_OF_BUFFER 78 +#define YY_NUM_RULES 78 +#define YY_END_OF_BUFFER 79 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -374,81 +374,82 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[665] = +static yyconst flex_int16_t yy_accept[678] = { 0, - 1, 1, 65, 65, 69, 69, 73, 73, 78, 76, - 1, 63, 64, 2, 77, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 65, 66, 77, 67, 77, 72, 69, 70, 71, - 77, 73, 74, 75, 77, 76, 0, 1, 2, 2, - 2, 2, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 65, 0, - 72, 0, 69, 73, 0, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 39, 76, 76, 76, - 76, 6, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 17, 76, 11, 12, 76, 14, 13, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 3, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 68, 76, 76, 76, 76, 76, - 76, 20, 76, 76, 76, 76, 76, 76, 21, 76, - - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 50, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 49, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 18, 76, - 76, 76, 76, 76, 76, 19, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 15, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 40, 41, 38, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 5, 76, 76, 76, 76, 76, - - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 22, 76, - 76, 76, 76, 62, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 37, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 4, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 43, 44, 42, 76, 76, 76, - 48, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 54, 76, 76, 76, 76, 76, 76, 76, 76, - - 76, 76, 47, 76, 76, 76, 76, 76, 76, 76, - 76, 51, 76, 76, 76, 76, 76, 76, 7, 76, - 76, 76, 76, 76, 76, 56, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 28, 29, - 59, 76, 76, 24, 76, 76, 76, 76, 8, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 60, 23, 25, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 10, 76, 76, 76, 76, - 76, 9, 26, 76, 76, 76, 76, 76, 76, 76, - - 76, 76, 76, 76, 76, 76, 76, 30, 76, 76, - 27, 76, 52, 53, 76, 76, 55, 76, 76, 76, - 76, 76, 76, 76, 76, 16, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 34, 76, 76, - 58, 45, 76, 36, 35, 76, 31, 76, 57, 76, - 76, 32, 76, 76, 46, 33, 76, 76, 76, 76, - 76, 76, 61, 0 + 1, 1, 66, 66, 70, 70, 74, 74, 79, 77, + 1, 64, 65, 2, 78, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 66, 67, 78, 68, 78, 73, 70, 71, 72, + 78, 74, 75, 76, 78, 77, 0, 1, 2, 2, + 2, 2, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 66, + 0, 73, 0, 70, 74, 0, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 40, 77, 77, 77, 77, 6, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 17, 77, 11, 12, + 77, 14, 13, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 3, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 69, 77, 77, 77, 77, 77, 77, 20, 77, + + 77, 77, 77, 77, 77, 21, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 51, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 50, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 18, 77, 77, 77, + 77, 77, 77, 77, 19, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 15, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 41, 42, 39, 77, 77, 77, 77, 77, 77, + + 77, 77, 77, 5, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 22, 77, + 77, 77, 77, 63, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 38, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 4, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 44, 45, 43, 77, + 77, 77, 49, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + + 77, 77, 77, 55, 77, 77, 77, 77, 77, 77, + 28, 77, 77, 77, 77, 48, 77, 77, 77, 77, + 77, 77, 77, 77, 52, 77, 77, 77, 77, 77, + 77, 7, 77, 77, 77, 77, 77, 77, 57, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 29, 30, 60, 77, 77, 24, 77, 77, 77, + 77, 8, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 61, + 23, 25, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 10, 77, + + 77, 77, 77, 77, 9, 26, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 31, 77, 77, 27, 77, 53, 54, 77, 77, 56, + 77, 77, 77, 77, 77, 77, 77, 77, 16, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 35, 77, 77, 59, 46, 77, 37, 36, 77, 32, + 77, 58, 77, 77, 33, 77, 77, 47, 34, 77, + 77, 77, 77, 77, 77, 62, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -465,8 +466,8 @@ static yyconst flex_int32_t yy_ec[256] = 1, 12, 1, 1, 1, 1, 13, 14, 15, 16, 17, 18, 19, 20, 21, 1, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 1, - 35, 36, 1, 1, 1, 1, 1, 1, 1, 1, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 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, @@ -483,480 +484,490 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[37] = +static yyconst flex_int32_t yy_meta[38] = { 0, 1, 2, 3, 4, 4, 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 } ; -static yyconst flex_int16_t yy_base[674] = +static yyconst flex_int16_t yy_base[687] = { 0, - 0, 0, 34, 37, 48, 52, 58, 62, 1353, 1340, - 41, 1354, 1354, 67, 71, 65, 66, 32, 68, 70, - 71, 33, 72, 78, 36, 82, 85, 84, 87, 92, - 100, 1339, 1354, 1354, 1354, 101, 1338, 1347, 1354, 1354, - 116, 1336, 1354, 1354, 119, 1335, 123, 124, 0, 127, - 0, 0, 107, 121, 128, 122, 125, 126, 129, 137, - 131, 141, 132, 144, 133, 135, 146, 149, 150, 81, - 152, 155, 157, 158, 159, 161, 160, 163, 1334, 176, - 1333, 191, 1342, 1331, 181, 162, 182, 185, 164, 188, - 190, 178, 189, 193, 196, 202, 206, 199, 213, 209, - - 216, 215, 217, 207, 218, 220, 221, 227, 224, 228, - 235, 238, 232, 239, 240, 236, 241, 244, 245, 256, - 254, 263, 248, 260, 261, 264, 262, 266, 268, 270, - 272, 283, 271, 278, 276, 289, 291, 284, 293, 299, - 295, 296, 301, 297, 320, 302, 304, 305, 306, 311, - 307, 312, 314, 321, 317, 328, 331, 332, 339, 346, - 344, 342, 345, 347, 351, 353, 1330, 355, 357, 358, - 359, 1329, 360, 366, 362, 372, 363, 369, 376, 377, - 381, 383, 384, 385, 386, 387, 389, 393, 390, 398, - 401, 412, 409, 411, 413, 419, 416, 418, 415, 421, - - 422, 425, 429, 424, 432, 443, 439, 441, 442, 431, - 440, 446, 449, 452, 457, 450, 459, 460, 466, 462, - 464, 465, 467, 469, 470, 472, 480, 471, 478, 481, - 1328, 482, 1327, 1326, 484, 1325, 1324, 491, 490, 493, - 489, 492, 496, 502, 503, 505, 510, 513, 512, 518, - 521, 522, 523, 525, 527, 507, 530, 526, 533, 1323, - 536, 535, 537, 538, 541, 548, 545, 546, 547, 557, - 549, 555, 559, 560, 562, 563, 564, 565, 569, 574, - 568, 570, 577, 582, 1322, 590, 588, 578, 587, 592, - 593, 1321, 594, 600, 601, 602, 603, 612, 1320, 609, - - 610, 614, 615, 616, 617, 620, 619, 618, 625, 626, - 627, 637, 630, 636, 635, 1319, 639, 641, 648, 642, - 643, 649, 650, 651, 653, 654, 1318, 655, 662, 659, - 661, 674, 676, 664, 675, 684, 680, 682, 681, 683, - 687, 689, 700, 703, 691, 697, 704, 706, 1317, 712, - 716, 719, 708, 715, 721, 1316, 718, 722, 723, 724, - 725, 727, 728, 729, 732, 731, 739, 747, 748, 1315, - 736, 749, 757, 740, 750, 753, 756, 759, 760, 761, - 764, 765, 1314, 1313, 1312, 772, 766, 767, 777, 773, - 781, 778, 783, 784, 1311, 785, 786, 791, 789, 796, - - 793, 797, 799, 800, 805, 806, 804, 807, 811, 812, - 809, 819, 829, 815, 825, 831, 832, 833, 1310, 839, - 837, 835, 836, 1309, 838, 847, 848, 850, 856, 863, - 841, 860, 862, 1308, 869, 871, 867, 873, 875, 868, - 874, 876, 877, 882, 878, 880, 884, 887, 891, 1307, - 892, 899, 896, 898, 900, 907, 914, 916, 910, 919, - 903, 917, 904, 927, 1306, 1305, 1304, 920, 922, 930, - 1303, 931, 932, 934, 935, 937, 940, 939, 941, 953, - 942, 955, 945, 956, 957, 949, 959, 962, 964, 963, - 965, 1302, 970, 980, 972, 969, 982, 983, 985, 977, - - 984, 990, 1301, 992, 993, 994, 996, 999, 1001, 1003, - 1007, 1300, 1008, 1012, 1009, 1014, 1015, 1016, 1299, 1018, - 1020, 1022, 1024, 1026, 1028, 1298, 1029, 1030, 1032, 1041, - 1042, 1040, 1045, 1047, 1034, 1051, 1052, 1055, 1297, 1296, - 1295, 1059, 1062, 1294, 1064, 1070, 1066, 1054, 1293, 1068, - 1072, 1071, 1075, 1076, 1079, 1077, 1078, 1080, 1081, 1083, - 1085, 1089, 1091, 1099, 1095, 1093, 1292, 1291, 1290, 1096, - 1100, 1105, 1113, 1106, 1108, 1114, 1116, 1118, 1120, 1122, - 1123, 1126, 1128, 1129, 1133, 1289, 1130, 1134, 1136, 1141, - 1140, 1288, 1287, 1144, 1147, 1154, 1156, 1146, 1162, 1161, - - 1163, 1151, 1158, 1165, 1164, 1168, 1171, 1285, 1172, 1174, - 1277, 1175, 1261, 1260, 1178, 1176, 1259, 1181, 1182, 1180, - 1183, 1187, 1184, 1191, 1197, 1256, 1196, 1193, 1199, 1206, - 1211, 1203, 1213, 1215, 1217, 1220, 1223, 1255, 1226, 1227, - 1254, 1253, 1216, 1250, 1249, 1229, 1207, 1230, 1110, 1231, - 1237, 842, 1239, 1240, 693, 660, 1233, 1242, 1243, 1245, - 1244, 1247, 388, 1354, 1274, 1278, 1282, 329, 1286, 1290, - 108, 1292, 1294 + 0, 0, 35, 38, 49, 53, 59, 63, 1380, 1367, + 42, 1381, 1381, 68, 72, 66, 69, 33, 70, 72, + 75, 34, 73, 81, 37, 84, 86, 89, 95, 88, + 104, 1366, 1381, 1381, 1381, 118, 1365, 1374, 1381, 1381, + 123, 1363, 1381, 1381, 125, 1362, 129, 130, 0, 133, + 0, 0, 99, 90, 97, 132, 128, 129, 130, 131, + 135, 137, 140, 139, 142, 144, 148, 150, 151, 153, + 152, 157, 159, 158, 162, 163, 167, 171, 164, 1361, + 181, 1360, 194, 1369, 1358, 196, 177, 180, 190, 191, + 192, 193, 196, 199, 202, 198, 203, 222, 218, 205, + + 226, 223, 232, 229, 231, 219, 220, 230, 233, 207, + 234, 240, 247, 248, 244, 245, 249, 165, 77, 251, + 252, 253, 259, 256, 271, 267, 268, 269, 272, 270, + 274, 275, 278, 280, 291, 276, 279, 285, 297, 303, + 299, 300, 306, 302, 304, 308, 309, 327, 310, 311, + 317, 313, 314, 337, 319, 316, 321, 328, 339, 344, + 346, 343, 348, 354, 350, 358, 351, 361, 360, 363, + 1357, 367, 368, 369, 370, 1356, 371, 377, 373, 374, + 383, 389, 385, 391, 386, 393, 388, 395, 396, 397, + 398, 405, 408, 410, 414, 419, 425, 422, 427, 428, + + 434, 431, 433, 411, 436, 437, 440, 444, 439, 447, + 454, 453, 455, 456, 446, 457, 460, 462, 464, 469, + 472, 466, 473, 479, 477, 481, 475, 482, 483, 484, + 486, 492, 488, 495, 496, 498, 1355, 500, 1354, 1353, + 502, 1352, 1351, 506, 503, 507, 508, 511, 516, 513, + 522, 519, 526, 528, 524, 530, 534, 536, 538, 539, + 540, 541, 544, 547, 549, 1350, 551, 552, 553, 557, + 554, 564, 558, 568, 403, 561, 571, 565, 572, 575, + 577, 578, 579, 580, 585, 581, 587, 583, 589, 590, + 596, 1349, 604, 606, 597, 605, 607, 611, 1348, 613, + + 614, 618, 620, 621, 630, 1347, 624, 628, 632, 626, + 633, 634, 637, 315, 636, 642, 635, 644, 651, 646, + 652, 648, 1346, 659, 656, 660, 658, 664, 666, 667, + 668, 669, 670, 673, 1345, 671, 686, 674, 676, 691, + 697, 675, 679, 700, 698, 701, 699, 702, 707, 710, + 718, 722, 704, 711, 724, 706, 1344, 730, 731, 732, + 728, 733, 735, 736, 1343, 739, 738, 740, 741, 743, + 745, 744, 750, 746, 747, 757, 768, 769, 1342, 753, + 766, 770, 773, 774, 775, 776, 777, 780, 778, 782, + 783, 1341, 1340, 1339, 784, 785, 786, 796, 790, 800, + + 798, 802, 803, 1338, 804, 805, 807, 811, 812, 814, + 815, 816, 818, 819, 822, 831, 825, 827, 836, 833, + 838, 839, 854, 841, 843, 851, 852, 853, 1337, 860, + 857, 858, 859, 1336, 861, 864, 867, 871, 870, 873, + 883, 882, 886, 888, 1335, 894, 895, 874, 892, 901, + 893, 897, 899, 900, 902, 905, 908, 907, 909, 913, + 1334, 914, 920, 921, 922, 923, 931, 935, 938, 936, + 939, 924, 942, 944, 946, 949, 1333, 1332, 1331, 951, + 952, 956, 1330, 953, 957, 959, 962, 963, 964, 961, + 968, 977, 969, 978, 980, 981, 971, 984, 990, 987, + + 991, 993, 995, 1329, 998, 997, 1005, 999, 1006, 1007, + 1328, 1009, 1011, 1015, 1016, 1327, 1018, 1019, 1020, 1022, + 1027, 1029, 1034, 1024, 1326, 1038, 1040, 1030, 1037, 1041, + 1046, 1325, 1045, 1050, 1051, 1053, 1055, 1056, 1324, 1057, + 1059, 1060, 1063, 1062, 1069, 1073, 1071, 1070, 1074, 1080, + 1081, 1323, 1322, 1321, 1087, 1090, 1320, 1092, 1098, 1094, + 1082, 1319, 1096, 1100, 1099, 1103, 1104, 1107, 1084, 1105, + 1106, 1108, 1111, 1113, 1117, 1120, 1126, 1122, 1123, 1318, + 1317, 1316, 1127, 1128, 1133, 1138, 1129, 1134, 1139, 1140, + 1142, 1148, 1149, 1150, 1152, 1151, 1158, 1159, 1315, 1155, + + 1160, 1166, 1161, 1170, 1314, 1313, 1172, 1174, 1180, 1182, + 1163, 1188, 1185, 1186, 1187, 1189, 1191, 1192, 1193, 1194, + 1312, 1195, 1199, 1311, 1200, 1309, 1301, 1203, 1201, 1285, + 1206, 1207, 1208, 1209, 1214, 1215, 1216, 1218, 1283, 1221, + 1226, 1228, 1230, 1232, 1233, 1236, 1239, 1241, 1243, 1244, + 1280, 1249, 1250, 1279, 1278, 1252, 1277, 1276, 1254, 1270, + 1256, 985, 1257, 1259, 927, 1262, 1263, 828, 749, 1265, + 1266, 1267, 1269, 1268, 1273, 677, 1381, 1298, 1302, 1306, + 609, 1310, 1314, 217, 1316, 1318 } ; -static yyconst flex_int16_t yy_def[674] = +static yyconst flex_int16_t yy_def[687] = { 0, - 664, 1, 665, 665, 666, 666, 667, 667, 664, 668, - 664, 664, 664, 669, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 670, 664, 664, 664, 670, 671, 664, 664, 664, - 671, 672, 664, 664, 672, 668, 668, 664, 673, 669, - 673, 669, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 670, 670, - 671, 671, 664, 672, 672, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 668, 668, 668, 668, 668, 668, 668, - 668, 668, 668, 0, 664, 664, 664, 664, 664, 664, - 664, 664, 664 + 677, 1, 678, 678, 679, 679, 680, 680, 677, 681, + 677, 677, 677, 682, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 683, 677, 677, 677, 683, 684, 677, 677, 677, + 684, 685, 677, 677, 685, 681, 681, 677, 686, 682, + 686, 682, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 683, + 683, 684, 684, 677, 685, 685, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, + 681, 681, 681, 681, 681, 681, 0, 677, 677, 677, + 677, 677, 677, 677, 677, 677 } ; -static yyconst flex_int16_t yy_nxt[1391] = +static yyconst flex_int16_t yy_nxt[1419] = { 0, 10, 11, 12, 12, 13, 14, 10, 10, 10, 10, 10, 15, 10, 10, 16, 17, 10, 18, 10, 19, 20, 21, 22, 23, 24, 25, 26, 10, 27, 28, - 29, 30, 31, 10, 10, 10, 33, 34, 35, 33, - 34, 35, 48, 47, 47, 36, 49, 47, 36, 38, - 39, 39, 40, 38, 39, 39, 40, 56, 62, 41, - 43, 43, 44, 41, 43, 43, 44, 67, 51, 45, - 51, 51, 46, 45, 46, 46, 47, 47, 52, 47, - 57, 47, 47, 47, 53, 59, 54, 61, 58, 47, - 65, 55, 47, 47, 60, 47, 47, 63, 47, 74, - - 72, 64, 68, 47, 79, 79, 105, 69, 81, 66, - 70, 47, 77, 71, 73, 75, 78, 81, 47, 81, - 81, 76, 84, 84, 46, 48, 46, 46, 51, 49, - 51, 51, 47, 47, 88, 86, 47, 47, 52, 47, - 47, 91, 47, 47, 47, 92, 47, 98, 47, 87, - 89, 93, 47, 90, 94, 47, 100, 47, 101, 97, - 47, 47, 99, 47, 103, 96, 47, 95, 47, 47, - 47, 47, 47, 47, 47, 47, 102, 111, 104, 79, - 79, 106, 112, 107, 84, 84, 109, 114, 108, 47, - 110, 113, 81, 47, 81, 81, 47, 120, 115, 47, - - 47, 47, 123, 121, 47, 116, 122, 47, 128, 117, - 47, 124, 127, 47, 125, 118, 119, 47, 47, 131, - 47, 126, 133, 129, 47, 132, 47, 47, 47, 47, - 130, 47, 47, 134, 135, 47, 138, 136, 47, 47, - 140, 143, 141, 47, 145, 146, 47, 47, 137, 47, - 47, 47, 47, 139, 149, 47, 47, 142, 152, 47, - 153, 147, 150, 144, 148, 47, 151, 47, 154, 156, - 155, 47, 47, 47, 47, 47, 160, 47, 157, 47, - 162, 47, 47, 47, 159, 165, 166, 47, 163, 47, - 161, 158, 164, 167, 47, 47, 171, 173, 168, 172, - - 47, 169, 47, 170, 47, 176, 47, 47, 47, 175, - 47, 177, 47, 47, 174, 47, 47, 47, 47, 190, - 191, 180, 47, 47, 187, 47, 178, 186, 47, 46, - 179, 47, 47, 181, 182, 188, 189, 192, 193, 47, - 194, 196, 47, 47, 183, 184, 185, 200, 197, 195, - 47, 199, 202, 47, 204, 47, 47, 47, 47, 201, - 198, 203, 47, 206, 47, 208, 47, 205, 47, 47, - 47, 47, 214, 47, 47, 220, 210, 47, 211, 213, - 47, 212, 207, 47, 216, 221, 209, 47, 47, 223, - 215, 217, 47, 219, 47, 47, 47, 47, 47, 47, - - 47, 47, 228, 231, 47, 225, 224, 218, 233, 47, - 222, 234, 47, 226, 230, 232, 229, 227, 235, 236, - 47, 237, 47, 47, 47, 239, 47, 47, 238, 47, - 47, 240, 47, 47, 241, 47, 47, 243, 249, 245, - 47, 248, 47, 47, 246, 242, 244, 247, 250, 251, - 47, 47, 47, 47, 47, 253, 252, 47, 254, 255, - 47, 47, 257, 47, 256, 261, 259, 260, 47, 258, - 47, 47, 264, 47, 265, 47, 47, 47, 47, 266, - 47, 47, 47, 47, 262, 263, 270, 269, 271, 47, - 268, 47, 47, 47, 267, 47, 272, 278, 274, 273, - - 47, 47, 47, 47, 47, 275, 285, 47, 279, 282, - 276, 277, 280, 47, 47, 287, 47, 283, 47, 281, - 286, 47, 289, 47, 47, 298, 284, 290, 292, 47, - 288, 291, 47, 47, 47, 293, 47, 47, 47, 294, - 299, 47, 295, 297, 47, 301, 47, 47, 47, 47, - 300, 302, 47, 296, 307, 305, 47, 47, 47, 47, - 47, 304, 309, 312, 303, 306, 47, 308, 47, 311, - 47, 47, 316, 47, 47, 47, 47, 319, 310, 47, - 47, 47, 314, 313, 320, 47, 323, 324, 47, 47, - 315, 322, 327, 47, 325, 318, 328, 317, 47, 47, - - 321, 47, 329, 47, 47, 47, 326, 330, 332, 333, - 331, 47, 47, 47, 47, 338, 335, 336, 339, 334, - 47, 47, 337, 47, 341, 47, 47, 47, 47, 47, - 47, 47, 344, 345, 346, 349, 47, 47, 47, 340, - 347, 47, 342, 348, 352, 343, 47, 47, 47, 356, - 47, 351, 47, 47, 47, 350, 354, 357, 353, 47, - 47, 47, 47, 358, 47, 47, 47, 359, 360, 355, - 47, 47, 47, 47, 365, 47, 363, 369, 362, 366, - 361, 367, 371, 364, 370, 47, 47, 47, 372, 368, - 374, 47, 47, 47, 47, 47, 375, 376, 47, 383, - - 47, 377, 47, 373, 47, 378, 382, 379, 47, 380, - 384, 47, 381, 385, 47, 47, 387, 47, 390, 47, - 388, 386, 391, 47, 389, 392, 47, 47, 393, 47, - 47, 395, 47, 47, 47, 47, 47, 397, 47, 47, - 47, 400, 47, 47, 394, 401, 396, 47, 399, 403, - 47, 47, 398, 407, 408, 406, 402, 404, 47, 47, - 47, 47, 405, 411, 47, 409, 410, 47, 47, 412, - 47, 47, 47, 418, 419, 47, 47, 47, 47, 413, - 415, 420, 414, 47, 47, 417, 421, 424, 47, 47, - 416, 422, 47, 426, 47, 47, 47, 47, 428, 427, - - 47, 423, 47, 425, 47, 433, 434, 47, 47, 435, - 47, 47, 440, 429, 431, 47, 47, 47, 47, 430, - 47, 432, 47, 47, 438, 450, 47, 436, 439, 437, - 47, 443, 445, 444, 441, 449, 47, 442, 446, 447, - 47, 448, 47, 47, 47, 455, 47, 47, 47, 47, - 47, 465, 47, 47, 452, 451, 456, 454, 47, 47, - 453, 47, 460, 457, 461, 458, 462, 47, 459, 464, - 466, 47, 467, 47, 47, 468, 463, 469, 47, 47, - 47, 472, 47, 471, 47, 47, 47, 47, 47, 47, - 473, 47, 474, 47, 479, 47, 480, 475, 47, 483, - - 481, 470, 47, 47, 476, 486, 477, 47, 485, 47, - 47, 47, 478, 490, 47, 47, 488, 484, 47, 482, - 491, 47, 493, 497, 492, 47, 487, 47, 47, 489, - 47, 47, 494, 47, 495, 502, 498, 496, 47, 499, - 503, 47, 47, 47, 505, 47, 47, 501, 47, 500, - 47, 47, 47, 47, 511, 510, 47, 507, 515, 508, - 47, 504, 509, 512, 47, 506, 47, 47, 47, 519, - 47, 514, 516, 47, 47, 47, 47, 513, 520, 518, - 47, 47, 524, 47, 521, 517, 522, 525, 47, 523, - 526, 47, 527, 47, 47, 47, 47, 529, 528, 530, - - 531, 47, 532, 47, 47, 47, 535, 47, 538, 539, - 47, 540, 47, 541, 47, 533, 536, 537, 47, 47, - 47, 534, 544, 47, 543, 47, 47, 47, 549, 47, - 548, 47, 547, 47, 551, 47, 542, 47, 545, 47, - 47, 47, 546, 47, 557, 47, 553, 558, 554, 552, - 556, 47, 47, 47, 560, 550, 47, 559, 47, 555, - 563, 561, 47, 47, 562, 47, 47, 564, 566, 567, - 47, 565, 568, 47, 569, 47, 570, 47, 571, 47, - 572, 47, 47, 47, 573, 574, 47, 47, 47, 47, - 47, 47, 47, 575, 47, 583, 47, 576, 577, 578, - - 47, 586, 47, 581, 47, 587, 47, 47, 580, 582, - 47, 47, 579, 584, 591, 592, 47, 47, 585, 47, - 588, 47, 589, 593, 47, 47, 590, 47, 595, 47, - 596, 47, 597, 47, 47, 594, 599, 47, 600, 47, - 47, 47, 602, 598, 47, 47, 608, 47, 601, 604, - 603, 47, 47, 605, 611, 47, 610, 47, 47, 606, - 609, 612, 47, 607, 613, 47, 614, 47, 616, 47, - 615, 617, 47, 47, 47, 47, 47, 620, 618, 47, - 619, 621, 47, 47, 626, 47, 47, 47, 623, 47, - 628, 47, 47, 47, 47, 47, 629, 630, 47, 622, - - 625, 624, 47, 634, 47, 632, 638, 47, 47, 627, - 47, 631, 633, 637, 47, 639, 641, 47, 47, 635, - 636, 642, 47, 644, 47, 645, 47, 47, 47, 640, - 647, 47, 643, 646, 47, 648, 649, 47, 47, 652, - 47, 47, 47, 650, 47, 653, 651, 655, 47, 656, - 47, 47, 657, 47, 47, 47, 47, 663, 47, 654, - 47, 47, 659, 658, 47, 47, 47, 47, 660, 661, - 47, 47, 47, 662, 32, 32, 32, 32, 37, 37, - 37, 37, 42, 42, 42, 42, 50, 50, 47, 50, - 79, 79, 84, 84, 51, 51, 47, 51, 47, 47, - - 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 29, 30, 31, 10, 10, 10, 10, 33, 34, 35, + 33, 34, 35, 48, 47, 47, 36, 49, 47, 36, + 38, 39, 39, 40, 38, 39, 39, 40, 57, 63, + 41, 43, 43, 44, 41, 43, 43, 44, 68, 51, + 45, 51, 51, 46, 45, 46, 46, 47, 53, 52, + 47, 47, 58, 47, 47, 54, 47, 60, 47, 55, + 59, 62, 47, 66, 56, 47, 61, 47, 64, 47, + + 47, 47, 65, 154, 69, 73, 47, 75, 47, 70, + 47, 71, 67, 87, 72, 47, 78, 77, 88, 74, + 79, 80, 80, 76, 82, 89, 82, 82, 85, 85, + 46, 48, 46, 46, 51, 49, 51, 51, 90, 47, + 47, 47, 47, 47, 52, 93, 47, 94, 47, 95, + 47, 47, 96, 47, 100, 47, 91, 92, 99, 47, + 101, 47, 47, 47, 47, 97, 105, 102, 47, 47, + 47, 103, 98, 47, 47, 47, 47, 107, 47, 153, + 104, 106, 47, 113, 80, 80, 108, 109, 47, 110, + 111, 47, 115, 114, 112, 82, 116, 82, 82, 85, + + 85, 47, 47, 47, 47, 117, 118, 47, 124, 47, + 47, 119, 125, 47, 47, 120, 47, 82, 47, 130, + 143, 121, 122, 126, 127, 123, 129, 128, 131, 47, + 47, 47, 134, 47, 47, 132, 133, 47, 136, 135, + 47, 47, 47, 47, 47, 47, 141, 137, 138, 139, + 140, 47, 144, 146, 148, 47, 47, 149, 47, 47, + 47, 151, 47, 47, 47, 142, 156, 47, 157, 145, + 47, 158, 159, 150, 152, 147, 155, 160, 47, 47, + 47, 47, 47, 47, 164, 47, 47, 47, 166, 47, + 47, 47, 163, 169, 170, 167, 47, 161, 165, 162, + + 168, 171, 47, 172, 174, 175, 173, 176, 47, 177, + 47, 47, 180, 47, 47, 47, 179, 47, 181, 47, + 47, 47, 47, 192, 47, 47, 47, 47, 47, 178, + 47, 191, 47, 184, 182, 190, 355, 183, 47, 47, + 185, 186, 198, 193, 194, 195, 196, 199, 47, 197, + 47, 187, 188, 189, 47, 47, 200, 47, 205, 47, + 207, 47, 47, 201, 202, 47, 204, 208, 206, 47, + 209, 47, 47, 210, 47, 213, 203, 211, 47, 47, + 47, 47, 47, 219, 47, 47, 221, 215, 47, 216, + 218, 212, 217, 222, 47, 225, 47, 47, 214, 47, + + 47, 220, 47, 228, 47, 226, 47, 47, 47, 47, + 223, 229, 233, 224, 47, 230, 47, 231, 237, 47, + 227, 47, 47, 235, 239, 47, 234, 232, 236, 240, + 47, 241, 242, 47, 317, 238, 47, 243, 47, 47, + 245, 248, 47, 244, 47, 47, 246, 47, 47, 247, + 47, 47, 249, 255, 251, 47, 254, 47, 47, 252, + 257, 250, 253, 256, 47, 47, 47, 47, 47, 259, + 258, 47, 260, 47, 261, 47, 263, 47, 265, 266, + 47, 262, 264, 47, 47, 270, 47, 267, 47, 271, + 47, 268, 47, 47, 47, 47, 272, 47, 269, 47, + + 276, 275, 277, 47, 273, 274, 47, 47, 278, 47, + 282, 47, 285, 47, 47, 280, 279, 47, 47, 47, + 281, 286, 47, 289, 47, 287, 292, 47, 283, 284, + 47, 293, 288, 47, 294, 47, 290, 47, 296, 47, + 299, 47, 297, 298, 295, 47, 291, 47, 300, 47, + 47, 47, 47, 301, 306, 47, 304, 302, 47, 305, + 47, 308, 47, 47, 47, 47, 309, 303, 47, 47, + 314, 307, 47, 318, 312, 47, 47, 311, 313, 47, + 315, 310, 47, 47, 316, 319, 47, 323, 47, 47, + 47, 47, 47, 320, 47, 321, 47, 327, 47, 331, + + 47, 47, 332, 330, 328, 322, 335, 47, 47, 46, + 336, 326, 324, 333, 325, 47, 47, 47, 47, 334, + 337, 329, 47, 340, 47, 47, 338, 341, 339, 47, + 343, 47, 47, 346, 344, 47, 347, 47, 342, 47, + 345, 47, 349, 47, 47, 47, 47, 47, 47, 352, + 353, 354, 357, 47, 348, 47, 351, 47, 360, 47, + 350, 356, 47, 47, 358, 364, 365, 47, 359, 47, + 47, 47, 362, 367, 361, 47, 366, 47, 47, 47, + 47, 47, 47, 363, 47, 47, 47, 47, 47, 368, + 47, 369, 378, 374, 372, 375, 371, 47, 370, 381, + + 373, 379, 47, 380, 377, 376, 383, 382, 47, 47, + 47, 47, 47, 47, 384, 47, 385, 47, 47, 386, + 392, 47, 47, 387, 398, 388, 391, 389, 393, 47, + 396, 390, 394, 47, 395, 47, 399, 400, 401, 47, + 397, 47, 47, 47, 47, 404, 47, 47, 402, 47, + 47, 47, 47, 407, 47, 47, 47, 47, 47, 410, + 47, 47, 403, 411, 47, 409, 405, 406, 47, 408, + 413, 414, 412, 416, 417, 418, 421, 47, 415, 47, + 47, 47, 419, 420, 47, 47, 47, 47, 47, 47, + 428, 47, 429, 47, 47, 47, 47, 47, 431, 430, + + 425, 47, 422, 423, 424, 427, 434, 47, 426, 47, + 432, 47, 436, 47, 47, 47, 47, 438, 47, 437, + 435, 433, 47, 47, 445, 47, 47, 47, 444, 47, + 47, 446, 439, 47, 440, 442, 47, 451, 47, 47, + 441, 443, 47, 449, 47, 450, 447, 47, 448, 47, + 47, 461, 47, 456, 47, 452, 454, 453, 455, 458, + 460, 459, 47, 47, 47, 47, 466, 457, 47, 47, + 47, 47, 47, 462, 463, 47, 467, 465, 47, 471, + 464, 47, 47, 472, 47, 47, 468, 473, 469, 476, + 474, 470, 477, 47, 47, 475, 478, 47, 479, 47, + + 480, 481, 483, 47, 47, 47, 47, 484, 47, 482, + 47, 47, 47, 47, 491, 485, 47, 486, 47, 47, + 47, 495, 487, 492, 47, 47, 498, 488, 493, 489, + 497, 47, 47, 47, 47, 47, 490, 502, 47, 496, + 500, 503, 47, 494, 505, 504, 47, 47, 509, 47, + 47, 499, 501, 47, 507, 47, 511, 47, 506, 508, + 47, 512, 47, 47, 47, 515, 516, 47, 47, 518, + 47, 513, 47, 47, 47, 47, 510, 523, 514, 47, + 47, 524, 47, 517, 520, 521, 522, 525, 47, 47, + 519, 47, 47, 528, 527, 47, 47, 529, 47, 530, + + 532, 47, 47, 533, 47, 526, 47, 539, 47, 47, + 47, 534, 537, 535, 531, 538, 47, 47, 47, 536, + 47, 542, 47, 543, 544, 540, 47, 47, 541, 47, + 47, 47, 548, 47, 551, 47, 545, 552, 47, 553, + 47, 47, 549, 550, 554, 47, 546, 547, 47, 47, + 557, 47, 47, 555, 556, 562, 47, 47, 560, 558, + 561, 47, 47, 564, 47, 559, 47, 47, 47, 571, + 47, 47, 570, 47, 47, 566, 567, 572, 565, 569, + 47, 47, 47, 573, 47, 47, 563, 568, 575, 574, + 577, 47, 47, 47, 579, 47, 576, 580, 47, 578, + + 581, 47, 582, 47, 583, 47, 584, 47, 585, 47, + 47, 47, 586, 587, 47, 47, 47, 47, 47, 47, + 592, 588, 47, 596, 47, 589, 590, 591, 47, 594, + 599, 47, 600, 47, 47, 593, 595, 47, 47, 47, + 47, 597, 604, 605, 47, 47, 598, 601, 606, 47, + 47, 47, 602, 47, 608, 609, 610, 603, 607, 47, + 47, 47, 47, 47, 612, 613, 47, 611, 615, 47, + 47, 47, 47, 616, 47, 614, 621, 47, 617, 618, + 622, 47, 624, 47, 619, 47, 623, 628, 625, 620, + 626, 47, 627, 47, 629, 630, 47, 47, 47, 47, + + 47, 631, 47, 47, 47, 47, 47, 634, 633, 639, + 47, 47, 47, 636, 47, 641, 632, 47, 47, 47, + 47, 642, 643, 638, 637, 47, 47, 47, 635, 47, + 647, 651, 47, 645, 650, 640, 644, 47, 646, 47, + 654, 47, 655, 47, 47, 649, 657, 47, 652, 658, + 47, 648, 47, 660, 47, 47, 661, 659, 653, 662, + 47, 47, 656, 47, 665, 47, 663, 47, 47, 668, + 47, 666, 669, 47, 47, 670, 47, 47, 47, 47, + 47, 47, 664, 676, 47, 667, 672, 47, 47, 47, + 47, 47, 673, 674, 47, 671, 47, 675, 32, 32, + + 32, 32, 37, 37, 37, 37, 42, 42, 42, 42, + 50, 50, 47, 50, 80, 80, 85, 85, 51, 51, + 47, 51, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 85, 83, 82, 80, 47, 85, 83, 82, - 80, 47, 664, 9, 664, 664, 664, 664, 664, 664, - 664, 664, 664, 664, 664, 664, 664, 664, 664, 664, - 664, 664, 664, 664, 664, 664, 664, 664, 664, 664, - 664, 664, 664, 664, 664, 664, 664, 664, 664, 664 + 47, 47, 47, 47, 47, 47, 47, 47, 47, 86, + 84, 83, 81, 47, 86, 84, 83, 81, 47, 677, + 9, 677, 677, 677, 677, 677, 677, 677, 677, 677, + 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + + 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + 677, 677, 677, 677, 677, 677, 677, 677 } ; -static yyconst flex_int16_t yy_chk[1391] = +static yyconst flex_int16_t yy_chk[1419] = { 0, 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, 3, 3, 3, 4, - 4, 4, 11, 18, 22, 3, 11, 25, 4, 5, - 5, 5, 5, 6, 6, 6, 6, 18, 22, 5, - 7, 7, 7, 6, 8, 8, 8, 25, 14, 7, - 14, 14, 15, 8, 15, 15, 16, 17, 14, 19, - 19, 20, 21, 23, 16, 20, 17, 21, 19, 24, - 24, 17, 70, 26, 20, 28, 27, 23, 29, 29, - - 28, 23, 26, 30, 36, 36, 70, 26, 671, 24, - 27, 31, 31, 27, 28, 29, 31, 41, 53, 41, - 41, 30, 45, 45, 47, 48, 47, 47, 50, 48, - 50, 50, 54, 56, 55, 53, 57, 58, 50, 55, - 59, 58, 61, 63, 65, 59, 66, 63, 60, 54, - 56, 60, 62, 57, 60, 64, 65, 67, 66, 62, - 68, 69, 64, 71, 68, 61, 72, 60, 73, 74, - 75, 77, 76, 86, 78, 89, 67, 76, 69, 80, - 80, 71, 77, 72, 85, 85, 74, 86, 73, 92, - 75, 78, 82, 87, 82, 82, 88, 89, 87, 90, - - 93, 91, 92, 90, 94, 88, 91, 95, 96, 88, - 98, 93, 95, 96, 93, 88, 88, 97, 104, 99, - 100, 94, 101, 97, 99, 100, 102, 101, 103, 105, - 98, 106, 107, 102, 103, 109, 106, 104, 108, 110, - 108, 111, 109, 113, 112, 113, 111, 116, 105, 112, - 114, 115, 117, 107, 115, 118, 119, 110, 118, 123, - 119, 113, 116, 111, 114, 121, 117, 120, 120, 122, - 121, 124, 125, 127, 122, 126, 126, 128, 123, 129, - 128, 130, 133, 131, 125, 131, 131, 135, 129, 134, - 127, 124, 130, 132, 132, 138, 135, 137, 133, 136, - - 136, 133, 137, 134, 139, 140, 141, 142, 144, 139, - 140, 141, 143, 146, 138, 147, 148, 149, 151, 150, - 150, 144, 150, 152, 147, 153, 142, 146, 155, 668, - 143, 145, 154, 145, 145, 148, 149, 151, 152, 156, - 153, 155, 157, 158, 145, 145, 145, 158, 156, 154, - 159, 157, 160, 162, 162, 161, 163, 160, 164, 159, - 156, 161, 165, 164, 166, 166, 168, 163, 169, 170, - 171, 173, 174, 175, 177, 178, 169, 174, 170, 173, - 178, 171, 165, 176, 176, 178, 168, 179, 180, 180, - 175, 176, 181, 177, 182, 183, 184, 185, 186, 663, - - 187, 189, 185, 188, 188, 182, 181, 176, 190, 190, - 179, 191, 191, 183, 187, 189, 186, 184, 192, 193, - 193, 194, 194, 192, 195, 196, 199, 197, 195, 198, - 196, 197, 200, 201, 198, 204, 202, 200, 204, 202, - 203, 203, 210, 205, 202, 199, 201, 202, 205, 206, - 207, 211, 208, 209, 206, 208, 207, 212, 209, 210, - 213, 216, 212, 214, 211, 216, 214, 215, 215, 213, - 217, 218, 219, 220, 220, 221, 222, 219, 223, 221, - 224, 225, 228, 226, 217, 218, 225, 224, 226, 229, - 223, 227, 230, 232, 222, 235, 227, 238, 229, 228, - - 241, 239, 238, 242, 240, 230, 243, 243, 239, 240, - 232, 235, 239, 244, 245, 245, 246, 241, 256, 239, - 244, 247, 247, 249, 248, 256, 242, 248, 250, 250, - 246, 249, 251, 252, 253, 251, 254, 258, 255, 252, - 257, 257, 253, 255, 259, 259, 262, 261, 263, 264, - 258, 261, 265, 254, 266, 264, 267, 268, 269, 266, - 271, 263, 268, 271, 262, 265, 272, 267, 270, 270, - 273, 274, 275, 275, 276, 277, 278, 278, 269, 281, - 279, 282, 273, 272, 278, 280, 280, 281, 283, 288, - 274, 279, 284, 284, 282, 277, 286, 276, 289, 287, - - 278, 286, 287, 290, 291, 293, 283, 288, 290, 291, - 289, 294, 295, 296, 297, 297, 294, 295, 298, 293, - 300, 301, 296, 298, 301, 302, 303, 304, 305, 308, - 307, 306, 304, 305, 306, 309, 309, 310, 311, 300, - 307, 313, 302, 308, 312, 303, 315, 314, 312, 317, - 317, 311, 318, 320, 321, 310, 314, 318, 313, 319, - 322, 323, 324, 319, 325, 326, 328, 320, 321, 315, - 330, 656, 331, 329, 326, 334, 324, 331, 323, 328, - 322, 329, 333, 325, 332, 332, 335, 333, 334, 330, - 336, 337, 339, 338, 340, 336, 337, 338, 341, 342, - - 342, 339, 345, 335, 655, 339, 341, 339, 346, 339, - 343, 343, 340, 344, 344, 347, 346, 348, 350, 353, - 347, 345, 351, 350, 348, 352, 354, 351, 353, 357, - 352, 355, 355, 358, 359, 360, 361, 358, 362, 363, - 364, 361, 366, 365, 354, 362, 357, 371, 360, 364, - 367, 374, 359, 368, 369, 367, 363, 365, 368, 369, - 372, 375, 366, 373, 376, 371, 372, 377, 373, 374, - 378, 379, 380, 380, 381, 381, 382, 387, 388, 375, - 377, 382, 376, 386, 390, 379, 386, 389, 389, 392, - 378, 387, 391, 391, 393, 394, 396, 397, 393, 392, - - 399, 388, 398, 390, 401, 399, 400, 400, 402, 401, - 403, 404, 406, 394, 397, 407, 405, 406, 408, 396, - 411, 398, 409, 410, 404, 414, 414, 402, 405, 403, - 412, 409, 410, 409, 407, 413, 415, 408, 411, 412, - 413, 412, 416, 417, 418, 420, 422, 423, 421, 425, - 420, 431, 431, 652, 416, 415, 421, 418, 426, 427, - 417, 428, 426, 422, 427, 423, 428, 429, 425, 430, - 432, 432, 433, 433, 430, 435, 429, 436, 437, 440, - 435, 439, 436, 438, 438, 441, 439, 442, 443, 445, - 440, 446, 440, 444, 444, 447, 445, 440, 448, 448, - - 446, 437, 449, 451, 441, 452, 442, 453, 451, 454, - 452, 455, 443, 456, 461, 463, 454, 449, 456, 447, - 457, 459, 458, 462, 457, 457, 453, 458, 462, 455, - 460, 468, 459, 469, 460, 469, 463, 461, 464, 464, - 470, 470, 472, 473, 473, 474, 475, 468, 476, 464, - 478, 477, 479, 481, 479, 478, 483, 475, 483, 476, - 486, 472, 477, 480, 480, 474, 482, 484, 485, 487, - 487, 482, 484, 488, 490, 489, 491, 481, 488, 486, - 496, 493, 491, 495, 489, 485, 489, 493, 500, 490, - 494, 494, 495, 497, 498, 501, 499, 497, 496, 498, - - 499, 502, 500, 504, 505, 506, 504, 507, 507, 508, - 508, 509, 509, 510, 510, 501, 505, 506, 511, 513, - 515, 502, 514, 514, 513, 516, 517, 518, 520, 520, - 518, 521, 517, 522, 522, 523, 511, 524, 515, 525, - 527, 528, 516, 529, 529, 535, 524, 530, 525, 523, - 528, 532, 530, 531, 532, 521, 533, 531, 534, 527, - 535, 533, 536, 537, 534, 548, 538, 536, 538, 542, - 542, 537, 543, 543, 545, 545, 546, 547, 547, 550, - 548, 546, 552, 551, 550, 551, 553, 554, 556, 557, - 555, 558, 559, 552, 560, 560, 561, 553, 554, 555, - - 562, 563, 563, 558, 566, 564, 565, 570, 557, 559, - 564, 571, 556, 561, 571, 572, 572, 574, 562, 575, - 565, 649, 566, 573, 573, 576, 570, 577, 575, 578, - 576, 579, 577, 580, 581, 574, 579, 582, 580, 583, - 584, 587, 582, 578, 585, 588, 589, 589, 581, 584, - 583, 591, 590, 585, 594, 594, 591, 598, 595, 587, - 590, 595, 602, 588, 596, 596, 597, 597, 599, 603, - 598, 600, 600, 599, 601, 605, 604, 603, 601, 606, - 602, 604, 607, 609, 610, 610, 612, 616, 606, 615, - 615, 620, 618, 619, 621, 623, 616, 618, 622, 605, - - 609, 607, 624, 622, 628, 620, 627, 627, 625, 612, - 629, 619, 621, 625, 632, 628, 630, 630, 647, 623, - 624, 631, 631, 633, 633, 634, 634, 643, 635, 629, - 636, 636, 632, 635, 637, 637, 639, 639, 640, 646, - 646, 648, 650, 640, 657, 648, 643, 651, 651, 653, - 653, 654, 654, 658, 659, 661, 660, 662, 662, 650, - 645, 644, 658, 657, 642, 641, 638, 626, 659, 660, - 617, 614, 613, 661, 665, 665, 665, 665, 666, 666, - 666, 666, 667, 667, 667, 667, 669, 669, 611, 669, - 670, 670, 672, 672, 673, 673, 608, 673, 593, 592, - - 586, 569, 568, 567, 549, 544, 541, 540, 539, 526, - 519, 512, 503, 492, 471, 467, 466, 465, 450, 434, - 424, 419, 395, 385, 384, 383, 370, 356, 349, 327, - 316, 299, 292, 285, 260, 237, 236, 234, 233, 231, - 172, 167, 84, 83, 81, 79, 46, 42, 38, 37, - 32, 10, 9, 664, 664, 664, 664, 664, 664, 664, - 664, 664, 664, 664, 664, 664, 664, 664, 664, 664, - 664, 664, 664, 664, 664, 664, 664, 664, 664, 664, - 664, 664, 664, 664, 664, 664, 664, 664, 664, 664 + 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, + 4, 4, 4, 11, 18, 22, 3, 11, 25, 4, + 5, 5, 5, 5, 6, 6, 6, 6, 18, 22, + 5, 7, 7, 7, 6, 8, 8, 8, 25, 14, + 7, 14, 14, 15, 8, 15, 15, 16, 16, 14, + 17, 19, 19, 20, 23, 16, 21, 20, 119, 17, + 19, 21, 24, 24, 17, 26, 20, 27, 23, 30, + + 28, 54, 23, 119, 26, 28, 29, 29, 55, 26, + 53, 27, 24, 53, 27, 31, 31, 30, 54, 28, + 31, 36, 36, 29, 41, 55, 41, 41, 45, 45, + 47, 48, 47, 47, 50, 48, 50, 50, 56, 57, + 58, 59, 60, 56, 50, 59, 61, 60, 62, 61, + 64, 63, 61, 65, 64, 66, 57, 58, 63, 67, + 65, 68, 69, 71, 70, 61, 69, 66, 72, 74, + 73, 67, 62, 75, 76, 79, 118, 71, 77, 118, + 68, 70, 78, 77, 81, 81, 72, 73, 87, 74, + 75, 88, 79, 78, 76, 83, 87, 83, 83, 86, + + 86, 89, 90, 91, 92, 88, 89, 93, 92, 96, + 94, 90, 93, 95, 97, 90, 100, 684, 110, 97, + 110, 90, 90, 94, 95, 91, 96, 95, 98, 99, + 106, 107, 101, 98, 102, 99, 100, 101, 103, 102, + 104, 108, 105, 103, 109, 111, 108, 104, 105, 106, + 107, 112, 111, 113, 114, 115, 116, 115, 113, 114, + 117, 116, 120, 121, 122, 109, 121, 124, 122, 112, + 123, 123, 124, 115, 117, 113, 120, 125, 126, 127, + 128, 130, 125, 129, 129, 131, 132, 136, 131, 133, + 137, 134, 128, 134, 134, 132, 138, 126, 130, 127, + + 133, 135, 135, 136, 137, 138, 136, 139, 139, 140, + 141, 142, 143, 144, 140, 145, 142, 143, 144, 146, + 147, 149, 150, 151, 152, 153, 314, 156, 151, 141, + 155, 150, 157, 147, 145, 149, 314, 146, 148, 158, + 148, 148, 156, 152, 153, 154, 154, 157, 154, 155, + 159, 148, 148, 148, 162, 160, 158, 161, 162, 163, + 164, 165, 167, 159, 160, 164, 161, 165, 163, 166, + 166, 169, 168, 167, 170, 170, 160, 168, 172, 173, + 174, 175, 177, 178, 179, 180, 180, 173, 178, 174, + 177, 169, 175, 180, 181, 182, 183, 185, 172, 187, + + 182, 179, 184, 184, 186, 182, 188, 189, 190, 191, + 180, 185, 189, 181, 275, 186, 192, 187, 193, 193, + 183, 194, 204, 191, 195, 195, 190, 188, 192, 196, + 196, 197, 198, 198, 275, 194, 197, 199, 199, 200, + 201, 204, 202, 200, 203, 201, 202, 205, 206, 203, + 209, 207, 205, 209, 207, 208, 208, 215, 210, 207, + 211, 206, 207, 210, 212, 211, 213, 214, 216, 213, + 212, 217, 214, 218, 215, 219, 217, 222, 219, 220, + 220, 216, 218, 221, 223, 224, 227, 221, 225, 225, + 224, 222, 226, 228, 229, 230, 226, 231, 223, 233, + + 230, 229, 231, 232, 227, 228, 234, 235, 232, 236, + 236, 238, 244, 241, 245, 234, 233, 244, 246, 247, + 235, 245, 248, 246, 250, 245, 249, 249, 238, 241, + 252, 250, 245, 251, 251, 255, 247, 253, 253, 254, + 256, 256, 254, 255, 252, 257, 248, 258, 257, 259, + 260, 261, 262, 258, 263, 263, 261, 259, 264, 262, + 265, 265, 267, 268, 269, 271, 267, 260, 270, 273, + 272, 264, 276, 276, 270, 272, 278, 269, 271, 274, + 273, 268, 277, 279, 274, 277, 280, 281, 281, 282, + 283, 284, 286, 278, 288, 279, 285, 285, 287, 287, + + 289, 290, 288, 286, 285, 280, 291, 291, 295, 681, + 293, 284, 282, 289, 283, 293, 296, 294, 297, 290, + 294, 285, 298, 297, 300, 301, 295, 298, 296, 302, + 301, 303, 304, 304, 302, 307, 305, 310, 300, 308, + 303, 305, 308, 309, 311, 312, 317, 315, 313, 311, + 312, 313, 316, 316, 307, 318, 310, 320, 319, 322, + 309, 315, 319, 321, 317, 324, 325, 325, 318, 327, + 324, 326, 321, 327, 320, 328, 326, 329, 330, 331, + 332, 333, 336, 322, 334, 338, 342, 339, 676, 328, + 343, 329, 339, 334, 332, 336, 331, 337, 330, 342, + + 333, 340, 340, 341, 338, 337, 344, 343, 341, 345, + 347, 344, 346, 348, 345, 353, 346, 356, 349, 347, + 350, 350, 354, 347, 356, 347, 349, 347, 351, 351, + 354, 348, 352, 352, 353, 355, 358, 359, 360, 361, + 355, 358, 359, 360, 362, 363, 363, 364, 361, 367, + 366, 368, 369, 367, 370, 372, 371, 374, 375, 370, + 669, 373, 362, 371, 380, 369, 364, 366, 376, 368, + 373, 374, 372, 376, 377, 378, 382, 381, 375, 377, + 378, 382, 380, 381, 383, 384, 385, 386, 387, 389, + 389, 388, 390, 390, 391, 395, 396, 397, 395, 391, + + 386, 399, 383, 384, 385, 388, 398, 398, 387, 401, + 396, 400, 400, 402, 403, 405, 406, 402, 407, 401, + 399, 397, 408, 409, 410, 410, 411, 412, 409, 413, + 414, 411, 403, 415, 405, 407, 417, 416, 418, 668, + 406, 408, 416, 414, 420, 415, 412, 419, 413, 421, + 422, 424, 424, 420, 425, 417, 419, 418, 419, 422, + 423, 422, 426, 427, 428, 423, 430, 421, 431, 432, + 433, 430, 435, 425, 426, 436, 431, 428, 437, 436, + 427, 439, 438, 437, 440, 448, 432, 438, 433, 441, + 439, 435, 442, 442, 441, 440, 443, 443, 444, 444, + + 446, 447, 449, 449, 451, 446, 447, 450, 452, 448, + 453, 454, 450, 455, 455, 451, 456, 451, 458, 457, + 459, 459, 451, 456, 460, 462, 463, 452, 457, 453, + 462, 463, 464, 465, 466, 472, 454, 467, 665, 460, + 465, 468, 467, 458, 469, 468, 468, 470, 473, 469, + 471, 464, 466, 473, 471, 474, 475, 475, 470, 472, + 476, 476, 480, 481, 484, 481, 482, 482, 485, 485, + 486, 476, 490, 487, 488, 489, 474, 490, 480, 491, + 493, 491, 497, 484, 487, 488, 489, 492, 492, 494, + 486, 495, 496, 495, 494, 498, 662, 496, 500, 497, + + 499, 499, 501, 500, 502, 493, 503, 506, 506, 505, + 508, 501, 503, 501, 498, 505, 507, 509, 510, 502, + 512, 509, 513, 510, 512, 507, 514, 515, 508, 517, + 518, 519, 517, 520, 520, 524, 513, 521, 521, 522, + 522, 528, 518, 519, 523, 523, 514, 515, 529, 526, + 527, 527, 530, 524, 526, 533, 533, 531, 530, 528, + 531, 534, 535, 535, 536, 529, 537, 538, 540, 543, + 541, 542, 542, 544, 543, 537, 538, 544, 536, 541, + 545, 548, 547, 545, 546, 549, 534, 540, 547, 546, + 549, 550, 551, 561, 551, 569, 548, 555, 555, 550, + + 556, 556, 558, 558, 559, 560, 560, 563, 561, 559, + 565, 564, 563, 564, 566, 567, 570, 571, 568, 572, + 569, 565, 573, 573, 574, 566, 567, 568, 575, 571, + 576, 576, 577, 578, 579, 570, 572, 577, 583, 584, + 587, 574, 584, 585, 585, 588, 575, 578, 586, 586, + 589, 590, 579, 591, 588, 589, 590, 583, 587, 592, + 593, 594, 596, 595, 592, 593, 600, 591, 595, 597, + 598, 601, 603, 596, 611, 594, 602, 602, 597, 598, + 603, 604, 607, 607, 600, 608, 604, 611, 608, 601, + 609, 609, 610, 610, 612, 613, 613, 614, 615, 612, + + 616, 614, 617, 618, 619, 620, 622, 617, 616, 623, + 623, 625, 629, 619, 628, 628, 615, 631, 632, 633, + 634, 629, 631, 622, 620, 635, 636, 637, 618, 638, + 635, 640, 640, 633, 638, 625, 632, 641, 634, 642, + 643, 643, 644, 644, 645, 637, 646, 646, 641, 647, + 647, 636, 648, 649, 649, 650, 650, 648, 642, 652, + 652, 653, 645, 656, 659, 659, 653, 661, 663, 664, + 664, 661, 666, 666, 667, 667, 670, 671, 672, 674, + 673, 660, 656, 675, 675, 663, 671, 658, 657, 655, + 654, 651, 672, 673, 639, 670, 630, 674, 678, 678, + + 678, 678, 679, 679, 679, 679, 680, 680, 680, 680, + 682, 682, 627, 682, 683, 683, 685, 685, 686, 686, + 626, 686, 624, 621, 606, 605, 599, 582, 581, 580, + 562, 557, 554, 553, 552, 539, 532, 525, 516, 511, + 504, 483, 479, 478, 477, 461, 445, 434, 429, 404, + 394, 393, 392, 379, 365, 357, 335, 323, 306, 299, + 292, 266, 243, 242, 240, 239, 237, 176, 171, 85, + 84, 82, 80, 46, 42, 38, 37, 32, 10, 9, + 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + + 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + 677, 677, 677, 677, 677, 677, 677, 677 } ; static yy_state_type yy_last_accepting_state; @@ -1062,7 +1073,7 @@ static void config_end_include(void) #endif -#line 1065 "" +#line 1076 "" #define INITIAL 0 #define quotedstring 1 @@ -1218,7 +1229,7 @@ YY_DECL #line 98 "util/configlexer.lex" -#line 1221 "" +#line 1232 "" if ( !(yy_init) ) { @@ -1277,13 +1288,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 >= 665 ) + if ( yy_current_state >= 678 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 1354 ); + while ( yy_base[yy_current_state] != 1381 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1445,211 +1456,216 @@ YY_RULE_SETUP case 28: YY_RULE_SETUP #line 126 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_HOST_TTL;} +{ YDOUT; return VAR_CACHE_MAX_TTL;} YY_BREAK case 29: YY_RULE_SETUP #line 127 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_LAME_TTL;} +{ YDOUT; return VAR_INFRA_HOST_TTL;} YY_BREAK case 30: YY_RULE_SETUP #line 128 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_CACHE_SLABS;} +{ YDOUT; return VAR_INFRA_LAME_TTL;} YY_BREAK case 31: YY_RULE_SETUP #line 129 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_CACHE_NUMHOSTS;} +{ YDOUT; return VAR_INFRA_CACHE_SLABS;} YY_BREAK case 32: YY_RULE_SETUP #line 130 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_CACHE_LAME_SIZE;} +{ YDOUT; return VAR_INFRA_CACHE_NUMHOSTS;} YY_BREAK case 33: YY_RULE_SETUP #line 131 "util/configlexer.lex" -{ YDOUT; return VAR_NUM_QUERIES_PER_THREAD;} +{ YDOUT; return VAR_INFRA_CACHE_LAME_SIZE;} YY_BREAK case 34: YY_RULE_SETUP #line 132 "util/configlexer.lex" -{ YDOUT; return VAR_TARGET_FETCH_POLICY;} +{ YDOUT; return VAR_NUM_QUERIES_PER_THREAD;} YY_BREAK case 35: YY_RULE_SETUP #line 133 "util/configlexer.lex" -{ YDOUT; return VAR_HARDEN_SHORT_BUFSIZE;} +{ YDOUT; return VAR_TARGET_FETCH_POLICY;} YY_BREAK case 36: YY_RULE_SETUP #line 134 "util/configlexer.lex" -{ YDOUT; return VAR_HARDEN_LARGE_QUERIES;} +{ YDOUT; return VAR_HARDEN_SHORT_BUFSIZE;} YY_BREAK case 37: YY_RULE_SETUP #line 135 "util/configlexer.lex" -{ YDOUT; return VAR_HARDEN_GLUE;} +{ YDOUT; return VAR_HARDEN_LARGE_QUERIES;} YY_BREAK case 38: YY_RULE_SETUP #line 136 "util/configlexer.lex" -{ YDOUT; return VAR_STUB_ZONE;} +{ YDOUT; return VAR_HARDEN_GLUE;} YY_BREAK case 39: YY_RULE_SETUP #line 137 "util/configlexer.lex" -{ YDOUT; return VAR_NAME;} +{ YDOUT; return VAR_STUB_ZONE;} YY_BREAK case 40: YY_RULE_SETUP #line 138 "util/configlexer.lex" -{ YDOUT; return VAR_STUB_ADDR;} +{ YDOUT; return VAR_NAME;} YY_BREAK case 41: YY_RULE_SETUP #line 139 "util/configlexer.lex" -{ YDOUT; return VAR_STUB_HOST;} +{ YDOUT; return VAR_STUB_ADDR;} YY_BREAK case 42: YY_RULE_SETUP #line 140 "util/configlexer.lex" -{ YDOUT; return VAR_FORWARD_ZONE;} +{ YDOUT; return VAR_STUB_HOST;} YY_BREAK case 43: YY_RULE_SETUP #line 141 "util/configlexer.lex" -{ YDOUT; return VAR_FORWARD_ADDR;} +{ YDOUT; return VAR_FORWARD_ZONE;} YY_BREAK case 44: YY_RULE_SETUP #line 142 "util/configlexer.lex" -{ YDOUT; return VAR_FORWARD_HOST;} +{ YDOUT; return VAR_FORWARD_ADDR;} YY_BREAK case 45: YY_RULE_SETUP #line 143 "util/configlexer.lex" -{ YDOUT; return VAR_DO_NOT_QUERY_ADDRESS;} +{ YDOUT; return VAR_FORWARD_HOST;} YY_BREAK case 46: YY_RULE_SETUP #line 144 "util/configlexer.lex" -{ YDOUT; return VAR_DO_NOT_QUERY_LOCALHOST;} +{ YDOUT; return VAR_DO_NOT_QUERY_ADDRESS;} YY_BREAK case 47: YY_RULE_SETUP #line 145 "util/configlexer.lex" -{ YDOUT; return VAR_HIDE_IDENTITY;} +{ YDOUT; return VAR_DO_NOT_QUERY_LOCALHOST;} YY_BREAK case 48: YY_RULE_SETUP #line 146 "util/configlexer.lex" -{ YDOUT; return VAR_HIDE_VERSION;} +{ YDOUT; return VAR_HIDE_IDENTITY;} YY_BREAK case 49: YY_RULE_SETUP #line 147 "util/configlexer.lex" -{ YDOUT; return VAR_IDENTITY;} +{ YDOUT; return VAR_HIDE_VERSION;} YY_BREAK case 50: YY_RULE_SETUP #line 148 "util/configlexer.lex" -{ YDOUT; return VAR_VERSION;} +{ YDOUT; return VAR_IDENTITY;} YY_BREAK case 51: YY_RULE_SETUP #line 149 "util/configlexer.lex" -{ YDOUT; return VAR_MODULE_CONF;} +{ YDOUT; return VAR_VERSION;} YY_BREAK case 52: YY_RULE_SETUP #line 150 "util/configlexer.lex" -{ YDOUT; return VAR_TRUST_ANCHOR_FILE;} +{ YDOUT; return VAR_MODULE_CONF;} YY_BREAK case 53: YY_RULE_SETUP #line 151 "util/configlexer.lex" -{ YDOUT; return VAR_TRUSTED_KEYS_FILE;} +{ YDOUT; return VAR_TRUST_ANCHOR_FILE;} YY_BREAK case 54: YY_RULE_SETUP #line 152 "util/configlexer.lex" -{ YDOUT; return VAR_TRUST_ANCHOR;} +{ YDOUT; return VAR_TRUSTED_KEYS_FILE;} YY_BREAK case 55: YY_RULE_SETUP #line 153 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_OVERRIDE_DATE;} +{ YDOUT; return VAR_TRUST_ANCHOR;} YY_BREAK case 56: YY_RULE_SETUP #line 154 "util/configlexer.lex" -{ YDOUT; return VAR_BOGUS_TTL;} +{ YDOUT; return VAR_VAL_OVERRIDE_DATE;} YY_BREAK case 57: YY_RULE_SETUP #line 155 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_CLEAN_ADDITIONAL;} +{ YDOUT; return VAR_BOGUS_TTL;} YY_BREAK case 58: YY_RULE_SETUP #line 156 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_PERMISSIVE_MODE;} +{ YDOUT; return VAR_VAL_CLEAN_ADDITIONAL;} YY_BREAK case 59: YY_RULE_SETUP #line 157 "util/configlexer.lex" -{ YDOUT; return VAR_KEY_CACHE_SIZE;} +{ YDOUT; return VAR_VAL_PERMISSIVE_MODE;} YY_BREAK case 60: YY_RULE_SETUP #line 158 "util/configlexer.lex" -{ YDOUT; return VAR_KEY_CACHE_SLABS;} +{ YDOUT; return VAR_KEY_CACHE_SIZE;} YY_BREAK case 61: YY_RULE_SETUP #line 159 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_NSEC3_KEYSIZE_ITERATIONS;} +{ YDOUT; return VAR_KEY_CACHE_SLABS;} YY_BREAK case 62: YY_RULE_SETUP #line 160 "util/configlexer.lex" -{ YDOUT; return VAR_USE_SYSLOG;} +{ YDOUT; return VAR_VAL_NSEC3_KEYSIZE_ITERATIONS;} YY_BREAK case 63: -/* rule 63 can match eol */ YY_RULE_SETUP #line 161 "util/configlexer.lex" +{ YDOUT; return VAR_USE_SYSLOG;} + YY_BREAK +case 64: +/* rule 64 can match eol */ +YY_RULE_SETUP +#line 162 "util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 64: +case 65: YY_RULE_SETUP -#line 164 "util/configlexer.lex" +#line 165 "util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 165 "util/configlexer.lex" +#line 166 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 65: -YY_RULE_SETUP -#line 169 "util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 66: -/* rule 66 can match eol */ YY_RULE_SETUP #line 170 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK case 67: +/* rule 67 can match eol */ YY_RULE_SETUP #line 171 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 68: +YY_RULE_SETUP +#line 172 "util/configlexer.lex" { LEXOUT(("QE ")); BEGIN(INITIAL); @@ -1661,37 +1677,37 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 68: +case 69: YY_RULE_SETUP -#line 182 "util/configlexer.lex" +#line 183 "util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 183 "util/configlexer.lex" +#line 184 "util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(INITIAL); } YY_BREAK -case 69: -YY_RULE_SETUP -#line 187 "util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 70: -/* rule 70 can match eol */ YY_RULE_SETUP #line 188 "util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 71: +/* rule 71 can match eol */ YY_RULE_SETUP #line 189 "util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 72: YY_RULE_SETUP #line 190 "util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 73: +YY_RULE_SETUP +#line 191 "util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include(yytext); @@ -1699,26 +1715,26 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 195 "util/configlexer.lex" +#line 196 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 73: -YY_RULE_SETUP -#line 199 "util/configlexer.lex" -{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } - YY_BREAK case 74: -/* rule 74 can match eol */ YY_RULE_SETUP #line 200 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK case 75: +/* rule 75 can match eol */ YY_RULE_SETUP #line 201 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 76: +YY_RULE_SETUP +#line 202 "util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -1727,7 +1743,7 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 207 "util/configlexer.lex" +#line 208 "util/configlexer.lex" { yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ if (config_include_stack_ptr == 0) { @@ -1738,18 +1754,18 @@ case YY_STATE_EOF(INITIAL): } } YY_BREAK -case 76: +case 77: YY_RULE_SETUP -#line 217 "util/configlexer.lex" +#line 218 "util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); yylval.str = strdup(yytext); return STRING; } YY_BREAK -case 77: +case 78: YY_RULE_SETUP -#line 220 "util/configlexer.lex" +#line 221 "util/configlexer.lex" ECHO; YY_BREAK -#line 1752 "" +#line 1768 "" case YY_END_OF_BUFFER: { @@ -2031,7 +2047,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 665 ) + if ( yy_current_state >= 678 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2059,11 +2075,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 >= 665 ) + if ( yy_current_state >= 678 ) 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 == 664); + yy_is_jam = (yy_current_state == 677); return yy_is_jam ? 0 : yy_current_state; } @@ -2696,7 +2712,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 220 "util/configlexer.lex" +#line 221 "util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 621857e2f..da01927ef 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -123,6 +123,7 @@ msg-cache-size{COLON} { YDOUT; return VAR_MSG_CACHE_SIZE;} msg-cache-slabs{COLON} { YDOUT; return VAR_MSG_CACHE_SLABS;} rrset-cache-size{COLON} { YDOUT; return VAR_RRSET_CACHE_SIZE;} rrset-cache-slabs{COLON} { YDOUT; return VAR_RRSET_CACHE_SLABS;} +cache-max-ttl{COLON} { YDOUT; return VAR_CACHE_MAX_TTL;} infra-host-ttl{COLON} { YDOUT; return VAR_INFRA_HOST_TTL;} infra-lame-ttl{COLON} { YDOUT; return VAR_INFRA_LAME_TTL;} infra-cache-slabs{COLON} { YDOUT; return VAR_INFRA_CACHE_SLABS;} diff --git a/util/configparser.c b/util/configparser.c index c92cc62f9..a6528e857 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -133,7 +133,8 @@ VAR_USE_SYSLOG = 322, VAR_OUTGOING_INTERFACE = 323, VAR_ROOT_HINTS = 324, - VAR_DO_NOT_QUERY_LOCALHOST = 325 + VAR_DO_NOT_QUERY_LOCALHOST = 325, + VAR_CACHE_MAX_TTL = 326 }; #endif /* Tokens. */ @@ -205,6 +206,7 @@ #define VAR_OUTGOING_INTERFACE 323 #define VAR_ROOT_HINTS 324 #define VAR_DO_NOT_QUERY_LOCALHOST 325 +#define VAR_CACHE_MAX_TTL 326 @@ -263,7 +265,7 @@ typedef union YYSTYPE char* str; } /* Line 187 of yacc.c. */ -#line 267 "util/configparser.c" +#line 269 "util/configparser.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -276,7 +278,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 280 "util/configparser.c" +#line 282 "util/configparser.c" #ifdef short # undef short @@ -491,20 +493,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 120 +#define YYLAST 123 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 71 +#define YYNTOKENS 72 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 70 +#define YYNNTS 71 /* YYNRULES -- Number of rules. */ -#define YYNRULES 131 +#define YYNRULES 133 /* YYNRULES -- Number of states. */ -#define YYNSTATES 190 +#define YYNSTATES 193 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 325 +#define YYMAXUTOK 326 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -544,7 +546,7 @@ static const yytype_uint8 yytranslate[] = 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70 + 65, 66, 67, 68, 69, 70, 71 }; #if YYDEBUG @@ -558,71 +560,71 @@ static const yytype_uint16 yyprhs[] = 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, - 122, 124, 126, 128, 131, 132, 134, 136, 138, 140, - 143, 144, 146, 148, 150, 153, 156, 159, 162, 165, - 168, 171, 174, 177, 180, 183, 186, 189, 192, 195, - 198, 201, 204, 207, 210, 213, 216, 219, 222, 225, - 228, 231, 234, 237, 240, 243, 246, 249, 252, 255, - 258, 261, 264, 267, 270, 273, 276, 279, 282, 285, - 288, 291, 294, 297, 300, 303, 306, 309, 312, 315, - 318, 321 + 122, 124, 126, 128, 130, 133, 134, 136, 138, 140, + 142, 145, 146, 148, 150, 152, 155, 158, 161, 164, + 167, 170, 173, 176, 179, 182, 185, 188, 191, 194, + 197, 200, 203, 206, 209, 212, 215, 218, 221, 224, + 227, 230, 233, 236, 239, 242, 245, 248, 251, 254, + 257, 260, 263, 266, 269, 272, 275, 278, 281, 284, + 287, 290, 293, 296, 299, 302, 305, 308, 311, 314, + 317, 320, 323, 326 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 72, 0, -1, -1, 72, 73, -1, 74, 75, -1, - 77, 78, -1, 80, 81, -1, 11, -1, 75, 76, - -1, -1, 83, -1, 84, -1, 85, -1, 88, -1, - 89, -1, 92, -1, 93, -1, 94, -1, 95, -1, - 86, -1, 97, -1, 98, -1, 99, -1, 100, -1, - 101, -1, 111, -1, 112, -1, 113, -1, 114, -1, - 115, -1, 90, -1, 116, -1, 117, -1, 120, -1, - 118, -1, 119, -1, 121, -1, 122, -1, 123, -1, - 125, -1, 106, -1, 107, -1, 108, -1, 109, -1, - 124, -1, 127, -1, 103, -1, 105, -1, 128, -1, - 129, -1, 130, -1, 131, -1, 91, -1, 110, -1, - 133, -1, 134, -1, 104, -1, 132, -1, 96, -1, - 87, -1, 102, -1, 126, -1, 39, -1, 78, 79, - -1, -1, 135, -1, 136, -1, 137, -1, 45, -1, - 81, 82, -1, -1, 138, -1, 139, -1, 140, -1, - 13, 10, -1, 12, 10, -1, 14, 10, -1, 17, - 10, -1, 68, 10, -1, 15, 10, -1, 16, 10, - -1, 32, 10, -1, 61, 10, -1, 18, 10, -1, - 19, 10, -1, 20, 10, -1, 21, 10, -1, 67, - 10, -1, 22, 10, -1, 23, 10, -1, 24, 10, - -1, 25, 10, -1, 26, 10, -1, 69, 10, -1, - 55, 10, -1, 65, 10, -1, 56, 10, -1, 49, - 10, -1, 50, 10, -1, 51, 10, -1, 52, 10, - -1, 62, 10, -1, 27, 10, -1, 28, 10, -1, - 29, 10, -1, 30, 10, -1, 31, 10, -1, 33, - 10, -1, 34, 10, -1, 36, 10, -1, 37, 10, - -1, 35, 10, -1, 42, 10, -1, 43, 10, -1, - 44, 10, -1, 53, 10, -1, 48, 10, -1, 70, - 10, -1, 54, 10, -1, 57, 10, -1, 58, 10, - -1, 59, 10, -1, 60, 10, -1, 66, 10, -1, - 63, 10, -1, 64, 10, -1, 38, 10, -1, 40, - 10, -1, 41, 10, -1, 38, 10, -1, 46, 10, - -1, 47, 10, -1 + 73, 0, -1, -1, 73, 74, -1, 75, 76, -1, + 78, 79, -1, 81, 82, -1, 11, -1, 76, 77, + -1, -1, 84, -1, 85, -1, 86, -1, 89, -1, + 90, -1, 93, -1, 94, -1, 95, -1, 96, -1, + 87, -1, 98, -1, 99, -1, 100, -1, 101, -1, + 102, -1, 112, -1, 113, -1, 114, -1, 115, -1, + 116, -1, 91, -1, 117, -1, 118, -1, 121, -1, + 119, -1, 120, -1, 122, -1, 123, -1, 124, -1, + 126, -1, 107, -1, 108, -1, 109, -1, 110, -1, + 125, -1, 128, -1, 104, -1, 106, -1, 129, -1, + 131, -1, 132, -1, 133, -1, 92, -1, 111, -1, + 135, -1, 136, -1, 105, -1, 134, -1, 97, -1, + 88, -1, 103, -1, 127, -1, 130, -1, 39, -1, + 79, 80, -1, -1, 137, -1, 138, -1, 139, -1, + 45, -1, 82, 83, -1, -1, 140, -1, 141, -1, + 142, -1, 13, 10, -1, 12, 10, -1, 14, 10, + -1, 17, 10, -1, 68, 10, -1, 15, 10, -1, + 16, 10, -1, 32, 10, -1, 61, 10, -1, 18, + 10, -1, 19, 10, -1, 20, 10, -1, 21, 10, + -1, 67, 10, -1, 22, 10, -1, 23, 10, -1, + 24, 10, -1, 25, 10, -1, 26, 10, -1, 69, + 10, -1, 55, 10, -1, 65, 10, -1, 56, 10, + -1, 49, 10, -1, 50, 10, -1, 51, 10, -1, + 52, 10, -1, 62, 10, -1, 27, 10, -1, 28, + 10, -1, 29, 10, -1, 30, 10, -1, 31, 10, + -1, 33, 10, -1, 34, 10, -1, 36, 10, -1, + 37, 10, -1, 35, 10, -1, 42, 10, -1, 43, + 10, -1, 44, 10, -1, 53, 10, -1, 48, 10, + -1, 70, 10, -1, 54, 10, -1, 57, 10, -1, + 71, 10, -1, 58, 10, -1, 59, 10, -1, 60, + 10, -1, 66, 10, -1, 63, 10, -1, 64, 10, + -1, 38, 10, -1, 40, 10, -1, 41, 10, -1, + 38, 10, -1, 46, 10, -1, 47, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 91, 91, 91, 92, 92, 93, 97, 102, 103, - 104, 104, 104, 105, 105, 105, 106, 106, 106, 107, - 107, 107, 108, 108, 108, 109, 109, 110, 110, 111, - 111, 112, 112, 113, 113, 114, 114, 115, 115, 116, - 116, 117, 117, 117, 118, 118, 118, 119, 119, 119, - 120, 120, 121, 121, 122, 122, 123, 123, 124, 124, - 124, 125, 127, 139, 140, 141, 141, 141, 143, 155, - 156, 157, 157, 157, 159, 168, 177, 186, 199, 214, - 223, 232, 241, 250, 259, 268, 277, 286, 300, 307, - 314, 321, 329, 336, 343, 351, 359, 366, 375, 384, - 391, 398, 409, 418, 431, 440, 449, 462, 471, 480, - 489, 498, 511, 518, 528, 538, 548, 555, 565, 572, - 590, 599, 609, 619, 626, 635, 648, 655, 662, 669, - 676, 683 + 0, 92, 92, 92, 93, 93, 94, 98, 103, 104, + 105, 105, 105, 106, 106, 106, 107, 107, 107, 108, + 108, 108, 109, 109, 109, 110, 110, 111, 111, 112, + 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, + 117, 118, 118, 118, 119, 119, 119, 120, 120, 120, + 121, 121, 122, 122, 123, 123, 124, 124, 125, 125, + 125, 126, 126, 128, 140, 141, 142, 142, 142, 144, + 156, 157, 158, 158, 158, 160, 169, 178, 187, 200, + 215, 224, 233, 242, 251, 260, 269, 278, 287, 301, + 308, 315, 322, 330, 337, 344, 352, 360, 367, 376, + 385, 392, 399, 410, 419, 432, 441, 450, 463, 472, + 481, 490, 499, 512, 519, 529, 539, 549, 556, 566, + 573, 591, 600, 609, 619, 629, 636, 645, 658, 665, + 672, 679, 686, 693 }; #endif @@ -652,15 +654,15 @@ static const char *const yytname[] = "VAR_KEY_CACHE_SIZE", "VAR_KEY_CACHE_SLABS", "VAR_TRUSTED_KEYS_FILE", "VAR_VAL_NSEC3_KEYSIZE_ITERATIONS", "VAR_USE_SYSLOG", "VAR_OUTGOING_INTERFACE", "VAR_ROOT_HINTS", "VAR_DO_NOT_QUERY_LOCALHOST", - "$accept", "toplevelvars", "toplevelvar", "serverstart", - "contents_server", "content_server", "stubstart", "contents_stub", - "content_stub", "forwardstart", "contents_forward", "content_forward", - "server_num_threads", "server_verbosity", "server_port", - "server_interface", "server_outgoing_interface", "server_outgoing_port", - "server_outgoing_range", "server_outgoing_num_tcp", - "server_incoming_num_tcp", "server_do_ip4", "server_do_ip6", - "server_do_udp", "server_do_tcp", "server_use_syslog", "server_chroot", - "server_username", "server_directory", "server_logfile", + "VAR_CACHE_MAX_TTL", "$accept", "toplevelvars", "toplevelvar", + "serverstart", "contents_server", "content_server", "stubstart", + "contents_stub", "content_stub", "forwardstart", "contents_forward", + "content_forward", "server_num_threads", "server_verbosity", + "server_port", "server_interface", "server_outgoing_interface", + "server_outgoing_port", "server_outgoing_range", + "server_outgoing_num_tcp", "server_incoming_num_tcp", "server_do_ip4", + "server_do_ip6", "server_do_udp", "server_do_tcp", "server_use_syslog", + "server_chroot", "server_username", "server_directory", "server_logfile", "server_pidfile", "server_root_hints", "server_trust_anchor_file", "server_trusted_keys_file", "server_trust_anchor", "server_hide_identity", "server_hide_version", "server_identity", @@ -673,7 +675,7 @@ static const char *const yytname[] = "server_harden_short_bufsize", "server_harden_large_queries", "server_harden_glue", "server_do_not_query_address", "server_do_not_query_localhost", "server_module_conf", - "server_val_override_date", "server_bogus_ttl", + "server_val_override_date", "server_cache_max_ttl", "server_bogus_ttl", "server_val_clean_additional", "server_val_permissive_mode", "server_val_nsec3_keysize_iterations", "server_key_cache_size", "server_key_cache_slabs", "stub_name", "stub_host", "stub_addr", @@ -693,27 +695,27 @@ static const yytype_uint16 yytoknum[] = 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 + 325, 326 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 71, 72, 72, 73, 73, 73, 74, 75, 75, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 77, 78, 78, 79, 79, 79, 80, 81, - 81, 82, 82, 82, 83, 84, 85, 86, 87, 88, + 0, 72, 73, 73, 74, 74, 74, 75, 76, 76, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 78, 79, 79, 80, 80, 80, 81, + 82, 82, 83, 83, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140 + 139, 140, 141, 142 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -725,14 +727,14 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 0, 1, 1, 1, 1, 2, - 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, + 2, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2 + 2, 2, 2, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -740,37 +742,39 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 2, 0, 1, 7, 62, 68, 3, 9, 64, 70, + 2, 0, 1, 7, 63, 69, 3, 9, 65, 71, 4, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 8, 10, 11, 12, 19, - 59, 13, 14, 30, 52, 15, 16, 17, 18, 58, - 20, 21, 22, 23, 24, 60, 46, 56, 47, 40, - 41, 42, 43, 53, 25, 26, 27, 28, 29, 31, - 32, 34, 35, 33, 36, 37, 38, 44, 39, 61, - 45, 48, 49, 50, 51, 57, 54, 55, 0, 0, - 0, 63, 65, 66, 67, 0, 0, 0, 69, 71, - 72, 73, 75, 74, 76, 79, 80, 77, 83, 84, - 85, 86, 88, 89, 90, 91, 92, 102, 103, 104, - 105, 106, 81, 107, 108, 111, 109, 110, 112, 113, - 114, 116, 97, 98, 99, 100, 115, 118, 94, 96, - 119, 120, 121, 122, 82, 101, 124, 125, 95, 123, - 87, 78, 93, 117, 126, 127, 128, 129, 130, 131 + 0, 0, 0, 0, 0, 0, 8, 10, 11, 12, + 19, 59, 13, 14, 30, 52, 15, 16, 17, 18, + 58, 20, 21, 22, 23, 24, 60, 46, 56, 47, + 40, 41, 42, 43, 53, 25, 26, 27, 28, 29, + 31, 32, 34, 35, 33, 36, 37, 38, 44, 39, + 61, 45, 48, 62, 49, 50, 51, 57, 54, 55, + 0, 0, 0, 64, 66, 67, 68, 0, 0, 0, + 70, 72, 73, 74, 76, 75, 77, 80, 81, 78, + 84, 85, 86, 87, 89, 90, 91, 92, 93, 103, + 104, 105, 106, 107, 82, 108, 109, 112, 110, 111, + 113, 114, 115, 117, 98, 99, 100, 101, 116, 119, + 95, 97, 120, 122, 123, 124, 83, 102, 126, 127, + 96, 125, 88, 79, 94, 118, 121, 128, 129, 130, + 131, 132, 133 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 6, 7, 10, 65, 8, 11, 121, 9, - 12, 128, 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, 100, 101, 102, 103, - 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 122, 123, 124, 129, 130, 131 + -1, 1, 6, 7, 10, 66, 8, 11, 123, 9, + 12, 130, 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, 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 124, 125, 126, 131, 132, + 133 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -778,25 +782,26 @@ static const yytype_int16 yydefgoto[] = #define YYPACT_NINF -13 static const yytype_int8 yypact[] = { - -13, 59, -13, -13, -13, -13, -13, -13, -13, -13, - -12, 23, 22, 16, 17, 18, 19, 24, 25, 52, - 55, 56, 57, 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, - 89, 90, 91, 92, 93, 95, 96, 97, 98, 99, - 100, 101, 102, 103, 104, -13, -13, -13, -13, -13, + -13, 60, -13, -13, -13, -13, -13, -13, -13, -13, + -12, 24, 23, 16, 17, 18, 19, 25, 53, 56, + 57, 58, 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, 90, + 91, 92, 93, 94, 96, 97, 98, 99, 100, 101, + 102, 103, 104, 105, 106, 107, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, -13, -13, -13, -13, -13, -13, 105, 106, - 107, -13, -13, -13, -13, 108, 109, 110, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, + 108, 109, 110, -13, -13, -13, -13, 111, 112, 113, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, -13, -13, -13, -13, -13, -13, -13, -13 + -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, + -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, + -13, -13, -13 }; /* YYPGOTO[NTERM-NUM]. */ @@ -808,7 +813,8 @@ static const yytype_int8 yypgoto[] = -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, -13, -13, -13, -13, -13, -13, -13, -13 + -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, + -13 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -820,17 +826,17 @@ static const yytype_uint8 yytable[] = { 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, 132, 133, 134, 135, - 39, 40, 41, 0, 136, 137, 42, 43, 44, 45, + 33, 34, 35, 36, 37, 38, 134, 135, 136, 137, + 39, 40, 41, 0, 0, 138, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 2, - 125, 118, 138, 119, 120, 139, 140, 141, 126, 127, - 3, 142, 143, 144, 145, 146, 147, 148, 149, 150, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 2, 127, 120, 139, 121, 122, 140, 141, 142, 128, + 129, 3, 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, 4, 169, - 170, 171, 172, 173, 5, 174, 175, 176, 177, 178, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 4, + 170, 171, 172, 173, 174, 5, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189 + 189, 190, 191, 192 }; static const yytype_int8 yycheck[] = @@ -838,41 +844,42 @@ static const yytype_int8 yycheck[] = 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, 10, 10, 10, 10, - 42, 43, 44, -1, 10, 10, 48, 49, 50, 51, + 42, 43, 44, -1, -1, 10, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 0, - 38, 38, 10, 40, 41, 10, 10, 10, 46, 47, - 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 0, 38, 38, 10, 40, 41, 10, 10, 10, 46, + 47, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 39, 10, - 10, 10, 10, 10, 45, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 39, + 10, 10, 10, 10, 10, 45, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10 + 10, 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 72, 0, 11, 39, 45, 73, 74, 77, 80, - 75, 78, 81, 12, 13, 14, 15, 16, 17, 18, + 0, 73, 0, 11, 39, 45, 74, 75, 78, 81, + 76, 79, 82, 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, 42, 43, 44, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 76, 83, 84, 85, 86, + 66, 67, 68, 69, 70, 71, 77, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 132, 133, 134, 38, 40, - 41, 79, 135, 136, 137, 38, 46, 47, 82, 138, - 139, 140, 10, 10, 10, 10, 10, 10, 10, 10, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 38, 40, 41, 80, 137, 138, 139, 38, 46, 47, + 83, 140, 141, 142, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 + 10, 10, 10 }; #define yyerrok (yyerrstatus = 0) @@ -1687,14 +1694,14 @@ yyreduce: switch (yyn) { case 7: -#line 98 "util/configparser.y" +#line 99 "util/configparser.y" { OUTYY(("\nP(server:)\n")); } break; - case 62: -#line 128 "util/configparser.y" + case 63: +#line 129 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -1707,8 +1714,8 @@ yyreduce: } break; - case 68: -#line 144 "util/configparser.y" + case 69: +#line 145 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -1721,8 +1728,8 @@ yyreduce: } break; - case 74: -#line 160 "util/configparser.y" + case 75: +#line 161 "util/configparser.y" { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -1732,8 +1739,8 @@ yyreduce: } break; - case 75: -#line 169 "util/configparser.y" + case 76: +#line 170 "util/configparser.y" { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -1743,8 +1750,8 @@ yyreduce: } break; - case 76: -#line 178 "util/configparser.y" + case 77: +#line 179 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1754,8 +1761,8 @@ yyreduce: } break; - case 77: -#line 187 "util/configparser.y" + case 78: +#line 188 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -1769,8 +1776,8 @@ yyreduce: } break; - case 78: -#line 200 "util/configparser.y" + case 79: +#line 201 "util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -1786,8 +1793,8 @@ yyreduce: } break; - case 79: -#line 215 "util/configparser.y" + case 80: +#line 216 "util/configparser.y" { OUTYY(("P(server_outgoing_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1797,8 +1804,8 @@ yyreduce: } break; - case 80: -#line 224 "util/configparser.y" + case 81: +#line 225 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1808,8 +1815,8 @@ yyreduce: } break; - case 81: -#line 233 "util/configparser.y" + case 82: +#line 234 "util/configparser.y" { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -1819,8 +1826,8 @@ yyreduce: } break; - case 82: -#line 242 "util/configparser.y" + case 83: +#line 243 "util/configparser.y" { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -1830,8 +1837,8 @@ yyreduce: } break; - case 83: -#line 251 "util/configparser.y" + case 84: +#line 252 "util/configparser.y" { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1841,8 +1848,8 @@ yyreduce: } break; - case 84: -#line 260 "util/configparser.y" + case 85: +#line 261 "util/configparser.y" { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1852,8 +1859,8 @@ yyreduce: } break; - case 85: -#line 269 "util/configparser.y" + case 86: +#line 270 "util/configparser.y" { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1863,8 +1870,8 @@ yyreduce: } break; - case 86: -#line 278 "util/configparser.y" + case 87: +#line 279 "util/configparser.y" { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1874,8 +1881,8 @@ yyreduce: } break; - case 87: -#line 287 "util/configparser.y" + case 88: +#line 288 "util/configparser.y" { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1890,8 +1897,8 @@ yyreduce: } break; - case 88: -#line 301 "util/configparser.y" + case 89: +#line 302 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -1899,8 +1906,8 @@ yyreduce: } break; - case 89: -#line 308 "util/configparser.y" + case 90: +#line 309 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -1908,8 +1915,8 @@ yyreduce: } break; - case 90: -#line 315 "util/configparser.y" + case 91: +#line 316 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -1917,8 +1924,8 @@ yyreduce: } break; - case 91: -#line 322 "util/configparser.y" + case 92: +#line 323 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -1927,8 +1934,8 @@ yyreduce: } break; - case 92: -#line 330 "util/configparser.y" + case 93: +#line 331 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -1936,8 +1943,8 @@ yyreduce: } break; - case 93: -#line 337 "util/configparser.y" + case 94: +#line 338 "util/configparser.y" { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[(2) - (2)].str))) @@ -1945,8 +1952,8 @@ yyreduce: } break; - case 94: -#line 344 "util/configparser.y" + case 95: +#line 345 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -1955,8 +1962,8 @@ yyreduce: } break; - case 95: -#line 352 "util/configparser.y" + case 96: +#line 353 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -1965,8 +1972,8 @@ yyreduce: } break; - case 96: -#line 360 "util/configparser.y" + case 97: +#line 361 "util/configparser.y" { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[(2) - (2)].str))) @@ -1974,8 +1981,8 @@ yyreduce: } break; - case 97: -#line 367 "util/configparser.y" + case 98: +#line 368 "util/configparser.y" { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1985,8 +1992,8 @@ yyreduce: } break; - case 98: -#line 376 "util/configparser.y" + case 99: +#line 377 "util/configparser.y" { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1996,8 +2003,8 @@ yyreduce: } break; - case 99: -#line 385 "util/configparser.y" + case 100: +#line 386 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -2005,8 +2012,8 @@ yyreduce: } break; - case 100: -#line 392 "util/configparser.y" + case 101: +#line 393 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -2014,8 +2021,8 @@ yyreduce: } break; - case 101: -#line 399 "util/configparser.y" + case 102: +#line 400 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2027,8 +2034,8 @@ yyreduce: } break; - case 102: -#line 410 "util/configparser.y" + case 103: +#line 411 "util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2038,8 +2045,8 @@ yyreduce: } break; - case 103: -#line 419 "util/configparser.y" + case 104: +#line 420 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2053,8 +2060,8 @@ yyreduce: } break; - case 104: -#line 432 "util/configparser.y" + case 105: +#line 433 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2064,8 +2071,8 @@ yyreduce: } break; - case 105: -#line 441 "util/configparser.y" + case 106: +#line 442 "util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2075,8 +2082,8 @@ yyreduce: } break; - case 106: -#line 450 "util/configparser.y" + case 107: +#line 451 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2090,8 +2097,8 @@ yyreduce: } break; - case 107: -#line 463 "util/configparser.y" + case 108: +#line 464 "util/configparser.y" { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2101,8 +2108,8 @@ yyreduce: } break; - case 108: -#line 472 "util/configparser.y" + case 109: +#line 473 "util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2112,8 +2119,8 @@ yyreduce: } break; - case 109: -#line 481 "util/configparser.y" + case 110: +#line 482 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2123,8 +2130,8 @@ yyreduce: } break; - case 110: -#line 490 "util/configparser.y" + case 111: +#line 491 "util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2134,8 +2141,8 @@ yyreduce: } break; - case 111: -#line 499 "util/configparser.y" + case 112: +#line 500 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2149,8 +2156,8 @@ yyreduce: } break; - case 112: -#line 512 "util/configparser.y" + case 113: +#line 513 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2158,8 +2165,8 @@ yyreduce: } break; - case 113: -#line 519 "util/configparser.y" + case 114: +#line 520 "util/configparser.y" { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2170,8 +2177,8 @@ yyreduce: } break; - case 114: -#line 529 "util/configparser.y" + case 115: +#line 530 "util/configparser.y" { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2182,8 +2189,8 @@ yyreduce: } break; - case 115: -#line 539 "util/configparser.y" + case 116: +#line 540 "util/configparser.y" { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2194,8 +2201,8 @@ yyreduce: } break; - case 116: -#line 549 "util/configparser.y" + case 117: +#line 550 "util/configparser.y" { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[(2) - (2)].str))) @@ -2203,8 +2210,8 @@ yyreduce: } break; - case 117: -#line 556 "util/configparser.y" + case 118: +#line 557 "util/configparser.y" { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2215,8 +2222,8 @@ yyreduce: } break; - case 118: -#line 566 "util/configparser.y" + case 119: +#line 567 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -2224,8 +2231,8 @@ yyreduce: } break; - case 119: -#line 573 "util/configparser.y" + case 120: +#line 574 "util/configparser.y" { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str))); if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) { @@ -2244,8 +2251,19 @@ yyreduce: } break; - case 120: -#line 591 "util/configparser.y" + case 121: +#line 592 "util/configparser.y" + { + OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str))); + if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->max_ttl = atoi((yyvsp[(2) - (2)].str)); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 122: +#line 601 "util/configparser.y" { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2255,8 +2273,8 @@ yyreduce: } break; - case 121: -#line 600 "util/configparser.y" + case 123: +#line 610 "util/configparser.y" { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2267,8 +2285,8 @@ yyreduce: } break; - case 122: -#line 610 "util/configparser.y" + case 124: +#line 620 "util/configparser.y" { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2279,8 +2297,8 @@ yyreduce: } break; - case 123: -#line 620 "util/configparser.y" + case 125: +#line 630 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -2288,8 +2306,8 @@ yyreduce: } break; - case 124: -#line 627 "util/configparser.y" + case 126: +#line 637 "util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2299,8 +2317,8 @@ yyreduce: } break; - case 125: -#line 636 "util/configparser.y" + case 127: +#line 646 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2314,8 +2332,8 @@ yyreduce: } break; - case 126: -#line 649 "util/configparser.y" + case 128: +#line 659 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->stubs->name); @@ -2323,8 +2341,8 @@ yyreduce: } break; - case 127: -#line 656 "util/configparser.y" + case 129: +#line 666 "util/configparser.y" { OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str))) @@ -2332,8 +2350,8 @@ yyreduce: } break; - case 128: -#line 663 "util/configparser.y" + case 130: +#line 673 "util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str))) @@ -2341,8 +2359,8 @@ yyreduce: } break; - case 129: -#line 670 "util/configparser.y" + case 131: +#line 680 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->forwards->name); @@ -2350,8 +2368,8 @@ yyreduce: } break; - case 130: -#line 677 "util/configparser.y" + case 132: +#line 687 "util/configparser.y" { OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str))) @@ -2359,8 +2377,8 @@ yyreduce: } break; - case 131: -#line 684 "util/configparser.y" + case 133: +#line 694 "util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str))) @@ -2370,7 +2388,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2374 "util/configparser.c" +#line 2392 "util/configparser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2584,7 +2602,7 @@ yyreturn: } -#line 690 "util/configparser.y" +#line 700 "util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 3b75248e6..7c6784780 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -106,7 +106,8 @@ VAR_USE_SYSLOG = 322, VAR_OUTGOING_INTERFACE = 323, VAR_ROOT_HINTS = 324, - VAR_DO_NOT_QUERY_LOCALHOST = 325 + VAR_DO_NOT_QUERY_LOCALHOST = 325, + VAR_CACHE_MAX_TTL = 326 }; #endif /* Tokens. */ @@ -178,6 +179,7 @@ #define VAR_OUTGOING_INTERFACE 323 #define VAR_ROOT_HINTS 324 #define VAR_DO_NOT_QUERY_LOCALHOST 325 +#define VAR_CACHE_MAX_TTL 326 @@ -189,7 +191,7 @@ typedef union YYSTYPE char* str; } /* Line 1489 of yacc.c. */ -#line 193 "util/configparser.h" +#line 195 "util/configparser.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 diff --git a/util/configparser.y b/util/configparser.y index b1408dd21..7a2991c58 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -86,6 +86,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_KEY_CACHE_SLABS VAR_TRUSTED_KEYS_FILE %token VAR_VAL_NSEC3_KEYSIZE_ITERATIONS VAR_USE_SYSLOG %token VAR_OUTGOING_INTERFACE VAR_ROOT_HINTS VAR_DO_NOT_QUERY_LOCALHOST +%token VAR_CACHE_MAX_TTL %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -122,7 +123,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_key_cache_size | server_key_cache_slabs | server_trusted_keys_file | server_val_nsec3_keysize_iterations | server_use_syslog | server_outgoing_interface | server_root_hints | - server_do_not_query_localhost + server_do_not_query_localhost | server_cache_max_ttl ; stubstart: VAR_STUB_ZONE { @@ -587,6 +588,15 @@ server_val_override_date: VAR_VAL_OVERRIDE_DATE STRING free($2); } ; +server_cache_max_ttl: VAR_CACHE_MAX_TTL STRING + { + OUTYY(("P(server_cache_max_ttl:%s)\n", $2)); + if(atoi($2) == 0 && strcmp($2, "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->max_ttl = atoi($2); + free($2); + } + ; server_bogus_ttl: VAR_BOGUS_TTL STRING { OUTYY(("P(server_bogus_ttl:%s)\n", $2)); diff --git a/util/data/msgparse.h b/util/data/msgparse.h index 438687c06..c5e258874 100644 --- a/util/data/msgparse.h +++ b/util/data/msgparse.h @@ -70,7 +70,7 @@ struct regional; /** number of buckets in parse rrset hash table. Must be power of 2. */ #define PARSE_TABLE_SIZE 1024 /** Maximum TTL that is allowed. */ -#define MAX_TTL 3600*24*365*10 /* ten years */ +extern uint32_t MAX_TTL; /** Negative cache time (for entries without any RRs.) */ #define NORR_TTL 5 /* seconds */ diff --git a/util/data/msgreply.c b/util/data/msgreply.c index 6c5b8809d..ea524e924 100644 --- a/util/data/msgreply.c +++ b/util/data/msgreply.c @@ -51,6 +51,9 @@ #include "util/data/msgparse.h" #include "util/data/msgencode.h" +/** MAX TTL default for messages and rrsets */ +uint32_t MAX_TTL = 3600 * 24 * 10; /* ten days */ + /** allocate qinfo, return 0 on error */ static int parse_create_qinfo(ldns_buffer* pkt, struct msg_parse* msg, -- 2.47.2