osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Robert Sauter 2017-07-14 15:27:51 +02:00 committed by Michael Mann
parent da0ae7e19b
commit abfa43aa27
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-ieee802154.c
View File

@ -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;