- CS 104 master: fixed potential race condition when new connection c…

…loses because of a protocol error
mz-automation · May 4, 2018 · 7c5f1e3 · 7c5f1e3
1 parent 09756ce
commit 7c5f1e3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/lib60870-C/examples/cs101_master_balanced/master_example.c b/lib60870-C/examples/cs101_master_balanced/master_example.c
@@ -106,6 +106,9 @@ main(int argc, char** argv)
 
     CS101_Master master = CS101_Master_create(port, NULL, NULL, IEC60870_LINK_LAYER_BALANCED);
 
+
+    CS101_Master_setOwnAddress(master, 3);
+
     /* Set the address of the slave (optional for balanced master */
     CS101_Master_useSlaveAddress(master, 3);
 

diff --git a/lib60870-C/src/iec60870/cs104/cs104_slave.c b/lib60870-C/src/iec60870/cs104/cs104_slave.c
@@ -1968,17 +1968,21 @@ MasterConnection_create(CS104_Slave slave, Socket socket, MessageQueue lowPrioQu
         self->highPrioQueue = highPrioQueue;
 
         self->outstandingTestFRConMessages = 0;
-
-        Thread newThread =
-               Thread_create((ThreadExecutionFunction) connectionHandlingThread,
-                       (void*) self, true);
-
-        Thread_start(newThread);
     }
 
     return self;
 }
 
+static void
+MasterConnection_start(MasterConnection self)
+{
+    Thread newThread =
+           Thread_create((ThreadExecutionFunction) connectionHandlingThread,
+                   (void*) self, true);
+
+    Thread_start(newThread);
+}
+
 void
 MasterConnection_close(MasterConnection self)
 {
@@ -2077,6 +2081,9 @@ serverThread (void* parameter)
 #if (CONFIG_USE_THREADS)
                     Semaphore_post(self->openConnectionsLock);
 #endif
+
+                    /* now start the connection handling (thread) */
+                    MasterConnection_start(connection);
                 }
                 else
                     DEBUG_PRINT("Connection attempt failed!");