+/*
+ * 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
+ * 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.
+ */
+
#include <sys/socket.h>
+#include <sys/stat.h>
#include <sys/uio.h>
+#ifdef FreeBSD
+#include <sys/param.h>
+#endif
+#include <syslog.h>
#include <signal.h>
#include <stdio.h>
#include <unistd.h>
#include "ubusd.h"
-static struct avl_tree clients;
-
-static struct ubus_msg_buf *ubus_msg_unshare(struct ubus_msg_buf *ub)
-{
- ub = realloc(ub, sizeof(*ub) + ub->len);
- if (!ub)
- return NULL;
-
- ub->refcount = 1;
- memcpy(ub + 1, ub->data, ub->len);
- ub->data = (void *) (ub + 1);
- return ub;
-}
-
-struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub)
+static struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub)
{
if (ub->refcount == ~0)
- return ubus_msg_unshare(ub);
+ return ubus_msg_new(ub->data, ub->len, false);
ub->refcount++;
return ub;
if (!ub)
return NULL;
+ ub->fd = -1;
+
if (shared) {
ub->refcount = ~0;
ub->data = data;
switch (ub->refcount) {
case 1:
case ~0:
+ if (ub->fd >= 0)
+ close(ub->fd);
+
free(ub);
break;
default:
static int ubus_msg_writev(int fd, struct ubus_msg_buf *ub, int offset)
{
- struct iovec iov[2];
+ static struct iovec iov[2];
+ static struct {
+ struct cmsghdr h;
+ int fd;
+ } fd_buf = {
+ .h = {
+ .cmsg_len = sizeof(fd_buf),
+ .cmsg_level = SOL_SOCKET,
+ .cmsg_type = SCM_RIGHTS,
+ },
+ };
+ struct msghdr msghdr = {
+ .msg_iov = iov,
+ .msg_iovlen = ARRAY_SIZE(iov),
+ .msg_control = &fd_buf,
+ .msg_controllen = sizeof(fd_buf),
+ };
+
+ fd_buf.fd = ub->fd;
+ if (ub->fd < 0) {
+ msghdr.msg_control = NULL;
+ msghdr.msg_controllen = 0;
+ }
if (offset < sizeof(ub->hdr)) {
iov[0].iov_base = ((char *) &ub->hdr) + offset;
iov[0].iov_len = sizeof(ub->hdr) - offset;
iov[1].iov_base = (char *) ub->data;
iov[1].iov_len = ub->len;
- return writev(fd, iov, 2);
+
+ return sendmsg(fd, &msghdr, 0);
} else {
offset -= sizeof(ub->hdr);
return write(fd, ((char *) ub->data) + offset, ub->len - offset);
static void handle_client_disconnect(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);
- }
-
while (ubus_msg_head(cl))
ubus_msg_dequeue(cl);
- ubus_free_id(&clients, &cl->id);
+ ubusd_proto_free_client(cl);
+ if (cl->pending_msg_fd >= 0)
+ close(cl->pending_msg_fd);
uloop_fd_delete(&cl->sock);
close(cl->sock.fd);
free(cl);
{
struct ubus_client *cl = container_of(sock, struct ubus_client, sock);
struct ubus_msg_buf *ub;
+ static struct iovec iov;
+ static struct {
+ struct cmsghdr h;
+ int fd;
+ } fd_buf = {
+ .h = {
+ .cmsg_type = SCM_RIGHTS,
+ .cmsg_level = SOL_SOCKET,
+ .cmsg_len = sizeof(fd_buf),
+ }
+ };
+ struct msghdr msghdr = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
/* first try to tx more pending data */
while ((ub = ubus_msg_head(cl))) {
int offset = cl->pending_msg_offset;
int bytes;
- bytes = read(sock->fd, (char *)&cl->hdrbuf + offset, sizeof(cl->hdrbuf) - offset);
+ fd_buf.fd = -1;
+
+ iov.iov_base = &cl->hdrbuf + offset;
+ iov.iov_len = sizeof(cl->hdrbuf) - offset;
+
+ if (cl->pending_msg_fd < 0) {
+ msghdr.msg_control = &fd_buf;
+ msghdr.msg_controllen = sizeof(fd_buf);
+ } else {
+ msghdr.msg_control = NULL;
+ msghdr.msg_controllen = 0;
+ }
+
+ bytes = recvmsg(sock->fd, &msghdr, 0);
if (bytes < 0)
goto out;
+ if (fd_buf.fd >= 0)
+ cl->pending_msg_fd = fd_buf.fd;
+
cl->pending_msg_offset += bytes;
if (cl->pending_msg_offset < sizeof(cl->hdrbuf))
goto out;
- if (blob_len(&cl->hdrbuf.data) + sizeof(cl->hdrbuf) > UBUS_MAX_MSGLEN)
+ if (blob_pad_len(&cl->hdrbuf.data) > UBUS_MAX_MSGLEN)
goto disconnect;
cl->pending_msg = ubus_msg_new(NULL, blob_raw_len(&cl->hdrbuf.data), false);
}
/* accept message */
+ ub->fd = cl->pending_msg_fd;
+ cl->pending_msg_fd = -1;
cl->pending_msg_offset = 0;
cl->pending_msg = NULL;
- ubusd_receive_message(cl, ub);
+ ubusd_proto_receive_message(cl, ub);
goto retry;
}
handle_client_disconnect(cl);
}
-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);
-}
-
static bool get_next_connection(int fd)
{
struct ubus_client *cl;
}
}
- cl = calloc(1, sizeof(*cl));
- cl->sock.fd = client_fd;
-
- INIT_LIST_HEAD(&cl->objects);
- if (!ubus_alloc_id(&clients, &cl->id, 0))
- goto error;
-
- cl->sock.cb = client_cb;
- uloop_fd_add(&cl->sock, ULOOP_READ | ULOOP_EDGE_TRIGGER);
- if (!ubusd_send_hello(cl))
- goto error_free;
+ cl = ubusd_proto_new_client(client_fd, client_cb);
+ if (cl)
+ uloop_fd_add(&cl->sock, ULOOP_READ | ULOOP_EDGE_TRIGGER);
+ else
+ close(client_fd);
return true;
-
-error_free:
- ubus_free_id(&clients, &cl->id);
-error:
- close(cl->sock.fd);
- free(cl);
- return true;
}
static void server_cb(struct uloop_fd *fd, unsigned int events)
return 1;
}
+static void sighup_handler(int sig)
+{
+ ubusd_acl_load();
+}
+
int main(int argc, char **argv)
{
const char *ubus_socket = UBUS_UNIX_SOCKET;
int ch;
signal(SIGPIPE, SIG_IGN);
+ signal(SIGHUP, sighup_handler);
- ubus_init_id_tree(&clients);
-
+ openlog("ubusd", LOG_PID, LOG_DAEMON);
uloop_init();
while ((ch = getopt(argc, argv, "s:")) != -1) {
}
unlink(ubus_socket);
+ umask(0111);
server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, ubus_socket, NULL);
if (server_fd.fd < 0) {
perror("usock");
goto out;
}
uloop_fd_add(&server_fd, ULOOP_READ | ULOOP_EDGE_TRIGGER);
+ ubusd_acl_load();
uloop_run();
+ unlink(ubus_socket);
out:
uloop_done();
projects / project / ubus.git / blobdiff