1 files changed, 34 insertions, 1 deletions

diff --git a/src/OSSupport/ServerHandleImpl.cpp b/src/OSSupport/ServerHandleImpl.cpp
index 5fc5662e1..44ace448b 100644
--- a/src/OSSupport/ServerHandleImpl.cpp
+++ b/src/OSSupport/ServerHandleImpl.cpp
@@ -125,6 +125,7 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
 	bool NeedsTwoSockets = false;
 	int err;
 	evutil_socket_t MainSock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
+
 	if (!IsValidSocket(MainSock))
 	{
 		// Failed to create IPv6 socket, create an IPv4 one instead:
@@ -138,6 +139,16 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
 			return false;
 		}
 
+		// Allow the port to be reused right after the socket closes:
+		if (evutil_make_listen_socket_reuseable(MainSock) != 0)
+		{
+			m_ErrorCode = EVUTIL_SOCKET_ERROR();
+			Printf(m_ErrorMsg, "Port %d cannot be made reusable: %d (%s). Restarting the server might not work.",
+				a_Port, m_ErrorCode, evutil_socket_error_to_string(m_ErrorCode)
+			);
+			LOG("%s", m_ErrorMsg.c_str());
+		}
+
 		// Bind to all interfaces:
 		sockaddr_in name;
 		memset(&name, 0, sizeof(name));
@@ -164,6 +175,16 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
 			setsockopt(MainSock, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char *>(&Zero), sizeof(Zero));
 		#endif
 
+		// Allow the port to be reused right after the socket closes:
+		if (evutil_make_listen_socket_reuseable(MainSock) != 0)
+		{
+			m_ErrorCode = EVUTIL_SOCKET_ERROR();
+			Printf(m_ErrorMsg, "Port %d cannot be made reusable: %d (%s). Restarting the server might not work.",
+				a_Port, m_ErrorCode, evutil_socket_error_to_string(m_ErrorCode)
+			);
+			LOG("%s", m_ErrorMsg.c_str());
+		}
+
 		// Bind to all interfaces:
 		sockaddr_in6 name;
 		memset(&name, 0, sizeof(name));
@@ -193,6 +214,7 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
 	}
 	m_ConnListener = evconnlistener_new(cNetworkSingleton::Get().GetEventBase(), Callback, this, LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, 0, MainSock);
 	m_IsListening = true;
+
 	if (!NeedsTwoSockets)
 	{
 		return true;
@@ -201,6 +223,7 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
 	// If a secondary socket is required (WinXP dual-stack), create it here:
 	LOGD("Creating a second socket for IPv4");
 	evutil_socket_t SecondSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+
 	if (!IsValidSocket(SecondSock))
 	{
 		err = EVUTIL_SOCKET_ERROR();
@@ -208,6 +231,16 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
 		return true;  // Report as success, the primary socket is working
 	}
 
+	// Allow the port to be reused right after the socket closes:
+	if (evutil_make_listen_socket_reuseable(SecondSock) != 0)
+	{
+		m_ErrorCode = EVUTIL_SOCKET_ERROR();
+		Printf(m_ErrorMsg, "Port %d cannot be made reusable (second socket): %d (%s). Restarting the server might not work.",
+			a_Port, m_ErrorCode, evutil_socket_error_to_string(m_ErrorCode)
+		);
+		LOG("%s", m_ErrorMsg.c_str());
+	}
+
 	// Make the secondary socket nonblocking:
 	if (evutil_make_socket_nonblocking(SecondSock) != 0)
 	{
@@ -233,7 +266,7 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
 	if (listen(SecondSock, 0) != 0)
 	{
 		err = EVUTIL_SOCKET_ERROR();
-		LOGD("Cannot listen on on secondary socket on port %d: %d (%s)", a_Port, err, evutil_socket_error_to_string(err));
+		LOGD("Cannot listen on secondary socket on port %d: %d (%s)", a_Port, err, evutil_socket_error_to_string(err));
 		evutil_closesocket(SecondSock);
 		return true;  // Report as success, the primary socket is working
 	}