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-ethertype.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-ethertype.c')
| -rw-r--r-- | packet-ethertype.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packet-ethertype.c b/packet-ethertype.c index 644094f4eb..5fefb16ffd 100644 --- a/packet-ethertype.c +++ b/packet-ethertype.c @@ -1,7 +1,7 @@ /* ethertype.c * Routines for calling the right protocol for the ethertype. * - * $Id: packet-ethertype.c,v 1.23 2001/12/08 06:41:41 guy Exp $ + * $Id: packet-ethertype.c,v 1.24 2001/12/10 00:25:27 guy Exp $ * * Gilbert Ramirez <gram@alumni.rice.edu> * @@ -185,22 +185,22 @@ ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype, switch (etype) { case ETHERTYPE_LOOP: - if (check_col(pinfo->fd, COL_PROTOCOL)) { - col_add_fstr(pinfo->fd, COL_PROTOCOL, "LOOP"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { + col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "LOOP"); } break; default: - if (check_col(pinfo->fd, COL_PROTOCOL)) { - col_add_fstr(pinfo->fd, COL_PROTOCOL, "0x%04x", + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { + col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "0x%04x", etype); } break; } - if (check_col(pinfo->fd, COL_INFO)) { + if (check_col(pinfo->cinfo, COL_INFO)) { description = match_strval(etype, etype_vals); if (description) { - col_add_fstr(pinfo->fd, COL_INFO, "%s", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s", description); } } |