Merge pull request #47 from Broekman/master

Resolve Windows (MinGW) issues and minor improvements

Author: jadamroth

src/CMakeLists.txt

@@ -30,6 +30,7 @@ set(SOURCE_FILES
         sockets/TCPSocket.cpp
         sockets/UDPBoundSocket.cpp
         sockets/UDPSocket.cpp
+        sockets/Platform.cpp
 
         utils/Logger.cpp
         utils/Buffer.cpp

src/ConnectionManager.cpp

@@ -71,7 +71,7 @@ namespace eipScanner {
 		auto t2oSize = t2oNCP.getConnectionSize();
 
 		connectionParameters.connectionPathSize = (connectionParameters.connectionPath .size() / 2)
-				+ (connectionParameters.connectionPath .size() % 2);
+				+ (connectionParameters.connectionPath.size() % 2);
 
 		if ((connectionParameters.transportTypeTrigger & NetworkConnectionParams::CLASS1) > 0
 			|| (connectionParameters.transportTypeTrigger & NetworkConnectionParams::CLASS3) > 0) {
@@ -87,22 +87,17 @@ namespace eipScanner {
 			connectionParameters.t2oNetworkConnectionParams += 4;
 		}
 
-		Buffer buffer;
-		buffer << sockets::EndPoint("0.0.0.0", 2222);
-		eip::CommonPacketItem addrItem(eip::CommonPacketItemIds::T2O_SOCKADDR_INFO, buffer.data());
-
-
 		MessageRouterResponse messageRouterResponse;
 		if (isLarge) {
 			LargeForwardOpenRequest request(connectionParameters);
 			messageRouterResponse = _messageRouter->sendRequest(si,
 				static_cast<cip::CipUsint>(ConnectionManagerServiceCodes::LARGE_FORWARD_OPEN),
-				EPath(6, 1), request.pack(), {addrItem});
+				EPath(6, 1), request.pack(), {});
 		} else {
 			ForwardOpenRequest request(connectionParameters);
 			messageRouterResponse = _messageRouter->sendRequest(si,
 				static_cast<cip::CipUsint>(ConnectionManagerServiceCodes::FORWARD_OPEN),
-				EPath(6, 1), request.pack(), {addrItem});
+				EPath(6, 1), request.pack(), {});
 		}
 
 		IOConnection::SPtr ioConnection;
@@ -148,15 +143,15 @@ namespace eipScanner {
 				} else {
 					ioConnection->_socket = std::make_unique<UDPSocket>(endPoint);
 				}
-				
+
 			} else {
-				ioConnection->_socket = std::make_unique<UDPSocket>(si->getRemoteEndPoint().getHost(), 2222);	
+				ioConnection->_socket = std::make_unique<UDPSocket>(si->getRemoteEndPoint().getHost(), EIP_DEFAULT_IMPLICIT_PORT);
 			}
 
 			Logger(LogLevel::INFO) << "Open UDP socket to send data to "
 					<< ioConnection->_socket->getRemoteEndPoint().toString();
 
-			findOrCreateSocket(sockets::EndPoint(si->getRemoteEndPoint().getHost(), 2222));
+			findOrCreateSocket(sockets::EndPoint(si->getRemoteEndPoint().getHost(), EIP_DEFAULT_IMPLICIT_PORT));
 
 			auto result = _connectionMap
 					.insert(std::make_pair(response.getT2ONetworkConnectionId(), ioConnection));
@@ -202,6 +197,7 @@ namespace eipScanner {
 			}
 
 			auto rc = _connectionMap.erase(ptr->_t2oNetworkConnectionId);
+			(void) rc;
 			assert(rc);
 		} else {
 			Logger(LogLevel::WARNING) << "Attempt to close an already closed connection";
@@ -212,6 +208,7 @@ namespace eipScanner {
 		std::vector<BaseSocket::SPtr > sockets;
 		std::transform(_socketMap.begin(), _socketMap.end(), std::back_inserter(sockets), [](auto entry) {
 			auto fd = entry.second->getSocketFd();
+			(void) fd;
 			return entry.second;
 		});
 
@@ -235,6 +232,7 @@ namespace eipScanner {
 			auto newSocket = std::make_shared<UDPBoundSocket>(endPoint);
 			_socketMap[endPoint] = newSocket;
 			newSocket->setBeginReceiveHandler([](sockets::BaseSocket& sock) {
+			  (void) sock;
 				Logger(LogLevel::DEBUG) << "Received something";
 			});
 
@@ -253,7 +251,7 @@ namespace eipScanner {
 				if (io != _connectionMap.end()) {
 					io->second->notifyReceiveData(commonPacket.getItems().at(1).getData());
 				} else {
-					Logger(LogLevel::ERROR) << "Received data from unknow connection T2O_ID=" << connectionId;
+					Logger(LogLevel::ERROR) << "Received data from unknown connection T2O_ID=" << connectionId;
 				}
 			});
 

src/DiscoveryManager.cpp

@@ -2,7 +2,6 @@
 // Created by Aleksey Timin on 12/17/19.
 //
 #include <system_error>
-#include <cerrno>
 
 #include "eip/EncapsPacketFactory.h"
 #include "eip/CommonPacket.h"
@@ -11,6 +10,13 @@
 #include "utils/Buffer.h"
 
 #include "DiscoveryManager.h"
+#include "sockets/Platform.h"
+
+#if defined (__unix__) || defined(__APPLE__)
+#define DISCOVERY_SOCKET_RECEIVE_END_ERROR_CODE (EIPSCANNER_SOCKET_ERROR(EAGAIN))
+#elif defined(_WIN32) || defined(WIN32) || defined(_WIN64)
+#define DISCOVERY_SOCKET_RECEIVE_END_ERROR_CODE (EIPSCANNER_SOCKET_ERROR(ETIMEDOUT))
+#endif
 
 namespace eipScanner {
 	using namespace cip;
@@ -79,7 +85,7 @@ namespace eipScanner {
 				}
 			}
 		} catch (std::system_error& er) {
-			if (er.code().value() != EAGAIN) {
+			if (er.code().value() != DISCOVERY_SOCKET_RECEIVE_END_ERROR_CODE) {
 				throw er;
 			}
 		}
@@ -93,7 +99,7 @@ namespace eipScanner {
 
 		int broadcast = 1;
 		if(setsockopt(socket->getSocketFd(), SOL_SOCKET, SO_BROADCAST, (char*)&broadcast, sizeof(broadcast)) < 0) {
-			throw std::system_error(errno, std::generic_category());
+			throw std::system_error(sockets::BaseSocket::getLastError(), sockets::BaseSocket::getErrorCategory());
 		}
 
 		return socket;

src/DiscoveryManager.h

@@ -37,7 +37,7 @@ namespace eipScanner {
 		/**
 		 * @brief default destructor
 		 */
-		~DiscoveryManager();
+		virtual ~DiscoveryManager();
 
 		/**
 		 * @brief Discovers the EIP network

src/IOConnection.cpp

@@ -31,20 +31,20 @@ namespace eipScanner {
 			, _connectionTimeoutMultiplier{0}
 			, _connectionTimeoutCount{0}
 			, _o2tSequenceNumber{0}
+			, _t2oSequenceNumber{0}
+			, _serialNumber{0}
 			, _transportTypeTrigger{0}
 			, _o2tRealTimeFormat{0}
 			, _t2oRealTimeFormat{0}
-			, _t2oSequenceNumber{0}
 			, _sequenceValueCount{0}
 			, _connectionPath(0)
 			, _originatorVendorId{0}
 			, _originatorSerialNumber{0}
-			, _serialNumber{0}
 			, _outputData()
-			, _lastHandleTime(std::chrono::steady_clock::now())
-			, _receiveDataHandle([](auto a, auto b, auto data) {})
-			, _sendDataHandle([](auto data) {})
-			, _closeHandle([]() {}) {
+			, _receiveDataHandle([](auto, auto, auto) {})
+			, _closeHandle([]() {})
+			, _sendDataHandle([](auto) {})
+			, _lastHandleTime(std::chrono::steady_clock::now()) {
 	}
 
 	IOConnection::~IOConnection() = default;

src/IdentityObject.cpp

@@ -8,7 +8,7 @@
 namespace eipScanner {
 	using namespace cip;
 	using utils::Buffer;
-	
+
 	IdentityObject::IdentityObject(cip::CipUint instanceId)
 		: BaseObject(CLASS_ID, instanceId)
 		, _vendorId(0)
@@ -25,7 +25,14 @@ namespace eipScanner {
 	}
 
 	IdentityObject::IdentityObject(cip::CipUint instanceId, const SessionInfoIf::SPtr &si, const MessageRouter::SPtr &messageRouter)
-		: BaseObject(CLASS_ID, instanceId) {
+		: BaseObject(CLASS_ID, instanceId)
+	  , _vendorId(0)
+	  , _deviceType(0)
+	  , _productCode(0)
+	  , _revision(0,0)
+	  , _status(0)
+	  , _serialNumber(0)
+	  , _productName("") {
 
 		auto response = messageRouter->sendRequest(
 				si,
@@ -105,4 +112,4 @@ namespace eipScanner {
 	void IdentityObject::setProductName(const std::string &productName) {
 		_productName = CipShortString(productName);
 	}
-}
+}

src/MessageRouter.cpp

@@ -82,4 +82,4 @@ namespace eipScanner {
 	MessageRouter::sendRequest(SessionInfoIf::SPtr si, CipUsint service, const EPath &path) const {
 		return this->sendRequest(si, service, path, {}, {});
 	}
-}
+}

src/ParameterObject.cpp

@@ -43,12 +43,15 @@ namespace eipScanner {
     ParameterObject::ParameterObject(cip::CipUint instanceId, bool fullAttributes, size_t typeSize)
             :  BaseObject(CLASS_ID, instanceId)
             , _hasFullAttributes(fullAttributes)
+            , _isScalable(false)
+            , _isReadOnly(false)
+            , _parameter(0)
             , _value(typeSize)
-            , _maxValue(typeSize)
+            , _type(CipDataTypes::ANY)
+            , _name{""}
             , _minValue(typeSize)
+            , _maxValue(typeSize)
             , _defaultValue(typeSize)
-            , _isScalable(false)
-            , _isReadOnly(false)
             , _scalingMultiplier(1)
             , _scalingDivisor(1)
             , _scalingBase(1)
@@ -60,10 +63,16 @@ namespace eipScanner {
                                      const SessionInfoIf::SPtr &si,
                                      const MessageRouter::SPtr& messageRouter)
             :  BaseObject(CLASS_ID, instanceId)
-            , _name{""}
-            , _hasFullAttributes{fullAttributes}
-            , _isScalable{false}
+            , _hasFullAttributes(fullAttributes)
+            , _isScalable(false)
             , _isReadOnly(false)
+            , _parameter(0)
+            , _value(0)
+            , _type(CipDataTypes::ANY)
+            , _name{""}
+            , _minValue(0)
+            , _maxValue(0)
+            , _defaultValue(0)
             , _scalingMultiplier(1)
             , _scalingDivisor(1)
             , _scalingBase(1)
@@ -302,4 +311,4 @@ namespace eipScanner {
 			return engValue;
 		}
 	}
-};
+}

src/ParameterObject.h

@@ -363,7 +363,7 @@ class ParameterObject : public BaseObject {
 	bool _isScalable;
 	bool _isReadOnly;
 
-    cip::CipUint _parameter;
+  cip::CipUint _parameter;
 	std::vector<uint8_t> _value;
 	cip::CipDataTypes _type;
 	std::string _name;

src/cip/EPath.cpp

@@ -165,4 +165,4 @@ namespace cip {
 			&& _attributeId == other._attributeId;
 	}
 }
-}
+}