rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge Ubus with the 2016.02.26 version.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-02-26 23:57:13 +01:00
parent 7eac5c920a
commit 5ed9eb9715
23 changed files with 1282 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
3P/ubus/ubusd_event.c
View File

@@ -103,8 +103,6 @@ static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *m
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)
@@ -143,8 +141,8 @@ static 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,
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;
@@ -228,7 +226,7 @@ static int ubusd_forward_event(struct ubus_client *cl, struct blob_attr *msg)
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);
@@ -267,6 +265,7 @@ 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;
}