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 /packet-mrdisc.c | |
| parent | a81a607ed5e3d291940ab75dd82d28d72c222b48 (diff) | |
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 'packet-mrdisc.c')
| -rw-r--r-- | packet-mrdisc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packet-mrdisc.c b/packet-mrdisc.c index a2ea14bb7e..3312fc8198 100644 --- a/packet-mrdisc.c +++ b/packet-mrdisc.c @@ -1,7 +1,7 @@ /* packet-mrdisc.c 2001 Ronnie Sahlberg <rsahlber@bigpond.net.au> * Routines for IGMP/MRDISC packet disassembly * - * $Id: packet-mrdisc.c,v 1.2 2001/07/16 05:16:57 guy Exp $ + * $Id: packet-mrdisc.c,v 1.3 2001/12/10 00:25:30 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -225,17 +225,17 @@ dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int o tree = proto_item_add_subtree(item, ett_mrdisc); - if (check_col(pinfo->fd, COL_PROTOCOL)) { - col_set_str(pinfo->fd, COL_PROTOCOL, "MRDISC"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MRDISC"); } - if (check_col(pinfo->fd, COL_INFO)) { - col_clear(pinfo->fd, COL_INFO); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_clear(pinfo->cinfo, COL_INFO); } type = tvb_get_guint8(tvb, offset); - if (check_col(pinfo->fd, COL_INFO)) { - col_add_fstr(pinfo->fd, COL_INFO, + if (check_col(pinfo->cinfo, COL_INFO)) { + col_add_fstr(pinfo->cinfo, COL_INFO, "%s",val_to_str(type, mrdisc_types, "Unknown Type:0x%02x")); } |