+#include <arpa/inet.h>
#include "ubusd.h"
static struct avl_tree patterns;
static LIST_HEAD(catch_all);
static struct ubus_object *event_obj;
static int event_seq = 0;
+static int obj_event_seq = 0;
enum evs_type {
EVS_PATTERN,
union {
struct {
struct avl_node avl;
+ bool partial;
} pattern;
struct {
struct list_head list;
};
};
-struct event_pattern {
- struct event_source evs;
- struct list_head list;
-};
-
-struct event_catchall {
- struct event_source evs;
-
- struct list_head list;
- struct ubus_object *obj;
-};
-
static void ubusd_delete_event_source(struct event_source *evs)
{
list_del(&evs->list);
struct event_source *ev;
struct ubus_object *obj;
struct blob_attr *attr[EVREG_LAST];
- const char *pattern;
+ char *pattern;
uint32_t id;
+ bool partial = false;
+ int len;
blobmsg_parse(evr_policy, EVREG_LAST, attr, blob_data(msg), blob_len(msg));
if (!attr[EVREG_OBJECT])
return ubusd_alloc_catchall(obj);
pattern = blobmsg_data(attr[EVREG_PATTERN]);
- ev = ubusd_alloc_event_source(obj, EVS_PATTERN, strlen(pattern) + 1);
+
+ len = strlen(pattern);
+ if (pattern[len - 1] == '*') {
+ partial = true;
+ pattern[len - 1] = 0;
+ len--;
+ }
+
+ ev = ubusd_alloc_event_source(obj, EVS_PATTERN, len + 1);
+ ev->pattern.partial = partial;
ev->pattern.avl.key = (void *) (ev + 1);
strcpy(ev->pattern.avl.key, pattern);
avl_insert(&patterns, &ev->pattern.avl);
return 0;
}
+typedef struct ubus_msg_buf *(*event_fill_cb)(void *priv, const char *id);
+
+static void ubusd_send_event_msg(struct ubus_msg_buf **ub, struct ubus_client *cl,
+ struct ubus_object *obj, const char *id,
+ event_fill_cb fill_cb, void *cb_priv)
+{
+ uint32_t *objid_ptr;
+
+ /* do not loop back events */
+ if (obj->client == cl)
+ return;
+
+ /* do not send duplicate events */
+ if (obj->event_seen == obj_event_seq)
+ return;
+
+ obj->event_seen = obj_event_seq;
+
+ if (!*ub) {
+ *ub = fill_cb(cb_priv, id);
+ (*ub)->hdr.type = UBUS_MSG_INVOKE;
+ (*ub)->hdr.peer = 0;
+ }
+
+ objid_ptr = blob_data(blob_data((*ub)->data));
+ *objid_ptr = htonl(obj->id.id);
+
+ (*ub)->hdr.seq = ++event_seq;
+ ubus_msg_send(obj->client, *ub, false);
+}
+
+bool strmatch_len(const char *s1, const char *s2, int *len)
+{
+ for (*len = 0; s1[*len] == s2[*len]; (*len)++)
+ if (!s1[*len])
+ return true;
+
+ return false;
+}
+
+static int ubusd_send_event(struct ubus_client *cl, const char *id,
+ event_fill_cb fill_cb, void *cb_priv)
+{
+ struct ubus_msg_buf *ub = NULL;
+ struct event_source *ev;
+ int match_len = 0;
+
+ list_for_each_entry(ev, &catch_all, catchall.list)
+ ubusd_send_event_msg(&ub, cl, ev->obj, id, fill_cb, cb_priv);
+
+ obj_event_seq++;
+
+ /*
+ * Since this tree is sorted alphabetically, we can only expect to find
+ * matching entries as long as the number of matching characters
+ * between the pattern string and our string is monotonically increasing.
+ */
+ avl_for_each_element(&patterns, ev, pattern.avl) {
+ const char *key = ev->pattern.avl.key;
+ int cur_match_len;
+ bool full_match;
+
+ full_match = strmatch_len(id, key, &cur_match_len);
+ if (cur_match_len < match_len)
+ break;
+
+ match_len = cur_match_len;
+
+ if (!full_match) {
+ if (!ev->pattern.partial)
+ continue;
+
+ if (match_len != strlen(key))
+ continue;
+ }
+
+ ubusd_send_event_msg(&ub, cl, ev->obj, id, fill_cb, cb_priv);
+ }
+
+ if (ub)
+ ubus_msg_free(ub);
+
+ return 0;
+}
+
enum {
EVMSG_ID,
EVMSG_DATA,
[EVMSG_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
};
-static void ubusd_send_event_msg(struct ubus_msg_buf **ub, struct ubus_object *obj,
- const char *id, struct blob_attr *msg)
+static struct ubus_msg_buf *
+ubusd_create_event_from_msg(void *priv, const char *id)
{
- uint32_t *objid_ptr;
-
- if (*ub) {
- objid_ptr = blob_data(blob_data((*ub)->data));
- *objid_ptr = htonl(obj->id.id);
- } else {
- blob_buf_init(&b, 0);
- blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
- blob_put_string(&b, UBUS_ATTR_METHOD, id);
- blob_put(&b, UBUS_ATTR_DATA, blobmsg_data(msg), blobmsg_data_len(msg));
+ struct blob_attr *msg = priv;
- *ub = ubus_msg_new(b.head, blob_raw_len(b.head), true);
+ blob_buf_init(&b, 0);
+ blob_put_int32(&b, UBUS_ATTR_OBJID, 0);
+ blob_put_string(&b, UBUS_ATTR_METHOD, id);
+ blob_put(&b, UBUS_ATTR_DATA, blobmsg_data(msg), blobmsg_data_len(msg));
- (*ub)->hdr.type = UBUS_MSG_INVOKE;
- (*ub)->hdr.peer = 0;
- }
- (*ub)->hdr.seq = ++event_seq;
- ubus_msg_send(obj->client, *ub, false);
+ return ubus_msg_new(b.head, blob_raw_len(b.head), true);
}
-static int ubusd_send_event(struct ubus_client *cl, struct blob_attr *msg)
+static int ubusd_forward_event(struct ubus_client *cl, struct blob_attr *msg)
{
- struct ubus_msg_buf *ub = NULL;
- struct event_source *ev;
+ struct blob_attr *data;
struct blob_attr *attr[EVMSG_LAST];
const char *id;
return UBUS_STATUS_INVALID_ARGUMENT;
id = blobmsg_data(attr[EVMSG_ID]);
- list_for_each_entry(ev, &catch_all, catchall.list) {
- /* do not loop back events */
- if (ev->obj->client == cl)
- continue;
+ data = attr[EVMSG_DATA];
- ubusd_send_event_msg(&ub, ev->obj, id, attr[EVMSG_DATA]);
- }
-
- if (ub)
- ubus_msg_free(ub);
+ if (!strncmp(id, "ubus.", 5))
+ return UBUS_STATUS_PERMISSION_DENIED;
- return 0;
+ return ubusd_send_event(cl, id, ubusd_create_event_from_msg, data);
}
static int ubusd_event_recv(struct ubus_client *cl, const char *method, struct blob_attr *msg)
return ubusd_alloc_event_pattern(cl, msg);
if (!strcmp(method, "send"))
- return ubusd_send_event(cl, msg);
+ return ubusd_forward_event(cl, msg);
return UBUS_STATUS_INVALID_COMMAND;
}
+static struct ubus_msg_buf *
+ubusd_create_object_event_msg(void *priv, const char *id)
+{
+ struct ubus_object *obj = priv;
+ void *s;
+
+ blob_buf_init(&b, 0);
+ blob_put_int32(&b, UBUS_ATTR_OBJID, 0);
+ blob_put_string(&b, UBUS_ATTR_METHOD, id);
+ s = blob_nest_start(&b, UBUS_ATTR_DATA);
+ blobmsg_add_u32(&b, "id", obj->id.id);
+ blobmsg_add_string(&b, "path", obj->path.key);
+ blob_nest_end(&b, s);
+
+ return ubus_msg_new(b.head, blob_raw_len(b.head), true);
+}
+
+void ubusd_send_obj_event(struct ubus_object *obj, bool add)
+{
+ const char *id = add ? "ubus.object.add" : "ubus.object.remove";
+
+ ubusd_send_event(NULL, id, ubusd_create_object_event_msg, obj);
+}
+
void ubusd_event_init(void)
{
ubus_init_string_tree(&patterns, true);
projects / project / ubus.git / blobdiff