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-dec-bpdu.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-dec-bpdu.c')
| -rw-r--r-- | packet-dec-bpdu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packet-dec-bpdu.c b/packet-dec-bpdu.c index b6c5013aac..14b2bcb0d5 100644 --- a/packet-dec-bpdu.c +++ b/packet-dec-bpdu.c @@ -1,7 +1,7 @@ /* packet-dec-bpdu.c * Routines for DEC BPDU (DEC Spanning Tree Protocol) disassembly * - * $Id: packet-dec-bpdu.c,v 1.8 2001/12/03 03:59:34 guy Exp $ + * $Id: packet-dec-bpdu.c,v 1.9 2001/12/10 00:25:27 guy Exp $ * * Copyright 2001 Paul Ionescu <paul@acorp.ro> * @@ -77,21 +77,21 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *bpdu_tree; proto_item *ti; - if (check_col(pinfo->fd, COL_PROTOCOL)) { - col_set_str(pinfo->fd, COL_PROTOCOL, "DEC_STP"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC_STP"); } - 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); } bpdu_type = tvb_get_guint8(tvb, BPDU_TYPE); flags=tvb_get_guint8(tvb,BPDU_FLAGS); - if (check_col(pinfo->fd, COL_INFO)) { + if (check_col(pinfo->cinfo, COL_INFO)) { if (bpdu_type == 25) - col_add_fstr(pinfo->fd, COL_INFO, "Hello Packet"); + col_add_fstr(pinfo->cinfo, COL_INFO, "Hello Packet"); else if (bpdu_type == 0x02) - col_add_fstr(pinfo->fd, COL_INFO, "Topology Change Notification"); + col_add_fstr(pinfo->cinfo, COL_INFO, "Topology Change Notification"); } tvb_set_reported_length(tvb, DEC_BPDU_SIZE); |