aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Sharpe <realrichardsharpe@gmail.com>2019-12-02 19:55:52 -0500
committerAnders Broman <a.broman58@gmail.com>2019-12-03 03:18:53 +0000
commitc72413ec14357375bf2a36587c1492b8c73b4dcc (patch)
tree739a5697d45b7e8e8e48180c7160658257134062
parente253e62750b5d5ec74b8368ea1e1e2dd933fb336 (diff)
ieee1905: Fix an incorrect bit usage in the Client Association Even TLV.
Bug: 16246 Change-Id: Ic5962782b8a04d3e3bc4f9e00596ecca9359841e Reviewed-on: https://code.wireshark.org/review/35300 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-ieee1905.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c
index dfdae4a140..e50a7a596e 100644
--- a/epan/dissectors/packet-ieee1905.c
+++ b/epan/dissectors/packet-ieee1905.c
@@ -177,6 +177,7 @@ static int hf_ieee1905_client_mac_addr = -1;
static int hf_ieee1905_client_capability_result = -1;
static int hf_ieee1905_client_capability_frame = -1;
static int hf_ieee1905_association_flag = -1;
+static int hf_ieee1905_association_event_reserved = -1;
static int hf_ieee1905_association_client_mac_addr = -1;
static int hf_ieee1905_association_agent_bssid = -1;
static int hf_ieee1905_association_event_flags = -1;
@@ -3985,6 +3986,7 @@ dissect_client_association_event(tvbuff_t *tvb, packet_info *pinfo _U_,
{
static const int *association_flags[] = {
&hf_ieee1905_association_flag,
+ &hf_ieee1905_association_event_reserved,
NULL,
};
@@ -7811,7 +7813,11 @@ proto_register_ieee1905(void)
{ &hf_ieee1905_association_flag,
{ "Association event", "ieee1905.assoc_event.assoc_event",
- FT_BOOLEAN, 8, TFS(&tfs_ieee1905_association_event_flag), 0x20, NULL, HFILL }},
+ FT_BOOLEAN, 8, TFS(&tfs_ieee1905_association_event_flag), 0x80, NULL, HFILL }},
+
+ { &hf_ieee1905_association_event_reserved,
+ { "Reserverd", "ieee1905.assoc_event.assoc_event_reserved",
+ FT_UINT8, BASE_HEX, NULL, 0x7F, NULL, HFILL }},
{ &hf_ieee1905_association_client_mac_addr,
{ "Client mac address", "ieee1905.assoc_event.client_mac",