diff options
| author | obiot <obiot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-09 02:57:54 +0000 |
|---|---|---|
| committer | obiot <obiot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-09 02:57:54 +0000 |
| commit | 829631a54e9908d0b5af88446aab33d1a6b23a46 (patch) | |
| tree | 2c2571cff5ab3b8d4e05032c9461809d455ae9fb /epan/frame_data.h | |
| parent | 989de50f34896af4649e69c3e10a7769fce61610 (diff) | |
Fix the "unmarking a packet matching a color filter does not apply the color
filter's colors" bug, by storing the pointer to the matching color_filter_t
structure in the frame_data structure.
Replace "frame" and "frames" by "packet" and "packets" in many places.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9607 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/frame_data.h')
| -rw-r--r-- | epan/frame_data.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/epan/frame_data.h b/epan/frame_data.h index 9e38551b10..3d1a5aa97c 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -1,7 +1,7 @@ /* frame_data.h * Definitions for frame_data structures and routines * - * $Id: frame_data.h,v 1.10 2003/09/12 02:48:22 sahlberg Exp $ + * $Id: frame_data.h,v 1.11 2004/01/09 02:57:29 obiot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -25,9 +25,22 @@ #ifndef __FRAME_DATA_H__ #define __FRAME_DATA_H__ +//#include "color.h" #include "column_info.h" #include "tvbuff.h" +#if 0 +/* Defined in color.h */ +#ifndef __COLOR_H__ +typedef struct _color_t /* { + guint32 pixel; + guint16 red; + guint16 green; + guint16 blue; +} */ color_t; +#endif +#endif + /* XXX - some of this stuff is used only while a packet is being dissected; should we keep that stuff in the "packet_info" structure, instead, to save memory? */ @@ -54,6 +67,7 @@ typedef struct _frame_data { unsigned int marked : 1; /* 1 = marked by user, 0 = normal */ unsigned int ref_time : 1; /* 1 = marked as a reference time frame, 0 = normal */ } flags; + void *color_filter; /* Per-packet matching color_filter_t object */ } frame_data; /* |