aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schultz <andreas.schultz@travelping.com>2021-07-07 18:54:22 +0200
committerJaap Keuter <jaap.keuter@xs4all.nl>2021-07-10 09:53:44 +0000
commitbe7bb332fe6666ce0879233869eb252a07619680 (patch)
tree961f593726b530b55095d0ec0e33b64777551ed7
parent3e42a64f6f54965a80e389bc0704afb987e57286 (diff)
GTPv2: fix decoding of (extended) eNodeB id
3GPP TS 29.274, clause 8.21.7 and 8.21.8 clearly specify a total length of 6 bytes for these fields. (cherry picked from commit 4992806dba09e67ec55921f0f8c964b0a9a0e8c5)
-rw-r--r--epan/dissectors/packet-gtpv2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 2e3f923614..68e9dcfb71 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -3011,7 +3011,7 @@ decode_gtpv2_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item
if (flags & GTPv2_ULI_MACRO_eNB_ID_MASK)
{
proto_item_append_text(item, "Macro eNodeB ID ");
- part_tree = proto_tree_add_subtree(tree, tvb, offset, 7,
+ part_tree = proto_tree_add_subtree(tree, tvb, offset, 6,
ett_gtpv2_uli_field, NULL, "Macro eNodeB ID");
str = dissect_gtpv2_macro_enodeb_id(tvb, pinfo, part_tree, &offset);
@@ -3024,7 +3024,7 @@ decode_gtpv2_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item
if (flags & GTPv2_ULI_EXT_MACRO_eNB_ID_MASK)
{
proto_item_append_text(item, "Ext Macro eNodeB ID ");
- part_tree = proto_tree_add_subtree(tree, tvb, offset, 7,
+ part_tree = proto_tree_add_subtree(tree, tvb, offset, 6,
ett_gtpv2_uli_field, NULL, "Extended Macro eNodeB ID");
str = dissect_gtpv2_ext_macro_enodeb_id(tvb, pinfo, part_tree, &offset, hf_gtpv2_ext_macro_enodeb_id);