From a9f27fea2a48250098012d797d6f83500c35a67b Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Fri, 2 Oct 2020 11:42:45 +0300 Subject: sys/linux: add 802.11 frame descriptions This commit enables accurate generation of 802.11 frames for injection. The descriptions only include frames/fields/elements that are supported by mac80211. Also, this commit includes fixes to tests that were affected by modification of the existing descriptions. The validity of the frames was verified by capturing the generated packets and examining them in Wirehark. --- sys/linux/net_80211.txt.const | 80 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'sys/linux/net_80211.txt.const') diff --git a/sys/linux/net_80211.txt.const b/sys/linux/net_80211.txt.const index dfbc992ac..b1ee0bd05 100644 --- a/sys/linux/net_80211.txt.const +++ b/sys/linux/net_80211.txt.const @@ -1,5 +1,7 @@ # Code generated by syz-sysgen. DO NOT EDIT. arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x +IEEE80211_CTL_FRAME_TYPE = 1 +IEEE80211_DATA_FRAME_TYPE = 2 IEEE80211_HT_CAP_40MHZ_INTOLERANT = 16384 IEEE80211_HT_CAP_DELAY_BA = 1024 IEEE80211_HT_CAP_DSSSCCK40 = 4096 @@ -23,8 +25,35 @@ IEEE80211_HT_EXT_CAP_PCO = 1 IEEE80211_HT_EXT_CAP_PCO_TIME = 6 IEEE80211_HT_EXT_CAP_PCO_TIME_SHIFT = 1 IEEE80211_HT_EXT_CAP_RD_RESPONDER = 2048 +IEEE80211_MAX_DATA_LEN = 2304 IEEE80211_MAX_SSID_LEN = 32 +IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS = 1 +IEEE80211_MESHCONF_CAPAB_FORWARDING = 8 +IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL = 64 +IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING = 32 +IEEE80211_MGMT_CTL_ACK = 13 +IEEE80211_MGMT_CTL_BACK = 9 +IEEE80211_MGMT_CTL_BACK_REQ = 8 +IEEE80211_MGMT_CTL_CFEND = 14 +IEEE80211_MGMT_CTL_CFENDACK = 15 +IEEE80211_MGMT_CTL_CTL_EXT = 6 +IEEE80211_MGMT_CTL_CTS = 12 +IEEE80211_MGMT_CTL_PSPOLL = 10 +IEEE80211_MGMT_CTL_RTS = 11 +IEEE80211_MGMT_FRAME_ACTION = 13 +IEEE80211_MGMT_FRAME_ACTION_NOACK = 14 +IEEE80211_MGMT_FRAME_ASSOC_REQ = 0 +IEEE80211_MGMT_FRAME_ASSOC_RESP = 1 +IEEE80211_MGMT_FRAME_ATIM = 9 +IEEE80211_MGMT_FRAME_AUTH = 11 IEEE80211_MGMT_FRAME_BEACON = 8 +IEEE80211_MGMT_FRAME_DEAUTH = 12 +IEEE80211_MGMT_FRAME_DISASSOC = 10 +IEEE80211_MGMT_FRAME_PROBE_REQ = 4 +IEEE80211_MGMT_FRAME_PROBE_RESP = 5 +IEEE80211_MGMT_FRAME_REASSOC_REQ = 2 +IEEE80211_MGMT_FRAME_REASSOC_RESP = 3 +IEEE80211_MGMT_FRAME_TYPE = 0 IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK = 57344 IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT = 13 IEEE80211_VHT_CAP_EXT_NSS_BW_MASK = 3221225472 @@ -64,6 +93,12 @@ IEEE80211_VHT_CAP_VHT_TXOP_PS = 2097152 JOIN_IBSS_BG_NO_SCAN = 2 JOIN_IBSS_BG_SCAN = 1 JOIN_IBSS_NO_SCAN = 0 +WLAN_ACTION_ADDBA_REQ = 0 +WLAN_ACTION_ADDBA_RESP = 1 +WLAN_ACTION_DELBA = 2 +WLAN_ACTION_SA_QUERY_REQUEST = 0 +WLAN_ACTION_SPCT_CHL_SWITCH = 4 +WLAN_ACTION_SPCT_MSR_REQ = 0 WLAN_AKM_SUITE_8021X = 1027073 WLAN_AKM_SUITE_8021X_SHA256 = 1027077 WLAN_AKM_SUITE_8021X_SUITE_B = 1027083 @@ -100,6 +135,15 @@ WLAN_CAPABILITY_RADIO_MEASURE = 4096 WLAN_CAPABILITY_SHORT_PREAMBLE = 32 WLAN_CAPABILITY_SHORT_SLOT_TIME = 1024 WLAN_CAPABILITY_SPECTRUM_MGMT = 256 +WLAN_CATEGORY_BACK = 3 +WLAN_CATEGORY_HT = 7 +WLAN_CATEGORY_MESH_ACTION = 13 +WLAN_CATEGORY_PUBLIC = 4 +WLAN_CATEGORY_SA_QUERY = 8 +WLAN_CATEGORY_SELF_PROTECTED = 15 +WLAN_CATEGORY_SPECTRUM_MGMT = 0 +WLAN_CATEGORY_TDLS = 12 +WLAN_CATEGORY_VHT = 21 WLAN_CIPHER_SUITE_AES_CMAC = 1027078 WLAN_CIPHER_SUITE_BIP_CMAC_256 = 1027085 WLAN_CIPHER_SUITE_BIP_GMAC_128 = 1027083 @@ -112,6 +156,40 @@ WLAN_CIPHER_SUITE_TKIP = 1027074 WLAN_CIPHER_SUITE_USE_GROUP = 1027072 WLAN_CIPHER_SUITE_WEP104 = 1027077 WLAN_CIPHER_SUITE_WEP40 = 1027073 +WLAN_EID_CF_PARAMS = 4 +WLAN_EID_CHALLENGE = 16 +WLAN_EID_CHANNEL_SWITCH = 37 +WLAN_EID_CHAN_SWITCH_PARAM = 118 +WLAN_EID_CHAN_SWITCH_TIMING = 104 +WLAN_EID_DS_PARAMS = 3 +WLAN_EID_ERP_INFO = 42 +WLAN_EID_EXT_CHANSWITCH_ANN = 60 +WLAN_EID_FAST_BSS_TRANSITION = 55 +WLAN_EID_GCR_GROUP_ADDR = 189 +WLAN_EID_HT_CAPABILITY = 45 +WLAN_EID_IBSS_PARAMS = 6 +WLAN_EID_LINK_ID = 101 +WLAN_EID_MEASURE_REQUEST = 38 +WLAN_EID_MESH_CONFIG = 113 +WLAN_EID_MESH_ID = 114 +WLAN_EID_MIC = 140 +WLAN_EID_PEER_MGMT = 117 +WLAN_EID_PERR = 132 +WLAN_EID_PREP = 131 +WLAN_EID_PREQ = 130 +WLAN_EID_RANN = 126 +WLAN_EID_SECONDARY_CHANNEL_OFFSET = 62 +WLAN_EID_SSID = 0 +WLAN_EID_SUPP_RATES = 1 +WLAN_EID_TIM = 5 +WLAN_EID_VENDOR_SPECIFIC = 221 +WLAN_HT_ACTION_NOTIFY_CHANWIDTH = 0 +WLAN_HT_ACTION_SMPS = 1 +WLAN_MESH_ACTION_HWMP_PATH_SELECTION = 1 +WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4 +WLAN_SP_MESH_PEERING_CLOSE = 3 +WLAN_SP_MESH_PEERING_CONFIRM = 2 +WLAN_SP_MESH_PEERING_OPEN = 1 WLAN_TDLS_CHANNEL_SWITCH_REQUEST = 5 WLAN_TDLS_CHANNEL_SWITCH_RESPONSE = 6 WLAN_TDLS_DISCOVERY_REQUEST = 10 @@ -123,3 +201,5 @@ WLAN_TDLS_SETUP_CONFIRM = 2 WLAN_TDLS_SETUP_REQUEST = 0 WLAN_TDLS_SETUP_RESPONSE = 1 WLAN_TDLS_TEARDOWN = 3 +WLAN_VHT_ACTION_GROUPID_MGMT = 1 +WLAN_VHT_ACTION_OPMODE_NOTIF = 2 -- cgit mrf-deployment