remove obseleted validation of key

[project/ubus.git] / libubus.h

diff --git a/libubus.h b/libubus.h
index f899ded..08dac49 100644 (file)
--- a/libubus.h
+++ b/libubus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Felix Fietkau <nbd@openwrt.org>
+ * 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
@@ -34,11 +34,10 @@ struct ubus_event_handler;
 struct ubus_subscriber;
 struct ubus_notify_request;
 
-static inline struct blob_attr *
-ubus_msghdr_data(struct ubus_msghdr *hdr)
-{
-       return (struct blob_attr *) (hdr + 1);
-}
+struct ubus_msghdr_buf {
+       struct ubus_msghdr hdr;
+       struct blob_attr *data;
+};
 
 typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx,
                                      struct ubus_object_data *obj,
@@ -53,9 +52,11 @@ typedef void (*ubus_event_handler_t)(struct ubus_context *ctx, struct ubus_event
                                     const char *type, struct blob_attr *msg);
 typedef void (*ubus_data_handler_t)(struct ubus_request *req,
                                    int type, struct blob_attr *msg);
+typedef void (*ubus_fd_handler_t)(struct ubus_request *req, int fd);
 typedef void (*ubus_complete_handler_t)(struct ubus_request *req, int ret);
 typedef void (*ubus_notify_complete_handler_t)(struct ubus_notify_request *req,
                                               int idx, int ret);
+typedef void (*ubus_connect_handler_t)(struct ubus_context *ctx);
 
 #define UBUS_OBJECT_TYPE(_name, _methods)              \
        {                                               \
@@ -65,24 +66,32 @@ typedef void (*ubus_notify_complete_handler_t)(struct ubus_notify_request *req,
                .methods = _methods                     \
        }
 
+#define __UBUS_METHOD_NOARG(_name, _handler)           \
+       .name = _name,                                  \
+       .handler = _handler
+
+#define __UBUS_METHOD(_name, _handler, _policy)                \
+       __UBUS_METHOD_NOARG(_name, _handler),           \
+       .policy = _policy,                              \
+       .n_policy = ARRAY_SIZE(_policy)
+
 #define UBUS_METHOD(_name, _handler, _policy)          \
+       { __UBUS_METHOD(_name, _handler, _policy) }
+
+#define UBUS_METHOD_MASK(_name, _handler, _policy, _mask) \
        {                                               \
-               .name = _name,                          \
-               .handler = _handler,                    \
-               .policy = _policy,                      \
-               .n_policy = ARRAY_SIZE(_policy)         \
+               __UBUS_METHOD(_name, _handler, _policy),\
+               .mask = _mask                           \
        }
 
 #define UBUS_METHOD_NOARG(_name, _handler)             \
-       {                                               \
-               .name = _name,                          \
-               .handler = _handler,                    \
-       }
+       { __UBUS_METHOD_NOARG(_name, _handler) }
 
 struct ubus_method {
        const char *name;
        ubus_handler_t handler;
 
+       unsigned long mask;
        const struct blobmsg_policy *policy;
        int n_policy;
 };
@@ -130,6 +139,7 @@ struct ubus_context {
        struct list_head pending;
 
        struct uloop_fd sock;
+       struct uloop_timeout pending_timer;
 
        uint32_t local_id;
        uint16_t request_seq;
@@ -137,10 +147,9 @@ struct ubus_context {
 
        void (*connection_lost)(struct ubus_context *ctx);
 
-       struct {
-               struct ubus_msghdr hdr;
-               char data[UBUS_MAX_MSGLEN];
-       } msgbuf;
+       struct ubus_msghdr_buf msgbuf;
+       uint32_t msgbuf_data_len;
+       int msgbuf_reduction_counter;
 };
 
 struct ubus_object_data {
@@ -154,7 +163,10 @@ struct ubus_request_data {
        uint32_t object;
        uint32_t peer;
        uint16_t seq;
+
+       /* internal use */
        bool deferred;
+       int fd;
 };
 
 struct ubus_request {
@@ -172,6 +184,7 @@ struct ubus_request {
 
        ubus_data_handler_t raw_data_cb;
        ubus_data_handler_t data_cb;
+       ubus_fd_handler_t fd_cb;
        ubus_complete_handler_t complete_cb;
 
        struct ubus_context *ctx;
@@ -188,10 +201,24 @@ struct ubus_notify_request {
        uint32_t id[UBUS_MAX_NOTIFY_PEERS + 1];
 };
 
+struct ubus_auto_conn {
+       struct ubus_context ctx;
+       struct uloop_timeout timer;
+       const char *path;
+       ubus_connect_handler_t cb;
+};
+
 struct ubus_context *ubus_connect(const char *path);
+int ubus_connect_ctx(struct ubus_context *ctx, const char *path);
+void ubus_auto_connect(struct ubus_auto_conn *conn);
 int ubus_reconnect(struct ubus_context *ctx, const char *path);
+
+/* call this only for struct ubus_context pointers returned by ubus_connect() */
 void ubus_free(struct ubus_context *ctx);
 
+/* call this only for struct ubus_context pointers initialised by ubus_connect_ctx() */
+void ubus_shutdown(struct ubus_context *ctx);
+
 const char *ubus_strerror(int error);
 
 static inline void ubus_add_uloop(struct ubus_context *ctx)
@@ -266,6 +293,12 @@ static inline void ubus_defer_request(struct ubus_context *ctx,
     req->deferred = true;
 }
 
+static inline void ubus_request_set_fd(struct ubus_context *ctx,
+                                      struct ubus_request_data *req, int fd)
+{
+    req->fd = fd;
+}
+
 void ubus_complete_deferred_request(struct ubus_context *ctx,
                                    struct ubus_request_data *req, int ret);