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-vlan.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-vlan.c')
| -rw-r--r-- | packet-vlan.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packet-vlan.c b/packet-vlan.c index b4521f6194..15a3b67ed2 100644 --- a/packet-vlan.c +++ b/packet-vlan.c @@ -1,7 +1,7 @@ /* packet-vlan.c * Routines for VLAN 802.1Q ethernet header disassembly * - * $Id: packet-vlan.c,v 1.36 2001/12/03 03:59:40 guy Exp $ + * $Id: packet-vlan.c,v 1.37 2001/12/10 00:25:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -79,15 +79,15 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) volatile gboolean is_802_2; proto_tree *volatile vlan_tree; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "VLAN"); - 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, "VLAN"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); tci = tvb_get_ntohs( tvb, 0 ); - if (check_col(pinfo->fd, COL_INFO)) { - col_add_fstr(pinfo->fd, COL_INFO, "PRI: %d CFI: %d ID: %d", + if (check_col(pinfo->cinfo, COL_INFO)) { + col_add_fstr(pinfo->cinfo, COL_INFO, "PRI: %d CFI: %d ID: %d", (tci >> 13), ((tci >> 12) & 1), (tci & 0xFFF)); } |