_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), \
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, "noise", node->noise);
blobmsg_add_u32(buf, "load", node->load);
blobmsg_add_u32(buf, "max_assoc", node->max_assoc);
- blobmsg_add_u32(buf, "roam_source", node->roam_source);
- blobmsg_add_u32(buf, "roam_destination", node->roam_destination);
+
+ 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);
+
if (node->rrm_nr)
blobmsg_add_field(buf, BLOBMSG_TYPE_ARRAY, "rrm_nr",
blobmsg_data(node->rrm_nr),
.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);
- for_each_remote_node(rn)
- 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", BEACON_MEASUREMENT_ACTIVE);
- blobmsg_add_u32(&b, "duration", 65535);
+ 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);