eba3b028e4
The following patches were merged upstream: 000-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch replaced by commit 0e3bd7ac6 001-Prevent-reinstallation-of-an-already-in-use-group-ke.patch replaced by commit cb5132bb3 002-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch replaced by commit 87e2db16b 003-Prevent-installation-of-an-all-zero-TK.patch replaced by commit 53bb18cc8 004-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch replaced by commit 0adc9b28b 005-TDLS-Reject-TPK-TK-reconfiguration.patch replaced by commit ff89af96e 006-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch replaced by commit adae51f8b 007-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch replaced by commit 2a9c5217b 008-WPA-Extra-defense-against-PTK-reinstalls-in-4-way-ha.patch replaced by commit a00e946c1 009-Clear-PMK-length-and-check-for-this-when-deriving-PT.patch replaced by commit b488a1294 010-Optional-AP-side-workaround-for-key-reinstallation-a.patch replaced by commit 6f234c1e2 011-Additional-consistentcy-checks-for-PTK-component-len.patch replaced by commit a6ea66530 012-Clear-BSSID-information-in-supplicant-state-machine-.patch replaced by commit c0fe5f125 013-WNM-Ignore-WNM-Sleep-Mode-Request-in-wnm_sleep_mode-.patch replaced by commit 114f2830d Some patches had to be modified to work with changed upstream source: 380-disable_ctrl_iface_mib.patch (adding more ifdef'ery) plus some minor knits needed for other patches to apply which are not worth being explicitely listed here. For SAE key management in mesh mode, use the newly introduce sae_password parameter instead of the psk parameter to also support SAE keys which would fail the checks applied on the psk field (ie. length and such). This fixes compatibility issues for users migrating from authsae. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
106 lines
2.8 KiB
Diff
106 lines
2.8 KiB
Diff
--- a/hostapd/ctrl_iface.c
|
|
+++ b/hostapd/ctrl_iface.c
|
|
@@ -60,6 +60,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
|
|
@@ -78,6 +79,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,
|
|
@@ -129,6 +131,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 CONFIG_IEEE80211W
|
|
#ifdef NEED_AP_MLME
|
|
@@ -3026,6 +3083,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
|
|
@@ -857,7 +857,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;
|
|
}
|
|
|
|
|