Allow filtering on 24-bit integral fields.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 5 Feb 2000 06:07:16 +0000 (06:07 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 5 Feb 2000 06:07:16 +0000 (06:07 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1602 f5534014-38df-0310-8fa8-9805f1628bb7

dfilter-grammar.y
dfilter-scanner.l

index 55a05cbb7a7c7b14aaf53479d9d51068e9a0462c..9c11f102aaa93efa94a1e7e0b70ec1f80e5884fd 100644 (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; }
index 08e9a2227bb48e2062da7bcdb3613f2b97b6d126..ec002fc475e8a246962d62295f0f8ce3e1eebad3 100644 (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;