- make write access to RCB elements configurable according to ReportSettings (LIB61850-404)

src/iec61850/inc/iec61850_server.h

@@ -42,6 +42,13 @@ extern "C" {
 #include "iso_connection_parameters.h"
 #include "iec61850_config_file_parser.h"
 
+#define IEC61850_REPORTSETTINGS_RPT_ID 1
+#define IEC61850_REPORTSETTINGS_BUF_TIME 2
+#define IEC61850_REPORTSETTINGS_DATSET 4
+#define IEC61850_REPORTSETTINGS_TRG_OPS 8
+#define IEC61850_REPORTSETTINGS_OPT_FIELDS 16
+#define IEC61850_REPORTSETTINGS_INTG_PD 32
+
 /**
  * \brief Configuration object to configure IEC 61850 stack features
  */
@@ -99,6 +106,9 @@ struct sIedServerConfig
 
     /** integrity report start times will by synchronized with straight numbers (default: false) */
     bool syncIntegrityReportTimes;
+
+    /** for each configurable ReportSetting there is a separate flag (default: Dyn = enable write for all) */
+    uint8_t reportSettingsWritable;
 };
 
 /**
@@ -388,6 +398,27 @@ IedServerConfig_useIntegratedGoosePublisher(IedServerConfig self, bool enable);
 LIB61850_API bool
 IedServerConfig_isLogServiceEnabled(IedServerConfig self);
 
+/**
+ * \brief Make a configurable report setting writeable or read-only
+ *
+ * \note Can be used to implement some of Services\ReportSettings options
+ *
+ * \param[in] setting one IEC61850_REPORTSETTINGS_RPT_ID, _BUF_TIME, _DATSET, _TRG_OPS, _OPT_FIELDS, _INTG_PD
+ * \param[in] isDyn true, when setting is writable ("Dyn") or false, when read-only
+ */
+LIB61850_API void
+IedServerConfig_setReportSetting(IedServerConfig self, uint8_t setting, bool isDyn);
+
+/**
+ * \brief Check if a configurable report setting is writable or read-only
+ *
+ * \param[in] setting one IEC61850_REPORTSETTINGS_RPT_ID, _BUF_TIME, _DATSET, _TRG_OPS, _OPT_FIELDS, _INTG_PD
+ *
+ * \return  isDyn true, when setting is writable ("Dyn") or false, when read-only
+ */
+LIB61850_API bool
+IedServerConfig_getReportSetting(IedServerConfig self, uint8_t setting);
+
 /**
  * An opaque handle for an IED server instance
  */

src/iec61850/inc_private/ied_server_private.h

@@ -3,7 +3,7 @@
  *
  *  Library private function definitions for IedServer.
  *
- *  Copyright 2013-2018 Michael Zillgith
+ *  Copyright 2013-2023 Michael Zillgith
  *
  *  This file is part of libIEC61850.
  *
@@ -50,6 +50,7 @@ struct sIedServer
     bool enableBRCBResvTms;
     bool enableOwnerForRCB;
     bool syncIntegrityReportTimes;
+    uint8_t rcbSettingsWritable;
 #endif
 
 #if (CONFIG_MMS_THREADLESS_STACK != 1)

src/iec61850/server/impl/ied_server.c

@@ -580,12 +580,19 @@ IedServer_createWithConfig(IedModel* dataModel, TLSConfiguration tlsConfiguratio
             self->enableBRCBResvTms = serverConfiguration->enableResvTmsForBRCB;
             self->enableOwnerForRCB = serverConfiguration->enableOwnerForRCB;
             self->syncIntegrityReportTimes = serverConfiguration->syncIntegrityReportTimes;
+            self->rcbSettingsWritable = serverConfiguration->reportSettingsWritable;
         }
         else {
             self->reportBufferSizeBRCBs = CONFIG_REPORTING_DEFAULT_REPORT_BUFFER_SIZE;
             self->reportBufferSizeURCBs = CONFIG_REPORTING_DEFAULT_REPORT_BUFFER_SIZE;
             self->enableOwnerForRCB = false;
             self->syncIntegrityReportTimes = false;
+            self->rcbSettingsWritable = IEC61850_REPORTSETTINGS_RPT_ID +
+                                        IEC61850_REPORTSETTINGS_BUF_TIME +
+                                        IEC61850_REPORTSETTINGS_DATSET +
+                                        IEC61850_REPORTSETTINGS_TRG_OPS +
+                                        IEC61850_REPORTSETTINGS_OPT_FIELDS +
+                                        IEC61850_REPORTSETTINGS_INTG_PD;
 #if (CONFIG_IEC61850_BRCB_WITH_RESVTMS == 1)
             self->enableBRCBResvTms = true;
 #else

src/iec61850/server/impl/ied_server_config.c

@@ -1,7 +1,7 @@
 /*
  *  ied_server_config.c
  *
- *  Copyright 2018-2022 Michael Zillgith
+ *  Copyright 2018-2023 Michael Zillgith
  *
  *  This file is part of libIEC61850.
  *
@@ -59,6 +59,12 @@ IedServerConfig_create()
         self->enableResvTmsForBRCB = true;
         self->enableOwnerForRCB = false;
         self->syncIntegrityReportTimes = false;
+        self->reportSettingsWritable = IEC61850_REPORTSETTINGS_RPT_ID +
+                                       IEC61850_REPORTSETTINGS_BUF_TIME +
+                                       IEC61850_REPORTSETTINGS_DATSET +
+                                       IEC61850_REPORTSETTINGS_TRG_OPS +
+                                       IEC61850_REPORTSETTINGS_OPT_FIELDS +
+                                       IEC61850_REPORTSETTINGS_INTG_PD;
     }
 
     return self;
@@ -264,3 +270,34 @@ IedServerConfig_getSyncIntegrityReportTimes(IedServerConfig self)
 {
     return self->syncIntegrityReportTimes;
 }
+
+static void
+configureSetting(IedServerConfig self, uint8_t flags, uint8_t setting, bool value)
+{
+    if (flags & setting)
+    {
+        if (value) {
+            self->reportSettingsWritable |= setting;
+        }
+        else {
+            self->reportSettingsWritable &= ~setting;
+        }
+    }
+}
+
+void
+IedServerConfig_setReportSetting(IedServerConfig self, uint8_t setting, bool isDyn)
+{
+    configureSetting(self, setting, IEC61850_REPORTSETTINGS_RPT_ID, isDyn);
+    configureSetting(self, setting, IEC61850_REPORTSETTINGS_BUF_TIME, isDyn);
+    configureSetting(self, setting, IEC61850_REPORTSETTINGS_DATSET, isDyn);
+    configureSetting(self, setting, IEC61850_REPORTSETTINGS_TRG_OPS, isDyn);
+    configureSetting(self, setting, IEC61850_REPORTSETTINGS_OPT_FIELDS, isDyn);
+    configureSetting(self, setting, IEC61850_REPORTSETTINGS_INTG_PD, isDyn);
+}
+
+bool
+IedServerConfig_getReportSetting(IedServerConfig self, uint8_t setting)
+{
+    return (self->reportSettingsWritable & setting);
+}

src/iec61850/server/mms_mapping/reporting.c

@@ -2193,6 +2193,12 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
         }
         else if (strcmp(elementName, "DatSet") == 0) {
 
+            if (!(self->iedServer->rcbSettingsWritable & IEC61850_REPORTSETTINGS_DATSET))
+            {
+                retVal = DATA_ACCESS_ERROR_OBJECT_ACCESS_DENIED;
+                goto exit_function;
+            }
+
 #if (CONFIG_MMS_THREADLESS_STACK != 1)
             Semaphore_wait(rc->rcbValuesLock);
 #endif
@@ -2240,6 +2246,12 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
         }
         else if (strcmp(elementName, "IntgPd") == 0) {
 
+            if (!(self->iedServer->rcbSettingsWritable & IEC61850_REPORTSETTINGS_INTG_PD))
+            {
+                retVal = DATA_ACCESS_ERROR_OBJECT_ACCESS_DENIED;
+                goto exit_function;
+            }
+
 #if (CONFIG_MMS_THREADLESS_STACK != 1)
             Semaphore_wait(rc->rcbValuesLock);
 #endif
@@ -2287,6 +2299,12 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
         }
         else if (strcmp(elementName, "TrgOps") == 0) {
 
+            if (!(self->iedServer->rcbSettingsWritable & IEC61850_REPORTSETTINGS_TRG_OPS))
+            {
+                retVal = DATA_ACCESS_ERROR_OBJECT_ACCESS_DENIED;
+                goto exit_function;
+            }
+
 #if (CONFIG_MMS_THREADLESS_STACK != 1)
             Semaphore_wait(rc->rcbValuesLock);
 #endif
@@ -2360,6 +2378,12 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
 
         else if (strcmp(elementName, "BufTm") == 0) {
 
+            if (!(self->iedServer->rcbSettingsWritable & IEC61850_REPORTSETTINGS_BUF_TIME))
+            {
+                retVal = DATA_ACCESS_ERROR_OBJECT_ACCESS_DENIED;
+                goto exit_function;
+            }
+
 #if (CONFIG_MMS_THREADLESS_STACK != 1)
             Semaphore_wait(rc->rcbValuesLock);
 #endif
@@ -2393,6 +2417,12 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
         }
         else if (strcmp(elementName, "RptID") == 0) {
 
+            if (!(self->iedServer->rcbSettingsWritable & IEC61850_REPORTSETTINGS_RPT_ID))
+            {
+                retVal = DATA_ACCESS_ERROR_OBJECT_ACCESS_DENIED;
+                goto exit_function;
+            }
+
 #if (CONFIG_MMS_THREADLESS_STACK != 1)
             Semaphore_wait(rc->rcbValuesLock);
 #endif
@@ -2500,6 +2530,14 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
 
             goto exit_function;
         }
+        else if (strcmp(elementName, "OptFlds") == 0) {
+
+            if (!(self->iedServer->rcbSettingsWritable & IEC61850_REPORTSETTINGS_OPT_FIELDS))
+            {
+                retVal = DATA_ACCESS_ERROR_OBJECT_ACCESS_DENIED;
+                goto exit_function;
+            }
+        }
 
 #if (CONFIG_MMS_THREADLESS_STACK != 1)
         Semaphore_wait(rc->rcbValuesLock);