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-pppoe.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-pppoe.c')
| -rw-r--r-- | packet-pppoe.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/packet-pppoe.c b/packet-pppoe.c index f386983321..8500bcae2b 100644 --- a/packet-pppoe.c +++ b/packet-pppoe.c @@ -1,7 +1,7 @@ /* packet-pppoe.c * Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516) * - * $Id: packet-pppoe.c,v 1.19 2001/12/03 03:59:38 guy Exp $ + * $Id: packet-pppoe.c,v 1.20 2001/12/10 00:25:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -162,11 +162,11 @@ dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *pppoe_tree; proto_item *ti; - if (check_col(pinfo->fd, COL_PROTOCOL)) { - col_set_str(pinfo->fd,COL_PROTOCOL, "PPPoED"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { + col_set_str(pinfo->cinfo,COL_PROTOCOL, "PPPoED"); } - if (check_col(pinfo->fd,COL_INFO)) { - col_clear(pinfo->fd,COL_INFO); + if (check_col(pinfo->cinfo,COL_INFO)) { + col_clear(pinfo->cinfo,COL_INFO); } /* Start Decoding Here. */ @@ -175,8 +175,8 @@ dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { pppoe_type = pppoe_ver_type & 0x0f; pppoe_code = tvb_get_guint8(tvb, 1); - if (check_col(pinfo->fd,COL_INFO)) { - col_add_fstr(pinfo->fd,COL_INFO,pppoecode_to_str(pppoe_code,"Unknown code (0x%02x)")); + if (check_col(pinfo->cinfo,COL_INFO)) { + col_add_fstr(pinfo->cinfo,COL_INFO,pppoecode_to_str(pppoe_code,"Unknown code (0x%02x)")); } pppoe_session_id = tvb_get_ntohs(tvb, 2); @@ -236,11 +236,11 @@ dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; tvbuff_t *next_tvb; - if (check_col(pinfo->fd, COL_PROTOCOL)) { - col_set_str(pinfo->fd,COL_PROTOCOL, "PPPoES"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { + col_set_str(pinfo->cinfo,COL_PROTOCOL, "PPPoES"); } - if (check_col(pinfo->fd,COL_INFO)) { - col_clear(pinfo->fd,COL_INFO); + if (check_col(pinfo->cinfo,COL_INFO)) { + col_clear(pinfo->cinfo,COL_INFO); } /* Start Decoding Here. */ @@ -249,8 +249,8 @@ dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { pppoe_type = pppoe_ver_type & 0x0f; pppoe_code = tvb_get_guint8(tvb, 1); - if (check_col(pinfo->fd,COL_INFO)) { - col_add_fstr(pinfo->fd,COL_INFO, + if (check_col(pinfo->cinfo,COL_INFO)) { + col_add_fstr(pinfo->cinfo,COL_INFO, pppoecode_to_str(pppoe_code,"Unknown code (0x%02x)")); } |