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-ucp.c | |
| parent | a81a607ed5e3d291940ab75dd82d28d72c222b48 (diff) | |
| download | wireshark-23319ff023bcb144347a1307b958359b5226c699.tar.gz | |
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-ucp.c')
| -rw-r--r-- | packet-ucp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packet-ucp.c b/packet-ucp.c index e4ab13cb0d..c6b7f13d09 100644 --- a/packet-ucp.c +++ b/packet-ucp.c @@ -2,7 +2,7 @@ * Routines for Universal Computer Protocol dissection * Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl> * - * $Id: packet-ucp.c,v 1.7 2001/12/03 08:47:28 guy Exp $ + * $Id: packet-ucp.c,v 1.8 2001/12/10 00:25:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1596,18 +1596,18 @@ dissect_ucp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) OT = 10 * OT + (tvb_get_guint8(tvb, UCP_OT_OFFSET + 1) - '0'); /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "UCP"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UCP"); - if (check_col(pinfo->fd, COL_INFO)) { - col_clear(pinfo->fd, COL_INFO); - col_append_fstr(pinfo->fd, COL_INFO, "%s (%s)", + if (check_col(pinfo->cinfo, COL_INFO)) { + col_clear(pinfo->cinfo, COL_INFO); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s (%s)", val_to_str(OT, vals_hdr_OT, "unknown operation"), match_strval(O_R, vals_hdr_O_R)); if (result == UCP_SHORTENED) - col_append_str(pinfo->fd, COL_INFO, " [short packet]"); + col_append_str(pinfo->cinfo, COL_INFO, " [short packet]"); else if (result == UCP_INV_CHK) - col_append_str(pinfo->fd, COL_INFO, " [checksum invalid]"); + col_append_str(pinfo->cinfo, COL_INFO, " [checksum invalid]"); } /* In the interest of speed, if "tree" is NULL, don't do any work not |