X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd.h;h=abe26b7819905156498291446bf6bf1db2958432;hp=c0b02f5e01cd3c05ae6c159e3f176646639e56ec;hb=df1af726e211eaaea870f7d2cbc326e5974b9b09;hpb=dbd4c2f121be08e514828f2533687b145a6e16dd

diff --git a/ubusd.h b/ubusd.h
index c0b02f5..abe26b7 100644
--- a/ubusd.h
+++ b/ubusd.h
@@ -9,12 +9,12 @@
 #include "ubusd_obj.h"
 #include "ubusmsg.h"
 
-#define UBUS_UNIX_SOCKET "./ubus.sock"
 #define UBUSD_CLIENT_BACKLOG	32
 #define UBUS_OBJ_HASH_BITS	4
 
+extern struct blob_buf b;
+
 struct ubus_msg_buf {
-	struct ubus_msg_buf *next;
 	uint32_t refcount; /* ~0: uses external data buffer */
 	struct ubus_msghdr hdr;
 	struct blob_attr *data;
@@ -25,22 +25,17 @@ struct ubus_client {
 	struct ubus_id id;
 	struct uloop_fd sock;
 
+	struct list_head objects;
+
+	struct ubus_msg_buf *tx_queue[UBUSD_CLIENT_BACKLOG];
+	unsigned int txq_cur, txq_tail, txq_ofs;
+
+	struct ubus_msg_buf *pending_msg;
+	int pending_msg_offset;
 	struct {
 		struct ubus_msghdr hdr;
 		struct blob_attr data;
 	} hdrbuf;
-
-	struct list_head objects;
-
-	int pending_msg_offset;
-	struct ubus_msg_buf *pending_msg;
-
-	unsigned int buf_head_ofs;
-	struct ubus_msg_buf *buf_head;
-	struct ubus_msg_buf **buf_tail;
-
-	struct ubus_msg_buf *requests[UBUSD_CLIENT_BACKLOG];
-	unsigned int req_head, req_tail;
 };
 
 struct ubus_path {
@@ -49,16 +44,16 @@ struct ubus_path {
 };
 
 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);
-struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub);
+void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free);
 void ubus_msg_free(struct ubus_msg_buf *ub);
 
-struct ubus_client *ubusd_get_client_by_id(uint32_t id);
-
-void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub);
-bool ubusd_send_hello(struct ubus_client *cl);
+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);
 
-struct blob_attr **ubus_parse_msg(struct blob_attr *msg);
+void ubusd_event_init(void);
+void ubusd_event_cleanup_object(struct ubus_object *obj);
+void ubusd_send_obj_event(struct ubus_object *obj, bool add);
 
 
 #endif