Merged in v2.3_develop_126 (pull request #1)

LIB8705-126

Author: mzillgith

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

@@ -68,6 +68,9 @@ struct sCS101_Slave
     CS101_ResetCUHandler resetCUHandler;
     void* resetCUHandlerParameter;
 
+    CS101_IsCAAllowedHandler isCAAllowedHandler;
+    void* isCAAllowedHandlerParameter;
+
     SerialTransceiverFT12 transceiver;
 
     LinkLayerSecondaryUnbalanced unbalancedLinkLayer;
@@ -560,6 +563,13 @@ CS101_Slave_getLinkLayerParameters(CS101_Slave self)
     return &(self->linkLayerParameters);
 }
 
+void
+CS101_Slave_setAllowedCAHandler(CS101_Slave self, CS101_IsCAAllowedHandler handler, void* parameter)
+{
+    self->isCAAllowedHandler = handler;
+    self->isCAAllowedHandlerParameter = parameter;
+}
+
 void
 CS101_Slave_setResetCUHandler(CS101_Slave self, CS101_ResetCUHandler handler, void* parameter)
 {
@@ -660,6 +670,19 @@ handleASDU(CS101_Slave self, CS101_ASDU asdu)
 
     int ca = CS101_ASDU_getCA(asdu);
 
+    /* check with user callback if CA address is known/used by application */
+    if (self->isCAAllowedHandler && (isBroadcastCA(self, ca) == false))
+    {
+        if (self->isCAAllowedHandler(self->isCAAllowedHandlerParameter, ca) == false)
+        {
+            DEBUG_PRINT("CS101_SLAVE: Rcvd ASDU with unknown CA\n");
+
+            responseNegative(asdu, &(self->iMasterConnection), CS101_COT_UNKNOWN_CA);
+
+            return;
+        }
+    }
+
     /* call plugins */
     if (self->plugins)
     {

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

@@ -1175,6 +1175,9 @@ struct sCS104_Slave
     CS104_SlaveRawMessageHandler rawMessageHandler;
     void* rawMessageHandlerParameter;
 
+    CS101_IsCAAllowedHandler isCAAllowedHandler;
+    void* isCAAllowedHandlerParameter;
+
 #if (CONFIG_CS104_SUPPORT_TLS == 1)
     TLSConfiguration tlsConfig;
 #endif
@@ -1637,6 +1640,13 @@ CS104_Slave_setConnectionEventHandler(CS104_Slave self, CS104_ConnectionEventHan
     self->connectionEventHandlerParameter = parameter;
 }
 
+void
+CS104_Slave_setAllowedCAHandler(CS104_Slave self, CS101_IsCAAllowedHandler handler, void* parameter)
+{
+    self->isCAAllowedHandler = handler;
+    self->isCAAllowedHandlerParameter = parameter;
+}
+
 /**
  * Activate connection and deactivate existing active connections if required
  */
@@ -2068,6 +2078,19 @@ handleASDU(MasterConnection self, CS101_ASDU asdu)
 
     int ca = CS101_ASDU_getCA(asdu);
 
+    /* check with user callback if CA address is known/used by application */
+    if (slave->isCAAllowedHandler && (isBroadcastCA(slave, ca) == false))
+    {
+        if (slave->isCAAllowedHandler(slave->isCAAllowedHandlerParameter, ca) == false)
+        {
+            DEBUG_PRINT("CS104 SLAVE: Rcvd ASDU with unknown CA\n");
+
+            responseNegative(asdu, self, CS101_COT_UNKNOWN_CA);
+
+            return true;
+        }
+    }
+
     /* call plugins */
     if (slave->plugins)
     {

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

@@ -1,7 +1,7 @@
 /*
  *  cs101_slave.h
  *
- *  Copyright 2017-2022 Michael Zillgith
+ *  Copyright 2017-2025 Michael Zillgith
  *
  *  This file is part of lib60870-C
  *
@@ -252,6 +252,16 @@ CS101_Slave_getAppLayerParameters(CS101_Slave self);
 LinkLayerParameters
 CS101_Slave_getLinkLayerParameters(CS101_Slave self);
 
+/**
+ * \brief Set a callback handler for the library to check if a specific CA is known by the application
+ *
+ * \param self the slave instance
+ * \param handler the callback function to be used
+ * \param parameter user provided context parameter that will be passed to the callback function (or NULL if not required).
+ */
+void
+CS101_Slave_setAllowedCAHandler(CS101_Slave self, CS101_IsCAAllowedHandler handler, void* parameter);
+
 /**
  * \brief Set the handler for the reset CU (communication unit) message
  *

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

@@ -1,7 +1,7 @@
 /*
  *  cs104_slave.h
  *
- *  Copyright 2017-2022 Michael Zillgith
+ *  Copyright 2017-2025 Michael Zillgith
  *
  *  This file is part of lib60870-C
  *
@@ -179,6 +179,16 @@ CS104_Slave_setMaxOpenConnections(CS104_Slave self, int maxOpenConnections);
 void
 CS104_Slave_setServerMode(CS104_Slave self, CS104_ServerMode serverMode);
 
+/**
+ * \brief Set a callback handler for the library to check if a specific CA is known by the application
+ *
+ * \param self the slave instance
+ * \param handler the callback function to be used
+ * \param parameter user provided context parameter that will be passed to the callback function (or NULL if not required).
+ */
+void
+CS104_Slave_setAllowedCAHandler(CS104_Slave self, CS101_IsCAAllowedHandler handler, void* parameter);
+
 /**
  * \brief Set the connection request handler
  *

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2018 MZ Automation GmbH
+ *  Copyright 2016-2025 MZ Automation GmbH
  *
  *  This file is part of lib60870-C
  *
@@ -247,6 +247,18 @@ typedef bool (*CS101_DelayAcquisitionHandler) (void* parameter, IMasterConnectio
  */
 typedef bool (*CS101_ASDUHandler) (void* parameter, IMasterConnection connection, CS101_ASDU asdu);
 
+/**
+ * \brief Handler that allows the application to inform the slave library if a specific CA is allowed/available
+ *
+ * \note this handler is called whenever such a check is required by the library (e.g. when a ASDU is received)
+ *
+ * \param[in] parameter user provided parameter
+ * \param[in] ca the CA(ASDU) to be checked
+ *
+ * \return true, when the CA is known and accepted, false, otherwise
+ */
+typedef bool (*CS101_IsCAAllowedHandler) (void* parameter, int ca);
+
 /**
  * @}
  */

lib60870-C/tests/all_tests.c

@@ -7076,6 +7076,90 @@ test_CS104Slave_rejectCommandsWithBroadcastCA()
     CS104_Slave_destroy(slave);
 }
 
+static bool
+test_IsCAAllowedHandler(void* parameter, int ca)
+{
+    int expectedCa = *((int*)parameter);
+
+    return (expectedCa == ca);
+}
+
+void
+test_CS104Slave_rejectCommandWithUnknownCA()
+{
+    int expectedCa = 100;
+    CS101_ASDU receivedASDU = NULL;
+
+    CS104_Slave slave = CS104_Slave_create(10, 10);
+
+    CS104_Slave_setServerMode(slave, CS104_MODE_SINGLE_REDUNDANCY_GROUP);
+    CS104_Slave_setLocalPort(slave, 20004);
+
+    CS104_Slave_setAllowedCAHandler(slave, test_IsCAAllowedHandler, &expectedCa);
+
+    CS104_Slave_start(slave);
+
+    CS101_AppLayerParameters alParams = CS104_Slave_getAppLayerParameters(slave);
+
+    CS104_Connection con = CS104_Connection_create("127.0.0.1", 20004);
+
+    bool result = CS104_Connection_connect(con);
+    TEST_ASSERT_TRUE(result);
+
+    CS104_Connection_setASDUReceivedHandler(con, test_CS104Slave_handleTestCommand_asduReceivedHandler, &receivedASDU);
+
+    CS104_Connection_sendStartDT(con);
+
+    TestCommandWithCP56Time2a  tc;
+
+    uint64_t time1 = Hal_getTimeInMs();
+    struct sCP56Time2a cpTime1;
+    CP56Time2a_createFromMsTimestamp(&cpTime1, time1);
+
+    /* send test command with unknown CA */
+    tc = TestCommandWithCP56Time2a_create(NULL, 0xaa55, &cpTime1);
+
+    CS101_ASDU asdu = CS101_ASDU_create(&defaultAppLayerParameters, false, CS101_COT_ACTIVATION, 0, 1, false, false);
+
+    CS101_ASDU_addInformationObject(asdu, (InformationObject) tc);
+    TestCommandWithCP56Time2a_destroy(tc);
+    TEST_ASSERT_TRUE(CS104_Connection_sendASDU(con, asdu));
+    CS101_ASDU_destroy(asdu);
+
+    Thread_sleep(500);
+
+    TEST_ASSERT_NOT_NULL(receivedASDU);
+    TEST_ASSERT_EQUAL_INT(C_TS_TA_1, CS101_ASDU_getTypeID(receivedASDU));
+    TEST_ASSERT_EQUAL_INT(CS101_COT_UNKNOWN_CA, CS101_ASDU_getCOT(receivedASDU));
+    TEST_ASSERT_TRUE(CS101_ASDU_isNegative(receivedASDU));
+
+    /* send test command with known CA */
+    tc = TestCommandWithCP56Time2a_create(NULL, 0xaa55, &cpTime1);
+
+    asdu = CS101_ASDU_create(&defaultAppLayerParameters, false, CS101_COT_ACTIVATION, 0, expectedCa, false, false);
+
+    CS101_ASDU_addInformationObject(asdu, (InformationObject) tc);
+    TestCommandWithCP56Time2a_destroy(tc);
+    TEST_ASSERT_TRUE(CS104_Connection_sendASDU(con, asdu));
+    CS101_ASDU_destroy(asdu);
+
+    Thread_sleep(500);
+
+    TEST_ASSERT_NOT_NULL(receivedASDU);
+    TEST_ASSERT_EQUAL_INT(C_TS_TA_1, CS101_ASDU_getTypeID(receivedASDU));
+    TEST_ASSERT_EQUAL_INT(CS101_COT_ACTIVATION_CON, CS101_ASDU_getCOT(receivedASDU));
+    TEST_ASSERT_FALSE(CS101_ASDU_isNegative(receivedASDU));
+
+    CS104_Connection_close(con);
+
+    CS104_Connection_destroy(con);
+
+    if (receivedASDU)
+        CS101_ASDU_destroy(receivedASDU);
+
+    CS104_Slave_destroy(slave);
+}
+
 int
 main(int argc, char** argv)
 {
@@ -7213,5 +7297,7 @@ main(int argc, char** argv)
 
     RUN_TEST(test_CS104Slave_rejectCommandsWithBroadcastCA);
 
+    RUN_TEST(test_CS104Slave_rejectCommandWithUnknownCA);
+
     return UNITY_END();
 }