X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsocket.c;h=2a5270f336f96458a621ed5d881912efee631f73;hp=2c9d693918facc7794aec846434af1223255744d;hb=5b1fe56a8b5543df614091d3cbcdb6b87e294dc0;hpb=5632e3743db350a67478acc107d76cdf648a1f99

diff --git a/src/socket.c b/src/socket.c
index 2c9d69391..2a5270f33 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -30,6 +30,7 @@
 
 #include "unit.h"
 #include "socket.h"
+#include "netinet/tcp.h"
 #include "log.h"
 #include "load-dropin.h"
 #include "load-fragment.h"
@@ -115,6 +116,9 @@ static void socket_done(Unit *u) {
 
         s->service = NULL;
 
+        free(s->tcp_congestion);
+        s->tcp_congestion = NULL;
+
         free(s->bind_to_device);
         s->bind_to_device = NULL;
 
@@ -370,14 +374,16 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sSocketMode: %04o\n"
                 "%sDirectoryMode: %04o\n"
                 "%sKeepAlive: %s\n"
-                "%sFreeBind: %s\n",
+                "%sFreeBind: %s\n"
+                "%sTCPCongestion: %s\n",
                 prefix, socket_state_to_string(s->state),
                 prefix, socket_address_bind_ipv6_only_to_string(s->bind_ipv6_only),
                 prefix, s->backlog,
                 prefix, s->socket_mode,
                 prefix, s->directory_mode,
                 prefix, yes_no(s->keep_alive),
-                prefix, yes_no(s->free_bind));
+                prefix, yes_no(s->free_bind),
+                prefix, s->tcp_congestion);
 
         if (s->control_pid > 0)
                 fprintf(f,
@@ -631,6 +637,10 @@ static void socket_apply_socket_options(Socket *s, int fd) {
                 if (r < 0 && x < 0)
                         log_warning("IP_TTL/IPV6_UNICAST_HOPS failed: %m");
         }
+
+        if (s->tcp_congestion)
+                if (setsockopt(fd, SOL_TCP, TCP_CONGESTION, s->tcp_congestion, strlen(s->tcp_congestion)+1) < 0)
+                        log_warning("TCP_CONGESTION failed: %m");
 }
 
 static void socket_apply_fifo_options(Socket *s, int fd) {
@@ -642,14 +652,15 @@ static void socket_apply_fifo_options(Socket *s, int fd) {
                         log_warning("F_SETPIPE_SZ: %m");
 }
 
+
 static int fifo_address_create(
                 const char *path,
                 mode_t directory_mode,
                 mode_t socket_mode,
-                /* FIXME SELINUX: pass SELinux context object here */
+                const char *label,
                 int *_fd) {
 
-        int fd = -1, r;
+        int fd = -1, r = 0;
         struct stat st;
         mode_t old_mask;
 
@@ -658,8 +669,8 @@ static int fifo_address_create(
 
         mkdir_parents(path, directory_mode);
 
-        /* FIXME SELINUX: The mkfifo here should be done with
-         * the right SELinux context set */
+        if ((r = label_fifofile_set(label, path)) < 0)
+                goto fail;
 
         /* Enforce the right access mode for the fifo */
         old_mask = umask(~ socket_mode);
@@ -680,13 +691,15 @@ static int fifo_address_create(
                 goto fail;
         }
 
+        label_file_clear();
+
         if (fstat(fd, &st) < 0) {
                 r = -errno;
                 goto fail;
         }
 
         if (!S_ISFIFO(st.st_mode) ||
-            st.st_mode != (socket_mode & ~old_mask) ||
+            (st.st_mode & 0777) != (socket_mode & ~old_mask) ||
             st.st_uid != getuid() ||
             st.st_gid != getgid()) {
 
@@ -698,6 +711,8 @@ static int fifo_address_create(
         return 0;
 
 fail:
+        label_file_clear();
+
         if (fd >= 0)
                 close_nointr_nofail(fd);
 
@@ -707,24 +722,15 @@ fail:
 static int socket_open_fds(Socket *s) {
         SocketPort *p;
         int r;
+        char *label = NULL;
 
         assert(s);
 
-        /* FIXME SELINUX: Somewhere here we must set the the SELinux
-           context for the created sockets and FIFOs. To figure out
-           the executable name for this, use
-           socket_instantiate_service() and then access the executable
-           path name via
-           s->service->exec_command[SERVICE_EXEC_START]->path. Example:
-
         if ((r = socket_instantiate_service(s)) < 0)
                 return r;
 
-        log_debug("Socket unit %s will spawn service unit %s with executable path %s.",
-                  s->meta.id,
-                  s->service->meta.id,
-                  s->service->exec_command[SERVICE_EXEC_START]->path);
-        */
+        if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0)
+                return r;
 
         LIST_FOREACH(port, p, s->ports) {
 
@@ -741,7 +747,7 @@ static int socket_open_fds(Socket *s) {
                                              s->free_bind,
                                              s->directory_mode,
                                              s->socket_mode,
-                                             /* FIXME SELINUX: Pass the SELinux context object here */
+                                             label,
                                              &p->fd)) < 0)
                                 goto rollback;
 
@@ -753,7 +759,7 @@ static int socket_open_fds(Socket *s) {
                                              p->path,
                                              s->directory_mode,
                                              s->socket_mode,
-                                             /* FIXME SELINUX: Pass the SELinux context object here */
+                                             label,
                                              &p->fd)) < 0)
                                 goto rollback;
 
@@ -763,10 +769,12 @@ static int socket_open_fds(Socket *s) {
                         assert_not_reached("Unknown port type");
         }
 
+        label_free(label);
         return 0;
 
 rollback:
         socket_close_fds(s);
+        label_free(label);
         return r;
 }