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

diff --git a/ubusd.h b/ubusd.h
index c0b02f5..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,16 +21,18 @@
 #include "ubusd_id.h"
 #include "ubusd_obj.h"
 #include "ubusmsg.h"
+#include "ubusd_acl.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;
+	int fd;
 	int len;
 };
 
@@ -25,22 +40,23 @@ struct ubus_client {
 	struct ubus_id id;
 	struct uloop_fd sock;
 
-	struct {
-		struct ubus_msghdr hdr;
-		struct blob_attr data;
-	} hdrbuf;
+	uid_t uid;
+	gid_t gid;
+	char *user;
+	char *group;
 
 	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 *tx_queue[UBUSD_CLIENT_BACKLOG];
+	unsigned int txq_cur, txq_tail, txq_ofs;
 
-	struct ubus_msg_buf *requests[UBUSD_CLIENT_BACKLOG];
-	unsigned int req_head, req_tail;
+	struct ubus_msg_buf *pending_msg;
+	int pending_msg_offset;
+	int pending_msg_fd;
+	struct {
+		struct ubus_msghdr hdr;
+		struct blob_attr data;
+	} hdrbuf;
 };
 
 struct ubus_path {
@@ -49,16 +65,23 @@ 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 blob_attr **ubus_parse_msg(struct blob_attr *msg);
 
-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);
+void ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
+				   uint8_t type);
 
-struct blob_attr **ubus_parse_msg(struct blob_attr *msg);
+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