X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubusd.c;h=5b1d52c808924c1e40eb3d699225db981ad9e1e3;hb=964adfdd3923ef1b54eb5c19487dd8e9e3f586b7;hp=c3edc70f5a95a53675b8a0e9337f1674b78d6dac;hpb=3bfa6ab128ee0ab9bd4bc0b2dbaa751902e7f340;p=project%2Fubus.git

diff --git a/ubusd.c b/ubusd.c
index c3edc70..5b1d52c 100644
--- a/ubusd.c
+++ b/ubusd.c
@@ -22,6 +22,9 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
+#ifdef ENABLE_SYSTEMD
+#include <systemd/sd-daemon.h>
+#endif
 
 #include <libubox/blob.h>
 #include <libubox/uloop.h>
@@ -110,8 +113,15 @@ static int ubus_msg_writev(int fd, struct ubus_msg_buf *ub, int offset)
 	}
 
 	if (offset < sizeof(ub->hdr)) {
-		iov[0].iov_base = ((char *) &ub->hdr) + offset;
-		iov[0].iov_len = sizeof(ub->hdr) - offset;
+		struct ubus_msghdr hdr;
+
+		hdr.version = ub->hdr.version;
+		hdr.type = ub->hdr.type;
+		hdr.seq = cpu_to_be16(ub->hdr.seq);
+		hdr.peer = cpu_to_be32(ub->hdr.peer);
+
+		iov[0].iov_base = ((char *) &hdr) + offset;
+		iov[0].iov_len = sizeof(hdr) - offset;
 		iov[1].iov_base = (char *) ub->data;
 		iov[1].iov_len = ub->len;
 
@@ -136,6 +146,9 @@ void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free)
 {
 	int written;
 
+	if (ub->hdr.type != UBUS_MSG_MONITOR)
+		ubusd_monitor_message(cl, ub, true);
+
 	if (!cl->tx_queue[cl->txq_cur]) {
 		written = ubus_msg_writev(cl->sock.fd, ub, 0);
 		if (written >= ub->len + sizeof(ub->hdr))
@@ -179,6 +192,7 @@ static void handle_client_disconnect(struct ubus_client *cl)
 	while (ubus_msg_head(cl))
 		ubus_msg_dequeue(cl);
 
+	ubusd_monitor_disconnect(cl);
 	ubusd_proto_free_client(cl);
 	if (cl->pending_msg_fd >= 0)
 		close(cl->pending_msg_fd);
@@ -242,7 +256,7 @@ retry:
 
 		fd_buf.fd = -1;
 
-		iov.iov_base = &cl->hdrbuf + offset;
+		iov.iov_base = ((char *) &cl->hdrbuf) + offset;
 		iov.iov_len = sizeof(cl->hdrbuf) - offset;
 
 		if (cl->pending_msg_fd < 0) {
@@ -271,6 +285,9 @@ retry:
 		if (!cl->pending_msg)
 			goto disconnect;
 
+		cl->hdrbuf.hdr.seq = be16_to_cpu(cl->hdrbuf.hdr.seq);
+		cl->hdrbuf.hdr.peer = be32_to_cpu(cl->hdrbuf.hdr.peer);
+
 		memcpy(&cl->pending_msg->hdr, &cl->hdrbuf.hdr, sizeof(cl->hdrbuf.hdr));
 		memcpy(cl->pending_msg->data, &cl->hdrbuf.data, sizeof(cl->hdrbuf.data));
 	}
@@ -297,6 +314,7 @@ retry:
 		cl->pending_msg_fd = -1;
 		cl->pending_msg_offset = 0;
 		cl->pending_msg = NULL;
+		ubusd_monitor_message(cl, ub, false);
 		ubusd_proto_receive_message(cl, ub);
 		goto retry;
 	}
@@ -351,6 +369,7 @@ static int usage(const char *progname)
 {
 	fprintf(stderr, "Usage: %s [<options>]\n"
 		"Options: \n"
+		"  -A <path>:		Set the path to ACL files\n"
 		"  -s <socket>:		Set the unix domain socket to listen on\n"
 		"\n", progname);
 	return 1;
@@ -364,8 +383,12 @@ static void sighup_handler(int sig)
 int main(int argc, char **argv)
 {
 	const char *ubus_socket = UBUS_UNIX_SOCKET;
+	bool remove_socket = true;
 	int ret = 0;
 	int ch;
+#ifdef ENABLE_SYSTEMD
+	int n_fds;
+#endif
 
 	signal(SIGPIPE, SIG_IGN);
 	signal(SIGHUP, sighup_handler);
@@ -373,29 +396,50 @@ int main(int argc, char **argv)
 	openlog("ubusd", LOG_PID, LOG_DAEMON);
 	uloop_init();
 
-	while ((ch = getopt(argc, argv, "s:")) != -1) {
+	while ((ch = getopt(argc, argv, "A:s:")) != -1) {
 		switch (ch) {
 		case 's':
 			ubus_socket = optarg;
 			break;
+		case 'A':
+			ubusd_acl_dir = optarg;
+			break;
 		default:
 			return usage(argv[0]);
 		}
 	}
 
-	unlink(ubus_socket);
-	umask(0177);
-	server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, ubus_socket, NULL);
-	if (server_fd.fd < 0) {
-		perror("usock");
-		ret = -1;
+#ifdef ENABLE_SYSTEMD
+	n_fds = sd_listen_fds(1);
+	if (n_fds > 1) {
+	        fprintf(stderr, "Too many file descriptors received.\n");
+	        ret = -1;
 		goto out;
+	} else if (n_fds == 1) {
+	        server_fd.fd = SD_LISTEN_FDS_START + 0;
+		fcntl(server_fd.fd, F_SETFD, fcntl(server_fd.fd, F_GETFD) | FD_CLOEXEC);
+		fcntl(server_fd.fd, F_SETFL, fcntl(server_fd.fd, F_GETFL) | O_NONBLOCK);
+
+		remove_socket = false;
+	} else
+#endif
+	{
+		unlink(ubus_socket);
+		umask(0111);
+		server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, ubus_socket, NULL);
+		if (server_fd.fd < 0) {
+			perror("usock");
+			ret = -1;
+			goto out;
+		}
 	}
 	uloop_fd_add(&server_fd, ULOOP_READ | ULOOP_EDGE_TRIGGER);
 	ubusd_acl_load();
 
 	uloop_run();
-	unlink(ubus_socket);
+
+	if (remove_socket)
+		unlink(ubus_socket);
 
 out:
 	uloop_done();