/*
- * 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
*/
#include <arpa/inet.h>
+#include <unistd.h>
+
#include "ubusd.h"
struct blob_buf b;
[UBUS_ATTR_METHOD] = { .type = BLOB_ATTR_STRING },
};
-static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
+struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
{
blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
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;
return new;
}
-static void
-ubus_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
+void
+ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
uint8_t type)
{
ub = ubus_reply_from_blob(ub, true);
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
ubusd_free_object(obj);
- ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+ ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
return 0;
}
if (attr[UBUS_ATTR_SIGNATURE])
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
- ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+ ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
return 0;
}
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);
if (data)
blob_put(&b, UBUS_ATTR_DATA, blob_data(data), blob_len(data));
- ubus_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
+ ubus_proto_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
}
static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
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);
}
blob_nest_end(&b, c);
blob_put_int32(&b, UBUS_ATTR_STATUS, 0);
- ubus_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
+ ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
}
ub->hdr.peer = cl->id.id;
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
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;
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);
}
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);