ln->req_state = REQ_IDLE;
}
+static void
+usteer_local_node_pending_bss_tm_free(struct usteer_local_node *ln)
+{
+ struct usteer_bss_tm_query *query, *tmp;
+
+ list_for_each_entry_safe(query, tmp, &ln->bss_tm_queries, list) {
+ list_del(&query->list);
+ free(query);
+ }
+}
+
static void
usteer_free_node(struct ubus_context *ctx, struct usteer_local_node *ln)
{
h->free_node(&ln->node);
}
+ usteer_local_node_pending_bss_tm_free(ln);
usteer_local_node_state_reset(ln);
usteer_sta_node_cleanup(&ln->node);
+ usteer_measurement_report_node_cleanup(&ln->node);
uloop_timeout_cancel(&ln->update);
+ uloop_timeout_cancel(&ln->bss_tm_queries_timeout);
avl_delete(&local_nodes, &ln->node.avl);
ubus_unregister_subscriber(ctx, &ln->ev);
kvlist_free(&ln->node_info);
free(ln);
}
+struct usteer_local_node *usteer_local_node_by_bssid(uint8_t *bssid) {
+ struct usteer_local_node *ln;
+ struct usteer_node *n;
+
+ for_each_local_node(n) {
+ ln = container_of(n, struct usteer_local_node, node);
+ if (!memcmp(n->bssid, bssid, 6))
+ return ln;
+ }
+
+ return NULL;
+}
+
static void
usteer_handle_remove(struct ubus_context *ctx, struct ubus_subscriber *s,
uint32_t id)
usteer_free_node(ctx, ln);
}
+static int
+usteer_handle_bss_tm_query(struct usteer_local_node *ln, struct blob_attr *msg)
+{
+ enum {
+ BSS_TM_QUERY_ADDRESS,
+ BSS_TM_QUERY_DIALOG_TOKEN,
+ BSS_TM_QUERY_CANDIDATE_LIST,
+ __BSS_TM_QUERY_MAX
+ };
+ struct blobmsg_policy policy[__BSS_TM_QUERY_MAX] = {
+ [BSS_TM_QUERY_ADDRESS] = { .name = "address", .type = BLOBMSG_TYPE_STRING },
+ [BSS_TM_QUERY_DIALOG_TOKEN] = { .name = "dialog-token", .type = BLOBMSG_TYPE_INT8 },
+ [BSS_TM_QUERY_CANDIDATE_LIST] = { .name = "candidate-list", .type = BLOBMSG_TYPE_STRING },
+ };
+ struct blob_attr *tb[__BSS_TM_QUERY_MAX];
+ struct usteer_bss_tm_query *query;
+ uint8_t *sta_addr;
+
+ blobmsg_parse(policy, __BSS_TM_QUERY_MAX, tb, blob_data(msg), blob_len(msg));
+
+ if (!tb[BSS_TM_QUERY_ADDRESS] || !tb[BSS_TM_QUERY_DIALOG_TOKEN])
+ return 0;
+
+ query = calloc(1, sizeof(*query));
+ if (!query)
+ return 0;
+
+ query->dialog_token = blobmsg_get_u8(tb[BSS_TM_QUERY_DIALOG_TOKEN]);
+
+ sta_addr = (uint8_t *) ether_aton(blobmsg_get_string(tb[BSS_TM_QUERY_ADDRESS]));
+ if (!sta_addr)
+ return 0;
+
+ memcpy(query->sta_addr, sta_addr, 6);
+
+ list_add(&query->list, &ln->bss_tm_queries);
+ uloop_timeout_set(&ln->bss_tm_queries_timeout, 1);
+
+ return 1;
+}
+
+static int
+usteer_handle_bss_tm_response(struct usteer_local_node *ln, struct blob_attr *msg)
+{
+ enum {
+ BSS_TM_RESPONSE_ADDRESS,
+ BSS_TM_RESPONSE_STATUS_CODE,
+ __BSS_TM_RESPONSE_MAX
+ };
+ struct blobmsg_policy policy[__BSS_TM_RESPONSE_MAX] = {
+ [BSS_TM_RESPONSE_ADDRESS] = { .name = "address", .type = BLOBMSG_TYPE_STRING },
+ [BSS_TM_RESPONSE_STATUS_CODE] = { .name = "status-code", .type = BLOBMSG_TYPE_INT8 },
+ };
+ struct blob_attr *tb[__BSS_TM_RESPONSE_MAX];
+ struct sta_info *si;
+ struct sta *sta;
+ uint8_t *sta_addr;
+
+ blobmsg_parse(policy, __BSS_TM_RESPONSE_MAX, tb, blob_data(msg), blob_len(msg));
+
+ if (!tb[BSS_TM_RESPONSE_ADDRESS] || !tb[BSS_TM_RESPONSE_STATUS_CODE])
+ return 0;
+
+ sta_addr = (uint8_t *) ether_aton(blobmsg_get_string(tb[BSS_TM_RESPONSE_ADDRESS]));
+ if (!sta_addr)
+ return 0;
+
+ sta = usteer_sta_get(sta_addr, false);
+ if (!sta)
+ return 0;
+
+ si = usteer_sta_info_get(sta, &ln->node, false);
+ if (!si)
+ return 0;
+
+ si->bss_transition_response.status_code = blobmsg_get_u8(tb[BSS_TM_RESPONSE_STATUS_CODE]);
+ si->bss_transition_response.timestamp = current_time;
+
+ if (si->bss_transition_response.status_code) {
+ /* Cancel imminent kick in case BSS transition was rejected */
+ si->kick_time = 0;
+ }
+
+ return 0;
+}
+
+static int
+usteer_local_node_handle_beacon_report(struct usteer_local_node *ln, struct blob_attr *msg)
+{
+ enum {
+ BR_ADDRESS,
+ BR_BSSID,
+ BR_RCPI,
+ BR_RSNI,
+ __BR_MAX
+ };
+ struct blobmsg_policy policy[__BR_MAX] = {
+ [BR_ADDRESS] = { .name = "address", .type = BLOBMSG_TYPE_STRING },
+ [BR_BSSID] = { .name = "bssid", .type = BLOBMSG_TYPE_STRING },
+ [BR_RCPI] = { .name = "rcpi", .type = BLOBMSG_TYPE_INT16 },
+ [BR_RSNI] = { .name = "rsni", .type = BLOBMSG_TYPE_INT16 },
+ };
+ struct blob_attr *tb[__BR_MAX];
+
+ struct usteer_beacon_report br;
+ struct usteer_node *node;
+ uint8_t *addr;
+ struct sta *sta;
+
+ blobmsg_parse(policy, __BR_MAX, tb, blob_data(msg), blob_len(msg));
+ if (!tb[BR_ADDRESS] || !tb[BR_BSSID] || !tb[BR_RCPI] || !tb[BR_RSNI])
+ return 0;
+
+ addr = (uint8_t *) ether_aton(blobmsg_get_string(tb[BR_ADDRESS]));
+ if (!addr)
+ return 0;
+
+ sta = usteer_sta_get(addr, false);
+ if (!sta)
+ return 0;
+
+ addr = (uint8_t *) ether_aton(blobmsg_get_string(tb[BR_BSSID]));
+ if (!addr)
+ return 0;
+
+ node = usteer_node_by_bssid(addr);
+ if (!node)
+ return 0;
+
+ br.rcpi = (uint8_t)blobmsg_get_u16(tb[BR_RCPI]);
+ br.rsni = (uint8_t)blobmsg_get_u16(tb[BR_RSNI]);
+
+ usteer_measurement_report_add_beacon_report(sta, node, &br, current_time);
+ return 0;
+}
+
static int
usteer_handle_event(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
usteer_update_time();
+ ln = container_of(obj, struct usteer_local_node, ev.obj);
+
+ if(!strcmp(method, "bss-transition-query")) {
+ return usteer_handle_bss_tm_query(ln, msg);
+ } else if(!strcmp(method, "bss-transition-response")) {
+ return usteer_handle_bss_tm_response(ln, msg);
+ } else if(!strcmp(method, "beacon-report")) {
+ return usteer_local_node_handle_beacon_report(ln, msg);
+ }
+
for (i = 0; i < ARRAY_SIZE(event_types); i++) {
if (strcmp(method, event_types[i]) != 0)
continue;
[MSG_ASSOC] = { "assoc", BLOBMSG_TYPE_BOOL },
};
struct blob_attr *tb[__MSG_MAX];
+ struct usteer_remote_node *rn;
+ struct sta_info *remote_si;
blobmsg_parse(policy, __MSG_MAX, tb, blobmsg_data(data), blobmsg_data_len(data));
- if (tb[MSG_ASSOC] && blobmsg_get_u8(tb[MSG_ASSOC]))
+ if (tb[MSG_ASSOC] && blobmsg_get_u8(tb[MSG_ASSOC])) {
+ if (si->connected == STA_NOT_CONNECTED) {
+ /* New connection. Check if STA roamed. */
+ for_each_remote_node(rn) {
+ remote_si = usteer_sta_info_get(si->sta, &rn->node, NULL);
+ if (!remote_si)
+ continue;
+
+ if (current_time - remote_si->last_connected < config.roam_process_timeout) {
+ rn->node.roam_events.source++;
+ /* Don't abort looking for roam sources here.
+ * The client might have roamed via another node
+ * within the roam-timeout.
+ */
+ }
+ }
+ }
si->connected = STA_CONNECTED;
+ }
+}
- if (si->node->freq < 4000)
- si->sta->seen_2ghz = 1;
- else
- si->sta->seen_5ghz = 1;
+static void
+usteer_local_node_update_sta_rrm_wnm(struct sta_info *si, struct blob_attr *client_attr)
+{
+ static const struct blobmsg_policy rrm_policy = {
+ .name = "rrm",
+ .type = BLOBMSG_TYPE_ARRAY,
+ };
+ static const struct blobmsg_policy ext_capa_policy = {
+ .name = "extended_capabilities",
+ .type = BLOBMSG_TYPE_ARRAY,
+ };
+ struct blob_attr *rrm_blob = NULL, *wnm_blob = NULL, *cur;
+ int rem;
+ int i = 0;
+
+ /* RRM */
+ blobmsg_parse(&rrm_policy, 1, &rrm_blob, blobmsg_data(client_attr), blobmsg_data_len(client_attr));
+ if (!rrm_blob)
+ return;
+
+ si->rrm = blobmsg_get_u32(blobmsg_data(rrm_blob));
+
+ /* Extended Capabilities / WNM */
+ blobmsg_parse(&ext_capa_policy, 1, &wnm_blob, blobmsg_data(client_attr), blobmsg_data_len(client_attr));
+ if (!wnm_blob)
+ return;
+
+ blobmsg_for_each_attr(cur, wnm_blob, rem) {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_INT32)
+ return;
+
+ if (i == 2) {
+ if (blobmsg_get_u32(cur) & (1 << 3))
+ si->bss_transition = true;
+ }
+
+ i++;
+ }
}
static void
si->last_connected = current_time;
n_assoc++;
}
+
+ /* Read RRM information */
+ usteer_local_node_update_sta_rrm_wnm(si, cur);
}
node->n_assoc = n_assoc;
if (si->connected != STA_DISCONNECTED)
continue;
- si->connected = STA_NOT_CONNECTED;
- usteer_sta_info_update_timeout(si, config.local_sta_timeout);
+ usteer_sta_disconnected(si);
MSG(VERBOSE, "station "MAC_ADDR_FMT" disconnected from node %s\n",
MAC_ADDR_DATA(si->sta->addr), usteer_node_name(node));
}
usteer_local_node_set_assoc(ln, tb[MSG_CLIENTS]);
}
+static void
+usteer_local_node_status_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+ enum {
+ MSG_FREQ,
+ MSG_CHANNEL,
+ MSG_OP_CLASS,
+ MSG_BEACON_INTERVAL,
+ __MSG_MAX,
+ };
+ static struct blobmsg_policy policy[__MSG_MAX] = {
+ [MSG_FREQ] = { "freq", BLOBMSG_TYPE_INT32 },
+ [MSG_CHANNEL] = { "channel", BLOBMSG_TYPE_INT32 },
+ [MSG_OP_CLASS] = { "op_class", BLOBMSG_TYPE_INT32 },
+ [MSG_BEACON_INTERVAL] = { "beacon_interval", BLOBMSG_TYPE_INT32 },
+ };
+ struct blob_attr *tb[__MSG_MAX];
+ struct usteer_local_node *ln;
+ struct usteer_node *node;
+
+ ln = container_of(req, struct usteer_local_node, req);
+ node = &ln->node;
+
+ blobmsg_parse(policy, __MSG_MAX, tb, blob_data(msg), blob_len(msg));
+ if (tb[MSG_FREQ])
+ node->freq = blobmsg_get_u32(tb[MSG_FREQ]);
+ if (tb[MSG_CHANNEL])
+ node->channel = blobmsg_get_u32(tb[MSG_CHANNEL]);
+ if (tb[MSG_OP_CLASS])
+ node->op_class = blobmsg_get_u32(tb[MSG_OP_CLASS]);
+
+ /* Local-Node */
+ if (tb[MSG_BEACON_INTERVAL])
+ ln->beacon_interval = blobmsg_get_u32(tb[MSG_BEACON_INTERVAL]);
+}
+
static void
usteer_local_node_rrm_nr_cb(struct ubus_request *req, int type, struct blob_attr *msg)
{
uloop_timeout_set(&ln->req_timer, 1);
}
-static void
+static bool
usteer_add_rrm_data(struct usteer_local_node *ln, struct usteer_node *node)
{
if (node == &ln->node)
- return;
+ return false;
if (!node->rrm_nr)
- return;
+ return false;
+ /* Remote node only adds same SSID. Required for local-node. */
if (strcmp(ln->node.ssid, node->ssid) != 0)
- return;
+ return false;
blobmsg_add_field(&b, BLOBMSG_TYPE_ARRAY, "",
blobmsg_data(node->rrm_nr),
blobmsg_data_len(node->rrm_nr));
+
+ return true;
}
static void
usteer_local_node_prepare_rrm_set(struct usteer_local_node *ln)
{
- struct usteer_remote_node *rn;
- struct usteer_node *node;
+ struct usteer_node *node, *last_remote_neighbor = NULL;
+ int i = 0;
void *c;
c = blobmsg_open_array(&b, "list");
- for_each_local_node(node)
- usteer_add_rrm_data(ln, node);
- for_each_remote_node(rn)
- usteer_add_rrm_data(ln, &rn->node);
+ for_each_local_node(node) {
+ if (i >= config.max_neighbor_reports)
+ break;
+ if (usteer_add_rrm_data(ln, node))
+ i++;
+ }
+
+ while (i < config.max_neighbor_reports) {
+ node = usteer_node_get_next_neighbor(&ln->node, last_remote_neighbor);
+ if (!node) {
+ /* No more nodes available */
+ break;
+ }
+
+ last_remote_neighbor = node;
+ if (usteer_add_rrm_data(ln, node))
+ i++;
+ }
+
blobmsg_close_array(&b, c);
}
ubus_invoke_async(ubus_ctx, ln->obj_id, "get_clients", b.head, &ln->req);
ln->req.data_cb = usteer_local_node_list_cb;
break;
+ case REQ_STATUS:
+ ubus_invoke_async(ubus_ctx, ln->obj_id, "get_status", b.head, &ln->req);
+ ln->req.data_cb = usteer_local_node_status_cb;
+ break;
case REQ_RRM_SET_LIST:
usteer_local_node_prepare_rrm_set(ln);
ubus_invoke_async(ubus_ctx, ln->obj_id, "rrm_nr_set", b.head, &ln->req);
uloop_timeout_set(timeout, config.local_sta_update);
}
+static void
+usteer_local_node_process_bss_tm_queries(struct uloop_timeout *timeout)
+{
+ struct usteer_bss_tm_query *query, *tmp;
+ struct usteer_local_node *ln;
+ struct usteer_node *node;
+ struct sta_info *si;
+ struct sta *sta;
+ uint8_t validity_period;
+
+ ln = container_of(timeout, struct usteer_local_node, bss_tm_queries_timeout);
+ node = &ln->node;
+
+ validity_period = 10000 / usteer_local_node_get_beacon_interval(ln); /* ~ 10 seconds */
+
+ list_for_each_entry_safe(query, tmp, &ln->bss_tm_queries, list) {
+ sta = usteer_sta_get(query->sta_addr, false);
+ if (!sta)
+ continue;
+
+ si = usteer_sta_info_get(sta, node, false);
+ if (!si)
+ continue;
+
+ usteer_ubus_bss_transition_request(si, query->dialog_token, false, false, validity_period);
+ }
+
+ /* Free pending queries we can not handle */
+ usteer_local_node_pending_bss_tm_free(ln);
+}
+
static struct usteer_local_node *
usteer_get_node(struct ubus_context *ctx, const char *name)
{
ln = calloc_a(sizeof(*ln), &str, strlen(name) + 1);
node = &ln->node;
node->type = NODE_TYPE_LOCAL;
+ node->created = current_time;
node->avl.key = strcpy(str, name);
ln->ev.remove_cb = usteer_handle_remove;
ln->ev.cb = usteer_handle_event;
avl_insert(&local_nodes, &node->avl);
kvlist_init(&ln->node_info, kvlist_blob_len);
INIT_LIST_HEAD(&node->sta_info);
+ INIT_LIST_HEAD(&node->measurements);
+ ln->bss_tm_queries_timeout.cb = usteer_local_node_process_bss_tm_queries;
+ INIT_LIST_HEAD(&ln->bss_tm_queries);
return ln;
}
MSG(INFO, "Disconnecting from local node %s\n", usteer_node_name(&ln->node));
usteer_local_node_state_reset(ln);
usteer_sta_node_cleanup(&ln->node);
+ usteer_measurement_report_node_cleanup(&ln->node);
uloop_timeout_cancel(&ln->update);
ubus_unsubscribe(ubus_ctx, &ln->ev, ln->obj_id);
return;
usteer_register_node(ctx, obj->path, obj->id);
}
+int
+usteer_local_node_get_beacon_interval(struct usteer_local_node *ln)
+{
+ /* Check if beacon-interval is not available (pre-21.02+) */
+ if (ln->beacon_interval < 1)
+ return 100;
+
+ return ln->beacon_interval;
+}
+
void config_set_node_up_script(struct blob_attr *data)
{
const char *val;
projects / project / usteer.git / blobdiff