3 @@ -28,6 +28,7 @@ CFLAGS += -I$(abspath ../src/utils)
4 export BINDIR ?= /usr/local/bin/
7 +-include $(if $(MULTICALL), ../wpa_supplicant/.config)
9 ifndef CONFIG_NO_GITVER
10 # Add VERSION_STR postfix for builds from a git repository
11 @@ -193,7 +194,8 @@ endif
14 CFLAGS += -DCONFIG_NO_VLAN
17 +ifneq ($(findstring CONFIG_NO_VLAN,$(CFLAGS)), CONFIG_NO_VLAN)
18 OBJS += ../src/ap/vlan_init.o
19 OBJS += ../src/ap/vlan_ifconfig.o
20 OBJS += ../src/ap/vlan.o
21 @@ -318,10 +320,14 @@ CFLAGS += -DCONFIG_MBO
22 OBJS += ../src/ap/mbo_ap.o
26 +CFLAGS += -DNO_SUPPLICANT
29 include ../src/drivers/drivers.mak
30 -OBJS += $(DRV_AP_OBJS)
31 -CFLAGS += $(DRV_AP_CFLAGS)
32 -LDFLAGS += $(DRV_AP_LDFLAGS)
33 +OBJS += $(sort $(DRV_AP_OBJS) $(if $(MULTICALL),$(DRV_WPA_OBJS)))
34 +CFLAGS += $(DRV_AP_CFLAGS) $(if $(MULTICALL),$(DRV_WPA_CFLAGS))
35 +LDFLAGS += $(DRV_AP_LDFLAGS) $(if $(MULTICALL),$(DRV_WPA_LDFLAGS))
36 LIBS += $(DRV_AP_LIBS)
38 ifdef CONFIG_L2_PACKET
39 @@ -1054,6 +1060,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
41 BCHECK=../src/drivers/build.hostapd
43 +hostapd_multi.a: $(BCHECK) $(OBJS)
44 + $(Q)$(CC) -c -o hostapd_multi.o -Dmain=hostapd_main $(CFLAGS) main.c
47 + @$(AR) cr $@ hostapd_multi.o $(OBJS)
49 hostapd: $(BCHECK) $(OBJS)
50 $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
52 @@ -1095,6 +1107,12 @@ HOBJS += ../src/crypto/aes-internal.o
53 HOBJS += ../src/crypto/aes-internal-enc.o
57 + @printf "%s " "$(CFLAGS)"
60 + @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)"
62 nt_password_hash: $(NOBJS)
63 $(Q)$(CC) $(LDFLAGS) -o nt_password_hash $(NOBJS) $(LIBS_n)
65 --- a/wpa_supplicant/Makefile
66 +++ b/wpa_supplicant/Makefile
67 @@ -27,6 +27,7 @@ CFLAGS += -I$(abspath ../src)
68 CFLAGS += -I$(abspath ../src/utils)
71 +-include $(if $(MULTICALL),../hostapd/.config)
73 ifndef CONFIG_NO_GITVER
74 # Add VERSION_STR postfix for builds from a git repository
75 @@ -313,7 +314,9 @@ endif
77 NEED_RSN_AUTHENTICATOR=y
78 CFLAGS += -DCONFIG_IBSS_RSN
80 CFLAGS += -DCONFIG_NO_VLAN
85 @@ -804,6 +807,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
86 CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
87 LIBS += -ldl -rdynamic
91 + OBJS += ../src/eap_common/eap_common.o
96 @@ -824,9 +831,11 @@ NEED_EAP_COMMON=y
97 NEED_RSN_AUTHENTICATOR=y
101 CFLAGS += -DCONFIG_NO_RADIUS
102 CFLAGS += -DCONFIG_NO_ACCOUNTING
103 CFLAGS += -DCONFIG_NO_VLAN
105 OBJS += ../src/ap/hostapd.o
106 OBJS += ../src/ap/wpa_auth_glue.o
107 OBJS += ../src/ap/utils.o
108 @@ -899,10 +908,18 @@ endif
110 OBJS += ../src/ap/hs20.o
114 + OBJS += ../src/eap_server/eap_server.o
115 + OBJS += ../src/eap_server/eap_server_identity.o
116 + OBJS += ../src/eap_server/eap_server_methods.o
120 ifdef NEED_RSN_AUTHENTICATOR
122 CFLAGS += -DCONFIG_NO_RADIUS
125 OBJS += ../src/ap/wpa_auth.o
126 OBJS += ../src/ap/wpa_auth_ie.o
127 @@ -1685,6 +1702,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
129 $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
131 +wpa_supplicant_multi.a: .config $(BCHECK) $(OBJS) $(EXTRA_progs)
132 + $(Q)$(CC) -c -o wpa_supplicant_multi.o -Dmain=wpa_supplicant_main $(CFLAGS) main.c
135 + @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS)
137 wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
138 $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
140 @@ -1787,6 +1810,12 @@ endif
141 -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
145 + @printf "%s " "$(CFLAGS)"
148 + @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)"
150 wpa_supplicant.exe: wpa_supplicant
153 --- a/src/drivers/driver.h
154 +++ b/src/drivers/driver.h
155 @@ -4870,8 +4870,8 @@ union wpa_event_data {
156 * Driver wrapper code should call this function whenever an event is received
159 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
160 - union wpa_event_data *data);
161 +extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
162 + union wpa_event_data *data);
165 * wpa_supplicant_event_global - Report a driver event for wpa_supplicant
166 @@ -4883,7 +4883,7 @@ void wpa_supplicant_event(void *ctx, enu
167 * Same as wpa_supplicant_event(), but we search for the interface in
170 -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
171 +extern void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
172 union wpa_event_data *data);
175 --- a/src/ap/drv_callbacks.c
176 +++ b/src/ap/drv_callbacks.c
177 @@ -1164,8 +1164,8 @@ static void hostapd_event_dfs_cac_starte
178 #endif /* NEED_AP_MLME */
181 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
182 - union wpa_event_data *data)
183 +void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
184 + union wpa_event_data *data)
186 struct hostapd_data *hapd = ctx;
187 #ifndef CONFIG_NO_STDOUT_DEBUG
188 @@ -1374,7 +1374,7 @@ void wpa_supplicant_event(void *ctx, enu
192 -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
193 +void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
194 union wpa_event_data *data)
196 struct hapd_interfaces *interfaces = ctx;
197 --- a/wpa_supplicant/wpa_priv.c
198 +++ b/wpa_supplicant/wpa_priv.c
199 @@ -940,8 +940,8 @@ static void wpa_priv_send_ft_response(st
203 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
204 - union wpa_event_data *data)
205 +static void supplicant_event(void *ctx, enum wpa_event_type event,
206 + union wpa_event_data *data)
208 struct wpa_priv_interface *iface = ctx;
210 @@ -1010,7 +1010,7 @@ void wpa_supplicant_event(void *ctx, enu
214 -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
215 +void supplicant_event_global(void *ctx, enum wpa_event_type event,
216 union wpa_event_data *data)
218 struct wpa_priv_global *global = ctx;
219 @@ -1122,6 +1122,8 @@ int main(int argc, char *argv[])
220 if (os_program_init())
223 + wpa_supplicant_event = supplicant_event;
224 + wpa_supplicant_event_global = supplicant_event_global;
225 wpa_priv_fd_workaround();
227 os_memset(&global, 0, sizeof(global));
228 --- a/wpa_supplicant/events.c
229 +++ b/wpa_supplicant/events.c
230 @@ -3398,8 +3398,8 @@ static void wpa_supplicant_event_assoc_a
234 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
235 - union wpa_event_data *data)
236 +void supplicant_event(void *ctx, enum wpa_event_type event,
237 + union wpa_event_data *data)
239 struct wpa_supplicant *wpa_s = ctx;
241 @@ -4074,7 +4074,7 @@ void wpa_supplicant_event(void *ctx, enu
242 #endif /* CONFIG_AP */
244 case EVENT_ACS_CHANNEL_SELECTED:
246 +#if defined(CONFIG_ACS) && defined(CONFIG_AP)
247 if (!wpa_s->ap_iface)
249 hostapd_acs_channel_selected(wpa_s->ap_iface->bss[0],
250 @@ -4096,7 +4096,7 @@ void wpa_supplicant_event(void *ctx, enu
254 -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
255 +void supplicant_event_global(void *ctx, enum wpa_event_type event,
256 union wpa_event_data *data)
258 struct wpa_supplicant *wpa_s;
259 --- a/wpa_supplicant/wpa_supplicant.c
260 +++ b/wpa_supplicant/wpa_supplicant.c
261 @@ -5094,7 +5094,6 @@ struct wpa_interface * wpa_supplicant_ma
267 * wpa_supplicant_match_existing - Match existing interfaces
268 * @global: Pointer to global data from wpa_supplicant_init()
269 @@ -5131,6 +5130,11 @@ static int wpa_supplicant_match_existing
271 #endif /* CONFIG_MATCH_IFACE */
273 +extern void supplicant_event(void *ctx, enum wpa_event_type event,
274 + union wpa_event_data *data);
276 +extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
277 + union wpa_event_data *data);
280 * wpa_supplicant_add_iface - Add a new network interface
281 @@ -5386,6 +5390,8 @@ struct wpa_global * wpa_supplicant_init(
282 #ifndef CONFIG_NO_WPA_MSG
283 wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
284 #endif /* CONFIG_NO_WPA_MSG */
285 + wpa_supplicant_event = supplicant_event;
286 + wpa_supplicant_event_global = supplicant_event_global;
288 if (params->wpa_debug_file_path)
289 wpa_debug_open_file(params->wpa_debug_file_path);
292 @@ -583,6 +583,11 @@ fail:
296 +void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
297 + union wpa_event_data *data);
299 +void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
300 + union wpa_event_data *data);
303 static int gen_uuid(const char *txt_addr)
304 @@ -660,6 +665,8 @@ int main(int argc, char *argv[])
305 interfaces.global_ctrl_sock = -1;
306 dl_list_init(&interfaces.global_ctrl_dst);
308 + wpa_supplicant_event = hostapd_wpa_event;
309 + wpa_supplicant_event_global = hostapd_wpa_event_global;
311 c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:");
313 --- a/src/drivers/drivers.c
314 +++ b/src/drivers/drivers.c
316 #include "utils/common.h"
319 +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
320 + union wpa_event_data *data);
321 +void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
322 + union wpa_event_data *data);
324 const struct wpa_driver_ops *const wpa_drivers[] =
326 --- a/wpa_supplicant/eapol_test.c
327 +++ b/wpa_supplicant/eapol_test.c
329 #include "ctrl_iface.h"
330 #include "pcsc_funcs.h"
331 #include "wpas_glue.h"
332 +#include "drivers/driver.h"
334 +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
335 + union wpa_event_data *data);
336 +void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
337 + union wpa_event_data *data);
339 const struct wpa_driver_ops *const wpa_drivers[] = { NULL };
341 @@ -1295,6 +1300,10 @@ static void usage(void)
342 "option several times.\n");
345 +extern void supplicant_event(void *ctx, enum wpa_event_type event,
346 + union wpa_event_data *data);
347 +extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
348 + union wpa_event_data *data);
350 int main(int argc, char *argv[])
352 @@ -1315,6 +1324,8 @@ int main(int argc, char *argv[])
353 if (os_program_init())
356 + wpa_supplicant_event = supplicant_event;
357 + wpa_supplicant_event_global = supplicant_event_global;
358 hostapd_logger_register_cb(hostapd_logger_cb);
360 os_memset(&eapol_test, 0, sizeof(eapol_test));