Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Under Windows, do only SO_EXCLUSIVEADDRUSE.

This commit is contained in:
Max Neunhoeffer 2014-03-04 10:57:46 +01:00
parent dc6882ffec
commit 41eaf9aaab
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Rest/EndpointIp.cpp
View File

@ -122,7 +122,19 @@ TRI_socket_t EndpointIp::connectSocket (const struct addrinfo* aip,
}
if (_type == ENDPOINT_SERVER) {
// try to reuse address
#ifdef _WIN32
int excl = 1;
if (TRI_setsockopt(listenSocket, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
reinterpret_cast<char*> (&excl), sizeof (excl)) == -1) {
LOG_ERROR("setsockopt() failed with %d", WSAGetLastError());
TRI_CLOSE_SOCKET(listenSocket);
TRI_invalidatesocket(&listenSocket);
return listenSocket;
}
#else
// try to reuse address
if (_reuseAddress) {
int opt = 1;
if (TRI_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char*> (&opt), sizeof (opt)) == -1) {
@ -133,17 +145,6 @@ TRI_socket_t EndpointIp::connectSocket (const struct addrinfo* aip,
return listenSocket;
}
}
#ifdef _WIN32
int excl = 1;
if (TRI_setsockopt(listenSocket, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
reinterpret_cast<char*> (&excl), sizeof (excl)) == -1) {
LOG_ERROR("setsockopt() failed with %d (%s)", errno, strerror(errno));
TRI_CLOSE_SOCKET(listenSocket);
TRI_invalidatesocket(&listenSocket);
return listenSocket;
}
#endif
// server needs to bind to socket
@ -151,8 +152,11 @@ TRI_socket_t EndpointIp::connectSocket (const struct addrinfo* aip,
if (result != 0) {
// error
#ifndef _WIN32
LOG_ERROR("bind() failed with %d (%s)", errno, strerror(errno));
#else
LOG_ERROR("bind() failed with %d", WSAGetLastError());
#endif
TRI_CLOSE_SOCKET(listenSocket);
TRI_invalidatesocket(&listenSocket);