diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-08-13 10:57:55 -0700 |
|---|---|---|
| committer | Richard Sharpe <realrichardsharpe@gmail.com> | 2017-08-14 04:40:04 +0000 |
| commit | 3c0ff67a9ca7e9c71785fa9d97cc1c1c13908774 (patch) | |
| tree | 81f89d66267303b04bc11fc5a25c996f8d7d496f /epan/dissectors/packet-ieee80211.h | |
| parent | 329cccfc7b3adabbcd961cc328609f23058e5a12 (diff) | |
ieee80211: Make a few dissector tables for vendor specific functionality
This allows vendors to more easily expand functionality.
Change-Id: Iaa6a0626f3ab3c80a3ea90ca09c90284705d0221
Reviewed-on: https://code.wireshark.org/review/23066
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.h')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.h | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/epan/dissectors/packet-ieee80211.h b/epan/dissectors/packet-ieee80211.h index 1b77a8a0e7..dd60096632 100644 --- a/epan/dissectors/packet-ieee80211.h +++ b/epan/dissectors/packet-ieee80211.h @@ -48,15 +48,6 @@ typedef struct ieee80211_tagged_field_data proto_item* item_tag_length; } ieee80211_tagged_field_data_t; -void dissect_wifi_p2p_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, - int offset, gint size); -int dissect_wifi_p2p_public_action(packet_info *pinfo, proto_tree *tree, - tvbuff_t *tvb, int offset); -void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, - int offset, gboolean request); - -void dissect_wifi_display_ie(packet_info *pinfo, proto_tree *tree, - tvbuff_t *tvb, int offset, gint size); int add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, int ftype, @@ -273,6 +264,23 @@ typedef struct { gchar *string; } uat_wep_key_record_t; +#define ADV_PROTO_ID_ANQP 0 +#define ANV_PROTO_ID_MIH_IS 1 +#define ADV_PROTO_ID_MIH_CESCD 2 +#define ADV_PROTO_ID_EAS 3 +#define ADV_PROTO_ID_VS 221 + +typedef struct anqp_info_dissector_data { + gboolean request; + int idx; +} anqp_info_dissector_data_t; + +/* WFA vendor specific subtypes */ +#define WFA_SUBTYPE_P2P 9 +#define WFA_SUBTYPE_WIFI_DISPLAY 10 +#define WFA_SUBTYPE_HS20_INDICATION 16 +#define WFA_SUBTYPE_HS20_ANQP 17 + /* * Editor modelines * |