X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd.c;h=80e5cfa55d986c977bb8053f006b1fc756ba3d57;hp=a283f597a1c916e4d56aa38cecfc3c0e4554b781;hb=df1af726e211eaaea870f7d2cbc326e5974b9b09;hpb=1643f728e7c99362d1925d6085a376f18cf46b5e

diff --git a/ubusd.c b/ubusd.c
index a283f59..80e5cfa 100644
--- a/ubusd.c
+++ b/ubusd.c
@@ -12,8 +12,6 @@
 
 #include "ubusd.h"
 
-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 +24,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 +142,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 +228,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;
 	}
 
@@ -265,26 +256,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)
@@ -317,8 +295,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) {