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-tr.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-tr.c')
| -rw-r--r-- | packet-tr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-tr.c b/packet-tr.c index 6415ad7ab1..94a045edc5 100644 --- a/packet-tr.c +++ b/packet-tr.c @@ -2,7 +2,7 @@ * Routines for Token-Ring packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-tr.c,v 1.67 2001/12/03 03:59:40 guy Exp $ + * $Id: packet-tr.c,v 1.68 2001/12/10 00:25:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -326,8 +326,8 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Token-Ring Strings */ char *fc[] = { "MAC", "LLC", "Reserved", "Unknown" }; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "TR"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TR"); if ((x = check_for_old_linux_tvb((tvbuff_t*) tvb))) { /* Actually packet starts x bytes into what we have got but with all @@ -348,8 +348,8 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) trn_shost_nonsr[0] &= 127; frame_type = (trn_fc & 192) >> 6; - if (check_col(pinfo->fd, COL_INFO)) - col_add_fstr(pinfo->fd, COL_INFO, "Token-Ring %s", fc[frame_type]); + if (check_col(pinfo->cinfo, COL_INFO)) + col_add_fstr(pinfo->cinfo, COL_INFO, "Token-Ring %s", fc[frame_type]); /* if the high bit on the first byte of src hwaddr is 1, then this packet is source-routed */ |