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-sua.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'packet-sua.c') diff --git a/packet-sua.c b/packet-sua.c index 8d049f5ed4..8aa6172def 100644 --- a/packet-sua.c +++ b/packet-sua.c @@ -6,7 +6,7 @@ * * Copyright 2000, Michael Tüxen * - * $Id: packet-sua.c,v 1.3 2001/12/08 06:41:42 guy Exp $ + * $Id: packet-sua.c,v 1.4 2001/12/10 00:25:36 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -478,9 +478,9 @@ dissect_sua_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto message_type = tvb_get_guint8(common_header_tvb, MESSAGE_TYPE_OFFSET); message_length = tvb_get_ntohl (common_header_tvb, MESSAGE_LENGTH_OFFSET); - if (check_col(pinfo->fd, COL_INFO)) { - col_append_str(pinfo->fd, COL_INFO, val_to_str(message_class * 256 + message_type, sua_message_class_type_acro_values, "reserved")); - col_append_str(pinfo->fd, COL_INFO, " "); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(message_class * 256 + message_type, sua_message_class_type_acro_values, "reserved")); + col_append_str(pinfo->cinfo, COL_INFO, " "); }; if (sua_tree) { @@ -2058,9 +2058,9 @@ dissect_sua_light_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, spare_2 = tvb_get_ntohs(common_header_tvb, SUAL_SPARE_2_OFFSET); message_length = tvb_get_ntohl(common_header_tvb, SUAL_MESSAGE_LENGTH_OFFSET); - if (check_col(pinfo->fd, COL_INFO)) { - col_append_str(pinfo->fd, COL_INFO, val_to_str(message_type, sua_light_message_type_acro_values, "Unknown")); - col_append_str(pinfo->fd, COL_INFO, " "); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(message_type, sua_light_message_type_acro_values, "Unknown")); + col_append_str(pinfo->cinfo, COL_INFO, " "); }; if (sual_tree) { @@ -2130,12 +2130,12 @@ dissect_sua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) /* make entry in the Protocol column on summary display */ switch(sua_version) { case IETF_VERSION08: - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "SUA"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SUA"); break; case SIEMENS_VERSION: - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "SUA-Light"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SUA-Light"); break; } -- cgit v1.2.3