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-m2pa.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-m2pa.c')
| -rw-r--r-- | packet-m2pa.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-m2pa.c b/packet-m2pa.c index 6b562f77b7..46faf8edb9 100644 --- a/packet-m2pa.c +++ b/packet-m2pa.c @@ -6,7 +6,7 @@ * Copyright 2001, Jeff Morriss <jeff.morriss[AT]ulticom.com>, * updated by Michael Tuexen <michael.tuexen[AT]icn.siemens.de> * - * $Id: packet-m2pa.c,v 1.3 2001/12/03 20:35:14 guy Exp $ + * $Id: packet-m2pa.c,v 1.4 2001/12/10 00:25:30 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -228,9 +228,9 @@ dissect_m2pa_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, prot type = tvb_get_guint8(common_header_tvb, TYPE_OFFSET); length = tvb_get_ntohl(common_header_tvb, LENGTH_OFFSET); - if (check_col(pinfo->fd, COL_INFO)) { - col_append_str(pinfo->fd, COL_INFO, val_to_str(type, m2pa_message_type_values, "Invalid")); - col_append_str(pinfo->fd, COL_INFO, " "); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(type, m2pa_message_type_values, "Invalid")); + col_append_str(pinfo->cinfo, COL_INFO, " "); }; if (m2pa_tree) { @@ -289,8 +289,8 @@ dissect_m2pa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *m2pa_tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "M2PA"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2PA"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ |