X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_event.c;h=984f341eecea25f27731ef4678fc303753543e0a;hp=87213b3d7c2e36b620624adaaff28eab72d63011;hb=6f4e11e1db399074273944329883f9c35e7daef6;hpb=fb45e383c2985c43a9aaf42050fef039473745ce

diff --git a/ubusd_event.c b/ubusd_event.c
index 87213b3..984f341 100644
--- a/ubusd_event.c
+++ b/ubusd_event.c
@@ -1,3 +1,16 @@
+/*
+ * 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"
 
@@ -46,7 +59,7 @@ static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *m
 	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;
@@ -82,15 +95,14 @@ static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *m
 	list_add(&ev->list, &obj->events);
 	ev->obj = obj;
 	ev->partial = partial;
-	ev->avl.key = (void *) (ev + 1);
-	strcpy(ev->avl.key, pattern);
+	name = (char *) (ev + 1);
+	strcpy(name, pattern);
+	ev->avl.key = name;
 	avl_insert(&patterns, &ev->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)
@@ -120,7 +132,7 @@ static void ubusd_send_event_msg(struct ubus_msg_buf **ub, struct ubus_client *c
 	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])
@@ -129,8 +141,8 @@ 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;
@@ -214,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);
@@ -253,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;
 }