move more protocol related stuff to ubusd_proto.c

[project/ubus.git] / ubusd.h

diff --git a/ubusd.h b/ubusd.h
index cb6bba0..30f9f7d 100644 (file)
--- a/ubusd.h
+++ b/ubusd.h
@@ -9,10 +9,11 @@
 #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 {
        uint32_t refcount; /* ~0: uses external data buffer */
        struct ubus_msghdr hdr;
@@ -44,15 +45,11 @@ 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, bool free);
-struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub);
 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 blob_attr **ubus_parse_msg(struct blob_attr *msg);
+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 ubusd_event_init(void);
 void ubusd_event_cleanup_object(struct ubus_object *obj);