X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd.h;h=32fe8524ec831f17057850387bd553b5608edfba;hp=6d6e18142dd406d7104c0379c183315203511327;hb=e59b44573423ad608d0752b46a6073222db9ed45;hpb=faedeaaca861a84fe1718358cd281db11334b5c9

diff --git a/ubusd.h b/ubusd.h
index 6d6e181..32fe852 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
 
@@ -8,17 +21,18 @@
 #include "ubusd_id.h"
 #include "ubusd_obj.h"
 #include "ubusmsg.h"
+#include "ubusd_acl.h"
 
 #define UBUSD_CLIENT_BACKLOG	32
 #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;
 };
 
@@ -26,6 +40,11 @@ struct ubus_client {
 	struct ubus_id id;
 	struct uloop_fd sock;
 
+	uid_t uid;
+	gid_t gid;
+	char *user;
+	char *group;
+
 	struct list_head objects;
 
 	struct ubus_msg_buf *tx_queue[UBUSD_CLIENT_BACKLOG];
@@ -33,6 +52,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;
@@ -47,12 +67,21 @@ 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);
 void ubus_msg_free(struct ubus_msg_buf *ub);
+struct blob_attr **ubus_parse_msg(struct blob_attr *msg);
 
-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 ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
+				   uint8_t type);
 
+typedef struct ubus_msg_buf *(*event_fill_cb)(void *priv, const char *id);
 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);
+int ubusd_send_event(struct ubus_client *cl, const char *id,
+		     event_fill_cb fill_cb, void *cb_priv);
 
+void ubusd_acl_init(void);
 
 #endif