diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-09-30 19:12:23 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-11-10 06:37:09 +0000 |
| commit | 059e02b704b31019e685ce8f9eab1e9f94c39466 (patch) | |
| tree | 3aef39a88457e72ae5fc1cc8b0365036713a6399 | |
| parent | 6a29a299c77e0a9bce0b30d103ca6535343e7364 (diff) | |
ieee80211: avoid duplicate wlan keys for managements frames with parameters
Bug: 16081
Change-Id: I3d2a9ac8058be1a7e7a686c96b8feb8883085c75
Reviewed-on: https://code.wireshark.org/review/34661
Tested-by: Petri Dish Buildbot
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index d76ca2ea89..a692301fb9 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -3082,6 +3082,8 @@ static int hf_ieee80211_addr_staa_resolved = -1; /* station address resolved*/ static int hf_ieee80211_addr = -1; /* Source or destination address subfield */ static int hf_ieee80211_addr_resolved = -1;/*Src/dst address subfield resolved*/ +static int hf_ieee80211_mgt = -1; + /* ************************************************************************* */ /* Header values for QoS control field */ /* ************************************************************************* */ @@ -22462,7 +22464,7 @@ dissect_ieee80211_mgt(guint16 fcf, tvbuff_t *tvb, packet_info *pinfo, proto_tree ieee80211_tvb_invalid = FALSE; - ti = proto_tree_add_item(tree, proto_wlan, tvb, 0, -1, ENC_NA); + ti = proto_tree_add_item(tree, hf_ieee80211_mgt, tvb, 0, -1, ENC_NA); mgt_tree = proto_item_add_subtree(ti, ett_80211_mgt); switch (COMPOSE_FRAME_TYPE(fcf)) @@ -26525,6 +26527,11 @@ proto_register_ieee80211(void) FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + {&hf_ieee80211_mgt, + {"IEEE 802.11 Wireless Management", "wlan.mgt", + FT_PROTOCOL, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, + {&hf_ieee80211_block_ack_control, {"Block Ack Control", "wlan.ba.control", FT_UINT16, BASE_HEX, NULL, 0, |