From 424e215228221cd61f574b4b40cb77e0666d9d37 Mon Sep 17 00:00:00 2001 From: Patrick Walther Date: Tue, 28 Jan 2020 15:14:35 +0100 --- hostapd/Makefile | 26 ++++++++++++++++++++++---- hostapd/main.c | 7 +++++++ src/ap/drv_callbacks.c | 6 +++--- src/drivers/driver.h | 6 +++--- src/drivers/drivers.c | 4 ++++ wpa_supplicant/Makefile | 29 +++++++++++++++++++++++++++++ wpa_supplicant/eapol_test.c | 11 +++++++++++ wpa_supplicant/events.c | 6 +++--- wpa_supplicant/wpa_priv.c | 8 +++++--- wpa_supplicant/wpa_supplicant.c | 8 +++++++- 10 files changed, 94 insertions(+), 17 deletions(-) diff --git a/hostapd/Makefile b/hostapd/Makefile index 2a6bd7ac8..da8f9bc9b 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -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 @@ -198,7 +199,8 @@ endif ifdef CONFIG_NO_VLAN CFLAGS += -DCONFIG_NO_VLAN -else +endif +ifneq ($(findstring CONFIG_NO_VLAN,$(CFLAGS)), CONFIG_NO_VLAN) OBJS += ../src/ap/vlan_init.o OBJS += ../src/ap/vlan_ifconfig.o OBJS += ../src/ap/vlan.o @@ -366,10 +368,14 @@ CFLAGS += -DCONFIG_MBO OBJS += ../src/ap/mbo_ap.o endif +ifndef MULTICALL +CFLAGS += -DNO_SUPPLICANT +endif + include ../src/drivers/drivers.mak -OBJS += $(DRV_AP_OBJS) -CFLAGS += $(DRV_AP_CFLAGS) -LDFLAGS += $(DRV_AP_LDFLAGS) +OBJS += $(sort $(DRV_AP_OBJS) $(if $(MULTICALL),$(DRV_WPA_OBJS))) +CFLAGS += $(DRV_AP_CFLAGS) $(if $(MULTICALL),$(DRV_WPA_CFLAGS)) +LDFLAGS += $(DRV_AP_LDFLAGS) $(if $(MULTICALL),$(DRV_WPA_LDFLAGS)) LIBS += $(DRV_AP_LIBS) ifdef CONFIG_L2_PACKET @@ -1316,6 +1322,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)/,$(ALL)) BCHECK=../src/drivers/build.hostapd +hostapd_multi.a: $(BCHECK) $(OBJS) + $(Q)$(CC) -c -o hostapd_multi.o -Dmain=hostapd_main $(CFLAGS) main.c + @$(E) " CC " $< + @rm -f $@ + @$(AR) cr $@ hostapd_multi.o $(OBJS) + hostapd: $(BCHECK) $(OBJS) $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) @$(E) " LD " $@ @@ -1358,6 +1370,12 @@ ifeq ($(CONFIG_TLS), linux) HOBJS += ../src/crypto/crypto_linux.o endif +dump_cflags: + @printf "%s " "$(CFLAGS)" + +dump_ldflags: + @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)" + nt_password_hash: $(NOBJS) $(Q)$(CC) $(LDFLAGS) -o nt_password_hash $(NOBJS) $(LIBS_n) @$(E) " LD " $@ diff --git a/hostapd/main.c b/hostapd/main.c index 08896ffe2..90424d5bd 100644 --- a/hostapd/main.c +++ b/hostapd/main.c @@ -592,6 +592,11 @@ fail: return -1; } +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) @@ -682,6 +687,8 @@ int main(int argc, char *argv[]) return -1; #endif /* CONFIG_DPP */ + wpa_supplicant_event = hostapd_wpa_event; + wpa_supplicant_event_global = hostapd_wpa_event_global; for (;;) { c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:vg:G:"); if (c < 0) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index 34ca379ed..366cfc08a 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -1669,8 +1669,8 @@ err: #endif /* CONFIG_OWE */ -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, - union wpa_event_data *data) +void hostapd_wpa_event(void *ctx, enum wpa_event_type event, + union wpa_event_data *data) { struct hostapd_data *hapd = ctx; #ifndef CONFIG_NO_STDOUT_DEBUG @@ -1915,7 +1915,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, } -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; diff --git a/src/drivers/driver.h b/src/drivers/driver.h index d73ff62c0..f35e3fdad 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -5657,8 +5657,8 @@ union wpa_event_data { * Driver wrapper code should call this function whenever an event is received * from the driver. */ -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, - union wpa_event_data *data); +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 @@ -5670,7 +5670,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, * 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); /* diff --git a/src/drivers/drivers.c b/src/drivers/drivers.c index e95df6ddb..9071da3cf 100644 --- a/src/drivers/drivers.c +++ b/src/drivers/drivers.c @@ -10,6 +10,10 @@ #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); const struct wpa_driver_ops *const wpa_drivers[] = { diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index f1384d5fa..3d05870bd 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -27,6 +27,7 @@ CFLAGS += -I$(abspath ../src) CFLAGS += -I$(abspath ../src/utils) -include .config +-include $(if $(MULTICALL),../hostapd/.config) ifndef CONFIG_NO_GITVER # Add VERSION_STR postfix for builds from a git repository @@ -363,7 +364,9 @@ endif ifdef CONFIG_IBSS_RSN NEED_RSN_AUTHENTICATOR=y CFLAGS += -DCONFIG_IBSS_RSN +ifndef MULTICALL CFLAGS += -DCONFIG_NO_VLAN +endif OBJS += ibss_rsn.o endif @@ -892,6 +895,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS LIBS += -ldl -rdynamic endif +else + ifdef MULTICALL + OBJS += ../src/eap_common/eap_common.o + endif endif ifdef CONFIG_AP @@ -899,9 +906,11 @@ NEED_EAP_COMMON=y NEED_RSN_AUTHENTICATOR=y CFLAGS += -DCONFIG_AP OBJS += ap.o +ifndef MULTICALL CFLAGS += -DCONFIG_NO_RADIUS CFLAGS += -DCONFIG_NO_ACCOUNTING CFLAGS += -DCONFIG_NO_VLAN +endif OBJS += ../src/ap/hostapd.o OBJS += ../src/ap/wpa_auth_glue.o OBJS += ../src/ap/utils.o @@ -983,6 +992,12 @@ endif ifdef CONFIG_HS20 OBJS += ../src/ap/hs20.o endif +else + ifdef MULTICALL + OBJS += ../src/eap_server/eap_server.o + OBJS += ../src/eap_server/eap_server_identity.o + OBJS += ../src/eap_server/eap_server_methods.o + endif endif ifdef CONFIG_MBO @@ -991,7 +1006,9 @@ CFLAGS += -DCONFIG_MBO endif ifdef NEED_RSN_AUTHENTICATOR +ifndef MULTICALL CFLAGS += -DCONFIG_NO_RADIUS +endif NEED_AES_WRAP=y OBJS += ../src/ap/wpa_auth.o OBJS += ../src/ap/wpa_auth_ie.o @@ -1899,6 +1916,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config +wpa_supplicant_multi.a: .config $(BCHECK) $(OBJS) $(EXTRA_progs) + $(Q)$(CC) -c -o wpa_supplicant_multi.o -Dmain=wpa_supplicant_main $(CFLAGS) main.c + @$(E) " CC " $< + @rm -f $@ + @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS) + wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) @$(E) " LD " $@ @@ -1999,6 +2022,12 @@ endif $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ @$(E) " sed" $< +dump_cflags: + @printf "%s " "$(CFLAGS)" + +dump_ldflags: + @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)" + wpa_supplicant.exe: wpa_supplicant mv -f $< $@ wpa_cli.exe: wpa_cli diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c index 524724f19..fe18dfd73 100644 --- a/wpa_supplicant/eapol_test.c +++ b/wpa_supplicant/eapol_test.c @@ -30,7 +30,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 }; @@ -1292,6 +1297,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[]) { @@ -1312,6 +1321,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)); diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 87dad0811..067f76b48 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -4184,8 +4184,8 @@ static void wpas_event_assoc_reject(struct wpa_supplicant *wpa_s, } -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, - union wpa_event_data *data) +void supplicant_event(void *ctx, enum wpa_event_type event, + union wpa_event_data *data) { struct wpa_supplicant *wpa_s = ctx; int resched; @@ -4967,7 +4967,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, } -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; diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c index b3ad45eca..55630a5c7 100644 --- a/wpa_supplicant/wpa_priv.c +++ b/wpa_supplicant/wpa_priv.c @@ -1031,8 +1031,8 @@ static void wpa_priv_send_ft_response(struct wpa_priv_interface *iface, } -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, - union wpa_event_data *data) +static void supplicant_event(void *ctx, enum wpa_event_type event, + union wpa_event_data *data) { struct wpa_priv_interface *iface = ctx; @@ -1095,7 +1095,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, } -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; @@ -1207,6 +1207,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(); os_memset(&global, 0, sizeof(global)); diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 578f274a9..4f95917c6 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -6096,7 +6096,6 @@ struct wpa_interface * wpa_supplicant_match_iface(struct wpa_global *global, return NULL; } - /** * wpa_supplicant_match_existing - Match existing interfaces * @global: Pointer to global data from wpa_supplicant_init() @@ -6133,6 +6132,11 @@ static int wpa_supplicant_match_existing(struct wpa_global *global) #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 @@ -6389,6 +6393,8 @@ struct wpa_global * wpa_supplicant_init(struct wpa_params *params) #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);