036cec531d
Bug: 275651698 Test: Connect to open, WPA2, WPA3 and passpoint network Test: Establish P2P connection Test: Basic SoftAp tests Test: Regression test (b/275948027) BYPASS_INCLUSIVE_LANGUAGE_REASON=Merged from opne source bb945b98f Add 40 and 80 MHz channels 165 and 173 for 5 GHz IBSS/mesh 0059fa5ba 6 GHz: Fix secondary channel setting 744295c8b Add 6 GHz channel validation during channel switching 5349a45d3 Set interface state as inactive if mesh bringup fails a4af79624 Handle signal termination in hostapd_cli for all cases cf8f13ac8 Add support to send 320 MHz bandwidth through vendor subcmd a0403c023 EHT: Validate the puncturing bitmap for ACS af0f60e7d EHT: Calculate puncturing bitmap for ACS f3206fbe9 EHT: Configuration option for ACS puncturing threshold e3621867c EHT: Process puncturing bitmap from channel switch event e277e577c nl80211: Send EHT puncturing bitmap to the driver for switch command 29a882bed EHT: Configure puncturing bitmap during channel switch 4942b19ff EHT: Send puncturing bitmap to the driver for AP bring up f9fc2eabb EHT: Add puncturing bitmap to EHT Operation element 46a5d989d EHT: Downgrade bandwidths for VHT and HE when using puncturing 7618269ec EHT: Validate puncturing bitmap 9102fda31 EHT: Add configuration option for puncturing in AP mode 9e79439fc nl80211: Retrieve driver support for EHT puncturing 507be376c Sync with wireless-next.git include/uapi/linux/nl80211.h 591256a8c FILS: 320 MHz support in FD frame 903e3a1e6 FILS: Fix maximum NSS calculation for FD frame ecae45ff6 FILS: Make HE a requirement for FILS discovery 4e86692ff AP: Fix 6 GHz AP setup after disable-enable a34b8477a ml80211: Put wiphy idx to obtain correct country code 1491fc64a Define QCA vendor per-enum 64-bit pad attributes 55e31699e qca-vendor: Add QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_NF_CAL_VAL b1f85957c Add QCA vendor commands to set and get MLO links state information 44b32a752 mesh: Add EHT support c4cb62ca8 WPA_AUTH: MLO: Add functions to get the AA and SPA cab963e9f AP: Split check_assoc_ies() 7a7a2256c common: Support parsing link specific association request b39e35693 common: Add support for clearing elements 0b2fc4268 common: Split ieee8021_parse_elems() df6561ec0 nl80211: AP MLD support for adding multi link stations b8b4ceb8d nl80211: Properly stop and deinit MLO AP 2f8fc46ed nl80211: Provide link_id in EAPOL_RX and RX_MGMT events 821374d43 nl80211: Introduce and implement a callback to add an MLO link for AP MLD 47269be36 nl80211: Refactor i802_bss to support multiple links eb146ee80 AP: Add some bridge port attribute settings f628e6b30 nl80211: Make sure scan frequency debug buffer is NUL terminated 41d23254b nl80211: Fix frequencies array boundary check for scanned frequencies a9012070a Android: Add wowlan_disconnect_on_deinit to template configuration e2ea0fd70 EST: Write the RSA private key using the standard PRIVATE KEY format bfd236df2 webkit2: Avoid deprecated function call 2c3202682 P2P: Filter out 6 GHz frequencies if not allowed for P2P connection b2bf7e39e Update PMK in wpa_sm when roam+auth event indicated with authorized flag 6b9c86466 nl80211: Replace the channel flags for VHT support 6f63aca7b DPP: Allow both STA and AP configObject to be set 7292e30b7 DPP: Fix @CONF-OBJ-SEP@ parsing for multiple configs c31600ce1 P2P: Allow GO BSSID to be specified for P2P_GROUP_ADD commands 0430756e6 P2P: Optimize join scan frequency b3921db42 nl80211: Add frequency info in start AP command 40c139664 macsec_linux: Add support for MACsec hardware offload 6d24673ab mka: Allow configuration of MACsec hardware offload 3081a9cb6 hostapd: Output country_code and country3 when using STATUS 91ad7a309 FT: Store PTKSA entry for the correct BSSID in the FT protocol case 3f3e356fa Mark addr argument to storing PTKSA const 242c3ad99 FT: Store PTKSA from FT protocol ba6954874 Mark wpa_auth_remove_ptksa() static 3b1ad1334 FT: Include KDK in FT specific PTK derivation on the AP 870a5bdc0 nl80211: Report guard interval and dual carrier modulation edcad193a dbus: Add inactive time to D-Bus signal info a678a510f dbus: Add D-Bus signal for PSK mismatch heuristics 691f729d5 P2P: Make invitation flow less aggressive f4a7e2a07 Rework IBSS/mesh 80 MHz channel selection f91f971bd Fix creating 6 GHz IBSS/mesh on 5/6 GHz-capable PHYs c623cee42 Make arrays static const in ibss_mesh_select_*() 64043e615 Split ibss_mesh_setup_freq() into multiple functions 8085a7e65 wpa_supplicant: Add option to explicitly set 4addr mode 1ffc7d1c6 Apply bias towards 6 GHz in roaming faa410292 WNM: Event report handling for BSS color collision and in-use 97405be96 Small textual improvements to wpa_supplicant man page ec02a0e93 hostapd: Output hw_mode when using STATUS 390e24c6c EAP-TTLS server: Add Ident field to MS-CHAP-Error 4ae798a22 P2P: Pick the best driver pref freq for invitation process 6c75f1dfa Send broadcast Probe Response frames on the 6 GHz band edfcb2f1a MLD STA: Indicate MLO support in NL80211_CMD_CONNECT c91852044 MLD STA: Add support for SAE external authentication offload to userspace 575712450 qca-vendor: Add QCA_WLAN_VENDOR_MCC_QUOTA_TYPE_LOW_LATENCY ba150059d FT: Store PMK-R0/PMK-R1 after EAPOL-Key msg 2/4 MIC validation 56662f36d Refine vendor subcmd QCA_NL80211_VENDOR_SUBCMD_ROAM_STATS 72b8193f4 MACsec: Remove EAP Session-Id length constraint 3915e8834 hostapd: Report error on unknown ACCEPT_ACL/DENY_ACL commands 2cff340d1 utils: Move log2pcap to python3 12de8112b Fix BSS age underflow d31c2b43a Fix segfault in case of an invalid configuration a32b424a3 MLD STA: Use AP MLD address in PMKSA cache attempts for driver-SME case 8c4790cef MLD STA: Store PMKSA with AP MLD address for MLO connection event bf124a03d SAE: Update PT value at later point for SME cases, if needed 1aadcca0a P2P: Enable SAE-H2E for client when joining a 6 GHz group 37f8257c4 SAE: Extend automatic enabling of H2E on 6 GHz to additional cases 89377c6b9 OCV: Fix build without CONFIG_OCV=y 2e47ea22c P2P: Fix handling Service Discovery Response received by GO device dc7e330e0 Set OCV capability based on Association Request frame RSNE 831be6514 WPS: Do not indicate incorrect PBC overlap based on partner link c9fc12425 P2P: Make wpas_p2p_notif_pbc_overlap() static Change-Id: I1eb61fc82b98b937a2ff37a30e60e28129fe143d Merged-In: I1eb61fc82b98b937a2ff37a30e60e28129fe143d
56 lines
1.5 KiB
Python
Executable File
56 lines
1.5 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
#
|
|
# Copyright (c) 2012-2022, Intel Corporation
|
|
#
|
|
# Author: Johannes Berg <johannes@sipsolutions.net>
|
|
#
|
|
# This software may be distributed under the terms of the BSD license.
|
|
# See README for more details.
|
|
|
|
import sys, struct, re
|
|
from binascii import unhexlify
|
|
|
|
def write_pcap_header(pcap_file):
|
|
pcap_file.write(
|
|
struct.pack('<IHHIIII',
|
|
0xa1b2c3d4, 2, 4, 0, 0, 65535,
|
|
105 # raw 802.11 format
|
|
))
|
|
|
|
def pcap_addpacket(pcap_file, ts, data):
|
|
# ts in seconds, float
|
|
pcap_file.write(struct.pack('<IIII',
|
|
int(ts), int(1000000 * ts) % 1000000,
|
|
len(data), len(data)))
|
|
pcap_file.write(data)
|
|
|
|
if __name__ == "__main__":
|
|
try:
|
|
input = sys.argv[1]
|
|
pcap = sys.argv[2]
|
|
except IndexError:
|
|
print("Usage: %s <log file> <pcap file>" % sys.argv[0])
|
|
sys.exit(2)
|
|
|
|
input_file = open(input, 'r')
|
|
pcap_file = open(pcap, 'wb')
|
|
frame_re = re.compile(r'(([0-9]+.[0-9]{6}):\s*)?nl80211: MLME event frame - hexdump\(len=[0-9]*\):((\s*[0-9a-fA-F]{2})*)')
|
|
|
|
write_pcap_header(pcap_file)
|
|
|
|
for line in input_file:
|
|
m = frame_re.match(line)
|
|
if m is None:
|
|
continue
|
|
if m.group(2):
|
|
ts = float(m.group(2))
|
|
else:
|
|
ts = 0
|
|
hexdata = m.group(3)
|
|
hexdata = hexdata.split()
|
|
data = unhexlify("".join(hexdata))
|
|
pcap_addpacket(pcap_file, ts, data)
|
|
|
|
input_file.close()
|
|
pcap_file.close()
|