From 325c3e0b7e437ad187165fcfdeb9968f6193d9e1 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Sat, 11 Jun 2016 07:39:10 +0200
Subject: [PATCH] - removed FileSystem_setBasePath from windows export files -
 ISO server: fixed race problem when opening/closing connections in
 multithreaded configuration

---
 src/mms/iso_server/iso_server.c | 131 +++++++++++++++++---------------
 src/vs/libiec61850-wo-goose.def |   1 -
 src/vs/libiec61850.def          |   1 -
 3 files changed, 70 insertions(+), 63 deletions(-)

diff --git a/src/mms/iso_server/iso_server.c b/src/mms/iso_server/iso_server.c
index d67f31c0..f32bc31d 100644
--- a/src/mms/iso_server/iso_server.c
+++ b/src/mms/iso_server/iso_server.c
@@ -67,24 +67,23 @@ struct sIsoServer {
 
 #if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
     LinkedList openClientConnections;
-
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
-    Semaphore openClientConnectionsMutex; /* mutex for openClientConnections list */
-#endif
-
 #else
     IsoConnection* openClientConnections;
 #endif /* (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1) */
 
 #if (CONFIG_MMS_THREADLESS_STACK != 1)
     Semaphore userLock;
+#endif
 
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    Semaphore openClientConnectionsMutex; /* mutex for openClientConnections list */
     Semaphore connectionCounterMutex;
 #endif
+
     int connectionCounter;
 };
 
-#if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
 static inline void
 lockClientConnections(IsoServer self)
 {
@@ -102,6 +101,18 @@ static void
 addClientConnection(IsoServer self, IsoConnection connection)
 {
 
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    Semaphore_wait(self->connectionCounterMutex);
+#endif
+
+    self->connectionCounter++;
+    if (DEBUG_ISO_SERVER)
+        printf("IsoServer: increase connection counter to %i!\n", self->connectionCounter);
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    lockClientConnections(self);
+#endif
+
 #if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
     LinkedList_add(self->openClientConnections, connection);
 #else
@@ -118,30 +129,37 @@ addClientConnection(IsoServer self, IsoConnection connection)
         }
     }
 #endif
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    unlockClientConnections(self);
+#endif
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    Semaphore_post(self->connectionCounterMutex);
+#endif
+
 }
 
 static void
 removeClientConnection(IsoServer self, IsoConnection connection)
 {
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    lockClientConnections(self);
+#endif
+
 #if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
 
 
 #if (CONFIG_MMS_SINGLE_THREADED == 0)
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
-    lockClientConnections(self);
-#endif
-
     LinkedList_remove(self->openClientConnections, connection);
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
-    unlockClientConnections(self);
-#endif
-
 #endif /* (CONFIG_MMS_SINGLE_THREADED == 0) */
 
 
 #else
+
     int i;
 
     for (i = 0; i < CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS; i++) {
@@ -155,18 +173,22 @@ removeClientConnection(IsoServer self, IsoConnection connection)
         }
     }
 #endif /* (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1) */
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    unlockClientConnections(self);
+#endif
 }
 
 static void
 closeAllOpenClientConnections(IsoServer self)
 {
 
-#if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
-
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     lockClientConnections(self);
 #endif
 
+#if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
+
     LinkedList openConnection = LinkedList_getNext(self->openClientConnections);
     while (openConnection != NULL) {
         IsoConnection isoConnection = (IsoConnection) openConnection->data;
@@ -186,11 +208,6 @@ closeAllOpenClientConnections(IsoServer self)
     self->openClientConnections = NULL;
 #endif
 
-
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
-    unlockClientConnections(self);
-#endif
-
 #else
     int i;
 
@@ -206,7 +223,12 @@ closeAllOpenClientConnections(IsoServer self)
 
         }
     }
+#endif /* (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1) */
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    unlockClientConnections(self);
 #endif
+
 }
 
 static void
@@ -214,7 +236,7 @@ handleClientConnections(IsoServer self)
 {
 #if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     lockClientConnections(self);
 #endif
 
@@ -237,12 +259,15 @@ handleClientConnections(IsoServer self)
         openConnection = LinkedList_getNext(openConnection);
     }
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     unlockClientConnections(self);
 #endif
 
 #else
 
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    lockClientConnections(self);
+#endif
 
     int i;
 
@@ -260,6 +285,11 @@ handleClientConnections(IsoServer self)
 
         }
     }
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+    unlockClientConnections(self);
+#endif
+
 #endif /* (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1) */
 }
 
@@ -319,8 +349,6 @@ handleIsoConnections(IsoServer self)
 
         IsoConnection isoConnection = IsoConnection_create(connectionSocket, self);
 
-        private_IsoServer_increaseConnectionCounter(self);
-
         addClientConnection(self, isoConnection);
 
         self->connectionHandler(ISO_CONNECTION_OPENED, self->connectionHandlerParameter,
@@ -357,8 +385,6 @@ handleIsoConnectionsThreadless(IsoServer self)
 
         IsoConnection isoConnection = IsoConnection_create(connectionSocket, self);
 
-        private_IsoServer_increaseConnectionCounter(self);
-
         addClientConnection(self, isoConnection);
 
         self->connectionHandler(ISO_CONNECTION_OPENED, self->connectionHandlerParameter,
@@ -419,12 +445,9 @@ IsoServer_create()
             GLOBAL_CALLOC(CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS, sizeof(IsoConnection));
 #endif
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     self->connectionCounterMutex = Semaphore_create(1);
-#if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
     self->openClientConnectionsMutex = Semaphore_create(1);
-#endif
-
 #endif /* (CONFIG_MMS_THREADLESS_STACK != 1) */
 
     self->connectionCounter = 0;
@@ -525,12 +548,13 @@ IsoServer_waitReady(IsoServer self, unsigned int timeoutMs)
 
        handles = Handleset_new();
        if (handles != NULL) {
-#if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
            lockClientConnections(self);
 #endif
 
+#if (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1)
+
            LinkedList openConnection = LinkedList_getNext(self->openClientConnections);
            LinkedList lastConnection = self->openClientConnections;
 
@@ -550,10 +574,6 @@ IsoServer_waitReady(IsoServer self, unsigned int timeoutMs)
                lastConnection = lastConnection->next;
            }
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
-           unlockClientConnections(self);
-#endif
-
 #else
            int i;
 
@@ -570,6 +590,11 @@ IsoServer_waitReady(IsoServer self, unsigned int timeoutMs)
                    }
                }
            }
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
+           unlockClientConnections(self);
+#endif
+
 #endif /* (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1) */
            Handleset_addSocket(handles, self->serverSocket);
            result = Handleset_waitReady(handles, timeoutMs);
@@ -671,42 +696,26 @@ IsoServer_destroy(IsoServer self)
         LinkedList_destroyStatic(self->openClientConnections);
 #endif /* (CONFIG_MMS_SINGLE_THREADED == 1) */
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     lockClientConnections(self);
-    Semaphore_destroy(self->openClientConnectionsMutex);
 #endif
 
 #else
     GLOBAL_FREEMEM(self->openClientConnections);
 #endif /* (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1) */
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     Semaphore_destroy(self->connectionCounterMutex);
+    Semaphore_destroy(self->openClientConnectionsMutex);
 #endif
 
     GLOBAL_FREEMEM(self);
 }
 
-void
-private_IsoServer_increaseConnectionCounter(IsoServer self)
-{
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
-    Semaphore_wait(self->connectionCounterMutex);
-#endif
-
-    self->connectionCounter++;
-    if (DEBUG_ISO_SERVER)
-        printf("IsoServer: increase connection counter to %i!\n", self->connectionCounter);
-
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
-    Semaphore_post(self->connectionCounterMutex);
-#endif
-}
-
 void
 private_IsoServer_decreaseConnectionCounter(IsoServer self)
 {
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     Semaphore_wait(self->connectionCounterMutex);
 #endif
 
@@ -715,7 +724,7 @@ private_IsoServer_decreaseConnectionCounter(IsoServer self)
     if (DEBUG_ISO_SERVER)
         printf("IsoServer: decrease connection counter to %i!\n", self->connectionCounter);
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     Semaphore_post(self->connectionCounterMutex);
 #endif
 }
@@ -725,13 +734,13 @@ private_IsoServer_getConnectionCounter(IsoServer self)
 {
     int connectionCounter;
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     Semaphore_wait(self->connectionCounterMutex);
 #endif
 
     connectionCounter = self->connectionCounter;
 
-#if (CONFIG_MMS_THREADLESS_STACK != 1)
+#if (CONFIG_MMS_THREADLESS_STACK != 1) && (CONFIG_MMS_SINGLE_THREADED == 0)
     Semaphore_post(self->connectionCounterMutex);
 #endif
 
diff --git a/src/vs/libiec61850-wo-goose.def b/src/vs/libiec61850-wo-goose.def
index 7411d01a..1113aa2e 100644
--- a/src/vs/libiec61850-wo-goose.def
+++ b/src/vs/libiec61850-wo-goose.def
@@ -113,7 +113,6 @@ EXPORTS
     FileSystem_readDirectory @302
     FileSystem_readFile @303
     FileSystem_renameFile @304
-    FileSystem_setBasePath @305
     FunctionalConstraint_fromString @313
     FunctionalConstraint_toString @314
     GSEControlBlock_create @316
diff --git a/src/vs/libiec61850.def b/src/vs/libiec61850.def
index d80f83e4..7d0c71c2 100644
--- a/src/vs/libiec61850.def
+++ b/src/vs/libiec61850.def
@@ -113,7 +113,6 @@ EXPORTS
     FileSystem_readDirectory @302
     FileSystem_readFile @303
     FileSystem_renameFile @304
-    FileSystem_setBasePath @305
     FunctionalConstraint_fromString @313
     FunctionalConstraint_toString @314
     GSEControlBlock_create @316