|
|
|
@ -1,15 +1,15 @@
|
|
|
|
|
--- a/hostapd/Makefile
|
|
|
|
|
+++ b/hostapd/Makefile
|
|
|
|
|
@@ -32,6 +32,7 @@ export BINDIR ?= /usr/local/bin/
|
|
|
|
|
# CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include
|
|
|
|
|
@@ -28,6 +28,7 @@ CFLAGS += -I$(abspath ../src/utils)
|
|
|
|
|
export BINDIR ?= /usr/local/bin/
|
|
|
|
|
|
|
|
|
|
-include .config
|
|
|
|
|
+-include $(if $(MULTICALL), ../wpa_supplicant/.config)
|
|
|
|
|
|
|
|
|
|
ifndef CONFIG_NO_GITVER
|
|
|
|
|
# Add VERSION_STR postfix for builds from a git repository
|
|
|
|
|
@@ -277,10 +278,14 @@ ifdef CONFIG_IEEE80211AC
|
|
|
|
|
CFLAGS += -DCONFIG_IEEE80211AC
|
|
|
|
|
@@ -315,10 +316,14 @@ CFLAGS += -DCONFIG_MBO
|
|
|
|
|
OBJS += ../src/ap/mbo_ap.o
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
+ifndef MULTICALL
|
|
|
|
@ -26,7 +26,7 @@
|
|
|
|
|
LIBS += $(DRV_AP_LIBS)
|
|
|
|
|
|
|
|
|
|
ifdef CONFIG_L2_PACKET
|
|
|
|
|
@@ -1019,6 +1024,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
|
|
|
|
|
@@ -1051,6 +1056,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
|
|
|
|
|
|
|
|
|
|
BCHECK=../src/drivers/build.hostapd
|
|
|
|
|
|
|
|
|
@ -39,7 +39,7 @@
|
|
|
|
|
hostapd: $(BCHECK) $(OBJS)
|
|
|
|
|
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
|
|
|
|
|
@$(E) " LD " $@
|
|
|
|
|
@@ -1060,6 +1071,12 @@ HOBJS += ../src/crypto/aes-internal.o
|
|
|
|
|
@@ -1092,6 +1103,12 @@ HOBJS += ../src/crypto/aes-internal.o
|
|
|
|
|
HOBJS += ../src/crypto/aes-internal-enc.o
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
@ -62,7 +62,7 @@
|
|
|
|
|
|
|
|
|
|
ifndef CONFIG_NO_GITVER
|
|
|
|
|
# Add VERSION_STR postfix for builds from a git repository
|
|
|
|
|
@@ -794,6 +795,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
|
|
|
|
|
@@ -803,6 +804,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
|
|
|
|
|
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
|
|
|
|
|
LIBS += -ldl -rdynamic
|
|
|
|
|
endif
|
|
|
|
@ -73,7 +73,7 @@
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifdef CONFIG_MACSEC
|
|
|
|
|
@@ -814,9 +819,11 @@ NEED_EAP_COMMON=y
|
|
|
|
|
@@ -823,9 +828,11 @@ NEED_EAP_COMMON=y
|
|
|
|
|
NEED_RSN_AUTHENTICATOR=y
|
|
|
|
|
CFLAGS += -DCONFIG_AP
|
|
|
|
|
OBJS += ap.o
|
|
|
|
@ -85,7 +85,7 @@
|
|
|
|
|
OBJS += ../src/ap/hostapd.o
|
|
|
|
|
OBJS += ../src/ap/wpa_auth_glue.o
|
|
|
|
|
OBJS += ../src/ap/utils.o
|
|
|
|
|
@@ -879,10 +886,18 @@ endif
|
|
|
|
|
@@ -898,10 +905,18 @@ endif
|
|
|
|
|
ifdef CONFIG_HS20
|
|
|
|
|
OBJS += ../src/ap/hs20.o
|
|
|
|
|
endif
|
|
|
|
@ -104,7 +104,7 @@
|
|
|
|
|
NEED_AES_WRAP=y
|
|
|
|
|
OBJS += ../src/ap/wpa_auth.o
|
|
|
|
|
OBJS += ../src/ap/wpa_auth_ie.o
|
|
|
|
|
@@ -1657,6 +1672,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
|
|
|
|
|
@@ -1680,6 +1695,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
|
|
|
|
|
|
|
|
|
|
$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
|
|
|
|
|
|
|
|
|
@ -117,8 +117,8 @@
|
|
|
|
|
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
|
|
|
|
|
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
|
|
|
|
|
@$(E) " LD " $@
|
|
|
|
|
@@ -1757,6 +1778,12 @@ endif
|
|
|
|
|
$(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
|
|
|
|
|
@@ -1782,6 +1803,12 @@ endif
|
|
|
|
|
-e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
|
|
|
|
|
@$(E) " sed" $<
|
|
|
|
|
|
|
|
|
|
+dump_cflags:
|
|
|
|
@ -132,7 +132,7 @@
|
|
|
|
|
wpa_cli.exe: wpa_cli
|
|
|
|
|
--- a/src/drivers/driver.h
|
|
|
|
|
+++ b/src/drivers/driver.h
|
|
|
|
|
@@ -4707,8 +4707,8 @@ union wpa_event_data {
|
|
|
|
|
@@ -4775,8 +4775,8 @@ union wpa_event_data {
|
|
|
|
|
* Driver wrapper code should call this function whenever an event is received
|
|
|
|
|
* from the driver.
|
|
|
|
|
*/
|
|
|
|
@ -141,11 +141,20 @@
|
|
|
|
|
+extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
|
|
|
|
|
@@ -4788,7 +4788,7 @@ void wpa_supplicant_event(void *ctx, enu
|
|
|
|
|
* Same as wpa_supplicant_event(), but we search for the interface in
|
|
|
|
|
* wpa_global.
|
|
|
|
|
*/
|
|
|
|
|
-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+extern void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
|
|
|
|
|
union wpa_event_data *data);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
--- a/src/ap/drv_callbacks.c
|
|
|
|
|
+++ b/src/ap/drv_callbacks.c
|
|
|
|
|
@@ -1122,8 +1122,8 @@ static void hostapd_event_dfs_cac_starte
|
|
|
|
|
@@ -1144,8 +1144,8 @@ static void hostapd_event_dfs_cac_starte
|
|
|
|
|
#endif /* NEED_AP_MLME */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -156,9 +165,18 @@
|
|
|
|
|
{
|
|
|
|
|
struct hostapd_data *hapd = ctx;
|
|
|
|
|
#ifndef CONFIG_NO_STDOUT_DEBUG
|
|
|
|
|
@@ -1354,7 +1354,7 @@ void wpa_supplicant_event(void *ctx, enu
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
union wpa_event_data *data)
|
|
|
|
|
{
|
|
|
|
|
struct hapd_interfaces *interfaces = ctx;
|
|
|
|
|
--- a/wpa_supplicant/wpa_priv.c
|
|
|
|
|
+++ b/wpa_supplicant/wpa_priv.c
|
|
|
|
|
@@ -932,8 +932,8 @@ static void wpa_priv_send_ft_response(st
|
|
|
|
|
@@ -940,8 +940,8 @@ static void wpa_priv_send_ft_response(st
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -169,17 +187,27 @@
|
|
|
|
|
{
|
|
|
|
|
struct wpa_priv_interface *iface = ctx;
|
|
|
|
|
|
|
|
|
|
@@ -1082,6 +1082,7 @@ int main(int argc, char *argv[])
|
|
|
|
|
@@ -1010,7 +1010,7 @@ void wpa_supplicant_event(void *ctx, enu
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+void supplicant_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
union wpa_event_data *data)
|
|
|
|
|
{
|
|
|
|
|
struct wpa_priv_global *global = ctx;
|
|
|
|
|
@@ -1122,6 +1122,8 @@ int main(int argc, char *argv[])
|
|
|
|
|
if (os_program_init())
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
+ wpa_supplicant_event = supplicant_event;
|
|
|
|
|
+ wpa_supplicant_event_global = supplicant_event_global;
|
|
|
|
|
wpa_priv_fd_workaround();
|
|
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
|
os_memset(&global, 0, sizeof(global));
|
|
|
|
|
--- a/wpa_supplicant/events.c
|
|
|
|
|
+++ b/wpa_supplicant/events.c
|
|
|
|
|
@@ -3298,8 +3298,8 @@ static void wpa_supplicant_event_assoc_a
|
|
|
|
|
@@ -3375,8 +3375,8 @@ static void wpa_supplicant_event_assoc_a
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -190,7 +218,7 @@
|
|
|
|
|
{
|
|
|
|
|
struct wpa_supplicant *wpa_s = ctx;
|
|
|
|
|
int resched;
|
|
|
|
|
@@ -3947,7 +3947,7 @@ void wpa_supplicant_event(void *ctx, enu
|
|
|
|
|
@@ -4037,7 +4037,7 @@ void wpa_supplicant_event(void *ctx, enu
|
|
|
|
|
#endif /* CONFIG_AP */
|
|
|
|
|
break;
|
|
|
|
|
case EVENT_ACS_CHANNEL_SELECTED:
|
|
|
|
@ -199,85 +227,115 @@
|
|
|
|
|
if (!wpa_s->ap_iface)
|
|
|
|
|
break;
|
|
|
|
|
hostapd_acs_channel_selected(wpa_s->ap_iface->bss[0],
|
|
|
|
|
@@ -4051,7 +4051,7 @@ void wpa_supplicant_event(void *ctx, enu
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+void supplicant_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
union wpa_event_data *data)
|
|
|
|
|
{
|
|
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
|
--- a/wpa_supplicant/wpa_supplicant.c
|
|
|
|
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
|
|
|
|
@@ -4845,6 +4845,9 @@ static void wpa_supplicant_deinit_iface(
|
|
|
|
|
os_free(wpa_s);
|
|
|
|
|
@@ -4967,7 +4967,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()
|
|
|
|
|
@@ -5004,6 +5003,11 @@ static int wpa_supplicant_match_existing
|
|
|
|
|
|
|
|
|
|
#endif /* CONFIG_MATCH_IFACE */
|
|
|
|
|
|
|
|
|
|
+extern void supplicant_event(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
+
|
|
|
|
|
+extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* wpa_supplicant_add_iface - Add a new network interface
|
|
|
|
|
@@ -5100,6 +5103,7 @@ struct wpa_global * wpa_supplicant_init(
|
|
|
|
|
@@ -5259,6 +5263,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 */
|
|
|
|
|
+ wpa_supplicant_event = supplicant_event;
|
|
|
|
|
+ wpa_supplicant_event_global = supplicant_event_global;
|
|
|
|
|
|
|
|
|
|
if (params->wpa_debug_file_path)
|
|
|
|
|
wpa_debug_open_file(params->wpa_debug_file_path);
|
|
|
|
|
--- a/hostapd/main.c
|
|
|
|
|
+++ b/hostapd/main.c
|
|
|
|
|
@@ -513,6 +513,9 @@ static int hostapd_get_ctrl_iface_group(
|
|
|
|
|
@@ -526,6 +526,11 @@ static int hostapd_get_ctrl_iface_group(
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
+
|
|
|
|
|
+void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
|
static int gen_uuid(const char *txt_addr)
|
|
|
|
|
@@ -588,6 +591,7 @@ int main(int argc, char *argv[])
|
|
|
|
|
@@ -601,6 +606,8 @@ int main(int argc, char *argv[])
|
|
|
|
|
interfaces.global_ctrl_sock = -1;
|
|
|
|
|
interfaces.global_ctrl_dst = NULL;
|
|
|
|
|
dl_list_init(&interfaces.global_ctrl_dst);
|
|
|
|
|
|
|
|
|
|
+ wpa_supplicant_event = hostapd_wpa_event;
|
|
|
|
|
+ wpa_supplicant_event_global = hostapd_wpa_event_global;
|
|
|
|
|
for (;;) {
|
|
|
|
|
c = getopt(argc, argv, "b:Bde:f:hKP:STtu:vg:G:");
|
|
|
|
|
if (c < 0)
|
|
|
|
|
--- a/src/drivers/drivers.c
|
|
|
|
|
+++ b/src/drivers/drivers.c
|
|
|
|
|
@@ -10,6 +10,9 @@
|
|
|
|
|
@@ -10,6 +10,11 @@
|
|
|
|
|
#include "utils/common.h"
|
|
|
|
|
#include "driver.h"
|
|
|
|
|
|
|
|
|
|
+void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
+void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
+
|
|
|
|
|
#ifdef CONFIG_DRIVER_WEXT
|
|
|
|
|
extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */
|
|
|
|
|
#endif /* CONFIG_DRIVER_WEXT */
|
|
|
|
|
--- a/wpa_supplicant/eapol_test.c
|
|
|
|
|
+++ b/wpa_supplicant/eapol_test.c
|
|
|
|
|
@@ -29,7 +29,10 @@
|
|
|
|
|
@@ -29,7 +29,12 @@
|
|
|
|
|
#include "ctrl_iface.h"
|
|
|
|
|
#include "pcsc_funcs.h"
|
|
|
|
|
#include "wpas_glue.h"
|
|
|
|
|
+#include "drivers/driver.h"
|
|
|
|
|
|
|
|
|
|
+void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
+void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
|
|
|
|
|
const struct wpa_driver_ops *const wpa_drivers[] = { NULL };
|
|
|
|
|
|
|
|
|
|
@@ -1288,6 +1291,8 @@ static void usage(void)
|
|
|
|
|
@@ -1295,6 +1300,10 @@ static void usage(void)
|
|
|
|
|
"option several times.\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+extern void supplicant_event(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
+extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
|
|
|
|
|
+ union wpa_event_data *data);
|
|
|
|
|
|
|
|
|
|
int main(int argc, char *argv[])
|
|
|
|
|
{
|
|
|
|
|
@@ -1308,6 +1313,7 @@ int main(int argc, char *argv[])
|
|
|
|
|
@@ -1315,6 +1324,8 @@ int main(int argc, char *argv[])
|
|
|
|
|
if (os_program_init())
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
+ wpa_supplicant_event = supplicant_event;
|
|
|
|
|
+ wpa_supplicant_event_global = supplicant_event_global;
|
|
|
|
|
hostapd_logger_register_cb(hostapd_logger_cb);
|
|
|
|
|
|
|
|
|
|
os_memset(&eapol_test, 0, sizeof(eapol_test));
|
|
|
|
|