#ifdef FreeBSD
#include <sys/param.h>
#endif
+#include <syslog.h>
#include <signal.h>
#include <stdio.h>
#include <unistd.h>
#include "ubusd.h"
-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;
-}
-
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;
{
int written;
+ if (ub->hdr.type != UBUS_MSG_MONITOR)
+ ubusd_monitor_message(cl, ub, true);
+
if (!cl->tx_queue[cl->txq_cur]) {
written = ubus_msg_writev(cl->sock.fd, ub, 0);
if (written >= ub->len + sizeof(ub->hdr))
while (ubus_msg_head(cl))
ubus_msg_dequeue(cl);
+ ubusd_monitor_disconnect(cl);
ubusd_proto_free_client(cl);
if (cl->pending_msg_fd >= 0)
close(cl->pending_msg_fd);
fd_buf.fd = -1;
- iov.iov_base = &cl->hdrbuf + offset;
+ iov.iov_base = ((char *) &cl->hdrbuf) + offset;
iov.iov_len = sizeof(cl->hdrbuf) - offset;
if (cl->pending_msg_fd < 0) {
cl->pending_msg_fd = -1;
cl->pending_msg_offset = 0;
cl->pending_msg = NULL;
+ ubusd_monitor_message(cl, ub, false);
ubusd_proto_receive_message(cl, ub);
goto retry;
}
{
fprintf(stderr, "Usage: %s [<options>]\n"
"Options: \n"
+ " -A <path>: Set the path to ACL files\n"
" -s <socket>: Set the unix domain socket to listen on\n"
"\n", progname);
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);
+ openlog("ubusd", LOG_PID, LOG_DAEMON);
uloop_init();
- while ((ch = getopt(argc, argv, "s:")) != -1) {
+ while ((ch = getopt(argc, argv, "A:s:")) != -1) {
switch (ch) {
case 's':
ubus_socket = optarg;
break;
+ case 'A':
+ ubusd_acl_dir = optarg;
+ break;
default:
return usage(argv[0]);
}
}
unlink(ubus_socket);
- umask(0177);
+ 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);