diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-08-13 23:47:43 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-08-13 23:47:43 +0000 |
| commit | ab6490398c47842880a96cef88161a535f825aa1 (patch) | |
| tree | 8d1cb07df40b15146867574b7a920c1df7eb572c /file.h | |
| parent | a5acc58fe3e5d2b5e8dde83ccda2ad5b5f3246c8 (diff) | |
| download | wireshark-ab6490398c47842880a96cef88161a535f825aa1.tar.gz wireshark-ab6490398c47842880a96cef88161a535f825aa1.tar.bz2 wireshark-ab6490398c47842880a96cef88161a535f825aa1.zip | |
Moved global memory alloction used in display filters (which was stored
in dfilter-grammar.y) to a new struct dfilter. Display filters now have
their own struct, rather than simply being GNode's. This allows multiple
display filters to exist at once, aiding John McDermott in his
work on colorization.
svn path=/trunk/; revision=480
Diffstat (limited to 'file.h')
| -rw-r--r-- | file.h | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1,7 +1,7 @@ /* file.h * Definitions for file structures and routines * - * $Id: file.h,v 1.31 1999/08/11 17:02:27 gram Exp $ + * $Id: file.h,v 1.32 1999/08/13 23:47:42 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -44,6 +44,10 @@ #endif #endif +#ifndef __DFILTER_H__ +#include "dfilter.h" +#endif + typedef struct bpf_program bpf_prog; typedef struct _capture_file { @@ -65,7 +69,7 @@ typedef struct _capture_file { wtap *wth; /* Wiretap session */ gchar *rfilter; /* Read filter string */ gchar *dfilter; /* Display filter string */ - GNode *dfcode; /* Compiled display filter program */ + dfilter *dfcode; /* Compiled display filter program */ #ifdef HAVE_LIBPCAP gchar *cfilter; /* Capture filter string */ bpf_prog fcode; /* Compiled capture filter program */ |