diff options
| -rw-r--r-- | dfilter-grammar.y | 7 | ||||
| -rw-r--r-- | dfilter-int.h | 108 | ||||
| -rw-r--r-- | dfilter-scanner.l | 7 | ||||
| -rw-r--r-- | dfilter.c | 3 | ||||
| -rw-r--r-- | dfilter.h | 75 |
5 files changed, 117 insertions, 83 deletions
diff --git a/dfilter-grammar.y b/dfilter-grammar.y index dbdfa5d598..47cb4738a9 100644 --- a/dfilter-grammar.y +++ b/dfilter-grammar.y @@ -3,7 +3,7 @@ /* dfilter-grammar.y * Parser for display filters * - * $Id: dfilter-grammar.y,v 1.7 1999/08/12 15:10:48 gram Exp $ + * $Id: dfilter-grammar.y,v 1.8 1999/08/12 21:16:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -61,6 +61,8 @@ #include "dfilter.h" #endif +#include "dfilter-int.h" + #ifndef __RESOLV_H__ #include "resolv.h" #endif @@ -94,9 +96,6 @@ GNode *dfilter_tree = NULL; * faster than the tree when we go back and free the byte arrays */ GSList *dfilter_list_byte_arrays = NULL; -/* In dfilter-scanner.l */ -GByteArray* byte_str_to_guint8_array(const char *s); - %} %union { diff --git a/dfilter-int.h b/dfilter-int.h new file mode 100644 index 0000000000..1ad1502795 --- /dev/null +++ b/dfilter-int.h @@ -0,0 +1,108 @@ +/* dfilter-int.h + * Definitions for routines common to multiple modules in the display + * filter code, but not used outside that code. + * + * $Id: dfilter-int.h,v 1.1 1999/08/12 21:16:31 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@zing.org> + * Copyright 1998 Gerald Combs + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __DFILTER_INT_H__ +#define __DFILTER_INT_H__ + +/* in dfilter-scanner.l */ +GByteArray *byte_str_to_guint8_array(const char *s); + +/* in dfilter-grammar.y */ +extern GSList *dfilter_list_byte_arrays; + +/* Here we provide interfaces to make our scanner act and look like lex */ +int yylex(void); +void yyerror(char *s); +void dfilter_yyerror(char *fmt, ...); + +/* functions that dfilter-grammar.y needs during parsing*/ +gboolean check_relation_numeric(gint operand, GArray *a, GArray *b); +gboolean check_relation_ether(gint operand, GArray *a, GArray *b); +gboolean check_relation_bytes(gint operand, GArray *a, GArray *b); +gboolean check_relation_boolean(gint operand, GArray *a, GArray *b); + +gboolean fill_array_numeric_value(GNode *gnode, gpointer data); +gboolean fill_array_numeric_variable(GNode *gnode, gpointer data); +gboolean fill_array_ether_value(GNode *gnode, gpointer data); +gboolean fill_array_ether_variable(GNode *gnode, gpointer data); +gboolean fill_array_bytes_value(GNode *gnode, gpointer data); +gboolean fill_array_bytes_variable(GNode *gnode, gpointer data); +gboolean fill_array_boolean_value(GNode *gnode, gpointer data); +gboolean fill_array_boolean_variable(GNode *gnode, gpointer data); + +enum node_type { + relation, /* eq, ne, gt, ge, lt, le */ + logical, /* and, or, not, xor */ + variable, /* protocol or header field id */ + existence, /* existence of a variable (protocol or hf) */ + alternation, /* &, | */ + boolean, /* true, false */ + numeric, /* uint8, uint16, or uint32 value */ + abs_time, + string, + ether, + bytes, + ipv4, + ipxnet +}; + +typedef gboolean(*CheckRelationFunc) (gint operand, GArray *a, GArray *b); + +/* This struct is the parse tree node created by this grammary and used + * directly in the display filter routines to filter packets. + */ +typedef struct dfilter_node { + enum node_type ntype; /* from dfilter-grammar.h */ + int elem_size; /* computed at dfilter parse time rather than + when finding elements for each packet. Saves time + in get_values_from_ptree() */ + CheckRelationFunc check_relation_func; + GNodeTraverseFunc fill_array_func; + + /* copied from proto.h */ + union { + gint relation; /* if type == relation (eq, ne, gt, ge, lt, le) */ + gint logical; /* if type == logical (and, or, not, xor) */ + gint variable; /* if type == variable (protocol or header field abbrev) */ + gint alternation; /* if type == alternation (& or |) */ + + gboolean boolean; + guint32 numeric; + struct timeval abs_time; /* the whole struct, not a pointer */ + gchar *string; + guint8 ether[6]; + GByteArray *bytes; + } value; + + /* used for byte-ranges */ + gint offset; + guint length; +} dfilter_node; + +/* lookup an abbreviation in our token hash, returing the ID # */ +int dfilter_lookup_token(char *abbrev); + +#endif /* ! __DFILTER_INT_H__ */ diff --git a/dfilter-scanner.l b/dfilter-scanner.l index 269ef90d8d..51c21d6b98 100644 --- a/dfilter-scanner.l +++ b/dfilter-scanner.l @@ -3,7 +3,7 @@ /* dfilter-scanner.l * Scanner for display filters * - * $Id: dfilter-scanner.l,v 1.5 1999/08/12 15:20:18 gram Exp $ + * $Id: dfilter-scanner.l,v 1.6 1999/08/12 21:16:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -53,13 +53,12 @@ #include "dfilter.h" #endif +#include "dfilter-int.h" + #include "dfilter-grammar.h" static int ether_str_to_guint8_array(const char *s, guint8 *mac); -/* in dfilter-grammar.y */ -extern GSList *dfilter_list_byte_arrays; - /* Flex has a few routines which help us get the scanner to read * from a string rather than from a file. POSIX lex only provides * for reading from a file; any method of reading from a string @@ -1,7 +1,7 @@ /* dfilter.c * Routines for display filters * - * $Id: dfilter.c,v 1.7 1999/08/12 15:10:48 gram Exp $ + * $Id: dfilter.c,v 1.8 1999/08/12 21:16:30 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -50,6 +50,7 @@ #ifndef __DFILTER_H__ #include "dfilter.h" #endif +#include "dfilter-int.h" #include "dfilter-grammar.h" int yyparse(void); /* yacc entry-point */ @@ -1,7 +1,7 @@ /* dfilter.h * Definitions for display filters * - * $Id: dfilter.h,v 1.5 1999/08/03 15:04:26 gram Exp $ + * $Id: dfilter.h,v 1.6 1999/08/12 21:16:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -27,84 +27,11 @@ #define __DFILTER_H__ void dfilter_init(void); -void dfilter_cleanup(void); int dfilter_compile(char* dfilter_text, GNode** p_dfcode); gboolean dfilter_apply(GNode *dfcode, proto_tree *ptree, const guint8* pd); -/* Here we provide interfaces to make our scanner act and look like lex */ -int yylex(void); -void yyerror(char *s); -void dfilter_yyerror(char *fmt, ...); - -/* functions that dfilter-grammar.y needs during parsing*/ -gboolean check_relation_numeric(gint operand, GArray *a, GArray *b); -gboolean check_relation_ether(gint operand, GArray *a, GArray *b); -gboolean check_relation_bytes(gint operand, GArray *a, GArray *b); -gboolean check_relation_boolean(gint operand, GArray *a, GArray *b); - -gboolean fill_array_numeric_value(GNode *gnode, gpointer data); -gboolean fill_array_numeric_variable(GNode *gnode, gpointer data); -gboolean fill_array_ether_value(GNode *gnode, gpointer data); -gboolean fill_array_ether_variable(GNode *gnode, gpointer data); -gboolean fill_array_bytes_value(GNode *gnode, gpointer data); -gboolean fill_array_bytes_variable(GNode *gnode, gpointer data); -gboolean fill_array_boolean_value(GNode *gnode, gpointer data); -gboolean fill_array_boolean_variable(GNode *gnode, gpointer data); - #ifdef WIN32 #define boolean truth_value #endif -enum node_type { - relation, /* eq, ne, gt, ge, lt, le */ - logical, /* and, or, not, xor */ - variable, /* protocol or header field id */ - existence, /* existence of a variable (protocol or hf) */ - alternation, /* &, | */ - boolean, /* true, false */ - numeric, /* uint8, uint16, or uint32 value */ - abs_time, - string, - ether, - bytes, - ipv4, - ipxnet -}; - -typedef gboolean(*CheckRelationFunc) (gint operand, GArray *a, GArray *b); - -/* This struct is the parse tree node created by this grammary and used - * directly in the display filter routines to filter packets. - */ -typedef struct dfilter_node { - enum node_type ntype; /* from dfilter-grammar.h */ - int elem_size; /* computed at dfilter parse time rather than - when finding elements for each packet. Saves time - in get_values_from_ptree() */ - CheckRelationFunc check_relation_func; - GNodeTraverseFunc fill_array_func; - - /* copied from proto.h */ - union { - gint relation; /* if type == relation (eq, ne, gt, ge, lt, le) */ - gint logical; /* if type == logical (and, or, not, xor) */ - gint variable; /* if type == variable (protocol or header field abbrev) */ - gint alternation; /* if type == alternation (& or |) */ - - gboolean boolean; - guint32 numeric; - struct timeval abs_time; /* the whole struct, not a pointer */ - gchar *string; - guint8 ether[6]; - GByteArray *bytes; - } value; - - /* used for byte-ranges */ - gint offset; - guint length; -} dfilter_node; - -/* lookup an abbreviation in our token hash, returing the ID # */ -int dfilter_lookup_token(char *abbrev); - #endif /* ! __DFILTER_H__ */ |