2011-06-17 16:35:11 +02:00
|
|
|
/*
|
2014-02-18 15:01:39 +01:00
|
|
|
* Copyright (C) 2011-2014 Felix Fietkau <nbd@openwrt.org>
|
2011-06-17 16:35:11 +02:00
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* as published by the Free Software Foundation
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*/
|
|
|
|
|
2010-12-06 03:51:58 +01:00
|
|
|
#include <arpa/inet.h>
|
2014-02-18 15:01:39 +01:00
|
|
|
#include <unistd.h>
|
|
|
|
|
2010-12-06 03:51:58 +01:00
|
|
|
#include "ubusd.h"
|
|
|
|
|
2011-02-07 01:25:28 +01:00
|
|
|
struct blob_buf b;
|
2011-02-07 02:54:00 +01:00
|
|
|
static struct avl_tree clients;
|
2010-12-06 03:51:58 +01:00
|
|
|
|
|
|
|
static struct blob_attr *attrbuf[UBUS_ATTR_MAX];
|
|
|
|
|
2011-01-31 16:32:29 +01:00
|
|
|
typedef int (*ubus_cmd_cb)(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr);
|
2010-12-06 03:51:58 +01:00
|
|
|
|
|
|
|
static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
|
|
|
|
[UBUS_ATTR_SIGNATURE] = { .type = BLOB_ATTR_NESTED },
|
|
|
|
[UBUS_ATTR_OBJTYPE] = { .type = BLOB_ATTR_INT32 },
|
|
|
|
[UBUS_ATTR_OBJPATH] = { .type = BLOB_ATTR_STRING },
|
2011-01-31 02:41:32 +01:00
|
|
|
[UBUS_ATTR_OBJID] = { .type = BLOB_ATTR_INT32 },
|
|
|
|
[UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 },
|
2012-12-15 00:32:27 +01:00
|
|
|
[UBUS_ATTR_METHOD] = { .type = BLOB_ATTR_STRING },
|
2015-04-25 10:10:34 +02:00
|
|
|
[UBUS_ATTR_USER] = { .type = BLOB_ATTR_STRING },
|
|
|
|
[UBUS_ATTR_GROUP] = { .type = BLOB_ATTR_STRING },
|
2010-12-06 03:51:58 +01:00
|
|
|
};
|
|
|
|
|
2015-04-21 01:01:26 +02:00
|
|
|
struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
|
2010-12-06 03:51:58 +01:00
|
|
|
{
|
|
|
|
blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
|
|
|
|
return attrbuf;
|
|
|
|
}
|
|
|
|
|
2014-02-18 15:01:39 +01:00
|
|
|
static void ubus_msg_close_fd(struct ubus_msg_buf *ub)
|
|
|
|
{
|
|
|
|
if (ub->fd < 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
close(ub->fd);
|
|
|
|
ub->fd = -1;
|
|
|
|
}
|
|
|
|
|
2010-12-06 03:51:58 +01:00
|
|
|
static void ubus_msg_init(struct ubus_msg_buf *ub, uint8_t type, uint16_t seq, uint32_t peer)
|
|
|
|
{
|
|
|
|
ub->hdr.version = 0;
|
|
|
|
ub->hdr.type = type;
|
|
|
|
ub->hdr.seq = seq;
|
|
|
|
ub->hdr.peer = peer;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ubus_msg_buf *ubus_msg_from_blob(bool shared)
|
|
|
|
{
|
|
|
|
return ubus_msg_new(b.head, blob_raw_len(b.head), shared);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ubus_msg_buf *ubus_reply_from_blob(struct ubus_msg_buf *ub, bool shared)
|
|
|
|
{
|
|
|
|
struct ubus_msg_buf *new;
|
|
|
|
|
2011-02-07 03:01:36 +01:00
|
|
|
new = ubus_msg_from_blob(shared);
|
2010-12-06 03:51:58 +01:00
|
|
|
if (!new)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
ubus_msg_init(new, UBUS_MSG_DATA, ub->hdr.seq, ub->hdr.peer);
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2015-04-25 09:48:09 +02:00
|
|
|
void
|
|
|
|
ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
|
2012-12-15 00:32:27 +01:00
|
|
|
uint8_t type)
|
|
|
|
{
|
2016-12-19 10:30:36 +01:00
|
|
|
/* keep the fd to be passed if it is UBUS_MSG_INVOKE */
|
|
|
|
int fd = ub->fd;
|
2012-12-15 00:32:27 +01:00
|
|
|
ub = ubus_reply_from_blob(ub, true);
|
|
|
|
if (!ub)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ub->hdr.type = type;
|
2016-12-19 10:30:36 +01:00
|
|
|
ub->fd = fd;
|
|
|
|
|
ubusd: don't free messages in ubus_send_msg() anymore
This makes it clear that `ubus_msg_send()` is only
about sending and queue-ing messages, and has nothing
to do with free-ing.
It can be a bit misleading/confusing when trying to go
through the code and make assumptions about whether a
buffer is free'd in ubus_send_msg(), or is free'd outside.
In `ubusd_proto_receive_message()` the `ubus_msg_free()`
is now called before the `if (ret == -1)` check.
That way, all callbacks will have their messages free'd,
which is what's desired, but confusing, because:
* ubusd_handle_invoke() called ubus_msg_free() before returning -1
* ubusd_handle_notify() called ubus_msg_free() before returning -1
* ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1
* ubus_msg_send() would call ubus_msg_send(,,free=false)
* all other callback callers would `ubus_msg_send(,,free=true)`
(free the buffers in ubus_msg_send() )
In all other places, where `ubus_msg_send(,,free=true)`
an explicit `ubus_msg_free()` was added.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-05 15:20:51 +02:00
|
|
|
ubus_msg_send(cl, ub);
|
|
|
|
ubus_msg_free(ub);
|
2012-12-15 00:32:27 +01:00
|
|
|
}
|
|
|
|
|
2011-02-07 02:54:00 +01:00
|
|
|
static bool ubusd_send_hello(struct ubus_client *cl)
|
2010-12-06 03:51:58 +01:00
|
|
|
{
|
|
|
|
struct ubus_msg_buf *ub;
|
|
|
|
|
|
|
|
blob_buf_init(&b, 0);
|
|
|
|
ub = ubus_msg_from_blob(true);
|
|
|
|
if (!ub)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
ubus_msg_init(ub, UBUS_MSG_HELLO, 0, cl->id.id);
|
ubusd: don't free messages in ubus_send_msg() anymore
This makes it clear that `ubus_msg_send()` is only
about sending and queue-ing messages, and has nothing
to do with free-ing.
It can be a bit misleading/confusing when trying to go
through the code and make assumptions about whether a
buffer is free'd in ubus_send_msg(), or is free'd outside.
In `ubusd_proto_receive_message()` the `ubus_msg_free()`
is now called before the `if (ret == -1)` check.
That way, all callbacks will have their messages free'd,
which is what's desired, but confusing, because:
* ubusd_handle_invoke() called ubus_msg_free() before returning -1
* ubusd_handle_notify() called ubus_msg_free() before returning -1
* ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1
* ubus_msg_send() would call ubus_msg_send(,,free=false)
* all other callback callers would `ubus_msg_send(,,free=true)`
(free the buffers in ubus_msg_send() )
In all other places, where `ubus_msg_send(,,free=true)`
an explicit `ubus_msg_free()` was added.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-05 15:20:51 +02:00
|
|
|
ubus_msg_send(cl, ub);
|
|
|
|
ubus_msg_free(ub);
|
2010-12-06 03:51:58 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-01-31 16:32:29 +01:00
|
|
|
static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
|
2010-12-06 03:51:58 +01:00
|
|
|
{
|
|
|
|
ub->hdr.type = UBUS_MSG_DATA;
|
ubusd: don't free messages in ubus_send_msg() anymore
This makes it clear that `ubus_msg_send()` is only
about sending and queue-ing messages, and has nothing
to do with free-ing.
It can be a bit misleading/confusing when trying to go
through the code and make assumptions about whether a
buffer is free'd in ubus_send_msg(), or is free'd outside.
In `ubusd_proto_receive_message()` the `ubus_msg_free()`
is now called before the `if (ret == -1)` check.
That way, all callbacks will have their messages free'd,
which is what's desired, but confusing, because:
* ubusd_handle_invoke() called ubus_msg_free() before returning -1
* ubusd_handle_notify() called ubus_msg_free() before returning -1
* ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1
* ubus_msg_send() would call ubus_msg_send(,,free=false)
* all other callback callers would `ubus_msg_send(,,free=true)`
(free the buffers in ubus_msg_send() )
In all other places, where `ubus_msg_send(,,free=true)`
an explicit `ubus_msg_free()` was added.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-05 15:20:51 +02:00
|
|
|
ubus_msg_send(cl, ub);
|
2010-12-06 03:51:58 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-02-06 21:41:29 +01:00
|
|
|
static int ubusd_handle_remove_object(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
|
|
|
|
{
|
|
|
|
struct ubus_object *obj;
|
|
|
|
|
|
|
|
if (!attr[UBUS_ATTR_OBJID])
|
|
|
|
return UBUS_STATUS_INVALID_ARGUMENT;
|
|
|
|
|
|
|
|
obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
|
|
|
|
if (!obj)
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
|
|
|
|
if (obj->client != cl)
|
|
|
|
return UBUS_STATUS_PERMISSION_DENIED;
|
|
|
|
|
|
|
|
blob_buf_init(&b, 0);
|
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
|
|
|
|
|
|
|
|
/* check if we're removing the object type as well */
|
|
|
|
if (obj->type && obj->type->refcount == 1)
|
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
|
|
|
|
|
2015-04-25 09:48:09 +02:00
|
|
|
ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
|
2016-08-23 12:55:08 +02:00
|
|
|
ubusd_free_object(obj);
|
2011-02-06 21:41:29 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-02-06 21:33:03 +01:00
|
|
|
static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
|
2010-12-06 03:51:58 +01:00
|
|
|
{
|
|
|
|
struct ubus_object *obj;
|
|
|
|
|
|
|
|
obj = ubusd_create_object(cl, attr);
|
|
|
|
if (!obj)
|
|
|
|
return UBUS_STATUS_INVALID_ARGUMENT;
|
|
|
|
|
|
|
|
blob_buf_init(&b, 0);
|
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
|
2016-08-23 11:36:41 +02:00
|
|
|
if (attr[UBUS_ATTR_SIGNATURE] && obj->type)
|
2010-12-06 03:51:58 +01:00
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
|
|
|
|
|
2015-04-25 09:48:09 +02:00
|
|
|
ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
|
2010-12-06 03:51:58 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, struct ubus_object *obj)
|
|
|
|
{
|
|
|
|
struct ubus_method *m;
|
2016-11-20 17:05:00 +01:00
|
|
|
int all_cnt = 0, cnt = 0;
|
2010-12-06 03:51:58 +01:00
|
|
|
void *s;
|
|
|
|
|
2016-08-23 11:36:41 +02:00
|
|
|
if (!obj->type)
|
|
|
|
return;
|
|
|
|
|
2010-12-06 03:51:58 +01:00
|
|
|
blob_buf_init(&b, 0);
|
|
|
|
|
2015-04-14 05:12:34 +02:00
|
|
|
blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
|
2010-12-06 03:51:58 +01:00
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
|
2011-01-31 18:26:09 +01:00
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
|
2010-12-06 03:51:58 +01:00
|
|
|
|
|
|
|
s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
|
2015-04-25 10:10:34 +02:00
|
|
|
list_for_each_entry(m, &obj->type->methods, list) {
|
2016-11-20 17:05:00 +01:00
|
|
|
all_cnt++;
|
2015-04-25 10:10:34 +02:00
|
|
|
if (!ubusd_acl_check(cl, obj->path.key, blobmsg_name(m->data), UBUS_ACL_ACCESS)) {
|
|
|
|
blobmsg_add_blob(&b, m->data);
|
|
|
|
cnt++;
|
|
|
|
}
|
|
|
|
}
|
2010-12-06 03:51:58 +01:00
|
|
|
blob_nest_end(&b, s);
|
|
|
|
|
2016-11-20 17:05:00 +01:00
|
|
|
if (cnt || !all_cnt)
|
2015-04-25 10:10:34 +02:00
|
|
|
ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
|
2010-12-06 03:51:58 +01:00
|
|
|
}
|
|
|
|
|
2011-01-31 16:32:29 +01:00
|
|
|
static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
|
2010-12-06 03:51:58 +01:00
|
|
|
{
|
|
|
|
struct ubus_object *obj;
|
|
|
|
char *objpath;
|
|
|
|
bool found = false;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (!attr[UBUS_ATTR_OBJPATH]) {
|
|
|
|
avl_for_each_element(&path, obj, path)
|
|
|
|
ubusd_send_obj(cl, ub, obj);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
objpath = blob_data(attr[UBUS_ATTR_OBJPATH]);
|
|
|
|
len = strlen(objpath);
|
|
|
|
if (objpath[len - 1] != '*') {
|
|
|
|
obj = avl_find_element(&path, objpath, obj, path);
|
|
|
|
if (!obj)
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
|
|
|
|
ubusd_send_obj(cl, ub, obj);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
objpath[--len] = 0;
|
|
|
|
|
|
|
|
obj = avl_find_ge_element(&path, objpath, obj, path);
|
|
|
|
if (!obj)
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
|
|
|
|
while (!strncmp(objpath, obj->path.key, len)) {
|
|
|
|
found = true;
|
|
|
|
ubusd_send_obj(cl, ub, obj);
|
|
|
|
if (obj == avl_last_element(&path, obj, path))
|
|
|
|
break;
|
|
|
|
obj = avl_next_element(obj, path);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!found)
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-12-15 00:32:27 +01:00
|
|
|
static void
|
2015-04-25 10:10:34 +02:00
|
|
|
ubusd_forward_invoke(struct ubus_client *cl, struct ubus_object *obj,
|
|
|
|
const char *method, struct ubus_msg_buf *ub,
|
|
|
|
struct blob_attr *data)
|
2012-12-15 00:32:27 +01:00
|
|
|
{
|
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
|
|
|
|
blob_put_string(&b, UBUS_ATTR_METHOD, method);
|
2015-04-25 10:10:34 +02:00
|
|
|
if (cl->user)
|
|
|
|
blob_put_string(&b, UBUS_ATTR_USER, cl->user);
|
|
|
|
if (cl->group)
|
|
|
|
blob_put_string(&b, UBUS_ATTR_GROUP, cl->group);
|
2012-12-15 00:32:27 +01:00
|
|
|
if (data)
|
|
|
|
blob_put(&b, UBUS_ATTR_DATA, blob_data(data), blob_len(data));
|
|
|
|
|
2015-04-25 09:48:09 +02:00
|
|
|
ubus_proto_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
|
2012-12-15 00:32:27 +01:00
|
|
|
}
|
|
|
|
|
2011-01-31 16:32:29 +01:00
|
|
|
static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
|
2011-01-30 23:57:14 +01:00
|
|
|
{
|
2011-01-31 02:41:32 +01:00
|
|
|
struct ubus_object *obj = NULL;
|
2011-01-31 16:25:22 +01:00
|
|
|
struct ubus_id *id;
|
2011-01-31 02:41:32 +01:00
|
|
|
const char *method;
|
|
|
|
|
2011-01-31 16:25:22 +01:00
|
|
|
if (!attr[UBUS_ATTR_METHOD] || !attr[UBUS_ATTR_OBJID])
|
2011-01-31 02:41:32 +01:00
|
|
|
return UBUS_STATUS_INVALID_ARGUMENT;
|
|
|
|
|
2011-02-06 21:37:37 +01:00
|
|
|
id = ubus_find_id(&objects, blob_get_u32(attr[UBUS_ATTR_OBJID]));
|
2011-01-31 16:25:22 +01:00
|
|
|
if (!id)
|
2011-01-31 02:41:32 +01:00
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
|
2011-01-31 16:25:22 +01:00
|
|
|
obj = container_of(id, struct ubus_object, id);
|
|
|
|
|
2011-01-31 02:41:32 +01:00
|
|
|
method = blob_data(attr[UBUS_ATTR_METHOD]);
|
2011-02-05 01:29:52 +01:00
|
|
|
|
2015-04-25 10:10:34 +02:00
|
|
|
if (ubusd_acl_check(cl, obj->path.key, method, UBUS_ACL_ACCESS))
|
2015-12-09 19:48:08 +01:00
|
|
|
return UBUS_STATUS_PERMISSION_DENIED;
|
2015-04-25 10:10:34 +02:00
|
|
|
|
2011-02-05 01:29:52 +01:00
|
|
|
if (!obj->client)
|
2015-04-20 11:08:26 +02:00
|
|
|
return obj->recv_msg(cl, ub, method, attr[UBUS_ATTR_DATA]);
|
2011-02-05 01:29:52 +01:00
|
|
|
|
2012-12-15 00:32:27 +01:00
|
|
|
ub->hdr.peer = cl->id.id;
|
2011-01-31 02:41:32 +01:00
|
|
|
blob_buf_init(&b, 0);
|
2015-04-25 10:10:34 +02:00
|
|
|
|
|
|
|
ubusd_forward_invoke(cl, obj, method, ub, attr[UBUS_ATTR_DATA]);
|
2011-01-31 02:41:32 +01:00
|
|
|
|
2012-12-15 00:32:27 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ubusd_handle_notify(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
|
|
|
|
{
|
|
|
|
struct ubus_object *obj = NULL;
|
|
|
|
struct ubus_subscription *s;
|
|
|
|
struct ubus_id *id;
|
|
|
|
const char *method;
|
|
|
|
bool no_reply = false;
|
|
|
|
void *c;
|
|
|
|
|
|
|
|
if (!attr[UBUS_ATTR_METHOD] || !attr[UBUS_ATTR_OBJID])
|
|
|
|
return UBUS_STATUS_INVALID_ARGUMENT;
|
|
|
|
|
|
|
|
if (attr[UBUS_ATTR_NO_REPLY])
|
|
|
|
no_reply = blob_get_int8(attr[UBUS_ATTR_NO_REPLY]);
|
|
|
|
|
|
|
|
id = ubus_find_id(&objects, blob_get_u32(attr[UBUS_ATTR_OBJID]));
|
|
|
|
if (!id)
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
|
|
|
|
obj = container_of(id, struct ubus_object, id);
|
|
|
|
if (obj->client != cl)
|
|
|
|
return UBUS_STATUS_PERMISSION_DENIED;
|
|
|
|
|
|
|
|
if (!no_reply) {
|
|
|
|
blob_buf_init(&b, 0);
|
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJID, id->id);
|
|
|
|
c = blob_nest_start(&b, UBUS_ATTR_SUBSCRIBERS);
|
|
|
|
list_for_each_entry(s, &obj->subscribers, list) {
|
|
|
|
blob_put_int32(&b, 0, s->subscriber->id.id);
|
|
|
|
}
|
|
|
|
blob_nest_end(&b, c);
|
|
|
|
blob_put_int32(&b, UBUS_ATTR_STATUS, 0);
|
2015-04-25 09:48:09 +02:00
|
|
|
ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
|
2012-12-15 00:32:27 +01:00
|
|
|
}
|
2011-01-31 02:41:32 +01:00
|
|
|
|
|
|
|
ub->hdr.peer = cl->id.id;
|
2012-12-15 00:32:27 +01:00
|
|
|
method = blob_data(attr[UBUS_ATTR_METHOD]);
|
|
|
|
list_for_each_entry(s, &obj->subscribers, list) {
|
|
|
|
blob_buf_init(&b, 0);
|
|
|
|
if (no_reply)
|
|
|
|
blob_put_int8(&b, UBUS_ATTR_NO_REPLY, 1);
|
2015-04-25 10:10:34 +02:00
|
|
|
ubusd_forward_invoke(cl, s->subscriber, method, ub, attr[UBUS_ATTR_DATA]);
|
2012-12-15 00:32:27 +01:00
|
|
|
}
|
2011-01-31 02:41:32 +01:00
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-02-07 02:40:40 +01:00
|
|
|
static struct ubus_client *ubusd_get_client_by_id(uint32_t id)
|
|
|
|
{
|
|
|
|
struct ubus_id *clid;
|
|
|
|
|
|
|
|
clid = ubus_find_id(&clients, id);
|
|
|
|
if (!clid)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return container_of(clid, struct ubus_client, id);
|
|
|
|
}
|
|
|
|
|
2011-01-31 16:32:29 +01:00
|
|
|
static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
|
2011-01-31 02:41:32 +01:00
|
|
|
{
|
2011-01-31 16:25:22 +01:00
|
|
|
struct ubus_object *obj;
|
2011-01-31 02:41:32 +01:00
|
|
|
|
2011-01-31 16:32:29 +01:00
|
|
|
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]))
|
2017-07-05 15:21:22 +02:00
|
|
|
goto out;
|
2011-01-31 02:41:32 +01:00
|
|
|
|
2011-02-06 21:37:37 +01:00
|
|
|
obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
|
2011-02-05 19:53:14 +01:00
|
|
|
if (!obj)
|
2017-07-05 15:21:22 +02:00
|
|
|
goto out;
|
2011-01-31 16:25:22 +01:00
|
|
|
|
|
|
|
if (cl != obj->client)
|
2017-07-05 15:21:22 +02:00
|
|
|
goto out;
|
2011-01-31 16:25:22 +01:00
|
|
|
|
2011-01-31 02:41:32 +01:00
|
|
|
cl = ubusd_get_client_by_id(ub->hdr.peer);
|
|
|
|
if (!cl)
|
2017-07-05 15:21:22 +02:00
|
|
|
goto out;
|
2011-01-31 02:41:32 +01:00
|
|
|
|
2011-02-06 21:37:37 +01:00
|
|
|
ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]);
|
ubusd: don't free messages in ubus_send_msg() anymore
This makes it clear that `ubus_msg_send()` is only
about sending and queue-ing messages, and has nothing
to do with free-ing.
It can be a bit misleading/confusing when trying to go
through the code and make assumptions about whether a
buffer is free'd in ubus_send_msg(), or is free'd outside.
In `ubusd_proto_receive_message()` the `ubus_msg_free()`
is now called before the `if (ret == -1)` check.
That way, all callbacks will have their messages free'd,
which is what's desired, but confusing, because:
* ubusd_handle_invoke() called ubus_msg_free() before returning -1
* ubusd_handle_notify() called ubus_msg_free() before returning -1
* ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1
* ubus_msg_send() would call ubus_msg_send(,,free=false)
* all other callback callers would `ubus_msg_send(,,free=true)`
(free the buffers in ubus_msg_send() )
In all other places, where `ubus_msg_send(,,free=true)`
an explicit `ubus_msg_free()` was added.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-05 15:20:51 +02:00
|
|
|
ubus_msg_send(cl, ub);
|
2017-07-05 15:21:22 +02:00
|
|
|
out:
|
2011-01-31 02:41:32 +01:00
|
|
|
return -1;
|
2011-01-30 23:57:14 +01:00
|
|
|
}
|
|
|
|
|
2012-05-19 21:09:35 +02:00
|
|
|
static int ubusd_handle_add_watch(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
|
|
|
|
{
|
|
|
|
struct ubus_object *obj, *target;
|
|
|
|
|
2012-12-14 13:11:40 +01:00
|
|
|
if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_TARGET])
|
2012-05-19 21:09:35 +02:00
|
|
|
return UBUS_STATUS_INVALID_ARGUMENT;
|
|
|
|
|
|
|
|
obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
|
|
|
|
if (!obj)
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
|
|
|
|
if (cl != obj->client)
|
|
|
|
return UBUS_STATUS_INVALID_ARGUMENT;
|
|
|
|
|
|
|
|
target = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_TARGET]));
|
2016-11-20 16:40:06 +01:00
|
|
|
if (!target || !target->client)
|
2012-05-19 21:09:35 +02:00
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
|
|
|
|
if (cl == target->client)
|
|
|
|
return UBUS_STATUS_INVALID_ARGUMENT;
|
|
|
|
|
2015-04-25 10:10:34 +02:00
|
|
|
if (!target->path.key) {
|
|
|
|
if (strcmp(target->client->user, cl->user) && strcmp(target->client->group, cl->group))
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
} else if (ubusd_acl_check(cl, target->path.key, NULL, UBUS_ACL_SUBSCRIBE)) {
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
2012-12-14 13:11:40 +01:00
|
|
|
ubus_subscribe(obj, target);
|
2012-05-19 21:09:35 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ubusd_handle_remove_watch(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
|
|
|
|
{
|
|
|
|
struct ubus_object *obj;
|
2012-12-13 18:44:15 +01:00
|
|
|
struct ubus_subscription *s;
|
2012-05-19 21:09:35 +02:00
|
|
|
uint32_t id;
|
|
|
|
|
|
|
|
if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_TARGET])
|
|
|
|
return UBUS_STATUS_INVALID_ARGUMENT;
|
|
|
|
|
|
|
|
obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
|
|
|
|
if (!obj)
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
|
|
|
|
if (cl != obj->client)
|
|
|
|
return UBUS_STATUS_INVALID_ARGUMENT;
|
|
|
|
|
|
|
|
id = blob_get_u32(attr[UBUS_ATTR_TARGET]);
|
2012-12-13 18:44:15 +01:00
|
|
|
list_for_each_entry(s, &obj->target_list, target_list) {
|
|
|
|
if (s->target->id.id != id)
|
2012-05-19 21:09:35 +02:00
|
|
|
continue;
|
|
|
|
|
2012-12-13 18:44:15 +01:00
|
|
|
ubus_unsubscribe(s);
|
2012-05-19 21:09:35 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return UBUS_STATUS_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
2010-12-06 03:51:58 +01:00
|
|
|
static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = {
|
|
|
|
[UBUS_MSG_PING] = ubusd_send_pong,
|
2011-02-06 21:33:03 +01:00
|
|
|
[UBUS_MSG_ADD_OBJECT] = ubusd_handle_add_object,
|
2011-02-06 21:41:29 +01:00
|
|
|
[UBUS_MSG_REMOVE_OBJECT] = ubusd_handle_remove_object,
|
2010-12-06 03:51:58 +01:00
|
|
|
[UBUS_MSG_LOOKUP] = ubusd_handle_lookup,
|
2011-01-30 23:57:14 +01:00
|
|
|
[UBUS_MSG_INVOKE] = ubusd_handle_invoke,
|
2011-01-31 16:32:29 +01:00
|
|
|
[UBUS_MSG_STATUS] = ubusd_handle_response,
|
|
|
|
[UBUS_MSG_DATA] = ubusd_handle_response,
|
2012-12-13 18:44:15 +01:00
|
|
|
[UBUS_MSG_SUBSCRIBE] = ubusd_handle_add_watch,
|
|
|
|
[UBUS_MSG_UNSUBSCRIBE] = ubusd_handle_remove_watch,
|
2012-12-15 00:32:27 +01:00
|
|
|
[UBUS_MSG_NOTIFY] = ubusd_handle_notify,
|
2010-12-06 03:51:58 +01:00
|
|
|
};
|
|
|
|
|
2011-02-07 02:54:00 +01:00
|
|
|
void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
|
2010-12-06 03:51:58 +01:00
|
|
|
{
|
|
|
|
ubus_cmd_cb cb = NULL;
|
|
|
|
int ret;
|
2017-06-07 13:09:31 +02:00
|
|
|
struct ubus_msg_buf *retmsg = cl->retmsg;
|
|
|
|
int *retmsg_data = blob_data(blob_data(retmsg->data));
|
2010-12-06 03:51:58 +01:00
|
|
|
|
|
|
|
retmsg->hdr.seq = ub->hdr.seq;
|
|
|
|
retmsg->hdr.peer = ub->hdr.peer;
|
|
|
|
|
|
|
|
if (ub->hdr.type < __UBUS_MSG_LAST)
|
|
|
|
cb = handlers[ub->hdr.type];
|
|
|
|
|
2016-12-19 10:30:36 +01:00
|
|
|
if (ub->hdr.type != UBUS_MSG_STATUS && ub->hdr.type != UBUS_MSG_INVOKE)
|
2014-02-18 15:01:39 +01:00
|
|
|
ubus_msg_close_fd(ub);
|
|
|
|
|
ubusd: don't free messages in ubus_send_msg() anymore
This makes it clear that `ubus_msg_send()` is only
about sending and queue-ing messages, and has nothing
to do with free-ing.
It can be a bit misleading/confusing when trying to go
through the code and make assumptions about whether a
buffer is free'd in ubus_send_msg(), or is free'd outside.
In `ubusd_proto_receive_message()` the `ubus_msg_free()`
is now called before the `if (ret == -1)` check.
That way, all callbacks will have their messages free'd,
which is what's desired, but confusing, because:
* ubusd_handle_invoke() called ubus_msg_free() before returning -1
* ubusd_handle_notify() called ubus_msg_free() before returning -1
* ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1
* ubus_msg_send() would call ubus_msg_send(,,free=false)
* all other callback callers would `ubus_msg_send(,,free=true)`
(free the buffers in ubus_msg_send() )
In all other places, where `ubus_msg_send(,,free=true)`
an explicit `ubus_msg_free()` was added.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-05 15:20:51 +02:00
|
|
|
/* Note: no callback should free the `ub` buffer
|
|
|
|
that's always done right after the callback finishes */
|
2010-12-06 03:51:58 +01:00
|
|
|
if (cb)
|
2011-01-31 16:32:29 +01:00
|
|
|
ret = cb(cl, ub, ubus_parse_msg(ub->data));
|
2010-12-06 03:51:58 +01:00
|
|
|
else
|
|
|
|
ret = UBUS_STATUS_INVALID_COMMAND;
|
|
|
|
|
ubusd: don't free messages in ubus_send_msg() anymore
This makes it clear that `ubus_msg_send()` is only
about sending and queue-ing messages, and has nothing
to do with free-ing.
It can be a bit misleading/confusing when trying to go
through the code and make assumptions about whether a
buffer is free'd in ubus_send_msg(), or is free'd outside.
In `ubusd_proto_receive_message()` the `ubus_msg_free()`
is now called before the `if (ret == -1)` check.
That way, all callbacks will have their messages free'd,
which is what's desired, but confusing, because:
* ubusd_handle_invoke() called ubus_msg_free() before returning -1
* ubusd_handle_notify() called ubus_msg_free() before returning -1
* ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1
* ubus_msg_send() would call ubus_msg_send(,,free=false)
* all other callback callers would `ubus_msg_send(,,free=true)`
(free the buffers in ubus_msg_send() )
In all other places, where `ubus_msg_send(,,free=true)`
an explicit `ubus_msg_free()` was added.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-05 15:20:51 +02:00
|
|
|
ubus_msg_free(ub);
|
|
|
|
|
2011-01-31 02:41:32 +01:00
|
|
|
if (ret == -1)
|
|
|
|
return;
|
|
|
|
|
2010-12-06 03:51:58 +01:00
|
|
|
*retmsg_data = htonl(ret);
|
ubusd: don't free messages in ubus_send_msg() anymore
This makes it clear that `ubus_msg_send()` is only
about sending and queue-ing messages, and has nothing
to do with free-ing.
It can be a bit misleading/confusing when trying to go
through the code and make assumptions about whether a
buffer is free'd in ubus_send_msg(), or is free'd outside.
In `ubusd_proto_receive_message()` the `ubus_msg_free()`
is now called before the `if (ret == -1)` check.
That way, all callbacks will have their messages free'd,
which is what's desired, but confusing, because:
* ubusd_handle_invoke() called ubus_msg_free() before returning -1
* ubusd_handle_notify() called ubus_msg_free() before returning -1
* ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1
* ubus_msg_send() would call ubus_msg_send(,,free=false)
* all other callback callers would `ubus_msg_send(,,free=true)`
(free the buffers in ubus_msg_send() )
In all other places, where `ubus_msg_send(,,free=true)`
an explicit `ubus_msg_free()` was added.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-05 15:20:51 +02:00
|
|
|
ubus_msg_send(cl, retmsg);
|
2010-12-06 03:51:58 +01:00
|
|
|
}
|
|
|
|
|
2017-06-07 13:09:31 +02:00
|
|
|
static int ubusd_proto_init_retmsg(struct ubus_client *cl)
|
|
|
|
{
|
|
|
|
struct blob_buf *b = &cl->b;
|
|
|
|
|
|
|
|
blob_buf_init(&cl->b, 0);
|
|
|
|
blob_put_int32(&cl->b, UBUS_ATTR_STATUS, 0);
|
|
|
|
|
|
|
|
/* we make the 'retmsg' buffer shared with the blob_buf b, to reduce mem duplication */
|
|
|
|
cl->retmsg = ubus_msg_new(b->head, blob_raw_len(b->head), true);
|
|
|
|
if (!cl->retmsg)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
cl->retmsg->hdr.type = UBUS_MSG_STATUS;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-02-07 02:54:00 +01:00
|
|
|
struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
|
|
|
|
{
|
|
|
|
struct ubus_client *cl;
|
|
|
|
|
|
|
|
cl = calloc(1, sizeof(*cl));
|
|
|
|
if (!cl)
|
|
|
|
return NULL;
|
|
|
|
|
2015-04-25 10:10:34 +02:00
|
|
|
if (ubusd_acl_init_client(cl, fd))
|
|
|
|
goto free;
|
|
|
|
|
2011-02-07 02:54:00 +01:00
|
|
|
INIT_LIST_HEAD(&cl->objects);
|
|
|
|
cl->sock.fd = fd;
|
|
|
|
cl->sock.cb = cb;
|
2014-02-18 15:01:39 +01:00
|
|
|
cl->pending_msg_fd = -1;
|
2011-02-07 02:54:00 +01:00
|
|
|
|
|
|
|
if (!ubus_alloc_id(&clients, &cl->id, 0))
|
|
|
|
goto free;
|
|
|
|
|
2017-06-07 13:09:31 +02:00
|
|
|
if (ubusd_proto_init_retmsg(cl))
|
|
|
|
goto free;
|
|
|
|
|
2011-02-07 02:54:00 +01:00
|
|
|
if (!ubusd_send_hello(cl))
|
|
|
|
goto delete;
|
|
|
|
|
|
|
|
return cl;
|
|
|
|
|
|
|
|
delete:
|
|
|
|
ubus_free_id(&clients, &cl->id);
|
|
|
|
free:
|
|
|
|
free(cl);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ubusd_proto_free_client(struct ubus_client *cl)
|
|
|
|
{
|
|
|
|
struct ubus_object *obj;
|
|
|
|
|
|
|
|
while (!list_empty(&cl->objects)) {
|
|
|
|
obj = list_first_entry(&cl->objects, struct ubus_object, list);
|
|
|
|
ubusd_free_object(obj);
|
|
|
|
}
|
2017-06-07 13:09:31 +02:00
|
|
|
ubus_msg_free(cl->retmsg);
|
|
|
|
blob_buf_free(&cl->b);
|
2011-02-07 02:54:00 +01:00
|
|
|
|
2016-01-26 10:10:39 +01:00
|
|
|
ubusd_acl_free_client(cl);
|
2011-02-07 02:54:00 +01:00
|
|
|
ubus_free_id(&clients, &cl->id);
|
|
|
|
}
|
|
|
|
|
2012-12-14 13:00:49 +01:00
|
|
|
void ubus_notify_subscription(struct ubus_object *obj)
|
|
|
|
{
|
|
|
|
bool active = !list_empty(&obj->subscribers);
|
|
|
|
struct ubus_msg_buf *ub;
|
|
|
|
|
|
|
|
blob_buf_init(&b, 0);
|
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
|
|
|
|
blob_put_int8(&b, UBUS_ATTR_ACTIVE, active);
|
|
|
|
|
|
|
|
ub = ubus_msg_from_blob(false);
|
2015-04-13 18:18:36 +02:00
|
|
|
if (!ub)
|
|
|
|
return;
|
|
|
|
|
2012-12-14 13:00:49 +01:00
|
|
|
ubus_msg_init(ub, UBUS_MSG_NOTIFY, ++obj->invoke_seq, 0);
|
ubusd: don't free messages in ubus_send_msg() anymore
This makes it clear that `ubus_msg_send()` is only
about sending and queue-ing messages, and has nothing
to do with free-ing.
It can be a bit misleading/confusing when trying to go
through the code and make assumptions about whether a
buffer is free'd in ubus_send_msg(), or is free'd outside.
In `ubusd_proto_receive_message()` the `ubus_msg_free()`
is now called before the `if (ret == -1)` check.
That way, all callbacks will have their messages free'd,
which is what's desired, but confusing, because:
* ubusd_handle_invoke() called ubus_msg_free() before returning -1
* ubusd_handle_notify() called ubus_msg_free() before returning -1
* ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1
* ubus_msg_send() would call ubus_msg_send(,,free=false)
* all other callback callers would `ubus_msg_send(,,free=true)`
(free the buffers in ubus_msg_send() )
In all other places, where `ubus_msg_send(,,free=true)`
an explicit `ubus_msg_free()` was added.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-05 15:20:51 +02:00
|
|
|
ubus_msg_send(obj->client, ub);
|
|
|
|
ubus_msg_free(ub);
|
2012-12-14 13:00:49 +01:00
|
|
|
}
|
|
|
|
|
2012-12-13 18:44:15 +01:00
|
|
|
void ubus_notify_unsubscribe(struct ubus_subscription *s)
|
2012-05-19 21:09:35 +02:00
|
|
|
{
|
|
|
|
struct ubus_msg_buf *ub;
|
|
|
|
|
|
|
|
blob_buf_init(&b, 0);
|
2012-12-13 18:44:15 +01:00
|
|
|
blob_put_int32(&b, UBUS_ATTR_OBJID, s->subscriber->id.id);
|
|
|
|
blob_put_int32(&b, UBUS_ATTR_TARGET, s->target->id.id);
|
2012-05-19 21:09:35 +02:00
|
|
|
|
|
|
|
ub = ubus_msg_from_blob(false);
|
2015-04-13 18:18:36 +02:00
|
|
|
if (ub != NULL) {
|
|
|
|
ubus_msg_init(ub, UBUS_MSG_UNSUBSCRIBE, ++s->subscriber->invoke_seq, 0);
|
ubusd: don't free messages in ubus_send_msg() anymore
This makes it clear that `ubus_msg_send()` is only
about sending and queue-ing messages, and has nothing
to do with free-ing.
It can be a bit misleading/confusing when trying to go
through the code and make assumptions about whether a
buffer is free'd in ubus_send_msg(), or is free'd outside.
In `ubusd_proto_receive_message()` the `ubus_msg_free()`
is now called before the `if (ret == -1)` check.
That way, all callbacks will have their messages free'd,
which is what's desired, but confusing, because:
* ubusd_handle_invoke() called ubus_msg_free() before returning -1
* ubusd_handle_notify() called ubus_msg_free() before returning -1
* ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1
* ubus_msg_send() would call ubus_msg_send(,,free=false)
* all other callback callers would `ubus_msg_send(,,free=true)`
(free the buffers in ubus_msg_send() )
In all other places, where `ubus_msg_send(,,free=true)`
an explicit `ubus_msg_free()` was added.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-05 15:20:51 +02:00
|
|
|
ubus_msg_send(s->subscriber->client, ub);
|
|
|
|
ubus_msg_free(ub);
|
2015-04-13 18:18:36 +02:00
|
|
|
}
|
2012-05-19 21:09:35 +02:00
|
|
|
|
2012-12-13 18:44:15 +01:00
|
|
|
ubus_unsubscribe(s);
|
2012-05-19 21:09:35 +02:00
|
|
|
}
|
|
|
|
|
2014-09-17 12:30:49 +02:00
|
|
|
static void __constructor ubusd_proto_init(void)
|
2010-12-06 03:51:58 +01:00
|
|
|
{
|
2011-02-07 02:54:00 +01:00
|
|
|
ubus_init_id_tree(&clients);
|
2010-12-06 03:51:58 +01:00
|
|
|
}
|