chiark / gitweb /
bus-proxy: turn into multi-threaded daemon
[elogind.git] / src / bus-proxyd / bus-proxyd.c
index a425fd2facf764f281dcc1549c5cf83304304cb5..702f021a6bdcfed8df3082e4a7a53394b80fc546 100644 (file)
@@ -4,6 +4,9 @@
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering
+  Copyright 2013 Daniel Mack
+  Copyright 2014 Kay Sievers
+  Copyright 2015 David Herrmann
 
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
 #include <sys/poll.h>
 #include <stddef.h>
 #include <getopt.h>
+#include <pthread.h>
 
 #include "log.h"
 #include "util.h"
+#include "hashmap.h"
 #include "socket-util.h"
 #include "sd-daemon.h"
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "build.h"
 #include "strv.h"
-
-#define UNIX_BUS_PATH "unix:path=/run/dbus/system_bus_socket"
-#define KERNEL_BUS_PATH "kernel:path=/dev/kdbus/0-system/bus"
-
-#ifdef ENABLE_KDBUS
-#  define DEFAULT_BUS_PATH KERNEL_BUS_PATH ";" UNIX_BUS_PATH
-#else
-#  define DEFAULT_BUS_PATH UNIX_BUS_PATH
-#endif
-
-static const char *arg_address = DEFAULT_BUS_PATH;
-static char *arg_command_line_buffer = NULL;
-
-static int help(void) {
-
-        printf("%s [OPTIONS...]\n\n"
-               "Connect STDIO or a socket to a given bus address.\n\n"
-               "  -h --help              Show this help\n"
-               "     --version           Show package version\n"
-               "     --address=ADDRESS   Connect to the bus specified by ADDRESS\n"
-               "                         (default: " DEFAULT_BUS_PATH ")\n",
-               program_invocation_short_name);
-
-        return 0;
+#include "def.h"
+#include "capability.h"
+#include "bus-control.h"
+#include "smack-util.h"
+#include "set.h"
+#include "bus-xml-policy.h"
+#include "driver.h"
+#include "proxy.h"
+#include "synthesize.h"
+
+static char *arg_address = NULL;
+static char **arg_configuration = NULL;
+
+typedef struct {
+        int fd;
+} ClientContext;
+
+static ClientContext *client_context_free(ClientContext *c) {
+        if (!c)
+                return NULL;
+
+        close(c->fd);
+        free(c);
+
+        return NULL;
 }
 
-static int parse_argv(int argc, char *argv[]) {
-
-        enum {
-                ARG_VERSION = 0x100,
-                ARG_ADDRESS,
-        };
-
-        static const struct option options[] = {
-                { "help",       no_argument,       NULL, 'h'            },
-                { "version",    no_argument,       NULL, ARG_VERSION    },
-                { "address",    required_argument, NULL, ARG_ADDRESS    },
-                { NULL,         0,                 NULL, 0              }
-        };
-
-        int c;
-
-        assert(argc >= 0);
-        assert(argv);
-
-        while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {
-
-                switch (c) {
-
-                case 'h':
-                        help();
-                        return 0;
+DEFINE_TRIVIAL_CLEANUP_FUNC(ClientContext*, client_context_free);
 
-                case ARG_VERSION:
-                        puts(PACKAGE_STRING);
-                        puts(SYSTEMD_FEATURES);
-                        return 0;
+static int client_context_new(ClientContext **out, int fd) {
+        _cleanup_(client_context_freep) ClientContext *c = NULL;
 
-                case ARG_ADDRESS:
-                        arg_address = optarg;
-                        break;
-
-                case '?':
-                        return -EINVAL;
-
-                default:
-                        assert_not_reached("Unhandled option");
-                }
-        }
+        c = new0(ClientContext, 1);
+        if (!c)
+                return log_oom();
 
-        /* If the first command line argument is only "x" characters
-         * we'll write who we are talking to into it, so that "ps" is
-         * explanatory */
-        arg_command_line_buffer = argv[optind];
-        if (argc > optind + 1 ||
-            (arg_command_line_buffer && arg_command_line_buffer[strspn(arg_command_line_buffer, "x")] != 0)) {
-                log_error("Too many arguments");
-                return -EINVAL;
-        }
+        c->fd = fd;
 
-        return 1;
+        *out = c;
+        c = NULL;
+        return 0;
 }
 
-static int rename_service(sd_bus *b) {
-        _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
-        _cleanup_free_ char *p = NULL, *name = NULL;
-        const char *comm;
-        char **cmdline;
-        uid_t uid;
-        pid_t pid;
+static void *run_client(void *userdata) {
+        _cleanup_(client_context_freep) ClientContext *c = userdata;
+        _cleanup_(proxy_freep) Proxy *p = NULL;
         int r;
 
-        assert(b);
-
-        r = sd_bus_get_peer_creds(b, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_CMDLINE|SD_BUS_CREDS_COMM, &creds);
+        r = proxy_new(&p, c->fd, c->fd, arg_address);
         if (r < 0)
-                return r;
+                goto exit;
 
-        r = sd_bus_creds_get_uid(creds, &uid);
+        r = proxy_load_policy(p, arg_configuration);
         if (r < 0)
-                return r;
+                goto exit;
 
-        r = sd_bus_creds_get_pid(creds, &pid);
+        r = proxy_hello_policy(p, getuid());
         if (r < 0)
-                return r;
+                goto exit;
 
-        r = sd_bus_creds_get_cmdline(creds, &cmdline);
-        if (r < 0)
-                return r;
+        r = proxy_run(p);
 
-        r = sd_bus_creds_get_comm(creds, &comm);
-        if (r < 0)
-                return r;
-
-        name = uid_to_name(uid);
-        if (!name)
-                return -ENOMEM;
-
-        p = strv_join(cmdline, " ");
-        if (!p)
-                return -ENOMEM;
-
-        /* The status string gets the full command line ... */
-        sd_notifyf(false,
-                   "STATUS=Processing requests from client PID %lu (%s); UID %lu (%s)",
-                   (unsigned long) pid, p,
-                   (unsigned long) uid, name);
-
-        /* ... and the argv line only the short comm */
-        if (arg_command_line_buffer) {
-                size_t m, w;
-
-                m = strlen(arg_command_line_buffer);
-                w = snprintf(arg_command_line_buffer, m,
-                             "[PID %lu/%s; UID %lu/%s]",
-                             (unsigned long) pid, comm,
-                             (unsigned long) uid, name);
-
-                if (m > w)
-                        memset(arg_command_line_buffer + w, 0, m - w);
-        }
-
-        return 0;
+exit:
+        return NULL;
 }
 
-static int synthesize_name_acquired(sd_bus *a, sd_bus *b, sd_bus_message *m) {
-        _cleanup_bus_message_unref_ sd_bus_message *n = NULL;
-        const char *name, *old_owner, *new_owner;
+static int loop_clients(int accept_fd) {
+        pthread_attr_t attr;
         int r;
 
-        assert(a);
-        assert(b);
-        assert(m);
-
-        /* If we get NameOwnerChanged for our own name, we need to
-         * synthesize NameLost/NameAcquired, since socket clients need
-         * that, even though it is obsoleted on kdbus */
-
-        if (!a->is_kernel)
-                return 0;
+        r = pthread_attr_init(&attr);
+        if (r < 0) {
+                r = log_error_errno(errno, "Cannot initialize pthread attributes: %m");
+                goto exit;
+        }
 
-        if (!sd_bus_message_is_signal(m, "org.freedesktop.DBus", "NameOwnerChanged") ||
-            !streq_ptr(m->path, "/org/freedesktop/DBus") ||
-            !streq_ptr(m->sender, "org.freedesktop.DBus"))
-                return 0;
+        r = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+        if (r < 0) {
+                r = log_error_errno(errno, "Cannot mark pthread attributes as detached: %m");
+                goto exit_attr;
+        }
 
-        r = sd_bus_message_read(m, "sss", &name, &old_owner, &new_owner);
-        if (r < 0)
-                return r;
+        for (;;) {
+                ClientContext *c;
+                pthread_t tid;
+                int fd;
 
-        r = sd_bus_message_rewind(m, true);
-        if (r < 0)
-                return r;
+                fd = accept4(accept_fd, NULL, NULL, SOCK_NONBLOCK | SOCK_CLOEXEC);
+                if (fd < 0) {
+                        if (errno == EAGAIN || errno == EINTR)
+                                continue;
 
-        if (streq(old_owner, a->unique_name)) {
+                        r = log_error_errno(errno, "accept4() failed: %m");
+                        break;
+                }
 
-                r = sd_bus_message_new_signal(
-                                b,
-                                "/org/freedesktop/DBus",
-                                "org.freedesktop.DBus",
-                                "NameLost",
-                                &n);
+                r = client_context_new(&c, fd);
+                if (r < 0) {
+                        log_oom();
+                        close(fd);
+                        continue;
+                }
 
-        } else if (streq(new_owner, a->unique_name)) {
+                r = pthread_create(&tid, &attr, run_client, c);
+                if (r < 0) {
+                        log_error("Cannot spawn thread: %m");
+                        client_context_free(c);
+                        continue;
+                }
+        }
 
-                r = sd_bus_message_new_signal(
-                                b,
-                                "/org/freedesktop/DBus",
-                                "org.freedesktop.DBus",
-                                "NameAcquired",
-                                &n);
-        } else
-                return 0;
+exit_attr:
+        pthread_attr_destroy(&attr);
+exit:
+        return r;
+}
 
-        if (r < 0)
-                return r;
+static int help(void) {
 
-        r = sd_bus_message_append(n, "s", name);
-        if (r < 0)
-                return r;
+        printf("%s [OPTIONS...]\n\n"
+               "DBus proxy server.\n\n"
+               "  -h --help               Show this help\n"
+               "     --version            Show package version\n"
+               "     --configuration=PATH Configuration file or directory\n"
+               "     --machine=MACHINE    Connect to specified machine\n"
+               "     --address=ADDRESS    Connect to the bus specified by ADDRESS\n"
+               "                          (default: " DEFAULT_SYSTEM_BUS_ADDRESS ")\n",
+               program_invocation_short_name);
 
-        r = bus_message_append_sender(n, "org.freedesktop.DBus");
-        if (r < 0)
-                return r;
+        return 0;
+}
 
-        r = bus_seal_synthetic_message(b, n);
-        if (r < 0)
-                return r;
+static int parse_argv(int argc, char *argv[]) {
 
-        return sd_bus_send(b, n, NULL);
-}
+        enum {
+                ARG_VERSION = 0x100,
+                ARG_ADDRESS,
+                ARG_CONFIGURATION,
+                ARG_MACHINE,
+        };
 
-static int process_hello(sd_bus *a, sd_bus *b, sd_bus_message *m, bool *got_hello) {
-        _cleanup_bus_message_unref_ sd_bus_message *n = NULL;
-        bool is_hello;
-        int r;
+        static const struct option options[] = {
+                { "help",            no_argument,       NULL, 'h'                 },
+                { "version",         no_argument,       NULL, ARG_VERSION         },
+                { "address",         required_argument, NULL, ARG_ADDRESS         },
+                { "configuration",   required_argument, NULL, ARG_CONFIGURATION   },
+                { "machine",         required_argument, NULL, ARG_MACHINE         },
+                {},
+        };
 
-        assert(a);
-        assert(b);
-        assert(m);
-        assert(got_hello);
+        int c, r;
 
-        /* As reaction to hello we need to respond with two messages:
-         * the callback reply and the NameAcquired for the unique
-         * name, since hello is otherwise obsolete on kdbus. */
+        assert(argc >= 0);
+        assert(argv);
 
-        is_hello =
-                sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "Hello") &&
-                streq_ptr(m->destination, "org.freedesktop.DBus");
+        while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
 
-        if (!is_hello) {
+                switch (c) {
 
-                if (*got_hello)
+                case 'h':
+                        help();
                         return 0;
 
-                log_error("First packet isn't hello (it's %s.%s), aborting.", m->interface, m->member);
-                return -EIO;
-        }
+                case ARG_VERSION:
+                        puts(PACKAGE_STRING);
+                        puts(SYSTEMD_FEATURES);
+                        return 0;
 
-        if (*got_hello) {
-                log_error("Got duplicate hello, aborting.");
-                return -EIO;
-        }
+                case ARG_ADDRESS: {
+                        char *a;
 
-        *got_hello = true;
+                        a = strdup(optarg);
+                        if (!a)
+                                return log_oom();
 
-        if (!a->is_kernel)
-                return 0;
+                        free(arg_address);
+                        arg_address = a;
+                        break;
+                }
 
-        r = sd_bus_message_new_method_return(m, &n);
-        if (r < 0) {
-                log_error("Failed to generate HELLO reply: %s", strerror(-r));
-                return r;
-        }
+                case ARG_CONFIGURATION:
+                        r = strv_extend(&arg_configuration, optarg);
+                        if (r < 0)
+                                return log_oom();
+                        break;
 
-        r = sd_bus_message_append(n, "s", a->unique_name);
-        if (r < 0) {
-                log_error("Failed to append unique name to HELLO reply: %s", strerror(-r));
-                return r;
-        }
+                case ARG_MACHINE: {
+                        _cleanup_free_ char *e = NULL;
+                        char *a;
 
-        r = bus_message_append_sender(n, "org.freedesktop.DBus");
-        if (r < 0) {
-                log_error("Failed to append sender to HELLO reply: %s", strerror(-r));
-                return r;
-        }
+                        e = bus_address_escape(optarg);
+                        if (!e)
+                                return log_oom();
 
-        r = bus_seal_synthetic_message(b, n);
-        if (r < 0) {
-                log_error("Failed to seal HELLO reply: %s", strerror(-r));
-                return r;
-        }
+#ifdef ENABLE_KDBUS
+                        a = strjoin("x-machine-kernel:machine=", e, ";x-machine-unix:machine=", e, NULL);
+#else
+                        a = strjoin("x-machine-unix:machine=", e, NULL);
+#endif
+                        if (!a)
+                                return log_oom();
 
-        r = sd_bus_send(b, n, NULL);
-        if (r < 0) {
-                log_error("Failed to send HELLO reply: %s", strerror(-r));
-                return r;
-        }
+                        free(arg_address);
+                        arg_address = a;
 
-        n = sd_bus_message_unref(n);
-        r = sd_bus_message_new_signal(
-                        b,
-                        "/org/freedesktop/DBus",
-                        "org.freedesktop.DBus",
-                        "NameAcquired",
-                        &n);
-        if (r < 0) {
-                log_error("Failed to allocate initial NameAcquired message: %s", strerror(-r));
-                return r;
-        }
+                        break;
+                }
 
-        r = sd_bus_message_append(n, "s", a->unique_name);
-        if (r < 0) {
-                log_error("Failed to append unique name to NameAcquired message: %s", strerror(-r));
-                return r;
-        }
+                case '?':
+                        return -EINVAL;
 
-        r = bus_message_append_sender(n, "org.freedesktop.DBus");
-        if (r < 0) {
-                log_error("Failed to append sender to NameAcquired message: %s", strerror(-r));
-                return r;
-        }
+                default:
+                        assert_not_reached("Unhandled option");
+                }
 
-        r = bus_seal_synthetic_message(b, n);
-        if (r < 0) {
-                log_error("Failed to seal NameAcquired message: %s", strerror(-r));
-                return r;
+        if (argc > optind) {
+                log_error("Too many arguments");
+                return -EINVAL;
         }
 
-        r = sd_bus_send(b, n, NULL);
-        if (r < 0) {
-                log_error("Failed to send NameAcquired message: %s", strerror(-r));
-                return r;
+        if (!arg_address) {
+                arg_address = strdup(DEFAULT_SYSTEM_BUS_ADDRESS);
+                if (!arg_address)
+                        return log_oom();
         }
 
         return 1;
 }
 
 int main(int argc, char *argv[]) {
-
-        _cleanup_bus_unref_ sd_bus *a = NULL, *b = NULL;
-        sd_id128_t server_id;
-        int r, in_fd, out_fd;
-        bool got_hello = false;
-        bool is_unix;
+        int r, accept_fd;
 
         log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
         log_parse_environment();
@@ -375,294 +286,27 @@ int main(int argc, char *argv[]) {
                 goto finish;
 
         r = sd_listen_fds(0);
-        if (r == 0) {
-                in_fd = STDIN_FILENO;
-                out_fd = STDOUT_FILENO;
-        } else if (r == 1) {
-                in_fd = SD_LISTEN_FDS_START;
-                out_fd = SD_LISTEN_FDS_START;
-        } else {
-                log_error("Illegal number of file descriptors passed\n");
-                goto finish;
-        }
-
-        is_unix =
-                sd_is_socket(in_fd, AF_UNIX, 0, 0) > 0 &&
-                sd_is_socket(out_fd, AF_UNIX, 0, 0) > 0;
-
-        r = sd_bus_new(&a);
-        if (r < 0) {
-                log_error("Failed to allocate bus: %s", strerror(-r));
-                goto finish;
-        }
-
-        r = sd_bus_set_address(a, arg_address);
-        if (r < 0) {
-                log_error("Failed to set address to connect to: %s", strerror(-r));
-                goto finish;
-        }
-
-        r = sd_bus_negotiate_fds(a, is_unix);
-        if (r < 0) {
-                log_error("Failed to set FD negotiation: %s", strerror(-r));
-                goto finish;
-        }
-
-        r = sd_bus_start(a);
-        if (r < 0) {
-                log_error("Failed to start bus client: %s", strerror(-r));
-                goto finish;
-        }
-
-        r = sd_bus_get_server_id(a, &server_id);
-        if (r < 0) {
-                log_error("Failed to get server ID: %s", strerror(-r));
-                goto finish;
-        }
-
-        r = sd_bus_new(&b);
-        if (r < 0) {
-                log_error("Failed to allocate bus: %s", strerror(-r));
+        if (r != 1) {
+                log_error("Illegal number of file descriptors passed");
                 goto finish;
         }
 
-        r = sd_bus_set_fd(b, in_fd, out_fd);
+        accept_fd = SD_LISTEN_FDS_START;
+        r = fd_nonblock(accept_fd, false);
         if (r < 0) {
-                log_error("Failed to set fds: %s", strerror(-r));
+                log_error_errno(r, "Cannot mark accept-fd non-blocking: %m");
                 goto finish;
         }
 
-        r = sd_bus_set_server(b, 1, server_id);
-        if (r < 0) {
-                log_error("Failed to set server mode: %s", strerror(-r));
-                goto finish;
-        }
-
-        r = sd_bus_negotiate_fds(b, is_unix);
-        if (r < 0) {
-                log_error("Failed to set FD negotiation: %s", strerror(-r));
-                goto finish;
-        }
-
-        r = sd_bus_set_anonymous(b, true);
-        if (r < 0) {
-                log_error("Failed to set anonymous authentication: %s", strerror(-r));
-                goto finish;
-        }
-
-        r = sd_bus_start(b);
-        if (r < 0) {
-                log_error("Failed to start bus client: %s", strerror(-r));
-                goto finish;
-        }
-
-        r = rename_service(b);
-        if (r < 0)
-                log_debug("Failed to rename process: %s", strerror(-r));
-
-        if (a->is_kernel) {
-                _cleanup_free_ char *match = NULL;
-                const char *unique;
-
-                r = sd_bus_get_unique_name(a, &unique);
-                if (r < 0) {
-                        log_error("Failed to get unique name: %s", strerror(-r));
-                        goto finish;
-                }
-
-                match = strjoin("type='signal',"
-                                "sender='org.freedesktop.DBus',"
-                                "path='/org/freedesktop/DBus',"
-                                "interface='org.freedesktop.DBus',"
-                                "member='NameOwnerChanged',"
-                                "arg1='",
-                                unique,
-                                "'",
-                                NULL);
-                if (!match) {
-                        log_oom();
-                        goto finish;
-                }
-
-                r = sd_bus_add_match(a, match, NULL, NULL);
-                if (r < 0) {
-                        log_error("Failed to add match for NameLost: %s", strerror(-r));
-                        goto finish;
-                }
-
-                free(match);
-                match = strjoin("type='signal',"
-                                "sender='org.freedesktop.DBus',"
-                                "path='/org/freedesktop/DBus',"
-                                "interface='org.freedesktop.DBus',"
-                                "member='NameOwnerChanged',"
-                                "arg2='",
-                                unique,
-                                "'",
-                                NULL);
-                if (!match) {
-                        log_oom();
-                        goto finish;
-                }
-
-                r = sd_bus_add_match(a, match, NULL, NULL);
-                if (r < 0) {
-                        log_error("Failed to add match for NameAcquired: %s", strerror(-r));
-                        goto finish;
-                }
-        }
-
-        for (;;) {
-                _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
-                int events_a, events_b, fd;
-                uint64_t timeout_a, timeout_b, t;
-                struct timespec _ts, *ts;
-                struct pollfd *pollfd;
-                int k;
-
-                if (got_hello) {
-                        r = sd_bus_process(a, &m);
-                        if (r < 0) {
-                                /* treat 'connection reset by peer' as clean exit condition */
-                                if (r == -ECONNRESET)
-                                        r = 0;
-                                else
-                                        log_error("Failed to process bus a: %s", strerror(-r));
-
-                                goto finish;
-                        }
-
-                        if (m) {
-                                /* We officially got EOF, let's quit */
-                                if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected")) {
-                                        r = 0;
-                                        goto finish;
-                                }
-
-                                k = synthesize_name_acquired(a, b, m);
-                                if (k < 0) {
-                                        r = k;
-                                        log_error("Failed to synthesize message: %s", strerror(-r));
-                                        goto finish;
-                                }
-
-                                k = sd_bus_send(b, m, NULL);
-                                if (k < 0) {
-                                        r = k;
-                                        log_error("Failed to send message: %s", strerror(-r));
-                                        goto finish;
-                                }
-                        }
-
-                        if (r > 0)
-                                continue;
-                }
-
-                r = sd_bus_process(b, &m);
-                if (r < 0) {
-                        /* treat 'connection reset by peer' as clean exit condition */
-                        if (r == -ECONNRESET)
-                                r = 0;
-                        else
-                                log_error("Failed to process bus b: %s", strerror(-r));
-
-                        goto finish;
-                }
-
-                if (m) {
-                        /* We officially got EOF, let's quit */
-                        if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected")) {
-                                r = 0;
-                                goto finish;
-                        }
-
-                        k = process_hello(a, b, m, &got_hello);
-                        if (k < 0) {
-                                r = k;
-                                goto finish;
-                        }
-
-                        if (k > 0)
-                                r = k;
-                        else {
-                                k = sd_bus_send(a, m, NULL);
-                                if (k < 0) {
-                                        r = k;
-                                        log_error("Failed to send message: %s", strerror(-r));
-                                        goto finish;
-                                }
-                        }
-                }
-
-                if (r > 0)
-                        continue;
-
-                fd = sd_bus_get_fd(a);
-                if (fd < 0) {
-                        log_error("Failed to get fd: %s", strerror(-r));
-                        goto finish;
-                }
-
-                events_a = sd_bus_get_events(a);
-                if (events_a < 0) {
-                        log_error("Failed to get events mask: %s", strerror(-r));
-                        goto finish;
-                }
-
-                r = sd_bus_get_timeout(a, &timeout_a);
-                if (r < 0) {
-                        log_error("Failed to get timeout: %s", strerror(-r));
-                        goto finish;
-                }
-
-                events_b = sd_bus_get_events(b);
-                if (events_b < 0) {
-                        log_error("Failed to get events mask: %s", strerror(-r));
-                        goto finish;
-                }
-
-                r = sd_bus_get_timeout(b, &timeout_b);
-                if (r < 0) {
-                        log_error("Failed to get timeout: %s", strerror(-r));
-                        goto finish;
-                }
-
-                t = timeout_a;
-                if (t == (uint64_t) -1 || (timeout_b != (uint64_t) -1 && timeout_b < timeout_a))
-                        t = timeout_b;
-
-                if (t == (uint64_t) -1)
-                        ts = NULL;
-                else {
-                        usec_t nw;
-
-                        nw = now(CLOCK_MONOTONIC);
-                        if (t > nw)
-                                t -= nw;
-                        else
-                                t = 0;
-
-                        ts = timespec_store(&_ts, t);
-                }
-
-                pollfd = (struct pollfd[3]) {
-                        {.fd = fd,     .events = events_a,           },
-                        {.fd = in_fd,  .events = events_b & POLLIN,  },
-                        {.fd = out_fd, .events = events_b & POLLOUT, }
-                };
-
-                r = ppoll(pollfd, 3, ts, NULL);
-                if (r < 0) {
-                        log_error("ppoll() failed: %m");
-                        goto finish;
-                }
-        }
-
-        r = 0;
+        r = loop_clients(accept_fd);
 
 finish:
-        sd_bus_flush(a);
-        sd_bus_flush(b);
+        sd_notify(false,
+                  "STOPPING=1\n"
+                  "STATUS=Shutting down.");
+
+        strv_free(arg_configuration);
+        free(arg_address);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }