--- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -168,9 +168,21 @@ OBJS += ../src/eapol_auth/eapol_auth_sm. ifdef CONFIG_UBUS CFLAGS += -DUBUS_SUPPORT -OBJS += ../src/utils/uloop.o OBJS += ../src/ap/ubus.o -LIBS += -lubox -lubus +LIBS += -lubus +NEED_ULOOP:=y +endif + +ifdef CONFIG_UCODE +CFLAGS += -DUCODE_SUPPORT +OBJS += ../src/utils/ucode.o +OBJS += ../src/ap/ucode.o +NEED_ULOOP:=y +endif + +ifdef NEED_ULOOP +OBJS += ../src/utils/uloop.o +LIBS += -lubox endif ifdef CONFIG_CODE_COVERAGE --- a/hostapd/main.c +++ b/hostapd/main.c @@ -898,6 +898,7 @@ int main(int argc, char *argv[]) } hostapd_global_ctrl_iface_init(&interfaces); + hostapd_ucode_init(&interfaces); if (hostapd_global_run(&interfaces, daemonize, pid_file)) { wpa_printf(MSG_ERROR, "Failed to start eloop"); @@ -907,6 +908,7 @@ int main(int argc, char *argv[]) ret = 0; out: + hostapd_ucode_free(); hostapd_global_ctrl_iface_deinit(&interfaces); /* Deinitialize all interfaces */ for (i = 0; i < interfaces.count; i++) { --- a/src/ap/hostapd.h +++ b/src/ap/hostapd.h @@ -18,6 +18,7 @@ #include "ap_config.h" #include "drivers/driver.h" #include "ubus.h" +#include "ucode.h" #define OCE_STA_CFON_ENABLED(hapd) \ ((hapd->conf->oce & OCE_STA_CFON) && \ @@ -50,6 +51,10 @@ struct hapd_interfaces { struct hostapd_config * (*config_read_cb)(const char *config_fname); int (*ctrl_iface_init)(struct hostapd_data *hapd); void (*ctrl_iface_deinit)(struct hostapd_data *hapd); + int (*ctrl_iface_recv)(struct hostapd_data *hapd, + char *buf, char *reply, int reply_size, + struct sockaddr_storage *from, + socklen_t fromlen); int (*for_each_interface)(struct hapd_interfaces *interfaces, int (*cb)(struct hostapd_iface *iface, void *ctx), void *ctx); @@ -171,6 +176,7 @@ struct hostapd_data { struct hostapd_config *iconf; struct hostapd_bss_config *conf; struct hostapd_ubus_bss ubus; + struct hostapd_ucode_bss ucode; int interface_added; /* virtual interface added for this BSS */ unsigned int started:1; unsigned int disabled:1; @@ -463,6 +469,7 @@ struct hostapd_sta_info { */ struct hostapd_iface { struct hapd_interfaces *interfaces; + struct hostapd_ucode_iface ucode; void *owner; char *config_fname; struct hostapd_config *conf; @@ -637,6 +644,8 @@ struct hostapd_iface * hostapd_init(stru struct hostapd_iface * hostapd_interface_init_bss(struct hapd_interfaces *interfaces, const char *phy, const char *config_fname, int debug); +int hostapd_setup_bss(struct hostapd_data *hapd, int first, bool start_beacon); +void hostapd_bss_deinit(struct hostapd_data *hapd); void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta, int reassoc); void hostapd_interface_deinit_free(struct hostapd_iface *iface); --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c @@ -216,6 +216,8 @@ int hostapd_reload_config(struct hostapd struct hostapd_config *newconf, *oldconf; size_t j; + hostapd_ucode_reload_bss(hapd); + if (iface->config_fname == NULL) { /* Only in-memory config in use - assume it has been updated */ hostapd_clear_old(iface); @@ -376,6 +378,7 @@ void hostapd_free_hapd_data(struct hosta hapd->beacon_set_done = 0; wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface); + hostapd_ucode_free_bss(hapd); hostapd_ubus_free_bss(hapd); accounting_deinit(hapd); hostapd_deinit_wpa(hapd); @@ -530,6 +533,7 @@ void hostapd_cleanup_iface_partial(struc static void hostapd_cleanup_iface(struct hostapd_iface *iface) { wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface); + hostapd_ucode_free_iface(iface); eloop_cancel_timeout(channel_list_update_timeout, iface, NULL); eloop_cancel_timeout(hostapd_interface_setup_failure_handler, iface, NULL); @@ -1104,7 +1108,7 @@ static int db_table_create_radius_attrib * initialized. Most of the modules that are initialized here will be * deinitialized in hostapd_cleanup(). */ -static int hostapd_setup_bss(struct hostapd_data *hapd, int first) +int hostapd_setup_bss(struct hostapd_data *hapd, int first, bool set_beacon) { struct hostapd_bss_config *conf = hapd->conf; u8 ssid[SSID_MAX_LEN + 1]; @@ -1400,6 +1404,7 @@ static int hostapd_setup_bss(struct host hapd->driver->set_operstate(hapd->drv_priv, 1); hostapd_ubus_add_bss(hapd); + hostapd_ucode_add_bss(hapd); return 0; } @@ -2090,7 +2095,7 @@ static int hostapd_setup_interface_compl hapd = iface->bss[j]; if (j) os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN); - if (hostapd_setup_bss(hapd, j == 0)) { + if (hostapd_setup_bss(hapd, j == 0, true)) { for (;;) { hapd = iface->bss[j]; hostapd_bss_deinit_no_free(hapd); @@ -2368,7 +2373,7 @@ hostapd_alloc_bss_data(struct hostapd_if } -static void hostapd_bss_deinit(struct hostapd_data *hapd) +void hostapd_bss_deinit(struct hostapd_data *hapd) { if (!hapd) return; @@ -2985,7 +2990,7 @@ int hostapd_add_iface(struct hapd_interf if (start_ctrl_iface_bss(hapd) < 0 || (hapd_iface->state == HAPD_IFACE_ENABLED && - hostapd_setup_bss(hapd, -1))) { + hostapd_setup_bss(hapd, -1, true))) { hostapd_cleanup(hapd); hapd_iface->bss[hapd_iface->num_bss - 1] = NULL; hapd_iface->conf->num_bss--; --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -172,8 +172,20 @@ endif ifdef CONFIG_UBUS CFLAGS += -DUBUS_SUPPORT OBJS += ubus.o +LIBS += -lubus +NEED_ULOOP:=y +endif + +ifdef CONFIG_UCODE +CFLAGS += -DUCODE_SUPPORT +OBJS += ../src/utils/ucode.o +OBJS += ucode.o +NEED_ULOOP:=y +endif + +ifdef NEED_ULOOP OBJS += ../src/utils/uloop.o -LIBS += -lubox -lubus +LIBS += -lubox endif ifdef CONFIG_CODE_COVERAGE @@ -956,6 +968,9 @@ OBJS += ../src/ap/ctrl_iface_ap.o ifdef CONFIG_UBUS OBJS += ../src/ap/ubus.o endif +ifdef CONFIG_UCODE +OBJS += ../src/ap/ucode.o +endif endif CFLAGS += -DEAP_SERVER -DEAP_SERVER_IDENTITY --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1025,6 +1025,7 @@ void wpa_supplicant_set_state(struct wpa sme_sched_obss_scan(wpa_s, 0); } wpa_s->wpa_state = state; + wpas_ucode_update_state(wpa_s); #ifdef CONFIG_BGSCAN if (state == WPA_COMPLETED && wpa_s->current_ssid != wpa_s->bgscan_ssid) @@ -6944,6 +6945,7 @@ struct wpa_supplicant * wpa_supplicant_a #endif /* CONFIG_P2P */ wpas_ubus_add_bss(wpa_s); + wpas_ucode_add_bss(wpa_s); return wpa_s; } @@ -6971,6 +6973,7 @@ int wpa_supplicant_remove_iface(struct w struct wpa_supplicant *parent = wpa_s->parent; #endif /* CONFIG_MESH */ + wpas_ucode_free_bss(wpa_s); wpas_ubus_free_bss(wpa_s); /* Remove interface from the global list of interfaces */ @@ -7238,6 +7241,7 @@ struct wpa_global * wpa_supplicant_init( eloop_register_timeout(WPA_SUPPLICANT_CLEANUP_INTERVAL, 0, wpas_periodic, global, NULL); + wpas_ucode_init(global); return global; } @@ -7276,12 +7280,8 @@ int wpa_supplicant_run(struct wpa_global eloop_register_signal_terminate(wpa_supplicant_terminate, global); eloop_register_signal_reconfig(wpa_supplicant_reconfig, global); - wpas_ubus_add(global); - eloop_run(); - wpas_ubus_free(global); - return 0; } @@ -7314,6 +7314,8 @@ void wpa_supplicant_deinit(struct wpa_gl wpas_notify_supplicant_deinitialized(global); + wpas_ucode_free(); + eap_peer_unregister_methods(); #ifdef CONFIG_AP eap_server_unregister_methods(); --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -20,6 +20,7 @@ #include "config_ssid.h" #include "wmm_ac.h" #include "ubus.h" +#include "ucode.h" extern const char *const wpa_supplicant_version; extern const char *const wpa_supplicant_license; @@ -600,6 +601,7 @@ struct wpa_supplicant { unsigned char perm_addr[ETH_ALEN]; char ifname[100]; struct wpas_ubus_bss ubus; + struct wpas_ucode_bss ucode; #ifdef CONFIG_MATCH_IFACE int matched; #endif /* CONFIG_MATCH_IFACE */ --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c @@ -4877,6 +4877,7 @@ try_again: return -1; } + interface->ctrl_iface_recv = hostapd_ctrl_iface_receive_process; wpa_msg_register_cb(hostapd_ctrl_iface_msg_cb); return 0; @@ -4978,6 +4979,7 @@ fail: os_free(fname); interface->global_ctrl_sock = s; + interface->ctrl_iface_recv = hostapd_ctrl_iface_receive_process; eloop_register_read_sock(s, hostapd_global_ctrl_iface_receive, interface, NULL); --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -5827,6 +5827,7 @@ union wpa_event_data { /** * struct ch_switch + * @count: Count until channel switch activates * @freq: Frequency of new channel in MHz * @ht_enabled: Whether this is an HT channel * @ch_offset: Secondary channel offset @@ -5835,6 +5836,7 @@ union wpa_event_data { * @cf2: Center frequency 2 */ struct ch_switch { + int count; int freq; int ht_enabled; int ch_offset; --- a/src/drivers/driver_nl80211_event.c +++ b/src/drivers/driver_nl80211_event.c @@ -655,6 +655,7 @@ static void mlme_event_ch_switch(struct struct nlattr *ifindex, struct nlattr *freq, struct nlattr *type, struct nlattr *bw, struct nlattr *cf1, struct nlattr *cf2, + struct nlattr *count, int finished) { struct i802_bss *bss; @@ -714,6 +715,8 @@ static void mlme_event_ch_switch(struct data.ch_switch.cf1 = nla_get_u32(cf1); if (cf2) data.ch_switch.cf2 = nla_get_u32(cf2); + if (count) + data.ch_switch.count = nla_get_u32(count); if (finished) bss->freq = data.ch_switch.freq; @@ -2886,6 +2889,7 @@ static void do_process_drv_event(struct tb[NL80211_ATTR_CHANNEL_WIDTH], tb[NL80211_ATTR_CENTER_FREQ1], tb[NL80211_ATTR_CENTER_FREQ2], + tb[NL80211_ATTR_CH_SWITCH_COUNT], 0); break; case NL80211_CMD_CH_SWITCH_NOTIFY: @@ -2896,6 +2900,7 @@ static void do_process_drv_event(struct tb[NL80211_ATTR_CHANNEL_WIDTH], tb[NL80211_ATTR_CENTER_FREQ1], tb[NL80211_ATTR_CENTER_FREQ2], + NULL, 1); break; case NL80211_CMD_DISCONNECT: --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -4702,6 +4702,7 @@ void supplicant_event(void *ctx, enum wp event_to_string(event), event); #endif /* CONFIG_NO_STDOUT_DEBUG */ + wpas_ucode_event(wpa_s, event, data); switch (event) { case EVENT_AUTH: #ifdef CONFIG_FST