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-lapb.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-lapb.c')
| -rw-r--r-- | packet-lapb.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/packet-lapb.c b/packet-lapb.c index b0ad0e9a6e..2a07db7ea0 100644 --- a/packet-lapb.c +++ b/packet-lapb.c @@ -2,7 +2,7 @@ * Routines for lapb frame disassembly * Olivier Abad <oabad@cybercable.fr> * - * $Id: packet-lapb.c,v 1.31 2001/12/03 03:59:36 guy Exp $ + * $Id: packet-lapb.c,v 1.32 2001/12/10 00:25:30 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -56,30 +56,30 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 byte0; tvbuff_t *next_tvb; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "LAPB"); - 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, "LAPB"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); if (pinfo->pseudo_header->x25.flags & FROM_DCE) { - if(check_col(pinfo->fd, COL_RES_DL_DST)) - col_set_str(pinfo->fd, COL_RES_DL_DST, "DTE"); - if(check_col(pinfo->fd, COL_RES_DL_SRC)) - col_set_str(pinfo->fd, COL_RES_DL_SRC, "DCE"); + if(check_col(pinfo->cinfo, COL_RES_DL_DST)) + col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE"); + if(check_col(pinfo->cinfo, COL_RES_DL_SRC)) + col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE"); } else { - if(check_col(pinfo->fd, COL_RES_DL_DST)) - col_set_str(pinfo->fd, COL_RES_DL_DST, "DCE"); - if(check_col(pinfo->fd, COL_RES_DL_SRC)) - col_set_str(pinfo->fd, COL_RES_DL_SRC, "DTE"); + if(check_col(pinfo->cinfo, COL_RES_DL_DST)) + col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE"); + if(check_col(pinfo->cinfo, COL_RES_DL_SRC)) + col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE"); } byte0 = tvb_get_guint8(tvb, 0); if (byte0 != 0x01 && byte0 != 0x03) /* invalid LAPB frame */ { - if (check_col(pinfo->fd, COL_INFO)) - col_set_str(pinfo->fd, COL_INFO, "Invalid LAPB frame"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_set_str(pinfo->cinfo, COL_INFO, "Invalid LAPB frame"); if (tree) ti = proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0, tvb_length(tvb), "Invalid LAPB frame"); |