DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add option to build a multicall binary

Browse source 
This allows building both hostapd and wpa_supplicant as a single binary
(wpad).
This commit is contained in:
Felix Fietkau 2010-01-23 08:28:26 +00:00 • committed by sinavir
parent 500ceaeb52
commit 433ed95af3
No known key found for this signature in database
10 changed files with 94 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
hostapd/Makefile
View file

@ -1,6 +1,7 @@
ALL=hostapd hostapd_cli
CONFIG_FILE = .config
-include $(if $(MULTICALL), ../wpa_supplicant/.config)
include ../src/build.rules
ifdef LIBS
@ -200,7 +201,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
@ -359,10 +361,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
@ -1393,6 +1399,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)/,$(ALL))
_OBJS_VAR := OBJS
include ../src/objs.mk
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: $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
@ -1473,6 +1485,12 @@ include ../src/objs.mk
_OBJS_VAR := SOBJS
include ../src/objs.mk
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 " $@

7
hostapd/main.c
View file

@ -696,6 +696,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)
@ -817,6 +822,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:q");
if (c < 0)

6
src/ap/drv_callbacks.c
View file

@ -2520,8 +2520,8 @@ static void hostapd_mld_iface_disable(struct hostapd_data *hapd)
#endif /* CONFIG_IEEE80211BE */
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;
struct sta_info *sta;
@ -2879,7 +2879,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;

6
src/drivers/driver.h
View file

@ -6974,8 +6974,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
@ -6987,7 +6987,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);
/*

4
src/drivers/drivers.c
View file

@ -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[] =
{

29
wpa_supplicant/Makefile
View file

@ -10,6 +10,7 @@ ALL += dbus/fi.w1.wpa_supplicant1.service
EXTRA_TARGETS=dynamic_eap_methods
CONFIG_FILE=.config
-include $(if $(MULTICALL),../hostapd/.config)
include ../src/build.rules
ifdef CONFIG_BUILD_PASN_SO
@ -389,7 +390,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
@ -981,6 +984,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
@ -988,9 +995,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
@ -1081,6 +1090,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
@ -1090,7 +1105,9 @@ NEED_GAS=y
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
@ -2080,6 +2097,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
_OBJS_VAR := OBJS
include ../src/objs.mk
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 " $@
@ -2212,6 +2235,12 @@ eap_gpsk.so: $(SRC_EAP_GPSK)
$(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

11
wpa_supplicant/eapol_test.c
View file

@ -31,7 +31,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 };
@ -1328,6 +1333,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[])
{
@ -1351,6 +1360,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));

6
wpa_supplicant/events.c
View file

@ -6131,8 +6131,8 @@ static int wpas_pasn_auth(struct wpa_supplicant *wpa_s,
#endif /* CONFIG_PASN */
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;
@ -7084,7 +7084,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;

8
wpa_supplicant/wpa_priv.c
View file

@ -1042,8 +1042,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;
@ -1106,7 +1106,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;
@ -1220,6 +1220,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));

8
wpa_supplicant/wpa_supplicant.c
View file

@ -7787,7 +7787,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()
@ -7822,6 +7821,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
@ -8078,6 +8082,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);