+/*
+ * Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *
+ * 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 <arpa/inet.h>
#include "ubusd.h"
void ubusd_event_cleanup_object(struct ubus_object *obj)
{
- struct event_source *ev;
+ struct event_source *ev, *tmp;
- while (!list_empty(&obj->events)) {
- ev = list_first_entry(&obj->events, struct event_source, list);
+ list_for_each_entry_safe(ev, tmp, &obj->events, list) {
ubusd_delete_event_source(ev);
}
}
len--;
}
+ if (pattern[0] && ubusd_acl_check(cl, pattern, NULL, UBUS_ACL_LISTEN))
+ return UBUS_STATUS_PERMISSION_DENIED;
+
ev = calloc(1, sizeof(*ev) + len + 1);
if (!ev)
return UBUS_STATUS_NO_DATA;
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)
*objid_ptr = htonl(obj->id.id);
(*ub)->hdr.seq = ++event_seq;
- ubus_msg_send(obj->client, *ub, false);
+ ubus_msg_send(obj->client, *ub);
}
-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)
+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;
+ if (ubusd_acl_check(cl, id, NULL, UBUS_ACL_SEND))
+ return UBUS_STATUS_PERMISSION_DENIED;
+
obj_event_seq++;
/*
int cur_match_len;
bool full_match;
- full_match = strmatch_len(id, key, &cur_match_len);
+ full_match = ubus_strmatch_len(id, key, &cur_match_len);
if (cur_match_len < match_len)
break;
if (!ev->partial)
continue;
- if (match_len != strlen(key))
+ if (match_len != (int) strlen(key))
continue;
}
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);
{
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;
}