X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=luci2.c;h=f136c56eaf87e7f5cfa62dec47bfe4f15fedf606;hb=fc1b008e081429101d5d3bb878ddb417c0d2be12;hp=27eead5eec430ad0dab3221316e2f5b2fff551f8;hpb=07c2f0a9b1c7f79e81fa8a51cca5ecbe9eaf7293;p=project%2Frpcd.git

diff --git a/luci2.c b/luci2.c
index 27eead5..f136c56 100644
--- a/luci2.c
+++ b/luci2.c
@@ -30,9 +30,19 @@
 #include <arpa/inet.h>
 #include <signal.h>
 #include <glob.h>
+#include <libubox/blobmsg_json.h>
+#include <libubus.h>
+#include <uci.h>
+
+#include <rpcd/plugin.h>
+
+/* limit of log size buffer */
+#define RPC_LUCI2_MAX_LOGSIZE		(128 * 1024)
+#define RPC_LUCI2_DEF_LOGSIZE       (16 * 1024)
+
+/* location of menu definitions */
+#define RPC_LUCI2_MENU_FILES        "/usr/share/luci2/menu.d/*.json" /* */
 
-#include "luci2.h"
-#include "plugin.h"
 
 static const struct rpc_daemon_ops *ops;
 
@@ -1988,16 +1998,16 @@ menu_access(struct blob_attr *sid, struct blob_attr *acls, struct blob_buf *e)
 
 	blobmsg_for_each_attr(acl, acls, rem)
 	{
-		if (!ops->access(blobmsg_data(sid), "luci-ui",
-		                 blobmsg_data(acl), "read"))
+		if (!ops->session_access(blobmsg_data(sid), "luci-ui",
+		                         blobmsg_data(acl), "read"))
 		{
 			rv = false;
 			break;
 		}
 
 		blobmsg_add_u8(e, blobmsg_data(acl),
-		               ops->access(blobmsg_data(sid), "luci-ui",
-		                           blobmsg_data(acl), "write"));
+		               ops->session_access(blobmsg_data(sid), "luci-ui",
+		                                   blobmsg_data(acl), "write"));
 	}
 
 	blobmsg_close_table(e, c);