Bugfix: Deal with error code for bind()

diff --git a/base/tcpsocket.cpp b/base/tcpsocket.cpp
index 9f08ae2f09722c90819b5260b4488e2c77a70d51..e6bfe5d70fb8065a8dca5be096f7cd6ecf88f4f3 100644 (file)
--- a/base/tcpsocket.cpp
+++ b/base/tcpsocket.cpp
@@ -60,11 +60,15 @@ void TCPSocket::Bind(string node, string service, int family)
                int rc = ::bind(fd, info->ai_addr, info->ai_addrlen);
 
 #ifdef _WIN32
-       if (rc < 0 && WSAGetLastError() != WSAEWOULDBLOCK)
+               if (rc < 0 && WSAGetLastError() != WSAEWOULDBLOCK) {
 #else /* _WIN32 */
-       if (rc < 0 && errno != EINPROGRESS)
+               if (rc < 0 && errno != EINPROGRESS) {
 #endif /* _WIN32 */
+                       closesocket(fd);
+                       SetFD(INVALID_SOCKET);
+
                        continue;
+               }
 
                break;
        }

diff --git a/icinga-app/icinga3.conf b/icinga-app/icinga3.conf
index ceb61f084b428fda465ecb84365bab558415c0dc..c72f195a93ee9f6cf7fc9a967f3a6f8e6903c2e2 100644 (file)
--- a/icinga-app/icinga3.conf
+++ b/icinga-app/icinga3.conf
@@ -5,7 +5,7 @@
                        "pubkey": "icinga-c3.crt",
                        "cakey": "ca.crt",
                        "node": "10.0.10.14",
-                       "service": "8888"
+                       "service": "9999"
                }
        },
        "component": {
@@ -14,7 +14,7 @@
                "discovery": { "replicate": "0", "broker": "0" }
        },
        "rpclistener": {
-               "kekslistener": { "replicate": "0", "service": "8888" }
+               "kekslistener": { "replicate": "0", "service": "9999" }
        },
        "broker": {
                "icinga-c1": { "replicate": "0", "node": "10.0.10.3", "service": "7777" }