- slave: added IMasterConnection_close function (see #35)

Author: mzillgith

lib60870-C/src/iec60870/cs101/cs101_master_connection.c

@@ -46,3 +46,11 @@ IMasterConnection_getApplicationLayerParameters(IMasterConnection self)
 {
     return self->getApplicationLayerParameters(self);
 }
+
+void
+IMasterConnection_close(IMasterConnection self)
+{
+    if (self->close)
+        self->close(self);
+}
+

lib60870-C/src/iec60870/cs101/cs101_slave.c

@@ -331,6 +331,7 @@ CS101_Slave_create(SerialPort serialPort, LinkLayerParameters llParameters, CS10
         self->iMasterConnection.sendACT_CON = sendACT_CON;
         self->iMasterConnection.sendACT_TERM = sendACT_TERM;
         self->iMasterConnection.getApplicationLayerParameters = getApplicationLayerParameters;
+        self->iMasterConnection.close = NULL;
         self->iMasterConnection.object = self;
 
         CS101_Queue_initialize(&(self->userDataClass1Queue), CS101_MAX_QUEUE_SIZE);

lib60870-C/src/iec60870/cs104/cs104_slave.c

@@ -2545,33 +2545,41 @@ connectionHandlingThread(void* parameter)
  *******************************************/
 
 static void
-_sendASDU(IMasterConnection self, CS101_ASDU asdu)
+_IMasterConnection_sendASDU(IMasterConnection self, CS101_ASDU asdu)
 {
     MasterConnection con = (MasterConnection) self->object;
 
     sendASDUInternal(con, asdu);
 }
 
 static void
-_sendACT_CON(IMasterConnection self, CS101_ASDU asdu, bool negative)
+_IMasterConnection_sendACT_CON(IMasterConnection self, CS101_ASDU asdu, bool negative)
 {
     CS101_ASDU_setCOT(asdu, CS101_COT_ACTIVATION_CON);
     CS101_ASDU_setNegative(asdu, negative);
 
-    _sendASDU(self, asdu);
+    _IMasterConnection_sendASDU(self, asdu);
 }
 
 static void
-_sendACT_TERM(IMasterConnection self, CS101_ASDU asdu)
+_IMasterConnection_sendACT_TERM(IMasterConnection self, CS101_ASDU asdu)
 {
     CS101_ASDU_setCOT(asdu, CS101_COT_ACTIVATION_TERMINATION);
     CS101_ASDU_setNegative(asdu, false);
 
-    _sendASDU(self, asdu);
+    _IMasterConnection_sendASDU(self, asdu);
+}
+
+static void
+_IMasterConnection_close(IMasterConnection self)
+{
+    MasterConnection con = (MasterConnection) self->object;
+
+    MasterConnection_close(con);
 }
 
 static CS101_AppLayerParameters
-_getApplicationLayerParameters(IMasterConnection self)
+_IMasterConnection_getApplicationLayerParameters(IMasterConnection self)
 {
     MasterConnection con = (MasterConnection) self->object;
 
@@ -2619,10 +2627,11 @@ MasterConnection_create(CS104_Slave slave, Socket socket, MessageQueue lowPrioQu
 #endif
 
         self->iMasterConnection.object = self;
-        self->iMasterConnection.getApplicationLayerParameters = _getApplicationLayerParameters;
-        self->iMasterConnection.sendASDU = _sendASDU;
-        self->iMasterConnection.sendACT_CON = _sendACT_CON;
-        self->iMasterConnection.sendACT_TERM = _sendACT_TERM;
+        self->iMasterConnection.getApplicationLayerParameters = _IMasterConnection_getApplicationLayerParameters;
+        self->iMasterConnection.sendASDU = _IMasterConnection_sendASDU;
+        self->iMasterConnection.sendACT_CON = _IMasterConnection_sendACT_CON;
+        self->iMasterConnection.sendACT_TERM = _IMasterConnection_sendACT_TERM;
+        self->iMasterConnection.close = _IMasterConnection_close;
 
         resetT3Timeout(self);
 

lib60870-C/src/inc/api/iec60870_slave.h

@@ -66,6 +66,7 @@ struct sIMasterConnection {
     void (*sendASDU) (IMasterConnection self, CS101_ASDU asdu);
     void (*sendACT_CON) (IMasterConnection self, CS101_ASDU asdu, bool negative);
     void (*sendACT_TERM) (IMasterConnection self, CS101_ASDU asdu);
+    void (*close) (IMasterConnection self);
     CS101_AppLayerParameters (*getApplicationLayerParameters) (IMasterConnection self);
     void* object;
 };
@@ -104,6 +105,14 @@ IMasterConnection_sendACT_CON(IMasterConnection self, CS101_ASDU asdu, bool nega
 void
 IMasterConnection_sendACT_TERM(IMasterConnection self, CS101_ASDU asdu);
 
+/**
+ * \brief Close the master connection (only for CS 104)
+ *
+ * Allows the slave to actively close a master connection (e.g. when some exception occurs)
+ */
+void
+IMasterConnection_close(IMasterConnection self);
+
 /**
  * \brief Get the application layer parameters used by this connection
  */