projects
/
project
/
ubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ubusd: move global retmsg per client
[project/ubus.git]
/
ubusd.h
diff --git
a/ubusd.h
b/ubusd.h
index bd2590e7ac5b08c159520cc9e971f37f3b8a4e4f..4d879201e2f5b6bf17cbba072b89f83ad612d35f 100644
(file)
--- a/
ubusd.h
+++ b/
ubusd.h
@@
-21,6
+21,7
@@
#include "ubusd_id.h"
#include "ubusd_obj.h"
#include "ubusmsg.h"
#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
#define UBUSD_CLIENT_BACKLOG 32
#define UBUS_OBJ_HASH_BITS 4
@@
-38,6
+39,12
@@
struct ubus_msg_buf {
struct ubus_client {
struct ubus_id id;
struct uloop_fd sock;
struct ubus_client {
struct ubus_id id;
struct uloop_fd sock;
+ struct blob_buf b;
+
+ uid_t uid;
+ gid_t gid;
+ char *user;
+ char *group;
struct list_head objects;
struct list_head objects;
@@
-45,6
+52,7
@@
struct ubus_client {
unsigned int txq_cur, txq_tail, txq_ofs;
struct ubus_msg_buf *pending_msg;
unsigned int txq_cur, txq_tail, txq_ofs;
struct ubus_msg_buf *pending_msg;
+ struct ubus_msg_buf *retmsg;
int pending_msg_offset;
int pending_msg_fd;
struct {
int pending_msg_offset;
int pending_msg_fd;
struct {
@@
-58,8
+66,10
@@
struct ubus_path {
const char name[];
};
const char name[];
};
+extern const char *ubusd_acl_dir;
+
struct ubus_msg_buf *ubus_msg_new(void *data, int len, bool shared);
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_send(struct ubus_client *cl, struct ubus_msg_buf *ub);
void ubus_msg_free(struct ubus_msg_buf *ub);
struct blob_attr **ubus_parse_msg(struct blob_attr *msg);
void ubus_msg_free(struct ubus_msg_buf *ub);
struct blob_attr **ubus_parse_msg(struct blob_attr *msg);
@@
-76,5
+86,10
@@
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);
int ubusd_send_event(struct ubus_client *cl, const char *id,
event_fill_cb fill_cb, void *cb_priv);
+void ubusd_acl_init(void);
+
+void ubusd_monitor_init(void);
+void ubusd_monitor_message(struct ubus_client *cl, struct ubus_msg_buf *ub, bool send);
+void ubusd_monitor_disconnect(struct ubus_client *cl);
#endif
#endif