yet again make Win32 compiles work correctly;

src/fne/FNEMain.cpp

@@ -22,6 +22,11 @@ using namespace lookups;
 
 #include <signal.h>
 
+#if defined(_WIN32)
+#include <ws2tcpip.h>
+#include <Winsock2.h>
+#endif // !defined(_WIN32)
+
 // ---------------------------------------------------------------------------
 //  Macros
 // ---------------------------------------------------------------------------
@@ -175,6 +180,14 @@ int checkArgs(int argc, char* argv[])
 #if !defined(CATCH2_TEST_COMPILATION)
 int main(int argc, char** argv)
 {
+#if defined(_WIN32)
+    WSAData data;
+    int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
+    if (wsaRet != 0) {
+        ::LogError(LOG_NET, "Error from WSAStartup, err: %d", wsaRet);
+    }
+#endif // defined(_WIN32)
+
     g_gitHashBytes = new uint8_t[4U];
     ::memset(g_gitHashBytes, 0x00U, 4U);
 
@@ -226,6 +239,10 @@ int main(int argc, char** argv)
     ::LogFinalise();
     ::ActivityLogFinalise();
 
+#if defined(_WIN32)
+    ::WSACleanup();
+#endif // defined(_WIN32)
+
     return ret;
 }
 #endif

src/fne/network/influxdb/InfluxDB.cpp

@@ -75,7 +75,11 @@ int detail::inner::request(const char* method, const char* uri, const std::strin
     // open the socket
     fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
     if (fd < 0) {
+#if defined(_WIN32)
+        ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, err: %lu", ::GetLastError());
+#else
         ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, err: %d", errno);
+#endif // defined(_WIN32)
         closesocket(fd);
         return 1;
     }
@@ -83,8 +87,8 @@ int detail::inner::request(const char* method, const char* uri, const std::strin
     // set SO_REUSEADDR option
     const int sockOptVal = 1;
 #if defined(_WIN32)
-    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&sockOptVal, sizeof(int)) < 0) {
+    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&sockOptVal, sizeof(int)) != 0) {
-        ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, err: %d", errno);
+        ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, err: %lu", ::GetLastError());
         closesocket(fd);
         return 1;
     }
@@ -94,9 +98,17 @@ int detail::inner::request(const char* method, const char* uri, const std::strin
         closesocket(fd);
         return 1;
     }
-#endif
+#endif // defined(_WIN32)
 
     // setup socket for non-blocking operations
+#if defined(_WIN32)
+    u_long flags = 1;
+    if (ioctlsocket(fd, FIONBIO, &flags) != 0) {
+        ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, failed ioctlsocket, err: %d", errno);
+        closesocket(fd);
+        return 1;
+    }
+#else
     int flags = fcntl(fd, F_GETFL, 0);
     if (flags < 0) {
         ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, failed fcntl(F_GETFL), err: %d", errno);
@@ -109,6 +121,7 @@ int detail::inner::request(const char* method, const char* uri, const std::strin
         closesocket(fd);
         return 1;
     }
+#endif // defined(_WIN32)
 
     fd_set fdset;
     struct timeval tv;
@@ -126,10 +139,15 @@ int detail::inner::request(const char* method, const char* uri, const std::strin
 
                 ret = select(fd + 1, NULL, &fdset, NULL, &tv);
                 if (ret < 0 && errno != EINTR) {
+#if defined(_WIN32)
+                    ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, err: %lu", ::GetLastError());
+#else
                     ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, err: %d", errno);
+#endif // defined(_WIN32)
                     closesocket(fd);
                     return 1;
                 } else if (ret > 0) {
+#if !defined(_WIN32)
                     // socket selected for write
                     int valopt;
                     socklen_t slen = sizeof(int);
@@ -145,6 +163,7 @@ int detail::inner::request(const char* method, const char* uri, const std::strin
                         closesocket(fd);
                         return 1;
                     }
+#endif // !defined(_WIN32)
                     break;
                 } else {
                     ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, timed out while connecting");
@@ -156,6 +175,14 @@ int detail::inner::request(const char* method, const char* uri, const std::strin
     }
 
     // reset socket blocking operations
+#if defined(_WIN32)
+    flags = 0;
+    if (ioctlsocket(fd, FIONBIO, &flags) != 0) {
+        ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, failed ioctlsocket, err: %d", errno);
+        closesocket(fd);
+        return 1;
+    }
+#else
     flags = fcntl(fd, F_GETFL, 0);
     if (flags < 0) {
         ::LogError(LOG_HOST, "Failed to connect to InfluxDB server, failed fcntl(F_GETFL), err: %d", errno);
@@ -168,11 +195,17 @@ int detail::inner::request(const char* method, const char* uri, const std::strin
         closesocket(fd);
         return 1;
     }
+#endif // defined(_WIN32)
 
     // ensure the remaining TCP operations timeout
+#if defined(_WIN32)
+    int sendTimeout = SOCK_CONNECT_TIMEOUT;
+    setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (const char*)&sendTimeout, sizeof(sendTimeout));
+#else
     tv.tv_sec = SOCK_CONNECT_TIMEOUT;
     tv.tv_usec = 0;
     setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+#endif // defined(_WIN32)
 
     header.resize(len = 0x100);
     while (true) {