X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=socket.c;h=00994daa2907c438e1703a2315efefdf22615ccb;hp=b979e58d390fb9f18e0a3e1cce45d2f45ac97ee9;hb=5cc5d790f4593bbf7829faba502e4c00b3718a08;hpb=b5a0699f0bb8b1d1ae55bb0d86f51dfe2783821b

diff --git a/socket.c b/socket.c
index b979e58d3..00994daa2 100644
--- a/socket.c
+++ b/socket.c
@@ -30,6 +30,8 @@
 #include "unit.h"
 #include "socket.h"
 #include "log.h"
+#include "load-dropin.h"
+#include "load-fragment.h"
 
 static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
         [SOCKET_DEAD] = UNIT_INACTIVE,
@@ -77,7 +79,7 @@ static void socket_done(Unit *u) {
         }
 
         exec_context_done(&s->exec_context);
-        exec_command_free_array(s->exec_command, _SOCKET_EXEC_MAX);
+        exec_command_free_array(s->exec_command, _SOCKET_EXEC_COMMAND_MAX);
         s->control_command = NULL;
 
         if (s->control_pid > 0) {
@@ -88,17 +90,16 @@ static void socket_done(Unit *u) {
         s->service = NULL;
 
         free(s->bind_to_device);
+        s->bind_to_device = NULL;
 
         unit_unwatch_timer(u, &s->timer_watch);
 }
 
-static int socket_init(Unit *u) {
+static void socket_init(Unit *u) {
         Socket *s = SOCKET(u);
-        char *t;
-        int r;
 
-        /* First, reset everything to the defaults, in case this is a
-         * reload */
+        assert(u);
+        assert(u->meta.load_state == UNIT_STUB);
 
         s->state = 0;
         s->timer_watch.type = WATCH_INVALID;
@@ -107,33 +108,40 @@ static int socket_init(Unit *u) {
         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);
+}
 
-        if ((r = unit_load_fragment_and_dropin(u)) <= 0) {
-                if (r == 0)
-                        r = -ENOENT;
-                goto fail;
-        }
+static int socket_load(Unit *u) {
+        Socket *s = SOCKET(u);
+        int r;
 
-        if (!(t = unit_name_change_suffix(unit_id(u), ".service"))) {
-                r = -ENOMEM;
-                goto fail;
-        }
+        assert(u);
+        assert(u->meta.load_state == UNIT_STUB);
 
-        r = manager_load_unit(u->meta.manager, t, (Unit**) &s->service);
-        free(t);
+        if ((r = unit_load_fragment_and_dropin(u)) < 0)
+                return r;
 
-        if (r < 0)
-                goto fail;
+        /* This is a new unit? Then let's add in some extras */
+        if (u->meta.load_state == UNIT_LOADED) {
 
-        if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(s->service))) < 0)
-                goto fail;
+                if ((r = unit_load_related_unit(u, ".service", (Unit**) &s->service)))
+                        return r;
 
-        return 0;
+                if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(s->service))) < 0)
+                        return r;
 
-fail:
-        socket_done(u);
-        return r;
+                if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
+                        return r;
+
+                if ((r = unit_add_default_cgroup(u)) < 0)
+                        return r;
+        }
+
+        return 0;
 }
 
 static const char* listen_lookup(int type) {
@@ -151,7 +159,7 @@ static const char* listen_lookup(int type) {
 
 static void socket_dump(Unit *u, FILE *f, const char *prefix) {
 
-        static const char* const command_table[_SOCKET_EXEC_MAX] = {
+        static const char* const command_table[_SOCKET_EXEC_COMMAND_MAX] = {
                 [SOCKET_EXEC_START_PRE] = "StartPre",
                 [SOCKET_EXEC_START_POST] = "StartPost",
                 [SOCKET_EXEC_STOP_PRE] = "StopPre",
@@ -174,14 +182,21 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sSocket State: %s\n"
                 "%sBindIPv6Only: %s\n"
                 "%sBacklog: %u\n"
+                "%sKillMode: %s\n"
                 "%sSocketMode: %04o\n"
                 "%sDirectoryMode: %04o\n",
                 prefix, state_string_table[s->state],
                 prefix, yes_no(s->bind_ipv6_only),
                 prefix, s->backlog,
+                prefix, kill_mode_to_string(s->kill_mode),
                 prefix, s->socket_mode,
                 prefix, s->directory_mode);
 
+        if (s->control_pid > 0)
+                fprintf(f,
+                        "%sControl PID: %llu\n",
+                        prefix, (unsigned long long) s->control_pid);
+
         if (s->bind_to_device)
                 fprintf(f,
                         "%sBindToDevice: %s\n",
@@ -207,7 +222,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
 
         exec_context_dump(&s->exec_context, f, prefix);
 
-        for (c = 0; c < _SOCKET_EXEC_MAX; c++) {
+        for (c = 0; c < _SOCKET_EXEC_COMMAND_MAX; c++) {
                 if (!s->exec_command[c])
                         continue;
 
@@ -263,7 +278,9 @@ static int socket_open_fds(Socket *s) {
                         struct stat st;
                         assert(p->type == SOCKET_FIFO);
 
-                        if (mkfifo(p->path, 0666 & ~s->exec_context.umask) < 0 && errno != EEXIST) {
+                        mkdir_parents(p->path, s->directory_mode);
+
+                        if (mkfifo(p->path, s->socket_mode) < 0 && errno != EEXIST) {
                                 r = -errno;
                                 goto rollback;
                         }
@@ -342,27 +359,16 @@ static void socket_set_state(Socket *s, SocketState state) {
             state != SOCKET_STOP_PRE_SIGKILL &&
             state != SOCKET_STOP_POST &&
             state != SOCKET_STOP_POST_SIGTERM &&
-            state != SOCKET_STOP_POST_SIGKILL)
+            state != SOCKET_STOP_POST_SIGKILL) {
                 unit_unwatch_timer(UNIT(s), &s->timer_watch);
 
-        if (state != SOCKET_START_PRE &&
-            state != SOCKET_START_POST &&
-            state != SOCKET_STOP_PRE &&
-            state != SOCKET_STOP_PRE_SIGTERM &&
-            state != SOCKET_STOP_PRE_SIGKILL &&
-            state != SOCKET_STOP_POST &&
-            state != SOCKET_STOP_POST_SIGTERM &&
-            state != SOCKET_STOP_POST_SIGKILL)
                 if (s->control_pid > 0) {
                         unit_unwatch_pid(UNIT(s), s->control_pid);
                         s->control_pid = 0;
                 }
 
-        if (state != SOCKET_START_PRE &&
-            state != SOCKET_START_POST &&
-            state != SOCKET_STOP_PRE &&
-            state != SOCKET_STOP_POST)
                 s->control_command = NULL;
+        }
 
         if (state != SOCKET_START_POST &&
             state != SOCKET_LISTENING &&
@@ -375,12 +381,13 @@ static void socket_set_state(Socket *s, SocketState state) {
         if (state != SOCKET_LISTENING)
                 socket_unwatch_fds(s);
 
-        log_debug("%s changed %s → %s", unit_id(UNIT(s)), state_string_table[old_state], state_string_table[state]);
+        if (state != old_state)
+                log_debug("%s changed %s → %s", unit_id(UNIT(s)), state_string_table[old_state], state_string_table[state]);
 
         unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]);
 }
 
-static int socket_spawn(Socket *s, ExecCommand *c, bool timeout, pid_t *_pid) {
+static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
         pid_t pid;
         int r;
 
@@ -388,13 +395,16 @@ static int socket_spawn(Socket *s, ExecCommand *c, bool timeout, pid_t *_pid) {
         assert(c);
         assert(_pid);
 
-        if (timeout) {
-                if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
-                        goto fail;
-        } else
-                unit_unwatch_timer(UNIT(s), &s->timer_watch);
+        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, &pid)) < 0)
+        if ((r = exec_spawn(c,
+                            &s->exec_context,
+                            NULL, 0,
+                            true,
+                            true,
+                            UNIT(s)->meta.cgroup_bondings,
+                            &pid)) < 0)
                 goto fail;
 
         if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
@@ -406,8 +416,7 @@ static int socket_spawn(Socket *s, ExecCommand *c, bool timeout, pid_t *_pid) {
         return 0;
 
 fail:
-        if (timeout)
-                unit_unwatch_timer(UNIT(s), &s->timer_watch);
+        unit_unwatch_timer(UNIT(s), &s->timer_watch);
 
         return r;
 }
@@ -429,7 +438,7 @@ static void socket_enter_stop_post(Socket *s, bool success) {
                 s->failure = true;
 
         if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_POST]))
-                if ((r = socket_spawn(s, s->control_command, true, &s->control_pid)) < 0)
+                if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
                         goto fail;
 
         socket_set_state(s, SOCKET_STOP_POST);
@@ -454,13 +463,24 @@ static void socket_enter_signal(Socket *s, SocketState state, bool success) {
 
         if (s->control_pid > 0) {
                 int sig;
+                bool sent = false;
 
                 sig = (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_POST_SIGTERM) ? SIGTERM : SIGKILL;
 
-                if (kill(s->control_pid, sig) < 0 && errno != ESRCH) {
-                        r = -errno;
-                        goto fail;
+                if (s->kill_mode == KILL_CONTROL_GROUP) {
+
+                        if ((r = cgroup_bonding_kill_list(UNIT(s)->meta.cgroup_bondings, sig)) < 0) {
+                                if (r != -EAGAIN && r != -ESRCH)
+                                        goto fail;
+                        } else
+                                sent = true;
                 }
+
+                if (!sent)
+                        if (kill(s->kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) {
+                                r = -errno;
+                                goto fail;
+                        }
         }
 
         socket_set_state(s, state);
@@ -487,7 +507,7 @@ static void socket_enter_stop_pre(Socket *s, bool success) {
                 s->failure = true;
 
         if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_PRE]))
-                if ((r = socket_spawn(s, s->control_command, true, &s->control_pid)) < 0)
+                if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
                         goto fail;
 
         socket_set_state(s, SOCKET_STOP_PRE);
@@ -528,7 +548,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, true, &s->control_pid)) < 0) {
+                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));
                         goto fail;
                 }
@@ -549,7 +569,7 @@ static void socket_enter_start_pre(Socket *s) {
         assert(s);
 
         if ((s->control_command = s->exec_command[SOCKET_EXEC_START_PRE]))
-                if ((r = socket_spawn(s, s->control_command, true, &s->control_pid)) < 0)
+                if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
                         goto fail;
 
         socket_set_state(s, SOCKET_START_PRE);
@@ -592,7 +612,7 @@ static void socket_run_next(Socket *s, bool success) {
 
         s->control_command = s->control_command->command_next;
 
-        if ((r = socket_spawn(s, s->control_command, true, &s->control_pid)) < 0)
+        if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
                 goto fail;
 
         return;
@@ -629,6 +649,13 @@ static int socket_start(Unit *u) {
         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);
 
         s->failure = false;
@@ -647,6 +674,15 @@ static int socket_stop(Unit *u) {
             s->state == SOCKET_START_POST)
                 return -EAGAIN;
 
+        /* Already on it */
+        if (s->state == SOCKET_STOP_PRE ||
+            s->state == SOCKET_STOP_PRE_SIGTERM ||
+            s->state == SOCKET_STOP_PRE_SIGKILL ||
+            s->state == SOCKET_STOP_POST ||
+            s->state == SOCKET_STOP_POST_SIGTERM ||
+            s->state == SOCKET_STOP_POST_SIGTERM)
+                return 0;
+
         assert(s->state == SOCKET_LISTENING || s->state == SOCKET_RUNNING);
 
         socket_enter_stop_pre(s, true);
@@ -691,7 +727,7 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         log_debug("%s control process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status);
 
         if (s->control_command->command_next &&
-            (success || (s->state == SOCKET_EXEC_STOP_PRE || s->state == SOCKET_EXEC_STOP_POST))) {
+            (success || (s->state == SOCKET_STOP_PRE || s->state == SOCKET_STOP_POST))) {
                 log_debug("%s running next command for the state %s", unit_id(u), state_string_table[s->state]);
                 socket_run_next(s, success);
         } else {
@@ -739,14 +775,13 @@ static void socket_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
 
         assert(s);
         assert(elapsed == 1);
-
         assert(w == &s->timer_watch);
 
         switch (s->state) {
 
         case SOCKET_START_PRE:
         case SOCKET_START_POST:
-                log_warning("%s operation timed out. Stopping.", unit_id(u));
+                log_warning("%s starting timed out. Stopping.", unit_id(u));
                 socket_enter_stop_pre(s, false);
                 break;
 
@@ -832,6 +867,7 @@ const UnitVTable socket_vtable = {
         .suffix = ".socket",
 
         .init = socket_init,
+        .load = socket_load,
         .done = socket_done,
 
         .dump = socket_dump,