From 896e4fea2a17205bc834e3e6fa4b12feb69dbdd5 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 30 Sep 2008 15:04:32 +0000 Subject: [PATCH] local data PTR shorthand. git-svn-id: file:///svn/unbound/trunk@1277 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 1 + doc/example.conf.in | 5 + doc/plan | 4 +- doc/unbound.conf.5.in | 5 + util/config_file.c | 101 ++++ util/config_file.h | 7 + util/configlexer.c | 1165 +++++++++++++++++++++-------------------- util/configlexer.lex | 1 + util/configparser.c | 724 ++++++++++++------------- util/configparser.h | 6 +- util/configparser.y | 20 +- 11 files changed, 1102 insertions(+), 937 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 3d27a8ed2..994eaa17e 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -6,6 +6,7 @@ - when using stub on localhost (127.0.0.1@10053) unbound works. Like when running NSD to host a local zone, on the same machine. The noprime feature. manpages more explanation. Added a test for it. + - shorthand for reverse PTR, local-data-ptr: "1.2.3.4 www.ex.com" 29 September 2008: Wouter - EDNS lameness detection, if EDNS packets are dropped this is diff --git a/doc/example.conf.in b/doc/example.conf.in index 52ca070e8..345c005dc 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -368,6 +368,11 @@ server: # (this makes example.com, www.example.com, etc, all go to 192.0.2.3) # local-zone: "example.com" redirect # local-data: "example.com A 192.0.2.3" + # + # Shorthand to make PTR records, "IPv4 name" or "IPv6 name". + # You can also add PTR records using local-data directly, but then + # you need to do the reverse notation yourself. + # local-data-ptr: "192.0.2.3 www.example.com" # Remote control config section. remote-control: diff --git a/doc/plan b/doc/plan index faeaa934a..281f6313b 100644 --- a/doc/plan +++ b/doc/plan @@ -67,9 +67,9 @@ not stats on SIGUSR1. perhaps also see which slow auth servers cause >1sec value * negative caching to avoid DS queries, NSEC, NSEC3 (w params). + SHA256 supported fully. + Make stub to localhost on different port work. -* IPv6 reverse, IP4 reverse local-data shorthand for PTR records (?). ++ IPv6 reverse, IP4 reverse local-data shorthand for PTR records (?). cumbersome to reverse notate by hand for the operator. For local-data. - local-reverse-data: "1.2.3.4 mypc.example.com" + local-data-ptr: "1.2.3.4 mypc.example.com" * dns-0x20 fallback TODO item. Consider. *** from draft resolver-mitigation diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index c62db50ee..12e3869fe 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -674,6 +674,11 @@ local\-data: 'example. TXT "text"'. If you need more complicated authoritative data, with referrals, wildcards, CNAME/DNAME support, or DNSSEC authoritative service, setup a stub\-zone for it as detailed in the stub zone section below. +.TP 5 +.B local\-data\-ptr: \fI"IPaddr name" +Configure local data shorthand for a PTR record with the reversed IPv4 or +IPv6 address and the host name. For example "192.0.2.4 www.example.com". +TTL can be inserted like this: "2001:DB8::4 7200 www.example.com" .SS "Remote Control Options" In the .B remote\-control: diff --git a/util/config_file.c b/util/config_file.c index 108e844b4..cc885fd91 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -890,3 +890,104 @@ fname_after_chroot(const char* fname, struct config_file* cfg, int use_chdir) return buf; } +/** return next space character in string */ +static char* next_space_pos(char* str) +{ + char* sp = strchr(str, ' '); + char* tab = strchr(str, '\t'); + if(!tab && !sp) + return NULL; + if(!sp) return tab; + if(!tab) return sp; + return (sptab)?sp:tab; +} + +char* cfg_ptr_reverse(char* str) +{ + char* ip, *ip_end; + char* name; + char* result; + char buf[1024]; + struct sockaddr_storage addr; + socklen_t addrlen; + + /* parse it as: [IP] [between stuff] [name] */ + ip = str; + while(*ip && isspace(*ip)) + ip++; + if(!*ip) { + log_err("syntax error: too short: %s", str); + return NULL; + } + ip_end = next_space_pos(ip); + if(!ip_end || !*ip_end) { + log_err("syntax error: expected name: %s", str); + return NULL; + } + + name = last_space_pos(ip_end); + if(!name || !*name) { + log_err("syntax error: expected name: %s", str); + return NULL; + } + + sscanf(ip, "%100s", buf); + buf[sizeof(buf)-1]=0; + + if(!ipstrtoaddr(buf, UNBOUND_DNS_PORT, &addr, &addrlen)) { + log_err("syntax error: cannot parse address: %s", str); + return NULL; + } + + /* reverse IPv4: + * ddd.ddd.ddd.ddd.in-addr-arpa. + * IPv6: (h.){32}.ip6.arpa. */ + + if(addr_is_ip6(&addr, addrlen)) { + struct in6_addr* ad = &((struct sockaddr_in6*)&addr)->sin6_addr; + char* hex = "0123456789abcdef"; + char *p = buf; + int i; + for(i=15; i>=0; i--) { + uint8_t b = ((uint8_t*)ad)[i]; + *p++ = hex[ (b&0x0f) ]; + *p++ = '.'; + *p++ = hex[ (b&0xf0) >> 4 ]; + *p++ = '.'; + } + snprintf(buf+16*4, sizeof(buf)-16*4, "ip6.arpa. "); + } else { + struct in_addr* ad = &((struct sockaddr_in*)&addr)->sin_addr; + snprintf(buf, sizeof(buf), "%u.%u.%u.%u.in-addr.arpa. ", + (unsigned)((uint8_t*)ad)[3], (unsigned)((uint8_t*)ad)[2], + (unsigned)((uint8_t*)ad)[1], (unsigned)((uint8_t*)ad)[0]); + } + + /* printed the reverse address, now the between goop and name on end */ + while(*ip_end && isspace(*ip_end)) + ip_end++; + if(name>ip_end) { + snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%.*s", + (int)(name-ip_end), ip_end); + } + snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), " PTR %s", name); + + result = strdup(buf); + if(!result) { + log_err("out of memory parsing %s", str); + return NULL; + } + return result; +} diff --git a/util/config_file.h b/util/config_file.h index 65121a1d5..e055d932e 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -421,6 +421,13 @@ int cfg_scan_ports(int* avail, int num); char* fname_after_chroot(const char* fname, struct config_file* cfg, int use_chdir); +/** + * Convert a ptr shorthand into a full reverse-notation PTR record. + * @param str: input string, "IP name" + * @return: malloced string "reversed-ip-name PTR name" + */ +char* cfg_ptr_reverse(char* str); + /** * Used during options parsing */ diff --git a/util/configlexer.c b/util/configlexer.c index 869724200..7db928d89 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -361,8 +361,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 107 -#define YY_END_OF_BUFFER 108 +#define YY_NUM_RULES 108 +#define YY_END_OF_BUFFER 109 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -370,115 +370,115 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[975] = +static yyconst flex_int16_t yy_accept[980] = { 0, - 1, 1, 91, 91, 95, 95, 99, 99, 103, 103, - 108, 106, 1, 89, 90, 2, 94, 107, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 91, 92, 107, 93, - 107, 95, 96, 97, 107, 102, 99, 100, 101, 107, - 103, 104, 105, 107, 106, 0, 1, 2, 2, 2, - 2, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 91, 0, 95, 0, 102, - - 0, 99, 103, 0, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 48, 106, 106, 106, 106, 106, 6, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 20, 106, 106, 106, - - 106, 12, 13, 106, 15, 14, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 3, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 98, 106, 106, 106, 106, 106, 106, 106, 106, 23, - 106, 106, 106, 106, 106, 106, 106, 24, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 60, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 59, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 21, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 22, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 17, - - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 49, 50, 47, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 5, 106, 106, 106, 106, 106, - 106, 106, 106, 62, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 77, 76, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 25, 106, - 106, 106, 106, 106, 106, 106, 106, 75, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - - 106, 106, 106, 106, 106, 106, 106, 106, 41, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 4, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 84, 106, 16, 106, 106, - 52, 53, 51, 106, 106, 106, 106, 106, 58, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 66, 106, - - 106, 106, 106, 106, 106, 106, 106, 31, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 57, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 61, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 68, 106, 106, 106, 106, 56, 106, - 82, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 32, 33, 106, 71, 106, - 106, 27, 106, 73, 106, 106, 106, 106, 106, 7, - 106, 46, 81, 106, 106, 106, 106, 106, 106, 106, - - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 63, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 72, 26, 28, 106, 106, 106, 106, - 106, 45, 106, 106, 106, 85, 106, 106, 106, 106, - 106, 44, 106, 106, 106, 106, 106, 106, 87, 106, - 106, 106, 106, 106, 106, 106, 11, 106, 106, 106, - 106, 106, 106, 10, 106, 106, 29, 106, 86, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 88, 83, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 34, - 106, 106, 106, 106, 106, 30, 106, 106, 106, 64, - - 65, 106, 106, 67, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 18, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 80, 106, 106, - 106, 106, 106, 106, 19, 106, 9, 106, 106, 78, - 38, 106, 106, 70, 54, 106, 106, 40, 43, 39, - 106, 35, 106, 8, 106, 69, 106, 106, 106, 36, - 106, 79, 106, 55, 42, 37, 106, 106, 106, 106, - 106, 106, 74, 0 + 1, 1, 92, 92, 96, 96, 100, 100, 104, 104, + 109, 107, 1, 90, 91, 2, 95, 108, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 92, 93, 108, 94, + 108, 96, 97, 98, 108, 103, 100, 101, 102, 108, + 104, 105, 106, 108, 107, 0, 1, 2, 2, 2, + 2, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 92, 0, 96, 0, 103, + + 0, 100, 104, 0, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 48, 107, 107, 107, 107, 107, 6, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 20, 107, 107, 107, + + 107, 12, 13, 107, 15, 14, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 3, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 99, 107, 107, 107, 107, 107, 107, 107, 107, 23, + 107, 107, 107, 107, 107, 107, 107, 24, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 60, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 59, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 21, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 22, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 17, + + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 49, 50, 47, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 5, 107, 107, 107, 107, 107, + 107, 107, 107, 62, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 77, 76, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 25, + 107, 107, 107, 107, 107, 107, 107, 107, 75, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + + 107, 107, 107, 107, 107, 107, 107, 107, 107, 41, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 4, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 85, 107, 16, + 107, 107, 52, 53, 51, 107, 107, 107, 107, 107, + 58, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + + 107, 66, 107, 107, 107, 107, 107, 107, 107, 107, + 31, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 57, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 61, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 68, 107, 107, + 107, 107, 56, 107, 83, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 32, + 33, 107, 71, 107, 78, 107, 27, 107, 73, 107, + 107, 107, 107, 107, 7, 107, 46, 82, 107, 107, + + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 63, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 72, 26, + 28, 107, 107, 107, 107, 107, 45, 107, 107, 107, + 86, 107, 107, 107, 107, 107, 44, 107, 107, 107, + 107, 107, 107, 88, 107, 107, 107, 107, 107, 107, + 107, 11, 107, 107, 107, 107, 107, 107, 10, 107, + 107, 29, 107, 87, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 89, 84, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 34, 107, 107, 107, 107, 107, + + 30, 107, 107, 107, 64, 65, 107, 107, 67, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 18, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 81, 107, 107, 107, 107, 107, 107, 19, + 107, 9, 107, 107, 79, 38, 107, 107, 70, 54, + 107, 107, 40, 43, 39, 107, 35, 107, 8, 107, + 69, 107, 107, 107, 36, 107, 80, 107, 55, 42, + 37, 107, 107, 107, 107, 107, 107, 74, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -521,20 +521,20 @@ static yyconst flex_int32_t yy_meta[39] = 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[986] = +static yyconst flex_int16_t yy_base[991] = { 0, 0, 0, 36, 39, 43, 50, 62, 74, 55, 67, - 1998, 1984, 49, 1999, 1999, 81, 1999, 88, 32, 83, + 2008, 1994, 49, 2009, 2009, 81, 2009, 88, 32, 83, 76, 48, 78, 60, 89, 94, 86, 95, 103, 96, - 98, 105, 101, 117, 111, 125, 1983, 1999, 1999, 1999, - 136, 1982, 1999, 1999, 130, 1981, 1991, 1999, 1999, 144, - 1979, 1999, 1999, 140, 1978, 148, 152, 0, 155, 0, + 98, 105, 101, 117, 111, 125, 1993, 2009, 2009, 2009, + 136, 1992, 2009, 2009, 130, 1991, 2001, 2009, 2009, 144, + 1989, 2009, 2009, 140, 1988, 148, 152, 0, 155, 0, 0, 148, 150, 143, 152, 154, 156, 162, 159, 158, 163, 164, 161, 167, 169, 176, 181, 182, 172, 187, 188, 190, 191, 196, 192, 198, 197, 199, 202, 203, - 205, 206, 207, 214, 215, 1977, 229, 1976, 233, 1975, + 205, 206, 207, 214, 215, 1987, 229, 1986, 233, 1985, - 239, 1985, 1973, 243, 236, 208, 229, 218, 239, 245, + 239, 1995, 1983, 243, 236, 208, 229, 218, 239, 245, 246, 242, 238, 248, 249, 251, 256, 257, 253, 268, 261, 269, 271, 277, 273, 281, 284, 280, 282, 283, 285, 286, 289, 290, 292, 293, 294, 297, 298, 310, @@ -546,7 +546,7 @@ static yyconst flex_int16_t yy_base[986] = 405, 407, 411, 425, 434, 418, 421, 433, 435, 438, 440, 441, 442, 443, 445, 449, 446, 456, 463, 459, - 460, 461, 466, 1972, 468, 464, 471, 473, 472, 1971, + 460, 461, 466, 1982, 468, 464, 471, 473, 472, 1981, 474, 475, 477, 491, 478, 476, 488, 487, 497, 498, 490, 500, 503, 504, 505, 507, 511, 508, 510, 525, 509, 519, 522, 527, 529, 530, 535, 537, 543, 540, @@ -554,198 +554,198 @@ static yyconst flex_int16_t yy_base[986] = 563, 565, 569, 566, 577, 574, 575, 576, 581, 582, 583, 584, 585, 592, 588, 595, 605, 591, 602, 593, 601, 608, 611, 609, 614, 616, 618, 617, 620, 621, - 622, 619, 623, 628, 635, 639, 1970, 642, 631, 643, + 622, 619, 623, 628, 635, 639, 1980, 642, 631, 643, - 633, 1969, 1968, 644, 1967, 1966, 645, 655, 661, 652, + 633, 1979, 1978, 644, 1977, 1976, 645, 655, 661, 652, 646, 653, 659, 662, 666, 656, 673, 680, 676, 681, 671, 687, 688, 689, 690, 692, 693, 694, 696, 702, - 709, 705, 706, 711, 713, 1965, 715, 714, 707, 717, + 709, 705, 706, 711, 713, 1975, 715, 714, 707, 717, 720, 721, 727, 728, 664, 731, 729, 732, 735, 737, 739, 740, 742, 743, 744, 768, 745, 747, 750, 752, 753, 774, 766, 765, 755, 780, 762, 781, 784, 787, - 1964, 793, 789, 790, 791, 795, 796, 797, 798, 1963, - 804, 805, 807, 809, 806, 819, 822, 1962, 823, 821, + 1974, 793, 789, 790, 791, 795, 796, 797, 798, 1973, + 804, 805, 807, 809, 806, 819, 822, 1972, 823, 821, 813, 825, 826, 829, 830, 836, 837, 838, 839, 842, 412, 846, 840, 848, 849, 850, 764, 851, 852, 855, - 1961, 857, 864, 860, 858, 862, 869, 866, 873, 876, + 1971, 857, 864, 860, 858, 862, 869, 866, 873, 876, 877, 878, 881, 884, 882, 887, 885, 889, 890, 891, - 892, 894, 895, 1960, 898, 900, 902, 905, 917, 919, + 892, 894, 895, 1970, 898, 900, 902, 905, 917, 919, 922, 915, 918, 924, 930, 932, 928, 934, 935, 936, 929, 926, 937, 945, 942, 946, 947, 957, 961, 963, - 949, 958, 964, 967, 971, 1959, 977, 979, 980, 976, - 981, 983, 984, 986, 987, 988, 990, 991, 993, 1958, + 949, 958, 964, 967, 971, 1969, 977, 979, 980, 976, + 981, 983, 984, 986, 987, 988, 990, 991, 993, 1968, 997, 994, 995, 998, 1002, 1000, 1001, 1007, 1008, 1016, - 1021, 1011, 1020, 1022, 1024, 1027, 1035, 1038, 1039, 1957, - - 1031, 1042, 1046, 1037, 1052, 1048, 1050, 1051, 1053, 1054, - 1055, 1056, 1057, 1059, 1060, 1061, 1065, 1073, 1062, 1079, - 1082, 1956, 1955, 1954, 951, 1076, 1083, 1084, 1086, 1087, - 1088, 1091, 1092, 1093, 1953, 1095, 1094, 1097, 1100, 1099, - 1108, 1105, 1109, 1952, 1114, 1110, 1117, 1120, 1121, 1122, - 1123, 1126, 1130, 1129, 1131, 1132, 1136, 1133, 1143, 1139, - 1141, 1142, 1144, 1951, 1950, 1147, 1148, 1152, 1159, 1169, - 1171, 1154, 1165, 1157, 1167, 1172, 1175, 1178, 1949, 1184, - 1186, 1182, 1187, 1183, 1185, 1192, 1194, 1948, 1193, 1197, - 1198, 1199, 1200, 1205, 1206, 1213, 1207, 1214, 1215, 1223, - - 1216, 1227, 1229, 1220, 1233, 1235, 1237, 1238, 1947, 1245, - 1230, 1248, 1228, 1250, 1251, 1242, 1244, 1254, 1256, 1257, - 1258, 1261, 1262, 1264, 1265, 1267, 1269, 1946, 1272, 1279, - 1276, 1278, 1281, 1287, 1280, 1270, 1291, 1290, 1283, 1293, - 1305, 1309, 1307, 1315, 1301, 1313, 1298, 1316, 1314, 1318, - 1320, 1321, 1323, 1324, 1325, 1945, 1326, 1944, 1331, 1336, - 1943, 1942, 1941, 1338, 1339, 1340, 1344, 1348, 1940, 1343, - 1349, 1351, 1352, 1353, 1354, 1356, 1361, 1357, 1368, 1358, - 1369, 1373, 1372, 1376, 1378, 1360, 1385, 1382, 1384, 1386, - 1389, 1392, 1388, 1393, 1394, 1390, 1396, 1407, 1939, 1408, - - 1410, 1416, 1412, 1405, 1418, 1420, 1427, 1938, 1424, 1429, - 1430, 1432, 1434, 1436, 1435, 1437, 1438, 1441, 1442, 1444, - 1937, 1445, 1446, 1447, 1450, 1463, 1466, 1457, 1468, 1452, - 1936, 1471, 1473, 1460, 1475, 1477, 1479, 1480, 1481, 1487, - 1484, 1489, 1491, 1492, 1497, 1493, 1495, 1499, 1501, 1507, - 1503, 1505, 1509, 1935, 1398, 1511, 1515, 1523, 1934, 1522, - 1933, 1524, 1525, 1529, 1531, 1534, 1526, 1532, 1536, 1543, - 1540, 1539, 1542, 1544, 1508, 1932, 1931, 1548, 1930, 1556, - 1558, 1929, 1560, 1928, 1566, 1562, 1550, 1553, 1564, 1927, - 1568, 1926, 1925, 1570, 1571, 1572, 1579, 1576, 1580, 1581, - - 1582, 1583, 1585, 1586, 1588, 1589, 1590, 1591, 1598, 1600, - 1924, 1601, 1604, 1606, 1607, 1609, 1610, 1611, 1617, 1619, - 1620, 1612, 1621, 1923, 1922, 1921, 1622, 1628, 1633, 1623, - 1627, 1920, 1636, 1638, 1643, 1919, 1645, 1639, 1648, 1647, - 1649, 1918, 1650, 1653, 1661, 1651, 1663, 1668, 1917, 1669, - 1659, 1672, 1671, 1673, 1676, 1678, 1916, 1679, 1681, 1684, - 1685, 1688, 1686, 1912, 1689, 1690, 1908, 1693, 1907, 1695, - 1700, 1703, 1705, 1708, 1709, 1715, 1712, 1713, 1906, 1902, - 1716, 1718, 1719, 1720, 1723, 1721, 1724, 1727, 1725, 1901, - 1729, 1730, 1739, 1741, 1733, 1897, 1743, 1746, 1731, 1896, - - 1895, 1750, 1753, 1889, 1754, 1748, 1756, 1761, 1758, 1763, - 1764, 1769, 1765, 1767, 1776, 1777, 1861, 1779, 1768, 1771, - 1784, 1789, 1780, 1786, 1794, 1796, 1797, 1859, 1798, 1800, - 1802, 1807, 1804, 1811, 1856, 1812, 1855, 1817, 1814, 1854, - 1853, 1821, 1818, 1852, 1850, 1808, 1822, 1849, 1655, 1454, - 1825, 1391, 1828, 1034, 1830, 758, 1831, 1834, 1836, 697, - 1838, 654, 1839, 558, 353, 174, 1841, 1842, 1843, 1845, - 1844, 1847, 114, 1999, 1875, 1881, 1887, 1893, 100, 1899, - 1905, 1911, 61, 1916, 1922 + 1021, 1011, 1020, 1022, 1024, 1027, 1035, 1038, 1039, 1967, + + 1031, 1042, 1046, 1047, 1048, 1034, 1050, 1051, 1054, 1057, + 1055, 1059, 1060, 1058, 1064, 1063, 1066, 1074, 1067, 1083, + 1085, 1966, 1965, 1964, 951, 1077, 1071, 1084, 1088, 1081, + 1089, 1092, 1093, 1094, 1963, 1096, 1099, 1101, 1103, 1104, + 1111, 1107, 1108, 1962, 1110, 1116, 1121, 1117, 1119, 1123, + 1124, 1131, 1127, 1125, 1133, 1135, 1136, 1139, 1146, 1137, + 1143, 1144, 1148, 1145, 1961, 1960, 1158, 1147, 1161, 1166, + 1155, 1169, 1163, 1171, 1173, 1174, 1176, 1177, 1179, 1959, + 1185, 1186, 1188, 1189, 1191, 1184, 1195, 1197, 1958, 1200, + 1202, 1203, 1204, 1207, 1210, 1211, 1217, 1215, 1218, 1221, + + 1229, 1223, 1231, 1225, 1233, 1237, 1239, 1241, 1242, 1957, + 1248, 1234, 1249, 1246, 1254, 1255, 1247, 1256, 1257, 1259, + 1261, 1262, 1264, 1266, 1268, 1267, 1271, 1269, 1274, 1956, + 1279, 1285, 1281, 1288, 1282, 1290, 1291, 1293, 1296, 1297, + 1298, 1301, 1308, 1317, 1309, 1315, 1313, 1319, 1307, 1325, + 1321, 1322, 1327, 1328, 1330, 1332, 1336, 1955, 1329, 1954, + 1343, 1337, 1953, 1952, 1951, 1352, 1339, 1348, 1351, 1357, + 1950, 1341, 1358, 1350, 1361, 1362, 1363, 1364, 1366, 1365, + 1368, 1376, 1369, 1377, 1379, 1383, 1384, 1380, 1386, 1392, + 1390, 1391, 1393, 1396, 1399, 1402, 1401, 1403, 1398, 1404, + + 1414, 1949, 1416, 1418, 1424, 1421, 1413, 1425, 1428, 1435, + 1948, 1432, 1437, 1438, 1440, 1442, 1444, 1443, 1445, 1446, + 1449, 1450, 1452, 1947, 1453, 1454, 1455, 1458, 1471, 1474, + 1465, 1476, 1460, 1480, 1946, 1481, 1483, 1484, 1488, 1468, + 1489, 1490, 1491, 1497, 1494, 1499, 1501, 1503, 1504, 1507, + 1508, 1509, 1510, 1511, 1514, 1517, 1516, 1945, 1519, 1521, + 1531, 1527, 1944, 1524, 1943, 1533, 1534, 1541, 1542, 1544, + 1537, 1543, 1545, 1553, 1549, 1551, 1552, 1559, 1558, 1942, + 1941, 1563, 1940, 1569, 1939, 1571, 1938, 1573, 1937, 1579, + 1575, 1565, 1561, 1578, 1936, 1585, 1935, 1934, 1581, 1587, + + 1588, 1591, 1592, 1577, 1595, 1596, 1597, 1599, 1600, 1601, + 1602, 1604, 1605, 1612, 1614, 1933, 1611, 1618, 1615, 1620, + 1622, 1623, 1625, 1630, 1632, 1631, 1633, 1634, 1932, 1931, + 1930, 1635, 1641, 1647, 1636, 1640, 1926, 1649, 1642, 1656, + 1922, 1658, 1652, 1661, 1662, 1663, 1921, 1664, 1666, 1669, + 1665, 1676, 1681, 1920, 1672, 1682, 1683, 1685, 1687, 1688, + 1690, 1916, 1684, 1691, 1698, 1692, 1695, 1700, 1915, 1704, + 1706, 1911, 1708, 1910, 1710, 1711, 1714, 1716, 1720, 1721, + 1727, 1724, 1726, 1909, 1903, 1725, 1728, 1731, 1732, 1733, + 1735, 1737, 1739, 1740, 1875, 1741, 1746, 1751, 1752, 1755, + + 1874, 1757, 1742, 1745, 1873, 1869, 1760, 1758, 1868, 1765, + 1768, 1771, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1781, + 1783, 1867, 1791, 1787, 1792, 1795, 1799, 1796, 1800, 1802, + 1805, 1808, 1866, 1809, 1811, 1816, 1818, 1820, 1822, 1864, + 1823, 1863, 1828, 1829, 1862, 1812, 1831, 1832, 1554, 1462, + 1833, 1835, 1426, 1400, 1205, 1841, 1153, 1838, 1056, 1844, + 758, 1836, 1846, 1848, 697, 1850, 654, 1854, 558, 353, + 174, 1851, 1856, 1857, 1859, 1858, 1861, 114, 2009, 1889, + 1895, 1901, 1907, 100, 1913, 1919, 1925, 61, 1930, 1936 } ; -static yyconst flex_int16_t yy_def[986] = +static yyconst flex_int16_t yy_def[991] = { 0, - 974, 1, 975, 975, 976, 976, 977, 977, 978, 978, - 974, 979, 974, 974, 974, 980, 974, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 981, 974, 974, 974, - 981, 982, 974, 974, 982, 983, 974, 974, 974, 983, - 984, 974, 974, 984, 979, 979, 974, 985, 980, 985, - 980, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 981, 981, 982, 982, 983, - - 983, 974, 984, 984, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, - 979, 979, 979, 0, 974, 974, 974, 974, 974, 974, - 974, 974, 974, 974, 974 + 979, 1, 980, 980, 981, 981, 982, 982, 983, 983, + 979, 984, 979, 979, 979, 985, 979, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 986, 979, 979, 979, + 986, 987, 979, 979, 987, 988, 979, 979, 979, 988, + 989, 979, 979, 989, 984, 984, 979, 990, 985, 990, + 985, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 986, 986, 987, 987, 988, + + 988, 979, 989, 989, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 984, 984, + 984, 984, 984, 984, 984, 984, 984, 984, 0, 979, + 979, 979, 979, 979, 979, 979, 979, 979, 979, 979 } ; -static yyconst flex_int16_t yy_nxt[2038] = +static yyconst flex_int16_t yy_nxt[2048] = { 0, 12, 13, 14, 14, 15, 16, 17, 12, 12, 12, 12, 12, 18, 19, 12, 20, 21, 22, 23, 12, @@ -852,7 +852,7 @@ static yyconst flex_int16_t yy_nxt[2038] = 56, 56, 503, 497, 56, 502, 56, 506, 56, 507, 56, 56, 56, 504, 56, 508, 56, 56, 56, 56, 509, 516, 514, 505, 56, 515, 510, 56, 56, 56, - 511, 56, 512, 56, 513, 518, 584, 517, 522, 56, + 511, 56, 512, 56, 513, 518, 585, 517, 522, 56, 56, 519, 523, 56, 524, 56, 56, 521, 526, 56, 525, 527, 520, 56, 530, 528, 531, 532, 56, 56, 529, 56, 56, 56, 535, 56, 56, 533, 56, 56, @@ -861,119 +861,120 @@ static yyconst flex_int16_t yy_nxt[2038] = 56, 534, 56, 56, 56, 536, 538, 537, 548, 56, 56, 540, 542, 56, 546, 552, 550, 541, 56, 547, 549, 545, 56, 56, 56, 553, 56, 551, 554, 56, - 555, 556, 560, 56, 559, 561, 56, 56, 557, 56, - 56, 56, 562, 564, 56, 566, 558, 565, 56, 567, - 56, 563, 56, 56, 56, 56, 56, 56, 56, 56, - 575, 56, 56, 56, 56, 576, 579, 56, 568, 572, - 569, 570, 574, 571, 577, 56, 582, 573, 56, 583, - 580, 56, 578, 581, 56, 56, 56, 588, 56, 56, - - 56, 590, 585, 56, 56, 56, 56, 56, 592, 56, - 587, 56, 56, 591, 597, 599, 598, 56, 589, 586, - 56, 56, 56, 593, 594, 595, 56, 601, 596, 56, - 604, 602, 56, 56, 56, 56, 600, 609, 56, 607, - 608, 56, 56, 56, 56, 56, 603, 610, 56, 605, - 616, 56, 606, 56, 56, 56, 56, 615, 611, 56, - 56, 614, 612, 613, 56, 620, 56, 621, 622, 56, - 617, 56, 618, 624, 619, 625, 627, 56, 623, 56, - 626, 56, 628, 56, 56, 629, 631, 56, 634, 630, - 56, 636, 632, 637, 56, 56, 56, 56, 56, 56, - - 638, 633, 639, 641, 56, 56, 56, 635, 640, 56, - 56, 56, 56, 646, 642, 647, 648, 56, 56, 56, - 652, 649, 643, 644, 645, 56, 56, 56, 56, 651, - 653, 650, 56, 655, 656, 56, 659, 657, 658, 56, - 56, 56, 56, 654, 661, 56, 662, 56, 663, 56, - 56, 660, 665, 664, 56, 667, 56, 56, 670, 666, - 56, 669, 56, 56, 668, 671, 56, 672, 56, 56, - 56, 678, 673, 56, 56, 674, 56, 56, 682, 56, - 679, 56, 56, 680, 56, 675, 686, 676, 56, 685, - 56, 56, 56, 56, 677, 56, 684, 688, 689, 56, - - 692, 681, 56, 56, 683, 56, 691, 687, 690, 693, - 56, 694, 697, 56, 700, 695, 698, 56, 696, 56, - 699, 56, 701, 705, 702, 56, 56, 56, 56, 703, - 56, 708, 56, 56, 704, 56, 56, 56, 56, 709, - 710, 707, 711, 56, 714, 717, 712, 706, 56, 713, - 56, 56, 56, 719, 715, 56, 56, 716, 720, 721, - 56, 56, 723, 56, 56, 56, 56, 718, 56, 56, - 56, 730, 56, 56, 722, 725, 726, 727, 729, 731, - 56, 56, 728, 724, 56, 56, 733, 734, 56, 735, - 56, 738, 739, 736, 56, 732, 56, 56, 56, 740, - - 56, 56, 56, 56, 56, 56, 56, 737, 56, 746, - 56, 742, 743, 744, 741, 745, 747, 56, 748, 56, - 56, 749, 56, 750, 56, 751, 752, 754, 56, 804, - 56, 753, 56, 755, 757, 756, 56, 758, 759, 56, - 761, 56, 56, 762, 56, 760, 56, 56, 56, 56, - 56, 764, 765, 56, 56, 763, 56, 56, 56, 56, - 772, 766, 56, 775, 56, 770, 56, 767, 768, 56, - 773, 774, 56, 769, 776, 56, 771, 777, 56, 779, - 56, 778, 780, 56, 782, 56, 784, 56, 781, 56, - 783, 56, 56, 56, 788, 787, 56, 786, 790, 56, - - 792, 56, 793, 56, 56, 56, 785, 56, 789, 56, - 795, 56, 797, 56, 791, 56, 796, 56, 799, 56, - 56, 56, 822, 56, 801, 803, 802, 56, 806, 794, - 807, 798, 805, 800, 56, 56, 56, 56, 56, 809, - 811, 56, 810, 56, 56, 808, 56, 812, 56, 813, - 817, 56, 56, 816, 56, 56, 56, 814, 818, 820, - 56, 823, 56, 815, 821, 56, 819, 824, 56, 825, - 56, 826, 56, 827, 56, 828, 56, 829, 56, 832, - 56, 831, 56, 56, 56, 834, 830, 833, 56, 835, - 836, 56, 56, 56, 56, 56, 842, 56, 56, 837, - - 56, 56, 56, 56, 839, 840, 841, 843, 847, 838, - 56, 849, 56, 56, 846, 848, 56, 851, 56, 56, - 845, 56, 56, 56, 56, 844, 858, 852, 857, 56, - 850, 56, 56, 56, 56, 56, 853, 855, 854, 56, - 56, 856, 860, 863, 864, 56, 859, 867, 56, 865, - 56, 56, 861, 862, 869, 56, 866, 56, 870, 56, - 56, 56, 56, 56, 873, 56, 874, 56, 868, 872, - 876, 56, 871, 56, 879, 56, 875, 878, 877, 880, - 56, 56, 882, 56, 56, 56, 881, 883, 56, 886, - 56, 56, 884, 56, 885, 890, 56, 56, 56, 887, - - 56, 56, 56, 893, 896, 56, 891, 56, 892, 888, - 894, 889, 56, 898, 895, 56, 900, 56, 899, 901, - 56, 56, 903, 904, 56, 56, 897, 56, 56, 905, - 56, 56, 56, 56, 902, 56, 56, 56, 907, 56, - 910, 56, 56, 56, 915, 56, 906, 909, 913, 908, - 917, 56, 911, 56, 919, 56, 914, 918, 56, 916, - 56, 912, 56, 923, 920, 56, 56, 922, 56, 921, - 56, 925, 928, 56, 924, 56, 56, 56, 926, 56, - 56, 56, 927, 56, 931, 929, 932, 935, 56, 56, - 937, 56, 56, 930, 936, 940, 56, 934, 56, 938, - - 941, 56, 933, 942, 939, 944, 56, 945, 56, 56, - 56, 948, 56, 949, 56, 947, 56, 943, 950, 56, - 56, 951, 952, 56, 56, 953, 56, 946, 954, 56, - 56, 955, 956, 56, 56, 957, 960, 56, 959, 958, - 56, 962, 56, 56, 961, 964, 56, 965, 56, 966, - 56, 56, 967, 56, 56, 56, 56, 56, 973, 56, - 963, 56, 56, 969, 56, 56, 56, 56, 56, 970, - 971, 56, 968, 56, 972, 37, 37, 37, 37, 37, - 37, 42, 42, 42, 42, 42, 42, 46, 46, 46, - 46, 46, 46, 51, 51, 51, 51, 51, 51, 59, - - 59, 56, 59, 59, 59, 96, 96, 56, 56, 56, - 96, 98, 98, 56, 56, 98, 103, 103, 56, 56, - 56, 103, 60, 60, 56, 60, 60, 60, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 555, 556, 560, 56, 559, 561, 56, 56, 557, 564, + 56, 56, 562, 565, 56, 568, 558, 566, 56, 56, + 56, 563, 56, 56, 569, 567, 56, 56, 56, 56, + 56, 56, 56, 576, 577, 56, 56, 580, 56, 56, + 570, 571, 573, 56, 572, 575, 56, 574, 578, 56, + 583, 581, 584, 56, 579, 56, 56, 56, 582, 589, + + 56, 56, 591, 586, 56, 56, 56, 587, 56, 593, + 588, 56, 590, 56, 592, 56, 56, 598, 600, 56, + 56, 599, 56, 56, 594, 595, 602, 603, 56, 56, + 596, 56, 597, 56, 605, 56, 56, 56, 601, 56, + 608, 609, 610, 56, 611, 56, 606, 56, 56, 56, + 607, 56, 604, 617, 612, 56, 56, 56, 56, 56, + 56, 615, 629, 616, 613, 56, 614, 56, 618, 621, + 56, 622, 623, 56, 619, 56, 620, 625, 56, 624, + 630, 56, 626, 56, 627, 56, 56, 628, 56, 56, + 636, 56, 638, 639, 631, 632, 56, 56, 56, 634, + + 56, 56, 633, 56, 641, 635, 640, 56, 637, 56, + 642, 643, 56, 644, 56, 56, 56, 56, 648, 56, + 649, 650, 56, 56, 654, 645, 646, 56, 651, 56, + 56, 647, 661, 56, 653, 56, 652, 56, 655, 657, + 658, 56, 660, 56, 659, 56, 56, 656, 663, 56, + 664, 56, 665, 56, 56, 667, 669, 666, 56, 56, + 56, 56, 672, 668, 662, 671, 56, 56, 56, 56, + 673, 56, 674, 56, 56, 680, 56, 675, 56, 56, + 56, 56, 670, 56, 685, 682, 56, 676, 677, 683, + 678, 56, 689, 56, 56, 681, 688, 56, 679, 692, + + 56, 687, 56, 56, 684, 56, 686, 691, 56, 56, + 56, 693, 690, 56, 696, 700, 703, 694, 697, 56, + 56, 56, 704, 695, 701, 56, 699, 56, 702, 56, + 698, 56, 708, 56, 56, 706, 705, 56, 711, 56, + 56, 56, 56, 707, 56, 710, 712, 713, 56, 56, + 714, 56, 716, 56, 709, 56, 717, 715, 719, 720, + 56, 722, 56, 56, 56, 723, 718, 721, 724, 56, + 56, 726, 725, 56, 56, 56, 56, 56, 56, 733, + 56, 56, 727, 732, 728, 729, 730, 735, 56, 56, + 731, 56, 56, 738, 737, 56, 56, 734, 56, 743, + + 739, 740, 56, 56, 56, 56, 736, 744, 56, 741, + 56, 56, 56, 56, 56, 56, 56, 742, 746, 747, + 748, 745, 749, 750, 751, 56, 56, 752, 56, 753, + 56, 754, 755, 56, 756, 758, 56, 56, 56, 757, + 56, 761, 759, 760, 56, 762, 763, 56, 765, 56, + 56, 766, 56, 764, 56, 56, 56, 56, 56, 768, + 769, 56, 56, 767, 56, 56, 56, 56, 776, 770, + 56, 779, 56, 774, 56, 771, 772, 56, 777, 778, + 56, 773, 780, 56, 775, 781, 56, 783, 56, 782, + 784, 785, 56, 56, 787, 56, 56, 790, 786, 789, + + 56, 56, 56, 56, 793, 792, 56, 791, 795, 56, + 797, 56, 798, 56, 788, 56, 56, 800, 794, 56, + 56, 56, 56, 56, 796, 802, 56, 804, 56, 56, + 801, 56, 808, 56, 812, 806, 56, 805, 807, 56, + 799, 803, 810, 56, 811, 56, 56, 813, 814, 56, + 809, 815, 816, 56, 56, 56, 56, 56, 817, 818, + 822, 56, 821, 56, 56, 56, 56, 823, 819, 825, + 56, 56, 827, 56, 820, 56, 828, 56, 824, 826, + 829, 56, 830, 56, 831, 56, 832, 56, 833, 56, + 56, 56, 834, 56, 835, 836, 837, 56, 838, 56, + + 56, 839, 841, 56, 56, 840, 843, 56, 56, 56, + 847, 56, 56, 56, 56, 842, 56, 56, 844, 845, + 846, 848, 852, 56, 56, 854, 56, 56, 851, 853, + 56, 856, 56, 850, 56, 56, 857, 56, 849, 863, + 855, 862, 56, 56, 56, 56, 56, 56, 56, 858, + 860, 859, 56, 56, 56, 861, 868, 864, 869, 56, + 872, 56, 870, 865, 56, 866, 867, 874, 56, 871, + 56, 875, 873, 56, 56, 56, 56, 56, 56, 878, + 879, 56, 877, 881, 56, 876, 882, 884, 56, 886, + 880, 883, 885, 56, 56, 56, 56, 56, 888, 56, + + 56, 891, 56, 56, 56, 887, 889, 56, 890, 895, + 56, 892, 56, 896, 893, 897, 56, 898, 56, 901, + 56, 894, 56, 56, 903, 899, 56, 905, 56, 904, + 900, 906, 56, 56, 908, 909, 56, 56, 56, 56, + 56, 902, 910, 56, 56, 56, 907, 56, 912, 56, + 915, 56, 56, 56, 56, 911, 920, 56, 56, 914, + 918, 913, 922, 56, 56, 926, 916, 56, 923, 56, + 56, 919, 56, 928, 917, 921, 924, 56, 925, 929, + 56, 927, 930, 56, 933, 56, 56, 56, 56, 56, + 56, 56, 940, 56, 937, 56, 936, 932, 931, 56, + + 941, 934, 942, 56, 56, 935, 945, 56, 56, 939, + 946, 56, 56, 949, 56, 938, 950, 56, 943, 947, + 56, 56, 953, 56, 56, 944, 952, 954, 56, 955, + 56, 948, 56, 957, 56, 56, 958, 956, 951, 959, + 56, 56, 961, 56, 56, 56, 960, 56, 56, 962, + 56, 964, 965, 56, 966, 967, 56, 969, 56, 970, + 56, 971, 56, 56, 963, 968, 56, 972, 56, 56, + 56, 56, 978, 56, 56, 56, 56, 974, 56, 56, + 56, 56, 973, 975, 976, 56, 56, 56, 977, 37, + 37, 37, 37, 37, 37, 42, 42, 42, 42, 42, + + 42, 46, 46, 46, 46, 46, 46, 51, 51, 51, + 51, 51, 51, 59, 59, 56, 59, 59, 59, 96, + 96, 56, 56, 56, 96, 98, 98, 56, 56, 98, + 103, 103, 56, 56, 56, 103, 60, 60, 56, 60, + 60, 60, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 104, 102, 101, 99, 97, - 56, 104, 102, 101, 99, 97, 56, 974, 11, 974, - 974, 974, 974, 974, 974, 974, 974, 974, 974, 974, - 974, 974, 974, 974, 974, 974, 974, 974, 974, 974, - 974, 974, 974, 974, 974, 974, 974, 974, 974, 974, - 974, 974, 974, 974, 974, 974, 974 + 56, 104, 102, 101, 99, 97, 56, 979, 11, 979, + 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, + 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, + 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, + 979, 979, 979, 979, 979, 979, 979 } ; -static yyconst flex_int16_t yy_chk[2038] = +static yyconst flex_int16_t yy_chk[2048] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -981,20 +982,20 @@ static yyconst flex_int16_t yy_chk[2038] = 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 4, 4, 4, 19, 5, 5, 19, 3, 5, 13, 4, 6, 6, 13, 5, 6, 9, 9, 9, - 22, 983, 6, 7, 7, 7, 7, 9, 7, 10, + 22, 988, 6, 7, 7, 7, 7, 9, 7, 10, 10, 10, 24, 24, 7, 8, 8, 8, 8, 10, 8, 24, 16, 22, 16, 16, 8, 16, 21, 18, 23, 18, 18, 16, 18, 20, 20, 21, 27, 21, - 979, 25, 21, 20, 23, 25, 26, 28, 30, 20, + 984, 25, 21, 20, 23, 25, 26, 28, 30, 20, 31, 26, 27, 33, 25, 29, 29, 32, 33, 31, - 29, 28, 32, 35, 31, 28, 973, 31, 30, 34, + 29, 28, 32, 35, 31, 28, 978, 31, 30, 34, 34, 32, 33, 45, 32, 29, 45, 36, 36, 41, 41, 35, 36, 54, 54, 50, 34, 50, 50, 56, 50, 56, 56, 57, 56, 64, 59, 57, 59, 59, 62, 59, 63, 62, 65, 63, 66, 59, 67, 68, 70, 69, 64, 73, 68, 71, 72, 65, 73, 74, - 72, 75, 74, 66, 79, 74, 966, 70, 76, 67, + 72, 75, 74, 66, 79, 74, 971, 70, 76, 67, 69, 76, 71, 77, 78, 76, 79, 77, 74, 80, 81, 78, 82, 83, 85, 75, 80, 83, 84, 87, @@ -1014,7 +1015,7 @@ static yyconst flex_int16_t yy_chk[2038] = 150, 147, 144, 143, 147, 151, 146, 145, 154, 140, 148, 148, 149, 149, 152, 150, 153, 152, 158, 151, 153, 154, 155, 155, 156, 157, 159, 160, 162, 156, - 157, 161, 161, 163, 165, 965, 163, 158, 164, 160, + 157, 161, 161, 163, 165, 970, 163, 158, 164, 160, 166, 168, 168, 165, 169, 162, 159, 169, 170, 164, 167, 166, 167, 167, 171, 175, 172, 173, 173, 174, 174, 176, 177, 179, 170, 172, 176, 170, 171, 182, @@ -1037,7 +1038,7 @@ static yyconst flex_int16_t yy_chk[2038] = 236, 245, 246, 257, 245, 243, 247, 247, 248, 248, 249, 250, 250, 244, 246, 249, 251, 251, 252, 259, 253, 254, 256, 252, 253, 255, 254, 256, 258, 255, - 964, 260, 259, 258, 260, 261, 261, 262, 264, 260, + 969, 260, 259, 258, 260, 261, 261, 262, 264, 260, 262, 263, 260, 264, 265, 263, 266, 267, 268, 265, 267, 268, 266, 269, 270, 271, 272, 273, 269, 274, @@ -1047,19 +1048,19 @@ static yyconst flex_int16_t yy_chk[2038] = 287, 292, 289, 290, 291, 293, 288, 289, 290, 291, 294, 285, 287, 299, 293, 301, 286, 295, 292, 298, 295, 296, 296, 294, 298, 300, 304, 307, 311, 301, - 299, 307, 308, 300, 310, 312, 962, 308, 316, 310, + 299, 307, 308, 300, 310, 312, 967, 308, 316, 310, 313, 313, 304, 309, 314, 311, 345, 309, 315, 315, 309, 314, 316, 321, 309, 317, 317, 345, 319, 312, 309, 309, 318, 320, 320, 318, 319, 321, 322, 322, - 323, 324, 325, 323, 326, 327, 328, 324, 329, 960, + 323, 324, 325, 323, 326, 327, 328, 324, 329, 965, 325, 328, 326, 330, 330, 329, 331, 332, 333, 339, 332, 331, 327, 334, 334, 335, 338, 337, 335, 340, 338, 333, 341, 342, 343, 335, 337, 339, 341, 343, 344, 347, 340, 346, 348, 348, 342, 349, 346, 350, 349, 351, 352, 353, 353, 354, 355, 357, 344, 358, 361, 347, 359, 351, 360, 361, 350, 365, 365, 354, - 956, 352, 407, 358, 367, 359, 407, 364, 363, 355, + 961, 352, 407, 358, 367, 359, 407, 364, 363, 355, 356, 357, 367, 356, 360, 356, 362, 362, 364, 356, 356, 363, 366, 368, 362, 356, 369, 366, 370, 370, @@ -1089,116 +1090,117 @@ static yyconst flex_int16_t yy_chk[2038] = 484, 471, 486, 487, 485, 473, 475, 474, 485, 488, 489, 477, 479, 492, 483, 489, 487, 478, 490, 484, 486, 482, 493, 491, 494, 490, 495, 488, 491, 496, - 492, 493, 497, 501, 496, 498, 954, 497, 494, 504, - 498, 499, 499, 502, 502, 504, 495, 503, 503, 505, - 506, 501, 507, 508, 505, 509, 510, 511, 512, 513, - 513, 514, 515, 516, 519, 514, 517, 517, 506, 510, - 507, 508, 512, 509, 515, 518, 520, 511, 526, 521, - 518, 520, 516, 519, 521, 527, 528, 529, 529, 530, - - 531, 531, 526, 532, 533, 534, 537, 536, 533, 538, - 528, 540, 539, 532, 539, 541, 540, 542, 530, 527, - 541, 543, 546, 534, 536, 537, 545, 543, 538, 547, - 547, 545, 548, 549, 550, 551, 542, 552, 552, 550, - 551, 554, 553, 555, 556, 558, 546, 553, 557, 548, - 559, 560, 549, 561, 562, 559, 563, 558, 554, 566, - 567, 557, 555, 556, 568, 563, 572, 563, 566, 574, - 560, 569, 561, 568, 562, 568, 570, 573, 567, 575, - 569, 570, 571, 571, 576, 572, 574, 577, 577, 573, - 578, 580, 575, 581, 582, 584, 580, 585, 581, 583, - - 582, 576, 583, 584, 586, 589, 587, 578, 583, 590, - 591, 592, 593, 590, 585, 591, 592, 594, 595, 597, - 596, 593, 586, 587, 589, 596, 598, 599, 601, 595, - 597, 594, 604, 599, 600, 600, 603, 601, 602, 602, - 613, 603, 611, 598, 605, 605, 606, 606, 607, 607, - 608, 604, 610, 608, 616, 612, 617, 610, 615, 611, - 612, 614, 614, 615, 613, 616, 618, 616, 619, 620, - 621, 621, 616, 622, 623, 617, 624, 625, 625, 626, - 622, 627, 636, 623, 629, 618, 630, 619, 631, 629, - 632, 630, 635, 633, 620, 639, 627, 632, 633, 634, - - 636, 624, 638, 637, 626, 640, 635, 631, 634, 637, - 647, 638, 641, 645, 643, 639, 642, 641, 640, 643, - 642, 642, 644, 648, 645, 646, 649, 644, 648, 646, - 650, 651, 651, 652, 647, 653, 654, 655, 657, 652, - 653, 650, 654, 659, 659, 664, 655, 649, 660, 657, - 664, 665, 666, 666, 659, 670, 667, 660, 667, 668, - 668, 671, 671, 672, 673, 674, 675, 665, 676, 678, - 680, 678, 686, 677, 670, 673, 674, 675, 677, 679, - 679, 681, 676, 672, 683, 682, 681, 682, 684, 683, - 685, 686, 687, 684, 688, 680, 689, 687, 690, 688, - - 693, 691, 696, 952, 692, 694, 695, 685, 697, 693, - 755, 690, 691, 692, 689, 692, 694, 704, 695, 698, - 700, 696, 701, 697, 703, 698, 700, 702, 702, 755, - 705, 701, 706, 703, 705, 704, 709, 706, 707, 707, - 710, 710, 711, 711, 712, 709, 713, 715, 714, 716, - 717, 713, 714, 718, 719, 712, 720, 722, 723, 724, - 722, 715, 725, 725, 730, 719, 950, 716, 717, 728, - 723, 724, 734, 718, 726, 726, 720, 727, 727, 729, - 729, 728, 730, 732, 733, 733, 735, 735, 732, 736, - 734, 737, 738, 739, 739, 738, 741, 737, 740, 740, - - 742, 742, 743, 743, 744, 746, 736, 747, 739, 745, - 745, 748, 747, 749, 741, 751, 746, 752, 749, 750, - 775, 753, 775, 756, 751, 753, 752, 757, 757, 744, - 758, 748, 756, 750, 760, 758, 762, 763, 767, 762, - 764, 764, 763, 765, 768, 760, 766, 765, 769, 766, - 770, 772, 771, 769, 773, 770, 774, 767, 771, 773, - 778, 778, 787, 768, 774, 788, 772, 780, 780, 781, - 781, 783, 783, 785, 786, 786, 789, 787, 785, 791, - 791, 789, 794, 795, 796, 795, 788, 794, 798, 796, - 797, 797, 799, 800, 801, 802, 803, 803, 804, 798, - - 805, 806, 807, 808, 800, 801, 802, 804, 808, 799, - 809, 810, 810, 812, 807, 809, 813, 813, 814, 815, - 806, 816, 817, 818, 822, 805, 820, 814, 819, 819, - 812, 820, 821, 823, 827, 830, 815, 817, 816, 831, - 828, 818, 822, 828, 829, 829, 821, 833, 833, 830, - 834, 838, 823, 827, 835, 835, 831, 837, 837, 840, - 839, 841, 843, 846, 840, 844, 841, 949, 834, 839, - 844, 851, 838, 845, 847, 847, 843, 846, 845, 848, - 848, 850, 851, 853, 852, 854, 850, 852, 855, 855, - 856, 858, 853, 859, 854, 860, 860, 861, 863, 856, - - 862, 865, 866, 863, 868, 868, 861, 870, 862, 858, - 865, 859, 871, 871, 866, 872, 873, 873, 872, 874, - 874, 875, 876, 877, 877, 878, 870, 876, 881, 878, - 882, 883, 884, 886, 875, 885, 887, 889, 882, 888, - 885, 891, 892, 899, 891, 895, 881, 884, 888, 883, - 893, 893, 886, 894, 895, 897, 889, 894, 898, 892, - 906, 887, 902, 902, 897, 903, 905, 899, 907, 898, - 909, 905, 908, 908, 903, 910, 911, 913, 906, 914, - 919, 912, 907, 920, 911, 909, 912, 915, 915, 916, - 918, 918, 923, 910, 916, 921, 921, 914, 924, 919, - - 922, 922, 913, 923, 920, 925, 925, 926, 926, 927, - 929, 930, 930, 931, 931, 929, 933, 924, 932, 932, - 946, 933, 934, 934, 936, 936, 939, 927, 938, 938, - 943, 939, 942, 942, 947, 943, 951, 951, 947, 946, - 953, 955, 955, 957, 953, 958, 958, 959, 959, 961, - 961, 963, 963, 967, 968, 969, 971, 970, 972, 972, - 957, 948, 945, 968, 944, 941, 940, 937, 935, 969, - 970, 928, 967, 917, 971, 975, 975, 975, 975, 975, - 975, 976, 976, 976, 976, 976, 976, 977, 977, 977, - 977, 977, 977, 978, 978, 978, 978, 978, 978, 980, - - 980, 904, 980, 980, 980, 981, 981, 901, 900, 896, - 981, 982, 982, 890, 880, 982, 984, 984, 879, 869, - 867, 984, 985, 985, 864, 985, 985, 985, 857, 849, - 842, 836, 832, 826, 825, 824, 811, 793, 792, 790, - 784, 782, 779, 777, 776, 761, 759, 754, 731, 721, - 708, 699, 669, 663, 662, 661, 658, 656, 628, 609, - 588, 579, 565, 564, 544, 535, 524, 523, 522, 500, + 492, 493, 497, 501, 496, 498, 506, 497, 494, 502, + 498, 499, 499, 502, 502, 505, 495, 503, 503, 504, + 505, 501, 507, 508, 506, 504, 509, 511, 959, 510, + 514, 512, 513, 513, 514, 516, 515, 517, 517, 519, + 507, 508, 510, 527, 509, 512, 518, 511, 515, 526, + 520, 518, 521, 530, 516, 520, 528, 521, 519, 529, + + 529, 531, 531, 526, 532, 533, 534, 527, 536, 533, + 528, 537, 530, 538, 532, 539, 540, 539, 541, 542, + 543, 540, 545, 541, 534, 536, 543, 545, 546, 548, + 537, 549, 538, 547, 547, 550, 551, 554, 542, 553, + 550, 551, 552, 552, 553, 555, 548, 556, 557, 560, + 549, 558, 546, 559, 554, 561, 562, 564, 559, 568, + 563, 557, 571, 558, 555, 957, 556, 571, 560, 563, + 567, 563, 564, 569, 561, 573, 562, 568, 570, 567, + 572, 572, 569, 574, 569, 575, 576, 570, 577, 578, + 578, 579, 581, 582, 573, 574, 586, 581, 582, 576, + + 583, 584, 575, 585, 584, 577, 583, 587, 579, 588, + 584, 585, 590, 586, 591, 592, 593, 955, 591, 594, + 592, 593, 595, 596, 597, 587, 588, 598, 594, 597, + 599, 590, 604, 600, 596, 602, 595, 604, 598, 600, + 601, 601, 603, 603, 602, 605, 612, 599, 606, 606, + 607, 607, 608, 608, 609, 611, 613, 609, 614, 617, + 611, 613, 616, 612, 605, 615, 615, 616, 618, 619, + 617, 620, 617, 621, 622, 622, 623, 617, 624, 626, + 625, 628, 614, 627, 627, 624, 629, 618, 619, 625, + 620, 631, 632, 633, 635, 623, 631, 632, 621, 635, + + 634, 629, 636, 637, 626, 638, 628, 634, 639, 640, + 641, 636, 633, 642, 639, 643, 645, 637, 640, 649, + 643, 645, 646, 638, 644, 647, 642, 646, 644, 644, + 641, 648, 650, 651, 652, 648, 647, 650, 653, 653, + 654, 659, 655, 649, 656, 652, 654, 655, 657, 662, + 656, 667, 659, 672, 651, 661, 661, 657, 662, 666, + 668, 668, 674, 669, 666, 669, 661, 667, 670, 670, + 673, 673, 672, 675, 676, 677, 678, 680, 679, 680, + 681, 683, 674, 679, 675, 676, 677, 682, 682, 684, + 678, 685, 688, 685, 684, 686, 687, 681, 689, 690, + + 686, 687, 691, 692, 690, 693, 683, 691, 694, 688, + 699, 695, 954, 697, 696, 698, 700, 689, 693, 694, + 695, 692, 695, 696, 697, 707, 701, 698, 703, 699, + 704, 700, 701, 706, 703, 705, 705, 708, 953, 704, + 709, 708, 706, 707, 712, 709, 710, 710, 713, 713, + 714, 714, 715, 712, 716, 718, 717, 719, 720, 716, + 717, 721, 722, 715, 723, 725, 726, 727, 725, 718, + 728, 728, 733, 722, 950, 719, 720, 731, 726, 727, + 740, 721, 729, 729, 723, 730, 730, 732, 732, 731, + 733, 734, 734, 736, 737, 737, 738, 740, 736, 739, + + 739, 741, 742, 743, 743, 742, 745, 741, 744, 744, + 746, 746, 747, 747, 738, 748, 749, 749, 743, 750, + 751, 752, 753, 754, 745, 751, 755, 753, 757, 756, + 750, 759, 757, 760, 762, 755, 764, 754, 756, 762, + 748, 752, 760, 761, 761, 766, 767, 764, 766, 771, + 759, 767, 768, 768, 769, 772, 770, 773, 769, 770, + 774, 775, 773, 776, 777, 774, 949, 775, 771, 777, + 779, 778, 779, 793, 772, 782, 782, 792, 776, 778, + 784, 784, 786, 786, 788, 788, 790, 791, 791, 804, + 794, 790, 792, 799, 793, 794, 796, 796, 799, 800, + + 801, 800, 802, 802, 803, 801, 804, 805, 806, 807, + 808, 808, 809, 810, 811, 803, 812, 813, 805, 806, + 807, 809, 813, 817, 814, 815, 815, 819, 812, 814, + 818, 818, 820, 811, 821, 822, 819, 823, 810, 825, + 817, 824, 824, 826, 825, 827, 828, 832, 835, 820, + 822, 821, 836, 833, 839, 823, 833, 826, 834, 834, + 838, 838, 835, 827, 843, 828, 832, 840, 840, 836, + 842, 842, 839, 844, 845, 846, 848, 851, 849, 845, + 846, 850, 844, 849, 855, 843, 850, 852, 852, 855, + 848, 851, 853, 853, 856, 857, 863, 858, 857, 859, + + 860, 860, 861, 864, 866, 856, 858, 867, 859, 865, + 865, 861, 868, 866, 863, 867, 870, 868, 871, 873, + 873, 864, 875, 876, 876, 870, 877, 878, 878, 877, + 871, 879, 879, 880, 881, 882, 882, 886, 883, 881, + 887, 875, 883, 888, 889, 890, 880, 891, 887, 892, + 890, 893, 894, 896, 903, 886, 896, 904, 897, 889, + 893, 888, 898, 898, 899, 903, 891, 900, 899, 902, + 908, 894, 907, 907, 892, 897, 900, 910, 902, 908, + 911, 904, 910, 912, 913, 913, 914, 915, 916, 917, + 918, 919, 920, 920, 917, 921, 916, 912, 911, 924, + + 921, 914, 923, 923, 925, 915, 926, 926, 928, 919, + 927, 927, 929, 930, 930, 918, 931, 931, 924, 928, + 932, 934, 935, 935, 946, 925, 934, 936, 936, 937, + 937, 929, 938, 939, 939, 941, 941, 938, 932, 943, + 943, 944, 947, 947, 948, 951, 944, 952, 962, 948, + 958, 952, 956, 956, 958, 960, 960, 963, 963, 964, + 964, 966, 966, 972, 951, 962, 968, 968, 973, 974, + 976, 975, 977, 977, 945, 942, 940, 973, 933, 922, + 909, 906, 972, 974, 975, 905, 901, 895, 976, 980, + 980, 980, 980, 980, 980, 981, 981, 981, 981, 981, + + 981, 982, 982, 982, 982, 982, 982, 983, 983, 983, + 983, 983, 983, 985, 985, 885, 985, 985, 985, 986, + 986, 884, 874, 872, 986, 987, 987, 869, 862, 987, + 989, 989, 854, 847, 841, 989, 990, 990, 837, 990, + 990, 990, 831, 830, 829, 816, 798, 797, 795, 789, + 787, 785, 783, 781, 780, 765, 763, 758, 735, 724, + 711, 702, 671, 665, 664, 663, 660, 658, 630, 610, + 589, 580, 566, 565, 544, 535, 524, 523, 522, 500, 480, 466, 434, 411, 388, 380, 371, 336, 306, 305, 303, 302, 297, 220, 214, 103, 102, 100, 98, 96, - 55, 51, 47, 46, 42, 37, 12, 11, 974, 974, - 974, 974, 974, 974, 974, 974, 974, 974, 974, 974, - 974, 974, 974, 974, 974, 974, 974, 974, 974, 974, - 974, 974, 974, 974, 974, 974, 974, 974, 974, 974, - 974, 974, 974, 974, 974, 974, 974 + 55, 51, 47, 46, 42, 37, 12, 11, 979, 979, + 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, + 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, + 979, 979, 979, 979, 979, 979, 979, 979, 979, 979, + 979, 979, 979, 979, 979, 979, 979 } ; static yy_state_type yy_last_accepting_state; @@ -1310,7 +1312,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 1313 "" +#line 1315 "" #define INITIAL 0 #define quotedstring 1 @@ -1496,7 +1498,7 @@ YY_DECL #line 107 "util/configlexer.lex" -#line 1499 "" +#line 1501 "" if ( !(yy_init) ) { @@ -1555,13 +1557,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 >= 975 ) + if ( yy_current_state >= 980 ) 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] != 1999 ); + while ( yy_base[yy_current_state] != 2009 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1973,91 +1975,96 @@ YY_RULE_SETUP case 78: YY_RULE_SETUP #line 185 "util/configlexer.lex" -{ YDOUT; return VAR_STATISTICS_INTERVAL;} +{ YDOUT; return VAR_LOCAL_DATA_PTR;} YY_BREAK case 79: YY_RULE_SETUP #line 186 "util/configlexer.lex" -{ YDOUT; return VAR_STATISTICS_CUMULATIVE;} +{ YDOUT; return VAR_STATISTICS_INTERVAL;} YY_BREAK case 80: YY_RULE_SETUP #line 187 "util/configlexer.lex" -{ YDOUT; return VAR_EXTENDED_STATISTICS;} +{ YDOUT; return VAR_STATISTICS_CUMULATIVE;} YY_BREAK case 81: YY_RULE_SETUP #line 188 "util/configlexer.lex" -{ YDOUT; return VAR_REMOTE_CONTROL; } +{ YDOUT; return VAR_EXTENDED_STATISTICS;} YY_BREAK case 82: YY_RULE_SETUP #line 189 "util/configlexer.lex" -{ YDOUT; return VAR_CONTROL_ENABLE; } +{ YDOUT; return VAR_REMOTE_CONTROL; } YY_BREAK case 83: YY_RULE_SETUP #line 190 "util/configlexer.lex" -{ YDOUT; return VAR_CONTROL_INTERFACE; } +{ YDOUT; return VAR_CONTROL_ENABLE; } YY_BREAK case 84: YY_RULE_SETUP #line 191 "util/configlexer.lex" -{ YDOUT; return VAR_CONTROL_PORT; } +{ YDOUT; return VAR_CONTROL_INTERFACE; } YY_BREAK case 85: YY_RULE_SETUP #line 192 "util/configlexer.lex" -{ YDOUT; return VAR_SERVER_KEY_FILE; } +{ YDOUT; return VAR_CONTROL_PORT; } YY_BREAK case 86: YY_RULE_SETUP #line 193 "util/configlexer.lex" -{ YDOUT; return VAR_SERVER_CERT_FILE; } +{ YDOUT; return VAR_SERVER_KEY_FILE; } YY_BREAK case 87: YY_RULE_SETUP #line 194 "util/configlexer.lex" -{ YDOUT; return VAR_CONTROL_KEY_FILE; } +{ YDOUT; return VAR_SERVER_CERT_FILE; } YY_BREAK case 88: YY_RULE_SETUP #line 195 "util/configlexer.lex" -{ YDOUT; return VAR_CONTROL_CERT_FILE; } +{ YDOUT; return VAR_CONTROL_KEY_FILE; } YY_BREAK case 89: -/* rule 89 can match eol */ YY_RULE_SETUP #line 196 "util/configlexer.lex" +{ YDOUT; return VAR_CONTROL_CERT_FILE; } + YY_BREAK +case 90: +/* rule 90 can match eol */ +YY_RULE_SETUP +#line 197 "util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 90: +case 91: YY_RULE_SETUP -#line 199 "util/configlexer.lex" +#line 200 "util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 200 "util/configlexer.lex" +#line 201 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 91: -YY_RULE_SETUP -#line 204 "util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 92: -/* rule 92 can match eol */ YY_RULE_SETUP #line 205 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK case 93: +/* rule 93 can match eol */ YY_RULE_SETUP #line 206 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 94: +YY_RULE_SETUP +#line 207 "util/configlexer.lex" { LEXOUT(("QE ")); BEGIN(INITIAL); @@ -2069,32 +2076,32 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 94: +case 95: YY_RULE_SETUP -#line 217 "util/configlexer.lex" +#line 218 "util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 218 "util/configlexer.lex" +#line 219 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 95: -YY_RULE_SETUP -#line 222 "util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 96: -/* rule 96 can match eol */ YY_RULE_SETUP #line 223 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK case 97: +/* rule 97 can match eol */ YY_RULE_SETUP #line 224 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 98: +YY_RULE_SETUP +#line 225 "util/configlexer.lex" { LEXOUT(("SQE ")); BEGIN(INITIAL); @@ -2106,37 +2113,37 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 98: +case 99: YY_RULE_SETUP -#line 235 "util/configlexer.lex" +#line 236 "util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 236 "util/configlexer.lex" +#line 237 "util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(INITIAL); } YY_BREAK -case 99: -YY_RULE_SETUP -#line 240 "util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 100: -/* rule 100 can match eol */ YY_RULE_SETUP #line 241 "util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 101: +/* rule 101 can match eol */ YY_RULE_SETUP #line 242 "util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 102: YY_RULE_SETUP #line 243 "util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 103: +YY_RULE_SETUP +#line 244 "util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include(yytext); @@ -2144,26 +2151,26 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 248 "util/configlexer.lex" +#line 249 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 103: -YY_RULE_SETUP -#line 252 "util/configlexer.lex" -{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } - YY_BREAK case 104: -/* rule 104 can match eol */ YY_RULE_SETUP #line 253 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK case 105: +/* rule 105 can match eol */ YY_RULE_SETUP #line 254 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 106: +YY_RULE_SETUP +#line 255 "util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -2172,7 +2179,7 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 260 "util/configlexer.lex" +#line 261 "util/configlexer.lex" { yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ if (config_include_stack_ptr == 0) { @@ -2183,18 +2190,18 @@ case YY_STATE_EOF(INITIAL): } } YY_BREAK -case 106: +case 107: YY_RULE_SETUP -#line 270 "util/configlexer.lex" +#line 271 "util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); yylval.str = strdup(yytext); return STRING; } YY_BREAK -case 107: +case 108: YY_RULE_SETUP -#line 273 "util/configlexer.lex" +#line 274 "util/configlexer.lex" ECHO; YY_BREAK -#line 2197 "" +#line 2204 "" case YY_END_OF_BUFFER: { @@ -2484,7 +2491,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 >= 975 ) + if ( yy_current_state >= 980 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2512,11 +2519,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 >= 975 ) + if ( yy_current_state >= 980 ) 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 == 974); + yy_is_jam = (yy_current_state == 979); return yy_is_jam ? 0 : yy_current_state; } @@ -3153,7 +3160,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 273 "util/configlexer.lex" +#line 274 "util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 2e6331223..c6c74bab7 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -182,6 +182,7 @@ val-nsec3-keysize-iterations{COLON} { YDOUT; return VAR_VAL_NSEC3_KEYSIZE_ITERAT use-syslog{COLON} { YDOUT; return VAR_USE_SYSLOG;} local-zone{COLON} { YDOUT; return VAR_LOCAL_ZONE;} local-data{COLON} { YDOUT; return VAR_LOCAL_DATA;} +local-data-ptr{COLON} { YDOUT; return VAR_LOCAL_DATA_PTR;} statistics-interval{COLON} { YDOUT; return VAR_STATISTICS_INTERVAL;} statistics-cumulative{COLON} { YDOUT; return VAR_STATISTICS_CUMULATIVE;} extended-statistics{COLON} { YDOUT; return VAR_EXTENDED_STATISTICS;} diff --git a/util/configparser.c b/util/configparser.c index 42776c024..58e675ad5 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -159,7 +159,8 @@ VAR_SERVER_CERT_FILE = 348, VAR_CONTROL_KEY_FILE = 349, VAR_CONTROL_CERT_FILE = 350, - VAR_EXTENDED_STATISTICS = 351 + VAR_EXTENDED_STATISTICS = 351, + VAR_LOCAL_DATA_PTR = 352 }; #endif /* Tokens. */ @@ -257,6 +258,7 @@ #define VAR_CONTROL_KEY_FILE 349 #define VAR_CONTROL_CERT_FILE 350 #define VAR_EXTENDED_STATISTICS 351 +#define VAR_LOCAL_DATA_PTR 352 @@ -315,7 +317,7 @@ typedef union YYSTYPE char* str; } /* Line 187 of yacc.c. */ -#line 319 "util/configparser.c" +#line 321 "util/configparser.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -328,7 +330,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 332 "util/configparser.c" +#line 334 "util/configparser.c" #ifdef short # undef short @@ -543,20 +545,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 173 +#define YYLAST 175 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 97 +#define YYNTOKENS 98 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 98 +#define YYNNTS 99 /* YYNRULES -- Number of rules. */ -#define YYNRULES 185 +#define YYNRULES 187 /* YYNRULES -- Number of states. */ -#define YYNSTATES 271 +#define YYNSTATES 274 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 351 +#define YYMAXUTOK 352 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -599,7 +601,7 @@ static const yytype_uint8 yytranslate[] = 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96 + 95, 96, 97 }; #if YYDEBUG @@ -615,68 +617,69 @@ static const yytype_uint16 yyprhs[] = 103, 105, 107, 109, 111, 113, 115, 117, 119, 121, 123, 125, 127, 129, 131, 133, 135, 137, 139, 141, 143, 145, 147, 149, 151, 153, 155, 157, 159, 161, - 163, 165, 167, 170, 171, 173, 175, 177, 179, 182, - 183, 185, 187, 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, 324, 327, - 330, 333, 336, 339, 342, 345, 348, 351, 354, 357, - 360, 364, 367, 370, 373, 376, 379, 382, 385, 388, - 391, 394, 398, 401, 404, 407, 410, 413, 416, 419, - 421, 424, 425, 427, 429, 431, 433, 435, 437, 439, - 442, 445, 448, 451, 454, 457 + 163, 165, 167, 169, 172, 173, 175, 177, 179, 181, + 184, 185, 187, 189, 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, + 329, 332, 335, 338, 341, 344, 347, 350, 353, 356, + 359, 362, 366, 369, 372, 375, 378, 381, 384, 387, + 390, 393, 396, 400, 403, 406, 409, 412, 415, 418, + 421, 424, 426, 429, 430, 432, 434, 436, 438, 440, + 442, 444, 447, 450, 453, 456, 459, 462 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 98, 0, -1, -1, 98, 99, -1, 100, 101, -1, - 103, 104, -1, 106, 107, -1, 185, 186, -1, 11, - -1, 101, 102, -1, -1, 109, -1, 110, -1, 114, - -1, 117, -1, 123, -1, 124, -1, 125, -1, 126, - -1, 115, -1, 129, -1, 130, -1, 131, -1, 132, - -1, 133, -1, 145, -1, 146, -1, 147, -1, 148, - -1, 149, -1, 120, -1, 150, -1, 151, -1, 154, - -1, 152, -1, 153, -1, 155, -1, 156, -1, 157, - -1, 164, -1, 140, -1, 141, -1, 142, -1, 143, - -1, 158, -1, 167, -1, 137, -1, 139, -1, 168, - -1, 170, -1, 171, -1, 172, -1, 121, -1, 144, - -1, 174, -1, 175, -1, 138, -1, 173, -1, 128, - -1, 116, -1, 134, -1, 165, -1, 169, -1, 159, - -1, 166, -1, 177, -1, 178, -1, 122, -1, 111, - -1, 127, -1, 161, -1, 112, -1, 118, -1, 119, - -1, 135, -1, 136, -1, 176, -1, 160, -1, 162, - -1, 163, -1, 113, -1, 38, -1, 104, 105, -1, - -1, 179, -1, 180, -1, 181, -1, 44, -1, 107, - 108, -1, -1, 182, -1, 183, -1, 184, -1, 13, - 10, -1, 12, 10, -1, 76, 10, -1, 79, 10, - -1, 96, 10, -1, 14, 10, -1, 16, 10, -1, - 67, 10, -1, 15, 10, -1, 80, 10, -1, 81, - 10, -1, 31, 10, -1, 60, 10, -1, 75, 10, - -1, 17, 10, -1, 18, 10, -1, 19, 10, -1, - 20, 10, -1, 77, 10, -1, 66, 10, -1, 21, - 10, -1, 22, 10, -1, 23, 10, -1, 24, 10, - -1, 25, 10, -1, 68, 10, -1, 82, 10, -1, - 83, 10, -1, 54, 10, -1, 64, 10, -1, 55, - 10, -1, 48, 10, -1, 49, 10, -1, 50, 10, - -1, 51, 10, -1, 61, 10, -1, 26, 10, -1, - 27, 10, -1, 28, 10, -1, 29, 10, -1, 30, - 10, -1, 32, 10, -1, 33, 10, -1, 35, 10, - -1, 36, 10, -1, 34, 10, -1, 41, 10, -1, - 42, 10, -1, 43, 10, -1, 52, 10, -1, 71, - 10, -1, 85, 10, -1, 78, 10, -1, 86, 10, - -1, 87, 10, -1, 47, 10, -1, 69, 10, -1, - 72, 10, 10, -1, 53, 10, -1, 56, 10, -1, - 70, 10, -1, 57, 10, -1, 58, 10, -1, 59, - 10, -1, 65, 10, -1, 62, 10, -1, 63, 10, - -1, 84, 10, -1, 73, 10, 10, -1, 74, 10, - -1, 37, 10, -1, 39, 10, -1, 40, 10, -1, - 37, 10, -1, 45, 10, -1, 46, 10, -1, 88, - -1, 186, 187, -1, -1, 188, -1, 190, -1, 189, - -1, 191, -1, 192, -1, 193, -1, 194, -1, 89, - 10, -1, 91, 10, -1, 90, 10, -1, 92, 10, - -1, 93, 10, -1, 94, 10, -1, 95, 10, -1 + 99, 0, -1, -1, 99, 100, -1, 101, 102, -1, + 104, 105, -1, 107, 108, -1, 187, 188, -1, 11, + -1, 102, 103, -1, -1, 110, -1, 111, -1, 115, + -1, 118, -1, 124, -1, 125, -1, 126, -1, 127, + -1, 116, -1, 130, -1, 131, -1, 132, -1, 133, + -1, 134, -1, 146, -1, 147, -1, 148, -1, 149, + -1, 150, -1, 121, -1, 151, -1, 152, -1, 155, + -1, 153, -1, 154, -1, 156, -1, 157, -1, 158, + -1, 165, -1, 141, -1, 142, -1, 143, -1, 144, + -1, 159, -1, 168, -1, 138, -1, 140, -1, 169, + -1, 171, -1, 172, -1, 173, -1, 122, -1, 145, + -1, 175, -1, 176, -1, 139, -1, 174, -1, 129, + -1, 117, -1, 135, -1, 166, -1, 170, -1, 160, + -1, 167, -1, 178, -1, 179, -1, 123, -1, 112, + -1, 128, -1, 162, -1, 113, -1, 119, -1, 120, + -1, 136, -1, 137, -1, 177, -1, 161, -1, 163, + -1, 164, -1, 114, -1, 180, -1, 38, -1, 105, + 106, -1, -1, 181, -1, 182, -1, 183, -1, 44, + -1, 108, 109, -1, -1, 184, -1, 185, -1, 186, + -1, 13, 10, -1, 12, 10, -1, 76, 10, -1, + 79, 10, -1, 96, 10, -1, 14, 10, -1, 16, + 10, -1, 67, 10, -1, 15, 10, -1, 80, 10, + -1, 81, 10, -1, 31, 10, -1, 60, 10, -1, + 75, 10, -1, 17, 10, -1, 18, 10, -1, 19, + 10, -1, 20, 10, -1, 77, 10, -1, 66, 10, + -1, 21, 10, -1, 22, 10, -1, 23, 10, -1, + 24, 10, -1, 25, 10, -1, 68, 10, -1, 82, + 10, -1, 83, 10, -1, 54, 10, -1, 64, 10, + -1, 55, 10, -1, 48, 10, -1, 49, 10, -1, + 50, 10, -1, 51, 10, -1, 61, 10, -1, 26, + 10, -1, 27, 10, -1, 28, 10, -1, 29, 10, + -1, 30, 10, -1, 32, 10, -1, 33, 10, -1, + 35, 10, -1, 36, 10, -1, 34, 10, -1, 41, + 10, -1, 42, 10, -1, 43, 10, -1, 52, 10, + -1, 71, 10, -1, 85, 10, -1, 78, 10, -1, + 86, 10, -1, 87, 10, -1, 47, 10, -1, 69, + 10, -1, 72, 10, 10, -1, 53, 10, -1, 56, + 10, -1, 70, 10, -1, 57, 10, -1, 58, 10, + -1, 59, 10, -1, 65, 10, -1, 62, 10, -1, + 63, 10, -1, 84, 10, -1, 73, 10, 10, -1, + 74, 10, -1, 97, 10, -1, 37, 10, -1, 39, + 10, -1, 40, 10, -1, 37, 10, -1, 45, 10, + -1, 46, 10, -1, 88, -1, 188, 189, -1, -1, + 190, -1, 192, -1, 191, -1, 193, -1, 194, -1, + 195, -1, 196, -1, 89, 10, -1, 91, 10, -1, + 90, 10, -1, 92, 10, -1, 93, 10, -1, 94, + 10, -1, 95, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -690,17 +693,17 @@ static const yytype_uint16 yyrline[] = 130, 130, 131, 131, 132, 132, 133, 133, 134, 134, 134, 135, 135, 136, 136, 137, 137, 137, 138, 138, 139, 139, 140, 140, 141, 141, 141, 142, 142, 143, - 143, 145, 157, 158, 159, 159, 159, 161, 173, 174, - 175, 175, 175, 177, 186, 195, 206, 215, 224, 233, - 246, 261, 270, 279, 288, 297, 306, 315, 324, 333, - 342, 351, 360, 374, 381, 388, 395, 403, 410, 417, - 424, 431, 439, 447, 454, 463, 472, 479, 486, 497, - 505, 518, 527, 535, 548, 557, 566, 575, 584, 597, - 604, 614, 624, 634, 644, 654, 664, 671, 678, 685, - 695, 709, 716, 734, 743, 752, 762, 772, 779, 787, - 800, 808, 827, 834, 841, 848, 855, 862, 869, 876, - 881, 882, 883, 883, 883, 884, 884, 884, 885, 887, - 897, 906, 913, 920, 927, 934 + 143, 144, 146, 158, 159, 160, 160, 160, 162, 174, + 175, 176, 176, 176, 178, 187, 196, 207, 216, 225, + 234, 247, 262, 271, 280, 289, 298, 307, 316, 325, + 334, 343, 352, 361, 375, 382, 389, 396, 404, 411, + 418, 425, 432, 440, 448, 455, 464, 473, 480, 487, + 498, 506, 519, 528, 536, 549, 558, 567, 576, 585, + 598, 605, 615, 625, 635, 645, 655, 665, 672, 679, + 686, 696, 710, 717, 735, 744, 753, 763, 773, 780, + 788, 801, 809, 828, 835, 850, 857, 864, 871, 878, + 885, 892, 897, 898, 899, 899, 899, 900, 900, 900, + 901, 903, 913, 922, 929, 936, 943, 950 }; #endif @@ -739,17 +742,17 @@ static const char *const yytname[] = "VAR_PRIVATE_DOMAIN", "VAR_REMOTE_CONTROL", "VAR_CONTROL_ENABLE", "VAR_CONTROL_INTERFACE", "VAR_CONTROL_PORT", "VAR_SERVER_KEY_FILE", "VAR_SERVER_CERT_FILE", "VAR_CONTROL_KEY_FILE", "VAR_CONTROL_CERT_FILE", - "VAR_EXTENDED_STATISTICS", "$accept", "toplevelvars", "toplevelvar", - "serverstart", "contents_server", "content_server", "stubstart", - "contents_stub", "content_stub", "forwardstart", "contents_forward", - "content_forward", "server_num_threads", "server_verbosity", - "server_statistics_interval", "server_statistics_cumulative", - "server_extended_statistics", "server_port", "server_interface", - "server_outgoing_interface", "server_outgoing_range", - "server_outgoing_port_permit", "server_outgoing_port_avoid", - "server_outgoing_num_tcp", "server_incoming_num_tcp", - "server_interface_automatic", "server_do_ip4", "server_do_ip6", - "server_do_udp", "server_do_tcp", "server_do_daemonize", + "VAR_EXTENDED_STATISTICS", "VAR_LOCAL_DATA_PTR", "$accept", + "toplevelvars", "toplevelvar", "serverstart", "contents_server", + "content_server", "stubstart", "contents_stub", "content_stub", + "forwardstart", "contents_forward", "content_forward", + "server_num_threads", "server_verbosity", "server_statistics_interval", + "server_statistics_cumulative", "server_extended_statistics", + "server_port", "server_interface", "server_outgoing_interface", + "server_outgoing_range", "server_outgoing_port_permit", + "server_outgoing_port_avoid", "server_outgoing_num_tcp", + "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4", + "server_do_ip6", "server_do_udp", "server_do_tcp", "server_do_daemonize", "server_use_syslog", "server_chroot", "server_username", "server_directory", "server_logfile", "server_pidfile", "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor", @@ -772,11 +775,11 @@ static const char *const yytname[] = "server_val_permissive_mode", "server_val_nsec3_keysize_iterations", "server_key_cache_size", "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone", "server_local_data", - "stub_name", "stub_host", "stub_addr", "forward_name", "forward_host", - "forward_addr", "rcstart", "contents_rc", "content_rc", - "rc_control_enable", "rc_control_port", "rc_control_interface", - "rc_server_key_file", "rc_server_cert_file", "rc_control_key_file", - "rc_control_cert_file", 0 + "server_local_data_ptr", "stub_name", "stub_host", "stub_addr", + "forward_name", "forward_host", "forward_addr", "rcstart", "contents_rc", + "content_rc", "rc_control_enable", "rc_control_port", + "rc_control_interface", "rc_server_key_file", "rc_server_cert_file", + "rc_control_key_file", "rc_control_cert_file", 0 }; #endif @@ -794,23 +797,23 @@ static const yytype_uint16 yytoknum[] = 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, - 345, 346, 347, 348, 349, 350, 351 + 345, 346, 347, 348, 349, 350, 351, 352 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 97, 98, 98, 99, 99, 99, 99, 100, 101, - 101, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 103, 104, 104, 105, 105, 105, 106, 107, 107, - 108, 108, 108, 109, 110, 111, 112, 113, 114, 115, + 0, 98, 99, 99, 100, 100, 100, 100, 101, 102, + 102, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 104, 105, 105, 106, 106, 106, 107, 108, + 108, 109, 109, 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, 141, 142, 143, 144, 145, @@ -818,8 +821,8 @@ static const yytype_uint8 yyr1[] = 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, - 186, 186, 187, 187, 187, 187, 187, 187, 187, 188, - 189, 190, 191, 192, 193, 194 + 186, 187, 188, 188, 189, 189, 189, 189, 189, 189, + 189, 190, 191, 192, 193, 194, 195, 196 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -833,17 +836,17 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 0, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, + 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, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 2, 2, 2, 2, 2, 2, 2, 1, - 2, 0, 1, 1, 1, 1, 1, 1, 1, 2, - 2, 2, 2, 2, 2, 2 + 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, + 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, + 1, 2, 2, 2, 2, 2, 2, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -851,49 +854,49 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 2, 0, 1, 8, 81, 87, 169, 3, 10, 83, - 89, 171, 4, 5, 6, 7, 0, 0, 0, 0, + 2, 0, 1, 8, 82, 88, 171, 3, 10, 84, + 90, 173, 4, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 9, 11, 12, 68, - 71, 80, 13, 19, 59, 14, 72, 73, 30, 52, - 67, 15, 16, 17, 18, 69, 58, 20, 21, 22, - 23, 24, 60, 74, 75, 46, 56, 47, 40, 41, - 42, 43, 53, 25, 26, 27, 28, 29, 31, 32, - 34, 35, 33, 36, 37, 38, 44, 63, 77, 70, - 78, 79, 39, 61, 64, 45, 48, 62, 49, 50, - 51, 57, 54, 55, 76, 65, 66, 0, 0, 0, - 82, 84, 85, 86, 0, 0, 0, 88, 90, 91, - 92, 0, 0, 0, 0, 0, 0, 0, 170, 172, - 174, 173, 175, 176, 177, 178, 94, 93, 98, 101, - 99, 107, 108, 109, 110, 113, 114, 115, 116, 117, - 129, 130, 131, 132, 133, 104, 134, 135, 138, 136, - 137, 139, 140, 141, 148, 124, 125, 126, 127, 142, - 151, 121, 123, 152, 154, 155, 156, 105, 128, 158, - 159, 122, 157, 112, 100, 118, 149, 153, 143, 0, - 0, 162, 106, 95, 111, 145, 96, 102, 103, 119, - 120, 160, 144, 146, 147, 97, 163, 164, 165, 166, - 167, 168, 179, 181, 180, 182, 183, 184, 185, 150, - 161 + 0, 0, 0, 0, 0, 0, 0, 9, 11, 12, + 68, 71, 80, 13, 19, 59, 14, 72, 73, 30, + 52, 67, 15, 16, 17, 18, 69, 58, 20, 21, + 22, 23, 24, 60, 74, 75, 46, 56, 47, 40, + 41, 42, 43, 53, 25, 26, 27, 28, 29, 31, + 32, 34, 35, 33, 36, 37, 38, 44, 63, 77, + 70, 78, 79, 39, 61, 64, 45, 48, 62, 49, + 50, 51, 57, 54, 55, 76, 65, 66, 81, 0, + 0, 0, 83, 85, 86, 87, 0, 0, 0, 89, + 91, 92, 93, 0, 0, 0, 0, 0, 0, 0, + 172, 174, 176, 175, 177, 178, 179, 180, 95, 94, + 99, 102, 100, 108, 109, 110, 111, 114, 115, 116, + 117, 118, 130, 131, 132, 133, 134, 105, 135, 136, + 139, 137, 138, 140, 141, 142, 149, 125, 126, 127, + 128, 143, 152, 122, 124, 153, 155, 156, 157, 106, + 129, 159, 160, 123, 158, 113, 101, 119, 150, 154, + 144, 0, 0, 163, 107, 96, 112, 146, 97, 103, + 104, 120, 121, 161, 145, 147, 148, 98, 164, 165, + 166, 167, 168, 169, 170, 181, 183, 182, 184, 185, + 186, 187, 151, 162 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 7, 8, 12, 86, 9, 13, 160, 10, - 14, 167, 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, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 161, 162, 163, 168, 169, 170, 11, 15, - 178, 179, 180, 181, 182, 183, 184, 185 + -1, 1, 7, 8, 12, 87, 9, 13, 162, 10, + 14, 169, 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, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, + 156, 157, 158, 163, 164, 165, 170, 171, 172, 11, + 15, 180, 181, 182, 183, 184, 185, 186, 187 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -907,28 +910,28 @@ static const yytype_int16 yypact[] = 19, 20, 21, 22, 23, 24, 25, 26, 27, 29, 30, 31, 32, 33, 35, 36, 37, 38, 39, 40, 41, 43, 69, 70, 71, 72, 76, 77, 120, 121, - 122, 123, 124, 125, 126, 127, 129, 130, 131, 132, - 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, - 143, 144, 145, 146, 147, 148, -88, -88, -88, -88, + 122, 123, 124, 125, 126, 127, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, -88, -88, -88, + -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, + -88, -88, -88, -88, -88, -88, -88, -88, -88, 151, + 152, 153, -88, -88, -88, -88, 154, 155, 156, -88, + -88, -88, -88, 157, 158, 159, 160, 161, 162, 163, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, - -88, -88, -88, -88, -88, -88, -88, 149, 150, 151, - -88, -88, -88, -88, 152, 153, 154, -88, -88, -88, - -88, 155, 156, 157, 158, 159, 160, 161, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, - -88, -88, -88, -88, -88, -88, -88, -88, -88, 162, - 163, -88, -88, -88, -88, -88, -88, -88, -88, -88, + -88, 164, 165, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, - -88 + -88, -88, -88, -88 }; /* YYPGOTO[NTERM-NUM]. */ @@ -943,7 +946,7 @@ static const yytype_int8 yypgoto[] = -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, - -88, -88, -88, -88, -88, -88, -88, -88 + -88, -88, -88, -88, -88, -88, -88, -88, -88 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -953,24 +956,24 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -1 static const yytype_uint16 yytable[] = { - 2, 164, 171, 172, 173, 174, 175, 176, 177, 165, - 166, 3, 157, 186, 158, 159, 187, 188, 189, 190, - 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, - 201, 202, 203, 204, 205, 206, 207, 208, 4, 209, - 210, 211, 212, 213, 5, 214, 215, 216, 217, 218, - 219, 220, 0, 221, 16, 17, 18, 19, 20, 21, + 2, 166, 173, 174, 175, 176, 177, 178, 179, 167, + 168, 3, 159, 188, 160, 161, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 4, 211, + 212, 213, 214, 215, 5, 216, 217, 218, 219, 220, + 221, 222, 0, 223, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 222, - 223, 224, 225, 41, 42, 43, 226, 227, 6, 44, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 224, + 225, 226, 227, 41, 42, 43, 228, 229, 6, 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, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 228, 229, 230, 231, 232, 233, 234, 235, 85, 236, - 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, - 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, - 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, - 267, 268, 269, 270 + 230, 231, 232, 233, 234, 235, 236, 237, 85, 86, + 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 271, 272, 273 }; static const yytype_int8 yycheck[] = @@ -988,36 +991,36 @@ static const yytype_int8 yycheck[] = 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 10, 10, 10, 10, 10, 10, 10, 10, 96, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 96, 97, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 98, 0, 11, 38, 44, 88, 99, 100, 103, - 106, 185, 101, 104, 107, 186, 12, 13, 14, 15, + 0, 99, 0, 11, 38, 44, 88, 100, 101, 104, + 107, 187, 102, 105, 108, 188, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 41, 42, 43, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 96, 102, 109, 110, 111, + 83, 84, 85, 86, 87, 96, 97, 103, 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, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, - 172, 173, 174, 175, 176, 177, 178, 37, 39, 40, - 105, 179, 180, 181, 37, 45, 46, 108, 182, 183, - 184, 89, 90, 91, 92, 93, 94, 95, 187, 188, - 189, 190, 191, 192, 193, 194, 10, 10, 10, 10, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 37, + 39, 40, 106, 181, 182, 183, 37, 45, 46, 109, + 184, 185, 186, 89, 90, 91, 92, 93, 94, 95, + 189, 190, 191, 192, 193, 194, 195, 196, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1026,7 +1029,7 @@ static const yytype_uint8 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10 + 10, 10, 10, 10 }; #define yyerrok (yyerrstatus = 0) @@ -1847,8 +1850,8 @@ yyreduce: } break; - case 81: -#line 146 "util/configparser.y" + case 82: +#line 147 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -1861,8 +1864,8 @@ yyreduce: } break; - case 87: -#line 162 "util/configparser.y" + case 88: +#line 163 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -1875,8 +1878,8 @@ yyreduce: } break; - case 93: -#line 178 "util/configparser.y" + case 94: +#line 179 "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) @@ -1886,8 +1889,8 @@ yyreduce: } break; - case 94: -#line 187 "util/configparser.y" + case 95: +#line 188 "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) @@ -1897,8 +1900,8 @@ yyreduce: } break; - case 95: -#line 196 "util/configparser.y" + case 96: +#line 197 "util/configparser.y" { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "") == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) @@ -1910,8 +1913,8 @@ yyreduce: } break; - case 96: -#line 207 "util/configparser.y" + case 97: +#line 208 "util/configparser.y" { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1921,8 +1924,8 @@ yyreduce: } break; - case 97: -#line 216 "util/configparser.y" + case 98: +#line 217 "util/configparser.y" { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1932,8 +1935,8 @@ yyreduce: } break; - case 98: -#line 225 "util/configparser.y" + case 99: +#line 226 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1943,8 +1946,8 @@ yyreduce: } break; - case 99: -#line 234 "util/configparser.y" + case 100: +#line 235 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -1958,8 +1961,8 @@ yyreduce: } break; - case 100: -#line 247 "util/configparser.y" + case 101: +#line 248 "util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -1975,8 +1978,8 @@ yyreduce: } break; - case 101: -#line 262 "util/configparser.y" + case 102: +#line 263 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1986,8 +1989,8 @@ yyreduce: } break; - case 102: -#line 271 "util/configparser.y" + case 103: +#line 272 "util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, @@ -1997,8 +2000,8 @@ yyreduce: } break; - case 103: -#line 280 "util/configparser.y" + case 104: +#line 281 "util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, @@ -2008,8 +2011,8 @@ yyreduce: } break; - case 104: -#line 289 "util/configparser.y" + case 105: +#line 290 "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) @@ -2019,8 +2022,8 @@ yyreduce: } break; - case 105: -#line 298 "util/configparser.y" + case 106: +#line 299 "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) @@ -2030,8 +2033,8 @@ yyreduce: } break; - case 106: -#line 307 "util/configparser.y" + case 107: +#line 308 "util/configparser.y" { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2041,8 +2044,8 @@ yyreduce: } break; - case 107: -#line 316 "util/configparser.y" + case 108: +#line 317 "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) @@ -2052,8 +2055,8 @@ yyreduce: } break; - case 108: -#line 325 "util/configparser.y" + case 109: +#line 326 "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) @@ -2063,8 +2066,8 @@ yyreduce: } break; - case 109: -#line 334 "util/configparser.y" + case 110: +#line 335 "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) @@ -2074,8 +2077,8 @@ yyreduce: } break; - case 110: -#line 343 "util/configparser.y" + case 111: +#line 344 "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) @@ -2085,8 +2088,8 @@ yyreduce: } break; - case 111: -#line 352 "util/configparser.y" + case 112: +#line 353 "util/configparser.y" { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2096,8 +2099,8 @@ yyreduce: } break; - case 112: -#line 361 "util/configparser.y" + case 113: +#line 362 "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) @@ -2112,8 +2115,8 @@ yyreduce: } break; - case 113: -#line 375 "util/configparser.y" + case 114: +#line 376 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -2121,8 +2124,8 @@ yyreduce: } break; - case 114: -#line 382 "util/configparser.y" + case 115: +#line 383 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -2130,8 +2133,8 @@ yyreduce: } break; - case 115: -#line 389 "util/configparser.y" + case 116: +#line 390 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -2139,8 +2142,8 @@ yyreduce: } break; - case 116: -#line 396 "util/configparser.y" + case 117: +#line 397 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -2149,8 +2152,8 @@ yyreduce: } break; - case 117: -#line 404 "util/configparser.y" + case 118: +#line 405 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -2158,8 +2161,8 @@ yyreduce: } break; - case 118: -#line 411 "util/configparser.y" + case 119: +#line 412 "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))) @@ -2167,8 +2170,8 @@ yyreduce: } break; - case 119: -#line 418 "util/configparser.y" + case 120: +#line 419 "util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dlv_anchor_file); @@ -2176,8 +2179,8 @@ yyreduce: } break; - case 120: -#line 425 "util/configparser.y" + case 121: +#line 426 "util/configparser.y" { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[(2) - (2)].str))) @@ -2185,8 +2188,8 @@ yyreduce: } break; - case 121: -#line 432 "util/configparser.y" + case 122: +#line 433 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2195,8 +2198,8 @@ yyreduce: } break; - case 122: -#line 440 "util/configparser.y" + case 123: +#line 441 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2205,8 +2208,8 @@ yyreduce: } break; - case 123: -#line 448 "util/configparser.y" + case 124: +#line 449 "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))) @@ -2214,8 +2217,8 @@ yyreduce: } break; - case 124: -#line 455 "util/configparser.y" + case 125: +#line 456 "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) @@ -2225,8 +2228,8 @@ yyreduce: } break; - case 125: -#line 464 "util/configparser.y" + case 126: +#line 465 "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) @@ -2236,8 +2239,8 @@ yyreduce: } break; - case 126: -#line 473 "util/configparser.y" + case 127: +#line 474 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -2245,8 +2248,8 @@ yyreduce: } break; - case 127: -#line 480 "util/configparser.y" + case 128: +#line 481 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -2254,8 +2257,8 @@ yyreduce: } break; - case 128: -#line 487 "util/configparser.y" + case 129: +#line 488 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2267,8 +2270,8 @@ yyreduce: } break; - case 129: -#line 498 "util/configparser.y" + case 130: +#line 499 "util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->msg_cache_size)) @@ -2277,8 +2280,8 @@ yyreduce: } break; - case 130: -#line 506 "util/configparser.y" + case 131: +#line 507 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2292,8 +2295,8 @@ yyreduce: } break; - case 131: -#line 519 "util/configparser.y" + case 132: +#line 520 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2303,8 +2306,8 @@ yyreduce: } break; - case 132: -#line 528 "util/configparser.y" + case 133: +#line 529 "util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->rrset_cache_size)) @@ -2313,8 +2316,8 @@ yyreduce: } break; - case 133: -#line 536 "util/configparser.y" + case 134: +#line 537 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2328,8 +2331,8 @@ yyreduce: } break; - case 134: -#line 549 "util/configparser.y" + case 135: +#line 550 "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) @@ -2339,8 +2342,8 @@ yyreduce: } break; - case 135: -#line 558 "util/configparser.y" + case 136: +#line 559 "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) @@ -2350,8 +2353,8 @@ yyreduce: } break; - case 136: -#line 567 "util/configparser.y" + case 137: +#line 568 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2361,8 +2364,8 @@ yyreduce: } break; - case 137: -#line 576 "util/configparser.y" + case 138: +#line 577 "util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg-> @@ -2372,8 +2375,8 @@ yyreduce: } break; - case 138: -#line 585 "util/configparser.y" + case 139: +#line 586 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2387,8 +2390,8 @@ yyreduce: } break; - case 139: -#line 598 "util/configparser.y" + case 140: +#line 599 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2396,8 +2399,8 @@ yyreduce: } break; - case 140: -#line 605 "util/configparser.y" + case 141: +#line 606 "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) @@ -2408,8 +2411,8 @@ yyreduce: } break; - case 141: -#line 615 "util/configparser.y" + case 142: +#line 616 "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) @@ -2420,8 +2423,8 @@ yyreduce: } break; - case 142: -#line 625 "util/configparser.y" + case 143: +#line 626 "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) @@ -2432,8 +2435,8 @@ yyreduce: } break; - case 143: -#line 635 "util/configparser.y" + case 144: +#line 636 "util/configparser.y" { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2444,8 +2447,8 @@ yyreduce: } break; - case 144: -#line 645 "util/configparser.y" + case 145: +#line 646 "util/configparser.y" { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2456,8 +2459,8 @@ yyreduce: } break; - case 145: -#line 655 "util/configparser.y" + case 146: +#line 656 "util/configparser.y" { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2468,8 +2471,8 @@ yyreduce: } break; - case 146: -#line 665 "util/configparser.y" + case 147: +#line 666 "util/configparser.y" { OUTYY(("P(server_private_address:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[(2) - (2)].str))) @@ -2477,8 +2480,8 @@ yyreduce: } break; - case 147: -#line 672 "util/configparser.y" + case 148: +#line 673 "util/configparser.y" { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[(2) - (2)].str))) @@ -2486,8 +2489,8 @@ yyreduce: } break; - case 148: -#line 679 "util/configparser.y" + case 149: +#line 680 "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))) @@ -2495,8 +2498,8 @@ yyreduce: } break; - case 149: -#line 686 "util/configparser.y" + case 150: +#line 687 "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) @@ -2507,8 +2510,8 @@ yyreduce: } break; - case 150: -#line 696 "util/configparser.y" + case 151: +#line 697 "util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 && @@ -2523,8 +2526,8 @@ yyreduce: } break; - case 151: -#line 710 "util/configparser.y" + case 152: +#line 711 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -2532,8 +2535,8 @@ yyreduce: } break; - case 152: -#line 717 "util/configparser.y" + case 153: +#line 718 "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) { @@ -2552,8 +2555,8 @@ yyreduce: } break; - case 153: -#line 735 "util/configparser.y" + case 154: +#line 736 "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) @@ -2563,8 +2566,8 @@ yyreduce: } break; - case 154: -#line 744 "util/configparser.y" + case 155: +#line 745 "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) @@ -2574,8 +2577,8 @@ yyreduce: } break; - case 155: -#line 753 "util/configparser.y" + case 156: +#line 754 "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) @@ -2586,8 +2589,8 @@ yyreduce: } break; - case 156: -#line 763 "util/configparser.y" + case 157: +#line 764 "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) @@ -2598,8 +2601,8 @@ yyreduce: } break; - case 157: -#line 773 "util/configparser.y" + case 158: +#line 774 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -2607,8 +2610,8 @@ yyreduce: } break; - case 158: -#line 780 "util/configparser.y" + case 159: +#line 781 "util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->key_cache_size)) @@ -2617,8 +2620,8 @@ yyreduce: } break; - case 159: -#line 788 "util/configparser.y" + case 160: +#line 789 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2632,8 +2635,8 @@ yyreduce: } break; - case 160: -#line 801 "util/configparser.y" + case 161: +#line 802 "util/configparser.y" { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->neg_cache_size)) @@ -2642,8 +2645,8 @@ yyreduce: } break; - case 161: -#line 809 "util/configparser.y" + case 162: +#line 810 "util/configparser.y" { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(strcmp((yyvsp[(3) - (3)].str), "static")!=0 && strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && @@ -2663,8 +2666,8 @@ yyreduce: } break; - case 162: -#line 828 "util/configparser.y" + case 163: +#line 829 "util/configparser.y" { OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[(2) - (2)].str))) @@ -2672,8 +2675,25 @@ yyreduce: } break; - case 163: -#line 835 "util/configparser.y" + case 164: +#line 836 "util/configparser.y" + { + char* ptr; + OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str))); + ptr = cfg_ptr_reverse((yyvsp[(2) - (2)].str)); + free((yyvsp[(2) - (2)].str)); + if(ptr) { + if(!cfg_strlist_insert(&cfg_parser->cfg-> + local_data, ptr)) + fatal_exit("out of memory adding local-data"); + } else { + yyerror("local-data-ptr could not be reversed"); + } + } + break; + + case 165: +#line 851 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->stubs->name); @@ -2681,8 +2701,8 @@ yyreduce: } break; - case 164: -#line 842 "util/configparser.y" + case 166: +#line 858 "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))) @@ -2690,8 +2710,8 @@ yyreduce: } break; - case 165: -#line 849 "util/configparser.y" + case 167: +#line 865 "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))) @@ -2699,8 +2719,8 @@ yyreduce: } break; - case 166: -#line 856 "util/configparser.y" + case 168: +#line 872 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->forwards->name); @@ -2708,8 +2728,8 @@ yyreduce: } break; - case 167: -#line 863 "util/configparser.y" + case 169: +#line 879 "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))) @@ -2717,8 +2737,8 @@ yyreduce: } break; - case 168: -#line 870 "util/configparser.y" + case 170: +#line 886 "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))) @@ -2726,15 +2746,15 @@ yyreduce: } break; - case 169: -#line 877 "util/configparser.y" + case 171: +#line 893 "util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } break; - case 179: -#line 888 "util/configparser.y" + case 181: +#line 904 "util/configparser.y" { OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2745,8 +2765,8 @@ yyreduce: } break; - case 180: -#line 898 "util/configparser.y" + case 182: +#line 914 "util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2756,8 +2776,8 @@ yyreduce: } break; - case 181: -#line 907 "util/configparser.y" + case 183: +#line 923 "util/configparser.y" { OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str))) @@ -2765,8 +2785,8 @@ yyreduce: } break; - case 182: -#line 914 "util/configparser.y" + case 184: +#line 930 "util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_key_file); @@ -2774,8 +2794,8 @@ yyreduce: } break; - case 183: -#line 921 "util/configparser.y" + case 185: +#line 937 "util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_cert_file); @@ -2783,8 +2803,8 @@ yyreduce: } break; - case 184: -#line 928 "util/configparser.y" + case 186: +#line 944 "util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_key_file); @@ -2792,8 +2812,8 @@ yyreduce: } break; - case 185: -#line 935 "util/configparser.y" + case 187: +#line 951 "util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_cert_file); @@ -2803,7 +2823,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2807 "util/configparser.c" +#line 2827 "util/configparser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3017,7 +3037,7 @@ yyreturn: } -#line 941 "util/configparser.y" +#line 957 "util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index fd074b8f8..ccfd32762 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -132,7 +132,8 @@ VAR_SERVER_CERT_FILE = 348, VAR_CONTROL_KEY_FILE = 349, VAR_CONTROL_CERT_FILE = 350, - VAR_EXTENDED_STATISTICS = 351 + VAR_EXTENDED_STATISTICS = 351, + VAR_LOCAL_DATA_PTR = 352 }; #endif /* Tokens. */ @@ -230,6 +231,7 @@ #define VAR_CONTROL_KEY_FILE 349 #define VAR_CONTROL_CERT_FILE 350 #define VAR_EXTENDED_STATISTICS 351 +#define VAR_LOCAL_DATA_PTR 352 @@ -241,7 +243,7 @@ typedef union YYSTYPE char* str; } /* Line 1489 of yacc.c. */ -#line 245 "util/configparser.h" +#line 247 "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 9ffa1b5b0..43866a558 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -95,7 +95,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_PRIVATE_DOMAIN VAR_REMOTE_CONTROL VAR_CONTROL_ENABLE %token VAR_CONTROL_INTERFACE VAR_CONTROL_PORT VAR_SERVER_KEY_FILE %token VAR_SERVER_CERT_FILE VAR_CONTROL_KEY_FILE VAR_CONTROL_CERT_FILE -%token VAR_EXTENDED_STATISTICS +%token VAR_EXTENDED_STATISTICS VAR_LOCAL_DATA_PTR %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -140,7 +140,8 @@ content_server: server_num_threads | server_verbosity | server_port | server_outgoing_port_permit | server_outgoing_port_avoid | server_dlv_anchor_file | server_dlv_anchor | server_neg_cache_size | server_harden_referral_path | server_private_address | - server_private_domain | server_extended_statistics + server_private_domain | server_extended_statistics | + server_local_data_ptr ; stubstart: VAR_STUB_ZONE { @@ -831,6 +832,21 @@ server_local_data: VAR_LOCAL_DATA STRING fatal_exit("out of memory adding local-data"); } ; +server_local_data_ptr: VAR_LOCAL_DATA_PTR STRING + { + char* ptr; + OUTYY(("P(server_local_data_ptr:%s)\n", $2)); + ptr = cfg_ptr_reverse($2); + free($2); + if(ptr) { + if(!cfg_strlist_insert(&cfg_parser->cfg-> + local_data, ptr)) + fatal_exit("out of memory adding local-data"); + } else { + yyerror("local-data-ptr could not be reversed"); + } + } + ; stub_name: VAR_NAME STRING { OUTYY(("P(name:%s)\n", $2)); -- 2.47.3