X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_event.c;h=984f341eecea25f27731ef4678fc303753543e0a;hp=2943bfb34a5fe503005c2349222251ff9367ce44;hb=e59b44573423ad608d0752b46a6073222db9ed45;hpb=2378e900abe8038c4fd384259f97bd85e0e8d078 diff --git a/ubusd_event.c b/ubusd_event.c index 2943bfb..984f341 100644 --- a/ubusd_event.c +++ b/ubusd_event.c @@ -1,43 +1,35 @@ +/* + * Copyright (C) 2011 Felix Fietkau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + #include #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, - EVS_CATCHALL -}; +static int obj_event_seq = 1; struct event_source { struct list_head list; struct ubus_object *obj; - enum evs_type type; - union { - struct { - struct avl_node avl; - bool partial; - } pattern; - struct { - struct list_head list; - } catchall; - }; + struct avl_node avl; + bool partial; }; static void ubusd_delete_event_source(struct event_source *evs) { list_del(&evs->list); - switch (evs->type) { - case EVS_PATTERN: - avl_delete(&patterns, &evs->pattern.avl); - break; - case EVS_CATCHALL: - list_del(&evs->catchall.list); - break; - } + avl_delete(&patterns, &evs->avl); free(evs); } @@ -62,40 +54,18 @@ static struct blobmsg_policy evr_policy[] = { [EVREG_OBJECT] = { .name = "object", .type = BLOBMSG_TYPE_INT32 }, }; - -static struct event_source *ubusd_alloc_event_source(struct ubus_object *obj, enum evs_type type, int datalen) -{ - struct event_source *evs; - - evs = calloc(1, sizeof(*evs) + datalen); - list_add(&evs->list, &obj->events); - evs->obj = obj; - evs->type = type; - return evs; -} - -static int ubusd_alloc_catchall(struct ubus_object *obj) -{ - struct event_source *evs; - - evs = ubusd_alloc_event_source(obj, EVS_CATCHALL, 0); - list_add(&evs->catchall.list, &catch_all); - - return 0; -} - static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *msg) { struct event_source *ev; struct ubus_object *obj; struct blob_attr *attr[EVREG_LAST]; - char *pattern; + char *pattern, *name; 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]) + if (!attr[EVREG_OBJECT] || !attr[EVREG_PATTERN]) return UBUS_STATUS_INVALID_ARGUMENT; id = blobmsg_get_u32(attr[EVREG_OBJECT]); @@ -109,9 +79,6 @@ static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *m if (obj->client != cl) return UBUS_STATUS_PERMISSION_DENIED; - if (!attr[EVREG_PATTERN]) - return ubusd_alloc_catchall(obj); - pattern = blobmsg_data(attr[EVREG_PATTERN]); len = strlen(pattern); @@ -121,18 +88,24 @@ static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *m 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); + ev = calloc(1, sizeof(*ev) + len + 1); + if (!ev) + return UBUS_STATUS_NO_DATA; + + list_add(&ev->list, &obj->events); + ev->obj = obj; + ev->partial = partial; + name = (char *) (ev + 1); + strcpy(name, pattern); + ev->avl.key = name; + avl_insert(&patterns, &ev->avl); return 0; } static void ubusd_send_event_msg(struct ubus_msg_buf **ub, struct ubus_client *cl, struct ubus_object *obj, const char *id, - struct blob_attr *msg) + event_fill_cb fill_cb, void *cb_priv) { uint32_t *objid_ptr; @@ -146,25 +119,20 @@ static void ubusd_send_event_msg(struct ubus_msg_buf **ub, struct ubus_client *c obj->event_seen = obj_event_seq; - 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)); - - *ub = ubus_msg_new(b.head, blob_raw_len(b.head), true); - + 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) +static bool strmatch_len(const char *s1, const char *s2, int *len) { for (*len = 0; s1[*len] == s2[*len]; (*len)++) if (!s1[*len]) @@ -173,15 +141,13 @@ bool strmatch_len(const char *s1, const char *s2, int *len) return false; } -static int ubusd_send_event(struct ubus_client *cl, const char *id, - struct blob_attr *data, struct ubus_msg_buf *ub) +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, data); - obj_event_seq++; /* @@ -189,8 +155,8 @@ static int ubusd_send_event(struct ubus_client *cl, const char *id, * 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; + avl_for_each_element(&patterns, ev, avl) { + const char *key = ev->avl.key; int cur_match_len; bool full_match; @@ -201,14 +167,14 @@ static int ubusd_send_event(struct ubus_client *cl, const char *id, match_len = cur_match_len; if (!full_match) { - if (!ev->pattern.partial) + if (!ev->partial) continue; if (match_len != strlen(key)) continue; } - ubusd_send_event_msg(&ub, cl, ev->obj, id, data); + ubusd_send_event_msg(&ub, cl, ev->obj, id, fill_cb, cb_priv); } if (ub) @@ -228,6 +194,19 @@ static struct blobmsg_policy ev_policy[] = { [EVMSG_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE }, }; +static struct ubus_msg_buf * +ubusd_create_event_from_msg(void *priv, const char *id) +{ + struct blob_attr *msg = priv; + + 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)); + + return ubus_msg_new(b.head, blob_raw_len(b.head), true); +} + static int ubusd_forward_event(struct ubus_client *cl, struct blob_attr *msg) { struct blob_attr *data; @@ -244,10 +223,10 @@ static int ubusd_forward_event(struct ubus_client *cl, struct blob_attr *msg) if (!strncmp(id, "ubus.", 5)) return UBUS_STATUS_PERMISSION_DENIED; - return ubusd_send_event(cl, id, data, NULL); + 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) +static int ubusd_event_recv(struct ubus_client *cl, struct ubus_msg_buf *ub, const char *method, struct blob_attr *msg) { if (!strcmp(method, "register")) return ubusd_alloc_event_pattern(cl, msg); @@ -258,10 +237,35 @@ static int ubusd_event_recv(struct ubus_client *cl, const char *method, struct b 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); event_obj = ubusd_create_object_internal(NULL, UBUS_SYSTEM_OBJECT_EVENT); - event_obj->recv_msg = ubusd_event_recv; + if (event_obj != NULL) + event_obj->recv_msg = ubusd_event_recv; }