#include "event.h"
static struct blob_buf b;
+static KVLIST(host_info, kvlist_blob_len);
static int
usteer_ubus_get_clients(struct ubus_context *ctx, struct ubus_object *obj,
#define __config_items \
_cfg(BOOL, syslog), \
_cfg(U32, debug_level), \
+ _cfg(BOOL, ipv6), \
_cfg(U32, sta_block_timeout), \
_cfg(U32, local_sta_timeout), \
_cfg(U32, local_sta_update), \
+ _cfg(U32, max_neighbor_reports), \
_cfg(U32, max_retry_band), \
_cfg(U32, seen_policy_timeout), \
_cfg(U32, load_balancing_threshold), \
_cfg(BOOL, assoc_steering), \
_cfg(I32, min_connect_snr), \
_cfg(I32, min_snr), \
+ _cfg(U32, roam_process_timeout), \
_cfg(I32, roam_scan_snr), \
_cfg(U32, roam_scan_tries), \
_cfg(U32, roam_scan_interval), \
}
}
+ usteer_interface_init();
+
return 0;
}
-static void
-usteer_dump_node_info(struct usteer_node *node)
+void usteer_dump_node(struct blob_buf *buf, struct usteer_node *node)
{
- void *c;
+ void *c, *roam_events;
+
+ c = blobmsg_open_table(buf, usteer_node_name(node));
+ blobmsg_printf(buf, "bssid", MAC_ADDR_FMT, MAC_ADDR_DATA(node->bssid));
+ blobmsg_add_u32(buf, "freq", node->freq);
+ blobmsg_add_u32(buf, "n_assoc", node->n_assoc);
+ blobmsg_add_u32(buf, "noise", node->noise);
+ blobmsg_add_u32(buf, "load", node->load);
+ blobmsg_add_u32(buf, "max_assoc", node->max_assoc);
+
+ roam_events = blobmsg_open_table(buf, "roam_events");
+ blobmsg_add_u32(buf, "source", node->roam_events.source);
+ blobmsg_add_u32(buf, "target", node->roam_events.target);
+ blobmsg_close_table(buf, roam_events);
- c = blobmsg_open_table(&b, usteer_node_name(node));
- blobmsg_add_u32(&b, "freq", node->freq);
- blobmsg_add_u32(&b, "n_assoc", node->n_assoc);
- blobmsg_add_u32(&b, "noise", node->noise);
- blobmsg_add_u32(&b, "load", node->load);
- blobmsg_add_u32(&b, "max_assoc", node->max_assoc);
if (node->rrm_nr)
- blobmsg_add_field(&b, BLOBMSG_TYPE_ARRAY, "rrm_nr",
+ blobmsg_add_field(buf, BLOBMSG_TYPE_ARRAY, "rrm_nr",
blobmsg_data(node->rrm_nr),
blobmsg_data_len(node->rrm_nr));
- if (node->script_data)
- blobmsg_add_field(&b, BLOBMSG_TYPE_TABLE, "script_data",
- blob_data(node->script_data),
- blob_len(node->script_data));
+ if (node->node_info)
+ blobmsg_add_field(buf, BLOBMSG_TYPE_TABLE, "node_info",
+ blob_data(node->node_info),
+ blob_len(node->node_info));
+
+ blobmsg_close_table(buf, c);
+}
- blobmsg_close_table(&b, c);
+void usteer_dump_host(struct blob_buf *buf, struct usteer_remote_host *host)
+{
+ void *c;
+
+ c = blobmsg_open_table(buf, host->addr);
+ blobmsg_add_u32(buf, "id", (uint32_t)(uintptr_t)host->avl.key);
+ if (host->host_info)
+ blobmsg_add_field(buf, BLOBMSG_TYPE_TABLE, "host_info",
+ blobmsg_data(host->host_info),
+ blobmsg_len(host->host_info));
+ blobmsg_close_table(buf, c);
}
static int
blob_buf_init(&b, 0);
for_each_local_node(node)
- usteer_dump_node_info(node);
+ usteer_dump_node(&b, node);
+
+ ubus_send_reply(ctx, req, b.head);
+
+ return 0;
+}
+
+static int
+usteer_ubus_remote_hosts(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct usteer_remote_host *host;
+
+ blob_buf_init(&b, 0);
+
+ avl_for_each_element(&remote_hosts, host, avl)
+ usteer_dump_host(&b, host);
ubus_send_reply(ctx, req, b.head);
blob_buf_init(&b, 0);
- avl_for_each_element(&remote_nodes, rn, avl)
- usteer_dump_node_info(&rn->node);
+ for_each_remote_node(rn)
+ usteer_dump_node(&b, &rn->node);
ubus_send_reply(ctx, req, b.head);
};
static void
-__usteer_ubus_update_node_data(struct usteer_local_node *ln, struct blob_attr *data,
- bool delete)
+usteer_update_kvlist_data(struct kvlist *kv, struct blob_attr *data,
+ bool delete)
{
struct blob_attr *cur;
int rem;
blobmsg_for_each_attr(cur, data, rem) {
if (delete)
- kvlist_delete(&ln->script_data, blobmsg_get_string(cur));
+ kvlist_delete(kv, blobmsg_get_string(cur));
else
- kvlist_set(&ln->script_data, blobmsg_name(cur), cur);
+ kvlist_set(kv, blobmsg_name(cur), cur);
}
+}
- usteer_local_node_update_script_data(ln);
+static void
+usteer_update_kvlist_blob(struct blob_attr **dest, struct kvlist *kv)
+{
+ struct blob_attr *val;
+ const char *name;
+
+ blob_buf_init(&b, 0);
+ kvlist_for_each(kv, name, val)
+ blobmsg_add_field(&b, blobmsg_type(val), name,
+ blobmsg_data(val), blobmsg_len(val));
+
+ val = b.head;
+ if (!blobmsg_len(val))
+ val = NULL;
+
+ usteer_node_set_blob(dest, val);
}
static int
if (!ln)
return UBUS_STATUS_NOT_FOUND;
- __usteer_ubus_update_node_data(ln, val, delete);
+ usteer_update_kvlist_data(&ln->node_info, val, delete);
+ usteer_update_kvlist_blob(&ln->node.node_info, &ln->node_info);
return 0;
}
- avl_for_each_element(&local_nodes, ln, node.avl)
- __usteer_ubus_update_node_data(ln, val, delete);
+ usteer_update_kvlist_data(&host_info, val, delete);
+ usteer_update_kvlist_blob(&host_info_blob, &host_info);
return 0;
}
static const struct ubus_method usteer_methods[] = {
UBUS_METHOD_NOARG("local_info", usteer_ubus_local_info),
+ UBUS_METHOD_NOARG("remote_hosts", usteer_ubus_remote_hosts),
UBUS_METHOD_NOARG("remote_info", usteer_ubus_remote_info),
UBUS_METHOD_NOARG("get_clients", usteer_ubus_get_clients),
UBUS_METHOD("get_client_info", usteer_ubus_get_client_info, client_arg),
.n_methods = ARRAY_SIZE(usteer_methods),
};
-static void
+static bool
usteer_add_nr_entry(struct usteer_node *ln, struct usteer_node *node)
{
struct blobmsg_policy policy[3] = {
struct blob_attr *tb[3];
if (!node->rrm_nr)
- return;
+ return false;
if (strcmp(ln->ssid, node->ssid) != 0)
- return;
+ return false;
blobmsg_parse_array(policy, ARRAY_SIZE(tb), tb,
blobmsg_data(node->rrm_nr),
blobmsg_data_len(node->rrm_nr));
if (!tb[2])
- return;
+ return false;
blobmsg_add_field(&b, BLOBMSG_TYPE_STRING, "",
blobmsg_data(tb[2]),
blobmsg_data_len(tb[2]));
+
+ return true;
+}
+
+static void
+usteer_ubus_disassoc_add_neighbors(struct sta_info *si)
+{
+ struct usteer_node *node, *last_remote_neighbor = NULL;
+ int i = 0;
+ void *c;
+
+ c = blobmsg_open_array(&b, "neighbors");
+ for_each_local_node(node) {
+ if (i >= config.max_neighbor_reports)
+ break;
+ if (usteer_add_nr_entry(si->node, node))
+ i++;
+ }
+
+ while (i < config.max_neighbor_reports) {
+ node = usteer_node_get_next_neighbor(si->node, last_remote_neighbor);
+ if (!node) {
+ /* No more nodes available */
+ break;
+ }
+
+ last_remote_neighbor = node;
+ if (usteer_add_nr_entry(si->node, node))
+ i++;
+ }
+ blobmsg_close_array(&b, c);
}
int usteer_ubus_notify_client_disassoc(struct sta_info *si)
{
struct usteer_local_node *ln = container_of(si->node, struct usteer_local_node, node);
- struct usteer_remote_node *rn;
- struct usteer_node *node;
- void *c;
blob_buf_init(&b, 0);
blobmsg_printf(&b, "addr", MAC_ADDR_FMT, MAC_ADDR_DATA(si->sta->addr));
blobmsg_add_u32(&b, "duration", config.roam_kick_delay);
- c = blobmsg_open_array(&b, "neighbors");
- for_each_local_node(node)
- usteer_add_nr_entry(si->node, node);
- avl_for_each_element(&remote_nodes, rn, avl)
- usteer_add_nr_entry(si->node, &rn->node);
- blobmsg_close_array(&b, c);
+ usteer_ubus_disassoc_add_neighbors(si);
return ubus_invoke(ubus_ctx, ln->obj_id, "wnm_disassoc_imminent", b.head, NULL, 0, 100);
}
{
struct usteer_local_node *ln = container_of(si->node, struct usteer_local_node, node);
+ if (!usteer_sta_supports_beacon_measurement_mode(si->sta, BEACON_MEASUREMENT_ACTIVE)) {
+ MSG(DEBUG, "STA does not support beacon measurement sta=" MAC_ADDR_FMT "\n", MAC_ADDR_DATA(si->sta->addr));
+ return 0;
+ }
+
si->scan_band = !si->scan_band;
blob_buf_init(&b, 0);
blobmsg_printf(&b, "addr", MAC_ADDR_FMT, MAC_ADDR_DATA(si->sta->addr));
- blobmsg_add_u32(&b, "mode", 1);
- blobmsg_add_u32(&b, "duration", 65535);
- blobmsg_add_u32(&b, "channel", 255);
+ blobmsg_add_u32(&b, "mode", BEACON_MEASUREMENT_ACTIVE);
+ blobmsg_add_u32(&b, "duration", config.roam_scan_interval / 100);
+ blobmsg_add_u32(&b, "channel", 0);
blobmsg_add_u32(&b, "op_class", si->scan_band ? 1 : 12);
return ubus_invoke(ubus_ctx, ln->obj_id, "rrm_beacon_req", b.head, NULL, 0, 100);
}
blobmsg_add_u32(&b, "reason", config.load_kick_reason_code);
blobmsg_add_u8(&b, "deauth", 1);
ubus_invoke(ubus_ctx, ln->obj_id, "del_client", b.head, NULL, 0, 100);
- si->connected = 0;
+ si->connected = STA_NOT_CONNECTED;
si->roam_kick = current_time;
}
projects / project / usteer.git / blobdiff