include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd
-PKG_RELEASE:=5
+PKG_RELEASE:=1
PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2016-12-19
-PKG_SOURCE_VERSION:=ad02e79d12fd70ed6bd5fbaf64001a2851e5bb7b
-PKG_MIRROR_HASH:=7a0983f004b156d46911765c113754a4c00f56fb889430620bbd061b3b1fcf33
+PKG_SOURCE_DATE:=2017-08-24
+PKG_SOURCE_VERSION:=c2d4f2eb5dba0b5c5a8c5805823084da958a9b52
+PKG_MIRROR_HASH:=c6ad9a73fc1ae0ba8bc48f71cf14394b274bc9c2c1d1b53c2775f08312597e74
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-3-Clause
+++ /dev/null
-From: Jouni Malinen <jouni@qca.qualcomm.com>
-Date: Tue, 20 Dec 2016 01:30:09 +0200
-Subject: [PATCH] Fix race condition between AssocResp callback and 4addr event
-
-It is apparently possible for the NL80211_CMD_UNEXPECTED_4ADDR_FRAME
-event to be delivered to hostapd before the NL80211_CMD_FRAME_TX_STATUS
-event for (Re)Association Response frame. This resulted in the 4-address
-WDS mode not getting enabled for a STA. This could occur in particular
-when operating under heavy load and the STA is reconnecting to the same
-AP in a sequence where Deauthentication frame is followed immediately by
-Authentication frame and the driver event processing gets delayed due to
-removal of the previous netdev taking time in the middle of this
-sequence.
-
-Fix this by recording a pending item for 4-address WDS enabling if the
-NL80211_CMD_UNEXPECTED_4ADDR_FRAME event would have been dropped due to
-incompleted association and then process this pending item if the TX
-status for the (Re)Association Response frame is received and it shows
-that the frame was acknowledged.
-
-Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
----
-
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -2634,6 +2634,8 @@ static void handle_assoc(struct hostapd_
- taxonomy_sta_info_assoc_req(hapd, sta, pos, left);
- #endif /* CONFIG_TAXONOMY */
-
-+ sta->pending_wds_enable = 0;
-+
- fail:
- /*
- * In case of a successful response, add the station to the driver.
-@@ -3248,6 +3250,14 @@ static void handle_assoc_cb(struct hosta
-
- hostapd_set_sta_flags(hapd, sta);
-
-+ if (!(sta->flags & WLAN_STA_WDS) && sta->pending_wds_enable) {
-+ wpa_printf(MSG_DEBUG, "Enable 4-address WDS mode for STA "
-+ MACSTR " based on pending request",
-+ MAC2STR(sta->addr));
-+ sta->pending_wds_enable = 0;
-+ sta->flags |= WLAN_STA_WDS;
-+ }
-+
- if (sta->flags & WLAN_STA_WDS) {
- int ret;
- char ifname_wds[IFNAMSIZ + 1];
-@@ -3512,10 +3522,22 @@ void ieee802_11_rx_from_unknown(struct h
- struct sta_info *sta;
-
- sta = ap_get_sta(hapd, src);
-- if (sta && (sta->flags & WLAN_STA_ASSOC)) {
-+ if (sta &&
-+ ((sta->flags & WLAN_STA_ASSOC) ||
-+ ((sta->flags & WLAN_STA_ASSOC_REQ_OK) && wds))) {
- if (!hapd->conf->wds_sta)
- return;
-
-+ if ((sta->flags & (WLAN_STA_ASSOC | WLAN_STA_ASSOC_REQ_OK)) ==
-+ WLAN_STA_ASSOC_REQ_OK) {
-+ wpa_printf(MSG_DEBUG,
-+ "Postpone 4-address WDS mode enabling for STA "
-+ MACSTR " since TX status for AssocResp is not yet known",
-+ MAC2STR(sta->addr));
-+ sta->pending_wds_enable = 1;
-+ return;
-+ }
-+
- if (wds && !(sta->flags & WLAN_STA_WDS)) {
- int ret;
- char ifname_wds[IFNAMSIZ + 1];
---- a/src/ap/sta_info.h
-+++ b/src/ap/sta_info.h
-@@ -115,6 +115,7 @@ struct sta_info {
- unsigned int radius_das_match:1;
- unsigned int ecsa_supported:1;
- unsigned int added_unassoc:1;
-+ unsigned int pending_wds_enable:1;
-
- u16 auth_alg;
-
+++ /dev/null
-From: Jouni Malinen <jouni@qca.qualcomm.com>
-Date: Sat, 14 Jan 2017 01:04:31 +0200
-Subject: [PATCH] Fix duplicate Reassociation Request frame dropping
-
-Relational operators (==) have higher precedence than the ternary
-conditional in C. The last_subtype check for association/reassociation
-was broken due to incorrect assumption about the precedence. Fix this by
-adding parenthesis around the ternary conditional.
-
-The previous implementation worked for Association Request frames by
-accident since WLAN_FC_STYPE_ASSOC_REQ happens to have value 0 and when
-the last receive frame was an Association Request frame, the
-sta->last_subtype == reassoc check was true and non-zero
-WLAN_FC_STYPE_REASSOC_REQ was interpreted as true. However, this was
-broken for Reassociation Request frame. reassoc == 1 in that case could
-have matched received Association Response frame (subtype == 1), but
-those are not received in AP mode and as such, this did not break other
-behavior apart from not being able to drop duplicated Reassociation
-Request frames.
-
-Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
----
-
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -2485,8 +2485,8 @@ static void handle_assoc(struct hostapd_
- if ((fc & WLAN_FC_RETRY) &&
- sta->last_seq_ctrl != WLAN_INVALID_MGMT_SEQ &&
- sta->last_seq_ctrl == seq_ctrl &&
-- sta->last_subtype == reassoc ? WLAN_FC_STYPE_REASSOC_REQ :
-- WLAN_FC_STYPE_ASSOC_REQ) {
-+ sta->last_subtype == (reassoc ? WLAN_FC_STYPE_REASSOC_REQ :
-+ WLAN_FC_STYPE_ASSOC_REQ)) {
- hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
- HOSTAPD_LEVEL_DEBUG,
- "Drop repeated association frame seq_ctrl=0x%x",
+++ /dev/null
-From: Jouni Malinen <j@w1.fi>
-Date: Sat, 14 Jan 2017 13:56:18 +0200
-Subject: [PATCH] RSN IBSS: Fix TK clearing on Authentication frame RX
-
-When wpa_supplicant was processing a received Authentication frame (seq
-1) from a peer STA for which there was already a TK configured to the
-driver, debug log claimed that the PTK gets cleared, but the actual
-call to clear the key was actually dropped due to AUTH vs. SUPP set_key
-selection. Fix this by explicitly clearing the TK in case it was set
-and an Authentication frame (seq 1) is received.
-
-This fixes some cases where EAPOL-Key frames were sent encrypted using
-the old key when a peer STA restarted itself and lost the key and had to
-re-join the IBSS. Previously, that state required timing out the 4-way
-handshake and Deauthentication frame exchange to recover.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
-
---- a/wpa_supplicant/ibss_rsn.c
-+++ b/wpa_supplicant/ibss_rsn.c
-@@ -838,6 +838,18 @@ static void ibss_rsn_handle_auth_1_of_2(
- MAC2STR(addr));
-
- if (peer &&
-+ peer->authentication_status & (IBSS_RSN_SET_PTK_SUPP |
-+ IBSS_RSN_SET_PTK_AUTH)) {
-+ /* Clear the TK for this pair to allow recovery from the case
-+ * where the peer STA has restarted and lost its key while we
-+ * still have a pairwise key configured. */
-+ wpa_printf(MSG_DEBUG, "RSN: Clear pairwise key for peer "
-+ MACSTR, MAC2STR(addr));
-+ wpa_drv_set_key(ibss_rsn->wpa_s, WPA_ALG_NONE, addr, 0, 0,
-+ NULL, 0, NULL, 0);
-+ }
-+
-+ if (peer &&
- peer->authentication_status & IBSS_RSN_AUTH_EAPOL_BY_PEER) {
- if (peer->own_auth_tx.sec) {
- struct os_reltime now, diff;
+++ /dev/null
-From cc3dae85bd694506cdea66ae532d452fb8716297 Mon Sep 17 00:00:00 2001
-From: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
-Date: Mon, 23 Jan 2017 13:55:04 +0100
-Subject: [PATCH] hostapd: Add possibility to send debug messages to syslog
-
-We can only send module specific messages to syslog and not debug
-messages printed with wpa_printf. Add an extra command line parameter
-'-s' to allow it. The feature is enabled with compile flag
-CONFIG_DEBUG_SYSLOG as for wpa_supplicant and behaves in the same manner
-as the wpa_supplicant -s command line argument.
-
-Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
----
- hostapd/Android.mk | 4 ++++
- hostapd/Makefile | 4 ++++
- hostapd/defconfig | 3 +++
- hostapd/main.c | 19 ++++++++++++++++++-
- src/utils/wpa_debug.c | 2 +-
- src/utils/wpa_debug.h | 3 +++
- 6 files changed, 33 insertions(+), 2 deletions(-)
-
---- a/hostapd/Android.mk
-+++ b/hostapd/Android.mk
-@@ -952,6 +952,10 @@ ifdef CONFIG_NO_STDOUT_DEBUG
- L_CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
- endif
-
-+ifdef CONFIG_DEBUG_SYSLOG
-+L_CFLAGS += -DCONFIG_DEBUG_SYSLOG
-+endif
-+
- ifdef CONFIG_DEBUG_LINUX_TRACING
- L_CFLAGS += -DCONFIG_DEBUG_LINUX_TRACING
- endif
---- a/hostapd/Makefile
-+++ b/hostapd/Makefile
-@@ -997,6 +997,10 @@ ifdef CONFIG_NO_STDOUT_DEBUG
- CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
- endif
-
-+ifdef CONFIG_DEBUG_SYSLOG
-+CFLAGS += -DCONFIG_DEBUG_SYSLOG
-+endif
-+
- ifdef CONFIG_DEBUG_LINUX_TRACING
- CFLAGS += -DCONFIG_DEBUG_LINUX_TRACING
- endif
---- a/hostapd/defconfig
-+++ b/hostapd/defconfig
-@@ -166,6 +166,9 @@ CONFIG_IPV6=y
- # Disabled by default.
- #CONFIG_DEBUG_FILE=y
-
-+# Send debug messages to syslog instead of stdout
-+#CONFIG_DEBUG_SYSLOG=y
-+
- # Add support for sending all debug messages (regardless of debug verbosity)
- # to the Linux kernel tracing facility. This helps debug the entire stack by
- # making it easy to record everything happening from the driver up into the
---- a/hostapd/main.c
-+++ b/hostapd/main.c
-@@ -108,6 +108,10 @@ static void hostapd_logger_cb(void *ctx,
- module_str ? module_str : "",
- module_str ? ": " : "", txt);
-
-+#ifdef CONFIG_DEBUG_SYSLOG
-+ if (wpa_debug_syslog)
-+ conf_stdout = 0;
-+#endif /* CONFIG_DEBUG_SYSLOG */
- if ((conf_stdout & module) && level >= conf_stdout_level) {
- wpa_debug_print_timestamp();
- wpa_printf(MSG_INFO, "%s", format);
-@@ -484,6 +488,9 @@ static void usage(void)
- " (records all messages regardless of debug verbosity)\n"
- #endif /* CONFIG_DEBUG_LINUX_TRACING */
- " -i list of interface names to use\n"
-+#ifdef CONFIG_DEBUG_SYSLOG
-+ " -s log output to syslog instead of stdout\n"
-+#endif /* CONFIG_DEBUG_SYSLOG */
- " -S start all the interfaces synchronously\n"
- " -t include timestamps in some debug messages\n"
- " -v show hostapd version\n");
-@@ -661,7 +668,7 @@ int main(int argc, char *argv[])
- dl_list_init(&interfaces.global_ctrl_dst);
-
- for (;;) {
-- c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:");
-+ c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:vg:G:");
- if (c < 0)
- break;
- switch (c) {
-@@ -718,6 +725,11 @@ int main(int argc, char *argv[])
- bss_config = tmp_bss;
- bss_config[num_bss_configs++] = optarg;
- break;
-+#ifdef CONFIG_DEBUG_SYSLOG
-+ case 's':
-+ wpa_debug_syslog = 1;
-+ break;
-+#endif /* CONFIG_DEBUG_SYSLOG */
- case 'S':
- start_ifaces_in_sync = 1;
- break;
-@@ -746,6 +758,10 @@ int main(int argc, char *argv[])
- wpa_debug_open_file(log_file);
- else
- wpa_debug_setup_stdout();
-+#ifdef CONFIG_DEBUG_SYSLOG
-+ if (wpa_debug_syslog)
-+ wpa_debug_open_syslog();
-+#endif /* CONFIG_DEBUG_SYSLOG */
- #ifdef CONFIG_DEBUG_LINUX_TRACING
- if (enable_trace_dbg) {
- int tret = wpa_debug_open_linux_tracing();
-@@ -882,6 +898,7 @@ int main(int argc, char *argv[])
- hostapd_global_deinit(pid_file, interfaces.eloop_initialized);
- os_free(pid_file);
-
-+ wpa_debug_close_syslog();
- if (log_file)
- wpa_debug_close_file();
- wpa_debug_close_linux_tracing();
---- a/src/utils/wpa_debug.c
-+++ b/src/utils/wpa_debug.c
-@@ -13,7 +13,7 @@
- #ifdef CONFIG_DEBUG_SYSLOG
- #include <syslog.h>
-
--static int wpa_debug_syslog = 0;
-+int wpa_debug_syslog = 0;
- #endif /* CONFIG_DEBUG_SYSLOG */
-
- #ifdef CONFIG_DEBUG_LINUX_TRACING
---- a/src/utils/wpa_debug.h
-+++ b/src/utils/wpa_debug.h
-@@ -14,6 +14,9 @@
- extern int wpa_debug_level;
- extern int wpa_debug_show_keys;
- extern int wpa_debug_timestamp;
-+#ifdef CONFIG_DEBUG_SYSLOG
-+extern int wpa_debug_syslog;
-+#endif /* CONFIG_DEBUG_SYSLOG */
-
- /* Debugging function - conditional printf and hex dump. Driver wrappers can
- * use these for debugging purposes. */
#ifdef ANDROID
#include <sys/capability.h>
-@@ -179,59 +180,46 @@ int os_gmtime(os_time_t t, struct os_tm
+@@ -182,59 +183,46 @@ int os_gmtime(os_time_t t, struct os_tm
return 0;
}
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -259,9 +259,10 @@ void wpa_supplicant_cancel_auth_timeout(
+@@ -265,9 +265,10 @@ void wpa_supplicant_cancel_auth_timeout(
*/
void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s)
{
--- a/src/l2_packet/l2_packet_linux.c
+++ b/src/l2_packet/l2_packet_linux.c
-@@ -337,8 +337,7 @@ struct l2_packet_data * l2_packet_init_b
+@@ -340,8 +340,7 @@ struct l2_packet_data * l2_packet_init_b
l2 = l2_packet_init(br_ifname, own_addr, protocol, rx_callback,
rx_callback_ctx, l2_hdr);
OBJS += ../src/ap/vlan_init.o
OBJS += ../src/ap/vlan_ifconfig.o
OBJS += ../src/ap/vlan.o
-@@ -330,10 +332,14 @@ CFLAGS += -DCONFIG_MBO
+@@ -354,10 +356,14 @@ CFLAGS += -DCONFIG_MBO
OBJS += ../src/ap/mbo_ap.o
endif
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
-@@ -1077,6 +1083,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
+@@ -1204,6 +1210,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
BCHECK=../src/drivers/build.hostapd
hostapd: $(BCHECK) $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
-@@ -1118,6 +1130,12 @@ HOBJS += ../src/crypto/aes-internal.o
- HOBJS += ../src/crypto/aes-internal-enc.o
+@@ -1248,6 +1260,12 @@ ifeq ($(CONFIG_TLS), linux)
+ HOBJS += ../src/crypto/crypto_linux.o
endif
+dump_cflags:
ifndef CONFIG_NO_GITVER
# Add VERSION_STR postfix for builds from a git repository
-@@ -329,7 +330,9 @@ endif
+@@ -357,7 +358,9 @@ endif
ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN
OBJS += ibss_rsn.o
endif
-@@ -820,6 +823,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
+@@ -861,6 +864,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
+ endif
endif
- ifdef CONFIG_MACSEC
-@@ -840,9 +847,11 @@ NEED_EAP_COMMON=y
+ ifdef CONFIG_AP
+@@ -868,9 +875,11 @@ NEED_EAP_COMMON=y
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP
OBJS += ap.o
OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o
-@@ -910,6 +919,12 @@ endif
+@@ -952,6 +961,12 @@ endif
ifdef CONFIG_HS20
OBJS += ../src/ap/hs20.o
endif
endif
ifdef CONFIG_MBO
-@@ -918,7 +933,9 @@ CFLAGS += -DCONFIG_MBO
+@@ -960,7 +975,9 @@ CFLAGS += -DCONFIG_MBO
endif
ifdef NEED_RSN_AUTHENTICATOR
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
-@@ -1706,6 +1723,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
+@@ -1835,6 +1852,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@
-@@ -1808,6 +1831,12 @@ endif
+@@ -1937,6 +1960,12 @@ endif
-e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
@$(E) " sed" $<
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -4968,8 +4968,8 @@ union wpa_event_data {
+@@ -5317,8 +5317,8 @@ union wpa_event_data {
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
-@@ -4981,7 +4981,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -5330,7 +5330,7 @@ void wpa_supplicant_event(void *ctx, enu
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
-@@ -1163,8 +1163,8 @@ static void hostapd_event_dfs_cac_starte
+@@ -1375,8 +1375,8 @@ static void hostapd_event_dfs_cac_starte
#endif /* NEED_AP_MLME */
{
struct hostapd_data *hapd = ctx;
#ifndef CONFIG_NO_STDOUT_DEBUG
-@@ -1373,7 +1373,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -1590,7 +1590,7 @@ void wpa_supplicant_event(void *ctx, enu
}
os_memset(&global, 0, sizeof(global));
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
-@@ -3610,8 +3610,8 @@ static void wpa_supplicant_event_assoc_a
+@@ -3709,8 +3709,8 @@ static void wpa_supplicant_event_assoc_a
}
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
-@@ -4315,7 +4315,7 @@ void wpa_supplicant_event(void *ctx, enu
- #endif /* CONFIG_AP */
- break;
- case EVENT_ACS_CHANNEL_SELECTED:
--#ifdef CONFIG_ACS
-+#if defined(CONFIG_ACS) && defined(CONFIG_AP)
- if (!wpa_s->ap_iface)
- break;
- hostapd_acs_channel_selected(wpa_s->ap_iface->bss[0],
-@@ -4337,7 +4337,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -4466,7 +4466,7 @@ void wpa_supplicant_event(void *ctx, enu
}
struct wpa_supplicant *wpa_s;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -5136,7 +5136,6 @@ struct wpa_interface * wpa_supplicant_ma
+@@ -5457,7 +5457,6 @@ struct wpa_interface * wpa_supplicant_ma
return NULL;
}
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
-@@ -5173,6 +5172,11 @@ static int wpa_supplicant_match_existing
+@@ -5494,6 +5493,11 @@ static int wpa_supplicant_match_existing
#endif /* CONFIG_MATCH_IFACE */
/**
* wpa_supplicant_add_iface - Add a new network interface
-@@ -5428,6 +5432,8 @@ struct wpa_global * wpa_supplicant_init(
+@@ -5750,6 +5754,8 @@ struct wpa_global * wpa_supplicant_init(
#ifndef CONFIG_NO_WPA_MSG
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */
#ifdef CONFIG_WPS
static int gen_uuid(const char *txt_addr)
-@@ -667,6 +672,8 @@ int main(int argc, char *argv[])
- interfaces.global_ctrl_sock = -1;
- dl_list_init(&interfaces.global_ctrl_dst);
+@@ -670,6 +675,8 @@ int main(int argc, char *argv[])
+ dl_list_init(&interfaces.eth_p_oui);
+ #endif /* CONFIG_ETH_P_OUI */
+ wpa_supplicant_event = hostapd_wpa_event;
+ wpa_supplicant_event_global = hostapd_wpa_event_global;
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
-@@ -2953,6 +2953,10 @@ static int hostapd_config_fill(struct ho
+@@ -3014,6 +3014,10 @@ static int hostapd_config_fill(struct ho
}
#endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_IEEE80211N
} else if (os_strcmp(buf, "ht_capab") == 0) {
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
-@@ -681,6 +681,8 @@ struct hostapd_config {
+@@ -734,6 +734,8 @@ struct hostapd_config {
int ht_op_mode_fixed;
u16 ht_capab;
int no_pri_sec_switch;
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
-@@ -474,7 +474,8 @@ static int ieee80211n_check_40mhz(struct
+@@ -480,7 +480,8 @@ static int ieee80211n_check_40mhz(struct
int ret;
/* Check that HT40 is used and PRI / SEC switch is allowed */
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -3696,7 +3696,7 @@ wpa_supplicant_alloc(struct wpa_supplica
+@@ -3927,7 +3927,7 @@ wpa_supplicant_alloc(struct wpa_supplica
if (wpa_s == NULL)
return NULL;
wpa_s->scan_req = INITIAL_SCAN_REQ;
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
-@@ -4104,7 +4104,7 @@ static int nl80211_set_channel(struct i8
+@@ -4152,7 +4152,7 @@ static int nl80211_set_channel(struct i8
freq->freq, freq->ht_enabled, freq->vht_enabled,
freq->bandwidth, freq->center_freq1, freq->center_freq2);
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
-@@ -80,6 +80,25 @@ static void hostapd_reload_bss(struct ho
+@@ -87,6 +87,25 @@ static void hostapd_reload_bss(struct ho
#endif /* CONFIG_NO_RADIUS */
ssid = &hapd->conf->ssid;
if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
/*
-@@ -158,6 +177,7 @@ int hostapd_reload_config(struct hostapd
+@@ -165,6 +184,7 @@ int hostapd_reload_config(struct hostapd
struct hostapd_data *hapd = iface->bss[0];
struct hostapd_config *newconf, *oldconf;
size_t j;
if (iface->config_fname == NULL) {
/* Only in-memory config in use - assume it has been updated */
-@@ -179,21 +199,20 @@ int hostapd_reload_config(struct hostapd
+@@ -186,21 +206,20 @@ int hostapd_reload_config(struct hostapd
oldconf = hapd->iconf;
iface->conf = newconf;
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
-@@ -2490,13 +2490,18 @@ wpa_driver_nl80211_finish_drv_init(struc
- }
-
-
--static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
-+static int wpa_driver_nl80211_del_beacon(struct i802_bss *bss)
- {
-+ struct wpa_driver_nl80211_data *drv = bss->drv;
+@@ -2536,10 +2536,15 @@ static int wpa_driver_nl80211_del_beacon
struct nl_msg *msg;
+ struct wpa_driver_nl80211_data *drv = bss->drv;
+ if (!bss->beacon_set)
+ return 0;
+
+ bss->beacon_set = 0;
++
wpa_printf(MSG_DEBUG, "nl80211: Remove beacon (ifindex=%d)",
- drv->ifindex);
-- msg = nl80211_drv_msg(drv, 0, NL80211_CMD_DEL_BEACON);
+ bss->ifindex);
+ nl80211_put_wiphy_data_ap(bss);
+- msg = nl80211_drv_msg(drv, 0, NL80211_CMD_DEL_BEACON);
+ msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_BEACON);
return send_and_recv_msgs(drv, msg, NULL, NULL);
}
-@@ -2548,7 +2553,7 @@ static void wpa_driver_nl80211_deinit(st
- nl80211_remove_monitor_interface(drv);
-
- if (is_ap_interface(drv->nlmode))
-- wpa_driver_nl80211_del_beacon(drv);
-+ wpa_driver_nl80211_del_beacon(bss);
-
- if (drv->eapol_sock >= 0) {
- eloop_unregister_read_sock(drv->eapol_sock);
-@@ -4703,8 +4708,7 @@ static void nl80211_teardown_ap(struct i
- nl80211_remove_monitor_interface(drv);
- else
+@@ -4753,7 +4758,7 @@ static void nl80211_teardown_ap(struct i
nl80211_mgmt_unsubscribe(bss, "AP teardown");
--
+
+ nl80211_put_wiphy_data_ap(bss);
- bss->beacon_set = 0;
+ wpa_driver_nl80211_del_beacon(bss);
}
-@@ -6728,8 +6732,6 @@ static int wpa_driver_nl80211_if_remove(
+@@ -6853,8 +6858,6 @@ static int wpa_driver_nl80211_if_remove(
} else {
wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
nl80211_teardown_ap(bss);
- if (!bss->added_if && !drv->first_bss->next)
-- wpa_driver_nl80211_del_beacon(drv);
+- wpa_driver_nl80211_del_beacon(bss);
nl80211_destroy_bss(bss);
if (!bss->added_if)
i802_set_iface_flags(bss, 0);
-@@ -7091,8 +7093,7 @@ static int wpa_driver_nl80211_deinit_ap(
- struct wpa_driver_nl80211_data *drv = bss->drv;
+@@ -7225,7 +7228,6 @@ static int wpa_driver_nl80211_deinit_ap(
if (!is_ap_interface(drv->nlmode))
return -1;
-- wpa_driver_nl80211_del_beacon(drv);
+ wpa_driver_nl80211_del_beacon(bss);
- bss->beacon_set = 0;
-+ wpa_driver_nl80211_del_beacon(bss);
/*
* If the P2P GO interface was dynamically added, then it is
-@@ -7111,8 +7112,7 @@ static int wpa_driver_nl80211_stop_ap(vo
- struct wpa_driver_nl80211_data *drv = bss->drv;
+@@ -7245,7 +7247,6 @@ static int wpa_driver_nl80211_stop_ap(vo
if (!is_ap_interface(drv->nlmode))
return -1;
-- wpa_driver_nl80211_del_beacon(drv);
+ wpa_driver_nl80211_del_beacon(bss);
- bss->beacon_set = 0;
-+ wpa_driver_nl80211_del_beacon(bss);
return 0;
}
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
-@@ -55,6 +55,7 @@
+@@ -56,6 +56,7 @@
#include "fst/fst_ctrl_iface.h"
#include "config_file.h"
#include "ctrl_iface.h"
#define HOSTAPD_CLI_DUP_VALUE_MAX_LEN 256
-@@ -73,6 +74,7 @@ static void hostapd_ctrl_iface_send(stru
+@@ -74,6 +75,7 @@ static void hostapd_ctrl_iface_send(stru
enum wpa_msg_type type,
const char *buf, size_t len);
static int hostapd_ctrl_iface_attach(struct hostapd_data *hapd,
struct sockaddr_storage *from,
-@@ -124,6 +126,61 @@ static int hostapd_ctrl_iface_new_sta(st
+@@ -125,6 +127,61 @@ static int hostapd_ctrl_iface_new_sta(st
return 0;
}
#ifdef CONFIG_IEEE80211W
#ifdef NEED_AP_MLME
-@@ -2620,6 +2677,8 @@ static int hostapd_ctrl_iface_receive_pr
+@@ -2607,6 +2664,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);
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
-@@ -100,6 +100,11 @@ struct wpa_interface {
+@@ -101,6 +101,11 @@ struct wpa_interface {
const char *ifname;
/**
* bridge_ifname - Optional bridge interface name
*
* If the driver interface (ifname) is included in a Linux bridge
-@@ -484,6 +489,8 @@ struct wpa_supplicant {
+@@ -512,6 +517,8 @@ struct wpa_supplicant {
#endif /* CONFIG_CTRL_IFACE_BINDER */
char bridge_ifname[16];
-include .config
-include $(if $(MULTICALL),../hostapd/.config)
-@@ -115,6 +119,8 @@ OBJS_c += ../src/utils/common.o
+@@ -117,6 +121,8 @@ OBJS_c += ../src/utils/common.o
OBJS_c += ../src/common/cli.o
OBJS += wmm_ac.o
CONFIG_OS=win32
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -112,6 +112,55 @@ const char *const wpa_supplicant_full_li
- "\n";
- #endif /* CONFIG_NO_STDOUT_DEBUG */
+@@ -118,6 +118,55 @@ const char *const wpa_supplicant_full_li
+ static void wpa_bss_tmp_disallow_timeout(void *eloop_ctx, void *timeout_ctx);
+
+static int hostapd_stop(struct wpa_supplicant *wpa_s)
+{
/* Configure default/group WEP keys for static WEP */
int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
{
-@@ -819,8 +868,12 @@ void wpa_supplicant_set_state(struct wpa
+@@ -883,8 +932,12 @@ void wpa_supplicant_set_state(struct wpa
wpas_p2p_completed(wpa_s);
sme_sched_obss_scan(wpa_s, 1);
wpa_s->new_connection = 1;
wpa_drv_set_operstate(wpa_s, 0);
#ifndef IEEE8021X_EAPOL
-@@ -4790,6 +4843,20 @@ static int wpa_supplicant_init_iface(str
+@@ -5080,6 +5133,20 @@ static int wpa_supplicant_init_iface(str
sizeof(wpa_s->bridge_ifname));
}
/* RSNA Supplicant Key Management - INITIALIZE */
eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
-@@ -5083,6 +5150,11 @@ static void wpa_supplicant_deinit_iface(
+@@ -5404,6 +5471,11 @@ static void wpa_supplicant_deinit_iface(
if (terminate)
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING);
#include "drivers/driver.h"
#include "eap_peer/eap.h"
#include "wpa_supplicant_i.h"
-@@ -290,6 +291,10 @@ static void calculate_update_time(const
+@@ -290,6 +291,10 @@ void calculate_update_time(const struct
static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src,
struct os_reltime *fetch_time)
{
else
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
-@@ -2471,6 +2471,7 @@ static int hostapd_ctrl_iface_receive_pr
+@@ -2458,6 +2458,7 @@ static int hostapd_ctrl_iface_receive_pr
reply_size);
} else if (os_strcmp(buf, "STATUS-DRIVER") == 0) {
reply_len = hostapd_drv_status(hapd, reply, reply_size);
} else if (os_strcmp(buf, "MIB") == 0) {
reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
if (reply_len >= 0) {
-@@ -2512,6 +2513,7 @@ static int hostapd_ctrl_iface_receive_pr
+@@ -2499,6 +2500,7 @@ static int hostapd_ctrl_iface_receive_pr
} else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
reply_size);
reply_len = -1;
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
-@@ -891,6 +891,9 @@ ifdef CONFIG_MBO
- OBJS += ../src/ap/mbo_ap.o
+@@ -926,6 +926,9 @@ ifdef CONFIG_FILS
+ OBJS += ../src/ap/fils_hlp.o
endif
ifdef CONFIG_CTRL_IFACE
+ifdef CONFIG_CTRL_IFACE_MIB
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
-@@ -1907,7 +1907,7 @@ static int wpa_supplicant_ctrl_iface_sta
+@@ -2070,7 +2070,7 @@ static int wpa_supplicant_ctrl_iface_sta
pos += ret;
}
if (wpa_s->ap_iface) {
pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
end - pos,
-@@ -9032,6 +9032,7 @@ char * wpa_supplicant_ctrl_iface_process
+@@ -9631,6 +9631,7 @@ char * wpa_supplicant_ctrl_iface_process
reply_len = -1;
} else if (os_strncmp(buf, "NOTE ", 5) == 0) {
wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
} else if (os_strcmp(buf, "MIB") == 0) {
reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
if (reply_len >= 0) {
-@@ -9039,6 +9040,7 @@ char * wpa_supplicant_ctrl_iface_process
+@@ -9638,6 +9639,7 @@ char * wpa_supplicant_ctrl_iface_process
reply + reply_len,
reply_size - reply_len);
}
} else if (os_strncmp(buf, "STATUS", 6) == 0) {
reply_len = wpa_supplicant_ctrl_iface_status(
wpa_s, buf + 6, reply, reply_size);
-@@ -9517,6 +9519,7 @@ char * wpa_supplicant_ctrl_iface_process
+@@ -10124,6 +10126,7 @@ char * wpa_supplicant_ctrl_iface_process
reply_len = wpa_supplicant_ctrl_iface_bss(
wpa_s, buf + 4, reply, reply_size);
#ifdef CONFIG_AP
} else if (os_strcmp(buf, "STA-FIRST") == 0) {
reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
} else if (os_strncmp(buf, "STA ", 4) == 0) {
-@@ -9525,12 +9528,15 @@ char * wpa_supplicant_ctrl_iface_process
+@@ -10132,12 +10135,15 @@ char * wpa_supplicant_ctrl_iface_process
} else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
reply_size);
static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
-@@ -2490,6 +2490,7 @@ static const char * bool_txt(Boolean val
+@@ -2492,6 +2492,7 @@ static const char * bool_txt(Boolean val
return val ? "TRUE" : "FALSE";
}
int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
{
-@@ -2665,6 +2666,7 @@ int ieee802_1x_get_mib_sta(struct hostap
+@@ -2667,6 +2668,7 @@ int ieee802_1x_get_mib_sta(struct hostap
return len;
}
static void ieee802_1x_wnm_notif_send(void *eloop_ctx, void *timeout_ctx)
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
-@@ -3544,6 +3544,7 @@ static const char * wpa_bool_txt(int val
+@@ -3741,6 +3741,7 @@ static const char * wpa_bool_txt(int val
return val ? "TRUE" : "FALSE";
}
#define RSN_SUITE "%02x-%02x-%02x-%d"
#define RSN_SUITE_ARG(s) \
-@@ -3688,7 +3689,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
+@@ -3885,7 +3886,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
return len;
}
{
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
-@@ -2252,6 +2252,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
+@@ -2283,6 +2283,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
}
#define RSN_SUITE "%02x-%02x-%02x-%d"
#define RSN_SUITE_ARG(s) \
((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
-@@ -2335,6 +2337,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
+@@ -2366,6 +2368,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
return (int) len;
}
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
-@@ -1119,7 +1119,7 @@ int wpas_ap_wps_nfc_report_handover(stru
+@@ -1139,7 +1139,7 @@ int wpas_ap_wps_nfc_report_handover(stru
#endif /* CONFIG_WPS */
--- a/src/common/wpa_common.c
+++ b/src/common/wpa_common.c
-@@ -1445,6 +1445,31 @@ u32 wpa_akm_to_suite(int akm)
+@@ -1664,6 +1664,31 @@ u32 wpa_akm_to_suite(int akm)
}
int wpa_compare_rsn_ie(int ft_initial_assoc,
const u8 *ie1, size_t ie1len,
const u8 *ie2, size_t ie2len)
-@@ -1452,8 +1477,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
+@@ -1671,8 +1696,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
if (ie1 == NULL || ie2 == NULL)
return -1;
#include "crypto/random.h"
#include "crypto/tls.h"
#include "common/version.h"
-@@ -675,7 +676,7 @@ int main(int argc, char *argv[])
+@@ -678,7 +679,7 @@ int main(int argc, char *argv[])
wpa_supplicant_event = hostapd_wpa_event;
wpa_supplicant_event_global = hostapd_wpa_event_global;
for (;;) {
if (c < 0)
break;
switch (c) {
-@@ -712,6 +713,8 @@ int main(int argc, char *argv[])
+@@ -715,6 +716,8 @@ int main(int argc, char *argv[])
break;
#endif /* CONFIG_DEBUG_LINUX_TRACING */
case 'v':
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
-@@ -447,7 +447,6 @@ static int hostapd_cli_cmd_sa_query(stru
+@@ -417,7 +417,6 @@ static int hostapd_cli_cmd_sa_query(stru
#endif /* CONFIG_IEEE80211W */
static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
char *argv[])
{
-@@ -673,7 +672,6 @@ static int hostapd_cli_cmd_wps_config(st
+@@ -643,7 +642,6 @@ static int hostapd_cli_cmd_wps_config(st
ssid_hex, argv[1]);
return wpa_ctrl_command(ctrl, buf);
}
static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
-@@ -1367,7 +1365,6 @@ static const struct hostapd_cli_cmd host
- { "sa_query", hostapd_cli_cmd_sa_query, NULL,
+@@ -1476,7 +1474,6 @@ static const struct hostapd_cli_cmd host
+ { "sa_query", hostapd_cli_cmd_sa_query, hostapd_complete_stations,
"<addr> = send SA Query to a station" },
#endif /* CONFIG_IEEE80211W */
-#ifdef CONFIG_WPS
{ "wps_pin", hostapd_cli_cmd_wps_pin, NULL,
"<uuid> <pin> [timeout] [addr] = add WPS Enrollee PIN" },
{ "wps_check_pin", hostapd_cli_cmd_wps_check_pin, NULL,
-@@ -1392,7 +1389,6 @@ static const struct hostapd_cli_cmd host
+@@ -1501,7 +1498,6 @@ static const struct hostapd_cli_cmd host
"<SSID> <auth> <encr> <key> = configure AP" },
{ "wps_get_status", hostapd_cli_cmd_wps_get_status, NULL,
"= show current WPS status" },
-#endif /* CONFIG_WPS */
- { "disassoc_imminent", hostapd_cli_cmd_disassoc_imminent, NULL, NULL },
- { "ess_disassoc", hostapd_cli_cmd_ess_disassoc, NULL, NULL },
- { "bss_tm_req", hostapd_cli_cmd_bss_tm_req, NULL, NULL },
+ { "disassoc_imminent", hostapd_cli_cmd_disassoc_imminent, NULL,
+ "= send Disassociation Imminent notification" },
+ { "ess_disassoc", hostapd_cli_cmd_ess_disassoc, NULL,
+#include "ap/sta_info.h"
#include "common/defs.h"
#include "common/ieee802_11_defs.h"
- #ifdef CONFIG_MACSEC
-@@ -605,6 +606,9 @@ struct wpa_driver_associate_params {
+ #include "common/wpa_common.h"
+@@ -762,6 +763,9 @@ struct wpa_driver_associate_params {
* responsible for selecting with which BSS to associate. */
const u8 *bssid;
*
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
-@@ -16,6 +16,7 @@
+@@ -17,6 +17,7 @@
#include "eap_peer/eap.h"
#include "p2p/p2p.h"
#include "fst/fst.h"
#include "config.h"
-@@ -1891,6 +1892,97 @@ static char * wpa_config_write_mka_ckn(c
+@@ -1985,6 +1986,97 @@ static char * wpa_config_write_mka_ckn(c
#endif /* CONFIG_MACSEC */
/* Helper macros for network block parser */
#ifdef OFFSET
-@@ -2123,6 +2215,9 @@ static const struct parse_data ssid_fiel
+@@ -2224,6 +2316,9 @@ static const struct parse_data ssid_fiel
{ INT(ap_max_inactivity) },
{ INT(dtim_period) },
{ INT(beacon_int) },
#define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)
-@@ -719,6 +721,9 @@ struct wpa_ssid {
+@@ -735,6 +737,9 @@ struct wpa_ssid {
*/
void *parent_cred;
* macsec_policy - Determines the policy for MACsec secure session
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2561,6 +2561,13 @@ static void wpas_start_assoc_cb(struct w
+@@ -2781,6 +2781,13 @@ static void wpas_start_assoc_cb(struct w
params.beacon_int = ssid->beacon_int;
else
params.beacon_int = wpa_s->conf->beacon_int;
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
-@@ -4962,7 +4962,7 @@ static int wpa_driver_nl80211_ibss(struc
+@@ -5012,7 +5012,7 @@ static int wpa_driver_nl80211_ibss(struc
struct wpa_driver_associate_params *params)
{
struct nl_msg *msg;
int count = 0;
wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex);
-@@ -4989,6 +4989,37 @@ retry:
+@@ -5039,6 +5039,37 @@ retry:
nl80211_put_beacon_int(msg, params->beacon_int))
goto fail;
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -608,6 +608,8 @@ struct wpa_driver_associate_params {
+@@ -765,6 +765,8 @@ struct wpa_driver_associate_params {
unsigned char rates[WLAN_SUPP_RATES_MAX];
int mcast_rate;
* bssid_hint - BSSID of a proposed AP
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
-@@ -5020,6 +5020,22 @@ retry:
+@@ -5070,6 +5070,22 @@ retry:
nla_put_u32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate);
}
goto fail;
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
-@@ -1923,6 +1923,71 @@ static char * wpa_config_write_mcast_rat
+@@ -2017,6 +2017,71 @@ static char * wpa_config_write_mcast_rat
}
#endif /* NO_CONFIG_WRITE */
static int wpa_config_parse_rates(const struct parse_data *data,
struct wpa_ssid *ssid, int line,
const char *value)
-@@ -2218,6 +2283,7 @@ static const struct parse_data ssid_fiel
+@@ -2319,6 +2384,7 @@ static const struct parse_data ssid_fiel
{ INT_RANGE(fixed_freq, 0, 1) },
{ FUNC(rates) },
{ FUNC(mcast_rate) },
{ INT_RANGE(macsec_integ_only, 0, 1) },
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
-@@ -723,6 +723,8 @@ struct wpa_ssid {
+@@ -739,6 +739,8 @@ struct wpa_ssid {
unsigned char rates[WLAN_SUPP_RATES_MAX];
double mcast_rate;
/**
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2568,6 +2568,8 @@ static void wpas_start_assoc_cb(struct w
+@@ -2788,6 +2788,8 @@ static void wpas_start_assoc_cb(struct w
i++;
}
params.mcast_rate = ssid->mcast_rate;
total = survey->channel_time;
-@@ -395,20 +389,19 @@ static int acs_usable_vht80_chan(struct
+@@ -392,20 +386,19 @@ static int acs_usable_vht80_chan(struct
static int acs_survey_is_sufficient(struct freq_survey *survey)
{
if (!(survey->filled & SURVEY_HAS_NF)) {
struct wpa_ctrl_dst;
struct radius_server_data;
-@@ -119,6 +120,7 @@ struct hostapd_data {
+@@ -122,6 +123,7 @@ struct hostapd_data {
struct hostapd_iface *iface;
struct hostapd_config *iconf;
struct hostapd_bss_config *conf;
int interface_added; /* virtual interface added for this BSS */
unsigned int started:1;
unsigned int disabled:1;
-@@ -328,6 +330,8 @@ struct hostapd_iface {
+@@ -370,6 +372,8 @@ struct hostapd_iface {
struct hostapd_config *conf;
char phy[16]; /* Name of the PHY (radio) */
HAPD_IFACE_DISABLED,
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
-@@ -302,6 +302,7 @@ static void hostapd_free_hapd_data(struc
+@@ -309,6 +309,7 @@ static void hostapd_free_hapd_data(struc
hapd->started = 0;
wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
iapp_deinit(hapd->iapp);
hapd->iapp = NULL;
accounting_deinit(hapd);
-@@ -1160,6 +1161,8 @@ static int hostapd_setup_bss(struct host
+@@ -1186,6 +1187,8 @@ static int hostapd_setup_bss(struct host
if (hapd->driver && hapd->driver->set_operstate)
hapd->driver->set_operstate(hapd->drv_priv, 1);
return 0;
}
-@@ -1683,6 +1686,7 @@ static int hostapd_setup_interface_compl
+@@ -1711,6 +1714,7 @@ static int hostapd_setup_interface_compl
if (err)
goto fail;
wpa_printf(MSG_DEBUG, "Completing interface initialization");
if (iface->conf->channel) {
#ifdef NEED_AP_MLME
-@@ -1862,6 +1866,7 @@ dfs_offload:
+@@ -1890,6 +1894,7 @@ dfs_offload:
fail:
wpa_printf(MSG_ERROR, "Interface initialization failed");
hostapd_set_state(iface, HAPD_IFACE_DISABLED);
wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
#ifdef CONFIG_FST
-@@ -2310,6 +2315,7 @@ void hostapd_interface_deinit_free(struc
+@@ -2344,6 +2349,7 @@ void hostapd_interface_deinit_free(struc
(unsigned int) iface->conf->num_bss);
driver = iface->bss[0]->driver;
drv_priv = iface->bss[0]->drv_priv;
__func__, driver, drv_priv);
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
-@@ -1293,7 +1293,8 @@ void ieee802_11_finish_fils_auth(struct
+@@ -1587,7 +1587,8 @@ ieee802_11_set_radius_info(struct hostap
static void handle_auth(struct hostapd_data *hapd,
{
u16 auth_alg, auth_transaction, status_code;
u16 resp = WLAN_STATUS_SUCCESS;
-@@ -1309,6 +1310,11 @@ static void handle_auth(struct hostapd_d
+@@ -1603,6 +1604,11 @@ static void handle_auth(struct hostapd_d
char *identity = NULL;
char *radius_cui = NULL;
u16 seq_ctrl;
+ .frame_info = fi,
+ };
- os_memset(&vlan_id, 0, sizeof(vlan_id));
-
-@@ -1466,6 +1472,14 @@ static void handle_auth(struct hostapd_d
+ if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.auth)) {
+ wpa_printf(MSG_INFO, "handle_auth - too short payload (len=%lu)",
+@@ -1757,6 +1763,12 @@ static void handle_auth(struct hostapd_d
resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
goto fail;
}
-+
+ if (hostapd_ubus_handle_event(hapd, &req)) {
+ wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n",
-+ MAC2STR(mgmt->sa));
++ MAC2STR(mgmt->sa));
+ resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+ goto fail;
+ }
-+
- if (res == HOSTAPD_ACL_PENDING) {
- wpa_printf(MSG_DEBUG, "Authentication frame from " MACSTR
- " waiting for an external authentication",
-@@ -2391,7 +2405,7 @@ static u16 send_assoc_resp(struct hostap
+ if (res == HOSTAPD_ACL_PENDING)
+ return;
+
+@@ -2860,7 +2872,7 @@ void fils_hlp_timeout(void *eloop_ctx, v
static void handle_assoc(struct hostapd_data *hapd,
const struct ieee80211_mgmt *mgmt, size_t len,
{
u16 capab_info, listen_interval, seq_ctrl, fc;
u16 resp = WLAN_STATUS_SUCCESS, reply_res;
-@@ -2399,6 +2413,11 @@ static void handle_assoc(struct hostapd_
- int left, i;
- struct sta_info *sta;
- u8 *tmp = NULL;
+@@ -2874,6 +2886,11 @@ static void handle_assoc(struct hostapd_
+ #ifdef CONFIG_FILS
+ int delay_assoc = 0;
+ #endif /* CONFIG_FILS */
+ struct hostapd_ubus_request req = {
+ .type = HOSTAPD_UBUS_ASSOC_REQ,
+ .mgmt_frame = mgmt,
if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
sizeof(mgmt->u.assoc_req))) {
-@@ -2518,6 +2537,13 @@ static void handle_assoc(struct hostapd_
+@@ -3041,6 +3058,13 @@ static void handle_assoc(struct hostapd_
}
#endif /* CONFIG_MBO */
/*
* sta->capability is used in check_assoc_ies() for RRM enabled
* capability element.
-@@ -2688,6 +2714,7 @@ static void handle_disassoc(struct hosta
+@@ -3248,6 +3272,7 @@ static void handle_disassoc(struct hosta
wpa_printf(MSG_DEBUG, "disassocation: STA=" MACSTR " reason_code=%d",
MAC2STR(mgmt->sa),
le_to_host16(mgmt->u.disassoc.reason_code));
sta = ap_get_sta(hapd, mgmt->sa);
if (sta == NULL) {
-@@ -2742,6 +2769,8 @@ static void handle_deauth(struct hostapd
+@@ -3313,6 +3338,8 @@ static void handle_deauth(struct hostapd
" reason_code=%d",
MAC2STR(mgmt->sa), le_to_host16(mgmt->u.deauth.reason_code));
sta = ap_get_sta(hapd, mgmt->sa);
if (sta == NULL) {
wpa_msg(hapd->msg_ctx, MSG_DEBUG, "Station " MACSTR " trying "
-@@ -3025,7 +3054,7 @@ int ieee802_11_mgmt(struct hostapd_data
+@@ -3627,7 +3654,7 @@ int ieee802_11_mgmt(struct hostapd_data
if (stype == WLAN_FC_STYPE_PROBE_REQ) {
return 1;
}
-@@ -3043,17 +3072,17 @@ int ieee802_11_mgmt(struct hostapd_data
+@@ -3647,17 +3674,17 @@ int ieee802_11_mgmt(struct hostapd_data
switch (stype) {
case WLAN_FC_STYPE_AUTH:
wpa_printf(MSG_DEBUG, "mgmt::auth");
case WLAN_FC_STYPE_DISASSOC:
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
-@@ -702,7 +702,7 @@ void sta_track_claim_taxonomy_info(struc
+@@ -716,7 +716,7 @@ void sta_track_claim_taxonomy_info(struc
void handle_probe_req(struct hostapd_data *hapd,
const struct ieee80211_mgmt *mgmt, size_t len,
{
u8 *resp;
struct ieee802_11_elems elems;
-@@ -711,9 +711,15 @@ void handle_probe_req(struct hostapd_dat
+@@ -725,9 +725,15 @@ void handle_probe_req(struct hostapd_dat
size_t i, resp_len;
int noack;
enum ssid_match_result res;
if (len < IEEE80211_HDRLEN)
return;
-@@ -880,6 +886,12 @@ void handle_probe_req(struct hostapd_dat
+@@ -894,6 +900,12 @@ void handle_probe_req(struct hostapd_dat
}
#endif /* CONFIG_P2P */
int ieee802_11_update_beacons(struct hostapd_iface *iface);
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
-@@ -52,6 +52,10 @@ int hostapd_notif_assoc(struct hostapd_d
+@@ -116,6 +116,10 @@ int hostapd_notif_assoc(struct hostapd_d
u16 reason = WLAN_REASON_UNSPECIFIED;
u16 status = WLAN_STATUS_SUCCESS;
const u8 *p2p_dev_addr = NULL;
if (addr == NULL) {
/*
-@@ -131,6 +135,12 @@ int hostapd_notif_assoc(struct hostapd_d
+@@ -195,6 +199,12 @@ int hostapd_notif_assoc(struct hostapd_d
goto fail;
}
wpabuf_free(sta->p2p_ie);
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
-@@ -386,6 +386,7 @@ void ap_handle_timer(void *eloop_ctx, vo
+@@ -404,6 +404,7 @@ void ap_handle_timer(void *eloop_ctx, vo
HOSTAPD_LEVEL_INFO, "deauthenticated due to "
"local deauth request");
ap_free_sta(hapd, sta);
return;
}
-@@ -533,6 +534,7 @@ skip_poll:
+@@ -551,6 +552,7 @@ skip_poll:
hapd, sta,
WLAN_REASON_PREV_AUTH_NOT_VALID);
ap_free_sta(hapd, sta);
}
--- a/src/ap/wpa_auth_glue.c
+++ b/src/ap/wpa_auth_glue.c
-@@ -159,6 +159,7 @@ static void hostapd_wpa_auth_psk_failure
+@@ -173,6 +173,7 @@ static void hostapd_wpa_auth_psk_failure
struct hostapd_data *hapd = ctx;
wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_POSSIBLE_PSK_MISMATCH MACSTR,
MAC2STR(addr));
projects / openwrt / staging / mkresin.git / commitdiff