|
|
@ -1,7 +1,5 @@
|
|
|
|
Index: hostapd-2019-08-08-ca8c2bd2/hostapd/config_file.c
|
|
|
|
--- a/hostapd/config_file.c
|
|
|
|
===================================================================
|
|
|
|
+++ b/hostapd/config_file.c
|
|
|
|
--- hostapd-2019-08-08-ca8c2bd2.orig/hostapd/config_file.c
|
|
|
|
|
|
|
|
+++ hostapd-2019-08-08-ca8c2bd2/hostapd/config_file.c
|
|
|
|
|
|
|
|
@@ -2470,6 +2470,8 @@ static int hostapd_config_fill(struct ho
|
|
|
|
@@ -2470,6 +2470,8 @@ static int hostapd_config_fill(struct ho
|
|
|
|
bss->isolate = atoi(pos);
|
|
|
|
bss->isolate = atoi(pos);
|
|
|
|
} else if (os_strcmp(buf, "ap_max_inactivity") == 0) {
|
|
|
|
} else if (os_strcmp(buf, "ap_max_inactivity") == 0) {
|
|
|
@ -20,10 +18,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/hostapd/config_file.c
|
|
|
|
} else if (os_strcmp(buf, "channel") == 0) {
|
|
|
|
} else if (os_strcmp(buf, "channel") == 0) {
|
|
|
|
if (os_strcmp(pos, "acs_survey") == 0) {
|
|
|
|
if (os_strcmp(pos, "acs_survey") == 0) {
|
|
|
|
#ifndef CONFIG_ACS
|
|
|
|
#ifndef CONFIG_ACS
|
|
|
|
Index: hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.c
|
|
|
|
--- a/src/ap/ap_config.c
|
|
|
|
===================================================================
|
|
|
|
+++ b/src/ap/ap_config.c
|
|
|
|
--- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/ap_config.c
|
|
|
|
|
|
|
|
+++ hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.c
|
|
|
|
|
|
|
|
@@ -698,6 +698,7 @@ void hostapd_config_free_bss(struct host
|
|
|
|
@@ -698,6 +698,7 @@ void hostapd_config_free_bss(struct host
|
|
|
|
os_free(conf->radius_req_attr_sqlite);
|
|
|
|
os_free(conf->radius_req_attr_sqlite);
|
|
|
|
os_free(conf->rsn_preauth_interfaces);
|
|
|
|
os_free(conf->rsn_preauth_interfaces);
|
|
|
@ -40,10 +36,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.c
|
|
|
|
os_free(conf->bss);
|
|
|
|
os_free(conf->bss);
|
|
|
|
os_free(conf->supported_rates);
|
|
|
|
os_free(conf->supported_rates);
|
|
|
|
os_free(conf->basic_rates);
|
|
|
|
os_free(conf->basic_rates);
|
|
|
|
Index: hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.h
|
|
|
|
--- a/src/ap/ap_config.h
|
|
|
|
===================================================================
|
|
|
|
+++ b/src/ap/ap_config.h
|
|
|
|
--- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/ap_config.h
|
|
|
|
|
|
|
|
+++ hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.h
|
|
|
|
|
|
|
|
@@ -829,6 +829,7 @@ struct hostapd_bss_config {
|
|
|
|
@@ -829,6 +829,7 @@ struct hostapd_bss_config {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
u8 mka_psk_set;
|
|
|
|
u8 mka_psk_set;
|
|
|
@ -60,10 +54,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.h
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.c
|
|
|
|
--- a/src/ap/hostapd.c
|
|
|
|
===================================================================
|
|
|
|
+++ b/src/ap/hostapd.c
|
|
|
|
--- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/hostapd.c
|
|
|
|
|
|
|
|
+++ hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.c
|
|
|
|
|
|
|
|
@@ -206,6 +206,10 @@ static int hostapd_iface_conf_changed(st
|
|
|
|
@@ -206,6 +206,10 @@ static int hostapd_iface_conf_changed(st
|
|
|
|
{
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
size_t i;
|
|
|
@ -150,10 +142,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.c
|
|
|
|
if (conf)
|
|
|
|
if (conf)
|
|
|
|
hapd->driver = conf->driver;
|
|
|
|
hapd->driver = conf->driver;
|
|
|
|
hapd->ctrl_sock = -1;
|
|
|
|
hapd->ctrl_sock = -1;
|
|
|
|
Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
|
|
|
|
--- a/src/ap/hostapd.h
|
|
|
|
===================================================================
|
|
|
|
+++ b/src/ap/hostapd.h
|
|
|
|
--- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/hostapd.h
|
|
|
|
|
|
|
|
+++ hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
|
|
|
|
|
|
|
|
@@ -42,7 +42,7 @@ struct mesh_conf;
|
|
|
|
@@ -42,7 +42,7 @@ struct mesh_conf;
|
|
|
|
struct hostapd_iface;
|
|
|
|
struct hostapd_iface;
|
|
|
|
|
|
|
|
|
|
|
@ -163,7 +153,7 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
|
|
|
|
struct hostapd_config * (*config_read_cb)(const char *config_fname);
|
|
|
|
struct hostapd_config * (*config_read_cb)(const char *config_fname);
|
|
|
|
int (*ctrl_iface_init)(struct hostapd_data *hapd);
|
|
|
|
int (*ctrl_iface_init)(struct hostapd_data *hapd);
|
|
|
|
void (*ctrl_iface_deinit)(struct hostapd_data *hapd);
|
|
|
|
void (*ctrl_iface_deinit)(struct hostapd_data *hapd);
|
|
|
|
@@ -149,6 +149,7 @@ struct hostapd_data {
|
|
|
|
@@ -148,6 +148,7 @@ struct hostapd_data {
|
|
|
|
struct hostapd_config *iconf;
|
|
|
|
struct hostapd_config *iconf;
|
|
|
|
struct hostapd_bss_config *conf;
|
|
|
|
struct hostapd_bss_config *conf;
|
|
|
|
struct hostapd_ubus_bss ubus;
|
|
|
|
struct hostapd_ubus_bss ubus;
|
|
|
@ -171,7 +161,7 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
|
|
|
|
int interface_added; /* virtual interface added for this BSS */
|
|
|
|
int interface_added; /* virtual interface added for this BSS */
|
|
|
|
unsigned int started:1;
|
|
|
|
unsigned int started:1;
|
|
|
|
unsigned int disabled:1;
|
|
|
|
unsigned int disabled:1;
|
|
|
|
@@ -576,7 +577,7 @@ struct hostapd_iface {
|
|
|
|
@@ -575,7 +576,7 @@ struct hostapd_iface {
|
|
|
|
int hostapd_for_each_interface(struct hapd_interfaces *interfaces,
|
|
|
|
int hostapd_for_each_interface(struct hapd_interfaces *interfaces,
|
|
|
|
int (*cb)(struct hostapd_iface *iface,
|
|
|
|
int (*cb)(struct hostapd_iface *iface,
|
|
|
|
void *ctx), void *ctx);
|
|
|
|
void *ctx), void *ctx);
|
|
|
@ -180,10 +170,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
|
|
|
|
void hostapd_reconfig_encryption(struct hostapd_data *hapd);
|
|
|
|
void hostapd_reconfig_encryption(struct hostapd_data *hapd);
|
|
|
|
struct hostapd_data *
|
|
|
|
struct hostapd_data *
|
|
|
|
hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
|
|
|
|
hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
|
|
|
|
Index: hostapd-2019-08-08-ca8c2bd2/src/drivers/driver_nl80211.c
|
|
|
|
--- a/src/drivers/driver_nl80211.c
|
|
|
|
===================================================================
|
|
|
|
+++ b/src/drivers/driver_nl80211.c
|
|
|
|
--- hostapd-2019-08-08-ca8c2bd2.orig/src/drivers/driver_nl80211.c
|
|
|
|
|
|
|
|
+++ hostapd-2019-08-08-ca8c2bd2/src/drivers/driver_nl80211.c
|
|
|
|
|
|
|
|
@@ -4295,6 +4295,9 @@ static int wpa_driver_nl80211_set_ap(voi
|
|
|
|
@@ -4295,6 +4295,9 @@ static int wpa_driver_nl80211_set_ap(voi
|
|
|
|
if (ret) {
|
|
|
|
if (ret) {
|
|
|
|
wpa_printf(MSG_DEBUG, "nl80211: Beacon set failed: %d (%s)",
|
|
|
|
wpa_printf(MSG_DEBUG, "nl80211: Beacon set failed: %d (%s)",
|
|
|
@ -194,10 +182,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/drivers/driver_nl80211.c
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
bss->beacon_set = 1;
|
|
|
|
bss->beacon_set = 1;
|
|
|
|
nl80211_set_bss(bss, params->cts_protect, params->preamble,
|
|
|
|
nl80211_set_bss(bss, params->cts_protect, params->preamble,
|
|
|
|
Index: hostapd-2019-08-08-ca8c2bd2/hostapd/ctrl_iface.c
|
|
|
|
--- a/hostapd/ctrl_iface.c
|
|
|
|
===================================================================
|
|
|
|
+++ b/hostapd/ctrl_iface.c
|
|
|
|
--- hostapd-2019-08-08-ca8c2bd2.orig/hostapd/ctrl_iface.c
|
|
|
|
|
|
|
|
+++ hostapd-2019-08-08-ca8c2bd2/hostapd/ctrl_iface.c
|
|
|
|
|
|
|
|
@@ -182,7 +182,7 @@ static int hostapd_ctrl_iface_update(str
|
|
|
|
@@ -182,7 +182,7 @@ static int hostapd_ctrl_iface_update(str
|
|
|
|
iface->interfaces->config_read_cb = hostapd_ctrl_iface_config_read;
|
|
|
|
iface->interfaces->config_read_cb = hostapd_ctrl_iface_config_read;
|
|
|
|
reload_opts = txt;
|
|
|
|
reload_opts = txt;
|
|
|
@ -207,10 +193,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/hostapd/ctrl_iface.c
|
|
|
|
|
|
|
|
|
|
|
|
iface->interfaces->config_read_cb = config_read_cb;
|
|
|
|
iface->interfaces->config_read_cb = config_read_cb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Index: hostapd-2019-08-08-ca8c2bd2/hostapd/main.c
|
|
|
|
--- a/hostapd/main.c
|
|
|
|
===================================================================
|
|
|
|
+++ b/hostapd/main.c
|
|
|
|
--- hostapd-2019-08-08-ca8c2bd2.orig/hostapd/main.c
|
|
|
|
|
|
|
|
+++ hostapd-2019-08-08-ca8c2bd2/hostapd/main.c
|
|
|
|
|
|
|
|
@@ -320,7 +320,7 @@ static void handle_term(int sig, void *s
|
|
|
|
@@ -320,7 +320,7 @@ static void handle_term(int sig, void *s
|
|
|
|
|
|
|
|
|
|
|
|
static int handle_reload_iface(struct hostapd_iface *iface, void *ctx)
|
|
|
|
static int handle_reload_iface(struct hostapd_iface *iface, void *ctx)
|
|
|
@ -220,10 +204,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/hostapd/main.c
|
|
|
|
wpa_printf(MSG_WARNING, "Failed to read new configuration "
|
|
|
|
wpa_printf(MSG_WARNING, "Failed to read new configuration "
|
|
|
|
"file - continuing with old.");
|
|
|
|
"file - continuing with old.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Index: hostapd-2019-08-08-ca8c2bd2/src/ap/wps_hostapd.c
|
|
|
|
--- a/src/ap/wps_hostapd.c
|
|
|
|
===================================================================
|
|
|
|
+++ b/src/ap/wps_hostapd.c
|
|
|
|
--- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/wps_hostapd.c
|
|
|
|
|
|
|
|
+++ hostapd-2019-08-08-ca8c2bd2/src/ap/wps_hostapd.c
|
|
|
|
|
|
|
|
@@ -275,7 +275,7 @@ static void wps_reload_config(void *eloo
|
|
|
|
@@ -275,7 +275,7 @@ static void wps_reload_config(void *eloo
|
|
|
|
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "WPS: Reload configuration data");
|
|
|
|
wpa_printf(MSG_DEBUG, "WPS: Reload configuration data");
|
|
|
|