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>
107 lines
2.8 KiB
Diff
107 lines
2.8 KiB
Diff
--- a/hostapd/ctrl_iface.c
|
|
+++ b/hostapd/ctrl_iface.c
|
|
@@ -68,6 +68,7 @@
|
|
#include "fst/fst_ctrl_iface.h"
|
|
#include "config_file.h"
|
|
#include "ctrl_iface.h"
|
|
+#include "config_file.h"
|
|
|
|
|
|
#define HOSTAPD_CLI_DUP_VALUE_MAX_LEN 256
|
|
@@ -83,6 +84,7 @@ static void hostapd_ctrl_iface_send(stru
|
|
enum wpa_msg_type type,
|
|
const char *buf, size_t len);
|
|
|
|
+static char *reload_opts = NULL;
|
|
|
|
static int hostapd_ctrl_iface_attach(struct hostapd_data *hapd,
|
|
struct sockaddr_storage *from,
|
|
@@ -134,6 +136,61 @@ static int hostapd_ctrl_iface_new_sta(st
|
|
return 0;
|
|
}
|
|
|
|
+static char *get_option(char *opt, char *str)
|
|
+{
|
|
+ int len = strlen(str);
|
|
+
|
|
+ if (!strncmp(opt, str, len))
|
|
+ return opt + len;
|
|
+ else
|
|
+ return NULL;
|
|
+}
|
|
+
|
|
+static struct hostapd_config *hostapd_ctrl_iface_config_read(const char *fname)
|
|
+{
|
|
+ struct hostapd_config *conf;
|
|
+ char *opt, *val;
|
|
+
|
|
+ conf = hostapd_config_read(fname);
|
|
+ if (!conf)
|
|
+ return NULL;
|
|
+
|
|
+ for (opt = strtok(reload_opts, " ");
|
|
+ opt;
|
|
+ opt = strtok(NULL, " ")) {
|
|
+
|
|
+ if ((val = get_option(opt, "channel=")))
|
|
+ conf->channel = atoi(val);
|
|
+ else if ((val = get_option(opt, "ht_capab=")))
|
|
+ conf->ht_capab = atoi(val);
|
|
+ else if ((val = get_option(opt, "ht_capab_mask=")))
|
|
+ conf->ht_capab &= atoi(val);
|
|
+ else if ((val = get_option(opt, "sec_chan=")))
|
|
+ conf->secondary_channel = atoi(val);
|
|
+ else if ((val = get_option(opt, "hw_mode=")))
|
|
+ conf->hw_mode = atoi(val);
|
|
+ else if ((val = get_option(opt, "ieee80211n=")))
|
|
+ conf->ieee80211n = atoi(val);
|
|
+ else
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return conf;
|
|
+}
|
|
+
|
|
+static int hostapd_ctrl_iface_update(struct hostapd_data *hapd, char *txt)
|
|
+{
|
|
+ struct hostapd_config * (*config_read_cb)(const char *config_fname);
|
|
+ struct hostapd_iface *iface = hapd->iface;
|
|
+
|
|
+ config_read_cb = iface->interfaces->config_read_cb;
|
|
+ iface->interfaces->config_read_cb = hostapd_ctrl_iface_config_read;
|
|
+ reload_opts = txt;
|
|
+
|
|
+ hostapd_reload_config(iface);
|
|
+
|
|
+ iface->interfaces->config_read_cb = config_read_cb;
|
|
+}
|
|
|
|
#ifdef NEED_AP_MLME
|
|
static int hostapd_ctrl_iface_sa_query(struct hostapd_data *hapd,
|
|
@@ -3529,6 +3586,8 @@ static int hostapd_ctrl_iface_receive_pr
|
|
} else if (os_strncmp(buf, "VENDOR ", 7) == 0) {
|
|
reply_len = hostapd_ctrl_iface_vendor(hapd, buf + 7, reply,
|
|
reply_size);
|
|
+ } else if (os_strncmp(buf, "UPDATE ", 7) == 0) {
|
|
+ hostapd_ctrl_iface_update(hapd, buf + 7);
|
|
} else if (os_strcmp(buf, "ERP_FLUSH") == 0) {
|
|
ieee802_1x_erp_flush(hapd);
|
|
#ifdef RADIUS_SERVER
|
|
--- a/src/ap/ctrl_iface_ap.c
|
|
+++ b/src/ap/ctrl_iface_ap.c
|
|
@@ -1008,7 +1008,13 @@ int hostapd_parse_csa_settings(const cha
|
|
|
|
int hostapd_ctrl_iface_stop_ap(struct hostapd_data *hapd)
|
|
{
|
|
- return hostapd_drv_stop_ap(hapd);
|
|
+ struct hostapd_iface *iface = hapd->iface;
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < iface->num_bss; i++)
|
|
+ hostapd_drv_stop_ap(iface->bss[i]);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
|