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-quakeworld.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-quakeworld.c')
| -rw-r--r-- | packet-quakeworld.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/packet-quakeworld.c b/packet-quakeworld.c index f5a6acfebe..850d3ae2f7 100644 --- a/packet-quakeworld.c +++ b/packet-quakeworld.c @@ -4,7 +4,7 @@ * Uwe Girlich <uwe@planetquake.com> * http://www.idsoftware.com/q1source/q1source.zip * - * $Id: packet-quakeworld.c,v 1.8 2001/12/03 03:59:38 guy Exp $ + * $Id: packet-quakeworld.c,v 1.9 2001/12/10 00:25:33 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -560,8 +560,8 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo, } } - if (check_col(pinfo->fd, COL_INFO)) { - col_append_fstr(pinfo->fd, COL_INFO, " %s", command); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_fstr(pinfo->cinfo, COL_INFO, " %s", command); } if (text_tree && !command_finished) { @@ -723,10 +723,10 @@ dissect_quakeworld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) direction = (pinfo->destport == gbl_quakeworldServerPort) ? DIR_C2S : DIR_S2C; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "QUAKEWORLD"); - if (check_col(pinfo->fd, COL_INFO)) - col_set_str(pinfo->fd, COL_INFO, val_to_str(direction, + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKEWORLD"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_set_str(pinfo->cinfo, COL_INFO, val_to_str(direction, names_direction, "%u")); if (tree) { @@ -746,8 +746,8 @@ dissect_quakeworld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tvb_get_ntohl(tvb, 0) == 0xffffffff) { - if (check_col(pinfo->fd, COL_INFO)) { - col_append_str(pinfo->fd, COL_INFO, " Connectionless"); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_str(pinfo->cinfo, COL_INFO, " Connectionless"); } if (quakeworld_tree) proto_tree_add_uint_format(quakeworld_tree, @@ -758,8 +758,8 @@ dissect_quakeworld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, pinfo, quakeworld_tree, direction); } else { - if (check_col(pinfo->fd, COL_INFO)) { - col_append_str(pinfo->fd, COL_INFO, " Game"); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_str(pinfo->cinfo, COL_INFO, " Game"); } if (quakeworld_tree) proto_tree_add_uint_format(quakeworld_tree, |