X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=file.c;h=b1cfe99d5c55dce11272d06ce0a76aa407db5243;hp=d4198460b8873bf6f3666d3dfabf118fbfb455bf;hb=059a6df1fd424c76ac6b1a7d54f187a95822f5f6;hpb=bea6a818756e6c2edbdddcedac26f8e1e29affde

diff --git a/file.c b/file.c
index d419846..b1cfe99 100644
--- a/file.c
+++ b/file.c
@@ -1,5 +1,5 @@
 /*
- * luci-rpcd - LuCI UBUS RPC server
+ * rpcd - UBUS RPC server
  *
  *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
  *
@@ -25,8 +25,46 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <libubus.h>
+#include <libubox/blobmsg.h>
+#include <libubox/ustream.h>
+
+#include "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;
+};
 
-#include "file.h"
 
 static struct blob_buf buf;
 
@@ -45,7 +83,6 @@ enum {
 	RPC_E_CMD,
 	RPC_E_PARM,
 	RPC_E_ENV,
-	RPC_E_MODE,
 	__RPC_E_MAX,
 };
 
@@ -53,7 +90,6 @@ static const struct blobmsg_policy rpc_exec_policy[__RPC_E_MAX] = {
 	[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  },
-	[RPC_E_MODE] = { .name = "mode",    .type = BLOBMSG_TYPE_STRING },
 };
 
 static const char *d_types[] = {
@@ -383,7 +419,7 @@ static void
 rpc_file_exec_opipe_read_cb(struct ustream *s, int bytes)
 {
 	struct rpc_file_exec_context *c =
-		container_of(s, struct rpc_file_exec_context, opipe);
+		container_of(s, struct rpc_file_exec_context, opipe.stream);
 
 	if (ustream_read_buf_full(s))
 		rpc_file_exec_reply(c, UBUS_STATUS_NOT_SUPPORTED);
@@ -393,7 +429,7 @@ static void
 rpc_file_exec_epipe_read_cb(struct ustream *s, int bytes)
 {
 	struct rpc_file_exec_context *c =
-		container_of(s, struct rpc_file_exec_context, epipe);
+		container_of(s, struct rpc_file_exec_context, epipe.stream);
 
 	if (ustream_read_buf_full(s))
 		rpc_file_exec_reply(c, UBUS_STATUS_NOT_SUPPORTED);
@@ -403,7 +439,7 @@ static void
 rpc_file_exec_opipe_state_cb(struct ustream *s)
 {
 	struct rpc_file_exec_context *c =
-		container_of(s, struct rpc_file_exec_context, opipe);
+		container_of(s, struct rpc_file_exec_context, opipe.stream);
 
 	if (c->opipe.stream.eof && c->epipe.stream.eof)
 		rpc_file_exec_reply(c, UBUS_STATUS_OK);
@@ -413,7 +449,7 @@ static void
 rpc_file_exec_epipe_state_cb(struct ustream *s)
 {
 	struct rpc_file_exec_context *c =
-		container_of(s, struct rpc_file_exec_context, epipe);
+		container_of(s, struct rpc_file_exec_context, epipe.stream);
 
 	if (c->opipe.stream.eof && c->epipe.stream.eof)
 		rpc_file_exec_reply(c, UBUS_STATUS_OK);
@@ -548,7 +584,8 @@ rpc_file_exec(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 
-int rpc_file_api_init(struct ubus_context *ctx)
+static int
+rpc_file_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
 {
 	static const struct ubus_method file_methods[] = {
 		UBUS_METHOD("read",    rpc_file_read,  rpc_file_policy),
@@ -570,3 +607,7 @@ int rpc_file_api_init(struct ubus_context *ctx)
 
 	return ubus_add_object(ctx, &obj);
 }
+
+const struct rpc_plugin rpc_plugin = {
+	.init = rpc_file_api_init
+};