pass ubus_msg_buf to callback of internal object

[project/ubus.git] / ubusd_proto.c

diff --git a/ubusd_proto.c b/ubusd_proto.c
index fd38dbd..caede10 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 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
@@ -12,6 +12,8 @@
  */
 
 #include <arpa/inet.h>
+#include <unistd.h>
+
 #include "ubusd.h"
 
 struct blob_buf b;
@@ -38,6 +40,15 @@ static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
        return attrbuf;
 }
 
+static void ubus_msg_close_fd(struct ubus_msg_buf *ub)
+{
+       if (ub->fd < 0)
+               return;
+
+       close(ub->fd);
+       ub->fd = -1;
+}
+
 static void ubus_msg_init(struct ubus_msg_buf *ub, uint8_t type, uint16_t seq, uint32_t peer)
 {
        ub->hdr.version = 0;
@@ -147,14 +158,13 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
 
        blob_buf_init(&b, 0);
 
-       if (obj->path.key)
-               blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
+       blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
        blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
        s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
        list_for_each_entry(m, &obj->type->methods, list)
-               blob_put(&b, blob_id(m->data), blob_data(m->data), blob_len(m->data));
+               blobmsg_add_blob(&b, m->data);
        blob_nest_end(&b, s);
 
        ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
@@ -234,7 +244,7 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
        method = blob_data(attr[UBUS_ATTR_METHOD]);
 
        if (!obj->client)
-               return obj->recv_msg(cl, method, attr[UBUS_ATTR_DATA]);
+               return obj->recv_msg(cl, ub, method, attr[UBUS_ATTR_DATA]);
 
        ub->hdr.peer = cl->id.id;
        blob_buf_init(&b, 0);
@@ -409,6 +419,9 @@ void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub
        if (ub->hdr.type < __UBUS_MSG_LAST)
                cb = handlers[ub->hdr.type];
 
+       if (ub->hdr.type != UBUS_MSG_STATUS)
+               ubus_msg_close_fd(ub);
+
        if (cb)
                ret = cb(cl, ub, ubus_parse_msg(ub->data));
        else
@@ -434,6 +447,7 @@ struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
        INIT_LIST_HEAD(&cl->objects);
        cl->sock.fd = fd;
        cl->sock.cb = cb;
+       cl->pending_msg_fd = -1;
 
        if (!ubus_alloc_id(&clients, &cl->id, 0))
                goto free;
@@ -472,6 +486,9 @@ void ubus_notify_subscription(struct ubus_object *obj)
        blob_put_int8(&b, UBUS_ATTR_ACTIVE, active);
 
        ub = ubus_msg_from_blob(false);
+       if (!ub)
+               return;
+
        ubus_msg_init(ub, UBUS_MSG_NOTIFY, ++obj->invoke_seq, 0);
        ubus_msg_send(obj->client, ub, true);
 }
@@ -485,13 +502,15 @@ void ubus_notify_unsubscribe(struct ubus_subscription *s)
        blob_put_int32(&b, UBUS_ATTR_TARGET, s->target->id.id);
 
        ub = ubus_msg_from_blob(false);
-       ubus_msg_init(ub, UBUS_MSG_UNSUBSCRIBE, ++s->subscriber->invoke_seq, 0);
-       ubus_msg_send(s->subscriber->client, ub, true);
+       if (ub != NULL) {
+               ubus_msg_init(ub, UBUS_MSG_UNSUBSCRIBE, ++s->subscriber->invoke_seq, 0);
+               ubus_msg_send(s->subscriber->client, ub, true);
+       }
 
        ubus_unsubscribe(s);
 }
 
-static void __init ubusd_proto_init(void)
+static void __constructor ubusd_proto_init(void)
 {
        ubus_init_id_tree(&clients);