OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 34... Line 34...
34 +CFLAGS += $(DRV_AP_CFLAGS) $(if $(MULTICALL),$(DRV_WPA_CFLAGS)) 34 +CFLAGS += $(DRV_AP_CFLAGS) $(if $(MULTICALL),$(DRV_WPA_CFLAGS))
35 +LDFLAGS += $(DRV_AP_LDFLAGS) $(if $(MULTICALL),$(DRV_WPA_LDFLAGS)) 35 +LDFLAGS += $(DRV_AP_LDFLAGS) $(if $(MULTICALL),$(DRV_WPA_LDFLAGS))
36 LIBS += $(DRV_AP_LIBS) 36 LIBS += $(DRV_AP_LIBS)
Line 37... Line 37...
37 37
38 ifdef CONFIG_L2_PACKET 38 ifdef CONFIG_L2_PACKET
Line 39... Line 39...
39 @@ -1274,6 +1280,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR) 39 @@ -1270,6 +1276,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
Line 40... Line 40...
40 40
41 BCHECK=../src/drivers/build.hostapd 41 BCHECK=../src/drivers/build.hostapd
Line 47... Line 47...
47 + @$(AR) cr $@ hostapd_multi.o $(OBJS) 47 + @$(AR) cr $@ hostapd_multi.o $(OBJS)
48 + 48 +
49 hostapd: $(BCHECK) $(OBJS) 49 hostapd: $(BCHECK) $(OBJS)
50 $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) 50 $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
51 @$(E) " LD " $@ 51 @$(E) " LD " $@
52 @@ -1316,6 +1328,12 @@ ifeq ($(CONFIG_TLS), linux) 52 @@ -1315,6 +1327,12 @@ ifeq ($(CONFIG_TLS), linux)
53 HOBJS += ../src/crypto/crypto_linux.o 53 HOBJS += ../src/crypto/crypto_linux.o
54 endif 54 endif
Line 55... Line 55...
55 55
56 +dump_cflags: 56 +dump_cflags:
Line 126... Line 126...
126 CFLAGS += -DCONFIG_NO_RADIUS 126 CFLAGS += -DCONFIG_NO_RADIUS
127 +endif 127 +endif
128 NEED_AES_WRAP=y 128 NEED_AES_WRAP=y
129 OBJS += ../src/ap/wpa_auth.o 129 OBJS += ../src/ap/wpa_auth.o
130 OBJS += ../src/ap/wpa_auth_ie.o 130 OBJS += ../src/ap/wpa_auth_ie.o
131 @@ -1888,6 +1905,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) 131 @@ -1887,6 +1904,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
Line 132... Line 132...
132 132
Line 133... Line 133...
133 $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config 133 $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
134 134
Line 139... Line 139...
139 + @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS) 139 + @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS)
140 + 140 +
141 wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) 141 wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
142 $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) 142 $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
143 @$(E) " LD " $@ 143 @$(E) " LD " $@
144 @@ -1990,6 +2013,12 @@ endif 144 @@ -1989,6 +2012,12 @@ endif
145 -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@ 145 -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
146 @$(E) " sed" $< 146 @$(E) " sed" $<
Line 147... Line 147...
147 147
148 +dump_cflags: 148 +dump_cflags:
Line 154... Line 154...
154 wpa_supplicant.exe: wpa_supplicant 154 wpa_supplicant.exe: wpa_supplicant
155 mv -f $< $@ 155 mv -f $< $@
156 wpa_cli.exe: wpa_cli 156 wpa_cli.exe: wpa_cli
157 --- a/src/drivers/driver.h 157 --- a/src/drivers/driver.h
158 +++ b/src/drivers/driver.h 158 +++ b/src/drivers/driver.h
159 @@ -5476,8 +5476,8 @@ union wpa_event_data { 159 @@ -5430,8 +5430,8 @@ union wpa_event_data {
160 * Driver wrapper code should call this function whenever an event is received 160 * Driver wrapper code should call this function whenever an event is received
161 * from the driver. 161 * from the driver.
162 */ 162 */
163 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, 163 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
164 - union wpa_event_data *data); 164 - union wpa_event_data *data);
165 +extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event, 165 +extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
166 + union wpa_event_data *data); 166 + union wpa_event_data *data);
Line 167... Line 167...
167 167
168 /** 168 /**
169 * wpa_supplicant_event_global - Report a driver event for wpa_supplicant 169 * wpa_supplicant_event_global - Report a driver event for wpa_supplicant
170 @@ -5489,7 +5489,7 @@ void wpa_supplicant_event(void *ctx, enu 170 @@ -5443,7 +5443,7 @@ void wpa_supplicant_event(void *ctx, enu
171 * Same as wpa_supplicant_event(), but we search for the interface in 171 * Same as wpa_supplicant_event(), but we search for the interface in
172 * wpa_global. 172 * wpa_global.
173 */ 173 */
174 -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event, 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, 175 +extern void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
Line 176... Line 176...
176 union wpa_event_data *data); 176 union wpa_event_data *data);
177 177
178 /* 178 /*
179 --- a/src/ap/drv_callbacks.c 179 --- a/src/ap/drv_callbacks.c
180 +++ b/src/ap/drv_callbacks.c 180 +++ b/src/ap/drv_callbacks.c
Line 181... Line 181...
181 @@ -1527,8 +1527,8 @@ static void hostapd_event_wds_sta_interf 181 @@ -1473,8 +1473,8 @@ static void hostapd_event_dfs_cac_starte
182 } 182 #endif /* NEED_AP_MLME */
183 183
184 184
185 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, 185 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
186 - union wpa_event_data *data) 186 - union wpa_event_data *data)
187 +void hostapd_wpa_event(void *ctx, enum wpa_event_type event, 187 +void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
188 + union wpa_event_data *data) 188 + union wpa_event_data *data)
189 { 189 {
Line 190... Line 190...
190 struct hostapd_data *hapd = ctx; 190 struct hostapd_data *hapd = ctx;
191 #ifndef CONFIG_NO_STDOUT_DEBUG 191 #ifndef CONFIG_NO_STDOUT_DEBUG
Line 229... Line 229...
229 wpa_priv_fd_workaround(); 229 wpa_priv_fd_workaround();
Line 230... Line 230...
230 230
231 os_memset(&global, 0, sizeof(global)); 231 os_memset(&global, 0, sizeof(global));
232 --- a/wpa_supplicant/events.c 232 --- a/wpa_supplicant/events.c
233 +++ b/wpa_supplicant/events.c 233 +++ b/wpa_supplicant/events.c
234 @@ -4026,8 +4026,8 @@ static void wpas_event_assoc_reject(stru 234 @@ -3812,8 +3812,8 @@ static void wpa_supplicant_event_assoc_a
Line 235... Line 235...
235 } 235 }
236 236
237 237
238 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event, 238 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
239 - union wpa_event_data *data) 239 - union wpa_event_data *data)
240 +void supplicant_event(void *ctx, enum wpa_event_type event, 240 +void supplicant_event(void *ctx, enum wpa_event_type event,
241 + union wpa_event_data *data) 241 + union wpa_event_data *data)
242 { 242 {
243 struct wpa_supplicant *wpa_s = ctx; 243 struct wpa_supplicant *wpa_s = ctx;
Line 244... Line 244...
244 int resched; 244 int resched;
245 @@ -4796,7 +4796,7 @@ void wpa_supplicant_event(void *ctx, enu 245 @@ -4632,7 +4632,7 @@ void wpa_supplicant_event(void *ctx, enu
246 } 246 }
247 247
248 248
249 -void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event, 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, 250 +void supplicant_event_global(void *ctx, enum wpa_event_type event,
251 union wpa_event_data *data) 251 union wpa_event_data *data)
252 { 252 {
253 struct wpa_supplicant *wpa_s; 253 struct wpa_supplicant *wpa_s;
Line 254... Line 254...
254 --- a/wpa_supplicant/wpa_supplicant.c 254 --- a/wpa_supplicant/wpa_supplicant.c
255 +++ b/wpa_supplicant/wpa_supplicant.c 255 +++ b/wpa_supplicant/wpa_supplicant.c
256 @@ -5861,7 +5861,6 @@ struct wpa_interface * wpa_supplicant_ma 256 @@ -5736,7 +5736,6 @@ struct wpa_interface * wpa_supplicant_ma
257 return NULL; 257 return NULL;
258 } 258 }
Line 259... Line 259...
259 259
Line 260... Line 260...
260 - 260 -
261 /** 261 /**
Line 271... Line 271...
271 +extern void supplicant_event_global(void *ctx, enum wpa_event_type event, 271 +extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
272 + union wpa_event_data *data); 272 + union wpa_event_data *data);
Line 273... Line 273...
273 273
274 /** 274 /**
275 * wpa_supplicant_add_iface - Add a new network interface 275 * wpa_supplicant_add_iface - Add a new network interface
276 @@ -6154,6 +6158,8 @@ struct wpa_global * wpa_supplicant_init( 276 @@ -6029,6 +6033,8 @@ struct wpa_global * wpa_supplicant_init(
277 #ifndef CONFIG_NO_WPA_MSG 277 #ifndef CONFIG_NO_WPA_MSG
278 wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); 278 wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
279 #endif /* CONFIG_NO_WPA_MSG */ 279 #endif /* CONFIG_NO_WPA_MSG */
280 + wpa_supplicant_event = supplicant_event; 280 + wpa_supplicant_event = supplicant_event;