3 files changed, 22 insertions, 0 deletions

diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
index d7401de8..f07df2c6 100644
--- a/toxcore/TCP_server.c
+++ b/toxcore/TCP_server.c
@@ -925,6 +925,10 @@ static sock_t new_listening_TCP_socket(int family, uint16_t port)
         ok = set_socket_dualstack(sock);
     }
 
+    if (ok) {
+        ok = set_socket_reuseaddr(sock);
+    }
+
     ok = ok && bind_to_port(sock, family, port) && (listen(sock, TCP_MAX_BACKLOG) == 0);
 
     if (!ok) {
diff --git a/toxcore/network.c b/toxcore/network.c
index d974ddc2..b3df3fbd 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -172,6 +172,17 @@ int set_socket_nosigpipe(sock_t sock)
 #endif
 }
 
+/* Enable SO_REUSEADDR on socket.
+ *
+ * return 1 on success
+ * return 0 on failure
+ */
+int set_socket_reuseaddr(sock_t sock)
+{
+    int set = 1;
+    return (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &set, sizeof(set)) == 0);
+}
+
 /* Set socket to dual (IPv4 + IPv6 socket)
  *
  * return 1 on success
diff --git a/toxcore/network.h b/toxcore/network.h
index c67f523d..b06c0f6a 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -334,6 +334,13 @@ int set_socket_nonblock(sock_t sock);
  */
 int set_socket_nosigpipe(sock_t sock);
 
+/* Enable SO_REUSEADDR on socket.
+ *
+ * return 1 on success
+ * return 0 on failure
+ */
+int set_socket_reuseaddr(sock_t sock);
+
 /* Set socket to dual (IPv4 + IPv6 socket)
  *
  * return 1 on success