From fd4c9d96f685ad0da33d2bbc38d826c4007a6009 Mon Sep 17 00:00:00 2001
From: somi <zirguo7@sjtu.edu.cn>
Date: Tue, 16 Sep 2025 17:01:13 +0800
Subject: [PATCH] 	modified:   src/DiscoveryManager.h 	modified:  
 src/eip/EncapsPacket.cpp 	modified:   src/eip/EncapsPacket.h 
 modified:   src/sockets/BaseSocket.cpp 	modified:  
 src/sockets/BaseSocket.h 	modified:   src/sockets/EndPoint.cpp 
 modified:   src/sockets/EndPoint.h

---
 src/DiscoveryManager.h     | 2 +-
 src/eip/EncapsPacket.cpp   | 4 ++++
 src/eip/EncapsPacket.h     | 4 ++++
 src/sockets/BaseSocket.cpp | 2 +-
 src/sockets/BaseSocket.h   | 4 +++-
 src/sockets/EndPoint.cpp   | 4 ++--
 src/sockets/EndPoint.h     | 3 ++-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/DiscoveryManager.h b/src/DiscoveryManager.h
index 7d7ed0d..f734fd1 100644
--- a/src/DiscoveryManager.h
+++ b/src/DiscoveryManager.h
@@ -8,7 +8,7 @@
 #include "IdentityObject.h"
 #include "sockets/Platform.h"
 
-#if defined (__unix__) || defined(__APPLE__) || defined(SYLIXOS) || defined(WA_ADAPTORED_RTOS)
+#if defined (__unix__) || defined(__APPLE__) || defined(SYLIXOS) || defined(WA_ADAPTORED_RTOS) || defined(ONEOSMULTI)
 #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))
diff --git a/src/eip/EncapsPacket.cpp b/src/eip/EncapsPacket.cpp
index 64d2ed3..9d8d553 100644
--- a/src/eip/EncapsPacket.cpp
+++ b/src/eip/EncapsPacket.cpp
@@ -7,6 +7,10 @@
 #include "EncapsPacket.h"
 #include "utils/Buffer.h"
 
+#ifdef ONEOSMULTI
+#undef NOP
+#endif
+
 using eipScanner::utils::Buffer;
 
 namespace eipScanner {
diff --git a/src/eip/EncapsPacket.h b/src/eip/EncapsPacket.h
index 1d39ba1..953be63 100644
--- a/src/eip/EncapsPacket.h
+++ b/src/eip/EncapsPacket.h
@@ -12,6 +12,10 @@
 #include "cip/Types.h"
 #include <vector>
 
+#ifdef ONEOSMULTI
+#undef NOP
+#endif
+
 namespace eipScanner {
 namespace eip {
 	enum class EncapsCommands : cip::CipUint {
diff --git a/src/sockets/BaseSocket.cpp b/src/sockets/BaseSocket.cpp
index 3808197..75adbf4 100644
--- a/src/sockets/BaseSocket.cpp
+++ b/src/sockets/BaseSocket.cpp
@@ -46,7 +46,7 @@ namespace sockets {
 
 	void BaseSocket::Close() {
         if (_sockedFd > 0) {
-#if defined(_WIN32) || defined(WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(ONEOSMULTI)
             closesocket(_sockedFd);
 #else
             close(_sockedFd);
diff --git a/src/sockets/BaseSocket.h b/src/sockets/BaseSocket.h
index 1019fab..fdf128b 100644
--- a/src/sockets/BaseSocket.h
+++ b/src/sockets/BaseSocket.h
@@ -12,7 +12,9 @@
 #include <functional>
 #include <memory>
 #include <system_error>
-
+#ifdef ONEOSMULTI
+#include <sys/time.h>
+#endif
 #include "EndPoint.h"
 
 namespace eipScanner {
diff --git a/src/sockets/EndPoint.cpp b/src/sockets/EndPoint.cpp
index 8dc95a5..d427df5 100644
--- a/src/sockets/EndPoint.cpp
+++ b/src/sockets/EndPoint.cpp
@@ -6,7 +6,7 @@
 #include "BaseSocket.h"
 #include "Platform.h"
 
-#if defined(__unix__) || defined(__APPLE__) || defined(WA_ADAPTORED_RTOS)
+#if defined(__unix__) || defined(__APPLE__) || defined(WA_ADAPTORED_RTOS) || defined(ONEOSMULTI)
 #include <arpa/inet.h>
 #elif defined(_WIN32) || defined(WIN32) || defined(_WIN64)
 #include <winsock2.h>
@@ -32,7 +32,7 @@ namespace sockets {
 
 		_addr.sin_family = AF_INET;
 		_addr.sin_port = htons(_port);
-#if defined(__unix__) || defined(__APPLE__) || defined(SYLIXOS) || defined(WA_ADAPTORED_RTOS)
+#if defined(__unix__) || defined(__APPLE__) || defined(SYLIXOS) || defined(WA_ADAPTORED_RTOS) || defined(ONEOSMULTI)
 		if (inet_aton(_host.c_str(), &_addr.sin_addr) < 0) {
 #elif defined(_WIN32) || defined(WIN32) || defined(_WIN64)
     if (inet_pton(AF_INET, _host.c_str(), &_addr.sin_addr.s_addr) < 0) {
diff --git a/src/sockets/EndPoint.h b/src/sockets/EndPoint.h
index 3dc2377..0794dfa 100644
--- a/src/sockets/EndPoint.h
+++ b/src/sockets/EndPoint.h
@@ -5,13 +5,14 @@
 #ifndef EIPSCANNER_SOCKETS_ENDPOINT_H
 #define EIPSCANNER_SOCKETS_ENDPOINT_H
 
-#if defined(__unix__) || defined(__APPLE__) || defined(WA_ADAPTORED_RTOS)
+#if defined(__unix__) || defined(__APPLE__) || defined(WA_ADAPTORED_RTOS) || defined(ONEOSMULTI)
 #include <netinet/in.h>
 #elif defined(_WIN32) || defined(WIN32) || defined(_WIN64)
 #include <winsock2.h>
 #elif defined(SYLIXOS)
 #include <network/lwip/sockets.h>
 #endif
+
 #include <string>
 
 #if defined(__REWORKS__) && defined(__loongarch__)
-- 
Gitee