CMakeLists.txt: bump minimum cmake version

[project/ubus.git] / ubusd.h

diff --git a/ubusd.h b/ubusd.h
index 393c7986510deb45253aed93c518480be2f2ee80..f43b9360d3367db0a1b70cf2491326b306a54a12 100644 (file)
--- a/ubusd.h
+++ b/ubusd.h
@@ -21,9 +21,10 @@
 #include "ubusd_id.h"
 #include "ubusd_obj.h"
 #include "ubusmsg.h"
+#include "ubusd_acl.h"
 
-#define UBUSD_CLIENT_BACKLOG   32
 #define UBUS_OBJ_HASH_BITS     4
+#define UBUS_CLIENT_MAX_TXQ_LEN        UBUS_MAX_MSGLEN
 
 extern struct blob_buf b;
 
@@ -35,16 +36,36 @@ struct ubus_msg_buf {
        int len;
 };
 
+struct ubus_msg_buf_list {
+       struct list_head list;
+       struct ubus_msg_buf *msg;
+};
+
+struct ubus_client_cmd {
+       struct list_head list;
+       struct ubus_msg_buf *msg;
+       struct ubus_object *obj;
+};
+
 struct ubus_client {
        struct ubus_id id;
        struct uloop_fd sock;
+       struct blob_buf b;
+
+       uid_t uid;
+       gid_t gid;
+       char *user;
+       char *group;
 
        struct list_head objects;
 
-       struct ubus_msg_buf *tx_queue[UBUSD_CLIENT_BACKLOG];
-       unsigned int txq_cur, txq_tail, txq_ofs;
+       struct list_head cmd_queue;
+       struct list_head tx_queue;
+       unsigned int txq_ofs;
+       unsigned int txq_len;
 
        struct ubus_msg_buf *pending_msg;
+       struct ubus_msg_buf *retmsg;
        int pending_msg_offset;
        int pending_msg_fd;
        struct {
@@ -58,14 +79,21 @@ struct ubus_path {
        const char name[];
 };
 
+extern const char *ubusd_acl_dir;
+
 struct ubus_msg_buf *ubus_msg_new(void *data, int len, bool shared);
-void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free);
+void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub);
+ssize_t ubus_msg_writev(int fd, struct ubus_msg_buf *ub, size_t offset);
 void ubus_msg_free(struct ubus_msg_buf *ub);
-struct blob_attr **ubus_parse_msg(struct blob_attr *msg);
+void ubus_msg_list_free(struct ubus_msg_buf_list *ubl);
+struct blob_attr **ubus_parse_msg(struct blob_attr *msg, size_t len);
 
 struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb);
 void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub);
 void ubusd_proto_free_client(struct ubus_client *cl);
+void ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
+                                  uint8_t type);
+int ubusd_cmd_lookup(struct ubus_client *cl, struct ubus_client_cmd *cmd);
 
 typedef struct ubus_msg_buf *(*event_fill_cb)(void *priv, const char *id);
 void ubusd_event_init(void);
@@ -74,5 +102,10 @@ void ubusd_send_obj_event(struct ubus_object *obj, bool add);
 int ubusd_send_event(struct ubus_client *cl, const char *id,
                     event_fill_cb fill_cb, void *cb_priv);
 
+void ubusd_acl_init(void);
+
+void ubusd_monitor_init(void);
+void ubusd_monitor_message(struct ubus_client *cl, struct ubus_msg_buf *ub, bool send);
+void ubusd_monitor_disconnect(struct ubus_client *cl);
 
 #endif