Fix gethostbyname

Author: beckdave

inc/finalmq/streamconnection/AddressHelpers.h

@@ -28,6 +28,7 @@
 #include <string>
 
 struct sockaddr;
+struct in_addr;
 
 namespace finalmq {
 
@@ -40,6 +41,7 @@ class SYMBOLEXP AddressHelpers
     static ConnectionData endpoint2ConnectionData(const std::string& endpoint);
     static void addr2peer(sockaddr* addr, ConnectionData& connectionData);
     static std::string makeSocketAddress(const std::string& hostname, int port, int af, bool asyncGetHostByName, bool& doAsyncGetHostByName);
+    static bool getHostByName(const std::string& hostname, struct in_addr& ipAddress);
 };
 
 }   // namespace finalmq

src/streamconnection/AddressHelpers.cpp

@@ -35,6 +35,10 @@
 #include <sys/un.h>
 #endif
 
+#if defined(WIN32)
+#include <ws2tcpip.h>
+#endif
+
 #ifdef __QNX__
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -144,6 +148,25 @@ ConnectionData AddressHelpers::endpoint2ConnectionData(const std::string& endpoi
     return connectionData;
 }
 
+bool AddressHelpers::getHostByName(const std::string& hostname, struct in_addr& ipAddress)
+{
+    struct addrinfo hints;
+    struct addrinfo* result = nullptr;
+
+    std::memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+    const int status = getaddrinfo(hostname.c_str(), nullptr, &hints, &result);
+    if (status == 0 && result)
+    {
+        struct sockaddr_in* ipv4 = reinterpret_cast<struct sockaddr_in*>(result->ai_addr);
+        ipAddress.s_addr = ipv4->sin_addr.s_addr;
+        return true;
+    }
+    return false;
+}
+
+
 std::string AddressHelpers::makeSocketAddress(const std::string& hostname, int port, int af, bool asyncGetHostByName, bool& doAsyncGetHostByName)
 {
     const sockaddr* addr = nullptr;
@@ -172,16 +195,17 @@ std::string AddressHelpers::makeSocketAddress(const std::string& hostname, int p
             else
             {
                 addrlen = sizeof(addrTcp);
-                struct hostent* hp = gethostbyname(hname.c_str());
-                if (hp)
+                struct in_addr ipAddress;
+                const bool ok = getHostByName(hname, ipAddress);
+                if (ok)
                 {
                     memset(&addrTcp, 0, addrlen);
 #ifdef WIN32
                     addrTcp.sin_family = static_cast<ADDRESS_FAMILY>(af);
 #else
                     addrTcp.sin_family = static_cast<in_port_t>(af);
 #endif
-                    addrTcp.sin_addr.s_addr = reinterpret_cast<struct in_addr*>(hp->h_addr)->s_addr;
+                    addrTcp.sin_addr.s_addr = ipAddress.s_addr;
                     addrTcp.sin_port = htons(static_cast<std::uint16_t>(port));
                     addr = reinterpret_cast<sockaddr*>(&addrTcp);
                 }

src/streamconnection/StreamConnectionContainer.cpp

@@ -384,20 +384,18 @@ bool StreamConnectionContainer::connect(const std::string& endpoint, const IStre
         ret = true;
         std::string hostname = connectionData.hostname;
         m_executorWorker->addAction([this, connectionData, connection, connectionPropertiesToUse]() mutable {
-            bool ok = false;
-            struct in_addr addr1;
-            struct hostent* hp = gethostbyname(connectionData.hostname.c_str());
-            if (hp)
+            struct in_addr ipAddress;
+            bool ok = AddressHelpers::getHostByName(connectionData.hostname, ipAddress);
+            if (ok)
             {
-                addr1 = *(reinterpret_cast<struct in_addr*>(hp->h_addr));
                 struct sockaddr_in addrTcp;
                 memset(&addrTcp, 0, sizeof(sockaddr_in));
 #ifdef WIN32
                 addrTcp.sin_family = static_cast<ADDRESS_FAMILY>(connectionData.af);
 #else
                 addrTcp.sin_family = static_cast<in_port_t>(connectionData.af);
 #endif
-                addrTcp.sin_addr.s_addr = addr1.s_addr;
+                addrTcp.sin_addr.s_addr = ipAddress.s_addr;
                 addrTcp.sin_port = htons(static_cast<std::int16_t>(connectionData.port));
                 connectionData.sockaddr = std::string(reinterpret_cast<const char*>(&addrTcp), sizeof(sockaddr_in));
                 ok = createSocket(connection, connectionData, connectionPropertiesToUse);