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

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>
This commit is contained in:
Alexis La Goutte 2019-09-30 19:12:23 +02:00
parent 6a29a299c7
commit 059e02b704
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-ieee80211.c
View File

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