--- a/hostapd/Makefile
+++ b/hostapd/Makefile
-@@ -121,6 +121,11 @@ OBJS += ../src/common/hw_features_common
+@@ -165,6 +165,11 @@ OBJS += ../src/common/hw_features_common
OBJS += ../src/eapol_auth/eapol_auth_sm.o
struct wpa_ctrl_dst;
struct radius_server_data;
-@@ -103,6 +104,7 @@ struct hostapd_data {
+@@ -119,6 +120,7 @@ struct hostapd_data {
struct hostapd_iface *iface;
struct hostapd_config *iconf;
struct hostapd_bss_config *conf;
int interface_added; /* virtual interface added for this BSS */
unsigned int started:1;
unsigned int disabled:1;
-@@ -286,6 +288,8 @@ struct hostapd_iface {
+@@ -328,6 +330,8 @@ struct hostapd_iface {
struct hostapd_config *conf;
char phy[16]; /* Name of the PHY (radio) */
enum hostapd_iface_state {
HAPD_IFACE_UNINITIALIZED,
HAPD_IFACE_DISABLED,
---- /dev/null
-+++ b/src/ap/ubus.c
-@@ -0,0 +1,511 @@
-+/*
-+ * hostapd / ubus support
-+ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * This software may be distributed under the terms of the BSD license.
-+ * See README for more details.
-+ */
-+
-+#include "utils/includes.h"
-+#include "utils/common.h"
-+#include "utils/eloop.h"
-+#include "common/ieee802_11_defs.h"
-+#include "hostapd.h"
-+#include "wps_hostapd.h"
-+#include "sta_info.h"
-+#include "ubus.h"
-+
-+static struct ubus_context *ctx;
-+static struct blob_buf b;
-+static int ctx_ref;
-+
-+static inline struct hostapd_data *get_hapd_from_object(struct ubus_object *obj)
-+{
-+ return container_of(obj, struct hostapd_data, ubus.obj);
-+}
-+
-+
-+struct ubus_banned_client {
-+ struct avl_node avl;
-+ u8 addr[ETH_ALEN];
-+};
-+
-+static void ubus_receive(int sock, void *eloop_ctx, void *sock_ctx)
-+{
-+ struct ubus_context *ctx = eloop_ctx;
-+ ubus_handle_event(ctx);
-+}
-+
-+static void ubus_reconnect_timeout(void *eloop_data, void *user_ctx)
-+{
-+ if (ubus_reconnect(ctx, NULL)) {
-+ eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
-+ return;
-+ }
-+
-+ eloop_register_read_sock(ctx->sock.fd, ubus_receive, ctx, NULL);
-+}
-+
-+static void hostapd_ubus_connection_lost(struct ubus_context *ctx)
-+{
-+ eloop_unregister_read_sock(ctx->sock.fd);
-+ eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
-+}
-+
-+static bool hostapd_ubus_init(void)
-+{
-+ if (ctx)
-+ return true;
-+
-+ ctx = ubus_connect(NULL);
-+ if (!ctx)
-+ return false;
-+
-+ ctx->connection_lost = hostapd_ubus_connection_lost;
-+ eloop_register_read_sock(ctx->sock.fd, ubus_receive, ctx, NULL);
-+ return true;
-+}
-+
-+static void hostapd_ubus_ref_inc(void)
-+{
-+ ctx_ref++;
-+}
-+
-+static void hostapd_ubus_ref_dec(void)
-+{
-+ ctx_ref--;
-+ if (!ctx)
-+ return;
-+
-+ if (ctx_ref)
-+ return;
-+
-+ eloop_unregister_read_sock(ctx->sock.fd);
-+ ubus_free(ctx);
-+ ctx = NULL;
-+}
-+
-+void hostapd_ubus_add_iface(struct hostapd_iface *iface)
-+{
-+ if (!hostapd_ubus_init())
-+ return;
-+}
-+
-+void hostapd_ubus_free_iface(struct hostapd_iface *iface)
-+{
-+ if (!ctx)
-+ return;
-+}
-+
-+static void
-+hostapd_bss_del_ban(void *eloop_data, void *user_ctx)
-+{
-+ struct ubus_banned_client *ban = eloop_data;
-+ struct hostapd_data *hapd = user_ctx;
-+
-+ avl_delete(&hapd->ubus.banned, &ban->avl);
-+ free(ban);
-+}
-+
-+static void
-+hostapd_bss_ban_client(struct hostapd_data *hapd, u8 *addr, int time)
-+{
-+ struct ubus_banned_client *ban;
-+
-+ if (time < 0)
-+ time = 0;
-+
-+ ban = avl_find_element(&hapd->ubus.banned, addr, ban, avl);
-+ if (!ban) {
-+ if (!time)
-+ return;
-+
-+ ban = os_zalloc(sizeof(*ban));
-+ memcpy(ban->addr, addr, sizeof(ban->addr));
-+ ban->avl.key = ban->addr;
-+ avl_insert(&hapd->ubus.banned, &ban->avl);
-+ } else {
-+ eloop_cancel_timeout(hostapd_bss_del_ban, ban, hapd);
-+ if (!time) {
-+ hostapd_bss_del_ban(ban, hapd);
-+ return;
-+ }
-+ }
-+
-+ eloop_register_timeout(0, time * 1000, hostapd_bss_del_ban, ban, hapd);
-+}
-+
-+static int
-+hostapd_bss_get_clients(struct ubus_context *ctx, struct ubus_object *obj,
-+ struct ubus_request_data *req, const char *method,
-+ struct blob_attr *msg)
-+{
-+ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
-+ struct sta_info *sta;
-+ void *list, *c;
-+ char mac_buf[20];
-+ static const struct {
-+ const char *name;
-+ uint32_t flag;
-+ } sta_flags[] = {
-+ { "auth", WLAN_STA_AUTH },
-+ { "assoc", WLAN_STA_ASSOC },
-+ { "authorized", WLAN_STA_AUTHORIZED },
-+ { "preauth", WLAN_STA_PREAUTH },
-+ { "wds", WLAN_STA_WDS },
-+ { "wmm", WLAN_STA_WMM },
-+ { "ht", WLAN_STA_HT },
-+ { "vht", WLAN_STA_VHT },
-+ { "wps", WLAN_STA_WPS },
-+ { "mfp", WLAN_STA_MFP },
-+ };
-+
-+ blob_buf_init(&b, 0);
-+ blobmsg_add_u32(&b, "freq", hapd->iface->freq);
-+ list = blobmsg_open_table(&b, "clients");
-+ for (sta = hapd->sta_list; sta; sta = sta->next) {
-+ int i;
-+
-+ sprintf(mac_buf, MACSTR, MAC2STR(sta->addr));
-+ c = blobmsg_open_table(&b, mac_buf);
-+ for (i = 0; i < ARRAY_SIZE(sta_flags); i++)
-+ blobmsg_add_u8(&b, sta_flags[i].name,
-+ !!(sta->flags & sta_flags[i].flag));
-+ blobmsg_add_u32(&b, "aid", sta->aid);
-+ blobmsg_close_table(&b, c);
-+ }
-+ blobmsg_close_array(&b, list);
-+ ubus_send_reply(ctx, req, b.head);
-+
-+ return 0;
-+}
-+
-+enum {
-+ DEL_CLIENT_ADDR,
-+ DEL_CLIENT_REASON,
-+ DEL_CLIENT_DEAUTH,
-+ DEL_CLIENT_BAN_TIME,
-+ __DEL_CLIENT_MAX
-+};
-+
-+static const struct blobmsg_policy del_policy[__DEL_CLIENT_MAX] = {
-+ [DEL_CLIENT_ADDR] = { "addr", BLOBMSG_TYPE_STRING },
-+ [DEL_CLIENT_REASON] = { "reason", BLOBMSG_TYPE_INT32 },
-+ [DEL_CLIENT_DEAUTH] = { "deauth", BLOBMSG_TYPE_INT8 },
-+ [DEL_CLIENT_BAN_TIME] = { "ban_time", BLOBMSG_TYPE_INT32 },
-+};
-+
-+static int
-+hostapd_bss_del_client(struct ubus_context *ctx, struct ubus_object *obj,
-+ struct ubus_request_data *req, const char *method,
-+ struct blob_attr *msg)
-+{
-+ struct blob_attr *tb[__DEL_CLIENT_MAX];
-+ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
-+ struct sta_info *sta;
-+ bool deauth = false;
-+ int reason;
-+ u8 addr[ETH_ALEN];
-+
-+ blobmsg_parse(del_policy, __DEL_CLIENT_MAX, tb, blob_data(msg), blob_len(msg));
-+
-+ if (!tb[DEL_CLIENT_ADDR])
-+ return UBUS_STATUS_INVALID_ARGUMENT;
-+
-+ if (hwaddr_aton(blobmsg_data(tb[DEL_CLIENT_ADDR]), addr))
-+ return UBUS_STATUS_INVALID_ARGUMENT;
-+
-+ if (tb[DEL_CLIENT_REASON])
-+ reason = blobmsg_get_u32(tb[DEL_CLIENT_REASON]);
-+
-+ if (tb[DEL_CLIENT_DEAUTH])
-+ deauth = blobmsg_get_bool(tb[DEL_CLIENT_DEAUTH]);
-+
-+ sta = ap_get_sta(hapd, addr);
-+ if (sta) {
-+ if (deauth) {
-+ hostapd_drv_sta_deauth(hapd, addr, reason);
-+ ap_sta_deauthenticate(hapd, sta, reason);
-+ } else {
-+ hostapd_drv_sta_disassoc(hapd, addr, reason);
-+ ap_sta_disassociate(hapd, sta, reason);
-+ }
-+ }
-+
-+ if (tb[DEL_CLIENT_BAN_TIME])
-+ hostapd_bss_ban_client(hapd, addr, blobmsg_get_u32(tb[DEL_CLIENT_BAN_TIME]));
-+
-+ return 0;
-+}
-+
-+static void
-+blobmsg_add_macaddr(struct blob_buf *buf, const char *name, const u8 *addr)
-+{
-+ char *s;
-+
-+ s = blobmsg_alloc_string_buffer(buf, name, 20);
-+ sprintf(s, MACSTR, MAC2STR(addr));
-+ blobmsg_add_string_buffer(buf);
-+}
-+
-+static int
-+hostapd_bss_list_bans(struct ubus_context *ctx, struct ubus_object *obj,
-+ struct ubus_request_data *req, const char *method,
-+ struct blob_attr *msg)
-+{
-+ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
-+ struct ubus_banned_client *ban;
-+ void *c;
-+
-+ blob_buf_init(&b, 0);
-+ c = blobmsg_open_array(&b, "clients");
-+ avl_for_each_element(&hapd->ubus.banned, ban, avl)
-+ blobmsg_add_macaddr(&b, NULL, ban->addr);
-+ blobmsg_close_array(&b, c);
-+ ubus_send_reply(ctx, req, b.head);
-+
-+ return 0;
-+}
-+
-+static int
-+hostapd_bss_wps_start(struct ubus_context *ctx, struct ubus_object *obj,
-+ struct ubus_request_data *req, const char *method,
-+ struct blob_attr *msg)
-+{
-+ int rc;
-+ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
-+
-+ rc = hostapd_wps_button_pushed(hapd, NULL);
-+
-+ if (rc != 0)
-+ return UBUS_STATUS_NOT_SUPPORTED;
-+
-+ return 0;
-+}
-+
-+static int
-+hostapd_bss_wps_cancel(struct ubus_context *ctx, struct ubus_object *obj,
-+ struct ubus_request_data *req, const char *method,
-+ struct blob_attr *msg)
-+{
-+ int rc;
-+ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
-+
-+ rc = hostapd_wps_cancel(hapd);
-+
-+ if (rc != 0)
-+ return UBUS_STATUS_NOT_SUPPORTED;
-+
-+ return 0;
-+}
-+
-+static int
-+hostapd_bss_update_beacon(struct ubus_context *ctx, struct ubus_object *obj,
-+ struct ubus_request_data *req, const char *method,
-+ struct blob_attr *msg)
-+{
-+ int rc;
-+ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
-+
-+ rc = ieee802_11_set_beacon(hapd);
-+
-+ if (rc != 0)
-+ return UBUS_STATUS_NOT_SUPPORTED;
-+
-+ return 0;
-+}
-+
-+enum {
-+ CSA_FREQ,
-+ CSA_BCN_COUNT,
-+ __CSA_MAX
-+};
-+
-+static const struct blobmsg_policy csa_policy[__CSA_MAX] = {
-+ /*
-+ * for now, frequency and beacon count are enough, add more
-+ * parameters on demand
-+ */
-+ [CSA_FREQ] = { "freq", BLOBMSG_TYPE_INT32 },
-+ [CSA_BCN_COUNT] = { "bcn_count", BLOBMSG_TYPE_INT32 },
-+};
-+
-+#ifdef NEED_AP_MLME
-+static int
-+hostapd_switch_chan(struct ubus_context *ctx, struct ubus_object *obj,
-+ struct ubus_request_data *req, const char *method,
-+ struct blob_attr *msg)
-+{
-+ struct blob_attr *tb[__CSA_MAX];
-+ struct hostapd_data *hapd = get_hapd_from_object(obj);
-+ struct csa_settings css;
-+
-+ blobmsg_parse(csa_policy, __CSA_MAX, tb, blob_data(msg), blob_len(msg));
-+
-+ if (!tb[CSA_FREQ])
-+ return UBUS_STATUS_INVALID_ARGUMENT;
-+
-+ memset(&css, 0, sizeof(css));
-+ css.freq_params.freq = blobmsg_get_u32(tb[CSA_FREQ]);
-+ if (tb[CSA_BCN_COUNT])
-+ css.cs_count = blobmsg_get_u32(tb[CSA_BCN_COUNT]);
-+
-+ if (hostapd_switch_channel(hapd, &css) != 0)
-+ return UBUS_STATUS_NOT_SUPPORTED;
-+ return UBUS_STATUS_OK;
-+}
-+#endif
-+
-+enum {
-+ VENDOR_ELEMENTS,
-+ __VENDOR_ELEMENTS_MAX
-+};
-+
-+static const struct blobmsg_policy ve_policy[__VENDOR_ELEMENTS_MAX] = {
-+ /* vendor elements are provided as hex-string */
-+ [VENDOR_ELEMENTS] = { "vendor_elements", BLOBMSG_TYPE_STRING },
-+};
-+
-+static int
-+hostapd_vendor_elements(struct ubus_context *ctx, struct ubus_object *obj,
-+ struct ubus_request_data *req, const char *method,
-+ struct blob_attr *msg)
-+{
-+ struct blob_attr *tb[__VENDOR_ELEMENTS_MAX];
-+ struct hostapd_data *hapd = get_hapd_from_object(obj);
-+
-+ blobmsg_parse(ve_policy, __VENDOR_ELEMENTS_MAX, tb,
-+ blob_data(msg), blob_len(msg));
-+
-+ if (!tb[VENDOR_ELEMENTS])
-+ return UBUS_STATUS_INVALID_ARGUMENT;
-+
-+ const char *vendor_elements = blobmsg_data(tb[VENDOR_ELEMENTS]);
-+ if (hostapd_set_iface(hapd->iconf, hapd->conf, "vendor_elements",
-+ vendor_elements) != 0)
-+ return UBUS_STATUS_NOT_SUPPORTED;
-+
-+ /* update beacons if vendor elements were set successfully */
-+ if (ieee802_11_update_beacons(hapd->iface) != 0)
-+ return UBUS_STATUS_NOT_SUPPORTED;
-+ return UBUS_STATUS_OK;
-+}
-+
-+static const struct ubus_method bss_methods[] = {
-+ UBUS_METHOD_NOARG("get_clients", hostapd_bss_get_clients),
-+ UBUS_METHOD("del_client", hostapd_bss_del_client, del_policy),
-+ UBUS_METHOD_NOARG("list_bans", hostapd_bss_list_bans),
-+ UBUS_METHOD_NOARG("wps_start", hostapd_bss_wps_start),
-+ UBUS_METHOD_NOARG("wps_cancel", hostapd_bss_wps_cancel),
-+ UBUS_METHOD_NOARG("update_beacon", hostapd_bss_update_beacon),
-+#ifdef NEED_AP_MLME
-+ UBUS_METHOD("switch_chan", hostapd_switch_chan, csa_policy),
-+#endif
-+ UBUS_METHOD("set_vendor_elements", hostapd_vendor_elements, ve_policy),
-+};
-+
-+static struct ubus_object_type bss_object_type =
-+ UBUS_OBJECT_TYPE("hostapd_bss", bss_methods);
-+
-+static int avl_compare_macaddr(const void *k1, const void *k2, void *ptr)
-+{
-+ return memcmp(k1, k2, ETH_ALEN);
-+}
-+
-+void hostapd_ubus_add_bss(struct hostapd_data *hapd)
-+{
-+ struct ubus_object *obj = &hapd->ubus.obj;
-+ char *name;
-+ int ret;
-+
-+ if (!hostapd_ubus_init())
-+ return;
-+
-+ if (asprintf(&name, "hostapd.%s", hapd->conf->iface) < 0)
-+ return;
-+
-+ avl_init(&hapd->ubus.banned, avl_compare_macaddr, false, NULL);
-+ obj->name = name;
-+ obj->type = &bss_object_type;
-+ obj->methods = bss_object_type.methods;
-+ obj->n_methods = bss_object_type.n_methods;
-+ ret = ubus_add_object(ctx, obj);
-+ hostapd_ubus_ref_inc();
-+}
-+
-+void hostapd_ubus_free_bss(struct hostapd_data *hapd)
-+{
-+ struct ubus_object *obj = &hapd->ubus.obj;
-+ char *name = (char *) obj->name;
-+
-+ if (!ctx)
-+ return;
-+
-+ if (obj->id) {
-+ ubus_remove_object(ctx, obj);
-+ hostapd_ubus_ref_dec();
-+ }
-+
-+ free(name);
-+}
-+
-+struct ubus_event_req {
-+ struct ubus_notify_request nreq;
-+ bool deny;
-+};
-+
-+static void
-+ubus_event_cb(struct ubus_notify_request *req, int idx, int ret)
-+{
-+ struct ubus_event_req *ureq = container_of(req, struct ubus_event_req, nreq);
-+
-+ if (ret)
-+ ureq->deny = true;
-+}
-+
-+int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req)
-+{
-+ struct ubus_banned_client *ban;
-+ const char *types[HOSTAPD_UBUS_TYPE_MAX] = {
-+ [HOSTAPD_UBUS_PROBE_REQ] = "probe",
-+ [HOSTAPD_UBUS_AUTH_REQ] = "auth",
-+ [HOSTAPD_UBUS_ASSOC_REQ] = "assoc",
-+ };
-+ const char *type = "mgmt";
-+ struct ubus_event_req ureq = {};
-+ const u8 *addr;
-+
-+ if (req->mgmt_frame)
-+ addr = req->mgmt_frame->sa;
-+ else
-+ addr = req->addr;
-+
-+ ban = avl_find_element(&hapd->ubus.banned, addr, ban, avl);
-+ if (ban)
-+ return -2;
-+
-+ if (!hapd->ubus.obj.has_subscribers)
-+ return 0;
-+
-+ if (req->type < ARRAY_SIZE(types))
-+ type = types[req->type];
-+
-+ blob_buf_init(&b, 0);
-+ blobmsg_add_macaddr(&b, "address", addr);
-+ if (req->mgmt_frame)
-+ blobmsg_add_macaddr(&b, "target", req->mgmt_frame->da);
-+ if (req->frame_info)
-+ blobmsg_add_u32(&b, "signal", req->frame_info->ssi_signal);
-+ blobmsg_add_u32(&b, "freq", hapd->iface->freq);
-+
-+ if (ubus_notify_async(ctx, &hapd->ubus.obj, type, b.head, &ureq.nreq))
-+ return 0;
-+
-+ ureq.nreq.status_cb = ubus_event_cb;
-+ ubus_complete_request(ctx, &ureq.nreq.req, 100);
-+
-+ if (ureq.deny)
-+ return -1;
-+
-+ return 0;
-+}
---- /dev/null
-+++ b/src/ap/ubus.h
-@@ -0,0 +1,78 @@
-+/*
-+ * hostapd / ubus support
-+ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * This software may be distributed under the terms of the BSD license.
-+ * See README for more details.
-+ */
-+#ifndef __HOSTAPD_UBUS_H
-+#define __HOSTAPD_UBUS_H
-+
-+enum hostapd_ubus_event_type {
-+ HOSTAPD_UBUS_PROBE_REQ,
-+ HOSTAPD_UBUS_AUTH_REQ,
-+ HOSTAPD_UBUS_ASSOC_REQ,
-+ HOSTAPD_UBUS_TYPE_MAX
-+};
-+
-+struct hostapd_ubus_request {
-+ enum hostapd_ubus_event_type type;
-+ const struct ieee80211_mgmt *mgmt_frame;
-+ const struct hostapd_frame_info *frame_info;
-+ const u8 *addr;
-+};
-+
-+struct hostapd_iface;
-+struct hostapd_data;
-+
-+#ifdef UBUS_SUPPORT
-+
-+#include <libubox/avl.h>
-+#include <libubus.h>
-+
-+struct hostapd_ubus_iface {
-+ struct ubus_object obj;
-+};
-+
-+struct hostapd_ubus_bss {
-+ struct ubus_object obj;
-+ struct avl_tree banned;
-+};
-+
-+void hostapd_ubus_add_iface(struct hostapd_iface *iface);
-+void hostapd_ubus_free_iface(struct hostapd_iface *iface);
-+void hostapd_ubus_add_bss(struct hostapd_data *hapd);
-+void hostapd_ubus_free_bss(struct hostapd_data *hapd);
-+
-+int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req);
-+
-+#else
-+
-+struct hostapd_ubus_iface {};
-+
-+struct hostapd_ubus_bss {};
-+
-+static inline void hostapd_ubus_add_iface(struct hostapd_iface *iface)
-+{
-+}
-+
-+static inline void hostapd_ubus_free_iface(struct hostapd_iface *iface)
-+{
-+}
-+
-+static inline void hostapd_ubus_add_bss(struct hostapd_data *hapd)
-+{
-+}
-+
-+static inline void hostapd_ubus_free_bss(struct hostapd_data *hapd)
-+{
-+}
-+
-+static inline int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req)
-+{
-+ return 0;
-+}
-+
-+#endif
-+
-+#endif
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
-@@ -277,6 +277,7 @@ static void hostapd_free_hapd_data(struc
+@@ -302,6 +302,7 @@ static void hostapd_free_hapd_data(struc
hapd->started = 0;
wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
iapp_deinit(hapd->iapp);
hapd->iapp = NULL;
accounting_deinit(hapd);
-@@ -1098,6 +1099,8 @@ static int hostapd_setup_bss(struct host
+@@ -1160,6 +1161,8 @@ static int hostapd_setup_bss(struct host
if (hapd->driver && hapd->driver->set_operstate)
hapd->driver->set_operstate(hapd->drv_priv, 1);
return 0;
}
-@@ -1384,6 +1387,7 @@ int hostapd_setup_interface_complete(str
+@@ -1683,6 +1686,7 @@ static int hostapd_setup_interface_compl
if (err)
goto fail;
wpa_printf(MSG_DEBUG, "Completing interface initialization");
if (iface->conf->channel) {
#ifdef NEED_AP_MLME
-@@ -1544,6 +1548,7 @@ dfs_offload:
+@@ -1862,6 +1866,7 @@ dfs_offload:
fail:
wpa_printf(MSG_ERROR, "Interface initialization failed");
+ hostapd_ubus_free_iface(iface);
hostapd_set_state(iface, HAPD_IFACE_DISABLED);
wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
- if (iface->interfaces && iface->interfaces->terminate_on_error)
-@@ -1873,6 +1878,7 @@ void hostapd_interface_deinit_free(struc
+ #ifdef CONFIG_FST
+@@ -2310,6 +2315,7 @@ void hostapd_interface_deinit_free(struc
(unsigned int) iface->conf->num_bss);
driver = iface->bss[0]->driver;
drv_priv = iface->bss[0]->drv_priv;
__func__, driver, drv_priv);
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
-@@ -881,7 +881,8 @@ int auth_sae_init_committed(struct hosta
+@@ -1293,7 +1293,8 @@ void ieee802_11_finish_fils_auth(struct
static void handle_auth(struct hostapd_data *hapd,
{
u16 auth_alg, auth_transaction, status_code;
u16 resp = WLAN_STATUS_SUCCESS;
-@@ -897,6 +898,11 @@ static void handle_auth(struct hostapd_d
+@@ -1309,6 +1310,11 @@ static void handle_auth(struct hostapd_d
char *identity = NULL;
char *radius_cui = NULL;
u16 seq_ctrl;
+ .frame_info = fi,
+ };
- if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.auth)) {
- wpa_printf(MSG_INFO, "handle_auth - too short payload (len=%lu)",
-@@ -983,6 +989,14 @@ static void handle_auth(struct hostapd_d
+ os_memset(&vlan_id, 0, sizeof(vlan_id));
+
+@@ -1466,6 +1472,14 @@ static void handle_auth(struct hostapd_d
resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
goto fail;
}
if (res == HOSTAPD_ACL_PENDING) {
wpa_printf(MSG_DEBUG, "Authentication frame from " MACSTR
" waiting for an external authentication",
-@@ -1694,13 +1708,18 @@ static void send_assoc_resp(struct hosta
+@@ -2391,7 +2405,7 @@ static u16 send_assoc_resp(struct hostap
static void handle_assoc(struct hostapd_data *hapd,
const struct ieee80211_mgmt *mgmt, size_t len,
+ int reassoc, struct hostapd_frame_info *fi)
{
u16 capab_info, listen_interval, seq_ctrl, fc;
- u16 resp = WLAN_STATUS_SUCCESS;
- const u8 *pos;
+ u16 resp = WLAN_STATUS_SUCCESS, reply_res;
+@@ -2399,6 +2413,11 @@ static void handle_assoc(struct hostapd_
int left, i;
struct sta_info *sta;
+ u8 *tmp = NULL;
+ struct hostapd_ubus_request req = {
+ .type = HOSTAPD_UBUS_ASSOC_REQ,
+ .mgmt_frame = mgmt,
if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
sizeof(mgmt->u.assoc_req))) {
-@@ -1820,6 +1839,13 @@ static void handle_assoc(struct hostapd_
- goto fail;
+@@ -2518,6 +2537,13 @@ static void handle_assoc(struct hostapd_
}
+ #endif /* CONFIG_MBO */
+ if (hostapd_ubus_handle_event(hapd, &req)) {
+ wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
+ goto fail;
+ }
+
- sta->capability = capab_info;
- sta->listen_interval = listen_interval;
+ /*
+ * sta->capability is used in check_assoc_ies() for RRM enabled
+ * capability element.
+@@ -2688,6 +2714,7 @@ static void handle_disassoc(struct hosta
+ wpa_printf(MSG_DEBUG, "disassocation: STA=" MACSTR " reason_code=%d",
+ MAC2STR(mgmt->sa),
+ le_to_host16(mgmt->u.disassoc.reason_code));
++ hostapd_ubus_notify(hapd, "disassoc", mgmt->sa);
-@@ -2236,7 +2262,7 @@ int ieee802_11_mgmt(struct hostapd_data
+ sta = ap_get_sta(hapd, mgmt->sa);
+ if (sta == NULL) {
+@@ -2742,6 +2769,8 @@ static void handle_deauth(struct hostapd
+ " reason_code=%d",
+ MAC2STR(mgmt->sa), le_to_host16(mgmt->u.deauth.reason_code));
+
++ hostapd_ubus_notify(hapd, "deauth", mgmt->sa);
++
+ sta = ap_get_sta(hapd, mgmt->sa);
+ if (sta == NULL) {
+ wpa_msg(hapd->msg_ctx, MSG_DEBUG, "Station " MACSTR " trying "
+@@ -3025,7 +3054,7 @@ int ieee802_11_mgmt(struct hostapd_data
if (stype == WLAN_FC_STYPE_PROBE_REQ) {
return 1;
}
-@@ -2251,17 +2277,17 @@ int ieee802_11_mgmt(struct hostapd_data
+@@ -3043,17 +3072,17 @@ int ieee802_11_mgmt(struct hostapd_data
switch (stype) {
case WLAN_FC_STYPE_AUTH:
wpa_printf(MSG_DEBUG, "mgmt::auth");
case WLAN_FC_STYPE_DISASSOC:
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
-@@ -542,7 +542,7 @@ static enum ssid_match_result ssid_match
+@@ -702,7 +702,7 @@ void sta_track_claim_taxonomy_info(struc
void handle_probe_req(struct hostapd_data *hapd,
const struct ieee80211_mgmt *mgmt, size_t len,
{
u8 *resp;
struct ieee802_11_elems elems;
-@@ -550,8 +550,14 @@ void handle_probe_req(struct hostapd_dat
- size_t ie_len;
- struct sta_info *sta = NULL;
+@@ -711,9 +711,15 @@ void handle_probe_req(struct hostapd_dat
size_t i, resp_len;
-+ int ssi_signal = fi->ssi_signal;
int noack;
enum ssid_match_result res;
++ int ssi_signal = fi->ssi_signal;
+ int ret;
+ u16 csa_offs[2];
+ size_t csa_offs_len;
+ struct hostapd_ubus_request req = {
+ .type = HOSTAPD_UBUS_PROBE_REQ,
+ .mgmt_frame = mgmt,
+ .frame_info = fi,
+ };
- ie = mgmt->u.probe_req.variable;
- if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.probe_req))
-@@ -710,6 +716,12 @@ void handle_probe_req(struct hostapd_dat
+ if (len < IEEE80211_HDRLEN)
+ return;
+@@ -880,6 +886,12 @@ void handle_probe_req(struct hostapd_dat
}
#endif /* CONFIG_P2P */
int ieee802_11_update_beacons(struct hostapd_iface *iface);
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
-@@ -49,6 +49,10 @@ int hostapd_notif_assoc(struct hostapd_d
+@@ -52,6 +52,10 @@ int hostapd_notif_assoc(struct hostapd_d
u16 reason = WLAN_REASON_UNSPECIFIED;
u16 status = WLAN_STATUS_SUCCESS;
const u8 *p2p_dev_addr = NULL;
if (addr == NULL) {
/*
-@@ -113,6 +117,12 @@ int hostapd_notif_assoc(struct hostapd_d
+@@ -131,6 +135,12 @@ int hostapd_notif_assoc(struct hostapd_d
+ goto fail;
}
- sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS | WLAN_STA_WPS2);
+ if (hostapd_ubus_handle_event(hapd, &req)) {
+ wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
#ifdef CONFIG_P2P
if (elems.p2p) {
wpabuf_free(sta->p2p_ie);
+--- a/src/ap/sta_info.c
++++ b/src/ap/sta_info.c
+@@ -386,6 +386,7 @@ void ap_handle_timer(void *eloop_ctx, vo
+ HOSTAPD_LEVEL_INFO, "deauthenticated due to "
+ "local deauth request");
+ ap_free_sta(hapd, sta);
++ hostapd_ubus_notify(hapd, "local-deauth", sta->addr);
+ return;
+ }
+
+@@ -533,6 +534,7 @@ skip_poll:
+ hapd, sta,
+ WLAN_REASON_PREV_AUTH_NOT_VALID);
+ ap_free_sta(hapd, sta);
++ hostapd_ubus_notify(hapd, "inactive-deauth", sta->addr);
+ break;
+ }
+ }
+--- a/src/ap/wpa_auth_glue.c
++++ b/src/ap/wpa_auth_glue.c
+@@ -159,6 +159,7 @@ static void hostapd_wpa_auth_psk_failure
+ struct hostapd_data *hapd = ctx;
+ wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_POSSIBLE_PSK_MISMATCH MACSTR,
+ MAC2STR(addr));
++ hostapd_ubus_notify(hapd, "key-mismatch", addr);
+ }
+
+
projects / openwrt / openwrt.git / blobdiff