Merge pull request #39 from luntik2012/master

ported to mingw (mxe/gcc10)
nimbuscontrols · Jan 26, 2021 · 71a1797 · 71a1797
2 parents 8080537 + 7ef3285
commit 71a1797
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 20 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -55,6 +55,11 @@ set(SOURCE_FILES
 add_library(EIPScanner SHARED ${SOURCE_FILES})
 add_library(EIPScannerS STATIC ${SOURCE_FILES})
 
+if(WIN32)
+	target_link_libraries(EIPScanner ws2_32)
+	target_link_libraries(EIPScannerS ws2_32)
+endif()
+
 set_target_properties(
         EIPScanner
         PROPERTIES

diff --git a/src/DiscoveryManager.cpp b/src/DiscoveryManager.cpp
@@ -92,7 +92,7 @@ namespace eipScanner {
 		socket->setRecvTimeout(_receiveTimout);
 
 		int broadcast = 1;
-		if(setsockopt(socket->getSocketFd(), SOL_SOCKET, SO_BROADCAST, &broadcast, sizeof(broadcast)) < 0) {
+		if(setsockopt(socket->getSocketFd(), SOL_SOCKET, SO_BROADCAST, (char*)&broadcast, sizeof(broadcast)) < 0) {
 			throw std::system_error(errno, std::generic_category());
 		}
 

diff --git a/src/sockets/BaseSocket.cpp b/src/sockets/BaseSocket.cpp
@@ -2,8 +2,14 @@
 // Created by Aleksey Timin on 11/18/19.
 //
 
+#if defined(__linux__) || defined(__APPLE__)
 #include <sys/socket.h>
 #include <sys/select.h>
+#elif defined _WIN32
+#include <winsock2.h>
+#include <time.h>
+#endif
+
 #include <utility>
 #include <algorithm>
 #include <system_error>
@@ -36,8 +42,14 @@ namespace sockets {
 	void BaseSocket::setRecvTimeout(const std::chrono::milliseconds &recvTimeout) {
 		_recvTimeout = recvTimeout;
 
-		timeval tv = makePortableInterval(recvTimeout);
-		setsockopt(_sockedFd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof tv);
+#ifdef _WIN32
+                uint32_t ms = recvTimeout.count();
+                setsockopt(_sockedFd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&ms, sizeof ms);
+#else
+                timeval tv = makePortableInterval(recvTimeout);
+                setsockopt(_sockedFd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof tv);
+#endif
+
 	}
 
 	timeval BaseSocket::makePortableInterval(const std::chrono::milliseconds &recvTimeout) {
@@ -52,8 +64,8 @@ namespace sockets {
 
 #elif _WIN32
 		// not sure what the macro is for windows
-		.tv_sec = static_cast<_time64>(recvTimeout.count()/1000),
-		.tv_usec =  static_cast<_time64>((recvTimeout.count()%1000)*1000)
+		.tv_sec = static_cast<long int>(recvTimeout.count()/1000),
+		.tv_usec =  static_cast<long int>((recvTimeout.count()%1000)*1000)
 #endif
 
 		};

diff --git a/src/sockets/EndPoint.cpp b/src/sockets/EndPoint.cpp
@@ -3,7 +3,14 @@
 //
 
 #include "EndPoint.h"
+
+#if defined(__linux__) || defined(__APPLE__)
 #include <arpa/inet.h>
+#elif defined _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
+
 #include <system_error>
 #include <utility>
 
@@ -23,7 +30,11 @@ namespace sockets {
 
 		_addr.sin_family = AF_INET;
 		_addr.sin_port = htons(_port);
+#if defined(__linux__) || defined(__APPLE__)
 		if (inet_aton(_host.c_str(), &_addr.sin_addr) < 0) {
+#elif defined _WIN32
+		if ((_addr.sin_addr.s_addr = inet_addr(_host.c_str())) == INADDR_NONE) {
+#endif
 			throw std::system_error(errno, std::generic_category());
 		}
 	}
@@ -61,4 +72,4 @@ namespace sockets {
 		return _host + ":" + std::to_string(_port);
 	}
 }
-}
+}
diff --git a/src/sockets/EndPoint.h b/src/sockets/EndPoint.h
@@ -5,7 +5,11 @@
 #ifndef EIPSCANNER_SOCKETS_ENDPOINT_H
 #define EIPSCANNER_SOCKETS_ENDPOINT_H
 
+#if defined(__linux__) || defined(__APPLE__)
 #include <netinet/in.h>
+#elif defined _WIN32
+#include <winsock2.h>
+#endif
 #include <string>
 
 namespace eipScanner {

diff --git a/src/sockets/TCPSocket.cpp b/src/sockets/TCPSocket.cpp
@@ -3,15 +3,27 @@
 //
 
 #include <system_error>
+
+#ifdef __linux__
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#elif defined _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <time.h>
+#endif
+
 #include <unistd.h>
 #include <fcntl.h>
 
 #include "utils/Logger.h"
 #include "TCPSocket.h"
 
+#if !(defined __linux__) && !(defined SHUT_RDWR)
+#define SHUT_RDWR SD_BOTH
+#endif
+
 
 namespace eipScanner {
 	namespace sockets {
@@ -30,6 +42,7 @@ namespace eipScanner {
 			}
 
 			// Set non-blocking
+#ifdef __linux__
 			auto arg = fcntl(_sockedFd, F_GETFL, NULL);
 			if (arg < 0) {
 				throw std::system_error(errno, std::generic_category());
@@ -39,6 +52,7 @@ namespace eipScanner {
 			if (fcntl(_sockedFd, F_SETFL, arg) < 0) {
 				throw std::system_error(errno, std::generic_category());
 			}
+#endif
 
 			Logger(LogLevel::DEBUG) << "Opened socket fd=" << _sockedFd;
 
@@ -61,7 +75,7 @@ namespace eipScanner {
 							// Socket selected for write
 							int err;
 							socklen_t lon = sizeof(int);
-							if (getsockopt(_sockedFd, SOL_SOCKET, SO_ERROR, (void *) (&err), &lon) < 0) {
+							if (getsockopt(_sockedFd, SOL_SOCKET, SO_ERROR, (char *) (&err), &lon) < 0) {
 								throw std::system_error(errno, std::generic_category());
 							}
 							// Check the value returned...
@@ -77,6 +91,8 @@ namespace eipScanner {
 					throw std::system_error(errno, std::generic_category());
 				}
 			}
+
+#ifdef __linux__
 			// Set to blocking mode again...
 			if ((arg = fcntl(_sockedFd, F_GETFL, NULL)) < 0) {
 				throw std::system_error(errno, std::generic_category());
@@ -85,6 +101,7 @@ namespace eipScanner {
 			if (fcntl(_sockedFd, F_SETFL, arg) < 0) {
 				throw std::system_error(errno, std::generic_category());
 			}
+#endif
 		}
 
 
@@ -102,7 +119,7 @@ namespace eipScanner {
 		void TCPSocket::Send(const std::vector<uint8_t> &data) const {
 			Logger(LogLevel::TRACE) << "Send " << data.size() << " bytes from TCP socket #" << _sockedFd << ".";
 
-			int count = send(_sockedFd, data.data(), data.size(), 0);
+			int count = send(_sockedFd, (char*)data.data(), data.size(), 0);
 			if (count < data.size()) {
 				throw std::system_error(errno, std::generic_category());
 			}
@@ -113,7 +130,7 @@ namespace eipScanner {
 
 			int count = 0;
 			while (size > count) {
-				auto len = recv(_sockedFd, recvBuffer.data() + count, size - count, 0);
+				auto len = recv(_sockedFd, (char*)(recvBuffer.data() + count), size - count, 0);
 				count += len;
 				if (len < 0) {
 					throw std::system_error(errno, std::generic_category());
@@ -132,4 +149,4 @@ namespace eipScanner {
 			return recvBuffer;
 		}
 	}
-}
+}
diff --git a/src/sockets/UDPBoundSocket.cpp b/src/sockets/UDPBoundSocket.cpp
@@ -2,8 +2,10 @@
 // Created by Aleksey Timin on 11/21/19.
 //
 #include <system_error>
-#include <sys/socket.h>
-#include <netinet/in.h>
+
+//#include <sys/socket.h>
+//#include <netinet/in.h>
+
 #include "UDPBoundSocket.h"
 
 namespace eipScanner {
@@ -30,4 +32,4 @@ namespace sockets {
 
 	sockets::UDPBoundSocket::~UDPBoundSocket() = default;
 }
-}
+}
diff --git a/src/sockets/UDPBoundSocket.h b/src/sockets/UDPBoundSocket.h
@@ -8,7 +8,7 @@
 #include <vector>
 #include <chrono>
 #include <memory>
-#include <netinet/in.h>
+//#include <netinet/in.h>
 #include "UDPSocket.h"
 
 namespace eipScanner {

diff --git a/src/sockets/UDPSocket.cpp b/src/sockets/UDPSocket.cpp
@@ -3,9 +3,21 @@
 //
 
 #include <system_error>
+
+#ifdef __linux__
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#elif defined _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
+
+#if !(defined __linux__) && !(defined SHUT_RDWR)
+#define SHUT_RDWR SD_BOTH
+#endif
+
+
 #include <unistd.h>
 
 #include "utils/Logger.h"
@@ -45,7 +57,7 @@ namespace sockets {
 		Logger(LogLevel::TRACE) << "Send " << data.size() << " bytes from UDP socket #" << _sockedFd << ".";
 
 		auto addr = _remoteEndPoint.getAddr();
-		int count = sendto(_sockedFd, data.data(), data.size(), 0,
+		int count = sendto(_sockedFd, (char*)data.data(), data.size(), 0,
 				(struct sockaddr *)&addr, sizeof(addr));
 		if (count < data.size()) {
 			throw std::system_error(errno, std::generic_category());
@@ -55,7 +67,7 @@ namespace sockets {
 	std::vector<uint8_t> UDPSocket::Receive(size_t size) const {
 		std::vector<uint8_t> recvBuffer(size);
 
-		auto len = recvfrom(_sockedFd, recvBuffer.data(), recvBuffer.size(), 0, NULL, NULL);
+		auto len = recvfrom(_sockedFd, (char*)recvBuffer.data(), recvBuffer.size(), 0, NULL, NULL);
 		if (len < 0) {
 			throw std::system_error(errno, std::generic_category());
 		}
@@ -67,7 +79,7 @@ namespace sockets {
 		std::vector<uint8_t> recvBuffer(size);
 		struct sockaddr_in addr;
 		socklen_t addrFromLength = sizeof(addr);
-		auto len = recvfrom(_sockedFd, recvBuffer.data(), recvBuffer.size(), 0, (struct sockaddr*)&addr, &addrFromLength);
+		auto len = recvfrom(_sockedFd, (char*)recvBuffer.data(), recvBuffer.size(), 0, (struct sockaddr*)&addr, &addrFromLength);
 		if (len < 0) {
 			throw std::system_error(errno, std::generic_category());
 		}

diff --git a/src/sockets/UDPSocket.h b/src/sockets/UDPSocket.h
@@ -8,7 +8,6 @@
 #include <vector>
 #include <chrono>
 #include <memory>
-#include <netinet/in.h>
 #include "BaseSocket.h"
 
 namespace eipScanner {

diff --git a/src/utils/Buffer.cpp b/src/utils/Buffer.cpp
@@ -182,7 +182,7 @@ Buffer &Buffer::operator<<(float val) {
 		sockaddr_in addr = v.getAddr();
 		return *this << htons(static_cast<cip::CipInt>(addr.sin_family))
 					 << addr.sin_port
-					 << addr.sin_addr.s_addr
+					 << uint32_t(addr.sin_addr.s_addr)
 					 << zeros;
 	}
 
@@ -191,7 +191,7 @@ Buffer &Buffer::operator<<(float val) {
 		sockaddr_in addr{0};
 		*this >> reinterpret_cast<cip::CipInt&>(addr.sin_family)
 			 >> addr.sin_port
-			 >> addr.sin_addr.s_addr
+			 >> (uint32_t&)addr.sin_addr.s_addr
 			 >> zeros;
 
 		addr.sin_family =  htons(addr.sin_family);

diff --git a/src/utils/Logger.h b/src/utils/Logger.h
@@ -8,6 +8,10 @@
 #include <sstream>
 #include <memory>
 
+#ifdef _WIN32
+#undef ERROR
+#endif
+
 namespace eipScanner {
 namespace utils {