X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=file.c;h=d22add56caceffbdcd1798bd2f4a664f394154ff;hp=0e8df4f116170950475621681036176ff6aa77fd;hb=ec21f653b936b54e4d788d77bfce18634255adb7;hpb=07c2f0a9b1c7f79e81fa8a51cca5ecbe9eaf7293

diff --git a/file.c b/file.c
index 0e8df4f..d22add5 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /*
  * rpcd - UBUS RPC server
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,8 +16,55 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "file.h"
-#include "plugin.h"
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <libubus.h>
+#include <libubox/blobmsg.h>
+#include <libubox/ustream.h>
+
+#include <rpcd/plugin.h>
+
+/* limit of sys & proc files */
+#define RPC_FILE_MIN_SIZE		(128)
+
+/* limit of regular files and command output data */
+#define RPC_FILE_MAX_SIZE		(4096 * 64)
+#define RPC_FILE_MAX_RUNTIME	(3 * 1000)
+
+#define ustream_for_each_read_buffer(stream, ptr, len) \
+	for (ptr = ustream_get_read_buf(stream, &len);     \
+	     ptr != NULL && len > 0;                       \
+	     ustream_consume(stream, len), ptr = ustream_get_read_buf(stream, &len))
+
+#define ustream_declare(us, fd, name)                     \
+	us.stream.string_data   = true;                       \
+	us.stream.r.buffer_len  = 4096;                       \
+	us.stream.r.max_buffers = RPC_FILE_MAX_SIZE / 4096;   \
+	us.stream.notify_read   = rpc_file_##name##_read_cb;  \
+	us.stream.notify_state  = rpc_file_##name##_state_cb; \
+	ustream_fd_init(&us, fd);
+
+struct rpc_file_exec_context {
+	struct ubus_context *context;
+	struct ubus_request_data request;
+	struct uloop_timeout timeout;
+	struct uloop_process process;
+	struct ustream_fd opipe;
+	struct ustream_fd epipe;
+	int outlen;
+	char *out;
+	int errlen;
+	char *err;
+	int stat;
+};
+
 
 static struct blob_buf buf;
 
@@ -40,7 +87,7 @@ enum {
 };
 
 static const struct blobmsg_policy rpc_exec_policy[__RPC_E_MAX] = {
-	[RPC_E_CMD] = { .name = "command", .type = BLOBMSG_TYPE_STRING },
+	[RPC_E_CMD]  = { .name = "command", .type = BLOBMSG_TYPE_STRING },
 	[RPC_E_PARM] = { .name = "params",  .type = BLOBMSG_TYPE_ARRAY  },
 	[RPC_E_ENV]  = { .name = "env",     .type = BLOBMSG_TYPE_TABLE  },
 };
@@ -410,7 +457,7 @@ rpc_file_exec_epipe_state_cb(struct ustream *s)
 
 static int
 rpc_file_exec_run(const char *cmd,
-			      const struct blob_attr *arg, const struct blob_attr *env,
+                  const struct blob_attr *arg, const struct blob_attr *env,
                   struct ubus_context *ctx, struct ubus_request_data *req)
 {
 	pid_t pid;
@@ -533,7 +580,7 @@ rpc_file_exec(struct ubus_context *ctx, struct ubus_object *obj,
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
 	return rpc_file_exec_run(blobmsg_data(tb[RPC_E_CMD]),
-					         tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req);
+					      tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req);
 }