[checkmk-commits] Windows agent: allocate sockaddr_in* from stack

Module: check_mk Branch: master Commit: 0818642b26b50965c3c079c082386995c48720ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0818642b26b509… Author: Jukka Aro &lt;ja(a)mathias-kettner.de&gt; Date: Mon Feb 26 14:36:02 2018 +0100 Windows agent: allocate sockaddr_in* from stack Heap allocation is totally unnecessary. Using std::unique_ptr is potentially dangerous as sockaddr_in and sockaddr_in6 are not inherited from sockaddr and default-deleting will not work by default. --- agents/windows/ListenSocket.cc | 62 ++++++++++++++++++++++-------------------- agents/windows/ListenSocket.h | 1 - agents/windows/build_version | 2 +- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index 122a484..d52bb49 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -119,26 +119,33 @@ SOCKET ListenSocket::init_listen_socket(int port) { SOCKET s = RemoveSocketInheritance(tmp_s); int addr_size = 0; - std::unique_ptr<SOCKADDR> addr(create_sockaddr(&addr_size)); + SOCKADDR *addr = nullptr; + SOCKADDR_IN6 addr6{0}; + SOCKADDR_IN addr4{0}; int optval = 1; - _winapi.setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&optval, - sizeof(optval)); + _winapi.setsockopt(s, SOL_SOCKET, SO_REUSEADDR, + reinterpret_cast<const char *>(&optval), sizeof(optval)); if (_use_ipv6) { - ((SOCKADDR_IN6 *)addr.get())->sin6_port = _winapi.htons(port); - + addr6.sin6_port = _winapi.htons(port); int v6only = 0; if (_winapi.setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&v6only, sizeof(int)) != 0) { Notice(_logger) << "failed to disable ipv6 only flag"; _supports_ipv4 = false; } + addr = reinterpret_cast<SOCKADDR *>(&addr6); + addr->sa_family = AF_INET6; + addr_size = sizeof(SOCKADDR_IN6); } else { - ((SOCKADDR_IN *)addr.get())->sin_port = _winapi.htons(port); - ((SOCKADDR_IN *)addr.get())->sin_addr.S_un.S_addr = ADDR_ANY; + addr4.sin_port = _winapi.htons(port); + addr4.sin_addr.S_un.S_addr = ADDR_ANY; + addr = reinterpret_cast<SOCKADDR *>(&addr4); + addr->sa_family = AF_INET; + addr_size = sizeof(SOCKADDR_IN); } - if (SOCKET_ERROR == _winapi.bind(s, addr.get(), addr_size)) { + if (SOCKET_ERROR == _winapi.bind(s, addr, addr_size)) { int error_id = _winapi.WSAGetLastError(); Error(_logger) << "Cannot bind socket to port " << port << ": " << get_win_error_as_string(_winapi, error_id) << " (" @@ -187,29 +194,12 @@ std::string ListenSocket::readableIP(const sockaddr_storage *addr) { return ip_hr; } -sockaddr *ListenSocket::create_sockaddr(int *addr_len) const { - assert(addr_len != NULL); - - sockaddr *result = NULL; - if (_use_ipv6) { - result = (sockaddr *)new sockaddr_in6(); - *addr_len = sizeof(sockaddr_in6); - } else { - result = (sockaddr *)new sockaddr_in(); - *addr_len = sizeof(sockaddr_in); - } - memset((void *)result, 0, *addr_len); - result->sa_family = _use_ipv6 ? AF_INET6 : AF_INET; - - return result; -} - SocketHandle ListenSocket::acceptConnection() const { // Loop forever. fd_set fds; FD_ZERO(&fds); FD_SET(_socket.get(), &fds); - struct timeval timeout; + struct timeval timeout{0}; timeout.tv_sec = 0; timeout.tv_usec = 500000; @@ -217,11 +207,23 @@ SocketHandle ListenSocket::acceptConnection() const { // never return while (1 == _winapi.select(1, &fds, NULL, NULL, &timeout)) { int addr_len = 0; - std::unique_ptr<sockaddr> remote_addr(create_sockaddr(&addr_len)); - SOCKET rawSocket = - _winapi.accept(_socket.get(), remote_addr.get(), &addr_len); + SOCKADDR *remoteAddr = nullptr; + SOCKADDR_IN6 addr6{0}; + SOCKADDR_IN addr4{0}; + + if (_use_ipv6) { + remoteAddr = reinterpret_cast<SOCKADDR *>(&addr6); + remoteAddr->sa_family = AF_INET6; + addr_len = sizeof(SOCKADDR_IN6); + } else { + remoteAddr = reinterpret_cast<SOCKADDR *>(&addr4); + remoteAddr->sa_family = AF_INET; + addr_len = sizeof(SOCKADDR_IN); + } + + SOCKET rawSocket = _winapi.accept(_socket.get(), remoteAddr, &addr_len); SocketHandle connection(RemoveSocketInheritance(rawSocket), _winapi); - if (connection && check_only_from(remote_addr.get())) { + if (connection && check_only_from(remoteAddr)) { return connection; } } diff --git a/agents/windows/ListenSocket.h b/agents/windows/ListenSocket.h index af30004..7801728 100644 --- a/agents/windows/ListenSocket.h +++ b/agents/windows/ListenSocket.h @@ -60,7 +60,6 @@ public: private: SOCKET init_listen_socket(int port); bool check_only_from(sockaddr *ip) const; - sockaddr *create_sockaddr(int *addr_len) const; SOCKET RemoveSocketInheritance(SOCKET oldsocket) const; Logger *_logger; diff --git a/agents/windows/build_version b/agents/windows/build_version index fc9dc43..96d3ba4 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3121 +3122