diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-12-10 00:26:21 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-12-10 00:26:21 +0000 |
| commit | 0c3fb23941e125f5f975469ed39cec16bea6e04e (patch) | |
| tree | b347f1669210e07039ec31051cbb2c5e82422e6b /packet-trmac.c | |
| parent | 9a31f9b449a3d6091ce3a707da168f623b4beed3 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4370 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-trmac.c')
| -rw-r--r-- | packet-trmac.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/packet-trmac.c b/packet-trmac.c index 62aaf22c1b..7bd7fb67d8 100644 --- a/packet-trmac.c +++ b/packet-trmac.c @@ -2,12 +2,11 @@ * Routines for Token-Ring Media Access Control * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-trmac.c,v 1.33 2001/11/13 23:55:30 gram Exp $ + * $Id: packet-trmac.c,v 1.34 2001/12/10 00:25:40 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -280,18 +279,18 @@ dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 mv_val; char *mv_text; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "TR MAC"); - if (check_col(pinfo->fd, COL_INFO)) - col_clear(pinfo->fd, COL_INFO); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TR MAC"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); mv_val = tvb_get_guint8(tvb, 3); /* Interpret the major vector */ mv_text = val_to_str(mv_val, major_vector_vs, "Unknown Major Vector: %d\n"); - if (check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, mv_text); + if (check_col(pinfo->cinfo, COL_INFO)) + col_add_str(pinfo->cinfo, COL_INFO, mv_text); if (tree) { mv_length = tvb_get_ntohs(tvb, 0); |