tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 13:45:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6405 from Icinga/bugfix/windows-reload-behaviour-6378

Browse Source 
TcpSocket#Bind(): reuse socket addresses on Windows, too
This commit is contained in:
Michael Friedrich 2018-06-22 12:25:28 +02:00 committed by GitHub
commit ba680dc829
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/tcpsocket.cpp
View File

@ -89,10 +89,8 @@ void TcpSocket::Bind(const String& node, const String& service, int family)
const int optFalse = 0; const int optFalse = 0;
setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char *>(&optFalse), sizeof(optFalse)); setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char *>(&optFalse), sizeof(optFalse));
#ifndef _WIN32
const int optTrue = 1; const int optTrue = 1;
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<const char *>(&optTrue), sizeof(optTrue)); setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<const char *>(&optTrue), sizeof(optTrue));
#endif /* _WIN32 */
int rc = bind(fd, info->ai_addr, info->ai_addrlen); int rc = bind(fd, info->ai_addr, info->ai_addrlen);