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)
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;
}
blob_buf_init(&b, 0);
ubusd_forward_invoke(cl, obj, method, ub, attr[UBUS_ATTR_DATA]);
- ubus_msg_free(ub);
return -1;
}
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;
}
if (!attr[UBUS_ATTR_OBJID] ||
(ub->hdr.type == UBUS_MSG_STATUS && !attr[UBUS_ATTR_STATUS]) ||
(ub->hdr.type == UBUS_MSG_DATA && !attr[UBUS_ATTR_DATA]))
- goto error;
+ goto out;
obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
if (!obj)
- goto error;
+ goto out;
if (cl != obj->client)
- goto error;
+ goto out;
cl = ubusd_get_client_by_id(ub->hdr.peer);
if (!cl)
- goto error;
+ goto out;
ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]);
- ubus_msg_send(cl, ub, true);
- return -1;
-
-error:
- ubus_msg_free(ub);
+ ubus_msg_send(cl, ub);
+out:
return -1;
}
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)
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)
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);