ubus: Correct usage of timeout on poll function

[project/ubus.git] / ubusd.c

diff --git a/ubusd.c b/ubusd.c
index c9cf8b6..6629720 100644 (file)
--- a/ubusd.c
+++ b/ubusd.c
@@ -136,6 +136,9 @@ void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free)
 {
        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))
@@ -179,6 +182,7 @@ static void handle_client_disconnect(struct ubus_client *cl)
        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);
@@ -242,7 +246,7 @@ retry:
 
                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) {
@@ -297,6 +301,7 @@ retry:
                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;
        }
@@ -356,6 +361,11 @@ static int usage(const char *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;
@@ -363,6 +373,7 @@ int main(int argc, char **argv)
        int ch;
 
        signal(SIGPIPE, SIG_IGN);
+       signal(SIGHUP, sighup_handler);
 
        openlog("ubusd", LOG_PID, LOG_DAEMON);
        uloop_init();
@@ -378,7 +389,7 @@ int main(int argc, char **argv)
        }
 
        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");
@@ -386,6 +397,7 @@ int main(int argc, char **argv)
                goto out;
        }
        uloop_fd_add(&server_fd, ULOOP_READ | ULOOP_EDGE_TRIGGER);
+       ubusd_acl_load();
 
        uloop_run();
        unlink(ubus_socket);