From fc99bca3cfa0af0e908b4e25156a87f6c7f5d3d9 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Mon, 7 Nov 2016 14:57:56 +0100 Subject: L2TP: Fix dissection when unknown vendor AVP Bug: 13103 Change-Id: I531aeb941bb80a1ac403d5e0ffcb6ba549ea9370 Reviewed-on: https://code.wireshark.org/review/18699 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-l2tp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-l2tp.c') diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index b8358b5f18..91da4b2f7d 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1589,7 +1589,7 @@ static int dissect_l2tp_cisco_avps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ break; default: - proto_tree_add_expert(l2tp_avp_tree, pinfo, &ei_l2tp_vendor_specific_avp_data, tvb, offset, avp_len-6); + proto_tree_add_expert(l2tp_avp_tree, pinfo, &ei_l2tp_vendor_specific_avp_data, tvb, offset, avp_len); break; } offset += avp_len; @@ -1725,7 +1725,7 @@ static int dissect_l2tp_broadband_avps(tvbuff_t *tvb, packet_info *pinfo _U_, pr break; default: - proto_tree_add_expert(l2tp_avp_tree, pinfo, &ei_l2tp_vendor_specific_avp_data, tvb, offset, avp_len-6); + proto_tree_add_expert(l2tp_avp_tree, pinfo, &ei_l2tp_vendor_specific_avp_data, tvb, offset, avp_len); break; } offset += avp_len; @@ -1860,7 +1860,7 @@ static int dissect_l2tp_ericsson_avps(tvbuff_t *tvb, packet_info *pinfo _U_, pro break; default: - proto_tree_add_expert(l2tp_avp_tree, pinfo, &ei_l2tp_vendor_specific_avp_data, tvb, offset, avp_len-6); + proto_tree_add_expert(l2tp_avp_tree, pinfo, &ei_l2tp_vendor_specific_avp_data, tvb, offset, avp_len); break; } offset += avp_len; -- cgit v1.2.3