mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
304423a4ff
Add patches:
- 170-wpa_supplicant-fix-compiling-without-IEEE8021X_EAPOL.patch
Remove upstreamed:
- 170-DPP-fix-memleak-of-intro.peer_key.patch
- 461-driver_nl80211-use-new-parameters-during-ibss-join.patch
- 800-acs-don-t-select-indoor-channel-on-outdoor-operation.patch
- 992-openssl-include-rsa.patch
Automatically refreshed:
- 011-mesh-use-deterministic-channel-on-channel-switch.patch
- 021-fix-sta-add-after-previous-connection.patch
- 022-hostapd-fix-use-of-uninitialized-stack-variables.patch
- 030-driver_nl80211-rewrite-neigh-code-to-not-depend-on-l.patch
- 040-mesh-allow-processing-authentication-frames-in-block.patch
- 050-build_fix.patch
- 110-mbedtls-TLS-crypto-option-initial-port.patch
- 120-mbedtls-fips186_2_prf.patch
- 140-tests-Makefile-make-run-tests-with-CONFIG_TLS.patch
- 150-add-NULL-checks-encountered-during-tests-hwsim.patch
- 160-dpp_pkex-EC-point-mul-w-value-prime.patch
- 200-multicall.patch
- 300-noscan.patch
- 310-rescan_immediately.patch
- 330-nl80211_fix_set_freq.patch
- 341-mesh-ctrl-iface-channel-switch.patch
- 360-ctrl_iface_reload.patch
- 381-hostapd_cli_UNKNOWN-COMMAND.patch
- 390-wpa_ie_cap_workaround.patch
- 410-limit_debug_messages.patch
- 420-indicate-features.patch
- 430-hostapd_cli_ifdef.patch
- 450-scan_wait.patch
- 460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
- 463-add-mcast_rate-to-11s.patch
- 465-hostapd-config-support-random-BSS-color.patch
- 500-lto-jobserver-support.patch
- 590-rrm-wnm-statistics.patch
- 710-vlan_no_bridge.patch
- 720-iface_max_num_sta.patch
- 730-ft_iface.patch
- 750-qos_map_set_without_interworking.patch
- 751-qos_map_ignore_when_unsupported.patch
- 760-dynamic_own_ip.patch
- 761-shared_das_port.patch
- 990-ctrl-make-WNM_AP-functions-dependant-on-CONFIG_AP.patch
Manually refresh:
- 010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch
- 301-mesh-noscan.patch
- 340-reload_freq_change.patch
- 350-nl80211_del_beacon_bss.patch
- 370-ap_sta_support.patch
- 380-disable_ctrl_iface_mib.patch
- 464-fix-mesh-obss-check.patch
- 470-survey_data_fallback.patch
- 600-ubus_support.patch
- 700-wifi-reload.patch
- 711-wds_bridge_force.patch
- 740-snoop_iface.patch
Tested-by: Packet Please <pktpls@systemli.org> [Fritzbox 4040 (ipq40xx),
EAP225-Outdoor (ath79); 802.11s, WPA3 OWE, and WPA3 PSK]
Tested-by: Andrew Sim <andrewsimz@gmail.com> [mediatek/filogic]
Signed-off-by: Nick Hainke <vincent@systemli.org>
93 lines
2.8 KiB
Diff
93 lines
2.8 KiB
Diff
--- a/src/ap/hostapd.h
|
|
+++ b/src/ap/hostapd.h
|
|
@@ -162,6 +162,21 @@ struct hostapd_sae_commit_queue {
|
|
};
|
|
|
|
/**
|
|
+ * struct hostapd_openwrt_stats - OpenWrt custom STA/AP statistics
|
|
+ */
|
|
+struct hostapd_openwrt_stats {
|
|
+ struct {
|
|
+ u64 neighbor_report_tx;
|
|
+ } rrm;
|
|
+
|
|
+ struct {
|
|
+ u64 bss_transition_query_rx;
|
|
+ u64 bss_transition_request_tx;
|
|
+ u64 bss_transition_response_rx;
|
|
+ } wnm;
|
|
+};
|
|
+
|
|
+/**
|
|
* struct hostapd_data - hostapd per-BSS data structure
|
|
*/
|
|
struct hostapd_data {
|
|
@@ -175,6 +190,9 @@ struct hostapd_data {
|
|
|
|
u8 own_addr[ETH_ALEN];
|
|
|
|
+ /* OpenWrt specific statistics */
|
|
+ struct hostapd_openwrt_stats openwrt_stats;
|
|
+
|
|
int num_sta; /* number of entries in sta_list */
|
|
struct sta_info *sta_list; /* STA info list head */
|
|
#define STA_HASH_SIZE 256
|
|
--- a/src/ap/wnm_ap.c
|
|
+++ b/src/ap/wnm_ap.c
|
|
@@ -386,6 +386,7 @@ static int ieee802_11_send_bss_trans_mgm
|
|
mgmt->u.action.u.bss_tm_req.validity_interval = 1;
|
|
pos = mgmt->u.action.u.bss_tm_req.variable;
|
|
|
|
+ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
|
|
wpa_printf(MSG_DEBUG, "WNM: Send BSS Transition Management Request to "
|
|
MACSTR " dialog_token=%u req_mode=0x%x disassoc_timer=%u "
|
|
"validity_interval=%u",
|
|
@@ -790,10 +791,12 @@ int ieee802_11_rx_wnm_action_ap(struct h
|
|
plen);
|
|
return 0;
|
|
case WNM_BSS_TRANS_MGMT_QUERY:
|
|
+ hapd->openwrt_stats.wnm.bss_transition_query_rx++;
|
|
ieee802_11_rx_bss_trans_mgmt_query(hapd, mgmt->sa, payload,
|
|
plen);
|
|
return 0;
|
|
case WNM_BSS_TRANS_MGMT_RESP:
|
|
+ hapd->openwrt_stats.wnm.bss_transition_response_rx++;
|
|
ieee802_11_rx_bss_trans_mgmt_resp(hapd, mgmt->sa, payload,
|
|
plen);
|
|
return 0;
|
|
@@ -840,6 +843,7 @@ int wnm_send_disassoc_imminent(struct ho
|
|
|
|
pos = mgmt->u.action.u.bss_tm_req.variable;
|
|
|
|
+ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
|
|
wpa_printf(MSG_DEBUG, "WNM: Send BSS Transition Management Request frame to indicate imminent disassociation (disassoc_timer=%d) to "
|
|
MACSTR, disassoc_timer, MAC2STR(sta->addr));
|
|
if (hostapd_drv_send_mlme(hapd, buf, pos - buf, 0, NULL, 0, 0) < 0) {
|
|
@@ -921,6 +925,7 @@ int wnm_send_ess_disassoc_imminent(struc
|
|
return -1;
|
|
}
|
|
|
|
+ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
|
|
if (disassoc_timer) {
|
|
/* send disassociation frame after time-out */
|
|
set_disassoc_timer(hapd, sta, disassoc_timer);
|
|
@@ -1001,6 +1006,7 @@ int wnm_send_bss_tm_req(struct hostapd_d
|
|
}
|
|
os_free(buf);
|
|
|
|
+ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
|
|
if (disassoc_timer) {
|
|
/* send disassociation frame after time-out */
|
|
set_disassoc_timer(hapd, sta, disassoc_timer);
|
|
--- a/src/ap/rrm.c
|
|
+++ b/src/ap/rrm.c
|
|
@@ -269,6 +269,8 @@ static void hostapd_send_nei_report_resp
|
|
}
|
|
}
|
|
|
|
+ hapd->openwrt_stats.rrm.neighbor_report_tx++;
|
|
+
|
|
hostapd_drv_send_action(hapd, hapd->iface->freq, 0, addr,
|
|
wpabuf_head(buf), wpabuf_len(buf));
|
|
wpabuf_free(buf);
|