Mildly working build process with argument parsing

This commit is contained in:
David Adrian 2013-09-19 17:51:49 -04:00
parent 8607c2574b
commit 8db9f260f2
17 changed files with 3578 additions and 613 deletions

44
lib/xalloc.c Normal file
View File

@ -0,0 +1,44 @@
#include "xalloc.h"
#include "../lib/logger.h"
#include <stdlib.h>
void die() __attribute__((noreturn));
void* xcalloc(size_t count, size_t size)
{
void* res = calloc(count, size);
if (res == NULL) {
die();
}
return res;
}
void xfree(void *ptr)
{
free(ptr);
}
void* xmalloc(size_t size)
{
void* res = malloc(size);
if (res == NULL) {
die();
}
return res;
}
void* xrealloc(void *ptr, size_t size)
{
void* res = realloc(ptr, size);
if (res == NULL) {
die();
}
return res;
}
void die()
{
log_fatal("zmap", "Out of memory");
}

14
lib/xalloc.h Normal file
View File

@ -0,0 +1,14 @@
#ifndef ZMAP_ALLOC_H
#define ZMAP_ALLOC_H
#include <stddef.h>
void* xcalloc(size_t count, size_t size);
void xfree(void *ptr);
void* xmalloc(size_t size);
void* xrealloc(void *ptr, size_t size);
#endif

View File

@ -1,8 +1,10 @@
#include "tree.h" #include "expression.h"
#include "../lib/xalloc.h"
node_t* alloc_node() node_t* alloc_node()
{ {
node_t *node = (node_t*) malloc(sizeof(node_t)); node_t *node = xmalloc(sizeof(node_t));
memset(node, 0, sizeof(node_t)); memset(node, 0, sizeof(node_t));
return node; return node;
} }
@ -40,6 +42,7 @@ node_t* make_int_node(int literal)
} }
int evaluate_expression(node_t *root) { int evaluate_expression(node_t *root) {
if (!root) return 0;
int result = 1; int result = 1;
return result; return result;
} }

25
src/filter.c Normal file
View File

@ -0,0 +1,25 @@
#include "filter.h"
#include "state.h"
#include "lexer.h"
#include "y.tab.h"
#include "../lib/logger.h"
extern int yyparse();
node_t *zfilter;
void parse_filter_string(char *filter)
{
YY_BUFFER_STATE buffer_state = yy_scan_string(filter);
int status = yyparse();
yy_delete_buffer(buffer_state);
if (status) {
// Error
log_fatal("zmap", "Unable to parse filter");
}
zconf.filter.expression = zfilter;
print_expression(zfilter);
printf("%s\n", "");
fflush(stdout);
return;
}

12
src/filter.h Normal file
View File

@ -0,0 +1,12 @@
#ifndef ZMAP_FILTER_H
#define ZMAP_FILTER_H
#include "expression.h"
struct output_filter {
node_t *expression;
};
void parse_filter_string(char *filter);
#endif /* ZMAP_FILTER_H */

1784
src/lexer.c Normal file

File diff suppressed because it is too large Load Diff

330
src/lexer.h Normal file
View File

@ -0,0 +1,330 @@
#ifndef yyHEADER_H
#define yyHEADER_H 1
#define yyIN_HEADER 1
#line 6 "lexer.h"
#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 35
#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 <stdio.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
/* end standard C headers. */
/* flex integer type definitions */
#ifndef FLEXINT_H
#define FLEXINT_H
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
#if defined (__STDC_VERSION__) && __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 <inttypes.h>
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;
/* 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
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const
#else
#define yyconst
#endif
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k.
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
* Ditto for the __ia64__ case accordingly.
*/
#define YY_BUF_SIZE 32768
#else
#define YY_BUF_SIZE 16384
#endif /* __ia64__ */
#endif
#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;
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
{
FILE *yy_input_file;
char *yy_ch_buf; /* input buffer */
char *yy_buf_pos; /* current position in input buffer */
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
yy_size_t yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
* delete it.
*/
int yy_is_our_buffer;
/* Whether this is an "interactive" input source; if so, and
* if we're using stdio for input, then we want to use getc()
* instead of fread(), to make sure we stop fetching input after
* each newline.
*/
int yy_is_interactive;
/* Whether we're considered to be at the beginning of a line.
* If so, '^' rules will be active on the next match, otherwise
* not.
*/
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;
};
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
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 );
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 );
void *yyalloc (yy_size_t );
void *yyrealloc (void *,yy_size_t );
void yyfree (void * );
/* Begin user sect3 */
extern int yylineno;
extern char *yytext;
#define yytext_ptr yytext
#ifdef YY_HEADER_EXPORT_START_CONDITIONS
#define INITIAL 0
#endif
#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 <unistd.h>
#endif
#ifndef YY_EXTRA_TYPE
#define YY_EXTRA_TYPE void *
#endif
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int yylex_destroy (void );
int yyget_debug (void );
void yyset_debug (int debug_flag );
YY_EXTRA_TYPE yyget_extra (void );
void yyset_extra (YY_EXTRA_TYPE user_defined );
FILE *yyget_in (void );
void yyset_in (FILE * in_str );
FILE *yyget_out (void );
void yyset_out (FILE * out_str );
int yyget_leng (void );
char *yyget_text (void );
int yyget_lineno (void );
void yyset_lineno (int line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
extern "C" int yywrap (void );
#else
extern int yywrap (void );
#endif
#endif
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int );
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * );
#endif
#ifndef YY_NO_INPUT
#endif
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k */
#define YY_READ_BUF_SIZE 16384
#else
#define YY_READ_BUF_SIZE 8192
#endif /* __ia64__ */
#endif
/* Number of entries by which start-condition stack grows. */
#ifndef YY_START_STACK_INCR
#define YY_START_STACK_INCR 25
#endif
/* Default declaration of generated scanner - a define so the user can
* easily add parameters.
*/
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
extern int yylex (void);
#define YY_DECL int yylex (void)
#endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached */
#undef YY_NEW_FILE
#undef YY_FLUSH_BUFFER
#undef yy_set_bol
#undef yy_new_buffer
#undef yy_set_interactive
#undef YY_DO_BEFORE_ACTION
#ifdef YY_DECL_IS_OURS
#undef YY_DECL_IS_OURS
#undef YY_DECL
#endif
#line 25 "lexer.l"
#line 329 "lexer.h"
#undef yyIN_HEADER
#endif /* yyHEADER_H */

View File

@ -1,8 +1,11 @@
%{ %{
#include <string.h> #include <string.h>
#include "zmap.tab.h" #include "y.tab.h"
%} %}
%option noinput
%option nounput
%% %%
[0-9]+ yylval.int_literal = atoi(yytext); return T_NUMBER; [0-9]+ yylval.int_literal = atoi(yytext); return T_NUMBER;
\n /* Ignore end of line */ \n /* Ignore end of line */

630
src/parser.c Normal file
View File

@ -0,0 +1,630 @@
#ifndef lint
static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93";
#endif
#define YYBYACC 1
#define YYMAJOR 1
#define YYMINOR 9
#define YYPATCH 20120115
#define YYEMPTY (-1)
#define yyclearin (yychar = YYEMPTY)
#define yyerrok (yyerrflag = 0)
#define YYRECOVERING() (yyerrflag != 0)
#define YYPREFIX "yy"
#define YYPURE 0
#line 2 "parser.y"
#include <stdio.h>
#include <string.h>
#include "expression.h"
#include "lexer.h"
#include "filter.h"
void yyerror(const char *str)
{
fprintf(stderr,"error: %s\n",str);
fprintf(stderr, "%s\n", "YOLO");
}
int yywrap()
{
return 1;
}
extern node_t *zfilter;
#line 23 "parser.y"
#ifdef YYSTYPE
#undef YYSTYPE_IS_DECLARED
#define YYSTYPE_IS_DECLARED 1
#endif
#ifndef YYSTYPE_IS_DECLARED
#define YYSTYPE_IS_DECLARED 1
typedef union {
int int_literal;
char *string_literal;
struct node *expr;
} YYSTYPE;
#endif /* !YYSTYPE_IS_DECLARED */
#line 52 "y.tab.c"
/* compatibility with bison */
#ifdef YYPARSE_PARAM
/* compatibility with FreeBSD */
# ifdef YYPARSE_PARAM_TYPE
# define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
# else
# define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
# endif
#else
# define YYPARSE_DECL() yyparse(void)
#endif
/* Parameters sent to lex. */
#ifdef YYLEX_PARAM
# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
# define YYLEX yylex(YYLEX_PARAM)
#else
# define YYLEX_DECL() yylex(void)
# define YYLEX yylex()
#endif
/* Parameters sent to yyerror. */
#ifndef YYERROR_DECL
#define YYERROR_DECL() yyerror(const char *s)
#endif
#ifndef YYERROR_CALL
#define YYERROR_CALL(msg) yyerror(msg)
#endif
extern int YYPARSE_DECL();
#define T_AND 257
#define T_OR 258
#define T_NUMBER 259
#define T_FIELD 260
#define T_NOT_EQ 261
#define T_GT_EQ 262
#define T_LT_EQ 263
#define YYERRCODE 256
static const short yylhs[] = { -1,
0, 4, 4, 4, 4, 1, 1, 2, 2, 2,
2, 2, 2, 3, 3,
};
static const short yylen[] = { 2,
1, 3, 3, 3, 1, 1, 1, 3, 3, 3,
3, 3, 3, 3, 3,
};
static const short yydefred[] = { 0,
0, 0, 0, 5, 6, 7, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 4, 11, 15, 12,
9, 10, 8, 14, 13, 3, 0,
};
static const short yydgoto[] = { 3,
4, 5, 6, 7,
};
static const short yysindex[] = { -40,
-40, -57, 0, 0, 0, 0, -250, -39, -249, -245,
-244, -243, -247, -242, -40, -40, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -248,
};
static const short yyrindex[] = { 0,
0, 0, 0, 0, 0, 0, 18, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1,
};
static const short yygindex[] = { 0,
0, 0, 0, 5,
};
#define YYTABLESIZE 259
static const short yytable[] = { 1,
2, 17, 12, 13, 11, 8, 15, 16, 15, 18,
19, 23, 24, 20, 21, 22, 25, 1, 0, 26,
27, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 2, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 9, 10, 14, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 15, 16, 2,
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, 2,
};
static const short yycheck[] = { 40,
0, 41, 60, 61, 62, 1, 257, 258, 257, 259,
260, 259, 260, 259, 259, 259, 259, 0, -1, 15,
16, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 41, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 261, 262, 263, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 257, 258, 260,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 258,
};
#define YYFINAL 3
#ifndef YYDEBUG
#define YYDEBUG 0
#endif
#define YYMAXTOKEN 263
#if YYDEBUG
static const char *yyname[] = {
"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,"'('","')'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'<'","'='","'>'",0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,"T_AND",
"T_OR","T_NUMBER","T_FIELD","T_NOT_EQ","T_GT_EQ","T_LT_EQ",
};
static const char *yyrule[] = {
"$accept : expression",
"expression : filter_expr",
"filter_expr : filter_expr T_OR filter_expr",
"filter_expr : filter_expr T_AND filter_expr",
"filter_expr : '(' filter_expr ')'",
"filter_expr : filter",
"filter : number_filter",
"filter : string_filter",
"number_filter : T_FIELD '=' T_NUMBER",
"number_filter : T_FIELD '>' T_NUMBER",
"number_filter : T_FIELD '<' T_NUMBER",
"number_filter : T_FIELD T_NOT_EQ T_NUMBER",
"number_filter : T_FIELD T_GT_EQ T_NUMBER",
"number_filter : T_FIELD T_LT_EQ T_NUMBER",
"string_filter : T_FIELD '=' T_FIELD",
"string_filter : T_FIELD T_NOT_EQ T_FIELD",
};
#endif
int yydebug;
int yynerrs;
int yyerrflag;
int yychar;
YYSTYPE yyval;
YYSTYPE yylval;
/* define the initial stack-sizes */
#ifdef YYSTACKSIZE
#undef YYMAXDEPTH
#define YYMAXDEPTH YYSTACKSIZE
#else
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
#define YYSTACKSIZE 500
#define YYMAXDEPTH 500
#endif
#endif
#define YYINITSTACKSIZE 500
typedef struct {
unsigned stacksize;
short *s_base;
short *s_mark;
short *s_last;
YYSTYPE *l_base;
YYSTYPE *l_mark;
} YYSTACKDATA;
/* variables for the parser stack */
static YYSTACKDATA yystack;
#line 144 "parser.y"
#line 253 "y.tab.c"
#if YYDEBUG
#include <stdio.h> /* needed for printf */
#endif
#include <stdlib.h> /* needed for malloc, etc */
#include <string.h> /* needed for memset */
/* allocate initial stack or double stack size, up to YYMAXDEPTH */
static int yygrowstack(YYSTACKDATA *data)
{
int i;
unsigned newsize;
short *newss;
YYSTYPE *newvs;
if ((newsize = data->stacksize) == 0)
newsize = YYINITSTACKSIZE;
else if (newsize >= YYMAXDEPTH)
return -1;
else if ((newsize *= 2) > YYMAXDEPTH)
newsize = YYMAXDEPTH;
i = data->s_mark - data->s_base;
newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
if (newss == 0)
return -1;
data->s_base = newss;
data->s_mark = newss + i;
newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
if (newvs == 0)
return -1;
data->l_base = newvs;
data->l_mark = newvs + i;
data->stacksize = newsize;
data->s_last = data->s_base + newsize - 1;
return 0;
}
#if YYPURE || defined(YY_NO_LEAKS)
static void yyfreestack(YYSTACKDATA *data)
{
free(data->s_base);
free(data->l_base);
memset(data, 0, sizeof(*data));
}
#else
#define yyfreestack(data) /* nothing */
#endif
#define YYABORT goto yyabort
#define YYREJECT goto yyabort
#define YYACCEPT goto yyaccept
#define YYERROR goto yyerrlab
int
YYPARSE_DECL()
{
int yym, yyn, yystate;
#if YYDEBUG
const char *yys;
if ((yys = getenv("YYDEBUG")) != 0)
{
yyn = *yys;
if (yyn >= '0' && yyn <= '9')
yydebug = yyn - '0';
}
#endif
yynerrs = 0;
yyerrflag = 0;
yychar = YYEMPTY;
yystate = 0;
#if YYPURE
memset(&yystack, 0, sizeof(yystack));
#endif
if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
yystack.s_mark = yystack.s_base;
yystack.l_mark = yystack.l_base;
yystate = 0;
*yystack.s_mark = 0;
yyloop:
if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
if (yychar < 0)
{
if ((yychar = YYLEX) < 0) yychar = 0;
#if YYDEBUG
if (yydebug)
{
yys = 0;
if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
if (!yys) yys = "illegal-symbol";
printf("%sdebug: state %d, reading %d (%s)\n",
YYPREFIX, yystate, yychar, yys);
}
#endif
}
if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
{
#if YYDEBUG
if (yydebug)
printf("%sdebug: state %d, shifting to state %d\n",
YYPREFIX, yystate, yytable[yyn]);
#endif
if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
{
goto yyoverflow;
}
yystate = yytable[yyn];
*++yystack.s_mark = yytable[yyn];
*++yystack.l_mark = yylval;
yychar = YYEMPTY;
if (yyerrflag > 0) --yyerrflag;
goto yyloop;
}
if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
{
yyn = yytable[yyn];
goto yyreduce;
}
if (yyerrflag) goto yyinrecovery;
yyerror("syntax error");
goto yyerrlab;
yyerrlab:
++yynerrs;
yyinrecovery:
if (yyerrflag < 3)
{
yyerrflag = 3;
for (;;)
{
if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
{
#if YYDEBUG
if (yydebug)
printf("%sdebug: state %d, error recovery shifting\
to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
#endif
if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
{
goto yyoverflow;
}
yystate = yytable[yyn];
*++yystack.s_mark = yytable[yyn];
*++yystack.l_mark = yylval;
goto yyloop;
}
else
{
#if YYDEBUG
if (yydebug)
printf("%sdebug: error recovery discarding state %d\n",
YYPREFIX, *yystack.s_mark);
#endif
if (yystack.s_mark <= yystack.s_base) goto yyabort;
--yystack.s_mark;
--yystack.l_mark;
}
}
}
else
{
if (yychar == 0) goto yyabort;
#if YYDEBUG
if (yydebug)
{
yys = 0;
if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
if (!yys) yys = "illegal-symbol";
printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
YYPREFIX, yystate, yychar, yys);
}
#endif
yychar = YYEMPTY;
goto yyloop;
}
yyreduce:
#if YYDEBUG
if (yydebug)
printf("%sdebug: state %d, reducing by rule %d (%s)\n",
YYPREFIX, yystate, yyn, yyrule[yyn]);
#endif
yym = yylen[yyn];
if (yym)
yyval = yystack.l_mark[1-yym];
else
memset(&yyval, 0, sizeof yyval);
switch (yyn)
{
case 1:
#line 46 "parser.y"
{
zfilter = yystack.l_mark[0].expr;
}
break;
case 2:
#line 53 "parser.y"
{
yyval.expr = make_op_node(OR);
yyval.expr->left_child = yystack.l_mark[-2].expr;
yyval.expr->right_child = yystack.l_mark[0].expr;
}
break;
case 3:
#line 59 "parser.y"
{
yyval.expr = make_op_node(AND);
yyval.expr->left_child = yystack.l_mark[-2].expr;
yyval.expr->right_child = yystack.l_mark[0].expr;
}
break;
case 4:
#line 65 "parser.y"
{
yyval.expr = yystack.l_mark[-1].expr;
}
break;
case 5:
#line 69 "parser.y"
{
yyval.expr = yystack.l_mark[0].expr;
}
break;
case 6:
#line 75 "parser.y"
{
yyval.expr = yystack.l_mark[0].expr;
}
break;
case 7:
#line 79 "parser.y"
{
yyval.expr = yystack.l_mark[0].expr;
}
break;
case 8:
#line 85 "parser.y"
{
yyval.expr = make_op_node(EQ);
yyval.expr->left_child = make_field_node(yystack.l_mark[-2].string_literal);
yyval.expr->right_child = make_int_node(yystack.l_mark[0].int_literal);
}
break;
case 9:
#line 92 "parser.y"
{
yyval.expr = make_op_node(GT);
yyval.expr->left_child = make_field_node(yystack.l_mark[-2].string_literal);
yyval.expr->right_child = make_int_node(yystack.l_mark[0].int_literal);
}
break;
case 10:
#line 99 "parser.y"
{
yyval.expr = make_op_node(LT);
yyval.expr->left_child = make_field_node(yystack.l_mark[-2].string_literal);
yyval.expr->right_child = make_int_node(yystack.l_mark[0].int_literal);
}
break;
case 11:
#line 106 "parser.y"
{
yyval.expr = make_op_node(NEQ);
yyval.expr->left_child = make_field_node(yystack.l_mark[-2].string_literal);
yyval.expr->right_child = make_int_node(yystack.l_mark[0].int_literal);
}
break;
case 12:
#line 113 "parser.y"
{
yyval.expr = make_op_node(GT_EQ);
yyval.expr->left_child = make_field_node(yystack.l_mark[-2].string_literal);
yyval.expr->right_child = make_int_node(yystack.l_mark[0].int_literal);
}
break;
case 13:
#line 120 "parser.y"
{
yyval.expr = make_op_node(LT_EQ);
yyval.expr->left_child = make_field_node(yystack.l_mark[-2].string_literal);
yyval.expr->right_child = make_int_node(yystack.l_mark[0].int_literal);
}
break;
case 14:
#line 129 "parser.y"
{
yyval.expr = make_op_node(EQ);
yyval.expr->left_child = make_field_node(yystack.l_mark[-2].string_literal);
yyval.expr->right_child = make_field_node(yystack.l_mark[0].string_literal);
}
break;
case 15:
#line 136 "parser.y"
{
yyval.expr = make_op_node(NEQ);
yyval.expr->left_child = make_field_node(yystack.l_mark[-2].string_literal);
yyval.expr->right_child = make_field_node(yystack.l_mark[0].string_literal);
}
break;
#line 569 "y.tab.c"
}
yystack.s_mark -= yym;
yystate = *yystack.s_mark;
yystack.l_mark -= yym;
yym = yylhs[yyn];
if (yystate == 0 && yym == 0)
{
#if YYDEBUG
if (yydebug)
printf("%sdebug: after reduction, shifting from state 0 to\
state %d\n", YYPREFIX, YYFINAL);
#endif
yystate = YYFINAL;
*++yystack.s_mark = YYFINAL;
*++yystack.l_mark = yyval;
if (yychar < 0)
{
if ((yychar = YYLEX) < 0) yychar = 0;
#if YYDEBUG
if (yydebug)
{
yys = 0;
if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
if (!yys) yys = "illegal-symbol";
printf("%sdebug: state %d, reading %d (%s)\n",
YYPREFIX, YYFINAL, yychar, yys);
}
#endif
}
if (yychar == 0) goto yyaccept;
goto yyloop;
}
if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
yystate = yytable[yyn];
else
yystate = yydgoto[yym];
#if YYDEBUG
if (yydebug)
printf("%sdebug: after reduction, shifting from state %d \
to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
#endif
if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
{
goto yyoverflow;
}
*++yystack.s_mark = (short) yystate;
*++yystack.l_mark = yyval;
goto yyloop;
yyoverflow:
yyerror("yacc stack overflow");
yyabort:
yyfreestack(&yystack);
return (1);
yyaccept:
yyfreestack(&yystack);
return (0);
}

View File

@ -2,6 +2,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "expression.h" #include "expression.h"
#include "lexer.h"
#include "filter.h"
void yyerror(const char *str) void yyerror(const char *str)
{ {
@ -14,6 +16,8 @@ int yywrap()
return 1; return 1;
} }
extern node_t *zfilter;
%} %}
%union { %union {
@ -38,22 +42,24 @@ int yywrap()
%% %%
expression: filter_expr
{
zfilter = $1;
}
filter_expr: filter_expr:
filter_expr T_OR filter_expr filter_expr T_OR filter_expr
{ {
$$ = make_op_node(OR); $$ = make_op_node(OR);
$$->left_child = $1; $$->left_child = $1;
$$->right_child = $3; $$->right_child = $3;
print_expression($$);
printf("%s\n", "");
} }
| filter_expr T_AND filter_expr | filter_expr T_AND filter_expr
{ {
$$ = make_op_node(AND); $$ = make_op_node(AND);
$$->left_child = $1; $$->left_child = $1;
$$->right_child = $3; $$->right_child = $3;
print_expression($$);
printf("%s\n", "");
} }
| '(' filter_expr ')' | '(' filter_expr ')'
{ {
@ -77,7 +83,6 @@ filter: number_filter
number_filter: T_FIELD '=' T_NUMBER number_filter: T_FIELD '=' T_NUMBER
{ {
printf("number_filter: %s = %d\n", $1, $3);
$$ = make_op_node(EQ); $$ = make_op_node(EQ);
$$->left_child = make_field_node($1); $$->left_child = make_field_node($1);
$$->right_child = make_int_node($3); $$->right_child = make_int_node($3);
@ -85,7 +90,6 @@ number_filter: T_FIELD '=' T_NUMBER
| |
T_FIELD '>' T_NUMBER T_FIELD '>' T_NUMBER
{ {
printf("number_filter: %s > %d\n", $1, $3);
$$ = make_op_node(GT); $$ = make_op_node(GT);
$$->left_child = make_field_node($1); $$->left_child = make_field_node($1);
$$->right_child = make_int_node($3); $$->right_child = make_int_node($3);
@ -93,34 +97,46 @@ number_filter: T_FIELD '=' T_NUMBER
| |
T_FIELD '<' T_NUMBER T_FIELD '<' T_NUMBER
{ {
printf("number_filter: %s < %d\n", $1, $3); $$ = make_op_node(LT);
$$->left_child = make_field_node($1);
$$->right_child = make_int_node($3);
} }
| |
T_FIELD T_NOT_EQ T_NUMBER T_FIELD T_NOT_EQ T_NUMBER
{ {
printf("number_filter: %s != %d\n", $1, $3); $$ = make_op_node(NEQ);
$$->left_child = make_field_node($1);
$$->right_child = make_int_node($3);
} }
| |
T_FIELD T_GT_EQ T_NUMBER T_FIELD T_GT_EQ T_NUMBER
{ {
printf("number_filter: %s >= %d\n", $1, $3); $$ = make_op_node(GT_EQ);
$$->left_child = make_field_node($1);
$$->right_child = make_int_node($3);
} }
| |
T_FIELD T_LT_EQ T_NUMBER T_FIELD T_LT_EQ T_NUMBER
{ {
printf("number_filter: %s <= %d\n", $1, $3); $$ = make_op_node(LT_EQ);
$$->left_child = make_field_node($1);
$$->right_child = make_int_node($3);
} }
; ;
string_filter: string_filter:
T_FIELD '=' T_FIELD T_FIELD '=' T_FIELD
{ {
printf("string_filter %s = %s\n", $1, $3); $$ = make_op_node(EQ);
$$->left_child = make_field_node($1);
$$->right_child = make_field_node($3);
} }
| |
T_FIELD T_NOT_EQ T_FIELD T_FIELD T_NOT_EQ T_FIELD
{ {
printf("string_filter: %s != %s\n", $1, $3); $$ = make_op_node(NEQ);
$$->left_child = make_field_node($1);
$$->right_child = make_field_node($3);
} }
; ;

40
src/stack.c Normal file
View File

@ -0,0 +1,40 @@
#include "stack.h"
#include "../lib/xalloc.h"
#include <stdlib.h>
struct stack {
size_t max_size;
size_t cur_size;
void** arr;
};
stack_t* alloc_stack(size_t size)
{
stack_t* stack = xmalloc(sizeof(stack_t));
stack->arr = xcalloc(size, sizeof(void*));
stack->max_size = size;
stack->cur_size = 0;
return stack;
}
void free_stack(stack_t* stack)
{
xfree(stack->arr);
xfree(stack);
}
void push(stack_t* stack, void* elt)
{
if (stack->cur_size == stack->max_size) {
stack->max_size *= 2;
xrealloc(stack->arr, stack->max_size);;
}
stack->arr[stack->cur_size++] = elt;
}
void* pop(stack_t* stack)
{
void* res = stack->arr[--stack->cur_size];
return res;
}

15
src/stack.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef ZMAP_STACK_H
#define ZMAP_STACK_H
#include <stddef.h>
struct stack;
typedef struct stack stack_t;
stack_t* alloc_stack(size_t size);
void free_stack(stack_t* stack);
void push(stack_t* stack, void* elt);
void* pop(stack_t* stack);
#endif /* ZMAP_STACK_H */

View File

@ -15,6 +15,7 @@
#include "types.h" #include "types.h"
#include "fieldset.h" #include "fieldset.h"
#include "filter.h"
#ifndef STATE_H #ifndef STATE_H
#define STATE_H #define STATE_H
@ -79,6 +80,7 @@ struct state_conf {
char *whitelist_filename; char *whitelist_filename;
char *raw_output_fields; char *raw_output_fields;
char **output_fields; char **output_fields;
struct output_filter filter;
struct fieldset_conf fsconf; struct fieldset_conf fsconf;
int output_fields_len; int output_fields_len;
int dryrun; int dryrun;

1
src/whitelist Normal file
View File

@ -0,0 +1 @@
192.168.1.0/24

20
src/y.tab.h Normal file
View File

@ -0,0 +1,20 @@
#define T_AND 257
#define T_OR 258
#define T_NUMBER 259
#define T_FIELD 260
#define T_NOT_EQ 261
#define T_GT_EQ 262
#define T_LT_EQ 263
#ifdef YYSTYPE
#undef YYSTYPE_IS_DECLARED
#define YYSTYPE_IS_DECLARED 1
#endif
#ifndef YYSTYPE_IS_DECLARED
#define YYSTYPE_IS_DECLARED 1
typedef union {
int int_literal;
char *string_literal;
struct node *expr;
} YYSTYPE;
#endif /* !YYSTYPE_IS_DECLARED */
extern YYSTYPE yylval;

1179
src/zmap.c

File diff suppressed because it is too large Load Diff

View File

@ -94,6 +94,9 @@ option "probe-args" - "Arguments to pass to probe module"
option "output-args" - "Arguments to pass to output module" option "output-args" - "Arguments to pass to output module"
typestr="args" typestr="args"
optional string optional string
option "output-filter" - "Read a file containing an output filter on the first line"
typestr="filename"
optional string
option "list-output-modules" - "List available output modules" option "list-output-modules" - "List available output modules"
optional optional
option "list-probe-modules" - "List available probe modules" option "list-probe-modules" - "List available probe modules"