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

diff --git a/ubusd.c b/ubusd.c
index bd437a5..80e5cfa 100644
--- a/ubusd.c
+++ b/ubusd.c
@@ -12,8 +12,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 +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);
@@ -95,7 +93,7 @@ static void ubus_msg_enqueue(struct ubus_client *cl, struct ubus_msg_buf *ub)
 	if (cl->tx_queue[cl->txq_tail])
 		return;
 
-	cl->tx_queue[cl->txq_tail] = ub;
+	cl->tx_queue[cl->txq_tail] = ubus_msg_ref(ub);
 	cl->txq_tail = (cl->txq_tail + 1) % ARRAY_SIZE(cl->tx_queue);
 }
 
@@ -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);
@@ -206,7 +197,7 @@ retry:
 		if (cl->pending_msg_offset < sizeof(cl->hdrbuf))
 			goto out;
 
-		if (blob_len(&cl->hdrbuf.data) + sizeof(cl->hdrbuf) > UBUS_MAX_MSGLEN)
+		if (blob_pad_len(&cl->hdrbuf.data) > UBUS_MAX_MSGLEN)
 			goto disconnect;
 
 		cl->pending_msg = ubus_msg_new(NULL, blob_raw_len(&cl->hdrbuf.data), false);
@@ -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;
 	}
 
@@ -249,17 +240,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 +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)
@@ -311,18 +278,37 @@ static struct uloop_fd server_fd = {
 	.cb = server_cb,
 };
 
+static int usage(const char *progname)
+{
+	fprintf(stderr, "Usage: %s [<options>]\n"
+		"Options: \n"
+		"  -s <socket>:		Set the unix domain socket to listen on\n"
+		"\n", progname);
+	return 1;
+}
+
 int main(int argc, char **argv)
 {
+	const char *ubus_socket = UBUS_UNIX_SOCKET;
 	int ret = 0;
+	int ch;
 
 	signal(SIGPIPE, SIG_IGN);
 
-	ubus_init_id_tree(&clients);
-
 	uloop_init();
 
-	unlink(UBUS_UNIX_SOCKET);
-	server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, UBUS_UNIX_SOCKET, NULL);
+	while ((ch = getopt(argc, argv, "s:")) != -1) {
+		switch (ch) {
+		case 's':
+			ubus_socket = optarg;
+			break;
+		default:
+			return usage(argv[0]);
+		}
+	}
+
+	unlink(ubus_socket);
+	server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, ubus_socket, NULL);
 	if (server_fd.fd < 0) {
 		perror("usock");
 		ret = -1;
@@ -331,6 +317,7 @@ int main(int argc, char **argv)
 	uloop_fd_add(&server_fd, ULOOP_READ | ULOOP_EDGE_TRIGGER);
 
 	uloop_run();
+	unlink(ubus_socket);
 
 out:
 	uloop_done();