* Dutin Johnson - 802.11n and portions of 802.11k and 802.11ma
* dustin@dustinj.us & dustin.johnson@cacetech.com
*
- * 04/21/2008 - Added dissection for 802.11p
+ * 01/31/2008 - Added dissection of 802.11s
+ * Javier Cardona <javier@cozybit.com>
+ *
+ * 04/21/2008 - Added dissection for 802.11p
* Arada Systems <http://www.aradasystems.com>
+ *
+ * Enhance 802.11 dissector by Alexis La Goutte
+ */
+
+/*
+ * Reference :
+ * The 802.11 standard is "free", 6 month after the publication.
+ *
+ * IEEE Std 802.11-2007: Revision of IEEE Std 802.11-199
+ * include 8 amendments (802.11a,b,d,e,g,h,i,j)
+ * http://standards.ieee.org/getieee802/download/802.11-2007.pdf
+ *
+ * IEEE Std 802.11k-2008: Radio Resource Measurement of Wireless LANs
+ * http://standards.ieee.org/getieee802/download/802.11k-2008.pdf
+ *
+ * IEEE Std 802.11r-2008: Fast Basic Service Set (BSS) Transition
+ * http://standards.ieee.org/getieee802/download/802.11r-2008.pdf
+ *
+ * IEEE Std 802.11y-2008: 3650-3700 MHz Operation in USA
+ * http://standards.ieee.org/getieee802/download/802.11y-2008.pdf
+ *
+ * IEEE Std 802.11w-2009: Protected Management Frames
+ * http://standards.ieee.org/getieee802/download/802.11w-2009.pdf
+ *
+ * IEEE Std 802.11n-2009: Enhancements for Higher Throughput
+ * http://standards.ieee.org/getieee802/download/802.11n-2009.pdf
+ *
+ * IEEE Std 802.11p-2010: Wireless Access in Vehicular Environments
+ * http://standards.ieee.org/getieee802/download/802.11p-2010.pdf
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <stdio.h>
#include <stdlib.h>
-
#include <string.h>
-#include <glib.h>
#include <math.h>
-#include <epan/bitswap.h>
-#include <epan/proto.h>
+
+#include <glib.h>
+
#include <epan/packet.h>
+#include <epan/bitswap.h>
#include <epan/addr_resolv.h>
#include <epan/strutil.h>
#include <epan/prefs.h>
#include <epan/tap.h>
#include <epan/emem.h>
#include <epan/crypt/wep-wpadefs.h>
-
-#include <ctype.h>
-#include "isprint.h"
+#include <epan/expert.h>
#include "packet-wps.h"
+#include "packet-wifi-p2p.h"
#ifndef roundup2
-#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
+#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
#endif
/* Defragment fragmented 802.11 datagrams */
#define HTC_AC_CONSTRAINT(htc) (((htc) >> 30) & 0x1)
#define HTC_RDG_MORE_PPDU(htc) (((htc) >> 31) & 0x1)
-/*
- * Extract the association ID from the value in an association ID field.
- */
-#define ASSOC_ID(x) ((x) & 0x3FFF)
-
/*
* Extract subfields from the key octet in WEP-encrypted frames.
*/
#define KEY_OCTET_WEP_KEY(x) (((x) & 0xC0) >> 6)
-/*
- * Extract subfields from TS Info field.
- */
-#define TSI_TYPE(x) (((x) & 0x000001) >> 0)
-#define TSI_TSID(x) (((x) & 0x00001E) >> 1)
-#define TSI_DIR(x) (((x) & 0x000060) >> 5)
-#define TSI_ACCESS(x) (((x) & 0x000180) >> 7)
-#define TSI_AGG(x) (((x) & 0x000200) >> 9)
-#define TSI_APSD(x) (((x) & 0x000400) >> 10)
-#define TSI_UP(x) (((x) & 0x003800) >> 11)
-#define TSI_ACK(x) (((x) & 0x00C000) >> 14)
-#define TSI_SCHED(x) (((x) & 0x010000) >> 16)
-#define TSI_RESERVED(x) (((x) & 0xFE0000) >> 17)
-
#define KEY_EXTIV 0x20
#define EXTIV_LEN 8
+/* Uncomment for 802.11s draft (mesh) support */
+/* #define MESH_OVERRIDES 1 */
+#ifdef MESH_OVERRIDES
+/*
+ * Bits from the Mesh Flags field
+ */
+#define MESH_FLAGS_ADDRESS_EXTENSION 0x3
+#endif /* MESH_OVERRIDES */
/* ************************************************************************* */
/* Constants used to identify cooked frame types */
#define DATA_QOS_CF_ACK_POLL_NOD 0x2F /* QoS CF-Ack + CF-Poll (No Data) */
-/* ************************************************************************* */
-/* Macros used to extract information about fixed fields */
-/* ************************************************************************* */
-#define ESS_SET(x) ((x) & 0x0001)
-#define IBSS_SET(x) ((x) & 0x0002)
-
-
-
/* ************************************************************************* */
/* Logical field codes (dissector's encoding of fixed fields) */
/* ************************************************************************* */
#define FIELD_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT 0x2E
#define FIELD_HT_INFORMATION 0x2F
#define FIELD_HT_ACTION_CODE 0x30
+#define FIELD_PA_ACTION_CODE 0x31
+#define FIELD_FT_ACTION_CODE 0x32
+#define FIELD_STA_ADDRESS 0x33
+#define FIELD_TARGET_AP_ADDRESS 0x34
+#define FIELD_MESH_MGT_ACTION_PS_CODE 0x35 /* Mesh Management action peer link code */
+#define FIELD_MESH_MGT_ACTION_PL_CODE 0x36 /* Mesh Management action peer link code */
+#define FIELD_GAS_COMEBACK_DELAY 0x37
+#define FIELD_GAS_FRAGMENT_ID 0x38
+#define FIELD_SA_QUERY_ACTION_CODE 0x39
+#define FIELD_TRANSACTION_ID 0x3A
+#define FIELD_TDLS_ACTION_CODE 0x3B
+#define FIELD_TARGET_CHANNEL 0x3C
+#define FIELD_REGULATORY_CLASS 0x3D
+
/* ************************************************************************* */
/* Logical field codes (IEEE 802.11 encoding of tags) */
/* ************************************************************************* */
-#define TAG_SSID 0x00
-#define TAG_SUPP_RATES 0x01
-#define TAG_FH_PARAMETER 0x02
-#define TAG_DS_PARAMETER 0x03
-#define TAG_CF_PARAMETER 0x04
-#define TAG_TIM 0x05
-#define TAG_IBSS_PARAMETER 0x06
-#define TAG_COUNTRY_INFO 0x07
-#define TAG_FH_HOPPING_PARAMETER 0x08
-#define TAG_FH_HOPPING_TABLE 0x09
-#define TAG_REQUEST 0x0A
-#define TAG_QBSS_LOAD 0x0B
-#define TAG_EDCA_PARAM_SET 0x0C
-#define TAG_TSPEC 0x0D
-#define TAG_TCLAS 0x0E
-#define TAG_SCHEDULE 0x0F
-#define TAG_CHALLENGE_TEXT 0x10
-#define TAG_POWER_CONSTRAINT 0x20
-#define TAG_POWER_CAPABILITY 0x21
-#define TAG_TPC_REQUEST 0x22
-#define TAG_TPC_REPORT 0x23
-#define TAG_SUPPORTED_CHANNELS 0x24
-#define TAG_CHANNEL_SWITCH_ANN 0x25
-#define TAG_MEASURE_REQ 0x26
-#define TAG_MEASURE_REP 0x27
-#define TAG_QUIET 0x28
-#define TAG_IBSS_DFS 0x29
-#define TAG_ERP_INFO 0x2A
-#define TAG_TS_DELAY 0x2B
-#define TAG_TCLAS_PROCESS 0x2C
-#define TAG_HT_CAPABILITY 0x2D /* IEEE Stc 802.11n/D2.0 */
-#define TAG_QOS_CAPABILITY 0x2E
-#define TAG_ERP_INFO_OLD 0x2F /* IEEE Std 802.11g/D4.0 */
-#define TAG_RSN_IE 0x30
+#define TAG_SSID 0
+#define TAG_SUPP_RATES 1
+#define TAG_FH_PARAMETER 2
+#define TAG_DS_PARAMETER 3
+#define TAG_CF_PARAMETER 4
+#define TAG_TIM 5
+#define TAG_IBSS_PARAMETER 6
+#define TAG_COUNTRY_INFO 7
+#define TAG_FH_HOPPING_PARAMETER 8
+#define TAG_FH_HOPPING_TABLE 9
+#define TAG_REQUEST 10
+#define TAG_QBSS_LOAD 11
+#define TAG_EDCA_PARAM_SET 12
+#define TAG_TSPEC 13
+#define TAG_TCLAS 14
+#define TAG_SCHEDULE 15
+#define TAG_CHALLENGE_TEXT 16
+
+#define TAG_POWER_CONSTRAINT 32
+#define TAG_POWER_CAPABILITY 33
+#define TAG_TPC_REQUEST 34
+#define TAG_TPC_REPORT 35
+/* 36 - 41 below */
+#define TAG_ERP_INFO 42
+#define TAG_TS_DELAY 43
+#define TAG_TCLAS_PROCESS 44
+#define TAG_HT_CAPABILITY 45 /* IEEE Stc 802.11n/D2.0 */
+#define TAG_QOS_CAPABILITY 46
+#define TAG_ERP_INFO_OLD 47 /* IEEE Std 802.11g/D4.0 */
+#define TAG_RSN_IE 48
/* Reserved 49 */
-#define TAG_EXT_SUPP_RATES 0x32
-#define TAG_NEIGHBOR_REPORT 0x34
-#define TAG_HT_INFO 0x3D /* IEEE Stc 802.11n/D2.0 */
-#define TAG_SECONDARY_CHANNEL_OFFSET 0x3E /* IEEE Stc 802.11n/D1.10/D2.0 */
-#define TAG_WSIE 0x45 /* tag of the Wave Service Information (802.11p) */
-#define TAG_20_40_BSS_CO_EX 0x48 /* IEEE P802.11n/D6.0 */
-#define TAG_20_40_BSS_INTOL_CH_REP 0x49 /* IEEE P802.11n/D6.0 */
-#define TAG_OVERLAP_BSS_SCAN_PAR 0x49 /* IEEE P802.11n/D6.0 */
-#define TAG_EXTENDED_CAPABILITIES 0X7F /* IEEE Stc 802.11n/D1.10/D2.0 */
-#define TAG_AGERE_PROPRIETARY 0x80
-#define TAG_CISCO_CCX1_CKIP 0x85 /* Cisco Compatible eXtensions */
-#define TAG_CISCO_UNKNOWN_88 0x88 /* Cisco Compatible eXtensions? */
-#define TAG_CISCO_UNKNOWN_95 0x95 /* Cisco Compatible eXtensions */
-#define TAG_CISCO_UNKNOWN_96 0x96 /* Cisco Compatible eXtensions */
-#define TAG_VENDOR_SPECIFIC_IE 0xDD
-#define TAG_SYMBOL_PROPRIETARY 0xAD
-#if 0 /* Not yet assigned tag numbers by ANA */
-#define TAG_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT 0xFF
-#define TAG_SUPPORTED_REGULATORY_CLASSES 0xFE
+#define TAG_EXT_SUPP_RATES 50
+#define TAG_AP_CHANNEL_REPORT 51
+/* 52 below */
+#define TAG_RCPI 53
+#define TAG_MOBILITY_DOMAIN 54 /* IEEE Std 802.11r-2008 */
+/* 55 below */
+#define TAG_TIMEOUT_INTERVAL 56 /* IEEE Std 802.11r-2008 */
+#define TAG_RIC_DATA 57 /* IEEE Std 802.11r-2008 */
+/* 58 ??? */
+#define TAG_SUPPORTED_REGULATORY_CLASSES 59 /* IEEE Std 802.11w-2009 */
+#define TAG_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT 60 /* IEEE Std 802.11w-2009 */
+#define TAG_HT_INFO 61 /* IEEE Stc 802.11n/D2.0 */
+#define TAG_SECONDARY_CHANNEL_OFFSET 62 /* IEEE Stc 802.11n/D1.10/D2.0 */
+/* 69 below */
+#define TAG_20_40_BSS_CO_EX 72 /* IEEE P802.11n/D6.0 */
+#define TAG_20_40_BSS_INTOL_CH_REP 73 /* IEEE P802.11n/D6.0 */
+#define TAG_OVERLAP_BSS_SCAN_PAR 74 /* IEEE P802.11n/D6.0 */
+#define TAG_RIC_DESCRIPTOR 75 /* IEEE Std 802.11r-2008 */
+#define TAG_MMIE 76 /* IEEE Std 802.11w-2009 */
+#define TAG_LINK_IDENTIFIER 101 /* IEEE Std 802.11z-2010 */
+#define TAG_WAKEUP_SCHEDULE 102 /* IEEE Std 802.11z-2010 */
+#define TAG_CHANNEL_SWITCH_TIMING 104 /* IEEE Std 802.11z-2010 */
+#define TAG_PTI_CONTROL 105 /* IEEE Std 802.11z-2010 */
+#define TAG_PU_BUFFER_STATUS 106 /* IEEE Std 802.11z-2010 */
+#define TAG_ADVERTISEMENT_PROTOCOL 108 /* IEEE P802.11u/D10.0 */
+#define TAG_EXTENDED_CAPABILITIES 127 /* IEEE Stc 802.11n/D1.10/D2.0 */
+#define TAG_AGERE_PROPRIETARY 128
+#define TAG_CISCO_CCX1_CKIP 133 /* Cisco Compatible eXtensions */
+#define TAG_CISCO_UNKNOWN_88 136 /* Cisco Compatible eXtensions? */
+#define TAG_CISCO_UNKNOWN_95 149 /* Cisco Compatible eXtensions */
+#define TAG_CISCO_UNKNOWN_96 150 /* Cisco Compatible eXtensions */
+#define TAG_SYMBOL_PROPRIETARY 173
+#define TAG_VENDOR_SPECIFIC_IE 221
+
+#ifndef MESH_OVERRIDES
+#define TAG_SUPPORTED_CHANNELS 36
+#define TAG_CHANNEL_SWITCH_ANN 37
+#define TAG_MEASURE_REQ 38
+#define TAG_MEASURE_REP 39
+#define TAG_QUIET 40
+#define TAG_IBSS_DFS 41
+#define TAG_NEIGHBOR_REPORT 52
+#define TAG_FAST_BSS_TRANSITION 55 /* IEEE Std 802.11r-2008 */
+#define TAG_WSIE 69 /* tag of the Wave Service Information (802.11p) */
+#else /* MESH_OVERRIDES */
+#define TAG_SUPPORTED_CHANNELS 224
+#define TAG_CHANNEL_SWITCH_ANN 225
+#define TAG_MEASURE_REQ 226
+#define TAG_MEASURE_REP 227
+#define TAG_QUIET 228
+#define TAG_IBSS_DFS 229
+/* Not yet assigned by ANA */
+#define TAG_MESH_CONFIGURATION 51
+#define TAG_MESH_ID 52
+#define TAG_MESH_PEER_LINK_MGMT 55
+#define TAG_MESH_PREQ 68
+#define TAG_MESH_PREP 69
+#define TAG_MESH_PERR 70
+#endif /* MESH_OVERRIDES */
+
+static const range_string tag_num_vals[] = {
+ { TAG_SSID, TAG_SSID, "SSID parameter set" },
+ { TAG_SUPP_RATES, TAG_SUPP_RATES, "Supported Rates" },
+ { TAG_FH_PARAMETER, TAG_FH_PARAMETER, "FH Parameter set" },
+ { TAG_DS_PARAMETER, TAG_DS_PARAMETER, "DS Parameter set" },
+ { TAG_CF_PARAMETER, TAG_CF_PARAMETER, "CF Parameter set" },
+ { TAG_TIM, TAG_TIM, "Traffic Indication Map (TIM)" },
+ { TAG_IBSS_PARAMETER, TAG_IBSS_PARAMETER, "IBSS Parameter set" },
+ { TAG_COUNTRY_INFO, TAG_COUNTRY_INFO, "Country Information" },
+ { TAG_FH_HOPPING_PARAMETER, TAG_FH_HOPPING_PARAMETER, "Hopping Pattern Parameters" },
+ { TAG_FH_HOPPING_TABLE, TAG_FH_HOPPING_TABLE, "Hopping Pattern Table" },
+ { TAG_REQUEST, TAG_REQUEST, "Request" },
+ { TAG_QBSS_LOAD, TAG_QBSS_LOAD, "QBSS Load Element" },
+ { TAG_EDCA_PARAM_SET, TAG_EDCA_PARAM_SET, "EDCA Parameter Set" },
+ { TAG_TSPEC, TAG_TSPEC, "Traffic Specification" },
+ { TAG_TCLAS, TAG_TCLAS, "Traffic Classification" },
+ { TAG_SCHEDULE, TAG_SCHEDULE, "Schedule" },
+ { TAG_CHALLENGE_TEXT, TAG_CHALLENGE_TEXT,"Challenge text" },
+ { 17, 31, "Reserved" },
+ { TAG_POWER_CONSTRAINT, TAG_POWER_CONSTRAINT, "Power Constraint" },
+ { TAG_POWER_CAPABILITY, TAG_POWER_CAPABILITY, "Power Capability" },
+ { TAG_TPC_REQUEST, TAG_TPC_REQUEST, "TPC Request" },
+ { TAG_TPC_REPORT, TAG_TPC_REPORT, "TPC Report" },
+ { TAG_SUPPORTED_CHANNELS, TAG_SUPPORTED_CHANNELS, "Supported Channels" },
+ { TAG_CHANNEL_SWITCH_ANN, TAG_CHANNEL_SWITCH_ANN, "Channel Switch Announcement" },
+ { TAG_MEASURE_REQ, TAG_MEASURE_REQ, "Measurement Request" },
+ { TAG_MEASURE_REP, TAG_MEASURE_REP, "Measurement Report" },
+ { TAG_QUIET, TAG_QUIET, "Quiet" },
+ { TAG_IBSS_DFS, TAG_IBSS_DFS, "IBSS DFS" },
+ { TAG_ERP_INFO, TAG_ERP_INFO, "ERP Information" },
+ { TAG_TS_DELAY, TAG_TS_DELAY, "TS Delay" },
+ { TAG_TCLAS_PROCESS, TAG_TCLAS_PROCESS, "TCLAS Processing" },
+ { TAG_HT_CAPABILITY, TAG_HT_CAPABILITY, "HT Capabilities (802.11n D1.10)" },
+ { TAG_QOS_CAPABILITY, TAG_QOS_CAPABILITY, "QoS Capability" },
+ { TAG_ERP_INFO_OLD, TAG_ERP_INFO_OLD, "ERP Information" }, /* Reserved... */
+ { TAG_RSN_IE, TAG_RSN_IE, "RSN Information" },
+ { TAG_EXT_SUPP_RATES, TAG_EXT_SUPP_RATES, "Extended Supported Rates" },
+ { TAG_AP_CHANNEL_REPORT, TAG_AP_CHANNEL_REPORT, "AP Channel Report" },
+#ifndef MESH_OVERRIDES
+ { TAG_NEIGHBOR_REPORT, TAG_NEIGHBOR_REPORT, "Neighbor Report" },
+#endif
+ { TAG_RCPI, TAG_RCPI, "RCPI" },
+ { TAG_MOBILITY_DOMAIN, TAG_MOBILITY_DOMAIN, "Mobility Domain" },
+#ifndef MESH_OVERRIDES
+ { TAG_FAST_BSS_TRANSITION, TAG_FAST_BSS_TRANSITION, "Fast BSS Transition" },
+#endif
+ { TAG_TIMEOUT_INTERVAL, TAG_TIMEOUT_INTERVAL,"Timeout Interval" },
+ { TAG_RIC_DATA, TAG_RIC_DATA, "RIC Data" },
+ { TAG_SUPPORTED_REGULATORY_CLASSES, TAG_SUPPORTED_REGULATORY_CLASSES, "Supported Regulatory Classes" },
+ { TAG_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT, TAG_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT, "Extended Channel Switch Announcement" },
+ { TAG_HT_INFO, TAG_HT_INFO, "HT Information (802.11n D1.10)" },
+ { TAG_SECONDARY_CHANNEL_OFFSET, TAG_SECONDARY_CHANNEL_OFFSET, "Secondary Channel Offset (802.11n D1.10)" },
+#ifndef MESH_OVERRIDES
+ { TAG_WSIE, TAG_WSIE, "Wave Service Information" }, /* www.aradasystems.com */
#endif
+ { TAG_20_40_BSS_CO_EX, TAG_20_40_BSS_CO_EX, "20/40 BSS Coexistence" },
+ { TAG_20_40_BSS_INTOL_CH_REP, TAG_20_40_BSS_INTOL_CH_REP, "20/40 BSS Intolerant Channel Report" }, /* IEEE P802.11n/D6.0 */
+ { TAG_OVERLAP_BSS_SCAN_PAR, TAG_OVERLAP_BSS_SCAN_PAR, "Overlapping BSS Scan Parameters" }, /* IEEE P802.11n/D6.0 */
+ { TAG_RIC_DESCRIPTOR, TAG_RIC_DESCRIPTOR, "RIC Descriptor" },
+ { TAG_MMIE, TAG_MMIE, "Management MIC" },
+ { TAG_LINK_IDENTIFIER, TAG_LINK_IDENTIFIER, "Link Identifier" },
+ { TAG_WAKEUP_SCHEDULE, TAG_WAKEUP_SCHEDULE, "Wakeup Schedule" },
+ { TAG_CHANNEL_SWITCH_TIMING, TAG_CHANNEL_SWITCH_TIMING, "Channel Switch Timing" },
+ { TAG_PTI_CONTROL, TAG_PTI_CONTROL, "PTI Control" },
+ { TAG_PU_BUFFER_STATUS, TAG_PU_BUFFER_STATUS, "PU Buffer Status" },
+ { TAG_ADVERTISEMENT_PROTOCOL, TAG_ADVERTISEMENT_PROTOCOL, "Advertisement Protocol"},
+ { TAG_EXTENDED_CAPABILITIES, TAG_EXTENDED_CAPABILITIES, "Extended Capabilities" },
+ { TAG_AGERE_PROPRIETARY, TAG_AGERE_PROPRIETARY, "Agere Proprietary" },
+ { TAG_CISCO_CCX1_CKIP, TAG_CISCO_CCX1_CKIP, "Cisco CCX1 CKIP + Device Name" },
+ { TAG_CISCO_UNKNOWN_88, TAG_CISCO_UNKNOWN_88, "Cisco Unknown 88" },
+ { TAG_CISCO_UNKNOWN_95, TAG_CISCO_UNKNOWN_95, "Cisco Unknown 95" },
+ { TAG_CISCO_UNKNOWN_96, TAG_CISCO_UNKNOWN_96, "Cisco Unknown 96" },
+ { TAG_SYMBOL_PROPRIETARY, TAG_SYMBOL_PROPRIETARY, "Symbol Proprietary" },
+ { TAG_VENDOR_SPECIFIC_IE, TAG_VENDOR_SPECIFIC_IE, "Vendor Specific" },
+#ifdef MESH_OVERRIDES
+ { TAG_MESH_ID, TAG_MESH_ID, "Mesh ID" },
+ { TAG_MESH_CONFIGURATION, TAG_MESH_CONFIGURATION, "Mesh Configuration" },
+ { TAG_MESH_PEER_LINK_MGMT, TAG_MESH_PEER_LINK_MGMT, "Mesh Peer Link Management" },
+ { TAG_MESH_PREQ, TAG_MESH_PREQ, "Mesh Path Request" },
+ { TAG_MESH_PREP, TAG_MESH_PREP, "Mesh Path Response" },
+ { TAG_MESH_PERR, TAG_MESH_PERR, "Mesh Path Error" },
+#endif /* MESH_OVERRIDES */
+ { 0, 0, NULL }
+};
#define WPA_OUI (const guint8 *) "\x00\x50\xF2"
#define RSN_OUI (const guint8 *) "\x00\x0F\xAC"
#define WME_OUI (const guint8 *) "\x00\x50\xF2"
#define PRE_11N_OUI (const guint8 *) "\x00\x90\x4c" /* 802.11n pre 1 oui */
+#define WFA_OUI (const guint8 *) "\x50\x6f\x9a"
+
+/* WFA vendor specific subtypes */
+#define WFA_SUBTYPE_P2P 9
#define PMKID_LEN 16
#define WAVE_IPV6ADDR 0x0020
#define WAVE_PEERMAC 0x0040
+/* ************************************************************************* */
+/* Supported Rates (7.3.2.2) */
+/* ************************************************************************* */
-
+static const value_string ieee80211_supported_rates_vals[] = {
+ { 0x02, "1" },
+ { 0x03, "1.5" },
+ { 0x04, "2" },
+ { 0x05, "2.5" },
+ { 0x06, "3" },
+ { 0x09, "4.5" },
+ { 0x0B, "5.5" },
+ { 0x0C, "6" },
+ { 0x12, "9" },
+ { 0x16, "11" },
+ { 0x18, "12" },
+ { 0x1B, "13.5" },
+ { 0x24, "18" },
+ { 0x2C, "22" },
+ { 0x30, "24" },
+ { 0x36, "27" },
+ { 0x42, "33" },
+ { 0x48, "36" },
+ { 0x60, "48" },
+ { 0x6C, "54" },
+ { 0x82, "1(B)" },
+ { 0x83, "1.5(B)" },
+ { 0x84, "2(B)" },
+ { 0x85, "2.5(B)" },
+ { 0x86, "3(B)" },
+ { 0x89, "4.5(B)" },
+ { 0x8B, "5.5(B)" },
+ { 0x8C, "6(B)" },
+ { 0x92, "9(B)" },
+ { 0x96, "11(B)" },
+ { 0x98, "12(B)" },
+ { 0x9B, "13.5(B)" },
+ { 0xA4, "18(B)" },
+ { 0xAC, "22(B)" },
+ { 0xB0, "24(B)" },
+ { 0xB6, "27(B)" },
+ { 0xC2, "33(B)" },
+ { 0xC8, "36(B)" },
+ { 0xE0, "48(B)" },
+ { 0xEC, "54(B)" },
+ { 0xFF, "BSS requires support for mandatory features of HT PHY (IEEE 802.11 - Clause 20)" },
+ { 0, NULL}
+};
/* ************************************************************************* */
/* Frame types, and their names */
/* ************************************************************************* */
static const value_string frame_type_subtype_vals[] = {
- {MGT_ASSOC_REQ, "Association Request"},
- {MGT_ASSOC_RESP, "Association Response"},
- {MGT_REASSOC_REQ, "Reassociation Request"},
- {MGT_REASSOC_RESP, "Reassociation Response"},
- {MGT_PROBE_REQ, "Probe Request"},
- {MGT_PROBE_RESP, "Probe Response"},
- {MGT_MEASUREMENT_PILOT,"Measurement Pilot"},
- {MGT_BEACON, "Beacon frame"},
- {MGT_ATIM, "ATIM"},
- {MGT_DISASS, "Disassociate"},
- {MGT_AUTHENTICATION, "Authentication"},
- {MGT_DEAUTHENTICATION, "Deauthentication"},
- {MGT_ACTION, "Action"},
- {MGT_ACTION_NO_ACK, "Action No Ack"},
- {MGT_ARUBA_WLAN, "Aruba Management"},
-
- {CTRL_CONTROL_WRAPPER, "Control Wrapper"},
- {CTRL_BLOCK_ACK_REQ, "802.11 Block Ack Req"},
- {CTRL_BLOCK_ACK, "802.11 Block Ack"},
- {CTRL_PS_POLL, "Power-Save poll"},
- {CTRL_RTS, "Request-to-send"},
- {CTRL_CTS, "Clear-to-send"},
- {CTRL_ACKNOWLEDGEMENT, "Acknowledgement"},
- {CTRL_CFP_END, "CF-End (Control-frame)"},
- {CTRL_CFP_ENDACK, "CF-End + CF-Ack (Control-frame)"},
+ {MGT_ASSOC_REQ, "Association Request"},
+ {MGT_ASSOC_RESP, "Association Response"},
+ {MGT_REASSOC_REQ, "Reassociation Request"},
+ {MGT_REASSOC_RESP, "Reassociation Response"},
+ {MGT_PROBE_REQ, "Probe Request"},
+ {MGT_PROBE_RESP, "Probe Response"},
+ {MGT_MEASUREMENT_PILOT, "Measurement Pilot"},
+ {MGT_BEACON, "Beacon frame"},
+ {MGT_ATIM, "ATIM"},
+ {MGT_DISASS, "Disassociate"},
+ {MGT_AUTHENTICATION, "Authentication"},
+ {MGT_DEAUTHENTICATION, "Deauthentication"},
+ {MGT_ACTION, "Action"},
+ {MGT_ACTION_NO_ACK, "Action No Ack"},
+ {MGT_ARUBA_WLAN, "Aruba Management"},
+
+ {CTRL_CONTROL_WRAPPER, "Control Wrapper"},
+ {CTRL_BLOCK_ACK_REQ, "802.11 Block Ack Req"},
+ {CTRL_BLOCK_ACK, "802.11 Block Ack"},
+ {CTRL_PS_POLL, "Power-Save poll"},
+ {CTRL_RTS, "Request-to-send"},
+ {CTRL_CTS, "Clear-to-send"},
+ {CTRL_ACKNOWLEDGEMENT, "Acknowledgement"},
+ {CTRL_CFP_END, "CF-End (Control-frame)"},
+ {CTRL_CFP_ENDACK, "CF-End + CF-Ack (Control-frame)"},
{DATA, "Data"},
{DATA_CF_ACK, "Data + CF-Ack"},
#define CAT_QOS 1
#define CAT_DLS 2
#define CAT_BLOCK_ACK 3
+#define CAT_PUBLIC 4
-#define CAT_RADIO_MEASUREMENT 6
+#define CAT_RADIO_MEASUREMENT 5
+#define CAT_FAST_BSS_TRANSITION 6
#define CAT_HT 7
+#define CAT_SA_QUERY 8
+#define CAT_PUBLIC_PROTECTED 9
+#define CAT_TDLS 12
#define CAT_MGMT_NOTIFICATION 17
+#define CAT_VENDOR_SPECIFIC_PROTECTED 126
#define CAT_VENDOR_SPECIFIC 127
+#ifdef MESH_OVERRIDES
+#define CAT_MESH_PEER_LINK 30 /* Per 802.11s draft 1.08. ANA will probably revise this */
+#define CAT_MESH_LINK_METRIC 31
+#define CAT_MESH_PATH_SELECTION 32
+#define CAT_MESH_INTERWORKING 33
+#define CAT_MESH_RESOURCE_COORDINATION 34
+#define CAT_MESH_SECURITY_ARCHITECTURE 35
+#endif /* MESH_OVERRIDES */
+
#define SM_ACTION_MEASUREMENT_REQUEST 0
#define SM_ACTION_MEASUREMENT_REPORT 1
#define SM_ACTION_TPC_REQUEST 2
#define BA_ADD_BLOCK_ACK_RESPONSE 1
#define BA_DELETE_BLOCK_ACK 2
+#define PA_DSE_ENABLEMENT 1
+#define PA_DSE_DEENABLEMENT 2
+#define PA_DSE_REG_LOC_ANNOUNCEMENT 3
+#define PA_EXT_CHANNEL_SWITCH_ANNOUNCEMENT 4
+#define PA_DSE_MEASUREMENT_REQUEST 5
+#define PA_DSE_MEASUREMENT_REPORT 6
+#define PA_MEASUREMENT_PILOT 7
+#define PA_DSE_POWER_CONSTRAINT 8
+#define PA_VENDOR_SPECIFIC 9
+#define PA_GAS_INITIAL_REQUEST 10
+#define PA_GAS_INITIAL_RESPONSE 11
+#define PA_GAS_COMEBACK_REQUEST 12
+#define PA_GAS_COMEBACK_RESPONSE 13
+#define PA_TDLS_DISCOVERY_RESPONSE 14
+
#define HT_ACTION_NOTIFY_CHAN_WIDTH 0
#define HT_ACTION_SM_PWR_SAVE 1
#define HT_ACTION_PSMP_ACTION 2
#define HT_ACTION_ANT_SEL_FEEDBACK 7
#define HT_ACTION_HT_INFO_EXCHANGE 8
+/* IEEE Std 802.11r-2008, 7.4.8, Table 7-57g */
+#define FT_ACTION_REQUEST 1
+#define FT_ACTION_RESPONSE 2
+#define FT_ACTION_CONFIRM 3
+#define FT_ACTION_ACK 4
+
+/* SA Query Action frame codes (IEEE 802.11w-2009, 7.4.9) */
+#define SA_QUERY_REQUEST 0
+#define SA_QUERY_RESPONSE 1
+
+/* IEEE Std 802.11z-2010, 7.4.11, Table 7-57v1 */
+#define TDLS_SETUP_REQUEST 0
+#define TDLS_SETUP_RESPONSE 1
+#define TDLS_SETUP_CONFIRM 2
+#define TDLS_TEARDOWN 3
+#define TDLS_PEER_TRAFFIC_INDICATION 4
+#define TDLS_CHANNEL_SWITCH_REQUEST 5
+#define TDLS_CHANNEL_SWITCH_RESPONSE 6
+#define TDLS_PEER_PSM_REQUEST 7
+#define TDLS_PEER_PSM_RESPONSE 8
+#define TDLS_PEER_TRAFFIC_RESPONSE 9
+#define TDLS_DISCOVERY_REQUEST 10
+
+#ifdef MESH_OVERRIDES
+#define MESH_PL_PEER_LINK_OPEN 0
+#define MESH_PL_PEER_LINK_CONFIRM 1
+#define MESH_PL_PEER_LINK_CLOSE 2
+
+#define MESH_PS_PATH_REQUEST 0
+#define MESH_PS_PATH_REPLY 1
+#define MESH_PS_PATH_ERROR 2
+#define MESH_PS_ROOT_ANNOUNCEMENT 3
+#endif /* MESH_OVERRIDES */
+
+/* 11s draft, table 7-22 */
+#define MESH_LINK_CANCELLED 2
+#define MESH_MAX_NEIGHBORS 3
+#define MESH_CONFIG_POLICY_VIOLATION 4
+#define MESH_CLOSE_RCVD 5
+#define MESH_MAX_RETRIES 6
+#define MESH_CONFIRM_TIMEOUT 7
+
/* Vendor actions */
/* MARVELL */
#define MRVL_ACTION_MESH_MANAGEMENT 1
/*** End: Action Fixed Parameter ***/
+static const value_string ieee80211_tag_measure_request_type_flags[] = {
+ {0x00, "Basic Request"},
+ {0x01, "Clear Channel Assessment (CCA) Request"},
+ {0x02, "Receive Power Indication (RPI) Histogram Request"},
+ {0x03, "Channel Load Request"},
+ {0x04, "Noise Histogram Request"},
+ {0x05, "Beacon Request"},
+ {0x06, "Frame Request"},
+ {0x07, "STA Statistics Request"},
+ {0x08, "Location Configuration Indication (LCI) Request"},
+ {0x09, "Transmit Stream Measurement Request"},
+ {0x0A, "Measurement Pause Request"},
+ {0x00, NULL}
+};
+
+static const value_string ieee80211_tag_measure_report_type_flags[] = {
+ { 0x00, "Basic Report" },
+ { 0x01, "Clear Channel Assessment (CCA) Report" },
+ { 0x02, "Receive Power Indication (RPI) Histogram Report" },
+ { 0x03, "Channel Load Report" },
+ { 0x04, "Noise Histogram Report" },
+ { 0x05, "Beacon Report" },
+ { 0x06, "Frame Report" },
+ { 0x07, "STA Statistics Report" },
+ { 0x08, "Location Configuration Information (LCI) Report" },
+ { 0x09, "Transmit Stream Measurement Report" },
+ { 0x00, NULL }
+};
+
+static const true_false_string ieee80211_tag_measure_report_frame_info_frame_type_flag = {
+ "Measurement Pilot Frame",
+ "Beacon/Probe Response Frame"
+};
+
+static const true_false_string ieee80211_tag_measure_map_field_bss_flag = {
+ "At least one MPDU was received by another BSS or IBSS in the measurement period.",
+ "No MPDUs were received from another BSS or IBSS in the measurement period."
+};
+
+static const value_string ieee80211_tag_measure_request_measurement_mode_flags[] = {
+ { 0x00, "Passive" },
+ { 0x01, "Active" },
+ { 0x02, "Beacon Table" },
+ { 0x00, NULL }
+};
+
+#define MEASURE_REQ_BEACON_SUB_SSID 0
+#define MEASURE_REQ_BEACON_SUB_BRI 1
+#define MEASURE_REQ_BEACON_SUB_RD 2
+#define MEASURE_REQ_BEACON_SUB_REQUEST 10
+#define MEASURE_REQ_BEACON_SUB_APCP 51
+#define MEASURE_REQ_BEACON_SUB_VS 221
+
+static const value_string ieee80211_tag_measure_request_beacon_sub_id_flags[] = {
+ { MEASURE_REQ_BEACON_SUB_SSID, "SSID" },
+ { MEASURE_REQ_BEACON_SUB_BRI, "Beacon Reporting Information" },
+ { MEASURE_REQ_BEACON_SUB_RD, "Reporting Detail" },
+ { MEASURE_REQ_BEACON_SUB_REQUEST, "Request" },
+ { MEASURE_REQ_BEACON_SUB_APCP, "AP Channel Report" },
+ { MEASURE_REQ_BEACON_SUB_VS, "Vendor Specific" },
+ { 0x00, NULL}
+};
+
+static const value_string ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition_flags[] = {
+ { 0x00, "Report to be issued after each measurement." },
+ { 0x01, "The measured RCPI level is greater than an absolute threshold." },
+ { 0x02, "The measured RCPI level is less than an absolute threshold." },
+ { 0x03, "The measured RSNI level is greater than an absolute threshold." },
+ { 0x04, "The measured RSNI level is less than an absolute threshold." },
+ { 0x05, "The measured RCPI level is greater than a threshold defined by an offset from the serving AP's reference RCPI." },
+ { 0x06, "The measured RCPI level is less than a threshold defined by an offset from the serving AP's reference RCPI." },
+ { 0x07, "The measured RSNI level is greater than a threshold defined by an offset from the serving AP's reference RSNI." },
+ { 0x08, "The measured RSNI level is less than a threshold defined by an offset from the serving AP's reference RSNI." },
+ { 0x09, "The measured RCPI level is in a range bound by the serving AP's reference RCPI and an offset from the serving AP's reference RCPI." },
+ { 0x0a, "The measured RSNI level is in a range bound by the serving AP's reference RSNI and an offset from the serving AP's reference RSNI." },
+ { 0xfe, "Report not required to be issued" },
+ { 0x00, NULL }
+};
+
+static const value_string ieee80211_tag_measure_request_beacon_sub_reporting_detail_flags[] = {
+ { 0, "No fixed length fields or elements" },
+ { 1, "All fixed length fields and any requested elements in the Request information element if present" },
+ { 2, "All fixed length fields and elements (default, used when Reporting Detail subelement is not included in Beacon Request" },
+ { 0x00, NULL }
+};
+
+static const value_string ieee80211_tag_measure_request_group_id_flags[] = {
+ { 0x00, "STA Counters from dot11CountersTable" },
+ { 0x01, "STA Counters from dot11MacStatistics group" },
+ { 0x02, "QoS STA Counters for UP0 from dot11QosCountersTable" },
+ { 0x03, "QoS STA Counters for UP1 from dot11QosCountersTable" },
+ { 0x04, "QoS STA Counters for UP2 from dot11QosCountersTable" },
+ { 0x05, "QoS STA Counters for UP3 from dot11QosCountersTable" },
+ { 0x06, "QoS STA Counters for UP4 from dot11QosCountersTable" },
+ { 0x07, "QoS STA Counters for UP5 from dot11QosCountersTable" },
+ { 0x08, "QoS STA Counters for UP6 from dot11QosCountersTable" },
+ { 0x09, "QoS STA Counters for UP7 from dot11QosCountersTable" },
+ { 0x0a, "BSS Average Access Delays" },
+ { 0x0b, "STA Counters from dot11A-MSDU Group" },
+ { 0x0c, "STA Counters from dot11A-MPDU Group" },
+ { 0x0d, "STA Counters from dot11 BAR, Channel Width, PSMP Group" },
+ { 0x0e, "STA Counters from dot11Protection Group" },
+ { 0x0f, "STBC Group" },
+ { 0x00, NULL }
+};
+
+static const value_string ieee80211_tclas_process_flag[] = {
+ {0x00, "Incoming MSDU's higher layer parameters have to match to the parameters in all associated TCLAS elements."},
+ {0x01, "Incoming MSDU's higher layer parameters have to match to at least one of the associated TCLAS elements."},
+ {0x02, "Incoming MSDU's that do not belong to any other TS are classified to the TS for which this TCLAS Processing element is used. In this case, there will not be any associated TCLAS elements."},
+ {0, NULL}
+};
+
static int proto_wlan = -1;
static int proto_aggregate = -1;
static packet_info * g_pinfo;
static int hf_signal_strength = -1;
/* Prism radio header */
-static int hf_prism_msgcode = -1;
-static int hf_prism_msglen = -1;
-static int hf_prism_rssi_data = -1;
-static int hf_prism_sq_data = -1;
-static int hf_prism_signal_data = -1;
-static int hf_prism_noise_data = -1;
-static int hf_prism_rate_data = -1;
-static int hf_prism_istx_data = -1;
-static int hf_prism_frmlen_data = -1;
+
+static int hf_ieee80211_prism_msgcode = -1;
+static int hf_ieee80211_prism_msglen = -1;
+static int hf_ieee80211_prism_devname = -1;
+static int hf_ieee80211_prism_did = -1;
+static int hf_ieee80211_prism_did_type = -1;
+static int hf_ieee80211_prism_did_status = -1;
+static int hf_ieee80211_prism_did_length = -1;
+static int hf_ieee80211_prism_did_hosttime = -1;
+static int hf_ieee80211_prism_did_mactime = -1;
+static int hf_ieee80211_prism_did_channel = -1;
+static int hf_ieee80211_prism_did_rssi = -1;
+static int hf_ieee80211_prism_did_sq = -1;
+static int hf_ieee80211_prism_did_signal = -1;
+static int hf_ieee80211_prism_did_noise = -1;
+static int hf_ieee80211_prism_did_rate = -1;
+static int hf_ieee80211_prism_did_istx = -1;
+static int hf_ieee80211_prism_did_frmlen = -1;
+static int hf_ieee80211_prism_did_unknown = -1;
/* AVS WLANCAP radio header */
static int hf_wlan_magic = -1;
static int hf_wlan_antenna = -1;
static int hf_wlan_priority = -1;
static int hf_wlan_ssi_type = -1;
-static int hf_wlan_ssi_signal = -1;
-static int hf_wlan_ssi_noise = -1;
static int hf_wlan_preamble = -1;
static int hf_wlan_encoding = -1;
static int hf_wlan_sequence = -1;
/* ************************************************************************* */
/* Header field info values for FC-field */
/* ************************************************************************* */
-static int hf_fc_field = -1;
-static int hf_fc_proto_version = -1;
-static int hf_fc_frame_type = -1;
-static int hf_fc_frame_subtype = -1;
-static int hf_fc_frame_type_subtype = -1;
-
-static int hf_fc_flags = -1;
-static int hf_fc_to_ds = -1;
-static int hf_fc_from_ds = -1;
-static int hf_fc_data_ds = -1;
-
-static int hf_fc_more_frag = -1;
-static int hf_fc_retry = -1;
-static int hf_fc_pwr_mgt = -1;
-static int hf_fc_more_data = -1;
-static int hf_fc_protected = -1;
-static int hf_fc_order = -1;
+static int hf_ieee80211_fc_field = -1;
+static int hf_ieee80211_fc_proto_version = -1;
+static int hf_ieee80211_fc_frame_type = -1;
+static int hf_ieee80211_fc_frame_subtype = -1;
+static int hf_ieee80211_fc_frame_type_subtype = -1;
+
+static int hf_ieee80211_fc_flags = -1;
+static int hf_ieee80211_fc_to_ds = -1;
+static int hf_ieee80211_fc_from_ds = -1;
+static int hf_ieee80211_fc_data_ds = -1;
+
+static int hf_ieee80211_fc_more_frag = -1;
+static int hf_ieee80211_fc_retry = -1;
+static int hf_ieee80211_fc_pwr_mgt = -1;
+static int hf_ieee80211_fc_more_data = -1;
+static int hf_ieee80211_fc_protected = -1;
+static int hf_ieee80211_fc_order = -1;
typedef struct retransmit_key {
- guint8 bssid[6];
- guint8 src[6];
- guint16 seq_control;
- guint fnum;
+ guint8 bssid[6];
+ guint8 src[6];
+ guint16 seq_control;
+ guint fnum;
} retransmit_key;
static GHashTable *fc_analyse_retransmit_table = NULL;
static GHashTable *fc_first_frame_table = NULL;
-static int hf_fc_analysis_retransmission = -1;
-static int hf_fc_analysis_retransmission_frame = -1;
+static int hf_ieee80211_fc_analysis_retransmission = -1;
+static int hf_ieee80211_fc_analysis_retransmission_frame = -1;
/* ************************************************************************* */
/* Header values for Duration/ID field */
/* ************************************************************************* */
-static int hf_did_duration = -1;
-static int hf_assoc_id = -1;
-
+static int hf_ieee80211_did_duration = -1;
+static int hf_ieee80211_assoc_id = -1;
/* ************************************************************************* */
/* Header values for different address-fields (all 4 of them) */
/* ************************************************************************* */
-static int hf_addr_da = -1; /* Destination address subfield */
-static int hf_addr_sa = -1; /* Source address subfield */
-static int hf_addr_ra = -1; /* Receiver address subfield */
-static int hf_addr_ta = -1; /* Transmitter address subfield */
-static int hf_addr_addr1 = -1;
-static int hf_addr_bssid = -1; /* address is bssid */
+static int hf_ieee80211_addr_da = -1; /* Destination address subfield */
+static int hf_ieee80211_addr_sa = -1; /* Source address subfield */
+static int hf_ieee80211_addr_ra = -1; /* Receiver address subfield */
+static int hf_ieee80211_addr_ta = -1; /* Transmitter address subfield */
+static int hf_ieee80211_addr_bssid = -1; /* address is bssid */
-static int hf_addr = -1; /* Source or destination address subfield */
+static int hf_ieee80211_addr = -1; /* Source or destination address subfield */
/* ************************************************************************* */
/* Header values for QoS control field */
/* ************************************************************************* */
-static int hf_qos_priority = -1;
-static int hf_qos_ack_policy = -1;
-static int hf_qos_amsdu_present = -1;
-static int hf_qos_eosp = -1;
-static int hf_qos_bit4 = -1;
-static int hf_qos_txop_limit = -1;
-static int hf_qos_buf_state_indicated = -1;
-static int hf_qos_highest_pri_buf_ac = -1;
-static int hf_qos_qap_buf_load = -1;
-static int hf_qos_txop_dur_req = -1;
-static int hf_qos_queue_size = -1;
+static int hf_ieee80211_qos_priority = -1;
+static int hf_ieee80211_qos_ack_policy = -1;
+static int hf_ieee80211_qos_amsdu_present = -1;
+static int hf_ieee80211_qos_eosp = -1;
+static int hf_ieee80211_qos_bit4 = -1;
+static int hf_ieee80211_qos_txop_limit = -1;
+static int hf_ieee80211_qos_buf_state_indicated = -1;
+static int hf_ieee80211_qos_highest_pri_buf_ac = -1;
+static int hf_ieee80211_qos_qap_buf_load = -1;
+static int hf_ieee80211_qos_txop_dur_req = -1;
+static int hf_ieee80211_qos_queue_size = -1;
/* ************************************************************************* */
/* Header values for HT control field (+HTC) */
/* ************************************************************************* */
/* 802.11nD-1.10 & 802.11nD-2.0 7.1.3.5a */
-static int hf_htc = -1;
-static int hf_htc_lac = -1;
-static int hf_htc_lac_reserved = -1;
-static int hf_htc_lac_trq = -1;
-static int hf_htc_lac_mai_aseli = -1;
-static int hf_htc_lac_mai_mrq = -1;
-static int hf_htc_lac_mai_msi = -1;
-static int hf_htc_lac_mai_reserved = -1;
-static int hf_htc_lac_mfsi = -1;
-static int hf_htc_lac_mfb = -1;
-static int hf_htc_lac_asel_command = -1;
-static int hf_htc_lac_asel_data = -1;
-static int hf_htc_cal_pos = -1;
-static int hf_htc_cal_seq = -1;
-static int hf_htc_reserved1 = -1;
-static int hf_htc_csi_steering = -1;
-static int hf_htc_ndp_announcement = -1;
-static int hf_htc_reserved2 = -1;
-static int hf_htc_ac_constraint = -1;
-static int hf_htc_rdg_more_ppdu = -1;
+static int hf_ieee80211_htc = -1;
+static int hf_ieee80211_htc_lac = -1;
+static int hf_ieee80211_htc_lac_reserved = -1;
+static int hf_ieee80211_htc_lac_trq = -1;
+static int hf_ieee80211_htc_lac_mai_aseli = -1;
+static int hf_ieee80211_htc_lac_mai_mrq = -1;
+static int hf_ieee80211_htc_lac_mai_msi = -1;
+static int hf_ieee80211_htc_lac_mai_reserved = -1;
+static int hf_ieee80211_htc_lac_mfsi = -1;
+static int hf_ieee80211_htc_lac_mfb = -1;
+static int hf_ieee80211_htc_lac_asel_command = -1;
+static int hf_ieee80211_htc_lac_asel_data = -1;
+static int hf_ieee80211_htc_cal_pos = -1;
+static int hf_ieee80211_htc_cal_seq = -1;
+static int hf_ieee80211_htc_reserved1 = -1;
+static int hf_ieee80211_htc_csi_steering = -1;
+static int hf_ieee80211_htc_ndp_announcement = -1;
+static int hf_ieee80211_htc_reserved2 = -1;
+static int hf_ieee80211_htc_ac_constraint = -1;
+static int hf_ieee80211_htc_rdg_more_ppdu = -1;
/* ************************************************************************* */
/* Header values for sequence number field */
/* ************************************************************************* */
-static int hf_frag_number = -1;
-static int hf_seq_number = -1;
+static int hf_ieee80211_frag_number = -1;
+static int hf_ieee80211_seq_number = -1;
/* ************************************************************************* */
/* Header values for Frame Check field */
/* ************************************************************************* */
-static int hf_fcs = -1;
-static int hf_fcs_good = -1;
-static int hf_fcs_bad = -1;
+static int hf_ieee80211_fcs = -1;
+static int hf_ieee80211_fcs_good = -1;
+static int hf_ieee80211_fcs_bad = -1;
/* ************************************************************************* */
/* Header values for reassembly */
/* ************************************************************************* */
-static int hf_fragments = -1;
-static int hf_fragment = -1;
-static int hf_fragment_overlap = -1;
-static int hf_fragment_overlap_conflict = -1;
-static int hf_fragment_multiple_tails = -1;
-static int hf_fragment_too_long_fragment = -1;
-static int hf_fragment_error = -1;
-static int hf_reassembled_in = -1;
-
+static int hf_ieee80211_fragments = -1;
+static int hf_ieee80211_fragment = -1;
+static int hf_ieee80211_fragment_overlap = -1;
+static int hf_ieee80211_fragment_overlap_conflict = -1;
+static int hf_ieee80211_fragment_multiple_tails = -1;
+static int hf_ieee80211_fragment_too_long_fragment = -1;
+static int hf_ieee80211_fragment_error = -1;
+static int hf_ieee80211_fragment_count = -1;
+static int hf_ieee80211_reassembled_in = -1;
+static int hf_ieee80211_reassembled_length = -1;
static int proto_wlan_mgt = -1;
/* ************************************************************************* */
/* Header values for WAVE */
/* ************************************************************************* */
-static int hf_pst_timingquality = -1;
-static int hf_pst_providercount = -1;
-static int hf_pst_length = -1;
-static int hf_pst_contents = -1;
-
-static int hf_pst_acid = -1;
-static int hf_pst_acm_length = -1;
-static int hf_pst_acm = -1;
-static int hf_pst_acm_contents =-1;
-static int hf_pst_acf = -1;
-static int hf_pst_priority = -1;
-static int hf_pst_ipv6addr = -1;
-static int hf_pst_serviceport = -1;
-static int hf_pst_addressing = -1;
-static int hf_pst_macaddr = -1;
-static int hf_pst_channel = -1;
-
-static int hf_chan_noc = -1;
-static int hf_chan_length = -1;
-static int hf_chan_content = -1;
-static int hf_chan_channel = -1;
-static int hf_chan_adapt = -1;
-static int hf_chan_rate = -1;
-static int hf_chan_tx_pow = -1;
+
+static int hf_ieee80211_pst_timingquality = -1;
+static int hf_ieee80211_pst_providercount = -1;
+static int hf_ieee80211_pst_providercap = -1;
+static int hf_ieee80211_pst_length = -1;
+static int hf_ieee80211_pst_contents = -1;
+static int hf_ieee80211_pst_acid = -1;
+static int hf_ieee80211_pst_acm_length = -1;
+static int hf_ieee80211_pst_acm_contents =-1;
+static int hf_ieee80211_pst_acf = -1;
+static int hf_ieee80211_pst_priority = -1;
+static int hf_ieee80211_pst_ipv6addr = -1;
+static int hf_ieee80211_pst_serviceport = -1;
+static int hf_ieee80211_pst_addressing = -1;
+static int hf_ieee80211_pst_macaddr = -1;
+static int hf_ieee80211_pst_channel = -1;
+
+static int hf_ieee80211_chan_noc = -1;
+static int hf_ieee80211_chan_length = -1;
+static int hf_ieee80211_chan_content = -1;
+static int hf_ieee80211_chan_channel = -1;
+static int hf_ieee80211_chan_adapt = -1;
+static int hf_ieee80211_chan_rate = -1;
+static int hf_ieee80211_chan_tx_pow = -1;
+
+#ifdef MESH_OVERRIDES
+/* ************************************************************************* */
+/* Header values for Mesh Header field */
+/* ************************************************************************* */
+static int hf_ieee80211_mesh_ttl = -1;
+static int hf_ieee80211_mesh_seq = -1;
+static int hf_ieee80211_mesh_flags = -1;
+static int hf_ieee80211_mesh_ae1 = -1;
+static int hf_ieee80211_mesh_ae2 = -1;
+static int hf_ieee80211_mesh_ae3 = -1;
+#endif /* MESH_OVERRIDES */
/* ************************************************************************* */
/* Fixed fields found in mgt frames */
/* ************************************************************************* */
-static int ff_auth_alg = -1; /* Authentication algorithm field */
-static int ff_auth_seq = -1; /* Authentication transaction sequence */
-static int ff_current_ap = -1; /* Current AP MAC address */
-static int ff_listen_ival = -1; /* Listen interval fixed field */
-static int ff_timestamp = -1; /* 64 bit timestamp */
-static int ff_beacon_interval = -1; /* 16 bit Beacon interval */
-static int ff_assoc_id = -1; /* 16 bit AID field */
-static int ff_reason = -1; /* 16 bit reason code */
-static int ff_status_code = -1; /* Status code */
-static int ff_category_code = -1; /* 8 bit Category code */
-static int ff_action_code = -1; /* 8 bit Action code */
-static int ff_dialog_token = -1; /* 8 bit Dialog token */
-static int ff_wme_action_code = -1; /* Management notification action code */
-static int ff_wme_status_code = -1; /* Management notification setup response status code */
-static int ff_qos_action_code = -1;
-static int ff_dls_action_code = -1;
-static int ff_dst_mac_addr = -1; /* DLS destination MAC addressi */
-static int ff_src_mac_addr = -1; /* DLS source MAC addressi */
-static int ff_dls_timeout = -1; /* DLS timeout value */
+static int hf_ieee80211_fixed_parameters = -1; /* Protocol payload for management frames */
+
+static int hf_ieee80211_ff_auth_alg = -1; /* Authentication algorithm field */
+static int hf_ieee80211_ff_auth_seq = -1; /* Authentication transaction sequence */
+static int hf_ieee80211_ff_current_ap = -1; /* Current AP MAC address */
+static int hf_ieee80211_ff_listen_ival = -1; /* Listen interval fixed field */
+static int hf_ieee80211_ff_timestamp = -1; /* 64 bit timestamp */
+static int hf_ieee80211_ff_beacon_interval = -1; /* 16 bit Beacon interval */
+static int hf_ieee80211_ff_assoc_id = -1; /* 16 bit AID field */
+static int hf_ieee80211_ff_reason = -1; /* 16 bit reason code */
+static int hf_ieee80211_ff_status_code = -1; /* Status code */
+static int hf_ieee80211_ff_category_code = -1; /* 8 bit Category code */
+static int hf_ieee80211_ff_action_code = -1; /* 8 bit Action code */
+static int hf_ieee80211_ff_dialog_token = -1; /* 8 bit Dialog token */
+static int hf_ieee80211_ff_wme_action_code = -1; /* Management notification action code */
+static int hf_ieee80211_ff_wme_status_code = -1; /* Management notification setup response status code */
+static int hf_ieee80211_ff_qos_action_code = -1;
+static int hf_ieee80211_ff_dls_action_code = -1;
+static int hf_ieee80211_ff_dst_mac_addr = -1; /* DLS destination MAC addressi */
+static int hf_ieee80211_ff_src_mac_addr = -1; /* DLS source MAC addressi */
+static int hf_ieee80211_ff_dls_timeout = -1; /* DLS timeout value */
+static int hf_ieee80211_ff_ft_action_code = -1; /* 8 bit FT Action code */
+static int hf_ieee80211_ff_sta_address = -1;
+static int hf_ieee80211_ff_target_ap_address = -1;
+static int hf_ieee80211_ff_gas_comeback_delay = -1;
+static int hf_ieee80211_ff_gas_fragment_id = -1;
+static int hf_ieee80211_ff_more_gas_fragments = -1;
+static int hf_ieee80211_ff_query_request_length = -1;
+static int hf_ieee80211_ff_query_request = -1;
+static int hf_ieee80211_ff_query_response_length = -1;
+static int hf_ieee80211_ff_query_response = -1;
+static int hf_ieee80211_ff_anqp_info_id = -1;
+static int hf_ieee80211_ff_anqp_info_length = -1;
+static int hf_ieee80211_ff_anqp_info = -1;
+static int hf_ieee80211_ff_tdls_action_code = -1;
+static int hf_ieee80211_ff_target_channel = -1;
+static int hf_ieee80211_ff_regulatory_class = -1;
+
+static int hf_ieee80211_ff_sa_query_action_code = -1;
+static int hf_ieee80211_ff_transaction_id = -1;
/* Vendor specific */
-static int ff_marvell_action_type = -1;
-static int ff_marvell_mesh_mgt_action_code = -1;
-static int ff_mesh_mgt_length = -1; /* Mesh Management length */
-static int ff_mesh_mgt_mode = -1; /* Mesh Management mode */
-static int ff_mesh_mgt_ttl = -1; /* Mesh Management TTL */
-static int ff_mesh_mgt_dstcount = -1; /* Mesh Management dst count */
-static int ff_mesh_mgt_hopcount = -1; /* Mesh Management hop count */
-static int ff_mesh_mgt_rreqid = -1; /* Mesh Management RREQ ID */
-static int ff_mesh_mgt_sa = -1; /* Mesh Management src addr */
-static int ff_mesh_mgt_ssn = -1; /* Mesh Management src sequence number */
-static int ff_mesh_mgt_metric = -1; /* Mesh Management metric */
-static int ff_mesh_mgt_flags = -1; /* Mesh Management RREQ flags */
-static int ff_mesh_mgt_da = -1; /* Mesh Management dst addr */
-static int ff_mesh_mgt_dsn = -1; /* Mesh Management dst sequence number */
-static int ff_mesh_mgt_lifetime = -1; /* Mesh Management lifetime */
-
-
-/*** Begin: Block Ack Action Fixed Field - Dustin Johnson ***/
-static int ff_ba_action = -1;
-/*** End: Block Ack Action Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Block Ack Params Fixed Field - Dustin Johnson ***/
-static int ff_block_ack_params = -1;
-static int ff_block_ack_params_amsdu_permitted = -1;
-static int ff_block_ack_params_policy = -1;
-static int ff_block_ack_params_tid = -1;
-static int ff_block_ack_params_buffer_size = -1;
-/*** End: Block Ack Params Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Block Ack Timeout Fixed Field - Dustin Johnson ***/
-static int ff_block_ack_timeout = -1;
-/*** End: Block Ack Timeout Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Block Ack Starting Sequence Control Fixed Field - Dustin Johnson ***/
-static int ff_block_ack_ssc = -1;
-static int ff_block_ack_ssc_fragment = -1;
-static int ff_block_ack_ssc_sequence = -1;
-/*** End: Block Ack Starting Sequence Control Fixed Field - Dustin Johnson ***/
-
-/*** Begin: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
-static int ff_delba_param = -1;
-static int ff_delba_param_reserved = -1;
-static int ff_delba_param_init = -1;
-static int ff_delba_param_tid = -1;
-/*** End: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Max Regulation Power Fixed Field - Dustin Johnson ***/
-static int ff_max_reg_pwr = -1;
-/*** End: Max Regulation Power Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Measurement Pilot Interval Fixed Field - Dustin Johnson ***/
-static int ff_measurement_pilot_int = -1;
-/*** End: Measurement Pilot Interval Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Country String Fixed Field - Dustin Johnson ***/
-static int ff_country_str = -1;
-/*** End: Country String Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Maximum Transmit Power Fixed Field - Dustin Johnson ***/
-static int ff_max_tx_pwr = -1;
-/*** End: Maximum Transmit Power Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Transmit Power Used Fixed Field - Dustin Johnson ***/
-static int ff_tx_pwr_used = -1;
-/*** End: Transmit Power Used Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Transmit Power Used Fixed Field - Dustin Johnson ***/
-static int ff_transceiver_noise_floor = -1;
-/*** End: Transmit Power Used Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Channel Width Fixed Field - Dustin Johnson ***/
-static int ff_channel_width = -1;
-/*** End: Channel Width Fixed Field - Dustin Johnson ***/
-
-/*** Begin: QoS Information AP Fixed Field - Dustin Johnson ***/
-static int ff_qos_info_ap = -1;
-static int ff_qos_info_ap_edca_param_set_counter = -1;
-static int ff_qos_info_ap_q_ack = -1;
-static int ff_qos_info_ap_queue_req = -1;
-static int ff_qos_info_ap_txop_request = -1;
-static int ff_qos_info_ap_reserved = -1;
-/*** End: QoS Information AP Fixed Field - Dustin Johnson ***/
-
-/*** Begin: QoS Information STA Fixed Field - Dustin Johnson ***/
-static int ff_qos_info_sta = -1;
-static int ff_qos_info_sta_ac_vo = -1;
-static int ff_qos_info_sta_ac_vi = -1;
-static int ff_qos_info_sta_ac_bk = -1;
-static int ff_qos_info_sta_ac_be = -1;
-static int ff_qos_info_sta_q_ack = -1;
-static int ff_qos_info_sta_max_sp_len = -1;
-static int ff_qos_info_sta_more_data_ack = -1;
-/*** End: QoS Information STA Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
-static int ff_sm_pwr_save = -1;
-static int ff_sm_pwr_save_enabled = -1;
-static int ff_sm_pwr_save_sm_mode = -1;
-static int ff_sm_pwr_save_reserved = -1;
-/*** End: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
-
-/*** End: PCO Phase Control Fixed Field - Dustin Johnson ***/
-static int ff_pco_phase_cntrl = -1;
-/*** End: PCO Phase Control Fixed Field - Dustin Johnson ***/
-
-/*** Begin: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
-static int ff_psmp_param_set = -1;
-static int ff_psmp_param_set_n_sta = -1;
-static int ff_psmp_param_set_more_psmp = -1;
-static int ff_psmp_param_set_psmp_sequence_duration = -1;
-/*** End: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
-
-/*** Begin: MIMO Control Fixed Field - Dustin Johnson ***/
-static int ff_mimo_cntrl_nc_index = -1;
-static int ff_mimo_cntrl_nr_index = -1;
-static int ff_mimo_cntrl_channel_width = -1;
-static int ff_mimo_cntrl_grouping = -1;
-static int ff_mimo_cntrl_coefficient_size = -1;
-static int ff_mimo_cntrl_codebook_info = -1;
-static int ff_mimo_cntrl_remaining_matrix_segment = -1;
-static int ff_mimo_cntrl_reserved = -1;
-static int ff_mimo_cntrl_sounding_timestamp = -1;
-/*** End: MIMO Control Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Antenna Selection Fixed Field - Dustin Johnson ***/
-static int ff_ant_selection = -1;
-static int ff_ant_selection_0 = -1;
-static int ff_ant_selection_1 = -1;
-static int ff_ant_selection_2 = -1;
-static int ff_ant_selection_3 = -1;
-static int ff_ant_selection_4 = -1;
-static int ff_ant_selection_5 = -1;
-static int ff_ant_selection_6 = -1;
-static int ff_ant_selection_7 = -1;
-/*** End: Antenna Selection Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
-static int ff_ext_channel_switch_announcement = -1;
-/*** End: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
-
-/*** Begin: HT Information Fixed Field - Dustin Johnson ***/
-static int ff_ht_info = -1;
-static int ff_ht_info_information_request = -1;
-static int ff_ht_info_40_mhz_intolerant = -1;
-static int ff_ht_info_sta_chan_width = -1;
-static int ff_ht_info_reserved = -1;
-/*** End: HT Information Fixed Field - Dustin Johnson ***/
-
-/*** Begin: HT Action Fixed Field - Dustin Johnson ***/
-static int ff_ht_action = -1;
-/*** End: HT Action Fixed Field - Dustin Johnson ***/
-
-/*** Begin: PSMP Station Information Fixed Field - Dustin Johnson ***/
-static int ff_psmp_sta_info = -1;
-static int ff_psmp_sta_info_dtt_start_offset = -1;
-static int ff_psmp_sta_info_dtt_duration = -1;
-static int ff_psmp_sta_info_sta_id = -1;
-static int ff_psmp_sta_info_utt_start_offset = -1;
-static int ff_psmp_sta_info_utt_duration = -1;
-static int ff_psmp_sta_info_reserved_small= -1;
-static int ff_psmp_sta_info_reserved_large = -1;
-static int ff_psmp_sta_info_psmp_multicast_id = -1;
-/*** End: PSMP Station Information Fixed Field - Dustin Johnson ***/
-
-/*** Begin: MIMO CSI Matrices Report - Dustin Johnson ***/
-static int ff_mimo_csi_snr = -1;
-/*** End: MIMO CSI Matrices Report - Dustin Johnson ***/
+static int hf_ieee80211_ff_marvell_action_type = -1;
+static int hf_ieee80211_ff_marvell_mesh_mgt_action_code = -1;
+static int hf_ieee80211_ff_mesh_mgt_length = -1; /* Mesh Management length */
+static int hf_ieee80211_ff_mesh_mgt_mode = -1; /* Mesh Management mode */
+static int hf_ieee80211_ff_mesh_mgt_ttl = -1; /* Mesh Management TTL */
+static int hf_ieee80211_ff_mesh_mgt_dstcount = -1; /* Mesh Management dst count */
+static int hf_ieee80211_ff_mesh_mgt_hopcount = -1; /* Mesh Management hop count */
+static int hf_ieee80211_ff_mesh_mgt_rreqid = -1; /* Mesh Management RREQ ID */
+static int hf_ieee80211_ff_mesh_mgt_sa = -1; /* Mesh Management src addr */
+static int hf_ieee80211_ff_mesh_mgt_ssn = -1; /* Mesh Management src sequence number */
+static int hf_ieee80211_ff_mesh_mgt_metric = -1; /* Mesh Management metric */
+static int hf_ieee80211_ff_mesh_mgt_flags = -1; /* Mesh Management RREQ flags */
+static int hf_ieee80211_ff_mesh_mgt_da = -1; /* Mesh Management dst addr */
+static int hf_ieee80211_ff_mesh_mgt_dsn = -1; /* Mesh Management dst sequence number */
+static int hf_ieee80211_ff_mesh_mgt_lifetime = -1; /* Mesh Management lifetime */
+
+
+static int hf_ieee80211_ff_ba_action = -1;
+
+static int hf_ieee80211_ff_block_ack_params = -1;
+static int hf_ieee80211_ff_block_ack_params_amsdu_permitted = -1;
+static int hf_ieee80211_ff_block_ack_params_policy = -1;
+static int hf_ieee80211_ff_block_ack_params_tid = -1;
+static int hf_ieee80211_ff_block_ack_params_buffer_size = -1;
+
+static int hf_ieee80211_ff_block_ack_timeout = -1;
+
+static int hf_ieee80211_ff_block_ack_ssc = -1;
+static int hf_ieee80211_ff_block_ack_ssc_fragment = -1;
+static int hf_ieee80211_ff_block_ack_ssc_sequence = -1;
+
+static int hf_ieee80211_ff_delba_param = -1;
+static int hf_ieee80211_ff_delba_param_reserved = -1;
+static int hf_ieee80211_ff_delba_param_init = -1;
+static int hf_ieee80211_ff_delba_param_tid = -1;
+
+static int hf_ieee80211_ff_max_reg_pwr = -1;
+static int hf_ieee80211_ff_measurement_pilot_int = -1;
+static int hf_ieee80211_ff_country_str = -1;
+static int hf_ieee80211_ff_max_tx_pwr = -1;
+static int hf_ieee80211_ff_tx_pwr_used = -1;
+static int hf_ieee80211_ff_transceiver_noise_floor = -1;
+static int hf_ieee80211_ff_channel_width = -1;
+
+static int hf_ieee80211_ff_qos_info_ap = -1;
+static int hf_ieee80211_ff_qos_info_ap_edca_param_set_counter = -1;
+static int hf_ieee80211_ff_qos_info_ap_q_ack = -1;
+static int hf_ieee80211_ff_qos_info_ap_queue_req = -1;
+static int hf_ieee80211_ff_qos_info_ap_txop_request = -1;
+static int hf_ieee80211_ff_qos_info_ap_reserved = -1;
+
+static int hf_ieee80211_ff_qos_info_sta = -1;
+static int hf_ieee80211_ff_qos_info_sta_ac_vo = -1;
+static int hf_ieee80211_ff_qos_info_sta_ac_vi = -1;
+static int hf_ieee80211_ff_qos_info_sta_ac_bk = -1;
+static int hf_ieee80211_ff_qos_info_sta_ac_be = -1;
+static int hf_ieee80211_ff_qos_info_sta_q_ack = -1;
+static int hf_ieee80211_ff_qos_info_sta_max_sp_len = -1;
+static int hf_ieee80211_ff_qos_info_sta_more_data_ack = -1;
+
+static int hf_ieee80211_ff_sm_pwr_save = -1;
+static int hf_ieee80211_ff_sm_pwr_save_enabled = -1;
+static int hf_ieee80211_ff_sm_pwr_save_sm_mode = -1;
+static int hf_ieee80211_ff_sm_pwr_save_reserved = -1;
+
+static int hf_ieee80211_ff_pco_phase_cntrl = -1;
+
+static int hf_ieee80211_ff_psmp_param_set = -1;
+static int hf_ieee80211_ff_psmp_param_set_n_sta = -1;
+static int hf_ieee80211_ff_psmp_param_set_more_psmp = -1;
+static int hf_ieee80211_ff_psmp_param_set_psmp_sequence_duration = -1;
+
+static int hf_ieee80211_ff_mimo_cntrl = -1;
+static int hf_ieee80211_ff_mimo_cntrl_nc_index = -1;
+static int hf_ieee80211_ff_mimo_cntrl_nr_index = -1;
+static int hf_ieee80211_ff_mimo_cntrl_channel_width = -1;
+static int hf_ieee80211_ff_mimo_cntrl_grouping = -1;
+static int hf_ieee80211_ff_mimo_cntrl_coefficient_size = -1;
+static int hf_ieee80211_ff_mimo_cntrl_codebook_info = -1;
+static int hf_ieee80211_ff_mimo_cntrl_remaining_matrix_segment = -1;
+static int hf_ieee80211_ff_mimo_cntrl_reserved = -1;
+static int hf_ieee80211_ff_mimo_cntrl_sounding_timestamp = -1;
+
+static int hf_ieee80211_ff_ant_selection = -1;
+static int hf_ieee80211_ff_ant_selection_0 = -1;
+static int hf_ieee80211_ff_ant_selection_1 = -1;
+static int hf_ieee80211_ff_ant_selection_2 = -1;
+static int hf_ieee80211_ff_ant_selection_3 = -1;
+static int hf_ieee80211_ff_ant_selection_4 = -1;
+static int hf_ieee80211_ff_ant_selection_5 = -1;
+static int hf_ieee80211_ff_ant_selection_6 = -1;
+static int hf_ieee80211_ff_ant_selection_7 = -1;
+
+static int hf_ieee80211_ff_ext_channel_switch_announcement = -1;
+static int hf_ieee80211_ff_ext_channel_switch_announcement_switch_mode = -1;
+static int hf_ieee80211_ff_ext_channel_switch_announcement_new_reg_class = -1;
+static int hf_ieee80211_ff_ext_channel_switch_announcement_new_chan_number = -1;
+static int hf_ieee80211_ff_ext_channel_switch_announcement_switch_count = -1;
+
+static int hf_ieee80211_ff_ht_info = -1;
+static int hf_ieee80211_ff_ht_info_information_request = -1;
+static int hf_ieee80211_ff_ht_info_40_mhz_intolerant = -1;
+static int hf_ieee80211_ff_ht_info_sta_chan_width = -1;
+static int hf_ieee80211_ff_ht_info_reserved = -1;
+
+static int hf_ieee80211_ff_ht_action = -1;
+
+static int hf_ieee80211_ff_psmp_sta_info = -1;
+static int hf_ieee80211_ff_psmp_sta_info_type = -1;
+static int hf_ieee80211_ff_psmp_sta_info_dtt_start_offset = -1;
+static int hf_ieee80211_ff_psmp_sta_info_dtt_duration = -1;
+static int hf_ieee80211_ff_psmp_sta_info_sta_id = -1;
+static int hf_ieee80211_ff_psmp_sta_info_utt_start_offset = -1;
+static int hf_ieee80211_ff_psmp_sta_info_utt_duration = -1;
+static int hf_ieee80211_ff_psmp_sta_info_reserved_small= -1;
+static int hf_ieee80211_ff_psmp_sta_info_reserved_large = -1;
+static int hf_ieee80211_ff_psmp_sta_info_psmp_multicast_id = -1;
+
+static int hf_ieee80211_ff_mimo_csi_snr = -1;
+
+#ifdef MESH_OVERRIDES
+
+/*** Begin: Mesh Frame Format ***/
+static int hf_ieee80211_ff_mesh_mgt_action_ps_code = -1;/* Mesh Management path selection action code */
+static int hf_ieee80211_ff_mesh_mgt_action_pl_code = -1;/* Mesh Management peer link action code */
+/* NB: see above for more items */
+static int hf_ieee80211_ff_mesh_mgt_dest_flags = -1; /* Mesh Management destination flags */
+static int hf_ieee80211_ff_mesh_mgt_srccount = -1; /* Mesh Management src count */
+static int hf_ieee80211_ff_mesh_mgt_dest_do_flags = -1; /* Mesh Management Destination Only flag */
+static int hf_ieee80211_ff_mesh_mgt_dest_rf_flags = -1; /* Mesh Management Reply and Forward flag */
+
+
+/* variable header fields */
+static int hf_ieee80211_mesh_mgt_pl_subtype = -1;/* Mesh Management peer link frame subtype */
+static int hf_ieee80211_mesh_mgt_pl_local_link_id = -1;/* Mesh Management local link id */
+static int hf_ieee80211_mesh_mgt_pl_peer_link_id = -1;/* Mesh Management peer link id */
+static int hf_ieee80211_mesh_mgt_pl_reason_code = -1;/* Mesh Management peer link reason code */
+static int hf_ieee80211_mesh_config_version = -1;
+static int hf_ieee80211_mesh_config_path_sel_protocol = -1;
+static int hf_ieee80211_mesh_config_path_sel_metric = -1;
+static int hf_ieee80211_mesh_config_congestion_control = -1;
+static int hf_ieee80211_mesh_config_channel_prec = -1;
+static int hf_ieee80211_mesh_config_capability = -1;
+static int hf_ieee80211_mesh_id = -1;
+/*** End: Mesh Frame Format ***/
+
+#endif /* MESH_OVERRIDES */
+
+static int hf_ieee80211_ff_public_action = -1;
/* ************************************************************************* */
/* Flags found in the capability field (fixed field) */
/* ************************************************************************* */
-static int ff_capture = -1;
-static int ff_cf_ess = -1;
-static int ff_cf_ibss = -1;
-static int ff_cf_sta_poll = -1; /* CF pollable status for a STA */
-static int ff_cf_ap_poll = -1; /* CF pollable status for an AP */
-static int ff_cf_privacy = -1;
-static int ff_cf_preamble = -1;
-static int ff_cf_pbcc = -1;
-static int ff_cf_agility = -1;
-static int ff_short_slot_time = -1;
-static int ff_dsss_ofdm = -1;
-static int ff_cf_spec_man = -1;
-static int ff_cf_apsd = -1;
-static int ff_cf_del_blk_ack = -1;
-static int ff_cf_imm_blk_ack = -1;
+static int hf_ieee80211_ff_capture = -1;
+static int hf_ieee80211_ff_cf_ess = -1;
+static int hf_ieee80211_ff_cf_ibss = -1;
+static int hf_ieee80211_ff_cf_sta_poll = -1; /* CF pollable status for a STA */
+static int hf_ieee80211_ff_cf_ap_poll = -1; /* CF pollable status for an AP */
+static int hf_ieee80211_ff_cf_privacy = -1;
+static int hf_ieee80211_ff_cf_preamble = -1;
+static int hf_ieee80211_ff_cf_pbcc = -1;
+static int hf_ieee80211_ff_cf_agility = -1;
+static int hf_ieee80211_ff_short_slot_time = -1;
+static int hf_ieee80211_ff_dsss_ofdm = -1;
+static int hf_ieee80211_ff_cf_spec_man = -1;
+static int hf_ieee80211_ff_cf_apsd = -1;
+static int hf_ieee80211_ff_cf_del_blk_ack = -1;
+static int hf_ieee80211_ff_cf_imm_blk_ack = -1;
/* ************************************************************************* */
/* A-MSDU fields */
/* ************************************************************************* */
-static int amsdu_msdu_header_text = -1;
+static int hf_ieee80211_amsdu_msdu_header_text = -1;
/* ************************************************************************* */
/* Tagged value format fields */
/* ************************************************************************* */
-static int tag_number = -1;
-static int tag_length = -1;
-static int tag_interpretation = -1;
-static int tag_oui = -1;
-
-
-static int tim_length = -1;
-static int tim_dtim_count = -1;
-static int tim_dtim_period = -1;
-static int tim_bmapctl = -1;
-
-
-static int hf_fixed_parameters = -1; /* Protocol payload for management frames */
-static int hf_tagged_parameters = -1; /* Fixed payload item */
-static int hf_tagged_ssid = -1;
-static int hf_wep_iv = -1;
-static int hf_wep_iv_weak = -1;
-static int hf_tkip_extiv = -1;
-static int hf_ccmp_extiv = -1;
-static int hf_wep_key = -1;
-static int hf_wep_icv = -1;
-
-/*** Begin: Block Ack Request/Block Ack - Dustin Johnson***/
-static int hf_block_ack_request_control = -1;
-static int hf_block_ack_control = -1;
-static int hf_block_ack_control_ack_policy = -1;
-static int hf_block_ack_control_multi_tid = -1;
-static int hf_block_ack_control_compressed_bitmap = -1;
-static int hf_block_ack_control_reserved = -1;
-
-static int hf_block_ack_control_basic_tid_info = -1;
-static int hf_block_ack_control_compressed_tid_info = -1;
-static int hf_block_ack_control_multi_tid_info = -1;
-
-static int hf_tag_measure_request_measurement_mode = -1;
-static int hf_tag_measure_request_bssid = -1;
-static int hf_tag_measure_request_reporting_condition = -1;
-static int hf_tag_measure_request_threshold_offset_unsigned = -1;
-static int hf_tag_measure_request_threshold_offset_signed = -1;
-
-static int hf_tag_measure_request_report_mac = -1;
-
-static int hf_tag_measure_request_group_id = -1;
-
-static int hf_block_ack_multi_tid_info = -1;
-static int hf_block_ack_request_type = -1;
-static int hf_block_ack_multi_tid_reserved = -1;
-static int hf_block_ack_multi_tid_value = -1;
-static int hf_block_ack_type = -1;
-/*** End: Block Ack Request/Block Ack - Dustin Johnson***/
-
-static int ht_cap = -1;
-static int ht_vs_cap = -1;
-static int ht_ldpc_coding = -1;
-static int ht_chan_width = -1;
-static int ht_sm_pwsave = -1;
-static int ht_green = -1;
-static int ht_short20 = -1;
-static int ht_short40 = -1;
-static int ht_tx_stbc = -1;
-static int ht_rx_stbc = -1;
-static int ht_delayed_block_ack = -1;
-static int ht_max_amsdu = -1;
-static int ht_dss_cck_40 = -1;
-static int ht_psmp = -1;
-static int ht_40_mhz_intolerant = -1;
-static int ht_l_sig = -1;
-
-static int ampduparam = -1;
-static int ampduparam_vs = -1;
-static int ampduparam_mpdu = -1;
-static int ampduparam_mpdu_start_spacing = -1;
-static int ampduparam_reserved = -1;
-
-static int mcsset = -1;
-static int mcsset_vs = -1;
-static int mcsset_rx_bitmask_0to7 = -1;
-static int mcsset_rx_bitmask_8to15 = -1;
-static int mcsset_rx_bitmask_16to23 = -1;
-static int mcsset_rx_bitmask_24to31 = -1;
-static int mcsset_rx_bitmask_32 = -1;
-static int mcsset_rx_bitmask_33to38 = -1;
-static int mcsset_rx_bitmask_39to52 = -1;
-static int mcsset_rx_bitmask_53to76 = -1;
-static int mcsset_highest_data_rate = -1;
-static int mcsset_tx_mcs_set_defined = -1;
-static int mcsset_tx_rx_mcs_set_not_equal = -1;
-static int mcsset_tx_max_spatial_streams = -1;
-static int mcsset_tx_unequal_modulation = -1;
-
-static int htex_cap = -1;
-static int htex_vs_cap = -1;
-static int htex_pco = -1;
-static int htex_transtime = -1;
-static int htex_mcs = -1;
-static int htex_htc_support = -1;
-static int htex_rd_responder = -1;
-
-static int txbf = -1;
-static int txbf_vs = -1;
-static int txbf_cap = -1;
-static int txbf_rcv_ssc = -1;
-static int txbf_tx_ssc = -1;
-static int txbf_rcv_ndp = -1;
-static int txbf_tx_ndp = -1;
-static int txbf_impl_txbf = -1;
-static int txbf_calib = -1;
-static int txbf_expl_csi = -1;
-static int txbf_expl_uncomp_fm = -1;
-static int txbf_expl_comp_fm = -1;
-static int txbf_expl_bf_csi = -1;
-static int txbf_expl_uncomp_fm_feed = -1;
-static int txbf_expl_comp_fm_feed = -1;
-static int txbf_csi_num_bf_ant = -1;
-static int txbf_min_group = -1;
-static int txbf_uncomp_sm_bf_ant = -1;
-static int txbf_comp_sm_bf_ant = -1;
-static int txbf_csi_max_rows_bf = -1;
-static int txbf_chan_est = -1;
-static int txbf_resrv = -1;
+static int hf_ieee80211_tagged_parameters = -1; /* Fixed payload item */
+static int hf_ieee80211_tag = -1;
+static int hf_ieee80211_tag_number = -1;
+static int hf_ieee80211_tag_length = -1;
+static int hf_ieee80211_tag_interpretation = -1;
+static int hf_ieee80211_tag_oui = -1;
+static int hf_ieee80211_tag_ssid = -1;
+static int hf_ieee80211_tag_supp_rates = -1;
+static int hf_ieee80211_tag_fh_dwell_time = -1;
+static int hf_ieee80211_tag_fh_hop_set = -1;
+static int hf_ieee80211_tag_fh_hop_pattern = -1;
+static int hf_ieee80211_tag_fh_hop_index = -1;
+static int hf_ieee80211_tag_ds_param_channel = -1;
+static int hf_ieee80211_tag_cfp_count = -1;
+static int hf_ieee80211_tag_cfp_period = -1;
+static int hf_ieee80211_tag_cfp_max_duration = -1;
+static int hf_ieee80211_tag_cfp_dur_remaining = -1;
+static int hf_ieee80211_tim_dtim_count = -1;
+static int hf_ieee80211_tim_dtim_period = -1;
+static int hf_ieee80211_tim_bmapctl = -1;
+static int hf_ieee80211_tim_bmapctl_mcast = -1;
+static int hf_ieee80211_tim_bmapctl_offset = -1;
+static int hf_ieee80211_tim_partial_virtual_bitmap = -1;
+static int hf_ieee80211_tag_ibss_atim_window = -1;
+static int hf_ieee80211_tag_country_info_code = -1;
+static int hf_ieee80211_tag_country_info_env = -1;
+static int hf_ieee80211_tag_country_info_fnm = -1;
+static int hf_ieee80211_tag_country_info_fnm_fcn = -1;
+static int hf_ieee80211_tag_country_info_fnm_nc = -1;
+static int hf_ieee80211_tag_country_info_fnm_mtpl = -1;
+static int hf_ieee80211_tag_country_info_rrc = -1;
+static int hf_ieee80211_tag_country_info_rrc_rei = -1;
+static int hf_ieee80211_tag_country_info_rrc_rc = -1;
+static int hf_ieee80211_tag_country_info_rrc_cc = -1;
+static int hf_ieee80211_tag_fh_hopping_parameter_prime_radix = -1;
+static int hf_ieee80211_tag_fh_hopping_parameter_nb_channels = -1;
+static int hf_ieee80211_tag_fh_hopping_table_flag = -1;
+static int hf_ieee80211_tag_fh_hopping_table_number_of_sets = -1;
+static int hf_ieee80211_tag_fh_hopping_table_modulus = -1;
+static int hf_ieee80211_tag_fh_hopping_table_offset = -1;
+static int hf_ieee80211_tag_fh_hopping_random_table = -1;
+static int hf_ieee80211_tag_request = -1;
+static int hf_ieee80211_tag_challenge_text = -1;
+
+static int hf_ieee80211_wep_iv = -1;
+static int hf_ieee80211_wep_iv_weak = -1;
+static int hf_ieee80211_tkip_extiv = -1;
+static int hf_ieee80211_ccmp_extiv = -1;
+static int hf_ieee80211_wep_key = -1;
+static int hf_ieee80211_wep_icv = -1;
+
+static int hf_ieee80211_block_ack_request_control = -1;
+static int hf_ieee80211_block_ack_control = -1;
+static int hf_ieee80211_block_ack_control_ack_policy = -1;
+static int hf_ieee80211_block_ack_control_multi_tid = -1;
+static int hf_ieee80211_block_ack_control_compressed_bitmap = -1;
+static int hf_ieee80211_block_ack_control_reserved = -1;
+
+static int hf_ieee80211_block_ack_control_basic_tid_info = -1;
+static int hf_ieee80211_block_ack_control_compressed_tid_info = -1;
+static int hf_ieee80211_block_ack_control_multi_tid_info = -1;
+
+static int hf_ieee80211_block_ack_multi_tid_info = -1;
+static int hf_ieee80211_block_ack_request_type = -1;
+static int hf_ieee80211_block_ack_multi_tid_reserved = -1;
+static int hf_ieee80211_block_ack_multi_tid_value = -1;
+static int hf_ieee80211_block_ack_type = -1;
+static int hf_ieee80211_block_ack_bitmap = -1;
+
+static int hf_ieee80211_tag_measure_request_measurement_mode = -1;
+static int hf_ieee80211_tag_measure_request_bssid = -1;
+
+static int hf_ieee80211_tag_measure_request_subelement_length = -1;
+static int hf_ieee80211_tag_measure_request_beacon_sub_id = -1;
+static int hf_ieee80211_tag_measure_request_beacon_sub_ssid = -1;
+static int hf_ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition = -1;
+static int hf_ieee80211_tag_measure_request_beacon_sub_bri_threshold_offset = -1;
+static int hf_ieee80211_tag_measure_request_beacon_sub_reporting_detail = -1;
+static int hf_ieee80211_tag_measure_request_beacon_sub_request = -1;
+static int hf_ieee80211_tag_measure_request_beacon_unknown = -1;
+
+static int hf_ieee80211_tag_measure_request_frame_request_type = -1;
+static int hf_ieee80211_tag_measure_request_mac_address = -1;
+static int hf_ieee80211_tag_measure_request_peer_mac_address = -1;
+static int hf_ieee80211_tag_measure_request_group_id = -1;
+
+static int hf_ieee80211_ht_cap = -1;
+static int hf_ieee80211_ht_vs_cap = -1;
+static int hf_ieee80211_ht_ldpc_coding = -1;
+static int hf_ieee80211_ht_chan_width = -1;
+static int hf_ieee80211_ht_sm_pwsave = -1;
+static int hf_ieee80211_ht_green = -1;
+static int hf_ieee80211_ht_short20 = -1;
+static int hf_ieee80211_ht_short40 = -1;
+static int hf_ieee80211_ht_tx_stbc = -1;
+static int hf_ieee80211_ht_rx_stbc = -1;
+static int hf_ieee80211_ht_delayed_block_ack = -1;
+static int hf_ieee80211_ht_max_amsdu = -1;
+static int hf_ieee80211_ht_dss_cck_40 = -1;
+static int hf_ieee80211_ht_psmp = -1;
+static int hf_ieee80211_ht_40_mhz_intolerant = -1;
+static int hf_ieee80211_ht_l_sig = -1;
+
+static int hf_ieee80211_ampduparam = -1;
+static int hf_ieee80211_ampduparam_vs = -1;
+static int hf_ieee80211_ampduparam_mpdu = -1;
+static int hf_ieee80211_ampduparam_mpdu_start_spacing = -1;
+static int hf_ieee80211_ampduparam_reserved = -1;
+
+static int hf_ieee80211_mcsset = -1;
+static int hf_ieee80211_mcsset_vs = -1;
+static int hf_ieee80211_mcsset_rx_bitmask_0to7 = -1;
+static int hf_ieee80211_mcsset_rx_bitmask_8to15 = -1;
+static int hf_ieee80211_mcsset_rx_bitmask_16to23 = -1;
+static int hf_ieee80211_mcsset_rx_bitmask_24to31 = -1;
+static int hf_ieee80211_mcsset_rx_bitmask_32 = -1;
+static int hf_ieee80211_mcsset_rx_bitmask_33to38 = -1;
+static int hf_ieee80211_mcsset_rx_bitmask_39to52 = -1;
+static int hf_ieee80211_mcsset_rx_bitmask_53to76 = -1;
+static int hf_ieee80211_mcsset_highest_data_rate = -1;
+static int hf_ieee80211_mcsset_tx_mcs_set_defined = -1;
+static int hf_ieee80211_mcsset_tx_rx_mcs_set_not_equal = -1;
+static int hf_ieee80211_mcsset_tx_max_spatial_streams = -1;
+static int hf_ieee80211_mcsset_tx_unequal_modulation = -1;
+
+static int hf_ieee80211_htex_cap = -1;
+static int hf_ieee80211_htex_vs_cap = -1;
+static int hf_ieee80211_htex_pco = -1;
+static int hf_ieee80211_htex_transtime = -1;
+static int hf_ieee80211_htex_mcs = -1;
+static int hf_ieee80211_htex_htc_support = -1;
+static int hf_ieee80211_htex_rd_responder = -1;
+
+static int hf_ieee80211_txbf = -1;
+static int hf_ieee80211_txbf_vs = -1;
+static int hf_ieee80211_txbf_cap = -1;
+static int hf_ieee80211_txbf_rcv_ssc = -1;
+static int hf_ieee80211_txbf_tx_ssc = -1;
+static int hf_ieee80211_txbf_rcv_ndp = -1;
+static int hf_ieee80211_txbf_tx_ndp = -1;
+static int hf_ieee80211_txbf_impl_txbf = -1;
+static int hf_ieee80211_txbf_calib = -1;
+static int hf_ieee80211_txbf_expl_csi = -1;
+static int hf_ieee80211_txbf_expl_uncomp_fm = -1;
+static int hf_ieee80211_txbf_expl_comp_fm = -1;
+static int hf_ieee80211_txbf_expl_bf_csi = -1;
+static int hf_ieee80211_txbf_expl_uncomp_fm_feed = -1;
+static int hf_ieee80211_txbf_expl_comp_fm_feed = -1;
+static int hf_ieee80211_txbf_csi_num_bf_ant = -1;
+static int hf_ieee80211_txbf_min_group = -1;
+static int hf_ieee80211_txbf_uncomp_sm_bf_ant = -1;
+static int hf_ieee80211_txbf_comp_sm_bf_ant = -1;
+static int hf_ieee80211_txbf_csi_max_rows_bf = -1;
+static int hf_ieee80211_txbf_chan_est = -1;
+static int hf_ieee80211_txbf_resrv = -1;
/*** Begin: 802.11n D1.10 - HT Information IE ***/
-static int ht_info_primary_channel = -1;
-
-static int ht_info_delimiter1 = -1;
-static int ht_info_secondary_channel_offset = -1;
-static int ht_info_channel_width = -1;
-static int ht_info_rifs_mode = -1;
-static int ht_info_psmp_stas_only = -1;
-static int ht_info_service_interval_granularity = -1;
-
-static int ht_info_delimiter2 = -1;
-static int ht_info_operating_mode = -1;
-static int ht_info_non_greenfield_sta_present = -1;
-static int ht_info_transmit_burst_limit = -1;
-static int ht_info_obss_non_ht_stas_present = -1;
-static int ht_info_reserved_1 = -1;
-
-static int ht_info_delimiter3 = -1;
-static int ht_info_reserved_2 = -1;
-static int ht_info_dual_beacon = -1;
-static int ht_info_dual_cts_protection = -1;
-static int ht_info_secondary_beacon = -1;
-static int ht_info_lsig_txop_protection_full_support = -1;
-static int ht_info_pco_active = -1;
-static int ht_info_pco_phase = -1;
-static int ht_info_reserved_3 = -1;
+static int hf_ieee80211_ht_info_primary_channel = -1;
+
+static int hf_ieee80211_ht_info_delimiter1 = -1;
+static int hf_ieee80211_ht_info_secondary_channel_offset = -1;
+static int hf_ieee80211_ht_info_channel_width = -1;
+static int hf_ieee80211_ht_info_rifs_mode = -1;
+static int hf_ieee80211_ht_info_psmp_stas_only = -1;
+static int hf_ieee80211_ht_info_service_interval_granularity = -1;
+
+static int hf_ieee80211_ht_info_delimiter2 = -1;
+static int hf_ieee80211_ht_info_operating_mode = -1;
+static int hf_ieee80211_ht_info_non_greenfield_sta_present = -1;
+static int hf_ieee80211_ht_info_transmit_burst_limit = -1;
+static int hf_ieee80211_ht_info_obss_non_ht_stas_present = -1;
+static int hf_ieee80211_ht_info_reserved_1 = -1;
+
+static int hf_ieee80211_ht_info_delimiter3 = -1;
+static int hf_ieee80211_ht_info_reserved_2 = -1;
+static int hf_ieee80211_ht_info_dual_beacon = -1;
+static int hf_ieee80211_ht_info_dual_cts_protection = -1;
+static int hf_ieee80211_ht_info_secondary_beacon = -1;
+static int hf_ieee80211_ht_info_lsig_txop_protection_full_support = -1;
+static int hf_ieee80211_ht_info_pco_active = -1;
+static int hf_ieee80211_ht_info_pco_phase = -1;
+static int hf_ieee80211_ht_info_reserved_3 = -1;
/*** End: 802.11n D1.10 - HT Information IE ***/
-/*** Begin: 802.11n D1.10 - Secondary Channel Offset Tag - Dustin Johnson***/
-static int hf_tag_secondary_channel_offset = -1;
-/*** End: 802.11n D1.10 - Secondary Channel Offset Tag - Dustin Johnson***/
-
-/*** Begin: Power Capability Tag - Dustin Johnson ***/
-static int hf_tag_power_capability_min = -1;
-static int hf_tag_power_capability_max = -1;
-/*** End: Power Capability Tag - Dustin Johnson ***/
-
-static int hf_tag_tpc_report_trsmt_pow = -1;
-static int hf_tag_tpc_report_link_mrg = -1;
-
-/*** Begin: Power Capability Tag - Dustin Johnson ***/
-static int hf_tag_supported_channels = -1;
-static int hf_tag_supported_channels_first = -1;
-static int hf_tag_supported_channels_range = -1;
-/*** End: Power Capability Tag - Dustin Johnson ***/
-
-/*** Begin: Measurement Request Tag - Dustin Johnson***/
-static int hf_tag_measure_request_measurement_token = -1;
-static int hf_tag_measure_request_mode = -1;
-static int hf_tag_measure_request_mode_reserved1 = -1;
-static int hf_tag_measure_request_mode_enable = -1;
-static int hf_tag_measure_request_mode_request = -1;
-static int hf_tag_measure_request_mode_report = -1;
-static int hf_tag_measure_request_mode_reserved2 = -1;
-static int hf_tag_measure_request_type = -1;
-
-static int hf_tag_measure_request_channel_number = -1;
-static int hf_tag_measure_request_start_time = -1;
-static int hf_tag_measure_request_duration = -1;
-
-static int hf_tag_measure_request_regulatory_class = -1;
-static int hf_tag_measure_request_randomization_interval = -1;
-/*** End: Measurement Request Tag - Dustin Johnson***/
-
-/*** Begin: Measurement Report Tag - Dustin Johnson***/
-static int hf_tag_measure_report_measurement_token = -1;
-static int hf_tag_measure_report_mode = -1;
-static int hf_tag_measure_report_mode_late = -1;
-static int hf_tag_measure_report_mode_incapable = -1;
-static int hf_tag_measure_report_mode_refused = -1;
-static int hf_tag_measure_report_mode_reserved = -1;
-static int hf_tag_measure_report_type = -1;
-static int hf_tag_measure_report_channel_number = -1;
-static int hf_tag_measure_report_start_time = -1;
-static int hf_tag_measure_report_duration = -1;
-
-static int hf_tag_measure_basic_map_field = -1;
-static int hf_tag_measure_map_field_bss = -1;
-static int hf_tag_measure_map_field_odfm = -1;
-static int hf_tag_measure_map_field_unident_signal = -1;
-static int hf_tag_measure_map_field_radar = -1;
-static int hf_tag_measure_map_field_unmeasured = -1;
-static int hf_tag_measure_map_field_reserved = -1;
-
-static int hf_tag_measure_cca_busy_fraction = -1;
-
-static int hf_tag_measure_rpi_histogram_report = -1;
-static int hf_tag_measure_rpi_histogram_report_0 = -1;
-static int hf_tag_measure_rpi_histogram_report_1 = -1;
-static int hf_tag_measure_rpi_histogram_report_2 = -1;
-static int hf_tag_measure_rpi_histogram_report_3 = -1;
-static int hf_tag_measure_rpi_histogram_report_4 = -1;
-static int hf_tag_measure_rpi_histogram_report_5 = -1;
-static int hf_tag_measure_rpi_histogram_report_6 = -1;
-static int hf_tag_measure_rpi_histogram_report_7 = -1;
-
-static int hf_tag_measure_report_regulatory_class = -1;
-static int hf_tag_measure_report_channel_load = -1;
-static int hf_tag_measure_report_frame_info = -1;
-static int hf_tag_measure_report_frame_info_phy_type = -1;
-static int hf_tag_measure_report_frame_info_frame_type = -1;
-static int hf_tag_measure_report_rcpi = -1;
-static int hf_tag_measure_report_rsni = -1;
-static int hf_tag_measure_report_bssid = -1;
-static int hf_tag_measure_report_ant_id = -1;
-static int hf_tag_measure_report_parent_tsf = -1;
-/*** End: Measurement Report Tag - Dustin Johnson***/
-
-/*** Begin: Extended Capabilities Tag - Dustin Johnson ***/
-static int hf_tag_extended_capabilities = -1;
-static int hf_tag_extended_capabilities_b0 = -1;
-static int hf_tag_extended_capabilities_b1 = -1;
-static int hf_tag_extended_capabilities_b2 = -1;
-static int hf_tag_extended_capabilities_b3 = -1;
-/*** End: Extended Capabilities Tag - Dustin Johnson ***/
-
-/*** Begin: Neighbor Report Tag - Dustin Johnson ***/
-static int hf_tag_neighbor_report_bssid = -1;
-static int hf_tag_neighbor_report_bssid_info = -1;
-static int hf_tag_neighbor_report_bssid_info_reachability = -1;
-static int hf_tag_neighbor_report_bssid_info_security = -1;
-static int hf_tag_neighbor_report_bssid_info_key_scope = -1;
-/*static int hf_tag_neighbor_report_bssid_info_capability = -1; */ /* TODO Make this the parent tree item */
-static int hf_tag_neighbor_report_bssid_info_capability_spec_mng = -1;
-static int hf_tag_neighbor_report_bssid_info_capability_qos = -1;
-static int hf_tag_neighbor_report_bssid_info_capability_apsd = -1;
-static int hf_tag_neighbor_report_bssid_info_capability_radio_msnt = -1;
-static int hf_tag_neighbor_report_bssid_info_capability_dback = -1;
-static int hf_tag_neighbor_report_bssid_info_capability_iback = -1;
-static int hf_tag_neighbor_report_bssid_info_mobility_domain = -1;
-static int hf_tag_neighbor_report_bssid_info_high_throughput = -1;
-static int hf_tag_neighbor_report_bssid_info_reserved = -1;
-static int hf_tag_neighbor_report_reg_class = -1;
-static int hf_tag_neighbor_report_channel_number = -1;
-static int hf_tag_neighbor_report_phy_type = -1;
-/*** End: Neighbor Report Tag - Dustin Johnson ***/
-
-/*** Begin: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
-static int hf_tag_ext_channel_switch_announcement_switch_mode = -1;
-static int hf_tag_ext_channel_switch_announcement_new_reg_class = -1;
-static int hf_tag_ext_channel_switch_announcement_new_chan_number = -1;
-static int hf_tag_ext_channel_switch_announcement_switch_count = -1;
-/*** End: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
-
-/*** Begin: Supported Regulatory Classes Tag - Dustin Johnson ***/
-static int hf_tag_supported_reg_classes_current = -1;
-static int hf_tag_supported_reg_classes_alternate = -1;
-/*** End: Supported Regulatory Classes Tag - Dustin Johnson ***/
+static int hf_ieee80211_tag_secondary_channel_offset = -1;
+
+static int hf_ieee80211_tag_power_constraint_local = -1;
+
+static int hf_ieee80211_tag_power_capability_min = -1;
+static int hf_ieee80211_tag_power_capability_max = -1;
+
+static int hf_ieee80211_tag_tpc_report_trsmt_pow = -1;
+static int hf_ieee80211_tag_tpc_report_link_mrg = -1;
+
+static int hf_ieee80211_tag_supported_channels = -1;
+static int hf_ieee80211_tag_supported_channels_first = -1;
+static int hf_ieee80211_tag_supported_channels_range = -1;
+
+static int hf_ieee80211_csa_channel_switch_mode = -1;
+static int hf_ieee80211_csa_new_channel_number = -1;
+static int hf_ieee80211_csa_channel_switch_count = -1;
+
+static int hf_ieee80211_tag_measure_request_token = -1;
+static int hf_ieee80211_tag_measure_request_mode = -1;
+static int hf_ieee80211_tag_measure_request_mode_parallel = -1;
+static int hf_ieee80211_tag_measure_request_mode_enable = -1;
+static int hf_ieee80211_tag_measure_request_mode_request = -1;
+static int hf_ieee80211_tag_measure_request_mode_report = -1;
+static int hf_ieee80211_tag_measure_request_mode_duration_mandatory = -1;
+static int hf_ieee80211_tag_measure_request_mode_reserved = -1;
+static int hf_ieee80211_tag_measure_request_type = -1;
+
+static int hf_ieee80211_tag_measure_request_channel_number = -1;
+static int hf_ieee80211_tag_measure_request_start_time = -1;
+static int hf_ieee80211_tag_measure_request_duration = -1;
+
+static int hf_ieee80211_tag_measure_request_regulatory_class = -1;
+static int hf_ieee80211_tag_measure_request_randomization_interval = -1;
+
+static int hf_ieee80211_tag_measure_report_measurement_token = -1;
+static int hf_ieee80211_tag_measure_report_mode = -1;
+static int hf_ieee80211_tag_measure_report_mode_late = -1;
+static int hf_ieee80211_tag_measure_report_mode_incapable = -1;
+static int hf_ieee80211_tag_measure_report_mode_refused = -1;
+static int hf_ieee80211_tag_measure_report_mode_reserved = -1;
+static int hf_ieee80211_tag_measure_report_type = -1;
+static int hf_ieee80211_tag_measure_report_channel_number = -1;
+static int hf_ieee80211_tag_measure_report_start_time = -1;
+static int hf_ieee80211_tag_measure_report_duration = -1;
+
+static int hf_ieee80211_tag_measure_basic_map_field = -1;
+static int hf_ieee80211_tag_measure_map_field_bss = -1;
+static int hf_ieee80211_tag_measure_map_field_odfm = -1;
+static int hf_ieee80211_tag_measure_map_field_unident_signal = -1;
+static int hf_ieee80211_tag_measure_map_field_radar = -1;
+static int hf_ieee80211_tag_measure_map_field_unmeasured = -1;
+static int hf_ieee80211_tag_measure_map_field_reserved = -1;
+
+static int hf_ieee80211_tag_measure_cca_busy_fraction = -1;
+
+static int hf_ieee80211_tag_measure_rpi_histogram_report = -1;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_0 = -1;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_1 = -1;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_2 = -1;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_3 = -1;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_4 = -1;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_5 = -1;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_6 = -1;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_7 = -1;
+
+static int hf_ieee80211_tag_measure_report_regulatory_class = -1;
+static int hf_ieee80211_tag_measure_report_channel_load = -1;
+static int hf_ieee80211_tag_measure_report_frame_info = -1;
+static int hf_ieee80211_tag_measure_report_frame_info_phy_type = -1;
+static int hf_ieee80211_tag_measure_report_frame_info_frame_type = -1;
+static int hf_ieee80211_tag_measure_report_rcpi = -1;
+static int hf_ieee80211_tag_measure_report_rsni = -1;
+static int hf_ieee80211_tag_measure_report_bssid = -1;
+static int hf_ieee80211_tag_measure_report_ant_id = -1;
+static int hf_ieee80211_tag_measure_report_anpi = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_0 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_1 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_2 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_3 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_4 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_5 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_6 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_7 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_8 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_9 = -1;
+static int hf_ieee80211_tag_measure_report_ipi_density_10 = -1;
+static int hf_ieee80211_tag_measure_report_parent_tsf = -1;
+
+static int hf_ieee80211_tag_quiet_count = -1;
+static int hf_ieee80211_tag_quiet_period = -1;
+static int hf_ieee80211_tag_quiet_duration = -1;
+static int hf_ieee80211_tag_quiet_offset = -1;
+
+static int hf_ieee80211_tag_dfs_owner = -1;
+static int hf_ieee80211_tag_dfs_recovery_interval = -1;
+static int hf_ieee80211_tag_dfs_channel_map = -1;
+static int hf_ieee80211_tag_dfs_channel_number = -1;
+static int hf_ieee80211_tag_dfs_map = -1;
+
+static int hf_ieee80211_tag_erp_info = -1;
+static int hf_ieee80211_tag_erp_info_erp_present = -1;
+static int hf_ieee80211_tag_erp_info_use_protection = -1;
+static int hf_ieee80211_tag_erp_info_barker_preamble_mode = -1;
+static int hf_ieee80211_tag_erp_info_reserved = -1;
+
+static int hf_ieee80211_tag_extended_capabilities = -1;
+static int hf_ieee80211_tag_extended_capabilities_b0 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b1 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b2 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b3 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b4 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b6 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b28 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b29 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b30 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b37 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b38 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b39 = -1;
+static int hf_ieee80211_tag_extended_capabilities_b40 = -1;
+static int hf_ieee80211_tag_extended_capabilities_serv_int_granularity = -1;
+
+static int hf_ieee80211_tag_neighbor_report_bssid = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_reachability = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_security = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_key_scope = -1;
+/*static int hf_ieee80211_tag_neighbor_report_bssid_info_capability = -1; */ /* TODO Make this the parent tree item */
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_spec_mng = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_qos = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_apsd = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_radio_msnt = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_dback = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_iback = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_mobility_domain = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_high_throughput = -1;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_reserved = -1;
+static int hf_ieee80211_tag_neighbor_report_reg_class = -1;
+static int hf_ieee80211_tag_neighbor_report_channel_number = -1;
+static int hf_ieee80211_tag_neighbor_report_phy_type = -1;
+
+static int hf_ieee80211_tag_supported_reg_classes_current = -1;
+static int hf_ieee80211_tag_supported_reg_classes_alternate = -1;
+
+/* IEEE Std 802.11r-2008 7.3.2.47 */
+static int hf_ieee80211_tag_mobility_domain_mdid = -1;
+static int hf_ieee80211_tag_mobility_domain_ft_capab = -1;
+static int hf_ieee80211_tag_mobility_domain_ft_capab_ft_over_ds = -1;
+static int hf_ieee80211_tag_mobility_domain_ft_capab_resource_req = -1;
+
+/* IEEE Std 802.11r-2008 7.3.2.48 */
+static int hf_ieee80211_tag_ft_mic_control = -1;
+static int hf_ieee80211_tag_ft_element_count = -1;
+static int hf_ieee80211_tag_ft_mic = -1;
+static int hf_ieee80211_tag_ft_anonce = -1;
+static int hf_ieee80211_tag_ft_snonce = -1;
+static int hf_ieee80211_tag_ft_subelem_id = -1;
+static int hf_ieee80211_tag_ft_subelem_len = -1;
+static int hf_ieee80211_tag_ft_subelem_data = -1;
+static int hf_ieee80211_tag_ft_subelem_r1kh_id = -1;
+static int hf_ieee80211_tag_ft_subelem_gtk_key_info = -1;
+static int hf_ieee80211_tag_ft_subelem_gtk_key_id = -1;
+static int hf_ieee80211_tag_ft_subelem_gtk_key_length = -1;
+static int hf_ieee80211_tag_ft_subelem_gtk_rsc = -1;
+static int hf_ieee80211_tag_ft_subelem_gtk_key = -1;
+static int hf_ieee80211_tag_ft_subelem_r0kh_id = -1;
+static int hf_ieee80211_tag_ft_subelem_igtk_key_id = -1;
+static int hf_ieee80211_tag_ft_subelem_igtk_ipn = -1;
+static int hf_ieee80211_tag_ft_subelem_igtk_key_length = -1;
+static int hf_ieee80211_tag_ft_subelem_igtk_key = -1;
+
+/* IEEE Std 802.11w-2009 7.3.2.55 */
+static int hf_ieee80211_tag_mmie_keyid = -1;
+static int hf_ieee80211_tag_mmie_ipn = -1;
+static int hf_ieee80211_tag_mmie_mic = -1;
+
+/* IEEE P802.11u/D10.0, 7.3.2.91 */
+static int hf_ieee80211_tag_adv_proto_resp_len_limit = -1;
+static int hf_ieee80211_tag_adv_proto_pame_bi = -1;
+static int hf_ieee80211_tag_adv_proto_id = -1;
/* 802.11n 7.3.2.48 */
-static int hta_cap = -1;
-static int hta_ext_chan_offset = -1;
-static int hta_rec_tx_width = -1;
-static int hta_rifs_mode = -1;
-static int hta_controlled_access = -1;
-static int hta_service_interval = -1;
-static int hta_operating_mode = -1;
-static int hta_non_gf_devices = -1;
-static int hta_basic_stbc_mcs = -1;
-static int hta_dual_stbc_protection = -1;
-static int hta_secondary_beacon = -1;
-static int hta_lsig_txop_protection = -1;
-static int hta_pco_active = -1;
-static int hta_pco_phase = -1;
-
-
-static int antsel = -1;
-static int antsel_vs = -1;
-static int antsel_b0 = -1;
-static int antsel_b1 = -1;
-static int antsel_b2 = -1;
-static int antsel_b3 = -1;
-static int antsel_b4 = -1;
-static int antsel_b5 = -1;
-static int antsel_b6 = -1;
-static int antsel_b7 = -1;
-
-static int rsn_cap = -1;
-static int rsn_cap_preauth = -1;
-static int rsn_cap_no_pairwise = -1;
-static int rsn_cap_ptksa_replay_counter = -1;
-static int rsn_cap_gtksa_replay_counter = -1;
-
-static int hf_aironet_ie_type = -1;
-static int hf_aironet_ie_version = -1;
-static int hf_aironet_ie_data = -1;
-static int hf_aironet_ie_qos_unk1 = -1;
-static int hf_aironet_ie_qos_paramset = -1;
-static int hf_aironet_ie_qos_val = -1;
-
-static int hf_marvell_ie_type = -1;
-static int hf_marvell_ie_mesh_subtype = -1;
-static int hf_marvell_ie_mesh_version = -1;
-static int hf_marvell_ie_mesh_active_proto_id = -1;
-static int hf_marvell_ie_mesh_active_metric_id = -1;
-static int hf_marvell_ie_mesh_cap = -1;
-static int hf_marvell_ie_data = -1;
+static int hf_ieee80211_hta_cap = -1;
+static int hf_ieee80211_hta_ext_chan_offset = -1;
+static int hf_ieee80211_hta_rec_tx_width = -1;
+static int hf_ieee80211_hta_rifs_mode = -1;
+static int hf_ieee80211_hta_controlled_access = -1;
+static int hf_ieee80211_hta_service_interval = -1;
+static int hf_ieee80211_hta_operating_mode = -1;
+static int hf_ieee80211_hta_non_gf_devices = -1;
+static int hf_ieee80211_hta_basic_stbc_mcs = -1;
+static int hf_ieee80211_hta_dual_stbc_protection = -1;
+static int hf_ieee80211_hta_secondary_beacon = -1;
+static int hf_ieee80211_hta_lsig_txop_protection = -1;
+static int hf_ieee80211_hta_pco_active = -1;
+static int hf_ieee80211_hta_pco_phase = -1;
+
+static int hf_ieee80211_antsel = -1;
+static int hf_ieee80211_antsel_vs = -1;
+static int hf_ieee80211_antsel_b0 = -1;
+static int hf_ieee80211_antsel_b1 = -1;
+static int hf_ieee80211_antsel_b2 = -1;
+static int hf_ieee80211_antsel_b3 = -1;
+static int hf_ieee80211_antsel_b4 = -1;
+static int hf_ieee80211_antsel_b5 = -1;
+static int hf_ieee80211_antsel_b6 = -1;
+static int hf_ieee80211_antsel_b7 = -1;
+
+static int hf_ieee80211_rsn_version = -1;
+static int hf_ieee80211_rsn_gcs = -1;
+static int hf_ieee80211_rsn_gcs_oui = -1;
+static int hf_ieee80211_rsn_gcs_type = -1;
+static int hf_ieee80211_rsn_gcs_80211_type = -1;
+static int hf_ieee80211_rsn_pcs_count = -1;
+static int hf_ieee80211_rsn_pcs_list = -1;
+static int hf_ieee80211_rsn_pcs = -1;
+static int hf_ieee80211_rsn_pcs_oui = -1;
+static int hf_ieee80211_rsn_pcs_80211_type = -1;
+static int hf_ieee80211_rsn_pcs_type = -1;
+static int hf_ieee80211_rsn_akms_count = -1;
+static int hf_ieee80211_rsn_akms_list = -1;
+static int hf_ieee80211_rsn_akms = -1;
+static int hf_ieee80211_rsn_akms_oui = -1;
+static int hf_ieee80211_rsn_akms_80211_type = -1;
+static int hf_ieee80211_rsn_akms_type = -1;
+static int hf_ieee80211_rsn_cap = -1;
+static int hf_ieee80211_rsn_cap_preauth = -1;
+static int hf_ieee80211_rsn_cap_no_pairwise = -1;
+static int hf_ieee80211_rsn_cap_ptksa_replay_counter = -1;
+static int hf_ieee80211_rsn_cap_gtksa_replay_counter = -1;
+static int hf_ieee80211_rsn_cap_mfpr = -1;
+static int hf_ieee80211_rsn_cap_mfpc = -1;
+static int hf_ieee80211_rsn_cap_peerkey = -1;
+static int hf_ieee80211_rsn_pmkid_count = -1;
+static int hf_ieee80211_rsn_pmkid_list = -1;
+static int hf_ieee80211_rsn_pmkid = -1;
+static int hf_ieee80211_rsn_gmcs = -1;
+static int hf_ieee80211_rsn_gmcs_oui = -1;
+static int hf_ieee80211_rsn_gmcs_type = -1;
+static int hf_ieee80211_rsn_gmcs_80211_type = -1;
+
+static int hf_ieee80211_aironet_ie_type = -1;
+static int hf_ieee80211_aironet_ie_version = -1;
+static int hf_ieee80211_aironet_ie_data = -1;
+static int hf_ieee80211_aironet_ie_qos_unk1 = -1;
+static int hf_ieee80211_aironet_ie_qos_paramset = -1;
+static int hf_ieee80211_aironet_ie_qos_val = -1;
+
+static int hf_ieee80211_marvell_ie_type = -1;
+static int hf_ieee80211_marvell_ie_mesh_subtype = -1;
+static int hf_ieee80211_marvell_ie_mesh_version = -1;
+static int hf_ieee80211_marvell_ie_mesh_active_proto_id = -1;
+static int hf_ieee80211_marvell_ie_mesh_active_metric_id = -1;
+static int hf_ieee80211_marvell_ie_mesh_cap = -1;
+static int hf_ieee80211_marvell_ie_data = -1;
+
+static int hf_ieee80211_atheros_ie_type = -1;
+static int hf_ieee80211_atheros_ie_subtype = -1;
+static int hf_ieee80211_atheros_ie_version = -1;
+static int hf_ieee80211_atheros_ie_cap_f_turbop = -1;
+static int hf_ieee80211_atheros_ie_cap_f_comp = -1;
+static int hf_ieee80211_atheros_ie_cap_f_ff = -1;
+static int hf_ieee80211_atheros_ie_cap_f_xr = -1;
+static int hf_ieee80211_atheros_ie_cap_f_ar = -1;
+static int hf_ieee80211_atheros_ie_cap_f_burst = -1;
+static int hf_ieee80211_atheros_ie_cap_f_wme = -1;
+static int hf_ieee80211_atheros_ie_cap_f_boost = -1;
+static int hf_ieee80211_atheros_ie_advcap_cap = -1;
+static int hf_ieee80211_atheros_ie_advcap_defkey = -1;
+static int hf_ieee80211_atheros_ie_xr_info = -1;
+static int hf_ieee80211_atheros_ie_xr_base_bssid = -1;
+static int hf_ieee80211_atheros_ie_xr_xr_bssid = -1;
+static int hf_ieee80211_atheros_ie_xr_xr_beacon = -1;
+static int hf_ieee80211_atheros_ie_xr_base_cap = -1;
+static int hf_ieee80211_atheros_ie_xr_xr_cap = -1;
+static int hf_ieee80211_atheros_ie_data = -1;
/*QBSS - Version 1,2,802.11e*/
-static int hf_qbss2_cal = -1;
-static int hf_qbss2_gl = -1;
-static int hf_qbss_cu = -1;
-static int hf_qbss2_cu = -1;
-static int hf_qbss_scount = -1;
-static int hf_qbss2_scount = -1;
-static int hf_qbss_version = -1;
-static int hf_qbss_adc = -1;
-
-static int hf_ts_info = -1;
-static int hf_tsinfo_type = -1;
-static int hf_tsinfo_tsid = -1;
-static int hf_tsinfo_dir = -1;
-static int hf_tsinfo_access = -1;
-static int hf_tsinfo_agg = -1;
-static int hf_tsinfo_apsd = -1;
-static int hf_tsinfo_up = -1;
-static int hf_tsinfo_ack = -1;
-static int hf_tsinfo_sched = -1;
-static int tspec_nor_msdu = -1;
-static int tspec_max_msdu = -1;
-static int tspec_min_srv = -1;
-static int tspec_max_srv = -1;
-static int tspec_inact_int = -1;
-static int tspec_susp_int = -1;
-static int tspec_srv_start = -1;
-static int tspec_min_data = -1;
-static int tspec_mean_data = -1;
-static int tspec_peak_data = -1;
-static int tspec_burst_size = -1;
-static int tspec_delay_bound = -1;
-static int tspec_min_phy = -1;
-static int tspec_surplus = -1;
-static int tspec_medium = -1;
-static int ts_delay = -1;
-static int hf_class_type = -1;
-static int hf_class_mask = -1;
-static int hf_ether_type = -1;
-static int hf_tclas_process = -1;
-static int hf_sched_info = -1;
-static int hf_sched_srv_start = -1;
-static int hf_sched_srv_int = -1;
-static int hf_sched_spec_int = -1;
-static int hf_action = -1;
-static int cf_version = -1;
-static int cf_ipv4_src = -1;
-static int cf_ipv4_dst = -1;
-static int cf_src_port = -1;
-static int cf_dst_port = -1;
-static int cf_dscp = -1;
-static int cf_protocol = -1;
-static int cf_ipv6_src = -1;
-static int cf_ipv6_dst = -1;
-static int cf_flow = -1;
-static int cf_tag_type = -1;
-static int cf_aruba = -1;
-static int cf_aruba_hb_seq = -1;
-static int cf_aruba_mtu = -1;
+static int hf_ieee80211_qbss2_cal = -1;
+static int hf_ieee80211_qbss2_gl = -1;
+static int hf_ieee80211_qbss_cu = -1;
+static int hf_ieee80211_qbss2_cu = -1;
+static int hf_ieee80211_qbss_scount = -1;
+static int hf_ieee80211_qbss2_scount = -1;
+static int hf_ieee80211_qbss_version = -1;
+static int hf_ieee80211_qbss_adc = -1;
+
+static int hf_ieee80211_tsinfo = -1;
+static int hf_ieee80211_tsinfo_type = -1;
+static int hf_ieee80211_tsinfo_tsid = -1;
+static int hf_ieee80211_tsinfo_dir = -1;
+static int hf_ieee80211_tsinfo_access = -1;
+static int hf_ieee80211_tsinfo_agg = -1;
+static int hf_ieee80211_tsinfo_apsd = -1;
+static int hf_ieee80211_tsinfo_up = -1;
+static int hf_ieee80211_tsinfo_ack = -1;
+static int hf_ieee80211_tsinfo_sched = -1;
+static int hf_ieee80211_tsinfo_rsv = -1;
+static int hf_ieee80211_tspec_nor_msdu = -1;
+static int hf_ieee80211_tspec_max_msdu = -1;
+static int hf_ieee80211_tspec_min_srv = -1;
+static int hf_ieee80211_tspec_max_srv = -1;
+static int hf_ieee80211_tspec_inact_int = -1;
+static int hf_ieee80211_tspec_susp_int = -1;
+static int hf_ieee80211_tspec_srv_start = -1;
+static int hf_ieee80211_tspec_min_data = -1;
+static int hf_ieee80211_tspec_mean_data = -1;
+static int hf_ieee80211_tspec_peak_data = -1;
+static int hf_ieee80211_tspec_burst_size = -1;
+static int hf_ieee80211_tspec_delay_bound = -1;
+static int hf_ieee80211_tspec_min_phy = -1;
+static int hf_ieee80211_tspec_surplus = -1;
+static int hf_ieee80211_tspec_medium = -1;
+static int hf_ieee80211_ts_delay = -1;
+static int hf_ieee80211_tclas_process = -1;
+static int hf_ieee80211_tag_qos_cap_qos_info = -1;
+static int hf_ieee80211_tag_ext_supp_rates = -1;
+static int hf_ieee80211_sched_info = -1;
+static int hf_ieee80211_sched_info_agg = -1;
+static int hf_ieee80211_sched_info_tsid = -1;
+static int hf_ieee80211_sched_info_dir = -1;
+static int hf_ieee80211_sched_srv_start = -1;
+static int hf_ieee80211_sched_srv_int = -1;
+static int hf_ieee80211_sched_spec_int = -1;
+static int hf_ieee80211_action = -1;
+static int hf_ieee80211_tclas_up = -1;
+static int hf_ieee80211_tclas_class_type = -1;
+static int hf_ieee80211_tclas_class_mask = -1;
+static int hf_ieee80211_tclas_src_mac_addr = -1;
+static int hf_ieee80211_tclas_dst_mac_addr = -1;
+static int hf_ieee80211_tclas_ether_type = -1;
+static int hf_ieee80211_tclas_version = -1;
+static int hf_ieee80211_tclas_ipv4_src = -1;
+static int hf_ieee80211_tclas_ipv4_dst = -1;
+static int hf_ieee80211_tclas_src_port = -1;
+static int hf_ieee80211_tclas_dst_port = -1;
+static int hf_ieee80211_tclas_dscp = -1;
+static int hf_ieee80211_tclas_protocol = -1;
+static int hf_ieee80211_tclas_ipv6_src = -1;
+static int hf_ieee80211_tclas_ipv6_dst = -1;
+static int hf_ieee80211_tclas_flow = -1;
+static int hf_ieee80211_tclas_tag_type = -1;
+
+static int hf_ieee80211_aruba = -1;
+static int hf_ieee80211_aruba_hb_seq = -1;
+static int hf_ieee80211_aruba_mtu = -1;
+
+static int hf_ieee80211_tag_vendor_oui_type = -1;
+
+/* IEEE Std 802.11z-2010 7.3.2.62 */
+static int hf_ieee80211_tag_link_id_bssid = -1;
+static int hf_ieee80211_tag_link_id_init_sta = -1;
+static int hf_ieee80211_tag_link_id_resp_sta = -1;
+
+/* IEEE Std 802.11z-2010 7.3.2.63 */
+static int hf_ieee80211_tag_wakeup_schedule_offset = -1;
+static int hf_ieee80211_tag_wakeup_schedule_interval = -1;
+static int hf_ieee80211_tag_wakeup_schedule_awake_window_slots = -1;
+static int hf_ieee80211_tag_wakeup_schedule_max_awake_dur = -1;
+static int hf_ieee80211_tag_wakeup_schedule_idle_count = -1;
+
+/* IEEE Std 802.11z-2010 7.3.2.64 */
+static int hf_ieee80211_tag_channel_switch_timing_switch_time = -1;
+static int hf_ieee80211_tag_channel_switch_timing_switch_timeout = -1;
+
+/* IEEE Std 802.11z-2010 7.3.2.65 */
+static int hf_ieee80211_tag_pti_control_tid = -1;
+static int hf_ieee80211_tag_pti_control_sequence_control = -1;
+
+/* IEEE Std 802.11z-2010 7.3.2.66 */
+static int hf_ieee80211_tag_pu_buffer_status_ac_bk = -1;
+static int hf_ieee80211_tag_pu_buffer_status_ac_be = -1;
+static int hf_ieee80211_tag_pu_buffer_status_ac_vi = -1;
+static int hf_ieee80211_tag_pu_buffer_status_ac_vo = -1;
+
+/* IEEE Std 802.11r-2008 7.3.2.49 */
+static int hf_ieee80211_tag_timeout_int_type = -1;
+static int hf_ieee80211_tag_timeout_int_value = -1;
+
+/* Ethertype 89-0d */
+static int hf_ieee80211_data_encap_payload_type = -1;
/* ************************************************************************* */
/* Protocol trees */
static gint ett_fragments = -1;
static gint ett_fragment = -1;
static gint ett_block_ack = -1;
+static gint ett_ath_cap_tree = -1;
static gint ett_80211_mgt = -1;
static gint ett_fixed_parameters = -1;
static gint ett_tagged_parameters = -1;
+static gint ett_tag_bmapctl_tree = -1;
+static gint ett_tag_country_fnm_tree = -1;
+static gint ett_tag_country_rcc_tree = -1;
static gint ett_qos_parameters = -1;
static gint ett_qos_ps_buf_state = -1;
static gint ett_wep_parameters = -1;
-
+#ifdef MESH_OVERRIDES
+static gint ett_msh_parameters = -1;
+static gint ett_msh_dest_flags_tree = -1;
+#endif /* MESH_OVERRIDES */
+
+static gint ett_rsn_gcs_tree = -1;
+static gint ett_rsn_pcs_tree = -1;
+static gint ett_rsn_sub_pcs_tree = -1;
+static gint ett_rsn_akms_tree = -1;
+static gint ett_rsn_sub_akms_tree = -1;
static gint ett_rsn_cap_tree = -1;
+static gint ett_rsn_pmkid_tree = -1;
+static gint ett_rsn_gmcs_tree = -1;
static gint ett_ht_cap_tree = -1;
static gint ett_ampduparam_tree = -1;
static gint ett_hta_cap2_tree = -1;
static gint ett_htc_tree = -1;
-/*** Start: 802.11n D1.10 - HT Information IE - Dustin Johnson ***/
static gint ett_ht_info_delimiter1_tree = -1;
static gint ett_ht_info_delimiter2_tree = -1;
static gint ett_ht_info_delimiter3_tree = -1;
-/*** End: 802.11n D1.10 - HT Information IE - Dustin Johnson ***/
-
-/*** Start: 802.11n D1.10 - Tag Measure Request IE - Dustin Johnson ***/
-static gint ett_tag_measure_request_tree = -1;
-/*** End: 802.11n D1.10 - Tag Measure Request IE - Dustin Johnson ***/
+static gint ett_tag_measure_request_mode_tree = -1;
+static gint ett_tag_measure_request_type_tree = -1;
+static gint ett_tag_measure_report_mode_tree = -1;
+static gint ett_tag_measure_report_type_tree = -1;
+static gint ett_tag_measure_report_basic_map_tree = -1;
+static gint ett_tag_measure_report_rpi_tree = -1;
+static gint ett_tag_measure_report_frame_tree = -1;
+static gint ett_tag_dfs_map_tree = -1;
+static gint ett_tag_erp_info_tree = -1;
static gint ett_tag_ex_cap = -1;
-/*** Begin: Supported Channels Tag - Dustin Johnson ***/
static gint ett_tag_supported_channels = -1;
-/*** End: Supported Channels Tag - Dustin Johnson ***/
-/*** Begin: Neighbor Report Tag - Dustin Johnson ***/
static gint ett_tag_neighbor_report_bssid_info_tree = -1;
static gint ett_tag_neighbor_report_bssid_info_capability_tree = -1;
static gint ett_tag_neighbor_report_sub_tag_tree = -1;
-/*** End: Neighbor Report Tag - Dustin Johnson ***/
-/*** Begin: Block Ack Timeout Fixed Field - Dustin Johnson ***/
static gint ett_ff_ba_param_tree = -1;
static gint ett_ff_ba_ssc_tree = -1;
-/*** End: Block Ack Timeout Fixed Field - Dustin Johnson ***/
-
-/*** Begin: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
static gint ett_ff_delba_param_tree = -1;
-/*** End: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
-
-/*** Begin: QoS Information AP/STA Fixed Field - Dustin Johnson ***/
static gint ett_ff_qos_info = -1;
-/*** End: QoS Information AP/STA Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
static gint ett_ff_sm_pwr_save = -1;
-/*** End: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
-
-/*** Begin: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
static gint ett_ff_psmp_param_set = -1;
-/*** End: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
-
-/*** Begin: MIMO Control Fixed Field - Dustin Johnson ***/
static gint ett_ff_mimo_cntrl = -1;
-/*** End: MIMO Control Fixed Field - Dustin Johnson ***/
-
-/*** Begin: Antenna Selection Fixed Field - Dustin Johnson ***/
static gint ett_ff_ant_sel = -1;
-/*** End: Antenna Selection Fixed Field - Dustin Johnson ***/
-
-/*** Begin: MIMO Reports - Dustin Johnson ***/
static gint ett_mimo_report = -1;
-/*** End: MIMO Reports - Dustin Johnson ***/
-
-/*** Begin: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
static gint ett_ff_chan_switch_announce = -1;
-/*** End: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
-
-/*** Begin: HT Information Fixed Field - Dustin Johnson ***/
static gint ett_ff_ht_info = -1;
-/*** End: HT Information Fixed Field - Dustin Johnson ***/
-
-/*** Begin: PSMP Station Information Fixed Field - Dustin Johnson ***/
static gint ett_ff_psmp_sta_info = -1;
-/*** End: PSMP Station Information Fixed Field - Dustin Johnson ***/
-/*** Begin: A-MSDU Dissection - Dustin Johnson ***/
static gint ett_msdu_aggregation_parent_tree = -1;
static gint ett_msdu_aggregation_subframe_tree = -1;
-/*** End: A-MSDU Dissection - Dustin Johnson ***/
/*** Begin: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
static gint ett_pst_tree = -1;
static gint ett_fcs = -1;
static gint ett_radio = -1;
+static gint ett_prism = -1;
+static gint ett_prism_did = -1;
+
+static gint ett_adv_proto = -1;
+static gint ett_adv_proto_tuple = -1;
+static gint ett_gas_query = -1;
+static gint ett_gas_anqp = -1;
static const fragment_items frag_items = {
&ett_fragment,
&ett_fragments,
- &hf_fragments,
- &hf_fragment,
- &hf_fragment_overlap,
- &hf_fragment_overlap_conflict,
- &hf_fragment_multiple_tails,
- &hf_fragment_too_long_fragment,
- &hf_fragment_error,
- &hf_reassembled_in,
+ &hf_ieee80211_fragments,
+ &hf_ieee80211_fragment,
+ &hf_ieee80211_fragment_overlap,
+ &hf_ieee80211_fragment_overlap_conflict,
+ &hf_ieee80211_fragment_multiple_tails,
+ &hf_ieee80211_fragment_too_long_fragment,
+ &hf_ieee80211_fragment_error,
+ &hf_ieee80211_fragment_count,
+ &hf_ieee80211_reassembled_in,
+ &hf_ieee80211_reassembled_length,
"fragments"
};
static int wlan_tap = -1;
+static const value_string adv_proto_id_vals[] =
+{
+ {0, "Access Network Query Protocol"},
+ {1, "MIH Information Service"},
+ {2, "MIH Command and Event Services Capability Discovery"},
+ {3, "Emergency Alert System (EAS)"},
+ {4, "Location-to-Service Translation Protocol"},
+ {221, "Vendor Specific"},
+ {0, NULL}
+};
+
+static const value_string timeout_int_types[] =
+{
+ {1, "Reassociation deadline interval (TUs)"},
+ {2, "Key lifetime interval (seconds)"},
+ {3, "Association Comeback time (TUs)"},
+ {0, NULL}
+};
+
+static const value_string tdls_action_codes[] ={
+ {TDLS_SETUP_REQUEST, "TDLS Setup Request"},
+ {TDLS_SETUP_RESPONSE, "TDLS Setup Response"},
+ {TDLS_SETUP_CONFIRM, "TDLS Setup Confirm"},
+ {TDLS_TEARDOWN, "TDLS Teardown"},
+ {TDLS_PEER_TRAFFIC_INDICATION, "TDLS Peer Traffic Indication"},
+ {TDLS_CHANNEL_SWITCH_REQUEST, "TDLS Channel Switch Request"},
+ {TDLS_CHANNEL_SWITCH_RESPONSE, "TDLS Channel Switch Response"},
+ {TDLS_PEER_PSM_REQUEST, "TDLS Peer PSM Request"},
+ {TDLS_PEER_PSM_RESPONSE, "TDLS Peer PSM Response"},
+ {TDLS_PEER_TRAFFIC_RESPONSE, "TDLS Peer Traffic Response"},
+ {TDLS_DISCOVERY_REQUEST, "TDLS Discovery Request"},
+ {0, NULL}
+};
+
+#define PSMP_STA_INFO_BROADCAST 0
+#define PSMP_STA_INFO_MULTICAST 1
+#define PSMP_STA_INFO_INDIVIDUALLY_ADDRESSED 2
+
+#define PSMP_STA_INFO_FLAG_TYPE 0x00000003
+#define PSMP_STA_INFO_FLAG_DTT_START 0x00001FFC
+#define PSMP_STA_INFO_FLAG_DTT_DURATION 0x001FE000
+
+#define PSMP_STA_INFO_FLAG_STA_ID 0x001FFFE0
+
+#define PSMP_STA_INFO_FLAG_UTT_START 0x0000FFE0
+#define PSMP_STA_INFO_FLAG_UTT_DURATION 0x03FF0000
+
+#define PSMP_STA_INFO_FLAG_IA_RESERVED 0xFC000000
+
+static const value_string ff_psmp_sta_info_flags[] = {
+ { PSMP_STA_INFO_BROADCAST, "Broadcast"},
+ { PSMP_STA_INFO_MULTICAST, "Multicast"},
+ { PSMP_STA_INFO_INDIVIDUALLY_ADDRESSED, "Individually Addressed"},
+ {0, NULL}
+};
+
+static void
+beacon_interval_base_custom(gchar *result, guint32 beacon_interval)
+{
+ double temp_double;
+ temp_double = (double)beacon_interval;
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%f [Seconds]", (temp_double * 1024 / 1000000) );
+}
+
/* Davide Schiera (2006-11-22): including AirPDcap project */
#ifdef HAVE_AIRPDCAP
#include <epan/crypt/airpdcap_ws.h>
}
}
+#ifdef MESH_OVERRIDES
+/* ************************************************************************* */
+/* Return the length of the mesh header if any (in bytes)
+ *
+ * Per IEEE 802.11-07/0799r8:
+ * 7.1.3.5a.1 The Mesh Header field (...) is present in Data frames if and
+ * only if they are transmitted between peer MPs with an established peer
+ * link. Data frames including the Mesh Header field are referred to as
+ * Mesh Data frames.
+ *
+ * We need a stateful sniffer for that. For now, use heuristics: If we
+ * find valid mesh flags (currently, only MESH_FLAGS_ADDRESS_EXTENSION) at the
+ * offset where mesh flags should be, assume we're dealing with a mesh header.
+ * ************************************************************************* */
+static int
+find_mesh_header_length(const guchar * pd, int offset, guint16 fcf)
+{
+ guint8 mesh_flags;
+
+ switch (FCF_FRAME_TYPE (fcf)) {
+
+ case MGT_FRAME:
+ /* TODO: Multihop Action Frames */
+ return 0;
+
+ case DATA_FRAME:
+ mesh_flags = pd[offset];
+
+ /* heuristics: */
+ /* asume mesh if all reserved bits in the mesh_flags field are zero */
+ if ((mesh_flags & ~MESH_FLAGS_ADDRESS_EXTENSION) == 0)
+ return 6 + 6*(mesh_flags & MESH_FLAGS_ADDRESS_EXTENSION);
+ break;
+ }
+ return 0;
+}
+#endif /* MESH_OVERRIDES */
+
mimo_control_t get_mimo_control (tvbuff_t *tvb, int offset)
{
guint16 mimo;
if (chan_width)
{
- switch (output_grouping)
+ switch (output_grouping)
{
case 1:
ns = 114;
}
} else {
switch (output_grouping)
- {
- case 1:
- ns = 56;
- break;
+ {
+ case 1:
+ ns = 56;
+ break;
- case 2:
- ns = 30;
- break;
+ case 2:
+ ns = 30;
+ break;
- case 4:
- ns = 16;
- break;
+ case 4:
+ ns = 16;
+ break;
- default:
- ns = 0;
- }
+ default:
+ ns = 0;
+ }
}
return ns;
guint8 snr;
snr = tvb_get_guint8(tvb, offset);
- proto_tree_add_uint_format(snr_tree, ff_mimo_csi_snr, tvb, offset, 1, snr, "Channel %d - Signal to Noise Ratio: 0x%02X", i, snr);
+ proto_tree_add_uint_format(snr_tree, hf_ieee80211_ff_mimo_csi_snr, tvb, offset, 1, snr, "Channel %d - Signal to Noise Ratio: 0x%02X", i, snr);
offset++;
}
guint8 snr;
snr = tvb_get_guint8(tvb, offset);
- proto_tree_add_uint_format(snr_tree, ff_mimo_csi_snr, tvb, offset, 1, snr, "Stream %d - Signal to Noise Ratio: 0x%02X", i, snr);
+ proto_tree_add_uint_format(snr_tree, hf_ieee80211_ff_mimo_csi_snr, tvb, offset, 1, snr, "Stream %d - Signal to Noise Ratio: 0x%02X", i, snr);
offset++;
}
guint8 snr;
snr = tvb_get_guint8(tvb, offset);
- proto_tree_add_uint_format(snr_tree, ff_mimo_csi_snr, tvb, offset, 1, snr, "Stream %d - Signal to Noise Ratio: 0x%02X", i, snr);
+ proto_tree_add_uint_format(snr_tree, hf_ieee80211_ff_mimo_csi_snr, tvb, offset, 1, snr, "Stream %d - Signal to Noise Ratio: 0x%02X", i, snr);
offset++;
}
gboolean datapad, gboolean is_ht)
{
guint16 fcf, hdr_length;
+#ifdef MESH_OVERRIDES
+ guint16 meshdr_length;
+#endif /* MESH_OVERRIDES */
if (!BYTES_ARE_IN_FRAME(offset, len, 2)) {
ld->other++;
case DATA_CF_ACK_POLL:
case DATA_QOS_DATA:
{
- if (fixed_length_header)
+ if (fixed_length_header) {
hdr_length = DATA_LONG_HDR_LEN;
- else
+#ifdef MESH_OVERRIDES
+ meshdr_length = 0;
+#endif /* MESH_OVERRIDES */
+ } else {
hdr_length = find_header_length (fcf, 0, is_ht);
+#ifdef MESH_OVERRIDES
+ if (datapad)
+ hdr_length = roundup2(hdr_length, 4);
+ meshdr_length = find_mesh_header_length(pd, offset + hdr_length, fcf);
+ g_warning("mesh hdr_length %d hdr_length %d\n", meshdr_length, hdr_length);
+ hdr_length += meshdr_length;
+ }
+#else /* MESH_OVERRIDES */
+ }
if (datapad)
hdr_length = roundup2(hdr_length, 4);
+#endif /* MESH_OVERRIDES */
/* I guess some bridges take Netware Ethernet_802_3 frames,
which are 802.3 frames (with a length field rather than
a type field, but with no 802.2 header in the payload),
#define WLANCAP_MAGIC_COOKIE_V1 0x80211001
#define WLANCAP_MAGIC_COOKIE_V2 0x80211002
+
/*
* Prism II-based wlan devices have a monitoring mode that sticks
* a proprietary header on each packet with lots of good
* drivers, and various patches to the orinoco_cs drivers to add
* Prism headers, that:
*
- * the "did" identifies what the value is (i.e., what it's the value
- * of);
+ * the "did" identifies what the value is (i.e., what it's the value
+ * of);
*
- * "status" is 0 if the value is present or 1 if it's absent;
+ * "status" is 0 if the value is present or 1 if it's absent;
*
- * "len" is the length of the value (always 4, in that code);
+ * "len" is the length of the value (always 4, in that code);
*
- * "data" is the value of the data (or 0 if not present).
+ * "data" is the value of the data (or 0 if not present).
*
* Note: all of those values are in the *host* byte order of the machine
* on which the capture was written.
*/
-struct val_80211 {
- unsigned int did;
- unsigned short status, len;
- unsigned int data;
-};
+
/*
* Header attached during Prism monitor mode.
* At least according to one paper I've seen, the Prism 2.5 chip set
* provides:
*
- * RSSI (receive signal strength indication) is "the total power
- * received by the radio hardware while receiving the frame,
- * including signal, interfereence, and background noise";
+ * RSSI (receive signal strength indication) is "the total power
+ * received by the radio hardware while receiving the frame,
+ * including signal, interfereence, and background noise";
*
- * "silence value" is "the total power observed just before the
- * start of the frame".
+ * "silence value" is "the total power observed just before the
+ * start of the frame".
*
* None of the drivers I looked at supply the "rssi" or "sq" value,
* but they do supply "signal" and "noise" values, along with a "rate"
* XXX - what about other drivers that supply Prism headers, such as
* old versions of the MadWifi driver?
*/
-struct prism_hdr {
- unsigned int msgcode, msglen;
- char devname[16];
- struct val_80211 hosttime, mactime, channel, rssi, sq, signal,
- noise, rate, istx, frmlen;
+
+#define PRISM_HEADER_LENGTH 144 /* Default Prism Header Length */
+#define PRISM_DID_HOSTTIME 0x00010044 /* Host time element */
+#define PRISM_DID_MACTIME 0x00020044 /* Mac time element */
+#define PRISM_DID_CHANNEL 0x00030044 /* Channel element */
+#define PRISM_DID_RSSI 0x00040044 /* RSSI element */
+#define PRISM_DID_SQ 0x00050044 /* SQ element */
+#define PRISM_DID_SIGNAL 0x00060044 /* Signal element */
+#define PRISM_DID_NOISE 0x00070044 /* Noise element */
+#define PRISM_DID_RATE 0x00080044 /* Rate element */
+#define PRISM_DID_ISTX 0x00090044 /* Is Tx frame */
+#define PRISM_DID_FRMLEN 0x000A0044 /* Frame length */
+
+static const value_string prism_did_vals[] =
+{
+ { PRISM_DID_HOSTTIME, "Host Time" },
+ { PRISM_DID_MACTIME, "Mac Time" },
+ { PRISM_DID_CHANNEL, "Channel" },
+ { PRISM_DID_RSSI, "RSSI" },
+ { PRISM_DID_SQ, "SQ" },
+ { PRISM_DID_SIGNAL, "Signal" },
+ { PRISM_DID_NOISE, "Noise" },
+ { PRISM_DID_RATE, "Rate" },
+ { PRISM_DID_ISTX, "Is Tx" },
+ { PRISM_DID_FRMLEN, "Frame Length" },
+ { 0, NULL}
};
+static const value_string prism_status_vals[] =
+{
+ { 0, "Not Supplied" },
+ { 1, "Supplied" },
+ { 0, NULL}
+};
+
+static const value_string prism_istx_vals[] =
+{
+ { 0, "Rx Packet" },
+ { 1, "Tx Packet" },
+ { 0, NULL}
+};
+
+static void
+prism_rate_base_custom(gchar *result, guint32 rate)
+{
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%u.%u", rate /2, rate & 1 ? 5 : 0);
+}
+
+static gchar *
+prism_rate_return(guint32 rate)
+{
+ gchar *result=NULL;
+ result = ep_alloc(SHORT_STR);
+ result[0] = '\0';
+ prism_rate_base_custom(result, rate);
+
+ return result;
+}
+
+
void
capture_prism(const guchar *pd, int offset, int len, packet_counts *ld)
{
guint32 cookie;
- if (!BYTES_ARE_IN_FRAME(offset, len, sizeof(guint32))) {
+ if (!BYTES_ARE_IN_FRAME(offset, len, 4)) {
ld->other++;
return;
}
}
/* Prism header */
- if (!BYTES_ARE_IN_FRAME(offset, len, (int)sizeof(struct prism_hdr))) {
+ if (!BYTES_ARE_IN_FRAME(offset, len, PRISM_HEADER_LENGTH)) {
ld->other++;
return;
}
- offset += sizeof(struct prism_hdr);
+ offset += PRISM_HEADER_LENGTH;
/* 802.11 header follows */
capture_ieee80211(pd, offset, len, ld);
{
proto_item *fixed_fields;
fixed_fields =
- proto_tree_add_uint_format (tree, hf_fixed_parameters, tvb, start,
+ proto_tree_add_uint_format (tree, hf_ieee80211_fixed_parameters, tvb, start,
size, size, "Fixed parameters (%d bytes)",
size);
{
proto_item *tagged_fields;
- tagged_fields = proto_tree_add_uint_format (tree, hf_tagged_parameters,
+ tagged_fields = proto_tree_add_uint_format (tree, hf_ieee80211_tagged_parameters,
tvb,
start,
- size,
+ 2,
size,
"Tagged parameters (%d bytes)",
size);
static int
-dissect_vendor_action_marvell (proto_tree *tree, tvbuff_t *tvb, int offset)
+dissect_vendor_action_marvell(proto_tree *tree, tvbuff_t *tvb, int offset)
{
guint8 octet;
octet = tvb_get_guint8(tvb, offset);
- proto_tree_add_item (tree, ff_marvell_action_type, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_marvell_action_type, tvb, offset, 1, TRUE);
offset++;
switch (octet)
{
case MRVL_ACTION_MESH_MANAGEMENT:
octet = tvb_get_guint8(tvb, offset);
- proto_tree_add_item (tree, ff_marvell_mesh_mgt_action_code, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_action_code, tvb, offset, 1, TRUE);
offset++;
switch (octet)
{
case MRVL_MESH_MGMT_ACTION_RREQ:
- proto_tree_add_item (tree, ff_mesh_mgt_length, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_length, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_mode, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_mode, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_hopcount, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_hopcount, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_ttl, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_ttl, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_rreqid, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_rreqid, tvb, offset, 4, TRUE);
offset+= 4;
- proto_tree_add_item (tree, ff_mesh_mgt_sa, tvb, offset, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_sa, tvb, offset, 6, FALSE);
offset+= 6;
- proto_tree_add_item (tree, ff_mesh_mgt_ssn, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_ssn, tvb, offset, 4, TRUE);
offset+= 4;
- proto_tree_add_item (tree, ff_mesh_mgt_lifetime, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_lifetime, tvb, offset, 4, TRUE);
offset+= 4;
- proto_tree_add_item (tree, ff_mesh_mgt_metric, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_metric, tvb, offset, 4, TRUE);
offset+= 4;
- proto_tree_add_item (tree, ff_mesh_mgt_dstcount, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_dstcount, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_flags, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_flags, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_da, tvb, offset, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_da, tvb, offset, 6, FALSE);
offset+= 6;
- proto_tree_add_item (tree, ff_mesh_mgt_dsn, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_dsn, tvb, offset, 4, TRUE);
offset+= 4;
break;
case MRVL_MESH_MGMT_ACTION_RREP:
- proto_tree_add_item (tree, ff_mesh_mgt_length, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_length, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_mode, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_mode, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_hopcount, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_hopcount, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_ttl, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_ttl, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_da, tvb, offset, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_da, tvb, offset, 6, FALSE);
offset+= 6;
- proto_tree_add_item (tree, ff_mesh_mgt_dsn, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_dsn, tvb, offset, 4, TRUE);
offset+= 4;
- proto_tree_add_item (tree, ff_mesh_mgt_lifetime, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_lifetime, tvb, offset, 4, TRUE);
offset+= 4;
- proto_tree_add_item (tree, ff_mesh_mgt_metric, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_metric, tvb, offset, 4, TRUE);
offset+= 4;
- proto_tree_add_item (tree, ff_mesh_mgt_sa, tvb, offset, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_sa, tvb, offset, 6, FALSE);
offset+= 6;
- proto_tree_add_item (tree, ff_mesh_mgt_ssn, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_ssn, tvb, offset, 4, TRUE);
offset+= 4;
break;
case MRVL_MESH_MGMT_ACTION_RERR:
- proto_tree_add_item (tree, ff_mesh_mgt_length, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_length, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_mode, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_mode, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_dstcount, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_dstcount, tvb, offset, 1, TRUE);
offset++;
- proto_tree_add_item (tree, ff_mesh_mgt_da, tvb, offset, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_da, tvb, offset, 6, FALSE);
offset+= 6;
- proto_tree_add_item (tree, ff_mesh_mgt_dsn, tvb, offset, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_dsn, tvb, offset, 4, TRUE);
offset+= 4;
break;
default:
return offset;
}
+static guint
+dissect_advertisement_protocol(packet_info *pinfo, proto_tree *tree,
+ tvbuff_t *tvb, int offset, gboolean *anqp)
+{
+ guint8 tag_no, tag_len, left;
+ proto_item *item = NULL;
+ proto_tree *adv_tree, *adv_tuple_tree;
+
+ if (anqp)
+ *anqp = FALSE;
+ tag_no = tvb_get_guint8(tvb, offset);
+ item = proto_tree_add_item(tree, hf_ieee80211_tag_number, tvb, offset, 1, TRUE);
+
+ tag_len = tvb_get_guint8(tvb, offset + 1);
+ if (tag_no != TAG_ADVERTISEMENT_PROTOCOL) {
+ expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR,
+ "Unexpected IE %d (expected Advertisement "
+ "Protocol)", tag_no);
+ return 2 + tag_len;
+ }
+ item = proto_tree_add_uint(tree, hf_ieee80211_tag_length, tvb, offset + 1, 1, tag_len);
+ if (tag_len < 2) {
+ expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR,
+ "Advertisement Protocol: IE must be at least 2 "
+ "octets long");
+ return 2 + tag_len;
+ }
+
+ left = tag_len;
+ offset += 2;
+ item = proto_tree_add_text(tree, tvb, offset, left,
+ "Advertisement Protocol element");
+ adv_tree = proto_item_add_subtree(item, ett_adv_proto);
+
+ while (left >= 2) {
+ guint8 id;
+
+ id = tvb_get_guint8(tvb, offset + 1);
+ item = proto_tree_add_text(adv_tree, tvb, offset, 2,
+ "Advertisement Protocol Tuple: %s",
+ val_to_str(id, adv_proto_id_vals,
+ "Unknown (%d)"));
+ adv_tuple_tree = proto_item_add_subtree(item, ett_adv_proto_tuple);
+
+ proto_tree_add_item(adv_tuple_tree,
+ hf_ieee80211_tag_adv_proto_resp_len_limit, tvb,
+ offset, 1, FALSE);
+ proto_tree_add_item(adv_tuple_tree,
+ hf_ieee80211_tag_adv_proto_pame_bi, tvb,
+ offset, 1, FALSE);
+ offset++;
+ left--;
+ proto_tree_add_item(adv_tuple_tree, hf_ieee80211_tag_adv_proto_id, tvb,
+ offset, 1, FALSE);
+ offset++;
+ left--;
+
+ if (id == 0 && anqp)
+ *anqp = TRUE;
+
+ if (id == 221) {
+ /* Vendor specific */
+ guint8 len = tvb_get_guint8(tvb, offset);
+ offset++;
+ left--;
+ if (len > left) {
+ expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR,
+ "Vendor specific info length error");
+ return 2 + tag_len;
+ }
+ proto_tree_add_text(adv_tuple_tree, tvb, offset, len,
+ "Vendor Specific Advertisement Protocol info");
+ offset += len;
+ left -= len;
+ }
+ }
+
+ if (left) {
+ expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR,
+ "Unexpected extra data in the end");
+ }
+
+ return 2 + tag_len;
+}
+
+static void
+dissect_anqp(proto_tree *tree, tvbuff_t *tvb, int offset, gboolean request)
+{
+ guint16 id, len;
+
+ proto_tree_add_text(tree, tvb, offset, 4,
+ request ? "Access Network Query Protocol Request" :
+ "Access Network Query Protocol Response");
+ proto_tree_add_item(tree, hf_ieee80211_ff_anqp_info_id,
+ tvb, offset, 2, TRUE);
+ id = tvb_get_letohs(tvb, offset);
+ offset += 2;
+ proto_tree_add_item(tree, hf_ieee80211_ff_anqp_info_length,
+ tvb, offset, 2, TRUE);
+ len = tvb_get_letohs(tvb, offset);
+ offset += 2;
+ proto_tree_add_item(tree, hf_ieee80211_ff_anqp_info,
+ tvb, offset, len, FALSE);
+ if (id == 56797) {
+ /* ANQP vendor-specific list */
+ guint32 oui;
+ guint8 subtype;
+
+ oui = tvb_get_ntoh24(tvb, offset);
+ proto_tree_add_bytes_format(tree, hf_ieee80211_tag_oui, tvb, offset, 3,
+ NULL, "Vendor: %s",
+ tvb_get_manuf_name(tvb, offset));
+ offset += 3;
+
+ switch (oui) {
+ case OUI_WFA:
+ subtype = tvb_get_guint8(tvb, offset);
+ if (subtype == WFA_SUBTYPE_P2P) {
+ proto_tree_add_text(tree, tvb, offset, 1, "Subtype %u: P2P ANQP",
+ subtype);
+ dissect_wifi_p2p_anqp(g_pinfo, tree, tvb, offset + 1, request);
+ } else {
+ proto_tree_add_text(tree, tvb, offset, 1, "Subtype %u", subtype);
+ }
+ }
+ }
+}
+
+static guint
+dissect_gas_initial_request(proto_tree *tree, tvbuff_t *tvb, int offset,
+ gboolean anqp)
+{
+ guint16 req_len;
+ int start = offset;
+ proto_item *item;
+ proto_tree *query, *anqp_tree;
+
+ /* Query Request Length (2 octets) */
+ req_len = tvb_get_letohs(tvb, offset);
+
+ item = proto_tree_add_text(tree, tvb, offset, 2 + req_len, "Query Request");
+ query = proto_item_add_subtree(item, ett_gas_query);
+
+ proto_tree_add_item(query, hf_ieee80211_ff_query_request_length,
+ tvb, offset, 2, TRUE);
+ offset += 2;
+ /*
+ * Query Request (GAS query; formatted per protocol specified in the
+ * Advertisement Protocol IE)
+ */
+ item = proto_tree_add_item(query, hf_ieee80211_ff_query_request,
+ tvb, offset, req_len, FALSE);
+ if (anqp) {
+ anqp_tree = proto_item_add_subtree(item, ett_gas_anqp);
+ dissect_anqp(anqp_tree, tvb, offset, TRUE);
+ }
+ offset += req_len;
+
+ return offset - start;
+}
+
+static guint
+dissect_gas_initial_response(proto_tree *tree, tvbuff_t *tvb, int offset,
+ gboolean anqp)
+{
+ guint16 resp_len;
+ int start = offset;
+ proto_item *item;
+ proto_tree *query, *anqp_tree;
+
+ /* Query Response Length (2 octets) */
+ resp_len = tvb_get_letohs(tvb, offset);
+
+ item = proto_tree_add_text(tree, tvb, offset, 2 + resp_len,
+ "Query Response");
+ query = proto_item_add_subtree(item, ett_gas_query);
+
+ proto_tree_add_item(query, hf_ieee80211_ff_query_response_length,
+ tvb, offset, 2, TRUE);
+ offset += 2;
+ /* Query Response (optional) */
+ if (resp_len) {
+ item = proto_tree_add_item(query, hf_ieee80211_ff_query_response,
+ tvb, offset, resp_len, FALSE);
+ if (anqp) {
+ anqp_tree = proto_item_add_subtree(item, ett_gas_anqp);
+ dissect_anqp(anqp_tree, tvb, offset, FALSE);
+ }
+ offset += resp_len;
+ }
+
+ return offset - start;
+}
+
+static guint
+dissect_gas_comeback_response(proto_tree *tree, tvbuff_t *tvb, int offset,
+ gboolean anqp, guint8 frag)
+{
+ guint16 resp_len;
+ int start = offset;
+ proto_item *item;
+ proto_tree *query, *anqp_tree;
+
+ /* Query Response Length (2 octets) */
+ resp_len = tvb_get_letohs(tvb, offset);
+
+ item = proto_tree_add_text(tree, tvb, offset, 2 + resp_len,
+ "Query Response");
+ query = proto_item_add_subtree(item, ett_gas_query);
+
+ proto_tree_add_item(query, hf_ieee80211_ff_query_response_length,
+ tvb, offset, 2, TRUE);
+ offset += 2;
+ /* Query Response (optional) */
+ if (resp_len) {
+ item = proto_tree_add_item(query, hf_ieee80211_ff_query_response,
+ tvb, offset, resp_len, FALSE);
+ if (anqp && frag == 0) {
+ anqp_tree = proto_item_add_subtree(item, ett_gas_anqp);
+ dissect_anqp(anqp_tree, tvb, offset, FALSE);
+ }
+ offset += resp_len;
+ }
+
+ return offset - start;
+}
+
/* ************************************************************************* */
/* Dissect and add fixed mgmt fields to protocol tree */
/* ************************************************************************* */
static guint
add_fixed_field(proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode)
{
- const guint8 *dataptr;
- char out_buff[SHORT_STR];
- guint16 capability;
- proto_item *cap_item;
- static proto_tree *cap_tree;
- double temp_double;
+
guint length = 0;
switch (lfcode)
{
case FIELD_TIMESTAMP:
- dataptr = tvb_get_ptr (tvb, offset, 8);
- memset (out_buff, 0, SHORT_STR);
- g_snprintf (out_buff, SHORT_STR, "0x%02X%02X%02X%02X%02X%02X%02X%02X",
- dataptr[7],
- dataptr[6],
- dataptr[5],
- dataptr[4],
- dataptr[3],
- dataptr[2],
- dataptr[1],
- dataptr[0]);
-
- proto_tree_add_string (tree, ff_timestamp, tvb, offset, 8, out_buff);
+ proto_tree_add_item(tree, hf_ieee80211_ff_timestamp, tvb, offset, 8, TRUE);
length += 8;
break;
case FIELD_BEACON_INTERVAL:
{
- capability = tvb_get_letohs (tvb, offset);
- temp_double = (double)capability;
- temp_double = temp_double * 1024 / 1000000;
- proto_tree_add_double_format (tree, ff_beacon_interval, tvb, offset, 2,
- temp_double,"Beacon Interval: %f [Seconds]", temp_double);
- if (check_col (g_pinfo->cinfo, COL_INFO)) {
- col_append_fstr(g_pinfo->cinfo, COL_INFO, ", BI=%d", capability);
- }
+ proto_tree_add_item(tree, hf_ieee80211_ff_beacon_interval, tvb, offset, 2, TRUE);
+ col_append_fstr(g_pinfo->cinfo, COL_INFO, ", BI=%d", tvb_get_letohs (tvb, offset));
length += 2;
break;
}
case FIELD_CAP_INFO:
{
- capability = tvb_get_letohs (tvb, offset);
- cap_item = proto_tree_add_uint_format (tree, ff_capture,
- tvb, offset, 2, capability,
- "Capability Information: 0x%04X", capability);
+ proto_item *cap_item;
+ proto_tree *cap_tree;
+
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_ff_capture, tvb, offset, 2, TRUE);
cap_tree = proto_item_add_subtree (cap_item, ett_cap_tree);
- proto_tree_add_boolean (cap_tree, ff_cf_ess, tvb, offset, 2, capability);
- proto_tree_add_boolean (cap_tree, ff_cf_ibss, tvb, offset, 2, capability);
- if (ESS_SET (capability) != 0) /* This is an AP */
- proto_tree_add_uint (cap_tree, ff_cf_ap_poll, tvb, offset, 2,
- capability);
+
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_ess, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_ibss, tvb, offset, 2, TRUE);
+ if ((tvb_get_letohs(tvb, offset) & 0x0001) != 0) /* This is an AP */
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_ap_poll, tvb, offset, 2, TRUE);
else /* This is a STA */
- proto_tree_add_uint (cap_tree, ff_cf_sta_poll, tvb, offset, 2,
- capability);
-
- proto_tree_add_boolean (cap_tree, ff_cf_privacy, tvb, offset, 2,
- capability);
- proto_tree_add_boolean (cap_tree, ff_cf_preamble, tvb, offset, 2,
- capability);
- proto_tree_add_boolean (cap_tree, ff_cf_pbcc, tvb, offset, 2,
- capability);
- proto_tree_add_boolean (cap_tree, ff_cf_agility, tvb, offset, 2,
- capability);
- proto_tree_add_boolean (cap_tree, ff_cf_spec_man, tvb, offset, 2,
- capability);
- proto_tree_add_boolean (cap_tree, ff_short_slot_time, tvb, offset, 2,
- capability);
- proto_tree_add_boolean (cap_tree, ff_cf_apsd, tvb, offset, 2,
- capability);
- proto_tree_add_boolean (cap_tree, ff_dsss_ofdm, tvb, offset, 2,
- capability);
- proto_tree_add_boolean (cap_tree, ff_cf_del_blk_ack, tvb, offset, 2,
- capability);
- proto_tree_add_boolean (cap_tree, ff_cf_imm_blk_ack, tvb, offset, 2,
- capability);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_sta_poll, tvb, offset, 2, TRUE);
+
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_privacy, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_preamble, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_pbcc, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_agility, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_spec_man, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_short_slot_time, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_apsd, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_dsss_ofdm, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_del_blk_ack, tvb, offset, 2, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ff_cf_imm_blk_ack, tvb, offset, 2, TRUE);
length += 2;
break;
}
case FIELD_AUTH_ALG:
- proto_tree_add_item (tree, ff_auth_alg, tvb, offset, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_auth_alg, tvb, offset, 2, TRUE);
length += 2;
break;
case FIELD_AUTH_TRANS_SEQ:
- proto_tree_add_item (tree, ff_auth_seq, tvb, offset, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_auth_seq, tvb, offset, 2, TRUE);
length += 2;
break;
case FIELD_CURRENT_AP_ADDR:
- proto_tree_add_item (tree, ff_current_ap, tvb, offset, 6, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_current_ap, tvb, offset, 6, FALSE);
length += 6;
break;
case FIELD_LISTEN_IVAL:
- proto_tree_add_item (tree, ff_listen_ival, tvb, offset, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_listen_ival, tvb, offset, 2, TRUE);
length += 2;
break;
case FIELD_REASON_CODE:
- proto_tree_add_item (tree, ff_reason, tvb, offset, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_reason, tvb, offset, 2, TRUE);
length += 2;
break;
case FIELD_ASSOC_ID:
- proto_tree_add_uint(tree, ff_assoc_id, tvb, offset, 2,
- ASSOC_ID(tvb_get_letohs(tvb,offset)));
- /* proto_tree_add_item (tree, ff_assoc_id, tvb, offset, 2, TRUE); */
+ proto_tree_add_item(tree, hf_ieee80211_ff_assoc_id, tvb, offset, 2, TRUE);
length += 2;
break;
case FIELD_STATUS_CODE:
- proto_tree_add_item (tree, ff_status_code, tvb, offset, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_status_code, tvb, offset, 2, TRUE);
length += 2;
break;
case FIELD_CATEGORY_CODE:
- proto_tree_add_item (tree, ff_category_code, tvb, offset, 1, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_category_code, tvb, offset, 1, TRUE);
length += 1;
break;
case FIELD_ACTION_CODE:
- proto_tree_add_item (tree, ff_action_code, tvb, offset, 1, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_action_code, tvb, offset, 1, TRUE);
length += 1;
break;
case FIELD_DIALOG_TOKEN:
- proto_tree_add_item (tree, ff_dialog_token, tvb, offset, 1, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_dialog_token, tvb, offset, 1, TRUE);
length += 1;
break;
case FIELD_WME_ACTION_CODE:
- proto_tree_add_item (tree, ff_wme_action_code, tvb, offset, 1, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_wme_action_code, tvb, offset, 1, TRUE);
length += 1;
break;
case FIELD_WME_STATUS_CODE:
- proto_tree_add_item (tree, ff_wme_status_code, tvb, offset, 1, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_wme_status_code, tvb, offset, 1, TRUE);
length += 1;
break;
case FIELD_QOS_ACTION_CODE:
- proto_tree_add_item (tree, ff_qos_action_code, tvb, offset, 1, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_qos_action_code, tvb, offset, 1, TRUE);
length += 1;
break;
- /*** Begin: Block Ack Action Fixed Field - Dustin Johnson ***/
case FIELD_BLOCK_ACK_ACTION_CODE:
- proto_tree_add_item (tree, ff_ba_action, tvb, offset, 1, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_ba_action, tvb, offset, 1, TRUE);
length += 1;
break;
- /*** End: Block Ack Action Fixed Field - Dustin Johnson ***/
- /*** Begin: Block Ack Params Fixed Field - Dustin Johnson ***/
case FIELD_BLOCK_ACK_PARAM:
{
- guint16 params;
proto_item *param_item;
proto_tree *param_tree;
- params = tvb_get_letohs (tvb, offset);
-
- param_item = proto_tree_add_uint(tree, ff_block_ack_params, tvb, offset, 2, params);
+ param_item = proto_tree_add_item(tree, hf_ieee80211_ff_block_ack_params, tvb, offset, 2, TRUE);
param_tree = proto_item_add_subtree (param_item, ett_ff_ba_param_tree);
- proto_tree_add_boolean(param_tree, ff_block_ack_params_amsdu_permitted, tvb, offset, 1, params);
- proto_tree_add_boolean(param_tree, ff_block_ack_params_policy, tvb, offset, 1, params);
- proto_tree_add_uint(param_tree, ff_block_ack_params_tid, tvb, offset, 1, params);
- proto_tree_add_uint(param_tree, ff_block_ack_params_buffer_size, tvb, offset, 2, params);
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_block_ack_params_amsdu_permitted, tvb, offset, 2, TRUE);
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_block_ack_params_policy, tvb, offset, 2, TRUE);
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_block_ack_params_tid, tvb, offset, 2, TRUE);
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_block_ack_params_buffer_size, tvb, offset, 2, TRUE);
length += 2;
break;
}
- /*** End: Block Ack Params Fixed Field - Dustin Johnson ***/
- /*** Begin: Block Ack Timeout Fixed Field - Dustin Johnson ***/
case FIELD_BLOCK_ACK_TIMEOUT:
{
- guint16 timeout;
-
- timeout = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint(tree, ff_block_ack_timeout, tvb, offset, 2, timeout);
+ proto_tree_add_item(tree, hf_ieee80211_ff_block_ack_timeout, tvb, offset, 2, TRUE);
length += 2;
break;
}
- /*** End: Block Ack Timeout Fixed Field - Dustin Johnson ***/
- /*** Begin: Block Ack Starting Sequence Control Fixed Field - Dustin Johnson ***/
case FIELD_BLOCK_ACK_SSC:
{
- guint16 ssc;
proto_item *ssc_item;
proto_tree *ssc_tree;
- ssc = tvb_get_letohs (tvb, offset);
- ssc_item = proto_tree_add_uint(tree, ff_block_ack_ssc, tvb, offset, 2, ssc);
+ ssc_item = proto_tree_add_item(tree, hf_ieee80211_ff_block_ack_ssc, tvb, offset, 2, TRUE);
ssc_tree = proto_item_add_subtree (ssc_item, ett_ff_ba_ssc_tree);
- proto_tree_add_uint(ssc_tree, ff_block_ack_ssc_fragment, tvb, offset, 1, ssc);
- proto_tree_add_uint(ssc_tree, ff_block_ack_ssc_sequence, tvb, offset, 2, ssc);
+
+ proto_tree_add_item(ssc_tree, hf_ieee80211_ff_block_ack_ssc_fragment, tvb, offset, 2, TRUE);
+ proto_tree_add_item(ssc_tree, hf_ieee80211_ff_block_ack_ssc_sequence, tvb, offset, 2, TRUE);
length += 2;
break;
}
- /*** End: Block Ack Starting Sequence Control Fixed Field - Dustin Johnson ***/
case FIELD_QOS_TS_INFO:
{
proto_item *tsinfo_item;
proto_tree *tsinfo_tree;
- guint32 tsi;
- tsinfo_item = proto_tree_add_item(tree, hf_ts_info, tvb,
- offset, 3, TRUE);
+ tsinfo_item = proto_tree_add_item(tree, hf_ieee80211_tsinfo, tvb, offset, 3, TRUE);
tsinfo_tree = proto_item_add_subtree(tsinfo_item, ett_tsinfo_tree);
- tsi = tvb_get_letoh24(tvb, offset);
- proto_tree_add_uint(tsinfo_tree, hf_tsinfo_type, tvb,
- offset, 3, TSI_TYPE (tsi));
- if (TSI_TSID (tsi) < 8)
- {
- proto_tree_add_text(tsinfo_tree, tvb, offset, 3,
- "TSID: %u (< 8 is invalid)", TSI_TSID (tsi));
- }
- else
- {
- proto_tree_add_uint(tsinfo_tree, hf_tsinfo_tsid, tvb,
- offset, 3, TSI_TSID (tsi));
- }
- proto_tree_add_uint(tsinfo_tree, hf_tsinfo_dir, tvb,
- offset, 3, TSI_DIR (tsi));
- proto_tree_add_uint(tsinfo_tree, hf_tsinfo_access, tvb,
- offset, 3, TSI_ACCESS (tsi));
- proto_tree_add_uint(tsinfo_tree, hf_tsinfo_agg, tvb,
- offset, 3, TSI_AGG (tsi));
- proto_tree_add_uint(tsinfo_tree, hf_tsinfo_apsd, tvb,
- offset, 3, TSI_APSD (tsi));
- proto_tree_add_uint(tsinfo_tree, hf_tsinfo_up, tvb,
- offset, 3, TSI_UP (tsi));
- proto_tree_add_uint(tsinfo_tree, hf_tsinfo_ack, tvb,
- offset, 3, TSI_ACK (tsi));
- proto_tree_add_uint(tsinfo_tree, hf_tsinfo_sched, tvb,
- offset, 3, TSI_SCHED (tsi));
+
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_type, tvb, offset, 3, TRUE);
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_tsid, tvb, offset, 3, TRUE);
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_dir, tvb, offset, 3, TRUE);
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_access, tvb, offset, 3, TRUE);
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_agg, tvb, offset, 3, TRUE);
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_apsd, tvb, offset, 3, TRUE);
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_up, tvb, offset, 3, TRUE);
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_ack, tvb, offset, 3, TRUE);
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_sched, tvb, offset, 3, TRUE);
+ proto_tree_add_item(tsinfo_tree, hf_ieee80211_tsinfo_rsv, tvb, offset, 3, TRUE);
length += 3;
break;
}
+#ifdef MESH_OVERRIDES
+ /* Mesh Management */
+ case FIELD_MESH_MGT_ACTION_PS_CODE:
+ proto_tree_add_item(tree, hf_ieee80211_ff_mesh_mgt_action_ps_code, tvb, offset, 1, TRUE);
+ length += 1;
+ break;
+
+ case FIELD_MESH_MGT_ACTION_PL_CODE:
+ proto_tree_add_item(tree, hf_ieee80211_ff_mesh_mgt_action_pl_code, tvb, offset, 1, TRUE);
+ length += 1;
+ break;
+#endif /* MESH_OVERRIDES */
+
case FIELD_DLS_ACTION_CODE:
- proto_tree_add_item (tree, ff_dls_action_code, tvb, offset, 1, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_dls_action_code, tvb, offset, 1, TRUE);
length += 1;
break;
case FIELD_DST_MAC_ADDR:
- proto_tree_add_item (tree, ff_dst_mac_addr, tvb, offset, 6, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_dst_mac_addr, tvb, offset, 6, TRUE);
length += 6;
break;
case FIELD_SRC_MAC_ADDR:
- proto_tree_add_item (tree, ff_src_mac_addr, tvb, offset, 6, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_src_mac_addr, tvb, offset, 6, TRUE);
length += 6;
break;
case FIELD_DLS_TIMEOUT:
- proto_tree_add_item (tree, ff_dls_timeout, tvb, offset, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_dls_timeout, tvb, offset, 2, TRUE);
length += 2;
break;
- /*** Begin: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
case FIELD_DELBA_PARAM_SET:
{
- guint16 params;
proto_item *param_item;
proto_tree *param_tree;
- params = tvb_get_letohs (tvb, offset);
-
- param_item = proto_tree_add_uint(tree, ff_delba_param, tvb, offset, 2, params);
+ param_item = proto_tree_add_item(tree, hf_ieee80211_ff_delba_param, tvb, offset, 2, TRUE);
param_tree = proto_item_add_subtree (param_item, ett_ff_ba_param_tree);
- proto_tree_add_uint(param_tree, ff_delba_param_reserved, tvb, offset, 2, params);
- proto_tree_add_boolean(param_tree, ff_delba_param_init, tvb, offset+1, 1, params);
- proto_tree_add_uint(param_tree, ff_delba_param_tid, tvb, offset+1, 1, params);
- length +=2;
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_delba_param_reserved, tvb, offset, 2, TRUE);
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_delba_param_init, tvb, offset, 2, TRUE);
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_delba_param_tid, tvb, offset, 2, TRUE);
+ length += 2;
break;
}
- /*** End: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
- /*** Begin: Max Regulation Power Fixed Field - Dustin Johnson ***/
case FIELD_MAX_REG_PWR:
- proto_tree_add_uint(tree, ff_max_reg_pwr, tvb, offset, 2, tvb_get_letohs (tvb, offset));
- length +=2;
+ proto_tree_add_item(tree, hf_ieee80211_ff_max_reg_pwr, tvb, offset, 2, TRUE);
+ length += 2;
break;
- /*** End: Max Regulation Power Fixed Field - Dustin Johnson ***/
- /*** Begin: Measurement Pilot Interval Fixed Field - Dustin Johnson ***/
case FIELD_MEASUREMENT_PILOT_INT:
- proto_tree_add_uint(tree, ff_measurement_pilot_int, tvb, offset, 2, tvb_get_letohs (tvb, offset));
- length +=2;
+ proto_tree_add_item(tree, hf_ieee80211_ff_measurement_pilot_int, tvb, offset, 2, TRUE);
+ length += 2;
break;
- /*** End: Measurement Pilot Interval Fixed Field - Dustin Johnson ***/
- /*** Begin: Country String Fixed Field - Dustin Johnson ***/
case FIELD_COUNTRY_STR:
- {
- guint8 *country_string;
+ proto_tree_add_string (tree, hf_ieee80211_ff_country_str, tvb, offset, 3, FALSE);
+ length += 3;
+ break;
- country_string = tvb_get_ephemeral_string(tvb, offset, 3);
- proto_tree_add_string (tree, ff_country_str, tvb, offset, 3, (char *) country_string);
- break;
- }
- /*** End: Country String Fixed Field - Dustin Johnson ***/
- /*** Begin: Maximum Transmit Power Fixed Field - Dustin Johnson ***/
case FIELD_MAX_TX_PWR:
- proto_tree_add_uint(tree, ff_max_tx_pwr, tvb, offset, 1, tvb_get_guint8 (tvb, offset));
- length +=1;
+ proto_tree_add_item(tree, hf_ieee80211_ff_max_tx_pwr, tvb, offset, 1, TRUE);
+ length += 1;
break;
- /*** End: Maximum Transmit Power Fixed Field - Dustin Johnson ***/
- /*** Begin: Transmit Power Used Fixed Field - Dustin Johnson ***/
case FIELD_TX_PWR_USED:
- proto_tree_add_uint(tree, ff_tx_pwr_used, tvb, offset, 1, tvb_get_guint8 (tvb, offset));
- length +=1;
+ proto_tree_add_item(tree, hf_ieee80211_ff_tx_pwr_used, tvb, offset, 1, TRUE);
+ length += 1;
break;
- /*** End: Transmit Power Used Fixed Field - Dustin Johnson ***/
- /*** Begin: Transceiver Noise Floor Fixed Field - Dustin Johnson ***/
case FIELD_TRANSCEIVER_NOISE_FLOOR:
- proto_tree_add_uint(tree, ff_transceiver_noise_floor, tvb, offset, 1, tvb_get_guint8 (tvb, offset));
- length +=1;
+ proto_tree_add_item(tree, hf_ieee80211_ff_transceiver_noise_floor, tvb, offset, 1, TRUE);
+ length += 1;
break;
- /*** End: Transceiver Noise Floor Fixed Field - Dustin Johnson ***/
- /*** Begin: Channel Width Fixed Field - Dustin Johnson ***/
case FIELD_CHANNEL_WIDTH:
- proto_tree_add_item(tree, ff_channel_width, tvb, offset, 1, TRUE);
- length +=1;
+ proto_tree_add_item(tree, hf_ieee80211_ff_channel_width, tvb, offset, 1, TRUE);
+ length += 1;
break;
- /*** End: Channel Width Fixed Field - Dustin Johnson ***/
- /*** Begin: QoS Information AP Fixed Field - Dustin Johnson ***/
case FIELD_QOS_INFO_AP:
{
- guint8 info;
proto_item *info_item;
proto_tree *info_tree;
- info = tvb_get_guint8 (tvb, offset);
-
- info_item = proto_tree_add_uint(tree, ff_qos_info_ap, tvb, offset, 1, info);
+ info_item = proto_tree_add_item(tree, hf_ieee80211_ff_qos_info_ap, tvb, offset, 1, TRUE);
info_tree = proto_item_add_subtree (info_item, ett_ff_qos_info);
- proto_tree_add_uint(info_tree, ff_qos_info_ap_edca_param_set_counter, tvb, offset, 1, info);
- proto_tree_add_uint(info_tree, ff_qos_info_ap_q_ack, tvb, offset, 1, info);
- proto_tree_add_boolean(info_tree, ff_qos_info_ap_queue_req, tvb, offset, 1, info);
- proto_tree_add_boolean(info_tree, ff_qos_info_ap_txop_request, tvb, offset, 1, info);
- proto_tree_add_boolean(info_tree, ff_qos_info_ap_reserved, tvb, offset, 1, info);
- length +=1;
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_ap_edca_param_set_counter, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_ap_q_ack, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_ap_queue_req, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_ap_txop_request, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_ap_reserved, tvb, offset, 1, TRUE);
+ length += 1;
break;
}
- /*** End: QoS Information AP Fixed Field - Dustin Johnson ***/
- /*** Begin: QoS Information STA Fixed Field - Dustin Johnson ***/
case FIELD_QOS_INFO_STA:
{
- guint8 info;
proto_item *info_item;
proto_tree *info_tree;
- info = tvb_get_guint8 (tvb, offset);
-
- info_item = proto_tree_add_uint(tree, ff_qos_info_sta, tvb, offset, 1, info);
+ info_item = proto_tree_add_item(tree, hf_ieee80211_ff_qos_info_sta, tvb, offset, 1, TRUE);
info_tree = proto_item_add_subtree (info_item, ett_ff_qos_info);
- proto_tree_add_boolean(info_tree, ff_qos_info_sta_ac_vo, tvb, offset, 1, info);
- proto_tree_add_boolean(info_tree, ff_qos_info_sta_ac_vi, tvb, offset, 1, info);
- proto_tree_add_boolean(info_tree, ff_qos_info_sta_ac_bk, tvb, offset, 1, info);
- proto_tree_add_boolean(info_tree, ff_qos_info_sta_ac_be, tvb, offset, 1, info);
- proto_tree_add_boolean(info_tree, ff_qos_info_sta_q_ack, tvb, offset, 1, info);
- proto_tree_add_uint(info_tree, ff_qos_info_sta_max_sp_len, tvb, offset, 1, info);
- proto_tree_add_boolean(info_tree, ff_qos_info_sta_more_data_ack, tvb, offset, 1, info);
-
- length +=1;
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_sta_ac_vo, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_sta_ac_vi, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_sta_ac_bk, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_sta_ac_be, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_sta_q_ack, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_sta_max_sp_len, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_qos_info_sta_more_data_ack, tvb, offset, 1, TRUE);
+ length += 1;
break;
}
- /*** End: QoS Information STA Fixed Field - Dustin Johnson ***/
- /*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
case FIELD_SM_PWR_CNTRL:
{
- guint8 info;
proto_item *info_item;
proto_tree *info_tree;
- info = tvb_get_guint8 (tvb, offset);
-
- info_item = proto_tree_add_uint(tree, ff_sm_pwr_save, tvb, offset, 1, info);
+ info_item = proto_tree_add_item(tree, hf_ieee80211_ff_sm_pwr_save, tvb, offset, 1, TRUE);
info_tree = proto_item_add_subtree (info_item, ett_ff_sm_pwr_save);
- proto_tree_add_boolean(info_tree, ff_sm_pwr_save_enabled, tvb, offset, 1, info);
- proto_tree_add_boolean(info_tree, ff_sm_pwr_save_sm_mode, tvb, offset, 1, info);
- proto_tree_add_uint(info_tree, ff_sm_pwr_save_reserved, tvb, offset, 1, info);
- length +=1;
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_sm_pwr_save_enabled, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_sm_pwr_save_sm_mode, tvb, offset, 1, TRUE);
+ proto_tree_add_item(info_tree, hf_ieee80211_ff_sm_pwr_save_reserved, tvb, offset, 1, TRUE);
+ length += 1;
break;
}
- /*** End: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
- /*** Begin: PCO Phase Control Fixed Field - Dustin Johnson ***/
case FIELD_PCO_PHASE_CNTRL:
- proto_tree_add_item(tree, ff_pco_phase_cntrl, tvb, offset, 1, TRUE);
- length +=1;
+ proto_tree_add_item(tree, hf_ieee80211_ff_pco_phase_cntrl, tvb, offset, 1, TRUE);
+ length += 1;
break;
- /*** End: PCO Phase Control Fixed Field - Dustin Johnson ***/
- /*** Begin: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
case FIELD_PSMP_PARAM_SET:
{
- guint16 params;
proto_item *param_item;
proto_tree *param_tree;
- params = tvb_get_letohs (tvb, offset);
-
- param_item = proto_tree_add_uint(tree, ff_psmp_param_set, tvb, offset, 2, params);
+ param_item = proto_tree_add_item(tree, hf_ieee80211_ff_psmp_param_set, tvb, offset, 2, TRUE);
param_tree = proto_item_add_subtree (param_item, ett_ff_psmp_param_set);
- proto_tree_add_uint(param_tree, ff_psmp_param_set_n_sta, tvb, offset, 1, params & 0x000F);
- proto_tree_add_boolean(param_tree, ff_psmp_param_set_more_psmp, tvb, offset, 1, (params & 0x0010) >> 4);
- proto_tree_add_uint_format(param_tree, ff_psmp_param_set_psmp_sequence_duration, tvb, offset, 2,
- (params & 0xFFE0) >> 5, "PSMP Sequence Duration: %u [us]", ((params & 0xFFE0) >> 5) * 8);
- length +=2;
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_psmp_param_set_n_sta, tvb, offset, 2, TRUE);
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_psmp_param_set_more_psmp, tvb, offset, 2, TRUE );
+ proto_tree_add_item(param_tree, hf_ieee80211_ff_psmp_param_set_psmp_sequence_duration, tvb, offset, 2, TRUE);
+ length += 2;
break;
}
- /*** End: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
- /*** Begin: MIMO Control Fixed Field - Dustin Johnson ***/
case FIELD_MIMO_CNTRL:
{
- guint16 mimo;
- guint32 time;
proto_item *mimo_item;
proto_tree *mimo_tree;
- mimo = tvb_get_letohs (tvb, offset);
-
- mimo_item = proto_tree_add_text(tree, tvb, offset, 2, "MIMO Control");
+ mimo_item = proto_tree_add_item(tree, hf_ieee80211_ff_mimo_cntrl, tvb, offset, 6, TRUE);
mimo_tree = proto_item_add_subtree (mimo_item, ett_ff_mimo_cntrl);
- proto_tree_add_uint(mimo_tree, ff_mimo_cntrl_nc_index, tvb, offset, 1, mimo);
- proto_tree_add_uint(mimo_tree, ff_mimo_cntrl_nr_index, tvb, offset, 1, mimo);
- proto_tree_add_boolean(mimo_tree, ff_mimo_cntrl_channel_width, tvb, offset, 1, mimo);
- proto_tree_add_uint(mimo_tree, ff_mimo_cntrl_grouping, tvb, offset, 1, mimo);
- proto_tree_add_uint(mimo_tree, ff_mimo_cntrl_coefficient_size, tvb, offset, 2, mimo);
- proto_tree_add_uint(mimo_tree, ff_mimo_cntrl_codebook_info, tvb, offset+1, 1, mimo);
- proto_tree_add_uint(mimo_tree, ff_mimo_cntrl_remaining_matrix_segment, tvb, offset+1, 1, mimo);
- proto_tree_add_uint(mimo_tree, ff_mimo_cntrl_reserved, tvb, offset+1, 1, mimo);
-
- offset+=2;
- time = tvb_get_letohl (tvb, offset);
- proto_tree_add_uint(mimo_tree, ff_mimo_cntrl_sounding_timestamp, tvb, offset, 4, time);
- length +=6;
+ proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_nc_index, tvb, offset, 1, TRUE);
+ proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_nr_index, tvb, offset, 1, TRUE);
+ proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_channel_width, tvb, offset, 1, TRUE);
+ proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_grouping, tvb, offset, 1, TRUE);
+ proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_coefficient_size, tvb, offset, 2, TRUE);
+ proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_codebook_info, tvb, offset, 1, TRUE);
+ proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_remaining_matrix_segment, tvb, offset, 1, TRUE);
+ proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_reserved, tvb, offset, 1, TRUE);
+
+ offset += 2;
+ proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_sounding_timestamp, tvb, offset, 4, TRUE);
+ length += 6;
break;
}
- /*** End: MIMO Control Fixed Field - Dustin Johnson ***/
- /*** Begin: Antenna Selection Fixed Field - Dustin Johnson ***/
case FIELD_ANT_SELECTION:
{
- guint8 ant;
proto_item *ant_item;
proto_tree *ant_tree;
- ant = tvb_get_guint8 (tvb, offset);
-
- ant_item = proto_tree_add_uint(tree, ff_ant_selection, tvb, offset, 1, ant);
+ ant_item = proto_tree_add_item(tree, hf_ieee80211_ff_ant_selection, tvb, offset, 1, TRUE);
ant_tree = proto_item_add_subtree (ant_item, ett_ff_ant_sel);
- proto_tree_add_uint(ant_tree, ff_ant_selection_0, tvb, offset, 1, ant);
- proto_tree_add_uint(ant_tree, ff_ant_selection_1, tvb, offset, 1, ant);
- proto_tree_add_uint(ant_tree, ff_ant_selection_2, tvb, offset, 1, ant);
- proto_tree_add_uint(ant_tree, ff_ant_selection_3, tvb, offset, 1, ant);
- proto_tree_add_uint(ant_tree, ff_ant_selection_4, tvb, offset, 1, ant);
- proto_tree_add_uint(ant_tree, ff_ant_selection_5, tvb, offset, 1, ant);
- proto_tree_add_uint(ant_tree, ff_ant_selection_6, tvb, offset, 1, ant);
- proto_tree_add_uint(ant_tree, ff_ant_selection_7, tvb, offset, 1, ant);
+ proto_tree_add_item(ant_tree, hf_ieee80211_ff_ant_selection_0, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ant_tree, hf_ieee80211_ff_ant_selection_1, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ant_tree, hf_ieee80211_ff_ant_selection_2, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ant_tree, hf_ieee80211_ff_ant_selection_3, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ant_tree, hf_ieee80211_ff_ant_selection_4, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ant_tree, hf_ieee80211_ff_ant_selection_5, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ant_tree, hf_ieee80211_ff_ant_selection_6, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ant_tree, hf_ieee80211_ff_ant_selection_7, tvb, offset, 1, TRUE);
- length +=1;
+ length += 1;
break;
}
- /*** End: Antenna Selection Fixed Field - Dustin Johnson ***/
- /*** Begin: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
case FIELD_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT:
{
- guint32 ext_chan;
proto_item *chan_item;
proto_tree *chan_tree;
- ext_chan = tvb_get_letohl (tvb, offset);
-
- chan_item = proto_tree_add_uint(tree, ff_ext_channel_switch_announcement, tvb, offset, 1, ext_chan);
+ chan_item = proto_tree_add_item(tree, hf_ieee80211_ff_ext_channel_switch_announcement, tvb, offset, 4, TRUE);
chan_tree = proto_item_add_subtree (chan_item, ett_ff_chan_switch_announce);
- proto_tree_add_uint(chan_tree, hf_tag_ext_channel_switch_announcement_switch_mode, tvb, offset++, 1, (ext_chan & 0x000000FF));
- proto_tree_add_uint(chan_tree, hf_tag_ext_channel_switch_announcement_new_reg_class, tvb, offset++, 1, (ext_chan & 0x0000FF00) >> 8);
- proto_tree_add_uint(chan_tree, hf_tag_ext_channel_switch_announcement_new_chan_number, tvb, offset++, 1, (ext_chan & 0x00FF0000) >> 16);
- proto_tree_add_uint(chan_tree, hf_tag_ext_channel_switch_announcement_switch_count, tvb, offset++, 1, (ext_chan & 0xFF000000) >> 24);
+ proto_tree_add_item(chan_tree, hf_ieee80211_ff_ext_channel_switch_announcement_switch_mode, tvb, offset, 4, TRUE);
+ proto_tree_add_item(chan_tree, hf_ieee80211_ff_ext_channel_switch_announcement_new_reg_class, tvb, offset, 4, TRUE);
+ proto_tree_add_item(chan_tree, hf_ieee80211_ff_ext_channel_switch_announcement_new_chan_number, tvb, offset, 4, TRUE);
+ proto_tree_add_item(chan_tree, hf_ieee80211_ff_ext_channel_switch_announcement_switch_count, tvb, offset, 4, TRUE);
length += 4;
break;
}
- /*** End: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
- /*** Begin: HT Information Fixed Field - Dustin Johnson ***/
case FIELD_HT_INFORMATION:
{
- guint8 info;
proto_item *ht_item;
proto_tree *ht_tree;
- info = tvb_get_guint8 (tvb, offset);
-
- ht_item = proto_tree_add_uint(tree, ff_ht_info, tvb, offset, 1, info);
+ ht_item = proto_tree_add_uint(tree, hf_ieee80211_ff_ht_info, tvb, offset, 1, TRUE);
ht_tree = proto_item_add_subtree (ht_item, ett_ff_ht_info);
- proto_tree_add_boolean(ht_tree, ff_ht_info_information_request, tvb, offset, 1, info);
- proto_tree_add_boolean(ht_tree, ff_ht_info_40_mhz_intolerant, tvb, offset, 1, info);
- proto_tree_add_boolean(ht_tree, ff_ht_info_sta_chan_width, tvb, offset, 1, info);
- proto_tree_add_uint(ht_tree, ff_ht_info_reserved, tvb, offset, 1, info);
+ proto_tree_add_item(ht_tree, hf_ieee80211_ff_ht_info_information_request, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ht_tree, hf_ieee80211_ff_ht_info_40_mhz_intolerant, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ht_tree, hf_ieee80211_ff_ht_info_sta_chan_width, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ht_tree, hf_ieee80211_ff_ht_info_reserved, tvb, offset, 1, TRUE);
length += 1;
break;
}
- /*** End: HT Information Fixed Field - Dustin Johnson ***/
- /*** Begin: HT Action Fixed Field - Dustin Johnson ***/
case FIELD_HT_ACTION_CODE:
- proto_tree_add_uint(tree, ff_ht_action, tvb, offset, 1, tvb_get_guint8 (tvb, offset));
- length +=1;
+ proto_tree_add_item(tree, hf_ieee80211_ff_ht_action, tvb, offset, 1, TRUE);
+ length += 1;
break;
- /*** End: HT Action Fixed Field - Dustin Johnson ***/
- /*** Begin: PSMP Station Information Fixed Field - Dustin Johnson ***/
case FIELD_PSMP_STA_INFO:
{
- #define BROADCAST 0
- #define MULTICAST 1
- #define INDIVIDUALLY_ADDRESSED 2
-
- guint64 info_large;
- guint32 info_medium;
- guint16 info_small;
- guint8 type;
+
proto_item *psmp_item;
proto_tree *psmp_tree;
- info_medium = tvb_get_letohl (tvb, offset);
- type = info_medium & 0x3;
+ psmp_item = proto_tree_add_item(tree, hf_ieee80211_ff_psmp_sta_info, tvb, offset, 8, TRUE);
+ psmp_tree = proto_item_add_subtree(psmp_item, ett_ff_psmp_sta_info);
- psmp_item = proto_tree_add_uint(tree, ff_psmp_sta_info, tvb, offset, 8, type);
- psmp_tree = proto_item_add_subtree (psmp_item, ett_ff_psmp_sta_info);
+ proto_tree_add_item(psmp_item, hf_ieee80211_ff_psmp_sta_info_type, tvb, offset, 4, TRUE);
- switch (type)
+ switch (tvb_get_letohl(tvb, offset) & PSMP_STA_INFO_FLAG_TYPE)
{
- case BROADCAST:
+ case PSMP_STA_INFO_BROADCAST:
{
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_dtt_start_offset, tvb, offset, 2, (info_medium & 0x00001FFC) >> 2);
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_dtt_duration, tvb, offset+1, 2, (info_medium & 0x001FE000) >> 13);
- info_large = tvb_get_letoh64 (tvb, offset);
- proto_tree_add_uint64(psmp_tree, ff_psmp_sta_info_reserved_large, tvb, offset, 6, (info_large & G_GINT64_CONSTANT(0xFFFFFFFFFFE00000)) >> 21);
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_dtt_start_offset, tvb, offset, 4, TRUE);
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_dtt_duration, tvb, offset, 4, TRUE);
+ /* Missing 64 bit bitmask... */
+ proto_tree_add_uint64(psmp_tree, hf_ieee80211_ff_psmp_sta_info_reserved_large, tvb, offset, 8, (tvb_get_letoh64 (tvb, offset) & G_GINT64_CONSTANT(0xFFFFFFFFFFE00000)) >> 21);
break;
}
- case MULTICAST:
+ case PSMP_STA_INFO_MULTICAST:
{
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_dtt_start_offset, tvb, offset, 2, (info_medium & 0x00001FFC) >> 2);
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_dtt_duration, tvb, offset+1, 2, (info_medium & 0x001FE000) >> 13);
- info_large = tvb_get_letoh64 (tvb, offset);
- proto_tree_add_uint64(psmp_tree, ff_psmp_sta_info_psmp_multicast_id, tvb, offset, 6, (info_large & G_GINT64_CONSTANT(0xFFFFFFFFFFE00000)) >> 21);
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_dtt_start_offset, tvb, offset, 4, TRUE);
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_dtt_duration, tvb, offset, 4, TRUE);
+ /* Missing 64 bit bitmask... */
+ proto_tree_add_uint64(psmp_tree, hf_ieee80211_ff_psmp_sta_info_psmp_multicast_id, tvb, offset, 6, (tvb_get_letoh64 (tvb, offset) & G_GINT64_CONSTANT(0xFFFFFFFFFFE00000)) >> 21);
break;
}
- case INDIVIDUALLY_ADDRESSED:
+ case PSMP_STA_INFO_INDIVIDUALLY_ADDRESSED:
{
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_dtt_start_offset, tvb, offset, 2, (info_medium & 0x00001FFC) >> 2);
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_dtt_duration, tvb, offset+1, 2, (info_medium & 0x001FE000) >> 13);
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_dtt_start_offset, tvb, offset, 4, TRUE);
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_dtt_duration, tvb, offset, 4, TRUE);
+
+ offset+=2;
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_sta_id, tvb, offset, 4, TRUE);
offset+=2;
- info_medium = tvb_get_letohl (tvb, offset);
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_sta_id, tvb, offset, 3, (info_medium & 0x001FFFE0) >> 5);
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_utt_start_offset, tvb, offset+2, 2, (info_medium & 0xFFE00000) >> 21);
- offset+=4;
- info_small = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_utt_duration, tvb, offset, 2, info_small & 0x03FF);
- proto_tree_add_uint(psmp_tree, ff_psmp_sta_info_reserved_small, tvb, offset+1, 1, (info_small & 0xFC00) >> 10);
+
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_utt_start_offset, tvb, offset, 4, TRUE);
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_utt_duration, tvb, offset, 4, TRUE);
+ proto_tree_add_item(psmp_tree, hf_ieee80211_ff_psmp_sta_info_reserved_small, tvb, offset, 4, TRUE);
break;
}
}
- length +=8;
+ length += 8;
break;
}
- /*** End: PSMP Station Information Fixed Field - Dustin Johnson ***/
case FIELD_SCHEDULE_INFO:
{
proto_item *sched_item;
proto_tree *sched_tree;
- guint16 sched;
- sched_item = proto_tree_add_item(tree, hf_sched_info,
- tvb, offset, 2, TRUE);
+ sched_item = proto_tree_add_item(tree, hf_ieee80211_sched_info, tvb, offset, 2, TRUE);
sched_tree = proto_item_add_subtree(sched_item, ett_sched_tree);
- sched = tvb_get_letohs(tvb, offset);
- proto_tree_add_uint(sched_tree, hf_tsinfo_agg, tvb, offset,
- 2, sched & 0x0001);
- if (sched & 0x0001)
+
+ proto_tree_add_item(sched_tree, hf_ieee80211_sched_info_agg, tvb, offset, 2, TRUE);
+ if (tvb_get_letohs(tvb, offset) & 0x0001)
{
- proto_tree_add_uint(sched_tree, hf_tsinfo_tsid, tvb, offset,
- 2, (sched & 0x001E) >> 1);
- proto_tree_add_uint(sched_tree, hf_tsinfo_dir, tvb, offset,
- 2, (sched & 0x0060) >> 5);
+ proto_tree_add_item(sched_tree, hf_ieee80211_sched_info_tsid, tvb, offset, 2, TRUE);
+ proto_tree_add_item(sched_tree, hf_ieee80211_sched_info_dir, tvb, offset, 2, TRUE);
}
length += 2;
break;
}
+ case FIELD_PA_ACTION_CODE:
+ proto_tree_add_item(tree, hf_ieee80211_ff_public_action, tvb, offset, 1, FALSE);
+ length += 1;
+ break;
+
case FIELD_ACTION:
{
proto_item *action_item;
proto_tree *action_tree;
- action_item = proto_tree_add_item(tree, hf_action, tvb, offset, 1, TRUE);
+ action_item = proto_tree_add_item(tree, hf_ieee80211_action, tvb, offset, 1, TRUE);
action_tree = proto_item_add_subtree(action_item, ett_sched_tree);
- switch (tvb_get_guint8(tvb, offset))
+ switch (tvb_get_guint8(tvb, offset) & 0x7f)
{
case CAT_SPECTRUM_MGMT:
{
add_fixed_field(action_tree, tvb, offset+4, FIELD_DST_MAC_ADDR);
add_fixed_field(action_tree, tvb, offset+10, FIELD_SRC_MAC_ADDR);
length += 16;
- if (!ff_status_code)
+ if (!hf_ieee80211_ff_status_code)
add_fixed_field(action_tree, tvb, offset+16, FIELD_CAP_INFO);
break;
break;
}
+ case CAT_PUBLIC:
+ {
+ guint start = offset;
+ guint32 oui;
+ guint8 code;
+ guint8 subtype;
+
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ code = tvb_get_guint8(tvb, offset);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_PA_ACTION_CODE);
+
+ switch (code)
+ {
+ case PA_VENDOR_SPECIFIC:
+ oui = tvb_get_ntoh24(tvb, offset);
+ proto_tree_add_bytes_format(action_tree, hf_ieee80211_tag_oui, tvb, offset, 3,
+ NULL, "Vendor: %s", tvb_get_manuf_name(tvb, offset));
+ offset += 3;
+ switch (oui)
+ {
+ case OUI_WFA:
+ subtype = tvb_get_guint8(tvb, offset);
+ proto_tree_add_text(action_tree, tvb, offset, 1,
+ "Subtype %u", subtype);
+ offset++;
+ if (subtype == WFA_SUBTYPE_P2P)
+ offset = dissect_wifi_p2p_public_action(action_tree, tvb, offset);
+ break;
+ default:
+ /* Don't know how to handle this vendor */
+ break;
+ }
+ break;
+ case PA_GAS_INITIAL_REQUEST:
+ {
+ gboolean anqp;
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ offset += dissect_advertisement_protocol(g_pinfo, action_tree, tvb, offset, &anqp);
+ offset += dissect_gas_initial_request(action_tree, tvb, offset, anqp);
+ break;
+ }
+ case PA_GAS_INITIAL_RESPONSE:
+ {
+ gboolean anqp;
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STATUS_CODE);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_GAS_COMEBACK_DELAY);
+ offset += dissect_advertisement_protocol(g_pinfo, action_tree, tvb, offset, &anqp);
+ offset += dissect_gas_initial_response(action_tree, tvb, offset, anqp);
+ break;
+ }
+ case PA_GAS_COMEBACK_REQUEST:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ break;
+ case PA_GAS_COMEBACK_RESPONSE:
+ {
+ gboolean anqp;
+ guint8 frag;
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STATUS_CODE);
+ frag = tvb_get_guint8(tvb, offset) & 0x7f;
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_GAS_FRAGMENT_ID);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_GAS_COMEBACK_DELAY);
+ offset += dissect_advertisement_protocol(g_pinfo, action_tree, tvb, offset, &anqp);
+ offset += dissect_gas_comeback_response(action_tree, tvb, offset, anqp, frag);
+ break;
+ }
+ case PA_TDLS_DISCOVERY_RESPONSE:
+ col_set_str(g_pinfo->cinfo, COL_PROTOCOL, "TDLS");
+ col_set_str(g_pinfo->cinfo, COL_INFO, "TDLS Discovery Response");
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_CAP_INFO);
+ break;
+ }
+ length += offset - start; /* Size of fixed fields */
+ break;
+ }
+
+ case CAT_FAST_BSS_TRANSITION:
+ {
+ guint start = offset;
+ guint8 code;
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ code = tvb_get_guint8(tvb, offset);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_FT_ACTION_CODE);
+
+ switch (code) {
+ case FT_ACTION_REQUEST:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STA_ADDRESS);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_TARGET_AP_ADDRESS);
+ /* Followed by FT Request frame body (IEs) */
+ break;
+ case FT_ACTION_RESPONSE:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STA_ADDRESS);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_TARGET_AP_ADDRESS);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STATUS_CODE);
+ /* Followed by FT Response frame body (IEs) */
+ break;
+ case FT_ACTION_CONFIRM:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STA_ADDRESS);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_TARGET_AP_ADDRESS);
+ /* Followed by FT Confirm frame body (IEs) */
+ break;
+ case FT_ACTION_ACK:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STA_ADDRESS);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_TARGET_AP_ADDRESS);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STATUS_CODE);
+ /* Followed by FT Ack frame body (IEs) */
+ break;
+ }
+
+ length += offset - start; /* Size of fixed fields */
+ break;
+ }
+
+ case CAT_SA_QUERY:
+ {
+ guint start = offset;
+ guint8 code;
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ code = tvb_get_guint8(tvb, offset);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_SA_QUERY_ACTION_CODE);
+
+ switch (code) {
+ case SA_QUERY_REQUEST:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_TRANSACTION_ID);
+ break;
+ case SA_QUERY_RESPONSE:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_TRANSACTION_ID);
+ break;
+ }
+
+ length += offset - start; /* Size of fixed fields */
+ break;
+ }
+
+#ifdef MESH_OVERRIDES
+ case CAT_MESH_PEER_LINK:
+ /* Non-IE fixed fields here. edit TAG_MESH_* for IE fields */
+ switch (tvb_get_guint8(tvb, 1))
+ {
+ guint offset;
+ case MESH_PL_PEER_LINK_OPEN:
+ offset = 0;
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PL_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_CAP_INFO);
+ length = offset;
+ break;
+
+ case MESH_PL_PEER_LINK_CONFIRM:
+ offset = 0;
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PL_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_CAP_INFO);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_STATUS_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_ASSOC_ID);
+ length = offset;
+ break;
+
+ case MESH_PL_PEER_LINK_CLOSE:
+ offset = 0;
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PL_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_REASON_CODE);
+ length = offset; /* Size of fixed fields */
+ break;
+
+ default:
+ offset = 0;
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PL_CODE);
+ length = offset; /* Size of fixed fields */
+ break;
+ }
+ break;
+
+ case CAT_MESH_PATH_SELECTION:
+ switch (tvb_get_guint8(tvb, 1))
+ {
+ guint offset;
+ /* defined values */
+ case MESH_PS_PATH_REQUEST:
+ offset = 0;
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PS_CODE);
+ length = offset;
+ break;
+
+ case MESH_PS_PATH_REPLY:
+ offset = 0;
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PS_CODE);
+ length = offset;
+ break;
+
+ case MESH_PS_PATH_ERROR:
+ offset = 0;
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PS_CODE);
+ length = offset;
+ break;
+
+ case MESH_PS_ROOT_ANNOUNCEMENT:
+ offset = 0;
+ offset += add_fixed_field (action_tree, tvb, 0, FIELD_CATEGORY_CODE);
+ offset += add_fixed_field (action_tree, tvb, 1, FIELD_MESH_MGT_ACTION_PS_CODE);
+ length = offset;
+ break;
+
+ /* undefined values */
+ default:
+ offset = 0;
+ offset += add_fixed_field (action_tree, tvb, 0, FIELD_CATEGORY_CODE);
+ offset += add_fixed_field (action_tree, tvb, 1, FIELD_MESH_MGT_ACTION_PS_CODE);
+ length = offset;
+ break;
+ }
+ break;
+#endif /* MESH_OVERRIDES */
+
+ case CAT_TDLS:
+ {
+ guint8 code;
+ guint16 status;
+ guint start = offset;
+
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_CATEGORY_CODE);
+ code = tvb_get_guint8(tvb, offset);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_TDLS_ACTION_CODE);
+ switch (code) {
+ case TDLS_SETUP_REQUEST:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_CAP_INFO);
+ break;
+ case TDLS_SETUP_RESPONSE:
+ status = tvb_get_letohs(tvb, offset);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STATUS_CODE);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ if (tvb_reported_length_remaining(tvb, offset) < 2) {
+ if (status == 0) {
+ expert_add_info_format(g_pinfo, action_item, PI_MALFORMED, PI_ERROR, "TDLS Setup Response (success) does not include mandatory fields");
+ }
+ break;
+ }
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_CAP_INFO);
+ break;
+ case TDLS_SETUP_CONFIRM:
+ status = tvb_get_letohs(tvb, offset);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STATUS_CODE);
+ if (tvb_reported_length_remaining(tvb, offset) < 1) {
+ if (status == 0) {
+ expert_add_info_format(g_pinfo, action_item, PI_MALFORMED, PI_ERROR, "TDLS Setup Confirm (success) does not include mandatory fields");
+ }
+ break;
+ }
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ break;
+ case TDLS_TEARDOWN:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_REASON_CODE);
+ break;
+ case TDLS_PEER_TRAFFIC_INDICATION:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ break;
+ case TDLS_CHANNEL_SWITCH_REQUEST:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_TARGET_CHANNEL);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_REGULATORY_CLASS);
+ break;
+ case TDLS_CHANNEL_SWITCH_RESPONSE:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STATUS_CODE);
+ break;
+ case TDLS_PEER_PSM_REQUEST:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ break;
+ case TDLS_PEER_PSM_RESPONSE:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_STATUS_CODE);
+ break;
+ case TDLS_PEER_TRAFFIC_RESPONSE:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ break;
+ case TDLS_DISCOVERY_REQUEST:
+ offset += add_fixed_field(action_tree, tvb, offset, FIELD_DIALOG_TOKEN);
+ break;
+ }
+
+ length = offset - start; /* Size of fixed fields */
+ break;
+ }
+
case CAT_MGMT_NOTIFICATION: /* Management notification frame */
{
guint start = offset;
{
guint start = offset;
guint32 oui;
- const guint8 *tag_data_ptr;
+ guint8 subtype;
offset += add_fixed_field(action_tree, tvb, offset, FIELD_CATEGORY_CODE);
oui = tvb_get_ntoh24(tvb, offset);
- tag_data_ptr = tvb_get_ptr(tvb, offset, 3);
- proto_tree_add_bytes_format (action_tree, tag_oui, tvb, offset, 3,
- tag_data_ptr, "Vendor: %s", get_manuf_name(tag_data_ptr));
+ proto_tree_add_bytes_format (action_tree, hf_ieee80211_tag_oui, tvb, offset, 3,
+ NULL, "Vendor: %s", tvb_get_manuf_name(tvb, offset));
offset += 3;
switch (oui)
{
case OUI_MARVELL:
- offset = dissect_vendor_action_marvell (action_tree, tvb, offset);
+ offset = dissect_vendor_action_marvell(action_tree, tvb, offset);
+ break;
+ case OUI_WFA:
+ subtype = tvb_get_guint8(tvb, offset);
+ proto_tree_add_text(action_tree, tvb, offset, 1,
+ "Subtype %u", subtype);
+ offset++;
+ if (subtype == WFA_SUBTYPE_P2P)
+ offset = dissect_wifi_p2p_action(action_tree, tvb,
+ offset);
break;
default:
/* Don't know how to handle this vendor */
case HT_ACTION_MIMO_CSI:
{
mimo_control_t mimo_cntrl;
- mimo_cntrl = get_mimo_control (tvb, offset);
+ mimo_cntrl = get_mimo_control(tvb, offset);
offset += add_fixed_field(action_tree, tvb, offset, FIELD_MIMO_CNTRL);
- offset += add_mimo_csi_matrices_report (action_tree, tvb, offset, mimo_cntrl);
+ offset += add_mimo_csi_matrices_report(action_tree, tvb, offset, mimo_cntrl);
break;
}
case HT_ACTION_MIMO_BEAMFORMING:
{
mimo_control_t mimo_cntrl;
- mimo_cntrl = get_mimo_control (tvb, offset);
+ mimo_cntrl = get_mimo_control(tvb, offset);
offset += add_fixed_field(action_tree, tvb, offset, FIELD_MIMO_CNTRL);
- offset += add_mimo_beamforming_feedback_report (action_tree, tvb, offset, mimo_cntrl);
+ offset += add_mimo_beamforming_feedback_report(action_tree, tvb, offset, mimo_cntrl);
break;
}
case HT_ACTION_MIMO_COMPRESSED_BEAMFORMING:
{
mimo_control_t mimo_cntrl;
- mimo_cntrl = get_mimo_control (tvb, offset);
+ mimo_cntrl = get_mimo_control(tvb, offset);
offset += add_fixed_field(action_tree, tvb, offset, FIELD_MIMO_CNTRL);
- offset += add_mimo_compressed_beamforming_feedback_report (action_tree, tvb, offset, mimo_cntrl);
+ offset += add_mimo_compressed_beamforming_feedback_report(action_tree, tvb, offset, mimo_cntrl);
break;
}
length += 1; /* Size of fixed fields */
break;
}
+ break;
}
+
+ case FIELD_FT_ACTION_CODE:
+ proto_tree_add_item(tree, hf_ieee80211_ff_ft_action_code, tvb, offset, 1, FALSE);
+ length += 1;
+ break;
+
+ case FIELD_STA_ADDRESS:
+ proto_tree_add_item(tree, hf_ieee80211_ff_sta_address, tvb, offset, 6, FALSE);
+ length += 6;
+ break;
+
+ case FIELD_TARGET_AP_ADDRESS:
+ proto_tree_add_item(tree, hf_ieee80211_ff_target_ap_address, tvb, offset, 6, FALSE);
+ length += 6;
+ break;
+
+ case FIELD_GAS_COMEBACK_DELAY:
+ proto_tree_add_item(tree, hf_ieee80211_ff_gas_comeback_delay, tvb, offset, 2, TRUE);
+ length += 2;
+ break;
+
+ case FIELD_GAS_FRAGMENT_ID:
+ proto_tree_add_item(tree, hf_ieee80211_ff_gas_fragment_id, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_ff_more_gas_fragments, tvb, offset, 1, FALSE);
+ length += 1;
+ break;
+
+ case FIELD_SA_QUERY_ACTION_CODE:
+ proto_tree_add_item(tree, hf_ieee80211_ff_sa_query_action_code, tvb, offset, 1, FALSE);
+ length += 1;
+ break;
+
+ case FIELD_TRANSACTION_ID:
+ proto_tree_add_item(tree, hf_ieee80211_ff_transaction_id, tvb, offset, 2, TRUE);
+ length += 2;
+ break;
+
+ case FIELD_TDLS_ACTION_CODE:
+ {
+ guint8 code;
+ code = tvb_get_guint8(tvb, offset);
+ col_set_str(g_pinfo->cinfo, COL_INFO, val_to_str_const(code, tdls_action_codes, "Unknown TDLS Action"));
+ proto_tree_add_item(tree, hf_ieee80211_ff_tdls_action_code, tvb, offset, 1, FALSE);
+ length += 1;
+ break;
+ }
+
+ case FIELD_TARGET_CHANNEL:
+ proto_tree_add_item(tree, hf_ieee80211_ff_target_channel, tvb, offset, 1, FALSE);
+ length += 1;
+ break;
+
+ case FIELD_REGULATORY_CLASS:
+ proto_tree_add_item(tree, hf_ieee80211_ff_regulatory_class, tvb, offset, 1, FALSE);
+ length += 1;
+ break;
}
return length;
}
{3, "AES (OCB)"},
{4, "AES (CCM)"},
{5, "WEP (104-bit)"},
+ {6, "BIP"},
+ {7, "Group addressed traffic not allowed"},
+ {0, NULL}
+};
+
+static const value_string ieee80211_rsn_cipher_vals[] =
+{
+ {0, "NONE"},
+ {1, "WEP (40-bit)"},
+ {2, "TKIP"},
+ {3, "AES (OCB)"},
+ {4, "AES (CCM)"},
+ {5, "WEP (104-bit)"},
+ {6, "BIP"},
+ {7, "Group addressed traffic not allowed"},
+ {0, NULL}
+};
+
+static const value_string ieee80211_rsn_keymgmt_vals[] =
+{
+ {0, "NONE"},
+ {1, "WPA"},
+ {2, "PSK"},
+ {3, "FT over IEEE 802.1X"},
+ {4, "FT using PSK"},
+ {5, "WPA (SHA256)"},
+ {6, "PSK (SHA256)"},
+ {7, "TDLS / TPK Handshake"},
{0, NULL}
};
+static void
+oui_base_custom(gchar *result, guint32 oui)
+{
+ guint8 p_oui[3];
+ const gchar *manuf_name;
+ p_oui[0] = oui >> 16 & 0xFF;
+ p_oui[1] = oui >> 8 & 0xFF;
+ p_oui[2] = oui & 0xFF;
+
+ /* Attempt an OUI lookup. */
+ manuf_name = get_manuf_name_if_known(p_oui);
+ if (manuf_name == NULL) {
+ /* Could not find an OUI. */
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%.2x-%.2x-%.2x", p_oui[0], p_oui[1], p_oui[2] );
+ }
+ else {
+ /* Found an address string. */
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%.2x-%.2x-%.2x (%s)", p_oui[0], p_oui[1], p_oui[2], manuf_name );
+ }
+}
+static void
+rsn_gcs_base_custom(gchar *result, guint32 gcs)
+{
+ gchar *oui_result=NULL;
+ oui_result = ep_alloc(SHORT_STR);
+ oui_result[0] = '\0';
+ oui_base_custom(oui_result, gcs >>8);
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%s %s", oui_result, val_to_str( gcs & 0xFF, ieee80211_rsn_cipher_vals, "Unknown %d") );
+}
+
+static void
+rsn_pcs_base_custom(gchar *result, guint32 pcs)
+{
+ gchar *oui_result=NULL;
+ oui_result = ep_alloc(SHORT_STR);
+ oui_result[0] = '\0';
+ oui_base_custom(oui_result, pcs >>8);
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%s %s", oui_result, val_to_str( pcs & 0xFF, ieee80211_rsn_cipher_vals, "Unknown %d") );
+
+}
+static void
+rsn_akms_base_custom(gchar *result, guint32 akms)
+{
+ gchar *oui_result=NULL;
+ oui_result = ep_alloc(SHORT_STR);
+ oui_result[0] = '\0';
+ oui_base_custom(oui_result, akms >>8);
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%s %s", oui_result, val_to_str( akms & 0xFF, ieee80211_rsn_keymgmt_vals, "Unknown %d") );
+}
+
+static gchar *
+rsn_pcs_return(guint32 pcs)
+{
+ gchar *result=NULL;
+ result = ep_alloc(SHORT_STR);
+ result[0] = '\0';
+ rsn_pcs_base_custom(result, pcs);
+
+ return result;
+}
+
+static gchar *
+rsn_akms_return(guint32 akms)
+{
+ gchar *result=NULL;
+ result = ep_alloc(SHORT_STR);
+ result[0] = '\0';
+ rsn_akms_base_custom(result, akms);
+
+ return result;
+}
+
+static void
+rsn_gmcs_base_custom(gchar *result, guint32 gmcs)
+{
+ gchar *oui_result=NULL;
+ oui_result = ep_alloc(SHORT_STR);
+ oui_result[0] = '\0';
+ oui_base_custom(oui_result, gmcs >>8);
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%s %s", oui_result, val_to_str( gmcs & 0xFF, ieee80211_rsn_cipher_vals, "Unknown %d") );
+}
+
static const value_string wpa_keymgmt_vals[] =
{
{0, "NONE"},
{1, "WPA"},
{2, "PSK"},
+ {3, "FT over IEEE 802.1X"},
+ {4, "FT using PSK"},
+ {5, "WPA (SHA256)"},
+ {6, "PSK (SHA256)"},
+ {7, "TDLS / TPK Handshake"},
+ {0, NULL}
+};
+
+static const value_string ft_subelem_id_vals[] =
+{
+ {0, "Reserved"},
+ {1, "PMK-R1 key holder identifier (R1KH-ID)"},
+ {2, "GTK subelement"},
+ {3, "PMK-R0 key holder identifier (R0KH-ID)"},
+ {4, "IGTK"},
+ {0, NULL}
+};
+
+static const value_string anqp_info_id_vals[] =
+{
+ {256, "ANQP Query list"},
+ {257, "ANQP Capability list"},
+ {258, "Venue Name information"},
+ {259, "Emergency Call Number information"},
+ {260, "Network Authentication Type information"},
+ {261, "Roaming Consortium list"},
+ {262, "IP Address Type Availability information"},
+ {263, "NAI Realm list"},
+ {264, "3GPP Cellular Network information"},
+ {265, "AP Geospatial Location"},
+ {266, "AP Civic Location"},
+ {267, "AP Location Public Identifier URI"},
+ {268, "Domain Name list"},
+ {269, "Emergency Alert Identifier URI"},
+ {270, "TDLS Discovery"},
+ {56797, "ANQP vendor-specific list"},
{0, NULL}
};
if (tag_off + 6 <= tag_len && !tvb_memeql(tag_tvb, tag_off, WPA_OUI"\x01", 4)) {
g_snprintf(out_buff, SHORT_STR, "WPA IE, type %u, version %u",
tvb_get_guint8(tag_tvb, tag_off + 3), tvb_get_letohs(tag_tvb, tag_off + 4));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 6, out_buff);
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 6, out_buff);
tag_off += 6;
if (tag_off + 4 <= tag_len) {
/* multicast cipher suite */
g_snprintf(out_buff, SHORT_STR, "Multicast cipher suite: %s",
val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3), wpa_cipher_vals,
"UNKNOWN"));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 4,
out_buff);
tag_off += 4;
/* unicast cipher suites */
if (tag_off + 2 <= tag_len) {
g_snprintf(out_buff, SHORT_STR,
"# of unicast cipher suites: %u", tvb_get_letohs(tag_tvb, tag_off));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 2,
out_buff);
tag_off += 2;
i = 1;
"Unicast cipher suite %u: %s", i,
val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
wpa_cipher_vals, "UNKNOWN"));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 4,
out_buff);
tag_off += 4;
i ++;
if (tag_off + 2 <= tag_len) {
g_snprintf(out_buff, SHORT_STR,
"# of auth key management suites: %u", tvb_get_letohs(tag_tvb, tag_off));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 2,
out_buff);
tag_off += 2;
i = 1;
"auth key management suite %u: %s", i,
val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
wpa_keymgmt_vals, "UNKNOWN"));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 4,
out_buff);
tag_off += 4;
i ++;
}
}
if (tag_off < tag_len)
- proto_tree_add_string(tree, tag_interpretation, tag_tvb,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb,
tag_off, tag_len - tag_off, "Not interpreted");
proto_item_append_text(item, ": WPA");
} else if (tag_off + 7 <= tag_len && !tvb_memeql(tag_tvb, tag_off, WME_OUI"\x02\x00", 5)) {
"WME IE: type %u, subtype %u, version %u, parameter set %u",
tvb_get_guint8(tag_tvb, tag_off+3), tvb_get_guint8(tag_tvb, tag_off+4),
tvb_get_guint8(tag_tvb, tag_off+5), tvb_get_guint8(tag_tvb, tag_off+6));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 7,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 7,
out_buff);
proto_item_append_text(item, ": WME");
} else if (tag_off + 24 <= tag_len && !tvb_memeql(tag_tvb, tag_off, WME_OUI"\x02\x01", 5)) {
"WME PE: type %u, subtype %u, version %u, parameter set %u",
tvb_get_guint8(tag_tvb, tag_off+3), tvb_get_guint8(tag_tvb, tag_off+4),
tvb_get_guint8(tag_tvb, tag_off+5), tvb_get_guint8(tag_tvb, tag_off+6));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 7,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 7,
out_buff);
tag_off += 8;
for (i = 0; i < 4; i++) {
byte2 = tvb_get_guint8(tag_tvb, tag_off + 1);
g_snprintf(out_buff, SHORT_STR,
"WME AC Parameters: ACI %u (%s), Admission Control %sMandatory, AIFSN %u, ECWmin %u, ECWmax %u, TXOP %u",
- (byte1 & 0x60) >> 5, match_strval((byte1 & 0x60) >> 5, wme_acs),
+ (byte1 & 0x60) >> 5, val_to_str((byte1 & 0x60) >> 5, wme_acs, "(Unknown: %d)"),
(byte1 & 0x10) ? "" : "not ", byte1 & 0x0f,
byte2 & 0x0f, (byte2 & 0xf0) >> 4,
tvb_get_letohs(tag_tvb, tag_off + 2));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 4,
out_buff);
tag_off += 4;
}
"WME TSPEC: type %u, subtype %u, version %u",
tvb_get_guint8(tag_tvb, tag_off+3), tvb_get_guint8(tag_tvb, tag_off+4),
tvb_get_guint8(tag_tvb, tag_off+5));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 6,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 6,
out_buff);
tag_off += 6;
byte1, qos_tags[byte1], qos_acs[byte1],
(ts_info & 0x0080) ? "" : "not ",
direction[(ts_info >> 5) & 0x3]);
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 3,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 3,
out_buff);
tag_off += 3;
g_snprintf(out_buff, SHORT_STR,
"WME TSPEC: %s MSDU Size %u",
(msdu_size & 0x8000) ? "Fixed" : "Nominal", msdu_size & 0x7fff);
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 2,
out_buff);
tag_off += 2;
g_snprintf(out_buff, SHORT_STR,
"WME TSPEC: Maximum MSDU Size %u", tvb_get_letohs(tag_tvb, tag_off));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 2,
out_buff);
tag_off += 2;
while ((field = val_to_str(tag_off, fields, "Unknown"))) {
g_snprintf(out_buff, SHORT_STR,
"WME TSPEC: %s %u", field, tvb_get_letohl(tag_tvb, tag_off));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 4,
out_buff);
tag_off += 4;
if (tag_off == 57)
g_snprintf(out_buff, SHORT_STR,
"WME TSPEC: Surplus Bandwidth Allowance Factor %u.%u",
(surplus_bandwidth >> 13) & 0x7, (surplus_bandwidth & 0x1fff));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 2,
out_buff);
tag_off += 2;
g_snprintf(out_buff, SHORT_STR,
"WME TSPEC: Medium Time %u", tvb_get_letohs(tag_tvb, tag_off));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, tag_off, 2,
out_buff);
tag_off += 2;
proto_item_append_text(item, ": WME");
}
}
+static void
+dissect_vendor_ie_wfa(packet_info *pinfo, proto_item *item, tvbuff_t *tag_tvb)
+{
+ gint tag_len = tvb_length(tag_tvb);
+
+ if (tag_len < 4)
+ return;
+
+ switch (tvb_get_guint8(tag_tvb, 3)) {
+ case WFA_SUBTYPE_P2P:
+ dissect_wifi_p2p_ie(pinfo, item, tag_tvb, 4, tag_len - 4);
+ proto_item_append_text(item, ": P2P");
+ break;
+ }
+}
+
static void
dissect_vendor_ie_rsn(proto_item * item, proto_tree * tree, tvbuff_t * tag_tvb)
{
}
g_snprintf(out_buff, SHORT_STR, "RSN PMKID: %s%s", valid_str,
tvb_bytes_to_str(tag_tvb, 4, pmkid_len));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, 0,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, 0,
tag_len, out_buff);
}
proto_item_append_text(item, ": RSN");
guint8 type;
type = tvb_get_guint8(tvb, offset);
- proto_tree_add_item (ietree, hf_marvell_ie_type, tvb, offset, 1, TRUE);
+ proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_type, tvb, offset, 1, TRUE);
offset += 1;
switch (type) {
case MARVELL_IE_MESH:
- proto_tree_add_item (ietree, hf_marvell_ie_mesh_subtype, tvb,
+ proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_subtype, tvb,
offset++, 1, TRUE );
- proto_tree_add_item (ietree, hf_marvell_ie_mesh_version, tvb,
+ proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_version, tvb,
offset++, 1, TRUE );
- proto_tree_add_item (ietree, hf_marvell_ie_mesh_active_proto_id, tvb,
+ proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_active_proto_id, tvb,
offset++, 1, TRUE );
- proto_tree_add_item (ietree, hf_marvell_ie_mesh_active_metric_id, tvb,
+ proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_active_metric_id, tvb,
offset++, 1, TRUE );
- proto_tree_add_item (ietree, hf_marvell_ie_mesh_cap, tvb,
+ proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_cap, tvb,
offset++, 1, TRUE );
break;
default:
- proto_tree_add_item(ietree, hf_marvell_ie_data, tvb, offset,
+ proto_tree_add_item(ietree, hf_ieee80211_marvell_ie_data, tvb, offset,
tag_len - 1, FALSE);
break;
}
}
typedef enum {
- AIRONET_IE_VERSION = 3,
- AIRONET_IE_QOS,
- AIRONET_IE_QBSS_V2 = 14
-} aironet_ie_type_t;
+ ATHEROS_IE_ADVCAP = 1,
+ ATHEROS_IE_XR = 3,
+} atheros_ie_type_t;
-static const value_string aironet_ie_type_vals[] = {
- { AIRONET_IE_VERSION, "CCX version"},
- { AIRONET_IE_QOS, "Qos"},
- { AIRONET_IE_QBSS_V2, "QBSS V2 - CCA"},
- { 0, NULL }
+typedef enum {
+ ATHEROS_IE_ADVCAP_S = 1,
+} atheros_ie_advcap_subtype_t;
+
+typedef enum {
+ ATHEROS_IE_XR_S = 1,
+} atheros_ie_xr_subtype_t;
+
+typedef enum {
+ ATHEROS_IE_CAP_TURBOP = 0x01,
+ ATHEROS_IE_CAP_COMP = 0x02,
+ ATHEROS_IE_CAP_FF = 0x04,
+ ATHEROS_IE_CAP_XR = 0x08,
+ ATHEROS_IE_CAP_AR = 0x10,
+ ATHEROS_IE_CAP_BURST = 0x20,
+ ATHEROS_IE_CAP_WME = 0x40,
+ ATHEROS_IE_CAP_BOOST = 0x80
+} atheros_ie_cap_t;
+
+static const value_string atheros_ie_type_vals[] = {
+ { ATHEROS_IE_ADVCAP, "Advanced Capability"},
+ { ATHEROS_IE_XR, "eXtended Range"},
+ { 0, NULL }
};
static void
-dissect_vendor_ie_aironet(proto_item * aironet_item, proto_tree * ietree,
- tvbuff_t * tvb, int offset, guint32 tag_len)
+dissect_vendor_ie_atheros_cap(proto_item * item _U_, tvbuff_t *tvb, int offset)
{
- guint8 type;
- int i;
- gboolean dont_change = FALSE; /* Don't change the IE item text to default */
+ proto_tree *cap_tree;
+
+ cap_tree = proto_item_add_subtree(item, ett_ath_cap_tree);
+
+ proto_tree_add_item(cap_tree, hf_ieee80211_atheros_ie_cap_f_turbop, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(cap_tree, hf_ieee80211_atheros_ie_cap_f_comp, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(cap_tree, hf_ieee80211_atheros_ie_cap_f_ff, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(cap_tree, hf_ieee80211_atheros_ie_cap_f_xr, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(cap_tree, hf_ieee80211_atheros_ie_cap_f_ar, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(cap_tree, hf_ieee80211_atheros_ie_cap_f_burst, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(cap_tree, hf_ieee80211_atheros_ie_cap_f_wme, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(cap_tree, hf_ieee80211_atheros_ie_cap_f_boost, tvb, offset, 1, ENC_NA);
+}
+
+static void
+dissect_vendor_ie_atheros(proto_item * item _U_, proto_tree * ietree,
+ tvbuff_t * tvb, int offset, guint tag_len,
+ packet_info * pinfo, int tag_end, proto_item *ti_len)
+{
+ guint8 type;
+ guint8 subtype;
+ guint8 version;
+ proto_item *cap_item;
+ proto_item *ti;
+
+ if (tag_len <= 6) {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be >= 6", tag_len);
+ return;
+ }
+ proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_type, tvb, offset, 1, ENC_NA);
type = tvb_get_guint8(tvb, offset);
- proto_tree_add_item (ietree, hf_aironet_ie_type, tvb, offset, 1, TRUE);
+ proto_item_append_text(item, ": %s", val_to_str(type, atheros_ie_type_vals, "Unknown"));
offset += 1;
- switch (type) {
- case AIRONET_IE_VERSION:
- proto_tree_add_item (ietree, hf_aironet_ie_version, tvb, offset, 1, TRUE);
- proto_item_append_text(aironet_item, ": Aironet CCX version = %d",
- tvb_get_guint8(tvb, offset));
- dont_change = TRUE;
- break;
- case AIRONET_IE_QOS:
- proto_tree_add_item (ietree, hf_aironet_ie_qos_unk1, tvb, offset, 1, TRUE);
- offset += 1;
- proto_tree_add_item (ietree, hf_aironet_ie_qos_paramset, tvb, offset, 1, TRUE);
- offset += 1;
+ proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_subtype, tvb, offset, 1, ENC_NA);
+ subtype = tvb_get_guint8(tvb, offset);
+ offset += 1;
- /* XXX: just copied over from WME. Maybe "Best Effort" and "Background"
- * need to be swapped. Also, the "TXOP" may be TXOP - or not.
- */
- for (i = 0; i < 4; i++) {
- guint8 byte1, byte2;
- guint16 txop;
- byte1 = tvb_get_guint8(tvb, offset);
- byte2 = tvb_get_guint8(tvb, offset + 1);
- txop = tvb_get_letohs(tvb, offset + 2);
- proto_tree_add_bytes_format(ietree, hf_aironet_ie_qos_val, tvb, offset, 4,
- tvb_get_ptr(tvb, offset, 4),
- "CCX QoS Parameters??: ACI %u (%s), Admission Control %sMandatory, AIFSN %u, ECWmin %u, ECWmax %u, TXOP %u",
- (byte1 & 0x60) >> 5, match_strval((byte1 & 0x60) >> 5, wme_acs),
- (byte1 & 0x10) ? "" : "not ", byte1 & 0x0f,
- byte2 & 0x0f, (byte2 & 0xf0) >> 4,
+ proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_version, tvb, offset, 1, ENC_NA);
+ version = tvb_get_guint8(tvb, offset);
+ offset += 1;
+
+ if(version == 0)
+ {
+ switch(type){
+ case ATHEROS_IE_ADVCAP:
+ {
+ switch(subtype){
+ case ATHEROS_IE_ADVCAP_S:
+ {
+ cap_item = proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_advcap_cap, tvb, offset, 1, ENC_NA);
+ dissect_vendor_ie_atheros_cap(cap_item, tvb, offset);
+ offset += 1;
+
+ proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_advcap_defkey, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+ break;
+ }
+ default:
+ /* No default Action */
+ break;
+ } /* End switch(subtype) */
+ break;
+ }
+ case ATHEROS_IE_XR:
+ {
+ switch(subtype){
+ case ATHEROS_IE_XR_S:
+ {
+ proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_xr_info, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_xr_base_bssid, tvb, offset, 6, ENC_NA);
+ offset += 6;
+
+ proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_xr_xr_bssid, tvb, offset, 6, ENC_NA);
+ offset += 6;
+
+ proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_xr_xr_beacon, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+
+ cap_item = proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_xr_base_cap, tvb, offset, 1, ENC_NA);
+ dissect_vendor_ie_atheros_cap(cap_item, tvb, offset);
+ offset += 1;
+
+ cap_item = proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_xr_xr_cap, tvb, offset, 1, ENC_NA);
+ dissect_vendor_ie_atheros_cap(cap_item, tvb, offset);
+ offset += 1;
+ break;
+ }
+ default:
+ /* No default Action */
+ break;
+ break;
+ } /* End switch(subtype) */
+ default:
+ /* No default Action */
+ break;
+ } /* End switch(type) */
+
+ }
+ }
+ if(offset < tag_end){
+ ti = proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_data, tvb, offset, tag_end - offset, FALSE);
+ expert_add_info_format(pinfo, ti, PI_UNDECODED, PI_WARN, "Unknown Data (not interpreted)");
+ }
+
+
+}
+
+typedef enum {
+ AIRONET_IE_VERSION = 3,
+ AIRONET_IE_QOS,
+ AIRONET_IE_QBSS_V2 = 14
+} aironet_ie_type_t;
+
+static const value_string aironet_ie_type_vals[] = {
+ { AIRONET_IE_VERSION, "CCX version"},
+ { AIRONET_IE_QOS, "Qos"},
+ { AIRONET_IE_QBSS_V2, "QBSS V2 - CCA"},
+ { 0, NULL }
+};
+
+static void
+dissect_vendor_ie_aironet(proto_item * aironet_item, proto_tree * ietree,
+ tvbuff_t * tvb, int offset, guint32 tag_len)
+{
+ guint8 type;
+ int i;
+ gboolean dont_change = FALSE; /* Don't change the IE item text to default */
+
+ type = tvb_get_guint8(tvb, offset);
+ proto_tree_add_item (ietree, hf_ieee80211_aironet_ie_type, tvb, offset, 1, TRUE);
+ offset += 1;
+
+ switch (type) {
+ case AIRONET_IE_VERSION:
+ proto_tree_add_item (ietree, hf_ieee80211_aironet_ie_version, tvb, offset, 1, TRUE);
+ proto_item_append_text(aironet_item, ": Aironet CCX version = %d",
+ tvb_get_guint8(tvb, offset));
+ dont_change = TRUE;
+ break;
+ case AIRONET_IE_QOS:
+ proto_tree_add_item (ietree, hf_ieee80211_aironet_ie_qos_unk1, tvb, offset, 1, TRUE);
+ offset += 1;
+ proto_tree_add_item (ietree, hf_ieee80211_aironet_ie_qos_paramset, tvb, offset, 1, TRUE);
+ offset += 1;
+
+ /* XXX: just copied over from WME. Maybe "Best Effort" and "Background"
+ * need to be swapped. Also, the "TXOP" may be TXOP - or not.
+ */
+ for (i = 0; i < 4; i++) {
+ guint8 byte1, byte2;
+ guint16 txop;
+ byte1 = tvb_get_guint8(tvb, offset);
+ byte2 = tvb_get_guint8(tvb, offset + 1);
+ txop = tvb_get_letohs(tvb, offset + 2);
+ proto_tree_add_bytes_format(ietree, hf_ieee80211_aironet_ie_qos_val, tvb, offset, 4, NULL,
+ "CCX QoS Parameters??: ACI %u (%s), Admission Control %sMandatory, AIFSN %u, ECWmin %u, ECWmax %u, TXOP %u",
+ (byte1 & 0x60) >> 5, val_to_str((byte1 & 0x60) >> 5, wme_acs, "(Unknown: %d)"),
+ (byte1 & 0x10) ? "" : "not ", byte1 & 0x0f,
+ byte2 & 0x0f, (byte2 & 0xf0) >> 4,
txop);
offset += 4;
}
break;
case AIRONET_IE_QBSS_V2:
/* Extract Values */
- proto_tree_add_item (ietree, hf_qbss2_scount, tvb, offset, 2, TRUE);
- proto_tree_add_item (ietree, hf_qbss2_cu, tvb, offset + 2, 1, FALSE);
- proto_tree_add_item (ietree, hf_qbss2_cal, tvb, offset + 3, 1, FALSE);
- proto_tree_add_item (ietree, hf_qbss2_gl, tvb, offset + 4, 1, FALSE);
+ proto_tree_add_item (ietree, hf_ieee80211_qbss2_scount, tvb, offset, 2, TRUE);
+ proto_tree_add_item (ietree, hf_ieee80211_qbss2_cu, tvb, offset + 2, 1, FALSE);
+ proto_tree_add_item (ietree, hf_ieee80211_qbss2_cal, tvb, offset + 3, 1, FALSE);
+ proto_tree_add_item (ietree, hf_ieee80211_qbss2_gl, tvb, offset + 4, 1, FALSE);
break;
default:
- proto_tree_add_item(ietree, hf_aironet_ie_data, tvb, offset,
+ proto_tree_add_item(ietree, hf_ieee80211_aironet_ie_data, tvb, offset,
tag_len - 1, FALSE);
break;
}
val_to_str(type, aironet_ie_type_vals, "Unknown"));
}
}
+/* 7.3.2.25 RSN information element */
+static int
+dissect_rsn_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len)
+{
+ proto_item *rsn_gcs_item, *rsn_pcs_item, *rsn_akms_item, *rsn_cap_item, *rsn_pmkid_item, *rsn_gmcs_item;
+ proto_item *rsn_sub_pcs_item, *rsn_sub_akms_item;
+ proto_tree *rsn_gcs_tree, *rsn_pcs_tree, *rsn_akms_tree, *rsn_cap_tree, *rsn_pmkid_tree, *rsn_gmcs_tree;
+ proto_tree *rsn_sub_pcs_tree, *rsn_sub_akms_tree;
+ guint16 i, pcs_count, akms_count, pmkid_count;
+ int tag_end = offset + tag_len;
+
+ proto_tree_add_item(tree, hf_ieee80211_rsn_version, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+
+ /* 7.3.2.25.1 Cipher suites */
+ rsn_gcs_item = proto_tree_add_item(tree, hf_ieee80211_rsn_gcs, tvb, offset, 4, FALSE);
+ rsn_gcs_tree = proto_item_add_subtree(rsn_gcs_item, ett_rsn_gcs_tree);
+ proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_oui, tvb, offset, 3, FALSE);
+ /* Check if OUI is 00:0F:AC (ieee80211) */
+ if(tvb_get_ntoh24(tvb, offset) == 0x000FAC)
+ {
+ proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_80211_type, tvb, offset + 3, 1, FALSE);
+ } else {
+ proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_type, tvb, offset + 3, 1, FALSE);
+ }
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_rsn_pcs_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ pcs_count = tvb_get_letohs(tvb, offset);
+ offset += 2;
+
+ rsn_pcs_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pcs_list, tvb, offset, pcs_count * 4, FALSE);
+ rsn_pcs_tree = proto_item_add_subtree(rsn_pcs_item, ett_rsn_pcs_tree);
+ for(i=1; i <= pcs_count; i++)
+ {
+ rsn_sub_pcs_item = proto_tree_add_item(rsn_pcs_tree, hf_ieee80211_rsn_pcs, tvb, offset, 4, FALSE);
+ rsn_sub_pcs_tree = proto_item_add_subtree(rsn_sub_pcs_item, ett_rsn_sub_pcs_tree);
+ proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_oui, tvb, offset, 3, FALSE);
+ /* Check if OUI is 00:0F:AC (ieee80211) */
+ if(tvb_get_ntoh24(tvb, offset) == 0x000FAC)
+ {
+ proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_80211_type, tvb, offset+3, 1, FALSE);
+ proto_item_append_text(rsn_pcs_item, " %s", rsn_pcs_return(tvb_get_ntohl(tvb, offset)));
+ } else {
+ proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_type, tvb, offset+3, 1, FALSE);
+ }
+ offset += 4;
+ }
+
+ /* 7.3.2.25.2 AKM suites */
+ proto_tree_add_item(tree, hf_ieee80211_rsn_akms_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ akms_count = tvb_get_letohs(tvb, offset);
+ offset += 2;
+
+ rsn_akms_item = proto_tree_add_item(tree, hf_ieee80211_rsn_akms_list, tvb, offset, akms_count * 4, FALSE);
+ rsn_akms_tree = proto_item_add_subtree(rsn_akms_item, ett_rsn_akms_tree);
+ for(i=1; i <= akms_count; i++)
+ {
+ rsn_sub_akms_item = proto_tree_add_item(rsn_akms_tree, hf_ieee80211_rsn_akms, tvb, offset, 4, FALSE);
+ rsn_sub_akms_tree = proto_item_add_subtree(rsn_sub_akms_item, ett_rsn_sub_akms_tree);
+ proto_tree_add_item(rsn_sub_akms_tree, hf_ieee80211_rsn_akms_oui, tvb, offset, 3, FALSE);
+
+ /* Check if OUI is 00:0F:AC (ieee80211) */
+ if(tvb_get_ntoh24(tvb, offset) == 0x000FAC)
+ {
+ proto_tree_add_item(rsn_sub_akms_tree, hf_ieee80211_rsn_akms_80211_type, tvb, offset+3, 1, FALSE);
+ proto_item_append_text(rsn_akms_item, " %s", rsn_akms_return(tvb_get_ntohl(tvb, offset)));
+ } else {
+ proto_tree_add_item(rsn_sub_akms_tree, hf_ieee80211_rsn_akms_type, tvb, offset+3, 1, FALSE);
+ }
+ offset += 4;
+ }
+
+ /* 7.3.2.25.3 RSN capabilities */
+ rsn_cap_item = proto_tree_add_item(tree, hf_ieee80211_rsn_cap, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ rsn_cap_tree = proto_item_add_subtree(rsn_cap_item, ett_rsn_cap_tree);
+
+ proto_tree_add_item(rsn_cap_tree, hf_ieee80211_rsn_cap_preauth, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(rsn_cap_tree, hf_ieee80211_rsn_cap_no_pairwise, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(rsn_cap_tree, hf_ieee80211_rsn_cap_ptksa_replay_counter, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(rsn_cap_tree, hf_ieee80211_rsn_cap_gtksa_replay_counter, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(rsn_cap_tree, hf_ieee80211_rsn_cap_mfpr, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(rsn_cap_tree, hf_ieee80211_rsn_cap_mfpc, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(rsn_cap_tree, hf_ieee80211_rsn_cap_peerkey, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+ if(offset >= tag_end)
+ {
+ return offset;
+ }
+ /* 7.3.2.25.4 PMKID */
+ proto_tree_add_item(tree, hf_ieee80211_rsn_pmkid_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ pmkid_count = tvb_get_letohs(tvb, offset);
+ offset += 2;
+
+ rsn_pmkid_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pmkid_list, tvb, offset, pmkid_count * 16, FALSE);
+ rsn_pmkid_tree = proto_item_add_subtree(rsn_pmkid_item, ett_rsn_pmkid_tree);
+ for(i=1; i <= pmkid_count; i++)
+ {
+ proto_tree_add_item(rsn_pmkid_tree, hf_ieee80211_rsn_pmkid, tvb, offset, 16, FALSE);
+ offset +=16;
+ }
+
+ if(offset >= tag_end)
+ {
+ return offset;
+ }
+ /* Group Management Cipher Suite (802.11w)*/
+ rsn_gmcs_item = proto_tree_add_item(tree, hf_ieee80211_rsn_gmcs, tvb, offset, 4, FALSE);
+ rsn_gmcs_tree = proto_item_add_subtree(rsn_gmcs_item, ett_rsn_gmcs_tree);
+ proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_oui, tvb, offset, 3, FALSE);
+ /* Check if OUI is 00:0F:AC (ieee80211) */
+ if(tvb_get_ntoh24(tvb, offset) == 0x000FAC)
+ {
+ proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_80211_type, tvb, offset + 3, 1, FALSE);
+ } else {
+ proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_type, tvb, offset + 3, 1, FALSE);
+ }
+ offset += 4;
+
+ return offset;
+}
static void
-dissect_rsn_ie(proto_tree * tree, tvbuff_t * tag_tvb)
+dissect_mobility_domain(proto_tree *tree, tvbuff_t *tvb, int offset,
+ guint32 tag_len)
{
- guint tag_off = 0;
- guint tag_len = tvb_length(tag_tvb);
- guint16 rsn_capab;
- char out_buff[SHORT_STR];
- int i, count;
- proto_item *cap_item;
- proto_tree *cap_tree;
+ if (tag_len < 3) {
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
+ "MDIE content length must be at least 3 bytes");
+ return;
+ }
- if (tag_off + 2 > tag_len) {
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, tag_len,
- "Not interpreted");
+ proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_mdid,
+ tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_ft_capab,
+ tvb, offset + 2, 1, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_ft_capab_ft_over_ds,
+ tvb, offset + 2, 1, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_ft_capab_resource_req,
+ tvb, offset + 2, 1, FALSE);
+}
+
+#ifndef MESH_OVERRIDES
+static void
+dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset,
+ guint32 tag_len)
+{
+ int end = offset + tag_len;
+ if (tag_len < 82) {
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
+ "FTIE content length must be at least 82 bytes");
return;
}
- g_snprintf(out_buff, SHORT_STR, "RSN IE, version %u",
- tvb_get_letohs(tag_tvb, tag_off));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2, out_buff);
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_mic_control,
+ tvb, offset, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_element_count,
+ tvb, offset, 2, TRUE);
+ offset += 2;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_mic,
+ tvb, offset, 16, FALSE);
+ offset += 16;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_anonce,
+ tvb, offset, 32, FALSE);
+ offset += 32;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_snonce,
+ tvb, offset, 32, FALSE);
+ offset += 32;
+
+ while (offset + 2 <= end) {
+ guint8 id, len;
+ int s_end;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_id,
+ tvb, offset, 1, FALSE);
+ id = tvb_get_guint8(tvb, offset);
+ offset++;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_len,
+ tvb, offset, 1, FALSE);
+ len = tvb_get_guint8(tvb, offset);
+ offset++;
- tag_off += 2;
+ if (offset + len > end) {
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset,
+ end - offset, "Invalid FTIE subelement");
+ return;
+ }
- if (tag_off + 4 > tag_len)
- goto done;
+ s_end = offset + len;
+ switch (id) {
+ case 1:
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_r1kh_id,
+ tvb, offset, len, FALSE);
+ break;
+ case 2:
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_gtk_key_info,
+ tvb, offset, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_gtk_key_id,
+ tvb, offset, 2, TRUE);
+ offset += 2;
+ if (offset > s_end)
+ break;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_gtk_key_length,
+ tvb, offset, 1, FALSE);
+ offset++;
+ if (offset > s_end)
+ break;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_gtk_rsc,
+ tvb, offset, 8, FALSE);
+ offset += 8;
+ if (offset > s_end)
+ break;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_gtk_key,
+ tvb, offset, s_end - offset, FALSE);
+ break;
+ case 3:
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_r0kh_id,
+ tvb, offset, len, FALSE);
+ break;
+ case 4:
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_igtk_key_id,
+ tvb, offset, 2, TRUE);
+ offset += 2;
+ if (offset > s_end)
+ break;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_igtk_ipn,
+ tvb, offset, 6, FALSE);
+ offset += 6;
+ if (offset > s_end)
+ break;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_igtk_key_length,
+ tvb, offset, 1, FALSE);
+ offset++;
+ if (offset > s_end)
+ break;
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_igtk_key,
+ tvb, offset, 24, FALSE);
+ break;
+ default:
+ proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_data,
+ tvb, offset, len, FALSE);
+ break;
+ }
+ offset = s_end;
+ }
+}
+#endif /* MESH_OVERRIDES */
- /* multicast cipher suite */
- if (!tvb_memeql(tag_tvb, tag_off, RSN_OUI, 3)) {
- g_snprintf(out_buff, SHORT_STR, "Multicast cipher suite: %s",
- val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
- wpa_cipher_vals, "UNKNOWN"));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4, out_buff);
- tag_off += 4;
+static void
+dissect_mmie(proto_tree *tree, tvbuff_t *tvb, int offset, guint32 tag_len)
+{
+ if (tag_len < 16) {
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
+ "MMIE content length must be at least 16 bytes");
+ return;
}
- if (tag_off + 2 > tag_len)
- goto done;
-
- /* unicast cipher suites */
- count = tvb_get_letohs(tag_tvb, tag_off);
- g_snprintf(out_buff, SHORT_STR, "# of unicast cipher suites: %u", count);
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2, out_buff);
- tag_off += 2;
- i = 1;
- while (tag_off + 4 <= tag_len && i <= count) {
- if (tvb_memeql(tag_tvb, tag_off, RSN_OUI, 3) != 0)
- goto done;
- g_snprintf(out_buff, SHORT_STR, "Unicast cipher suite %u: %s",
- i, val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
- wpa_cipher_vals, "UNKNOWN"));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4, out_buff);
- tag_off += 4;
- i++;
+ proto_tree_add_item(tree, hf_ieee80211_tag_mmie_keyid, tvb, offset, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_mmie_ipn, tvb, offset + 2, 6,
+ TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_mmie_mic, tvb, offset + 8, 8,
+ FALSE);
+}
+
+static void
+dissect_link_identifier(proto_tree *tree, tvbuff_t *tvb, int offset,
+ guint32 tag_len)
+{
+ if (tag_len < 18) {
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
+ "Link Identifier content length must be at least "
+ "18 bytes");
+ return;
}
- if (i <= count || tag_off + 2 > tag_len)
- goto done;
-
- /* authenticated key management suites */
- count = tvb_get_letohs(tag_tvb, tag_off);
- g_snprintf(out_buff, SHORT_STR, "# of auth key management suites: %u", count);
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2, out_buff);
- tag_off += 2;
- i = 1;
- while (tag_off + 4 <= tag_len && i <= count) {
- if (tvb_memeql(tag_tvb, tag_off, RSN_OUI, 3) != 0)
- goto done;
- g_snprintf(out_buff, SHORT_STR, "auth key management suite %u: %s",
- i, val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
- wpa_keymgmt_vals, "UNKNOWN"));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4, out_buff);
- tag_off += 4;
- i++;
+ proto_tree_add_item(tree, hf_ieee80211_tag_link_id_bssid, tvb,
+ offset, 6, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_link_id_init_sta, tvb,
+ offset + 6, 6, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_link_id_resp_sta, tvb,
+ offset + 12, 6, FALSE);
+}
+
+static void
+dissect_wakeup_schedule(proto_tree *tree, tvbuff_t *tvb, int offset,
+ guint32 tag_len)
+{
+ if (tag_len < 18) {
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
+ "Wakeup Schedule content length must be at least "
+ "18 bytes");
+ return;
}
- if (i <= count || tag_off + 2 > tag_len)
- goto done;
-
- rsn_capab = tvb_get_letohs(tag_tvb, tag_off);
- g_snprintf(out_buff, SHORT_STR, "RSN Capabilities 0x%04x", rsn_capab);
- cap_item = proto_tree_add_uint_format(tree, rsn_cap, tag_tvb,
- tag_off, 2, rsn_capab,
- "RSN Capabilities: 0x%04X", rsn_capab);
- cap_tree = proto_item_add_subtree(cap_item, ett_rsn_cap_tree);
- proto_tree_add_boolean(cap_tree, rsn_cap_preauth, tag_tvb, tag_off, 2,
- rsn_capab);
- proto_tree_add_boolean(cap_tree, rsn_cap_no_pairwise, tag_tvb, tag_off, 2,
- rsn_capab);
- proto_tree_add_uint(cap_tree, rsn_cap_ptksa_replay_counter, tag_tvb, tag_off, 2,
- rsn_capab);
- proto_tree_add_uint(cap_tree, rsn_cap_gtksa_replay_counter, tag_tvb, tag_off, 2,
- rsn_capab);
- tag_off += 2;
-
- if (tag_off + 2 > tag_len)
- goto done;
-
- count = tvb_get_letohs(tag_tvb, tag_off);
- g_snprintf(out_buff, SHORT_STR, "# of PMKIDs: %u", count);
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2, out_buff);
- tag_off += 2;
-
- /* PMKID List (16 * n octets) */
- for (i = 0; i < count; i++) {
- if (tag_off + PMKID_LEN > tag_len)
- break;
- g_snprintf(out_buff, SHORT_STR, "PMKID %u: %s", i,
- tvb_bytes_to_str(tag_tvb, tag_off, PMKID_LEN));
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off,
- PMKID_LEN, out_buff);
- tag_off += PMKID_LEN;
+ proto_tree_add_item(tree, hf_ieee80211_tag_wakeup_schedule_offset, tvb,
+ offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_wakeup_schedule_interval, tvb,
+ offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree,
+ hf_ieee80211_tag_wakeup_schedule_awake_window_slots, tvb,
+ offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_wakeup_schedule_max_awake_dur,
+ tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_wakeup_schedule_idle_count, tvb,
+ offset, 2, TRUE);
+}
+
+static void
+dissect_channel_switch_timing(proto_tree *tree, tvbuff_t *tvb, int offset,
+ guint32 tag_len)
+{
+ if (tag_len < 4) {
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
+ "Channel Switch Timing content length must be at "
+ "least 4 bytes");
+ return;
}
-done:
- if (tag_off < tag_len)
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off,
- tag_len - tag_off, "Not interpreted");
+ proto_tree_add_item(tree, hf_ieee80211_tag_channel_switch_timing_switch_time,
+ tvb, offset, 2, TRUE);
+ offset += 2;
+
+ proto_tree_add_item(tree,
+ hf_ieee80211_tag_channel_switch_timing_switch_timeout,
+ tvb, offset, 2, TRUE);
+}
+
+static void
+dissect_pti_control(proto_tree *tree, tvbuff_t *tvb, int offset,
+ guint32 tag_len)
+{
+ if (tag_len < 3) {
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
+ "PTI Control content length must be at least "
+ "3 bytes");
+ return;
+ }
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_pti_control_tid, tvb,
+ offset, 1, FALSE);
+ offset++;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_pti_control_sequence_control, tvb,
+ offset, 2, TRUE);
+}
+
+static void
+dissect_pu_buffer_status(proto_tree *tree, tvbuff_t *tvb, int offset,
+ guint32 tag_len)
+{
+ if (tag_len < 1) {
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
+ "PU Buffer Status content length must be at least "
+ "1 byte");
+ return;
+ }
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_pu_buffer_status_ac_bk, tvb,
+ offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_pu_buffer_status_ac_be, tvb,
+ offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_pu_buffer_status_ac_vi, tvb,
+ offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_tag_pu_buffer_status_ac_vo, tvb,
+ offset, 1, FALSE);
+}
+
+static void
+dissect_timeout_interval(proto_tree *tree, tvbuff_t *tvb, int offset,
+ guint32 tag_len)
+{
+ proto_item *pi;
+
+ pi = proto_tree_add_item(tree, hf_ieee80211_tag_timeout_int_type, tvb,
+ offset, 1, FALSE);
+ if (tag_len < 5) {
+ expert_add_info_format(g_pinfo, pi, PI_MALFORMED, PI_ERROR,
+ "Timeout Interval content length must be at least "
+ "5 bytes");
+ return;
+ }
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_timeout_int_value, tvb,
+ offset + 1, 4, TRUE);
}
static void
guint16 capability;
/* 16 byte Supported MCS set */
- ti = proto_tree_add_string(tree, vs ? mcsset_vs : mcsset, tvb, offset, 16,
+ if(vs)
+ {
+ ti = proto_tree_add_string(tree, hf_ieee80211_mcsset_vs, tvb, offset, 16,
+ basic ? "Basic MCS Set" : "MCS Set");
+ }else
+ {
+ ti = proto_tree_add_string(tree, hf_ieee80211_mcsset, tvb, offset, 16,
basic ? "Basic MCS Set" : "MCS Set");
+ }
mcs_tree = proto_item_add_subtree(ti, ett_mcsset_tree);
/* Rx MCS Bitmask */
- ti = proto_tree_add_string(mcs_tree, tag_interpretation, tvb, offset,
+ ti = proto_tree_add_string(mcs_tree, hf_ieee80211_tag_interpretation, tvb, offset,
10, "Rx Modulation and Coding Scheme (One bit per modulation)");
bit_tree = proto_item_add_subtree(ti, ett_mcsbit_tree);
/* Bits 0 - 31 */
- proto_tree_add_item(bit_tree, mcsset_rx_bitmask_0to7, tvb, offset, 4, TRUE);
- proto_tree_add_item(bit_tree, mcsset_rx_bitmask_8to15, tvb, offset, 4, TRUE);
- proto_tree_add_item(bit_tree, mcsset_rx_bitmask_16to23, tvb, offset, 4, TRUE);
- proto_tree_add_item(bit_tree, mcsset_rx_bitmask_24to31, tvb, offset, 4, TRUE);
+ proto_tree_add_item(bit_tree, hf_ieee80211_mcsset_rx_bitmask_0to7, tvb, offset, 4, TRUE);
+ proto_tree_add_item(bit_tree, hf_ieee80211_mcsset_rx_bitmask_8to15, tvb, offset, 4, TRUE);
+ proto_tree_add_item(bit_tree, hf_ieee80211_mcsset_rx_bitmask_16to23, tvb, offset, 4, TRUE);
+ proto_tree_add_item(bit_tree, hf_ieee80211_mcsset_rx_bitmask_24to31, tvb, offset, 4, TRUE);
/* Bits 32 - 52 */
- proto_tree_add_item(bit_tree, mcsset_rx_bitmask_32, tvb, offset + 4, 4, TRUE);
- proto_tree_add_item(bit_tree, mcsset_rx_bitmask_33to38, tvb, offset + 4, 4, TRUE);
- proto_tree_add_item(bit_tree, mcsset_rx_bitmask_39to52, tvb, offset + 4, 4, TRUE);
+ proto_tree_add_item(bit_tree, hf_ieee80211_mcsset_rx_bitmask_32, tvb, offset + 4, 4, TRUE);
+ proto_tree_add_item(bit_tree, hf_ieee80211_mcsset_rx_bitmask_33to38, tvb, offset + 4, 4, TRUE);
+ proto_tree_add_item(bit_tree, hf_ieee80211_mcsset_rx_bitmask_39to52, tvb, offset + 4, 4, TRUE);
/* Bits 53 - 76 */
- proto_tree_add_item(bit_tree, mcsset_rx_bitmask_53to76, tvb, offset + 6, 4, TRUE);
+ proto_tree_add_item(bit_tree, hf_ieee80211_mcsset_rx_bitmask_53to76, tvb, offset + 6, 4, TRUE);
capability = tvb_get_letohs (tvb, offset+10);
- proto_tree_add_uint_format(mcs_tree, mcsset_highest_data_rate, tvb, offset + 10, 2,
+ proto_tree_add_uint_format(mcs_tree, hf_ieee80211_mcsset_highest_data_rate, tvb, offset + 10, 2,
capability, "Highest Supported Data Rate: 0x%04X", capability);
capability = tvb_get_letohs (tvb, offset+12);
- proto_tree_add_boolean(mcs_tree, mcsset_tx_mcs_set_defined, tvb, offset + 12, 1,
+ proto_tree_add_boolean(mcs_tree, hf_ieee80211_mcsset_tx_mcs_set_defined, tvb, offset + 12, 1,
capability);
- proto_tree_add_boolean(mcs_tree, mcsset_tx_rx_mcs_set_not_equal, tvb, offset + 12, 1,
+ proto_tree_add_boolean(mcs_tree, hf_ieee80211_mcsset_tx_rx_mcs_set_not_equal, tvb, offset + 12, 1,
capability);
- proto_tree_add_uint(mcs_tree, mcsset_tx_max_spatial_streams, tvb, offset + 12, 1,
+ proto_tree_add_uint(mcs_tree, hf_ieee80211_mcsset_tx_max_spatial_streams, tvb, offset + 12, 1,
capability);
- proto_tree_add_boolean(mcs_tree, mcsset_tx_unequal_modulation, tvb, offset + 12, 1,
+ proto_tree_add_boolean(mcs_tree, hf_ieee80211_mcsset_tx_unequal_modulation, tvb, offset + 12, 1,
capability);
}
cap_tree = tree;
if (tag_len < 22) {
- proto_tree_add_string(tree, tag_interpretation, tvb, offset, tag_len,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
"HT Information IE content length must be at least 22 bytes");
return;
}
info = tvb_get_guint8 (tvb, offset);
- proto_tree_add_item(cap_tree, ht_info_primary_channel, tvb, offset, 1, TRUE);
+ proto_tree_add_item(cap_tree, hf_ieee80211_ht_info_primary_channel, tvb, offset, 1, TRUE);
info = tvb_get_guint8 (tvb, ++offset);
- cap_item = proto_tree_add_uint_format(tree, ht_info_delimiter1, tvb,
+ cap_item = proto_tree_add_uint_format(tree, hf_ieee80211_ht_info_delimiter1, tvb,
offset, 1, info,
"HT Information Subset (1 of 3): 0x%02X", info);
cap_tree = proto_item_add_subtree(cap_item, ett_ht_info_delimiter1_tree);
- proto_tree_add_uint(cap_tree, ht_info_secondary_channel_offset, tvb, offset, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ht_info_secondary_channel_offset, tvb, offset, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_channel_width, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_channel_width, tvb, offset, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_rifs_mode, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_rifs_mode, tvb, offset, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_psmp_stas_only, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_psmp_stas_only, tvb, offset, 1,
info);
- proto_tree_add_uint(cap_tree, ht_info_service_interval_granularity, tvb, offset, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ht_info_service_interval_granularity, tvb, offset, 1,
info);
info = tvb_get_letohs (tvb, ++offset);
- cap_item = proto_tree_add_uint_format(tree, ht_info_delimiter2, tvb,
+ cap_item = proto_tree_add_uint_format(tree, hf_ieee80211_ht_info_delimiter2, tvb,
offset, 2, info,
"HT Information Subset (2 of 3): 0x%04X", info);
cap_tree = proto_item_add_subtree(cap_item, ett_ht_info_delimiter2_tree);
- proto_tree_add_uint(cap_tree, ht_info_operating_mode, tvb, offset, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ht_info_operating_mode, tvb, offset, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_non_greenfield_sta_present, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_non_greenfield_sta_present, tvb, offset, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_transmit_burst_limit, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_transmit_burst_limit, tvb, offset, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_obss_non_ht_stas_present, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_obss_non_ht_stas_present, tvb, offset, 1,
info);
- proto_tree_add_uint(cap_tree, ht_info_reserved_1, tvb, offset, 2,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ht_info_reserved_1, tvb, offset, 2,
info);
offset += 2;
info = tvb_get_letohs (tvb, offset);
- cap_item = proto_tree_add_uint_format(tree, ht_info_delimiter3, tvb,
+ cap_item = proto_tree_add_uint_format(tree, hf_ieee80211_ht_info_delimiter3, tvb,
offset, 2, info,
"HT Information Subset (3 of 3): 0x%04X", info);
cap_tree = proto_item_add_subtree(cap_item, ett_ht_info_delimiter3_tree);
- proto_tree_add_uint(cap_tree, ht_info_reserved_2, tvb, offset, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ht_info_reserved_2, tvb, offset, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_dual_beacon, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_dual_beacon, tvb, offset, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_dual_cts_protection, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_dual_cts_protection, tvb, offset, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_secondary_beacon, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_secondary_beacon, tvb, offset+1, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_lsig_txop_protection_full_support, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_lsig_txop_protection_full_support, tvb, offset+1, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_pco_active, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_pco_active, tvb, offset+1, 1,
info);
- proto_tree_add_boolean(cap_tree, ht_info_pco_phase, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_info_pco_phase, tvb, offset+1, 1,
info);
- proto_tree_add_uint(cap_tree, ht_info_reserved_3, tvb, offset+1, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ht_info_reserved_3, tvb, offset+1, 1,
info);
offset += 2;
offset += 16;
if (tag_val_init_off - offset < tag_len){
- proto_tree_add_string(cap_tree, tag_interpretation, tvb, offset,
+ proto_tree_add_string(cap_tree, hf_ieee80211_tag_interpretation, tvb, offset,
tag_len + tag_val_init_off - offset, "Unparsed Extra Data");
}
}
+#ifndef MESH_OVERRIDES
/*** WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
static void
dissect_wsie_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len _U_)
{
- proto_item *pst_item, *cap_item, *chan_noc_item, *chnl_item;
- proto_tree *pst_tree, *cap_tree, *chan_noc_tree, *chnl_tree;
-
- guint8 providercount, pst_contents, pst_acm_length;
- int i;
- guint16 pst_length = 0;
- guint16 chan_noc;
- guint8 chan_length = 0;
- int local_offset;
-
- proto_tree_add_item(tree, hf_pst_timingquality, tvb, offset, 2, TRUE);
- offset+=2;
-
- providercount = tvb_get_guint8 (tvb, offset);
- pst_item = proto_tree_add_item(tree, hf_pst_providercount, tvb, offset, 1, TRUE);
- pst_tree = proto_item_add_subtree(pst_item,ett_pst_tree);
- offset++;
-
- for (i=0;i<providercount;i++) {
-
- local_offset = offset;
- cap_item = proto_tree_add_text (pst_tree, tvb, local_offset, pst_length, "Capabilities of Provider :%u", i+1);
- cap_tree = proto_item_add_subtree(cap_item, ett_pst_cap_tree);
-
- pst_length = tvb_get_letohl(tvb, local_offset);
- proto_tree_add_item(cap_tree, hf_pst_length, tvb, local_offset, 2, TRUE);
- local_offset+=2;
-
- pst_contents = tvb_get_guint8 (tvb, local_offset);
- proto_tree_add_item(cap_tree, hf_pst_contents, tvb, local_offset, 1, TRUE);
- local_offset++;
-
- if (pst_contents & WAVE_ACID) {
- proto_tree_add_item(cap_tree, hf_pst_acid, tvb, local_offset, 1, TRUE);
- local_offset++;
- }
-
- if (pst_contents & WAVE_ACM) {
- pst_acm_length = tvb_get_guint8 (tvb, local_offset);
- proto_tree_add_item(cap_tree, hf_pst_acm_length, tvb, local_offset, 1, TRUE);
- local_offset++;
- proto_tree_add_item(cap_tree, hf_pst_acm, tvb, local_offset, pst_acm_length, FALSE);
- }
- if (pst_contents & WAVE_ACF) {
- local_offset +=32;
- }
- if (pst_contents & WAVE_PRIORITY) {
- proto_tree_add_item(cap_tree, hf_pst_priority, tvb, local_offset, 1, TRUE);
- local_offset++;
- }
- if (pst_contents & WAVE_IPV6ADDR) {
- proto_tree_add_item(cap_tree, hf_pst_ipv6addr, tvb, local_offset, 16, FALSE);
- local_offset +=16;
- proto_tree_add_item(cap_tree, hf_pst_serviceport, tvb, local_offset, 2, FALSE);
- local_offset +=2;
- proto_tree_add_item(cap_tree, hf_pst_addressing, tvb, local_offset, 1, FALSE);
- local_offset++;
- }
- if (pst_contents & WAVE_PEERMAC) {
- proto_tree_add_item(cap_tree, hf_pst_macaddr, tvb, local_offset, 6, FALSE);
- local_offset +=6;
- }
- if (pst_contents & WAVE_CHANNEL) {
- proto_tree_add_item(cap_tree, hf_pst_channel, tvb, local_offset, 1, FALSE);
- local_offset++;
- }
-
- offset = offset + pst_length;
- }
-
- chan_noc = tvb_get_guint8 (tvb, offset);
- chan_noc_item = proto_tree_add_item(tree, hf_chan_noc, tvb, offset, 1, TRUE);
- chan_noc_tree = proto_item_add_subtree(chan_noc_item,ett_chan_noc_tree);
- offset++;
-
- if (chan_noc != 0){
- for (i=0;i<chan_noc;i++) {
- chan_length = tvb_get_guint8 (tvb, offset);
- chnl_item = proto_tree_add_text (chan_noc_tree, tvb, offset, chan_length, "Channel :%u Information ", i+1);
- chnl_tree = proto_item_add_subtree(chnl_item, ett_wave_chnl_tree);
- proto_tree_add_item(chnl_tree, hf_chan_length, tvb, offset, 1, TRUE);
- proto_tree_add_item(chnl_tree, hf_chan_content, tvb, offset+1, 1, TRUE);
- proto_tree_add_item(chnl_tree, hf_chan_channel, tvb, offset+2, 1, TRUE);
- proto_tree_add_item(chnl_tree, hf_chan_adapt, tvb, offset+3, 1, TRUE);
- proto_tree_add_item(chnl_tree, hf_chan_rate, tvb, offset+4, 1, TRUE);
- proto_tree_add_item(chnl_tree, hf_chan_tx_pow, tvb, offset+5, 1, TRUE);
- offset = offset + chan_length;
- }
- }
+ proto_item *pst_item, *cap_item, *chan_noc_item, *chnl_item;
+ proto_tree *pst_tree, *cap_tree, *chan_noc_tree, *chnl_tree;
+
+ guint8 providercount, pst_contents, pst_acm_length;
+ int i;
+ guint16 pst_length = 0;
+ guint16 chan_noc;
+ guint8 chan_length = 0;
+ int local_offset;
+
+ proto_tree_add_item(tree, hf_ieee80211_pst_timingquality, tvb, offset, 2, TRUE);
+ offset+=2;
+
+ providercount = tvb_get_guint8 (tvb, offset);
+ pst_item = proto_tree_add_item(tree, hf_ieee80211_pst_providercount, tvb, offset, 1, TRUE);
+ pst_tree = proto_item_add_subtree(pst_item, ett_pst_tree);
+ offset++;
+
+ for (i=0;i<providercount;i++) {
+
+ local_offset = offset;
+ cap_item = proto_tree_add_item(pst_tree, hf_ieee80211_pst_providercap, tvb, local_offset, 0, TRUE);
+ proto_item_append_text(cap_item, ": %u", i+1);
+ cap_tree = proto_item_add_subtree(cap_item, ett_pst_cap_tree);
+
+ pst_length = tvb_get_letohl(tvb, local_offset);
+ proto_item_set_len(cap_item, pst_length);
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_length, tvb, local_offset, 2, TRUE);
+ local_offset += 2;
+
+ pst_contents = tvb_get_guint8 (tvb, local_offset);
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_contents, tvb, local_offset, 1, TRUE);
+ local_offset += 1;
+
+ if (pst_contents & WAVE_ACID) {
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_acid, tvb, local_offset, 1, TRUE);
+ local_offset += 1;
+ }
+
+ if (pst_contents & WAVE_ACM) {
+ pst_acm_length = tvb_get_guint8 (tvb, local_offset);
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_acm_length, tvb, local_offset, 1, TRUE);
+ local_offset += 1;
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_acm_contents, tvb, local_offset, pst_acm_length, FALSE);
+ local_offset += pst_acm_length;
+ }
+ if (pst_contents & WAVE_ACF) {
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_acf, tvb, local_offset, 32, FALSE);
+ local_offset += 32;
+ }
+ if (pst_contents & WAVE_PRIORITY) {
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_priority, tvb, local_offset, 1, TRUE);
+ local_offset += 1;
+ }
+ if (pst_contents & WAVE_IPV6ADDR) {
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_ipv6addr, tvb, local_offset, 16, FALSE);
+ local_offset += 16;
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_serviceport, tvb, local_offset, 2, FALSE);
+ local_offset += 2;
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_addressing, tvb, local_offset, 1, FALSE);
+ local_offset += 1;
+ }
+ if (pst_contents & WAVE_PEERMAC) {
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_macaddr, tvb, local_offset, 6, FALSE);
+ local_offset += 6;
+ }
+ if (pst_contents & WAVE_CHANNEL) {
+ proto_tree_add_item(cap_tree, hf_ieee80211_pst_channel, tvb, local_offset, 1, FALSE);
+ local_offset += 1;
+ }
+
+ offset = offset + pst_length;
+ }
+
+ chan_noc = tvb_get_guint8 (tvb, offset);
+ chan_noc_item = proto_tree_add_item(tree, hf_ieee80211_chan_noc, tvb, offset, 1, TRUE);
+ chan_noc_tree = proto_item_add_subtree(chan_noc_item,ett_chan_noc_tree);
+ offset++;
+
+ if (chan_noc != 0){
+ for (i=0;i<chan_noc;i++) {
+ chan_length = tvb_get_guint8 (tvb, offset);
+ chnl_item = proto_tree_add_text (chan_noc_tree, tvb, offset, chan_length, "Channel :%u Information ", i+1);
+ chnl_tree = proto_item_add_subtree(chnl_item, ett_wave_chnl_tree);
+ proto_tree_add_item(chnl_tree, hf_ieee80211_chan_length, tvb, offset, 1, TRUE);
+ proto_tree_add_item(chnl_tree, hf_ieee80211_chan_content, tvb, offset+1, 1, TRUE);
+ proto_tree_add_item(chnl_tree, hf_ieee80211_chan_channel, tvb, offset+2, 1, TRUE);
+ proto_tree_add_item(chnl_tree, hf_ieee80211_chan_adapt, tvb, offset+3, 1, TRUE);
+ proto_tree_add_item(chnl_tree, hf_ieee80211_chan_rate, tvb, offset+4, 1, TRUE);
+ proto_tree_add_item(chnl_tree, hf_ieee80211_chan_tx_pow, tvb, offset+5, 1, TRUE);
+ offset = offset + chan_length;
+ }
+ }
}
+#endif /* MESH_OVERRIDES */
-/*** Begin: Secondary Channel Offset Tag - Dustin Johnson ***/
static void secondary_channel_offset_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len)
{
int tag_offset;
}
tag_offset = offset;
- proto_tree_add_uint(tree, hf_tag_secondary_channel_offset, tvb, offset, 1, tvb_get_guint8 (tvb, offset));
+ proto_tree_add_uint(tree, hf_ieee80211_tag_secondary_channel_offset, tvb, offset, 1, tvb_get_guint8 (tvb, offset));
offset++;
if ((tag_len - (offset-tag_offset)) > 0)
return;
}
}
-/*** End: Secondary Channel Offset Tag - Dustin Johnson ***/
static void
dissect_ht_capability_ie(proto_tree * tree, tvbuff_t * tvb, int offset,
guint32 tag_val_off = 0;
if (tag_val_off + 2 > tag_len) {
- proto_tree_add_string(tree, tag_interpretation, tvb, offset, tag_len,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
"Not interpreted");
return;
}
if (tag_len != 26) {
- proto_tree_add_string(tree, tag_interpretation, tvb, offset, tag_len,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
"HT Capabilities IE content length must be exactly 26 bytes");
return;
}
/* 2 byte HT Capabilities Info*/
capability = tvb_get_letohs (tvb, offset);
- cap_item = proto_tree_add_item(tree, vs ? ht_vs_cap : ht_cap, tvb,
- offset, 2, TRUE);
+ if(vs)
+ {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_ht_vs_cap, tvb, offset, 2, TRUE);
+ }
+ else
+ {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_ht_cap, tvb, offset, 2, TRUE);
+ }
cap_tree = proto_item_add_subtree(cap_item, ett_ht_cap_tree);
- proto_tree_add_boolean(cap_tree, ht_ldpc_coding, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_ldpc_coding, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_chan_width, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_chan_width, tvb, offset, 1,
capability);
- proto_tree_add_uint(cap_tree, ht_sm_pwsave, tvb, offset, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ht_sm_pwsave, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_green, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_green, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_short20, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_short20, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_short40, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_short40, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_tx_stbc, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_tx_stbc, tvb, offset, 1,
capability);
- proto_tree_add_uint(cap_tree, ht_rx_stbc, tvb, offset+1, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ht_rx_stbc, tvb, offset+1, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_delayed_block_ack, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_delayed_block_ack, tvb, offset+1, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_max_amsdu, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_max_amsdu, tvb, offset+1, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_dss_cck_40, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_dss_cck_40, tvb, offset+1, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_psmp, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_psmp, tvb, offset+1, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_40_mhz_intolerant, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_40_mhz_intolerant, tvb, offset+1, 1,
capability);
- proto_tree_add_boolean(cap_tree, ht_l_sig, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_ht_l_sig, tvb, offset+1, 1,
capability);
offset += 2;
/* 1 byte A-MPDU Parameters */
capability = tvb_get_guint8 (tvb, offset);
- cap_item = proto_tree_add_item(tree, vs ? ampduparam_vs : ampduparam, tvb,
- offset, 1, TRUE);
+ if(vs)
+ {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_ampduparam_vs, tvb, offset, 1, TRUE);
+ }else
+ {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_ampduparam, tvb, offset, 1, TRUE);
+ }
cap_tree = proto_item_add_subtree(cap_item, ett_ampduparam_tree);
- proto_tree_add_uint_format(cap_tree, ampduparam_mpdu, tvb, offset, 1, capability, decode_numeric_bitfield(capability, 0x03, 8,"Maximum Rx A-MPDU Length: %%04.0Lf [Bytes]"), pow(2,13+(capability & 0x3))-1);
- proto_tree_add_uint(cap_tree, ampduparam_mpdu_start_spacing, tvb, offset, 1, capability);
- proto_tree_add_uint(cap_tree, ampduparam_reserved, tvb, offset, 1, capability);
+ proto_tree_add_uint_format(cap_tree, hf_ieee80211_ampduparam_mpdu, tvb, offset, 1, capability,
+ "%sMaximum Rx A-MPDU Length: %04.0f [Bytes]",
+ decode_numeric_bitfield(capability, 0x03, 8, ""),
+ pow(2,13+(capability & 0x3))-1);
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ampduparam_mpdu_start_spacing, tvb, offset, 1, capability);
+ proto_tree_add_uint(cap_tree, hf_ieee80211_ampduparam_reserved, tvb, offset, 1, capability);
offset += 1;
tag_val_off += 1;
/* 2 byte HT Extended Capabilities */
capability = tvb_get_letohs (tvb, offset);
- cap_item = proto_tree_add_item(tree, vs ? htex_vs_cap : htex_cap, tvb,
- offset, 2, TRUE);
- cap_tree = proto_item_add_subtree(cap_item, ett_htex_cap_tree);
- proto_tree_add_boolean(cap_tree, htex_pco, tvb, offset, 1,
- capability);
- proto_tree_add_uint(cap_tree, htex_transtime, tvb, offset, 1,
+ if(vs)
+ {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_htex_vs_cap, tvb, offset, 2, TRUE);
+ } else {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_htex_cap, tvb, offset, 2, TRUE);
+ }
+ cap_tree = proto_item_add_subtree(cap_item, ett_htex_cap_tree);
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_htex_pco, tvb, offset, 1,
capability);
- proto_tree_add_uint(cap_tree, htex_mcs, tvb, offset+1, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_htex_transtime, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, htex_htc_support, tvb, offset+1, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_htex_mcs, tvb, offset+1, 1,
capability);
- proto_tree_add_boolean(cap_tree, htex_rd_responder, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_htex_htc_support, tvb, offset+1, 1,
+ capability);
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_htex_rd_responder, tvb, offset+1, 1,
capability);
offset += 2;
/* 4 byte TxBF capabilities */
txbfcap = tvb_get_letohl (tvb, offset);
- cap_item = proto_tree_add_item(tree, vs ? txbf_vs : txbf, tvb,
- offset, 4, TRUE);
+ if(vs)
+ {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_txbf_vs, tvb, offset, 4, TRUE);
+ } else {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_txbf, tvb, offset, 4, TRUE);
+ }
cap_tree = proto_item_add_subtree(cap_item, ett_txbf_tree);
- proto_tree_add_boolean(cap_tree, txbf_cap, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_txbf_cap, tvb, offset, 1,
txbfcap);
- proto_tree_add_boolean(cap_tree, txbf_rcv_ssc, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_txbf_rcv_ssc, tvb, offset, 1,
txbfcap);
- proto_tree_add_boolean(cap_tree, txbf_tx_ssc, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_txbf_tx_ssc, tvb, offset, 1,
txbfcap);
- proto_tree_add_boolean(cap_tree, txbf_rcv_ndp, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_txbf_rcv_ndp, tvb, offset, 1,
txbfcap);
- proto_tree_add_boolean(cap_tree, txbf_tx_ndp, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_txbf_tx_ndp, tvb, offset, 1,
txbfcap);
- proto_tree_add_boolean(cap_tree, txbf_impl_txbf, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_txbf_impl_txbf, tvb, offset, 1,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_calib, tvb, offset, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_calib, tvb, offset, 1,
txbfcap);
- proto_tree_add_boolean(cap_tree, txbf_expl_csi, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_txbf_expl_csi, tvb, offset+1, 1,
txbfcap);
- proto_tree_add_boolean(cap_tree, txbf_expl_uncomp_fm, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm, tvb, offset+1, 1,
txbfcap);
- proto_tree_add_boolean(cap_tree, txbf_expl_comp_fm, tvb, offset+1, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_txbf_expl_comp_fm, tvb, offset+1, 1,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_expl_bf_csi, tvb, offset+1, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_expl_bf_csi, tvb, offset+1, 1,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_expl_uncomp_fm_feed, tvb, offset+1, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm_feed, tvb, offset+1, 1,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_expl_comp_fm_feed, tvb, offset+1, 2,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_expl_comp_fm_feed, tvb, offset+1, 2,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_min_group, tvb, offset+2, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_min_group, tvb, offset+2, 1,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_csi_num_bf_ant, tvb, offset+2, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_csi_num_bf_ant, tvb, offset+2, 1,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_uncomp_sm_bf_ant, tvb, offset+2, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_uncomp_sm_bf_ant, tvb, offset+2, 1,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_comp_sm_bf_ant, tvb, offset+2, 2,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_comp_sm_bf_ant, tvb, offset+2, 2,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_csi_max_rows_bf, tvb, offset+3, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_csi_max_rows_bf, tvb, offset+3, 1,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_chan_est, tvb, offset+3, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_chan_est, tvb, offset+3, 1,
txbfcap);
- proto_tree_add_uint(cap_tree, txbf_resrv, tvb, offset+3, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_txbf_resrv, tvb, offset+3, 1,
txbfcap);
offset += 4;
/* 1 byte Antenna Selection (ASEL) capabilities */
capability = tvb_get_guint8 (tvb, offset);
- cap_item = proto_tree_add_item(tree, vs ? antsel_vs : antsel, tvb,
- offset, 1, TRUE);
+ if(vs)
+ {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_antsel_vs, tvb, offset, 1, TRUE);
+ }
+ else
+ {
+ cap_item = proto_tree_add_item(tree, hf_ieee80211_antsel, tvb, offset, 1, TRUE);
+ }
cap_tree = proto_item_add_subtree(cap_item, ett_antsel_tree);
- proto_tree_add_boolean(cap_tree, antsel_b0, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_antsel_b0, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, antsel_b1, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_antsel_b1, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, antsel_b2, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_antsel_b2, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, antsel_b3, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_antsel_b3, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, antsel_b4, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_antsel_b4, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, antsel_b5, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_antsel_b5, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, antsel_b6, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_antsel_b6, tvb, offset, 1,
capability);
- proto_tree_add_uint(cap_tree, antsel_b7, tvb, offset, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_antsel_b7, tvb, offset, 1,
capability);
offset += 1;
tag_val_off += 1;
-
- if (tag_val_off < tag_len)
- proto_tree_add_string(tree, tag_interpretation, tvb, offset,
- tag_len - tag_val_off, "Not interpreted");
}
static void
gchar out_buff[SHORT_STR];
if (tag_val_off + 2 > tag_len) {
- proto_tree_add_string(tree, tag_interpretation, tvb, offset, tag_len,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
"Not interpreted");
return;
}
if (tag_len < 22) {
- proto_tree_add_string(tree, tag_interpretation, tvb, offset, tag_len,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, tag_len,
"HT Additional Capabilities IE content length must be 22");
return;
}
g_snprintf(out_buff, SHORT_STR, "Control Channel %d",
tvb_get_guint8(tvb, offset));
- proto_tree_add_string(tree, tag_interpretation, tvb, offset, 1, out_buff);
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset, 1, out_buff);
offset += 1;
tag_val_off += 1;
/* 1 byte HT additional capabilities */
capability = tvb_get_guint8 (tvb, offset);
- cap_item = proto_tree_add_uint_format(tree, hta_cap, tvb,
+ cap_item = proto_tree_add_uint_format(tree, hf_ieee80211_hta_cap, tvb,
offset, 1, capability,
"HT Additional Capabilities: 0x%04X", capability);
cap_tree = proto_item_add_subtree(cap_item, ett_hta_cap_tree);
- proto_tree_add_uint(cap_tree, hta_ext_chan_offset, tvb, offset, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_hta_ext_chan_offset, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, hta_rec_tx_width, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_hta_rec_tx_width, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, hta_rifs_mode, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_hta_rifs_mode, tvb, offset, 1,
capability);
- proto_tree_add_boolean(cap_tree, hta_controlled_access, tvb, offset, 1,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_hta_controlled_access, tvb, offset, 1,
capability);
- proto_tree_add_uint(cap_tree, hta_service_interval, tvb, offset, 1,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_hta_service_interval, tvb, offset, 1,
capability);
offset += 1;
tag_val_off += 1;
/* 2 byte HT additional capabilities */
capability = tvb_get_letohs (tvb, offset);
- cap_item = proto_tree_add_uint_format(tree, hta_cap, tvb,
+ cap_item = proto_tree_add_uint_format(tree, hf_ieee80211_hta_cap, tvb,
offset, 2, capability,
"HT Additional Capabilities: 0x%04X", capability);
cap_tree = proto_item_add_subtree(cap_item, ett_hta_cap1_tree);
- proto_tree_add_uint(cap_tree, hta_operating_mode, tvb, offset, 2,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_hta_operating_mode, tvb, offset, 2,
capability);
- proto_tree_add_boolean(cap_tree, hta_non_gf_devices, tvb, offset, 2,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_hta_non_gf_devices, tvb, offset, 2,
capability);
offset += 2;
/* 2 byte HT additional capabilities */
capability = tvb_get_letohs (tvb, offset);
- cap_item = proto_tree_add_uint_format(tree, hta_cap, tvb,
+ cap_item = proto_tree_add_uint_format(tree, hf_ieee80211_hta_cap, tvb,
offset, 2, capability,
"HT Additional Capabilities: 0x%04X", capability);
cap_tree = proto_item_add_subtree(cap_item, ett_hta_cap2_tree);
- proto_tree_add_uint(cap_tree, hta_basic_stbc_mcs, tvb, offset, 2,
+ proto_tree_add_uint(cap_tree, hf_ieee80211_hta_basic_stbc_mcs, tvb, offset, 2,
capability);
- proto_tree_add_boolean(cap_tree, hta_dual_stbc_protection, tvb, offset, 2,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_hta_dual_stbc_protection, tvb, offset, 2,
capability);
- proto_tree_add_boolean(cap_tree, hta_secondary_beacon, tvb, offset, 2,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_hta_secondary_beacon, tvb, offset, 2,
capability);
- proto_tree_add_boolean(cap_tree, hta_lsig_txop_protection, tvb, offset, 2,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_hta_lsig_txop_protection, tvb, offset, 2,
capability);
- proto_tree_add_boolean(cap_tree, hta_pco_active, tvb, offset, 2,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_hta_pco_active, tvb, offset, 2,
capability);
- proto_tree_add_boolean(cap_tree, hta_pco_phase, tvb, offset, 2,
+ proto_tree_add_boolean(cap_tree, hf_ieee80211_hta_pco_phase, tvb, offset, 2,
capability);
offset += 2;
tag_val_off += 2;
tag_val_off += 16;
if (tag_val_off < tag_len)
- proto_tree_add_string(tree, tag_interpretation, tvb, offset,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tvb, offset,
tag_len - tag_val_off, "Not interpreted");
}
htc = tvb_get_letohs(tvb, offset);
- ti = proto_tree_add_item(tree, hf_htc, tvb, offset, 4, TRUE);
+ ti = proto_tree_add_item(tree, hf_ieee80211_htc, tvb, offset, 4, TRUE);
htc_tree = proto_item_add_subtree(ti, ett_htc_tree);
/* Start: Link Adaptation Control */
- ti = proto_tree_add_item(htc_tree, hf_htc_lac, tvb, offset, 2, TRUE);
+ ti = proto_tree_add_item(htc_tree, hf_ieee80211_htc_lac, tvb, offset, 2, TRUE);
lac_subtree = proto_item_add_subtree(ti, ett_htc_tree);
- proto_tree_add_item(lac_subtree, hf_htc_lac_reserved, tvb, offset, 1, htc);
- proto_tree_add_item(lac_subtree, hf_htc_lac_trq, tvb, offset, 1, TRUE);
+ proto_tree_add_item(lac_subtree, hf_ieee80211_htc_lac_reserved, tvb, offset, 1, htc);
+ proto_tree_add_item(lac_subtree, hf_ieee80211_htc_lac_trq, tvb, offset, 1, TRUE);
if (HTC_IS_ASELI(htc)) {
- proto_tree_add_uint(lac_subtree, hf_htc_lac_mai_aseli, tvb, offset, 1, htc);
+ proto_tree_add_uint(lac_subtree, hf_ieee80211_htc_lac_mai_aseli, tvb, offset, 1, htc);
} else {
- proto_tree_add_item(lac_subtree, hf_htc_lac_mai_mrq, tvb, offset, 1, TRUE);
+ proto_tree_add_item(lac_subtree, hf_ieee80211_htc_lac_mai_mrq, tvb, offset, 1, TRUE);
if (HTC_LAC_MAI_MRQ(htc)){
- proto_tree_add_uint(lac_subtree, hf_htc_lac_mai_msi, tvb, offset, 1, htc);
+ proto_tree_add_uint(lac_subtree, hf_ieee80211_htc_lac_mai_msi, tvb, offset, 1, htc);
} else {
- proto_tree_add_uint(lac_subtree, hf_htc_lac_mai_reserved, tvb, offset, 1, htc);
+ proto_tree_add_uint(lac_subtree, hf_ieee80211_htc_lac_mai_reserved, tvb, offset, 1, htc);
}
}
- proto_tree_add_uint(lac_subtree, hf_htc_lac_mfsi, tvb, offset, 2, htc);
+ proto_tree_add_uint(lac_subtree, hf_ieee80211_htc_lac_mfsi, tvb, offset, 2, htc);
offset++;
if (HTC_IS_ASELI(htc)) {
- proto_tree_add_uint(lac_subtree, hf_htc_lac_asel_command, tvb, offset, 1, htc);
- proto_tree_add_uint(lac_subtree, hf_htc_lac_asel_data, tvb, offset, 1, htc);
+ proto_tree_add_uint(lac_subtree, hf_ieee80211_htc_lac_asel_command, tvb, offset, 1, htc);
+ proto_tree_add_uint(lac_subtree, hf_ieee80211_htc_lac_asel_data, tvb, offset, 1, htc);
} else {
- proto_tree_add_uint(lac_subtree, hf_htc_lac_mfb, tvb, offset, 1, htc);
+ proto_tree_add_uint(lac_subtree, hf_ieee80211_htc_lac_mfb, tvb, offset, 1, htc);
}
/* End: Link Adaptation Control */
offset++;
htc = tvb_get_letohs(tvb, offset);
- proto_tree_add_uint(htc_tree, hf_htc_cal_pos, tvb, offset, 1, htc);
- proto_tree_add_uint(htc_tree, hf_htc_cal_seq, tvb, offset, 1, htc);
- proto_tree_add_uint(htc_tree, hf_htc_reserved1, tvb, offset, 1, htc);
- proto_tree_add_uint(htc_tree, hf_htc_csi_steering, tvb, offset, 1, htc);
+ proto_tree_add_uint(htc_tree, hf_ieee80211_htc_cal_pos, tvb, offset, 1, htc);
+ proto_tree_add_uint(htc_tree, hf_ieee80211_htc_cal_seq, tvb, offset, 1, htc);
+ proto_tree_add_uint(htc_tree, hf_ieee80211_htc_reserved1, tvb, offset, 1, htc);
+ proto_tree_add_uint(htc_tree, hf_ieee80211_htc_csi_steering, tvb, offset, 1, htc);
offset++;
- proto_tree_add_boolean(htc_tree, hf_htc_ndp_announcement, tvb, offset, 1, htc);
- proto_tree_add_uint(htc_tree, hf_htc_reserved2, tvb, offset, 1, htc);
- proto_tree_add_boolean(htc_tree, hf_htc_ac_constraint, tvb, offset, 1, htc);
- proto_tree_add_boolean(htc_tree, hf_htc_rdg_more_ppdu, tvb, offset, 1, htc);
+ proto_tree_add_boolean(htc_tree, hf_ieee80211_htc_ndp_announcement, tvb, offset, 1, htc);
+ proto_tree_add_uint(htc_tree, hf_ieee80211_htc_reserved2, tvb, offset, 1, htc);
+ proto_tree_add_boolean(htc_tree, hf_ieee80211_htc_ac_constraint, tvb, offset, 1, htc);
+ proto_tree_add_boolean(htc_tree, hf_ieee80211_htc_rdg_more_ppdu, tvb, offset, 1, htc);
}
static void
flags = FCF_FLAGS(fcf);
frame_type_subtype = COMPOSE_FRAME_TYPE(fcf);
- proto_tree_add_uint (tree, hf_fc_frame_type_subtype,
+ proto_tree_add_uint (tree, hf_ieee80211_fc_frame_type_subtype,
tvb, wlan_broken_fc?offset+1:offset, 1,
frame_type_subtype);
- fc_item = proto_tree_add_uint_format (tree, hf_fc_field, tvb,
+ fc_item = proto_tree_add_uint_format (tree, hf_ieee80211_fc_field, tvb,
offset, 2, fcf, "Frame Control: 0x%04X (%s)",
fcf, wlan_broken_fc?"Swapped":"Normal");
fc_tree = proto_item_add_subtree (fc_item, ett_fc_tree);
- proto_tree_add_uint (fc_tree, hf_fc_proto_version, tvb, wlan_broken_fc?offset+1:offset, 1,
+ proto_tree_add_uint (fc_tree, hf_ieee80211_fc_proto_version, tvb, wlan_broken_fc?offset+1:offset, 1,
FCF_PROT_VERSION (fcf));
- proto_tree_add_uint (fc_tree, hf_fc_frame_type, tvb, wlan_broken_fc?offset+1:offset, 1,
+ proto_tree_add_uint (fc_tree, hf_ieee80211_fc_frame_type, tvb, wlan_broken_fc?offset+1:offset, 1,
FCF_FRAME_TYPE (fcf));
- proto_tree_add_uint (fc_tree, hf_fc_frame_subtype, tvb, wlan_broken_fc?offset+1:offset, 1,
+ proto_tree_add_uint (fc_tree, hf_ieee80211_fc_frame_subtype, tvb, wlan_broken_fc?offset+1:offset, 1,
FCF_FRAME_SUBTYPE (fcf));
- flag_item = proto_tree_add_uint_format (fc_tree, hf_fc_flags, tvb,
+ flag_item = proto_tree_add_uint_format (fc_tree, hf_ieee80211_fc_flags, tvb,
wlan_broken_fc?offset:offset+1, 1,
flags, "Flags: 0x%X", flags);
flag_tree = proto_item_add_subtree (flag_item, ett_proto_flags);
- proto_tree_add_uint (flag_tree, hf_fc_data_ds, tvb, wlan_broken_fc?offset:offset+1, 1,
+ proto_tree_add_uint (flag_tree, hf_ieee80211_fc_data_ds, tvb, wlan_broken_fc?offset:offset+1, 1,
FLAGS_DS_STATUS (flags));
- hidden_item = proto_tree_add_boolean (flag_tree, hf_fc_to_ds, tvb, offset+1, 1, flags);
+ hidden_item = proto_tree_add_boolean (flag_tree, hf_ieee80211_fc_to_ds, tvb, offset+1, 1, flags);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- hidden_item = proto_tree_add_boolean (flag_tree, hf_fc_from_ds, tvb, offset+1, 1, flags);
+ hidden_item = proto_tree_add_boolean (flag_tree, hf_ieee80211_fc_from_ds, tvb, offset+1, 1, flags);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- proto_tree_add_boolean (flag_tree, hf_fc_more_frag, tvb, wlan_broken_fc?offset:offset+1, 1,
+ proto_tree_add_boolean (flag_tree, hf_ieee80211_fc_more_frag, tvb, wlan_broken_fc?offset:offset+1, 1,
flags);
- proto_tree_add_boolean (flag_tree, hf_fc_retry, tvb, wlan_broken_fc?offset:offset+1, 1,
+ proto_tree_add_boolean (flag_tree, hf_ieee80211_fc_retry, tvb, wlan_broken_fc?offset:offset+1, 1,
flags);
- proto_tree_add_boolean (flag_tree, hf_fc_pwr_mgt, tvb, wlan_broken_fc?offset:offset+1, 1,
+ proto_tree_add_boolean (flag_tree, hf_ieee80211_fc_pwr_mgt, tvb, wlan_broken_fc?offset:offset+1, 1,
flags);
- proto_tree_add_boolean (flag_tree, hf_fc_more_data, tvb, wlan_broken_fc?offset:offset+1, 1,
+ proto_tree_add_boolean (flag_tree, hf_ieee80211_fc_more_data, tvb, wlan_broken_fc?offset:offset+1, 1,
flags);
- proto_tree_add_boolean (flag_tree, hf_fc_protected, tvb, wlan_broken_fc?offset:offset+1, 1,
+ proto_tree_add_boolean (flag_tree, hf_ieee80211_fc_protected, tvb, wlan_broken_fc?offset:offset+1, 1,
flags);
- proto_tree_add_boolean (flag_tree, hf_fc_order, tvb, wlan_broken_fc?offset:offset+1, 1,
+ proto_tree_add_boolean (flag_tree, hf_ieee80211_fc_order, tvb, wlan_broken_fc?offset:offset+1, 1,
flags);
}
{
gint tag_len = tvb_length(tag_tvb);
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, 0, 3, "802.11n (Pre) OUI");
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, 0, 3, "802.11n (Pre) OUI");
/* 802.11n OUI Information Element */
if (4 <= tag_len && !tvb_memeql(tag_tvb, 0, PRE_11N_OUI"\x33", 4)) {
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, 3, 1,"802.11n (Pre) HT information" );
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, 3, 1,"802.11n (Pre) HT information" );
dissect_ht_capability_ie(tree, tag_tvb, 4, tag_len - 4, TRUE);
proto_item_append_text(item, ": HT Capabilities (802.11n D1.10)");
}
else {
if (4 <= tag_len && !tvb_memeql(tag_tvb, 0, PRE_11N_OUI"\x34", 4)) {
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, 3, 1, "HT additional information (802.11n D1.00)");
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, 3, 1, "HT additional information (802.11n D1.00)");
dissect_ht_info_ie_1_0(tree, tag_tvb, 4, tag_len - 4);
proto_item_append_text(item, ": HT Additional Capabilities (802.11n D1.00)");
}
else {
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, 3, 1, "Unknown type");
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, 3, 1, "Unknown type");
proto_item_append_text(item, ": 802.11n (pre) Unknown type");
- proto_tree_add_string(tree, tag_interpretation, tag_tvb, 4,
+ proto_tree_add_string(tree, hf_ieee80211_tag_interpretation, tag_tvb, 4,
tag_len - 4, "Not interpreted");
}
}
/* Dissect and add tagged (optional) fields to proto tree */
/* ************************************************************************* */
-static const value_string tag_num_vals[] = {
- { TAG_SSID, "SSID parameter set" },
- { TAG_SUPP_RATES, "Supported Rates" },
- { TAG_FH_PARAMETER, "FH Parameter set" },
- { TAG_DS_PARAMETER, "DS Parameter set" },
- { TAG_CF_PARAMETER, "CF Parameter set" },
- { TAG_TIM, "Traffic Indication Map (TIM)" },
- { TAG_IBSS_PARAMETER, "IBSS Parameter set" },
- { TAG_COUNTRY_INFO, "Country Information" },
- { TAG_FH_HOPPING_PARAMETER, "Hopping Pattern Parameters" },
- { TAG_CHALLENGE_TEXT, "Challenge text" },
- { TAG_ERP_INFO, "ERP Information" },
- { TAG_ERP_INFO_OLD, "ERP Information" },
- { TAG_RSN_IE, "RSN Information" },
- { TAG_EXT_SUPP_RATES, "Extended Supported Rates" },
- { TAG_CISCO_CCX1_CKIP, "Cisco CCX1 CKIP + Device Name" },
- { TAG_CISCO_UNKNOWN_88, "Cisco Unknown 88" },
- { TAG_CISCO_UNKNOWN_95, "Cisco Unknown 95" },
- { TAG_CISCO_UNKNOWN_96, "Cisco Unknown 96" },
- { TAG_VENDOR_SPECIFIC_IE, "Vendor Specific" },
- { TAG_SYMBOL_PROPRIETARY, "Symbol Proprietary"},
- { TAG_AGERE_PROPRIETARY, "Agere Proprietary"},
- { TAG_REQUEST, "Request"},
- { TAG_QBSS_LOAD, "QBSS Load Element"},
- { TAG_EDCA_PARAM_SET, "EDCA Parameter Set"},
- { TAG_TSPEC, "Traffic Specification"},
- { TAG_TCLAS, "Traffic Classification"},
- { TAG_SCHEDULE, "Schedule"},
- { TAG_TS_DELAY, "TS Delay"},
- { TAG_TCLAS_PROCESS, "TCLAS Processing"},
- { TAG_HT_CAPABILITY, "HT Capabilities (802.11n D1.10)"},
- { TAG_NEIGHBOR_REPORT, "Neighbor Report"},
- { TAG_HT_INFO, "HT Information (802.11n D1.10)"},
- { TAG_SECONDARY_CHANNEL_OFFSET, "Secondary Channel Offset (802.11n D1.10)"},
- { TAG_WSIE, "Wave Service Information"}, /* www.aradasystems.com */
- { TAG_20_40_BSS_CO_EX, "20/40 BSS Coexistence"},
- { TAG_20_40_BSS_INTOL_CH_REP, "20/40 BSS Intolerant Channel Report"}, /* IEEE P802.11n/D6.0 */
- { TAG_OVERLAP_BSS_SCAN_PAR, "Overlapping BSS Scan Parameters"}, /* IEEE P802.11n/D6.0 */
- { TAG_QOS_CAPABILITY, "QoS Capability"},
- { TAG_POWER_CONSTRAINT, "Power Constraint"},
- { TAG_POWER_CAPABILITY, "Power Capability"},
- { TAG_TPC_REQUEST, "TPC Request"},
- { TAG_TPC_REPORT, "TPC Report"},
- { TAG_SUPPORTED_CHANNELS, "Supported Channels"},
- { TAG_CHANNEL_SWITCH_ANN, "Channel Switch Announcement"},
- { TAG_MEASURE_REQ, "Measurement Request"},
- { TAG_MEASURE_REP, "Measurement Report"},
- { TAG_QUIET, "Quiet"},
- { TAG_IBSS_DFS, "IBSS DFS"},
- { TAG_EXTENDED_CAPABILITIES, "Extended Capabilities"},
- #if 0 /*Not yet assigned tag numbers by ANA */
- { TAG_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT, "Extended Channel Switch Announcement"},
- { TAG_SUPPORTED_REGULATORY_CLASSES, "Supported Regulatory Classes"},
- #endif
- { 0, NULL }
-};
+
static const value_string environment_vals[] = {
{ 0x20, "Any" },
static int beacon_padding = 0; /* beacon padding bug */
static int
-add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int offset)
+add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int offset)
{
guint32 oui;
tvbuff_t *tag_tvb;
const guint8 *tag_data_ptr;
guint32 tag_no, tag_len;
- unsigned int i;
int n, ret;
char out_buff[SHORT_STR];
char print_buff[SHORT_STR];
proto_tree * orig_tree=tree;
- proto_item *ti = NULL, *en;
+ proto_item *ti = NULL, *ti_len = NULL;
+ int tag_end;
guint8 tag_len_len; /* The length of the length parameter in bytes*/
tag_no = tvb_get_guint8(tvb, offset);
+#ifndef MESH_OVERRIDES
if(tag_no == TAG_WSIE){
- tag_len_len = 2;
- tag_len = tvb_get_letohl(tvb, offset + 1);
- }else{
- tag_len_len = 1;
- tag_len = tvb_get_guint8(tvb, offset + 1);
+ tag_len_len = 2;
+ tag_len = tvb_get_letohl(tvb, offset + 1);
+ } else
+#endif /* MESH_OVERRIDES */
+ {
+ tag_len_len = 1;
+ tag_len = tvb_get_guint8(tvb, offset + 1);
}
-
+ tag_end = offset + 2 + tag_len;
if (tree) {
- ti=proto_tree_add_text(orig_tree,tvb,offset,tag_len+1+tag_len_len,"%s",
- val_to_str(tag_no, tag_num_vals,
- (tag_no >= 17 && tag_no <= 31) ?
- "Reserved for challenge text" : "Reserved tag number" ));
- tree=proto_item_add_subtree(ti,ett_80211_mgt_ie);
-
- proto_tree_add_uint_format (tree, tag_number, tvb, offset, 1, tag_no,
- "Tag Number: %u (%s)",
- tag_no,
- val_to_str(tag_no, tag_num_vals,
- (tag_no >= 17 && tag_no <= 31) ?
- "Reserved for challenge text" :
- "Reserved tag number"));
+ ti = proto_tree_add_item(orig_tree, hf_ieee80211_tag, tvb, offset, 2 + tag_len , FALSE);
+ proto_item_append_text(ti, ": %s", rval_to_str(tag_no, tag_num_vals, "Reserved tag Number"));
+
+ tree = proto_item_add_subtree(ti, ett_80211_mgt_ie);
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_number, tvb, offset, 1, FALSE);
+
}
- proto_tree_add_uint (tree, (tag_no==TAG_TIM ? tim_length : tag_length), tvb, offset + 1, tag_len_len, tag_len);
+ ti_len = proto_tree_add_uint(tree, hf_ieee80211_tag_length, tvb, offset + 1, tag_len_len, tag_len);
switch (tag_no)
{
- case TAG_SSID:
+ case TAG_SSID: /* 7.3.2.1 SSID element (0) */
if(beacon_padding == 0) /* padding bug */
{
guint8 *ssid; /* The SSID may consist of arbitrary bytes */
+ if(tag_len > MAX_SSID_LEN) {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR,
+ "SSID length (%u) greater than maximum (%u)",
+ tag_len, MAX_SSID_LEN);
+ }
+
ssid = tvb_get_ephemeral_string(tvb, offset + 2, tag_len);
#ifdef HAVE_AIRPDCAP
AirPDcapSetLastSSID(&airpdcap_ctx, (CHAR *) ssid, tag_len);
#endif
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
- tag_len, (char *) ssid);
- if (check_col (pinfo->cinfo, COL_INFO)) {
- if (tag_len > 0) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", SSID=\"%s\"",
- format_text(ssid, tag_len));
- } else {
- col_append_str(pinfo->cinfo, COL_INFO, ", SSID=Broadcast");
- }
- }
+ proto_tree_add_item(tree, hf_ieee80211_tag_ssid, tvb, offset + 2, tag_len, FALSE);
if (tag_len > 0) {
- proto_item_append_text(ti, ": \"%s\"",
- format_text(ssid, tag_len));
- memcpy(wlan_stats.ssid, ssid, MAX_SSID_LEN);
+ proto_item_append_text(ti, ": %s", ssid);
+
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", SSID=%s", ssid );
+
+ /* Wlan Stats */
+ memcpy(wlan_stats.ssid, ssid, MIN(tag_len, MAX_SSID_LEN));
wlan_stats.ssid_len = tag_len;
} else {
proto_item_append_text(ti, ": Broadcast");
+
+ col_append_str(pinfo->cinfo, COL_INFO, ", SSID=Broadcast");
}
- en = proto_tree_add_string_format (tree, hf_tagged_ssid, tvb, offset + 2,
- tag_len, format_text(ssid, tag_len),
- "SSID: %s", format_text(ssid, tag_len));
- PROTO_ITEM_SET_HIDDEN (en);
+
beacon_padding++; /* padding bug */
}
break;
- case TAG_SUPP_RATES:
- case TAG_EXT_SUPP_RATES:
- if (tag_len < 1)
+ case TAG_SUPP_RATES: /* 7.3.2.2 Supported Rates element (1) */
+ if(tag_len < 1)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "Tag length %u too short, must be greater than 0", tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be greater than 0", tag_len);
break;
}
+ offset += 2;
- tag_data_ptr = tvb_get_ptr (tvb, offset + 2, tag_len);
- for (i = 0, n = 0; i < tag_len && n < SHORT_STR; i++) {
- if (tag_data_ptr[i] == 0xFF){
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2 + i,
- 1, "BSS requires support for mandatory features of HT PHY (IEEE 802.11 - Clause 20)");
- } else {
- ret = g_snprintf (print_buff + n, SHORT_STR - n, "%2.1f%s ",
- (tag_data_ptr[i] & 0x7F) * 0.5,
- (tag_data_ptr[i] & 0x80) ? "(B)" : "");
- if (ret >= SHORT_STR - n) {
- /* ret = <buf_size> or greater. means buffer truncated */
- break;
- }
- n += ret;
- }
+ while(offset < tag_end)
+ {
+ proto_tree_add_item(tree, hf_ieee80211_tag_supp_rates, tvb, offset, 1, FALSE);
+ proto_item_append_text(ti, " %s,", val_to_str(tvb_get_guint8(tvb, offset), ieee80211_supported_rates_vals, "Unknown Rate") );
+ offset += 1;
}
- g_snprintf (out_buff, SHORT_STR, "Supported rates: %s [Mbit/sec]", print_buff);
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
- tag_len, out_buff);
- proto_item_append_text(ti, ": %s", print_buff);
+ proto_item_append_text(ti, " [Mbit/sec]");
break;
- case TAG_FH_PARAMETER:
- if (tag_len < 5)
+ case TAG_FH_PARAMETER: /* 7.3.2.3 FH Parameter Set element (2) */
+ if(tag_len < 5)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 5",
- tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be >= 5", tag_len);
break;
}
- g_snprintf (out_buff, SHORT_STR,
- "Dwell time 0x%04X, Hop Set %2d, Hop Pattern %2d, Hop Index %2d",
- tvb_get_letohs(tvb, offset + 2),
- tvb_get_guint8(tvb, offset + 4),
- tvb_get_guint8(tvb, offset + 5),
- tvb_get_guint8(tvb, offset + 6));
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
- tag_len, out_buff);
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_dwell_time, tvb, offset, 2, TRUE);
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hop_set, tvb, offset, 1, TRUE);
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hop_pattern, tvb, offset, 1, TRUE);
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hop_index, tvb, offset, 1, TRUE);
+ offset += 1;
break;
- case TAG_DS_PARAMETER:
- if (tag_len < 1)
+ case TAG_DS_PARAMETER: /* 7.3.2.4 DS Parameter Set element (3) */
+ if(tag_len != 1)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 1",
- tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u wrong, must be = 1", tag_len);
break;
}
- g_snprintf (out_buff, SHORT_STR, "Current Channel: %u",
- tvb_get_guint8(tvb, offset + 2));
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
- tag_len, out_buff);
- proto_item_append_text(ti, ": %s", out_buff);
- wlan_stats.channel = tvb_get_guint8(tvb, offset + 2);
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_ds_param_channel, tvb, offset , 1, FALSE);
+
+ proto_item_append_text(ti, " : Current Channel: %u", tvb_get_guint8(tvb, offset));
+
+ wlan_stats.channel = tvb_get_guint8(tvb, offset);
break;
- case TAG_CF_PARAMETER:
- if (tag_len < 6)
+ case TAG_CF_PARAMETER: /* 7.3.2.5 CF Parameter Set element (4) */
+ if(tag_len != 6)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 6",
- tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u wrong, must be = 6", tag_len);
break;
}
- g_snprintf (out_buff, SHORT_STR, "CFP count: %u",
- tvb_get_guint8(tvb, offset + 2));
- proto_tree_add_string_format(tree, tag_interpretation, tvb, offset + 2,
- 1, out_buff, "%s", out_buff);
- g_snprintf (out_buff, SHORT_STR, "CFP period: %u",
- tvb_get_guint8(tvb, offset + 3));
- proto_tree_add_string_format(tree, tag_interpretation, tvb, offset + 3,
- 1, out_buff, "%s", out_buff);
- g_snprintf (out_buff, SHORT_STR, "CFP max duration: %u",
- tvb_get_letohs(tvb, offset + 4));
- proto_tree_add_string_format(tree, tag_interpretation, tvb, offset + 4,
- 2, out_buff, "%s", out_buff);
- g_snprintf (out_buff, SHORT_STR, "CFP Remaining: %u",
- tvb_get_letohs(tvb, offset + 6));
- proto_tree_add_string_format(tree, tag_interpretation, tvb, offset + 6,
- 2, out_buff, "%s", out_buff);
- proto_item_append_text(ti, ": CFP count %u, CFP period %u, CFP max duration %u, "
- "CFP Remaining %u",
- tvb_get_guint8(tvb, offset + 2),
- tvb_get_guint8(tvb, offset + 3),
- tvb_get_letohs(tvb, offset + 4),
- tvb_get_letohs(tvb, offset + 6));
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_cfp_count, tvb, offset , 1, FALSE);
+ proto_item_append_text(ti, ": CFP count %u", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_cfp_period, tvb, offset , 1, FALSE);
+ proto_item_append_text(ti, ": CFP Period %u", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_cfp_max_duration, tvb, offset , 2, TRUE);
+ proto_item_append_text(ti, ": CFP Max Duration %u", tvb_get_letohs(tvb, offset));
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_cfp_dur_remaining, tvb, offset , 2, TRUE);
+ proto_item_append_text(ti, ": CFP Dur Remaining %u", tvb_get_letohs(tvb, offset));
+ offset += 2;
break;
- case TAG_TIM:
+ case TAG_TIM: /* 7.3.2.6 TIM (5) */
+ {
+ proto_tree *bmapctl_tree;
+ proto_item *bmapctl_item;
if (tag_len < 4)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 4",
- tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be >= 4", tag_len);
break;
}
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tim_dtim_count, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, ": DTIM %u of", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tim_dtim_period, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, " %u bitmap", tvb_get_guint8(tvb, offset + 1));
+ offset += 1;
+
+ bmapctl_item = proto_tree_add_item(tree, hf_ieee80211_tim_bmapctl, tvb, offset, 1, TRUE);
+ bmapctl_tree = proto_item_add_subtree(bmapctl_item, ett_tag_bmapctl_tree);
+ proto_tree_add_item(bmapctl_tree, hf_ieee80211_tim_bmapctl_mcast, tvb, offset, 1, TRUE);
+ proto_tree_add_item(bmapctl_tree, hf_ieee80211_tim_bmapctl_offset, tvb, offset, 1, TRUE);
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tim_partial_virtual_bitmap, tvb, offset, tag_len - 3, TRUE);
+
+ break;
+ }
+ case TAG_IBSS_PARAMETER: /* 7.3.2.7 IBSS Parameter Set element (6) */
+ if(tag_len != 2)
{
- guint8 bmapctl;
- guint8 bmapoff;
- guint8 bmaplen;
- const guint8* bmap;
-
- proto_tree_add_item(tree, tim_dtim_count, tvb,
- offset + 2, 1, TRUE);
- proto_tree_add_item(tree, tim_dtim_period, tvb,
- offset + 3, 1, TRUE);
- proto_item_append_text(ti, ": DTIM %u of %u bitmap",
- tvb_get_guint8(tvb, offset + 2),
- tvb_get_guint8(tvb, offset + 3));
-
- bmapctl = tvb_get_guint8(tvb, offset + 4);
- bmapoff = bmapctl>>1;
- proto_tree_add_uint_format(tree, tim_bmapctl, tvb,
- offset + 4, 1, bmapctl,
- "Bitmap Control: 0x%02X (mcast:%u, bitmap offset %u)",
- bmapctl, bmapctl&1, bmapoff);
-
- bmaplen = tag_len - 3;
- bmap = tvb_get_ptr(tvb, offset + 5, bmaplen);
- if (bmaplen==1 && 0==bmap[0] && !(bmapctl&1)) {
- proto_item_append_text(ti, " empty");
- } else {
- if (bmapctl&1) {
- proto_item_append_text(ti, " mcast");
- }
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u wrong, must be = 2", tag_len);
+ break;
+ }
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_ibss_atim_window, tvb, offset, 2, TRUE);
+ proto_item_append_text(ti, ": ATIM window 0x%x", tvb_get_letohs(tvb, offset));
+
+ break;
+ case TAG_COUNTRY_INFO: /* 7.3.2.9 Country information element (7) */
+ {
+ proto_tree *sub_tree;
+ proto_item *sub_item;
+ if (tag_len < 6)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be >= 6", tag_len);
+ break;
}
- if (bmaplen>1 || bmap[0]) {
- int len=g_snprintf (out_buff, SHORT_STR,
- "Bitmap: traffic for AID's:");
- int i=0;
- for (i=0;i<bmaplen*8;i++) {
- if (bmap[i/8] & (1<<(i%8))) {
- int aid=i+2*bmapoff*8;
- len+=g_snprintf (out_buff+len, SHORT_STR-len," %u", aid);
- proto_item_append_text(ti, " %u", aid);
- if (len>=SHORT_STR) {
- break;
- }
- }
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_country_info_code, tvb, offset, 2, FALSE);
+ proto_item_append_text(ti, ": Country Code %s", tvb_get_ephemeral_string(tvb, offset, 2));
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_country_info_env, tvb, offset, 1, FALSE);
+ proto_item_append_text(ti, ", Environment %s", val_to_str(tvb_get_guint8(tvb, offset), environment_vals,"Unknown (0x%02x)"));
+ offset += 1;
+
+ while(offset < tag_end)
+ {
+ if(tvb_get_guint8(tvb, offset) <= 200) { /* 802.11d */
+ sub_item = proto_tree_add_item(tree, hf_ieee80211_tag_country_info_fnm, tvb, offset, 3, FALSE);
+ sub_tree = proto_item_add_subtree(sub_item, ett_tag_country_fnm_tree);
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_fnm_fcn, tvb, offset, 1, FALSE);
+ proto_item_append_text(sub_item, ": First Channel Number: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_fnm_nc, tvb, offset, 1, FALSE);
+ proto_item_append_text(sub_item, ", Number of Channels: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_fnm_mtpl, tvb, offset, 1, FALSE);
+ proto_item_append_text(sub_item, ", Maximum Transmit Power Level: %d dBm", tvb_get_guint8(tvb, offset));
+ offset += 1;
+ } else { /* 802.11j */
+ sub_item = proto_tree_add_item(tree, hf_ieee80211_tag_country_info_rrc, tvb, offset, 3, FALSE);
+ sub_tree = proto_item_add_subtree(sub_item, ett_tag_country_rcc_tree);
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_rrc_rei, tvb, offset, 1, FALSE);
+ proto_item_append_text(sub_item, ": Regulatory Extension Identifier: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_rrc_rc, tvb, offset, 1, FALSE);
+ proto_item_append_text(sub_item, ", Regulatory Class: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_rrc_cc, tvb, offset, 1, FALSE);
+ proto_item_append_text(sub_item, ", Coverage Class: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
}
- proto_tree_add_string_format (tree, tag_interpretation, tvb, offset + 5,
- bmaplen, out_buff, "%s", out_buff);
+
}
+
}
break;
- case TAG_IBSS_PARAMETER:
+ case TAG_FH_HOPPING_PARAMETER: /* 7.3.2.10 Hopping Pattern Parameters information element (8) */
if (tag_len < 2)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 2",
- tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be >= 2", tag_len);
break;
}
- g_snprintf (out_buff, SHORT_STR, "ATIM window 0x%X",
- tvb_get_letohs(tvb, offset + 2));
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
- tag_len, out_buff);
- proto_item_append_text(ti, ": %s", out_buff);
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_parameter_prime_radix, tvb, offset, 1, FALSE);
+ proto_item_append_text(ti, ": Prime Radix: %u", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_parameter_nb_channels, tvb, offset, 1, FALSE);
+ proto_item_append_text(ti, ", Number of Channels: %u", tvb_get_guint8(tvb, offset));
+ offset += 1;
break;
- case TAG_COUNTRY_INFO: /* IEEE 802.11d-2001 and IEEE 802.11j-2004 */
+ case TAG_FH_HOPPING_TABLE: /* 7.3.2.11 Hopping Pattern Table information element (9) */
+ if (tag_len < 4)
{
- guint8 ccode[2+1];
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be >= 4", tag_len);
+ break;
+ }
+ offset += 2;
- if (tag_len < 3)
- {
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 3",
- tag_len);
- break;
- }
- tvb_memcpy(tvb, ccode, offset + 2, 2);
- ccode[2] = '\0';
- g_snprintf (out_buff, SHORT_STR, "Country Code: %s, %s Environment",
- format_text(ccode, 2),
- val_to_str(tvb_get_guint8(tvb, offset + 4), environment_vals,"Unknown (0x%02x)"));
- proto_item_append_text(ti, ": %s", out_buff);
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,3, out_buff);
-
- for (i = 3; (i + 3) <= tag_len; i += 3)
- {
- guint8 val1, val2, val3;
- val1 = tvb_get_guint8(tvb, offset + 2 + i);
- val2 = tvb_get_guint8(tvb, offset + 3 + i);
- val3 = tvb_get_guint8(tvb, offset + 4 + i);
-
- if (val1 <= 200) { /* 802.11d */
- proto_tree_add_string_format(tree, tag_interpretation, tvb, offset + 2+i,3, out_buff,
- " Start Channel: %u, Channels: %u, Max TX Power: %d dBm",
- val1, val2, (gint) val3);
- } else { /* 802.11j */
- proto_tree_add_string_format(tree, tag_interpretation, tvb, offset + 2+i,3, out_buff,
- " Reg Extension Id: %u, Regulatory Class: %u, Coverage Class: %u",
- val1, val2, val3);
- }
- }
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_table_flag, tvb, offset, 1, FALSE);
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_table_number_of_sets, tvb, offset, 1, FALSE);
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_table_modulus, tvb, offset, 1, FALSE);
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_table_offset, tvb, offset, 1, FALSE);
+ offset += 1;
+
+ while(offset < tag_end )
+ {
+ proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_random_table, tvb, offset, 2, FALSE);
+ offset += 2;
+ }
+ break;
+
+ case TAG_REQUEST: /* 7.3.2.12 Request information element (10) */
+ while(offset < tag_end )
+ {
+ proto_tree_add_item(tree, hf_ieee80211_tag_request, tvb, offset, 1, FALSE);
+ offset += 1;
}
break;
- case TAG_QBSS_LOAD:
+ case TAG_QBSS_LOAD: /* 7.3.2.28 BSS Load element (11) */
if (tag_len < 4 || tag_len >5)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Wrong QBSS Tag Length %u", tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 4 or 5", tag_len);
break;
}
if (tag_len == 4)
{
/* QBSS Version 1 */
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 1,
- tag_len, "Cisco QBSS Version 1 - non CCA");
+ proto_item_append_text(ti, " Cisco QBSS Version 1 - non CCA");
/* Extract Values */
- proto_tree_add_uint (tree, hf_qbss_version, tvb, offset + 2, tag_len, 1);
- proto_tree_add_item (tree, hf_qbss_scount, tvb, offset + 2, 2, TRUE);
- proto_tree_add_item (tree, hf_qbss_cu, tvb, offset + 4, 1, FALSE);
- proto_tree_add_item (tree, hf_qbss_adc, tvb, offset + 5, 1, FALSE);
+ proto_tree_add_uint(tree, hf_ieee80211_qbss_version, tvb, offset + 2, tag_len, 1);
+ proto_tree_add_item(tree, hf_ieee80211_qbss_scount, tvb, offset + 2, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_qbss_cu, tvb, offset + 4, 1, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_qbss_adc, tvb, offset + 5, 1, FALSE);
}
else if (tag_len == 5)
{
/* QBSS Version 2 */
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
- tag_len, "802.11e CCA Version");
+ proto_item_append_text(ti, " 802.11e CCA Version");
/* Extract Values */
- proto_tree_add_uint (tree, hf_qbss_version, tvb, offset + 2, tag_len, 2);
- proto_tree_add_item (tree, hf_qbss_scount, tvb, offset + 2, 2, TRUE);
- proto_tree_add_item (tree, hf_qbss_cu, tvb, offset + 4, 1, FALSE);
- proto_tree_add_item (tree, hf_qbss_adc, tvb, offset + 5, 2, TRUE);
+ proto_tree_add_uint(tree, hf_ieee80211_qbss_version, tvb, offset + 2, tag_len, 2);
+ proto_tree_add_item(tree, hf_ieee80211_qbss_scount, tvb, offset + 2, 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_qbss_cu, tvb, offset + 4, 1, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_qbss_adc, tvb, offset + 5, 2, TRUE);
}
break;
- case TAG_FH_HOPPING_PARAMETER:
- if (tag_len < 2)
- {
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 2",
- tag_len);
- break;
- }
- g_snprintf (out_buff, SHORT_STR, "Prime Radix: %u, Number of Channels: %u",
- tvb_get_guint8(tvb, offset + 2),
- tvb_get_guint8(tvb, offset + 3));
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2, tag_len, out_buff);
- proto_item_append_text(ti, ": %s", out_buff);
- break;
-
- case TAG_TSPEC:
+ case TAG_TSPEC: /* 7.3.2.30 TSPEC element (13) */
if (tag_len != 55)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "TSPEC tag length %u != 55", tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 55", tag_len);
break;
}
- add_fixed_field(tree, tvb, offset + 2, FIELD_QOS_TS_INFO);
- proto_tree_add_item(tree, tspec_nor_msdu, tvb, offset + 5, 2, TRUE);
- proto_tree_add_item(tree, tspec_max_msdu, tvb, offset + 7, 2, TRUE);
- proto_tree_add_item(tree, tspec_min_srv, tvb, offset + 9, 4, TRUE);
- proto_tree_add_item(tree, tspec_max_srv, tvb, offset + 13, 4, TRUE);
- proto_tree_add_item(tree, tspec_inact_int, tvb, offset + 17, 4, TRUE);
- proto_tree_add_item(tree, tspec_susp_int, tvb, offset + 21, 4, TRUE);
- proto_tree_add_item(tree, tspec_srv_start, tvb, offset + 25, 4, TRUE);
- proto_tree_add_item(tree, tspec_min_data, tvb, offset + 29, 4, TRUE);
- proto_tree_add_item(tree, tspec_mean_data, tvb, offset + 33, 4, TRUE);
- proto_tree_add_item(tree, tspec_peak_data, tvb, offset + 37, 4, TRUE);
- proto_tree_add_item(tree, tspec_burst_size, tvb, offset + 41, 4, TRUE);
- proto_tree_add_item(tree, tspec_delay_bound, tvb, offset + 45, 4, TRUE);
- proto_tree_add_item(tree, tspec_min_phy, tvb, offset + 49, 4, TRUE);
- proto_tree_add_item(tree, tspec_surplus, tvb, offset + 53, 2, TRUE);
- proto_tree_add_item(tree, tspec_medium, tvb, offset + 55, 2, TRUE);
- break;
+ offset += 2;
+
+ add_fixed_field(tree, tvb, offset, FIELD_QOS_TS_INFO);
+ offset += 3;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_nor_msdu, tvb, offset, 2, TRUE);
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_max_msdu, tvb, offset, 2, TRUE);
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_min_srv, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_max_srv, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_inact_int, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_susp_int, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_srv_start, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_min_data, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_mean_data, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_peak_data, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_burst_size, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_delay_bound, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_min_phy, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_surplus, tvb, offset, 2, TRUE);
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tspec_medium, tvb, offset, 2, TRUE);
+ offset += 2;
- case TAG_TS_DELAY:
- if (tag_len != 4)
- {
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "TS_DELAY tag length %u != 4", tag_len);
- break;
- }
- proto_tree_add_item(tree, ts_delay, tvb, offset + 2, 4, TRUE);
break;
- case TAG_TCLAS:
+ case TAG_TCLAS: /* 7.3.2.31 TCLAS element (14) */
if (tag_len < 6)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "TCLAS element is too small %u", tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be >= 6", tag_len);
break;
}
{
guint8 type;
guint8 version;
- type = tvb_get_guint8(tvb, offset + 2);
- proto_tree_add_item(tree, hf_tsinfo_up, tvb, offset + 2, 1, TRUE);
- proto_tree_add_item(tree, hf_class_type, tvb, offset + 3, 1, TRUE);
- proto_tree_add_item(tree, hf_class_mask, tvb, offset + 4, 1, TRUE);
+ offset += 2;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_up, tvb, offset, 1, TRUE);
+ type = tvb_get_guint8(tvb, offset);
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tclas_class_type, tvb, offset, 1, TRUE);
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tclas_class_mask, tvb, offset, 1, TRUE);
+ offset += 1;
+
switch (type)
{
case 0:
- proto_tree_add_item(tree, ff_src_mac_addr, tvb, offset + 5,
- 6, TRUE);
- proto_tree_add_item(tree, ff_dst_mac_addr, tvb, offset + 11,
- 6, TRUE);
- proto_tree_add_item(tree, hf_ether_type, tvb, offset + 17,
- 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_tclas_src_mac_addr, tvb, offset, 6, TRUE);
+ offset += 6;
+
+ proto_tree_add_item(tree, hf_ieee80211_tclas_dst_mac_addr, tvb, offset, 6, TRUE);
+ offset += 6;
+
+ proto_tree_add_item(tree, hf_ieee80211_tclas_ether_type, tvb, offset, 2, TRUE);
+ offset += 2;
break;
case 1:
version = tvb_get_guint8(tvb, offset + 5);
- proto_tree_add_item(tree, cf_version, tvb, offset + 5, 1, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_tclas_version, tvb, offset + 5, 1, TRUE);
+ offset += 1;
if (version == 4)
{
- proto_tree_add_item(tree, cf_ipv4_src, tvb, offset + 6,
- 4, FALSE);
- proto_tree_add_item(tree, cf_ipv4_dst, tvb, offset + 10,
- 4, FALSE);
- proto_tree_add_item(tree, cf_src_port, tvb, offset + 14,
- 2, FALSE);
- proto_tree_add_item(tree, cf_dst_port, tvb, offset + 16,
- 2, FALSE);
- proto_tree_add_item(tree, cf_dscp, tvb, offset + 18,
- 1, FALSE);
- proto_tree_add_item(tree, cf_protocol, tvb, offset + 19,
- 1, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_tclas_ipv4_src, tvb, offset, 4, FALSE);
+ offset += 4;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_ipv4_dst, tvb, offset, 4, FALSE);
+ offset += 4;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_src_port, tvb, offset, 2, FALSE);
+ offset += 2;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_dst_port, tvb, offset, 2, FALSE);
+ offset += 2;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_dscp, tvb, offset, 1, FALSE);
+ offset += 1;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_protocol, tvb, offset, 1, FALSE);
+ offset += 1;
}
else if (version == 6)
{
- proto_tree_add_item(tree, cf_ipv6_src, tvb, offset + 6,
- 16, FALSE);
- proto_tree_add_item(tree, cf_ipv6_dst, tvb, offset + 22,
- 16, FALSE);
- proto_tree_add_item(tree, cf_src_port, tvb, offset + 38,
- 2, FALSE);
- proto_tree_add_item(tree, cf_dst_port, tvb, offset + 40,
- 2, FALSE);
- proto_tree_add_item(tree, cf_flow, tvb, offset + 42,
- 3, FALSE);
+ proto_tree_add_item(tree, hf_ieee80211_tclas_ipv6_src, tvb, offset, 16, FALSE);
+ offset += 16;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_ipv6_dst, tvb, offset, 16, FALSE);
+ offset += 16;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_src_port, tvb, offset, 2, FALSE);
+ offset += 2;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_dst_port, tvb, offset, 2, FALSE);
+ offset += 2;
+ proto_tree_add_item(tree, hf_ieee80211_tclas_flow, tvb, offset, 3, FALSE);
+ offset += 3;
}
break;
case 2:
- proto_tree_add_item(tree, cf_tag_type, tvb, offset + 5,
- 2, TRUE);
+ proto_tree_add_item(tree, hf_ieee80211_tclas_tag_type, tvb, offset, 2, TRUE);
+ offset += 2;
break;
default:
}
break;
- case TAG_TCLAS_PROCESS:
- if (tag_len != 1)
+ case TAG_SCHEDULE: /* 7.3.2.34 Schedule element (15) */
+ if (tag_len != 14)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "TCLAS_PROCESS element length %u != 1", tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 14", tag_len);
break;
}
- proto_tree_add_item(tree, hf_tclas_process, tvb, offset + 2, 1, TRUE);
+ offset += 2;
+
+ add_fixed_field(tree, tvb, offset, FIELD_SCHEDULE_INFO);
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_sched_srv_start, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_sched_srv_int, tvb, offset, 4, TRUE);
+ offset += 4;
+
+ proto_tree_add_item(tree, hf_ieee80211_sched_spec_int, tvb, offset, 2, TRUE);
+ offset += 2;
break;
- case TAG_SCHEDULE:
- if (tag_len != 14)
+ case TAG_CHALLENGE_TEXT: /* 7.3.2.8 Challenge Text element (16) */
+ offset += 2;
+ proto_tree_add_item(tree, hf_ieee80211_tag_challenge_text, tvb, offset, tag_len, FALSE);
+ break;
+
+ case TAG_POWER_CONSTRAINT: /* 7.3.2.15 Power Constraint element (32) */
+ {
+ if (tag_len != 1)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "TCLAS_PROCESS element length %u != 14", tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 1", tag_len);
break;
}
- add_fixed_field(tree, tvb, offset + 2, FIELD_SCHEDULE_INFO);
- proto_tree_add_item(tree, hf_sched_srv_start, tvb, offset + 4, 4, TRUE);
- proto_tree_add_item(tree, hf_sched_srv_int, tvb, offset + 8, 4, TRUE);
- proto_tree_add_item(tree, hf_sched_spec_int, tvb, offset + 12, 2, TRUE);
- break;
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_power_constraint_local, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, " :%d", tvb_get_guint8(tvb, offset));
+ offset += 1;
- case TAG_CHALLENGE_TEXT:
- g_snprintf (out_buff, SHORT_STR, "Challenge text: %s",
- tvb_bytes_to_str(tvb, offset + 2, tag_len));
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
- tag_len, out_buff);
break;
+ }
- case TAG_ERP_INFO:
- case TAG_ERP_INFO_OLD:
+ case TAG_POWER_CAPABILITY: /* 7.3.2.16 Power Capability element (33) */
+ {
+ if (tag_len != 2)
{
- guint8 erp_info;
-
- if (tag_len < 1)
- {
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 1",
- tag_len);
- break;
- }
- erp_info = tvb_get_guint8 (tvb, offset + 2);
- g_snprintf (print_buff, SHORT_STR, "%sNon-ERP STAs, %suse protection, %s preambles",
- erp_info & 0x01 ? "" : "no ",
- erp_info & 0x02 ? "" : "do not ",
- /* 802.11g, 7.3.2.13: 1 means "one or more ... STAs
- * are not short preamble capable" */
- erp_info & 0x04 ? "long": "short or long");
- g_snprintf (out_buff, SHORT_STR,
- "ERP info: 0x%x (%s)",erp_info,print_buff);
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
- tag_len, out_buff);
- proto_item_append_text(ti, ": %s", print_buff);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 2", tag_len);
+ break;
}
- break;
+ offset += 2;
- case TAG_CISCO_CCX1_CKIP:
- /* From WCS manual:
- * If Aironet IE support is enabled, the access point sends an Aironet
- * IE 0x85 (which contains the access point name, load, number of
- * associated clients, and so on) in the beacon and probe responses of
- * this WLAN, and the controller sends Aironet IEs 0x85 and 0x95
- * (which contains the management IP address of the controller and
- * the IP address of the access point) in the reassociation response
- * if it receives Aironet IE 0x85 in the reassociation request.
- */
+ proto_tree_add_item(tree, hf_ieee80211_tag_power_capability_min, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, " Min: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
- /* The Name of the sending device starts at offset 10 and is up to
- 15 or 16 bytes in length, \0 padded */
- if (tag_len < 26)
+ proto_tree_add_item(tree, hf_ieee80211_tag_power_capability_max, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, ", Max :%d", tvb_get_guint8(tvb, offset));
+ offset += 1;
+ break;
+ }
+
+ case TAG_TPC_REQUEST: /* 7.3.2.18 TPC Request element (34) */
+ {
+ if (tag_len != 0)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 26",
- tag_len);
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 0", tag_len);
break;
}
- /* A cisco AP transmits the first 15 bytes of the AP name, probably
- followed by '\0' for ASCII termination */
- g_snprintf (out_buff, SHORT_STR, "%.16s",
- tvb_format_stringzpad(tvb, offset + 12, 16));
- proto_tree_add_string_format (tree, tag_interpretation, tvb, offset + 2,
- tag_len, "", "Tag interpretation: Unknown + Name: %s #Clients: %u",
- out_buff,
- /* Total number off associated clients and repeater access points */
- tvb_get_guint8(tvb, offset + 28));
- if (check_col (pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Name=\"%s\"", out_buff);
- }
+ offset += 2;
+
+ /* No Data */
break;
+ }
-/* Std 802.11-2007
- * 7.3.2.26 Vendor Specific information element
- * The
- * information element is in the format shown in Figure 7-75 and requires that the first 3 octets of the
- * information field contain the OUI of the entity that has defined the content of the particular Vendor Specific
- * information element. The length of the information field (n) is 3 >= n =< 255. The OUI field shall be a public
- * OUI assigned by the IEEE. It is 3 octets in length. The length of the vendor-specific content is n-3 octets.
- *
- * Element ID Length OUI Vendor-specific content
- * Octets 1 1 3 n-3
- */
+ case TAG_TPC_REPORT: /* 7.3.2.18 TPC Report element (35) */
+ {
+ if (tag_len != 2)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 2", tag_len);
+ break;
+ }
+ offset += 2;
- case TAG_VENDOR_SPECIFIC_IE:
- tvb_ensure_bytes_exist (tvb, offset + 2, tag_len);
- if (tag_len >= 3) {
- oui = tvb_get_ntoh24(tvb, offset + 2);
- tag_tvb = tvb_new_subset(tvb, offset + 2, tag_len, tag_len);
- tag_data_ptr = tvb_get_ptr(tag_tvb, 0, 3);
- proto_tree_add_bytes_format (tree, tag_oui, tvb, offset + 2, 3,
- tag_data_ptr, "Vendor: %s", get_manuf_name(tag_data_ptr));
- proto_item_append_text(ti, ": %s", get_manuf_name(tag_data_ptr));
-
-#define WPAWME_OUI 0x0050F2
-#define RSNOUI_VAL 0x000FAC
-#define PRE11N_OUI 0x00904c
-
- switch (oui) {
- case WPAWME_OUI:
- dissect_vendor_ie_wpawme(ti, tree, tag_tvb);
- break;
- case RSNOUI_VAL:
- dissect_vendor_ie_rsn(ti, tree, tag_tvb);
- break;
- case OUI_CISCOWL: /* Cisco Wireless (Aironet) */
- dissect_vendor_ie_aironet(ti, tree, tvb, offset + 5, tag_len - 3);
- break;
- case PRE11N_OUI:
- dissect_vendor_ie_ht(ti, tree, tag_tvb);
- break;
- case OUI_MARVELL:
- dissect_vendor_ie_marvell(ti, tree, tvb, offset + 5, tag_len - 3);
- break;
- default:
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 5,
- tag_len - 3, "Not interpreted");
- break;
- }
+ proto_tree_add_item(tree, hf_ieee80211_tag_tpc_report_trsmt_pow, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, " Transmit Power :%d", tvb_get_guint8(tvb, offset));
+ offset += 1;
- }
- break;
+ proto_tree_add_item(tree, hf_ieee80211_tag_tpc_report_link_mrg, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, ", Link Margin :%d", tvb_get_guint8(tvb, offset));
+ offset += 1;
- case TAG_RSN_IE:
- tag_tvb = tvb_new_subset(tvb, offset + 2, tag_len, tag_len);
- dissect_rsn_ie(tree, tag_tvb);
break;
+ }
- case TAG_HT_CAPABILITY:
- dissect_ht_capability_ie(tree, tvb, offset + 2, tag_len, FALSE);
- break;
-
- case TAG_HT_INFO:
- dissect_ht_info_ie_1_1(tree, tvb, offset + 2, tag_len);
- break;
- /*** Begin: Secondary Channel Offset Tag - Dustin Johnson ***/
- case TAG_SECONDARY_CHANNEL_OFFSET:
- secondary_channel_offset_ie(tree, tvb, offset + 2, tag_len);
- break;
- /*** End: Secondary Channel Offset Tag - Dustin Johnson ***/
-
- /*** Begin: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
- case TAG_WSIE:
- dissect_wsie_ie(tree, tvb, offset + 3, tag_len);
- break;
- /*** End: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
-
- /*** Begin: Power Capability Tag - Dustin Johnson ***/
- case TAG_POWER_CAPABILITY:
- {
- offset += 2;
- if (tag_len != 2)
- {
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "Power Capability: Error: Tag length must be exactly 2 bytes long");
- }
-
- proto_tree_add_item(tree, hf_tag_power_capability_min, tvb, offset, 1, TRUE);
- proto_tree_add_item(tree, hf_tag_power_capability_max, tvb, offset+1, 1, TRUE);
- break;
- }
- /*** End: Power Capability Tag - Dustin Johnson ***/
- /*
- * 7.3.2.18 TPC Report element
- *
- */
- case TAG_TPC_REPORT:
- if(tag_len !=2)
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "TPC Report: Error: Tag length must be 2 bytes long");
- /* Transmit Power field
- * The field is coded as a signed integer in units of decibels relative to 1 mW
- */
- offset += 2;
- proto_tree_add_item(tree, hf_tag_tpc_report_trsmt_pow, tvb, offset, 1, TRUE);
- offset++;
- /* Link Margin */
- proto_tree_add_item(tree, hf_tag_tpc_report_link_mrg, tvb, offset, 1, TRUE);
- offset++;
- break;
- /*** Begin: Supported Channels Tag - Dustin Johnson ***/
- case TAG_SUPPORTED_CHANNELS:
+ case TAG_SUPPORTED_CHANNELS: /* 7.3.2.19 Supported Channels element (36) */
{
proto_item *chan_item;
proto_tree *chan_tree;
- guint8 i;
+ guint i=1;
offset += 2;
- if (tag_len > 8) /* XXX Is this a sane limit? */
- {
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "Supported Channels: Error: Tag length too long");
- } else if (tag_len % 2 == 1) {
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "Supported Channels: Error: Tag length must be even");
+ if (tag_len % 2 == 1) {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u must be even",tag_len);
+ break;
}
-
- for (i=0; i<(tag_len/2); i++)
+ while(offset < tag_end)
{
- chan_item = proto_tree_add_uint_format(tree, hf_tag_supported_channels, tvb, offset, 2, i,
- "Supported Channels Set #%d", i);
+ chan_item = proto_tree_add_item(tree, hf_ieee80211_tag_supported_channels, tvb, offset, 2, FALSE);
+ proto_item_append_text(chan_item, " #%d", i);
+ i++;
+
chan_tree = proto_item_add_subtree(chan_item , ett_tag_supported_channels);
- proto_tree_add_item(chan_tree, hf_tag_supported_channels_first, tvb, offset++, 1, TRUE);
- proto_tree_add_item(chan_tree, hf_tag_supported_channels_range, tvb, offset++, 1, TRUE);
+
+ proto_tree_add_item(chan_tree, hf_ieee80211_tag_supported_channels_first, tvb, offset, 1, TRUE);
+ proto_item_append_text(chan_item, " First: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
+ proto_tree_add_item(chan_tree, hf_ieee80211_tag_supported_channels_range, tvb, offset, 1, TRUE);
+ proto_item_append_text(chan_item, ", Range: %d ", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
}
break;
}
- /*** End: Supported Channels Tag - Dustin Johnson ***/
+ case TAG_CHANNEL_SWITCH_ANN: /* 7.3.2.20 Channel Switch Announcement element (37) */
+ {
+ if (tag_len != 3)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 3", tag_len);
+ break;
+ }
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_csa_channel_switch_mode, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, " Mode: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_csa_new_channel_number, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, ", Number: %d ", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_csa_channel_switch_count, tvb, offset, 1, TRUE);
+ proto_item_append_text(ti, ", Count: %d ", tvb_get_guint8(tvb, offset));
+ offset += 1;
+ }
- /*** Begin: Measure Request Tag - Dustin Johnson ***/
- case TAG_MEASURE_REQ:
+ case TAG_MEASURE_REQ: /* 7.3.2.21 Measurement Request element (38) with update from 802.11k-2008 */
if (tag_len < 3)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "Measurement Request: Error: Tag length must be at least 3 bytes long");
- } else {
- guint8 info, request_type;
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be >= 3", tag_len);
+ break;
+ }
+ {
+ guint8 request_type;
guint tag_offset;
proto_item *parent_item;
proto_tree *sub_tree;
offset += 2;
tag_offset = offset;
- info = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(tree, hf_tag_measure_request_measurement_token, tvb,
- offset, 1, info, "Measurement Token: 0x%02X", info);
-
- info = tvb_get_guint8 (tvb, ++offset);
- parent_item = proto_tree_add_uint_format(tree, hf_tag_measure_request_mode, tvb,
- offset, 1, info, "Measurement Request Mode: 0x%02X", info);
- sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_request_tree);
- proto_tree_add_uint(sub_tree, hf_tag_measure_request_mode_reserved1, tvb, offset, 1, info);
- proto_tree_add_boolean(sub_tree, hf_tag_measure_request_mode_enable, tvb, offset, 1, info);
- proto_tree_add_boolean(sub_tree, hf_tag_measure_request_mode_request, tvb, offset, 1, info);
- proto_tree_add_boolean(sub_tree, hf_tag_measure_request_mode_report, tvb, offset, 1, info);
- proto_tree_add_uint(sub_tree, hf_tag_measure_request_mode_reserved2, tvb, offset, 1, info);
-
- request_type = tvb_get_guint8 (tvb, ++offset);
- parent_item = proto_tree_add_uint(tree, hf_tag_measure_request_type, tvb, offset, 1, request_type);
- sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_request_tree);
- offset++;
- switch (request_type) {
+ proto_tree_add_item(tree, hf_ieee80211_tag_measure_request_token, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ parent_item = proto_tree_add_item(tree, hf_ieee80211_tag_measure_request_mode, tvb, offset, 1, ENC_NA);
+ sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_request_mode_tree);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_mode_parallel, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_mode_enable, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_mode_request, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_mode_report, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_mode_duration_mandatory, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_mode_reserved, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+
+ parent_item = proto_tree_add_item(tree, hf_ieee80211_tag_measure_request_type, tvb, offset, 1, ENC_NA);
+ sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_request_type_tree);
+ request_type = tvb_get_guint8 (tvb, offset);
+ offset += 1;
+
+ switch(request_type) {
case 0: /* Basic Request */
case 1: /* Clear channel assessment (CCA) request */
case 2: /* Receive power indication (RPI) histogram request */
{
- guint8 channel_number;
- guint64 start_time;
- guint16 duration;
- channel_number = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
-
- start_time = tvb_get_letoh64 (tvb, offset);
- proto_tree_add_uint64_format(sub_tree, hf_tag_measure_request_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_start_time, tvb, offset, 8, ENC_LITTLE_ENDIAN);
offset += 8;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_duration, tvb, offset, 2, duration, "Measurement Duration: 0x%04X TU (1 TU = 1024 us)", duration);
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
break;
}
case 3: /* Channel Load Request */
case 4: /* Noise Histogram Request */
{
- guint8 regulatory_class, channel_number;
- guint16 rand_interval, duration;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_regulatory_class, tvb, offset, 1, ENC_NA);
+ offset += 1;
- regulatory_class = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_regulatory_class, tvb, offset, 1, regulatory_class, "Regulatory Class: 0x%02X", regulatory_class);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
- offset++;
- channel_number = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
-
- offset++;
- rand_interval = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_randomization_interval, tvb, offset, 2, rand_interval, "Randomization Interval: 0x%02X TU (1 TU = 1024 us)", rand_interval);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_randomization_interval, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_duration, tvb, offset, 2, duration, "Measurement Duration: 0x%04X TU (1 TU = 1024 us)", duration);
+ /* TODO Add Optionnal Subelements */
break;
}
case 5: /* Beacon Request */
{
- guint8 regulatory_class, channel_number, measurement_mode, reporting_condition, threshold_offset;
- guint16 rand_interval, duration;
- const guint8 *bssid = NULL;
-
- regulatory_class = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_regulatory_class, tvb, offset, 1, regulatory_class, "Regulatory Class: 0x%02X", regulatory_class);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_regulatory_class, tvb, offset, 1, ENC_NA);
+ offset += 1;
- offset++;
- channel_number = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
- offset++;
- rand_interval = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_randomization_interval, tvb, offset, 2, rand_interval, "Randomization Interval: 0x%02X TU (1 TU = 1024 us)", rand_interval);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_randomization_interval, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_duration, tvb, offset, 2, duration, "Measurement Duration: 0x%04X TU (1 TU = 1024 us)", duration);
-
- offset+=2;
- measurement_mode = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint(sub_tree, hf_tag_measure_request_measurement_mode, tvb, offset, 1, measurement_mode);
-
- offset++;
- bssid = tvb_get_ptr (tvb, offset, 6);
- proto_tree_add_ether(sub_tree, hf_tag_measure_request_bssid, tvb, offset, 6, bssid);
-
- offset+=6;
- reporting_condition = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint(sub_tree, hf_tag_measure_request_reporting_condition, tvb, offset, 1, reporting_condition);
-
- offset++;
- threshold_offset = tvb_get_guint8 (tvb, offset);
- if (reporting_condition == 0) {
- /* XXX ? */
- } else if (reporting_condition >= 1 && reporting_condition <= 4){ /* Unsigned dBm */
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_threshold_offset_unsigned, tvb, offset, 1, threshold_offset, "Threshold/Offset: 0x%02X dBm", threshold_offset);
- } else if (reporting_condition == 5 || reporting_condition == 6 || reporting_condition == 9){ /* Signed dBm */
- proto_tree_add_int_format(sub_tree, hf_tag_measure_request_threshold_offset_signed, tvb, offset, 1, threshold_offset, "Threshold/Offset: 0x%02X dBm", threshold_offset);
- } else if (reporting_condition == 7 || reporting_condition == 8 || reporting_condition == 10){ /* Signed dB */
- proto_tree_add_int_format(sub_tree, hf_tag_measure_request_threshold_offset_signed, tvb, offset, 1, threshold_offset, "Threshold/Offset: 0x%02X dB", threshold_offset);
- } else {
- /* Not Defined */
- }
- offset++;
- add_tagged_field (pinfo, sub_tree, tvb, offset);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_measurement_mode, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_bssid, tvb, offset, 6, ENC_NA);
+ offset += 6;
+
+ while(offset < tag_end)
+ {
+ guint8 sub_id, sub_length, sub_tag_end;
+ proto_item *ti;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_id, tvb, offset, 1, ENC_NA);
+ sub_id = tvb_get_guint8(tvb, offset);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_subelement_length, tvb, offset, 1, ENC_NA);
+ sub_length = tvb_get_guint8(tvb, offset);
+ offset += 1;
+ sub_tag_end = offset + sub_length;
+
+ switch(sub_id){
+ case MEASURE_REQ_BEACON_SUB_SSID: /* SSID (0) */
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_ssid, tvb, offset, sub_length, FALSE);
+ offset += sub_length;
+ break;
+ case MEASURE_REQ_BEACON_SUB_BRI: /* Beacon Reporting Information (1) */
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition, tvb, offset, 1, FALSE);
+ offset += 1;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_bri_threshold_offset, tvb, offset, 1, FALSE);
+ offset += 1;
+ break;
+ case MEASURE_REQ_BEACON_SUB_RD: /* Reporting Detail (2) */
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_reporting_detail, tvb, offset, 1, FALSE);
+ offset += 1;
+ break;
+ case MEASURE_REQ_BEACON_SUB_REQUEST: /* Request (10) */
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_request, tvb, offset, 1, FALSE);
+ offset += 1;
+ break;
+ case MEASURE_REQ_BEACON_SUB_APCP: /* Request (51) */
+ /* TODO */
+ break;
+ default:
+ /* no default action */
+ break;
+ }
+ if(offset < sub_tag_end)
+ {
+ ti = proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_unknown, tvb, offset, sub_tag_end - offset, ENC_NA);
+ expert_add_info_format(pinfo, ti, PI_UNDECODED, PI_WARN, " Unknown Data (not interpreted)");
+ offset = sub_tag_end;
+ }
+ }
break;
}
case 6: /* Frame Request */
{
- guint8 regulatory_class, channel_number;
- guint16 rand_interval, duration;
- const guint8 *mac = NULL;
-
- regulatory_class = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_regulatory_class, tvb, offset, 1, regulatory_class, "Regulatory Class: 0x%02X", regulatory_class);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_regulatory_class, tvb, offset, 1, ENC_NA);
+ offset += 1;
- offset++;
- channel_number = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
-
- offset++;
- rand_interval = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_randomization_interval, tvb, offset, 2, rand_interval, "Randomization Interval: 0x%02X TU (1 TU = 1024 us)", rand_interval);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_randomization_interval, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_duration, tvb, offset, 2, duration, "Measurement Duration: 0x%04X TU (1 TU = 1024 us)", duration);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
- if (tag_len >= ((offset-tag_offset)+6)){
- mac = tvb_get_ptr (tvb, offset, 6);
- proto_tree_add_ether(sub_tree, hf_tag_measure_request_bssid, tvb, offset, 6, mac);
- }
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_frame_request_type, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_mac_address, tvb, offset, 6, ENC_NA);
+ offset += 6;
+
+ /* TODO Add Optionnal Subelements */
break;
}
case 7: /* BSTA Statistics Request */
{
- guint8 group_id;
- guint16 rand_interval, duration;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_peer_mac_address, tvb, offset, 6, ENC_NA);
+ offset += 6;
- offset++;
- rand_interval = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_randomization_interval, tvb, offset, 2, rand_interval, "Randomization Interval: 0x%02X TU (1 TU = 1024 us)", rand_interval);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_randomization_interval, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_duration, tvb, offset, 2, duration, "Measurement Duration: 0x%04X TU (1 TU = 1024 us)", duration);
- offset++;
- group_id = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint(sub_tree, hf_tag_measure_request_group_id, tvb, offset, 1, group_id);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_group_id, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ /* TODO Add Optionnal Subelements */
break;
}
case 8: /* Location Configuration Indication (LCI) Request */
case 255: /* Measurement Pause Request*/
/* TODO */
default: /* unknown */
- proto_tree_add_text (tree, tvb, offset, tag_len - (offset - tag_offset), "Undissected Data");
break;
}
}
break;
- /* End: Measure Request Tag - Dustin Johnson */
- /* Begin: Measure Report Tag - Dustin Johnson */
- /* 7.3.2.22 Measurement Report element
- * The Length field is variable and depends on the length of the
- * Measurement Report field. The minimum value of the Length field is 3.
- */
- case TAG_MEASURE_REP:
+ case TAG_MEASURE_REP: /* 7.3.2.22 Measurement Report element (39) with update from 802.11k-2008 */
if (tag_len < 3)
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "Measurement Report: Error: Tag length must be at least 3 bytes long");
- } else {
- guint8 info, report_type, channel_number;
- guint16 duration;
- guint64 start_time;
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be >= 3", tag_len);
+ break;
+ }
+ {
proto_item *parent_item;
proto_tree *sub_tree;
- guint tag_offset;
+ guint8 report_type;
offset += 2;
- tag_offset = offset;
- info = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(tree, hf_tag_measure_report_measurement_token, tvb,
- offset, 1, info, "Measurement Token: 0x%02X", info);
+ proto_tree_add_item(tree, hf_ieee80211_tag_measure_report_measurement_token, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ parent_item = proto_tree_add_item(tree, hf_ieee80211_tag_measure_report_mode, tvb, offset, 1, ENC_NA);
+ sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_report_mode_tree);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_mode_late, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_mode_incapable, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_mode_refused, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_mode_reserved, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ report_type = tvb_get_guint8(tvb, offset);
+ parent_item = proto_tree_add_uint(tree, hf_ieee80211_tag_measure_report_type, tvb, offset, 1, ENC_NA);
+ sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_report_type_tree);
+ offset += 1;
+
+ if (tag_len == 3)
+ break;
+ switch (report_type) {
+ case 0: /* Basic Report */
+ {
+ proto_tree *sub_tree_map_field;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_start_time, tvb, offset, 8, ENC_LITTLE_ENDIAN);
+ offset += 8;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+
+
+ parent_item = proto_tree_add_item(tree, hf_ieee80211_tag_measure_basic_map_field, tvb, offset, 1, ENC_NA);
+ sub_tree_map_field = proto_item_add_subtree(parent_item, ett_tag_measure_report_basic_map_tree);
+ proto_tree_add_item(sub_tree_map_field, hf_ieee80211_tag_measure_map_field_bss, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree_map_field, hf_ieee80211_tag_measure_map_field_odfm, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree_map_field, hf_ieee80211_tag_measure_map_field_unident_signal, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree_map_field, hf_ieee80211_tag_measure_map_field_radar, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree_map_field, hf_ieee80211_tag_measure_map_field_unmeasured, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree_map_field, hf_ieee80211_tag_measure_map_field_reserved, tvb, offset, 1, ENC_NA);
+ break;
+ }
+ case 1: /* Clear channel assessment (CCA) report */
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_start_time, tvb, offset, 8, ENC_LITTLE_ENDIAN);
+ offset += 8;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_cca_busy_fraction, tvb, offset, 1, ENC_NA);
+ offset += 1;
+ break;
+ case 2: /* Receive power indication (RPI) histogram report */
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_start_time, tvb, offset, 8, ENC_LITTLE_ENDIAN);
+ offset += 8;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+
+ parent_item = proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_rpi_histogram_report, tvb, offset, 8, ENC_NA);
+ sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_report_rpi_tree);
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_rpi_histogram_report_0, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_rpi_histogram_report_1, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_rpi_histogram_report_2, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_rpi_histogram_report_3, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_rpi_histogram_report_4, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_rpi_histogram_report_5, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_rpi_histogram_report_6, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_rpi_histogram_report_7, tvb, offset, 1, ENC_NA);
+ offset += 1;
+ break;
+ case 3: /* Channel Load Report */
+ {
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_regulatory_class, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_start_time, tvb, offset, 8, ENC_LITTLE_ENDIAN);
+ offset += 8;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_channel_load, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ /* TODO Add Optionnal Subelements */
+ break;
+ }
+ case 4: /* Noise Histogram Report */
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_regulatory_class, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_start_time, tvb, offset, 8, ENC_LITTLE_ENDIAN);
+ offset += 8;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ant_id, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_anpi, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_0, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_1, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_2, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_3, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_4, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_5, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_6, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_7, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_8, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_9, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_10, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ /* TODO Add Optionnal Subelements */
+ break;
+ case 5: /* Beacon Report */
+ {
+ proto_tree *sub_tree_frame_info;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_regulatory_class, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_start_time, tvb, offset, 8, ENC_LITTLE_ENDIAN);
+ offset += 8;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+
+ parent_item = proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_frame_info, tvb, offset, 1, ENC_NA);
+ sub_tree_frame_info = proto_item_add_subtree(parent_item, ett_tag_measure_report_frame_tree);
+ proto_tree_add_item(sub_tree_frame_info, hf_ieee80211_tag_measure_report_frame_info_phy_type, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_tree_frame_info, hf_ieee80211_tag_measure_report_frame_info_frame_type, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_rcpi, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_rsni, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_bssid, tvb, offset, 6, ENC_NA);
+ offset += 6;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ant_id, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_parent_tsf, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+ offset += 4;
+ /* TODO Add Optionnal Subelements */
+ break;
+ }
+ case 6: /* Frame Report */
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_regulatory_class, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_channel_number, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_start_time, tvb, offset, 8, ENC_LITTLE_ENDIAN);
+ offset += 8;
+
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ offset += 2;
+
+ /* TODO Add Optionnal Subelements */
+ break;
+ case 7: /* BSTA Statistics Report */
+ /* TODO */
+ case 8: /* Location Configuration Information Report element */
+ /* TODO */
+ case 9: /* Transmit Stream Measurement Report */
+ /* TODO */
+ default: /* unknown */
+ break;
+ }
+ }
+
+ case TAG_QUIET: /* 7.3.2.23 Quiet element (40) */
+ if (tag_len != 6)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 6", tag_len);
+ break;
+ }
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_quiet_count, tvb, offset, 1, ENC_NA);
+ proto_item_append_text(ti, " Count: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_quiet_period, tvb, offset, 1, ENC_NA);
+ proto_item_append_text(ti, " Period: %d", tvb_get_guint8(tvb, offset));
+ offset += 1;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_quiet_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_item_append_text(ti, " Duration: %d", tvb_get_letohs(tvb, offset));
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_quiet_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_item_append_text(ti, " Offset: %d", tvb_get_letohs(tvb, offset));
+ offset += 2;
+ break;
+
+
+ case TAG_IBSS_DFS: /* 7.3.2.24 IBSS DFS element (41) */
+ if (tag_len < 7)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be >= 7", tag_len);
+ break;
+ }
+ {
+ proto_item *ti_sup_map;
+ proto_tree *sub_map_tree;
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_dfs_owner, tvb, offset, 6, ENC_NA);
+ proto_item_append_text(ti, " Owner: %s", tvb_ether_to_str(tvb, offset));
+ offset += 6;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_dfs_recovery_interval, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ while(offset < tag_end)
+ {
+ ti_sup_map = proto_tree_add_item(tree, hf_ieee80211_tag_dfs_channel_map, tvb, offset, 2, ENC_NA);
+ sub_map_tree = proto_item_add_subtree(ti_sup_map, ett_tag_dfs_map_tree);
+ proto_tree_add_item(sub_map_tree, hf_ieee80211_tag_dfs_channel_number, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(sub_map_tree, hf_ieee80211_tag_dfs_map, tvb, offset, 1, ENC_NA);
+ offset += 2;
+ }
+ break;
+ }
+ case TAG_ERP_INFO: /* 7.3.2.13 ERP Information element (42) */
+ case TAG_ERP_INFO_OLD:
+ if (tag_len != 1)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 1", tag_len);
+ break;
+ }
+ {
+ proto_item *ti_erp;
+ proto_tree *erp_tree;
+
+ offset += 2;
+
+ ti_erp = proto_tree_add_item(tree, hf_ieee80211_tag_erp_info, tvb, offset, 1, ENC_NA);
+ erp_tree = proto_item_add_subtree(ti_erp, ett_tag_erp_info_tree);
+ proto_tree_add_item(erp_tree, hf_ieee80211_tag_erp_info_erp_present, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(erp_tree, hf_ieee80211_tag_erp_info_use_protection, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(erp_tree, hf_ieee80211_tag_erp_info_barker_preamble_mode, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(erp_tree, hf_ieee80211_tag_erp_info_reserved, tvb, offset, 1, ENC_NA);
+ offset += 1;
+ break;
+ }
+
+ case TAG_TS_DELAY: /* 7.3.2.32 TS Delay element (43) */
+ if (tag_len != 4)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 4", tag_len);
+ break;
+ }
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_ts_delay, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+ proto_item_append_text(ti, " : %d", tvb_get_ntohl(tvb, offset) );
+ offset += 4;
+ break;
+
+ case TAG_TCLAS_PROCESS: /* 7.3.2.33 TCLAS Processing element (44) */
+ if (tag_len != 1)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 1", tag_len);
+ break;
+ }
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tclas_process, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+ proto_item_append_text(ti, " : %s", val_to_str(tvb_get_guint8(tvb, offset), ieee80211_tclas_process_flag, "Unknown %d"));
+ offset += 1;
+ break;
+
+ case TAG_QOS_CAPABILITY: /* 7.3.2.35 QoS Capability element (46) */
+ if (tag_len != 1)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be = 1", tag_len);
+ break;
+ }
+ {
+ /* proto_item *ti_cap;
+ proto_tree *cap_tree; */
+ offset += 2;
+
+ proto_tree_add_item(tree, hf_ieee80211_tag_qos_cap_qos_info, tvb, offset, 1, ENC_NA);
+ /* TODO : Add detail of QoS Info Field 7.3.1.17 QoS Info field ) */
+ offset += 1;
+ }
+ break;
+
+ case TAG_RSN_IE: /* 7.3.2.25 RSN information element (48) */
+ if (tag_len < 20)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag Length %u wrong, must be >= 20", tag_len);
+ break;
+ }
+ offset += 2;
+
+ offset = dissect_rsn_ie(tree, tvb, offset, tag_len);
+ break;
+
+ case TAG_EXT_SUPP_RATES: /* 7.3.2.14 Extended Supported Rates element (50) */
+ if(tag_len < 1)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be greater than 0", tag_len);
+ break;
+ }
+ offset += 2;
+
+ while(offset < tag_end)
+ {
+ proto_tree_add_item(tree, hf_ieee80211_tag_ext_supp_rates, tvb, offset, 1, ENC_NA);
+ proto_item_append_text(ti, " %s,", val_to_str(tvb_get_guint8(tvb, offset), ieee80211_supported_rates_vals, "Unknown Rate") );
+ offset += 1;
+ }
+ proto_item_append_text(ti, " [Mbit/sec]");
+ break;
+
+ case TAG_EXTENDED_CAPABILITIES: /* 7.3.2.27 Extended Capabilities information element (127) */
+ {
+ proto_item *ti_ex_cap;
+ proto_tree *ex_cap_tree;
+
+ if (tag_len < 1)
+ {
+ expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR, "Tag length %u too short, must be greater than 0", tag_len);
+ break;
+ }
+ offset += 2;
+
+ /* Extended Capability octet 0 */
+ ti_ex_cap = proto_tree_add_item(tree, hf_ieee80211_tag_extended_capabilities, tvb, offset, 1, ENC_NA);
+ proto_item_append_text(ti_ex_cap, " (octet 0)");
+ ex_cap_tree = proto_item_add_subtree (ti_ex_cap, ett_tag_ex_cap);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b0, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b1, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b2, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b3, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b4, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b6, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ /* Extended Capability octet 1 */
+ if (offset >= tag_end) {
+ break;
+ }
+ ti_ex_cap = proto_tree_add_item(tree, hf_ieee80211_tag_extended_capabilities, tvb, offset, 1, ENC_NA);
+ proto_item_append_text(ti_ex_cap, " (octet 1)");
+ offset += 1;
+
+ /* Extended Capability octet 2 */
+ if (offset >= tag_end) {
+ break;
+ }
+ ti_ex_cap = proto_tree_add_item(tree, hf_ieee80211_tag_extended_capabilities, tvb, offset, 1, ENC_NA);
+ proto_item_append_text(ti_ex_cap, " (octet 2)");
+ offset += 1;
+
+ /* Extended Capability octet 3 */
+ if (offset >= tag_end) {
+ break;
+ }
+ ti_ex_cap = proto_tree_add_item(tree, hf_ieee80211_tag_extended_capabilities, tvb, offset, 1, ENC_NA);
+ proto_item_append_text(ti_ex_cap, " (octet 3)");
+ ex_cap_tree = proto_item_add_subtree(ti_ex_cap, ett_tag_ex_cap);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b28, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b29, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b30, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ /* Extended Capability octet 4 */
+ if (offset >= tag_end) {
+ break;
+ }
+ ti_ex_cap = proto_tree_add_item(tree, hf_ieee80211_tag_extended_capabilities, tvb, offset, 1, ENC_NA);
+ proto_item_append_text(ti_ex_cap, " (octet 4)");
+ ex_cap_tree = proto_item_add_subtree(ti_ex_cap, ett_tag_ex_cap);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b37, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b38, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b39, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ /* Extended Capability octet 5 */
+ if (offset >= tag_end) {
+ break;
+ }
+ ti_ex_cap = proto_tree_add_item(tree, hf_ieee80211_tag_extended_capabilities, tvb, offset, 1, ENC_NA);
+ proto_item_append_text(ti_ex_cap, " (octet 5)");
+ ex_cap_tree = proto_item_add_subtree(ti_ex_cap, ett_tag_ex_cap);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_b40, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(ex_cap_tree, hf_ieee80211_tag_extended_capabilities_serv_int_granularity, tvb, offset, 1, ENC_NA);
+ offset += 1;
+
+ break;
+
+ case TAG_CISCO_CCX1_CKIP:
+ /* From WCS manual:
+ * If Aironet IE support is enabled, the access point sends an Aironet
+ * IE 0x85 (which contains the access point name, load, number of
+ * associated clients, and so on) in the beacon and probe responses of
+ * this WLAN, and the controller sends Aironet IEs 0x85 and 0x95
+ * (which contains the management IP address of the controller and
+ * the IP address of the access point) in the reassociation response
+ * if it receives Aironet IE 0x85 in the reassociation request.
+ */
+
+ /* The Name of the sending device starts at offset 10 and is up to
+ 15 or 16 bytes in length, \0 padded */
+ if (tag_len < 26)
+ {
+ proto_tree_add_text (tree, tvb, offset + 2, tag_len, "Tag length %u too short, must be >= 26",
+ tag_len);
+ break;
+ }
+ /* A cisco AP transmits the first 15 bytes of the AP name, probably
+ followed by '\0' for ASCII termination */
+ g_snprintf (out_buff, SHORT_STR, "%.16s",
+ tvb_format_stringzpad(tvb, offset + 12, 16));
+ proto_tree_add_string_format (tree, hf_ieee80211_tag_interpretation, tvb, offset + 2,
+ tag_len, "", "Tag interpretation: Unknown + Name: %s #Clients: %u",
+ out_buff,
+ /* Total number off associated clients and repeater access points */
+ tvb_get_guint8(tvb, offset + 28));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Name=\"%s\"", out_buff);
+ break;
+
+/* Std 802.11-2007
+ * 7.3.2.26 Vendor Specific information element
+ * The
+ * information element is in the format shown in Figure 7-75 and requires that the first 3 octets of the
+ * information field contain the OUI of the entity that has defined the content of the particular Vendor Specific
+ * information element. The length of the information field (n) is 3 >= n =< 255. The OUI field shall be a public
+ * OUI assigned by the IEEE. It is 3 octets in length. The length of the vendor-specific content is n-3 octets.
+ *
+ * Element ID Length OUI Vendor-specific content
+ * Octets 1 1 3 n-3
+ */
+
+ case TAG_VENDOR_SPECIFIC_IE:
+ tvb_ensure_bytes_exist (tvb, offset + 2, tag_len);
+ if (tag_len >= 3) {
+ const gchar *str = tvb_get_manuf_name(tvb, offset+2);
+ oui = tvb_get_ntoh24(tvb, offset + 2);
+ tag_tvb = tvb_new_subset(tvb, offset + 2, tag_len, tag_len);
+ proto_tree_add_bytes_format (tree, hf_ieee80211_tag_oui, tvb, offset + 2, 3,
+ NULL, "Vendor: %s", str);
+ proto_item_append_text(ti, ": %s", str);
+ if (tag_len > 3) {
+ proto_tree_add_item(ti, hf_ieee80211_tag_vendor_oui_type, tag_tvb,
+ 3, 1, FALSE);
+ }
+
+#define WPAWME_OUI 0x0050F2
+#define RSNOUI_VAL 0x000FAC
+#define PRE11N_OUI 0x00904c
+
+ switch (oui) {
+ case WPAWME_OUI:
+ dissect_vendor_ie_wpawme(ti, tree, tag_tvb);
+ break;
+ case RSNOUI_VAL:
+ dissect_vendor_ie_rsn(ti, tree, tag_tvb);
+ break;
+ case OUI_CISCOWL: /* Cisco Wireless (Aironet) */
+ dissect_vendor_ie_aironet(ti, tree, tvb, offset + 5, tag_len - 3);
+ break;
+ case PRE11N_OUI:
+ dissect_vendor_ie_ht(ti, tree, tag_tvb);
+ break;
+ case OUI_MARVELL:
+ dissect_vendor_ie_marvell(ti, tree, tvb, offset + 5, tag_len - 3);
+ break;
+ case OUI_WFA:
+ dissect_vendor_ie_wfa(pinfo, ti, tag_tvb);
+ break;
+ case OUI_ATHEROS:
+ dissect_vendor_ie_atheros(ti, tree, tvb, offset + 5, tag_len, pinfo, tag_end, ti_len);
+ break;
+ default:
+ proto_tree_add_string (tree, hf_ieee80211_tag_interpretation, tvb, offset + 5,
+ tag_len - 3, "Not interpreted");
+ break;
+ }
+
+ }
+ break;
+
+
- offset++;
- info = tvb_get_guint8 (tvb, offset);
- parent_item = proto_tree_add_uint_format(tree, hf_tag_measure_report_mode, tvb,
- offset, 1, info, "Measurement Report Mode: 0x%02X", info);
- sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_request_tree);
- proto_tree_add_boolean(sub_tree, hf_tag_measure_report_mode_late, tvb, offset, 1, info);
- proto_tree_add_boolean(sub_tree, hf_tag_measure_report_mode_incapable, tvb, offset, 1, info);
- proto_tree_add_boolean(sub_tree, hf_tag_measure_report_mode_refused, tvb, offset, 1, info);
- proto_tree_add_uint(sub_tree, hf_tag_measure_report_mode_reserved, tvb, offset, 1, info);
+ case TAG_MOBILITY_DOMAIN:
+ dissect_mobility_domain(tree, tvb, offset + 2, tag_len);
+ break;
- offset++;
- report_type = tvb_get_guint8 (tvb, offset);
- parent_item = proto_tree_add_uint(tree, hf_tag_measure_report_type, tvb, offset, 1, report_type);
- sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_request_tree);
- offset++;
+#ifndef MESH_OVERRIDES
+ case TAG_FAST_BSS_TRANSITION:
+ dissect_fast_bss_transition(tree, tvb, offset + 2, tag_len);
+ break;
+#endif /* MESH_OVERRIDES */
- if (tag_len == 3)
- break;
- switch (report_type) {
- case 0: /* Basic Report */
- {
- proto_tree *sub_tree_map_field;
+ case TAG_MMIE:
+ dissect_mmie(tree, tvb, offset + 2, tag_len);
+ break;
- channel_number = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
+ case TAG_TIMEOUT_INTERVAL:
+ dissect_timeout_interval(tree, tvb, offset + 2, tag_len);
+ break;
- offset++;
- start_time = tvb_get_letoh64 (tvb, offset);
- proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "x", start_time);
+ case TAG_LINK_IDENTIFIER:
+ dissect_link_identifier(tree, tvb, offset + 2, tag_len);
+ break;
- offset += 8;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_duration, tvb, offset, 2, duration, "Measurement Duration in TUs (1TU = 1024 us): 0x%04X", duration);
-
- offset+=2;
- info = tvb_get_guint8 (tvb, offset);
- parent_item = proto_tree_add_uint_format(tree, hf_tag_measure_basic_map_field, tvb,
- offset, 1, info, "Map Field: 0x%02X", info);
- sub_tree_map_field = proto_item_add_subtree(parent_item, ett_tag_measure_request_tree);
- proto_tree_add_boolean(sub_tree_map_field, hf_tag_measure_map_field_bss, tvb, offset, 1, info);
- proto_tree_add_boolean(sub_tree_map_field, hf_tag_measure_map_field_odfm, tvb, offset, 1, info);
- proto_tree_add_boolean(sub_tree_map_field, hf_tag_measure_map_field_unident_signal, tvb, offset, 1, info);
- proto_tree_add_boolean(sub_tree_map_field, hf_tag_measure_map_field_radar, tvb, offset, 1, info);
- proto_tree_add_boolean(sub_tree_map_field, hf_tag_measure_map_field_unmeasured, tvb, offset, 1, info);
- proto_tree_add_uint(sub_tree_map_field, hf_tag_measure_map_field_reserved, tvb, offset, 1, info);
- break;
- }
- case 1: /* Clear channel assessment (CCA) report */
- channel_number = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
+ case TAG_WAKEUP_SCHEDULE:
+ dissect_wakeup_schedule(tree, tvb, offset + 2, tag_len);
+ break;
- offset++;
- start_time = tvb_get_letoh64 (tvb, offset);
- proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
+ case TAG_CHANNEL_SWITCH_TIMING:
+ dissect_channel_switch_timing(tree, tvb, offset + 2, tag_len);
+ break;
- offset += 8;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_duration, tvb, offset, 2, duration, "Measurement Duration in TUs (1TU = 1024 us): 0x%04X", duration);
+ case TAG_PTI_CONTROL:
+ dissect_pti_control(tree, tvb, offset + 2, tag_len);
+ break;
- offset+=2;
- info = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_cca_busy_fraction, tvb, offset, 1, info, "CCA Busy Fraction: 0x%02X", info);
- break;
- case 2: /* Receive power indication (RPI) histogram report */
- channel_number = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
+ case TAG_PU_BUFFER_STATUS:
+ dissect_pu_buffer_status(tree, tvb, offset + 2, tag_len);
+ break;
- offset++;
- start_time = tvb_get_letoh64 (tvb, offset);
- proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
+ case TAG_HT_CAPABILITY:
+ dissect_ht_capability_ie(tree, tvb, offset + 2, tag_len, FALSE);
+ break;
- offset += 8;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_duration, tvb, offset, 2, duration, "Measurement Duration in TUs (1TU = 1024 us): 0x%04X", duration);
-
- offset+=2;
- parent_item = proto_tree_add_string(sub_tree, hf_tag_measure_rpi_histogram_report, tvb,
- offset, 8, "RPI Histogram Report");
- sub_tree = proto_item_add_subtree(parent_item, ett_tag_measure_request_tree);
- info = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_rpi_histogram_report_0, tvb, offset, 1, info, "RPI 0 Density: 0x%02X", info);
- info = tvb_get_guint8 (tvb, ++offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_rpi_histogram_report_1, tvb, offset, 1, info, "RPI 1 Density: 0x%02X", info);
- info = tvb_get_guint8 (tvb, ++offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_rpi_histogram_report_2, tvb, offset, 1, info, "RPI 2 Density: 0x%02X", info);
- info = tvb_get_guint8 (tvb, ++offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_rpi_histogram_report_3, tvb, offset, 1, info, "RPI 3 Density: 0x%02X", info);
- info = tvb_get_guint8 (tvb, ++offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_rpi_histogram_report_4, tvb, offset, 1, info, "RPI 4 Density: 0x%02X", info);
- info = tvb_get_guint8 (tvb, ++offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_rpi_histogram_report_5, tvb, offset, 1, info, "RPI 5 Density: 0x%02X", info);
- info = tvb_get_guint8 (tvb, ++offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_rpi_histogram_report_6, tvb, offset, 1, info, "RPI 6 Density: 0x%02X", info);
- info = tvb_get_guint8 (tvb, ++offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_rpi_histogram_report_7, tvb, offset, 1, info, "RPI 7 Density: 0x%02X", info);
- break;
- case 3: /* Channel Load Report */
- {
- guint8 regulatory_class, channel_load;
+ case TAG_HT_INFO:
+ dissect_ht_info_ie_1_1(tree, tvb, offset + 2, tag_len);
+ break;
+ case TAG_SECONDARY_CHANNEL_OFFSET:
+ secondary_channel_offset_ie(tree, tvb, offset + 2, tag_len);
+ break;
- regulatory_class = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint(sub_tree, hf_tag_measure_report_regulatory_class, tvb, offset, 1, regulatory_class);
+#ifndef MESH_OVERRIDES
+ /*** Begin: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
+ case TAG_WSIE:
+ dissect_wsie_ie(tree, tvb, offset + 3, tag_len);
+ break;
+ /*** End: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
+#endif /* MESH_OVERRIDES */
- offset++;
- channel_number = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
- offset++;
- start_time = tvb_get_letoh64 (tvb, offset);
- proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
- offset += 8;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_duration, tvb, offset, 2, duration, "Measurement Duration in TUs (1TU = 1024 us): 0x%04X", duration);
+#ifdef MESH_OVERRIDES
+ case TAG_MESH_PEER_LINK_MGMT:
+ {
+ offset += 2;
+ proto_tree_add_item (tree, hf_ieee80211_mesh_mgt_pl_subtype, tvb, offset, 1, TRUE);
+ offset += 1;
+ switch (tvb_get_guint8(tvb, 1))
+ { /* IE subtype */
+ case MESH_PL_PEER_LINK_OPEN:
+ proto_tree_add_item (tree, hf_ieee80211_mesh_mgt_pl_local_link_id, tvb, offset, 2, TRUE);
+ break;
- offset+=2;
- channel_load = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint(sub_tree, hf_tag_measure_report_channel_load, tvb, offset, 1, channel_load);
+ case MESH_PL_PEER_LINK_CONFIRM:
+ proto_tree_add_item (tree, hf_ieee80211_mesh_mgt_pl_local_link_id, tvb, offset, 2, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_mesh_mgt_pl_peer_link_id, tvb, offset + 2, 2, TRUE);
break;
- }
- case 4: /* Noise Histogram Report */
- /* TODO */
- proto_tree_add_text (sub_tree, tvb, offset, tag_len - (offset - tag_offset), "Undissected Data");
+
+ case MESH_PL_PEER_LINK_CLOSE:
+ proto_tree_add_item (tree, hf_ieee80211_mesh_mgt_pl_local_link_id, tvb, offset, 2, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_mesh_mgt_pl_peer_link_id, tvb, offset + 2, 2, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_mesh_mgt_pl_reason_code, tvb, offset + 4, 2, TRUE);
break;
- case 5: /* Beacon Report */
- {
- guint8 regulatory_class, reported_frame_info, rcpi, rsni, ant_id;
- guint32 parent_tsf;
- proto_tree *sub_tree_frame_info;
- const guint8 *bssid = NULL;
- regulatory_class = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint(sub_tree, hf_tag_measure_report_regulatory_class, tvb, offset, 1, regulatory_class);
+ /* undefined values */
+ default:
+ proto_tree_add_text (tree, tvb, offset, tag_len, "Unknown Peer Link Message Subtype");
+ break;
+ }
+ break;
+ }
- offset++;
- channel_number = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
+ case TAG_MESH_CONFIGURATION:
+ {
+ offset += 2;
+ proto_tree_add_item (tree, hf_ieee80211_mesh_config_version, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_mesh_config_path_sel_protocol, tvb, offset + 1, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_mesh_config_path_sel_metric, tvb, offset + 5, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_mesh_config_congestion_control, tvb, offset + 9, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_mesh_config_channel_prec, tvb, offset + 13, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_mesh_config_capability, tvb, offset + 17, 2, TRUE);
+ break;
+ }
- offset++;
- start_time = tvb_get_letoh64 (tvb, offset);
- proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
+ case TAG_MESH_ID:
+ {
+ offset += 2;
- offset += 8;
- duration = tvb_get_letohs (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_duration, tvb, offset, 2, duration, "Measurement Duration in TUs (1TU = 1024 us): 0x%04X", duration);
-
- offset+=2;
- reported_frame_info = tvb_get_guint8 (tvb, offset);
- parent_item = proto_tree_add_uint(sub_tree, hf_tag_measure_report_frame_info, tvb, offset, 1, reported_frame_info);
- sub_tree_frame_info = proto_item_add_subtree(parent_item, ett_tag_measure_request_tree);
- proto_tree_add_uint(sub_tree_frame_info, hf_tag_measure_report_frame_info_phy_type, tvb, offset, 1, reported_frame_info);
- proto_tree_add_uint(sub_tree_frame_info, hf_tag_measure_report_frame_info_frame_type, tvb, offset, 1, reported_frame_info);
-
- offset++;
- rcpi = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_rcpi, tvb, offset, 1, rcpi, "Received Channel Power Indicator (RCPI): 0x%02X dBm", rcpi);
-
- offset++;
- rsni = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(sub_tree, hf_tag_measure_report_rsni, tvb, offset, 1, rsni, "Received Signal to Noise Indicator (RSNI): 0x%02X dB", rsni);
-
- offset++;
- bssid = tvb_get_ptr (tvb, offset, 6);
- proto_tree_add_ether(sub_tree, hf_tag_measure_request_bssid, tvb, offset, 6, bssid);
-
- offset+=6;
- ant_id = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint(sub_tree, hf_tag_measure_report_ant_id, tvb, offset, 1, ant_id);
-
- offset++;
- parent_tsf = tvb_get_letohl (tvb, offset);
- proto_tree_add_uint(sub_tree, hf_tag_measure_report_parent_tsf, tvb, offset, 4, parent_tsf);
-
- offset+=4;
- /* TODO - Must determine frame type and dissect this */
- if (tag_len > (offset - tag_offset))
- {
- proto_tree_add_text (sub_tree, tvb, offset, tag_len - (offset - tag_offset), "Reported Frame Body");
- }
- break;
- }
- case 6: /* Frame Report */
- /* TODO */
- case 7: /* BSTA Statistics Report */
- /* TODO */
- case 8: /* Location Configuration Information Report element */
- /* TODO */
- case 9: /* Transmit Stream Measurement Report */
- /* TODO */
- default: /* unknown */
- proto_tree_add_text (tree, tvb, offset, tag_len - (offset - tag_offset), "Undissected Data");
- break;
+ proto_tree_add_item(tree, hf_ieee80211_mesh_id, tvb, offset, tag_len, FALSE);
+ if (tag_len > 0) {
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", MESHID=%s", tvb_get_ephemeral_string(tvb, offset, tag_len));
+ proto_item_append_text(ti, ": %s", tvb_get_ephemeral_string(tvb, offset, tag_len));
}
- }
break;
- /*** End: Measure Report Tag - Dustin Johnson ***/
- /*** Begin: Extended Capabilities Tag - Dustin Johnson ***/
- /* The Capabilities field is a bit field indicating the capabilities being advertised
- * by the STA transmitting the information element
- */
- case TAG_EXTENDED_CAPABILITIES:
- {
- guint tag_offset;
- guint8 info_exchange;
- proto_item *ti;
- proto_tree *ex_cap_tree;
+ }
- if (tag_len < 1)
+ case TAG_MESH_PREQ:
{
- proto_tree_add_text (tree, tvb, offset + 2, tag_len,
- "Extended Capabilities: Error: Tag length must be at least 1 byte long");
+ guint8 flags;
+ proto_item *item;
+ proto_tree *subtree;
+
+ offset += 2;
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_flags, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_hopcount, tvb, offset + 1, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_ttl, tvb, offset + 2, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_rreqid, tvb, offset + 3, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_sa, tvb, offset + 7, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_ssn, tvb, offset + 13, 4, TRUE);
+ /* TODO: display proxied address if present */
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_lifetime, tvb, offset + 17, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_metric, tvb, offset + 21, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_dstcount, tvb, offset + 25, 1, TRUE);
+ flags = tvb_get_guint8 (tvb, offset + 26);
+ item = proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_dest_flags, tvb, offset + 26, 1, TRUE);
+ subtree = proto_item_add_subtree(item, ett_msh_dest_flags_tree);
+ proto_tree_add_boolean(subtree, hf_ieee80211_ff_mesh_mgt_dest_do_flags, tvb, offset + 26, 1, flags);
+ proto_tree_add_boolean(subtree, hf_ieee80211_ff_mesh_mgt_dest_rf_flags, tvb, offset + 26, 1, flags);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_da, tvb, offset + 27, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_dsn, tvb, offset + 33, 4, TRUE);
break;
}
- offset+=2;
- tag_offset = offset;
- info_exchange = tvb_get_guint8 (tvb, offset);
- ti = proto_tree_add_item (tree, hf_tag_extended_capabilities, tvb, offset, 1, FALSE);
- ex_cap_tree = proto_item_add_subtree (ti, ett_tag_ex_cap);
- proto_tree_add_item (ex_cap_tree, hf_tag_extended_capabilities_b0, tvb, offset, 1, FALSE);
- proto_tree_add_item (ex_cap_tree, hf_tag_extended_capabilities_b1, tvb, offset, 1, FALSE);
- proto_tree_add_item (ex_cap_tree, hf_tag_extended_capabilities_b2, tvb, offset, 1, FALSE);
- proto_tree_add_item (ex_cap_tree, hf_tag_extended_capabilities_b3, tvb, offset, 1, FALSE);
+ case TAG_MESH_PREP:
+ {
+ offset += 2;
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_flags, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_hopcount, tvb, offset + 1, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_ttl, tvb, offset + 2, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_da, tvb, offset + 3, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_dsn, tvb, offset + 9, 4, TRUE);
+ /* TODO: display proxied address if present */
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_lifetime, tvb, offset + 13, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_metric, tvb, offset + 17, 4, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_sa, tvb, offset + 21, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_ssn, tvb, offset + 27, 4, TRUE);
+ break;
+ }
- if (tag_len > (offset - tag_offset))
+ case TAG_MESH_PERR:
{
- proto_tree_add_text (tree, tvb, offset, tag_len - (offset - tag_offset), "Unknown Data");
+ offset += 2;
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_flags, tvb, offset, 1, TRUE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_srccount, tvb, offset + 1, 1, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_sa, tvb, offset + 2, 6, FALSE);
+ proto_tree_add_item (tree, hf_ieee80211_ff_mesh_mgt_ssn, tvb, offset + 8, 4, TRUE);
break;
}
+#endif /* MESH_OVERRIDES */
+
+ break;
+ }
+ case TAG_ADVERTISEMENT_PROTOCOL:
+ {
+ dissect_advertisement_protocol(pinfo, tree, tvb, offset, NULL);
break;
}
- /*** End: Extended Capabilities Tag - Dustin Johnson ***/
- /*** Begin: Neighbor Report Tag - Dustin Johnson ***/
+
+#ifndef MESH_OVERRIDES
case TAG_NEIGHBOR_REPORT:
{
#define SUB_TAG_TSF_INFO 0x01
guint tag_offset;
guint8 sub_tag_id;
guint32 bssid_info, info, sub_tag_length;
- const guint8 *bssid = NULL;
proto_item *parent_item;
proto_tree *bssid_info_subtree, *sub_tag_tree;
tvbuff_t *volatile sub_tag_tvb = NULL;
offset+=2;
tag_offset = offset;
- bssid = tvb_get_ptr (tvb, offset, 6);
- proto_tree_add_ether(tree, hf_tag_neighbor_report_bssid, tvb, offset, 6, bssid);
+ proto_tree_add_item(tree, hf_ieee80211_tag_neighbor_report_bssid, tvb, offset, 6, ENC_NA);
/*** Begin: BSSID Information ***/
offset+=6;
bssid_info = tvb_get_letohl (tvb, offset);
- parent_item = proto_tree_add_uint_format(tree, hf_tag_neighbor_report_bssid_info, tvb, offset, 4, bssid_info, "BSSID Information: 0x%08X", bssid_info);
+ parent_item = proto_tree_add_uint_format(tree, hf_ieee80211_tag_neighbor_report_bssid_info, tvb, offset, 4, bssid_info, "BSSID Information: 0x%08X", bssid_info);
bssid_info_subtree = proto_item_add_subtree(parent_item, ett_tag_neighbor_report_bssid_info_tree);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_reachability, tvb, offset, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_security, tvb, offset, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_key_scope, tvb, offset, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_capability_spec_mng, tvb, offset, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_capability_qos, tvb, offset, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_capability_apsd, tvb, offset, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_capability_radio_msnt, tvb, offset, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_capability_dback, tvb, offset+1, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_capability_iback, tvb, offset+1, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_mobility_domain, tvb, offset+1, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_high_throughput, tvb, offset+1, 1, bssid_info);
- proto_tree_add_uint(bssid_info_subtree, hf_tag_neighbor_report_bssid_info_reserved, tvb, offset+1, 3, (bssid_info & 0xfffff000) >> 12);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_reachability, tvb, offset, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_security, tvb, offset, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_key_scope, tvb, offset, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_capability_spec_mng, tvb, offset, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_capability_qos, tvb, offset, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_capability_apsd, tvb, offset, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_capability_radio_msnt, tvb, offset, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_capability_dback, tvb, offset+1, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_capability_iback, tvb, offset+1, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_mobility_domain, tvb, offset+1, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_high_throughput, tvb, offset+1, 1, bssid_info);
+ proto_tree_add_uint(bssid_info_subtree, hf_ieee80211_tag_neighbor_report_bssid_info_reserved, tvb, offset+1, 3, (bssid_info & 0xfffff000) >> 12);
/*** End: BSSID Information ***/
offset+=4;
info = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(tree, hf_tag_neighbor_report_reg_class, tvb, offset, 1, info, "Regulatory Class: 0x%02X", info);
+ proto_tree_add_uint_format(tree, hf_ieee80211_tag_neighbor_report_reg_class, tvb, offset, 1, info, "Regulatory Class: 0x%02X", info);
offset++;
info = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(tree, hf_tag_neighbor_report_channel_number, tvb, offset, 1, info, "Channel Number: 0x%02X", info);
+ proto_tree_add_uint_format(tree, hf_ieee80211_tag_neighbor_report_channel_number, tvb, offset, 1, info, "Channel Number: 0x%02X", info);
offset++;
info = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint_format(tree, hf_tag_neighbor_report_phy_type, tvb, offset, 1, info, "PHY Type: 0x%02X", info);
+ proto_tree_add_uint_format(tree, hf_ieee80211_tag_neighbor_report_phy_type, tvb, offset, 1, info, "PHY Type: 0x%02X", info);
offset++;
sub_tag_id = tvb_get_guint8 (tvb, offset);
}
break;
}
- /*** End: Neighbor Report Tag - Dustin Johnson ***/
-#if 0 /*Not yet assigned tag numbers by ANA */
- /*** Begin: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
+#endif /* MESH_OVERRIDES */
+
case TAG_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT:
{
guint tag_offset;
}
break;
}
- /*** End: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
-#endif
-#if 0 /*Not yet assigned tag numbers by ANA */
- /*** Begin: Supported Regulatory Classes Tag - Dustin Johnson ***/
case TAG_SUPPORTED_REGULATORY_CLASSES:
{
guint tag_offset;
guint8 current_field;
+ guint i;
if (tag_len < 2) {
proto_tree_add_text (tree, tvb, offset + 2, tag_len,
tag_offset = offset;
current_field = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint(tree, hf_tag_supported_reg_classes_current, tvb, offset, 1, current_field);
+ proto_tree_add_uint(tree, hf_ieee80211_tag_supported_reg_classes_current, tvb, offset, 1, current_field);
offset++;
/* Partially taken from the ssid section */
}
n += ret;
}
- proto_tree_add_string (tree, hf_tag_supported_reg_classes_alternate, tvb, offset, tag_len, print_buff);
+ proto_tree_add_string (tree, hf_ieee80211_tag_supported_reg_classes_alternate, tvb, offset, tag_len, print_buff);
break;
}
- /*** End: Supported Regulatory Classes Tag - Dustin Johnson ***/
-#endif
default:
tvb_ensure_bytes_exist (tvb, offset + 2, tag_len);
- proto_tree_add_string (tree, tag_interpretation, tvb, offset + 1 + tag_len_len,
+ proto_tree_add_string (tree, hf_ieee80211_tag_interpretation, tvb, offset + 1 + tag_len_len,
tag_len, "Not interpreted");
proto_item_append_text(ti, ": Tag %u Len %u", tag_no, tag_len);
break;
case MGT_DISASS:
fixed_tree = get_fixed_parameter_tree (mgt_tree, tvb, 0, 2);
add_fixed_field(fixed_tree, tvb, 0, FIELD_REASON_CODE);
+ offset = 2; /* Size of fixed fields */
+ tagged_parameter_tree_len = tvb_reported_length_remaining(tvb, offset);
+ if (tagged_parameter_tree_len > 0) {
+ tagged_tree = get_tagged_parameter_tree(mgt_tree, tvb, offset,
+ tagged_parameter_tree_len);
+ ieee_80211_add_tagged_parameters(tvb, offset, pinfo, tagged_tree,
+ tagged_parameter_tree_len);
+ }
break;
case MGT_AUTHENTICATION:
case MGT_DEAUTHENTICATION:
fixed_tree = get_fixed_parameter_tree (mgt_tree, tvb, 0, 2);
add_fixed_field(fixed_tree, tvb, 0, FIELD_REASON_CODE);
+ offset = 2; /* Size of fixed fields */
+ tagged_parameter_tree_len = tvb_reported_length_remaining(tvb, offset);
+ if (tagged_parameter_tree_len > 0) {
+ tagged_tree = get_tagged_parameter_tree(mgt_tree, tvb, offset,
+ tagged_parameter_tree_len);
+ ieee_80211_add_tagged_parameters(tvb, offset, pinfo, tagged_tree,
+ tagged_parameter_tree_len);
+ }
break;
case MGT_ACTION:
{
- proto_item *fixed_hdr;
- proto_tree *fixed_tree;
- fixed_hdr = proto_tree_add_text(mgt_tree, tvb, 0, 0, "Fixed parameters");
- fixed_tree = proto_item_add_subtree (fixed_hdr, ett_fixed_parameters);
+ proto_item *lcl_fixed_hdr;
+ proto_tree *lcl_fixed_tree;
+ lcl_fixed_hdr = proto_tree_add_text(mgt_tree, tvb, 0, 0, "Fixed parameters");
+ lcl_fixed_tree = proto_item_add_subtree (lcl_fixed_hdr, ett_fixed_parameters);
- offset += add_fixed_field(fixed_tree, tvb, 0, FIELD_ACTION);
+ offset += add_fixed_field(lcl_fixed_tree, tvb, 0, FIELD_ACTION);
- proto_item_set_len(fixed_hdr, offset);
+ proto_item_set_len(lcl_fixed_hdr, offset);
tagged_parameter_tree_len = tvb_reported_length_remaining(tvb, offset);
if (tagged_parameter_tree_len != 0)
{
}
case MGT_ACTION_NO_ACK:
{
- proto_item *fixed_hdr;
- proto_tree *fixed_tree;
- fixed_hdr = proto_tree_add_text(mgt_tree, tvb, 0, 0, "Fixed parameters");
- fixed_tree = proto_item_add_subtree (fixed_hdr, ett_fixed_parameters);
+ proto_item *lcl_fixed_hdr;
+ proto_tree *lcl_fixed_tree;
+ lcl_fixed_hdr = proto_tree_add_text(mgt_tree, tvb, 0, 0, "Fixed parameters");
+ lcl_fixed_tree = proto_item_add_subtree (lcl_fixed_hdr, ett_fixed_parameters);
- offset += add_fixed_field(fixed_tree, tvb, 0, FIELD_ACTION);
+ offset += add_fixed_field(lcl_fixed_tree, tvb, 0, FIELD_ACTION);
- proto_item_set_len(fixed_hdr, offset);
+ proto_item_set_len(lcl_fixed_hdr, offset);
tagged_parameter_tree_len = tvb_reported_length_remaining(tvb, offset);
if (tagged_parameter_tree_len != 0)
{
aruba_hdr = proto_tree_add_text(mgt_tree, tvb, 0, 0, "Aruba Management");
aruba_tree = proto_item_add_subtree(aruba_hdr, ett_fixed_parameters);
- proto_tree_add_item(aruba_tree, cf_aruba, tvb, offset, 2, FALSE);
+ proto_tree_add_item(aruba_tree, hf_ieee80211_aruba, tvb, offset, 2, FALSE);
offset += 2;
/* HeartBeat Sequence */
if ( type == 0x0005 )
{
- proto_tree_add_item(aruba_tree, cf_aruba_hb_seq, tvb, offset, 8, FALSE);
+ proto_tree_add_item(aruba_tree, hf_ieee80211_aruba_hb_seq, tvb, offset, 8, FALSE);
}
/* MTU Size */
if ( type == 0x0003 )
{
- proto_tree_add_item(aruba_tree, cf_aruba_mtu, tvb, offset, 2, FALSE);
+ proto_tree_add_item(aruba_tree, hf_ieee80211_aruba_mtu, tvb, offset, 2, FALSE);
}
break;
}
static void
set_src_addr_cols(packet_info *pinfo, const guint8 *addr, const char *type)
{
- if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
- col_add_fstr(pinfo->cinfo, COL_RES_DL_SRC, "%s (%s)",
+ col_add_fstr(pinfo->cinfo, COL_RES_DL_SRC, "%s (%s)",
get_ether_name(addr), type);
- if (check_col(pinfo->cinfo, COL_UNRES_DL_SRC))
- col_add_str(pinfo->cinfo, COL_UNRES_DL_SRC, ether_to_str(addr));
+ col_add_str(pinfo->cinfo, COL_UNRES_DL_SRC, ether_to_str(addr));
}
static void
set_dst_addr_cols(packet_info *pinfo, const guint8 *addr, const char *type)
{
- if (check_col(pinfo->cinfo, COL_RES_DL_DST))
- col_add_fstr(pinfo->cinfo, COL_RES_DL_DST, "%s (%s)",
+ col_add_fstr(pinfo->cinfo, COL_RES_DL_DST, "%s (%s)",
get_ether_name(addr), type);
- if (check_col(pinfo->cinfo, COL_UNRES_DL_DST))
- col_add_str(pinfo->cinfo, COL_UNRES_DL_DST, ether_to_str(addr));
+ col_add_str(pinfo->cinfo, COL_UNRES_DL_DST, ether_to_str(addr));
}
static guint32
guint offset;
const gchar *fts_str;
gchar flag_str[] = "opmPRMFTC";
- gint i;
+ gint ii;
wlan_hdr *volatile whdr;
static wlan_hdr whdrs[4];
whdr= &whdrs[0];
- if (check_col (pinfo->cinfo, COL_PROTOCOL))
- col_set_str (pinfo->cinfo, COL_PROTOCOL, "IEEE 802.11");
- if (check_col (pinfo->cinfo, COL_INFO))
- col_clear (pinfo->cinfo, COL_INFO);
+ col_set_str (pinfo->cinfo, COL_PROTOCOL, "802.11");
+ col_clear(pinfo->cinfo, COL_INFO);
fcf = FETCH_FCF(0);
frame_type_subtype = COMPOSE_FRAME_TYPE(fcf);
if (datapad)
hdr_len = roundup2(hdr_len, 4);
- fts_str = val_to_str(frame_type_subtype, frame_type_subtype_vals,
+ fts_str = val_to_str_const(frame_type_subtype, frame_type_subtype_vals,
"Unrecognized (Reserved frame)");
- if (check_col (pinfo->cinfo, COL_INFO))
- col_set_str (pinfo->cinfo, COL_INFO, fts_str);
+ col_set_str (pinfo->cinfo, COL_INFO, fts_str);
flags = FCF_FLAGS (fcf);
more_frags = HAVE_FRAGMENTS (flags);
- for (i = 0; i < 8; i++) {
- if (! (flags & 0x80 >> i)) {
- flag_str[i] = '.';
+ for (ii = 0; ii < 8; ii++) {
+ if (! (flags & 0x80 >> ii)) {
+ flag_str[ii] = '.';
}
}
dissect_frame_control(hdr_tree, tvb, wlan_broken_fc, 0);
if (frame_type_subtype == CTRL_PS_POLL)
- proto_tree_add_uint(hdr_tree, hf_assoc_id,tvb,2,2,
- ASSOC_ID(tvb_get_letohs(tvb,2)));
+ proto_tree_add_uint(hdr_tree, hf_ieee80211_assoc_id, tvb, 2, 2, TRUE);
else
- proto_tree_add_uint (hdr_tree, hf_did_duration, tvb, 2, 2,
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_did_duration, tvb, 2, 2,
tvb_get_letohs (tvb, 2));
}
frag_number = SEQCTL_FRAGMENT_NUMBER(seq_control);
seq_number = SEQCTL_SEQUENCE_NUMBER(seq_control);
- if (check_col (pinfo->cinfo, COL_INFO))
- {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", SN=%d", seq_number);
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", FN=%d",frag_number);
- }
if (tree)
{
- proto_tree_add_ether (hdr_tree, hf_addr_da, tvb, 4, 6, dst);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_da, tvb, 4, 6, dst);
- proto_tree_add_ether (hdr_tree, hf_addr_sa, tvb, 10, 6, src);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_sa, tvb, 10, 6, src);
/* add items for wlan.addr filter */
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 4, 6, dst);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 4, 6, dst);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 10, 6, src);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 10, 6, src);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- proto_tree_add_ether (hdr_tree, hf_addr_bssid, tvb, 16, 6,
- tvb_get_ptr (tvb, 16, 6));
+ proto_tree_add_item (hdr_tree, hf_ieee80211_addr_bssid, tvb, 16, 6, ENC_NA);
- proto_tree_add_uint (hdr_tree, hf_frag_number, tvb, 22, 2,
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2,
frag_number);
- proto_tree_add_uint (hdr_tree, hf_seq_number, tvb, 22, 2,
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2,
seq_number);
}
break;
{
case CTRL_PS_POLL:
addr1_str = "BSSID";
- addr1_hf = hf_addr_bssid;
+ addr1_hf = hf_ieee80211_addr_bssid;
break;
case CTRL_RTS:
case CTRL_CTS:
case CTRL_BLOCK_ACK_REQ:
case CTRL_BLOCK_ACK:
addr1_str = "RA";
- addr1_hf = hf_addr_ra;
+ addr1_hf = hf_ieee80211_addr_ra;
break;
default:
break;
src = tvb_get_ptr (tvb, offset, 6);
set_src_addr_cols(pinfo, src, "BSSID");
if (tree) {
- proto_tree_add_item(hdr_tree, hf_addr_ta, tvb, offset, 6, FALSE);
+ proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, FALSE);
}
break;
}
src = tvb_get_ptr (tvb, offset, 6);
set_src_addr_cols(pinfo, src, "TA");
if (tree) {
- proto_tree_add_item(hdr_tree, hf_addr_ta, tvb, offset, 6, FALSE);
+ proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, FALSE);
}
break;
}
break;
}
- /*** Begin: Block Ack Request - Dustin Johnson ***/
case CTRL_BLOCK_ACK_REQ:
{
src = tvb_get_ptr (tvb, offset, 6);
proto_item *bar_parent_item;
proto_tree *bar_sub_tree;
- proto_tree_add_item(hdr_tree, hf_addr_ta, tvb, offset, 6, FALSE);
+ proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, FALSE);
offset += 6;
bar_control = tvb_get_letohs(tvb, offset);
block_ack_type = (bar_control & 0x0006) >> 1;
- proto_tree_add_uint(hdr_tree, hf_block_ack_request_type, tvb,
+ proto_tree_add_uint(hdr_tree, hf_ieee80211_block_ack_request_type, tvb,
offset, 1, block_ack_type);
bar_parent_item = proto_tree_add_uint_format(hdr_tree,
- hf_block_ack_request_control, tvb, offset, 2, bar_control,
+ hf_ieee80211_block_ack_request_control, tvb, offset, 2, bar_control,
"Block Ack Request (BAR) Control: 0x%04X", bar_control);
bar_sub_tree = proto_item_add_subtree(bar_parent_item,
ett_block_ack);
proto_tree_add_boolean(bar_sub_tree,
- hf_block_ack_control_ack_policy, tvb, offset, 1, bar_control);
- proto_tree_add_boolean(bar_sub_tree, hf_block_ack_control_multi_tid,
+ hf_ieee80211_block_ack_control_ack_policy, tvb, offset, 1, bar_control);
+ proto_tree_add_boolean(bar_sub_tree, hf_ieee80211_block_ack_control_multi_tid,
tvb, offset, 1, bar_control);
proto_tree_add_boolean(bar_sub_tree,
- hf_block_ack_control_compressed_bitmap, tvb, offset, 1,
+ hf_ieee80211_block_ack_control_compressed_bitmap, tvb, offset, 1,
bar_control);
- proto_tree_add_uint(bar_sub_tree, hf_block_ack_control_reserved,
+ proto_tree_add_uint(bar_sub_tree, hf_ieee80211_block_ack_control_reserved,
tvb, offset, 2, bar_control);
switch (block_ack_type)
case 0: /*Basic BlockAckReq */
{
proto_tree_add_uint(bar_sub_tree,
- hf_block_ack_control_basic_tid_info, tvb, offset+1, 1,
+ hf_ieee80211_block_ack_control_basic_tid_info, tvb, offset+1, 1,
bar_control);
offset += 2;
case 2: /* Compressed BlockAckReq */
{
proto_tree_add_uint(bar_sub_tree,
- hf_block_ack_control_compressed_tid_info, tvb, offset+1, 1,
+ hf_ieee80211_block_ack_control_compressed_tid_info, tvb, offset+1, 1,
bar_control);
offset += 2;
proto_tree *bar_mtid_tree, *bar_mtid_sub_tree;
tid_count = ((bar_control & 0xF000) >> 12) + 1;
- proto_tree_add_uint_format(bar_sub_tree, hf_block_ack_control_compressed_tid_info, tvb, offset+1, 1, bar_control,
+ proto_tree_add_uint_format(bar_sub_tree, hf_ieee80211_block_ack_control_multi_tid_info, tvb, offset+1, 1, bar_control,
decode_numeric_bitfield(bar_control, 0xF000, 16,"Number of TIDs Present: 0x%%X"), tid_count);
offset += 2;
bar_parent_item = proto_tree_add_text (hdr_tree, tvb, offset, tid_count*4, "Per TID Info");
bar_mtid_tree = proto_item_add_subtree(bar_parent_item, ett_block_ack);
for (i = 1; i <= tid_count; i++) {
- bar_parent_item = proto_tree_add_uint(bar_mtid_tree, hf_block_ack_multi_tid_info, tvb, offset, 4, i);
+ bar_parent_item = proto_tree_add_uint(bar_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, i);
bar_mtid_sub_tree = proto_item_add_subtree(bar_parent_item, ett_block_ack);
bar_control = tvb_get_letohs(tvb, offset);
- proto_tree_add_uint(bar_mtid_sub_tree, hf_block_ack_multi_tid_reserved, tvb, offset, 2, bar_control);
- proto_tree_add_uint(bar_mtid_sub_tree, hf_block_ack_multi_tid_value, tvb, offset+1, 1, bar_control);
+ proto_tree_add_uint(bar_mtid_sub_tree, hf_ieee80211_block_ack_multi_tid_reserved, tvb, offset, 2, bar_control);
+ proto_tree_add_uint(bar_mtid_sub_tree, hf_ieee80211_block_ack_multi_tid_value, tvb, offset+1, 1, bar_control);
offset += 2;
offset += add_fixed_field(bar_mtid_sub_tree, tvb, offset, FIELD_BLOCK_ACK_SSC);
}
break;
}
- /*** End: Block Ack Request - Dustin Johnson ***/
- /*** Begin: Block Ack - Dustin Johnson ***/
case CTRL_BLOCK_ACK:
{
src = tvb_get_ptr (tvb, offset, 6);
proto_item *ba_parent_item;
proto_tree *ba_sub_tree;
- proto_tree_add_item(hdr_tree, hf_addr_ta, tvb, offset, 6, FALSE);
+ proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, FALSE);
offset += 6;
ba_control = tvb_get_letohs(tvb, offset);
block_ack_type = (ba_control & 0x0006) >> 1;
- proto_tree_add_uint(hdr_tree, hf_block_ack_type, tvb, offset, 1, block_ack_type);
+ proto_tree_add_uint(hdr_tree, hf_ieee80211_block_ack_type, tvb, offset, 1, block_ack_type);
ba_parent_item = proto_tree_add_uint_format(hdr_tree,
- hf_block_ack_control, tvb, offset, 2, ba_control,
+ hf_ieee80211_block_ack_control, tvb, offset, 2, ba_control,
"Block Ack (BA) Control: 0x%04X", ba_control);
ba_sub_tree = proto_item_add_subtree(ba_parent_item, ett_block_ack);
- proto_tree_add_boolean(ba_sub_tree, hf_block_ack_control_ack_policy,
+ proto_tree_add_boolean(ba_sub_tree, hf_ieee80211_block_ack_control_ack_policy,
tvb, offset, 1, ba_control);
- proto_tree_add_boolean(ba_sub_tree, hf_block_ack_control_multi_tid,
+ proto_tree_add_boolean(ba_sub_tree, hf_ieee80211_block_ack_control_multi_tid,
tvb, offset, 1, ba_control);
proto_tree_add_boolean(ba_sub_tree,
- hf_block_ack_control_compressed_bitmap, tvb, offset, 1,
+ hf_ieee80211_block_ack_control_compressed_bitmap, tvb, offset, 1,
ba_control);
- proto_tree_add_uint(ba_sub_tree, hf_block_ack_control_reserved, tvb,
+ proto_tree_add_uint(ba_sub_tree, hf_ieee80211_block_ack_control_reserved, tvb,
offset, 2, ba_control);
switch (block_ack_type)
case 0: /*Basic BlockAck */
{
proto_tree_add_uint(ba_sub_tree,
- hf_block_ack_control_basic_tid_info, tvb, offset+1, 1,
+ hf_ieee80211_block_ack_control_basic_tid_info, tvb, offset+1, 1,
ba_control);
offset += 2;
offset += add_fixed_field(hdr_tree, tvb, offset, FIELD_BLOCK_ACK_SSC);
- proto_tree_add_text(hdr_tree, tvb, offset, 128, "Block Ack Bitmap");
+ proto_tree_add_item(hdr_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 128, FALSE);
offset += 128;
break;
}
case 2: /* Compressed BlockAck */
{
- proto_tree_add_uint(ba_sub_tree, hf_block_ack_control_basic_tid_info, tvb, offset+1, 1, ba_control);
+ proto_tree_add_uint(ba_sub_tree, hf_ieee80211_block_ack_control_basic_tid_info, tvb, offset+1, 1, ba_control);
offset += 2;
offset += add_fixed_field(hdr_tree, tvb, offset, FIELD_BLOCK_ACK_SSC);
- proto_tree_add_text(hdr_tree, tvb, offset, 8, "Block Ack Bitmap");
+ proto_tree_add_item(hdr_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 8, FALSE);
offset += 8;
break;
}
tid_count = ((ba_control & 0xF000) >> 12) + 1;
proto_tree_add_uint_format(ba_sub_tree,
- hf_block_ack_control_compressed_tid_info, tvb, offset+1, 1,
+ hf_ieee80211_block_ack_control_compressed_tid_info, tvb, offset+1, 1,
ba_control, decode_numeric_bitfield(ba_control, 0xF000,
16,"Number of TIDs Present: 0x%%X"), tid_count);
offset += 2;
ba_parent_item = proto_tree_add_text (hdr_tree, tvb, offset, tid_count*4, "Per TID Info");
ba_mtid_tree = proto_item_add_subtree(ba_parent_item, ett_block_ack);
for (i=1; i<=tid_count; i++) {
- ba_parent_item = proto_tree_add_uint(ba_mtid_tree, hf_block_ack_multi_tid_info, tvb, offset, 4, i);
+ ba_parent_item = proto_tree_add_uint(ba_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, i);
ba_mtid_sub_tree = proto_item_add_subtree(ba_parent_item, ett_block_ack);
ba_control = tvb_get_letohs(tvb, offset);
- proto_tree_add_uint(ba_mtid_sub_tree, hf_block_ack_multi_tid_reserved, tvb, offset, 2, ba_control);
- proto_tree_add_uint(ba_mtid_sub_tree, hf_block_ack_multi_tid_value, tvb, offset+1, 1, ba_control);
+ proto_tree_add_uint(ba_mtid_sub_tree, hf_ieee80211_block_ack_multi_tid_reserved, tvb, offset, 2, ba_control);
+ proto_tree_add_uint(ba_mtid_sub_tree, hf_ieee80211_block_ack_multi_tid_value, tvb, offset+1, 1, ba_control);
offset += 2;
offset += add_fixed_field(ba_mtid_sub_tree, tvb, offset, FIELD_BLOCK_ACK_SSC);
- proto_tree_add_text(ba_mtid_sub_tree, tvb, offset, 8, "Block Ack Bitmap");
+ proto_tree_add_item(ba_mtid_sub_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 8, FALSE);
offset += 8;
}
break;
}
break;
}
- /*** End: Block Ack - Dustin Johnson ***/
}
break;
}
frag_number = SEQCTL_FRAGMENT_NUMBER(seq_control);
seq_number = SEQCTL_SEQUENCE_NUMBER(seq_control);
- if (check_col (pinfo->cinfo, COL_INFO))
- {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", SN=%d, FN=%d", seq_number,frag_number);
- }
/* Now if we have a tree we start adding stuff */
if (tree)
{
case DATA_ADDR_T1:
- proto_tree_add_ether (hdr_tree, hf_addr_da, tvb, 4, 6, dst);
- proto_tree_add_ether (hdr_tree, hf_addr_sa, tvb, 10, 6, src);
- proto_tree_add_ether (hdr_tree, hf_addr_bssid, tvb, 16, 6, bssid);
- proto_tree_add_uint (hdr_tree, hf_frag_number, tvb, 22, 2,
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_da, tvb, 4, 6, dst);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_sa, tvb, 10, 6, src);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_bssid, tvb, 16, 6, bssid);
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2,
frag_number);
- proto_tree_add_uint (hdr_tree, hf_seq_number, tvb, 22, 2,
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2,
seq_number);
/* add items for wlan.addr filter */
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 4, 6, dst);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 4, 6, dst);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 10, 6, src);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 10, 6, src);
PROTO_ITEM_SET_HIDDEN(hidden_item);
break;
case DATA_ADDR_T2:
- proto_tree_add_ether (hdr_tree, hf_addr_da, tvb, 4, 6, dst);
- proto_tree_add_ether (hdr_tree, hf_addr_bssid, tvb, 10, 6, bssid);
- proto_tree_add_ether (hdr_tree, hf_addr_sa, tvb, 16, 6, src);
- proto_tree_add_uint (hdr_tree, hf_frag_number, tvb, 22, 2,
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_da, tvb, 4, 6, dst);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_bssid, tvb, 10, 6, bssid);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_sa, tvb, 16, 6, src);
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2,
frag_number);
- proto_tree_add_uint (hdr_tree, hf_seq_number, tvb, 22, 2,
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2,
seq_number);
/* add items for wlan.addr filter */
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 4, 6, dst);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 4, 6, dst);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 16, 6, src);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 16, 6, src);
PROTO_ITEM_SET_HIDDEN(hidden_item);
break;
case DATA_ADDR_T3:
- proto_tree_add_ether (hdr_tree, hf_addr_bssid, tvb, 4, 6, bssid);
- proto_tree_add_ether (hdr_tree, hf_addr_sa, tvb, 10, 6, src);
- proto_tree_add_ether (hdr_tree, hf_addr_da, tvb, 16, 6, dst);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_bssid, tvb, 4, 6, bssid);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_sa, tvb, 10, 6, src);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_da, tvb, 16, 6, dst);
- proto_tree_add_uint (hdr_tree, hf_frag_number, tvb, 22, 2,
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2,
frag_number);
- proto_tree_add_uint (hdr_tree, hf_seq_number, tvb, 22, 2,
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2,
seq_number);
/* add items for wlan.addr filter */
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 10, 6, src);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 10, 6, src);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 16, 6, dst);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 16, 6, dst);
PROTO_ITEM_SET_HIDDEN(hidden_item);
break;
case DATA_ADDR_T4:
- proto_tree_add_ether (hdr_tree, hf_addr_ra, tvb, 4, 6,
- tvb_get_ptr (tvb, 4, 6));
- proto_tree_add_ether (hdr_tree, hf_addr_ta, tvb, 10, 6,
- tvb_get_ptr (tvb, 10, 6));
- proto_tree_add_ether (hdr_tree, hf_addr_da, tvb, 16, 6, dst);
- proto_tree_add_uint (hdr_tree, hf_frag_number, tvb, 22, 2,
+ proto_tree_add_item (hdr_tree, hf_ieee80211_addr_ra, tvb, 4, 6, ENC_NA);
+ proto_tree_add_item (hdr_tree, hf_ieee80211_addr_ta, tvb, 10, 6, ENC_NA);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_da, tvb, 16, 6, dst);
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2,
frag_number);
- proto_tree_add_uint (hdr_tree, hf_seq_number, tvb, 22, 2,
+ proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2,
seq_number);
- proto_tree_add_ether (hdr_tree, hf_addr_sa, tvb, 24, 6, src);
+ proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_sa, tvb, 24, 6, src);
/* add items for wlan.addr filter */
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 16, 6, dst);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 16, 6, dst);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- hidden_item = proto_tree_add_ether (hdr_tree, hf_addr, tvb, 24, 6, src);
+ hidden_item = proto_tree_add_ether (hdr_tree, hf_ieee80211_addr, tvb, 24, 6, src);
PROTO_ITEM_SET_HIDDEN(hidden_item);
break;
}
}
+
+#ifdef MESH_OVERRIDES
+ if (tree &&
+ (FCF_ADDR_SELECTOR(fcf) == DATA_ADDR_T4 ||
+ FCF_ADDR_SELECTOR(fcf) == DATA_ADDR_T2))
+ {
+ proto_item *msh_fields;
+ proto_tree *msh_tree;
+
+ guint16 mshoff;
+ guint8 mesh_flags;
+ guint8 mesh_ttl;
+ guint32 mesh_seq_number;
+ guint8 mesh_hdr_len;
+
+ mshoff = hdr_len;
+ mesh_flags = tvb_get_guint8(tvb, mshoff + 0);
+ /* heuristic method to determine if this is a mesh frame */
+ if (mesh_flags & ~MESH_FLAGS_ADDRESS_EXTENSION) {
+#if 0
+ g_warning("Invalid mesh flags: %x. Interpreting as WDS frame.\n", mesh_flags);
+#endif
+ break;
+ }
+ mesh_hdr_len = find_mesh_header_length(tvb_get_ptr(tvb, mshoff, 1), 0, fcf);
+ mesh_ttl = tvb_get_guint8(tvb, mshoff + 1);
+ mesh_seq_number = 0xffffff & tvb_get_letohl(tvb, mshoff + 2);
+
+ msh_fields = proto_tree_add_text(hdr_tree, tvb, mshoff, mesh_hdr_len, "Mesh Header");
+ msh_tree = proto_item_add_subtree (msh_fields, ett_msh_parameters);
+
+ proto_tree_add_boolean_format (msh_tree, hf_ieee80211_mesh_flags,
+ tvb, mshoff, 1, mesh_flags, "Address Extension %x", mesh_flags & MESH_FLAGS_ADDRESS_EXTENSION);
+ proto_tree_add_uint (msh_tree, hf_ieee80211_mesh_ttl, tvb, mshoff + 1, 1, mesh_ttl);
+ proto_tree_add_uint (msh_tree, hf_ieee80211_mesh_seq, tvb, mshoff + 2, 4, mesh_seq_number);
+ switch (mesh_hdr_len) {
+ case 24:
+ proto_tree_add_item(msh_tree, hf_ieee80211_mesh_ae3, tvb, mshoff + 18, 6, ENC_NA);
+ case 18:
+ proto_tree_add_item(msh_tree, hf_ieee80211_mesh_ae2, tvb, mshoff + 12, 6, ENC_NA);
+ case 12:
+ proto_tree_add_item(msh_tree, hf_ieee80211_mesh_ae1, tvb, mshoff + 6, 6, ENC_NA);
+ case 6:
+ break;
+ default:
+ expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR,
+ "Invalid mesh header length (%d)\n",
+ mesh_hdr_len);
+ }
+ hdr_len += mesh_hdr_len;
+ }
+#endif /* MESH_OVERRIDES */
break;
}
has_fcs = TRUE;
break;
+ case -2: /* Data frames have no FCS, other frames have an FCS */
+ if (FCF_FRAME_TYPE (fcf) == DATA_FRAME)
+ has_fcs = FALSE;
+ else
+ has_fcs = TRUE;
+ break;
+
default: /* Don't know - use "wlan_check_fcs" */
has_fcs = wlan_check_fcs;
break;
}
if(fcs_good) {
- fcs_item = proto_tree_add_uint_format(hdr_tree, hf_fcs, tvb,
+ fcs_item = proto_tree_add_uint_format(hdr_tree, hf_ieee80211_fcs, tvb,
hdr_len + len, 4, sent_fcs,
"Frame check sequence: 0x%08x [correct]", sent_fcs);
} else {
- fcs_item = proto_tree_add_uint_format(hdr_tree, hf_fcs, tvb,
+ fcs_item = proto_tree_add_uint_format(hdr_tree, hf_ieee80211_fcs, tvb,
hdr_len + len, 4, sent_fcs,
"Frame check sequence: 0x%08x [incorrect, should be 0x%08x]",
sent_fcs, fcs);
fcs_tree = proto_item_add_subtree(fcs_item, ett_fcs);
fcs_item = proto_tree_add_boolean(fcs_tree,
- hf_fcs_good, tvb,
+ hf_ieee80211_fcs_good, tvb,
hdr_len + len, 4,
fcs_good);
PROTO_ITEM_SET_GENERATED(fcs_item);
fcs_item = proto_tree_add_boolean(fcs_tree,
- hf_fcs_bad, tvb,
+ hf_ieee80211_fcs_bad, tvb,
hdr_len + len, 4,
fcs_bad);
PROTO_ITEM_SET_GENERATED(fcs_item);
}
proto_item_append_text(ti, ", Flags: %s", flag_str);
- if (check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr (pinfo->cinfo, COL_INFO, ", Flags=%s", flag_str);
+ col_append_fstr (pinfo->cinfo, COL_INFO, ", Flags=%s", flag_str);
/*
qos_eosp = QOS_EOSP(qos_control);
qos_field_content = QOS_FIELD_CONTENT(qos_control);
- proto_tree_add_uint_format (qos_tree, hf_qos_priority, tvb,
+ proto_tree_add_uint_format (qos_tree, hf_ieee80211_qos_priority, tvb,
qosoff, 1, qos_priority,
"Priority: %d (%s) (%s)",
qos_priority, qos_tags[qos_priority], qos_acs[qos_priority]);
if (flags & FLAG_FROM_DS) {
- proto_tree_add_boolean (qos_tree, hf_qos_eosp, tvb,
+ proto_tree_add_boolean (qos_tree, hf_ieee80211_qos_eosp, tvb,
qosoff, 1, qos_control);
} else {
- proto_tree_add_boolean (qos_tree, hf_qos_bit4, tvb,
+ proto_tree_add_boolean (qos_tree, hf_ieee80211_qos_bit4, tvb,
qosoff, 1, qos_control);
}
- proto_tree_add_uint (qos_tree, hf_qos_ack_policy, tvb, qosoff, 1,
+ proto_tree_add_uint (qos_tree, hf_ieee80211_qos_ack_policy, tvb, qosoff, 1,
qos_ack_policy);
if (flags & FLAG_FROM_DS) {
if (!DATA_FRAME_IS_NULL(frame_type_subtype)) {
- proto_tree_add_boolean(qos_tree, hf_qos_amsdu_present, tvb,
+ proto_tree_add_boolean(qos_tree, hf_ieee80211_qos_amsdu_present, tvb,
qosoff, 1, qos_amsdu_present);
is_amsdu = qos_amsdu_present;
}
if (DATA_FRAME_IS_CF_POLL(frame_type_subtype)) {
/* txop limit */
if (qos_field_content == 0) {
- proto_tree_add_uint_format_value (qos_tree, hf_qos_txop_limit, tvb,
+ proto_tree_add_uint_format_value (qos_tree, hf_ieee80211_qos_txop_limit, tvb,
qosoff + 1, 1, qos_field_content,
- "transmit one frame immediately (0)");
+ "transmit one frame immediately (0)");
} else {
- proto_tree_add_uint (qos_tree, hf_qos_txop_limit, tvb,
- qosoff + 1, 1, qos_field_content);
- }
+ proto_tree_add_uint (qos_tree, hf_ieee80211_qos_txop_limit, tvb,
+ qosoff + 1, 1, qos_field_content);
+ }
} else {
/* qap ps buffer state */
proto_item *qos_ps_buf_state_fields;
"QAP PS Buffer State: 0x%x", qos_field_content);
qos_ps_buf_state_tree = proto_item_add_subtree (qos_ps_buf_state_fields, ett_qos_ps_buf_state);
- proto_tree_add_boolean (qos_ps_buf_state_tree, hf_qos_buf_state_indicated,
- tvb, 1, 1, qos_field_content);
+ proto_tree_add_boolean (qos_ps_buf_state_tree, hf_ieee80211_qos_buf_state_indicated,
+ tvb, qosoff + 1, 1, qos_field_content);
if (QOS_PS_BUF_STATE_INDICATED(qos_field_content)) {
- proto_tree_add_uint (qos_ps_buf_state_tree, hf_qos_highest_pri_buf_ac, tvb,
+ proto_tree_add_uint (qos_ps_buf_state_tree, hf_ieee80211_qos_highest_pri_buf_ac, tvb,
qosoff + 1, 1, qos_field_content);
qap_buf_load = QOS_PS_QAP_BUF_LOAD(qos_field_content);
switch (qap_buf_load) {
case 0:
- proto_tree_add_uint_format_value (qos_ps_buf_state_tree, hf_qos_qap_buf_load, tvb,
+ proto_tree_add_uint_format_value (qos_ps_buf_state_tree, hf_ieee80211_qos_qap_buf_load, tvb,
qosoff + 1, 1, qos_field_content,
"no buffered traffic (0)");
break;
default:
- proto_tree_add_uint_format_value (qos_ps_buf_state_tree, hf_qos_qap_buf_load, tvb,
+ proto_tree_add_uint_format_value (qos_ps_buf_state_tree, hf_ieee80211_qos_qap_buf_load, tvb,
qosoff + 1, 1, qos_field_content,
"%d octets (%d)", qap_buf_load*4096, qap_buf_load);
break;
case 15:
- proto_tree_add_uint_format_value (qos_ps_buf_state_tree, hf_qos_qap_buf_load, tvb,
+ proto_tree_add_uint_format_value (qos_ps_buf_state_tree, hf_ieee80211_qos_qap_buf_load, tvb,
qosoff + 1, 1, qos_field_content,
"greater than 57344 octets (15)");
break;
}
} else {
if (!DATA_FRAME_IS_NULL(frame_type_subtype)) {
- proto_tree_add_boolean(qos_tree, hf_qos_amsdu_present, tvb,
+ proto_tree_add_boolean(qos_tree, hf_ieee80211_qos_amsdu_present, tvb,
qosoff, 1, qos_amsdu_present);
is_amsdu = qos_amsdu_present;
}
switch (qos_field_content) {
case 0:
- proto_tree_add_uint_format_value (qos_tree, hf_qos_queue_size,
- tvb, qosoff + 1, 1, qos_field_content,
+ proto_tree_add_uint_format_value (qos_tree, hf_ieee80211_qos_queue_size,
+ tvb, qosoff + 1, 1, qos_field_content,
"no buffered traffic in the queue (0)");
break;
default:
- proto_tree_add_uint_format_value (qos_tree, hf_qos_queue_size,
- tvb, qosoff + 1, 1, qos_field_content,
- "%u bytes (%u)", qos_field_content*256, qos_field_content);
+ proto_tree_add_uint_format_value (qos_tree, hf_ieee80211_qos_queue_size,
+ tvb, qosoff + 1, 1, qos_field_content,
+ "%u bytes (%u)", qos_field_content*256, qos_field_content);
break;
case 254:
- proto_tree_add_uint_format_value (qos_tree, hf_qos_queue_size,
- tvb, qosoff + 1, 1, qos_field_content,
+ proto_tree_add_uint_format_value (qos_tree, hf_ieee80211_qos_queue_size,
+ tvb, qosoff + 1, 1, qos_field_content,
"more than 64768 octets (254)");
break;
case 255:
- proto_tree_add_uint_format_value (qos_tree, hf_qos_queue_size,
- tvb, qosoff + 1, 1, qos_field_content,
+ proto_tree_add_uint_format_value (qos_tree, hf_ieee80211_qos_queue_size,
+ tvb, qosoff + 1, 1, qos_field_content,
"unspecified or unknown (256)");
break;
}
} else {
/* txop duration requested */
if (qos_field_content == 0) {
- proto_tree_add_uint_format_value (qos_tree, hf_qos_txop_dur_req,
- tvb, qosoff + 1, 1, qos_field_content,
- "no TXOP requested (0)");
+ proto_tree_add_uint_format_value (qos_tree, hf_ieee80211_qos_txop_dur_req,
+ tvb, qosoff + 1, 1, qos_field_content,
+ "no TXOP requested (0)");
} else {
- proto_tree_add_uint (qos_tree, hf_qos_txop_dur_req,
- tvb, qosoff + 1, 1, qos_field_content);
- }
+ proto_tree_add_uint (qos_tree, hf_ieee80211_qos_txop_dur_req,
+ tvb, qosoff + 1, 1, qos_field_content);
+ }
}
}
}
if (retransmitted) {
- if (check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " [retransmitted]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [retransmitted]");
if (tree) {
proto_item *item;
- item=proto_tree_add_none_format(hdr_tree, hf_fc_analysis_retransmission, tvb, 0, 0, "Retransmitted frame");
+ item=proto_tree_add_none_format(hdr_tree, hf_ieee80211_fc_analysis_retransmission, tvb, 0, 0, "Retransmitted frame");
PROTO_ITEM_SET_GENERATED(item);
- item=proto_tree_add_uint(hdr_tree, hf_fc_analysis_retransmission_frame,tvb, 0, 0, fnum);
+ item=proto_tree_add_uint(hdr_tree, hf_ieee80211_fc_analysis_retransmission_frame,tvb, 0, 0, fnum);
PROTO_ITEM_SET_GENERATED(item);
}
next_tvb = tvb_new_subset (tvb, hdr_len, len, reported_len);
tvb_get_letohl(tvb, hdr_len + 4),
tvb_get_guint8(tvb, hdr_len),
tvb_get_guint8(tvb, hdr_len + 2));
- proto_tree_add_string(wep_tree, hf_tkip_extiv, tvb, hdr_len,
+ proto_tree_add_string(wep_tree, hf_ieee80211_tkip_extiv, tvb, hdr_len,
EXTIV_LEN, out_buff);
} else if (algorithm==PROTECTION_ALG_CCMP) {
g_snprintf(out_buff, SHORT_STR, "0x%08X%02X%02X",
tvb_get_letohl(tvb, hdr_len + 4),
tvb_get_guint8(tvb, hdr_len + 1),
tvb_get_guint8(tvb, hdr_len));
- proto_tree_add_string(wep_tree, hf_ccmp_extiv, tvb, hdr_len,
+ proto_tree_add_string(wep_tree, hf_ieee80211_ccmp_extiv, tvb, hdr_len,
EXTIV_LEN, out_buff);
}
- proto_tree_add_uint(wep_tree, hf_wep_key, tvb, hdr_len + 3, 1, key);
+ proto_tree_add_uint(wep_tree, hf_ieee80211_wep_key, tvb, hdr_len + 3, 1, key);
}
/* Subtract out the length of the IV. */
"WEP parameters");
wep_tree = proto_item_add_subtree (wep_fields, ett_wep_parameters);
- proto_tree_add_uint (wep_tree, hf_wep_iv, tvb, hdr_len, 3, iv);
+ proto_tree_add_uint (wep_tree, hf_ieee80211_wep_iv, tvb, hdr_len, 3, iv);
tvb_memcpy(tvb, iv_buff, hdr_len, 3);
is_iv_bad = weak_iv(iv_buff);
if (is_iv_bad != -1) {
- proto_tree_add_boolean_format (wep_tree, hf_wep_iv_weak,
+ proto_tree_add_boolean_format (wep_tree, hf_ieee80211_wep_iv_weak,
tvb, 0, 0, TRUE,
"Weak IV for key byte %d",
is_iv_bad);
}
}
if (tree)
- proto_tree_add_uint (wep_tree, hf_wep_key, tvb, hdr_len + 3, 1, key);
+ proto_tree_add_uint (wep_tree, hf_ieee80211_wep_key, tvb, hdr_len + 3, 1, key);
/* Subtract out the length of the IV. */
len -= 4;
/* Davide Schiera (2006-11-21): added WEP or WPA separation */
if (algorithm==PROTECTION_ALG_WEP) {
if (can_decrypt)
- proto_tree_add_uint_format (wep_tree, hf_wep_icv, tvb,
+ proto_tree_add_uint_format (wep_tree, hf_ieee80211_wep_icv, tvb,
hdr_len + ivlen + len, 4,
tvb_get_ntohl(tvb, hdr_len + ivlen + len),
"WEP ICV: 0x%08x (not verified)",
/* Davide Schiera (2006-11-21): added WEP or WPA separation */
if (algorithm==PROTECTION_ALG_WEP) {
if (tree)
- proto_tree_add_uint_format (wep_tree, hf_wep_icv, tvb,
+ proto_tree_add_uint_format (wep_tree, hf_ieee80211_wep_icv, tvb,
hdr_len + ivlen + len, 4,
tvb_get_ntohl(tvb, hdr_len + ivlen + len),
"WEP ICV: 0x%08x (correct)",
if (next_tvb == NULL) {
/* Just show this as an incomplete fragment. */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Fragmented IEEE 802.11 frame");
+ col_set_str(pinfo->cinfo, COL_INFO, "Fragmented IEEE 802.11 frame");
next_tvb = tvb_new_subset (tvb, hdr_len, len, reported_len);
call_dissector(data_handle, next_tvb, pinfo, tree);
pinfo->fragmented = save_fragmented;
tvbuff_t *volatile msdu_tvb = NULL;
guint32 msdu_offset = 0;
guint16 i = 1;
- const guint8 *src = NULL;
- const guint8 *dst = NULL;
+ const guint8 *lcl_src = NULL;
+ const guint8 *lcl_dst = NULL;
guint16 msdu_length;
proto_item *parent_item;
proto_tree *mpdu_tree;
mpdu_tree = proto_item_add_subtree(parent_item, ett_msdu_aggregation_parent_tree);
do {
- dst = tvb_get_ptr (next_tvb, msdu_offset, 6);
- src = tvb_get_ptr (next_tvb, msdu_offset+6, 6);
+ lcl_dst = tvb_get_ptr (next_tvb, msdu_offset, 6);
+ lcl_src = tvb_get_ptr (next_tvb, msdu_offset+6, 6);
msdu_length = tvb_get_ntohs (next_tvb, msdu_offset+12);
- parent_item = proto_tree_add_uint_format(mpdu_tree, amsdu_msdu_header_text, next_tvb,
+ parent_item = proto_tree_add_uint_format(mpdu_tree, hf_ieee80211_amsdu_msdu_header_text, next_tvb,
msdu_offset, roundup2(msdu_offset+14+msdu_length, 4),
i, "A-MSDU Subframe #%u", i);
subframe_tree = proto_item_add_subtree(parent_item, ett_msdu_aggregation_subframe_tree);
i++;
- proto_tree_add_ether(subframe_tree, hf_addr_da, next_tvb, msdu_offset, 6, dst);
- proto_tree_add_ether(subframe_tree, hf_addr_sa, next_tvb, msdu_offset+6, 6, src);
- proto_tree_add_uint_format(subframe_tree, mcsset_highest_data_rate, next_tvb, msdu_offset+12, 2,
+ proto_tree_add_ether(subframe_tree, hf_ieee80211_addr_da, next_tvb, msdu_offset, 6, lcl_dst);
+ proto_tree_add_ether(subframe_tree, hf_ieee80211_addr_sa, next_tvb, msdu_offset+6, 6, lcl_src);
+ proto_tree_add_uint_format(subframe_tree, hf_ieee80211_mcsset_highest_data_rate, next_tvb, msdu_offset+12, 2,
msdu_length, "MSDU length: 0x%04X", msdu_length);
msdu_offset += 14;
octet1 = tvb_get_guint8(next_tvb, 0);
octet2 = tvb_get_guint8(next_tvb, 1);
if (octet1 != 0xaa || octet2 != 0xaa) {
- src = tvb_get_ptr (next_tvb, 6, 6);
- dst = tvb_get_ptr (next_tvb, 0, 6);
- if (memcmp(src, pinfo->dl_src.data, 6) == 0 ||
- memcmp(dst, pinfo->dl_dst.data, 6) == 0)
+ if (tvb_memeql(next_tvb, 6, pinfo->dl_src.data, 6) == 0 ||
+ tvb_memeql(next_tvb, 0, pinfo->dl_dst.data, 6) == 0)
encap_type = ENCAP_ETHERNET;
else if (octet1 == 0xff && octet2 == 0xff)
encap_type = ENCAP_IPX;
else if (octet1 == 0x00 && octet2 == 0x00) {
proto_tree_add_text(tree, next_tvb, 0, 2, "Mysterious OLPC stuff");
- next_tvb = tvb_new_subset (next_tvb, 2, -1, -1);
+ next_tvb = tvb_new_subset_remaining (next_tvb, 2);
}
}
}
proto_item *ti = NULL;
proto_tree *radio_tree = NULL;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "Radio");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_clear(pinfo->cinfo, COL_INFO);
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Radio");
+ col_clear(pinfo->cinfo, COL_INFO);
/* Add the radio information to the column information */
- if (check_col(pinfo->cinfo, COL_TX_RATE)) {
- col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%u.%u",
+ col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%u.%u",
pinfo->pseudo_header->ieee_802_11.data_rate / 2,
pinfo->pseudo_header->ieee_802_11.data_rate & 1 ? 5 : 0);
- }
- if (check_col(pinfo->cinfo, COL_RSSI)) {
/* XX - this is a percentage, not a dBm or normalized or raw RSSI */
- col_add_fstr(pinfo->cinfo, COL_RSSI, "%u",
+ col_add_fstr(pinfo->cinfo, COL_RSSI, "%u",
pinfo->pseudo_header->ieee_802_11.signal_level);
- }
if (tree) {
ti = proto_tree_add_item(tree, proto_radio, tvb, 0, 0, FALSE);
}
/* ------------- */
-static gboolean
-free_all(gpointer key_arg _U_, gpointer value _U_, gpointer user_data _U_)
-{
- return TRUE;
-}
-
static guint
retransmit_hash(gconstpointer k)
{
- const retransmit_key *key = (const retransmit_key *)k;
- guint hash_val;
- int i;
+ const retransmit_key *key = (const retransmit_key *)k;
+ guint hash_val;
+ int i;
- hash_val = 0;
- for (i = 0; i < 6; i++)
- hash_val += key->bssid[i];
+ hash_val = 0;
+ for (i = 0; i < 6; i++)
+ hash_val += key->bssid[i];
- for (i = 0; i < 6; i++)
- hash_val += key->src[i];
+ for (i = 0; i < 6; i++)
+ hash_val += key->src[i];
- return hash_val;
+ return hash_val;
}
static gint
wlan_retransmit_init(void)
{
if ( fc_analyse_retransmit_table ){
- g_hash_table_foreach_remove(fc_analyse_retransmit_table,free_all, NULL);
g_hash_table_destroy(fc_analyse_retransmit_table);
fc_analyse_retransmit_table = NULL;
}
if( fc_first_frame_table ){
- g_hash_table_foreach_remove(fc_first_frame_table,free_all, NULL);
g_hash_table_destroy(fc_first_frame_table);
fc_first_frame_table = NULL;
}
}
-/* ------------- */
-
-/*
- * yah, I know, macros, ugh, but it makes the code
- * below more readable
- * XXX - This should be rewritten to use ptvcursors, then.
- */
-#define FIELD_PRESENT(name) (hdr.name.status == 0 && hdr.name.did != 0)
-#define IFHELP(size, name, var, str) \
- if(tree) { \
- proto_tree_add_uint_format(prism_tree, hf_prism_ ## name, \
- tvb, offset, size, hdr.var, str, hdr.var); \
- } \
- offset += (size)
-#define INTFIELD(size, name, str) IFHELP(size, name, name, str)
-#define VALFIELD(name, str) \
- if (FIELD_PRESENT(name)) { \
- if(tree) { \
- proto_tree_add_uint_format(prism_tree, hf_ ## name, \
- tvb, offset, 12, hdr.name.data, \
- str ": 0x%x (DID 0x%x, Status 0x%x, Length 0x%x)", \
- hdr.name.data, hdr.name.did, \
- hdr.name.status, hdr.name.len); \
- } \
- } \
- offset += 12
-#define VALFIELD_PRISM(name, str) \
- if (FIELD_PRESENT(name)) { \
- if(tree) { \
- proto_tree_add_uint_format(prism_tree, hf_prism_ ## name ## _data, \
- tvb, offset, 12, hdr.name.data, \
- str ": 0x%x (DID 0x%x, Status 0x%x, Length 0x%x)", \
- hdr.name.data, hdr.name.did, \
- hdr.name.status, hdr.name.len); \
- } \
- } \
- offset += 12
-
static void
dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- struct prism_hdr hdr;
- proto_tree *prism_tree = NULL;
- proto_item *ti;
+ proto_tree *prism_tree = NULL, *prism_did_tree = NULL;
+ proto_item *ti = NULL, *ti_did = NULL;
tvbuff_t *next_tvb;
int offset;
- guint32 msgcode;
+ guint32 msgcode, msglen, did;
+ guint8 *devname;
offset = 0;
+ did = 0;
/* handle the new capture type. */
msgcode = tvb_get_ntohl(tvb, offset);
if ((msgcode == WLANCAP_MAGIC_COOKIE_V1) ||
- (msgcode == WLANCAP_MAGIC_COOKIE_V2)) {
- call_dissector(wlancap_handle, tvb, pinfo, tree);
- return;
+ (msgcode == WLANCAP_MAGIC_COOKIE_V2)) {
+ call_dissector(wlancap_handle, tvb, pinfo, tree);
+ return;
}
- tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr));
-
- if(check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism");
- if(check_col(pinfo->cinfo, COL_INFO))
- col_clear(pinfo->cinfo, COL_INFO);
-
- if(check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %.16s "
- "Message 0x%x, Length %d", hdr.devname,
- hdr.msgcode, hdr.msglen);
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism");
+ col_clear(pinfo->cinfo, COL_INFO);
if(tree) {
- ti = proto_tree_add_item(tree, proto_prism, tvb, 0, sizeof hdr, FALSE);
- prism_tree = proto_item_add_subtree(ti, ett_radio);
+ ti = proto_tree_add_item(tree, proto_prism, tvb, 0, 144, FALSE);
+ prism_tree = proto_item_add_subtree(ti, ett_prism);
}
- INTFIELD(4, msgcode, "Message Code: %d");
- INTFIELD(4, msglen, "Message Length: %d");
+ /* Message Code */
if(tree) {
- proto_tree_add_text(prism_tree, tvb, offset, sizeof hdr.devname,
- "Device: %s", hdr.devname);
+ proto_tree_add_item(prism_tree, hf_ieee80211_prism_msgcode, tvb, offset, 4, TRUE);
}
- offset += sizeof hdr.devname;
+ msgcode = tvb_get_letohl(tvb, offset);
+ offset += 4;
- if (FIELD_PRESENT(hosttime)) {
- if(tree) {
- proto_tree_add_uint64_format(prism_tree, hf_hosttime,
- tvb, offset, 12, hdr.hosttime.data,
- "Host timestamp: 0x%x (DID 0x%x, Status 0x%x, Length 0x%x)",
- hdr.hosttime.data, hdr.hosttime.did,
- hdr.hosttime.status, hdr.hosttime.len);
- }
- }
- offset += 12;
- if (FIELD_PRESENT(mactime)) {
- if(tree) {
- proto_tree_add_uint64_format(prism_tree, hf_mactime,
- tvb, offset, 12, hdr.mactime.data,
- "MAC timestamp: 0x%x (DID 0x%x, Status 0x%x, Length 0x%x)",
- hdr.mactime.data, hdr.mactime.did,
- hdr.mactime.status, hdr.mactime.len);
- }
- }
- offset += 12;
- if (FIELD_PRESENT(channel)) {
- if (check_col(pinfo->cinfo, COL_FREQ_CHAN))
- col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", hdr.channel.data);
+ /* Message Length */
+ if(tree) {
+ proto_tree_add_item(prism_tree, hf_ieee80211_prism_msglen, tvb, offset, 4, TRUE);
}
- VALFIELD(channel, "Channel");
- if (FIELD_PRESENT(rssi)) {
- if (check_col(pinfo->cinfo, COL_RSSI))
- col_add_fstr(pinfo->cinfo, COL_RSSI, "%d", hdr.rssi.data);
- if (tree) {
- proto_tree_add_uint_format(prism_tree, hf_prism_rssi_data,
- tvb, offset, 12, hdr.rssi.data,
- "RSSI: 0x%x (DID 0x%x, Status 0x%x, Length 0x%x)",
- hdr.rssi.data, hdr.rssi.did, hdr.rssi.status, hdr.rssi.len);
- }
+ msglen = tvb_get_letohl(tvb, offset);
+ offset += 4;
+
+ /* Device Name */
+ if(tree) {
+ proto_tree_add_item(prism_tree, hf_ieee80211_prism_devname, tvb, offset, 16, TRUE);
}
- offset += 12;
- VALFIELD_PRISM(sq, "SQ");
- VALFIELD_PRISM(signal, "Signal");
- VALFIELD_PRISM(noise, "Noise");
- if (FIELD_PRESENT(rate)) {
- if (check_col(pinfo->cinfo, COL_TX_RATE)) {
- col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%u.%u",
- hdr.rate.data / 2, hdr.rate.data & 1 ? 5 : 0);
- }
- if (tree) {
- proto_tree_add_uint64_format(prism_tree, hf_data_rate,
- tvb, offset, 12, (guint64)hdr.rate.data * 500000,
- "Data Rate: %u.%u Mb/s",
- hdr.rate.data / 2, hdr.rate.data & 1 ? 5 : 0);
- }
+ devname = tvb_get_ephemeral_string(tvb, offset, 16);
+ offset += 16;
+
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %s, Message 0x%x, Length %d", devname, msgcode, msglen);
+
+
+ while(offset < PRISM_HEADER_LENGTH)
+ {
+ /* DID */
+ if(tree) {
+ ti_did = proto_tree_add_item(prism_tree, hf_ieee80211_prism_did, tvb, offset, 12, TRUE);
+ prism_did_tree = proto_item_add_subtree(ti_did, ett_prism_did);
+
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_type, tvb, offset, 4, TRUE);
+ did = tvb_get_letohl(tvb, offset);
+ proto_item_append_text(ti_did, " %s", val_to_str(did, prism_did_vals, "Unknown %x") );
+ }
+ offset += 4;
+
+
+ /* Status */
+ if(tree) {
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_status, tvb, offset, 2, TRUE);
+ }
+ offset += 2;
+
+ /* Length */
+ if(tree) {
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_length, tvb, offset, 2, TRUE);
+ }
+ offset += 2;
+
+ /* Data... */
+ switch(did){
+ case PRISM_DID_HOSTTIME:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_hosttime, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+ case PRISM_DID_MACTIME:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_mactime, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+ case PRISM_DID_CHANNEL:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_channel, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
+ }
+ col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", tvb_get_letohl(tvb, offset));
+ break;
+ case PRISM_DID_RSSI:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rssi, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ col_add_fstr(pinfo->cinfo, COL_RSSI, "%d", tvb_get_letohl(tvb, offset));
+ break;
+ case PRISM_DID_SQ:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_sq, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+ case PRISM_DID_SIGNAL:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_signal, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+ case PRISM_DID_NOISE:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_noise, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+ case PRISM_DID_RATE:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rate, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %s Mb/s", prism_rate_return(tvb_get_letohl(tvb, offset)) );
+ }
+ col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%s", prism_rate_return(tvb_get_letohl(tvb, offset)) );
+
+ break;
+ case PRISM_DID_ISTX:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_istx, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+ case PRISM_DID_FRMLEN:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_frmlen, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+ default:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_unknown, tvb, offset, 4, TRUE);
+ }
+ break;
+ }
+ offset += 4;
}
- offset += 12;
- VALFIELD_PRISM(istx, "IsTX");
- VALFIELD_PRISM(frmlen, "Frame Length");
/* dissect the 802.11 header next */
- next_tvb = tvb_new_subset(tvb, sizeof hdr, -1, -1);
+ next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector(ieee80211_handle, next_tvb, pinfo, tree);
}
2. Frame Format
All sniff frames follow the same format:
- Offset Name Size Description
- --------------------------------------------------------------------
- 0 CaptureHeader AVS capture metadata header
- 64 802.11Header [10-30] 802.11 frame header
- ?? 802.11Payload [0-2312] 802.11 frame payload
- ?? 802.11FCS 4 802.11 frame check sequence
+ Offset Name Size Description
+ --------------------------------------------------------------------
+ 0 CaptureHeader AVS capture metadata header
+ 64 802.11Header [10-30] 802.11 frame header
+ ?? 802.11Payload [0-2312] 802.11 frame payload
+ ?? 802.11FCS 4 802.11 frame check sequence
Note that the header and payload are variable length and the payload
may be empty.
4. Capture Header Format
The following fields make up the AVS capture header:
- Offset Name Type
- ------------------------------
- 0 version uint32
- 4 length uint32
- 8 mactime uint64
- 16 hosttime uint64
- 24 phytype uint32
- 28 frequency uint32
- 32 datarate uint32
- 36 antenna uint32
- 40 priority uint32
- 44 ssi_type uint32
- 48 ssi_signal int32
- 52 ssi_noise int32
- 56 preamble uint32
- 60 encoding uint32
- 64 sequence uint32
- 68 drops uint32
+ Offset Name Type
+ ------------------------------
+ 0 version uint32
+ 4 length uint32
+ 8 mactime uint64
+ 16 hosttime uint64
+ 24 phytype uint32
+ 28 frequency uint32
+ 32 datarate uint32
+ 36 antenna uint32
+ 40 priority uint32
+ 44 ssi_type uint32
+ 48 ssi_signal int32
+ 52 ssi_noise int32
+ 56 preamble uint32
+ 60 encoding uint32
+ 64 sequence uint32
+ 68 drops uint32
72 receiver_addr uint8[6]
78 padding uint8[2]
- ------------------------------
- 80
+ ------------------------------
+ 80
The following subsections detail the fields of the capture header.
Many WLAN devices supply a relatively high resolution frame reception
time value. This field contains the value supplied by the device. If
the device does not supply a receive time value, this field shall be
-set to zero. The units for this field are microseconds.
+set to zero. The units for this field are microseconds.
If possible, this time value should be absolute, representing the number
of microseconds elapsed since the UNIX epoch.
4.4 hosttime
The hosttime field is set to the current value of the host maintained
-clock variable when the frame is received by the host.
+clock variable when the frame is received by the host.
-If possible, this time value should be absolute, representing the number
+If possible, this time value should be absolute, representing the number
of microseconds elapsed since the UNIX epoch.
4.5 phytype
-The phytype field identifies what type of PHY is employed by the WLAN
+The phytype field identifies what type of PHY is employed by the WLAN
device used to capture this frame. The valid values are:
- PhyType Value
- -------------------------------------
- phytype_fhss_dot11_97 1
- phytype_dsss_dot11_97 2
- phytype_irbaseband 3
- phytype_dsss_dot11_b 4
- phytype_pbcc_dot11_b 5
- phytype_ofdm_dot11_g 6
- phytype_pbcc_dot11_g 7
- phytype_ofdm_dot11_a 8
- phytype_dss_ofdm_dot11_g 9
+ PhyType Value
+ -------------------------------------
+ phytype_fhss_dot11_97 1
+ phytype_dsss_dot11_97 2
+ phytype_irbaseband 3
+ phytype_dsss_dot11_b 4
+ phytype_pbcc_dot11_b 5
+ phytype_ofdm_dot11_g 6
+ phytype_pbcc_dot11_g 7
+ phytype_ofdm_dot11_a 8
+ phytype_dss_ofdm_dot11_g 9
4.6 frequency
-This represents the frequency or channel number of the receiver at the
+This represents the frequency or channel number of the receiver at the
time the frame was received. It is interpreted as follows:
-For frequency hopping radios, this field is broken in to the
+For frequency hopping radios, this field is broken in to the
following subfields:
- Byte Subfield
- ------------------------
- Byte0 Hop Set
- Byte1 Hop Pattern
- Byte2 Hop Index
- Byte3 reserved
+ Byte Subfield
+ ------------------------
+ Byte0 Hop Set
+ Byte1 Hop Pattern
+ Byte2 Hop Index
+ Byte3 reserved
For non-hopping radios, the frequency is interpreted as follows:
Value Meaning
-----------------------------------------
- < 256 Channel number (using externally-defined
+ < 256 Channel number (using externally-defined
channelization)
< 10000 Center frequency, in MHz
>= 10000 Center frequency, in KHz
indicates that the underlying WLAN device does not supply any signal
strength at all and the ssi_* values are unset. "Normalized RSSI"
values are integers in the range [0-1000] where higher numbers
-indicate stronger signal. "dBm" values indicate an actual signal
+indicate stronger signal. "dBm" values indicate an actual signal
strength measurement quantity and are usually in the range [-108 - 10].
The following values indicate the three types:
- Value Description
- ---------------------------------------------
- 0 None
- 1 Normalized RSSI
- 2 dBm
- 3 Raw RSSI
+ Value Description
+ ---------------------------------------------
+ 0 None
+ 1 Normalized RSSI
+ 2 dBm
+ 3 Raw RSSI
4.11 ssi_signal
The ssi_signal field contains the signal strength value reported by
For PHYs that support variable preamble lengths, the preamble field
indicates the preamble type used for this frame. The values are:
- Value Description
- ---------------------------------------------
- 0 Undefined
- 1 Short Preamble
- 2 Long Preamble
+ Value Description
+ ---------------------------------------------
+ 0 Undefined
+ 1 Short Preamble
+ 2 Long Preamble
4.13 encoding
This specifies the encoding of the received packet. For PHYs that support
multiple encoding types, this will tell us which one was used.
- Value Description
- ---------------------------------------------
- 0 Unknown
- 1 CCK
- 2 PBCC
- 3 OFDM
- 4 DSSS-OFDM
- 5 BPSK
+ Value Description
+ ---------------------------------------------
+ 0 Unknown
+ 1 CCK
+ 2 PBCC
+ 3 OFDM
+ 4 DSSS-OFDM
+ 5 BPSK
6 QPSK
7 16QAM
8 64QAM
4.14 sequence
-This is a receive frame sequence counter. The sniff host shall
+This is a receive frame sequence counter. The sniff host shall
increment this by one for every valid frame received off the medium.
-By watching for gaps in the sequence numbers we can determine when
-packets are lost due to unreliable transport, rather than a frame never
+By watching for gaps in the sequence numbers we can determine when
+packets are lost due to unreliable transport, rather than a frame never
being received to begin with.
4.15 drops
-This is a counter of the number of known frame drops that occured. This
-is particularly useful when the system or hardware cannot keep up with
+This is a counter of the number of known frame drops that occured. This
+is particularly useful when the system or hardware cannot keep up with
the sniffer load.
4.16 receiver_addr
-This specifies the MAC address of the receiver of this frame.
-It is six octets in length. This field is followed by two octets of
+This specifies the MAC address of the receiver of this frame.
+It is six octets in length. This field is followed by two octets of
padding to keep the structure 32-bit word aligned.
================================
Changes: v2->v2.1
* Added contact e-mail address to introduction
- * Added sniffer_addr, drop count, and sequence fields, bringing total
+ * Added sniffer_addr, drop count, and sequence fields, bringing total
length to 80 bytes
* Bumped version to 0x80211002
* Mactime is specified in microseconds, not nanoseconds
/*
* Signal/noise strength type values.
*/
-#define SSI_NONE 0 /* no SSI information */
-#define SSI_NORM_RSSI 1 /* normalized RSSI - 0-1000 */
-#define SSI_DBM 2 /* dBm */
-#define SSI_RAW_RSSI 3 /* raw RSSI from the hardware */
+#define SSI_NONE 0 /* no SSI information */
+#define SSI_NORM_RSSI 1 /* normalized RSSI - 0-1000 */
+#define SSI_DBM 2 /* dBm */
+#define SSI_RAW_RSSI 3 /* raw RSSI from the hardware */
static void
dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint32 ssi_type;
guint32 antnoise;
- if(check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN");
- if(check_col(pinfo->cinfo, COL_INFO))
- col_clear(pinfo->cinfo, COL_INFO);
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN");
+ col_clear(pinfo->cinfo, COL_INFO);
offset = 0;
version = tvb_get_ntohl(tvb, offset) - WLANCAP_MAGIC_COOKIE_BASE;
length = tvb_get_ntohl(tvb, offset+4);
- if(check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "AVS WLAN Capture v%x, Length %d",version, length);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "AVS WLAN Capture v%x, Length %d",version, length);
if (version > 2) {
goto skip;
/* XXX cook channel (fh uses different numbers) */
channel = tvb_get_ntohl(tvb, offset);
if (channel < 256) {
- if (check_col(pinfo->cinfo, COL_FREQ_CHAN))
- col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", channel);
+ col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", channel);
if (tree)
proto_tree_add_uint(wlan_tree, hf_channel, tvb, offset, 4, channel);
} else if (channel < 10000) {
- if (check_col(pinfo->cinfo, COL_FREQ_CHAN))
- col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u MHz", channel);
+ col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u MHz", channel);
if (tree)
proto_tree_add_uint_format(wlan_tree, hf_channel_frequency, tvb, offset,
4, channel, "Frequency: %u MHz", channel);
} else {
- if (check_col(pinfo->cinfo, COL_FREQ_CHAN))
- col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u KHz", channel);
+ col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u KHz", channel);
if (tree)
proto_tree_add_uint_format(wlan_tree, hf_channel_frequency, tvb, offset,
4, channel, "Frequency: %u KHz", channel);
/* In units of 100 Kb/s; convert to b/s */
datarate *= 100000;
}
- if (check_col(pinfo->cinfo, COL_TX_RATE)) {
- col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%u.%u",
+
+ col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%u.%u",
datarate / 1000000,
((datarate % 1000000) > 500000) ? 5 : 0);
- }
if (tree) {
proto_tree_add_uint64_format(wlan_tree, hf_data_rate, tvb, offset, 4,
datarate,
case SSI_NORM_RSSI:
/* Normalized RSSI */
- if (check_col(pinfo->cinfo, COL_RSSI))
- col_add_fstr(pinfo->cinfo, COL_RSSI, "%u (norm)", tvb_get_ntohl(tvb, offset));
+ col_add_fstr(pinfo->cinfo, COL_RSSI, "%u (norm)", tvb_get_ntohl(tvb, offset));
if (tree)
proto_tree_add_item(wlan_tree, hf_normrssi_antsignal, tvb, offset, 4, FALSE);
break;
case SSI_DBM:
/* dBm */
- if (check_col(pinfo->cinfo, COL_RSSI))
- col_add_fstr(pinfo->cinfo, COL_RSSI, "%d dBm", tvb_get_ntohl(tvb, offset));
+ col_add_fstr(pinfo->cinfo, COL_RSSI, "%d dBm", tvb_get_ntohl(tvb, offset));
if (tree)
proto_tree_add_item(wlan_tree, hf_dbm_antsignal, tvb, offset, 4, FALSE);
break;
case SSI_RAW_RSSI:
/* Raw RSSI */
- if (check_col(pinfo->cinfo, COL_RSSI))
- col_add_fstr(pinfo->cinfo, COL_RSSI, "%u (raw)", tvb_get_ntohl(tvb, offset));
+ col_add_fstr(pinfo->cinfo, COL_RSSI, "%u (raw)", tvb_get_ntohl(tvb, offset));
if (tree)
proto_tree_add_item(wlan_tree, hf_rawrssi_antsignal, tvb, offset, 4, FALSE);
break;
offset = length;
/* dissect the 802.11 header next */
- next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+ next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector(ieee80211_handle, next_tvb, pinfo, tree);
}
"From DS: 0)"},
{FLAG_FROM_DS, "Frame from DS to a STA via AP(To DS: 0 "
"From DS: 1)"},
+#ifdef MESH_OVERRIDES
+ {FLAG_TO_DS|FLAG_FROM_DS, "WDS (AP to AP) or Mesh (MP to MP) Frame "
+ "(To DS: 1 From DS: 1)"},
+#else /* MESH_OVERRIDES */
{FLAG_TO_DS|FLAG_FROM_DS, "Frame part of WDS from one AP to another "
"AP (To DS: 1 From DS: 1)"},
+#endif /* MESH_OVERRIDES */
{0, NULL}
};
"Bits 8-15 of QoS Control field are TXOP Duration Requested"
};
- static const true_false_string hf_qos_amsdu_present_flag = {
+ static const true_false_string ieee80211_qos_amsdu_present_flag = {
"A-MSDU",
"MSDU"
};
static const value_string auth_alg[] = {
{0x00, "Open System"},
{0x01, "Shared key"},
+ {0x02, "Fast BSS Transition"},
{0x80, "Network EAP"}, /* Cisco proprietary? */
{0, NULL}
};
- /*** Begin: Block Ack Params Fixed Field - Dustin Johnson ***/
static const true_false_string ff_block_ack_params_amsdu_permitted_flag = {
"Permitted in QoS Data MPDUs",
"Not Permitted"
"Immediate Block Ack",
"Delayed Block Ack"
};
- /*** End: Block Ack Params Fixed Field - Dustin Johnson ***/
- /*** Begin: Channel Width Fixed Field - Dustin Johnson ***/
static const value_string ff_channel_width_vals[] = {
{0x00, "20 MHz channel width only"},
{0x01, "Any channel width in the STA's Supported Channel Width Set"},
{0, NULL}
};
- /*** End: Channel Width Fixed Field - Dustin Johnson ***/
- /*** Begin: QoS Information AP Fixed Field - Dustin Johnson ***/
static const true_false_string ff_qos_info_ap_q_ack_flag = {
"Implemented",
"Not Implemented"
"Can process a nonzero TXOP Duration Requested subfield in the QoS Control field in QoS data frames",
"Can NOT process a nonzero TXOP Duration Requested subfield in the QoS Control field in QoS data frames"
};
- /*** End: QoS Information AP Fixed Field - Dustin Johnson ***/
- /*** Begin: QoS Information STA Fixed Field - Dustin Johnson ***/
static const true_false_string ff_qos_info_sta_ac_flag = {
"Trigger-enabled and Delivery-enabled",
"Neither Trigger-enabled nor Delivery-enabled"
"Can process ACK frames with the More Data bit in the Frame Control field set to 1",
"Can NOT process ACK frames with the More Data bit in the Frame Control field set to 1"
};
- /*** End: QoS Information STA Fixed Field - Dustin Johnson ***/
- /*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
static const true_false_string ff_sm_pwr_save_sm_mode_flag = {
"Dynamic SM Power Save mode",
"Static SM Power Save mode"
};
- /*** End: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
- /*** Begin: PCO Phase Control Fixed Field - Dustin Johnson ***/
static const true_false_string ff_pco_phase_cntrl_flag = {
"40 MHz Phase",
"20 MHz Phase"
};
- /*** End: PCO Phase Control Fixed Field - Dustin Johnson ***/
- /*** Begin: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
static const true_false_string ff_psmp_param_set_more_psmp_flag = {
"More PSMP Sequences Follow",
"No PSMP Sequences Follow"
};
- /*** End: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
- /*** Begin: MIMO Control Fixed Field - Dustin Johnson ***/
static const value_string ff_mimo_cntrl_nc_index_flags[] = {
{0x00, "1 Column"},
{0x01, "2 Columns"},
"20 MHz"
};
- /*** Begin: HT Information Fixed Field - Dustin Johnson ***/
static const true_false_string ff_ht_info_information_request_flag = {
"Requesting HT Information Exchange management action frame",
"Should not send an HT Information Exchange management action frame"
"40 MHz",
"20 MHz"
};
- /*** End: HT Information Fixed Field - Dustin Johnson ***/
- /*** Begin: HT Category Fixed Field - Dustin Johnson ***/
static const value_string ff_ht_action_flags[] = {
{HT_ACTION_NOTIFY_CHAN_WIDTH, "Notify Channel Width"},
{HT_ACTION_SM_PWR_SAVE, "Spatial Multiplexing (SM) Power Save"},
{HT_ACTION_HT_INFO_EXCHANGE, "HT Information Exchange"},
{0x00, NULL}
};
- /*** Begin: HT Category Fixed Field - Dustin Johnson ***/
static const value_string ff_mimo_cntrl_grouping_flags[] = {
{0x00, "No Grouping"},
{0x03, "4 bit for 'Capital Psi', 6 bits for 'Small Psi'"},
{0, NULL}
};
- /*** End: MIMO Control Fixed Field - Dustin Johnson ***/
- /*** Begin: PSMP Station Information Fixed Field - Dustin Johnson ***/
- static const value_string ff_psmp_sta_info_flags[] = {
- {0x00, "Broadcast"},
- {0x01, "Multicast"},
- {0x02, "Individually Addressed"},
- {0x03, "Unknown"},
- {0, NULL}
+
+
+ static const value_string ff_pa_action_codes[] = {
+ {PA_DSE_ENABLEMENT, "DSE enablement"},
+ {PA_DSE_DEENABLEMENT, "DSE deenablement"},
+ {PA_DSE_REG_LOC_ANNOUNCEMENT, "DSE Registered Location Announcement"},
+ {PA_EXT_CHANNEL_SWITCH_ANNOUNCEMENT, "Extended Channel Switch Announcement"},
+ {PA_DSE_MEASUREMENT_REQUEST, "DSE measurement request"},
+ {PA_DSE_MEASUREMENT_REPORT, "DSE measurement report"},
+ {PA_MEASUREMENT_PILOT, "Measurement Pilot"},
+ {PA_DSE_POWER_CONSTRAINT, "DSE power constraint"},
+ {PA_VENDOR_SPECIFIC, "Vendor Specific"},
+ {PA_GAS_INITIAL_REQUEST, "GAS Initial Request"},
+ {PA_GAS_INITIAL_RESPONSE, "GAS Initial Response"},
+ {PA_GAS_COMEBACK_REQUEST, "GAS Comeback Request"},
+ {PA_GAS_COMEBACK_RESPONSE, "GAS Comeback Response"},
+ {PA_TDLS_DISCOVERY_RESPONSE, "TDLS Discovery Response"},
+ {0x00, NULL}
};
- /*** End: PSMP Station Information Fixed Field - Dustin Johnson ***/
static const value_string reason_codes[] = {
{0x00, "Reserved"},
{0x16, "Invalid RSN IE Capabilities"},
{0x17, "IEEE 802.1X Authentication failed"},
{0x18, "Cipher suite is rejected per security policy"},
+ {0x19, "TDLS direct-link teardown due to TDLS peer STA unreachable via "
+ "the TDLS direct link"},
+ {0x1A, "TDLS direct-link teardown for unspecified reason"},
{0x20, "Disassociated for unspecified, QoS-related reason"},
{0x21, "Disassociated because QoS AP lacks sufficient bandwidth for this QoS STA"},
{0x22, "Disassociated because of excessive number of frames that need to be "
static const value_string status_codes[] = {
{0x00, "Successful"},
{0x01, "Unspecified failure"},
+ {0x02, "TDLS wakeup schedule rejected but alternative schedule provided"},
+ {0x03, "TDLS wakeup schedule rejected"},
+ {0x05, "Security disabled"},
+ {0x06, "Unacceptable lifetime"},
+ {0x07, "Not in same BSS"},
{0x0A, "Cannot support all requested capabilities in the "
"Capability information field"},
{0x0B, "Reassociation denied due to inability to confirm that "
"short slot operation"},
{0x1A, "Association denied due to requesting station not supporting "
"DSSS-OFDM operation"},
+ {0x1C, "R0KH unreachable"},
+ {0x1E, "Association request rejected temporarily; try again later"},
+ {0x1F, "Robust Management frame policy violation"},
{0x20, "Unspecified, QoS-related failure"},
{0x21, "Association denied due to QAP having insufficient bandwidth "
"to handle another QSTA"},
{0x30, "Direct Link is not allowed in the BSS by policy"},
{0x31, "Destination STA is not present within this QBSS."},
{0x32, "The Destination STA is not a QSTA."},
+ {0x34, "Invalid FT Action frame count"},
+ {0x35, "Invalid pairwise master key identifier (PMKID)"},
+ {0x36, "Invalid MDIE"},
+ {0x37, "Invalid FTIE"},
+ {0x3B, "GAS Advertisement Protocol not supported"},
+ {0x3C, "No outstanding GAS request"},
+ {0x3D, "GAS Response not received from the Advertisement Server"},
+ {0x3E, "STA timed out waiting for GAS Query Response"},
+ {0x3F, "GAS Response is larger than query response length limit"},
+ {0x40, "Advertisement Server in the network is not currently reachable"},
+ {0x41, "Requested information is not available for this BSSID"},
+ {0x42, "Transmission failure"},
+ {0x43, "Request refused due to permissions received via SSPN interface"},
+ {0x44, "Request refused because AP does not support unauthenticated "
+ "access"},
+ {0x48, "Invalid contents of RSNIE"},
{0x00, NULL}
};
static const value_string category_codes[] = {
{CAT_SPECTRUM_MGMT, "Spectrum Management (SM)"},
+ {0x80 | CAT_SPECTRUM_MGMT, "Spectrum Management (SM) (error)"},
{CAT_QOS, "Quality of Service (QoS)"},
+ {0x80 | CAT_QOS, "Quality of Service (QoS (error))"},
{CAT_DLS, "Direct-Link Setup (DLS)"},
+ {0x80 | CAT_DLS, "Direct-Link Setup (DLS) (error)"},
{CAT_BLOCK_ACK, "Block Ack"},
+ {0x80 | CAT_BLOCK_ACK, "Block Ack (error)"},
+ {CAT_PUBLIC, "Public Action"},
+ {0x80 | CAT_PUBLIC, "Public Action (error)"},
+#ifdef MESH_OVERRIDES
+ {CAT_MESH_PEER_LINK, "Mesh Peer Link"},
+ {0x80 | CAT_MESH_PEER_LINK, "Mesh Peer Link"},
+ {CAT_MESH_LINK_METRIC, "Mesh Link Metric"},
+ {0x80 | CAT_MESH_LINK_METRIC, "Mesh Link Metric"},
+ {CAT_MESH_PATH_SELECTION, "Mesh Path Selection"},
+ {0x80 | CAT_MESH_PATH_SELECTION, "Mesh Path Selection"},
+ {CAT_MESH_INTERWORKING, "Mesh Internetworking"},
+ {0x80 | CAT_MESH_INTERWORKING, "Mesh Internetworking"},
+ {CAT_MESH_RESOURCE_COORDINATION, "Mesh Resource Coordination"},
+ {0x80 | CAT_MESH_RESOURCE_COORDINATION, "Mesh Resource Coordination"},
+ {CAT_MESH_SECURITY_ARCHITECTURE, "Mesh Security Arch"},
+ {0x80 | CAT_MESH_SECURITY_ARCHITECTURE, "Mesh Security Arch"},
+#endif /* MESH_OVERRIDES */
{CAT_RADIO_MEASUREMENT, "Radio Measurement"},
+ {0x80 | CAT_RADIO_MEASUREMENT, "Radio Measurement (error)"},
+ {CAT_FAST_BSS_TRANSITION, "Fast BSS Transition"},
+ {0x80 | CAT_FAST_BSS_TRANSITION, "Fast BSS Transition (error)"},
{CAT_HT, "High Throughput"},
+ {0x80 | CAT_HT, "High Throughput (error)"},
+ {CAT_SA_QUERY, "SA Query"},
+ {0x80 | CAT_SA_QUERY, "SA Query (error)"},
+ {CAT_PUBLIC_PROTECTED, "Protected Dual of Public Action"},
+ {0x80 | CAT_PUBLIC_PROTECTED, "Protected Dual of Public Action (error)"},
+ {CAT_TDLS, "TDLS"},
+ {0x80 | CAT_TDLS, "TDLS (error)"},
{CAT_MGMT_NOTIFICATION, "Management Notification"},
+ {0x80 | CAT_MGMT_NOTIFICATION, "Management Notification (error)"},
+ {CAT_VENDOR_SPECIFIC_PROTECTED, "Vendor-specific Protected"},
+ {0x80 | CAT_VENDOR_SPECIFIC_PROTECTED, "Vendor-specific Protected (error)"},
{CAT_VENDOR_SPECIFIC, "Vendor Specific"},
+ {0x80 | CAT_VENDOR_SPECIFIC, "Vendor Specific (error)"},
{0, NULL}
};
{0x00, NULL}
};
+#ifdef MESH_OVERRIDES
+ static const value_string mesh_mgt_action_ps_codes[] ={
+ {MESH_PS_PATH_REQUEST, "Path Request"},
+ {MESH_PS_PATH_REPLY, "Path Reply"},
+ {MESH_PS_PATH_ERROR, "Path Error"},
+ {MESH_PS_ROOT_ANNOUNCEMENT, "Root Announcement"},
+ {0, NULL}
+ };
+
+ static const value_string mesh_mgt_action_pl_codes[] ={
+ {MESH_PL_PEER_LINK_OPEN, "Peer Link Open"},
+ {MESH_PL_PEER_LINK_CONFIRM, "Peer Link Confirm"},
+ {MESH_PL_PEER_LINK_CLOSE, "Peer Link Close"},
+ {0, NULL}
+ };
+
+ static const value_string mesh_mgt_pl_reason_codes[] = {
+ {MESH_LINK_CANCELLED, "Link Cancelled"},
+ {MESH_MAX_NEIGHBORS, "Maximum Number of Peers Reached"},
+ {MESH_CONFIG_POLICY_VIOLATION, "Policy Violation"},
+ {MESH_CLOSE_RCVD, "Close Received"},
+ {MESH_MAX_RETRIES, "Maximum Retries"},
+ {MESH_CONFIRM_TIMEOUT, "Confirm Timeout"},
+ {0x00, NULL}
+ };
+
+ static const true_false_string mesh_dest_rf_flags ={
+ "[RF = 1] Intermediate Nodes That Respond Will Also Forward",
+ "[RF = 0] Intermediate Nodes That Respond Will Not Forward"
+ };
+
+ static const true_false_string mesh_dest_do_flags ={
+ "[DO = 1] Only Destination Will Respond",
+ "[DO = 0] Intermediate Nodes May Respond"
+ };
+#endif /* MESH_OVERRIDES */
+
static const value_string ack_policy[] = {
{0x00, "Normal Ack"},
{0x01, "No Ack"},
{0, NULL}
};
- /*** Begin: Block Ack Action Fixed Field - Dustin Johnson ***/
static const value_string ba_action_codes[] = {
{BA_ADD_BLOCK_ACK_REQUEST, "Add Block Ack Request"},
{BA_ADD_BLOCK_ACK_RESPONSE, "Add Block Ack Response"},
{BA_DELETE_BLOCK_ACK, "Delete Block Ack"},
{0x00, NULL}
};
- /*** End: Block Ack Action Fixed Field - Dustin Johnson ***/
static const value_string dls_action_codes[] = {
{SM_ACTION_DLS_REQUEST, "DLS Request"},
{0, NULL}
};
- static const value_string tclas_process[] = {
- {0x00, "Incoming MSDU's higher layer parameters have to match to the parameters in all associated TCLAS elements."},
- {0x01, "Incoming MSDU's higher layer parameters have to match to at least one of the associated TCLAS elements."},
- {0x02, "Incoming MSDU's that do not belong to any other TS are classified to the TS for which this TCLAS Processing element is used. In this case, there will not be any associated TCLAS elements."},
- {0, NULL}
- };
-
- /*** Begin: Block Ack/Block Ack Request - Dustin Johnson***/
- static const true_false_string hf_block_ack_control_ack_policy_flag = {
+ static const true_false_string ieee80211_block_ack_control_ack_policy_flag = {
"Immediate Acknowledgement Required",
"Sender Does Not Require Immediate Acknowledgement"
};
- static const value_string hf_block_ack_request_type_flags[] = {
+ static const value_string ieee80211_block_ack_request_type_flags[] = {
{0x00, "Basic Block Ack Request"},
{0x01, "Reserved"},
{0x02, "Compressed Block Ack Request"},
{0x00, NULL}
};
- static const value_string hf_block_ack_type_flags[] = {
+ static const value_string ieee80211_block_ack_type_flags[] = {
{0x00, "Basic Block Ack"},
{0x01, "Reserved"},
{0x02, "Compressed Block"},
{0x03, "Multi-TID Block"},
{0x00, NULL}
};
- /*** End: Block Ack/Block Ack Request - Dustin Johnson***/
static const value_string phy_type[] = {
{ 0, "Unknown" },
{ 0, NULL }
};
+ static const value_string ft_action_codes[] ={
+ {FT_ACTION_REQUEST, "FT Request"},
+ {FT_ACTION_RESPONSE, "FT Response"},
+ {FT_ACTION_CONFIRM, "FT Confirm"},
+ {FT_ACTION_ACK, "FT Ack"},
+ {0, NULL}
+ };
+
+ static const value_string sa_query_action_codes[] ={
+ {SA_QUERY_REQUEST, "SA Query Request"},
+ {SA_QUERY_RESPONSE, "SA Query Response"},
+ {0, NULL}
+ };
+
+ static const value_string ieee80211_data_encap_payload_types[] = {
+ {1, "Remote Request/Response"},
+ {2, "TDLS"},
+ {0, NULL}
+ };
+
static hf_register_info hf[] = {
{&hf_mactime,
{"MAC timestamp", "wlan.mactime", FT_UINT64, BASE_DEC, NULL, 0x0,
{&hf_hosttime,
{"Host timestamp", "wlan.hosttime", FT_UINT64, BASE_DEC, NULL, 0x0,
- "", HFILL }},
+ NULL, HFILL }},
{&hf_data_rate,
{"Data Rate", "wlan.data_rate", FT_UINT64, BASE_DEC, NULL, 0,
"RF noise power at the antenna, normalized to the range 0-1000", HFILL }},
{&hf_dbm_antnoise,
- {"SSI Noise (dBm)", "radiotap.dbm_antnoise", FT_INT32, BASE_DEC, NULL, 0x0,
+ {"SSI Noise (dBm)", "wlan.dbm_antnoise", FT_INT32, BASE_DEC, NULL, 0x0,
"RF noise power at the antenna from a fixed, arbitrary value in decibels per one milliwatt", HFILL }},
{&hf_rawrssi_antnoise,
{"Signal Strength", "wlan.signal_strength", FT_UINT8, BASE_DEC, NULL, 0,
"Signal strength (Percentage)", HFILL }},
- {&hf_fc_field,
+ {&hf_ieee80211_fc_field,
{"Frame Control Field", "wlan.fc", FT_UINT16, BASE_HEX, NULL, 0,
"MAC Frame control", HFILL }},
- {&hf_fc_proto_version,
+ {&hf_ieee80211_fc_proto_version,
{"Version", "wlan.fc.version", FT_UINT8, BASE_DEC, NULL, 0,
"MAC Protocol version", HFILL }}, /* 0 */
- {&hf_fc_frame_type,
+ {&hf_ieee80211_fc_frame_type,
{"Type", "wlan.fc.type", FT_UINT8, BASE_DEC, VALS(frame_type), 0,
"Frame type", HFILL }},
- {&hf_fc_frame_subtype,
+ {&hf_ieee80211_fc_frame_subtype,
{"Subtype", "wlan.fc.subtype", FT_UINT8, BASE_DEC, NULL, 0,
"Frame subtype", HFILL }}, /* 2 */
- {&hf_fc_frame_type_subtype,
+ {&hf_ieee80211_fc_frame_type_subtype,
{"Type/Subtype", "wlan.fc.type_subtype", FT_UINT8, BASE_HEX, VALS(frame_type_subtype_vals), 0,
"Type and subtype combined (first byte: type, second byte: subtype)", HFILL }},
- {&hf_fc_flags,
+ {&hf_ieee80211_fc_flags,
{"Protocol Flags", "wlan.flags", FT_UINT8, BASE_HEX, NULL, 0,
- "Protocol flags", HFILL }},
+ NULL, HFILL }},
- {&hf_fc_data_ds,
+ {&hf_ieee80211_fc_data_ds,
{"DS status", "wlan.fc.ds", FT_UINT8, BASE_HEX, VALS (&tofrom_ds), (FLAG_FROM_DS|FLAG_TO_DS),
"Data-frame DS-traversal status", HFILL }}, /* 3 */
- {&hf_fc_to_ds,
+ {&hf_ieee80211_fc_to_ds,
{"To DS", "wlan.fc.tods", FT_BOOLEAN, 8, TFS (&tods_flag), FLAG_TO_DS,
"To DS flag", HFILL }}, /* 4 */
- {&hf_fc_from_ds,
+ {&hf_ieee80211_fc_from_ds,
{"From DS", "wlan.fc.fromds", FT_BOOLEAN, 8, TFS (&fromds_flag), FLAG_FROM_DS,
"From DS flag", HFILL }}, /* 5 */
- {&hf_fc_more_frag,
+ {&hf_ieee80211_fc_more_frag,
{"More Fragments", "wlan.fc.frag", FT_BOOLEAN, 8, TFS (&more_frags), FLAG_MORE_FRAGMENTS,
"More Fragments flag", HFILL }}, /* 6 */
- {&hf_fc_retry,
+ {&hf_ieee80211_fc_retry,
{"Retry", "wlan.fc.retry", FT_BOOLEAN, 8, TFS (&retry_flags), FLAG_RETRY,
"Retransmission flag", HFILL }},
- { &hf_fc_analysis_retransmission,
+ { &hf_ieee80211_fc_analysis_retransmission,
{"Retransmission", "wlan.analysis.retransmission", FT_NONE, BASE_NONE,
NULL, 0x0, "This frame is a suspected wireless retransmission", HFILL }},
- { &hf_fc_analysis_retransmission_frame,
+ { &hf_ieee80211_fc_analysis_retransmission_frame,
{"Retransmission of frame", "wlan.analysis.retransmission_frame", FT_FRAMENUM, BASE_NONE,
NULL, 0x0, "This is a retransmission of frame #", HFILL }},
- {&hf_fc_pwr_mgt,
+ {&hf_ieee80211_fc_pwr_mgt,
{"PWR MGT", "wlan.fc.pwrmgt", FT_BOOLEAN, 8, TFS (&pm_flags), FLAG_POWER_MGT,
"Power management status", HFILL }},
- {&hf_fc_more_data,
+ {&hf_ieee80211_fc_more_data,
{"More Data", "wlan.fc.moredata", FT_BOOLEAN, 8, TFS (&md_flags), FLAG_MORE_DATA,
"More data flag", HFILL }},
- {&hf_fc_protected,
+ {&hf_ieee80211_fc_protected,
{"Protected flag", "wlan.fc.protected", FT_BOOLEAN, 8, TFS (&protected_flags), FLAG_PROTECTED,
- "Protected flag", HFILL }},
+ NULL, HFILL }},
- {&hf_fc_order,
+ {&hf_ieee80211_fc_order,
{"Order flag", "wlan.fc.order", FT_BOOLEAN, 8, TFS (&order_flags), FLAG_ORDER,
"Strictly ordered flag", HFILL }},
- {&hf_assoc_id,
- {"Association ID","wlan.aid",FT_UINT16, BASE_DEC,NULL,0,
+ {&hf_ieee80211_assoc_id,
+ {"Association ID","wlan.aid",FT_UINT16, BASE_DEC, NULL, 0x3FFF,
"Association-ID field", HFILL }},
- {&hf_did_duration,
+ {&hf_ieee80211_did_duration,
{"Duration", "wlan.duration", FT_UINT16, BASE_DEC, NULL, 0,
"Duration field", HFILL }},
- {&hf_addr_da,
+ {&hf_ieee80211_addr_da,
{"Destination address", "wlan.da", FT_ETHER, BASE_NONE, NULL, 0,
"Destination Hardware Address", HFILL }},
- {&hf_addr_sa,
+ {&hf_ieee80211_addr_sa,
{"Source address", "wlan.sa", FT_ETHER, BASE_NONE, NULL, 0,
"Source Hardware Address", HFILL }},
- { &hf_addr,
+ { &hf_ieee80211_addr,
{"Source or Destination address", "wlan.addr", FT_ETHER, BASE_NONE, NULL, 0,
"Source or Destination Hardware Address", HFILL }},
- {&hf_addr_ra,
+ {&hf_ieee80211_addr_ra,
{"Receiver address", "wlan.ra", FT_ETHER, BASE_NONE, NULL, 0,
"Receiving Station Hardware Address", HFILL }},
- {&hf_addr_ta,
+ {&hf_ieee80211_addr_ta,
{"Transmitter address", "wlan.ta", FT_ETHER, BASE_NONE, NULL, 0,
"Transmitting Station Hardware Address", HFILL }},
- {&hf_addr_addr1,
- {"First Address of Contained Frame", "wlan.controlwrap.addr1", FT_ETHER, BASE_NONE, NULL, 0,
- "First Address of Contained Frame", HFILL }},
-
- {&hf_addr_bssid,
+ {&hf_ieee80211_addr_bssid,
{"BSS Id", "wlan.bssid", FT_ETHER, BASE_NONE, NULL, 0,
"Basic Service Set ID", HFILL }},
- {&hf_frag_number,
+ {&hf_ieee80211_frag_number,
{"Fragment number", "wlan.frag", FT_UINT16, BASE_DEC, NULL, 0,
- "Fragment number", HFILL }},
+ NULL, HFILL }},
- {&hf_seq_number,
+ {&hf_ieee80211_seq_number,
{"Sequence number", "wlan.seq", FT_UINT16, BASE_DEC, NULL, 0,
- "Sequence number", HFILL }},
+ NULL, HFILL }},
- {&hf_qos_priority,
+ {&hf_ieee80211_qos_priority,
{"Priority", "wlan.qos.priority", FT_UINT16, BASE_DEC, NULL, 0,
"802.1D Tag", HFILL }},
- {&hf_qos_eosp,
+ {&hf_ieee80211_qos_eosp,
{"EOSP", "wlan.qos.eosp", FT_BOOLEAN, 8, TFS (&eosp_flag), QOS_FLAG_EOSP,
"EOSP Field", HFILL }},
- {&hf_qos_bit4,
+ {&hf_ieee80211_qos_bit4,
{"QoS bit 4", "wlan.qos.bit4", FT_BOOLEAN, 8, TFS (&bit4_flag), QOS_FLAG_EOSP,
- "QoS bit 4", HFILL }},
+ NULL, HFILL }},
- {&hf_qos_ack_policy,
+ {&hf_ieee80211_qos_ack_policy,
{"Ack Policy", "wlan.qos.ack", FT_UINT8, BASE_HEX, VALS (&ack_policy), 0,
- "Ack Policy", HFILL }},
+ NULL, HFILL }},
- {&hf_qos_amsdu_present,
+ {&hf_ieee80211_qos_amsdu_present,
{"Payload Type", "wlan.qos.amsdupresent", FT_BOOLEAN, BASE_NONE,
- TFS (&hf_qos_amsdu_present_flag), 0, "Payload Type", HFILL }},
+ TFS (&ieee80211_qos_amsdu_present_flag), 0x0, NULL, HFILL }},
- {&hf_qos_txop_limit,
+ {&hf_ieee80211_qos_txop_limit,
{"TXOP Limit", "wlan.qos.txop_limit", FT_UINT16, BASE_DEC, NULL, 0,
- "TXOP Limit", HFILL }},
+ NULL, HFILL }},
- {&hf_qos_buf_state_indicated,
+ {&hf_ieee80211_qos_buf_state_indicated,
{"Buffer State Indicated", "wlan.qos.buf_state_indicated",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x02,
- "Buffer State Indicated", HFILL }},
+ NULL, HFILL }},
- {&hf_qos_highest_pri_buf_ac,
+ {&hf_ieee80211_qos_highest_pri_buf_ac,
{"Highest-Priority Buffered AC", "wlan.qos.highest_pri_buf_ac",
FT_UINT8, BASE_DEC, VALS(wme_acs), 0x0C,
- "Highest-Priority Buffered AC", HFILL }},
+ NULL, HFILL }},
- {&hf_qos_qap_buf_load,
+ {&hf_ieee80211_qos_qap_buf_load,
{"QAP Buffered Load", "wlan.qos.qap_buf_load",
FT_UINT8, BASE_DEC, NULL, 0xF0,
- "QAP Buffered Load", HFILL }},
+ NULL, HFILL }},
- {&hf_qos_txop_dur_req,
+ {&hf_ieee80211_qos_txop_dur_req,
{"TXOP Duration Requested", "wlan.qos.txop_dur_req", FT_UINT16, BASE_DEC, NULL, 0,
- "TXOP Duration Requested", HFILL }},
+ NULL, HFILL }},
- {&hf_qos_queue_size,
+ {&hf_ieee80211_qos_queue_size,
{"Queue Size", "wlan.qos.queue_size", FT_UINT16, BASE_DEC, NULL, 0,
- "Queue Size", HFILL }},
+ NULL, HFILL }},
- {&hf_fcs,
+ {&hf_ieee80211_fcs,
{"Frame check sequence", "wlan.fcs", FT_UINT32, BASE_HEX,
NULL, 0, "Frame Check Sequence (FCS)", HFILL }},
- {&hf_fcs_good,
+ {&hf_ieee80211_fcs_good,
{"Good", "wlan.fcs_good", FT_BOOLEAN, BASE_NONE,
- NULL, 0, "True if the FCS is correct", HFILL }},
+ NULL, 0x0, "True if the FCS is correct", HFILL }},
- {&hf_fcs_bad,
+ {&hf_ieee80211_fcs_bad,
{"Bad", "wlan.fcs_bad", FT_BOOLEAN, BASE_NONE,
- NULL, 0, "True if the FCS is incorrect", HFILL }},
+ NULL, 0x0, "True if the FCS is incorrect", HFILL }},
- {&hf_fragment_overlap,
+ {&hf_ieee80211_fragment_overlap,
{"Fragment overlap", "wlan.fragment.overlap", FT_BOOLEAN, BASE_NONE,
NULL, 0x0, "Fragment overlaps with other fragments", HFILL }},
- {&hf_fragment_overlap_conflict,
+ {&hf_ieee80211_fragment_overlap_conflict,
{"Conflicting data in fragment overlap", "wlan.fragment.overlap.conflict",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"Overlapping fragments contained conflicting data", HFILL }},
- {&hf_fragment_multiple_tails,
+ {&hf_ieee80211_fragment_multiple_tails,
{"Multiple tail fragments found", "wlan.fragment.multipletails",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"Several tails were found when defragmenting the packet", HFILL }},
- {&hf_fragment_too_long_fragment,
+ {&hf_ieee80211_fragment_too_long_fragment,
{"Fragment too long", "wlan.fragment.toolongfragment",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"Fragment contained data past end of packet", HFILL }},
- {&hf_fragment_error,
+ {&hf_ieee80211_fragment_error,
{"Defragmentation error", "wlan.fragment.error",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"Defragmentation error due to illegal fragments", HFILL }},
- {&hf_fragment,
+ {&hf_ieee80211_fragment_count,
+ {"Fragment count", "wlan.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_fragment,
{"802.11 Fragment", "wlan.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
- "802.11 Fragment", HFILL }},
+ NULL, HFILL }},
- {&hf_fragments,
+ {&hf_ieee80211_fragments,
{"802.11 Fragments", "wlan.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
- "802.11 Fragments", HFILL }},
+ NULL, HFILL }},
- {&hf_reassembled_in,
+ {&hf_ieee80211_reassembled_in,
{"Reassembled 802.11 in frame", "wlan.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"This 802.11 packet is reassembled in this frame", HFILL }},
- {&hf_wep_iv,
+ {&hf_ieee80211_reassembled_length,
+ {"Reassembled 802.11 length", "wlan.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "The total length of the reassembled payload", HFILL }},
+
+ {&hf_ieee80211_wep_iv,
{"Initialization Vector", "wlan.wep.iv", FT_UINT24, BASE_HEX, NULL, 0,
- "Initialization Vector", HFILL }},
+ NULL, HFILL }},
- {&hf_wep_iv_weak,
+ {&hf_ieee80211_wep_iv_weak,
{"Weak IV", "wlan.wep.weakiv", FT_BOOLEAN,BASE_NONE, NULL,0x0,
- "Weak IV",HFILL}},
+ NULL,HFILL}},
- {&hf_tkip_extiv,
+ {&hf_ieee80211_tkip_extiv,
{"TKIP Ext. Initialization Vector", "wlan.tkip.extiv", FT_STRING,
- BASE_HEX, NULL, 0, "TKIP Extended Initialization Vector", HFILL }},
+ BASE_NONE, NULL, 0, "TKIP Extended Initialization Vector", HFILL }},
- {&hf_ccmp_extiv,
+ {&hf_ieee80211_ccmp_extiv,
{"CCMP Ext. Initialization Vector", "wlan.ccmp.extiv", FT_STRING,
- BASE_HEX, NULL, 0, "CCMP Extended Initialization Vector", HFILL }},
+ BASE_NONE, NULL, 0, "CCMP Extended Initialization Vector", HFILL }},
- {&hf_wep_key,
+ {&hf_ieee80211_wep_key,
{"Key Index", "wlan.wep.key", FT_UINT8, BASE_DEC, NULL, 0,
- "Key Index", HFILL }},
+ NULL, HFILL }},
- {&hf_wep_icv,
+ {&hf_ieee80211_wep_icv,
{"WEP ICV", "wlan.wep.icv", FT_UINT32, BASE_HEX, NULL, 0,
- "WEP ICV", HFILL }},
- /*** Begin: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
- {&hf_pst_timingquality,
+ NULL, HFILL }},
+ /*** Begin: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
+
+
+ {&hf_ieee80211_pst_timingquality,
{"Timing Quality", "pst.timingQuality", FT_UINT16, BASE_DEC, NULL, 0,
"PST Timing Quality", HFILL }},
- {&hf_pst_providercount,
+ {&hf_ieee80211_pst_providercount,
{"No. of Providers announcing their Services", "pst.providerCount", FT_UINT8, BASE_DEC, NULL, 0,
"Provider Count", HFILL }},
- {&hf_pst_length,
- {"Provider Service Table Length ", "pst.length", FT_UINT16, BASE_DEC, NULL, 0,
+ {&hf_ieee80211_pst_providercap,
+ {"Capabilities of Provider", "pst.providercap", FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_pst_length,
+ {"Provider Service Table Length", "pst.length", FT_UINT16, BASE_DEC, NULL, 0,
"PST Length", HFILL }},
- {&hf_pst_contents,
- {"Provider Service Table Contents ", "pst.contents", FT_UINT8, BASE_HEX, NULL, 0,
+ {&hf_ieee80211_pst_contents,
+ {"Provider Service Table Contents", "pst.contents", FT_UINT8, BASE_HEX, NULL, 0,
"PST Contents", HFILL }},
- {&hf_pst_acid,
- {"Application Class ID (ACID) ", "pst.ACID", FT_UINT8, BASE_DEC, NULL, 0,
+ {&hf_ieee80211_pst_acid,
+ {"Application Class ID (ACID)", "pst.ACID", FT_UINT8, BASE_DEC, NULL, 0,
"PST ACID", HFILL }},
- {&hf_pst_acm_length,
+ {&hf_ieee80211_pst_acm_length,
{"Application Context Mask (ACM) Length", "pst.ACM.length", FT_UINT8, BASE_DEC, NULL, 0,
"PST ACM Length", HFILL }},
- {&hf_pst_acm,
- {"Application Context Mask", "pst.ACM", FT_STRING, BASE_NONE, NULL, 0,
- "PST ACM", HFILL }},
-
- {&hf_pst_acm_contents,
- {"Application Context Mask Contents (ACM)", "pst.ACM.contents", FT_UINT32, BASE_DEC, NULL, 0,
+ {&hf_ieee80211_pst_acm_contents,
+ {"Application Context Mask Contents (ACM)", "pst.ACM.contents", FT_STRING, BASE_NONE, NULL, 0,
"PST ACM Contents", HFILL }},
- {&hf_pst_acf,
- {"Application Contents Field (ACF)", "pst.ACF", FT_UINT32, BASE_DEC, NULL, 0,
+ {&hf_ieee80211_pst_acf,
+ {"Application Contents Field (ACF)", "pst.ACF", FT_STRING, BASE_NONE, NULL, 0,
"PST ACF", HFILL }},
- {&hf_pst_priority,
+ {&hf_ieee80211_pst_priority,
{"Application Priority", "pst.priority", FT_UINT8, BASE_DEC, NULL, 0,
"PST Priority", HFILL }},
- {&hf_pst_ipv6addr,
+ {&hf_ieee80211_pst_ipv6addr,
{"Internet Protocol V6 Address", "pst.ipv6addr", FT_IPv6, BASE_NONE, NULL, 0,
"IP v6 Addr", HFILL }},
- {&hf_pst_macaddr,
+ {&hf_ieee80211_pst_macaddr,
{"Medium Access Control Address (MAC addr)", "pst.macaddr", FT_ETHER, BASE_NONE, NULL, 0,
"MAC Address", HFILL }},
- {&hf_pst_serviceport,
- {"Service Port ", "pst.serviceport", FT_UINT16, BASE_DEC, NULL, 0,
+ {&hf_ieee80211_pst_serviceport,
+ {"Service Port", "pst.serviceport", FT_UINT16, BASE_DEC, NULL, 0,
"PST Service Port", HFILL }},
- {&hf_pst_addressing,
- {"Addressing ", "pst.addressing", FT_UINT8, BASE_DEC, NULL, 0,
+ {&hf_ieee80211_pst_addressing,
+ {"Addressing", "pst.addressing", FT_UINT8, BASE_DEC, NULL, 0,
"PST Addressing", HFILL }},
- {&hf_pst_channel,
+ {&hf_ieee80211_pst_channel,
{"Service (IEE802.11) Channel", "pst.channel", FT_UINT8, BASE_DEC, NULL, 0,
"PST Service Channel", HFILL }},
- {&hf_chan_noc,
+ {&hf_ieee80211_chan_noc,
{"Number of Channels", "chan.chan_uknown", FT_UINT8, BASE_DEC, NULL, 0,
- "Number of Channels", HFILL }},
+ NULL, HFILL }},
- {&hf_chan_length,
+ {&hf_ieee80211_chan_length,
{"Length", "chan.chan_length", FT_UINT8, BASE_DEC, NULL, 0,
- "Length", HFILL }},
+ NULL, HFILL }},
- {&hf_chan_content,
+ {&hf_ieee80211_chan_content,
{"Contents", "chan.chan_content", FT_UINT8, BASE_DEC, NULL, 0,
- "Contents", HFILL }},
+ NULL, HFILL }},
- {&hf_chan_channel,
+ {&hf_ieee80211_chan_channel,
{"channel", "chan.chan_channel", FT_UINT8, BASE_DEC, NULL, 0,
- "channel", HFILL }},
+ NULL, HFILL }},
- {&hf_chan_adapt,
+ {&hf_ieee80211_chan_adapt,
{"Adaptable", "chan.chan_adapt", FT_UINT8, BASE_DEC, NULL, 0,
- "Adaptable", HFILL }},
+ NULL, HFILL }},
- {&hf_chan_rate,
+ {&hf_ieee80211_chan_rate,
{"Rate", "chan.chan_rate", FT_UINT8, BASE_DEC, NULL, 0,
- "Rate", HFILL }},
+ NULL, HFILL }},
- {&hf_chan_tx_pow,
+ {&hf_ieee80211_chan_tx_pow,
{"Tx Power", "chan.chan_tx_pow", FT_UINT8, BASE_DEC, NULL, 0,
- "Tx Power", HFILL }},
+ NULL, HFILL }},
- /*** Begin: Block Ack Request/Block Ack - Dustin Johnson***/
- {&hf_block_ack_request_control,
+ {&hf_ieee80211_block_ack_request_control,
{"Block Ack Request (BAR) Control", "wlan.bar.control",
- FT_UINT16, BASE_HEX, NULL, 0, "Block Ack Request (BAR) Control", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_block_ack_control,
+ {&hf_ieee80211_block_ack_control,
{"Block Ack Request Control", "wlan.ba.control",
- FT_UINT16, BASE_HEX, NULL, 0, "Block Ack Request Control", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_block_ack_control_ack_policy,
+ {&hf_ieee80211_block_ack_control_ack_policy,
{"BAR Ack Policy", "wlan.ba.control.ackpolicy",
- FT_BOOLEAN, 16, TFS (&hf_block_ack_control_ack_policy_flag), 0x01, "Block Ack Request (BAR) Ack Policy", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ieee80211_block_ack_control_ack_policy_flag), 0x01, "Block Ack Request (BAR) Ack Policy", HFILL }},
- {&hf_block_ack_control_multi_tid,
+ {&hf_ieee80211_block_ack_control_multi_tid,
{"Multi-TID", "wlan.ba.control.multitid",
FT_BOOLEAN, 16, 0, 0x02, "Multi-Traffic Identifier (TID)", HFILL }},
- {&hf_block_ack_control_compressed_bitmap,
+ {&hf_ieee80211_block_ack_control_compressed_bitmap,
{"Compressed Bitmap", "wlan.ba.control.cbitmap",
- FT_BOOLEAN, 16, 0, 0x04, "Compressed Bitmap", HFILL }},
+ FT_BOOLEAN, 16, 0, 0x04, NULL, HFILL }},
- {&hf_block_ack_control_reserved,
+ {&hf_ieee80211_block_ack_control_reserved,
{"Reserved", "wlan.ba.control.cbitmap",
- FT_UINT16, BASE_HEX, NULL, 0x0ff8, "Reserved", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0ff8, NULL, HFILL }},
- {&hf_block_ack_control_basic_tid_info,
+ {&hf_ieee80211_block_ack_control_basic_tid_info,
{"TID for which a Basic BlockAck frame is requested", "wlan.ba.basic.tidinfo",
FT_UINT16, BASE_HEX, NULL, 0xf000, "Traffic Identifier (TID) for which a Basic BlockAck frame is requested", HFILL }},
- {&hf_block_ack_control_compressed_tid_info,
+ {&hf_ieee80211_block_ack_control_compressed_tid_info,
{"TID for which a BlockAck frame is requested", "wlan.bar.compressed.tidinfo",
FT_UINT16, BASE_HEX, NULL, 0xf000, "Traffic Identifier (TID) for which a BlockAck frame is requested", HFILL }},
- {&hf_block_ack_control_multi_tid_info,
- {"Number of TIDs Present", "wlan.ba.mtid.tidinfo",
- FT_UINT16, BASE_HEX, NULL, 0xf000, "Number of Traffic Identifiers (TIDs) Present", HFILL }},
+ {&hf_ieee80211_block_ack_control_multi_tid_info,
+ {"Number of TIDs Present", "wlan.ba.mtid.tidinfo",
+ FT_UINT16, BASE_HEX, NULL, 0xf000, "Number of Traffic Identifiers (TIDs) Present", HFILL }},
+
+ {&hf_ieee80211_block_ack_multi_tid_info,
+ {"Traffic Identifier (TID) Info", "wlan.ba.mtid.tid",
+ FT_UINT8, BASE_DEC, 0, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_block_ack_multi_tid_reserved,
+ {"Reserved", "wlan.bar.mtid.tidinfo.reserved",
+ FT_UINT16, BASE_HEX, 0, 0x0fff, NULL, HFILL }},
+
+ {&hf_ieee80211_block_ack_multi_tid_value,
+ {"Multi-TID Value", "wlan.bar.mtid.tidinfo.value",
+ FT_UINT16, BASE_HEX, 0, 0xf000, NULL, HFILL }},
+
+ {&hf_ieee80211_block_ack_request_type,
+ {"Block Ack Request Type", "wlan.bar.type",
+ FT_UINT8, BASE_HEX, VALS(ieee80211_block_ack_request_type_flags), 0, "Block Ack Request (BAR) Type", HFILL }},
+
+ {&hf_ieee80211_block_ack_type,
+ {"Block Ack Type", "wlan.ba.type",
+ FT_UINT8, BASE_HEX, VALS(ieee80211_block_ack_type_flags), 0, NULL, HFILL }},
+
+ {&hf_ieee80211_block_ack_bitmap,
+ {"Block Ack Bitmap", "wlan.ba.bm",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_data_encap_payload_type,
+ {"Payload Type", "wlan.data_encap.payload_type",
+ FT_UINT8, BASE_DEC, VALS(ieee80211_data_encap_payload_types), 0, NULL,
+ HFILL }},
+
+ {&hf_ieee80211_ff_tdls_action_code,
+ {"Action code", "wlan_mgt.fixed.action_code",
+ FT_UINT8, BASE_DEC, VALS(tdls_action_codes), 0,
+ "Management action code", HFILL }},
+
+ {&hf_ieee80211_ff_target_channel,
+ {"Target Channel", "wlan_mgt.fixed.target_channel",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_regulatory_class,
+ {"Regulatory Class", "wlan_mgt.fixed.regulatory_class",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}
+
+#ifdef MESH_OVERRIDES
+ ,
+ {&hf_ieee80211_mesh_flags,
+ {"Mesh Flags", "wlan.mesh.flags",
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }},
- {&hf_block_ack_multi_tid_info,
- {"Traffic Identifier (TID) Info", "wlan.ba.mtid.tid",
- FT_UINT8, BASE_DEC, 0, 0, "Traffic Identifier (TID) Info", HFILL }},
+ {&hf_ieee80211_mesh_seq,
+ {"Mesh Seq", "wlan.mesh.seq", FT_UINT32, BASE_DEC, NULL, 0,
+ "Mesh End-to-End sequence number", HFILL }},
- {&hf_block_ack_multi_tid_reserved,
- {"Reserved", "wlan.bar.mtid.tidinfo.reserved",
- FT_UINT16, BASE_HEX, 0, 0x0fff, "Reserved", HFILL }},
+ {&hf_ieee80211_mesh_ttl,
+ {"Mesh TTL", "wlan.mesh.ttl", FT_UINT8, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
- {&hf_block_ack_multi_tid_value,
- {"Multi-TID Value", "wlan.bar.mtid.tidinfo.value",
- FT_UINT16, BASE_HEX, 0, 0xf000, "Multi-TID Value", HFILL }},
+ {&hf_ieee80211_mesh_ae1,
+ {"Mesh A4", "wlan.mesh.a4", FT_ETHER, BASE_NONE, NULL, 0,
+ "Mesh Address4", HFILL }},
- {&hf_block_ack_request_type,
- {"Block Ack Request Type", "wlan.bar.type",
- FT_UINT8, BASE_HEX, VALS(&hf_block_ack_request_type_flags), 0, "Block Ack Request (BAR) Type", HFILL }},
+ {&hf_ieee80211_mesh_ae2,
+ {"Mesh A5", "wlan.mesh.a5", FT_ETHER, BASE_NONE, NULL, 0,
+ "Mesh Address5", HFILL }},
+
+ {&hf_ieee80211_mesh_ae3,
+ {"Mesh A6", "wlan.mesh.a6", FT_ETHER, BASE_NONE, NULL, 0,
+ "Mesh Address6", HFILL }}
- {&hf_block_ack_type,
- {"Block Ack Request Type", "wlan.ba.type",
- FT_UINT8, BASE_HEX, VALS(&hf_block_ack_type_flags), 0, "Block Ack Request Type", HFILL }}
- /*** End: Block Ack Request/Block Ack - Dustin Johnson***/
+#endif /* MESH_OVERRIDES */
};
static hf_register_info hf_prism[] = {
/* Prism-specific header fields
XXX - make as many of these generic as possible. */
- { &hf_prism_msgcode,
- {"Message Code", "prism.msgcode", FT_UINT32, BASE_HEX, NULL, 0x0,
- "", HFILL }},
+ { &hf_ieee80211_prism_msgcode,
+ {"Message Code", "prism.msgcode", FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ { &hf_ieee80211_prism_msglen,
+ {"Message Length", "prism.msglen", FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ { &hf_ieee80211_prism_devname,
+ {"Device Name", "prism.devname", FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }},
+
+ { &hf_ieee80211_prism_did,
+ {"DID", "prism.did.type", FT_NONE, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }},
+
+ { &hf_ieee80211_prism_did_type,
+ {"DID", "prism.did.type", FT_UINT32, BASE_HEX, VALS(prism_did_vals), 0x0,
+ "Different ID for each parameter", HFILL }},
+
+ { &hf_ieee80211_prism_did_status,
+ {"Status", "prism.did.status", FT_UINT16, BASE_DEC, VALS(prism_status_vals), 0x0,
+ "Supplied by the driver or not", HFILL }},
+
+ { &hf_ieee80211_prism_did_length,
+ {"Length", "prism.did.length", FT_UINT16, BASE_DEC, NULL, 0x0,
+ "Length of data", HFILL }},
+
+ { &hf_ieee80211_prism_did_hosttime,
+ {"Host Time", "prism.did.hosttime", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "In jiffies - for our system this is in 10ms units", HFILL }},
+
+ { &hf_ieee80211_prism_did_mactime,
+ {"Mac Time", "prism.did.hosttime", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "In micro-seconds", HFILL }},
- { &hf_prism_msglen,
- {"Message Length", "prism.msglen", FT_UINT32, BASE_HEX, NULL, 0x0,
- "", HFILL }},
+ { &hf_ieee80211_prism_did_channel,
+ {"Channel", "prism.did.hosttime", FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
- { &hf_prism_rssi_data,
- {"RSSI Field", "prism.rssi.data", FT_UINT32, BASE_HEX, NULL, 0x0,
- "", HFILL }},
+ { &hf_ieee80211_prism_did_rssi,
+ {"RSSI", "prism.did.rssi", FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL }},
- { &hf_prism_sq_data,
- {"SQ Field", "prism.sq.data", FT_UINT32, BASE_HEX, NULL, 0x0,
- "", HFILL }},
+ { &hf_ieee80211_prism_did_sq,
+ {"SQ", "prism.did.sq", FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL }},
- { &hf_prism_signal_data,
- {"Signal Field", "prism.signal.data", FT_UINT32, BASE_HEX, NULL, 0x0,
- "", HFILL }},
+ { &hf_ieee80211_prism_did_signal,
+ {"Signal", "prism.did.signal", FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL }},
- { &hf_prism_noise_data,
- {"Noise Field", "prism.noise.data", FT_UINT32, BASE_HEX, NULL, 0x0,
- "", HFILL }},
+ { &hf_ieee80211_prism_did_noise,
+ {"Noise", "prism.did.noise", FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL }},
- { &hf_prism_rate_data,
- {"Rate Field", "prism.rate.data", FT_UINT32, BASE_HEX, NULL, 0x0,
- "", HFILL }},
+ { &hf_ieee80211_prism_did_rate,
+ {"Rate (In Mb/s)", "prism.did.rate", FT_UINT32, BASE_CUSTOM, prism_rate_base_custom, 0x0,
+ "In Mb/s", HFILL }},
- { &hf_prism_istx_data,
- {"IsTX Field", "prism.istx.data", FT_UINT32, BASE_HEX, NULL, 0x0,
- "", HFILL }},
+ { &hf_ieee80211_prism_did_istx,
+ {"IsTX", "prism.did.istx", FT_UINT32, BASE_HEX, VALS(prism_istx_vals), 0x0,
+ "Type of packet (RX or TX ?)", HFILL }},
- { &hf_prism_frmlen_data,
- {"Frame Length Field", "prism.frmlen.data", FT_UINT32, BASE_HEX, NULL, 0x0,
- "", HFILL }}
+ { &hf_ieee80211_prism_did_frmlen,
+ {"Frame Length", "prism.did.frmlen", FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+ "Length of the following frame in bytes", HFILL }},
+
+ { &hf_ieee80211_prism_did_unknown,
+ {"Unknown DID Field", "prism.did.unknown", FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+ NULL, HFILL }}
};
static hf_register_info hf_wlancap[] = {
/* AVS-specific header fields.
XXX - make as many of these generic as possible. */
{&hf_wlan_magic,
- {"Header magic", "wlancap.magic", FT_UINT32, BASE_HEX, NULL, 0xFFFFFFF0, "", HFILL } },
+ {"Header magic", "wlancap.magic", FT_UINT32, BASE_HEX, NULL, 0xFFFFFFF0, NULL, HFILL } },
{ &hf_wlan_version, { "Header revision", "wlancap.version", FT_UINT32,
- BASE_DEC, NULL, 0xF, "", HFILL } },
+ BASE_DEC, NULL, 0xF, NULL, HFILL } },
{ &hf_wlan_length, { "Header length", "wlancap.length", FT_UINT32,
- BASE_DEC, NULL, 0x0, "", HFILL } },
+ BASE_DEC, NULL, 0x0, NULL, HFILL } },
{&hf_wlan_phytype,
{"PHY type", "wlan.phytype", FT_UINT32, BASE_DEC, VALS(phy_type), 0x0,
- "", HFILL } },
+ NULL, HFILL } },
{ &hf_wlan_priority, { "Priority", "wlancap.priority", FT_UINT32, BASE_DEC,
- NULL, 0x0, "", HFILL } },
+ NULL, 0x0, NULL, HFILL } },
{ &hf_wlan_ssi_type, { "SSI Type", "wlancap.ssi_type", FT_UINT32, BASE_DEC,
- VALS(ssi_type), 0x0, "", HFILL } },
- { &hf_wlan_ssi_signal, { "SSI Signal", "wlancap.ssi_signal", FT_INT32,
- BASE_DEC, NULL, 0x0, "", HFILL } },
- { &hf_wlan_ssi_noise, { "SSI Noise", "wlancap.ssi_noise", FT_INT32,
- BASE_DEC, NULL, 0x0, "", HFILL } },
+ VALS(ssi_type), 0x0, NULL, HFILL } },
{ &hf_wlan_preamble, { "Preamble", "wlancap.preamble", FT_UINT32,
- BASE_DEC, VALS(preamble_type), 0x0, "", HFILL } },
+ BASE_DEC, VALS(preamble_type), 0x0, NULL, HFILL } },
{ &hf_wlan_encoding, { "Encoding Type", "wlancap.encoding", FT_UINT32,
- BASE_DEC, VALS(encoding_type), 0x0, "", HFILL } },
+ BASE_DEC, VALS(encoding_type), 0x0, NULL, HFILL } },
{ &hf_wlan_sequence, { "Receive sequence", "wlancap.sequence", FT_UINT32,
- BASE_DEC, NULL, 0x0, "", HFILL } },
+ BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_wlan_drops, { "Known Dropped Frames", "wlancap.drops", FT_UINT32,
- BASE_DEC, NULL, 0x0, "", HFILL } },
+ BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_wlan_receiver_addr, { "Receiver Address", "wlancap.receiver_addr", FT_ETHER,
- BASE_NONE, NULL, 0x0, "Receiver Hardware Address", HFILL } },
+ BASE_NONE, NULL, 0x0, "Receiver Hardware Address", HFILL } },
{ &hf_wlan_padding, { "Padding", "wlancap.padding", FT_BYTES,
- BASE_NONE, NULL, 0x0, "", HFILL } }
+ BASE_NONE, NULL, 0x0, NULL, HFILL } }
};
static const true_false_string rsn_preauth_flags = {
"No MCS feedback requested"
};
- static const value_string hf_htc_lac_asel_command_flags[] = {
+ static const value_string ieee80211_htc_lac_asel_command_flags[] = {
{0x00, "Transmit Antenna Selection Sounding Indication (TXASSI)"},
{0x01, "Transmit Antenna Selection Sounding Request (TXASSR)"},
{0x02, "Receive Antenna Selection Sounding Indication (RXASSI)"},
{0x00, NULL}
};
- static const value_string hf_htc_cal_pos_flags[] = {
+ static const value_string ieee80211_htc_cal_pos_flags[] = {
{0x00, "Not a calibration frame"},
{0x01, "Calibration Start"},
{0x02, "Sounding Response"},
{0x00, NULL}
};
- static const true_false_string hf_htc_ndp_announcement_flag = {
+ static const true_false_string ieee80211_htc_ndp_announcement_flag = {
"NDP will follow",
"No NDP will follow"
};
- static const value_string hf_htc_csi_steering_flags[] = {
+ static const value_string ieee80211_htc_csi_steering_flags[] = {
{0x00, "No feedback required"},
{0x01, "CSI"},
{0x02, "Non-compressed Beamforming Feedback Matrix"},
{0x00, NULL}
};
- static const value_string hf_tag_secondary_channel_offset_flags[] = {
+ static const value_string ieee80211_tag_secondary_channel_offset_flags[] = {
{0x00, "No Secondary Channel"},
{0x01, "Above Primary Channel"},
{0x02, "Reserved"},
{0x00, NULL}
};
- static const true_false_string hf_tag_measure_acc_not_acc = {
- "Accepted",
- "Not Accepted"
- };
-
- static const value_string hf_tag_measure_request_type_flags[] = {
- {0x00, "Basic Request"},
- {0x01, "Clear Channel Assessment (CCA) Request"},
- {0x02, "Receive Power Indication (RPI) Histogram Request"},
- {0x03, "Channel Load Request"},
- {0x04, "Noise Histogram Request"},
- {0x05, "Beacon Request"},
- {0x06, "Frame Request"},
- {0x07, "STA Statistics Request"},
- {0x08, "Location Configuration Indication (LCI) Request"},
- {0x09, "Transmit Stream Measurement Request"},
- {0x0A, "Measurement Pause Request"},
- {0x00, NULL}
- };
-
- static const value_string hf_tag_measure_report_type_flags[] = {
- {0x00, "Basic Report"},
- {0x01, "Clear Channel Assessment (CCA) Report"},
- {0x02, "Receive Power Indication (RPI) Histogram Report"},
- {0x03, "Channel Load Report"},
- {0x04, "Noise Histogram Report"},
- {0x05, "Beacon Report"},
- {0x06, "Frame Report"},
- {0x07, "STA Statistics Report"},
- {0x08, "Location Configuration Information (LCI) Report"},
- {0x09, "Transmit Stream Measurement Report"},
- {0x00, NULL}
- };
-
- static const true_false_string hf_tag_measure_report_frame_info_frame_type_flag = {
- "Measurement Pilot Frame",
- "Beacon/Probe Response Frame"
- };
-
- static const true_false_string hf_tag_measure_map_field_bss_flag = {
- "At least one MPDU was received by another BSS or IBSS in the measurement period.",
- "No MPDUs were received from another BSS or IBSS in the measurement period."
- };
-
- static const true_false_string hf_tag_measure_detected_not_detected = {
- "Detected",
- "Not Detected"
- };
-
- static const value_string hf_tag_measure_request_measurement_mode_flags[] = {
- {0x00, "Passive"},
- {0x01, "Active"},
- {0x02, "Beacon Table"},
- {0x00, NULL}
- };
-
- static const value_string hf_tag_measure_request_reporting_condition_flags[] = {
- {0x00, "Report to be issued after each measurement."},
- {0x01, "The measured RCPI level is greater than an absolute threshold."},
- {0x02, "The measured RCPI level is less than an absolute threshold."},
- {0x03, "The measured RSNI level is greater than an absolute threshold."},
- {0x04, "The measured RSNI level is less than an absolute threshold."},
- {0x05, "The measured RCPI level is greater than a threshold defined by an offset from the serving AP's reference RCPI."},
- {0x06, "The measured RCPI level is less than a threshold defined by an offset from the serving AP's reference RCPI."},
- {0x07, "The measured RSNI level is greater than a threshold defined by an offset from the serving AP's reference RSNI."},
- {0x08, "The measured RSNI level is less than a threshold defined by an offset from the serving AP's reference RSNI."},
- {0x09, "The measured RCPI level is in a range bound by the serving AP's reference RCPI and an offset from the serving AP's reference RCPI."},
- {0x0a, "The measured RSNI level is in a range bound by the serving AP's reference RSNI and an offset from the serving AP's reference RSNI."},
- {0xfe, "Report not required to be issued"},
- {0x00, NULL}
- };
-
- static const value_string hf_tag_measure_request_group_id_flags[] = {
- {0x00, "STA Counters from dot11CountersTable"},
- {0x01, "STA Counters from dot11MacStatistics group"},
- {0x02, "QoS STA Counters for UP0 from dot11QosCountersTable"},
- {0x03, "QoS STA Counters for UP1 from dot11QosCountersTable"},
- {0x04, "QoS STA Counters for UP2 from dot11QosCountersTable"},
- {0x05, "QoS STA Counters for UP3 from dot11QosCountersTable"},
- {0x06, "QoS STA Counters for UP4 from dot11QosCountersTable"},
- {0x07, "QoS STA Counters for UP5 from dot11QosCountersTable"},
- {0x08, "QoS STA Counters for UP6 from dot11QosCountersTable"},
- {0x09, "QoS STA Counters for UP7 from dot11QosCountersTable"},
- {0x0a, "BSS Average Access Delays"},
- {0x0b, "STA Counters from dot11A-MSDU Group"},
- {0x0c, "STA Counters from dot11A-MPDU Group"},
- {0x0d, "STA Counters from dot11 BAR, Channel Width, PSMP Group"},
- {0x0e, "STA Counters from dot11Protection Group"},
- {0x0f, "STBC Group"},
- {0x00, NULL}
- };
-
- /*** Begin: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
- static const value_string hf_tag_ext_channel_switch_announcement_switch_mode_flags[] = {
+ static const value_string ieee80211_tag_ext_channel_switch_announcement_switch_mode_flags[] = {
{0x00, "Frames may be transmitted before the channel switch has been completed"},
{0x01, "No more frames are to be transmitted until the channel switch has been completed"},
{0x00, NULL}
};
- /*** End: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
+
+ static const value_string service_interval_granularity_vals[] = {
+ { 0, "5 ms" },
+ { 1, "10 ms" },
+ { 2, "15 ms" },
+ { 3, "20 ms" },
+ { 4, "25 ms" },
+ { 5, "30 ms" },
+ { 6, "35 ms" },
+ { 7, "40 ms" },
+ { 0x00, NULL }
+ };
static hf_register_info ff[] = {
- {&ff_timestamp,
- {"Timestamp", "wlan_mgt.fixed.timestamp", FT_STRING, BASE_NONE,
- NULL, 0, "Timestamp", HFILL }},
+ {&hf_ieee80211_ff_timestamp,
+ {"Timestamp", "wlan_mgt.fixed.timestamp", FT_UINT64, BASE_HEX,
+ NULL, 0, NULL, HFILL }},
- {&ff_auth_alg,
+ {&hf_ieee80211_ff_auth_alg,
{"Authentication Algorithm", "wlan_mgt.fixed.auth.alg",
- FT_UINT16, BASE_DEC, VALS (&auth_alg), 0, "Authentication Algorithm", HFILL }},
+ FT_UINT16, BASE_DEC, VALS (&auth_alg), 0, NULL, HFILL }},
- {&ff_beacon_interval,
- {"Beacon Interval", "wlan_mgt.fixed.beacon", FT_DOUBLE, BASE_DEC, NULL, 0,
- "Beacon Interval", HFILL }},
+ {&hf_ieee80211_ff_beacon_interval,
+ {"Beacon Interval", "wlan_mgt.fixed.beacon", FT_UINT32, BASE_CUSTOM, beacon_interval_base_custom, 0,
+ NULL, HFILL }},
- {&hf_fixed_parameters,
+ {&hf_ieee80211_fixed_parameters,
{"Fixed parameters", "wlan_mgt.fixed.all", FT_UINT16, BASE_DEC, NULL, 0,
- "Fixed parameters", HFILL }},
+ NULL, HFILL }},
- {&hf_tagged_parameters,
+ {&hf_ieee80211_tagged_parameters,
{"Tagged parameters", "wlan_mgt.tagged.all", FT_UINT16, BASE_DEC, NULL, 0,
- "Tagged parameters", HFILL }},
-
- {&hf_tagged_ssid,
- {"SSID", "wlan_mgt.ssid", FT_STRING, BASE_DEC, NULL, 0,
- "SSID", HFILL }},
-
- /*** Begin: Block Ack Params Fixed Field - Dustin Johnson ***/
- {&ff_block_ack_params,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_ssid,
+ {"SSID", "wlan_mgt.ssid", FT_STRING, BASE_NONE, NULL, 0,
+ "Indicates the identity of an ESS or IBSS", HFILL }},
+
+ {&hf_ieee80211_tag_supp_rates,
+ {"Supported Rates", "wlan_mgt.supported_rates",
+ FT_UINT8, BASE_NONE, VALS(ieee80211_supported_rates_vals), 0x0,
+ "In Mbit/sec, (B) for Basic Rates", HFILL }},
+
+ {&hf_ieee80211_tag_fh_dwell_time,
+ {"Dwell Time", "wlan_mgt.fh.dwell_time",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ "In Time Unit (TU)", HFILL }},
+
+ {&hf_ieee80211_tag_fh_hop_set,
+ {"Hop Set", "wlan_mgt.fh.hop_set",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_fh_hop_pattern,
+ {"Hop Pattern", "wlan_mgt.fh.hop_pattern",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_fh_hop_index,
+ {"Hop Index", "wlan_mgt.fh.hop_index",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_ff_block_ack_params,
{"Block Ack Parameters", "wlan_mgt.fixed.baparams",
- FT_UINT16, BASE_HEX, NULL, 0, "Block Ack Parameters", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&ff_block_ack_params_amsdu_permitted,
+ {&hf_ieee80211_ff_block_ack_params_amsdu_permitted,
{"A-MSDUs", "wlan_mgt.fixed.baparams.amsdu",
FT_BOOLEAN, 16, TFS (&ff_block_ack_params_amsdu_permitted_flag), 0x0001, "A-MSDU Permitted in QoS Data MPDUs", HFILL }},
- {&ff_block_ack_params_policy,
+ {&hf_ieee80211_ff_block_ack_params_policy,
{"Block Ack Policy", "wlan_mgt.fixed.baparams.policy",
- FT_BOOLEAN, 16, TFS (&ff_block_ack_params_policy_flag), 0x0002, "Block Ack Policy", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ff_block_ack_params_policy_flag), 0x0002, NULL, HFILL }},
- {&ff_block_ack_params_tid,
+ {&hf_ieee80211_ff_block_ack_params_tid,
{"Traffic Identifier", "wlan_mgt.fixed.baparams.tid",
- FT_UINT8, BASE_HEX, NULL, 0x003C, "Traffic Identifier", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x003C, NULL, HFILL }},
- {&ff_block_ack_params_buffer_size,
+ {&hf_ieee80211_ff_block_ack_params_buffer_size,
{"Number of Buffers (1 Buffer = 2304 Bytes)", "wlan_mgt.fixed.baparams.buffersize",
FT_UINT16, BASE_DEC, NULL, 0xFFC0, "Number of Buffers", HFILL }},
- /*** End: Block Ack Params Fixed Field - Dustin Johnson ***/
- /*** Begin: Block Ack Timeout Fixed Field - Dustin Johnson ***/
- {&ff_block_ack_timeout,
+ {&hf_ieee80211_ff_block_ack_timeout,
{"Block Ack Timeout", "wlan_mgt.fixed.batimeout",
- FT_UINT16, BASE_HEX, NULL, 0, "Block Ack Timeout", HFILL }},
- /*** End: Block Ack Timeout Fixed Field - Dustin Johnson ***/
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
- /*** Begin: Block Ack Starting Sequence Control Fixed Field - Dustin Johnson ***/
- {&ff_block_ack_ssc,
+ {&hf_ieee80211_ff_block_ack_ssc,
{"Block Ack Starting Sequence Control (SSC)", "wlan_mgt.fixed.ssc",
- FT_UINT16, BASE_HEX, 0, 0, "Block Ack Starting Sequence Control (SSC)", HFILL }},
+ FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
- {&ff_block_ack_ssc_fragment,
+ {&hf_ieee80211_ff_block_ack_ssc_fragment,
{"Fragment", "wlan_mgt.fixed.fragment",
- FT_UINT16, BASE_DEC, 0, 0x000f, "Fragment", HFILL }},
+ FT_UINT16, BASE_DEC, 0, 0x000f, NULL, HFILL }},
- {&ff_block_ack_ssc_sequence,
+ {&hf_ieee80211_ff_block_ack_ssc_sequence,
{"Starting Sequence Number", "wlan_mgt.fixed.sequence",
- FT_UINT16, BASE_DEC, 0, 0xfff0, "Starting Sequence Number", HFILL }},
- /*** End: Block Ack Starting Sequence Control Fixed Field - Dustin Johnson ***/
+ FT_UINT16, BASE_DEC, 0, 0xfff0, NULL, HFILL }},
- /*** Begin: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
- {&ff_delba_param,
+ {&hf_ieee80211_ff_delba_param,
{"Delete Block Ack (DELBA) Parameter Set", "wlan_mgt.fixed.delba.param",
- FT_UINT16, BASE_HEX, 0, 0, "Delete Block Ack (DELBA) Parameter Set", HFILL }},
+ FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
- {&ff_delba_param_reserved,
+ {&hf_ieee80211_ff_delba_param_reserved,
{"Reserved", "wlan_mgt.fixed.delba.param.reserved",
- FT_UINT16, BASE_HEX, 0, 0x07ff, "Reserved", HFILL }},
+ FT_UINT16, BASE_HEX, 0, 0x07ff, NULL, HFILL }},
- {&ff_delba_param_init,
+ {&hf_ieee80211_ff_delba_param_init,
{"Initiator", "wlan_mgt.fixed.delba.param.initiator",
- FT_BOOLEAN, 16, 0, 0x08000, "Initiator", HFILL }},
+ FT_BOOLEAN, 16, 0, 0x0800, NULL, HFILL }},
- {&ff_delba_param_tid,
+ {&hf_ieee80211_ff_delba_param_tid,
{"TID", "wlan_mgt.fixed.delba.param.tid",
FT_UINT16, BASE_HEX, 0, 0xf000, "Traffic Identifier (TID)", HFILL }},
- /*** End: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
- /*** Begin: Max Regulation Power Fixed Field - Dustin Johnson ***/
- {&ff_max_reg_pwr,
+ {&hf_ieee80211_ff_max_reg_pwr,
{"Maximum Regulation Power", "wlan_mgt.fixed.maxregpwr",
- FT_UINT16, BASE_HEX, 0, 0, "Maximum Regulation Power", HFILL }},
- /*** End: Max Regulation Power Fixed Field - Dustin Johnson ***/
+ FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
- /*** Begin: Measurement Pilot Interval Fixed Field - Dustin Johnson ***/
- {&ff_measurement_pilot_int,
+ {&hf_ieee80211_ff_measurement_pilot_int,
{"Measurement Pilot Interval", "wlan_mgt.fixed.msmtpilotint",
FT_UINT16, BASE_HEX, 0, 0, "Measurement Pilot Interval Fixed Field", HFILL }},
- /*** End: Measurement Pilot Interval Fixed Field - Dustin Johnson ***/
- /*** Begin: Country String Fixed Field - Dustin Johnson ***/
- {&ff_country_str,
+ {&hf_ieee80211_ff_country_str,
{"Country String", "wlan_mgt.fixed.country",
- FT_STRING, BASE_NONE, 0, 0, "Country String", HFILL }},
- /*** End: Country String Fixed Field - Dustin Johnson ***/
+ FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
- /*** Begin: Maximum Transmit Power Fixed Field - Dustin Johnson ***/
- {&ff_max_tx_pwr,
+ {&hf_ieee80211_ff_max_tx_pwr,
{"Maximum Transmit Power", "wlan_mgt.fixed.maxtxpwr",
- FT_UINT8, BASE_HEX, 0, 0, "Maximum Transmit Power", HFILL }},
- /*** End: Maximum Transmit Power Fixed Field - Dustin Johnson ***/
+ FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
- /*** Begin: Transmit Power Used Fixed Field - Dustin Johnson ***/
- {&ff_tx_pwr_used,
+ {&hf_ieee80211_ff_tx_pwr_used,
{"Transmit Power Used", "wlan_mgt.fixed.txpwr",
- FT_UINT8, BASE_HEX, 0, 0, "Transmit Power Used", HFILL }},
- /*** End: Transmit Power Used Fixed Field - Dustin Johnson ***/
+ FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
- /*** Begin: Transmit Power Used Fixed Field - Dustin Johnson ***/
- {&ff_transceiver_noise_floor,
+ {&hf_ieee80211_ff_transceiver_noise_floor,
{"Transceiver Noise Floor", "wlan_mgt.fixed.tnoisefloor",
- FT_UINT8, BASE_HEX, 0, 0, "Transceiver Noise Floor", HFILL }},
- /*** End: Transceiver Noise Floor Fixed Field - Dustin Johnson ***/
+ FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
- /*** Begin: Channel Width Fixed Field - Dustin Johnson ***/
- {&ff_channel_width,
+ {&hf_ieee80211_ff_channel_width,
{"Supported Channel Width", "wlan_mgt.fixed.chanwidth",
- FT_UINT8, BASE_HEX, VALS (ff_channel_width_vals), 0, "Supported Channel Width", HFILL }},
- /*** End: Channel Width Fixed Field - Dustin Johnson ***/
+ FT_UINT8, BASE_HEX, VALS (ff_channel_width_vals), 0, NULL, HFILL }},
- /*** Begin: QoS Information AP Fixed Field - Dustin Johnson ***/
- {&ff_qos_info_ap,
+ {&hf_ieee80211_ff_qos_info_ap,
{"QoS Information (AP)", "wlan_mgt.fixed.qosinfo.ap",
- FT_UINT8, BASE_HEX, NULL, 0, "QoS Information (AP)", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&ff_qos_info_ap_edca_param_set_counter,
+ {&hf_ieee80211_ff_qos_info_ap_edca_param_set_counter,
{"EDCA Parameter Set Update Count", "wlan_mgt.fixed.qosinfo.ap.edcaupdate",
FT_UINT8, BASE_HEX, NULL, 0x0F, "Enhanced Distributed Channel Access (EDCA) Parameter Set Update Count", HFILL }},
- {&ff_qos_info_ap_q_ack,
+ {&hf_ieee80211_ff_qos_info_ap_q_ack,
{"Q-Ack", "wlan_mgt.fixed.qosinfo.ap.qack",
FT_BOOLEAN, 8, TFS (&ff_qos_info_ap_q_ack_flag), 0x10, "QoS Ack", HFILL }},
- {&ff_qos_info_ap_queue_req,
+ {&hf_ieee80211_ff_qos_info_ap_queue_req,
{"Queue Request", "wlan_mgt.fixed.qosinfo.ap",
- FT_BOOLEAN, 8, TFS (&ff_qos_info_ap_queue_req_flag), 0x20, "Queue Request", HFILL }},
+ FT_BOOLEAN, 8, TFS (&ff_qos_info_ap_queue_req_flag), 0x20, NULL, HFILL }},
- {&ff_qos_info_ap_txop_request,
+ {&hf_ieee80211_ff_qos_info_ap_txop_request,
{"TXOP Request", "wlan_mgt.fixed.qosinfo.ap.txopreq",
FT_BOOLEAN, 8, TFS (&ff_qos_info_ap_txop_request_flag), 0x40, "Transmit Opportunity (TXOP) Request", HFILL }},
- {&ff_qos_info_ap_reserved,
+ {&hf_ieee80211_ff_qos_info_ap_reserved,
{"Reserved", "wlan_mgt.fixed.qosinfo.ap.reserved",
- FT_BOOLEAN, 8, NULL, 0x80, "Reserved", HFILL }},
- /*** End: QoS Information AP Fixed Field - Dustin Johnson ***/
+ FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
- /*** Begin: QoS Information STA Fixed Field - Dustin Johnson ***/
- {&ff_qos_info_sta,
+ {&hf_ieee80211_ff_qos_info_sta,
{"QoS Information (STA)", "wlan_mgt.fixed.qosinfo.sta",
- FT_UINT8, BASE_HEX, NULL, 0, "QoS Information (STA)", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&ff_qos_info_sta_ac_vo,
+ {&hf_ieee80211_ff_qos_info_sta_ac_vo,
{"AC_VO", "wlan_mgt.fixed.qosinfo.sta.ac.vo",
- FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x01, "AC_VO", HFILL }},
+ FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x01, NULL, HFILL }},
- {&ff_qos_info_sta_ac_vi,
+ {&hf_ieee80211_ff_qos_info_sta_ac_vi,
{"AC_VI", "wlan_mgt.fixed.qosinfo.sta.ac.vi",
- FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x02, "AC_VI", HFILL }},
+ FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x02, NULL, HFILL }},
- {&ff_qos_info_sta_ac_bk,
+ {&hf_ieee80211_ff_qos_info_sta_ac_bk,
{"AC_BK", "wlan_mgt.fixed.qosinfo.sta.ac.bk",
- FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x04, "AC_BK", HFILL }},
+ FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x04, NULL, HFILL }},
- {&ff_qos_info_sta_ac_be,
+ {&hf_ieee80211_ff_qos_info_sta_ac_be,
{"AC_BE", "wlan_mgt.fixed.qosinfo.sta.ac.be",
- FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x08, "AC_BE", HFILL }},
+ FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x08, NULL, HFILL }},
- {&ff_qos_info_sta_q_ack,
+ {&hf_ieee80211_ff_qos_info_sta_q_ack,
{"Q-Ack", "wlan_mgt.fixed.qosinfo.sta.qack",
FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_q_ack_flag), 0x10, "QoS Ack", HFILL }},
- {&ff_qos_info_sta_max_sp_len,
+ {&hf_ieee80211_ff_qos_info_sta_max_sp_len,
{"Service Period (SP) Length", "wlan_mgt.fixed.qosinfo.sta.splen",
- FT_UINT8, BASE_HEX, VALS (&ff_qos_info_sta_max_sp_len_flags) , 0x60, "Service Period (SP) Length", HFILL }},
+ FT_UINT8, BASE_HEX, VALS (&ff_qos_info_sta_max_sp_len_flags) , 0x60, NULL, HFILL }},
- {&ff_qos_info_sta_more_data_ack,
+ {&hf_ieee80211_ff_qos_info_sta_more_data_ack,
{"More Data Ack", "wlan_mgt.fixed.qosinfo.sta.moredataack",
- FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_more_data_ack_flag), 0x80, "More Data Ack", HFILL }},
- /*** End: QoS Information STA Fixed Field - Dustin Johnson ***/
+ FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_more_data_ack_flag), 0x80, NULL, HFILL }},
- /*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
- {&ff_sm_pwr_save,
+ {&hf_ieee80211_ff_sm_pwr_save,
{"Spatial Multiplexing (SM) Power Control", "wlan_mgt.fixed.sm.powercontrol",
- FT_UINT8, BASE_HEX, NULL, 0, "Spatial Multiplexing (SM) Power Control", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&ff_sm_pwr_save_enabled,
+ {&hf_ieee80211_ff_sm_pwr_save_enabled,
{"SM Power Save", "wlan_mgt.fixed.sm.powercontrol.enabled",
FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x01, "Spatial Multiplexing (SM) Power Save", HFILL }},
- {&ff_sm_pwr_save_sm_mode,
+ {&hf_ieee80211_ff_sm_pwr_save_sm_mode,
{"SM Mode", "wlan_mgt.fixed.sm.powercontrol.mode",
FT_BOOLEAN, 8, TFS (&ff_sm_pwr_save_sm_mode_flag), 0x02, "Spatial Multiplexing (SM) Mode", HFILL }},
- {&ff_sm_pwr_save_reserved,
+ {&hf_ieee80211_ff_sm_pwr_save_reserved,
{"Reserved", "wlan_mgt.fixed.sm.powercontrol.reserved",
- FT_UINT8, BASE_HEX, NULL, 0xFC, "Reserved", HFILL }},
- /*** End: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
+ FT_UINT8, BASE_HEX, NULL, 0xFC, NULL, HFILL }},
- /*** Begin: PCO Phase Control Fixed Field - Dustin Johnson ***/
- {&ff_pco_phase_cntrl,
+ {&hf_ieee80211_ff_pco_phase_cntrl,
{"Phased Coexistence Operation (PCO) Phase Control", "wlan_mgt.fixed.pco.phasecntrl",
- FT_BOOLEAN, 0, TFS (&ff_pco_phase_cntrl_flag), 0, "Phased Coexistence Operation (PCO) Phase Control", HFILL }},
- /*** End: PCO Phase Control Fixed Field - Dustin Johnson ***/
+ FT_BOOLEAN, BASE_NONE, TFS (&ff_pco_phase_cntrl_flag), 0x0, NULL, HFILL }},
- /*** Begin: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
- {&ff_psmp_param_set,
+ {&hf_ieee80211_ff_psmp_param_set,
{"Power Save Multi-Poll (PSMP) Parameter Set", "wlan_mgt.fixed.psmp.paramset",
- FT_UINT16, BASE_HEX, 0, 0, "Power Save Multi-Poll (PSMP) Parameter Set", HFILL }},
+ FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
- {&ff_psmp_param_set_n_sta,
+ {&hf_ieee80211_ff_psmp_param_set_n_sta,
{"Number of STA Info Fields Present", "wlan_mgt.fixed.psmp.paramset.nsta",
- FT_UINT8, BASE_HEX, 0, 0, "Number of STA Info Fields Present", HFILL }},
+ FT_UINT16, BASE_HEX, 0, 0x000F, NULL, HFILL }},
- {&ff_psmp_param_set_more_psmp,
+ {&hf_ieee80211_ff_psmp_param_set_more_psmp,
{"More PSMP", "wlan_mgt.fixed.psmp.paramset.more",
- FT_BOOLEAN, 0, TFS(&ff_psmp_param_set_more_psmp_flag), 0, "More Power Save Multi-Poll (PSMP)", HFILL }},
+ FT_BOOLEAN, 16, TFS(&ff_psmp_param_set_more_psmp_flag), 0x0010, "More Power Save Multi-Poll (PSMP)", HFILL }},
- {&ff_psmp_param_set_psmp_sequence_duration,
- {"PSMP Sequence Duration", "wlan_mgt.fixed.psmp.paramset.seqduration",
- FT_UINT16, BASE_DEC, 0, 0, "Power Save Multi-Poll (PSMP) Sequence Duration", HFILL }},
- /*** End: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
+ {&hf_ieee80211_ff_psmp_param_set_psmp_sequence_duration,
+ {"PSMP Sequence Duration [us]", "wlan_mgt.fixed.psmp.paramset.seqduration",
+ FT_UINT16, BASE_DEC, 0, 0xFFE0, "Power Save Multi-Poll (PSMP) Sequence Duration", HFILL }},
- /*** Begin: MIMO Control Fixed Field - Dustin Johnson ***/
- {&ff_mimo_cntrl_nc_index,
+ {&hf_ieee80211_ff_mimo_cntrl,
+ {"MIMO Control", "wlan_mgt.fixed.mimo.control.",
+ FT_BYTES, BASE_NONE, 0, 0x0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_mimo_cntrl_nc_index,
{"Nc Index", "wlan_mgt.fixed.mimo.control.ncindex",
- FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_nc_index_flags), 0x0003, "Number of Columns Less One", HFILL }},
+ FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_nc_index_flags), 0x0003, "Number of Columns Less One", HFILL }},
- {&ff_mimo_cntrl_nr_index,
+ {&hf_ieee80211_ff_mimo_cntrl_nr_index,
{"Nr Index", "wlan_mgt.fixed.mimo.control.nrindex",
- FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_nr_index_flags), 0x000C, "Number of Rows Less One", HFILL }},
+ FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_nr_index_flags), 0x000C, "Number of Rows Less One", HFILL }},
- {&ff_mimo_cntrl_channel_width,
+ {&hf_ieee80211_ff_mimo_cntrl_channel_width,
{"Channel Width", "wlan_mgt.fixed.mimo.control.chanwidth",
- FT_BOOLEAN, 16, TFS(&ff_mimo_cntrl_channel_width_flag), 0x0010, "Channel Width", HFILL }},
+ FT_BOOLEAN, 16, TFS(&ff_mimo_cntrl_channel_width_flag), 0x0010, NULL, HFILL }},
- {&ff_mimo_cntrl_grouping,
+ {&hf_ieee80211_ff_mimo_cntrl_grouping,
{"Grouping (Ng)", "wlan_mgt.fixed.mimo.control.grouping",
- FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_grouping_flags), 0x0060, "Grouping (Ng)", HFILL }},
+ FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_grouping_flags), 0x0060, NULL, HFILL }},
- {&ff_mimo_cntrl_coefficient_size,
+ {&hf_ieee80211_ff_mimo_cntrl_coefficient_size,
{"Coefficient Size (Nb)", "wlan_mgt.fixed.mimo.control.cosize",
- FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_coefficient_size_flags), 0x0180, "Coefficient Size (Nb)", HFILL }},
+ FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_coefficient_size_flags), 0x0180, NULL, HFILL }},
- {&ff_mimo_cntrl_codebook_info,
+ {&hf_ieee80211_ff_mimo_cntrl_codebook_info,
{"Codebook Information", "wlan_mgt.fixed.mimo.control.codebookinfo",
- FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_codebook_info_flags), 0x0600, "Codebook Information", HFILL }},
+ FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_codebook_info_flags), 0x0600, NULL, HFILL }},
- {&ff_mimo_cntrl_remaining_matrix_segment,
+ {&hf_ieee80211_ff_mimo_cntrl_remaining_matrix_segment,
{"Remaining Matrix Segment", "wlan_mgt.fixed.mimo.control.matrixseg",
- FT_UINT16, BASE_HEX, 0, 0x3800, "Remaining Matrix Segment", HFILL }},
+ FT_UINT16, BASE_HEX, 0, 0x3800, NULL, HFILL }},
- {&ff_mimo_cntrl_reserved,
+ {&hf_ieee80211_ff_mimo_cntrl_reserved,
{"Reserved", "wlan_mgt.fixed.mimo.control.reserved",
- FT_UINT16, BASE_HEX, 0, 0xC000, "Reserved", HFILL }},
+ FT_UINT16, BASE_HEX, 0, 0xC000, NULL, HFILL }},
- {&ff_mimo_cntrl_sounding_timestamp,
+ {&hf_ieee80211_ff_mimo_cntrl_sounding_timestamp,
{"Sounding Timestamp", "wlan_mgt.fixed.mimo.control.soundingtime",
- FT_UINT32, BASE_HEX, 0, 0, "Sounding Timestamp", HFILL }},
- /*** End: MIMO Control Fixed Field - Dustin Johnson ***/
+ FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
- /*** Begin: PSMP Station Information Fixed Field - Dustin Johnson ***/
- {&ff_psmp_sta_info,
+ {&hf_ieee80211_ff_psmp_sta_info,
{"Power Save Multi-Poll (PSMP) Station Information", "wlan_mgt.fixed.psmp.stainfo",
- FT_UINT8, BASE_HEX, VALS (&ff_psmp_sta_info_flags), 0, "Power Save Multi-Poll (PSMP) Station Information", HFILL }},
+ FT_UINT64, BASE_HEX, 0, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_psmp_sta_info_type,
+ {"Sta Info Type", "wlan_mgt.fixed.psmp.stainfo.type",
+ FT_UINT32, BASE_HEX, VALS(ff_psmp_sta_info_flags), PSMP_STA_INFO_FLAG_TYPE, NULL, HFILL }},
- {&ff_psmp_sta_info_dtt_start_offset,
+ {&hf_ieee80211_ff_psmp_sta_info_dtt_start_offset,
{"DTT Start Offset", "wlan_mgt.fixed.psmp.stainfo.dttstart",
- FT_UINT16, BASE_HEX, 0, 0, "DTT Start Offset", HFILL }},
+ FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_DTT_START, NULL, HFILL }},
- {&ff_psmp_sta_info_dtt_duration,
+ {&hf_ieee80211_ff_psmp_sta_info_dtt_duration,
{"DTT Duration", "wlan_mgt.fixed.psmp.stainfo.dttduration",
- FT_UINT8, BASE_HEX, 0, 0, "DTT Duration", HFILL }},
+ FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_DTT_DURATION, NULL, HFILL }},
- {&ff_psmp_sta_info_sta_id,
+ {&hf_ieee80211_ff_psmp_sta_info_sta_id,
{"Target Station ID", "wlan_mgt.fixed.psmp.stainfo.staid",
- FT_UINT16, BASE_HEX, 0, 0, "Target Station ID", HFILL }},
+ FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_STA_ID, NULL, HFILL }},
- {&ff_psmp_sta_info_utt_start_offset,
+ {&hf_ieee80211_ff_psmp_sta_info_utt_start_offset,
{"UTT Start Offset", "wlan_mgt.fixed.psmp.stainfo.uttstart",
- FT_UINT16, BASE_HEX, 0, 0, "UTT Start Offset", HFILL }},
+ FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_UTT_START, NULL, HFILL }},
- {&ff_psmp_sta_info_utt_duration,
+ {&hf_ieee80211_ff_psmp_sta_info_utt_duration,
{"UTT Duration", "wlan_mgt.fixed.psmp.stainfo.uttduration",
- FT_UINT16, BASE_HEX, 0, 0, "UTT Duration", HFILL }},
+ FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_UTT_DURATION, NULL, HFILL }},
- {&ff_psmp_sta_info_reserved_small,
+ {&hf_ieee80211_ff_psmp_sta_info_reserved_small,
{"Reserved", "wlan_mgt.fixed.psmp.stainfo.reserved",
- FT_UINT16, BASE_HEX, 0, 0, "Reserved", HFILL }},
+ FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_IA_RESERVED, NULL, HFILL }},
- {&ff_psmp_sta_info_reserved_large,
+ {&hf_ieee80211_ff_psmp_sta_info_reserved_large,
{"Reserved", "wlan_mgt.fixed.psmp.stainfo.reserved",
- FT_UINT64, BASE_HEX, 0, 0, "Reserved", HFILL }},
+ FT_UINT64, BASE_HEX, 0, 0, NULL, HFILL }},
- {&ff_psmp_sta_info_psmp_multicast_id,
+ {&hf_ieee80211_ff_psmp_sta_info_psmp_multicast_id,
{"Power Save Multi-Poll (PSMP) Multicast ID", "wlan_mgt.fixed.psmp.stainfo.multicastid",
- FT_UINT64, BASE_HEX, 0, 0, "Power Save Multi-Poll (PSMP) Multicast ID", HFILL }},
- /*** End: PSMP Station Information Fixed Field - Dustin Johnson ***/
+ FT_UINT64, BASE_HEX, 0, 0, NULL, HFILL }},
- /*** Begin: Antenna Selection Fixed Field - Dustin Johnson ***/
- {&ff_ant_selection,
+ {&hf_ieee80211_ff_ant_selection,
{"Antenna Selection", "wlan_mgt.fixed.antsel",
- FT_UINT8, BASE_HEX, 0, 0, "Antenna Selection", HFILL }},
+ FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
- {&ff_ant_selection_0,
+ {&hf_ieee80211_ff_ant_selection_0,
{"Antenna 0", "wlan_mgt.fixed.antsel.ant0",
- FT_UINT8, BASE_HEX, 0, 0x01, "Antenna 0", HFILL }},
+ FT_UINT8, BASE_HEX, 0, 0x01, NULL, HFILL }},
- {&ff_ant_selection_1,
+ {&hf_ieee80211_ff_ant_selection_1,
{"Antenna 1", "wlan_mgt.fixed.antsel.ant1",
- FT_UINT8, BASE_HEX, 0, 0x02, "Antenna 1", HFILL }},
+ FT_UINT8, BASE_HEX, 0, 0x02, NULL, HFILL }},
- {&ff_ant_selection_2,
+ {&hf_ieee80211_ff_ant_selection_2,
{"Antenna 2", "wlan_mgt.fixed.antsel.ant2",
- FT_UINT8, BASE_HEX, 0, 0x04, "Antenna 2", HFILL }},
+ FT_UINT8, BASE_HEX, 0, 0x04, NULL, HFILL }},
- {&ff_ant_selection_3,
+ {&hf_ieee80211_ff_ant_selection_3,
{"Antenna 3", "wlan_mgt.fixed.antsel.ant3",
- FT_UINT8, BASE_HEX, 0, 0x08, "Antenna 3", HFILL }},
+ FT_UINT8, BASE_HEX, 0, 0x08, NULL, HFILL }},
- {&ff_ant_selection_4,
+ {&hf_ieee80211_ff_ant_selection_4,
{"Antenna 4", "wlan_mgt.fixed.antsel.ant4",
- FT_UINT8, BASE_HEX, 0, 0x10, "Antenna 4", HFILL }},
+ FT_UINT8, BASE_HEX, 0, 0x10, NULL, HFILL }},
- {&ff_ant_selection_5,
+ {&hf_ieee80211_ff_ant_selection_5,
{"Antenna 5", "wlan_mgt.fixed.antsel.ant5",
- FT_UINT8, BASE_HEX, 0, 0x20, "Antenna 5", HFILL }},
+ FT_UINT8, BASE_HEX, 0, 0x20, NULL, HFILL }},
- {&ff_ant_selection_6,
+ {&hf_ieee80211_ff_ant_selection_6,
{"Antenna 6", "wlan_mgt.fixed.antsel.ant6",
- FT_UINT8, BASE_HEX, 0, 0x40, "Antenna 6", HFILL }},
+ FT_UINT8, BASE_HEX, 0, 0x40, NULL, HFILL }},
- {&ff_ant_selection_7,
+ {&hf_ieee80211_ff_ant_selection_7,
{"Antenna 7", "wlan_mgt.fixed.antsel.ant7",
- FT_UINT8, BASE_HEX, 0, 0x80, "Antenna 7", HFILL }},
- /*** End: Antenna Selection Fixed Field - Dustin Johnson ***/
+ FT_UINT8, BASE_HEX, 0, 0x80, NULL, HFILL }},
- /*** Begin: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
- {&ff_ext_channel_switch_announcement,
+ {&hf_ieee80211_ff_ext_channel_switch_announcement,
{"Extended Channel Switch Announcement", "wlan_mgt.fixed.extchansw",
- FT_UINT32, BASE_HEX, 0, 0, "", HFILL }},
- /*** End: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
+ FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_ext_channel_switch_announcement_switch_mode,
+ {"Channel Switch Mode", "wlan_mgt.fixed.extchansw.switchmode",
+ FT_UINT32, BASE_HEX, VALS(ieee80211_tag_ext_channel_switch_announcement_switch_mode_flags), 0x000000FF, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_ext_channel_switch_announcement_new_reg_class,
+ {"New Regulatory Class", "wlan_mgt.fixed.extchansw.new.regclass",
+ FT_UINT32, BASE_HEX, NULL, 0x0000FF00, NULL, HFILL }},
- /*** Begin: HT Information Fixed Field - Dustin Johnson ***/
- {&ff_ht_info,
+ {&hf_ieee80211_ff_ext_channel_switch_announcement_new_chan_number,
+ {"New Channel Number", "wlan_mgt.fixed.extchansw.new.channumber",
+ FT_UINT32, BASE_HEX, NULL, 0x00FF0000, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_ext_channel_switch_announcement_switch_count,
+ {"Channel Switch Count", "wlan_mgt.extchanswitch.switchcount",
+ FT_UINT32, BASE_HEX, NULL, 0xFF000000, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_ht_info,
{"HT Information", "wlan_mgt.fixed.extchansw",
FT_UINT8, BASE_HEX, 0, 0, "HT Information Fixed Field", HFILL }},
- {&ff_ht_info_information_request,
+ {&hf_ieee80211_ff_ht_info_information_request,
{"Information Request", "wlan_mgt.fixed.mimo.control.chanwidth",
- FT_BOOLEAN, 8, TFS(&ff_ht_info_information_request_flag), 0x01, "Information Request", HFILL }},
+ FT_BOOLEAN, 8, TFS(&ff_ht_info_information_request_flag), 0x01, NULL, HFILL }},
- {&ff_ht_info_40_mhz_intolerant,
+ {&hf_ieee80211_ff_ht_info_40_mhz_intolerant,
{"40 MHz Intolerant", "wlan_mgt.fixed.mimo.control.chanwidth",
- FT_BOOLEAN, 8, TFS(&ff_ht_info_40_mhz_intolerant_flag), 0x02, "40 MHz Intolerant", HFILL }},
+ FT_BOOLEAN, 8, TFS(&ff_ht_info_40_mhz_intolerant_flag), 0x02, NULL, HFILL }},
- {&ff_ht_info_sta_chan_width,
+ {&hf_ieee80211_ff_ht_info_sta_chan_width,
{"Station Channel Width", "wlan_mgt.fixed.mimo.control.chanwidth",
- FT_BOOLEAN, 8, TFS(&ff_ht_info_sta_chan_width_flag), 0x04, "Station Channel Width", HFILL }},
+ FT_BOOLEAN, 8, TFS(&ff_ht_info_sta_chan_width_flag), 0x04, NULL, HFILL }},
- {&ff_ht_info_reserved,
+ {&hf_ieee80211_ff_ht_info_reserved,
{"Reserved", "wlan_mgt.fixed.extchansw",
FT_UINT8, BASE_HEX, 0, 0xF8, "Reserved Field", HFILL }},
- /*** End: HT Information Fixed Field - Dustin Johnson ***/
- /*** Begin: HT Action Fixed Field - Dustin Johnson ***/
- {&ff_ht_action,
+ {&hf_ieee80211_ff_ht_action,
{"HT Action", "wlan_mgt.fixed.htact",
FT_UINT8, BASE_HEX, VALS (&ff_ht_action_flags), 0, "HT Action Code", HFILL }},
- /*** End: HT Action Fixed Field - Dustin Johnson ***/
- /*** Begin: MIMO CSI Matrices Report - Dustin Johnson ***/
- {&ff_mimo_csi_snr,
+ {&hf_ieee80211_ff_mimo_csi_snr,
{"Signal to Noise Ratio (SNR)", "wlan_mgt.mimo.csimatrices.snr",
- FT_UINT8, BASE_HEX, NULL, 0, "Signal to Noise Ratio (SNR)", HFILL }},
- /*** End: MIMO CSI Matrices Report - Dustin Johnson ***/
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_public_action,
+ {"Public Action", "wlan_mgt.fixed.publicact",
+ FT_UINT8, BASE_HEX, VALS(ff_pa_action_codes), 0, "Public Action Code", HFILL }},
- {&ff_capture,
- {"Capabilities", "wlan_mgt.fixed.capabilities", FT_UINT16, BASE_HEX, NULL, 0,
+ {&hf_ieee80211_ff_capture,
+ {"Capabilities Information", "wlan_mgt.fixed.capabilities", FT_UINT16, BASE_HEX, NULL, 0,
"Capability information", HFILL }},
- {&ff_cf_ess,
+ {&hf_ieee80211_ff_cf_ess,
{"ESS capabilities", "wlan_mgt.fixed.capabilities.ess",
- FT_BOOLEAN, 16, TFS (&cf_ess_flags), 0x0001, "ESS capabilities", HFILL }},
+ FT_BOOLEAN, 16, TFS (&cf_ess_flags), 0x0001, NULL, HFILL }},
- {&ff_cf_ibss,
+ {&hf_ieee80211_ff_cf_ibss,
{"IBSS status", "wlan_mgt.fixed.capabilities.ibss",
FT_BOOLEAN, 16, TFS (&cf_ibss_flags), 0x0002, "IBSS participation", HFILL }},
- {&ff_cf_sta_poll,
+ {&hf_ieee80211_ff_cf_sta_poll,
{"CFP participation capabilities", "wlan_mgt.fixed.capabilities.cfpoll.sta",
FT_UINT16, BASE_HEX, VALS (&sta_cf_pollable), 0x020C,
"CF-Poll capabilities for a STA", HFILL }},
- {&ff_cf_ap_poll,
+ {&hf_ieee80211_ff_cf_ap_poll,
{"CFP participation capabilities", "wlan_mgt.fixed.capabilities.cfpoll.ap",
FT_UINT16, BASE_HEX, VALS (&ap_cf_pollable), 0x020C,
"CF-Poll capabilities for an AP", HFILL }},
- {&ff_cf_privacy,
+ {&hf_ieee80211_ff_cf_privacy,
{"Privacy", "wlan_mgt.fixed.capabilities.privacy",
FT_BOOLEAN, 16, TFS (&cf_privacy_flags), 0x0010, "WEP support", HFILL }},
- {&ff_cf_preamble,
+ {&hf_ieee80211_ff_cf_preamble,
{"Short Preamble", "wlan_mgt.fixed.capabilities.preamble",
- FT_BOOLEAN, 16, TFS (&cf_preamble_flags), 0x0020, "Short Preamble", HFILL }},
+ FT_BOOLEAN, 16, TFS (&cf_preamble_flags), 0x0020, NULL, HFILL }},
- {&ff_cf_pbcc,
+ {&hf_ieee80211_ff_cf_pbcc,
{"PBCC", "wlan_mgt.fixed.capabilities.pbcc",
FT_BOOLEAN, 16, TFS (&cf_pbcc_flags), 0x0040, "PBCC Modulation", HFILL }},
- {&ff_cf_agility,
+ {&hf_ieee80211_ff_cf_agility,
{"Channel Agility", "wlan_mgt.fixed.capabilities.agility",
- FT_BOOLEAN, 16, TFS (&cf_agility_flags), 0x0080, "Channel Agility", HFILL }},
+ FT_BOOLEAN, 16, TFS (&cf_agility_flags), 0x0080, NULL, HFILL }},
- {&ff_cf_spec_man,
+ {&hf_ieee80211_ff_cf_spec_man,
{"Spectrum Management", "wlan_mgt.fixed.capabilities.spec_man",
- FT_BOOLEAN, 16, TFS (&cf_spec_man_flags), 0x0100, "Spectrum Management", HFILL }},
+ FT_BOOLEAN, 16, TFS (&cf_spec_man_flags), 0x0100, NULL, HFILL }},
- {&ff_short_slot_time,
+ {&hf_ieee80211_ff_short_slot_time,
{"Short Slot Time", "wlan_mgt.fixed.capabilities.short_slot_time",
- FT_BOOLEAN, 16, TFS (&short_slot_time_flags), 0x0400, "Short Slot Time",
+ FT_BOOLEAN, 16, TFS (&short_slot_time_flags), 0x0400, NULL,
HFILL }},
- {&ff_cf_apsd,
+ {&hf_ieee80211_ff_cf_apsd,
{"Automatic Power Save Delivery", "wlan_mgt.fixed.capabilities.apsd",
- FT_BOOLEAN, 16, TFS (&cf_apsd_flags), 0x0800, "Automatic Power Save Delivery", HFILL }},
+ FT_BOOLEAN, 16, TFS (&cf_apsd_flags), 0x0800, NULL, HFILL }},
- {&ff_dsss_ofdm,
+ {&hf_ieee80211_ff_dsss_ofdm,
{"DSSS-OFDM", "wlan_mgt.fixed.capabilities.dsss_ofdm",
FT_BOOLEAN, 16, TFS (&dsss_ofdm_flags), 0x2000, "DSSS-OFDM Modulation",
HFILL }},
- {&ff_cf_del_blk_ack,
+ {&hf_ieee80211_ff_cf_del_blk_ack,
{"Delayed Block Ack", "wlan_mgt.fixed.capabilities.del_blk_ack",
- FT_BOOLEAN, 16, TFS (&cf_del_blk_ack_flags), 0x4000, "Delayed Block Ack", HFILL }},
+ FT_BOOLEAN, 16, TFS (&cf_del_blk_ack_flags), 0x4000, NULL, HFILL }},
- {&ff_cf_imm_blk_ack,
+ {&hf_ieee80211_ff_cf_imm_blk_ack,
{"Immediate Block Ack", "wlan_mgt.fixed.capabilities.imm_blk_ack",
- FT_BOOLEAN, 16, TFS (&cf_imm_blk_ack_flags), 0x8000, "Immediate Block Ack", HFILL }},
+ FT_BOOLEAN, 16, TFS (&cf_imm_blk_ack_flags), 0x8000, NULL, HFILL }},
- {&ff_auth_seq,
+ {&hf_ieee80211_ff_auth_seq,
{"Authentication SEQ", "wlan_mgt.fixed.auth_seq",
FT_UINT16, BASE_HEX, NULL, 0, "Authentication Sequence Number", HFILL }},
- {&ff_assoc_id,
+ {&hf_ieee80211_ff_assoc_id,
{"Association ID", "wlan_mgt.fixed.aid",
- FT_UINT16, BASE_HEX, NULL, 0, "Association ID", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x3FFF, NULL, HFILL }},
- {&ff_listen_ival,
+ {&hf_ieee80211_ff_listen_ival,
{"Listen Interval", "wlan_mgt.fixed.listen_ival",
- FT_UINT16, BASE_HEX, NULL, 0, "Listen Interval", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&ff_current_ap,
+ {&hf_ieee80211_ff_current_ap,
{"Current AP", "wlan_mgt.fixed.current_ap",
FT_ETHER, BASE_NONE, NULL, 0, "MAC address of current AP", HFILL }},
- {&ff_reason,
+ {&hf_ieee80211_ff_reason,
{"Reason code", "wlan_mgt.fixed.reason_code",
FT_UINT16, BASE_HEX, VALS (&reason_codes), 0,
"Reason for unsolicited notification", HFILL }},
- {&ff_status_code,
+ {&hf_ieee80211_ff_status_code,
{"Status code", "wlan_mgt.fixed.status_code",
FT_UINT16, BASE_HEX, VALS (&status_codes), 0,
"Status of requested event", HFILL }},
- {&ff_category_code,
+ {&hf_ieee80211_ff_category_code,
{"Category code", "wlan_mgt.fixed.category_code",
FT_UINT16, BASE_DEC, VALS (&category_codes), 0,
"Management action category", HFILL }},
- {&ff_action_code,
+ {&hf_ieee80211_ff_action_code,
{"Action code", "wlan_mgt.fixed.action_code",
FT_UINT16, BASE_DEC, VALS (&action_codes), 0,
"Management action code", HFILL }},
- {&ff_dialog_token,
+ {&hf_ieee80211_ff_dialog_token,
{"Dialog token", "wlan_mgt.fixed.dialog_token",
FT_UINT8, BASE_HEX, NULL, 0, "Management action dialog token", HFILL }},
- {&ff_marvell_action_type,
+ {&hf_ieee80211_ff_marvell_action_type,
{"Marvell Action type", "wlan_mgt.fixed.mrvl_action_type",
FT_UINT8, BASE_DEC, VALS (&vendor_action_types_mrvl), 0,
"Vendor Specific Action Type (Marvell)", HFILL }},
- {&ff_marvell_mesh_mgt_action_code,
+ {&hf_ieee80211_ff_marvell_mesh_mgt_action_code,
{"Mesh action(Marvell)", "wlan_mgt.fixed.mrvl_mesh_action",
FT_UINT8, BASE_HEX, VALS (&mesh_mgt_action_codes_mrvl), 0,
"Mesh action code(Marvell)", HFILL }},
- {&ff_mesh_mgt_length,
+ {&hf_ieee80211_ff_mesh_mgt_length,
{"Message Length", "wlan_mgt.fixed.length",
- FT_UINT8, BASE_DEC, NULL, 0, "Message Length", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&ff_mesh_mgt_mode,
+ {&hf_ieee80211_ff_mesh_mgt_mode,
{"Message Mode", "wlan_mgt.fixed.mode",
- FT_UINT8, BASE_HEX, NULL, 0, "Message Mode", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&ff_mesh_mgt_ttl,
+ {&hf_ieee80211_ff_mesh_mgt_ttl,
{"Message TTL", "wlan_mgt.fixed.ttl",
- FT_UINT8, BASE_DEC, NULL, 0, "Message TTL", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&ff_mesh_mgt_dstcount,
+ {&hf_ieee80211_ff_mesh_mgt_dstcount,
{"Destination Count", "wlan_mgt.fixed.dstcount",
- FT_UINT8, BASE_DEC, NULL, 0, "Destination Count", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&ff_mesh_mgt_hopcount,
+ {&hf_ieee80211_ff_mesh_mgt_hopcount,
{"Hop Count", "wlan_mgt.fixed.hopcount",
- FT_UINT8, BASE_DEC, NULL, 0, "Hop Count", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&ff_mesh_mgt_rreqid,
+ {&hf_ieee80211_ff_mesh_mgt_rreqid,
{"RREQ ID", "wlan_mgt.fixed.rreqid",
- FT_UINT32, BASE_DEC, NULL, 0, "RREQ ID", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&ff_mesh_mgt_sa,
+ {&hf_ieee80211_ff_mesh_mgt_sa,
{"Source Address", "wlan_mgt.fixed.sa",
FT_ETHER, BASE_NONE, NULL, 0, "Source MAC address", HFILL }},
- {&ff_mesh_mgt_ssn,
+ {&hf_ieee80211_ff_mesh_mgt_ssn,
{"SSN", "wlan_mgt.fixed.ssn",
FT_UINT32, BASE_DEC, NULL, 0, "Source Sequence Number", HFILL }},
- {&ff_mesh_mgt_metric,
+ {&hf_ieee80211_ff_mesh_mgt_metric,
{"Metric", "wlan_mgt.fixed.metric",
FT_UINT32, BASE_DEC, NULL, 0, "Route Metric", HFILL }},
- {&ff_mesh_mgt_flags,
+ {&hf_ieee80211_ff_mesh_mgt_flags,
{"RREQ Flags", "wlan_mgt.fixed.hopcount",
- FT_UINT8, BASE_HEX, NULL, 0, "RREQ Flags", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&ff_mesh_mgt_da,
+ {&hf_ieee80211_ff_mesh_mgt_da,
{"Destination Address", "wlan_mgt.fixed.da",
FT_ETHER, BASE_NONE, NULL, 0, "Destination MAC address", HFILL }},
- {&ff_mesh_mgt_dsn,
+ {&hf_ieee80211_ff_mesh_mgt_dsn,
{"DSN", "wlan_mgt.fixed.dsn",
FT_UINT32, BASE_DEC, NULL, 0, "Destination Sequence Number", HFILL }},
- {&ff_mesh_mgt_lifetime,
+ {&hf_ieee80211_ff_mesh_mgt_lifetime,
{"Lifetime", "wlan_mgt.fixed.lifetime",
FT_UINT32, BASE_DEC, NULL, 0, "Route Lifetime", HFILL }},
- {&ff_wme_action_code,
+ {&hf_ieee80211_ff_wme_action_code,
{"Action code", "wlan_mgt.fixed.action_code",
FT_UINT16, BASE_HEX, VALS (&wme_action_codes), 0,
"Management notification action code", HFILL }},
- {&ff_wme_status_code,
+ {&hf_ieee80211_ff_wme_status_code,
{"Status code", "wlan_mgt.fixed.status_code",
FT_UINT16, BASE_HEX, VALS (&wme_status_codes), 0,
"Management notification setup response status code", HFILL }},
- {&ff_qos_action_code,
+#ifdef MESH_OVERRIDES
+ {&hf_ieee80211_ff_mesh_mgt_action_ps_code,
+ {"Action code", "wlan_mgt.fixed.action_code",
+ FT_UINT16, BASE_HEX, VALS (&mesh_mgt_action_ps_codes), 0,
+ "Mesh Management Path Selection action code", HFILL }},
+
+ {&hf_ieee80211_ff_mesh_mgt_action_pl_code,
+ {"Action code", "wlan_mgt.fixed.action_code",
+ FT_UINT16, BASE_HEX, VALS (&mesh_mgt_action_pl_codes), 0,
+ "Mesh Management Peer Link action code", HFILL }},
+
+ {&hf_ieee80211_mesh_mgt_pl_local_link_id,
+ {"Local Link ID", "wlan.pl.local_id",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ "Mesh Management Local Link ID", HFILL }},
+
+ {&hf_ieee80211_mesh_mgt_pl_subtype,
+ {"Peer Link Subtype", "wlan.pl.subtype",
+ FT_UINT16, BASE_HEX, VALS (&mesh_mgt_action_pl_codes), 0,
+ "Mesh Management Peer Link Subtype", HFILL }},
+
+ {&hf_ieee80211_mesh_mgt_pl_reason_code,
+ {"Reason Code", "wlan.pl.reason_code",
+ FT_UINT16, BASE_HEX, VALS (&mesh_mgt_pl_reason_codes), 0,
+ "Mesh Management Reason Code", HFILL }},
+
+ {&hf_ieee80211_mesh_mgt_pl_peer_link_id,
+ {"Peer Link ID", "wlan.pl.peer_id",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ "Mesh Management Peer Link ID", HFILL }},
+
+ {&hf_ieee80211_mesh_config_version,
+ {"Version", "wlan.mesh.config.version",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ "Mesh Configuration Version", HFILL }},
+
+ {&hf_ieee80211_mesh_config_path_sel_protocol,
+ {"Path Selection Protocol", "wlan.mesh.config.ps_protocol",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ "Mesh Configuration Path Selection Protocol", HFILL }},
+
+ {&hf_ieee80211_mesh_config_path_sel_metric,
+ {"Path Selection Metric", "wlan.mesh.config.ps_metric",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ "Mesh Configuration Path Selection Metric", HFILL }},
+
+ {&hf_ieee80211_mesh_config_congestion_control,
+ {"Congestion Control", "wlan.mesh.config.cong_ctl",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ "Mesh Configuration Congestion Control", HFILL }},
+
+ {&hf_ieee80211_mesh_config_channel_prec,
+ {"Channel Precedence", "wlan.mesh.config.chan_prec",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ "Mesh Configuration Channel Precedence", HFILL }},
+
+ {&hf_ieee80211_mesh_config_capability,
+ {"Capability", "wlan.mesh.config.cap",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ "Mesh Configuration Capability", HFILL }},
+
+ {&hf_ieee80211_mesh_id,
+ {"Mesh ID", "wlan.mesh.id",
+ FT_STRING, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_ff_mesh_mgt_dest_flags,
+ {"Destination Flags", "wlan.preq.dest_flags",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_mesh_mgt_dest_do_flags,
+ {"Destination Flags", "wlan.preq.dest_flags.do",
+ FT_BOOLEAN, 8, TFS (&mesh_dest_do_flags), 0x01,
+ "Dest Flags", HFILL }},
+
+ {&hf_ieee80211_ff_mesh_mgt_dest_rf_flags,
+ {"Destination Flags", "wlan.preq.dest_flags.rf",
+ FT_BOOLEAN, 8, TFS (&mesh_dest_rf_flags), 0x02,
+ "Dest Flags", HFILL }},
+
+ {&hf_ieee80211_ff_mesh_mgt_srccount,
+ {"Source Count", "wlan.mesh.srccount",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+#endif /* MESH_OVERRIDES */
+
+ {&hf_ieee80211_ff_qos_action_code,
{"Action code", "wlan_mgt.fixed.action_code",
FT_UINT16, BASE_HEX, VALS (&qos_action_codes), 0,
"QoS management action code", HFILL }},
- /*** Begin: Block Ack Action Fixed Field - Dustin Johnson ***/
- {&ff_ba_action,
+ {&hf_ieee80211_ff_ba_action,
{"Action code", "wlan_mgt.fixed.action_code",
FT_UINT8, BASE_HEX, VALS (&ba_action_codes), 0,
"Block Ack action code", HFILL }},
- /*** End: Block Ack Action Fixed Field - Dustin Johnson ***/
- {&ff_dls_action_code,
+ {&hf_ieee80211_ff_dls_action_code,
{"Action code", "wlan_mgt.fixed.action_code",
FT_UINT16, BASE_HEX, VALS (&dls_action_codes), 0,
"DLS management action code", HFILL }},
- {&ff_dst_mac_addr,
+ {&hf_ieee80211_ff_dst_mac_addr,
{"Destination address", "wlan_mgt.fixed.dst_mac_addr",
FT_ETHER, BASE_NONE, NULL, 0, "Destination MAC address", HFILL }},
- {&ff_src_mac_addr,
+ {&hf_ieee80211_ff_src_mac_addr,
{"Source address", "wlan_mgt.fixed.src_mac_addr",
FT_ETHER, BASE_NONE, NULL, 0, "Source MAC address", HFILL }},
- {&ff_dls_timeout,
+ {&hf_ieee80211_ff_ft_action_code,
+ {"Action code", "wlan_mgt.fixed.action_code",
+ FT_UINT8, BASE_DEC, VALS(ft_action_codes), 0,
+ "Management action code", HFILL }},
+
+ {&hf_ieee80211_ff_sta_address,
+ {"STA Address", "wlan_mgt.fixed.sta_address",
+ FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_target_ap_address,
+ {"Target AP Address", "wlan_mgt.fixed.target_ap_address",
+ FT_ETHER, BASE_NONE, NULL, 0, "Target AP MAC address", HFILL }},
+
+ {&hf_ieee80211_ff_gas_comeback_delay,
+ {"GAS Comeback Delay", "wlan_mgt.fixed.gas_comeback_delay",
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_gas_fragment_id,
+ {"GAS Query Response Fragment ID", "wlan_mgt.fixed.gas_fragment_id",
+ FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL
+ }},
+
+ {&hf_ieee80211_ff_more_gas_fragments,
+ {"More GAS Fragments", "wlan_mgt.fixed.more_gas_fragments",
+ FT_UINT8, BASE_DEC, NULL, 0x80, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_query_request_length,
+ {"Query Request Length", "wlan_mgt.fixed.query_request_length",
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_query_request,
+ {"Query Request", "wlan_mgt.fixed.query_request",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_query_response_length,
+ {"Query Response Length", "wlan_mgt.fixed.query_response_length",
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_query_response,
+ {"Query Response", "wlan_mgt.fixed.query_response",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_ff_anqp_info_id,
+ {"Info ID", "wlan_mgt.fixed.anqp.info_id",
+ FT_UINT16, BASE_DEC, VALS(anqp_info_id_vals), 0,
+ "Access Network Query Protocol Info ID", HFILL }},
+
+ {&hf_ieee80211_ff_anqp_info_length,
+ {"Length", "wlan_mgt.fixed.anqp.info_length",
+ FT_UINT16, BASE_DEC, NULL, 0, "Access Network Query Protocol Length",
+ HFILL }},
+
+ {&hf_ieee80211_ff_anqp_info,
+ {"Information", "wlan_mgt.fixed.anqp.info",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "Access Network Query Protocol Information", HFILL }},
+
+ {&hf_ieee80211_ff_dls_timeout,
{"DLS timeout", "wlan_mgt.fixed.dls_timeout",
FT_UINT16, BASE_HEX, NULL, 0, "DLS timeout value", HFILL }},
- {&tag_number,
- {"Tag", "wlan_mgt.tag.number",
- FT_UINT8, BASE_DEC, VALS(tag_num_vals), 0,
+ {&hf_ieee80211_ff_sa_query_action_code,
+ {"Action code", "wlan_mgt.fixed.action_code",
+ FT_UINT8, BASE_DEC, VALS(sa_query_action_codes), 0,
+ "Management action code", HFILL }},
+
+ {&hf_ieee80211_ff_transaction_id,
+ {"Transaction Id", "wlan_mgt.fixed.transaction_id",
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag,
+ {"Tag", "wlan_mgt.tag",
+ FT_NONE, BASE_NONE, 0x0, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_number,
+ {"Tag Number", "wlan_mgt.tag.number",
+ FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(tag_num_vals), 0,
"Element ID", HFILL }},
- {&tag_length,
+ {&hf_ieee80211_tag_length,
{"Tag length", "wlan_mgt.tag.length",
FT_UINT32, BASE_DEC, NULL, 0, "Length of tag", HFILL }},
- {&tag_interpretation,
+ {&hf_ieee80211_tag_interpretation,
{"Tag interpretation", "wlan_mgt.tag.interpretation",
FT_STRING, BASE_NONE, NULL, 0, "Interpretation of tag", HFILL }},
- {&tag_oui,
+ {&hf_ieee80211_tag_oui,
{"OUI", "wlan_mgt.tag.oui",
FT_BYTES, BASE_NONE, NULL, 0, "OUI of vendor specific IE", HFILL }},
- {&tim_length,
- {"TIM length", "wlan_mgt.tim.length",
+ {&hf_ieee80211_tag_ds_param_channel,
+ {"Current Channel", "wlan_mgt.ds.current_channel",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ "DS Parameter Set - Current Channel", HFILL }},
+
+ {&hf_ieee80211_tag_cfp_count,
+ {"CFP Count", "wlan_mgt.cfp.count",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ "Indicates how many delivery traffic indication messages (DTIMs)", HFILL }},
+
+ {&hf_ieee80211_tag_cfp_period,
+ {"CFP Period", "wlan_mgt.cfp.period",
FT_UINT8, BASE_DEC, NULL, 0,
- "Traffic Indication Map length", HFILL }},
+ "Indicates the number of DTIM intervals between the start of CFPs", HFILL }},
- {&tim_dtim_count,
+ {&hf_ieee80211_tag_cfp_max_duration,
+ {"CFP Max Duration", "wlan_mgt.cfp.max_duration",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Indicates the maximum duration (in TU) of the CFP that may be generated by this PCF", HFILL }},
+
+ {&hf_ieee80211_tag_cfp_dur_remaining,
+ {"CFP Dur Remaining", "wlan_mgt.cfp.dur_remaining",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Indicates the maximum time (in TU) remaining in the present CFP", HFILL }},
+
+ {&hf_ieee80211_tag_vendor_oui_type,
+ {"Vendor Specific OUI Type", "wlan_mgt.tag.oui.type",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tim_dtim_count,
{"DTIM count", "wlan_mgt.tim.dtim_count",
FT_UINT8, BASE_DEC, NULL, 0,
- "DTIM count", HFILL }},
+ "Indicates how many Beacon frames (including the current frame) appear before the next DTIM", HFILL }},
- {&tim_dtim_period,
+ {&hf_ieee80211_tim_dtim_period,
{"DTIM period", "wlan_mgt.tim.dtim_period",
FT_UINT8, BASE_DEC, NULL, 0,
- "DTIM period", HFILL }},
+ "Indicates the number of beacon intervals between successive DTIMs", HFILL }},
- {&tim_bmapctl,
+ {&hf_ieee80211_tim_bmapctl,
{"Bitmap control", "wlan_mgt.tim.bmapctl",
FT_UINT8, BASE_HEX, NULL, 0,
- "Bitmap control", HFILL }},
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tim_bmapctl_mcast,
+ {"Multicast", "wlan_mgt.tim.bmapctl.multicast",
+ FT_BOOLEAN, 8, NULL, 0x1,
+ "Contains the Traffic Indicator bit associated with Association ID 0", HFILL }},
+
+ {&hf_ieee80211_tim_bmapctl_offset,
+ {"Bitmap Offset", "wlan_mgt.tim.bmapctl.offset",
+ FT_UINT8, BASE_HEX, NULL, 0xFE,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tim_partial_virtual_bitmap,
+ {"Partial Virtual Bitmap", "wlan_mgt.tim.partial_virtual_bitmap",
+ FT_BYTES, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_ibss_atim_window,
+ {"Atim Windows", "wlan_mgt.ibss.atim_windows",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ "Contains the ATIM Window length in TU", HFILL }},
+
+ {&hf_ieee80211_tag_country_info_code,
+ {"Code", "wlan_mgt.country_info.code",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_country_info_env,
+ {"Environment", "wlan_mgt.country_info.environment",
+ FT_UINT8, BASE_HEX, VALS(environment_vals), 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_country_info_fnm,
+ {"Country Info", "wlan_mgt.country_info.fnm",
+ FT_NONE, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_country_info_fnm_fcn,
+ {"First Channel Number", "wlan_mgt.country_info.fnm.fcn",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_country_info_fnm_nc,
+ {"Number of Channels", "wlan_mgt.country_info.fnm.nc",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_country_info_fnm_mtpl,
+ {"Maximum Transmit Power Level (in dBm)", "wlan_mgt.country_info.fnm.mtpl",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_country_info_rrc,
+ {"Country Info", "wlan_mgt.country_info.rrc",
+ FT_NONE, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_country_info_rrc_rei,
+ {"Regulatory Extension Identifier", "wlan_mgt.country_info.rrc.rei",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_country_info_rrc_rc,
+ {"Regulatory Class", "wlan_mgt.country_info.rrc.rc",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_country_info_rrc_cc,
+ {"Coverage Class", "wlan_mgt.country_info.rrc.cc",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_fh_hopping_parameter_prime_radix,
+ {"Prime Radix", "wlan_mgt.fh_hopping.parameter.prime_radix",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_fh_hopping_parameter_nb_channels,
+ {"Number of Channels", "wlan_mgt.fh_hopping.parameter.nb_channels",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_fh_hopping_table_flag,
+ {"Flag", "wlan_mgt.fh_hopping.table.flag",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ "Indicates that a Random Table is present when the value is 1", HFILL }},
+
+ {&hf_ieee80211_tag_fh_hopping_table_number_of_sets,
+ {"Number of Sets", "wlan_mgt.fh_hopping.table.number_of_sets",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Indicates the total number of sets within the hopping patterns", HFILL }},
+
+ {&hf_ieee80211_tag_fh_hopping_table_modulus,
+ {"Modulus", "wlan_mgt.fh_hopping.table.modulus",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ "Indicate the values to be used in the equations to create a hopping sequence from the Random Table information", HFILL }},
+
+ {&hf_ieee80211_tag_fh_hopping_table_offset,
+ {"Offset", "wlan_mgt.fh_hopping.table.offset",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ "Indicate the values to be used in the equations to create a hopping sequence from the Random Table information", HFILL }},
+
+ {&hf_ieee80211_tag_fh_hopping_random_table,
+ {"Random Table", "wlan_mgt.fh_hopping.table.random_table",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ "It is a vector of single octet values that indicate the random sequence to be followed during a hopping sequence", HFILL }},
+
+ {&hf_ieee80211_tag_request,
+ {"Requested Element ID", "wlan_mgt.tag.request",
+ FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(tag_num_vals), 0,
+ "The list of elements that are to be included in the responding STA Probe Response frame", HFILL }},
+
+ {&hf_ieee80211_tclas_up,
+ {"User Priority", "wlan_mgt.tclas.user_priority",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ "Contains the value of the UP of the associated MSDUs", HFILL }},
+
+ {&hf_ieee80211_tclas_class_type,
+ {"Classifier Type", "wlan_mgt.tclas.class_type",
+ FT_UINT8, BASE_DEC, VALS (classifier_type), 0,
+ "Specifies the type of classifier parameters", HFILL }},
+
+ {&hf_ieee80211_tclas_class_mask,
+ {"Classifier Mask", "wlan_mgt.tclas.class_mask",
+ FT_UINT8, BASE_HEX, NULL, 0,
+ "Specifies a bitmap where bits that are set to 1 identify a subset of the classifier parameters", HFILL }},
+
+ {&hf_ieee80211_tclas_src_mac_addr,
+ {"Source address", "wlan_mgt.tclas.type",
+ FT_ETHER, BASE_NONE, NULL, 0,
+ "Classifier Parameters Ethernet Type", HFILL }},
+
+ {&hf_ieee80211_tclas_dst_mac_addr,
+ {"Destination address", "wlan_mgt.tclas.type",
+ FT_ETHER, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tclas_ether_type,
+ {"Ethernet Type", "wlan_mgt.tclas.type",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tclas_version,
+ {"IP Version", "wlan_mgt.tclas.version",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tclas_ipv4_src,
+ {"IPv4 Src Addr", "wlan_mgt.tclas.ipv4_src",
+ FT_IPv4, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tclas_ipv4_dst,
+ {"IPv4 Dst Addr", "wlan_mgt.tclas.ipv4_dst",
+ FT_IPv4, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tclas_src_port,
+ {"Source Port", "wlan_mgt.tclas.src_port",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tclas_dst_port,
+ {"Destination Port", "wlan_mgt.tclas.dst_port",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tclas_dscp,
+ {"IPv4 DSCP", "wlan_mgt.tclas.dscp",
+ FT_UINT8, BASE_HEX, NULL, 0,
+ "IPv4 Differentiated Services Code Point (DSCP) Field", HFILL }},
+
+ {&hf_ieee80211_tclas_protocol,
+ {"Protocol", "wlan_mgt.tclas.protocol",
+ FT_UINT8, BASE_HEX, NULL, 0, "IPv4 Protocol", HFILL }},
+
+ {&hf_ieee80211_tclas_ipv6_src,
+ {"IPv6 Src Addr", "wlan_mgt.tclas.ipv6_src",
+ FT_IPv6, BASE_NONE,
+ NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tclas_ipv6_dst,
+ {"IPv6 Dst Addr", "wlan_mgt.tclas.ipv6_dst",
+ FT_IPv6, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tclas_flow,
+ {"Flow Label", "wlan_mgt.tclas.flow",
+ FT_UINT24, BASE_HEX, NULL, 0,
+ "IPv6 Flow Label", HFILL }},
+
+ {&hf_ieee80211_tclas_tag_type,
+ {"802.1Q Tag Type", "wlan_mgt.tclas.tag_type",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_challenge_text,
+ {"Challenge Text", "wlan_mgt.tag.challenge_text",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_version,
+ {"RSN Version", "wlan_mgt.rsn.version", FT_UINT16, BASE_DEC,
+ NULL, 0, "Indicates the version number of the RSNA protocol", HFILL }},
- {&rsn_cap,
+ {&hf_ieee80211_rsn_gcs,
+ {"Group Cipher Suite", "wlan_mgt.rsn.gcs", FT_UINT32, BASE_CUSTOM,
+ rsn_gcs_base_custom, 0, "Contains the cipher suite selector used by the BSS to protect broadcast/multicast traffic", HFILL }},
+
+ {&hf_ieee80211_rsn_gcs_oui,
+ {"Group Cipher Suite OUI", "wlan_mgt.rsn.gcs.oui", FT_UINT24, BASE_CUSTOM,
+ oui_base_custom, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_gcs_type,
+ {"Group Cipher Suite type", "wlan_mgt.rsn.gcs.type", FT_UINT8, BASE_DEC,
+ NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_gcs_80211_type,
+ {"Group Cipher Suite type", "wlan_mgt.rsn.gcs.type", FT_UINT8, BASE_DEC,
+ VALS(ieee80211_rsn_cipher_vals), 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_pcs_count,
+ {"Pairwise Cipher Suite Count", "wlan_mgt.rsn.pcs.count", FT_UINT16, BASE_DEC,
+ NULL, 0, "Indicates the number of pairwise cipher suite selectors that are contained in the Pairwise Cipher Suite List", HFILL }},
+
+ {&hf_ieee80211_rsn_pcs_list,
+ {"Pairwise Cipher Suite List", "wlan_mgt.rsn.pcs.list", FT_NONE, BASE_NONE,
+ NULL, 0, "Contains a series of cipher suite selectors that indicate the pairwisecipher suites", HFILL }},
+
+ {&hf_ieee80211_rsn_pcs,
+ {"Pairwise Cipher Suite", "wlan_mgt.rsn.pcs", FT_UINT32, BASE_CUSTOM,
+ rsn_pcs_base_custom, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_pcs_oui,
+ {"Pairwise Cipher Suite OUI", "wlan_mgt.rsn.pcs.oui", FT_UINT24, BASE_CUSTOM,
+ oui_base_custom, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_pcs_type,
+ {"Pairwise Cipher Suite type", "wlan_mgt.rsn.pcs.type", FT_UINT8, BASE_DEC,
+ NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_pcs_80211_type,
+ {"Pairwise Cipher Suite type", "wlan_mgt.rsn.pcs.type", FT_UINT8, BASE_DEC,
+ VALS(ieee80211_rsn_cipher_vals), 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_akms_count,
+ {"Auth Key Management (AKM) Suite Count", "wlan_mgt.rsn.akms.count", FT_UINT16, BASE_DEC,
+ NULL, 0, "Indicates the number of Auth Key Management suite selectors that are contained in the Auth Key Management Suite List", HFILL }},
+
+ {&hf_ieee80211_rsn_akms_list,
+ {"Auth Key Management (AKM) List", "wlan_mgt.rsn.akms.list", FT_NONE, BASE_NONE,
+ NULL, 0, "Contains a series of cipher suite selectors that indicate the AKM suites", HFILL }},
+
+ {&hf_ieee80211_rsn_akms,
+ {"Auth Key Management (AKM) Suite", "wlan_mgt.rsn.akms", FT_UINT32, BASE_CUSTOM,
+ rsn_akms_base_custom, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_akms_oui,
+ {"Auth Key Management (AKM) OUI", "wlan_mgt.rsn.akms.oui", FT_UINT24, BASE_CUSTOM,
+ oui_base_custom, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_akms_type,
+ {"Auth Key Management (AKM) type", "wlan_mgt.rsn.akms.type", FT_UINT8, BASE_DEC,
+ NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_akms_80211_type,
+ {"Auth Key Management (AKM) type", "wlan_mgt.rsn.akms.type", FT_UINT8, BASE_DEC,
+ VALS(ieee80211_rsn_keymgmt_vals), 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_cap,
{"RSN Capabilities", "wlan_mgt.rsn.capabilities", FT_UINT16, BASE_HEX,
NULL, 0, "RSN Capability information", HFILL }},
- {&rsn_cap_preauth,
+ {&hf_ieee80211_rsn_cap_preauth,
{"RSN Pre-Auth capabilities", "wlan_mgt.rsn.capabilities.preauth",
- FT_BOOLEAN, 16, TFS (&rsn_preauth_flags), 0x0001,
- "RSN Pre-Auth capabilities", HFILL }},
+ FT_BOOLEAN, 16, TFS(&rsn_preauth_flags), 0x0001,
+ NULL, HFILL }},
- {&rsn_cap_no_pairwise,
+ {&hf_ieee80211_rsn_cap_no_pairwise,
{"RSN No Pairwise capabilities", "wlan_mgt.rsn.capabilities.no_pairwise",
- FT_BOOLEAN, 16, TFS (&rsn_no_pairwise_flags), 0x0002,
- "RSN No Pairwise capabilities", HFILL }},
+ FT_BOOLEAN, 16, TFS(&rsn_no_pairwise_flags), 0x0002,
+ NULL, HFILL }},
- {&rsn_cap_ptksa_replay_counter,
+ {&hf_ieee80211_rsn_cap_ptksa_replay_counter,
{"RSN PTKSA Replay Counter capabilities",
"wlan_mgt.rsn.capabilities.ptksa_replay_counter",
- FT_UINT16, BASE_HEX, VALS (&rsn_cap_replay_counter), 0x000C,
- "RSN PTKSA Replay Counter capabilities", HFILL }},
+ FT_UINT16, BASE_HEX, VALS(rsn_cap_replay_counter), 0x000C,
+ NULL, HFILL }},
- {&rsn_cap_gtksa_replay_counter,
+ {&hf_ieee80211_rsn_cap_gtksa_replay_counter,
{"RSN GTKSA Replay Counter capabilities",
"wlan_mgt.rsn.capabilities.gtksa_replay_counter",
- FT_UINT16, BASE_HEX, VALS (&rsn_cap_replay_counter), 0x0030,
- "RSN GTKSA Replay Counter capabilities", HFILL }},
+ FT_UINT16, BASE_HEX, VALS(rsn_cap_replay_counter), 0x0030,
+ NULL, HFILL }},
- {&ht_cap,
+ {&hf_ieee80211_rsn_cap_mfpr,
+ {"Management Frame Protection Required",
+ "wlan_mgt.rsn.capabilities.mfpr",
+ FT_BOOLEAN, 16, NULL, 0x0040, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_cap_mfpc,
+ {"Management Frame Protection Capable",
+ "wlan_mgt.rsn.capabilities.mfpc",
+ FT_BOOLEAN, 16, NULL, 0x0080, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_cap_peerkey,
+ {"PeerKey Enabled",
+ "wlan_mgt.rsn.capabilities.peerkey",
+ FT_BOOLEAN, 16, NULL, 0x0200, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_pmkid_count,
+ {"PMKID Count", "wlan_mgt.rsn.pmkid.count", FT_UINT16, BASE_DEC,
+ NULL, 0, "Indicates the number of PMKID selectors that are contained in the PMKID Suite List", HFILL }},
+
+ {&hf_ieee80211_rsn_pmkid_list,
+ {"PMKID List", "wlan_mgt.rsn.pmkid.list", FT_NONE, BASE_NONE,
+ NULL, 0, "Contains a series of cipher suite selectors that indicate the AKM suites", HFILL }},
+
+ {&hf_ieee80211_rsn_pmkid,
+ {"PMKID", "wlan_mgt.pmkid.akms", FT_BYTES, BASE_NONE,
+ NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_gmcs,
+ {"Group Managemement Cipher Suite", "wlan_mgt.rsn.gmcs", FT_UINT32, BASE_CUSTOM,
+ rsn_gmcs_base_custom, 0, "Contains the cipher suite selector used by the BSS to protect broadcast/multicast traffic", HFILL }},
+
+ {&hf_ieee80211_rsn_gmcs_oui,
+ {"Group Managemement Cipher Suite OUI", "wlan_mgt.rsn.gmcs.oui", FT_UINT24, BASE_CUSTOM,
+ oui_base_custom, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_gmcs_type,
+ {"Group Managemement Cipher Suite type", "wlan_mgt.rsn.gmcs.type", FT_UINT8, BASE_DEC,
+ NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_rsn_gmcs_80211_type,
+ {"Group Managemement Cipher Suite type", "wlan_mgt.rsn.gmcs.type", FT_UINT8, BASE_DEC,
+ VALS(ieee80211_rsn_cipher_vals), 0, NULL, HFILL }},
+
+
+ {&hf_ieee80211_ht_cap,
{"HT Capabilities Info", "wlan_mgt.ht.capabilities", FT_UINT16, BASE_HEX,
NULL, 0, "HT Capability information", HFILL }},
- {&ht_vs_cap,
+ {&hf_ieee80211_ht_vs_cap,
{"HT Capabilities Info (VS)", "wlan_mgt.vs.ht.capabilities", FT_UINT16, BASE_HEX,
NULL, 0, "Vendor Specific HT Capability information", HFILL }},
- {&ht_ldpc_coding,
+ {&hf_ieee80211_ht_ldpc_coding,
{"HT LDPC coding capability", "wlan_mgt.ht.capabilities.ldpccoding",
FT_BOOLEAN, 16, TFS (&ht_ldpc_coding_flag), 0x0001,
- "HT LDPC coding capability", HFILL }},
+ NULL, HFILL }},
- {&ht_chan_width,
+ {&hf_ieee80211_ht_chan_width,
{"HT Support channel width", "wlan_mgt.ht.capabilities.width",
FT_BOOLEAN, 16, TFS (&ht_chan_width_flag), 0x0002,
- "HT Support channel width", HFILL }},
+ NULL, HFILL }},
- {&ht_sm_pwsave,
+ {&hf_ieee80211_ht_sm_pwsave,
{"HT SM Power Save", "wlan_mgt.ht.capabilities.sm",
FT_UINT16, BASE_HEX, VALS (&ht_sm_pwsave_flag), 0x000c,
- "HT SM Power Save", HFILL }},
+ NULL, HFILL }},
- {&ht_green,
+ {&hf_ieee80211_ht_green,
{"HT Green Field", "wlan_mgt.ht.capabilities.green",
FT_BOOLEAN, 16, TFS (&ht_green_flag), 0x0010,
- "HT Green Field", HFILL }},
+ NULL, HFILL }},
- {&ht_short20,
+ {&hf_ieee80211_ht_short20,
{"HT Short GI for 20MHz", "wlan_mgt.ht.capabilities.short20",
FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0020,
- "HT Short GI for 20MHz", HFILL }},
+ NULL, HFILL }},
- {&ht_short40,
+ {&hf_ieee80211_ht_short40,
{"HT Short GI for 40MHz", "wlan_mgt.ht.capabilities.short40",
FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0040,
- "HT Short GI for 40MHz", HFILL }},
+ NULL, HFILL }},
- {&ht_tx_stbc,
+ {&hf_ieee80211_ht_tx_stbc,
{"HT Tx STBC", "wlan_mgt.ht.capabilities.txstbc",
FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0080,
- "HT Tx STBC", HFILL }},
+ NULL, HFILL }},
- {&ht_rx_stbc,
+ {&hf_ieee80211_ht_rx_stbc,
{"HT Rx STBC", "wlan_mgt.ht.capabilities.rxstbc",
FT_UINT16, BASE_HEX, VALS (&ht_rx_stbc_flag), 0x0300,
"HT Tx STBC", HFILL }},
- {&ht_delayed_block_ack,
+ {&hf_ieee80211_ht_delayed_block_ack,
{"HT Delayed Block ACK", "wlan_mgt.ht.capabilities.delayedblockack",
FT_BOOLEAN, 16, TFS (&ht_delayed_block_ack_flag), 0x0400,
- "HT Delayed Block ACK", HFILL }},
+ NULL, HFILL }},
- {&ht_max_amsdu,
+ {&hf_ieee80211_ht_max_amsdu,
{"HT Max A-MSDU length", "wlan_mgt.ht.capabilities.amsdu",
FT_BOOLEAN, 16, TFS (&ht_max_amsdu_flag), 0x0800,
- "HT Max A-MSDU length", HFILL }},
+ NULL, HFILL }},
- {&ht_dss_cck_40,
+ {&hf_ieee80211_ht_dss_cck_40,
{"HT DSSS/CCK mode in 40MHz", "wlan_mgt.ht.capabilities.dsscck",
FT_BOOLEAN, 16, TFS (&ht_dss_cck_40_flag), 0x1000,
"HT DSS/CCK mode in 40MHz", HFILL }},
- {&ht_psmp,
+ {&hf_ieee80211_ht_psmp,
{"HT PSMP Support", "wlan_mgt.ht.capabilities.psmp",
FT_BOOLEAN, 16, TFS (&ht_psmp_flag), 0x2000,
- "HT PSMP Support", HFILL }},
+ NULL, HFILL }},
- {&ht_40_mhz_intolerant,
+ {&hf_ieee80211_ht_40_mhz_intolerant,
{"HT Forty MHz Intolerant", "wlan_mgt.ht.capabilities.40mhzintolerant",
FT_BOOLEAN, 16, TFS (&ht_40_mhz_intolerant_flag), 0x4000,
- "HT Forty MHz Intolerant", HFILL }},
+ NULL, HFILL }},
- {&ht_l_sig,
+ {&hf_ieee80211_ht_l_sig,
{"HT L-SIG TXOP Protection support", "wlan_mgt.ht.capabilities.lsig",
FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x8000,
- "HT L-SIG TXOP Protection support", HFILL }},
+ NULL, HFILL }},
- {&duparam,
+ {&hf_ieee80211_ampduparam,
{"A-MPDU Parameters", "wlan_mgt.ht.ampduparam", FT_UINT16, BASE_HEX,
- NULL, 0, "A-MPDU Parameters", HFILL }},
+ NULL, 0, NULL, HFILL }},
- {&duparam_vs,
+ {&hf_ieee80211_ampduparam_vs,
{"A-MPDU Parameters (VS)", "wlan_mgt.vs.ht.ampduparam", FT_UINT16, BASE_HEX,
NULL, 0, "Vendor Specific A-MPDU Parameters", HFILL }},
- {&duparam_mpdu,
+ {&hf_ieee80211_ampduparam_mpdu,
{"Maximum Rx A-MPDU Length", "wlan_mgt.ht.ampduparam.maxlength",
FT_UINT8, BASE_HEX, 0 , 0x03,
- "Maximum Rx A-MPDU Length", HFILL }},
+ NULL, HFILL }},
- {&duparam_mpdu_start_spacing,
+ {&hf_ieee80211_ampduparam_mpdu_start_spacing,
{"MPDU Density", "wlan_mgt.ht.ampduparam.mpdudensity",
FT_UINT8, BASE_HEX, VALS (&duparam_mpdu_start_spacing_flags) , 0x1c,
- "MPDU Density", HFILL }},
+ NULL, HFILL }},
- {&duparam_reserved,
+ {&hf_ieee80211_ampduparam_reserved,
{"Reserved", "wlan_mgt.ht.ampduparam.reserved",
FT_UINT8, BASE_HEX, NULL, 0xE0,
- "Reserved", HFILL }},
+ NULL, HFILL }},
- {&mcsset,
+ {&hf_ieee80211_mcsset,
{"Rx Supported Modulation and Coding Scheme Set", "wlan_mgt.ht.mcsset",
- FT_STRING, BASE_NONE, NULL, 0, "Rx Supported Modulation and Coding Scheme Set", HFILL }},
+ FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
- {&mcsset_vs,
+ {&hf_ieee80211_mcsset_vs,
{"Rx Supported Modulation and Coding Scheme Set (VS)", "wlan_mgt.vs.ht.mcsset",
FT_STRING, BASE_NONE, NULL, 0, "Vendor Specific Rx Supported Modulation and Coding Scheme Set", HFILL }},
- {&mcsset_rx_bitmask_0to7,
+ {&hf_ieee80211_mcsset_rx_bitmask_0to7,
{"Rx Bitmask Bits 0-7", "wlan_mgt.ht.mcsset.rxbitmask.0to7",
- FT_UINT32, BASE_HEX, 0, 0x000000ff, "Rx Bitmask Bits 0-7", HFILL }},
+ FT_UINT32, BASE_HEX, 0, 0x000000ff, NULL, HFILL }},
- {&mcsset_rx_bitmask_8to15,
+ {&hf_ieee80211_mcsset_rx_bitmask_8to15,
{"Rx Bitmask Bits 8-15", "wlan_mgt.ht.mcsset.rxbitmask.8to15",
- FT_UINT32, BASE_HEX, 0, 0x0000ff00, "Rx Bitmask Bits 8-15", HFILL }},
+ FT_UINT32, BASE_HEX, 0, 0x0000ff00, NULL, HFILL }},
- {&mcsset_rx_bitmask_16to23,
+ {&hf_ieee80211_mcsset_rx_bitmask_16to23,
{"Rx Bitmask Bits 16-23", "wlan_mgt.ht.mcsset.rxbitmask.16to23",
- FT_UINT32, BASE_HEX, 0, 0x00ff0000, "Rx Bitmask Bits 16-23", HFILL }},
+ FT_UINT32, BASE_HEX, 0, 0x00ff0000, NULL, HFILL }},
- {&mcsset_rx_bitmask_24to31,
+ {&hf_ieee80211_mcsset_rx_bitmask_24to31,
{"Rx Bitmask Bits 24-31", "wlan_mgt.ht.mcsset.rxbitmask.24to31",
- FT_UINT32, BASE_HEX, 0, 0xff000000, "Rx Bitmask Bits 24-31", HFILL }},
+ FT_UINT32, BASE_HEX, 0, 0xff000000, NULL, HFILL }},
- {&mcsset_rx_bitmask_32,
+ {&hf_ieee80211_mcsset_rx_bitmask_32,
{"Rx Bitmask Bit 32", "wlan_mgt.ht.mcsset.rxbitmask.32",
- FT_UINT32, BASE_HEX, 0, 0x000001, "Rx Bitmask Bit 32", HFILL }},
+ FT_UINT32, BASE_HEX, 0, 0x000001, NULL, HFILL }},
- {&mcsset_rx_bitmask_33to38,
+ {&hf_ieee80211_mcsset_rx_bitmask_33to38,
{"Rx Bitmask Bits 33-38", "wlan_mgt.ht.mcsset.rxbitmask.33to38",
- FT_UINT32, BASE_HEX, 0, 0x00007e, "Rx Bitmask Bits 33-38", HFILL }},
+ FT_UINT32, BASE_HEX, 0, 0x00007e, NULL, HFILL }},
- {&mcsset_rx_bitmask_39to52,
+ {&hf_ieee80211_mcsset_rx_bitmask_39to52,
{"Rx Bitmask Bits 39-52", "wlan_mgt.ht.mcsset.rxbitmask.39to52",
- FT_UINT32, BASE_HEX, 0, 0x1fff80, "Rx Bitmask Bits 39-52", HFILL }},
+ FT_UINT32, BASE_HEX, 0, 0x1fff80, NULL, HFILL }},
- {&mcsset_rx_bitmask_53to76,
+ {&hf_ieee80211_mcsset_rx_bitmask_53to76,
{"Rx Bitmask Bits 53-76", "wlan_mgt.ht.mcsset.rxbitmask.53to76",
- FT_UINT32, BASE_HEX, 0, 0x1fffffe0, "Rx Bitmask Bits 53-76", HFILL }},
+ FT_UINT32, BASE_HEX, 0, 0x1fffffe0, NULL, HFILL }},
- {&mcsset_highest_data_rate,
+ {&hf_ieee80211_mcsset_highest_data_rate,
{"Highest Supported Data Rate", "wlan_mgt.ht.mcsset.highestdatarate",
- FT_UINT16, BASE_HEX, 0, 0x03ff, "Highest Supported Data Rate", HFILL }},
+ FT_UINT16, BASE_HEX, 0, 0x03ff, NULL, HFILL }},
- {&mcsset_tx_mcs_set_defined,
+ {&hf_ieee80211_mcsset_tx_mcs_set_defined,
{"Tx Supported MCS Set", "wlan_mgt.ht.mcsset.txsetdefined",
FT_BOOLEAN, 16, TFS (&mcsset_tx_mcs_set_defined_flag), 0x0001,
- "Tx Supported MCS Set", HFILL }},
+ NULL, HFILL }},
- {&mcsset_tx_rx_mcs_set_not_equal,
+ {&hf_ieee80211_mcsset_tx_rx_mcs_set_not_equal,
{"Tx and Rx MCS Set", "wlan_mgt.ht.mcsset.txrxmcsnotequal",
FT_BOOLEAN, 16, TFS (&mcsset_tx_rx_mcs_set_not_equal_flag), 0x0002,
- "Tx and Rx MCS Set", HFILL }},
+ NULL, HFILL }},
- {&mcsset_tx_max_spatial_streams,
+ {&hf_ieee80211_mcsset_tx_max_spatial_streams,
{"Tx Maximum Number of Spatial Streams Supported", "wlan_mgt.ht.mcsset.txmaxss",
FT_UINT16, BASE_HEX, VALS (&mcsset_tx_max_spatial_streams_flags) , 0x000c,
- "Tx Maximum Number of Spatial Streams Supported", HFILL }},
+ NULL, HFILL }},
- {&mcsset_tx_unequal_modulation,
+ {&hf_ieee80211_mcsset_tx_unequal_modulation,
{"Unequal Modulation", "wlan_mgt.ht.mcsset.txunequalmod",
FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0010,
- "Unequal Modulation", HFILL }},
+ NULL, HFILL }},
- {&htex_cap,
+ {&hf_ieee80211_htex_cap,
{"HT Extended Capabilities", "wlan_mgt.htex.capabilities", FT_UINT16, BASE_HEX,
NULL, 0, "HT Extended Capability information", HFILL }},
- {&htex_vs_cap,
+ {&hf_ieee80211_htex_vs_cap,
{"HT Extended Capabilities (VS)", "wlan_mgt.vs.htex.capabilities", FT_UINT16, BASE_HEX,
NULL, 0, "Vendor Specific HT Extended Capability information", HFILL }},
- {&htex_pco,
+ {&hf_ieee80211_htex_pco,
{"Transmitter supports PCO", "wlan_mgt.htex.capabilities.pco",
FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0001,
- "Transmitter supports PCO", HFILL }},
+ NULL, HFILL }},
- {&htex_transtime,
+ {&hf_ieee80211_htex_transtime,
{"Time needed to transition between 20MHz and 40MHz", "wlan_mgt.htex.capabilities.transtime",
FT_UINT16, BASE_HEX, VALS (&htex_transtime_flags), 0x0006,
- "Time needed to transition between 20MHz and 40MHz", HFILL }},
+ NULL, HFILL }},
- {&htex_mcs,
+ {&hf_ieee80211_htex_mcs,
{"MCS Feedback capability", "wlan_mgt.htex.capabilities.mcs",
FT_UINT16, BASE_HEX, VALS (&htex_mcs_flags), 0x0300,
- "MCS Feedback capability", HFILL }},
+ NULL, HFILL }},
- {&htex_htc_support,
+ {&hf_ieee80211_htex_htc_support,
{"High Throughput", "wlan_mgt.htex.capabilities.htc",
FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0400,
- "High Throughput", HFILL }},
+ NULL, HFILL }},
- {&htex_rd_responder,
+ {&hf_ieee80211_htex_rd_responder,
{"Reverse Direction Responder", "wlan_mgt.htex.capabilities.rdresponder",
FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0800,
- "Reverse Direction Responder", HFILL }},
+ NULL, HFILL }},
- {&txbf,
+ {&hf_ieee80211_txbf,
{"Transmit Beam Forming (TxBF) Capabilities", "wlan_mgt.txbf", FT_UINT16, BASE_HEX,
- NULL, 0, "Transmit Beam Forming (TxBF) Capabilities", HFILL }},
+ NULL, 0, NULL, HFILL }},
- {&txbf_vs,
+ {&hf_ieee80211_txbf_vs,
{"Transmit Beam Forming (TxBF) Capabilities (VS)", "wlan_mgt.vs.txbf", FT_UINT16, BASE_HEX,
NULL, 0, "Vendor Specific Transmit Beam Forming (TxBF) Capabilities", HFILL }},
- {&txbf_cap,
+ {&hf_ieee80211_txbf_cap,
{"Transmit Beamforming", "wlan_mgt.txbf.txbf",
FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000001,
- "Transmit Beamforming", HFILL }},
+ NULL, HFILL }},
- {&txbf_rcv_ssc,
+ {&hf_ieee80211_txbf_rcv_ssc,
{"Receive Staggered Sounding", "wlan_mgt.txbf.rxss",
FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000002,
- "Receive Staggered Sounding", HFILL }},
+ NULL, HFILL }},
- {&txbf_tx_ssc,
+ {&hf_ieee80211_txbf_tx_ssc,
{"Transmit Staggered Sounding", "wlan_mgt.txbf.txss",
FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000004,
- "Transmit staggered sounding", HFILL }},
+ NULL, HFILL }},
- {&txbf_rcv_ndp,
+ {&hf_ieee80211_txbf_rcv_ndp,
{"Receive Null Data packet (NDP)", "wlan_mgt.txbf.rxndp",
FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000008,
- "Receive Null Data packet (NDP)", HFILL }},
+ NULL, HFILL }},
- {&txbf_tx_ndp,
+ {&hf_ieee80211_txbf_tx_ndp,
{"Transmit Null Data packet (NDP)", "wlan_mgt.txbf.txndp",
FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000010,
- "Transmit Null Data packet (NDP)", HFILL }},
+ NULL, HFILL }},
- {&txbf_impl_txbf,
+ {&hf_ieee80211_txbf_impl_txbf,
{"Implicit TxBF capable", "wlan_mgt.txbf.impltxbf",
FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000020,
"Implicit Transmit Beamforming (TxBF) capable", HFILL }},
- {&txbf_calib,
+ {&hf_ieee80211_txbf_calib,
{"Calibration", "wlan_mgt.txbf.calibration",
FT_UINT32, BASE_HEX, VALS (&txbf_calib_flag), 0x000000c0,
- "Calibration", HFILL }},
+ NULL, HFILL }},
- {&txbf_expl_csi,
+ {&hf_ieee80211_txbf_expl_csi,
{"STA can apply TxBF using CSI explicit feedback", "wlan_mgt.txbf.csi",
FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000100,
"Station can apply TxBF using CSI explicit feedback", HFILL }},
- {&txbf_expl_uncomp_fm,
+ {&hf_ieee80211_txbf_expl_uncomp_fm,
{"STA can apply TxBF using uncompressed beamforming feedback matrix", "wlan_mgt.txbf.fm.uncompressed.tbf",
FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000200,
"Station can apply TxBF using uncompressed beamforming feedback matrix", HFILL }},
- {&txbf_expl_comp_fm,
+ {&hf_ieee80211_txbf_expl_comp_fm,
{"STA can apply TxBF using compressed beamforming feedback matrix", "wlan_mgt.txbf.fm.compressed.tbf",
FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000400,
"Station can apply TxBF using compressed beamforming feedback matrix", HFILL }},
- {&txbf_expl_bf_csi,
+ {&hf_ieee80211_txbf_expl_bf_csi,
{"Receiver can return explicit CSI feedback", "wlan_mgt.txbf.rcsi",
FT_UINT32, BASE_HEX, VALS (&txbf_feedback_flags), 0x00001800,
- "Receiver can return explicit CSI feedback", HFILL }},
+ NULL, HFILL }},
- {&txbf_expl_uncomp_fm_feed,
+ {&hf_ieee80211_txbf_expl_uncomp_fm_feed,
{"Receiver can return explicit uncompressed Beamforming Feedback Matrix", "wlan_mgt.txbf.fm.uncompressed.rbf",
FT_UINT32, BASE_HEX, VALS (&txbf_feedback_flags), 0x00006000,
- "Receiver can return explicit uncompressed Beamforming Feedback Matrix", HFILL }},
+ NULL, HFILL }},
- {&txbf_expl_comp_fm_feed,
+ {&hf_ieee80211_txbf_expl_comp_fm_feed,
{"STA can compress and use compressed Beamforming Feedback Matrix", "wlan_mgt.txbf.fm.compressed.bf",
FT_UINT32, BASE_HEX, VALS (&txbf_feedback_flags), 0x00018000,
"Station can compress and use compressed Beamforming Feedback Matrix", HFILL }},
- {&txbf_min_group,
+ {&hf_ieee80211_txbf_min_group,
{"Minimal grouping used for explicit feedback reports", "wlan_mgt.txbf.mingroup",
FT_UINT32, BASE_HEX, VALS (&txbf_min_group_flags), 0x00060000,
- "Minimal grouping used for explicit feedback reports", HFILL }},
+ NULL, HFILL }},
- {&txbf_csi_num_bf_ant,
+ {&hf_ieee80211_txbf_csi_num_bf_ant,
{"Max antennae STA can support when CSI feedback required", "wlan_mgt.txbf.csinumant",
FT_UINT32, BASE_HEX, VALS (&txbf_antenna_flags), 0x00180000,
"Max antennae station can support when CSI feedback required", HFILL }},
- {&txbf_uncomp_sm_bf_ant,
+ {&hf_ieee80211_txbf_uncomp_sm_bf_ant,
{"Max antennae STA can support when uncompressed Beamforming feedback required", "wlan_mgt.txbf.fm.uncompressed.maxant",
FT_UINT32, BASE_HEX, VALS (&txbf_antenna_flags), 0x00600000,
"Max antennae station can support when uncompressed Beamforming feedback required", HFILL }},
- {&txbf_comp_sm_bf_ant,
+ {&hf_ieee80211_txbf_comp_sm_bf_ant,
{"Max antennae STA can support when compressed Beamforming feedback required", "wlan_mgt.txbf.fm.compressed.maxant",
FT_UINT32, BASE_HEX, VALS (&txbf_antenna_flags), 0x01800000,
"Max antennae station can support when compressed Beamforming feedback required", HFILL }},
- {&txbf_csi_max_rows_bf,
+ {&hf_ieee80211_txbf_csi_max_rows_bf,
{"Maximum number of rows of CSI explicit feedback", "wlan_mgt.txbf.csi.maxrows",
FT_UINT32, BASE_HEX, VALS (&txbf_csi_max_rows_bf_flags), 0x06000000,
- "Maximum number of rows of CSI explicit feedback", HFILL }},
+ NULL, HFILL }},
- {&txbf_chan_est,
+ {&hf_ieee80211_txbf_chan_est,
{"Maximum number of space time streams for which channel dimensions can be simultaneously estimated", "wlan_mgt.txbf.channelest",
FT_UINT32, BASE_HEX, VALS (&txbf_chan_est_flags), 0x18000000,
- "Maximum number of space time streams for which channel dimensions can be simultaneously estimated", HFILL }},
+ NULL, HFILL }},
- {&txbf_resrv,
+ {&hf_ieee80211_txbf_resrv,
{"Reserved", "wlan_mgt.txbf.reserved",
FT_UINT32, BASE_HEX, NULL, 0xe0000000,
- "Reserved", HFILL }},
+ NULL, HFILL }},
- {&hta_cap,
+ {&hf_ieee80211_hta_cap,
{"HT Additional Capabilities", "wlan_mgt.hta.capabilities", FT_UINT16, BASE_HEX,
NULL, 0, "HT Additional Capability information", HFILL }},
- {&hta_ext_chan_offset,
+ {&hf_ieee80211_hta_ext_chan_offset,
{"Extension Channel Offset", "wlan_mgt.hta.capabilities.extchan",
FT_UINT16, BASE_HEX, VALS (&hta_ext_chan_offset_flag), 0x0003,
- "Extension Channel Offset", HFILL }},
+ NULL, HFILL }},
- {&hta_rec_tx_width,
+ {&hf_ieee80211_hta_rec_tx_width,
{"Recommended Tx Channel Width", "wlan_mgt.hta.capabilities.rectxwidth",
FT_BOOLEAN, 16, TFS (&hta_rec_tx_width_flag), 0x0004,
"Recommended Transmit Channel Width", HFILL }},
- {&hta_rifs_mode,
+ {&hf_ieee80211_hta_rifs_mode,
{"Reduced Interframe Spacing (RIFS) Mode", "wlan_mgt.hta.capabilities.rifsmode",
FT_BOOLEAN, 16, TFS (&hta_rifs_mode_flag), 0x0008,
- "Reduced Interframe Spacing (RIFS) Mode", HFILL }},
+ NULL, HFILL }},
- {&hta_controlled_access,
+ {&hf_ieee80211_hta_controlled_access,
{"Controlled Access Only", "wlan_mgt.hta.capabilities.controlledaccess",
FT_BOOLEAN, 16, TFS (&hta_controlled_access_flag), 0x0010,
- "Controlled Access Only", HFILL }},
+ NULL, HFILL }},
- {&hta_service_interval,
+ {&hf_ieee80211_hta_service_interval,
{"Service Interval Granularity", "wlan_mgt.hta.capabilities.serviceinterval",
FT_UINT16, BASE_HEX, VALS (&hta_service_interval_flag), 0x00E0,
- "Service Interval Granularity", HFILL }},
+ NULL, HFILL }},
- {&hta_operating_mode,
+ {&hf_ieee80211_hta_operating_mode,
{"Operating Mode", "wlan_mgt.hta.capabilities.operatingmode",
FT_UINT16, BASE_HEX, VALS (&hta_operating_mode_flag), 0x0003,
- "Operating Mode", HFILL }},
+ NULL, HFILL }},
- {&hta_non_gf_devices,
+ {&hf_ieee80211_hta_non_gf_devices,
{"Non Greenfield (GF) devices Present", "wlan_mgt.hta.capabilities.nongfdevices",
FT_BOOLEAN, 16, TFS (&hta_non_gf_devices_flag), 0x0004,
"on Greenfield (GF) devices Present", HFILL }},
- {&hta_basic_stbc_mcs,
+ {&hf_ieee80211_hta_basic_stbc_mcs,
{"Basic STB Modulation and Coding Scheme (MCS)", "wlan_mgt.hta.capabilities.",
FT_UINT16, BASE_HEX, NULL , 0x007f,
- "Basic STB Modulation and Coding Scheme (MCS)", HFILL }},
+ NULL, HFILL }},
- {&hta_dual_stbc_protection,
+ {&hf_ieee80211_hta_dual_stbc_protection,
{"Dual Clear To Send (CTS) Protection", "wlan_mgt.hta.capabilities.",
FT_BOOLEAN, 16, TFS (&hta_dual_stbc_protection_flag), 0x0080,
- "Dual Clear To Send (CTS) Protection", HFILL }},
+ NULL, HFILL }},
- {&hta_secondary_beacon,
+ {&hf_ieee80211_hta_secondary_beacon,
{"Secondary Beacon", "wlan_mgt.hta.capabilities.",
FT_BOOLEAN, 16, TFS (&hta_secondary_beacon_flag), 0x0100,
- "Secondary Beacon", HFILL }},
+ NULL, HFILL }},
- {&hta_lsig_txop_protection,
+ {&hf_ieee80211_hta_lsig_txop_protection,
{"L-SIG TXOP Protection Support", "wlan_mgt.hta.capabilities.",
FT_BOOLEAN, 16, TFS (&hta_lsig_txop_protection_flag), 0x0200,
- "L-SIG TXOP Protection Support", HFILL }},
+ NULL, HFILL }},
- {&hta_pco_active,
+ {&hf_ieee80211_hta_pco_active,
{"Phased Coexistence Operation (PCO) Active", "wlan_mgt.hta.capabilities.",
FT_BOOLEAN, 16, TFS (&hta_pco_active_flag), 0x0400,
- "Phased Coexistence Operation (PCO) Active", HFILL }},
+ NULL, HFILL }},
- {&hta_pco_phase,
+ {&hf_ieee80211_hta_pco_phase,
{"Phased Coexistence Operation (PCO) Phase", "wlan_mgt.hta.capabilities.",
FT_BOOLEAN, 16, TFS (&hta_pco_phase_flag), 0x0800,
- "Phased Coexistence Operation (PCO) Phase", HFILL }},
+ NULL, HFILL }},
- {&antsel,
+ {&hf_ieee80211_antsel,
{"Antenna Selection (ASEL) Capabilities", "wlan_mgt.asel",
- FT_UINT8, BASE_HEX, NULL, 0, "Antenna Selection (ASEL) Capabilities", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&antsel_vs,
+ {&hf_ieee80211_antsel_vs,
{"Antenna Selection (ASEL) Capabilities (VS)", "wlan_mgt.vs.asel",
FT_UINT8, BASE_HEX, NULL, 0, "Vendor Specific Antenna Selection (ASEL) Capabilities", HFILL }},
- {&antsel_b0,
+ {&hf_ieee80211_antsel_b0,
{"Antenna Selection Capable", "wlan_mgt.asel.capable",
- FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x01, "Antenna Selection Capable", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x01, NULL, HFILL }},
- {&antsel_b1,
+ {&hf_ieee80211_antsel_b1,
{"Explicit CSI Feedback Based Tx ASEL", "wlan_mgt.asel.txcsi",
- FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x02, "Explicit CSI Feedback Based Tx ASEL", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x02, NULL, HFILL }},
- {&antsel_b2,
+ {&hf_ieee80211_antsel_b2,
{"Antenna Indices Feedback Based Tx ASEL", "wlan_mgt.asel.txif",
- FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x04, "Antenna Indices Feedback Based Tx ASEL", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x04, NULL, HFILL }},
- {&antsel_b3,
+ {&hf_ieee80211_antsel_b3,
{"Explicit CSI Feedback", "wlan_mgt.asel.csi",
- FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x08, "Explicit CSI Feedback", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x08, NULL, HFILL }},
- {&antsel_b4,
+ {&hf_ieee80211_antsel_b4,
{"Antenna Indices Feedback", "wlan_mgt.asel.if",
- FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x10, "Antenna Indices Feedback", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x10, NULL, HFILL }},
- {&antsel_b5,
+ {&hf_ieee80211_antsel_b5,
{"Rx ASEL", "wlan_mgt.asel.rx",
- FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x20, "Rx ASEL", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x20, NULL, HFILL }},
- {&antsel_b6,
+ {&hf_ieee80211_antsel_b6,
{"Tx Sounding PPDUs", "wlan_mgt.asel.sppdu",
- FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x40, "Tx Sounding PPDUs", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x40, NULL, HFILL }},
- {&antsel_b7,
+ {&hf_ieee80211_antsel_b7,
{"Reserved", "wlan_mgt.asel.reserved",
- FT_UINT8, BASE_HEX, NULL, 0x80, "Reserved", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL }},
- {&ht_info_delimiter1,
+ {&hf_ieee80211_ht_info_delimiter1,
{"HT Information Delimiter #1", "wlan_mgt.ht.info.delim1",
- FT_UINT8, BASE_HEX, NULL, 0xff, "HT Information Delimiter #1", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL }},
- {&ht_info_primary_channel,
+ {&hf_ieee80211_ht_info_primary_channel,
{"Primary Channel", "wlan_mgt.ht.info.primarychannel",
- FT_UINT8, BASE_DEC, NULL, 0, "Primary Channel", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&ht_info_secondary_channel_offset,
+ {&hf_ieee80211_ht_info_secondary_channel_offset,
{"Secondary channel offset", "wlan_mgt.ht.info.secchanoffset",
- FT_UINT8, BASE_HEX, VALS (&ht_info_secondary_channel_offset_flags), 0x03, "Secondary channel offset", HFILL }},
+ FT_UINT8, BASE_HEX, VALS (&ht_info_secondary_channel_offset_flags), 0x03, NULL, HFILL }},
- {&ht_info_channel_width,
+ {&hf_ieee80211_ht_info_channel_width,
{"Supported channel width", "wlan_mgt.ht.info.chanwidth",
- FT_BOOLEAN, 8, TFS (&ht_info_channel_width_flag), 0x04, "Supported channel width", HFILL }},
+ FT_BOOLEAN, 8, TFS (&ht_info_channel_width_flag), 0x04, NULL, HFILL }},
- {&ht_info_rifs_mode,
+ {&hf_ieee80211_ht_info_rifs_mode,
{"Reduced Interframe Spacing (RIFS)", "wlan_mgt.ht.info.rifs",
- FT_BOOLEAN, 8, TFS (&ht_info_rifs_mode_flag), 0x08, "Reduced Interframe Spacing (RIFS)", HFILL }},
+ FT_BOOLEAN, 8, TFS (&ht_info_rifs_mode_flag), 0x08, NULL, HFILL }},
- {&ht_info_psmp_stas_only,
+ {&hf_ieee80211_ht_info_psmp_stas_only,
{"Power Save Multi-Poll (PSMP) stations only", "wlan_mgt.ht.info.psmponly",
- FT_BOOLEAN, 8, TFS (&ht_info_psmp_stas_only_flag), 0x10, "Power Save Multi-Poll (PSMP) stations only", HFILL }},
+ FT_BOOLEAN, 8, TFS (&ht_info_psmp_stas_only_flag), 0x10, NULL, HFILL }},
- {&ht_info_service_interval_granularity,
+ {&hf_ieee80211_ht_info_service_interval_granularity,
{"Shortest service interval", "wlan_mgt.ht.info.",
- FT_UINT8, BASE_HEX, VALS (&ht_info_service_interval_granularity_flags), 0xe0, "Shortest service interval", HFILL }},
+ FT_UINT8, BASE_HEX, VALS (&ht_info_service_interval_granularity_flags), 0xe0, NULL, HFILL }},
- {&ht_info_delimiter2,
+ {&hf_ieee80211_ht_info_delimiter2,
{"HT Information Delimiter #2", "wlan_mgt.ht.info.delim2",
- FT_UINT16, BASE_HEX, NULL, 0xffff, "HT Information Delimiter #2", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0xffff, NULL, HFILL }},
- {&ht_info_operating_mode,
+ {&hf_ieee80211_ht_info_operating_mode,
{"Operating mode of BSS", "wlan_mgt.ht.info.operatingmode",
- FT_UINT16, BASE_HEX, VALS (&ht_info_operating_mode_flags), 0x0003, "Operating mode of BSS", HFILL }},
+ FT_UINT16, BASE_HEX, VALS (&ht_info_operating_mode_flags), 0x0003, NULL, HFILL }},
- {&ht_info_non_greenfield_sta_present,
+ {&hf_ieee80211_ht_info_non_greenfield_sta_present,
{"Non-greenfield STAs present", "wlan_mgt.ht.info.greenfield",
- FT_BOOLEAN, 16, TFS (&ht_info_non_greenfield_sta_present_flag), 0x0004, "Non-greenfield STAs present", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ht_info_non_greenfield_sta_present_flag), 0x0004, NULL, HFILL }},
- {&ht_info_transmit_burst_limit,
+ {&hf_ieee80211_ht_info_transmit_burst_limit,
{"Transmit burst limit", "wlan_mgt.ht.info.burstlim",
- FT_BOOLEAN, 16, TFS (&ht_info_transmit_burst_limit_flag), 0x0008, "Transmit burst limit", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ht_info_transmit_burst_limit_flag), 0x0008, NULL, HFILL }},
- {&ht_info_obss_non_ht_stas_present,
+ {&hf_ieee80211_ht_info_obss_non_ht_stas_present,
{"OBSS non-HT STAs present", "wlan_mgt.ht.info.obssnonht",
- FT_BOOLEAN, 16, TFS (&ht_info_obss_non_ht_stas_present_flag), 0x0010, "OBSS non-HT STAs present", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ht_info_obss_non_ht_stas_present_flag), 0x0010, NULL, HFILL }},
- {&ht_info_reserved_1,
+ {&hf_ieee80211_ht_info_reserved_1,
{"Reserved", "wlan_mgt.ht.info.reserved1",
- FT_UINT16, BASE_HEX, NULL, 0xffe0, "Reserved", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0xffe0, NULL, HFILL }},
- {&ht_info_delimiter3,
+ {&hf_ieee80211_ht_info_delimiter3,
{"HT Information Delimiter #3", "wlan_mgt.ht.info.delim3",
- FT_UINT16, BASE_HEX, NULL, 0xffff, "HT Information Delimiter #3", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0xffff, NULL, HFILL }},
- {&ht_info_reserved_2,
+ {&hf_ieee80211_ht_info_reserved_2,
{"Reserved", "wlan_mgt.ht.info.reserved2",
- FT_UINT16, BASE_HEX, NULL, 0x003f, "Reserved", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x003f, NULL, HFILL }},
- {&ht_info_dual_beacon,
+ {&hf_ieee80211_ht_info_dual_beacon,
{"Dual beacon", "wlan_mgt.ht.info.dualbeacon",
- FT_BOOLEAN, 16, TFS (&ht_info_dual_beacon_flag), 0x0040, "Dual beacon", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ht_info_dual_beacon_flag), 0x0040, NULL, HFILL }},
- {&ht_info_dual_cts_protection,
+ {&hf_ieee80211_ht_info_dual_cts_protection,
{"Dual Clear To Send (CTS) protection", "wlan_mgt.ht.info.dualcts",
- FT_BOOLEAN, 16, TFS (&ht_info_dual_cts_protection_flag), 0x0080, "Dual Clear To Send (CTS) protection", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ht_info_dual_cts_protection_flag), 0x0080, NULL, HFILL }},
- {&ht_info_secondary_beacon,
+ {&hf_ieee80211_ht_info_secondary_beacon,
{"Beacon ID", "wlan_mgt.ht.info.secondarybeacon",
- FT_BOOLEAN, 16, TFS (&ht_info_secondary_beacon_flag), 0x0100, "Beacon ID", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ht_info_secondary_beacon_flag), 0x0100, NULL, HFILL }},
- {&ht_info_lsig_txop_protection_full_support,
+ {&hf_ieee80211_ht_info_lsig_txop_protection_full_support,
{"L-SIG TXOP Protection Full Support", "wlan_mgt.ht.info.lsigprotsupport",
- FT_BOOLEAN, 16, TFS (&ht_info_lsig_txop_protection_full_support_flag), 0x0200, "L-SIG TXOP Protection Full Support", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ht_info_lsig_txop_protection_full_support_flag), 0x0200, NULL, HFILL }},
- {&ht_info_pco_active,
+ {&hf_ieee80211_ht_info_pco_active,
{"Phased Coexistence Operation (PCO)", "wlan_mgt.ht.info.pco.active",
- FT_BOOLEAN, 16, TFS (&tfs_active_inactive), 0x0400, "Phased Coexistence Operation (PCO)", HFILL }},
+ FT_BOOLEAN, 16, TFS (&tfs_active_inactive), 0x0400, NULL, HFILL }},
- {&ht_info_pco_phase,
+ {&hf_ieee80211_ht_info_pco_phase,
{"Phased Coexistence Operation (PCO) Phase", "wlan_mgt.ht.info.pco.phase",
- FT_BOOLEAN, 16, TFS (&ht_info_pco_phase_flag), 0x0800, "Phased Coexistence Operation (PCO) Phase", HFILL }},
+ FT_BOOLEAN, 16, TFS (&ht_info_pco_phase_flag), 0x0800, NULL, HFILL }},
- {&ht_info_reserved_3,
+ {&hf_ieee80211_ht_info_reserved_3,
{"Reserved", "wlan_mgt.ht.info.reserved3",
- FT_UINT16, BASE_HEX, NULL, 0xf000, "Reserved", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0xf000, NULL, HFILL }},
- {&hf_tag_secondary_channel_offset,
+ {&hf_ieee80211_tag_secondary_channel_offset,
{"Secondary Channel Offset", "wlan_mgt.secchanoffset",
- FT_UINT8, BASE_HEX, VALS (&hf_tag_secondary_channel_offset_flags), 0,
- "Secondary Channel Offset", HFILL }},
+ FT_UINT8, BASE_HEX, VALS (&ieee80211_tag_secondary_channel_offset_flags), 0,
+ NULL, HFILL }},
- /*** Begin: Power Capability Tag - Dustin Johnson ***/
- {&hf_tag_power_capability_min,
+ {&hf_ieee80211_tag_power_constraint_local,
+ {"Local Power Constraint", "wlan_mgt.powercon.local",
+ FT_UINT8, BASE_HEX, NULL, 0,
+ "Value that allows the mitigation requirements to be satisfied in the current channel", HFILL }},
+
+ {&hf_ieee80211_tag_power_capability_min,
{"Minimum Transmit Power", "wlan_mgt.powercap.min",
- FT_UINT8, BASE_HEX, NULL, 0, "Minimum Transmit Power", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0,
+ "The nominal minimum transmit power with which the STA is capable of transmitting in the current channel", HFILL }},
- {&hf_tag_power_capability_max,
+ {&hf_ieee80211_tag_power_capability_max,
{"Maximum Transmit Power", "wlan_mgt.powercap.max",
- FT_UINT8, BASE_HEX, NULL, 0, "Maximum Transmit Power", HFILL }},
- /*** End: Power Capability Tag - Dustin Johnson ***/
- {&hf_tag_tpc_report_trsmt_pow,
+ FT_UINT8, BASE_HEX, NULL, 0,
+ "The nominal maximum transmit power with which the STA is capable of transmitting in the current channel", HFILL }},
+
+ {&hf_ieee80211_tag_tpc_report_trsmt_pow,
{"Transmit Power", "wlan_mgt.tcprep.trsmt_pow",
- FT_INT8, BASE_DEC, NULL, 0, "Transmit Power", HFILL }},
- {&hf_tag_tpc_report_link_mrg,
+ FT_INT8, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_tpc_report_link_mrg,
{"Link Margin", "wlan_mgt.tcprep.link_mrg",
- FT_INT8, BASE_DEC, NULL, 0, "Link Margin", HFILL }},
- /*** Begin: Supported Channels Tag - Dustin Johnson ***/
- {&hf_tag_supported_channels,
+ FT_INT8, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_supported_channels,
{"Supported Channels Set", "wlan_mgt.supchan",
- FT_UINT8, BASE_DEC, NULL, 0, "Supported Channels Set", HFILL }},
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
- {&hf_tag_supported_channels_first,
+ {&hf_ieee80211_tag_supported_channels_first,
{"First Supported Channel", "wlan_mgt.supchan.first",
- FT_UINT8, BASE_HEX, NULL, 0, "First Supported Channel", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
- {&hf_tag_supported_channels_range,
+ {&hf_ieee80211_tag_supported_channels_range,
{"Supported Channel Range", "wlan_mgt.supchan.range",
- FT_UINT8, BASE_HEX, NULL, 0, "Supported Channel Range", HFILL }},
- /*** End: Supported Channels Tag - Dustin Johnson ***/
+ FT_UINT8, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_csa_channel_switch_mode,
+ {"Channel Switch Mode", "wlan_mgt.csa.channel_switch_mode",
+ FT_UINT8, BASE_HEX, NULL, 0,
+ "Indicates any restrictions on transmission until a channel switch", HFILL }},
+
+ {&hf_ieee80211_csa_new_channel_number,
+ {"New Channel Number", "wlan_mgt.csa.new_channel_number",
+ FT_UINT8, BASE_HEX, NULL, 0,
+ "Set to the number of the channel to which the STA is moving", HFILL }},
+
+ {&hf_ieee80211_csa_channel_switch_count,
+ {"Channel Switch Count", "wlan_mgt.csa.channel_switch_count",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ "Set to the number of TBTTs until the STA sending the Channel Switch Announcement element switches to the new channel or shall be set to 0", HFILL }},
- /*** Start: Measurement Request Tag - Dustin Johnson***/
- {&hf_tag_measure_request_measurement_token,
- {"Measurement Token", "wlan_mgt.measure.req.measuretoken",
- FT_UINT8, BASE_HEX, NULL, 0xff, "Measurement Token", HFILL }},
+ {&hf_ieee80211_tag_measure_request_token,
+ {"Measurement Token", "wlan_mgt.measure.req.token",
+ FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL }},
- {&hf_tag_measure_request_mode,
- {"Measurement Request Mode", "wlan_mgt.measure.req.reqmode",
- FT_UINT8, BASE_HEX, NULL, 0xff, "Measurement Request Mode", HFILL }},
+ {&hf_ieee80211_tag_measure_request_mode,
+ {"Measurement Request Mode", "wlan_mgt.measure.req.mode",
+ FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL }},
- {&hf_tag_measure_request_mode_reserved1,
- {"Reserved", "wlan_mgt.measure.req.reqmode.reserved1",
- FT_UINT8, BASE_HEX, NULL, 0x01, "Reserved", HFILL }},
+ {&hf_ieee80211_tag_measure_request_mode_parallel,
+ {"Parallel", "wlan_mgt.measure.req.reqmode.parallel",
+ FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
- {&hf_tag_measure_request_mode_enable,
+ {&hf_ieee80211_tag_measure_request_mode_enable,
{"Measurement Request Mode Field", "wlan_mgt.measure.req.reqmode.enable",
- FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x02, "Measurement Request Mode Field", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x02, NULL, HFILL }},
- {&hf_tag_measure_request_mode_request,
+ {&hf_ieee80211_tag_measure_request_mode_request,
{"Measurement Reports", "wlan_mgt.measure.req.reqmode.request",
- FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x04, "Measurement Reports", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_accepted_not_accepted), 0x04, NULL, HFILL }},
- {&hf_tag_measure_request_mode_report,
+ {&hf_ieee80211_tag_measure_request_mode_report,
{"Autonomous Measurement Reports", "wlan_mgt.measure.req.reqmode.report",
- FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x08, "Autonomous Measurement Reports", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_accepted_not_accepted), 0x08, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_request_mode_duration_mandatory,
+ {"Duration Mandatory", "wlan_mgt.measure.req.reqmode.duration_mandatory",
+ FT_BOOLEAN, 8, TFS (&tfs_accepted_not_accepted), 0x10, NULL, HFILL }},
- {&hf_tag_measure_request_mode_reserved2,
- {"Reserved", "wlan_mgt.measure.req.reqmode.reserved2",
- FT_UINT8, BASE_HEX, NULL, 0xf0, "Reserved", HFILL }},
+ {&hf_ieee80211_tag_measure_request_mode_reserved,
+ {"Reserved", "wlan_mgt.measure.req.reqmode.reserved",
+ FT_UINT8, BASE_HEX, NULL, 0xE0, NULL, HFILL }},
- {&hf_tag_measure_request_type,
+ {&hf_ieee80211_tag_measure_request_type,
{"Measurement Request Type", "wlan_mgt.measure.req.reqtype",
- FT_UINT8, BASE_HEX, VALS (&hf_tag_measure_request_type_flags), 0x00, "Measurement Request Type", HFILL }},
+ FT_UINT8, BASE_HEX, VALS (&ieee80211_tag_measure_request_type_flags), 0x00, NULL, HFILL }},
- {&hf_tag_measure_request_channel_number,
+ {&hf_ieee80211_tag_measure_request_channel_number,
{"Measurement Channel Number", "wlan_mgt.measure.req.channelnumber",
- FT_UINT8, BASE_HEX, NULL, 0, "Measurement Channel Number", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_request_start_time,
+ {&hf_ieee80211_tag_measure_request_start_time,
{"Measurement Start Time", "wlan_mgt.measure.req.starttime",
- FT_UINT64, BASE_HEX, NULL, 0, "Measurement Start Time", HFILL }},
+ FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_request_duration,
+ {&hf_ieee80211_tag_measure_request_duration,
{"Measurement Duration", "wlan_mgt.measure.req.channelnumber",
- FT_UINT16, BASE_HEX, NULL, 0, "Measurement Duration", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0, "in TU (1 TU = 1024 us)", HFILL }},
- {&hf_tag_measure_request_regulatory_class,
+ {&hf_ieee80211_tag_measure_request_regulatory_class,
{"Measurement Channel Number", "wlan_mgt.measure.req.regclass",
- FT_UINT8, BASE_HEX, NULL, 0, "Measurement Channel Number", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_request_randomization_interval,
+ {&hf_ieee80211_tag_measure_request_randomization_interval,
{"Randomization Interval", "wlan_mgt.measure.req.randint",
- FT_UINT16, BASE_HEX, NULL, 0, "Randomization Interval", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0, "in TU (1 TU = 1024 us)", HFILL }},
- {&hf_tag_measure_request_measurement_mode,
+ {&hf_ieee80211_tag_measure_request_measurement_mode,
{"Measurement Mode", "wlan_mgt.measure.req.measurementmode",
- FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_measurement_mode_flags), 0, "Measurement Mode", HFILL }},
+ FT_UINT8, BASE_HEX, VALS(ieee80211_tag_measure_request_measurement_mode_flags), 0, NULL, HFILL }},
- {&hf_tag_measure_request_bssid,
+ {&hf_ieee80211_tag_measure_request_bssid,
{"BSSID", "wlan_mgt.measure.req.bssid",
- FT_ETHER, BASE_NONE, NULL, 0, "BSSID", HFILL }},
+ FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_request_subelement_length,
+ {"Length", "wlan_mgt.measure.req.sub.length",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_request_beacon_sub_id,
+ {"SubElement ID", "wlan_mgt.measure.req.beacon.sub.id",
+ FT_UINT8, BASE_DEC, VALS(ieee80211_tag_measure_request_beacon_sub_id_flags), 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_request_beacon_sub_ssid,
+ {"SSID", "wlan_mgt.measure.req.beacon.sub.ssid",
+ FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition,
+ {"Reporting Condition", "wlan_mgt.measure.req.beacon.sub.bri.repcond",
+ FT_UINT8, BASE_HEX, VALS(ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition_flags), 0, NULL, HFILL }},
- {&hf_tag_measure_request_reporting_condition,
- {"Reporting Condition", "wlan_mgt.measure.req.repcond",
- FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_reporting_condition_flags), 0, "Reporting Condition", HFILL }},
+ {&hf_ieee80211_tag_measure_request_beacon_sub_bri_threshold_offset,
+ {"Threshold/Offset", "wlan_mgt.measure.req.beacon.sub.bri.threshold_offset",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_request_threshold_offset_unsigned,
- {"Threshold/Offset", "wlan_mgt.measure.req.threshold",
- FT_UINT8, BASE_HEX, 0, 0, "Threshold/Offset", HFILL }},
+ {&hf_ieee80211_tag_measure_request_beacon_sub_reporting_detail,
+ {"Reporting Detail", "wlan_mgt.measure.req.beacon.sub.bri.reporting_detail",
+ FT_UINT8, BASE_HEX, VALS(ieee80211_tag_measure_request_beacon_sub_reporting_detail_flags), 0, NULL, HFILL }},
- {&hf_tag_measure_request_threshold_offset_signed,
- {"Threshold/Offset", "wlan_mgt.measure.req.threshold",
- FT_UINT8, BASE_HEX, 0, 0, "Threshold/Offset", HFILL }},
+ {&hf_ieee80211_tag_measure_request_beacon_sub_request,
+ {"Request", "wlan_mgt.measure.req.beacon.sub.request",
+ FT_UINT8, BASE_DEC, 0, 0, NULL, HFILL }},
- {&hf_tag_measure_request_report_mac,
- {"MAC on wich to gather data", "wlan_mgt.measure.req.reportmac",
- FT_ETHER, BASE_NONE, NULL, 0, "MAC on wich to gather data", HFILL }},
+ {&hf_ieee80211_tag_measure_request_beacon_unknown,
+ {"Unknown Data", "wlan_mgt.measure.req.beacon.unknown",
+ FT_BYTES, BASE_NONE, NULL, 0, "(not interpreted)", HFILL }},
- {&hf_tag_measure_request_group_id,
+ {&hf_ieee80211_tag_measure_request_frame_request_type,
+ {"Frame Request Type", "wlan_mgt.measure.req.frame_request_type",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_request_mac_address,
+ {"MAC Address", "wlan_mgt.measure.req.mac_address",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_request_peer_mac_address,
+ {"Peer MAC Address", "wlan_mgt.measure.req.peer_mac_address",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_request_group_id,
{"Group ID", "wlan_mgt.measure.req.groupid",
- FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_group_id_flags), 0, "Group ID", HFILL }},
- /*** End: Measurement Request Tag - Dustin Johnson***/
+ FT_UINT8, BASE_HEX, VALS(ieee80211_tag_measure_request_group_id_flags), 0, NULL, HFILL }},
- /*** Start: Measurement Report Tag - Dustin Johnson***/
- {&hf_tag_measure_report_measurement_token,
- {"Measurement Token", "wlan_mgt.measure.req.clr",
- FT_UINT8, BASE_HEX, NULL, 0, "Measurement Token", HFILL }},
+ {&hf_ieee80211_tag_measure_report_measurement_token,
+ {"Measurement Token", "wlan_mgt.measure.req.token",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_report_mode,
- {"Measurement Report Mode", "wlan_mgt.measure.req.clr",
- FT_UINT8, BASE_HEX, NULL, 0, "Measurement Report Mode", HFILL }},
+ {&hf_ieee80211_tag_measure_report_mode,
+ {"Measurement Report Mode", "wlan_mgt.measure.req.mode",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_report_mode_late,
+ {&hf_ieee80211_tag_measure_report_mode_late,
{"Measurement Report Mode Field", "wlan_mgt.measure.rep.repmode.late",
- FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x01, "Measurement Report Mode Field", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x01, NULL, HFILL }},
- {&hf_tag_measure_report_mode_incapable,
+ {&hf_ieee80211_tag_measure_report_mode_incapable,
{"Measurement Reports", "wlan_mgt.measure.rep.repmode.incapable",
- FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x02, "Measurement Reports", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_accepted_not_accepted), 0x02, NULL, HFILL }},
- {&hf_tag_measure_report_mode_refused,
+ {&hf_ieee80211_tag_measure_report_mode_refused,
{"Autonomous Measurement Reports", "wlan_mgt.measure.rep.repmode.refused",
- FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x04, "Autonomous Measurement Reports", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_accepted_not_accepted), 0x04, NULL, HFILL }},
- {&hf_tag_measure_report_mode_reserved,
+ {&hf_ieee80211_tag_measure_report_mode_reserved,
{"Reserved", "wlan_mgt.measure.rep.repmode.reserved",
- FT_UINT8, BASE_HEX, NULL, 0xf8, "Reserved", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0xf8, NULL, HFILL }},
- {&hf_tag_measure_report_type,
+ {&hf_ieee80211_tag_measure_report_type,
{"Measurement Report Type", "wlan_mgt.measure.rep.reptype",
- FT_UINT8, BASE_HEX, VALS (&hf_tag_measure_report_type_flags), 0x00, "Measurement Report Type", HFILL }},
+ FT_UINT8, BASE_HEX, VALS (&ieee80211_tag_measure_report_type_flags), 0x00, NULL, HFILL }},
- {&hf_tag_measure_report_channel_number,
+ {&hf_ieee80211_tag_measure_report_channel_number,
{"Measurement Channel Number", "wlan_mgt.measure.rep.channelnumber",
- FT_UINT8, BASE_HEX, NULL, 0, "Measurement Channel Number", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_report_start_time,
+ {&hf_ieee80211_tag_measure_report_start_time,
{"Measurement Start Time", "wlan_mgt.measure.rep.starttime",
- FT_UINT64, BASE_HEX, NULL, 0, "Measurement Start Time", HFILL }},
+ FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_report_duration,
+ {&hf_ieee80211_tag_measure_report_duration,
{"Measurement Duration", "wlan_mgt.measure.rep.channelnumber",
- FT_UINT16, BASE_HEX, NULL, 0, "Measurement Duration", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_cca_busy_fraction,
+ {&hf_ieee80211_tag_measure_cca_busy_fraction,
{"CCA Busy Fraction", "wlan_mgt.measure.rep.ccabusy",
- FT_UINT8, BASE_HEX, NULL, 0, "CCA Busy Fraction", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_basic_map_field,
+ {&hf_ieee80211_tag_measure_basic_map_field,
{"Map Field", "wlan_mgt.measure.rep.mapfield",
- FT_UINT8, BASE_HEX, NULL, 0, "Map Field", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_map_field_bss,
+ {&hf_ieee80211_tag_measure_map_field_bss,
{"BSS", "wlan_mgt.measure.rep.repmode.mapfield.bss",
- FT_BOOLEAN, 8, TFS (&hf_tag_measure_map_field_bss_flag), 0x01, "BSS", HFILL }},
+ FT_BOOLEAN, 8, TFS (&ieee80211_tag_measure_map_field_bss_flag), 0x01, NULL, HFILL }},
- {&hf_tag_measure_map_field_odfm,
+ {&hf_ieee80211_tag_measure_map_field_odfm,
{"Orthogonal Frequency Division Multiplexing (ODFM) Preamble", "wlan_mgt.measure.rep.repmode.mapfield.bss",
- FT_BOOLEAN, 8, TFS (&hf_tag_measure_detected_not_detected), 0x02, "Orthogonal Frequency Division Multiplexing (ODFM) Preamble", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_detected_not_detected), 0x02, NULL, HFILL }},
- {&hf_tag_measure_map_field_unident_signal,
+ {&hf_ieee80211_tag_measure_map_field_unident_signal,
{"Unidentified Signal", "wlan_mgt.measure.rep.repmode.mapfield.unidentsig",
- FT_BOOLEAN, 8, TFS (&hf_tag_measure_detected_not_detected), 0x04, "Unidentified Signal", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_detected_not_detected), 0x04, NULL, HFILL }},
- {&hf_tag_measure_map_field_radar,
+ {&hf_ieee80211_tag_measure_map_field_radar,
{"Radar", "wlan_mgt.measure.rep.repmode.mapfield.radar",
- FT_BOOLEAN, 8, TFS (&hf_tag_measure_detected_not_detected), 0x08, "Radar", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_detected_not_detected), 0x08, NULL, HFILL }},
- {&hf_tag_measure_map_field_unmeasured,
+ {&hf_ieee80211_tag_measure_map_field_unmeasured,
{"Unmeasured", "wlan_mgt.measure.rep.repmode.mapfield.unmeasured",
- FT_BOOLEAN, 8, TFS (&tfs_true_false), 0x10, "Unmeasured", HFILL }},
+ FT_BOOLEAN, 8, TFS (&tfs_true_false), 0x10, NULL, HFILL }},
- {&hf_tag_measure_map_field_reserved,
+ {&hf_ieee80211_tag_measure_map_field_reserved,
{"Reserved", "wlan_mgt.measure.rep.repmode.mapfield.reserved",
- FT_UINT8, BASE_HEX, NULL, 0xe0, "Reserved", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0xe0, NULL, HFILL }},
- {&hf_tag_measure_rpi_histogram_report,
+ {&hf_ieee80211_tag_measure_rpi_histogram_report,
{"Receive Power Indicator (RPI) Histogram Report", "wlan_mgt.measure.rep.rpi.histogram_report",
- FT_STRING, BASE_NONE, NULL, 0, "Receive Power Indicator (RPI) Histogram Report", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_rpi_histogram_report_0,
+ {&hf_ieee80211_tag_measure_rpi_histogram_report_0,
{"RPI 0 Density", "wlan_mgt.measure.rep.rpi.rpi0density",
FT_UINT8, BASE_HEX, NULL, 0, "Receive Power Indicator (RPI) 0 Density", HFILL }},
- {&hf_tag_measure_rpi_histogram_report_1,
+ {&hf_ieee80211_tag_measure_rpi_histogram_report_1,
{"RPI 1 Density", "wlan_mgt.measure.rep.rpi.rpi1density",
FT_UINT8, BASE_HEX, NULL, 0, "Receive Power Indicator (RPI) 1 Density", HFILL }},
- {&hf_tag_measure_rpi_histogram_report_2,
+ {&hf_ieee80211_tag_measure_rpi_histogram_report_2,
{"RPI 2 Density", "wlan_mgt.measure.rep.rpi.rpi2density",
FT_UINT8, BASE_HEX, NULL, 0, "Receive Power Indicator (RPI) 2 Density", HFILL }},
- {&hf_tag_measure_rpi_histogram_report_3,
+ {&hf_ieee80211_tag_measure_rpi_histogram_report_3,
{"RPI 3 Density", "wlan_mgt.measure.rep.rpi.rpi3density",
FT_UINT8, BASE_HEX, NULL, 0, "Receive Power Indicator (RPI) 3 Density", HFILL }},
- {&hf_tag_measure_rpi_histogram_report_4,
+ {&hf_ieee80211_tag_measure_rpi_histogram_report_4,
{"RPI 4 Density", "wlan_mgt.measure.rep.rpi.rpi4density",
FT_UINT8, BASE_HEX, NULL, 0, "Receive Power Indicator (RPI) 4 Density", HFILL }},
- {&hf_tag_measure_rpi_histogram_report_5,
+ {&hf_ieee80211_tag_measure_rpi_histogram_report_5,
{"RPI 5 Density", "wlan_mgt.measure.rep.rpi.rpi5density",
FT_UINT8, BASE_HEX, NULL, 0, "Receive Power Indicator (RPI) 5 Density", HFILL }},
- {&hf_tag_measure_rpi_histogram_report_6,
+ {&hf_ieee80211_tag_measure_rpi_histogram_report_6,
{"RPI 6 Density", "wlan_mgt.measure.rep.rpi.rpi6density",
FT_UINT8, BASE_HEX, NULL, 0, "Receive Power Indicator (RPI) 6 Density", HFILL }},
- {&hf_tag_measure_rpi_histogram_report_7,
+ {&hf_ieee80211_tag_measure_rpi_histogram_report_7,
{"RPI 7 Density", "wlan_mgt.measure.rep.rpi.rpi7density",
FT_UINT8, BASE_HEX, NULL, 0, "Receive Power Indicator (RPI) 7 Density", HFILL }},
- {&hf_tag_measure_report_regulatory_class,
+ {&hf_ieee80211_tag_measure_report_regulatory_class,
{"Regulatory Class", "wlan_mgt.measure.rep.regclass",
- FT_UINT8, BASE_HEX, NULL, 0, "Regulatory Class", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_report_channel_load,
+ {&hf_ieee80211_tag_measure_report_channel_load,
{"Channel Load", "wlan_mgt.measure.rep.chanload",
- FT_UINT8, BASE_HEX, NULL, 0, "Channel Load", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_report_frame_info,
+ {&hf_ieee80211_tag_measure_report_frame_info,
{"Reported Frame Information", "wlan_mgt.measure.rep.frameinfo",
- FT_UINT8, BASE_HEX, NULL, 0, "Reported Frame Information", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_report_frame_info_phy_type,
+ {&hf_ieee80211_tag_measure_report_frame_info_phy_type,
{"Condensed PHY", "wlan_mgt.measure.rep.frameinfo.phytype",
- FT_UINT8, BASE_HEX, NULL, 0x7F, "Condensed PHY", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0x7F, NULL, HFILL }},
- {&hf_tag_measure_report_frame_info_frame_type,
+ {&hf_ieee80211_tag_measure_report_frame_info_frame_type,
{"Reported Frame Type", "wlan_mgt.measure.rep.frameinfo.frametype",
- FT_UINT8, BASE_HEX, TFS(&hf_tag_measure_report_frame_info_frame_type_flag), 0x80, "Reported Frame Type", HFILL }},
+ FT_UINT8, BASE_HEX, TFS(&ieee80211_tag_measure_report_frame_info_frame_type_flag), 0x80, NULL, HFILL }},
- {&hf_tag_measure_report_rcpi,
+ {&hf_ieee80211_tag_measure_report_rcpi,
{"Received Channel Power Indicator (RCPI)", "wlan_mgt.measure.rep.rcpi",
- FT_UINT8, BASE_HEX, NULL, 0, "Received Channel Power Indicator (RCPI)", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, "in dBm", HFILL }},
- {&hf_tag_measure_report_rsni,
+ {&hf_ieee80211_tag_measure_report_rsni,
{"Received Signal to Noise Indicator (RSNI)", "wlan_mgt.measure.rep.rsni",
- FT_UINT8, BASE_HEX, NULL, 0, "Received Signal to Noise Indicator (RSNI)", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, "in dB", HFILL }},
- {&hf_tag_measure_report_bssid,
+ {&hf_ieee80211_tag_measure_report_bssid,
{"BSSID Being Reported", "wlan_mgt.measure.rep.bssid",
- FT_ETHER, BASE_NONE, NULL, 0, "BSSID Being Reported", HFILL }},
+ FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_report_ant_id,
+ {&hf_ieee80211_tag_measure_report_ant_id,
{"Antenna ID", "wlan_mgt.measure.rep.antid",
- FT_UINT8, BASE_HEX, NULL, 0, "Antenna ID", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_anpi,
+ {"ANPI", "wlan_mgt.measure.rep.anpi",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_0,
+ {"IPI Density 0", "wlan_mgt.measure.rep.ipi_density0",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_1,
+ {"IPI Density 1", "wlan_mgt.measure.rep.ipi_density1",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_2,
+ {"IPI Density 2", "wlan_mgt.measure.rep.ipi_density2",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_3,
+ {"IPI Density 3", "wlan_mgt.measure.rep.ipi_density3",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_measure_report_parent_tsf,
+ {&hf_ieee80211_tag_measure_report_ipi_density_4,
+ {"IPI Density 4", "wlan_mgt.measure.rep.ipi_density4",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_5,
+ {"IPI Density 5", "wlan_mgt.measure.rep.ipi_density5",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_6,
+ {"IPI Density 6", "wlan_mgt.measure.rep.ipi_density6",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_7,
+ {"IPI Density 7", "wlan_mgt.measure.rep.ipi_density7",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_8,
+ {"IPI Density 8", "wlan_mgt.measure.rep.ipi_density8",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_9,
+ {"IPI Density 9", "wlan_mgt.measure.rep.ipi_density9",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_ipi_density_10,
+ {"IPI Density 10", "wlan_mgt.measure.rep.ipi_density10",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_measure_report_parent_tsf,
{"Parent Timing Synchronization Function (TSF)", "wlan_mgt.measure.rep.parenttsf",
- FT_UINT32, BASE_HEX, NULL, 0, "Parent Timing Synchronization Function (TSF)", HFILL }},
- /*** End: Measurement Report Tag - Dustin Johnson***/
+ FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_quiet_count,
+ {"Count", "wlan_mgt.quiet.count",
+ FT_UINT8, BASE_DEC, NULL, 0, "Set to the number of TBTTs until the beacon interval during which the next quiet interval shall start", HFILL }},
+
+ {&hf_ieee80211_tag_quiet_period,
+ {"Period", "wlan_mgt.quiet.period",
+ FT_UINT8, BASE_DEC, NULL, 0, "Set to the number of beacon intervals between the start of regularly scheduled quiet intervals", HFILL }},
+
+ {&hf_ieee80211_tag_quiet_duration,
+ {"Duration", "wlan_mgt.quiet.duration",
+ FT_UINT16, BASE_DEC, NULL, 0, "Set to the duration of the quiet interval", HFILL }},
+
+ {&hf_ieee80211_tag_quiet_offset,
+ {"Offset", "wlan_mgt.quiet.offset",
+ FT_UINT16, BASE_DEC, NULL, 0, "Set to the offset of the start of the quiet interval from the TBTT", HFILL }},
+
+ {&hf_ieee80211_tag_dfs_owner,
+ {"Owner", "wlan_mgt.dfs.owner",
+ FT_ETHER, BASE_NONE, NULL, 0, "Set to the individual IEEE MAC address of the STA that is the currently known DFS Owner in the IBSS", HFILL }},
+
+ {&hf_ieee80211_tag_dfs_recovery_interval,
+ {"Recovery Interval", "wlan_mgt.dfs.recovery_interval",
+ FT_UINT8, BASE_DEC, NULL, 0, "Indicates the time interval that shall be used for DFS owner recovery", HFILL }},
+
+ {&hf_ieee80211_tag_dfs_channel_map,
+ {"Channel Map", "wlan_mgt.dfs.channel_map",
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_dfs_channel_number,
+ {"Channel Number", "wlan_mgt.dfs.channel_number",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_dfs_map,
+ {"Map", "wlan_mgt.dfs.map",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_erp_info,
+ {"ERP Information", "wlan_mgt.erp_info",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_erp_info_erp_present,
+ {"Non ERP Present", "wlan_mgt.erp_info.erp_present",
+ FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x01, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_erp_info_use_protection,
+ {"Use Protection", "wlan_mgt.erp_info.use_protection",
+ FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x02, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_erp_info_barker_preamble_mode,
+ {"Barker Preamble Mode", "wlan_mgt.erp_info.barker_preamble_mode",
+ FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x04, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_erp_info_reserved,
+ {"Reserved", "wlan_mgt.erp_info.reserved",
+ FT_UINT8, BASE_HEX, NULL, 0xF8, NULL, HFILL }},
- /*** Begin: Extended Capabilities Tag - Dustin Johnson ***/
/* Table 7-35a-Capabilities field */
- {&hf_tag_extended_capabilities,
+ {&hf_ieee80211_tag_extended_capabilities,
{"Extended Capabilities", "wlan_mgt.extcap",
- FT_UINT8, BASE_HEX, NULL, 0, "Extended Capabilities", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
/* P802.11n/D6.0 */
- {&hf_tag_extended_capabilities_b0,
+ /* Extended Capability octet 0 */
+ {&hf_ieee80211_tag_extended_capabilities_b0,
{"20/40 BSS Coexistence Management Support", "wlan_mgt.extcap.infoexchange.b0",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0001, "HT Information Exchange Support", HFILL }},
/* P802.11p/D4.0 */
- {&hf_tag_extended_capabilities_b1,
+ {&hf_ieee80211_tag_extended_capabilities_b1,
{"On-demand beacon", "wlan_mgt.extcap.infoexchange.b1",
- FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0002, "On-demand beacon", HFILL }},
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0002, NULL, HFILL }},
- {&hf_tag_extended_capabilities_b2,
+ {&hf_ieee80211_tag_extended_capabilities_b2,
{"Extended Channel Switching", "wlan_mgt.extcap.infoexchange.b2",
- FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0004, "Extended Channel Switching", HFILL }},
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0004, NULL, HFILL }},
- {&hf_tag_extended_capabilities_b3,
+ {&hf_ieee80211_tag_extended_capabilities_b3,
{"WAVE indication", "wlan_mgt.extcap.infoexchange.b3",
- FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0008, "WAVE indication", HFILL }},
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0008, NULL, HFILL }},
/*End: P802.11p/D4.0 */
- /*** End: Extended Capabilities Tag - Dustin Johnson ***/
+ {&hf_ieee80211_tag_extended_capabilities_b4,
+ {"PSMP Capability", "wlan_mgt.extcap.infoexchange.b4",
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0010, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_extended_capabilities_b6,
+ {"S-PSMP Support", "wlan_mgt.extcap.infoexchange.b6",
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0040, NULL, HFILL }},
+
+ /* Extended Capability octet 3 */
+ {&hf_ieee80211_tag_extended_capabilities_b28,
+ {"Peer U-APSD Buffer STA Support", "wlan_mgt.extcap.infoexchange.b28",
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0010, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_extended_capabilities_b29,
+ {"TDLS Peer PSM Support", "wlan_mgt.extcap.infoexchange.b29",
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0020, NULL, HFILL }},
- /*** Begin: Neighbor Report Tag - Dustin Johnson ***/
- {&hf_tag_neighbor_report_bssid,
+ {&hf_ieee80211_tag_extended_capabilities_b30,
+ {"TDLS channel switching", "wlan_mgt.extcap.infoexchange.b30",
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0040, NULL, HFILL }},
+
+ /* Extended Capability octet 4 */
+ {&hf_ieee80211_tag_extended_capabilities_b37,
+ {"TDLS support", "wlan_mgt.extcap.infoexchange.b37",
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0020, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_extended_capabilities_b38,
+ {"TDLS Prohibited", "wlan_mgt.extcap.infoexchange.b38",
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0040, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_extended_capabilities_b39,
+ {"TDLS Channel Switching Prohibited", "wlan_mgt.extcap.infoexchange.b39",
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0080, NULL, HFILL }},
+
+ /* Extended Capability octet 5 */
+ {&hf_ieee80211_tag_extended_capabilities_b40,
+ {"Reject Unadmitted Frame", "wlan_mgt.extcap.infoexchange.b40",
+ FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0001, NULL, HFILL }},
+
+ {&hf_ieee80211_tag_extended_capabilities_serv_int_granularity,
+ {"Service Interval Granularity",
+ "wlan_mgt.extcap.infoexchange.serv_int_granularity",
+ FT_UINT8, BASE_NONE, VALS(service_interval_granularity_vals), 0x000e,
+ NULL, HFILL }},
+
+ {&hf_ieee80211_tag_neighbor_report_bssid,
{"BSSID", "wlan_mgt.nreport.bssid",
- FT_ETHER, BASE_NONE, NULL, 0, "BSSID", HFILL }},
+ FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info,
{"BSSID Information", "wlan_mgt.nreport.bssid.info",
- FT_UINT32, BASE_HEX, NULL, 0, "BSSID Information", HFILL }},
+ FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_reachability,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_reachability,
{"AP Reachability", "wlan_mgt.nreport.bssid.info.reachability",
- FT_UINT16, BASE_HEX, NULL, 0x0003, "AP Reachability", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0003, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_security,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_security,
{"Security", "wlan_mgt.nreport.bssid.info.security",
- FT_UINT16, BASE_HEX, NULL, 0x0004, "Security", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0004, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_key_scope,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_key_scope,
{"Key Scope", "wlan_mgt.nreport.bssid.info.keyscope",
- FT_UINT16, BASE_HEX, NULL, 0x0008, "Key Scope", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0008, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_capability_spec_mng,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_capability_spec_mng,
{"Capability: Spectrum Management", "wlan_mgt.nreport.bssid.info.capability.specmngt",
- FT_UINT16, BASE_HEX, NULL, 0x0010, "Capability: Spectrum Management", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0010, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_capability_qos,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_capability_qos,
{"Capability: QoS", "wlan_mgt.nreport.bssid.info.capability.qos",
- FT_UINT16, BASE_HEX, NULL, 0x0020, "Capability: QoS", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0020, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_capability_apsd,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_capability_apsd,
{"Capability: APSD", "wlan_mgt.nreport.bssid.info.capability.apsd",
- FT_UINT16, BASE_HEX, NULL, 0x0040, "Capability: APSD", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0040, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_capability_radio_msnt,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_capability_radio_msnt,
{"Capability: Radio Measurement", "wlan_mgt.nreport.bssid.info.capability.radiomsnt",
- FT_UINT16, BASE_HEX, NULL, 0x0080, "Capability: Radio Measurement", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0080, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_capability_dback,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_capability_dback,
{"Capability: Delayed Block Ack", "wlan_mgt.nreport.bssid.info.capability.dback",
- FT_UINT16, BASE_HEX, NULL, 0x0100, "Capability: Delayed Block Ack", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0100, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_capability_iback,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_capability_iback,
{"Capability: Immediate Block Ack", "wlan_mgt.nreport.bssid.info.capability.iback",
- FT_UINT16, BASE_HEX, NULL, 0x0200, "Capability: Immediate Block Ack", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0200, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_mobility_domain,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_mobility_domain,
{"Mobility Domain", "wlan_mgt.nreport.bssid.info.mobilitydomain",
- FT_UINT16, BASE_HEX, NULL, 0x0400, "Mobility Domain", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0400, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_high_throughput,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_high_throughput,
{"High Throughput", "wlan_mgt.nreport.bssid.info.hthoughput",
- FT_UINT16, BASE_HEX, NULL, 0x0800, "High Throughput", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0x0800, NULL, HFILL }},
- {&hf_tag_neighbor_report_bssid_info_reserved,
+ {&hf_ieee80211_tag_neighbor_report_bssid_info_reserved,
{"Reserved", "wlan_mgt.nreport.bssid.info.reserved",
- FT_UINT32, BASE_HEX, NULL, 0, "Reserved", HFILL }},
+ FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_neighbor_report_reg_class,
+ {&hf_ieee80211_tag_neighbor_report_reg_class,
{"Regulatory Class", "wlan_mgt.nreport.regclass",
- FT_UINT8, BASE_HEX, NULL, 0, "Regulatory Class", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_neighbor_report_channel_number,
+ {&hf_ieee80211_tag_neighbor_report_channel_number,
{"Channel Number", "wlan_mgt.nreport.channumber",
- FT_UINT8, BASE_HEX, NULL, 0, "Channel Number", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_neighbor_report_phy_type,
+ {&hf_ieee80211_tag_neighbor_report_phy_type,
{"PHY Type", "wlan_mgt.nreport.phytype",
- FT_UINT8, BASE_HEX, NULL, 0, "PHY Type", HFILL }},
- /*** End: Neighbor Report Tag - Dustin Johnson ***/
-
- /*** Begin: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
- {&hf_tag_ext_channel_switch_announcement_switch_mode,
- {"Channel Switch Mode", "wlan_mgt.extchanswitch.switchmode",
- FT_UINT8, BASE_HEX, VALS (&hf_tag_ext_channel_switch_announcement_switch_mode_flags), 0, "Channel Switch Mode", HFILL }},
-
- {&hf_tag_ext_channel_switch_announcement_new_reg_class,
- {"New Regulatory Class", "wlan_mgt.extchanswitch.new.regclass",
- FT_UINT8, BASE_HEX, NULL, 0, "New Regulatory Class", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_ext_channel_switch_announcement_new_chan_number,
- {"New Channel Number", "wlan_mgt.extchanswitch.new.channumber",
- FT_UINT8, BASE_HEX, NULL, 0, "New Channel Number", HFILL }},
-
- {&hf_tag_ext_channel_switch_announcement_switch_count,
- {"Channel Switch Count", "wlan_mgt.extchanswitch.switchcount",
- FT_UINT8, BASE_HEX, NULL, 0, "Channel Switch Count", HFILL }},
- /*** End: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
-
- /*** Begin: Supported Regulatory Classes Tag - Dustin Johnson ***/
- {&hf_tag_supported_reg_classes_current,
+ {&hf_ieee80211_tag_supported_reg_classes_current,
{"Current Regulatory Class", "wlan_mgt.supregclass.current",
- FT_UINT8, BASE_HEX, NULL, 0, "Current Regulatory Class", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_tag_supported_reg_classes_alternate,
+ {&hf_ieee80211_tag_supported_reg_classes_alternate,
{"Alternate Regulatory Classes", "wlan_mgt.supregclass.alt",
- FT_STRING, BASE_NONE, NULL, 0, "Alternate Regulatory Classes", HFILL }},
- /*** End: Supported Regulatory Classes Tag - Dustin Johnson ***/
+ FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
- {&hf_marvell_ie_type,
+ {&hf_ieee80211_marvell_ie_type,
{"Type", "wlan_mgt.marvell.ie.type",
- FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_marvell_ie_mesh_subtype,
+ {&hf_ieee80211_marvell_ie_mesh_subtype,
{"Subtype", "wlan_mgt.marvell.ie.subtype",
- FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_marvell_ie_mesh_version,
+ {&hf_ieee80211_marvell_ie_mesh_version,
{"Version", "wlan_mgt.marvell.ie.version",
- FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_marvell_ie_mesh_active_proto_id,
+ {&hf_ieee80211_marvell_ie_mesh_active_proto_id,
{"Path Selection Protocol", "wlan_mgt.marvell.ie.proto_id",
- FT_UINT8, BASE_HEX, VALS(mesh_path_selection_codes), 0, "", HFILL }},
+ FT_UINT8, BASE_HEX, VALS(mesh_path_selection_codes), 0, NULL, HFILL }},
- {&hf_marvell_ie_mesh_active_metric_id,
+ {&hf_ieee80211_marvell_ie_mesh_active_metric_id,
{"Path Selection Metric", "wlan_mgt.marvell.ie.metric_id",
- FT_UINT8, BASE_HEX, VALS(mesh_metric_codes), 0, "", HFILL }},
+ FT_UINT8, BASE_HEX, VALS(mesh_metric_codes), 0, NULL, HFILL }},
- {&hf_marvell_ie_mesh_cap,
+ {&hf_ieee80211_marvell_ie_mesh_cap,
{"Mesh Capabilities", "wlan_mgt.marvell.ie.cap",
- FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_marvell_ie_data,
+ {&hf_ieee80211_marvell_ie_data,
{ "Marvell IE data", "wlan_mgt.marvell.data",
- FT_BYTES, BASE_NONE, NULL, 0x0, "Marvell IE data", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_type,
+ {"Type", "wlan_mgt.atheros.ie.type",
+ FT_UINT8, BASE_HEX, VALS(atheros_ie_type_vals), 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_subtype,
+ {"Subtype", "wlan_mgt.atheros.ie.subtype",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_version,
+ {"Version", "wlan_mgt.atheros.ie.version",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_cap_f_turbop,
+ {"Turbo Prime", "wlan_mgt.ie.atheros.capabilities.turbop",
+ FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_TURBOP, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_cap_f_comp,
+ {"Compression", "wlan_mgt.ie.atheros.capabilities.comp",
+ FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_COMP, NULL, HFILL }},
- {&hf_aironet_ie_type,
+ {&hf_ieee80211_atheros_ie_cap_f_ff,
+ {"Fast Frames", "wlan_mgt.ie.atheros.capabilities.ff",
+ FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_FF, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_cap_f_xr,
+ {"eXtended Range", "wlan_mgt.ie.atheros.capabilities.xr",
+ FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_XR, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_cap_f_ar,
+ {"Advanced Radar", "wlan_mgt.ie.atheros.capabilities.ar",
+ FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_AR, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_cap_f_burst,
+ {"Burst", "wlan_mgt.ie.atheros.capabilities.burst",
+ FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_BURST, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_cap_f_wme,
+ {"CWMin tuning", "wlan_mgt.ie.atheros.capabilities.wme",
+ FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_WME, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_cap_f_boost,
+ {"Boost", "wlan_mgt.ie.atheros.capabilities.boost",
+ FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_BOOST, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_advcap_cap,
+ {"Capabilities", "wlan_mgt.atheros.ie.advcap.cap",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_advcap_defkey,
+ {"Default key index", "wlan_mgt.atheros.ie.advcap.defkey",
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_xr_info,
+ {"Info", "wlan_mgt.atheros.ie.xr.info",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_xr_base_bssid,
+ {"Base BSS Id", "wlan_mgt.atheros.ie.xr.base_bssid",
+ FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_xr_xr_bssid,
+ {"XR BSS Id", "wlan_mgt.atheros.ie.xr.xr_bssid",
+ FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_xr_xr_beacon,
+ {"XR Beacon Interval", "wlan_mgt.atheros.ie.xr.xr_beacon",
+ FT_UINT32, BASE_CUSTOM, beacon_interval_base_custom, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_xr_base_cap,
+ {"Base capabilities", "wlan_mgt.atheros.ie.xr.base_cap",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_xr_xr_cap,
+ {"XR capabilities", "wlan_mgt.atheros.ie.xr.xr_cap",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_atheros_ie_data,
+ {"Atheros IE data", "wlan_mgt.atheros.data",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ {&hf_ieee80211_aironet_ie_type,
{"Aironet IE type", "wlan_mgt.aironet.type",
- FT_UINT8, BASE_DEC, VALS(aironet_ie_type_vals), 0, "Aironet IE type", HFILL }},
+ FT_UINT8, BASE_DEC, VALS(aironet_ie_type_vals), 0, NULL, HFILL }},
- {&hf_aironet_ie_version,
+ {&hf_ieee80211_aironet_ie_version,
{"Aironet IE CCX version?", "wlan_mgt.aironet.version",
- FT_UINT8, BASE_DEC, NULL, 0, "Aironet IE CCX version?", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_aironet_ie_data,
+ {&hf_ieee80211_aironet_ie_data,
{ "Aironet IE data", "wlan_mgt.aironet.data",
- FT_BYTES, BASE_NONE, NULL, 0x0, "Aironet IE data", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- {&hf_qbss_version,
+ {&hf_ieee80211_qbss_version,
{"QBSS Version", "wlan_mgt.qbss.version",
- FT_UINT8, BASE_DEC, NULL, 0, "QBSS Version", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_qbss_scount,
+ {&hf_ieee80211_qbss_scount,
{"Station Count", "wlan_mgt.qbss.scount",
- FT_UINT16, BASE_DEC, NULL, 0, "Station Count", HFILL }},
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_qbss_cu,
+ {&hf_ieee80211_qbss_cu,
{"Channel Utilization", "wlan_mgt.qbss.cu",
- FT_UINT8, BASE_DEC, NULL, 0, "Channel Utilization", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_qbss_adc,
+ {&hf_ieee80211_qbss_adc,
{"Available Admission Capabilities", "wlan_mgt.qbss.adc",
- FT_UINT8, BASE_DEC, NULL, 0, "Available Admission Capabilities", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_qbss2_cu,
+ {&hf_ieee80211_qbss2_cu,
{"Channel Utilization", "wlan_mgt.qbss2.cu",
- FT_UINT8, BASE_DEC, NULL, 0, "Channel Utilization", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_qbss2_gl,
+ {&hf_ieee80211_qbss2_gl,
{"G.711 CU Quantum", "wlan_mgt.qbss2.glimit",
- FT_UINT8, BASE_DEC, NULL, 0, "G.711 CU Quantum", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_qbss2_cal,
+ {&hf_ieee80211_qbss2_cal,
{"Call Admission Limit", "wlan_mgt.qbss2.cal",
- FT_UINT8, BASE_DEC, NULL, 0, "Call Admission Limit", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_qbss2_scount,
+ {&hf_ieee80211_qbss2_scount,
{"Station Count", "wlan_mgt.qbss2.scount",
- FT_UINT16, BASE_DEC, NULL, 0, "Station Count", HFILL }},
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_aironet_ie_qos_unk1,
+ {&hf_ieee80211_aironet_ie_qos_unk1,
{"Aironet IE QoS unknown 1", "wlan_mgt.aironet.qos.unk1",
- FT_UINT8, BASE_HEX, NULL, 0, "Aironet IE QoS unknown 1", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_aironet_ie_qos_paramset,
+ {&hf_ieee80211_aironet_ie_qos_paramset,
{"Aironet IE QoS paramset", "wlan_mgt.aironet.qos.paramset",
- FT_UINT8, BASE_DEC, NULL, 0, "Aironet IE QoS paramset", HFILL }},
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_aironet_ie_qos_val,
+ {&hf_ieee80211_aironet_ie_qos_val,
{"Aironet IE QoS valueset", "wlan_mgt.aironet.qos.val",
- FT_BYTES, BASE_NONE, NULL, 0, "Aironet IE QoS valueset", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
- {&hf_ts_info,
+ {&hf_ieee80211_tsinfo,
{"Traffic Stream (TS) Info", "wlan_mgt.ts_info",
FT_UINT24, BASE_HEX, NULL, 0, "Traffic Stream (TS) Info field", HFILL }},
- {&hf_tsinfo_type,
- {"Traffic Type", "wlan_mgt.ts_info.type", FT_UINT8, BASE_DEC,
- VALS (&tsinfo_type), 0, "Traffic Stream (TS) Info Traffic Type", HFILL }},
+ {&hf_ieee80211_tsinfo_type,
+ {"Traffic Type", "wlan_mgt.ts_info.type", FT_UINT24, BASE_DEC,
+ VALS (&tsinfo_type), 0x000001, "Traffic Stream (TS) Info Traffic Type", HFILL }},
- {&hf_tsinfo_tsid,
+ {&hf_ieee80211_tsinfo_tsid,
{"Traffic Stream ID (TSID)", "wlan_mgt.ts_info.tsid",
- FT_UINT8, BASE_DEC, NULL, 0, "Traffic Stream ID (TSID) Info TSID", HFILL }},
+ FT_UINT24, BASE_DEC, NULL, 0x00001E, "Traffic Stream ID (TSID) Info TSID", HFILL }},
+
+ {&hf_ieee80211_tsinfo_dir,
+ {"Direction", "wlan_mgt.ts_info.dir", FT_UINT24, BASE_DEC,
+ VALS (&tsinfo_direction), 0x000060, "Traffic Stream (TS) Info Direction", HFILL }},
- {&hf_tsinfo_dir,
- {"Direction", "wlan_mgt.ts_info.dir", FT_UINT8, BASE_DEC,
- VALS (&tsinfo_direction), 0, "Traffic Stream (TS) Info Direction", HFILL }},
+ {&hf_ieee80211_tsinfo_access,
+ {"Access Policy", "wlan_mgt.ts_info.dir", FT_UINT24, BASE_DEC,
+ VALS (&tsinfo_access), 0x000180, "Traffic Stream (TS) Info Access Policy", HFILL }},
- {&hf_tsinfo_access,
- {"Access Policy", "wlan_mgt.ts_info.dir", FT_UINT8, BASE_DEC,
- VALS (&tsinfo_access), 0, "Traffic Stream (TS) Info Access Policy", HFILL }},
+ {&hf_ieee80211_tsinfo_agg,
+ {"Aggregation", "wlan_mgt.ts_info.agg", FT_UINT24, BASE_DEC,
+ NULL, 0x000200, "Traffic Stream (TS) Info Access Policy", HFILL }},
- {&hf_tsinfo_agg,
- {"Aggregation", "wlan_mgt.ts_info.agg", FT_UINT8, BASE_DEC,
- NULL, 0, "Traffic Stream (TS) Info Access Policy", HFILL }},
+ {&hf_ieee80211_tsinfo_apsd,
+ {"Automatic Power-Save Delivery (APSD)", "wlan_mgt.ts_info.apsd", FT_UINT24, BASE_DEC,
+ NULL, 0x000400, "Traffic Stream (TS) Info Automatic Power-Save Delivery (APSD)", HFILL }},
- {&hf_tsinfo_apsd,
- {"Automatic Power-Save Delivery (APSD)", "wlan_mgt.ts_info.apsd", FT_UINT8, BASE_DEC,
- NULL, 0, "Traffic Stream (TS) Info Automatic Power-Save Delivery (APSD)", HFILL }},
+ {&hf_ieee80211_tsinfo_up,
+ {"User Priority", "wlan_mgt.ts_info.up", FT_UINT24, BASE_DEC,
+ VALS (&qos_up), 0x003800, "Traffic Stream (TS) Info User Priority", HFILL }},
- {&hf_tsinfo_up,
- {"User Priority", "wlan_mgt.ts_info.up", FT_UINT8, BASE_DEC,
- VALS (&qos_up), 0, "Traffic Stream (TS) Info User Priority", HFILL }},
+ {&hf_ieee80211_tsinfo_ack,
+ {"Ack Policy", "wlan_mgt.ts_info.ack", FT_UINT24, BASE_DEC,
+ VALS (&ack_policy), 0x00C000, "Traffic Stream (TS) Info Ack Policy", HFILL }},
- {&hf_tsinfo_ack,
- {"Ack Policy", "wlan_mgt.ts_info.ack", FT_UINT8, BASE_DEC,
- VALS (&ack_policy), 0, "Traffic Stream (TS) Info Ack Policy", HFILL }},
+ {&hf_ieee80211_tsinfo_sched,
+ {"Schedule", "wlan_mgt.ts_info.sched", FT_UINT24, BASE_DEC,
+ NULL, 0x010000, "Traffic Stream (TS) Info Schedule", HFILL }},
- {&hf_tsinfo_sched,
- {"Schedule", "wlan_mgt.ts_info.sched", FT_UINT8, BASE_DEC,
- NULL, 0, "Traffic Stream (TS) Info Schedule", HFILL }},
+ {&hf_ieee80211_tsinfo_rsv,
+ {"Reserved", "wlan_mgt.ts_info.rsv", FT_UINT24, BASE_HEX,
+ NULL, 0xFE0000, "Must be Zero", HFILL }},
- {&tspec_nor_msdu,
+ {&hf_ieee80211_tspec_nor_msdu,
{"Normal MSDU Size", "wlan_mgt.tspec.nor_msdu",
- FT_UINT16, BASE_DEC, NULL, 0, "Normal MSDU Size", HFILL }},
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_max_msdu,
+ {&hf_ieee80211_tspec_max_msdu,
{"Maximum MSDU Size", "wlan_mgt.tspec.max_msdu",
- FT_UINT16, BASE_DEC, NULL, 0, "Maximum MSDU Size", HFILL }},
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_min_srv,
+ {&hf_ieee80211_tspec_min_srv,
{"Minimum Service Interval", "wlan_mgt.tspec.min_srv",
- FT_UINT32, BASE_DEC, NULL, 0, "Minimum Service Interval", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_max_srv,
+ {&hf_ieee80211_tspec_max_srv,
{"Maximum Service Interval", "wlan_mgt.tspec.max_srv",
- FT_UINT32, BASE_DEC, NULL, 0, "Maximum Service Interval", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_inact_int,
+ {&hf_ieee80211_tspec_inact_int,
{"Inactivity Interval", "wlan_mgt.tspec.inact_int",
- FT_UINT32, BASE_DEC, NULL, 0, "Inactivity Interval", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_susp_int,
+ {&hf_ieee80211_tspec_susp_int,
{"Suspension Interval", "wlan_mgt.tspec.susp_int",
- FT_UINT32, BASE_DEC, NULL, 0, "Suspension Interval", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_srv_start,
+ {&hf_ieee80211_tspec_srv_start,
{"Service Start Time", "wlan_mgt.tspec.srv_start",
- FT_UINT32, BASE_DEC, NULL, 0, "Service Start Time", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_min_data,
+ {&hf_ieee80211_tspec_min_data,
{"Minimum Data Rate", "wlan_mgt.tspec.min_data",
- FT_UINT32, BASE_DEC, NULL, 0, "Minimum Data Rate", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_mean_data,
+ {&hf_ieee80211_tspec_mean_data,
{"Mean Data Rate", "wlan_mgt.tspec.mean_data",
- FT_UINT32, BASE_DEC, NULL, 0, "Mean Data Rate", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_peak_data,
+ {&hf_ieee80211_tspec_peak_data,
{"Peak Data Rate", "wlan_mgt.tspec.peak_data",
- FT_UINT32, BASE_DEC, NULL, 0, "Peak Data Rate", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_burst_size,
+ {&hf_ieee80211_tspec_burst_size,
{"Burst Size", "wlan_mgt.tspec.burst_size",
- FT_UINT32, BASE_DEC, NULL, 0, "Burst Size", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_delay_bound,
+ {&hf_ieee80211_tspec_delay_bound,
{"Delay Bound", "wlan_mgt.tspec.delay_bound",
- FT_UINT32, BASE_DEC, NULL, 0, "Delay Bound", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_min_phy,
+ {&hf_ieee80211_tspec_min_phy,
{"Minimum PHY Rate", "wlan_mgt.tspec.min_phy",
- FT_UINT32, BASE_DEC, NULL, 0, "Minimum PHY Rate", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_surplus,
+ {&hf_ieee80211_tspec_surplus,
{"Surplus Bandwidth Allowance", "wlan_mgt.tspec.surplus",
- FT_UINT16, BASE_DEC, NULL, 0, "Surplus Bandwidth Allowance", HFILL }},
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&tspec_medium,
+ {&hf_ieee80211_tspec_medium,
{"Medium Time", "wlan_mgt.tspec.medium",
- FT_UINT16, BASE_DEC, NULL, 0, "Medium Time", HFILL }},
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&ts_delay,
+ {&hf_ieee80211_ts_delay,
{"Traffic Stream (TS) Delay", "wlan_mgt.ts_delay",
- FT_UINT32, BASE_DEC, NULL, 0, "Traffic Stream (TS) Delay", HFILL }},
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&hf_class_type,
- {"Classifier Type", "wlan_mgt.tclas.class_type", FT_UINT8, BASE_DEC,
- VALS (classifier_type), 0, "Classifier Type", HFILL }},
-
- {&hf_class_mask,
- {"Classifier Mask", "wlan_mgt.tclas.class_mask", FT_UINT8, BASE_HEX,
- NULL, 0, "Classifier Mask", HFILL }},
+ {&hf_ieee80211_tclas_process,
+ {"Processing", "wlan_mgt.tclas_proc.processing", FT_UINT8, BASE_DEC,
+ VALS(ieee80211_tclas_process_flag), 0, "TCLAS Processing", HFILL }},
- {&hf_ether_type,
- {"Ethernet Type", "wlan_mgt.tclas.params.type", FT_UINT8, BASE_DEC,
- NULL, 0, "Classifier Parameters Ethernet Type", HFILL }},
+ {&hf_ieee80211_tag_qos_cap_qos_info,
+ {"QoS Info", "wlan_mgt.tag.qos_cap.qos_info", FT_UINT8, BASE_HEX,
+ NULL, 0, "TCLAS Processing", HFILL }},
- {&hf_tclas_process,
- {"Processing", "wlan_mgt.tclas_proc.processing", FT_UINT8, BASE_DEC,
- VALS (tclas_process), 0, "TCLAS Processing", HFILL }},
+ {&hf_ieee80211_tag_ext_supp_rates,
+ {"Extented Supported Rates", "wlan_mgt.extented_supported_rates",
+ FT_UINT8, BASE_NONE, VALS(ieee80211_supported_rates_vals), 0x0,
+ "In Mbit/sec, (B) for Basic Rates", HFILL }},
- {&hf_sched_info,
+ {&hf_ieee80211_sched_info,
{"Schedule Info", "wlan_mgt.sched.sched_info",
FT_UINT16, BASE_HEX, NULL, 0, "Schedule Info field", HFILL }},
- {&hf_sched_srv_start,
+ {&hf_ieee80211_sched_info_agg,
+ {"Schedule Aggregation", "wlan_mgt.sched_info.agg", FT_UINT16, BASE_DEC,
+ NULL, 0x0001, "Traffic Stream (TS) Info Access Policy", HFILL }},
+
+ {&hf_ieee80211_sched_info_tsid,
+ {"Schedule Traffic Stream ID (TSID)", "wlan_mgt.sched_info.tsid",
+ FT_UINT16, BASE_DEC, NULL, 0x001E, "Traffic Stream ID (TSID) Info TSID", HFILL }},
+
+ {&hf_ieee80211_sched_info_dir,
+ {"Schedule Direction", "wlan_mgt.sched_info.dir", FT_UINT16, BASE_DEC,
+ VALS (&tsinfo_direction), 0x0060, "Traffic Stream (TS) Info Direction", HFILL }},
+
+ {&hf_ieee80211_sched_srv_start,
{"Service Start Time", "wlan_mgt.sched.srv_start",
- FT_UINT32, BASE_HEX, NULL, 0, "Service Start Time", HFILL }},
+ FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_sched_srv_int,
+ {&hf_ieee80211_sched_srv_int,
{"Service Interval", "wlan_mgt.sched.srv_int",
- FT_UINT32, BASE_HEX, NULL, 0, "Service Interval", HFILL }},
+ FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_sched_spec_int,
+ {&hf_ieee80211_sched_spec_int,
{"Specification Interval", "wlan_mgt.sched.spec_int",
- FT_UINT16, BASE_HEX, NULL, 0, "Specification Interval", HFILL }},
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&hf_action,
+ {&hf_ieee80211_action,
{"Action", "wlan_mgt.fixed.action",
- FT_UINT8, BASE_HEX, NULL, 0, "Action", HFILL }},
-
- {&cf_version,
- {"IP Version", "wlan_mgt.tclas.params.version",
- FT_UINT8, BASE_DEC, NULL, 0, "IP Version", HFILL }},
-
- {&cf_ipv4_src,
- {"IPv4 Src Addr", "wlan_mgt.tclas.params.ipv4_src",
- FT_IPv4, BASE_NONE, NULL, 0, "IPv4 Src Addr", HFILL }},
-
- {&cf_ipv4_dst,
- {"IPv4 Dst Addr", "wlan_mgt.tclas.params.ipv4_dst",
- FT_IPv4, BASE_NONE, NULL, 0, "IPv4 Dst Addr", HFILL }},
-
- {&cf_src_port,
- {"Source Port", "wlan_mgt.tclas.params.src_port",
- FT_UINT16, BASE_DEC, NULL, 0, "Source Port", HFILL }},
-
- {&cf_dst_port,
- {"Destination Port", "wlan_mgt.tclas.params.dst_port",
- FT_UINT16, BASE_DEC, NULL, 0, "Destination Port", HFILL }},
-
- {&cf_dscp,
- {"IPv4 DSCP", "wlan_mgt.tclas.params.dscp",
- FT_UINT8, BASE_HEX, NULL, 0, "IPv4 Differentiated Services Code Point (DSCP) Field", HFILL }},
-
- {&cf_protocol,
- {"Protocol", "wlan_mgt.tclas.params.protocol",
- FT_UINT8, BASE_HEX, NULL, 0, "IPv4 Protocol", HFILL }},
-
- {&cf_ipv6_src,
- {"IPv6 Src Addr", "wlan_mgt.tclas.params.ipv6_src",
- FT_IPv6, BASE_NONE, NULL, 0, "IPv6 Src Addr", HFILL }},
-
- {&cf_ipv6_dst,
- {"IPv6 Dst Addr", "wlan_mgt.tclas.params.ipv6_dst",
- FT_IPv6, BASE_NONE, NULL, 0, "IPv6 Dst Addr", HFILL }},
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
- {&cf_flow,
- {"Flow Label", "wlan_mgt.tclas.params.flow",
- FT_UINT24, BASE_HEX, NULL, 0, "IPv6 Flow Label", HFILL }},
- {&cf_tag_type,
- {"802.1Q Tag Type", "wlan_mgt.tclas.params.tag_type",
- FT_UINT16, BASE_HEX, NULL, 0, "802.1Q Tag Type", HFILL }},
-
- {&cf_aruba,
- {"Aruba Type", "wlan_mgt.aruba_type",
+ {&hf_ieee80211_aruba,
+ {"Aruba Type", "wlan_mgt.aruba.type",
FT_UINT16, BASE_DEC, VALS(aruba_mgt_typevals), 0, "Aruba Management", HFILL }},
- {&cf_aruba_hb_seq,
- {"Aruba Heartbeat Sequence", "wlan_mgt.aruba_heartbeat_sequence",
- FT_UINT64, BASE_DEC, NULL, 0, "Aruba Heartbeat Sequence", HFILL }},
+ {&hf_ieee80211_aruba_hb_seq,
+ {"Aruba Heartbeat Sequence", "wlan_mgt.aruba.heartbeat_sequence",
+ FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
- {&cf_aruba_mtu,
- {"Aruba MTU Size", "wlan_mgt.aruba_mtu_size",
- FT_UINT16, BASE_DEC, NULL, 0, "Aruba MTU Size", HFILL }},
+ {&hf_ieee80211_aruba_mtu,
+ {"Aruba MTU Size", "wlan_mgt.aruba.mtu_size",
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
/* Start: HT Control (+HTC) */
- {&hf_htc,
+ {&hf_ieee80211_htc,
{"HT Control (+HTC)", "wlan_mgt.htc",
FT_UINT32, BASE_HEX, NULL, 0, "High Throughput Control (+HTC)", HFILL }},
- {&hf_htc_lac,
+ {&hf_ieee80211_htc_lac,
{"Link Adaptation Control (LAC)", "wlan_mgt.htc.lac",
FT_UINT16, BASE_HEX, NULL, 0, "High Throughput Control Link Adaptation Control (LAC)", HFILL }},
- {&hf_htc_lac_reserved,
+ {&hf_ieee80211_htc_lac_reserved,
{"Reserved", "wlan_mgt.htc.lac.reserved",
FT_BOOLEAN, 16, NULL, 0x0001, "High Throughput Control Link Adaptation Control Reserved", HFILL }},
- {&hf_htc_lac_trq,
+ {&hf_ieee80211_htc_lac_trq,
{"Training Request (TRQ)", "wlan_mgt.htc.lac.trq",
FT_BOOLEAN, 16, TFS(&htc_lac_trq_flag), 0x0002, "High Throughput Control Link Adaptation Control Training Request (TRQ)", HFILL }},
- {&hf_htc_lac_mai_aseli,
+ {&hf_ieee80211_htc_lac_mai_aseli,
{"Antenna Selection Indication (ASELI)", "wlan_mgt.htc.lac.mai.aseli",
FT_UINT16, BASE_HEX, NULL, 0x003C, "High Throughput Control Link Adaptation Control MAI Antenna Selection Indication", HFILL }},
- {&hf_htc_lac_mai_mrq,
+ {&hf_ieee80211_htc_lac_mai_mrq,
{"MCS Request (MRQ)", "wlan_mgt.htc.lac.mai.mrq",
FT_BOOLEAN, 16, TFS(&htc_lac_mai_mrq_flag), 0x0004, "High Throughput Control Link Adaptation Control MAI MCS Request", HFILL }},
- {&hf_htc_lac_mai_msi,
+ {&hf_ieee80211_htc_lac_mai_msi,
{"MCS Request Sequence Identifier (MSI)", "wlan_mgt.htc.lac.mai.msi",
FT_UINT16, BASE_HEX, NULL, 0x0038, "High Throughput Control Link Adaptation Control MAI MCS Request Sequence Identifier", HFILL }},
- {&hf_htc_lac_mai_reserved,
+ {&hf_ieee80211_htc_lac_mai_reserved,
{"Reserved", "wlan_mgt.htc.lac.mai.reserved",
FT_UINT16, BASE_HEX, NULL, 0x0038, "High Throughput Control Link Adaptation Control MAI Reserved", HFILL }},
- {&hf_htc_lac_mfsi,
+ {&hf_ieee80211_htc_lac_mfsi,
{"MCS Feedback Sequence Identifier (MFSI)", "wlan_mgt.htc.lac.mfsi",
FT_UINT16, BASE_DEC, NULL, 0x01C0, "High Throughput Control Link Adaptation Control MCS Feedback Sequence Identifier (MSI)", HFILL }},
- {&hf_htc_lac_asel_command,
+ {&hf_ieee80211_htc_lac_asel_command,
{"Antenna Selection (ASEL) Command", "wlan_mgt.htc.lac.asel.command",
- FT_UINT16, BASE_HEX, VALS (&hf_htc_lac_asel_command_flags), 0x0E00, "High Throughput Control Link Adaptation Control Antenna Selection (ASEL) Command", HFILL }},
- {&hf_htc_lac_asel_data,
+ FT_UINT16, BASE_HEX, VALS (&ieee80211_htc_lac_asel_command_flags), 0x0E00, "High Throughput Control Link Adaptation Control Antenna Selection (ASEL) Command", HFILL }},
+ {&hf_ieee80211_htc_lac_asel_data,
{"Antenna Selection (ASEL) Data", "wlan_mgt.htc.lac.asel.data",
FT_UINT16, BASE_HEX, NULL, 0xF000, "High Throughput Control Link Adaptation Control Antenna Selection (ASEL) Data", HFILL }},
- {&hf_htc_lac_mfb,
+ {&hf_ieee80211_htc_lac_mfb,
{"MCS Feedback (MFB)", "wlan_mgt.htc.lac.mfb",
FT_UINT16, BASE_HEX, NULL, 0xFE00, "High Throughput Control Link Adaptation Control MCS Feedback", HFILL }},
- {&hf_htc_cal_pos,
+ {&hf_ieee80211_htc_cal_pos,
{"Calibration Position", "wlan_mgt.htc.cal.pos",
- FT_UINT16, BASE_DEC, VALS (&hf_htc_cal_pos_flags), 0x0003, "High Throughput Control Calibration Position", HFILL }},
- {&hf_htc_cal_seq,
+ FT_UINT16, BASE_DEC, VALS (&ieee80211_htc_cal_pos_flags), 0x0003, "High Throughput Control Calibration Position", HFILL }},
+ {&hf_ieee80211_htc_cal_seq,
{"Calibration Sequence Identifier", "wlan_mgt.htc.cal.seq",
FT_UINT16, BASE_DEC, NULL, 0x000C, "High Throughput Control Calibration Sequence Identifier", HFILL }},
- {&hf_htc_reserved1,
+ {&hf_ieee80211_htc_reserved1,
{"Reserved", "wlan_mgt.htc.reserved1",
FT_UINT16, BASE_DEC, NULL, 0x0030, "High Throughput Control Reserved", HFILL }},
- {&hf_htc_csi_steering,
+ {&hf_ieee80211_htc_csi_steering,
{"CSI/Steering", "wlan_mgt.htc.csi_steering",
- FT_UINT16, BASE_DEC, VALS (&hf_htc_csi_steering_flags), 0x00C0, "High Throughput Control CSI/Steering", HFILL }},
- {&hf_htc_ndp_announcement,
+ FT_UINT16, BASE_DEC, VALS (&ieee80211_htc_csi_steering_flags), 0x00C0, "High Throughput Control CSI/Steering", HFILL }},
+ {&hf_ieee80211_htc_ndp_announcement,
{"NDP Announcement", "wlan_mgt.htc.ndp_announcement",
- FT_BOOLEAN, 16, TFS(&hf_htc_ndp_announcement_flag), 0x0100, "High Throughput Control NDP Announcement", HFILL }},
- {&hf_htc_reserved2,
+ FT_BOOLEAN, 16, TFS(&ieee80211_htc_ndp_announcement_flag), 0x0100, "High Throughput Control NDP Announcement", HFILL }},
+ {&hf_ieee80211_htc_reserved2,
{"Reserved", "wlan_mgt.htc.reserved2",
FT_UINT16, BASE_HEX, NULL, 0x3E00, "High Throughput Control Reserved", HFILL }},
- {&hf_htc_ac_constraint,
+ {&hf_ieee80211_htc_ac_constraint,
{"AC Constraint", "wlan_mgt.htc.ac_constraint",
FT_BOOLEAN, 16, NULL, 0x4000, "High Throughput Control AC Constraint", HFILL }},
- {&hf_htc_rdg_more_ppdu,
+ {&hf_ieee80211_htc_rdg_more_ppdu,
{"RDG/More PPDU", "wlan_mgt.htc.rdg_more_ppdu",
- FT_BOOLEAN, 16, NULL, 0x8000, "High Throughput Control RDG/More PPDU", HFILL }}
+ FT_BOOLEAN, 16, NULL, 0x8000, "High Throughput Control RDG/More PPDU", HFILL }},
/* End: HT Control (+HTC) */
+
+ /* MDIE */
+ {&hf_ieee80211_tag_mobility_domain_mdid,
+ {"Mobility Domain Identifier", "wlan_mgt.mobility_domain.mdid",
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_mobility_domain_ft_capab,
+ {"FT Capability and Policy", "wlan_mgt.mobility_domain.ft_capab",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_mobility_domain_ft_capab_ft_over_ds,
+ {"Fast BSS Transition over DS",
+ "wlan_mgt.mobility_domain.ft_capab.ft_over_ds",
+ FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL }},
+ {&hf_ieee80211_tag_mobility_domain_ft_capab_resource_req,
+ {"Resource Request Protocol Capability",
+ "wlan_mgt.mobility_domain.ft_capab.resource_req",
+ FT_UINT8, BASE_HEX, NULL, 0x02, NULL, HFILL }},
+
+ /* FTIE */
+ {&hf_ieee80211_tag_ft_mic_control,
+ {"MIC Control", "wlan_mgt.ft.mic_control",
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_element_count,
+ {"Element Count", "wlan_mgt.ft.element_count",
+ FT_UINT16, BASE_DEC, NULL, 0xff00, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_mic,
+ {"MIC", "wlan_mgt.ft.mic",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_anonce,
+ {"ANonce", "wlan_mgt.ft.anonce",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_snonce,
+ {"SNonce", "wlan_mgt.ft.snonce",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_id,
+ {"Subelement ID", "wlan_mgt.ft.subelem.id",
+ FT_UINT8, BASE_DEC, VALS(ft_subelem_id_vals), 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_len,
+ {"Length", "wlan_mgt.ft.subelem.len",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_data,
+ {"Data", "wlan_mgt.ft.subelem.data",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_r1kh_id,
+ {"PMK-R1 key holder identifier (R1KH-ID)", "wlan_mgt.ft.subelem.r1kh_id",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_gtk_key_info,
+ {"Key Info", "wlan_mgt.ft.subelem.gtk.key_info",
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_gtk_key_id,
+ {"Key ID", "wlan_mgt.ft.subelem.gtk.key_id",
+ FT_UINT16, BASE_DEC, NULL, 0x0003, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_gtk_key_length,
+ {"Key Length", "wlan_mgt.ft.subelem.gtk.key_length",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_gtk_rsc,
+ {"RSC", "wlan_mgt.ft.subelem.gtk.rsc",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_gtk_key,
+ {"GTK", "wlan_mgt.ft.subelem.gtk.key",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_r0kh_id,
+ {"PMK-R0 key holder identifier (R0KH-ID)", "wlan_mgt.ft.subelem.r0kh_id",
+ FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_igtk_key_id,
+ {"Key ID", "wlan_mgt.ft.subelem.igtk.key_id",
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_igtk_ipn,
+ {"IPN", "wlan_mgt.ft.subelem.igtk.ipn",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_igtk_key_length,
+ {"Key Length", "wlan_mgt.ft.subelem.igtk.key_length",
+ FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_ft_subelem_igtk_key,
+ {"Wrapped Key (IGTK)", "wlan_mgt.ft.subelem.igtk.key",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ /* MMIE */
+ {&hf_ieee80211_tag_mmie_keyid,
+ {"KeyID", "wlan_mgt.mmie.keyid",
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_mmie_ipn,
+ {"IPN", "wlan_mgt.mmie.ipn",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_mmie_mic,
+ {"MIC", "wlan_mgt.mmie.mic",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ /* Advertisement Protocol */
+ {&hf_ieee80211_tag_adv_proto_resp_len_limit,
+ {"Query Response Length Limit", "wlan_mgt.adv_proto.resp_len_limit",
+ FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
+ {&hf_ieee80211_tag_adv_proto_pame_bi,
+ {"PAME-BI", "wlan_mgt.adv_proto.pame_bi",
+ FT_UINT8, BASE_DEC, NULL, 0x80,
+ "Pre-Association Message Xchange BSSID Independent (PAME-BI)", HFILL }},
+ {&hf_ieee80211_tag_adv_proto_id,
+ {"Advertisement Protocol ID", "wlan_mgt.adv_proto.id",
+ FT_UINT8, BASE_DEC, VALS(adv_proto_id_vals), 0, NULL, HFILL }},
+
+ /* Timeout Interval */
+ {&hf_ieee80211_tag_timeout_int_type,
+ {"Timeout Interval Type", "wlan_mgt.timeout_int.type",
+ FT_UINT8, BASE_DEC, VALS(timeout_int_types), 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_timeout_int_value,
+ {"Timeout Interval Value", "wlan_mgt.timeout_int.value",
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ /* Link Identifier */
+ {&hf_ieee80211_tag_link_id_bssid,
+ {"BSSID", "wlan_mgt.link_id.bssid",
+ FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_link_id_init_sta,
+ {"TDLS initiator STA Address", "wlan_mgt.link_id.init_sta",
+ FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_link_id_resp_sta,
+ {"TDLS responder STA Address", "wlan_mgt.link_id.resp_sta",
+ FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
+
+ /* Wakeup Schedule */
+ {&hf_ieee80211_tag_wakeup_schedule_offset,
+ {"Offset", "wlan_mgt.wakeup_schedule.offset",
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_wakeup_schedule_interval,
+ {"Interval", "wlan_mgt.wakeup_schedule.interval",
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_wakeup_schedule_awake_window_slots,
+ {"Awake Window Slots", "wlan_mgt.wakeup_schedule.awake_window_slots",
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_wakeup_schedule_max_awake_dur,
+ {"Maximum Awake Window Duration",
+ "wlan_mgt.wakeup_schedule.max_awake_dur",
+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_wakeup_schedule_idle_count,
+ {"Idle Count", "wlan_mgt.wakeup_schedule.idle_count",
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ /* Channel Switch Timing */
+ {&hf_ieee80211_tag_channel_switch_timing_switch_time,
+ {"Switch Time", "wlan_mgt.channel_switch_timing.switch_time",
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_channel_switch_timing_switch_timeout,
+ {"Switch Timeout", "wlan_mgt.channel_switch_timing.switch_timeout",
+ FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+
+ /* PTI Control */
+ {&hf_ieee80211_tag_pti_control_tid,
+ {"TID", "wlan_mgt.pti_control.tid",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {&hf_ieee80211_tag_pti_control_sequence_control,
+ {"Sequence Control", "wlan_mgt.pti_control.sequence_control",
+ FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
+
+ /* PU Buffer Status */
+ {&hf_ieee80211_tag_pu_buffer_status_ac_bk,
+ {"AC_BK traffic available", "wlan_mgt.pu_buffer_status.ac_bk",
+ FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL }},
+ {&hf_ieee80211_tag_pu_buffer_status_ac_be,
+ {"AC_BE traffic available", "wlan_mgt.pu_buffer_status.ac_be",
+ FT_UINT8, BASE_DEC, NULL, 0x02, NULL, HFILL }},
+ {&hf_ieee80211_tag_pu_buffer_status_ac_vi,
+ {"AC_VI traffic available", "wlan_mgt.pu_buffer_status.ac_vi",
+ FT_UINT8, BASE_DEC, NULL, 0x04, NULL, HFILL }},
+ {&hf_ieee80211_tag_pu_buffer_status_ac_vo,
+ {"AC_VO traffic available", "wlan_mgt.pu_buffer_status.ac_vo",
+ FT_UINT8, BASE_DEC, NULL, 0x08, NULL, HFILL }}
};
static hf_register_info aggregate_fields[] = {
- {&amsdu_msdu_header_text,
- {"MAC Service Data Unit (MSDU)", "wlan_aggregate.msduheader", FT_UINT16,
- BASE_DEC, 0, 0x0000, "MAC Service Data Unit (MSDU)", HFILL }}
+ {&hf_ieee80211_amsdu_msdu_header_text,
+ {"MAC Service Data Unit (MSDU)", "wlan_aggregate.msduheader", FT_UINT16,
+ BASE_DEC, 0, 0x0000, NULL, HFILL }}
};
static gint *tree_array[] = {
&ett_80211_mgt,
&ett_fixed_parameters,
&ett_tagged_parameters,
+ &ett_tag_bmapctl_tree,
+ &ett_tag_country_fnm_tree,
+ &ett_tag_country_rcc_tree,
&ett_qos_parameters,
&ett_qos_ps_buf_state,
&ett_wep_parameters,
+#ifdef MESH_OVERRIDES
+ &ett_msh_parameters,
+ &ett_msh_dest_flags_tree,
+#endif /* MESH_OVERRIDES */
&ett_cap_tree,
+ &ett_rsn_gcs_tree,
+ &ett_rsn_pcs_tree,
+ &ett_rsn_sub_pcs_tree,
+ &ett_rsn_akms_tree,
+ &ett_rsn_sub_akms_tree,
&ett_rsn_cap_tree,
+ &ett_rsn_pmkid_tree,
+ &ett_rsn_gmcs_tree,
&ett_ht_cap_tree,
+ &ett_ath_cap_tree,
&ett_ff_ba_param_tree,
&ett_ff_qos_info,
&ett_ff_sm_pwr_save,
&ett_ht_info_delimiter3_tree,
&ett_msdu_aggregation_parent_tree,
&ett_msdu_aggregation_subframe_tree,
- &ett_tag_measure_request_tree,
- &ett_tag_ex_cap,
+ &ett_tag_measure_request_mode_tree,
+ &ett_tag_measure_request_type_tree,
+ &ett_tag_measure_report_mode_tree,
+ &ett_tag_measure_report_type_tree,
+ &ett_tag_measure_report_basic_map_tree,
+ &ett_tag_measure_report_rpi_tree,
+ &ett_tag_measure_report_frame_tree,
+ &ett_tag_dfs_map_tree,
+ &ett_tag_erp_info_tree,
+ &ett_tag_ex_cap,
&ett_tag_supported_channels,
&ett_tag_neighbor_report_bssid_info_tree,
&ett_tag_neighbor_report_bssid_info_capability_tree,
&ett_sched_tree,
&ett_fcs,
&ett_radio,
+ &ett_prism,
+ &ett_prism_did,
&ett_pst_tree,
&ett_pst_cap_tree,
&ett_chan_noc_tree,
- &ett_wave_chnl_tree
+ &ett_wave_chnl_tree,
+ &ett_adv_proto,
+ &ett_adv_proto_tuple,
+ &ett_gas_query,
+ &ett_gas_anqp
};
module_t *wlan_module;
/* Register configuration options */
wlan_module = prefs_register_protocol(proto_wlan, init_wepkeys);
prefs_register_bool_preference(wlan_module, "defragment",
- "Reassemble fragmented 802.11 datagrams",
- "Whether fragmented 802.11 datagrams should be reassembled",
- &wlan_defragment);
+ "Reassemble fragmented 802.11 datagrams",
+ "Whether fragmented 802.11 datagrams should be reassembled",
+ &wlan_defragment);
prefs_register_bool_preference(wlan_module, "ignore_draft_ht",
"Ignore vendor-specific HT elements",
/* Davide Schiera (2006-11-26): changed "WEP bit" in "Protection bit" */
/* (according to the document IEEE Std 802.11i-2004) */
prefs_register_enum_preference(wlan_module, "ignore_wep",
- "Ignore the Protection bit",
- "Some 802.11 cards leave the Protection bit set even though the packet is decrypted, "
- "and some also leave the IV (initialization vector).",
- &wlan_ignore_wep, wlan_ignore_wep_options, TRUE);
+ "Ignore the Protection bit",
+ "Some 802.11 cards leave the Protection bit set even though the packet is decrypted, "
+ "and some also leave the IV (initialization vector).",
+ &wlan_ignore_wep, wlan_ignore_wep_options, TRUE);
#ifndef USE_ENV
#ifdef HAVE_AIRPDCAP
/* Davide Schiera (2006-11-26): added reference to WPA/WPA2 decryption */
prefs_register_bool_preference(wlan_module, "enable_decryption",
- "Enable decryption", "Enable WEP and WPA/WPA2 decryption",
- &enable_decryption);
+ "Enable decryption", "Enable WEP and WPA/WPA2 decryption",
+ &enable_decryption);
#else
prefs_register_bool_preference(wlan_module, "enable_decryption",
- "Enable decryption", "Enable WEP decryption",
- &enable_decryption);
+ "Enable decryption", "Enable WEP decryption",
+ &enable_decryption);
#endif
#ifdef HAVE_AIRPDCAP
prefs_register_static_text_preference(wlan_module, "info_decryption_key",
- "Key examples: 01:02:03:04:05 (40/64-bit WEP),\n"
- "010203040506070809101111213 (104/128-bit WEP),\n"
- "wpa-pwd:MyPassword[:MyAP] (WPA + plaintext password [+ SSID]),\n"
- "wpa-psk:0102030405...6061626364 (WPA + 256-bit key). "
- "Invalid keys will be ignored.",
- "Valid key formats");
+ "Key examples: 01:02:03:04:05 (40/64-bit WEP),\n"
+ "010203040506070809101111213 (104/128-bit WEP),\n"
+ "wpa-pwd:MyPassword[:MyAP] (WPA + plaintext password [+ SSID]),\n"
+ "wpa-psk:0102030405...6061626364 (WPA + 256-bit key). "
+ "Invalid keys will be ignored.",
+ "Valid key formats");
#else
prefs_register_static_text_preference(wlan_module, "info_decryption_key",
- "Key examples: 01:02:03:04:05 (40/64-bit WEP),\n"
- "010203040506070809101111213 (104/128-bit WEP)",
- "Valid key formats");
+ "Key examples: 01:02:03:04:05 (40/64-bit WEP),\n"
+ "010203040506070809101111213 (104/128-bit WEP)",
+ "Valid key formats");
#endif
for (i = 0; i < MAX_ENCRYPTION_KEYS; i++) {
" wpa-pwd:<passphrase>[:<ssid>];"
" wpa-psk:<wpa hexadecimal key>", i + 1);
#else
- g_string_printf(key_name, "wep_key%d", i + 1);
- g_string_printf(key_title, "WEP key #%d", i + 1);
- g_string_printf(key_desc, "WEP key #%d can be:"
- " <wep hexadecimal key>;"
- " wep:<wep hexadecimal key>", i + 1);
+ g_string_printf(key_name, "wep_key%d", i + 1);
+ g_string_printf(key_title, "WEP key #%d", i + 1);
+ g_string_printf(key_desc, "WEP key #%d can be:"
+ " <wep hexadecimal key>;"
+ " wep:<wep hexadecimal key>", i + 1);
#endif
prefs_register_string_preference(wlan_module, key_name->str,
- key_title->str, key_desc->str, (const char **) &wep_keystr[i]);
+ key_title->str, key_desc->str, (const char **) &wep_keystr[i]);
g_string_free(key_name, FALSE);
g_string_free(key_title, FALSE);
#endif
}
+static void
+dissect_data_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ int offset = 0;
+ guint8 type;
+ int tagged_parameter_tree_len;
+ proto_tree *tagged_tree;
+
+ g_pinfo = pinfo;
+
+ type = tvb_get_guint8(tvb, offset);
+ proto_tree_add_item(tree, hf_ieee80211_data_encap_payload_type, tvb, offset,
+ 1, FALSE);
+ offset++;
+ switch (type) {
+ case 1:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "RRB");
+ /* TODO: IEEE 802.11r */
+ break;
+ case 2:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "TDLS");
+ col_clear(pinfo->cinfo, COL_INFO);
+ offset += add_fixed_field(tree, tvb, offset, FIELD_ACTION);
+ tagged_parameter_tree_len = tvb_reported_length_remaining(tvb, offset);
+ if (tagged_parameter_tree_len != 0) {
+ tagged_tree = get_tagged_parameter_tree(tree, tvb, offset,
+ tagged_parameter_tree_len);
+ ieee_80211_add_tagged_parameters(tvb, offset, pinfo, tagged_tree,
+ tagged_parameter_tree_len);
+ }
+ break;
+ }
+}
+
void
proto_reg_handoff_ieee80211(void)
{
dissector_handle_t radio_handle;
dissector_handle_t prism_handle;
+ dissector_handle_t data_encap_handle;
/*
* Get handles for the LLC, IPX and Ethernet dissectors.
data_handle = find_dissector("data");
ieee80211_handle = find_dissector("wlan");
- dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11, ieee80211_handle);
- dissector_add("ethertype", ETHERTYPE_CENTRINO_PROMISC, ieee80211_handle);
+ dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11, ieee80211_handle);
+ dissector_add_uint("ethertype", ETHERTYPE_CENTRINO_PROMISC, ieee80211_handle);
/* Register handoff to radio-header dissectors */
radio_handle = create_dissector_handle(dissect_radio, proto_radio);
- dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11_WITH_RADIO, radio_handle);
+ dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_WITH_RADIO, radio_handle);
prism_handle = create_dissector_handle(dissect_prism, proto_prism);
- dissector_add("wtap_encap", WTAP_ENCAP_PRISM_HEADER, prism_handle);
+ dissector_add_uint("wtap_encap", WTAP_ENCAP_PRISM_HEADER, prism_handle);
wlancap_handle = create_dissector_handle(dissect_wlancap, proto_wlancap);
- dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_AVS, wlancap_handle);
+ dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_AVS, wlancap_handle);
/* Register handoff to Aruba GRE */
- dissector_add("gre.proto", GRE_ARUBA_8200, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8210, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8220, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8230, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8240, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8250, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8260, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8270, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8280, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8290, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_82A0, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_82B0, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_82C0, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_82D0, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_82E0, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_82F0, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8300, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8310, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8320, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8330, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8340, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8350, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8360, ieee80211_handle);
- dissector_add("gre.proto", GRE_ARUBA_8370, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8200, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8210, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8220, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8230, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8240, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8250, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8260, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8270, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8280, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8290, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_82A0, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_82B0, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_82C0, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_82D0, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_82E0, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_82F0, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8300, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8310, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8320, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8330, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8340, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8350, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8360, ieee80211_handle);
+ dissector_add_uint("gre.proto", GRE_ARUBA_8370, ieee80211_handle);
+
+ data_encap_handle = create_dissector_handle(dissect_data_encap, proto_wlan);
+ dissector_add_uint("ethertype", ETHERTYPE_IEEE80211_DATA_ENCAP,
+ data_encap_handle);
}
#ifdef HAVE_AIRPDCAP
}
/* allocate buffer for decrypted payload */
- if ((tmp = g_malloc(dec_caplen-offset)) == NULL)
- return NULL; /* krap! */
- memcpy(tmp, dec_data+offset, dec_caplen-offset);
+ tmp = g_memdup(dec_data+offset, dec_caplen-offset);
len=dec_caplen-offset;
/* decrypt successful, let's set up a new data tvb. */
- decr_tvb = tvb_new_child_real_data(tvb, tmp, len-8, len-8);
+ decr_tvb = tvb_new_child_real_data(tvb, tmp, len, len);
tvb_set_free_cb(decr_tvb, g_free);
} else
g_free(tmp);
}
if (!decr_tvb)
- g_free(tmp);
+ g_free(tmp);
#if 0
printf("de-wep %p\n", decr_tvb);
/* XXX - This just lops the end if the key off if it's too long.
* Should we handle this more gracefully? */
- g_strlcpy(key.UserPwd.Passphrase, dk->key->str, AIRPDCAP_WPA_PASSPHRASE_MAX_LEN);
+ g_strlcpy(key.UserPwd.Passphrase, dk->key->str, AIRPDCAP_WPA_PASSPHRASE_MAX_LEN+1);
key.UserPwd.SsidLen = 0;
if(dk->ssid != NULL && dk->ssid->len <= AIRPDCAP_WPA_SSID_MAX_LEN)
wep_keylens[keyidx] = 0;
#ifdef USE_ENV
- buf=ep_alloc(128);
- g_snprintf(buf, 128, "WIRESHARK_WEPKEY%d", i+1);
+ buf = ep_strdup_printf("WIRESHARK_WEPKEY%d", i+1);
tmp = getenv(buf);
#else
tmp = wep_keystr[i];
static int
weak_iv(guchar *iv)
{
- guchar sum, k;
+ guchar sum, k;
- if (iv[1] == 255 && iv[0] > 2 && iv[0] < 16) {
- return iv[0] -3;
- }
+ if (iv[1] == 255 && iv[0] > 2 && iv[0] < 16) {
+ return iv[0] -3;
+ }
- sum = iv[0] + iv[1];
- if (sum == 1) {
- if (iv[2] <= 0x0a) {
- return iv[2] +2;
- }
- else if (iv[2] == 0xff){
- return 0;
- }
- }
- k = 0xfe - iv[2];
- if (sum == k && (iv[2] >= 0xf2 && iv[2] <= 0xfe && iv[2] != 0xfd)){
- return k;
- }
- return -1;
+ sum = iv[0] + iv[1];
+ if (sum == 1) {
+ if (iv[2] <= 0x0a) {
+ return iv[2] +2;
+ }
+ else if (iv[2] == 0xff){
+ return 0;
+ }
+ }
+ k = 0xfe - iv[2];
+ if (sum == k && (iv[2] >= 0xf2 && iv[2] <= 0xfe && iv[2] != 0xfd)){
+ return k;
+ }
+ return -1;
}
/*
git.samba.org / obnox / wireshark / wip.git / blobdiff