projects
/
project
/
ubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libubus: restore uloop_cancelled on timeout
[project/ubus.git]
/
ubusd_proto.c
diff --git
a/ubusd_proto.c
b/ubusd_proto.c
index
fd38dbd
..
130e9a8
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
*
* 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 <arpa/inet.h>
+#include <unistd.h>
+
#include "ubusd.h"
struct blob_buf b;
#include "ubusd.h"
struct blob_buf b;
@@
-38,6
+40,15
@@
static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
return attrbuf;
}
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;
static void ubus_msg_init(struct ubus_msg_buf *ub, uint8_t type, uint16_t seq, uint32_t peer)
{
ub->hdr.version = 0;
@@
-154,7
+165,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)
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)
);
+ blob
msg_add_blob(&b, m->data
);
blob_nest_end(&b, s);
ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
blob_nest_end(&b, s);
ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
@@
-409,6
+420,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_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
if (cb)
ret = cb(cl, ub, ubus_parse_msg(ub->data));
else
@@
-434,6
+448,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;
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;
if (!ubus_alloc_id(&clients, &cl->id, 0))
goto free;