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/socket_netlink_generic_80211.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/linux/socket_netlink_generic_80211.txt') diff --git a/sys/linux/socket_netlink_generic_80211.txt b/sys/linux/socket_netlink_generic_80211.txt index 83da3013f..64cd222a3 100644 --- a/sys/linux/socket_netlink_generic_80211.txt +++ b/sys/linux/socket_netlink_generic_80211.txt @@ -515,7 +515,7 @@ nl80211_scan_flags = NL80211_SCAN_FLAG_LOW_PRIORITY, NL80211_SCAN_FLAG_FLUSH, NL nl80211_policy_scan [ NL80211_ATTR_MAC nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr] - NL80211_ATTR_IE nlattr[NL80211_ATTR_IE, array[int8, 0:IEEE80211_MAX_DATA_LEN]] + NL80211_ATTR_IE nlattr[NL80211_ATTR_IE, array[ieee80211_ie]] NL80211_ATTR_SCAN_FREQUENCIES nlnest[NL80211_ATTR_SCAN_FREQUENCIES, array[nlattr[0, int32]]] NL80211_ATTR_SCAN_SSIDS nlnest[NL80211_ATTR_SCAN_SSIDS, array[nlattr[0, ieee80211_ssid]]] NL80211_ATTR_SCHED_SCAN_INTERVAL nlattr[NL80211_ATTR_SCHED_SCAN_INTERVAL, int32] @@ -851,7 +851,7 @@ nl80211_policy_cqm [ nl80211_policy_mgmt_frame [ chandef_params array[nl80211_policy_chandef_params] NL80211_ATTR_DONT_WAIT_FOR_ACK nlattr[NL80211_ATTR_DONT_WAIT_FOR_ACK, void] - NL80211_ATTR_FRAME nlattr[NL80211_ATTR_FRAME, ieee80211_frame] + NL80211_ATTR_FRAME nlattr[NL80211_ATTR_FRAME, ieee80211_mgmt_frame] NL80211_ATTR_DURATION nlattr[NL80211_ATTR_DURATION, int32[NL80211_MIN_REMAIN_ON_CHANNEL_TIME:5000]] NL80211_ATTR_OFFCHANNEL_TX_OK nlattr[NL80211_ATTR_OFFCHANNEL_TX_OK, void] NL80211_ATTR_TX_NO_CCK_RATE nlattr[NL80211_ATTR_TX_NO_CCK_RATE, void] -- cgit mrf-deployment