OpenWrt – Blame information for rev 3
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 1 | --- a/hostapd/Makefile |
2 | +++ b/hostapd/Makefile |
||
3 | @@ -28,6 +28,7 @@ CFLAGS += -I$(abspath ../src/utils) |
||
4 | export BINDIR ?= /usr/local/bin/ |
||
5 | |||
6 | -include .config |
||
7 | +-include $(if $(MULTICALL), ../wpa_supplicant/.config) |
||
8 | |||
9 | ifndef CONFIG_NO_GITVER |
||
10 | # Add VERSION_STR postfix for builds from a git repository |
||
11 | @@ -198,7 +199,8 @@ endif |
||
12 | |||
13 | ifdef CONFIG_NO_VLAN |
||
14 | CFLAGS += -DCONFIG_NO_VLAN |
||
15 | -else |
||
16 | +endif |
||
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 | @@ -354,10 +356,14 @@ CFLAGS += -DCONFIG_MBO |
||
22 | OBJS += ../src/ap/mbo_ap.o |
||
23 | endif |
||
24 | |||
25 | +ifndef MULTICALL |
||
26 | +CFLAGS += -DNO_SUPPLICANT |
||
27 | +endif |
||
28 | + |
||
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) |
||
37 | |||
38 | ifdef CONFIG_L2_PACKET |
||
3 | office | 39 | @@ -1270,6 +1276,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR) |
1 | office | 40 | |
41 | BCHECK=../src/drivers/build.hostapd |
||
42 | |||
43 | +hostapd_multi.a: $(BCHECK) $(OBJS) |
||
44 | + $(Q)$(CC) -c -o hostapd_multi.o -Dmain=hostapd_main $(CFLAGS) main.c |
||
45 | + @$(E) " CC " $< |
||
46 | + @rm -f $@ |
||
47 | + @$(AR) cr $@ hostapd_multi.o $(OBJS) |
||
48 | + |
||
49 | hostapd: $(BCHECK) $(OBJS) |
||
50 | $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) |
||
51 | @$(E) " LD " $@ |
||
3 | office | 52 | @@ -1315,6 +1327,12 @@ ifeq ($(CONFIG_TLS), linux) |
1 | office | 53 | HOBJS += ../src/crypto/crypto_linux.o |
54 | endif |
||
55 | |||
56 | +dump_cflags: |
||
57 | + @printf "%s " "$(CFLAGS)" |
||
58 | + |
||
59 | +dump_ldflags: |
||
60 | + @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)" |
||
61 | + |
||
62 | nt_password_hash: $(NOBJS) |
||
63 | $(Q)$(CC) $(LDFLAGS) -o nt_password_hash $(NOBJS) $(LIBS_n) |
||
64 | @$(E) " LD " $@ |
||
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) |
||
69 | |||
70 | -include .config |
||
71 | +-include $(if $(MULTICALL),../hostapd/.config) |
||
72 | |||
73 | ifndef CONFIG_NO_GITVER |
||
74 | # Add VERSION_STR postfix for builds from a git repository |
||
75 | @@ -354,7 +355,9 @@ endif |
||
76 | ifdef CONFIG_IBSS_RSN |
||
77 | NEED_RSN_AUTHENTICATOR=y |
||
78 | CFLAGS += -DCONFIG_IBSS_RSN |
||
79 | +ifndef MULTICALL |
||
80 | CFLAGS += -DCONFIG_NO_VLAN |
||
81 | +endif |
||
82 | OBJS += ibss_rsn.o |
||
83 | endif |
||
84 | |||
85 | @@ -862,6 +865,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS |
||
86 | CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS |
||
87 | LIBS += -ldl -rdynamic |
||
88 | endif |
||
89 | +else |
||
90 | + ifdef MULTICALL |
||
91 | + OBJS += ../src/eap_common/eap_common.o |
||
92 | + endif |
||
93 | endif |
||
94 | |||
95 | ifdef CONFIG_AP |
||
96 | @@ -869,9 +876,11 @@ NEED_EAP_COMMON=y |
||
97 | NEED_RSN_AUTHENTICATOR=y |
||
98 | CFLAGS += -DCONFIG_AP |
||
99 | OBJS += ap.o |
||
100 | +ifndef MULTICALL |
||
101 | CFLAGS += -DCONFIG_NO_RADIUS |
||
102 | CFLAGS += -DCONFIG_NO_ACCOUNTING |
||
103 | CFLAGS += -DCONFIG_NO_VLAN |
||
104 | +endif |
||
105 | OBJS += ../src/ap/hostapd.o |
||
106 | OBJS += ../src/ap/wpa_auth_glue.o |
||
107 | OBJS += ../src/ap/utils.o |
||
108 | @@ -953,6 +962,12 @@ endif |
||
109 | ifdef CONFIG_HS20 |
||
110 | OBJS += ../src/ap/hs20.o |
||
111 | endif |
||
112 | +else |
||
113 | + ifdef MULTICALL |
||
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 |
||
117 | + endif |
||
118 | endif |
||
119 | |||
120 | ifdef CONFIG_MBO |
||
121 | @@ -961,7 +976,9 @@ CFLAGS += -DCONFIG_MBO |
||
122 | endif |
||
123 | |||
124 | ifdef NEED_RSN_AUTHENTICATOR |
||
125 | +ifndef MULTICALL |
||
126 | CFLAGS += -DCONFIG_NO_RADIUS |
||
127 | +endif |
||
128 | NEED_AES_WRAP=y |
||
129 | OBJS += ../src/ap/wpa_auth.o |
||
130 | OBJS += ../src/ap/wpa_auth_ie.o |
||
3 | office | 131 | @@ -1887,6 +1904,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) |
1 | office | 132 | |
133 | $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config |
||
134 | |||
135 | +wpa_supplicant_multi.a: .config $(BCHECK) $(OBJS) $(EXTRA_progs) |
||
136 | + $(Q)$(CC) -c -o wpa_supplicant_multi.o -Dmain=wpa_supplicant_main $(CFLAGS) main.c |
||
137 | + @$(E) " CC " $< |
||
138 | + @rm -f $@ |
||
139 | + @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS) |
||
140 | + |
||
141 | wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) |
||
142 | $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) |
||
143 | @$(E) " LD " $@ |
||
3 | office | 144 | @@ -1989,6 +2012,12 @@ endif |
1 | office | 145 | -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@ |
146 | @$(E) " sed" $< |
||
147 | |||
148 | +dump_cflags: |
||
149 | + @printf "%s " "$(CFLAGS)" |
||
150 | + |
||
151 | +dump_ldflags: |
||
152 | + @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)" |
||
153 | + |
||
154 | wpa_supplicant.exe: wpa_supplicant |
||
155 | mv -f $< $@ |
||
156 | wpa_cli.exe: wpa_cli |
||
157 | --- a/src/drivers/driver.h |
||
158 | +++ b/src/drivers/driver.h |
||
3 | office | 159 | @@ -5430,8 +5430,8 @@ union wpa_event_data { |
1 | office | 160 | * Driver wrapper code should call this function whenever an event is received |
161 | * from the driver. |
||
162 | */ |
||
163 | -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, |
||
164 | - union wpa_event_data *data); |
||
165 | +extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event, |
||
166 | + union wpa_event_data *data); |
||
167 | |||
168 | /** |
||
169 | * wpa_supplicant_event_global - Report a driver event for wpa_supplicant |
||
3 | office | 170 | @@ -5443,7 +5443,7 @@ void wpa_supplicant_event(void *ctx, enu |
1 | office | 171 | * Same as wpa_supplicant_event(), but we search for the interface in |
172 | * wpa_global. |
||
173 | */ |
||
174 | -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event, |
||
175 | +extern void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event, |
||
176 | union wpa_event_data *data); |
||
177 | |||
178 | /* |
||
179 | --- a/src/ap/drv_callbacks.c |
||
180 | +++ b/src/ap/drv_callbacks.c |
||
3 | office | 181 | @@ -1473,8 +1473,8 @@ static void hostapd_event_dfs_cac_starte |
182 | #endif /* NEED_AP_MLME */ |
||
1 | office | 183 | |
184 | |||
185 | -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, |
||
186 | - union wpa_event_data *data) |
||
187 | +void hostapd_wpa_event(void *ctx, enum wpa_event_type event, |
||
188 | + union wpa_event_data *data) |
||
189 | { |
||
190 | struct hostapd_data *hapd = ctx; |
||
191 | #ifndef CONFIG_NO_STDOUT_DEBUG |
||
3 | office | 192 | @@ -1694,7 +1694,7 @@ void wpa_supplicant_event(void *ctx, enu |
1 | office | 193 | } |
194 | |||
195 | |||
196 | -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event, |
||
197 | +void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event, |
||
198 | union wpa_event_data *data) |
||
199 | { |
||
200 | struct hapd_interfaces *interfaces = ctx; |
||
201 | --- a/wpa_supplicant/wpa_priv.c |
||
202 | +++ b/wpa_supplicant/wpa_priv.c |
||
203 | @@ -1031,8 +1031,8 @@ static void wpa_priv_send_ft_response(st |
||
204 | } |
||
205 | |||
206 | |||
207 | -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, |
||
208 | - union wpa_event_data *data) |
||
209 | +static void supplicant_event(void *ctx, enum wpa_event_type event, |
||
210 | + union wpa_event_data *data) |
||
211 | { |
||
212 | struct wpa_priv_interface *iface = ctx; |
||
213 | |||
214 | @@ -1095,7 +1095,7 @@ void wpa_supplicant_event(void *ctx, enu |
||
215 | } |
||
216 | |||
217 | |||
218 | -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event, |
||
219 | +void supplicant_event_global(void *ctx, enum wpa_event_type event, |
||
220 | union wpa_event_data *data) |
||
221 | { |
||
222 | struct wpa_priv_global *global = ctx; |
||
223 | @@ -1207,6 +1207,8 @@ int main(int argc, char *argv[]) |
||
224 | if (os_program_init()) |
||
225 | return -1; |
||
226 | |||
227 | + wpa_supplicant_event = supplicant_event; |
||
228 | + wpa_supplicant_event_global = supplicant_event_global; |
||
229 | wpa_priv_fd_workaround(); |
||
230 | |||
231 | os_memset(&global, 0, sizeof(global)); |
||
232 | --- a/wpa_supplicant/events.c |
||
233 | +++ b/wpa_supplicant/events.c |
||
3 | office | 234 | @@ -3812,8 +3812,8 @@ static void wpa_supplicant_event_assoc_a |
1 | office | 235 | } |
236 | |||
237 | |||
238 | -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, |
||
239 | - union wpa_event_data *data) |
||
240 | +void supplicant_event(void *ctx, enum wpa_event_type event, |
||
241 | + union wpa_event_data *data) |
||
242 | { |
||
243 | struct wpa_supplicant *wpa_s = ctx; |
||
244 | int resched; |
||
3 | office | 245 | @@ -4632,7 +4632,7 @@ void wpa_supplicant_event(void *ctx, enu |
1 | office | 246 | } |
247 | |||
248 | |||
249 | -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event, |
||
250 | +void supplicant_event_global(void *ctx, enum wpa_event_type event, |
||
251 | union wpa_event_data *data) |
||
252 | { |
||
253 | struct wpa_supplicant *wpa_s; |
||
254 | --- a/wpa_supplicant/wpa_supplicant.c |
||
255 | +++ b/wpa_supplicant/wpa_supplicant.c |
||
3 | office | 256 | @@ -5736,7 +5736,6 @@ struct wpa_interface * wpa_supplicant_ma |
1 | office | 257 | return NULL; |
258 | } |
||
259 | |||
260 | - |
||
261 | /** |
||
262 | * wpa_supplicant_match_existing - Match existing interfaces |
||
263 | * @global: Pointer to global data from wpa_supplicant_init() |
||
3 | office | 264 | @@ -5773,6 +5772,11 @@ static int wpa_supplicant_match_existing |
1 | office | 265 | |
266 | #endif /* CONFIG_MATCH_IFACE */ |
||
267 | |||
268 | +extern void supplicant_event(void *ctx, enum wpa_event_type event, |
||
269 | + union wpa_event_data *data); |
||
270 | + |
||
271 | +extern void supplicant_event_global(void *ctx, enum wpa_event_type event, |
||
272 | + union wpa_event_data *data); |
||
273 | |||
274 | /** |
||
275 | * wpa_supplicant_add_iface - Add a new network interface |
||
3 | office | 276 | @@ -6029,6 +6033,8 @@ struct wpa_global * wpa_supplicant_init( |
1 | office | 277 | #ifndef CONFIG_NO_WPA_MSG |
278 | wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); |
||
279 | #endif /* CONFIG_NO_WPA_MSG */ |
||
280 | + wpa_supplicant_event = supplicant_event; |
||
281 | + wpa_supplicant_event_global = supplicant_event_global; |
||
282 | |||
283 | if (params->wpa_debug_file_path) |
||
284 | wpa_debug_open_file(params->wpa_debug_file_path); |
||
285 | --- a/hostapd/main.c |
||
286 | +++ b/hostapd/main.c |
||
287 | @@ -591,6 +591,11 @@ fail: |
||
288 | return -1; |
||
289 | } |
||
290 | |||
291 | +void hostapd_wpa_event(void *ctx, enum wpa_event_type event, |
||
292 | + union wpa_event_data *data); |
||
293 | + |
||
294 | +void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event, |
||
295 | + union wpa_event_data *data); |
||
296 | |||
297 | #ifdef CONFIG_WPS |
||
298 | static int gen_uuid(const char *txt_addr) |
||
299 | @@ -674,6 +679,8 @@ int main(int argc, char *argv[]) |
||
300 | hostapd_dpp_init_global(&interfaces); |
||
301 | #endif /* CONFIG_DPP */ |
||
302 | |||
303 | + wpa_supplicant_event = hostapd_wpa_event; |
||
304 | + wpa_supplicant_event_global = hostapd_wpa_event_global; |
||
305 | for (;;) { |
||
306 | c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:vg:G:"); |
||
307 | if (c < 0) |
||
308 | --- a/src/drivers/drivers.c |
||
309 | +++ b/src/drivers/drivers.c |
||
310 | @@ -10,6 +10,10 @@ |
||
311 | #include "utils/common.h" |
||
312 | #include "driver.h" |
||
313 | |||
314 | +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event, |
||
315 | + union wpa_event_data *data); |
||
316 | +void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event, |
||
317 | + union wpa_event_data *data); |
||
318 | |||
319 | const struct wpa_driver_ops *const wpa_drivers[] = |
||
320 | { |
||
321 | --- a/wpa_supplicant/eapol_test.c |
||
322 | +++ b/wpa_supplicant/eapol_test.c |
||
323 | @@ -29,7 +29,12 @@ |
||
324 | #include "ctrl_iface.h" |
||
325 | #include "pcsc_funcs.h" |
||
326 | #include "wpas_glue.h" |
||
327 | +#include "drivers/driver.h" |
||
328 | |||
329 | +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event, |
||
330 | + union wpa_event_data *data); |
||
331 | +void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event, |
||
332 | + union wpa_event_data *data); |
||
333 | |||
334 | const struct wpa_driver_ops *const wpa_drivers[] = { NULL }; |
||
335 | |||
336 | @@ -1295,6 +1300,10 @@ static void usage(void) |
||
337 | "option several times.\n"); |
||
338 | } |
||
339 | |||
340 | +extern void supplicant_event(void *ctx, enum wpa_event_type event, |
||
341 | + union wpa_event_data *data); |
||
342 | +extern void supplicant_event_global(void *ctx, enum wpa_event_type event, |
||
343 | + union wpa_event_data *data); |
||
344 | |||
345 | int main(int argc, char *argv[]) |
||
346 | { |
||
347 | @@ -1315,6 +1324,8 @@ int main(int argc, char *argv[]) |
||
348 | if (os_program_init()) |
||
349 | return -1; |
||
350 | |||
351 | + wpa_supplicant_event = supplicant_event; |
||
352 | + wpa_supplicant_event_global = supplicant_event_global; |
||
353 | hostapd_logger_register_cb(hostapd_logger_cb); |
||
354 | |||
355 | os_memset(&eapol_test, 0, sizeof(eapol_test)); |