X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd.h;h=1c6cd7feadf9730d3cca245e7bb2cdf10b9e1cf4;hp=4959a91f1d8200ee38cd7e002abad4623fc023ec;hb=37cc5d2f25c162c1e125922e91bbc741e2e4a6d1;hpb=1643f728e7c99362d1925d6085a376f18cf46b5e

diff --git a/ubusd.h b/ubusd.h
index 4959a91..1c6cd7f 100644
--- a/ubusd.h
+++ b/ubusd.h
@@ -1,3 +1,16 @@
+/*
+ * Copyright (C) 2011-2014 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #ifndef __UBUSD_H
 #define __UBUSD_H
 
@@ -13,12 +26,12 @@
 #define UBUS_OBJ_HASH_BITS	4
 
 extern struct blob_buf b;
-extern struct avl_tree clients;
 
 struct ubus_msg_buf {
 	uint32_t refcount; /* ~0: uses external data buffer */
 	struct ubus_msghdr hdr;
 	struct blob_attr *data;
+	int fd;
 	int len;
 };
 
@@ -33,6 +46,7 @@ struct ubus_client {
 
 	struct ubus_msg_buf *pending_msg;
 	int pending_msg_offset;
+	int pending_msg_fd;
 	struct {
 		struct ubus_msghdr hdr;
 		struct blob_attr data;
@@ -46,14 +60,15 @@ 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);
 
-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);
 
 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