Add max-query-restarts to grammar and lexer

diff --git a/util/configlexer.lex b/util/configlexer.lex
index b52ddf81ef91486cb4bdafbbdcedc3bae059884d..17d281faa778793e5d969bf3fec48cf6353bbe56 100644 (file)
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -517,6 +517,7 @@ pad-responses{COLON}                { YDVAR(1, VAR_PAD_RESPONSES) }
 pad-responses-block-size{COLON}        { YDVAR(1, VAR_PAD_RESPONSES_BLOCK_SIZE) }
 pad-queries{COLON}             { YDVAR(1, VAR_PAD_QUERIES) }
 pad-queries-block-size{COLON}  { YDVAR(1, VAR_PAD_QUERIES_BLOCK_SIZE) }
+max-query-restarts{COLON}      { YDVAR(1, VAR_MAX_QUERY_RESTARTS) }
 ipsecmod-enabled{COLON}                { YDVAR(1, VAR_IPSECMOD_ENABLED) }
 ipsecmod-ignore-bogus{COLON}   { YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 ipsecmod-hook{COLON}           { YDVAR(1, VAR_IPSECMOD_HOOK) }

diff --git a/util/configparser.y b/util/configparser.y
index 10f5ac1c48226f15d35690e29ffd6df986c9254e..95426dd9cabdf9b63ba5020102e3a6c0d200d316 100644 (file)
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -164,6 +164,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_DNSCRYPT_NONCE_CACHE_SLABS
 %token VAR_PAD_RESPONSES VAR_PAD_RESPONSES_BLOCK_SIZE
 %token VAR_PAD_QUERIES VAR_PAD_QUERIES_BLOCK_SIZE
+%token VAR_MAX_QUERY_RESTARTS
 %token VAR_IPSECMOD_ENABLED VAR_IPSECMOD_HOOK VAR_IPSECMOD_IGNORE_BOGUS
 %token VAR_IPSECMOD_MAX_TTL VAR_IPSECMOD_WHITELIST VAR_IPSECMOD_STRICT
 %token VAR_CACHEDB VAR_CACHEDB_BACKEND VAR_CACHEDB_SECRETSEED
@@ -280,6 +281,7 @@ content_server: server_num_threads | server_verbosity | server_port |
        server_qname_minimisation_strict |
        server_pad_responses | server_pad_responses_block_size |
        server_pad_queries | server_pad_queries_block_size |
+       server_max_query_restarts |
        server_serve_expired |
        server_serve_expired_ttl | server_serve_expired_ttl_reset |
        server_serve_expired_reply_ttl | server_serve_expired_client_timeout |
@@ -2501,6 +2503,15 @@ server_pad_queries_block_size: VAR_PAD_QUERIES_BLOCK_SIZE STRING_ARG
                free($2);
        }
        ;
+server_max_query_restarts: VAR_MAX_QUERY_RESTARTS STRING_ARG
+       {
+               OUTYY(("P(server_max_query_restarts:%s)\n", $2));
+               if(atoi($2) == 0)
+                       yyerror("number expected");
+               else cfg_parser->cfg->max_query_restarts = atoi($2);
+               free($2);
+       }
+       ;
 server_ipsecmod_enabled: VAR_IPSECMOD_ENABLED STRING_ARG
        {
        #ifdef USE_IPSECMOD