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-gre.c | |
| parent | a81a607ed5e3d291940ab75dd82d28d72c222b48 (diff) | |
| download | wireshark-23319ff023bcb144347a1307b958359b5226c699.tar.gz wireshark-23319ff023bcb144347a1307b958359b5226c699.tar.bz2 wireshark-23319ff023bcb144347a1307b958359b5226c699.zip | |
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-gre.c')
| -rw-r--r-- | packet-gre.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-gre.c b/packet-gre.c index 230cd4f913..df13dd5cb7 100644 --- a/packet-gre.c +++ b/packet-gre.c @@ -2,7 +2,7 @@ * Routines for the Generic Routing Encapsulation (GRE) protocol * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-gre.c,v 1.48 2001/12/08 06:41:41 guy Exp $ + * $Id: packet-gre.c,v 1.49 2001/12/10 00:25:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -103,11 +103,11 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) flags_and_ver = tvb_get_ntohs(tvb, offset); type = tvb_get_ntohs(tvb, offset + sizeof(flags_and_ver)); - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "GRE"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GRE"); - if (check_col(pinfo->fd, COL_INFO)) { - col_add_fstr(pinfo->fd, COL_INFO, "Encapsulated %s", + if (check_col(pinfo->cinfo, COL_INFO)) { + col_add_fstr(pinfo->cinfo, COL_INFO, "Encapsulated %s", val_to_str(type, typevals, "0x%04X (unknown)")); } |