#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,
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;
- 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);
+ c = blobmsg_open_table(buf, usteer_node_name(node));
+ 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);
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));
- blobmsg_close_table(&b, c);
+ 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);
+}
+
+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);
return 0;
}
+enum {
+ NODE_DATA_NODE,
+ NODE_DATA_VALUES,
+ __NODE_DATA_MAX,
+};
+
+static const struct blobmsg_policy set_node_data_policy[] = {
+ [NODE_DATA_NODE] = { "node", BLOBMSG_TYPE_STRING },
+ [NODE_DATA_VALUES] = { "data", BLOBMSG_TYPE_TABLE },
+};
+
+static const struct blobmsg_policy del_node_data_policy[] = {
+ [NODE_DATA_NODE] = { "node", BLOBMSG_TYPE_STRING },
+ [NODE_DATA_VALUES] = { "names", BLOBMSG_TYPE_ARRAY },
+};
+
+static void
+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(kv, blobmsg_get_string(cur));
+ else
+ kvlist_set(kv, blobmsg_name(cur), cur);
+ }
+}
+
+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
+usteer_ubus_update_node_data(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ const struct blobmsg_policy *policy;
+ struct blob_attr *tb[__NODE_DATA_MAX];
+ struct usteer_local_node *ln;
+ struct blob_attr *val;
+ const char *name;
+ bool delete;
+
+ delete = !strncmp(method, "del", 3);
+ policy = delete ? del_node_data_policy : set_node_data_policy;
+
+ blobmsg_parse(policy, __NODE_DATA_MAX, tb, blob_data(msg), blob_len(msg));
+ if (!tb[NODE_DATA_NODE] || !tb[NODE_DATA_VALUES])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ name = blobmsg_get_string(tb[NODE_DATA_NODE]);
+ val = tb[NODE_DATA_VALUES];
+ if (delete && blobmsg_check_array(val, BLOBMSG_TYPE_STRING) < 0)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ if (strcmp(name, "*") != 0) {
+ ln = avl_find_element(&local_nodes, name, ln, node.avl);
+ if (!ln)
+ return UBUS_STATUS_NOT_FOUND;
+
+ usteer_update_kvlist_data(&ln->node_info, val, delete);
+ usteer_update_kvlist_blob(&ln->node.node_info, &ln->node_info);
+
+ return 0;
+ }
+
+ 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),
UBUS_METHOD_NOARG("get_config", usteer_ubus_get_config),
UBUS_METHOD("set_config", usteer_ubus_set_config, config_policy),
UBUS_METHOD("update_config", usteer_ubus_set_config, config_policy),
+ UBUS_METHOD("set_node_data", usteer_ubus_update_node_data, set_node_data_policy),
+ UBUS_METHOD("delete_node_data", usteer_ubus_update_node_data, del_node_data_policy),
};
static struct ubus_object_type usteer_obj_type =
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)
+ for_each_remote_node(rn)
usteer_add_nr_entry(si->node, &rn->node);
blobmsg_close_array(&b, c);
return ubus_invoke(ubus_ctx, ln->obj_id, "wnm_disassoc_imminent", b.head, NULL, 0, 100);
projects / project / usteer.git / blobdiff