X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubusd_monitor.c;h=bba741e86987172197583331f13d8cc10e09036c;hb=HEAD;hp=82d03330b8bc5048d6bdd3f4ca963180b0f5e784;hpb=47d75dd84af8ba6e9bac0d24861653e11796bdb0;p=project%2Fubus.git

diff --git a/ubusd_monitor.c b/ubusd_monitor.c
index 82d0333..bba741e 100644
--- a/ubusd_monitor.c
+++ b/ubusd_monitor.c
@@ -29,7 +29,7 @@ ubusd_monitor_free(struct ubus_monitor *m)
 	free(m);
 }
 
-static void
+static bool
 ubusd_monitor_connect(struct ubus_client *cl, struct ubus_msg_buf *ub)
 {
 	struct ubus_monitor *m;
@@ -37,22 +37,40 @@ ubusd_monitor_connect(struct ubus_client *cl, struct ubus_msg_buf *ub)
 	ubusd_monitor_disconnect(cl);
 
 	m = calloc(1, sizeof(*m));
+	if (!m)
+		return false;
+
 	m->cl = cl;
-	list_add(&m->list, &monitors);
+	list_add_tail(&m->list, &monitors);
+
+	return true;
 }
 
-void
-ubusd_monitor_disconnect(struct ubus_client *cl)
+static struct ubus_monitor*
+ubusd_monitor_find(struct ubus_client *cl)
 {
-	struct ubus_monitor *m;
+	struct ubus_monitor *m, *tmp;
 
-	list_for_each_entry(m, &monitors, list) {
+	list_for_each_entry_safe(m, tmp, &monitors, list) {
 		if (m->cl != cl)
 			continue;
 
-		ubusd_monitor_free(m);
-		return;
+		return m;
 	}
+
+	return NULL;
+}
+
+void
+ubusd_monitor_disconnect(struct ubus_client *cl)
+{
+	struct ubus_monitor *m;
+
+	m = ubusd_monitor_find(cl);
+	if (!m)
+		return;
+
+	ubusd_monitor_free(m);
 }
 
 void
@@ -72,12 +90,15 @@ ubusd_monitor_message(struct ubus_client *cl, struct ubus_msg_buf *ub, bool send
 	blob_put_int8(&mb, UBUS_MONITOR_SEND, send);
 	blob_put(&mb, UBUS_MONITOR_DATA, blob_data(ub->data), blob_len(ub->data));
 
+	ub = ubus_msg_new(mb.head, blob_raw_len(mb.head), true);
+	ub->hdr.type = UBUS_MSG_MONITOR;
+
 	list_for_each_entry(m, &monitors, list) {
-		ub = ubus_msg_new(mb.head, blob_raw_len(mb.head), true);
-		ub->hdr.type = UBUS_MSG_MONITOR;
 		ub->hdr.seq = ++m->seq;
-		ubus_msg_send(m->cl, ub, true);
+		ubus_msg_send(m->cl, ub);
 	}
+
+	ubus_msg_free(ub);
 }
 
 static int
@@ -89,13 +110,15 @@ ubusd_monitor_recv(struct ubus_client *cl, struct ubus_msg_buf *ub,
 		return UBUS_STATUS_PERMISSION_DENIED;
 
 	if (!strcmp(method, "add")) {
-		ubusd_monitor_connect(cl, ub);
-		return 0;
+		if (!ubusd_monitor_connect(cl, ub))
+			return UBUS_STATUS_UNKNOWN_ERROR;
+
+		return UBUS_STATUS_OK;
 	}
 
 	if (!strcmp(method, "remove")) {
 		ubusd_monitor_disconnect(cl);
-		return 0;
+		return UBUS_STATUS_OK;
 	}
 
 	return UBUS_STATUS_METHOD_NOT_FOUND;