Attempt at windows socket fix.

ess-dmsc · Feb 23, 2017 · 8c014c4 · 8c014c4
1 parent d2df380
commit 8c014c4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/include/graylog_logger/GraylogConnection.hpp b/include/graylog_logger/GraylogConnection.hpp
@@ -74,4 +74,7 @@ class GraylogConnection {
     mutable std::mutex stateMutex;
     ConStatus retConState;
     ConcurrentQueue<ConStatus> stateQueue;
+#ifdef _WIN32
+    WSADATA wsaData;
+#endif
 };
diff --git a/src/GraylogConnection.cpp b/src/GraylogConnection.cpp
@@ -34,10 +34,16 @@
 
 GraylogConnection::GraylogConnection(std::string host, int port) : closeThread(false), host(host), port(std::to_string(port)), socketFd(-1), conAddresses(NULL), connectionTries(0), firstMessage(true) {
     retConState = GraylogConnection::ConStatus::NONE;
+#ifdef _WIN32
+    WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
     connectionThread = std::thread(&GraylogConnection::ThreadFunction, this);
 }
 
 GraylogConnection::~GraylogConnection() {
+#ifdef _WIN32
+    WSACleanup();
+#endif
     EndThread();
 }
 
@@ -67,6 +73,7 @@ void GraylogConnection::MakeConnectionHints() {
     //hints.ai_family = AF_UNSPEC; //Accept both IPv4 and IPv6
     hints.ai_family = AF_INET; //Accept only IPv4
     hints.ai_socktype = SOCK_STREAM; //Use TCP
+    hints.ai_protocol = IPPROTO_TCP;
 }
 
 void GraylogConnection::GetServerAddr() {