Allow filtering on 24-bit integral fields.

svn path=/trunk/; revision=1602
This commit is contained in:
Guy Harris 2000-02-05 06:07:16 +00:00
parent 4b81b2dbc9
commit f035694705
2 changed files with 14 additions and 2 deletions

View File

@ -3,7 +3,7 @@
/* dfilter-grammar.y
* Parser for display filters
*
* $Id: dfilter-grammar.y,v 1.37 1999/11/15 06:32:11 gram Exp $
* $Id: dfilter-grammar.y,v 1.38 2000/02/05 06:07:16 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -144,9 +144,11 @@ dfilter *global_df = NULL;
%token <variable> T_FT_UINT8
%token <variable> T_FT_UINT16
%token <variable> T_FT_UINT24
%token <variable> T_FT_UINT32
%token <variable> T_FT_INT8
%token <variable> T_FT_INT16
%token <variable> T_FT_INT24
%token <variable> T_FT_INT32
%token <variable> T_FT_ETHER
%token <variable> T_FT_IPv4
@ -490,9 +492,11 @@ bytes_value: T_VAL_BYTE_STRING
numeric_variable: T_FT_UINT8 { $$ = dfilter_mknode_numeric_variable($1.id); }
| T_FT_UINT16 { $$ = dfilter_mknode_numeric_variable($1.id); }
| T_FT_UINT24 { $$ = dfilter_mknode_numeric_variable($1.id); }
| T_FT_UINT32 { $$ = dfilter_mknode_numeric_variable($1.id); }
| T_FT_INT8 { $$ = dfilter_mknode_numeric_variable($1.id); }
| T_FT_INT16 { $$ = dfilter_mknode_numeric_variable($1.id); }
| T_FT_INT24 { $$ = dfilter_mknode_numeric_variable($1.id); }
| T_FT_INT32 { $$ = dfilter_mknode_numeric_variable($1.id); }
;
@ -536,9 +540,11 @@ bytes_variable: any_variable_type T_VAL_BYTE_RANGE
any_variable_type: T_FT_UINT8 { $$ = $1; }
| T_FT_UINT16 { $$ = $1; }
| T_FT_UINT24 { $$ = $1; }
| T_FT_UINT32 { $$ = $1; }
| T_FT_INT8 { $$ = $1; }
| T_FT_INT16 { $$ = $1; }
| T_FT_INT24 { $$ = $1; }
| T_FT_INT32 { $$ = $1; }
| T_FT_DOUBLE { $$ = $1; }
| T_FT_ETHER { $$ = $1; }

View File

@ -3,7 +3,7 @@
/* dfilter-scanner.l
* Scanner for display filters
*
* $Id: dfilter-scanner.l,v 1.27 2000/01/10 17:32:50 gram Exp $
* $Id: dfilter-scanner.l,v 1.28 2000/02/05 06:07:16 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -194,6 +194,9 @@ le|\<\= { dfilter_lval.operand = TOK_LE; return TOK_LE; }
case FT_UINT16:
retval = T_FT_UINT16;
break;
case FT_UINT24:
retval = T_FT_UINT24;
break;
case FT_UINT32:
retval = T_FT_UINT32;
break;
@ -203,6 +206,9 @@ le|\<\= { dfilter_lval.operand = TOK_LE; return TOK_LE; }
case FT_INT16:
retval = T_FT_INT16;
break;
case FT_INT24:
retval = T_FT_INT24;
break;
case FT_INT32:
retval = T_FT_INT32;
break;