aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee802154.c
diff options
context:
space:
mode:
authorRobert Sauter <sauter@locoslab.com>2017-07-14 15:27:51 +0200
committerMichael Mann <mmann78@netscape.net>2017-07-19 01:57:54 +0000
commitabfa43aa270d92219f0784c725fe31cad1cdbc69 (patch)
treeec695e18532fcb32db87d64b67757048fff1d0d6 /epan/dissectors/packet-ieee802154.c
parentda0ae7e19b0a3514756f6d0a762b480d744425ac (diff)
IEEE 802.15.4: MPX dissect IEEE 802.11 4WH/GKH with EAPOL dissector
Change-Id: I8972a9a9efef31ab77571f333fb040569fb7de9a Reviewed-on: https://code.wireshark.org/review/22622 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ieee802154.c')
-rw-r--r--epan/dissectors/packet-ieee802154.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 428153b52f..5df65719f8 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -3064,6 +3064,8 @@ dissect_mpx_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *
offset += 1;
switch (kmp_id) {
case IEEE802159_MPX_KMP_ID_IEEE8021X:
+ case IEEE802159_MPX_KMP_ID_IEEE80211_4WH:
+ case IEEE802159_MPX_KMP_ID_IEEE80211_GKH:
dissector = eapol_handle;
break;
@@ -3072,8 +3074,6 @@ dissect_mpx_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *
case IEEE802159_MPX_KMP_ID_IKEV2:
case IEEE802159_MPX_KMP_ID_PANA:
case IEEE802159_MPX_KMP_ID_DRAGONFLY:
- case IEEE802159_MPX_KMP_ID_IEEE80211_4WH:
- case IEEE802159_MPX_KMP_ID_IEEE80211_GKH:
case IEEE802159_MPX_KMP_ID_ETSI_TS_102_887_2:
expert_add_info(pinfo, proto_tree_get_parent(tree), &ei_ieee802159_mpx_unsupported_kmp);
break;