socket: support socket activation of containers

[elogind.git] / src / core / socket.c

diff --git a/src/core/socket.c b/src/core/socket.c
index f4f40afa907f39e734993e519d5325b9713eac4d..324ec1e34bd03f0333f33f9aa7260e1fd09f54e8 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -28,7 +28,9 @@
 #include <signal.h>
 #include <arpa/inet.h>
 #include <mqueue.h>
+#ifdef HAVE_ATTR_XATTR_H
 #include <attr/xattr.h>
+#endif
 
 #include "unit.h"
 #include "socket.h"
@@ -768,6 +770,7 @@ static void socket_apply_socket_options(Socket *s, int fd) {
                 if (setsockopt(fd, SOL_TCP, TCP_CONGESTION, s->tcp_congestion, strlen(s->tcp_congestion)+1) < 0)
                         log_warning("TCP_CONGESTION failed: %m");
 
+#ifdef HAVE_ATTR_XATTR_H
         if (s->smack_ip_in)
                 if (fsetxattr(fd, "security.SMACK64IPIN", s->smack_ip_in, strlen(s->smack_ip_in), 0) < 0)
                         log_error("fsetxattr(\"security.SMACK64IPIN\"): %m");
@@ -775,6 +778,7 @@ static void socket_apply_socket_options(Socket *s, int fd) {
         if (s->smack_ip_out)
                 if (fsetxattr(fd, "security.SMACK64IPOUT", s->smack_ip_out, strlen(s->smack_ip_out), 0) < 0)
                         log_error("fsetxattr(\"security.SMACK64IPOUT\"): %m");
+#endif
 }
 
 static void socket_apply_fifo_options(Socket *s, int fd) {
@@ -785,9 +789,11 @@ static void socket_apply_fifo_options(Socket *s, int fd) {
                 if (fcntl(fd, F_SETPIPE_SZ, s->pipe_size) < 0)
                         log_warning("F_SETPIPE_SZ: %m");
 
+#ifdef HAVE_ATTR_XATTR_H
         if (s->smack)
                 if (fsetxattr(fd, "security.SMACK64", s->smack, strlen(s->smack), 0) < 0)
                         log_error("fsetxattr(\"security.SMACK64\"): %m");
+#endif
 }
 
 static int fifo_address_create(
@@ -1140,10 +1146,12 @@ static int socket_coldplug(Unit *u) {
                         if (s->control_pid <= 0)
                                 return -EBADMSG;
 
-                        if ((r = unit_watch_pid(UNIT(s), s->control_pid)) < 0)
+                        r = unit_watch_pid(UNIT(s), s->control_pid);
+                        if (r < 0)
                                 return r;
 
-                        if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
+                        r = unit_watch_timer(UNIT(s), CLOCK_MONOTONIC, true, s->timeout_usec, &s->timer_watch);
+                        if (r < 0)
                                 return r;
                 }
 
@@ -1175,10 +1183,12 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
         assert(c);
         assert(_pid);
 
-        if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
+        r = unit_watch_timer(UNIT(s), CLOCK_MONOTONIC, true, s->timeout_usec, &s->timer_watch);
+        if (r < 0)
                 goto fail;
 
-        if (!(argv = unit_full_printf_strv(UNIT(s), c->argv))) {
+        argv = unit_full_printf_strv(UNIT(s), c->argv);
+        if (!argv) {
                 r = -ENOMEM;
                 goto fail;
         }
@@ -1300,7 +1310,8 @@ static void socket_enter_signal(Socket *s, SocketState state, SocketResult f) {
         }
 
         if (wait_for_exit) {
-                if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
+                r = unit_watch_timer(UNIT(s), CLOCK_MONOTONIC, true, s->timeout_usec, &s->timer_watch);
+                if (r < 0)
                         goto fail;
 
                 socket_set_state(s, state);
@@ -1473,7 +1484,7 @@ static void socket_enter_running(Socket *s, int cfd) {
                 Service *service;
 
                 if (s->n_connections >= s->max_connections) {
-                        log_warning("Too many incoming connections (%u)", s->n_connections);
+                        log_warning("%s: Too many incoming connections (%u)", UNIT(s)->id, s->n_connections);
                         close_nointr_nofail(cfd);
                         return;
                 }
@@ -1691,7 +1702,8 @@ static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
                 if (p->type == SOCKET_SOCKET) {
                         char *t;
 
-                        if ((r = socket_address_print(&p->address, &t)) < 0)
+                        r = socket_address_print(&p->address, &t);
+                        if (r < 0)
                                 return r;
 
                         if (socket_address_family(&p->address) == AF_NETLINK)
@@ -1701,6 +1713,8 @@ static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
                         free(t);
                 } else if (p->type == SOCKET_SPECIAL)
                         unit_serialize_item_format(u, f, "special", "%i %s", copy, p->path);
+                else if (p->type == SOCKET_MQUEUE)
+                        unit_serialize_item_format(u, f, "mqueue", "%i %s", copy, p->path);
                 else {
                         assert(p->type == SOCKET_FIFO);
                         unit_serialize_item_format(u, f, "fifo", "%i %s", copy, p->path);
@@ -1721,7 +1735,8 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
         if (streq(key, "state")) {
                 SocketState state;
 
-                if ((state = socket_state_from_string(value)) < 0)
+                state = socket_state_from_string(value);
+                if (state < 0)
                         log_debug("Failed to parse state value %s", value);
                 else
                         s->deserialized_state = state;
@@ -1797,6 +1812,26 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
                         }
                 }
 
+        } else if (streq(key, "mqueue")) {
+                int fd, skip = 0;
+                SocketPort *p;
+
+                if (sscanf(value, "%i %n", &fd, &skip) < 1 || fd < 0 || !fdset_contains(fds, fd))
+                        log_debug("Failed to parse mqueue value %s", value);
+                else {
+
+                        LIST_FOREACH(port, p, s->ports)
+                                if (p->type == SOCKET_MQUEUE &&
+                                    streq_ptr(p->path, value+skip))
+                                        break;
+
+                        if (p) {
+                                if (p->fd >= 0)
+                                        close_nointr_nofail(p->fd);
+                                p->fd = fdset_remove(fds, fd);
+                        }
+                }
+
         } else if (streq(key, "socket")) {
                 int fd, type, skip = 0;
                 SocketPort *p;
@@ -1841,6 +1876,34 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
         return 0;
 }
 
+static int socket_distribute_fds(Unit *u, FDSet *fds) {
+        Socket *s = SOCKET(u);
+        SocketPort *p;
+
+        assert(u);
+
+        LIST_FOREACH(port, p, s->ports) {
+                Iterator i;
+                int fd;
+
+                if (p->type != SOCKET_SOCKET)
+                        continue;
+
+                if (p->fd >= 0)
+                        continue;
+
+                FDSET_FOREACH(fd, fds, i) {
+                        if (socket_address_matches_fd(&p->address, fd)) {
+                                p->fd = fdset_remove(fds, fd);
+                                s->deserialized_state = SOCKET_LISTENING;
+                                break;
+                        }
+                }
+        }
+
+        return 0;
+}
+
 static UnitActiveState socket_active_state(Unit *u) {
         assert(u);
 
@@ -2253,6 +2316,7 @@ const UnitVTable socket_vtable = {
 
         .serialize = socket_serialize,
         .deserialize_item = socket_deserialize_item,
+        .distribute_fds = socket_distribute_fds,
 
         .active_state = socket_active_state,
         .sub_state_to_string = socket_sub_state_to_string,