/*
- * 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;
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;
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;