This is an automated email from the ASF dual-hosted git repository. lordgamez pushed a commit to branch MINIFICPP-2152 in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 5fd7ffdf02595d6efd70e300d50d455a20958b22 Author: Gabor Gyimesi <gamezb...@gmail.com> AuthorDate: Tue Aug 1 11:44:55 2023 +0200 Review update --- libminifi/include/utils/net/DNS.h | 3 --- libminifi/include/utils/net/Socket.h | 7 +------ libminifi/src/utils/net/DNS.cpp | 9 +-------- libminifi/src/utils/net/Socket.cpp | 6 ++++++ 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/libminifi/include/utils/net/DNS.h b/libminifi/include/utils/net/DNS.h index 6117f5892..da8153b0e 100644 --- a/libminifi/include/utils/net/DNS.h +++ b/libminifi/include/utils/net/DNS.h @@ -22,11 +22,8 @@ #include <system_error> #include "nonstd/expected.hpp" -#include "IpProtocol.h" #include "asio/ip/address.hpp" -struct addrinfo; - namespace org::apache::nifi::minifi::utils::net { nonstd::expected<asio::ip::address, std::error_code> addressFromString(std::string_view ip_address_str); diff --git a/libminifi/include/utils/net/Socket.h b/libminifi/include/utils/net/Socket.h index 7a67d5e81..479067758 100644 --- a/libminifi/include/utils/net/Socket.h +++ b/libminifi/include/utils/net/Socket.h @@ -23,16 +23,11 @@ #endif /* WIN32_LEAN_AND_MEAN */ #include <WinSock2.h> #else -#include <netdb.h> +#include <sys/socket.h> #endif /* WIN32 */ namespace org::apache::nifi::minifi::utils::net { -/** - * Return the last socket error code, based on errno on posix and WSAGetLastError() on windows. - */ -std::error_code get_last_socket_error(); - std::string sockaddr_ntop(const sockaddr* sa); } // namespace org::apache::nifi::minifi::utils::net diff --git a/libminifi/src/utils/net/DNS.cpp b/libminifi/src/utils/net/DNS.cpp index c7c47a60e..9823bc5dd 100644 --- a/libminifi/src/utils/net/DNS.cpp +++ b/libminifi/src/utils/net/DNS.cpp @@ -16,14 +16,7 @@ */ #include "utils/net/DNS.h" -#ifdef WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include <winsock2.h> -#include <ws2tcpip.h> -#else -#include <netdb.h> +#ifndef WIN32 #include <cstring> #endif /* WIN32 */ diff --git a/libminifi/src/utils/net/Socket.cpp b/libminifi/src/utils/net/Socket.cpp index fd435d5f9..6b6ac2b84 100644 --- a/libminifi/src/utils/net/Socket.cpp +++ b/libminifi/src/utils/net/Socket.cpp @@ -17,6 +17,9 @@ #include "utils/net/Socket.h" #ifdef WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif /* WIN32_LEAN_AND_MEAN */ #include <ws2tcpip.h> #else #include <arpa/inet.h> @@ -25,6 +28,8 @@ #include "Exception.h" namespace org::apache::nifi::minifi::utils::net { + +namespace { std::error_code get_last_socket_error() { #ifdef WIN32 const auto error_code = WSAGetLastError(); @@ -33,6 +38,7 @@ std::error_code get_last_socket_error() { #endif /* WIN32 */ return {error_code, std::system_category()}; } +} // namespace std::string sockaddr_ntop(const sockaddr* const sa) { std::string result;