X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd.c;h=aa745504162f78c28494e349283864f7e4cbd25a;hp=a1636aa1847dbaf5c980d8f3616ad5c5526ab2d7;hb=5fde74d12a7fdf4f60503780be28d7bb275abd0d;hpb=a84c6cac9a8e57cfdbedb82f96e38079e3871995

diff --git a/ubusd.c b/ubusd.c
index a1636aa..aa74550 100644
--- a/ubusd.c
+++ b/ubusd.c
@@ -95,7 +95,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);
 }
 
@@ -180,8 +180,6 @@ static void client_cb(struct uloop_fd *sock, unsigned int events)
 			}
 			break;
 		}
-		if (written == 0)
-			break;
 
 		cl->txq_ofs += written;
 		if (cl->txq_ofs < ub->len + sizeof(ub->hdr))
@@ -313,9 +311,20 @@ 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);
 
@@ -323,8 +332,18 @@ int main(int argc, char **argv)
 
 	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;
@@ -333,6 +352,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();