From: Wouter Wijngaards Date: Fri, 19 Oct 2007 08:32:36 +0000 (+0000) Subject: outgoing interfaces setting possible. X-Git-Tag: release-0.6~40 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8c099960a6d494a95ae1ab12b6dab3af36670a1;p=thirdparty%2Funbound.git outgoing interfaces setting possible. git-svn-id: file:///svn/unbound/trunk@704 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/checkconf/unbound-checkconf.c b/checkconf/unbound-checkconf.c index 2749d2603..8869fbeea 100644 --- a/checkconf/unbound-checkconf.c +++ b/checkconf/unbound-checkconf.c @@ -89,14 +89,21 @@ static void morechecks(struct config_file* cfg) { int i; + struct sockaddr_storage a; + socklen_t alen; for(i=0; inum_ifs; i++) { - struct sockaddr_storage a; - socklen_t alen; if(!ipstrtoaddr(cfg->ifs[i], UNBOUND_DNS_PORT, &a, &alen)) { fatal_exit("cannot parse interface specified as '%s'", cfg->ifs[i]); } } + for(i=0; inum_out_ifs; i++) { + if(!ipstrtoaddr(cfg->out_ifs[i], UNBOUND_DNS_PORT, + &a, &alen)) { + fatal_exit("cannot parse outgoing-interface " + "specified as '%s'", cfg->out_ifs[i]); + } + } if(cfg->verbosity < 0) fatal_exit("verbosity value < 0"); diff --git a/daemon/unbound.c b/daemon/unbound.c index 31d2a0e3b..07b66df7c 100644 --- a/daemon/unbound.c +++ b/daemon/unbound.c @@ -81,7 +81,8 @@ checkrlimits(struct config_file* cfg) (int)cfg->incoming_num_tcp:0)); size_t ifs = (size_t)(cfg->num_ifs==0?1:cfg->num_ifs); size_t listen_num = list*ifs; - size_t outnum = cfg->outgoing_num_ports*ifs + cfg->outgoing_num_tcp; + size_t out_ifs = (size_t)(cfg->num_out_ifs==0?1:cfg->num_out_ifs); + size_t outnum = cfg->outgoing_num_ports*out_ifs + cfg->outgoing_num_tcp; size_t misc = 4; /* logfile, pidfile, stdout... */ size_t perthread = listen_num + outnum + 2/*cmdpipe*/ + 2/*libevent*/ + misc; diff --git a/daemon/worker.c b/daemon/worker.c index 6754d9c81..1f0ebbba2 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -921,8 +921,8 @@ worker_init(struct worker* worker, struct config_file *cfg, cfg->outgoing_num_ports * worker->thread_num; worker->back = outside_network_create(worker->base, cfg->msg_buffer_size, (size_t)cfg->outgoing_num_ports, - cfg->ifs, cfg->num_ifs, cfg->do_ip4, cfg->do_ip6, startport, - cfg->do_tcp?cfg->outgoing_num_tcp:0, + cfg->out_ifs, cfg->num_out_ifs, cfg->do_ip4, cfg->do_ip6, + startport, cfg->do_tcp?cfg->outgoing_num_tcp:0, worker->daemon->env->infra_cache, worker->rndstate); if(!worker->back) { log_err("could not create outgoing sockets"); @@ -985,7 +985,8 @@ worker_delete(struct worker* worker) { if(!worker) return; - mesh_stats(worker->env.mesh, "mesh has"); + if(worker->env.mesh) + mesh_stats(worker->env.mesh, "mesh has"); server_stats_log(&worker->stats, worker->thread_num); worker_mem_report(worker, NULL); mesh_delete(worker->env.mesh); diff --git a/doc/Changelog b/doc/Changelog index bea99ed86..0683a52f9 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -7,6 +7,7 @@ - without lex no attempt to use it. - unsecure response validation collated into one block. - remove warning about const cast of cfgfile name. + - outgoing-interfaces can be different from service interfaces. 18 October 2007: Wouter - addresses are logged with errors. diff --git a/doc/example.conf b/doc/example.conf index bbe06ba83..223d2b748 100644 --- a/doc/example.conf +++ b/doc/example.conf @@ -28,6 +28,13 @@ server: # port to answer queries from # port: 53 + # specify the interfaces to send outgoing queries to authoritative + # server from by ip-address. If none, the default (all) interface + # is used. Specify every interface on a 'outgoing-interface:' line. + # outgoing-interface: 192.0.2.153 + # outgoing-interface: 2001:DB8::5 + # outgoing-interface: 2001:DB8::6 + # unbound needs to send packets to authoritative nameservers. # it uses a range of ports for that. # the start number of the port range diff --git a/doc/unbound.conf.5 b/doc/unbound.conf.5 index 6be04f4be..f0e1531b9 100644 --- a/doc/unbound.conf.5 +++ b/doc/unbound.conf.5 @@ -75,8 +75,20 @@ The number of threads to create to serve clients. Use 1 for no threading. .It \fBport:\fR The port number, default 53, on which the server responds to queries. .It \fBinterface:\fR -Interface to use to connect to the network. Can be given multiple times to -work on several interfaces. If none are given the default (all) is used. +Interface to use to connect to the network. This interface is listened to +for queries from clients, and answers to clients are given from it. +Can be given multiple times to work on several interfaces. If none are +given the default (all) is used. +.It \fBoutgoing-interface:\fR +Interface to use to connect to the network. This interface is used to send +queries to authoritative servers and receive their replies. Can be given +multiple times to work on several interfaces. If none are given the +default (all) is used. You can specify the same interfaces in +.Ic interface: +and +.Ic outgoing-interface: +lines, the interfaces are then used for both purposes. Queries are sent +via a random interface to counter spoofing. .It \fBoutgoing-port:\fR The starting port number where the outgoing query port range is allocated. Default is 1053. diff --git a/services/outside_network.c b/services/outside_network.c index 73e45271e..867f94411 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -485,6 +485,11 @@ outside_network_create(struct comm_base *base, size_t bufsize, outnet->num_udp6 = done_6; outnet->num_udp4 = done_4; } + if(outnet->num_udp4 + outnet->num_udp6 == 0) { + log_err("Could not open any ports on outgoing interfaces"); + outside_network_delete(outnet); + return NULL; + } return outnet; } diff --git a/util/config_file.c b/util/config_file.c index a2172b71f..4b263ea1f 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -106,6 +106,8 @@ config_create() cfg->do_daemonize = 1; cfg->num_ifs = 0; cfg->ifs = NULL; + cfg->num_out_ifs = 0; + cfg->out_ifs = NULL; cfg->stubs = NULL; cfg->forwards = NULL; cfg->harden_short_bufsize = 0; @@ -212,6 +214,12 @@ config_delete(struct config_file* cfg) free(cfg->ifs[i]); free(cfg->ifs); } + if(cfg->out_ifs) { + int i; + for(i=0; inum_out_ifs; i++) + free(cfg->out_ifs[i]); + free(cfg->out_ifs); + } config_delstubs(cfg->stubs); config_delstubs(cfg->forwards); config_delstrlist(cfg->donotqueryaddrs); diff --git a/util/config_file.h b/util/config_file.h index e412a617d..e06b33269 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -106,6 +106,12 @@ struct config_file { /** interface description strings (IP addresses) */ char **ifs; + /** number of outgoing interfaces to open. + * If 0 default all interfaces. */ + int num_out_ifs; + /** outgoing interface description strings (IP addresses) */ + char **out_ifs; + /** the stub definitions, linked list */ struct config_stub* stubs; /** the forward zone definitions, linked list */ diff --git a/util/configlexer.c b/util/configlexer.c index 63c9238ab..1c533f17d 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -1,39 +1,93 @@ #include "util/configyyrename.h" -/* A lexical scanner generated by flex */ -/* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ - * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.8 2004/01/06 19:03:44 nectar Exp $ - */ +#line 3 "" -#if defined(__FreeBSD__) -#include -#else -#define __unused -#endif +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 33 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ +/* begin standard C headers. */ #include +#include +#include +#include +/* end standard C headers. */ -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 #endif +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ -#ifdef __cplusplus +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif -#include -#include +#endif /* ! FLEXINT_H */ -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS +#ifdef __cplusplus /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST @@ -42,34 +96,17 @@ #if __STDC__ -#define YY_USE_PROTOS #define YY_USE_CONST #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include -#include -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else #define yyconst #endif - -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif - /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -84,71 +121,75 @@ * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN yy_start = 1 + 2 * +#define BEGIN (yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START ((yy_start - 1) / 2) +#define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) +#define YY_NEW_FILE yyrestart(yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ +#ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 +#endif +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif extern int yyleng; + extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ { \ /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, yytext_ptr ) +#define unput(c) yyunput( c, (yytext_ptr) ) /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). */ -typedef unsigned int yy_size_t; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef unsigned int yy_size_t; +#endif +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state { FILE *yy_input_file; @@ -185,12 +226,16 @@ struct yy_buffer_state */ int yy_at_bol; + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; + #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -204,28 +249,38 @@ struct yy_buffer_state * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ -static YY_BUFFER_STATE yy_current_buffer = 0; +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". + * + * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER yy_current_buffer +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; - static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - int yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ +static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ /* Flag which is used to allow yywrap()'s to do buffer switches @@ -233,141 +288,168 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart YY_PROTO(( FILE *input_file )); +void yyrestart (FILE *input_file ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); +void yy_delete_buffer (YY_BUFFER_STATE b ); +void yy_flush_buffer (YY_BUFFER_STATE b ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state (void ); + +static void yyensure_buffer_stack (void ); +static void yy_load_buffer_state (void ); +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __unused; -static void yy_flex_free YY_PROTO(( void * )); +void *yyalloc (yy_size_t ); +void *yyrealloc (void *,yy_size_t ); +void yyfree (void * ); #define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +/* Begin user sect3 */ typedef unsigned char YY_CHAR; + FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; + typedef int yy_state_type; + +extern int yylineno; + +int yylineno = 1; + extern char *yytext; #define yytext_ptr yytext -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); +static yy_state_type yy_get_previous_state (void ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); +static int yy_get_next_buffer (void ); +static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ - yytext_ptr -= yy_more_len; \ - yyleng = (int) (yy_cp - yytext_ptr); \ - yy_hold_char = *yy_cp; \ + (yytext_ptr) = yy_bp; \ + (yytext_ptr) -= (yy_more_len); \ + yyleng = (size_t) (yy_cp - (yytext_ptr)); \ + (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; + (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 74 -#define YY_END_OF_BUFFER 75 -static yyconst short int yy_accept[635] = +#define YY_NUM_RULES 75 +#define YY_END_OF_BUFFER 76 +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[645] = { 0, - 1, 1, 62, 62, 66, 66, 70, 70, 75, 73, - 1, 60, 61, 2, 74, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 62, 63, 74, 64, 74, 69, 66, 67, 68, - 74, 70, 71, 72, 74, 73, 0, 1, 2, 2, - 2, 2, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 62, 0, 69, - 0, 66, 70, 0, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 37, 73, 73, 73, 73, 6, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 16, 73, 11, 12, 73, - 14, 13, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 3, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 65, 73, - 73, 73, 73, 73, 73, 19, 73, 73, 73, 73, - 73, 73, 20, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 47, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 46, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 17, 73, 73, 73, 73, 73, 73, 18, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 15, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 38, 39, 36, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 5, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 59, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 35, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 4, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 41, 42, 40, 73, 73, 73, 45, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 51, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 44, 73, 73, - 73, 73, 73, 73, 73, 73, 48, 73, 73, 73, - - 73, 73, 7, 73, 73, 73, 73, 73, 73, 53, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 26, 27, 56, 73, 73, 22, 73, 73, 73, - 8, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 57, 21, 23, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 10, 73, 73, 73, 73, 9, - 24, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 28, 73, 25, 73, 49, 50, - 73, 73, 52, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 32, 73, 73, 55, 43, 34, 33, 73, 29, 73, - 54, 73, 30, 73, 73, 31, 73, 73, 73, 73, - 73, 73, 58, 0 + 1, 1, 63, 63, 67, 67, 71, 71, 76, 74, + 1, 61, 62, 2, 75, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 63, 64, 75, 65, 75, 70, 67, 68, 69, + 75, 71, 72, 73, 75, 74, 0, 1, 2, 2, + 2, 2, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 63, 0, 70, + 0, 67, 71, 0, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 38, 74, 74, 74, 74, 6, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 17, 74, 11, 12, 74, + 14, 13, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 3, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 66, 74, + 74, 74, 74, 74, 74, 20, 74, 74, 74, 74, + 74, 74, 21, 74, 74, 74, 74, 74, 74, 74, + + 74, 74, 74, 74, 74, 74, 74, 74, 48, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 47, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 18, 74, 74, 74, 74, 74, 74, 19, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 15, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 39, 40, 37, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 5, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 60, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 36, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 4, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 42, 43, 41, 74, 74, 74, + 46, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 52, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 45, 74, 74, 74, 74, 74, 74, 74, 74, + + 49, 74, 74, 74, 74, 74, 74, 7, 74, 74, + 74, 74, 74, 74, 54, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 27, 28, 57, 74, + 74, 23, 74, 74, 74, 74, 8, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 58, 22, 24, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 10, 74, 74, 74, 74, 74, 9, 25, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 29, 74, 74, 26, 74, 50, 51, 74, + + 74, 53, 74, 74, 74, 74, 74, 74, 74, 16, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 33, 74, 74, 56, 44, 35, 34, 74, 30, 74, + 55, 74, 31, 74, 74, 32, 74, 74, 74, 74, + 74, 74, 59, 0 } ; -static yyconst int yy_ec[256] = +static yyconst flex_int32_t yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, @@ -399,7 +481,7 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[37] = +static yyconst flex_int32_t yy_meta[37] = { 0, 1, 2, 3, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -407,17 +489,17 @@ static yyconst int yy_meta[37] = 1, 1, 1, 1, 1, 1 } ; -static yyconst short int yy_base[644] = +static yyconst flex_int16_t yy_base[654] = { 0, - 0, 0, 34, 37, 48, 52, 58, 62, 1293, 1280, - 41, 1294, 1294, 67, 71, 65, 66, 32, 68, 70, + 0, 0, 34, 37, 48, 52, 58, 62, 1313, 1300, + 41, 1314, 1314, 67, 71, 65, 66, 32, 68, 70, 71, 33, 72, 78, 36, 82, 84, 87, 88, 81, - 102, 1279, 1294, 1294, 1294, 101, 1278, 1287, 1294, 1294, - 118, 1276, 1294, 1294, 120, 1275, 124, 110, 0, 128, + 102, 1299, 1314, 1314, 1314, 101, 1298, 1307, 1314, 1314, + 118, 1296, 1314, 1314, 120, 1295, 124, 110, 0, 128, 0, 0, 109, 115, 124, 122, 123, 125, 130, 131, 133, 136, 138, 141, 85, 145, 127, 147, 144, 149, - 152, 153, 154, 155, 158, 159, 160, 1274, 172, 1273, - 186, 1282, 1271, 188, 168, 183, 184, 172, 162, 185, + 152, 153, 154, 155, 158, 159, 160, 1294, 172, 1293, + 186, 1302, 1291, 188, 168, 183, 184, 172, 162, 185, 174, 191, 189, 195, 201, 186, 198, 212, 208, 214, 210, 215, 211, 219, 199, 223, 222, 216, 231, 232, @@ -426,138 +508,140 @@ static yyconst short int yy_base[644] = 263, 267, 278, 284, 280, 285, 291, 288, 289, 292, 294, 311, 295, 296, 297, 298, 303, 302, 304, 312, 306, 315, 320, 322, 330, 333, 337, 338, 335, 339, - 340, 343, 346, 1270, 348, 349, 351, 353, 1269, 359, + 340, 343, 346, 1290, 348, 349, 351, 353, 1289, 359, 352, 365, 355, 367, 356, 370, 361, 376, 377, 378, 380, 382, 383, 391, 384, 393, 402, 386, 404, 406, 407, 413, 410, 412, 396, 416, 409, 420, 418, 424, 425, 434, 388, 432, 433, 426, 436, 437, 441, 440, 446, 445, 447, 453, 451, 454, 455, 456, 457, 460, - 462, 466, 463, 469, 470, 1268, 472, 1267, 1266, 474, - 1265, 1264, 481, 475, 479, 477, 485, 488, 491, 495, + 462, 466, 463, 469, 470, 1288, 472, 1287, 1286, 474, + 1285, 1284, 481, 475, 479, 477, 485, 488, 491, 495, 492, 499, 501, 497, 503, 507, 509, 511, 512, 513, - 514, 517, 522, 1263, 520, 525, 526, 527, 528, 535, + 514, 517, 522, 1283, 520, 525, 526, 527, 528, 535, 531, 532, 534, 544, 546, 536, 538, 540, 548, 551, - 552, 555, 557, 560, 558, 562, 564, 570, 1262, 576, - 577, 565, 573, 581, 584, 1261, 578, 588, 590, 587, - 597, 599, 1260, 600, 591, 601, 602, 604, 610, 605, + 552, 555, 557, 560, 558, 562, 564, 570, 1282, 576, + 577, 565, 573, 581, 584, 1281, 578, 588, 590, 587, + 597, 599, 1280, 600, 591, 601, 602, 604, 610, 605, - 611, 617, 606, 614, 622, 612, 619, 621, 1259, 631, - 632, 634, 626, 633, 623, 635, 636, 639, 642, 1258, + 611, 617, 606, 614, 622, 612, 619, 621, 1279, 631, + 632, 634, 626, 633, 623, 635, 636, 639, 642, 1278, 641, 645, 646, 655, 649, 661, 657, 659, 667, 663, - 669, 664, 666, 672, 683, 685, 675, 678, 687, 688, - 1257, 696, 698, 702, 680, 690, 700, 1256, 701, 703, - 704, 706, 705, 709, 711, 712, 713, 714, 715, 729, - 730, 1255, 717, 726, 736, 723, 733, 737, 738, 739, - 742, 740, 1254, 1253, 1252, 744, 746, 748, 750, 754, - 756, 752, 759, 761, 1251, 764, 765, 766, 767, 769, - 770, 774, 776, 777, 780, 783, 781, 784, 788, 789, - - 786, 796, 806, 809, 802, 794, 810, 817, 813, 815, - 816, 1250, 818, 820, 822, 825, 819, 831, 836, 839, - 841, 1249, 847, 848, 829, 845, 851, 849, 850, 853, - 833, 854, 856, 859, 858, 864, 861, 1248, 871, 870, - 873, 874, 883, 886, 884, 877, 887, 875, 895, 893, - 896, 1247, 1246, 1245, 894, 899, 903, 1244, 900, 904, - 906, 907, 909, 911, 908, 915, 924, 912, 916, 925, - 928, 929, 931, 932, 934, 935, 938, 1243, 940, 942, - 947, 939, 949, 954, 951, 952, 958, 1242, 960, 961, - 962, 964, 967, 969, 971, 975, 1241, 976, 980, 977, - - 982, 983, 1240, 985, 987, 988, 990, 991, 992, 1239, - 994, 996, 997, 1007, 1006, 1003, 1009, 1012, 1014, 1016, - 1018, 1238, 1237, 1236, 1022, 1026, 1235, 1029, 1035, 1017, - 1234, 1031, 1037, 1023, 1033, 1038, 1041, 1040, 1042, 1043, - 1045, 1046, 1047, 1052, 1053, 1054, 1056, 1233, 1232, 1231, - 1057, 1059, 1067, 1060, 1070, 1072, 1075, 1069, 1081, 1082, - 1071, 1084, 1088, 1090, 1230, 1073, 1092, 1094, 1095, 1228, - 1220, 1101, 1102, 1107, 1109, 1098, 1117, 1114, 1115, 1104, - 1116, 1096, 1118, 1123, 1204, 1124, 1203, 1125, 1202, 1198, - 1128, 1126, 1197, 1131, 1132, 1133, 1134, 1130, 1137, 1138, - - 1145, 1146, 1140, 1153, 1161, 1163, 1165, 1166, 1168, 1169, - 1196, 1173, 1174, 1194, 1193, 1192, 1191, 1176, 1158, 1177, - 1149, 1178, 791, 1183, 1184, 567, 1180, 1147, 1186, 1188, - 1187, 1190, 358, 1294, 1217, 1221, 1225, 329, 1229, 1233, - 106, 1235, 1237 + 669, 666, 664, 678, 685, 687, 671, 674, 688, 689, + 1277, 697, 699, 700, 698, 691, 702, 1276, 703, 704, + 705, 706, 710, 711, 712, 713, 714, 716, 721, 730, + 732, 1275, 717, 731, 738, 724, 734, 739, 740, 741, + 744, 745, 743, 1274, 1273, 1272, 747, 749, 751, 755, + 756, 759, 762, 764, 765, 1271, 766, 767, 769, 771, + 778, 780, 773, 779, 781, 770, 791, 787, 790, 793, + + 796, 795, 799, 812, 801, 797, 803, 811, 814, 822, + 818, 819, 820, 1270, 821, 825, 830, 832, 824, 839, + 842, 844, 846, 1269, 852, 853, 831, 850, 856, 855, + 857, 858, 859, 860, 862, 863, 864, 870, 865, 1268, + 874, 886, 875, 878, 882, 889, 892, 895, 893, 897, + 896, 903, 899, 905, 1267, 1266, 1265, 902, 907, 911, + 1264, 908, 912, 914, 915, 917, 921, 924, 923, 931, + 916, 933, 935, 936, 922, 942, 944, 945, 946, 947, + 948, 1263, 952, 960, 956, 949, 964, 966, 969, 963, + 970, 1262, 972, 974, 976, 977, 980, 982, 985, 987, + + 1261, 989, 992, 993, 995, 996, 997, 1260, 999, 1001, + 1003, 1006, 1007, 1008, 1259, 1009, 1010, 1013, 1023, 1022, + 1024, 1015, 1027, 1030, 1031, 951, 1258, 1257, 1256, 1033, + 1037, 1255, 1041, 1043, 1044, 1034, 1254, 1046, 1048, 1047, + 1052, 1053, 1056, 1054, 1055, 1057, 1059, 1060, 1061, 1067, + 1073, 1070, 1062, 1253, 1251, 1243, 1071, 1072, 1082, 1086, + 1083, 1087, 1088, 1089, 1091, 1092, 1095, 1098, 1099, 1102, + 1106, 1227, 1103, 1107, 1109, 1110, 1114, 1226, 1225, 1117, + 1120, 1127, 1129, 1122, 1136, 1133, 1130, 1124, 1138, 1113, + 1139, 1140, 1224, 1141, 1145, 1223, 1146, 1222, 1220, 1149, + + 1147, 1219, 1152, 1153, 1154, 1155, 1151, 1161, 1162, 1216, + 1164, 1165, 1166, 1174, 1178, 1181, 1183, 1184, 1187, 1190, + 1215, 1193, 1194, 1214, 1213, 1170, 1168, 1196, 867, 1197, + 823, 1188, 680, 1203, 1206, 567, 1198, 1200, 1204, 1208, + 1210, 1212, 358, 1314, 1240, 1244, 1248, 329, 1252, 1256, + 106, 1258, 1260 } ; -static yyconst short int yy_def[644] = +static yyconst flex_int16_t yy_def[654] = { 0, - 634, 1, 635, 635, 636, 636, 637, 637, 634, 638, - 634, 634, 634, 639, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 640, 634, 634, 634, 640, 641, 634, 634, 634, - 641, 642, 634, 634, 642, 638, 638, 634, 643, 639, - 643, 639, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 640, 640, 641, - 641, 634, 642, 642, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 638, 638, 0, 634, 634, 634, 634, 634, 634, - 634, 634, 634 + 644, 1, 645, 645, 646, 646, 647, 647, 644, 648, + 644, 644, 644, 649, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 650, 644, 644, 644, 650, 651, 644, 644, 644, + 651, 652, 644, 644, 652, 648, 648, 644, 653, 649, + 653, 649, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 650, 650, 651, + 651, 644, 652, 652, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 0, 644, 644, 644, 644, 644, 644, + 644, 644, 644 } ; -static yyconst short int yy_nxt[1331] = +static yyconst flex_int16_t yy_nxt[1351] = { 0, 10, 11, 12, 12, 13, 14, 10, 10, 10, 10, 10, 15, 10, 10, 16, 17, 10, 18, 10, 19, @@ -633,81 +717,83 @@ static yyconst short int yy_nxt[1331] = 47, 351, 47, 47, 353, 347, 47, 47, 352, 362, 47, 355, 357, 354, 359, 358, 47, 363, 47, 356, 47, 361, 47, 366, 47, 47, 360, 47, 47, 367, - 47, 364, 373, 47, 368, 372, 47, 365, 369, 47, - 370, 47, 371, 374, 47, 375, 47, 377, 47, 47, - - 383, 47, 380, 378, 381, 376, 379, 47, 382, 47, - 385, 47, 47, 47, 47, 47, 47, 47, 387, 384, - 47, 390, 47, 47, 47, 47, 47, 391, 47, 386, - 389, 396, 393, 388, 47, 397, 398, 47, 394, 392, - 47, 47, 401, 400, 47, 395, 399, 47, 47, 47, - 47, 47, 402, 47, 407, 47, 408, 47, 409, 47, - 412, 47, 403, 47, 406, 47, 404, 47, 414, 405, - 47, 410, 47, 415, 416, 47, 47, 47, 47, 422, - 47, 47, 411, 421, 413, 47, 423, 47, 47, 428, - 417, 47, 47, 419, 47, 47, 420, 47, 418, 47, - - 47, 426, 47, 427, 424, 47, 425, 47, 431, 433, - 432, 429, 437, 47, 430, 434, 435, 47, 436, 438, - 47, 47, 440, 442, 47, 439, 47, 47, 47, 47, - 47, 47, 443, 47, 441, 447, 47, 451, 448, 450, - 47, 449, 47, 444, 47, 445, 452, 47, 446, 453, - 47, 454, 47, 455, 456, 458, 47, 459, 47, 47, - 47, 47, 47, 457, 47, 47, 466, 47, 465, 47, - 47, 460, 47, 461, 467, 47, 470, 472, 462, 468, - 463, 47, 47, 464, 47, 47, 47, 471, 47, 476, - 479, 474, 477, 469, 47, 47, 478, 47, 47, 480, - - 473, 483, 481, 475, 47, 47, 47, 47, 485, 482, - 47, 47, 487, 488, 47, 47, 490, 47, 47, 47, - 47, 486, 47, 47, 495, 484, 47, 47, 496, 492, - 489, 493, 499, 494, 497, 47, 47, 491, 500, 47, - 47, 503, 47, 47, 501, 47, 47, 498, 504, 47, - 47, 47, 510, 47, 505, 508, 506, 509, 47, 502, - 47, 507, 47, 47, 513, 47, 515, 511, 512, 47, - 514, 47, 47, 47, 518, 47, 521, 522, 47, 523, - 47, 524, 47, 516, 519, 520, 47, 47, 47, 517, - 527, 47, 526, 47, 47, 531, 47, 530, 47, 47, - - 533, 47, 47, 47, 525, 47, 528, 47, 47, 539, - 529, 535, 536, 540, 47, 534, 538, 47, 47, 542, - 47, 541, 532, 47, 537, 47, 543, 47, 47, 47, - 545, 547, 548, 47, 47, 546, 549, 47, 544, 550, - 47, 551, 47, 552, 47, 555, 47, 553, 47, 47, - 554, 47, 47, 47, 47, 556, 47, 47, 47, 566, - 557, 558, 565, 47, 47, 47, 561, 47, 47, 570, - 47, 47, 560, 562, 563, 559, 564, 571, 47, 567, - 47, 47, 47, 47, 47, 568, 47, 569, 574, 572, - 573, 575, 47, 47, 576, 47, 579, 577, 578, 47, - - 580, 47, 583, 47, 585, 47, 47, 47, 581, 47, - 582, 587, 47, 47, 586, 47, 588, 589, 47, 590, - 47, 584, 591, 592, 593, 47, 47, 47, 47, 47, - 594, 597, 596, 595, 47, 47, 47, 47, 598, 47, - 602, 47, 47, 47, 47, 47, 603, 604, 47, 47, - 607, 47, 600, 599, 610, 611, 47, 47, 47, 601, - 47, 605, 606, 614, 47, 608, 609, 629, 612, 47, - 613, 615, 47, 616, 47, 617, 47, 47, 619, 47, - 47, 620, 618, 621, 47, 47, 623, 47, 47, 47, - 622, 47, 624, 626, 47, 47, 627, 47, 47, 47, - - 633, 47, 47, 47, 47, 47, 625, 47, 47, 47, - 628, 630, 631, 47, 47, 47, 632, 32, 32, 32, - 32, 37, 37, 37, 37, 42, 42, 42, 42, 50, - 50, 47, 50, 78, 78, 83, 83, 51, 51, 47, - 51, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 364, 47, 373, 368, 47, 369, 365, 374, 47, + 370, 47, 371, 378, 372, 375, 47, 376, 47, 47, + + 47, 377, 47, 381, 379, 382, 383, 380, 47, 47, + 47, 47, 386, 47, 47, 47, 47, 47, 384, 388, + 385, 47, 47, 47, 47, 47, 391, 47, 47, 392, + 390, 387, 47, 394, 389, 47, 398, 397, 399, 395, + 393, 47, 47, 47, 402, 47, 400, 396, 401, 47, + 47, 47, 47, 403, 47, 47, 47, 409, 47, 410, + 47, 411, 47, 404, 406, 414, 47, 47, 405, 408, + 47, 416, 407, 47, 412, 47, 47, 47, 47, 418, + 47, 47, 47, 417, 47, 413, 415, 423, 424, 47, + 47, 47, 47, 429, 419, 421, 425, 430, 47, 422, + + 420, 47, 47, 426, 47, 428, 47, 47, 47, 427, + 47, 440, 47, 433, 47, 434, 435, 431, 439, 437, + 432, 438, 47, 47, 436, 47, 442, 441, 445, 47, + 47, 47, 47, 47, 47, 47, 47, 446, 444, 443, + 450, 47, 47, 47, 453, 454, 451, 447, 452, 448, + 47, 449, 455, 47, 456, 47, 457, 47, 458, 459, + 461, 47, 462, 47, 47, 460, 47, 47, 47, 47, + 47, 47, 469, 47, 47, 47, 47, 463, 47, 464, + 470, 47, 473, 471, 465, 47, 47, 466, 467, 47, + 475, 474, 476, 47, 468, 480, 478, 47, 481, 472, + + 47, 483, 482, 47, 47, 477, 47, 47, 47, 487, + 47, 479, 485, 47, 47, 484, 47, 489, 47, 47, + 491, 492, 47, 47, 494, 47, 47, 47, 47, 490, + 486, 488, 47, 47, 47, 47, 500, 496, 493, 497, + 499, 501, 47, 498, 47, 495, 47, 47, 504, 503, + 506, 502, 505, 47, 508, 47, 47, 47, 47, 47, + 47, 509, 47, 47, 553, 513, 510, 47, 511, 514, + 515, 47, 507, 512, 47, 47, 516, 47, 517, 518, + 47, 47, 519, 47, 520, 47, 523, 47, 47, 526, + 527, 47, 528, 47, 521, 529, 47, 524, 47, 525, + + 47, 522, 532, 47, 47, 531, 47, 47, 47, 537, + 47, 536, 47, 535, 47, 539, 530, 47, 47, 47, + 47, 47, 533, 534, 47, 545, 47, 541, 542, 546, + 544, 540, 549, 47, 47, 47, 538, 547, 47, 543, + 548, 47, 47, 554, 47, 47, 551, 555, 47, 557, + 552, 556, 47, 550, 47, 47, 558, 47, 47, 47, + 559, 561, 560, 47, 47, 47, 47, 47, 47, 562, + 47, 47, 47, 47, 563, 564, 565, 572, 47, 573, + 568, 47, 47, 47, 47, 567, 577, 569, 570, 566, + 571, 575, 578, 47, 47, 574, 579, 47, 47, 47, + + 47, 576, 47, 47, 582, 583, 47, 581, 585, 47, + 47, 586, 580, 47, 47, 588, 584, 47, 47, 593, + 47, 47, 589, 587, 47, 47, 590, 596, 47, 594, + 595, 47, 591, 47, 597, 47, 592, 598, 47, 599, + 47, 47, 601, 602, 47, 603, 600, 47, 606, 47, + 47, 47, 47, 604, 605, 610, 47, 47, 47, 607, + 47, 612, 47, 47, 47, 47, 47, 613, 614, 609, + 608, 617, 47, 47, 621, 47, 47, 47, 620, 47, + 611, 47, 615, 616, 624, 47, 618, 622, 625, 47, + 619, 626, 47, 627, 47, 47, 623, 629, 47, 47, + + 628, 47, 630, 631, 47, 47, 633, 47, 47, 47, + 632, 47, 634, 636, 47, 47, 635, 47, 637, 47, + 639, 47, 643, 47, 47, 47, 47, 47, 638, 640, + 47, 47, 641, 47, 47, 47, 47, 47, 47, 642, + 32, 32, 32, 32, 37, 37, 37, 37, 42, 42, + 42, 42, 50, 50, 47, 50, 78, 78, 83, 83, + 51, 51, 47, 51, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 84, 82, 81, 79, 47, 84, 82, 81, - 79, 47, 634, 9, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 634, 634, 634, 634, 634 + 47, 47, 84, 82, 81, 79, 47, 84, 82, 81, + 79, 47, 644, 9, 644, 644, 644, 644, 644, 644, + 644, 644, 644, 644, 644, 644, 644, 644, 644, 644, + 644, 644, 644, 644, 644, 644, 644, 644, 644, 644, + 644, 644, 644, 644, 644, 644, 644, 644, 644, 644 } ; -static yyconst short int yy_chk[1331] = +static yyconst flex_int16_t yy_chk[1351] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -720,7 +806,7 @@ static yyconst short int yy_chk[1331] = 19, 20, 21, 23, 16, 20, 17, 21, 19, 24, 24, 17, 30, 26, 20, 27, 65, 23, 28, 29, - 29, 23, 26, 28, 36, 36, 641, 26, 65, 24, + 29, 23, 26, 28, 36, 36, 651, 26, 65, 24, 30, 48, 27, 31, 31, 48, 29, 28, 31, 41, 53, 41, 41, 45, 45, 47, 54, 47, 47, 50, 55, 50, 50, 56, 57, 55, 58, 53, 67, 50, @@ -744,11 +830,11 @@ static yyconst short int yy_chk[1331] = 139, 136, 137, 140, 138, 141, 143, 144, 145, 146, 135, 147, 147, 148, 147, 149, 144, 151, 141, 139, - 143, 140, 142, 150, 142, 142, 152, 145, 146, 638, + 143, 140, 142, 150, 142, 142, 152, 145, 146, 648, 149, 153, 148, 154, 151, 142, 142, 142, 150, 152, 153, 155, 154, 157, 156, 155, 159, 159, 157, 158, 160, 161, 153, 156, 162, 158, 161, 163, 163, 165, - 166, 160, 167, 171, 168, 170, 173, 175, 166, 633, + 166, 160, 167, 171, 168, 170, 173, 175, 166, 643, 170, 167, 177, 174, 162, 168, 172, 172, 174, 165, 171, 176, 176, 174, 172, 173, 177, 178, 179, 180, 175, 181, 188, 182, 183, 185, 181, 188, 178, 203, @@ -771,7 +857,7 @@ static yyconst short int yy_chk[1331] = 249, 260, 261, 262, 258, 263, 260, 266, 262, 267, 257, 268, 259, 261, 256, 264, 264, 265, 269, 269, 265, 267, 270, 271, 266, 263, 272, 272, 273, 275, - 268, 274, 274, 276, 272, 277, 282, 275, 626, 273, + 268, 274, 274, 276, 272, 277, 282, 275, 636, 273, 278, 278, 280, 271, 283, 270, 276, 280, 281, 287, 272, 281, 284, 277, 282, 285, 283, 284, 290, 288, @@ -782,96 +868,100 @@ static yyconst short int yy_chk[1331] = 306, 310, 310, 311, 314, 312, 316, 317, 311, 312, 318, 313, 321, 319, 315, 308, 322, 323, 314, 325, 325, 317, 319, 316, 322, 321, 324, 326, 327, 318, - 328, 324, 326, 329, 330, 332, 323, 333, 329, 330, - 331, 327, 334, 334, 331, 333, 337, 328, 332, 338, - 332, 345, 332, 335, 335, 336, 336, 338, 339, 340, - - 345, 346, 342, 339, 343, 337, 340, 342, 344, 343, - 347, 347, 349, 344, 350, 351, 353, 352, 350, 346, - 354, 353, 355, 356, 357, 358, 359, 354, 363, 349, - 352, 359, 356, 351, 366, 360, 361, 364, 357, 355, - 360, 361, 365, 364, 367, 358, 363, 365, 368, 369, - 370, 372, 366, 371, 371, 376, 372, 377, 376, 378, - 379, 379, 367, 382, 370, 380, 368, 381, 381, 369, - 383, 377, 384, 382, 383, 386, 387, 388, 389, 390, - 390, 391, 378, 389, 380, 392, 391, 393, 394, 396, - 384, 395, 397, 387, 396, 398, 388, 401, 386, 399, - - 400, 394, 623, 395, 392, 406, 393, 402, 399, 400, - 399, 397, 403, 405, 398, 401, 402, 403, 402, 404, - 404, 407, 406, 408, 409, 405, 410, 411, 408, 413, - 417, 414, 409, 415, 407, 414, 416, 418, 415, 417, - 425, 416, 418, 410, 431, 411, 419, 419, 413, 420, - 420, 421, 421, 423, 424, 426, 426, 427, 423, 424, - 428, 429, 427, 425, 430, 432, 432, 433, 431, 435, - 434, 428, 437, 428, 433, 436, 436, 439, 428, 434, - 429, 440, 439, 430, 441, 442, 448, 437, 446, 443, - 445, 441, 444, 435, 443, 445, 444, 444, 447, 446, - - 440, 449, 447, 442, 450, 455, 449, 451, 451, 448, - 456, 459, 456, 457, 457, 460, 460, 461, 462, 465, - 463, 455, 464, 468, 465, 450, 466, 469, 466, 462, - 459, 463, 469, 464, 467, 467, 470, 461, 470, 471, - 472, 473, 473, 474, 471, 475, 476, 468, 474, 477, - 482, 479, 480, 480, 475, 477, 475, 479, 481, 472, - 483, 476, 485, 486, 483, 484, 485, 481, 482, 487, - 484, 489, 490, 491, 489, 492, 492, 493, 493, 494, - 494, 495, 495, 486, 490, 491, 496, 498, 500, 487, - 499, 499, 498, 501, 502, 504, 504, 502, 505, 506, - - 506, 507, 508, 509, 496, 511, 500, 512, 513, 513, - 501, 508, 509, 514, 516, 507, 512, 515, 514, 516, - 517, 515, 505, 518, 511, 519, 517, 520, 530, 521, - 519, 521, 525, 525, 534, 520, 526, 526, 518, 528, - 528, 529, 532, 530, 535, 534, 529, 532, 533, 536, - 533, 538, 537, 539, 540, 535, 541, 542, 543, 545, - 536, 537, 544, 544, 545, 546, 540, 547, 551, 552, - 552, 554, 539, 541, 542, 538, 543, 553, 553, 546, - 558, 555, 561, 556, 566, 547, 557, 551, 556, 554, - 555, 557, 559, 560, 558, 562, 561, 559, 560, 563, - - 562, 564, 566, 567, 568, 568, 569, 582, 563, 576, - 564, 572, 572, 573, 569, 580, 573, 574, 574, 575, - 575, 567, 576, 577, 578, 578, 579, 581, 577, 583, - 579, 582, 581, 580, 584, 586, 588, 592, 583, 591, - 591, 598, 594, 595, 596, 597, 592, 594, 599, 600, - 597, 603, 586, 584, 600, 601, 601, 602, 628, 588, - 621, 595, 596, 604, 604, 598, 599, 628, 602, 619, - 603, 605, 605, 606, 606, 607, 607, 608, 609, 609, - 610, 610, 608, 612, 612, 613, 618, 618, 620, 622, - 613, 627, 620, 624, 624, 625, 625, 629, 631, 630, - - 632, 632, 617, 616, 615, 614, 622, 611, 593, 590, - 627, 629, 630, 589, 587, 585, 631, 635, 635, 635, - 635, 636, 636, 636, 636, 637, 637, 637, 637, 639, - 639, 571, 639, 640, 640, 642, 642, 643, 643, 570, - 643, 565, 550, 549, 548, 531, 527, 524, 523, 522, - 510, 503, 497, 488, 478, 458, 454, 453, 452, 438, - 422, 412, 385, 375, 374, 373, 362, 348, 341, 320, + 328, 324, 326, 329, 330, 333, 323, 332, 329, 330, + 331, 327, 337, 333, 331, 338, 332, 328, 334, 334, + 332, 633, 332, 338, 332, 335, 335, 336, 336, 339, + + 340, 337, 346, 342, 339, 343, 344, 340, 342, 345, + 343, 344, 347, 347, 349, 350, 351, 352, 345, 350, + 346, 353, 354, 355, 356, 357, 353, 358, 363, 354, + 352, 349, 359, 356, 351, 366, 360, 359, 361, 357, + 355, 360, 364, 361, 365, 367, 363, 358, 364, 365, + 368, 369, 370, 366, 373, 371, 372, 372, 377, 373, + 378, 377, 379, 367, 369, 380, 380, 381, 368, 371, + 382, 382, 370, 383, 378, 384, 385, 387, 388, 384, + 389, 396, 390, 383, 393, 379, 381, 390, 391, 391, + 394, 392, 395, 396, 385, 388, 392, 397, 398, 389, + + 387, 399, 397, 393, 400, 395, 402, 401, 406, 394, + 403, 405, 405, 400, 407, 400, 401, 398, 404, 403, + 399, 403, 408, 404, 402, 409, 407, 406, 410, 411, + 412, 413, 415, 410, 631, 419, 416, 411, 409, 408, + 416, 417, 427, 418, 419, 420, 417, 412, 418, 413, + 420, 415, 421, 421, 422, 422, 423, 423, 425, 426, + 428, 428, 429, 425, 426, 427, 430, 429, 431, 432, + 433, 434, 434, 435, 436, 437, 439, 430, 629, 430, + 435, 438, 438, 436, 430, 441, 443, 431, 432, 444, + 441, 439, 442, 445, 433, 446, 444, 442, 447, 437, + + 446, 448, 447, 447, 449, 443, 448, 451, 450, 452, + 453, 445, 450, 458, 452, 449, 454, 454, 459, 462, + 459, 460, 460, 463, 463, 464, 465, 471, 466, 458, + 451, 453, 467, 475, 469, 468, 469, 465, 462, 466, + 468, 470, 470, 467, 472, 464, 473, 474, 473, 472, + 475, 471, 474, 476, 477, 477, 478, 479, 480, 481, + 486, 478, 526, 483, 526, 481, 479, 485, 479, 483, + 484, 484, 476, 480, 490, 487, 485, 488, 486, 487, + 489, 491, 488, 493, 489, 494, 493, 495, 496, 496, + 497, 497, 498, 498, 490, 499, 499, 494, 500, 495, + + 502, 491, 503, 503, 504, 502, 505, 506, 507, 509, + 509, 507, 510, 506, 511, 511, 500, 512, 513, 514, + 516, 517, 504, 505, 518, 518, 522, 513, 514, 519, + 517, 512, 522, 520, 519, 521, 510, 520, 523, 516, + 521, 524, 525, 530, 530, 536, 524, 531, 531, 534, + 525, 533, 533, 523, 534, 535, 535, 538, 540, 539, + 536, 539, 538, 541, 542, 544, 545, 543, 546, 540, + 547, 548, 549, 553, 541, 542, 543, 550, 550, 551, + 546, 552, 557, 558, 551, 545, 558, 547, 548, 544, + 549, 553, 559, 559, 561, 552, 560, 560, 562, 563, + + 564, 557, 565, 566, 563, 564, 567, 562, 566, 568, + 569, 567, 561, 570, 573, 569, 565, 571, 574, 575, + 575, 576, 570, 568, 590, 577, 571, 580, 580, 576, + 577, 581, 573, 584, 581, 588, 574, 582, 582, 583, + 583, 587, 585, 586, 586, 587, 584, 585, 590, 589, + 591, 592, 594, 588, 589, 595, 595, 597, 601, 591, + 600, 600, 607, 603, 604, 605, 606, 601, 603, 594, + 592, 606, 608, 609, 611, 611, 612, 613, 609, 627, + 597, 626, 604, 605, 614, 614, 607, 612, 615, 615, + 608, 616, 616, 617, 617, 618, 613, 619, 619, 632, + + 618, 620, 620, 622, 622, 623, 628, 628, 630, 637, + 623, 638, 630, 634, 634, 639, 632, 635, 635, 640, + 638, 641, 642, 642, 625, 624, 621, 610, 637, 639, + 602, 599, 640, 598, 596, 593, 579, 578, 572, 641, + 645, 645, 645, 645, 646, 646, 646, 646, 647, 647, + 647, 647, 649, 649, 556, 649, 650, 650, 652, 652, + 653, 653, 555, 653, 554, 537, 532, 529, 528, 527, + 515, 508, 501, 492, 482, 461, 457, 456, 455, 440, + 424, 414, 386, 376, 375, 374, 362, 348, 341, 320, 309, 293, 286, 279, 254, 232, 231, 229, 228, 226, - 169, 164, 83, 82, 80, 78, 46, 42, 38, 37, - 32, 10, 9, 634, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 634, 634, 634, 634, 634 + 169, 164, 83, 82, 80, 78, 46, 42, 38, 37, + 32, 10, 9, 644, 644, 644, 644, 644, 644, 644, + 644, 644, 644, 644, 644, 644, 644, 644, 644, 644, + 644, 644, 644, 644, 644, 644, 644, 644, 644, 644, + 644, 644, 644, 644, 644, 644, 644, 644, 644, 644 } ; static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; +extern int yy_flex_debug; +int yy_flex_debug = 0; + /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ #define REJECT reject_used_but_not_detected static int yy_more_flag = 0; static int yy_more_len = 0; -#define yymore() (yy_more_flag = 1) -#define YY_MORE_ADJ yy_more_len +#define yymore() ((yy_more_flag) = 1) +#define YY_MORE_ADJ (yy_more_len) #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "util/configlexer.lex" -#define INITIAL 0 #line 2 "util/configlexer.lex" /* * configlexer.lex - lexical analyzer for unbound config file @@ -934,7 +1024,7 @@ static void config_start_include(const char* filename) include_stack[config_include_stack_ptr] = YY_CURRENT_BUFFER; cfg_parser->filename = strdup(filename); cfg_parser->line = 1; - yy_switch_to_buffer(yy_create_buffer(input, YY_BUF_SIZE)); + yy_switch_to_buffer(yy_create_buffer(input,YY_BUF_SIZE)); ++config_include_stack_ptr; } @@ -952,15 +1042,32 @@ static void config_end_include(void) #define yy_set_bol(at_bol) \ { \ if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer = yy_create_buffer(yyin,YY_BUF_SIZE ); \ yy_current_buffer->yy_ch_buf[0] = ((at_bol)?'\n':' '); \ } #endif + +#line 1051 "" + +#define INITIAL 0 #define quotedstring 1 #define include 2 #define include_quoted 3 +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +static int yy_init_globals (void ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -968,65 +1075,28 @@ static void config_end_include(void) #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); +extern "C" int yywrap (void ); #else -extern int yywrap YY_PROTO(( void )); -#endif +extern int yywrap (void ); #endif - -#ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); #endif #ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +static void yy_flex_strncpy (char *,yyconst char *,int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); +static int yy_flex_strlen (yyconst char * ); #endif #ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif -#endif - -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); -#endif +#ifdef __cplusplus +static int yyinput (void ); #else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 +static int input (void ); #endif -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif #endif /* Amount of stuff to slurp up with each read. */ @@ -1035,7 +1105,6 @@ YY_MALLOC_DECL #endif /* Copy whatever the last rule matched to the standard output. */ - #ifndef ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). @@ -1048,9 +1117,10 @@ YY_MALLOC_DECL */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ - int c = '*', n; \ + int c = '*'; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1060,9 +1130,22 @@ YY_MALLOC_DECL YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ - && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + }\ +\ + #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -1083,12 +1166,18 @@ YY_MALLOC_DECL #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif +/* end tables serialization structures and prototypes */ + /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif +#define YY_DECL_IS_OURS 1 + +extern int yylex (void); + +#define YY_DECL int yylex (void) +#endif /* !YY_DECL */ /* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. @@ -1105,25 +1194,28 @@ YY_MALLOC_DECL #define YY_RULE_SETUP \ YY_USER_ACTION +/** The main scanner function which does all the work. + */ YY_DECL - { +{ register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - + #line 98 "util/configlexer.lex" +#line 1207 "" - if ( yy_init ) + if ( !(yy_init) ) { - yy_init = 0; + (yy_init) = 1; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! yy_start ) - yy_start = 1; /* first start state */ + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ if ( ! yyin ) yyin = stdin; @@ -1131,74 +1223,74 @@ YY_DECL if ( ! yyout ) yyout = stdout; - if ( ! yy_current_buffer ) - yy_current_buffer = - yy_create_buffer( yyin, YY_BUF_SIZE ); + if ( ! YY_CURRENT_BUFFER ) { + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); + } - yy_load_buffer_state(); + yy_load_buffer_state( ); } while ( 1 ) /* loops until end-of-file is reached */ { - yy_more_len = 0; - if ( yy_more_flag ) + (yy_more_len) = 0; + if ( (yy_more_flag) ) { - yy_more_len = yy_c_buf_p - yytext_ptr; - yy_more_flag = 0; + (yy_more_len) = (yy_c_buf_p) - (yytext_ptr); + (yy_more_flag) = 0; } - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); /* Support of yytext. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = yy_start; + yy_current_state = (yy_start); yy_match: do { register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } 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 >= 635 ) + if ( yy_current_state >= 645 ) 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] != 1294 ); + while ( yy_base[yy_current_state] != 1314 ); yy_find_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; - do_action: /* This label is used only to access EOF actions. */ - switch ( yy_act ) { /* beginning of action switch */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); goto yy_find_action; case 1: @@ -1279,254 +1371,261 @@ YY_RULE_SETUP case 16: YY_RULE_SETUP #line 114 "util/configlexer.lex" -{ YDOUT; return VAR_CHROOT;} +{ YDOUT; return VAR_OUTGOING_INTERFACE;} YY_BREAK case 17: YY_RULE_SETUP #line 115 "util/configlexer.lex" -{ YDOUT; return VAR_USERNAME;} +{ YDOUT; return VAR_CHROOT;} YY_BREAK case 18: YY_RULE_SETUP #line 116 "util/configlexer.lex" -{ YDOUT; return VAR_DIRECTORY;} +{ YDOUT; return VAR_USERNAME;} YY_BREAK case 19: YY_RULE_SETUP #line 117 "util/configlexer.lex" -{ YDOUT; return VAR_LOGFILE;} +{ YDOUT; return VAR_DIRECTORY;} YY_BREAK case 20: YY_RULE_SETUP #line 118 "util/configlexer.lex" -{ YDOUT; return VAR_PIDFILE;} +{ YDOUT; return VAR_LOGFILE;} YY_BREAK case 21: YY_RULE_SETUP #line 119 "util/configlexer.lex" -{ YDOUT; return VAR_MSG_BUFFER_SIZE;} +{ YDOUT; return VAR_PIDFILE;} YY_BREAK case 22: YY_RULE_SETUP #line 120 "util/configlexer.lex" -{ YDOUT; return VAR_MSG_CACHE_SIZE;} +{ YDOUT; return VAR_MSG_BUFFER_SIZE;} YY_BREAK case 23: YY_RULE_SETUP #line 121 "util/configlexer.lex" -{ YDOUT; return VAR_MSG_CACHE_SLABS;} +{ YDOUT; return VAR_MSG_CACHE_SIZE;} YY_BREAK case 24: YY_RULE_SETUP #line 122 "util/configlexer.lex" -{ YDOUT; return VAR_RRSET_CACHE_SIZE;} +{ YDOUT; return VAR_MSG_CACHE_SLABS;} YY_BREAK case 25: YY_RULE_SETUP #line 123 "util/configlexer.lex" -{ YDOUT; return VAR_RRSET_CACHE_SLABS;} +{ YDOUT; return VAR_RRSET_CACHE_SIZE;} YY_BREAK case 26: YY_RULE_SETUP #line 124 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_HOST_TTL;} +{ YDOUT; return VAR_RRSET_CACHE_SLABS;} YY_BREAK case 27: YY_RULE_SETUP #line 125 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_LAME_TTL;} +{ YDOUT; return VAR_INFRA_HOST_TTL;} YY_BREAK case 28: YY_RULE_SETUP #line 126 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_CACHE_SLABS;} +{ YDOUT; return VAR_INFRA_LAME_TTL;} YY_BREAK case 29: YY_RULE_SETUP #line 127 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_CACHE_NUMHOSTS;} +{ YDOUT; return VAR_INFRA_CACHE_SLABS;} YY_BREAK case 30: YY_RULE_SETUP #line 128 "util/configlexer.lex" -{ YDOUT; return VAR_INFRA_CACHE_LAME_SIZE;} +{ YDOUT; return VAR_INFRA_CACHE_NUMHOSTS;} YY_BREAK case 31: YY_RULE_SETUP #line 129 "util/configlexer.lex" -{ YDOUT; return VAR_NUM_QUERIES_PER_THREAD;} +{ YDOUT; return VAR_INFRA_CACHE_LAME_SIZE;} YY_BREAK case 32: YY_RULE_SETUP #line 130 "util/configlexer.lex" -{ YDOUT; return VAR_TARGET_FETCH_POLICY;} +{ YDOUT; return VAR_NUM_QUERIES_PER_THREAD;} YY_BREAK case 33: YY_RULE_SETUP #line 131 "util/configlexer.lex" -{ YDOUT; return VAR_HARDEN_SHORT_BUFSIZE;} +{ YDOUT; return VAR_TARGET_FETCH_POLICY;} YY_BREAK case 34: YY_RULE_SETUP #line 132 "util/configlexer.lex" -{ YDOUT; return VAR_HARDEN_LARGE_QUERIES;} +{ YDOUT; return VAR_HARDEN_SHORT_BUFSIZE;} YY_BREAK case 35: YY_RULE_SETUP #line 133 "util/configlexer.lex" -{ YDOUT; return VAR_HARDEN_GLUE;} +{ YDOUT; return VAR_HARDEN_LARGE_QUERIES;} YY_BREAK case 36: YY_RULE_SETUP #line 134 "util/configlexer.lex" -{ YDOUT; return VAR_STUB_ZONE;} +{ YDOUT; return VAR_HARDEN_GLUE;} YY_BREAK case 37: YY_RULE_SETUP #line 135 "util/configlexer.lex" -{ YDOUT; return VAR_NAME;} +{ YDOUT; return VAR_STUB_ZONE;} YY_BREAK case 38: YY_RULE_SETUP #line 136 "util/configlexer.lex" -{ YDOUT; return VAR_STUB_ADDR;} +{ YDOUT; return VAR_NAME;} YY_BREAK case 39: YY_RULE_SETUP #line 137 "util/configlexer.lex" -{ YDOUT; return VAR_STUB_HOST;} +{ YDOUT; return VAR_STUB_ADDR;} YY_BREAK case 40: YY_RULE_SETUP #line 138 "util/configlexer.lex" -{ YDOUT; return VAR_FORWARD_ZONE;} +{ YDOUT; return VAR_STUB_HOST;} YY_BREAK case 41: YY_RULE_SETUP #line 139 "util/configlexer.lex" -{ YDOUT; return VAR_FORWARD_ADDR;} +{ YDOUT; return VAR_FORWARD_ZONE;} YY_BREAK case 42: YY_RULE_SETUP #line 140 "util/configlexer.lex" -{ YDOUT; return VAR_FORWARD_HOST;} +{ YDOUT; return VAR_FORWARD_ADDR;} YY_BREAK case 43: YY_RULE_SETUP #line 141 "util/configlexer.lex" -{ YDOUT; return VAR_DO_NOT_QUERY_ADDRESS;} +{ YDOUT; return VAR_FORWARD_HOST;} YY_BREAK case 44: YY_RULE_SETUP #line 142 "util/configlexer.lex" -{ YDOUT; return VAR_HIDE_IDENTITY;} +{ YDOUT; return VAR_DO_NOT_QUERY_ADDRESS;} YY_BREAK case 45: YY_RULE_SETUP #line 143 "util/configlexer.lex" -{ YDOUT; return VAR_HIDE_VERSION;} +{ YDOUT; return VAR_HIDE_IDENTITY;} YY_BREAK case 46: YY_RULE_SETUP #line 144 "util/configlexer.lex" -{ YDOUT; return VAR_IDENTITY;} +{ YDOUT; return VAR_HIDE_VERSION;} YY_BREAK case 47: YY_RULE_SETUP #line 145 "util/configlexer.lex" -{ YDOUT; return VAR_VERSION;} +{ YDOUT; return VAR_IDENTITY;} YY_BREAK case 48: YY_RULE_SETUP #line 146 "util/configlexer.lex" -{ YDOUT; return VAR_MODULE_CONF;} +{ YDOUT; return VAR_VERSION;} YY_BREAK case 49: YY_RULE_SETUP #line 147 "util/configlexer.lex" -{ YDOUT; return VAR_TRUST_ANCHOR_FILE;} +{ YDOUT; return VAR_MODULE_CONF;} YY_BREAK case 50: YY_RULE_SETUP #line 148 "util/configlexer.lex" -{ YDOUT; return VAR_TRUSTED_KEYS_FILE;} +{ YDOUT; return VAR_TRUST_ANCHOR_FILE;} YY_BREAK case 51: YY_RULE_SETUP #line 149 "util/configlexer.lex" -{ YDOUT; return VAR_TRUST_ANCHOR;} +{ YDOUT; return VAR_TRUSTED_KEYS_FILE;} YY_BREAK case 52: YY_RULE_SETUP #line 150 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_OVERRIDE_DATE;} +{ YDOUT; return VAR_TRUST_ANCHOR;} YY_BREAK case 53: YY_RULE_SETUP #line 151 "util/configlexer.lex" -{ YDOUT; return VAR_BOGUS_TTL;} +{ YDOUT; return VAR_VAL_OVERRIDE_DATE;} YY_BREAK case 54: YY_RULE_SETUP #line 152 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_CLEAN_ADDITIONAL;} +{ YDOUT; return VAR_BOGUS_TTL;} YY_BREAK case 55: YY_RULE_SETUP #line 153 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_PERMISSIVE_MODE;} +{ YDOUT; return VAR_VAL_CLEAN_ADDITIONAL;} YY_BREAK case 56: YY_RULE_SETUP #line 154 "util/configlexer.lex" -{ YDOUT; return VAR_KEY_CACHE_SIZE;} +{ YDOUT; return VAR_VAL_PERMISSIVE_MODE;} YY_BREAK case 57: YY_RULE_SETUP #line 155 "util/configlexer.lex" -{ YDOUT; return VAR_KEY_CACHE_SLABS;} +{ YDOUT; return VAR_KEY_CACHE_SIZE;} YY_BREAK case 58: YY_RULE_SETUP #line 156 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_NSEC3_KEYSIZE_ITERATIONS;} +{ YDOUT; return VAR_KEY_CACHE_SLABS;} YY_BREAK case 59: YY_RULE_SETUP #line 157 "util/configlexer.lex" -{ YDOUT; return VAR_USE_SYSLOG;} +{ YDOUT; return VAR_VAL_NSEC3_KEYSIZE_ITERATIONS;} YY_BREAK case 60: YY_RULE_SETUP #line 158 "util/configlexer.lex" +{ YDOUT; return VAR_USE_SYSLOG;} + YY_BREAK +case 61: +/* rule 61 can match eol */ +YY_RULE_SETUP +#line 159 "util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 61: +case 62: YY_RULE_SETUP -#line 161 "util/configlexer.lex" +#line 162 "util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 162 "util/configlexer.lex" +#line 163 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 62: -YY_RULE_SETUP -#line 166 "util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 63: YY_RULE_SETUP #line 167 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK case 64: +/* rule 64 can match eol */ YY_RULE_SETUP #line 168 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 65: +YY_RULE_SETUP +#line 169 "util/configlexer.lex" { LEXOUT(("QE ")); BEGIN(INITIAL); @@ -1538,36 +1637,37 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 65: +case 66: YY_RULE_SETUP -#line 179 "util/configlexer.lex" +#line 180 "util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 180 "util/configlexer.lex" +#line 181 "util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(INITIAL); } YY_BREAK -case 66: -YY_RULE_SETUP -#line 184 "util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 67: YY_RULE_SETUP #line 185 "util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 68: +/* rule 68 can match eol */ YY_RULE_SETUP #line 186 "util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 69: YY_RULE_SETUP #line 187 "util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 70: +YY_RULE_SETUP +#line 188 "util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include(yytext); @@ -1575,25 +1675,26 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 192 "util/configlexer.lex" +#line 193 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 70: -YY_RULE_SETUP -#line 196 "util/configlexer.lex" -{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } - YY_BREAK case 71: YY_RULE_SETUP #line 197 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK case 72: +/* rule 72 can match eol */ YY_RULE_SETUP #line 198 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 73: +YY_RULE_SETUP +#line 199 "util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -1602,7 +1703,7 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 204 "util/configlexer.lex" +#line 205 "util/configlexer.lex" { yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ if (config_include_stack_ptr == 0) { @@ -1613,41 +1714,42 @@ case YY_STATE_EOF(INITIAL): } } YY_BREAK -case 73: +case 74: YY_RULE_SETUP -#line 214 "util/configlexer.lex" +#line 215 "util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); yylval.str = strdup(yytext); return STRING; } YY_BREAK -case 74: +case 75: YY_RULE_SETUP -#line 217 "util/configlexer.lex" +#line 218 "util/configlexer.lex" ECHO; YY_BREAK +#line 1728 "" case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our + * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -1657,13 +1759,13 @@ ECHO; * end-of-buffer state). Contrast this with the test * in input(). */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -1676,30 +1778,30 @@ ECHO; yy_next_state = yy_try_NUL_trans( yy_current_state ); - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_bp = (yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; + yy_cp = ++(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer() ) + else switch ( yy_get_next_buffer( ) ) { case EOB_ACT_END_OF_FILE: { - yy_did_buffer_switch_on_eof = 0; + (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap() ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1710,7 +1812,7 @@ ECHO; * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -1718,30 +1820,30 @@ ECHO; else { - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -1752,8 +1854,7 @@ ECHO; "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of yylex */ - +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1762,21 +1863,20 @@ ECHO; * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ - -static int yy_get_next_buffer() - { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; +static int yy_get_next_buffer (void) +{ + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); register int number_to_move, i; int ret_val; - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( yy_current_buffer->yy_fill_buffer == 0 ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -1796,34 +1896,30 @@ static int yy_get_next_buffer() /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; else { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); + (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -1836,8 +1932,7 @@ static int yy_get_next_buffer() b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ @@ -1847,35 +1942,35 @@ static int yy_get_next_buffer() YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = yy_current_buffer->yy_buf_size - + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; -#endif + } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), num_to_read ); - yy_current_buffer->yy_n_chars = yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - if ( yy_n_chars == 0 ) + if ( (yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + yyrestart(yyin ); } else { ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -1883,152 +1978,100 @@ static int yy_get_next_buffer() else ret_val = EOB_ACT_CONTINUE_SCAN; - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; return ret_val; - } - +} /* yy_get_previous_state - get the state just before the EOB char was reached */ -static yy_state_type yy_get_previous_state() - { + static yy_state_type yy_get_previous_state (void) +{ register yy_state_type yy_current_state; register char *yy_cp; + + yy_current_state = (yy_start); - yy_current_state = yy_start; - - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } 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 >= 635 ) + if ( yy_current_state >= 645 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; } return yy_current_state; - } - +} /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; + register char *yy_cp = (yy_c_buf_p); register YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } 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 >= 635 ) + if ( yy_current_state >= 645 ) 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 == 634); + yy_is_jam = (yy_current_state == 644); return yy_is_jam ? 0 : yy_current_state; - } - - -#ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -register char *yy_bp; -#endif - { - register char *yy_cp = yy_c_buf_p; - - /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; - - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) - { /* need to shift things up to make room */ - /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; - register char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; - - while ( source > yy_current_buffer->yy_ch_buf ) - *--dest = *--source; - - yy_cp += (int) (dest - source); - yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; - - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) - YY_FATAL_ERROR( "flex scanner push-back overflow" ); - } - - *--yy_cp = (char) c; - - - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ - +} +#ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput() + static int yyinput (void) #else -static int input() + static int input (void) #endif - { - int c; - *yy_c_buf_p = yy_hold_char; +{ + int c; + + *(yy_c_buf_p) = (yy_hold_char); - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) /* This was really a NUL. */ - *yy_c_buf_p = '\0'; + *(yy_c_buf_p) = '\0'; else { /* need more input */ - int offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); - switch ( yy_get_next_buffer() ) + switch ( yy_get_next_buffer( ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -2042,16 +2085,16 @@ static int input() */ /* Reset buffer status. */ - yyrestart( yyin ); + yyrestart(yyin ); - /* fall through */ + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap() ) + if ( yywrap( ) ) return EOF; - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus return yyinput(); @@ -2061,90 +2104,92 @@ static int input() } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; + (yy_c_buf_p) = (yytext_ptr) + offset; break; } } } - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; - + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve yytext */ + (yy_hold_char) = *++(yy_c_buf_p); return c; - } - - -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); +} +#endif /* ifndef YY_NO_INPUT */ - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void yyrestart (FILE * input_file ) +{ + + if ( ! YY_CURRENT_BUFFER ){ + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); } + yy_init_buffer(YY_CURRENT_BUFFER,input_file ); + yy_load_buffer_state( ); +} -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); + */ + yyensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) return; - if ( yy_current_buffer ) + if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - yy_current_buffer = new_buffer; - yy_load_buffer_state(); + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ - yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } + (yy_did_buffer_switch_on_eof) = 1; +} +static void yy_load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) +{ YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -2153,80 +2198,75 @@ int size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer( b, file ); + yy_init_buffer(b,file ); return b; - } - +} -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { +/** Destroy the buffer. + * @param b a buffer created with yy_create_buffer() + * + */ + void yy_delete_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); + yyfree((void *) b->yy_ch_buf ); - yy_flex_free( (void *) b ); - } - - -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif - -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif + yyfree((void *) b ); +} +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a yyrestart() or at EOF. + */ + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - { - yy_flush_buffer( b ); +{ + int oerrno = errno; + + yy_flush_buffer(b ); b->yy_input_file = file; b->yy_fill_buffer = 1; -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; -#endif -#endif - } - - -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } + + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} - { - if ( ! b ) +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void yy_flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; b->yy_n_chars = 0; @@ -2243,29 +2283,121 @@ YY_BUFFER_STATE b; b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == yy_current_buffer ) - yy_load_buffer_state(); + if ( b == YY_CURRENT_BUFFER ) + yy_load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == NULL) + return; + + yyensure_buffer_stack(); + + /* This block is copied from yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void yypop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; } +} +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void yyensure_buffer_stack (void) +{ + int num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; + } -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { - YY_BUFFER_STATE b; + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} + +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) +{ + YY_BUFFER_STATE b; + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); @@ -2279,56 +2411,51 @@ yy_size_t size; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + yy_switch_to_buffer(b ); return b; - } -#endif - - -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - - return yy_scan_bytes( yy_str, len ); - } -#endif +} +/** Setup the input buffer state to scan a string. The next call to yylex() will + * scan from a @e copy of @a str. + * @param str a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * yy_scan_bytes() instead. + */ +YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +{ + + return yy_scan_bytes(yystr,strlen(yystr) ); +} -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +{ YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; - buf = (char *) yy_flex_alloc( n ); + n = _yybytes_len + 2; + buf = (char *) yyalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer( buf, n ); + b = yy_scan_buffer(buf,n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -2338,148 +2465,196 @@ int len; b->yy_is_our_buffer = 1; return b; - } +} + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 #endif +static void yy_fatal_error (yyconst char* msg ) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; -#endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; +/* Redefine yyless() so it works in section 3 code. */ - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = (yy_hold_char); \ + (yy_c_buf_p) = yytext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); +/* Accessor methods (get/set functions) to struct members. */ - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); +/** Get the current line number. + * + */ +int yyget_lineno (void) +{ + + return yylineno; +} - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } +/** Get the input stream. + * + */ +FILE *yyget_in (void) +{ + return yyin; +} - yy_start_stack[yy_start_stack_ptr++] = YY_START; +/** Get the output stream. + * + */ +FILE *yyget_out (void) +{ + return yyout; +} - BEGIN(new_state); - } -#endif +/** Get the length of the current token. + * + */ +int yyget_leng (void) +{ + return yyleng; +} +/** Get the current token. + * + */ -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); +char *yyget_text (void) +{ + return yytext; +} - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif +/** Set the current line number. + * @param line_number + * + */ +void yyset_lineno (int line_number ) +{ + + yylineno = line_number; +} +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * + * @see yy_switch_to_buffer + */ +void yyset_in (FILE * in_str ) +{ + yyin = in_str ; +} -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif +void yyset_out (FILE * out_str ) +{ + yyout = out_str ; +} -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif +int yyget_debug (void) +{ + return yy_flex_debug; +} + +void yyset_debug (int bdebug ) +{ + yy_flex_debug = bdebug ; +} -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) +static int yy_init_globals (void) +{ + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from yylex_destroy(), so don't allocate here. + */ + + (yy_buffer_stack) = 0; + (yy_buffer_stack_top) = 0; + (yy_buffer_stack_max) = 0; + (yy_c_buf_p) = (char *) 0; + (yy_init) = 0; + (yy_start) = 0; + +/* Defined in main.c */ +#ifdef YY_STDINIT + yyin = stdin; + yyout = stdout; #else -static void yy_fatal_error( msg ) -char msg[]; + yyin = (FILE *) 0; + yyout = (FILE *) 0; #endif - { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); - } + /* For future reference: Set errno on error, since we are called by + * yylex_init() + */ + return 0; +} +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + yypop_buffer_state(); + } -/* Redefine yyless() so it works in section 3 code. */ + /* Destroy the stack itself. */ + yyfree((yy_buffer_stack) ); + (yy_buffer_stack) = NULL; -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ - } \ - while ( 0 ) + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * yylex() is called, initialization will occur. */ + yy_init_globals( ); + return 0; +} -/* Internal utility routines. */ +/* + * Internal utility routines. + */ #ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) -#else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; -#endif - { +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +{ register int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; - } +} #endif #ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { +static int yy_flex_strlen (yyconst char * s ) +{ register int n; for ( n = 0; s[n]; ++n ) ; return n; - } +} #endif - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { +void *yyalloc (yy_size_t size ) +{ return (void *) malloc( size ); - } +} -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { +void *yyrealloc (void * ptr, yy_size_t size ) +{ /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2488,24 +2663,16 @@ yy_size_t size; * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); - } +} + +void yyfree (void * ptr ) +{ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ +} + +#define YYTABLES_NAME "yytables" + +#line 218 "util/configlexer.lex" -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ptr ); - } -#if YY_MAIN -int main() - { - yylex(); - return 0; - } -#endif -#line 217 "util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 97f6624b7..88b5fa5c7 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -111,6 +111,7 @@ do-ip6{COLON} { YDOUT; return VAR_DO_IP6;} do-udp{COLON} { YDOUT; return VAR_DO_UDP;} do-tcp{COLON} { YDOUT; return VAR_DO_TCP;} interface{COLON} { YDOUT; return VAR_INTERFACE;} +outgoing-interface{COLON} { YDOUT; return VAR_OUTGOING_INTERFACE;} chroot{COLON} { YDOUT; return VAR_CHROOT;} username{COLON} { YDOUT; return VAR_USERNAME;} directory{COLON} { YDOUT; return VAR_DIRECTORY;} diff --git a/util/configparser.c b/util/configparser.c index 4085964a3..7e13b5a6a 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -130,7 +130,8 @@ VAR_KEY_CACHE_SLABS = 319, VAR_TRUSTED_KEYS_FILE = 320, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 321, - VAR_USE_SYSLOG = 322 + VAR_USE_SYSLOG = 322, + VAR_OUTGOING_INTERFACE = 323 }; #endif /* Tokens. */ @@ -199,6 +200,7 @@ #define VAR_TRUSTED_KEYS_FILE 320 #define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 321 #define VAR_USE_SYSLOG 322 +#define VAR_OUTGOING_INTERFACE 323 @@ -257,7 +259,7 @@ typedef union YYSTYPE char* str; } /* Line 187 of yacc.c. */ -#line 261 "util/configparser.c" +#line 263 "util/configparser.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -270,7 +272,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 274 "util/configparser.c" +#line 276 "util/configparser.c" #ifdef short # undef short @@ -485,20 +487,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 114 +#define YYLAST 115 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 68 +#define YYNTOKENS 69 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 67 +#define YYNNTS 68 /* YYNRULES -- Number of rules. */ -#define YYNRULES 125 +#define YYNRULES 127 /* YYNRULES -- Number of states. */ -#define YYNSTATES 181 +#define YYNSTATES 184 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 322 +#define YYMAXUTOK 323 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -538,7 +540,7 @@ static const yytype_uint8 yytranslate[] = 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67 + 65, 66, 67, 68 }; #if YYDEBUG @@ -552,67 +554,68 @@ static const yytype_uint16 yyprhs[] = 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, - 122, 125, 126, 128, 130, 132, 134, 137, 138, 140, - 142, 144, 147, 150, 153, 156, 159, 162, 165, 168, - 171, 174, 177, 180, 183, 186, 189, 192, 195, 198, - 201, 204, 207, 210, 213, 216, 219, 222, 225, 228, - 231, 234, 237, 240, 243, 246, 249, 252, 255, 258, - 261, 264, 267, 270, 273, 276, 279, 282, 285, 288, - 291, 294, 297, 300, 303, 306 + 122, 124, 127, 128, 130, 132, 134, 136, 139, 140, + 142, 144, 146, 149, 152, 155, 158, 161, 164, 167, + 170, 173, 176, 179, 182, 185, 188, 191, 194, 197, + 200, 203, 206, 209, 212, 215, 218, 221, 224, 227, + 230, 233, 236, 239, 242, 245, 248, 251, 254, 257, + 260, 263, 266, 269, 272, 275, 278, 281, 284, 287, + 290, 293, 296, 299, 302, 305, 308, 311 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 69, 0, -1, -1, 69, 70, -1, 71, 72, -1, - 74, 75, -1, 77, 78, -1, 11, -1, 72, 73, - -1, -1, 80, -1, 81, -1, 82, -1, 84, -1, - 85, -1, 88, -1, 89, -1, 90, -1, 91, -1, - 83, -1, 93, -1, 94, -1, 95, -1, 96, -1, - 97, -1, 106, -1, 107, -1, 108, -1, 109, -1, - 110, -1, 86, -1, 111, -1, 112, -1, 115, -1, - 113, -1, 114, -1, 116, -1, 117, -1, 118, -1, - 120, -1, 101, -1, 102, -1, 103, -1, 104, -1, - 119, -1, 121, -1, 98, -1, 100, -1, 122, -1, - 123, -1, 124, -1, 125, -1, 87, -1, 105, -1, - 127, -1, 128, -1, 99, -1, 126, -1, 92, -1, - 39, -1, 75, 76, -1, -1, 129, -1, 130, -1, - 131, -1, 45, -1, 78, 79, -1, -1, 132, -1, - 133, -1, 134, -1, 13, 10, -1, 12, 10, -1, - 14, 10, -1, 17, 10, -1, 15, 10, -1, 16, - 10, -1, 32, 10, -1, 61, 10, -1, 18, 10, - -1, 19, 10, -1, 20, 10, -1, 21, 10, -1, - 67, 10, -1, 22, 10, -1, 23, 10, -1, 24, - 10, -1, 25, 10, -1, 26, 10, -1, 55, 10, - -1, 65, 10, -1, 56, 10, -1, 49, 10, -1, - 50, 10, -1, 51, 10, -1, 52, 10, -1, 62, - 10, -1, 27, 10, -1, 28, 10, -1, 29, 10, - -1, 30, 10, -1, 31, 10, -1, 33, 10, -1, - 34, 10, -1, 36, 10, -1, 37, 10, -1, 35, - 10, -1, 42, 10, -1, 43, 10, -1, 44, 10, - -1, 53, 10, -1, 48, 10, -1, 54, 10, -1, - 57, 10, -1, 58, 10, -1, 59, 10, -1, 60, - 10, -1, 66, 10, -1, 63, 10, -1, 64, 10, - -1, 38, 10, -1, 40, 10, -1, 41, 10, -1, - 38, 10, -1, 46, 10, -1, 47, 10, -1 + 70, 0, -1, -1, 70, 71, -1, 72, 73, -1, + 75, 76, -1, 78, 79, -1, 11, -1, 73, 74, + -1, -1, 81, -1, 82, -1, 83, -1, 86, -1, + 87, -1, 90, -1, 91, -1, 92, -1, 93, -1, + 84, -1, 95, -1, 96, -1, 97, -1, 98, -1, + 99, -1, 108, -1, 109, -1, 110, -1, 111, -1, + 112, -1, 88, -1, 113, -1, 114, -1, 117, -1, + 115, -1, 116, -1, 118, -1, 119, -1, 120, -1, + 122, -1, 103, -1, 104, -1, 105, -1, 106, -1, + 121, -1, 123, -1, 100, -1, 102, -1, 124, -1, + 125, -1, 126, -1, 127, -1, 89, -1, 107, -1, + 129, -1, 130, -1, 101, -1, 128, -1, 94, -1, + 85, -1, 39, -1, 76, 77, -1, -1, 131, -1, + 132, -1, 133, -1, 45, -1, 79, 80, -1, -1, + 134, -1, 135, -1, 136, -1, 13, 10, -1, 12, + 10, -1, 14, 10, -1, 17, 10, -1, 68, 10, + -1, 15, 10, -1, 16, 10, -1, 32, 10, -1, + 61, 10, -1, 18, 10, -1, 19, 10, -1, 20, + 10, -1, 21, 10, -1, 67, 10, -1, 22, 10, + -1, 23, 10, -1, 24, 10, -1, 25, 10, -1, + 26, 10, -1, 55, 10, -1, 65, 10, -1, 56, + 10, -1, 49, 10, -1, 50, 10, -1, 51, 10, + -1, 52, 10, -1, 62, 10, -1, 27, 10, -1, + 28, 10, -1, 29, 10, -1, 30, 10, -1, 31, + 10, -1, 33, 10, -1, 34, 10, -1, 36, 10, + -1, 37, 10, -1, 35, 10, -1, 42, 10, -1, + 43, 10, -1, 44, 10, -1, 53, 10, -1, 48, + 10, -1, 54, 10, -1, 57, 10, -1, 58, 10, + -1, 59, 10, -1, 60, 10, -1, 66, 10, -1, + 63, 10, -1, 64, 10, -1, 38, 10, -1, 40, + 10, -1, 41, 10, -1, 38, 10, -1, 46, 10, + -1, 47, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 90, 90, 90, 91, 91, 92, 96, 101, 102, - 103, 103, 103, 104, 104, 104, 105, 105, 105, 106, - 106, 106, 107, 107, 107, 108, 108, 109, 109, 110, - 110, 111, 111, 112, 112, 113, 113, 114, 114, 115, - 115, 116, 116, 116, 117, 117, 117, 118, 118, 118, - 119, 119, 120, 120, 121, 121, 122, 122, 123, 125, - 137, 138, 139, 139, 139, 141, 153, 154, 155, 155, - 155, 157, 166, 175, 184, 197, 206, 215, 224, 233, - 242, 251, 260, 269, 283, 290, 297, 304, 312, 319, - 327, 335, 342, 351, 360, 367, 374, 385, 394, 407, - 416, 425, 438, 447, 456, 465, 474, 487, 494, 504, - 514, 524, 531, 538, 556, 565, 575, 585, 592, 601, - 614, 621, 628, 635, 642, 649 + 0, 91, 91, 91, 92, 92, 93, 97, 102, 103, + 104, 104, 104, 105, 105, 105, 106, 106, 106, 107, + 107, 107, 108, 108, 108, 109, 109, 110, 110, 111, + 111, 112, 112, 113, 113, 114, 114, 115, 115, 116, + 116, 117, 117, 117, 118, 118, 118, 119, 119, 119, + 120, 120, 121, 121, 122, 122, 123, 123, 124, 124, + 126, 138, 139, 140, 140, 140, 142, 154, 155, 156, + 156, 156, 158, 167, 176, 185, 198, 213, 222, 231, + 240, 249, 258, 267, 276, 285, 299, 306, 313, 320, + 328, 335, 343, 351, 358, 367, 376, 383, 390, 401, + 410, 423, 432, 441, 454, 463, 472, 481, 490, 503, + 510, 520, 530, 540, 547, 554, 572, 581, 591, 601, + 608, 617, 630, 637, 644, 651, 658, 665 }; #endif @@ -640,12 +643,13 @@ static const char *const yytname[] = "VAR_VAL_OVERRIDE_DATE", "VAR_BOGUS_TTL", "VAR_VAL_CLEAN_ADDITIONAL", "VAR_VAL_PERMISSIVE_MODE", "VAR_INCOMING_NUM_TCP", "VAR_MSG_BUFFER_SIZE", "VAR_KEY_CACHE_SIZE", "VAR_KEY_CACHE_SLABS", "VAR_TRUSTED_KEYS_FILE", - "VAR_VAL_NSEC3_KEYSIZE_ITERATIONS", "VAR_USE_SYSLOG", "$accept", - "toplevelvars", "toplevelvar", "serverstart", "contents_server", - "content_server", "stubstart", "contents_stub", "content_stub", - "forwardstart", "contents_forward", "content_forward", - "server_num_threads", "server_verbosity", "server_port", - "server_interface", "server_outgoing_port", "server_outgoing_range", + "VAR_VAL_NSEC3_KEYSIZE_ITERATIONS", "VAR_USE_SYSLOG", + "VAR_OUTGOING_INTERFACE", "$accept", "toplevelvars", "toplevelvar", + "serverstart", "contents_server", "content_server", "stubstart", + "contents_stub", "content_stub", "forwardstart", "contents_forward", + "content_forward", "server_num_threads", "server_verbosity", + "server_port", "server_interface", "server_outgoing_interface", + "server_outgoing_port", "server_outgoing_range", "server_outgoing_num_tcp", "server_incoming_num_tcp", "server_do_ip4", "server_do_ip6", "server_do_udp", "server_do_tcp", "server_use_syslog", "server_chroot", "server_username", "server_directory", "server_logfile", @@ -679,26 +683,26 @@ static const yytype_uint16 yytoknum[] = 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 321, 322 + 315, 316, 317, 318, 319, 320, 321, 322, 323 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 68, 69, 69, 70, 70, 70, 71, 72, 72, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 74, - 75, 75, 76, 76, 76, 77, 78, 78, 79, 79, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 0, 69, 70, 70, 71, 71, 71, 72, 73, 73, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 75, 76, 76, 77, 77, 77, 78, 79, 79, 80, + 80, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134 + 129, 130, 131, 132, 133, 134, 135, 136 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -710,13 +714,13 @@ 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, - 2, 0, 1, 1, 1, 1, 2, 0, 1, 1, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 2, 0, 1, 1, 1, 1, 2, 0, 1, + 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2 + 2, 2, 2, 2, 2, 2, 2, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -724,37 +728,37 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 2, 0, 1, 7, 59, 65, 3, 9, 61, 67, + 2, 0, 1, 7, 60, 66, 3, 9, 62, 68, 4, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 8, 10, 11, 12, 19, 13, 14, 30, - 52, 15, 16, 17, 18, 58, 20, 21, 22, 23, - 24, 46, 56, 47, 40, 41, 42, 43, 53, 25, - 26, 27, 28, 29, 31, 32, 34, 35, 33, 36, - 37, 38, 44, 39, 45, 48, 49, 50, 51, 57, - 54, 55, 0, 0, 0, 60, 62, 63, 64, 0, - 0, 0, 66, 68, 69, 70, 72, 71, 73, 75, - 76, 74, 79, 80, 81, 82, 84, 85, 86, 87, - 88, 97, 98, 99, 100, 101, 77, 102, 103, 106, - 104, 105, 107, 108, 109, 111, 92, 93, 94, 95, - 110, 112, 89, 91, 113, 114, 115, 116, 78, 96, - 118, 119, 90, 117, 83, 120, 121, 122, 123, 124, - 125 + 0, 0, 0, 8, 10, 11, 12, 19, 59, 13, + 14, 30, 52, 15, 16, 17, 18, 58, 20, 21, + 22, 23, 24, 46, 56, 47, 40, 41, 42, 43, + 53, 25, 26, 27, 28, 29, 31, 32, 34, 35, + 33, 36, 37, 38, 44, 39, 45, 48, 49, 50, + 51, 57, 54, 55, 0, 0, 0, 61, 63, 64, + 65, 0, 0, 0, 67, 69, 70, 71, 73, 72, + 74, 77, 78, 75, 81, 82, 83, 84, 86, 87, + 88, 89, 90, 99, 100, 101, 102, 103, 79, 104, + 105, 108, 106, 107, 109, 110, 111, 113, 94, 95, + 96, 97, 112, 114, 91, 93, 115, 116, 117, 118, + 80, 98, 120, 121, 92, 119, 85, 76, 122, 123, + 124, 125, 126, 127 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 1, 6, 7, 10, 62, 8, 11, 115, 9, - 12, 122, 63, 64, 65, 66, 67, 68, 69, 70, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 116, 117, 118, 123, 124, 125 + -1, 1, 6, 7, 10, 63, 8, 11, 117, 9, + 12, 124, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 118, 119, 120, 125, 126, 127 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -762,25 +766,25 @@ static const yytype_int8 yydefgoto[] = #define YYPACT_NINF -13 static const yytype_int8 yypact[] = { - -13, 56, -13, -13, -13, -13, -13, -13, -13, -13, - -12, 20, 19, 16, 17, 18, 23, 24, 25, 49, - 52, 53, 54, 58, 59, 60, 61, 62, 63, 64, + -13, 57, -13, -13, -13, -13, -13, -13, -13, -13, + -12, 21, 20, 16, 17, 18, 19, 23, 24, 25, + 50, 53, 54, 55, 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, - 86, 87, 88, 89, 90, 92, 93, 94, 95, 96, - 97, 98, -13, -13, -13, -13, -13, -13, -13, -13, + 85, 87, 88, 89, 90, 91, 93, 94, 95, 96, + 97, 98, 99, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, 99, 100, 101, -13, -13, -13, -13, 102, - 103, 104, -13, -13, -13, -13, -13, -13, -13, -13, + -13, -13, -13, -13, 100, 101, 102, -13, -13, -13, + -13, 103, 104, 105, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13 + -13, -13, -13, -13 }; /* YYPGOTO[NTERM-NUM]. */ @@ -792,7 +796,7 @@ static const yytype_int8 yypgoto[] = -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, -13, -13, -13, -13, -13 + -13, -13, -13, -13, -13, -13, -13, -13 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -804,57 +808,57 @@ static const yytype_uint8 yytable[] = { 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 126, 127, 128, 0, - 39, 40, 41, 129, 130, 131, 42, 43, 44, 45, + 33, 34, 35, 36, 37, 38, 128, 129, 130, 131, + 39, 40, 41, 132, 133, 134, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 2, 119, 112, 132, - 113, 114, 133, 134, 135, 120, 121, 3, 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, 4, 163, 164, 165, 166, - 167, 5, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180 + 56, 57, 58, 59, 60, 61, 62, 2, 121, 114, + 135, 115, 116, 136, 137, 138, 122, 123, 3, 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, 4, 166, 167, 168, + 169, 170, 5, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183 }; -static const yytype_int8 yycheck[] = +static const yytype_uint8 yycheck[] = { 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 10, 10, 10, -1, + 32, 33, 34, 35, 36, 37, 10, 10, 10, 10, 42, 43, 44, 10, 10, 10, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 0, 38, 38, 10, - 40, 41, 10, 10, 10, 46, 47, 11, 10, 10, + 62, 63, 64, 65, 66, 67, 68, 0, 38, 38, + 10, 40, 41, 10, 10, 10, 46, 47, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 39, 10, 10, 10, 10, - 10, 45, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10, 39, 10, 10, 10, + 10, 10, 45, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 69, 0, 11, 39, 45, 70, 71, 74, 77, - 72, 75, 78, 12, 13, 14, 15, 16, 17, 18, + 0, 70, 0, 11, 39, 45, 71, 72, 75, 78, + 73, 76, 79, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 42, 43, 44, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 73, 80, 81, 82, 83, 84, 85, 86, + 66, 67, 68, 74, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 38, 40, 41, 76, 129, 130, 131, 38, - 46, 47, 79, 132, 133, 134, 10, 10, 10, 10, + 127, 128, 129, 130, 38, 40, 41, 77, 131, 132, + 133, 38, 46, 47, 80, 134, 135, 136, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 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) @@ -1669,14 +1673,14 @@ yyreduce: switch (yyn) { case 7: -#line 97 "util/configparser.y" +#line 98 "util/configparser.y" { OUTYY(("\nP(server:)\n")); } break; - case 59: -#line 126 "util/configparser.y" + case 60: +#line 127 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -1689,8 +1693,8 @@ yyreduce: } break; - case 65: -#line 142 "util/configparser.y" + case 66: +#line 143 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -1703,8 +1707,8 @@ yyreduce: } break; - case 71: -#line 158 "util/configparser.y" + case 72: +#line 159 "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) @@ -1714,8 +1718,8 @@ yyreduce: } break; - case 72: -#line 167 "util/configparser.y" + case 73: +#line 168 "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) @@ -1725,8 +1729,8 @@ yyreduce: } break; - case 73: -#line 176 "util/configparser.y" + case 74: +#line 177 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1736,8 +1740,8 @@ yyreduce: } break; - case 74: -#line 185 "util/configparser.y" + case 75: +#line 186 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -1751,8 +1755,25 @@ yyreduce: } break; - case 75: -#line 198 "util/configparser.y" + case 76: +#line 199 "util/configparser.y" + { + OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); + if(cfg_parser->cfg->num_out_ifs == 0) + cfg_parser->cfg->out_ifs = calloc(1, sizeof(char*)); + else cfg_parser->cfg->out_ifs = realloc( + cfg_parser->cfg->out_ifs, + (cfg_parser->cfg->num_out_ifs+1)*sizeof(char*)); + if(!cfg_parser->cfg->out_ifs) + yyerror("out of memory"); + else + cfg_parser->cfg->out_ifs[ + cfg_parser->cfg->num_out_ifs++] = (yyvsp[(2) - (2)].str); + } + break; + + case 77: +#line 214 "util/configparser.y" { OUTYY(("P(server_outgoing_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1762,8 +1783,8 @@ yyreduce: } break; - case 76: -#line 207 "util/configparser.y" + case 78: +#line 223 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1773,8 +1794,8 @@ yyreduce: } break; - case 77: -#line 216 "util/configparser.y" + case 79: +#line 232 "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) @@ -1784,8 +1805,8 @@ yyreduce: } break; - case 78: -#line 225 "util/configparser.y" + case 80: +#line 241 "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) @@ -1795,8 +1816,8 @@ yyreduce: } break; - case 79: -#line 234 "util/configparser.y" + case 81: +#line 250 "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) @@ -1806,8 +1827,8 @@ yyreduce: } break; - case 80: -#line 243 "util/configparser.y" + case 82: +#line 259 "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) @@ -1817,8 +1838,8 @@ yyreduce: } break; - case 81: -#line 252 "util/configparser.y" + case 83: +#line 268 "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) @@ -1828,8 +1849,8 @@ yyreduce: } break; - case 82: -#line 261 "util/configparser.y" + case 84: +#line 277 "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) @@ -1839,8 +1860,8 @@ yyreduce: } break; - case 83: -#line 270 "util/configparser.y" + case 85: +#line 286 "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) @@ -1855,8 +1876,8 @@ yyreduce: } break; - case 84: -#line 284 "util/configparser.y" + case 86: +#line 300 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -1864,8 +1885,8 @@ yyreduce: } break; - case 85: -#line 291 "util/configparser.y" + case 87: +#line 307 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -1873,8 +1894,8 @@ yyreduce: } break; - case 86: -#line 298 "util/configparser.y" + case 88: +#line 314 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -1882,8 +1903,8 @@ yyreduce: } break; - case 87: -#line 305 "util/configparser.y" + case 89: +#line 321 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -1892,8 +1913,8 @@ yyreduce: } break; - case 88: -#line 313 "util/configparser.y" + case 90: +#line 329 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -1901,8 +1922,8 @@ yyreduce: } break; - case 89: -#line 320 "util/configparser.y" + case 91: +#line 336 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -1911,8 +1932,8 @@ yyreduce: } break; - case 90: -#line 328 "util/configparser.y" + case 92: +#line 344 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -1921,8 +1942,8 @@ yyreduce: } break; - case 91: -#line 336 "util/configparser.y" + case 93: +#line 352 "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))) @@ -1930,8 +1951,8 @@ yyreduce: } break; - case 92: -#line 343 "util/configparser.y" + case 94: +#line 359 "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) @@ -1941,8 +1962,8 @@ yyreduce: } break; - case 93: -#line 352 "util/configparser.y" + case 95: +#line 368 "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) @@ -1952,8 +1973,8 @@ yyreduce: } break; - case 94: -#line 361 "util/configparser.y" + case 96: +#line 377 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -1961,8 +1982,8 @@ yyreduce: } break; - case 95: -#line 368 "util/configparser.y" + case 97: +#line 384 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -1970,8 +1991,8 @@ yyreduce: } break; - case 96: -#line 375 "util/configparser.y" + case 98: +#line 391 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1983,8 +2004,8 @@ yyreduce: } break; - case 97: -#line 386 "util/configparser.y" + case 99: +#line 402 "util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1994,8 +2015,8 @@ yyreduce: } break; - case 98: -#line 395 "util/configparser.y" + case 100: +#line 411 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2009,8 +2030,8 @@ yyreduce: } break; - case 99: -#line 408 "util/configparser.y" + case 101: +#line 424 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2020,8 +2041,8 @@ yyreduce: } break; - case 100: -#line 417 "util/configparser.y" + case 102: +#line 433 "util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2031,8 +2052,8 @@ yyreduce: } break; - case 101: -#line 426 "util/configparser.y" + case 103: +#line 442 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2046,8 +2067,8 @@ yyreduce: } break; - case 102: -#line 439 "util/configparser.y" + case 104: +#line 455 "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) @@ -2057,8 +2078,8 @@ yyreduce: } break; - case 103: -#line 448 "util/configparser.y" + case 105: +#line 464 "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) @@ -2068,8 +2089,8 @@ yyreduce: } break; - case 104: -#line 457 "util/configparser.y" + case 106: +#line 473 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2079,8 +2100,8 @@ yyreduce: } break; - case 105: -#line 466 "util/configparser.y" + case 107: +#line 482 "util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2090,8 +2111,8 @@ yyreduce: } break; - case 106: -#line 475 "util/configparser.y" + case 108: +#line 491 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2105,8 +2126,8 @@ yyreduce: } break; - case 107: -#line 488 "util/configparser.y" + case 109: +#line 504 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2114,8 +2135,8 @@ yyreduce: } break; - case 108: -#line 495 "util/configparser.y" + case 110: +#line 511 "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) @@ -2126,8 +2147,8 @@ yyreduce: } break; - case 109: -#line 505 "util/configparser.y" + case 111: +#line 521 "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) @@ -2138,8 +2159,8 @@ yyreduce: } break; - case 110: -#line 515 "util/configparser.y" + case 112: +#line 531 "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) @@ -2150,8 +2171,8 @@ yyreduce: } break; - case 111: -#line 525 "util/configparser.y" + case 113: +#line 541 "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))) @@ -2159,8 +2180,8 @@ yyreduce: } break; - case 112: -#line 532 "util/configparser.y" + case 114: +#line 548 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -2168,8 +2189,8 @@ yyreduce: } break; - case 113: -#line 539 "util/configparser.y" + case 115: +#line 555 "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) { @@ -2188,8 +2209,8 @@ yyreduce: } break; - case 114: -#line 557 "util/configparser.y" + case 116: +#line 573 "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) @@ -2199,8 +2220,8 @@ yyreduce: } break; - case 115: -#line 566 "util/configparser.y" + case 117: +#line 582 "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) @@ -2211,8 +2232,8 @@ yyreduce: } break; - case 116: -#line 576 "util/configparser.y" + case 118: +#line 592 "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) @@ -2223,8 +2244,8 @@ yyreduce: } break; - case 117: -#line 586 "util/configparser.y" + case 119: +#line 602 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -2232,8 +2253,8 @@ yyreduce: } break; - case 118: -#line 593 "util/configparser.y" + case 120: +#line 609 "util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2243,8 +2264,8 @@ yyreduce: } break; - case 119: -#line 602 "util/configparser.y" + case 121: +#line 618 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2258,8 +2279,8 @@ yyreduce: } break; - case 120: -#line 615 "util/configparser.y" + case 122: +#line 631 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->stubs->name); @@ -2267,8 +2288,8 @@ yyreduce: } break; - case 121: -#line 622 "util/configparser.y" + case 123: +#line 638 "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))) @@ -2276,8 +2297,8 @@ yyreduce: } break; - case 122: -#line 629 "util/configparser.y" + case 124: +#line 645 "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))) @@ -2285,8 +2306,8 @@ yyreduce: } break; - case 123: -#line 636 "util/configparser.y" + case 125: +#line 652 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->forwards->name); @@ -2294,8 +2315,8 @@ yyreduce: } break; - case 124: -#line 643 "util/configparser.y" + case 126: +#line 659 "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))) @@ -2303,8 +2324,8 @@ yyreduce: } break; - case 125: -#line 650 "util/configparser.y" + case 127: +#line 666 "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))) @@ -2314,7 +2335,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2318 "util/configparser.c" +#line 2339 "util/configparser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2528,7 +2549,7 @@ yyreturn: } -#line 656 "util/configparser.y" +#line 672 "util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 2664bfd68..729cba139 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -103,7 +103,8 @@ VAR_KEY_CACHE_SLABS = 319, VAR_TRUSTED_KEYS_FILE = 320, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 321, - VAR_USE_SYSLOG = 322 + VAR_USE_SYSLOG = 322, + VAR_OUTGOING_INTERFACE = 323 }; #endif /* Tokens. */ @@ -172,6 +173,7 @@ #define VAR_TRUSTED_KEYS_FILE 320 #define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 321 #define VAR_USE_SYSLOG 322 +#define VAR_OUTGOING_INTERFACE 323 @@ -183,7 +185,7 @@ typedef union YYSTYPE char* str; } /* Line 1489 of yacc.c. */ -#line 187 "util/configparser.h" +#line 189 "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 09da835fa..bc3bb1084 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -84,7 +84,8 @@ extern struct config_parser_state* cfg_parser; %token VAR_BOGUS_TTL VAR_VAL_CLEAN_ADDITIONAL VAR_VAL_PERMISSIVE_MODE %token VAR_INCOMING_NUM_TCP VAR_MSG_BUFFER_SIZE VAR_KEY_CACHE_SIZE %token VAR_KEY_CACHE_SLABS VAR_TRUSTED_KEYS_FILE -%token VAR_VAL_NSEC3_KEYSIZE_ITERATIONS VAR_USE_SYSLOG +%token VAR_VAL_NSEC3_KEYSIZE_ITERATIONS VAR_USE_SYSLOG +%token VAR_OUTGOING_INTERFACE %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -120,7 +121,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_incoming_num_tcp | server_msg_buffer_size | server_key_cache_size | server_key_cache_slabs | server_trusted_keys_file | server_val_nsec3_keysize_iterations | - server_use_syslog + server_use_syslog | server_outgoing_interface ; stubstart: VAR_STUB_ZONE { @@ -194,6 +195,21 @@ server_interface: VAR_INTERFACE STRING cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = $2; } ; +server_outgoing_interface: VAR_OUTGOING_INTERFACE STRING + { + OUTYY(("P(server_outgoing_interface:%s)\n", $2)); + if(cfg_parser->cfg->num_out_ifs == 0) + cfg_parser->cfg->out_ifs = calloc(1, sizeof(char*)); + else cfg_parser->cfg->out_ifs = realloc( + cfg_parser->cfg->out_ifs, + (cfg_parser->cfg->num_out_ifs+1)*sizeof(char*)); + if(!cfg_parser->cfg->out_ifs) + yyerror("out of memory"); + else + cfg_parser->cfg->out_ifs[ + cfg_parser->cfg->num_out_ifs++] = $2; + } + ; server_outgoing_port: VAR_OUTGOING_PORT STRING { OUTYY(("P(server_outgoing_port:%s)\n", $2));