From 19e92309e94425e4348baec47a104c0a9705f830 Mon Sep 17 00:00:00 2001
From: Shawn Landden <shawnlandden@gmail.com>
Date: Mon, 8 Jul 2013 18:28:14 +0000
Subject: [PATCH] basic SO_REUSEPORT support

---
 man/systemd.socket.xml | 9 +++++++++
 src/core/dbus-socket.c | 2 ++
 src/core/socket.c      | 9 +++++++++
 src/core/socket.h      | 1 +
 src/shared/missing.h   | 4 ++++
 5 files changed, 25 insertions(+)

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 040305c..e845a7f 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -503,6 +503,15 @@
                         </varlistentry>
 
                         <varlistentry>
+                                <term><varname>ReUsePort=</varname></term>
+                                <listitem><para>Takes a true value to allow
+                                multiple bind()s to this TCP or UDP port.
+                                This controls the SO_REUSEPORT socket option.
+                                See <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                                for details.</ppara></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
                                 <term><varname>SmackLabel=</varname></term>
                                 <term><varname>SmackLabelIPIn=</varname></term>
                                 <term><varname>SmackLabelIPOut=</varname></term>
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index 973f905..0fa0962 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -65,6 +65,7 @@
         "  <property name=\"MessageQueueMessageSize\" type=\"x\" access=\"read\"/>\n" \
         "  <property name=\"Listen\" type=\"a(ss)\" access=\"read\"/>\n"    \
         "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
+        "  <property name=\"ReUsePort\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"SmackLabel\" type=\"s\" access=\"read\"/>\n" \
         "  <property name=\"SmackLabelIPIn\" type=\"s\" access=\"read\"/>\n" \
         "  <property name=\"SmackLabelIPOut\" type=\"s\" access=\"read\"/>\n" \
@@ -192,6 +193,7 @@ static const BusProperty bus_socket_properties[] = {
         { "MessageQueueMaxMessages", bus_property_append_long, "x", offsetof(Socket, mq_maxmsg)       },
         { "MessageQueueMessageSize", bus_property_append_long, "x", offsetof(Socket, mq_msgsize)      },
         { "Result",         bus_socket_append_socket_result,   "s", offsetof(Socket, result)          },
+        { "ReUsePort",      bus_property_append_bool,          "b", offsetof(Socket, reuseport)       },
         { "SmackLabel",     bus_property_append_string,        "s", offsetof(Socket, smack),          true },
         { "SmackLabelIPIn", bus_property_append_string,        "s", offsetof(Socket, smack_ip_in),    true },
         { "SmackLabelIPOut",bus_property_append_string,        "s", offsetof(Socket, smack_ip_out),   true },
diff --git a/src/core/socket.c b/src/core/socket.c
index 2f25e25..e806ceb 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -537,6 +537,11 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
                         "%sMessageQueueMessageSize: %li\n",
                         prefix, s->mq_msgsize);
 
+        if (s->reuseport > 0)
+                fprintf(f,
+                        "%sReusePort: %s\n",
+                         prefix, yes_no(s->reuseport));
+
         if (s->smack)
                 fprintf(f,
                         "%sSmackLabel: %s\n",
@@ -793,6 +798,10 @@ 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_unit(UNIT(s)->id, "TCP_CONGESTION failed: %m");
 
+        if (s->reuseport)
+                if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &s->reuseport, sizeof(bool)))
+                        log_warning_unit(UNIT(s)->id, "SO_REUSEPORT failed: %m");
+
 #ifdef HAVE_SMACK
         if (s->smack_ip_in)
                 if (fsetxattr(fd, "security.SMACK64IPIN", s->smack_ip_in, strlen(s->smack_ip_in), 0) < 0)
diff --git a/src/core/socket.h b/src/core/socket.h
index 9d48cde..873d4a3 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -143,6 +143,7 @@ struct Socket {
         size_t pipe_size;
         char *bind_to_device;
         char *tcp_congestion;
+        bool reuseport;
         long mq_maxmsg;
         long mq_msgsize;
 
diff --git a/src/shared/missing.h b/src/shared/missing.h
index 96e6d63..879fe56 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -266,3 +266,7 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
 #ifndef TFD_TIMER_CANCEL_ON_SET
 #define TFD_TIMER_CANCEL_ON_SET (1 << 1)
 #endif
+
+#ifndef SO_REUSEPORT
+#define SO_REUSEPORT 15
+#endif
-- 
1.8.3.2