+/*
+ * Copyright (C) 2011 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>
#include <signal.h>
#include <stdio.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);
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);
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);
uloop_fd_delete(&cl->sock);
close(cl->sock.fd);
free(cl);
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 */
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)
signal(SIGPIPE, SIG_IGN);
- ubus_init_id_tree(&clients);
-
uloop_init();
while ((ch = getopt(argc, argv, "s:")) != -1) {
}
unlink(ubus_socket);
+ umask(0177);
server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, ubus_socket, NULL);
if (server_fd.fd < 0) {
perror("usock");