aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorUli Heilmeier <uh@heilmeier.eu>2021-09-04 11:17:08 +0200
committerUli Heilmeier <uh@heilmeier.eu>2021-09-04 11:17:08 +0200
commit86d5606be3d77d689f6b47e0c93165a1123cd58b (patch)
tree9095ef92b69f257649b5620249d62e16b7c78151 /epan
parent8ef6f04f5ac5f927d92e2f20bb79beeefe7c2e06 (diff)
IEEE 802.15.4: Add PAN ID when flag is set
According to IEEE 802.15.4-2020 Section 7.3.5.1 Destination PAN ID field is present when PAN ID Present bit is set. Therefore we should check for the bit. Fixes: wireshark/wireshark#17496
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ieee802154.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 54f57a1d08..dbc15a90df 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -1624,6 +1624,7 @@ dissect_ieee802154_fcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee
/* The second octet of the FCF is only present if the long frame control bit is set */
if (packet->long_frame_control) {
+ packet->pan_id_present = (fcf & IEEE802154_MPF_FCF_PAN_ID_PRESENT) >> 8;
packet->security_enable = (fcf & IEEE802154_MPF_FCF_SEC_EN) >> 9;
packet->seqno_suppression = (fcf & IEEE802154_MPF_FCF_SEQNO_SUPPRESSION) >> 10;
packet->frame_pending = (fcf & IEEE802154_MPF_FCF_FRAME_PND) >> 11;