projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: update to version 2018-12-02 (2.7)
[oweals/openwrt.git]
/
package
/
network
/
services
/
hostapd
/
patches
/
200-multicall.patch
diff --git
a/package/network/services/hostapd/patches/200-multicall.patch
b/package/network/services/hostapd/patches/200-multicall.patch
index 0d289d53a36853bb6f8963d312d9bc332c9a50eb..9c7936695a16f7595fd45df1284ed1d883879cae 100644
(file)
--- a/
package/network/services/hostapd/patches/200-multicall.patch
+++ b/
package/network/services/hostapd/patches/200-multicall.patch
@@
-36,7
+36,7
@@
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
-@@ -12
04,6 +121
0,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
+@@ -12
74,6 +128
0,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
BCHECK=../src/drivers/build.hostapd
BCHECK=../src/drivers/build.hostapd
@@
-49,7
+49,7
@@
hostapd: $(BCHECK) $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
hostapd: $(BCHECK) $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
-@@ -1
248,6 +1260
,12 @@ ifeq ($(CONFIG_TLS), linux)
+@@ -1
316,6 +1328
,12 @@ ifeq ($(CONFIG_TLS), linux)
HOBJS += ../src/crypto/crypto_linux.o
endif
HOBJS += ../src/crypto/crypto_linux.o
endif
@@
-72,7
+72,7
@@
ifndef CONFIG_NO_GITVER
# Add VERSION_STR postfix for builds from a git repository
ifndef CONFIG_NO_GITVER
# Add VERSION_STR postfix for builds from a git repository
-@@ -35
7,7 +358
,9 @@ endif
+@@ -35
4,7 +355
,9 @@ endif
ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN
ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN
@@
-82,7
+82,7
@@
OBJS += ibss_rsn.o
endif
OBJS += ibss_rsn.o
endif
-@@ -86
1,6 +864
,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
+@@ -86
2,6 +865
,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
@@
-93,7
+93,7
@@
endif
ifdef CONFIG_AP
endif
ifdef CONFIG_AP
-@@ -86
8,9 +875
,11 @@ NEED_EAP_COMMON=y
+@@ -86
9,9 +876
,11 @@ NEED_EAP_COMMON=y
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP
OBJS += ap.o
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP
OBJS += ap.o
@@
-105,7
+105,7
@@
OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o
OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o
-@@ -95
2,6 +961
,12 @@ endif
+@@ -95
3,6 +962
,12 @@ endif
ifdef CONFIG_HS20
OBJS += ../src/ap/hs20.o
endif
ifdef CONFIG_HS20
OBJS += ../src/ap/hs20.o
endif
@@
-118,7
+118,7
@@
endif
ifdef CONFIG_MBO
endif
ifdef CONFIG_MBO
-@@ -96
0,7 +975
,9 @@ CFLAGS += -DCONFIG_MBO
+@@ -96
1,7 +976
,9 @@ CFLAGS += -DCONFIG_MBO
endif
ifdef NEED_RSN_AUTHENTICATOR
endif
ifdef NEED_RSN_AUTHENTICATOR
@@
-128,7
+128,7
@@
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
-@@ -18
35,6 +1852
,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
+@@ -18
88,6 +1905
,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
@@
-141,7
+141,7
@@
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@
-@@ -19
37,6 +1960
,12 @@ endif
+@@ -19
90,6 +2013
,12 @@ endif
-e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
@$(E) " sed" $<
-e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
@$(E) " sed" $<
@@
-156,7
+156,7
@@
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -5
317,8 +5317
,8 @@ union wpa_event_data {
+@@ -5
476,8 +5476
,8 @@ union wpa_event_data {
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
@@
-167,7
+167,7
@@
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
-@@ -5
330,7 +5330
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -5
489,7 +5489
,7 @@ void wpa_supplicant_event(void *ctx, enu
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
@@
-178,8
+178,8
@@
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
-@@ -1
375,8 +1375,8 @@ static void hostapd_event_dfs_cac_starte
- #endif /* NEED_AP_MLME */
+@@ -1
527,8 +1527,8 @@ static void hostapd_event_wds_sta_interf
+ }
-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
@@
-189,7
+189,7
@@
{
struct hostapd_data *hapd = ctx;
#ifndef CONFIG_NO_STDOUT_DEBUG
{
struct hostapd_data *hapd = ctx;
#ifndef CONFIG_NO_STDOUT_DEBUG
-@@ -1
590,7 +1590
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -1
757,7 +1757
,7 @@ void wpa_supplicant_event(void *ctx, enu
}
}
@@
-211,7
+211,7
@@
{
struct wpa_priv_interface *iface = ctx;
{
struct wpa_priv_interface *iface = ctx;
-@@ -1
101,7 +1101
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -1
095,7 +1095
,7 @@ void wpa_supplicant_event(void *ctx, enu
}
}
@@
-220,7
+220,7
@@
union wpa_event_data *data)
{
struct wpa_priv_global *global = ctx;
union wpa_event_data *data)
{
struct wpa_priv_global *global = ctx;
-@@ -12
13,6 +1213
,8 @@ int main(int argc, char *argv[])
+@@ -12
07,6 +1207
,8 @@ int main(int argc, char *argv[])
if (os_program_init())
return -1;
if (os_program_init())
return -1;
@@
-231,7
+231,7
@@
os_memset(&global, 0, sizeof(global));
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
os_memset(&global, 0, sizeof(global));
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
-@@ -
3709,8 +3709,8 @@ static void wpa_supplicant_event_assoc_a
+@@ -
4026,8 +4026,8 @@ static void wpas_event_assoc_reject(stru
}
}
@@
-242,7
+242,7
@@
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
-@@ -4
466,7 +446
6,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -4
796,7 +479
6,7 @@ void wpa_supplicant_event(void *ctx, enu
}
}
@@
-253,7
+253,7
@@
struct wpa_supplicant *wpa_s;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
struct wpa_supplicant *wpa_s;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -5
457,7 +5457
,6 @@ struct wpa_interface * wpa_supplicant_ma
+@@ -5
861,7 +5861
,6 @@ struct wpa_interface * wpa_supplicant_ma
return NULL;
}
return NULL;
}
@@
-261,7
+261,7
@@
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
-@@ -5
494,6 +5493
,11 @@ static int wpa_supplicant_match_existing
+@@ -5
898,6 +5897
,11 @@ static int wpa_supplicant_match_existing
#endif /* CONFIG_MATCH_IFACE */
#endif /* CONFIG_MATCH_IFACE */
@@
-273,7
+273,7
@@
/**
* wpa_supplicant_add_iface - Add a new network interface
/**
* wpa_supplicant_add_iface - Add a new network interface
-@@ -
5750,6 +5754
,8 @@ struct wpa_global * wpa_supplicant_init(
+@@ -
6154,6 +6158
,8 @@ struct wpa_global * wpa_supplicant_init(
#ifndef CONFIG_NO_WPA_MSG
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */
#ifndef CONFIG_NO_WPA_MSG
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */
@@
-284,7
+284,7
@@
wpa_debug_open_file(params->wpa_debug_file_path);
--- a/hostapd/main.c
+++ b/hostapd/main.c
wpa_debug_open_file(params->wpa_debug_file_path);
--- a/hostapd/main.c
+++ b/hostapd/main.c
-@@ -59
0,6 +590
,11 @@ fail:
+@@ -59
1,6 +591
,11 @@ fail:
return -1;
}
return -1;
}
@@
-296,9
+296,9
@@
#ifdef CONFIG_WPS
static int gen_uuid(const char *txt_addr)
#ifdef CONFIG_WPS
static int gen_uuid(const char *txt_addr)
-@@ -67
0,6 +675
,8 @@ int main(int argc, char *argv[])
-
dl_list_init(&interfaces.eth_p_oui
);
- #endif /* CONFIG_
ETH_P_OUI
*/
+@@ -67
4,6 +679
,8 @@ int main(int argc, char *argv[])
+
hostapd_dpp_init_global(&interfaces
);
+ #endif /* CONFIG_
DPP
*/
+ wpa_supplicant_event = hostapd_wpa_event;
+ wpa_supplicant_event_global = hostapd_wpa_event_global;
+ wpa_supplicant_event = hostapd_wpa_event;
+ wpa_supplicant_event_global = hostapd_wpa_event_global;