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

Set reuse flag to sockets

Browse Source 
Should fix #1726
This commit is contained in:
Howaner 2015-02-07 11:03:38 +01:00
parent e7424adbf4
commit d32831d7e8
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/OSSupport/ServerHandleImpl.cpp
View File

@ -125,6 +125,17 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
bool NeedsTwoSockets = false; bool NeedsTwoSockets = false;
int err; int err;
evutil_socket_t MainSock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); evutil_socket_t MainSock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
// Set reuse flag
{
#if defined(_WIN32) || defined(ANDROID_NDK)
char yes = 1;
#else
int yes = 1;
#endif
setsockopt(MainSock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int));
}
if (!IsValidSocket(MainSock)) if (!IsValidSocket(MainSock))
{ {
// Failed to create IPv6 socket, create an IPv4 one instead: // Failed to create IPv6 socket, create an IPv4 one instead:
@ -193,6 +204,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_ConnListener = evconnlistener_new(cNetworkSingleton::Get().GetEventBase(), Callback, this, LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, 0, MainSock);
m_IsListening = true; m_IsListening = true;
if (!NeedsTwoSockets) if (!NeedsTwoSockets)
{ {
return true; return true;
@ -201,6 +213,17 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
// If a secondary socket is required (WinXP dual-stack), create it here: // If a secondary socket is required (WinXP dual-stack), create it here:
LOGD("Creating a second socket for IPv4"); LOGD("Creating a second socket for IPv4");
evutil_socket_t SecondSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); evutil_socket_t SecondSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
// Set reuse flag
{
#if defined(_WIN32) || defined(ANDROID_NDK)
char yes = 1;
#else
int yes = 1;
#endif
setsockopt(SecondSock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int));
}
if (!IsValidSocket(SecondSock)) if (!IsValidSocket(SecondSock))
{ {
err = EVUTIL_SOCKET_ERROR(); err = EVUTIL_SOCKET_ERROR();
@ -233,7 +256,7 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
if (listen(SecondSock, 0) != 0) if (listen(SecondSock, 0) != 0)
{ {
err = EVUTIL_SOCKET_ERROR(); 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); evutil_closesocket(SecondSock);
return true; // Report as success, the primary socket is working return true; // Report as success, the primary socket is working
} }