flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

ServerHandle: Fixed socket reuse.

Browse Source 
Fixes CID 104670, CID 104670 and CID 103724.
This commit is contained in:
Mattes D 2015-02-08 14:41:24 +01:00
parent a939e2ded9
commit 81d7329ad3
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/OSSupport/ServerHandleImpl.cpp
View File

@ -126,11 +126,6 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
int err;
evutil_socket_t MainSock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
// Set reuse flag
#if !defined(_WIN32)
evutil_make_listen_socket_reuseable(MainSock);
#endif
if (!IsValidSocket(MainSock))
{
// Failed to create IPv6 socket, create an IPv4 one instead:
@ -144,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));
@ -170,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));
@ -209,11 +224,6 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
LOGD("Creating a second socket for IPv4");
evutil_socket_t SecondSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
// Set reuse flag
#if !defined(_WIN32)
evutil_make_listen_socket_reuseable(SecondSock);
#endif
if (!IsValidSocket(SecondSock))
{
err = EVUTIL_SOCKET_ERROR();
@ -221,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(MainSock) != 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)
{