ubus/lua: pass notification name to callback

[project/ubus.git] / libubus-obj.c

diff --git a/libubus-obj.c b/libubus-obj.c
index ef10462..c1931b3 100644 (file)
--- a/libubus-obj.c
+++ b/libubus-obj.c
@@ -11,12 +11,13 @@
  * GNU General Public License for more details.
  */
 
+#include <unistd.h>
 #include "libubus.h"
 #include "libubus-internal.h"
 
 static void
 ubus_process_unsubscribe(struct ubus_context *ctx, struct ubus_msghdr *hdr,
-                        struct ubus_object *obj, struct blob_attr **attrbuf)
+                        struct ubus_object *obj, struct blob_attr **attrbuf, int fd)
 {
        struct ubus_subscriber *s;
 
@@ -29,11 +30,14 @@ ubus_process_unsubscribe(struct ubus_context *ctx, struct ubus_msghdr *hdr,
        s = container_of(obj, struct ubus_subscriber, obj);
        if (s->remove_cb)
                s->remove_cb(ctx, s, blob_get_u32(attrbuf[UBUS_ATTR_TARGET]));
+
+       if (fd >= 0)
+               close(fd);
 }
 
 static void
 ubus_process_notify(struct ubus_context *ctx, struct ubus_msghdr *hdr,
-                   struct ubus_object *obj, struct blob_attr **attrbuf)
+                   struct ubus_object *obj, struct blob_attr **attrbuf, int fd)
 {
        if (!obj || !attrbuf[UBUS_ATTR_ACTIVE])
                return;
@@ -41,14 +45,19 @@ ubus_process_notify(struct ubus_context *ctx, struct ubus_msghdr *hdr,
        obj->has_subscribers = blob_get_u8(attrbuf[UBUS_ATTR_ACTIVE]);
        if (obj->subscribe_cb)
                obj->subscribe_cb(ctx, obj);
+
+       if (fd >= 0)
+               close(fd);
 }
 static void
 ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hdr,
-                   struct ubus_object *obj, struct blob_attr **attrbuf)
+                   struct ubus_object *obj, struct blob_attr **attrbuf, int fd)
 {
        struct ubus_request_data req = {
                .fd = -1,
+               .req_fd = fd,
        };
+
        int method;
        int ret;
        bool no_reply = false;
@@ -65,11 +74,15 @@ ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hdr,
 
        if (attrbuf[UBUS_ATTR_NO_REPLY])
                no_reply = blob_get_int8(attrbuf[UBUS_ATTR_NO_REPLY]);
-
+               
        req.peer = hdr->peer;
        req.seq = hdr->seq;
        req.object = obj->id;
-
+       if (attrbuf[UBUS_ATTR_USER] && attrbuf[UBUS_ATTR_GROUP]) {
+               req.acl.user = blobmsg_get_string(attrbuf[UBUS_ATTR_USER]);
+               req.acl.group = blobmsg_get_string(attrbuf[UBUS_ATTR_GROUP]);
+               req.acl.object = obj->name;
+       }
        for (method = 0; method < obj->n_methods; method++)
                if (!obj->methods[method].name ||
                    !strcmp(obj->methods[method].name,
@@ -84,6 +97,8 @@ found:
        ret = obj->methods[method].handler(ctx, obj, &req,
                                           blob_data(attrbuf[UBUS_ATTR_METHOD]),
                                           attrbuf[UBUS_ATTR_DATA]);
+       if (req.req_fd >= 0)
+               close(req.req_fd);
        if (req.deferred || no_reply)
                return;
 
@@ -91,15 +106,16 @@ send:
        ubus_complete_deferred_request(ctx, &req, ret);
 }
 
-void __hidden ubus_process_obj_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf)
+
+void __hidden ubus_process_obj_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf, int fd)
 {
        void (*cb)(struct ubus_context *, struct ubus_msghdr *,
-                  struct ubus_object *, struct blob_attr **);
+                  struct ubus_object *, struct blob_attr **, int fd);
        struct ubus_msghdr *hdr = &buf->hdr;
        struct blob_attr **attrbuf;
        struct ubus_object *obj;
        uint32_t objid;
-
+       void *prev_data = NULL;
        attrbuf = ubus_parse_msg(buf->data);
        if (!attrbuf[UBUS_ATTR_OBJID])
                return;
@@ -120,7 +136,20 @@ void __hidden ubus_process_obj_msg(struct ubus_context *ctx, struct ubus_msghdr_
        default:
                return;
        }
-       cb(ctx, hdr, obj, attrbuf);
+
+       if (buf == &ctx->msgbuf) {
+               prev_data = buf->data;
+               buf->data = NULL;
+       }
+
+       cb(ctx, hdr, obj, attrbuf, fd);
+
+       if (prev_data) {
+               if (buf->data)
+                       free(prev_data);
+               else
+                       buf->data = prev_data;
+       }
 }
 
 static void ubus_add_object_cb(struct ubus_request *req, int type, struct blob_attr *msg)
@@ -211,12 +240,12 @@ static void ubus_remove_object_cb(struct ubus_request *req, int type, struct blo
        if (!attrbuf[UBUS_ATTR_OBJID])
                return;
 
+       avl_delete(&req->ctx->objects, &obj->avl);
+
        obj->id = 0;
 
        if (attrbuf[UBUS_ATTR_OBJTYPE] && obj->type)
                obj->type->id = 0;
-
-       avl_delete(&req->ctx->objects, &obj->avl);
 }
 
 int ubus_remove_object(struct ubus_context *ctx, struct ubus_object *obj)