diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
| commit | 23319ff023bcb144347a1307b958359b5226c699 (patch) | |
| tree | b347f1669210e07039ec31051cbb2c5e82422e6b /epan/packet_info.h | |
| parent | a81a607ed5e3d291940ab75dd82d28d72c222b48 (diff) | |
| download | wireshark-23319ff023bcb144347a1307b958359b5226c699.tar.gz wireshark-23319ff023bcb144347a1307b958359b5226c699.tar.bz2 wireshark-23319ff023bcb144347a1307b958359b5226c699.zip | |
Move the pointer to the "column_info" structure in the "frame_data"
structure to the "packet_info" structure; only stuff that's permanently
stored with each frame should be in the "frame_data" structure, and the
"column_info" structure is not guaranteed to hold the column values for
that frame at all times - it was only in the "frame_data" structure so
that it could be passed to dissectors, and, as all dissectors are now
passed a pointer to a "packet_info" structure, it could just as well be
put in the "packet_info" structure.
That saves memory, by shrinking the "frame_data" structure (there's one
of those per frame), and also lets us clean up the code a bit.
svn path=/trunk/; revision=4370
Diffstat (limited to 'epan/packet_info.h')
| -rw-r--r-- | epan/packet_info.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/packet_info.h b/epan/packet_info.h index d8a5df5e94..e6200f0339 100644 --- a/epan/packet_info.h +++ b/epan/packet_info.h @@ -1,7 +1,7 @@ /* packet_info.h * Definitions for packet info structures and routines * - * $Id: packet_info.h,v 1.12 2001/11/29 09:05:25 guy Exp $ + * $Id: packet_info.h,v 1.13 2001/12/10 00:26:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -89,6 +89,7 @@ typedef enum { typedef struct _packet_info { const char *current_proto; /* name of protocol currently being dissected */ + column_info *cinfo; /* Column formatting information */ frame_data *fd; union wtap_pseudo_header *pseudo_header; address dl_src; /* link-layer source address */ |