X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=socket.c;h=88fb2d3869e50231a4cfd4a2b6974c091e352688;hp=3b74b5e9f82ab15279b7589331d35f44963023ec;hb=ac86f50d7b62fb16b4521c87bd2739b9c26a4f60;hpb=80876c20f64f87765242bc35895977ab6a855729

diff --git a/socket.c b/socket.c
index 3b74b5e9f..88fb2d386 100644
--- a/socket.c
+++ b/socket.c
@@ -26,12 +26,15 @@
 #include <fcntl.h>
 #include <sys/epoll.h>
 #include <signal.h>
+#include <arpa/inet.h>
 
 #include "unit.h"
 #include "socket.h"
 #include "log.h"
 #include "load-dropin.h"
 #include "load-fragment.h"
+#include "strv.h"
+#include "unit-name.h"
 
 static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
         [SOCKET_DEAD] = UNIT_INACTIVE,
@@ -108,20 +111,44 @@ static void socket_init(Unit *u) {
         assert(u);
         assert(u->meta.load_state == UNIT_STUB);
 
-        s->state = 0;
         s->timer_watch.type = WATCH_INVALID;
-        s->bind_ipv6_only = false;
         s->backlog = SOMAXCONN;
         s->timeout_usec = DEFAULT_TIMEOUT_USEC;
         s->directory_mode = 0755;
         s->socket_mode = 0666;
-        s->kill_mode = 0;
-        s->failure = false;
-        s->control_pid = 0;
-        s->service = NULL;
+
         exec_context_init(&s->exec_context);
 }
 
+static bool have_non_accept_socket(Socket *s) {
+        SocketPort *p;
+
+        assert(s);
+
+        if (!s->accept)
+                return true;
+
+        LIST_FOREACH(port, p, s->ports)
+                if (!socket_address_can_accept(&p->address))
+                        return true;
+
+        return false;
+}
+
+static int socket_verify(Socket *s) {
+        assert(s);
+
+        if (UNIT(s)->meta.load_state != UNIT_LOADED)
+                return 0;
+
+        if (!s->ports) {
+                log_error("%s lacks Listen setting. Refusing.", UNIT(s)->meta.id);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static int socket_load(Unit *u) {
         Socket *s = SOCKET(u);
         int r;
@@ -135,11 +162,13 @@ static int socket_load(Unit *u) {
         /* This is a new unit? Then let's add in some extras */
         if (u->meta.load_state == UNIT_LOADED) {
 
-                if ((r = unit_load_related_unit(u, ".service", (Unit**) &s->service)))
-                        return r;
+                if (have_non_accept_socket(s)) {
+                        if ((r = unit_load_related_unit(u, ".service", (Unit**) &s->service)))
+                                return r;
 
-                if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(s->service))) < 0)
-                        return r;
+                        if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(s->service))) < 0)
+                                return r;
+                }
 
                 if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
                         return r;
@@ -148,7 +177,7 @@ static int socket_load(Unit *u) {
                         return r;
         }
 
-        return 0;
+        return socket_verify(s);
 }
 
 static const char* listen_lookup(int type) {
@@ -209,6 +238,11 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
                         "%sBindToDevice: %s\n",
                         prefix, s->bind_to_device);
 
+        if (s->accept)
+                fprintf(f,
+                        "%sAccepted: %u\n",
+                        prefix, s->n_accepted);
+
         LIST_FOREACH(port, p, s->ports) {
 
                 if (p->type == SOCKET_SOCKET) {
@@ -242,6 +276,87 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
         free(p2);
 }
 
+static int instance_from_socket(int fd, unsigned nr, char **instance) {
+        socklen_t l;
+        char *r;
+        union {
+                struct sockaddr sa;
+                struct sockaddr_un un;
+                struct sockaddr_in in;
+                struct sockaddr_in6 in6;
+                struct sockaddr_storage storage;
+        } local, remote;
+
+        assert(fd >= 0);
+        assert(instance);
+
+        l = sizeof(local);
+        if (getsockname(fd, &local.sa, &l) < 0)
+                return -errno;
+
+        l = sizeof(remote);
+        if (getpeername(fd, &remote.sa, &l) < 0)
+                return -errno;
+
+        switch (local.sa.sa_family) {
+
+        case AF_INET: {
+                uint32_t
+                        a = ntohl(local.in.sin_addr.s_addr),
+                        b = ntohl(remote.in.sin_addr.s_addr);
+
+                if (asprintf(&r,
+                             "%u-%u.%u.%u.%u-%u-%u.%u.%u.%u-%u",
+                             nr,
+                             a >> 24, (a >> 16) & 0xFF, (a >> 8) & 0xFF, a & 0xFF,
+                             ntohs(local.in.sin_port),
+                             b >> 24, (b >> 16) & 0xFF, (b >> 8) & 0xFF, b & 0xFF,
+                             ntohs(remote.in.sin_port)) < 0)
+                        return -ENOMEM;
+
+                break;
+        }
+
+        case AF_INET6: {
+                char a[INET6_ADDRSTRLEN], b[INET6_ADDRSTRLEN];
+
+                if (asprintf(&r,
+                             "%u-%s-%u-%s-%u",
+                             nr,
+                             inet_ntop(AF_INET6, &local.in6.sin6_addr, a, sizeof(a)),
+                             ntohs(local.in6.sin6_port),
+                             inet_ntop(AF_INET6, &remote.in6.sin6_addr, b, sizeof(b)),
+                             ntohs(remote.in6.sin6_port)) < 0)
+                        return -ENOMEM;
+
+                break;
+        }
+
+        case AF_UNIX: {
+                struct ucred ucred;
+
+                l = sizeof(ucred);
+                if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &l) < 0)
+                        return -errno;
+
+                if (asprintf(&r,
+                             "%u-%llu-%llu",
+                             nr,
+                             (unsigned long long) ucred.pid,
+                             (unsigned long long) ucred.uid) < 0)
+                        return -ENOMEM;
+
+                break;
+        }
+
+        default:
+                assert_not_reached("Unhandled socket type.");
+        }
+
+        *instance = r;
+        return 0;
+}
+
 static void socket_close_fds(Socket *s) {
         SocketPort *p;
 
@@ -341,6 +456,10 @@ static int socket_watch_fds(Socket *s) {
                 if (p->fd < 0)
                         continue;
 
+                p->fd_watch.data.socket_accept =
+                        s->accept &&
+                        socket_address_can_accept(&p->address);
+
                 if ((r = unit_watch_fd(UNIT(s), p->fd, EPOLLIN, &p->fd_watch)) < 0)
                         goto fail;
         }
@@ -384,7 +503,7 @@ static void socket_set_state(Socket *s, SocketState state) {
                 socket_unwatch_fds(s);
 
         if (state != old_state)
-                log_debug("%s changed %s → %s", unit_id(UNIT(s)), state_string_table[old_state], state_string_table[state]);
+                log_debug("%s changed %s → %s", s->meta.id, state_string_table[old_state], state_string_table[state]);
 
         unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]);
 }
@@ -392,6 +511,7 @@ static void socket_set_state(Socket *s, SocketState state) {
 static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
         pid_t pid;
         int r;
+        char **argv;
 
         assert(s);
         assert(c);
@@ -400,14 +520,23 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
         if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
                 goto fail;
 
-        if ((r = exec_spawn(c,
-                            &s->exec_context,
-                            NULL, 0,
-                            true,
-                            true,
-                            UNIT(s)->meta.manager->confirm_spawn,
-                            UNIT(s)->meta.cgroup_bondings,
-                            &pid)) < 0)
+        if (!(argv = unit_full_printf_strv(UNIT(s), c->argv))) {
+                r = -ENOMEM;
+                goto fail;
+        }
+
+        r = exec_spawn(c,
+                       argv,
+                       &s->exec_context,
+                       NULL, 0,
+                       true,
+                       true,
+                       UNIT(s)->meta.manager->confirm_spawn,
+                       UNIT(s)->meta.cgroup_bondings,
+                       &pid);
+
+        strv_free(argv);
+        if (r < 0)
                 goto fail;
 
         if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
@@ -455,7 +584,7 @@ static void socket_enter_stop_post(Socket *s, bool success) {
         return;
 
 fail:
-        log_warning("%s failed to run stop-post executable: %s", unit_id(UNIT(s)), strerror(-r));
+        log_warning("%s failed to run stop-post executable: %s", s->meta.id, strerror(-r));
         socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
 }
 
@@ -500,7 +629,7 @@ static void socket_enter_signal(Socket *s, SocketState state, bool success) {
         return;
 
 fail:
-        log_warning("%s failed to kill processes: %s", unit_id(UNIT(s)), strerror(-r));
+        log_warning("%s failed to kill processes: %s", s->meta.id, strerror(-r));
 
         if (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_PRE_SIGKILL)
                 socket_enter_stop_post(s, false);
@@ -528,7 +657,7 @@ static void socket_enter_stop_pre(Socket *s, bool success) {
         return;
 
 fail:
-        log_warning("%s failed to run stop-pre executable: %s", unit_id(UNIT(s)), strerror(-r));
+        log_warning("%s failed to run stop-pre executable: %s", s->meta.id, strerror(-r));
         socket_enter_stop_post(s, false);
 }
 
@@ -537,7 +666,7 @@ static void socket_enter_listening(Socket *s) {
         assert(s);
 
         if ((r = socket_watch_fds(s)) < 0) {
-                log_warning("%s failed to watch sockets: %s", unit_id(UNIT(s)), strerror(-r));
+                log_warning("%s failed to watch sockets: %s", s->meta.id, strerror(-r));
                 goto fail;
         }
 
@@ -553,7 +682,7 @@ static void socket_enter_start_post(Socket *s) {
         assert(s);
 
         if ((r = socket_open_fds(s)) < 0) {
-                log_warning("%s failed to listen on sockets: %s", unit_id(UNIT(s)), strerror(-r));
+                log_warning("%s failed to listen on sockets: %s", s->meta.id, strerror(-r));
                 goto fail;
         }
 
@@ -561,7 +690,7 @@ static void socket_enter_start_post(Socket *s) {
 
         if ((s->control_command = s->exec_command[SOCKET_EXEC_START_POST])) {
                 if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0) {
-                        log_warning("%s failed to run start-post executable: %s", unit_id(UNIT(s)), strerror(-r));
+                        log_warning("%s failed to run start-post executable: %s", s->meta.id, strerror(-r));
                         goto fail;
                 }
 
@@ -592,24 +721,63 @@ static void socket_enter_start_pre(Socket *s) {
         return;
 
 fail:
-        log_warning("%s failed to run start-pre exectuable: %s", unit_id(UNIT(s)), strerror(-r));
+        log_warning("%s failed to run start-pre exectuable: %s", s->meta.id, strerror(-r));
         socket_enter_dead(s, false);
 }
 
-static void socket_enter_running(Socket *s) {
+static void socket_enter_running(Socket *s, int cfd) {
         int r;
 
         assert(s);
 
-        if ((r = manager_add_job(UNIT(s)->meta.manager, JOB_START, UNIT(s->service), JOB_REPLACE, true, NULL)) < 0)
-                goto fail;
+        if (cfd < 0) {
+                if ((r = manager_add_job(UNIT(s)->meta.manager, JOB_START, UNIT(s->service), JOB_REPLACE, true, NULL)) < 0)
+                        goto fail;
+
+                socket_set_state(s, SOCKET_RUNNING);
+        } else {
+                Unit *u;
+                char *prefix, *instance, *name;
+
+                if ((r = instance_from_socket(cfd, s->n_accepted++, &instance)))
+                        goto fail;
+
+                if (!(prefix = unit_name_to_prefix(UNIT(s)->meta.id))) {
+                        free(instance);
+                        r = -ENOMEM;
+                        goto fail;
+                }
+
+                name = unit_name_build(prefix, instance, ".service");
+                free(prefix);
+                free(instance);
+
+                if (!name)
+                        r = -ENOMEM;
+
+                r = manager_load_unit(UNIT(s)->meta.manager, name, NULL, &u);
+                free(name);
+
+                if (r < 0)
+                        goto fail;
+
+                if ((r = service_set_socket_fd(SERVICE(u), cfd) < 0))
+                        goto fail;
+
+                cfd = -1;
+
+                if ((r = manager_add_job(u->meta.manager, JOB_START, u, JOB_REPLACE, true, NULL)) < 0)
+                        goto fail;
+        }
 
-        socket_set_state(s, SOCKET_RUNNING);
         return;
 
 fail:
-        log_warning("%s failed to queue socket startup job: %s", unit_id(UNIT(s)), strerror(-r));
+        log_warning("%s failed to queue socket startup job: %s", s->meta.id, strerror(-r));
         socket_enter_stop_pre(s, false);
+
+        if (cfd >= 0)
+                close_nointr_nofail(cfd);
 }
 
 static void socket_run_next(Socket *s, bool success) {
@@ -632,7 +800,7 @@ static void socket_run_next(Socket *s, bool success) {
         return;
 
 fail:
-        log_warning("%s failed to run spawn next executable: %s", unit_id(UNIT(s)), strerror(-r));
+        log_warning("%s failed to run spawn next executable: %s", s->meta.id, strerror(-r));
 
         if (s->state == SOCKET_START_POST)
                 socket_enter_stop_pre(s, false);
@@ -662,15 +830,17 @@ static int socket_start(Unit *u) {
                 return 0;
 
         /* Cannot run this without the service being around */
-        if (s->service->meta.load_state != UNIT_LOADED)
-                return -ENOENT;
-
-        /* If the service is alredy actvie we cannot start the
-         * socket */
-        if (s->service->state != SERVICE_DEAD &&
-            s->service->state != SERVICE_MAINTAINANCE &&
-            s->service->state != SERVICE_AUTO_RESTART)
-                return -EBUSY;
+        if (s->service) {
+                if (s->service->meta.load_state != UNIT_LOADED)
+                        return -ENOENT;
+
+                /* If the service is alredy actvie we cannot start the
+                 * socket */
+                if (s->service->state != SERVICE_DEAD &&
+                    s->service->state != SERVICE_MAINTAINANCE &&
+                    s->service->state != SERVICE_AUTO_RESTART)
+                        return -EBUSY;
+        }
 
         assert(s->state == SOCKET_DEAD || s->state == SOCKET_MAINTAINANCE);
 
@@ -711,17 +881,47 @@ static UnitActiveState socket_active_state(Unit *u) {
         return state_translation_table[SOCKET(u)->state];
 }
 
+static const char *socket_sub_state_to_string(Unit *u) {
+        assert(u);
+
+        return state_string_table[SOCKET(u)->state];
+}
+
 static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
         Socket *s = SOCKET(u);
+        int cfd = -1;
 
         assert(s);
+        assert(fd >= 0);
 
-        log_debug("Incoming traffic on %s", unit_id(u));
+        log_debug("Incoming traffic on %s", u->meta.id);
 
-        if (events != EPOLLIN)
-                socket_enter_stop_pre(s, false);
+        if (events != EPOLLIN) {
+                log_error("Got invalid poll event on socket.");
+                goto fail;
+        }
+
+        if (w->data.socket_accept) {
+                for (;;) {
+
+                        if ((cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK)) < 0) {
 
-        socket_enter_running(s);
+                                if (errno == EINTR)
+                                        continue;
+
+                                log_error("Failed to accept socket: %m");
+                                goto fail;
+                        }
+
+                        break;
+                }
+        }
+
+        socket_enter_running(s, cfd);
+        return;
+
+fail:
+        socket_enter_stop_pre(s, false);
 }
 
 static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
@@ -740,16 +940,16 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         exec_status_fill(&s->control_command->exec_status, pid, code, status);
         s->control_pid = 0;
 
-        log_debug("%s control process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status);
+        log_debug("%s control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
 
         if (s->control_command->command_next && success) {
-                log_debug("%s running next command for state %s", unit_id(u), state_string_table[s->state]);
+                log_debug("%s running next command for state %s", u->meta.id, state_string_table[s->state]);
                 socket_run_next(s, success);
         } else {
                 /* No further commands for this step, so let's figure
                  * out what to do next */
 
-                log_debug("%s got final SIGCHLD for state %s", unit_id(u), state_string_table[s->state]);
+                log_debug("%s got final SIGCHLD for state %s", u->meta.id, state_string_table[s->state]);
 
                 switch (s->state) {
 
@@ -795,41 +995,41 @@ static void socket_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
         switch (s->state) {
 
         case SOCKET_START_PRE:
-                log_warning("%s starting timed out. Terminating.", unit_id(u));
+                log_warning("%s starting timed out. Terminating.", u->meta.id);
                 socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
 
         case SOCKET_START_POST:
-                log_warning("%s starting timed out. Stopping.", unit_id(u));
+                log_warning("%s starting timed out. Stopping.", u->meta.id);
                 socket_enter_stop_pre(s, false);
                 break;
 
         case SOCKET_STOP_PRE:
-                log_warning("%s stopping timed out. Terminating.", unit_id(u));
+                log_warning("%s stopping timed out. Terminating.", u->meta.id);
                 socket_enter_signal(s, SOCKET_STOP_PRE_SIGTERM, false);
                 break;
 
         case SOCKET_STOP_PRE_SIGTERM:
-                log_warning("%s stopping timed out. Killing.", unit_id(u));
+                log_warning("%s stopping timed out. Killing.", u->meta.id);
                 socket_enter_signal(s, SOCKET_STOP_PRE_SIGKILL, false);
                 break;
 
         case SOCKET_STOP_PRE_SIGKILL:
-                log_warning("%s still around after SIGKILL. Ignoring.", unit_id(u));
+                log_warning("%s still around after SIGKILL. Ignoring.", u->meta.id);
                 socket_enter_stop_post(s, false);
                 break;
 
         case SOCKET_STOP_POST:
-                log_warning("%s stopping timed out (2). Terminating.", unit_id(u));
+                log_warning("%s stopping timed out (2). Terminating.", u->meta.id);
                 socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
                 break;
 
         case SOCKET_FINAL_SIGTERM:
-                log_warning("%s stopping timed out (2). Killing.", unit_id(u));
+                log_warning("%s stopping timed out (2). Killing.", u->meta.id);
                 socket_enter_signal(s, SOCKET_FINAL_SIGKILL, false);
                 break;
 
         case SOCKET_FINAL_SIGKILL:
-                log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", unit_id(u));
+                log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", u->meta.id);
                 socket_enter_dead(s, false);
                 break;
 
@@ -876,7 +1076,7 @@ void socket_notify_service_dead(Socket *s) {
         /* The service is dead. Dang. */
 
         if (s->state == SOCKET_RUNNING) {
-                log_debug("%s got notified about service death.", unit_id(UNIT(s)));
+                log_debug("%s got notified about service death.", s->meta.id);
                 socket_enter_listening(s);
         }
 }
@@ -894,6 +1094,7 @@ const UnitVTable socket_vtable = {
         .stop = socket_stop,
 
         .active_state = socket_active_state,
+        .sub_state_to_string = socket_sub_state_to_string,
 
         .fd_event = socket_fd_event,
         .sigchld_event = socket_sigchld_event,