From 23319ff023bcb144347a1307b958359b5226c699 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 10 Dec 2001 00:26:21 +0000 Subject: 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 --- packet-ascend.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'packet-ascend.c') diff --git a/packet-ascend.c b/packet-ascend.c index dfa4269129..cadcf3f44c 100644 --- a/packet-ascend.c +++ b/packet-ascend.c @@ -1,7 +1,7 @@ /* packet-ascend.c * Routines for decoding Lucent/Ascend packet traces * - * $Id: packet-ascend.c,v 1.27 2001/12/03 03:59:33 guy Exp $ + * $Id: packet-ascend.c,v 1.28 2001/12/10 00:25:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -61,14 +61,14 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* load the top pane info. This should be overwritten by the next protocol in the stack */ - if(check_col(pinfo->fd, COL_RES_DL_SRC)) - col_set_str(pinfo->fd, COL_RES_DL_SRC, "N/A" ); - if(check_col(pinfo->fd, COL_RES_DL_DST)) - col_set_str(pinfo->fd, COL_RES_DL_DST, "N/A" ); - if(check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "N/A" ); - if(check_col(pinfo->fd, COL_INFO)) - col_set_str(pinfo->fd, COL_INFO, "Lucent/Ascend packet trace" ); + if(check_col(pinfo->cinfo, COL_RES_DL_SRC)) + col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" ); + if(check_col(pinfo->cinfo, COL_RES_DL_DST)) + col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" ); + if(check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A" ); + if(check_col(pinfo->cinfo, COL_INFO)) + col_set_str(pinfo->cinfo, COL_INFO, "Lucent/Ascend packet trace" ); /* populate a tree in the second pane with the status of the link layer (ie none) */ -- cgit v1.2.3