tests: cram: fix usage test

[project/ubus.git] / ubusd.h

diff --git a/ubusd.h b/ubusd.h
index 393c7986510deb45253aed93c518480be2f2ee80..923e43dd92da313243dde29cb23bc1dc2c0b4b08 100644 (file)
--- a/ubusd.h
+++ b/ubusd.h
@@ -21,6 +21,7 @@
 #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
@@ -38,6 +39,12 @@ struct ubus_msg_buf {
 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;
 
@@ -45,6 +52,7 @@ struct ubus_client {
        unsigned int txq_cur, txq_tail, txq_ofs;
 
        struct ubus_msg_buf *pending_msg;
+       struct ubus_msg_buf *retmsg;
        int pending_msg_offset;
        int pending_msg_fd;
        struct {
@@ -58,14 +66,19 @@ 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);
+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);
 
 typedef struct ubus_msg_buf *(*event_fill_cb)(void *priv, const char *id);
 void ubusd_event_init(void);
@@ -74,5 +87,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