ubus: make libubus ready for linking into C++

[project/ubus.git] / ubusd.h

diff --git a/ubusd.h b/ubusd.h
index 6078e02991fd1e3cfac34f54bf96aac32268d5b0..923e43dd92da313243dde29cb23bc1dc2c0b4b08 100644 (file)
--- a/ubusd.h
+++ b/ubusd.h
@@ -39,6 +39,7 @@ 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;
@@ -51,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 {
@@ -64,10 +66,13 @@ 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);