X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=exec.c;h=3d2ec716bda9b686ea8daea37262cde3662fe6df;hp=5ce7f15ecfeef6436a08e7dc322ab85dd625fa83;hb=4bf5d60f65b99c5205fdd1de70e3847976e4568f;hpb=190708e539d9717cf9c051e4c773593361e827ce

diff --git a/exec.c b/exec.c
index 5ce7f15..3d2ec71 100644
--- a/exec.c
+++ b/exec.c
@@ -1,5 +1,5 @@
 /*
- * luci-rpcd - LuCI UBUS RPC server
+ * rpcd - UBUS RPC server
  *
  *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
  *
@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include "exec.h"
+#include <rpcd/exec.h>
 
 static int
 rpc_errno_status(void)
@@ -50,7 +50,7 @@ rpc_errno_status(void)
 	}
 }
 
-static const char *
+const char *
 rpc_exec_lookup(const char *cmd)
 {
 	struct stat s;
@@ -133,9 +133,10 @@ rpc_exec_reply(struct rpc_exec_context *c, int rv)
 		}
 
 		if (c->finish_cb)
-			c->finish_cb(&c->blob, c->stat, c->priv);
+			rv = c->finish_cb(&c->blob, c->stat, c->priv);
 
-		ubus_send_reply(c->context, &c->request, c->blob.head);
+		if (rv == UBUS_STATUS_OK)
+			ubus_send_reply(c->context, &c->request, c->blob.head);
 	}
 
 	ubus_complete_deferred_request(c->context, &c->request, rv);
@@ -155,7 +156,7 @@ rpc_exec_reply(struct rpc_exec_context *c, int rv)
 }
 
 static void
-rpc_exec_timestdout_cb(struct uloop_timeout *t)
+rpc_exec_timeout_cb(struct uloop_timeout *t)
 {
 	struct rpc_exec_context *c =
 		container_of(t, struct rpc_exec_context, timeout);
@@ -177,6 +178,19 @@ rpc_exec_process_cb(struct uloop_process *p, int stat)
 }
 
 static void
+rpc_exec_ipipe_write_cb(struct ustream *s, int bytes)
+{
+	struct rpc_exec_context *c =
+		container_of(s, struct rpc_exec_context, ipipe.stream);
+
+	if (c->stdin_cb(s, c->priv) <= 0)
+	{
+		ustream_free(&c->ipipe.stream);
+		close(c->ipipe.fd.fd);
+	}
+}
+
+static void
 rpc_exec_opipe_read_cb(struct ustream *s, int bytes)
 {
 	int len, rv;
@@ -257,12 +271,14 @@ rpc_exec_epipe_state_cb(struct ustream *s)
 }
 
 int
-rpc_exec(const char **args, rpc_exec_read_cb_t out, rpc_exec_read_cb_t err,
+rpc_exec(const char **args, rpc_exec_write_cb_t in,
+         rpc_exec_read_cb_t out, rpc_exec_read_cb_t err,
          rpc_exec_done_cb_t end, void *priv, struct ubus_context *ctx,
          struct ubus_request_data *req)
 {
 	pid_t pid;
 
+	int ipipe[2];
 	int opipe[2];
 	int epipe[2];
 
@@ -279,8 +295,14 @@ rpc_exec(const char **args, rpc_exec_read_cb_t out, rpc_exec_read_cb_t err,
 	if (!c)
 		return UBUS_STATUS_UNKNOWN_ERROR;
 
-	if (pipe(opipe) || pipe(epipe))
-		return rpc_errno_status();
+	if (pipe(ipipe))
+		goto fail_ipipe;
+
+	if (pipe(opipe))
+		goto fail_opipe;
+
+	if (pipe(epipe))
+		goto fail_epipe;
 
 	switch ((pid = fork()))
 	{
@@ -290,10 +312,12 @@ rpc_exec(const char **args, rpc_exec_read_cb_t out, rpc_exec_read_cb_t err,
 	case 0:
 		uloop_done();
 
+		dup2(ipipe[0], 0);
 		dup2(opipe[1], 1);
 		dup2(epipe[1], 2);
 
-		close(0);
+		close(ipipe[0]);
+		close(ipipe[1]);
 		close(opipe[0]);
 		close(opipe[1]);
 		close(epipe[0]);
@@ -306,21 +330,33 @@ rpc_exec(const char **args, rpc_exec_read_cb_t out, rpc_exec_read_cb_t err,
 		memset(c, 0, sizeof(*c));
 		blob_buf_init(&c->blob, 0);
 
+		c->stdin_cb  = in;
 		c->stdout_cb = out;
 		c->stderr_cb = err;
 		c->finish_cb = end;
 		c->priv      = priv;
 
-		ustream_declare(c->opipe, opipe[0], opipe);
-		ustream_declare(c->epipe, epipe[0], epipe);
+		ustream_declare_read(c->opipe, opipe[0], opipe);
+		ustream_declare_read(c->epipe, epipe[0], epipe);
 
 		c->process.pid = pid;
 		c->process.cb = rpc_exec_process_cb;
 		uloop_process_add(&c->process);
 
-		c->timeout.cb = rpc_exec_timestdout_cb;
+		c->timeout.cb = rpc_exec_timeout_cb;
 		uloop_timeout_set(&c->timeout, RPC_EXEC_MAX_RUNTIME);
 
+		if (c->stdin_cb)
+		{
+			ustream_declare_write(c->ipipe, ipipe[1], ipipe);
+			rpc_exec_ipipe_write_cb(&c->ipipe.stream, 0);
+		}
+		else
+		{
+			close(ipipe[1]);
+		}
+
+		close(ipipe[0]);
 		close(opipe[1]);
 		close(epipe[1]);
 
@@ -329,4 +365,15 @@ rpc_exec(const char **args, rpc_exec_read_cb_t out, rpc_exec_read_cb_t err,
 	}
 
 	return UBUS_STATUS_OK;
+
+fail_epipe:
+	close(opipe[0]);
+	close(opipe[1]);
+
+fail_opipe:
+	close(ipipe[0]);
+	close(ipipe[1]);
+
+fail_ipipe:
+	return rpc_errno_status();
 }