From 12591d0a42bb06aca52f611bb130c330ad7974d7 Mon Sep 17 00:00:00 2001 From: Bernhard Dick Date: Fri, 23 Dec 2022 15:27:11 +0100 Subject: [PATCH] DECT-NWK: Fix ELI type decoding The extended location information type field is a four bit value. This was handled correctly while displaying, but not by interpreting the value. Hence the according MASK and SHIFT values have been updated. --- epan/dissectors/packet-dect-nwk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-dect-nwk.c b/epan/dissectors/packet-dect-nwk.c index b9046a86fc..123b53969a 100644 --- a/epan/dissectors/packet-dect-nwk.c +++ b/epan/dissectors/packet-dect-nwk.c @@ -1819,8 +1819,8 @@ static const dgt_set_t Dgt0_9_bcd = { #define DECT_NWK_S_IE_LOCATION_AREA_LI_EXTENDED_INCLUDED_MASK 0x80 #define DECT_NWK_S_IE_LOCATION_AREA_LI_EXTENDED_INCLUDED_SHIFT 7 -#define DECT_NWK_S_IE_LOCATION_AREA_ELI_TYPE_MASK 0xE0 -#define DECT_NWK_S_IE_LOCATION_AREA_ELI_TYPE_SHIFT 5 +#define DECT_NWK_S_IE_LOCATION_AREA_ELI_TYPE_MASK 0xF0 +#define DECT_NWK_S_IE_LOCATION_AREA_ELI_TYPE_SHIFT 4 #define DECT_NWK_S_IE_TERMINAL_CAPABILITY_STORED_DISPLAY_CHARACTERS_MASK 0x7F @@ -3180,7 +3180,7 @@ void proto_register_dect_nwk(void) }, { &hf_dect_nwk_s_ie_location_area_eli_type, { "ELI-Type", "dect_nwk.s.ie.location_area.eli_type", FT_UINT8, BASE_HEX, - VALS(dect_nwk_s_ie_location_area_eli_type_val), 0xF0, "Extended Location Information type", HFILL + VALS(dect_nwk_s_ie_location_area_eli_type_val), DECT_NWK_S_IE_LOCATION_AREA_ELI_TYPE_MASK, "Extended Location Information type", HFILL } }, { &hf_dect_nwk_s_ie_location_area_lac,