#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;
int len;
};
+struct ubus_msg_buf_list {
+ struct list_head list;
+ struct ubus_msg_buf *msg;
+};
+
struct ubus_client {
struct ubus_id id;
struct uloop_fd sock;
+ struct blob_buf b;
uid_t uid;
gid_t gid;
struct list_head objects;
- struct ubus_msg_buf *tx_queue[UBUSD_CLIENT_BACKLOG];
- unsigned int txq_cur, txq_tail, txq_ofs;
+ 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 {
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);