ubusd: don't free messages in ubus_send_msg() anymore

[project/ubus.git] / ubusd_proto.c

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 0af11f2..441d084 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -80,12 +80,17 @@ void
 ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
                        uint8_t type)
 {
+       /* keep the fd to be passed if it is UBUS_MSG_INVOKE */
+       int fd = ub->fd;
        ub = ubus_reply_from_blob(ub, true);
        if (!ub)
                return;
 
        ub->hdr.type = type;
-       ubus_msg_send(cl, ub, true);
+       ub->fd = fd;
+
+       ubus_msg_send(cl, ub);
+       ubus_msg_free(ub);
 }
 
 static bool ubusd_send_hello(struct ubus_client *cl)
@@ -98,14 +103,15 @@ static bool ubusd_send_hello(struct ubus_client *cl)
                return false;
 
        ubus_msg_init(ub, UBUS_MSG_HELLO, 0, cl->id.id);
-       ubus_msg_send(cl, ub, true);
+       ubus_msg_send(cl, ub);
+       ubus_msg_free(ub);
        return true;
 }
 
 static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
        ub->hdr.type = UBUS_MSG_DATA;
-       ubus_msg_send(cl, ub, false);
+       ubus_msg_send(cl, ub);
        return 0;
 }
 
@@ -130,8 +136,8 @@ static int ubusd_handle_remove_object(struct ubus_client *cl, struct ubus_msg_bu
        if (obj->type && obj->type->refcount == 1)
                blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
-       ubusd_free_object(obj);
        ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+       ubusd_free_object(obj);
 
        return 0;
 }
@@ -146,7 +152,7 @@ static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *
 
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
-       if (attr[UBUS_ATTR_SIGNATURE])
+       if (attr[UBUS_ATTR_SIGNATURE] && obj->type)
                blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
        ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
@@ -156,9 +162,12 @@ static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *
 static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, struct ubus_object *obj)
 {
        struct ubus_method *m;
-       int cnt = 0;
+       int all_cnt = 0, cnt = 0;
        void *s;
 
+       if (!obj->type)
+               return;
+
        blob_buf_init(&b, 0);
 
        blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
@@ -167,6 +176,7 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
 
        s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
        list_for_each_entry(m, &obj->type->methods, list) {
+               all_cnt++;
                if (!ubusd_acl_check(cl, obj->path.key, blobmsg_name(m->data), UBUS_ACL_ACCESS)) {
                        blobmsg_add_blob(&b, m->data);
                        cnt++;
@@ -174,7 +184,7 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
        }
        blob_nest_end(&b, s);
 
-       if (cnt)
+       if (cnt || !all_cnt)
                ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
 }
 
@@ -266,7 +276,6 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
        blob_buf_init(&b, 0);
 
        ubusd_forward_invoke(cl, obj, method, ub, attr[UBUS_ATTR_DATA]);
-       ubus_msg_free(ub);
 
        return -1;
 }
@@ -314,7 +323,6 @@ static int ubusd_handle_notify(struct ubus_client *cl, struct ubus_msg_buf *ub,
                        blob_put_int8(&b, UBUS_ATTR_NO_REPLY, 1);
                ubusd_forward_invoke(cl, s->subscriber, method, ub, attr[UBUS_ATTR_DATA]);
        }
-       ubus_msg_free(ub);
 
        return -1;
 }
@@ -351,11 +359,8 @@ static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub
                goto error;
 
        ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]);
-       ubus_msg_send(cl, ub, true);
-       return -1;
-
+       ubus_msg_send(cl, ub);
 error:
-       ubus_msg_free(ub);
        return -1;
 }
 
@@ -374,7 +379,7 @@ static int ubusd_handle_add_watch(struct ubus_client *cl, struct ubus_msg_buf *u
                return UBUS_STATUS_INVALID_ARGUMENT;
 
        target = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_TARGET]));
-       if (!target)
+       if (!target || !target->client)
                return UBUS_STATUS_NOT_FOUND;
 
        if (cl == target->client)
@@ -443,21 +448,23 @@ 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)
+       if (ub->hdr.type != UBUS_MSG_STATUS && ub->hdr.type != UBUS_MSG_INVOKE)
                ubus_msg_close_fd(ub);
 
+       /* Note: no callback should free the `ub` buffer
+                that's always done right after the callback finishes */
        if (cb)
                ret = cb(cl, ub, ubus_parse_msg(ub->data));
        else
                ret = UBUS_STATUS_INVALID_COMMAND;
 
+       ubus_msg_free(ub);
+
        if (ret == -1)
                return;
 
-       ubus_msg_free(ub);
-
        *retmsg_data = htonl(ret);
-       ubus_msg_send(cl, retmsg, false);
+       ubus_msg_send(cl, retmsg);
 }
 
 struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
@@ -518,7 +525,8 @@ void ubus_notify_subscription(struct ubus_object *obj)
                return;
 
        ubus_msg_init(ub, UBUS_MSG_NOTIFY, ++obj->invoke_seq, 0);
-       ubus_msg_send(obj->client, ub, true);
+       ubus_msg_send(obj->client, ub);
+       ubus_msg_free(ub);
 }
 
 void ubus_notify_unsubscribe(struct ubus_subscription *s)
@@ -532,7 +540,8 @@ void ubus_notify_unsubscribe(struct ubus_subscription *s)
        ub = ubus_msg_from_blob(false);
        if (ub != NULL) {
                ubus_msg_init(ub, UBUS_MSG_UNSUBSCRIBE, ++s->subscriber->invoke_seq, 0);
-               ubus_msg_send(s->subscriber->client, ub, true);
+               ubus_msg_send(s->subscriber->client, ub);
+               ubus_msg_free(ub);
        }
 
        ubus_unsubscribe(s);