X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd.c;h=03215b33525f9011d0a681dfb185ae085292ccd4;hp=14eb537ca48fc504771276a3513c7ac36c1025e2;hb=a69f062cbd4041229f8d29ef9647bf783df414c1;hpb=b0755698c1b686800c9de9e1c3d02026724d116e

diff --git a/ubusd.c b/ubusd.c
index 14eb537..03215b3 100644
--- a/ubusd.c
+++ b/ubusd.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 <sys/socket.h>
 #include <sys/uio.h>
 #include <signal.h>
@@ -12,8 +25,6 @@
 
 #include "ubusd.h"
 
-static struct avl_tree clients;
-
 static struct ubus_msg_buf *ubus_msg_unshare(struct ubus_msg_buf *ub)
 {
 	ub = realloc(ub, sizeof(*ub) + ub->len);
@@ -26,7 +37,7 @@ static struct ubus_msg_buf *ubus_msg_unshare(struct ubus_msg_buf *ub)
 	return ub;
 }
 
-struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub)
+static struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub)
 {
 	if (ub->refcount == ~0)
 		return ubus_msg_unshare(ub);
@@ -144,17 +155,10 @@ static void ubus_msg_dequeue(struct ubus_client *cl)
 
 static void handle_client_disconnect(struct ubus_client *cl)
 {
-	struct ubus_object *obj;
-
-	while (!list_empty(&cl->objects)) {
-		obj = list_first_entry(&cl->objects, struct ubus_object, list);
-		ubusd_free_object(obj);
-	}
-
 	while (ubus_msg_head(cl))
 		ubus_msg_dequeue(cl);
 
-	ubus_free_id(&clients, &cl->id);
+	ubusd_proto_free_client(cl);
 	uloop_fd_delete(&cl->sock);
 	close(cl->sock.fd);
 	free(cl);
@@ -237,7 +241,7 @@ retry:
 		/* accept message */
 		cl->pending_msg_offset = 0;
 		cl->pending_msg = NULL;
-		ubusd_receive_message(cl, ub);
+		ubusd_proto_receive_message(cl, ub);
 		goto retry;
 	}
 
@@ -249,17 +253,6 @@ disconnect:
 	handle_client_disconnect(cl);
 }
 
-struct ubus_client *ubusd_get_client_by_id(uint32_t id)
-{
-	struct ubus_id *clid;
-
-	clid = ubus_find_id(&clients, id);
-	if (!clid)
-		return NULL;
-
-	return container_of(clid, struct ubus_client, id);
-}
-
 static bool get_next_connection(int fd)
 {
 	struct ubus_client *cl;
@@ -276,26 +269,13 @@ static bool get_next_connection(int fd)
 		}
 	}
 
-	cl = calloc(1, sizeof(*cl));
-	cl->sock.fd = client_fd;
-
-	INIT_LIST_HEAD(&cl->objects);
-	if (!ubus_alloc_id(&clients, &cl->id, 0))
-		goto error;
-
-	cl->sock.cb = client_cb;
-	uloop_fd_add(&cl->sock, ULOOP_READ | ULOOP_EDGE_TRIGGER);
-	if (!ubusd_send_hello(cl))
-		goto error_free;
+	cl = ubusd_proto_new_client(client_fd, client_cb);
+	if (cl)
+		uloop_fd_add(&cl->sock, ULOOP_READ | ULOOP_EDGE_TRIGGER);
+	else
+		close(client_fd);
 
 	return true;
-
-error_free:
-	ubus_free_id(&clients, &cl->id);
-error:
-	close(cl->sock.fd);
-	free(cl);
-	return true;
 }
 
 static void server_cb(struct uloop_fd *fd, unsigned int events)
@@ -328,8 +308,6 @@ int main(int argc, char **argv)
 
 	signal(SIGPIPE, SIG_IGN);
 
-	ubus_init_id_tree(&clients);
-
 	uloop_init();
 
 	while ((ch = getopt(argc, argv, "s:")) != -1) {