From 8c64c5da892b3861260950d8bd34b6c2f9acd2d4 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 27 Oct 2013 20:38:42 +0000 Subject: Remove iplen and iphdrlen from struct _packet_info. Dissectors should just use (reported) tvb length and taps have other ways to get the data. svn path=/trunk/; revision=52899 --- epan/dissectors/packet-ehs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-ehs.c') diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 457567f1e5..75ce039440 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -867,7 +867,7 @@ aoslos_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, int* offset, p proto_tree *ehs_data_zone_tree; /* create the data zone tree */ - ehs_data_zone = proto_tree_add_text ( ehs_tree, tvb, *offset, pinfo->iplen - IP_HEADER_LENGTH - *offset, "AOS/LOS Data Zone" ); + ehs_data_zone = proto_tree_add_text ( ehs_tree, tvb, *offset, tvb_reported_length(tvb) - *offset, "AOS/LOS Data Zone" ); ehs_data_zone_tree = proto_item_add_subtree ( ehs_data_zone, ett_ehs_data_zone ); /* since the aos/los EHS packet data zone is well known, format it for display as well @@ -902,7 +902,7 @@ udsm_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, int* offset, pac int year, jday, hour, minute, second; /* create the data zone tree */ - ehs_data_zone = proto_tree_add_text ( ehs_tree, tvb, *offset, pinfo->iplen - IP_HEADER_LENGTH - *offset, "UDSM Data Zone" ); + ehs_data_zone = proto_tree_add_text ( ehs_tree, tvb, *offset, tvb_reported_length(tvb) - *offset, "UDSM Data Zone" ); ehs_data_zone_tree = proto_item_add_subtree ( ehs_data_zone, ett_ehs_data_zone ); proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_ccsds_vs_bpdu, tvb, *offset, 1, ENC_BIG_ENDIAN ); -- cgit v1.2.3