hostapd: update to version 2016-12-15

Update to latest upstream HEAD:

- Refreshed all
- Delete patches and parts which made it upstream

Compile tested Full & Mini configs
Run-tested Mini config

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name> [another update, remove broken patch]
This commit is contained in:
Koen Vandeputte 2016-12-14 10:04:44 +01:00 committed by Felix Fietkau
parent 1a4d07c2c5
commit f628d0e0e9
20 changed files with 110 additions and 169 deletions

View file

@ -7,16 +7,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd
PKG_VERSION:=2016-09-05
PKG_VERSION:=2016-12-14
PKG_RELEASE:=1
PKG_REV:=fcd85d9a3f2d9d63d0fa57e93446ad467db75b23
PKG_REV:=aaa9c60bc29750f7c09685635b6811c8041663cc
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=git
PKG_MIRROR_HASH:=b1b690fedae8ff5c5801b4fb75508ea35c036aae86425ae324875fa57ef1a01b
PKG_MIRROR_HASH:=6ee5b8a8b9361c1bc688c27441763bd28722ff6236d96954213fef291c5cf73e
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-3-Clause

View file

@ -1,25 +0,0 @@
From: Matthias May <matthias.may@neratec.com>
Date: Tue, 5 Jul 2016 15:00:43 +0200
Subject: [PATCH] 4addr: fix reconnecting client on connection lost
When a 4addr client suddenly looses its connection (no deauth/deassoc)
the AP still thinks it is connected.
If the client reconnects before the AP timeoutes the client, traffic
cannot flow.
Fix this by making sure the WLAN_STA_WDS flag is unset in the sta->flags
when the client completes association.
Signed-off-by: Matthias May <matthias.may@neratec.com>
---
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -2826,6 +2826,7 @@ static void handle_assoc_cb(struct hosta
new_assoc = 0;
sta->flags |= WLAN_STA_ASSOC;
sta->flags &= ~WLAN_STA_WNM_SLEEP_MODE;
+ sta->flags &= ~WLAN_STA_WDS;
if ((!hapd->conf->ieee802_1x && !hapd->conf->wpa && !hapd->conf->osen) ||
sta->auth_alg == WLAN_AUTH_FT) {
/*

View file

@ -60,13 +60,13 @@
+ if (chdir("/") < 0)
return -1;
- }
-
- return 0;
-}
-#else /* __APPLE__ */
-#define os_daemon daemon
-#endif /* __APPLE__ */
-
-
-int os_daemonize(const char *pid_file)
-{

View file

@ -1,6 +1,6 @@
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -257,9 +257,10 @@ void wpa_supplicant_cancel_auth_timeout(
@@ -259,9 +259,10 @@ void wpa_supplicant_cancel_auth_timeout(
*/
void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s)
{

View file

@ -1,39 +0,0 @@
From 23dc11dfbd8e78a2450120e9afc83c1d32a8e683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
Date: Mon, 12 Sep 2016 19:02:34 +0200
Subject: [PATCH] Revert "nl80211: Remove duplicated check in
nl80211_setup_ap()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 647862eb60c324015ea31293cc052558b5185ca4.
The second check of device_ap_sme looks like duplicated, but it isn't
actually. The trick is nl80211_create_monitor_interface may change that
variable value and the second evaluation may give a different result.
This definitely isn't a very clear code, but that change caused a
regression for drivers that:
1) Don't report NL80211_ATTR_DEVICE_AP_SME
2) Don't support monitor mode
3) Don't support subscribing for PROBE_REQ and/or ACTION frames
like brcmfmac. With such drivers hostapd doesn't start anymore.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
src/drivers/driver_nl80211.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -4434,7 +4434,8 @@ static int nl80211_setup_ap(struct i802_
"nl80211: Failed to subscribe for mgmt frames from SME driver - trying to run without it");
if (!drv->device_ap_sme && drv->use_monitor &&
- nl80211_create_monitor_interface(drv))
+ nl80211_create_monitor_interface(drv) &&
+ !drv->device_ap_sme)
return -1;
if (drv->device_ap_sme &&

View file

@ -8,7 +8,7 @@
ifndef CONFIG_NO_GITVER
# Add VERSION_STR postfix for builds from a git repository
@@ -193,7 +194,8 @@ endif
@@ -198,7 +199,8 @@ endif
ifdef CONFIG_NO_VLAN
CFLAGS += -DCONFIG_NO_VLAN
@ -18,7 +18,7 @@
OBJS += ../src/ap/vlan_init.o
OBJS += ../src/ap/vlan_ifconfig.o
OBJS += ../src/ap/vlan.o
@@ -318,10 +320,14 @@ CFLAGS += -DCONFIG_MBO
@@ -330,10 +332,14 @@ CFLAGS += -DCONFIG_MBO
OBJS += ../src/ap/mbo_ap.o
endif
@ -36,7 +36,7 @@
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
@@ -1054,6 +1060,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
@@ -1073,6 +1079,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
BCHECK=../src/drivers/build.hostapd
@ -49,7 +49,7 @@
hostapd: $(BCHECK) $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
@@ -1095,6 +1107,12 @@ HOBJS += ../src/crypto/aes-internal.o
@@ -1114,6 +1126,12 @@ HOBJS += ../src/crypto/aes-internal.o
HOBJS += ../src/crypto/aes-internal-enc.o
endif
@ -72,7 +72,7 @@
ifndef CONFIG_NO_GITVER
# Add VERSION_STR postfix for builds from a git repository
@@ -313,7 +314,9 @@ endif
@@ -329,7 +330,9 @@ endif
ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN
@ -82,7 +82,7 @@
OBJS += ibss_rsn.o
endif
@@ -804,6 +807,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
@@ -820,6 +823,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
@ -93,7 +93,7 @@
endif
ifdef CONFIG_MACSEC
@@ -824,9 +831,11 @@ NEED_EAP_COMMON=y
@@ -840,9 +847,11 @@ NEED_EAP_COMMON=y
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP
OBJS += ap.o
@ -105,7 +105,7 @@
OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o
@@ -899,10 +908,18 @@ endif
@@ -910,6 +919,12 @@ endif
ifdef CONFIG_HS20
OBJS += ../src/ap/hs20.o
endif
@ -117,6 +117,10 @@
+ endif
endif
ifdef CONFIG_MBO
@@ -918,7 +933,9 @@ CFLAGS += -DCONFIG_MBO
endif
ifdef NEED_RSN_AUTHENTICATOR
+ifndef MULTICALL
CFLAGS += -DCONFIG_NO_RADIUS
@ -124,7 +128,7 @@
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
@@ -1685,6 +1702,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
@@ -1706,6 +1723,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
@ -137,7 +141,7 @@
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@
@@ -1787,6 +1810,12 @@ endif
@@ -1808,6 +1831,12 @@ endif
-e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
@$(E) " sed" $<
@ -152,7 +156,7 @@
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -4870,8 +4870,8 @@ union wpa_event_data {
@@ -4968,8 +4968,8 @@ union wpa_event_data {
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
@ -163,7 +167,7 @@
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
@@ -4883,7 +4883,7 @@ void wpa_supplicant_event(void *ctx, enu
@@ -4981,7 +4981,7 @@ void wpa_supplicant_event(void *ctx, enu
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
@ -174,7 +178,7 @@
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -1164,8 +1164,8 @@ static void hostapd_event_dfs_cac_starte
@@ -1163,8 +1163,8 @@ static void hostapd_event_dfs_cac_starte
#endif /* NEED_AP_MLME */
@ -185,7 +189,7 @@
{
struct hostapd_data *hapd = ctx;
#ifndef CONFIG_NO_STDOUT_DEBUG
@@ -1374,7 +1374,7 @@ void wpa_supplicant_event(void *ctx, enu
@@ -1373,7 +1373,7 @@ void wpa_supplicant_event(void *ctx, enu
}
@ -196,7 +200,7 @@
struct hapd_interfaces *interfaces = ctx;
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
@@ -940,8 +940,8 @@ static void wpa_priv_send_ft_response(st
@@ -1031,8 +1031,8 @@ static void wpa_priv_send_ft_response(st
}
@ -207,7 +211,7 @@
{
struct wpa_priv_interface *iface = ctx;
@@ -1010,7 +1010,7 @@ void wpa_supplicant_event(void *ctx, enu
@@ -1101,7 +1101,7 @@ void wpa_supplicant_event(void *ctx, enu
}
@ -216,7 +220,7 @@
union wpa_event_data *data)
{
struct wpa_priv_global *global = ctx;
@@ -1122,6 +1122,8 @@ int main(int argc, char *argv[])
@@ -1213,6 +1213,8 @@ int main(int argc, char *argv[])
if (os_program_init())
return -1;
@ -227,7 +231,7 @@
os_memset(&global, 0, sizeof(global));
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -3398,8 +3398,8 @@ static void wpa_supplicant_event_assoc_a
@@ -3610,8 +3610,8 @@ static void wpa_supplicant_event_assoc_a
}
@ -238,7 +242,7 @@
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
@@ -4074,7 +4074,7 @@ void wpa_supplicant_event(void *ctx, enu
@@ -4315,7 +4315,7 @@ void wpa_supplicant_event(void *ctx, enu
#endif /* CONFIG_AP */
break;
case EVENT_ACS_CHANNEL_SELECTED:
@ -247,7 +251,7 @@
if (!wpa_s->ap_iface)
break;
hostapd_acs_channel_selected(wpa_s->ap_iface->bss[0],
@@ -4096,7 +4096,7 @@ void wpa_supplicant_event(void *ctx, enu
@@ -4337,7 +4337,7 @@ void wpa_supplicant_event(void *ctx, enu
}
@ -258,7 +262,7 @@
struct wpa_supplicant *wpa_s;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -5094,7 +5094,6 @@ struct wpa_interface * wpa_supplicant_ma
@@ -5136,7 +5136,6 @@ struct wpa_interface * wpa_supplicant_ma
return NULL;
}
@ -266,7 +270,7 @@
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
@@ -5131,6 +5130,11 @@ static int wpa_supplicant_match_existing
@@ -5173,6 +5172,11 @@ static int wpa_supplicant_match_existing
#endif /* CONFIG_MATCH_IFACE */
@ -278,7 +282,7 @@
/**
* wpa_supplicant_add_iface - Add a new network interface
@@ -5386,6 +5390,8 @@ struct wpa_global * wpa_supplicant_init(
@@ -5428,6 +5432,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 */

View file

@ -1,6 +1,6 @@
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2863,6 +2863,10 @@ static int hostapd_config_fill(struct ho
@@ -2930,6 +2930,10 @@ static int hostapd_config_fill(struct ho
}
#endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_IEEE80211N
@ -13,7 +13,7 @@
} else if (os_strcmp(buf, "ht_capab") == 0) {
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -664,6 +664,8 @@ struct hostapd_config {
@@ -674,6 +674,8 @@ struct hostapd_config {
int ht_op_mode_fixed;
u16 ht_capab;

View file

@ -1,6 +1,6 @@
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -3654,7 +3654,7 @@ wpa_supplicant_alloc(struct wpa_supplica
@@ -3696,7 +3696,7 @@ wpa_supplicant_alloc(struct wpa_supplica
if (wpa_s == NULL)
return NULL;
wpa_s->scan_req = INITIAL_SCAN_REQ;

View file

@ -1,6 +1,6 @@
--- a/src/drivers/drivers.mak
+++ b/src/drivers/drivers.mak
@@ -36,7 +36,6 @@ NEED_SME=y
@@ -49,7 +49,6 @@ NEED_SME=y
NEED_AP_MLME=y
NEED_NETLINK=y
NEED_LINUX_IOCTL=y
@ -8,7 +8,7 @@
NEED_RADIOTAP=y
ifdef CONFIG_LIBNL32
@@ -123,7 +122,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
@@ -136,7 +135,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
CONFIG_WIRELESS_EXTENSION=y
NEED_NETLINK=y
NEED_LINUX_IOCTL=y
@ -16,7 +16,7 @@
endif
ifdef CONFIG_DRIVER_NDIS
@@ -149,7 +147,6 @@ endif
@@ -162,7 +160,6 @@ endif
ifdef CONFIG_WIRELESS_EXTENSION
DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
DRV_WPA_OBJS += ../src/drivers/driver_wext.o
@ -24,7 +24,7 @@
endif
ifdef NEED_NETLINK
@@ -162,6 +159,7 @@ endif
@@ -175,6 +172,7 @@ endif
ifdef NEED_RFKILL
DRV_OBJS += ../src/drivers/rfkill.o

View file

@ -1,6 +1,6 @@
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3864,7 +3864,7 @@ static int nl80211_set_channel(struct i8
@@ -4104,7 +4104,7 @@ static int nl80211_set_channel(struct i8
freq->freq, freq->ht_enabled, freq->vht_enabled,
freq->bandwidth, freq->center_freq1, freq->center_freq2);

View file

@ -1,6 +1,6 @@
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -2398,13 +2398,18 @@ wpa_driver_nl80211_finish_drv_init(struc
@@ -2490,13 +2490,18 @@ wpa_driver_nl80211_finish_drv_init(struc
}
@ -22,7 +22,7 @@
return send_and_recv_msgs(drv, msg, NULL, NULL);
}
@@ -2456,7 +2461,7 @@ static void wpa_driver_nl80211_deinit(st
@@ -2548,7 +2553,7 @@ static void wpa_driver_nl80211_deinit(st
nl80211_remove_monitor_interface(drv);
if (is_ap_interface(drv->nlmode))
@ -31,7 +31,7 @@
if (drv->eapol_sock >= 0) {
eloop_unregister_read_sock(drv->eapol_sock);
@@ -4463,8 +4468,7 @@ static void nl80211_teardown_ap(struct i
@@ -4703,8 +4708,7 @@ static void nl80211_teardown_ap(struct i
nl80211_remove_monitor_interface(drv);
else
nl80211_mgmt_unsubscribe(bss, "AP teardown");
@ -41,7 +41,7 @@
}
@@ -6473,8 +6477,6 @@ static int wpa_driver_nl80211_if_remove(
@@ -6728,8 +6732,6 @@ static int wpa_driver_nl80211_if_remove(
} else {
wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
nl80211_teardown_ap(bss);
@ -50,7 +50,7 @@
nl80211_destroy_bss(bss);
if (!bss->added_if)
i802_set_iface_flags(bss, 0);
@@ -6836,8 +6838,7 @@ static int wpa_driver_nl80211_deinit_ap(
@@ -7091,8 +7093,7 @@ static int wpa_driver_nl80211_deinit_ap(
struct wpa_driver_nl80211_data *drv = bss->drv;
if (!is_ap_interface(drv->nlmode))
return -1;
@ -60,7 +60,7 @@
/*
* If the P2P GO interface was dynamically added, then it is
@@ -6856,8 +6857,7 @@ static int wpa_driver_nl80211_stop_ap(vo
@@ -7111,8 +7112,7 @@ static int wpa_driver_nl80211_stop_ap(vo
struct wpa_driver_nl80211_data *drv = bss->drv;
if (!is_ap_interface(drv->nlmode))
return -1;

View file

@ -78,7 +78,7 @@
#ifdef CONFIG_IEEE80211W
#ifdef NEED_AP_MLME
@@ -2505,6 +2562,8 @@ static int hostapd_ctrl_iface_receive_pr
@@ -2620,6 +2677,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);
@ -89,7 +89,7 @@
#ifdef RADIUS_SERVER
--- a/src/ap/ctrl_iface_ap.c
+++ b/src/ap/ctrl_iface_ap.c
@@ -601,7 +601,13 @@ int hostapd_parse_csa_settings(const cha
@@ -624,7 +624,13 @@ int hostapd_parse_csa_settings(const cha
int hostapd_ctrl_iface_stop_ap(struct hostapd_data *hapd)
{

View file

@ -34,7 +34,7 @@
-include .config
-include $(if $(MULTICALL),../hostapd/.config)
@@ -114,6 +118,8 @@ OBJS_c += ../src/utils/common.o
@@ -115,6 +119,8 @@ OBJS_c += ../src/utils/common.o
OBJS_c += ../src/common/cli.o
OBJS += wmm_ac.o
@ -101,7 +101,7 @@
/* Configure default/group WEP keys for static WEP */
int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
{
@@ -812,8 +861,12 @@ void wpa_supplicant_set_state(struct wpa
@@ -819,8 +868,12 @@ void wpa_supplicant_set_state(struct wpa
wpas_p2p_completed(wpa_s);
sme_sched_obss_scan(wpa_s, 1);
@ -114,7 +114,7 @@
wpa_s->new_connection = 1;
wpa_drv_set_operstate(wpa_s, 0);
#ifndef IEEE8021X_EAPOL
@@ -4748,6 +4801,20 @@ static int wpa_supplicant_init_iface(str
@@ -4790,6 +4843,20 @@ static int wpa_supplicant_init_iface(str
sizeof(wpa_s->bridge_ifname));
}
@ -135,7 +135,7 @@
/* RSNA Supplicant Key Management - INITIALIZE */
eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
@@ -5041,6 +5108,11 @@ static void wpa_supplicant_deinit_iface(
@@ -5083,6 +5150,11 @@ static void wpa_supplicant_deinit_iface(
if (terminate)
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING);

View file

@ -1,6 +1,6 @@
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -215,6 +215,9 @@ endif
@@ -220,6 +220,9 @@ endif
ifdef CONFIG_NO_CTRL_IFACE
CFLAGS += -DCONFIG_NO_CTRL_IFACE
else
@ -12,7 +12,7 @@
else
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -2364,6 +2364,7 @@ static int hostapd_ctrl_iface_receive_pr
@@ -2471,6 +2471,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);
@ -20,7 +20,7 @@
} else if (os_strcmp(buf, "MIB") == 0) {
reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
if (reply_len >= 0) {
@@ -2405,6 +2406,7 @@ static int hostapd_ctrl_iface_receive_pr
@@ -2512,6 +2513,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);
@ -30,7 +30,7 @@
reply_len = -1;
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -875,6 +875,9 @@ ifdef CONFIG_MBO
@@ -891,6 +891,9 @@ ifdef CONFIG_MBO
OBJS += ../src/ap/mbo_ap.o
endif
ifdef CONFIG_CTRL_IFACE
@ -42,7 +42,7 @@
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -1895,7 +1895,7 @@ static int wpa_supplicant_ctrl_iface_sta
@@ -1907,7 +1907,7 @@ static int wpa_supplicant_ctrl_iface_sta
pos += ret;
}
@ -51,7 +51,7 @@
if (wpa_s->ap_iface) {
pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
end - pos,
@@ -8684,6 +8684,7 @@ char * wpa_supplicant_ctrl_iface_process
@@ -8943,6 +8943,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);
@ -59,7 +59,7 @@
} else if (os_strcmp(buf, "MIB") == 0) {
reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
if (reply_len >= 0) {
@@ -8691,6 +8692,7 @@ char * wpa_supplicant_ctrl_iface_process
@@ -8950,6 +8951,7 @@ char * wpa_supplicant_ctrl_iface_process
reply + reply_len,
reply_size - reply_len);
}
@ -67,7 +67,7 @@
} else if (os_strncmp(buf, "STATUS", 6) == 0) {
reply_len = wpa_supplicant_ctrl_iface_status(
wpa_s, buf + 6, reply, reply_size);
@@ -9161,6 +9163,7 @@ char * wpa_supplicant_ctrl_iface_process
@@ -9428,6 +9430,7 @@ char * wpa_supplicant_ctrl_iface_process
reply_len = wpa_supplicant_ctrl_iface_bss(
wpa_s, buf + 4, reply, reply_size);
#ifdef CONFIG_AP
@ -75,7 +75,7 @@
} 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) {
@@ -9169,12 +9172,15 @@ char * wpa_supplicant_ctrl_iface_process
@@ -9436,12 +9439,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);
@ -93,15 +93,15 @@
reply_len = -1;
--- a/src/ap/ctrl_iface_ap.c
+++ b/src/ap/ctrl_iface_ap.c
@@ -24,6 +24,7 @@
#include "ap_drv_ops.h"
@@ -25,6 +25,7 @@
#include "mbo_ap.h"
#include "taxonomy.h"
+#ifdef CONFIG_CTRL_IFACE_MIB
static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd,
struct sta_info *sta,
@@ -249,6 +250,7 @@ int hostapd_ctrl_iface_sta_next(struct h
@@ -250,6 +251,7 @@ int hostapd_ctrl_iface_sta_next(struct h
return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
}
@ -111,7 +111,7 @@
static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -2442,6 +2442,7 @@ static const char * bool_txt(Boolean val
@@ -2490,6 +2490,7 @@ static const char * bool_txt(Boolean val
return val ? "TRUE" : "FALSE";
}
@ -119,7 +119,7 @@
int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
{
@@ -2617,6 +2618,7 @@ int ieee802_1x_get_mib_sta(struct hostap
@@ -2665,6 +2666,7 @@ int ieee802_1x_get_mib_sta(struct hostap
return len;
}
@ -129,7 +129,7 @@
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
@@ -3069,6 +3069,7 @@ static const char * wpa_bool_txt(int val
@@ -3544,6 +3544,7 @@ static const char * wpa_bool_txt(int val
return val ? "TRUE" : "FALSE";
}
@ -137,7 +137,7 @@
#define RSN_SUITE "%02x-%02x-%02x-%d"
#define RSN_SUITE_ARG(s) \
@@ -3213,7 +3214,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
@@ -3688,7 +3689,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
return len;
}
@ -148,7 +148,7 @@
{
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -2108,6 +2108,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
@@ -2250,6 +2250,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
}
@ -157,7 +157,7 @@
#define RSN_SUITE "%02x-%02x-%02x-%d"
#define RSN_SUITE_ARG(s) \
((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
@@ -2191,6 +2193,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
@@ -2333,6 +2335,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
return (int) len;
}

View file

@ -1,6 +1,6 @@
--- a/src/common/wpa_common.c
+++ b/src/common/wpa_common.c
@@ -1246,6 +1246,31 @@ u32 wpa_akm_to_suite(int akm)
@@ -1446,6 +1446,31 @@ u32 wpa_akm_to_suite(int akm)
}
@ -32,7 +32,7 @@
int wpa_compare_rsn_ie(int ft_initial_assoc,
const u8 *ie1, size_t ie1len,
const u8 *ie2, size_t ie2len)
@@ -1253,8 +1278,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
@@ -1453,8 +1478,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
if (ie1 == NULL || ie2 == NULL)
return -1;

View file

@ -1,6 +1,6 @@
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -382,7 +382,6 @@ static int hostapd_cli_cmd_sa_query(stru
@@ -447,7 +447,6 @@ static int hostapd_cli_cmd_sa_query(stru
#endif /* CONFIG_IEEE80211W */
@ -8,7 +8,7 @@
static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
char *argv[])
{
@@ -608,7 +607,6 @@ static int hostapd_cli_cmd_wps_config(st
@@ -673,7 +672,6 @@ static int hostapd_cli_cmd_wps_config(st
ssid_hex, argv[1]);
return wpa_ctrl_command(ctrl, buf);
}
@ -16,7 +16,7 @@
static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
@@ -1275,7 +1273,6 @@ static const struct hostapd_cli_cmd host
@@ -1367,7 +1365,6 @@ static const struct hostapd_cli_cmd host
{ "sa_query", hostapd_cli_cmd_sa_query, NULL,
"<addr> = send SA Query to a station" },
#endif /* CONFIG_IEEE80211W */
@ -24,7 +24,7 @@
{ "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,
@@ -1300,7 +1297,6 @@ static const struct hostapd_cli_cmd host
@@ -1392,7 +1389,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" },

View file

@ -21,8 +21,8 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
+#include "ap/sta_info.h"
#include "common/defs.h"
#include "common/ieee802_11_defs.h"
#include "utils/list.h"
@@ -587,6 +588,9 @@ struct wpa_driver_associate_params {
#ifdef CONFIG_MACSEC
@@ -605,6 +606,9 @@ struct wpa_driver_associate_params {
* responsible for selecting with which BSS to associate. */
const u8 *bssid;
@ -42,8 +42,8 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
#include "config.h"
@@ -1816,6 +1817,97 @@ static char * wpa_config_write_mesh_basi
#endif /* CONFIG_MESH */
@@ -1891,6 +1892,97 @@ static char * wpa_config_write_mka_ckn(c
#endif /* CONFIG_MACSEC */
+static int wpa_config_parse_mcast_rate(const struct parse_data *data,
@ -140,7 +140,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
/* Helper macros for network block parser */
#ifdef OFFSET
@@ -2048,6 +2140,9 @@ static const struct parse_data ssid_fiel
@@ -2123,6 +2215,9 @@ static const struct parse_data ssid_fiel
{ INT(ap_max_inactivity) },
{ INT(dtim_period) },
{ INT(beacon_int) },
@ -149,7 +149,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
+ { FUNC(mcast_rate) },
#ifdef CONFIG_MACSEC
{ INT_RANGE(macsec_policy, 0, 1) },
#endif /* CONFIG_MACSEC */
{ INT_RANGE(macsec_integ_only, 0, 1) },
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -10,8 +10,10 @@
@ -175,7 +175,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
* macsec_policy - Determines the policy for MACsec secure session
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2527,6 +2527,13 @@ static void wpas_start_assoc_cb(struct w
@@ -2561,6 +2561,13 @@ static void wpas_start_assoc_cb(struct w
params.beacon_int = ssid->beacon_int;
else
params.beacon_int = wpa_s->conf->beacon_int;

View file

@ -10,7 +10,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -4722,7 +4722,7 @@ static int wpa_driver_nl80211_ibss(struc
@@ -4962,7 +4962,7 @@ static int wpa_driver_nl80211_ibss(struc
struct wpa_driver_associate_params *params)
{
struct nl_msg *msg;
@ -19,7 +19,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
int count = 0;
wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex);
@@ -4749,6 +4749,37 @@ retry:
@@ -4989,6 +4989,37 @@ retry:
nl80211_put_beacon_int(msg, params->beacon_int))
goto fail;

View file

@ -16,7 +16,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -590,6 +590,8 @@ struct wpa_driver_associate_params {
@@ -608,6 +608,8 @@ struct wpa_driver_associate_params {
unsigned char rates[WLAN_SUPP_RATES_MAX];
int mcast_rate;
@ -27,7 +27,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
* bssid_hint - BSSID of a proposed AP
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -4780,6 +4780,22 @@ retry:
@@ -5020,6 +5020,22 @@ retry:
nla_put_u32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate);
}
@ -52,7 +52,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
goto fail;
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -1848,6 +1848,71 @@ static char * wpa_config_write_mcast_rat
@@ -1923,6 +1923,71 @@ static char * wpa_config_write_mcast_rat
}
#endif /* NO_CONFIG_WRITE */
@ -124,14 +124,14 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
static int wpa_config_parse_rates(const struct parse_data *data,
struct wpa_ssid *ssid, int line,
const char *value)
@@ -2143,6 +2208,7 @@ static const struct parse_data ssid_fiel
@@ -2218,6 +2283,7 @@ static const struct parse_data ssid_fiel
{ INT_RANGE(fixed_freq, 0, 1) },
{ FUNC(rates) },
{ FUNC(mcast_rate) },
+ { FUNC(htmode) },
#ifdef CONFIG_MACSEC
{ INT_RANGE(macsec_policy, 0, 1) },
#endif /* CONFIG_MACSEC */
{ 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 {
@ -145,7 +145,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
/**
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2534,6 +2534,8 @@ static void wpas_start_assoc_cb(struct w
@@ -2568,6 +2568,8 @@ static void wpas_start_assoc_cb(struct w
i++;
}
params.mcast_rate = ssid->mcast_rate;

View file

@ -1,6 +1,6 @@
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -160,6 +160,11 @@ OBJS += ../src/common/hw_features_common
@@ -165,6 +165,11 @@ OBJS += ../src/common/hw_features_common
OBJS += ../src/eapol_auth/eapol_auth_sm.o
@ -22,7 +22,7 @@
struct wpa_ctrl_dst;
struct radius_server_data;
@@ -118,6 +119,7 @@ struct hostapd_data {
@@ -119,6 +120,7 @@ struct hostapd_data {
struct hostapd_iface *iface;
struct hostapd_config *iconf;
struct hostapd_bss_config *conf;
@ -30,7 +30,7 @@
int interface_added; /* virtual interface added for this BSS */
unsigned int started:1;
unsigned int disabled:1;
@@ -323,6 +325,8 @@ struct hostapd_iface {
@@ -328,6 +330,8 @@ struct hostapd_iface {
struct hostapd_config *conf;
char phy[16]; /* Name of the PHY (radio) */
@ -49,7 +49,7 @@
iapp_deinit(hapd->iapp);
hapd->iapp = NULL;
accounting_deinit(hapd);
@@ -1140,6 +1141,8 @@ static int hostapd_setup_bss(struct host
@@ -1142,6 +1143,8 @@ static int hostapd_setup_bss(struct host
if (hapd->driver && hapd->driver->set_operstate)
hapd->driver->set_operstate(hapd->drv_priv, 1);
@ -66,7 +66,7 @@
wpa_printf(MSG_DEBUG, "Completing interface initialization");
if (iface->conf->channel) {
#ifdef NEED_AP_MLME
@@ -1845,6 +1849,7 @@ dfs_offload:
@@ -1844,6 +1848,7 @@ dfs_offload:
fail:
wpa_printf(MSG_ERROR, "Interface initialization failed");
@ -74,7 +74,7 @@
hostapd_set_state(iface, HAPD_IFACE_DISABLED);
wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
#ifdef CONFIG_FST
@@ -2279,6 +2284,7 @@ void hostapd_interface_deinit_free(struc
@@ -2292,6 +2297,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;
@ -84,7 +84,7 @@
__func__, driver, drv_priv);
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -980,7 +980,8 @@ int auth_sae_init_committed(struct hosta
@@ -1293,7 +1293,8 @@ void ieee802_11_finish_fils_auth(struct
static void handle_auth(struct hostapd_data *hapd,
@ -94,7 +94,7 @@
{
u16 auth_alg, auth_transaction, status_code;
u16 resp = WLAN_STATUS_SUCCESS;
@@ -996,6 +997,11 @@ static void handle_auth(struct hostapd_d
@@ -1309,6 +1310,11 @@ static void handle_auth(struct hostapd_d
char *identity = NULL;
char *radius_cui = NULL;
u16 seq_ctrl;
@ -106,7 +106,7 @@
os_memset(&vlan_id, 0, sizeof(vlan_id));
@@ -1149,6 +1155,14 @@ static void handle_auth(struct hostapd_d
@@ -1466,6 +1472,14 @@ static void handle_auth(struct hostapd_d
resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
goto fail;
}
@ -121,7 +121,7 @@
if (res == HOSTAPD_ACL_PENDING) {
wpa_printf(MSG_DEBUG, "Authentication frame from " MACSTR
" waiting for an external authentication",
@@ -2052,13 +2066,18 @@ static u16 send_assoc_resp(struct hostap
@@ -2391,7 +2405,7 @@ static u16 send_assoc_resp(struct hostap
static void handle_assoc(struct hostapd_data *hapd,
const struct ieee80211_mgmt *mgmt, size_t len,
@ -130,9 +130,10 @@
{
u16 capab_info, listen_interval, seq_ctrl, fc;
u16 resp = WLAN_STATUS_SUCCESS, reply_res;
const u8 *pos;
@@ -2399,6 +2413,11 @@ static void handle_assoc(struct hostapd_
int left, i;
struct sta_info *sta;
u8 *tmp = NULL;
+ struct hostapd_ubus_request req = {
+ .type = HOSTAPD_UBUS_ASSOC_REQ,
+ .mgmt_frame = mgmt,
@ -141,7 +142,7 @@
if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
sizeof(mgmt->u.assoc_req))) {
@@ -2178,6 +2197,13 @@ static void handle_assoc(struct hostapd_
@@ -2518,6 +2537,13 @@ static void handle_assoc(struct hostapd_
}
#endif /* CONFIG_MBO */
@ -155,7 +156,7 @@
/*
* sta->capability is used in check_assoc_ies() for RRM enabled
* capability element.
@@ -2654,7 +2680,7 @@ int ieee802_11_mgmt(struct hostapd_data
@@ -3023,7 +3049,7 @@ int ieee802_11_mgmt(struct hostapd_data
if (stype == WLAN_FC_STYPE_PROBE_REQ) {
@ -164,7 +165,7 @@
return 1;
}
@@ -2672,17 +2698,17 @@ int ieee802_11_mgmt(struct hostapd_data
@@ -3041,17 +3067,17 @@ int ieee802_11_mgmt(struct hostapd_data
switch (stype) {
case WLAN_FC_STYPE_AUTH:
wpa_printf(MSG_DEBUG, "mgmt::auth");
@ -187,7 +188,7 @@
case WLAN_FC_STYPE_DISASSOC:
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -675,7 +675,7 @@ sta_track_seen_on(struct hostapd_iface *
@@ -702,7 +702,7 @@ void sta_track_claim_taxonomy_info(struc
void handle_probe_req(struct hostapd_data *hapd,
const struct ieee80211_mgmt *mgmt, size_t len,
@ -196,7 +197,7 @@
{
u8 *resp;
struct ieee802_11_elems elems;
@@ -684,9 +684,15 @@ void handle_probe_req(struct hostapd_dat
@@ -711,9 +711,15 @@ void handle_probe_req(struct hostapd_dat
size_t i, resp_len;
int noack;
enum ssid_match_result res;
@ -212,7 +213,7 @@
if (len < IEEE80211_HDRLEN)
return;
@@ -838,6 +844,12 @@ void handle_probe_req(struct hostapd_dat
@@ -880,6 +886,12 @@ void handle_probe_req(struct hostapd_dat
}
#endif /* CONFIG_P2P */