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-lpd.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-lpd.c')
| -rw-r--r-- | packet-lpd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/packet-lpd.c b/packet-lpd.c index 04002bc07f..542a57ec56 100644 --- a/packet-lpd.c +++ b/packet-lpd.c @@ -2,7 +2,7 @@ * Routines for LPR and LPRng packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-lpd.c,v 1.31 2001/12/03 03:59:37 guy Exp $ + * $Id: packet-lpd.c,v 1.32 2001/12/10 00:25:30 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -80,10 +80,10 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Bad job format, do not retry" }; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "LPD"); - if (check_col(pinfo->fd, COL_INFO)) - col_clear(pinfo->fd, COL_INFO); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LPD"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); /* rfc1179 states that all responses are 1 byte long */ code = tvb_get_guint8(tvb, 0); @@ -97,15 +97,15 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) lpr_packet_type = unknown; } - if (check_col(pinfo->fd, COL_INFO)) { + if (check_col(pinfo->cinfo, COL_INFO)) { if (lpr_packet_type == request) { - col_add_str(pinfo->fd, COL_INFO, lpd_client_code[code]); + col_add_str(pinfo->cinfo, COL_INFO, lpd_client_code[code]); } else if (lpr_packet_type == response) { - col_set_str(pinfo->fd, COL_INFO, "LPD response"); + col_set_str(pinfo->cinfo, COL_INFO, "LPD response"); } else { - col_set_str(pinfo->fd, COL_INFO, "LPD continuation"); + col_set_str(pinfo->cinfo, COL_INFO, "LPD continuation"); } } |