Don't assume we have a protocol tree.

In the association_sanity_check_t structure:

Have separate flags to indicate whether we *have* an IE specifying an
FT AKM suite and whether we *have* an IE specifying a non-FT AKM suite.
Use those to decide whether to add an expert info, so we add it
regardless of whether we are building a protocol tree or not.

Set the protocol tree item for the first FT AKM suite and the first
non-FT AKM suite only if we have a protocol tree.

Bug: 13149
Change-Id: I16a3194017b34d8d2c9128364c2761d1c202969d
Reviewed-on: https://code.wireshark.org/review/18863
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 3 insertions, 1 deletions

diff --git a/epan/dissectors/packet-ieee80211.h b/epan/dissectors/packet-ieee80211.h
index f983038b81..54eb5b4ff2 100644
--- a/epan/dissectors/packet-ieee80211.h
+++ b/epan/dissectors/packet-ieee80211.h
@@ -32,7 +32,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 typedef struct {
-  int association_has_mobility_domain_element;
+  gboolean association_has_mobility_domain_element;
+  gboolean has_ft_akm_suite;
+  gboolean has_non_ft_akm_suite;
   proto_node *rsn_first_ft_akm_suite;
   proto_node *rsn_first_non_ft_akm_suite;
 } association_sanity_check_t;