doxygen, lex, yacc.

git-svn-id: file:///svn/unbound/trunk@1525 be551aaa-1e26-0410-a405-d3ace91eadb9

doc/Changelog

@@ -1,3 +1,6 @@
+13 March 2009: Wouter
+	- doxygen and lex/yacc on linux.
+
 12 March 2009: Wouter
 	- log to App.logs on windows prints executable identity.
 	- fixup tests.

util/configlexer.c

@@ -54,6 +54,7 @@ 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 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -1380,7 +1379,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 1383 "<stdout>"
+#line 1382 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -1472,7 +1471,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1483,7 +1482,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1567,7 +1566,7 @@ YY_DECL
     
 #line 120 "util/configlexer.lex"
 
-#line 1570 "<stdout>"
+#line 1569 "<stdout>"
 
 	if ( !(yy_init) )
 		{
@@ -2320,7 +2319,7 @@ YY_RULE_SETUP
 #line 311 "util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 2323 "<stdout>"
+#line 2322 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{

util/configparser.h

@@ -1,103 +1,262 @@
-#define SPACE 257
+/* A Bison parser, made by GNU Bison 2.3.  */
-#define LETTER 258
+
-#define NEWLINE 259
+/* Skeleton interface for Bison's Yacc-like parsers in C
-#define COMMENT 260
+
-#define COLON 261
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-#define ANY 262
+   Free Software Foundation, Inc.
-#define ZONESTR 263
+
-#define STRING 264
+   This program is free software; you can redistribute it and/or modify
-#define VAR_SERVER 265
+   it under the terms of the GNU General Public License as published by
-#define VAR_VERBOSITY 266
+   the Free Software Foundation; either version 2, or (at your option)
-#define VAR_NUM_THREADS 267
+   any later version.
-#define VAR_PORT 268
+
-#define VAR_OUTGOING_RANGE 269
+   This program is distributed in the hope that it will be useful,
-#define VAR_INTERFACE 270
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#define VAR_DO_IP4 271
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#define VAR_DO_IP6 272
+   GNU General Public License for more details.
-#define VAR_DO_UDP 273
+
-#define VAR_DO_TCP 274
+   You should have received a copy of the GNU General Public License
-#define VAR_CHROOT 275
+   along with this program; if not, write to the Free Software
-#define VAR_USERNAME 276
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#define VAR_DIRECTORY 277
+   Boston, MA 02110-1301, USA.  */
-#define VAR_LOGFILE 278
+
-#define VAR_PIDFILE 279
+/* As a special exception, you may create a larger work that contains
-#define VAR_MSG_CACHE_SIZE 280
+   part or all of the Bison parser skeleton and distribute that work
-#define VAR_MSG_CACHE_SLABS 281
+   under terms of your choice, so long as that work isn't itself a
-#define VAR_NUM_QUERIES_PER_THREAD 282
+   parser generator using the skeleton or a modified version thereof
-#define VAR_RRSET_CACHE_SIZE 283
+   as a parser skeleton.  Alternatively, if you modify or redistribute
-#define VAR_RRSET_CACHE_SLABS 284
+   the parser skeleton itself, you may (at your option) remove this
-#define VAR_OUTGOING_NUM_TCP 285
+   special exception, which will cause the skeleton and the resulting
-#define VAR_INFRA_HOST_TTL 286
+   Bison output files to be licensed under the GNU General Public
-#define VAR_INFRA_LAME_TTL 287
+   License without this special exception.
-#define VAR_INFRA_CACHE_SLABS 288
+
-#define VAR_INFRA_CACHE_NUMHOSTS 289
+   This special exception was added by the Free Software Foundation in
-#define VAR_INFRA_CACHE_LAME_SIZE 290
+   version 2.2 of Bison.  */
-#define VAR_NAME 291
+
-#define VAR_STUB_ZONE 292
+/* Tokens.  */
-#define VAR_STUB_HOST 293
+#ifndef YYTOKENTYPE
-#define VAR_STUB_ADDR 294
+# define YYTOKENTYPE
-#define VAR_TARGET_FETCH_POLICY 295
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
-#define VAR_HARDEN_SHORT_BUFSIZE 296
+      know about them.  */
-#define VAR_HARDEN_LARGE_QUERIES 297
+   enum yytokentype {
-#define VAR_FORWARD_ZONE 298
+     SPACE = 258,
-#define VAR_FORWARD_HOST 299
+     LETTER = 259,
-#define VAR_FORWARD_ADDR 300
+     NEWLINE = 260,
-#define VAR_DO_NOT_QUERY_ADDRESS 301
+     COMMENT = 261,
-#define VAR_HIDE_IDENTITY 302
+     COLON = 262,
-#define VAR_HIDE_VERSION 303
+     ANY = 263,
-#define VAR_IDENTITY 304
+     ZONESTR = 264,
-#define VAR_VERSION 305
+     STRING = 265,
-#define VAR_HARDEN_GLUE 306
+     VAR_SERVER = 266,
-#define VAR_MODULE_CONF 307
+     VAR_VERBOSITY = 267,
-#define VAR_TRUST_ANCHOR_FILE 308
+     VAR_NUM_THREADS = 268,
-#define VAR_TRUST_ANCHOR 309
+     VAR_PORT = 269,
-#define VAR_VAL_OVERRIDE_DATE 310
+     VAR_OUTGOING_RANGE = 270,
-#define VAR_BOGUS_TTL 311
+     VAR_INTERFACE = 271,
-#define VAR_VAL_CLEAN_ADDITIONAL 312
+     VAR_DO_IP4 = 272,
-#define VAR_VAL_PERMISSIVE_MODE 313
+     VAR_DO_IP6 = 273,
-#define VAR_INCOMING_NUM_TCP 314
+     VAR_DO_UDP = 274,
-#define VAR_MSG_BUFFER_SIZE 315
+     VAR_DO_TCP = 275,
-#define VAR_KEY_CACHE_SIZE 316
+     VAR_CHROOT = 276,
-#define VAR_KEY_CACHE_SLABS 317
+     VAR_USERNAME = 277,
-#define VAR_TRUSTED_KEYS_FILE 318
+     VAR_DIRECTORY = 278,
-#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 319
+     VAR_LOGFILE = 279,
-#define VAR_USE_SYSLOG 320
+     VAR_PIDFILE = 280,
-#define VAR_OUTGOING_INTERFACE 321
+     VAR_MSG_CACHE_SIZE = 281,
-#define VAR_ROOT_HINTS 322
+     VAR_MSG_CACHE_SLABS = 282,
-#define VAR_DO_NOT_QUERY_LOCALHOST 323
+     VAR_NUM_QUERIES_PER_THREAD = 283,
-#define VAR_CACHE_MAX_TTL 324
+     VAR_RRSET_CACHE_SIZE = 284,
-#define VAR_HARDEN_DNNSEC_STRIPPED 325
+     VAR_RRSET_CACHE_SLABS = 285,
-#define VAR_ACCESS_CONTROL 326
+     VAR_OUTGOING_NUM_TCP = 286,
-#define VAR_LOCAL_ZONE 327
+     VAR_INFRA_HOST_TTL = 287,
-#define VAR_LOCAL_DATA 328
+     VAR_INFRA_LAME_TTL = 288,
-#define VAR_INTERFACE_AUTOMATIC 329
+     VAR_INFRA_CACHE_SLABS = 289,
-#define VAR_STATISTICS_INTERVAL 330
+     VAR_INFRA_CACHE_NUMHOSTS = 290,
-#define VAR_DO_DAEMONIZE 331
+     VAR_INFRA_CACHE_LAME_SIZE = 291,
-#define VAR_USE_CAPS_FOR_ID 332
+     VAR_NAME = 292,
-#define VAR_STATISTICS_CUMULATIVE 333
+     VAR_STUB_ZONE = 293,
-#define VAR_OUTGOING_PORT_PERMIT 334
+     VAR_STUB_HOST = 294,
-#define VAR_OUTGOING_PORT_AVOID 335
+     VAR_STUB_ADDR = 295,
-#define VAR_DLV_ANCHOR_FILE 336
+     VAR_TARGET_FETCH_POLICY = 296,
-#define VAR_DLV_ANCHOR 337
+     VAR_HARDEN_SHORT_BUFSIZE = 297,
-#define VAR_NEG_CACHE_SIZE 338
+     VAR_HARDEN_LARGE_QUERIES = 298,
-#define VAR_HARDEN_REFERRAL_PATH 339
+     VAR_FORWARD_ZONE = 299,
-#define VAR_PRIVATE_ADDRESS 340
+     VAR_FORWARD_HOST = 300,
-#define VAR_PRIVATE_DOMAIN 341
+     VAR_FORWARD_ADDR = 301,
-#define VAR_REMOTE_CONTROL 342
+     VAR_DO_NOT_QUERY_ADDRESS = 302,
-#define VAR_CONTROL_ENABLE 343
+     VAR_HIDE_IDENTITY = 303,
-#define VAR_CONTROL_INTERFACE 344
+     VAR_HIDE_VERSION = 304,
-#define VAR_CONTROL_PORT 345
+     VAR_IDENTITY = 305,
-#define VAR_SERVER_KEY_FILE 346
+     VAR_VERSION = 306,
-#define VAR_SERVER_CERT_FILE 347
+     VAR_HARDEN_GLUE = 307,
-#define VAR_CONTROL_KEY_FILE 348
+     VAR_MODULE_CONF = 308,
-#define VAR_CONTROL_CERT_FILE 349
+     VAR_TRUST_ANCHOR_FILE = 309,
-#define VAR_EXTENDED_STATISTICS 350
+     VAR_TRUST_ANCHOR = 310,
-#define VAR_LOCAL_DATA_PTR 351
+     VAR_VAL_OVERRIDE_DATE = 311,
-#define VAR_JOSTLE_TIMEOUT 352
+     VAR_BOGUS_TTL = 312,
-#define VAR_STUB_PRIME 353
+     VAR_VAL_CLEAN_ADDITIONAL = 313,
-#define VAR_UNWANTED_REPLY_THRESHOLD 354
+     VAR_VAL_PERMISSIVE_MODE = 314,
-#define VAR_LOG_TIME_ASCII 355
+     VAR_INCOMING_NUM_TCP = 315,
-typedef union {
+     VAR_MSG_BUFFER_SIZE = 316,
+     VAR_KEY_CACHE_SIZE = 317,
+     VAR_KEY_CACHE_SLABS = 318,
+     VAR_TRUSTED_KEYS_FILE = 319,
+     VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 320,
+     VAR_USE_SYSLOG = 321,
+     VAR_OUTGOING_INTERFACE = 322,
+     VAR_ROOT_HINTS = 323,
+     VAR_DO_NOT_QUERY_LOCALHOST = 324,
+     VAR_CACHE_MAX_TTL = 325,
+     VAR_HARDEN_DNNSEC_STRIPPED = 326,
+     VAR_ACCESS_CONTROL = 327,
+     VAR_LOCAL_ZONE = 328,
+     VAR_LOCAL_DATA = 329,
+     VAR_INTERFACE_AUTOMATIC = 330,
+     VAR_STATISTICS_INTERVAL = 331,
+     VAR_DO_DAEMONIZE = 332,
+     VAR_USE_CAPS_FOR_ID = 333,
+     VAR_STATISTICS_CUMULATIVE = 334,
+     VAR_OUTGOING_PORT_PERMIT = 335,
+     VAR_OUTGOING_PORT_AVOID = 336,
+     VAR_DLV_ANCHOR_FILE = 337,
+     VAR_DLV_ANCHOR = 338,
+     VAR_NEG_CACHE_SIZE = 339,
+     VAR_HARDEN_REFERRAL_PATH = 340,
+     VAR_PRIVATE_ADDRESS = 341,
+     VAR_PRIVATE_DOMAIN = 342,
+     VAR_REMOTE_CONTROL = 343,
+     VAR_CONTROL_ENABLE = 344,
+     VAR_CONTROL_INTERFACE = 345,
+     VAR_CONTROL_PORT = 346,
+     VAR_SERVER_KEY_FILE = 347,
+     VAR_SERVER_CERT_FILE = 348,
+     VAR_CONTROL_KEY_FILE = 349,
+     VAR_CONTROL_CERT_FILE = 350,
+     VAR_EXTENDED_STATISTICS = 351,
+     VAR_LOCAL_DATA_PTR = 352,
+     VAR_JOSTLE_TIMEOUT = 353,
+     VAR_STUB_PRIME = 354,
+     VAR_UNWANTED_REPLY_THRESHOLD = 355,
+     VAR_LOG_TIME_ASCII = 356
+   };
+#endif
+/* Tokens.  */
+#define SPACE 258
+#define LETTER 259
+#define NEWLINE 260
+#define COMMENT 261
+#define COLON 262
+#define ANY 263
+#define ZONESTR 264
+#define STRING 265
+#define VAR_SERVER 266
+#define VAR_VERBOSITY 267
+#define VAR_NUM_THREADS 268
+#define VAR_PORT 269
+#define VAR_OUTGOING_RANGE 270
+#define VAR_INTERFACE 271
+#define VAR_DO_IP4 272
+#define VAR_DO_IP6 273
+#define VAR_DO_UDP 274
+#define VAR_DO_TCP 275
+#define VAR_CHROOT 276
+#define VAR_USERNAME 277
+#define VAR_DIRECTORY 278
+#define VAR_LOGFILE 279
+#define VAR_PIDFILE 280
+#define VAR_MSG_CACHE_SIZE 281
+#define VAR_MSG_CACHE_SLABS 282
+#define VAR_NUM_QUERIES_PER_THREAD 283
+#define VAR_RRSET_CACHE_SIZE 284
+#define VAR_RRSET_CACHE_SLABS 285
+#define VAR_OUTGOING_NUM_TCP 286
+#define VAR_INFRA_HOST_TTL 287
+#define VAR_INFRA_LAME_TTL 288
+#define VAR_INFRA_CACHE_SLABS 289
+#define VAR_INFRA_CACHE_NUMHOSTS 290
+#define VAR_INFRA_CACHE_LAME_SIZE 291
+#define VAR_NAME 292
+#define VAR_STUB_ZONE 293
+#define VAR_STUB_HOST 294
+#define VAR_STUB_ADDR 295
+#define VAR_TARGET_FETCH_POLICY 296
+#define VAR_HARDEN_SHORT_BUFSIZE 297
+#define VAR_HARDEN_LARGE_QUERIES 298
+#define VAR_FORWARD_ZONE 299
+#define VAR_FORWARD_HOST 300
+#define VAR_FORWARD_ADDR 301
+#define VAR_DO_NOT_QUERY_ADDRESS 302
+#define VAR_HIDE_IDENTITY 303
+#define VAR_HIDE_VERSION 304
+#define VAR_IDENTITY 305
+#define VAR_VERSION 306
+#define VAR_HARDEN_GLUE 307
+#define VAR_MODULE_CONF 308
+#define VAR_TRUST_ANCHOR_FILE 309
+#define VAR_TRUST_ANCHOR 310
+#define VAR_VAL_OVERRIDE_DATE 311
+#define VAR_BOGUS_TTL 312
+#define VAR_VAL_CLEAN_ADDITIONAL 313
+#define VAR_VAL_PERMISSIVE_MODE 314
+#define VAR_INCOMING_NUM_TCP 315
+#define VAR_MSG_BUFFER_SIZE 316
+#define VAR_KEY_CACHE_SIZE 317
+#define VAR_KEY_CACHE_SLABS 318
+#define VAR_TRUSTED_KEYS_FILE 319
+#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 320
+#define VAR_USE_SYSLOG 321
+#define VAR_OUTGOING_INTERFACE 322
+#define VAR_ROOT_HINTS 323
+#define VAR_DO_NOT_QUERY_LOCALHOST 324
+#define VAR_CACHE_MAX_TTL 325
+#define VAR_HARDEN_DNNSEC_STRIPPED 326
+#define VAR_ACCESS_CONTROL 327
+#define VAR_LOCAL_ZONE 328
+#define VAR_LOCAL_DATA 329
+#define VAR_INTERFACE_AUTOMATIC 330
+#define VAR_STATISTICS_INTERVAL 331
+#define VAR_DO_DAEMONIZE 332
+#define VAR_USE_CAPS_FOR_ID 333
+#define VAR_STATISTICS_CUMULATIVE 334
+#define VAR_OUTGOING_PORT_PERMIT 335
+#define VAR_OUTGOING_PORT_AVOID 336
+#define VAR_DLV_ANCHOR_FILE 337
+#define VAR_DLV_ANCHOR 338
+#define VAR_NEG_CACHE_SIZE 339
+#define VAR_HARDEN_REFERRAL_PATH 340
+#define VAR_PRIVATE_ADDRESS 341
+#define VAR_PRIVATE_DOMAIN 342
+#define VAR_REMOTE_CONTROL 343
+#define VAR_CONTROL_ENABLE 344
+#define VAR_CONTROL_INTERFACE 345
+#define VAR_CONTROL_PORT 346
+#define VAR_SERVER_KEY_FILE 347
+#define VAR_SERVER_CERT_FILE 348
+#define VAR_CONTROL_KEY_FILE 349
+#define VAR_CONTROL_CERT_FILE 350
+#define VAR_EXTENDED_STATISTICS 351
+#define VAR_LOCAL_DATA_PTR 352
+#define VAR_JOSTLE_TIMEOUT 353
+#define VAR_STUB_PRIME 354
+#define VAR_UNWANTED_REPLY_THRESHOLD 355
+#define VAR_LOG_TIME_ASCII 356
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 64 "util/configparser.y"
+{
 	char*	str;
-} YYSTYPE;
+}
+/* Line 1489 of yacc.c.  */
+#line 255 "util/configparser.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
 extern YYSTYPE yylval;
+

winrc/win_svc.c

@@ -480,6 +480,7 @@ win_do_cron(void* ATTR_UNUSED(arg))
 	return NULL;
 }
 
+/** Set the timer for cron for the next wake up */
 static void
 set_cron_timer()
 {