From d40b359292ccccd5b66ad3f4878c38b5a9a15df0 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Tue, 8 Mar 2022 08:48:41 +0100
Subject: [PATCH] - updated windows socket implementation; fixed
 Socket_checkAsyncConnectState function

---
 hal/socket/win32/socket_win32.c             | 51 ++++++++++++++-------
 src/iec61850/server/mms_mapping/reporting.c |  2 +-
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/hal/socket/win32/socket_win32.c b/hal/socket/win32/socket_win32.c
index 98cbe9fd..65be99d7 100644
--- a/hal/socket/win32/socket_win32.c
+++ b/hal/socket/win32/socket_win32.c
@@ -445,10 +445,24 @@ Socket_checkAsyncConnectState(Socket self)
         int so_error;
         int len = sizeof so_error;
 
-        if (getsockopt(self->fd, SOL_SOCKET, SO_ERROR, (char*) (&so_error), &len) >= 0) {
+        if (getsockopt(self->fd, SOL_SOCKET, SO_ERROR, (char*) (&so_error), &len) != SOCKET_ERROR) {
+            if (so_error == 0) {
+
+                int recvRes = recv(self->fd, NULL, 0, 0);
+
+                if (recvRes == SOCKET_ERROR) {
+                    int wsaError = WSAGetLastError();
+
+                    if (wsaError == WSAECONNRESET)
+                        return SOCKET_STATE_FAILED;
+
+                    if (wsaError == WSAECONNABORTED)
+                        return SOCKET_STATE_FAILED;
+                }
+
 
-            if (so_error == 0)
                 return SOCKET_STATE_CONNECTED;
+            }
         }
 
         return SOCKET_STATE_FAILED;
@@ -464,30 +478,35 @@ Socket_checkAsyncConnectState(Socket self)
 bool
 Socket_connect(Socket self, const char* address, int port)
 {
-    struct sockaddr_in serverAddress;
-
-    if (!prepareAddress(address, port, &serverAddress))
+    if (Socket_connectAsync(self, address, port) == false)
         return false;
 
-    setSocketNonBlocking(self);
+    struct timeval timeout;
+    timeout.tv_sec = self->connectTimeout / 1000;
+    timeout.tv_usec = (self->connectTimeout % 1000) * 1000;
 
     fd_set fdSet;
     FD_ZERO(&fdSet);
     FD_SET(self->fd, &fdSet);
 
-    if (connect(self->fd, (struct sockaddr *) &serverAddress, sizeof(serverAddress)) == SOCKET_ERROR) {
-        if (WSAGetLastError() != WSAEWOULDBLOCK)
-            return false;
+    if (select(self->fd + 1, NULL, &fdSet , NULL, &timeout) == 1) {
+
+        /* Check if connection is established */
+
+        int so_error;
+        socklen_t len = sizeof so_error;
+
+        if (getsockopt(self->fd, SOL_SOCKET, SO_ERROR, (char*)&so_error, &len) >= 0) {
+
+            if (so_error == 0)
+                return true;
+        }
     }
 
-    struct timeval timeout;
-    timeout.tv_sec = self->connectTimeout / 1000;
-    timeout.tv_usec = (self->connectTimeout % 1000) * 1000;
+    closesocket (self->fd);
+    self->fd = INVALID_SOCKET;
 
-    if (select((int)self->fd + 1, NULL, &fdSet, NULL, &timeout) <= 0)
-        return false;
-    else
-        return true;
+    return false;
 }
 
 static char*
diff --git a/src/iec61850/server/mms_mapping/reporting.c b/src/iec61850/server/mms_mapping/reporting.c
index aadeee7a..c06b4f47 100644
--- a/src/iec61850/server/mms_mapping/reporting.c
+++ b/src/iec61850/server/mms_mapping/reporting.c
@@ -2825,7 +2825,7 @@ enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI, uint64_
 #if (DEBUG_IED_SERVER == 1)
                     printf("IED_SERVER: REMOVE report with ID ");
                     printReportId(buffer->oldestReport);
-                    printf(" (index: %li, size: %i)\n", (void*)(buffer->oldestReport) - (void*)(buffer->memoryBlock), buffer->oldestReport->entryLength);
+                    printf(" (index: %li, size: %i)\n", (int)((uint8_t*)(buffer->oldestReport) - (uint8_t*)(buffer->memoryBlock)), buffer->oldestReport->entryLength);
 #endif
                     buffer->oldestReport = buffer->oldestReport->next;