From 9022877411a539d0561c0d71be3ca63095819d13 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 25 Nov 2016 18:50:49 -0800 Subject: We only need the tvbuff length for EAP messages. Change-Id: I22a5990e12a151c209288b9e879ae1f88c866904 Reviewed-on: https://code.wireshark.org/review/18956 Reviewed-by: Guy Harris --- epan/dissectors/packet-radius.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'epan/dissectors/packet-radius.c') diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 6d81f7bfc6..9e609a212a 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1381,7 +1381,6 @@ dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo, tvbuff_t *tv while (length > 0) { radius_attr_info_t *dictionary_entry = NULL; - gint tvb_len; guint32 avp_type; guint32 avp_length; guint32 vendor_id; @@ -1596,14 +1595,16 @@ dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo, tvbuff_t *tv PROTO_ITEM_SET_GENERATED(avp_len_item); } - tvb_len = tvb_captured_length_remaining(tvb, offset); - - if ((gint)avp_length < tvb_len) - tvb_len = avp_length; - if (avp_type == RADIUS_ATTR_TYPE_EAP_MESSAGE) { + gint tvb_len; + eap_seg_num++; + tvb_len = tvb_captured_length_remaining(tvb, offset); + + if ((gint)avp_length < tvb_len) + tvb_len = avp_length; + /* Show this as an EAP fragment. */ proto_tree_add_item(avp_tree, hf_radius_eap_fragment, tvb, offset, tvb_len, ENC_NA); -- cgit v1.2.3