- added semaphore for server side RCB value access

4 years ago · a7362928f4
parent c3191b2864
commit a7362928f4
5 changed files with 383 additions and 30 deletions
--- a/src/iec61850/inc_private/reporting.h
+++ b/src/iec61850/inc_private/reporting.h
@ -53,8 +53,13 @@ typedef struct {
    LogicalNode* parentLN;

    MmsValue* rcbValues;
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore rcbValuesLock;
+#endif
+
    MmsValue* inclusionField;
-    MmsValue* confRev;
+    MmsValue* confRev; /* TODO Is this field required? */

    DataSet* dataSet;
    bool isDynamicDataSet;
--- a/src/iec61850/server/mms_mapping/mms_mapping.c
+++ b/src/iec61850/server/mms_mapping/mms_mapping.c
@ -3097,11 +3097,24 @@ mmsReadHandler(void* parameter, MmsDomain* domain, char* variableId, MmsServerCo

                        MmsValue* value = NULL;

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
                        if (elementName != NULL)
                            value = ReportControl_getRCBValue(rc, elementName);
                        else
                            value = rc->rcbValues;

+                        if (value) {
+                            value = MmsValue_clone(value);
+                            MmsValue_setDeletableRecursive(value);
+                        }
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                        Semaphore_post(rc->rcbValuesLock);
+#endif
+
                        retValue = value;

                        goto exit_function;
--- a/src/iec61850/server/mms_mapping/reporting.c
+++ b/src/iec61850/server/mms_mapping/reporting.c
@ -101,6 +101,11 @@ ReportControl_create(bool buffered, LogicalNode* parentLN, int reportBufferSize,
    self->domain = NULL;
    self->parentLN = parentLN;
    self->rcbValues = NULL;
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    self->rcbValuesLock = Semaphore_create(1);
+#endif
+
    self->confRev = NULL;
    self->subSeqVal = MmsValue_newUnsigned(16);
    self->segmented = false;
@ -234,6 +239,7 @@ ReportControl_destroy(ReportControl* self)

 #if (CONFIG_MMS_THREADLESS_STACK != 1)
    Semaphore_destroy(self->createNotificationsMutex);
+    Semaphore_destroy(self->rcbValuesLock);
 #endif

    GLOBAL_FREEMEM(self->name);
@ -325,6 +331,10 @@ ReportControl_getRCBValue(ReportControl* rc, char* elementName)
 static void
 copyRCBValuesToTrackingObject(MmsMapping* self, ReportControl* rc)
 {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_wait(rc->rcbValuesLock);
+#endif
+
    if (rc->buffered) {
        if (self->brcbTrk) {
            BrcbTrkInstance trkInst = self->brcbTrk;
@ -441,6 +451,10 @@ copyRCBValuesToTrackingObject(MmsMapping* self, ReportControl* rc)
                MmsValue_update(trkInst->gi->mmsValue, ReportControl_getRCBValue(rc, "GI"));
        }
    }
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_post(rc->rcbValuesLock);
+#endif
 }

 static void
@ -682,7 +696,6 @@ updateReportDataset(MmsMapping* mapping, ReportControl* rc, MmsValue* newDatSet,
    else
        dataSetValue = ReportControl_getRCBValue(rc, "DatSet");

-
    bool dataSetChanged = true;

    /* check if old and new data sets are the same */
@ -725,7 +738,6 @@ updateReportDataset(MmsMapping* mapping, ReportControl* rc, MmsValue* newDatSet,
        }
    }

-
    if (rc->isDynamicDataSet) {
        if (rc->dataSet && dataSetChanged) {
            deleteDataSetValuesShadowBuffer(rc);
@ -820,6 +832,7 @@ updateReportDataset(MmsMapping* mapping, ReportControl* rc, MmsValue* newDatSet,
    }

 exit_function:
+
    return success;
 }

@ -886,6 +899,10 @@ createTrgOps(ReportControlBlock* reportControlBlock) {
 static void
 refreshTriggerOptions(ReportControl* rc)
 {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_wait(rc->rcbValuesLock);
+#endif
+
    rc->triggerOps = 0;
    MmsValue* trgOps = ReportControl_getRCBValue(rc, "TrgOps");
    if (MmsValue_getBitStringBit(trgOps, 1))
@ -902,14 +919,26 @@ refreshTriggerOptions(ReportControl* rc)

    if (MmsValue_getBitStringBit(trgOps, 5))
        rc->triggerOps += TRG_OPT_GI;
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_post(rc->rcbValuesLock);
+#endif
 }

 static void
 refreshIntegrityPeriod(ReportControl* rc)
 {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_wait(rc->rcbValuesLock);
+#endif
+
    MmsValue* intgPd = ReportControl_getRCBValue(rc, "IntgPd");
    rc->intgPd = MmsValue_toUint32(intgPd);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_post(rc->rcbValuesLock);
+#endif
+
    if (rc->buffered == false)
        rc->nextIntgReportTime = Hal_getTimeInMs() + rc->intgPd;
 }
@ -917,8 +946,16 @@ refreshIntegrityPeriod(ReportControl* rc)
 static void
 refreshBufferTime(ReportControl* rc)
 {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_wait(rc->rcbValuesLock);
+#endif
+
    MmsValue* bufTm = ReportControl_getRCBValue(rc, "BufTm");
    rc->bufTm = MmsValue_toUint32(bufTm);
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_post(rc->rcbValuesLock);
+#endif
 }

 static void
@ -1449,6 +1486,10 @@ updateOwner(ReportControl* rc, MmsServerConnection connection)
 {
    rc->clientConnection = connection;

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_wait(rc->rcbValuesLock);
+#endif
+
    if (rc->server->edition >= IEC_61850_EDITION_2 && rc->hasOwner) {

        MmsValue* owner = ReportControl_getRCBValue(rc, "Owner");
@ -1510,6 +1551,10 @@ updateOwner(ReportControl* rc, MmsServerConnection connection)
            }
        }
    }
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_post(rc->rcbValuesLock);
+#endif
 }

 static bool
@ -1581,9 +1626,16 @@ checkReservationTimeout(MmsMapping* self, ReportControl* rc)

 #if (CONFIG_IEC61850_BRCB_WITH_RESVTMS == 1)
                if (self->iedServer->enableBRCBResvTms) {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                    Semaphore_wait(rc->rcbValuesLock);
+#endif
                    MmsValue* resvTmsVal = ReportControl_getRCBValue(rc, "ResvTms");
                    if (resvTmsVal)
                        MmsValue_setInt16(resvTmsVal, rc->resvTms);
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                    Semaphore_post(rc->rcbValuesLock);
+#endif
                }
 #endif

@ -1626,34 +1678,53 @@ ReportControl_readAccess(ReportControl* rc, MmsMapping* mmsMapping, MmsServerCon
 static bool
 isIpAddressMatchingWithOwner(ReportControl* rc, const char* ipAddress)
 {
+    bool retVal = false;
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_wait(rc->rcbValuesLock);
+#endif
+
    MmsValue* owner = ReportControl_getRCBValue(rc, "Owner");

    if (owner != NULL) {

-        if (MmsValue_getOctetStringSize(owner) == 0)
-            return true;
+        if (MmsValue_getOctetStringSize(owner) == 0) {
+            retVal = true;
+            goto exit_function;
+        }

        if (strchr(ipAddress, '.') != NULL) {
            uint8_t ipV4Addr[4];

            if (convertIPv4AddressStringToByteArray(ipAddress, ipV4Addr)) {
-                if (memcmp(ipV4Addr, MmsValue_getOctetStringBuffer(owner), 4) == 0)
-                    return true;
+                if (memcmp(ipV4Addr, MmsValue_getOctetStringBuffer(owner), 4) == 0) {
+                    retVal = true;
+                    goto exit_function;
+                }
            }
        }
        else {
            uint8_t ipV6Addr[16];

            if (StringUtils_convertIPv6AdddressStringToByteArray(ipAddress, ipV6Addr)) {
-                if (memcmp(ipV6Addr, MmsValue_getOctetStringBuffer(owner), 16) == 0)
-                    return true;
+                if (memcmp(ipV6Addr, MmsValue_getOctetStringBuffer(owner), 16) == 0) {
+                    retVal = true;
+                    goto exit_function;
+                }
+            }
+            else {
+                goto exit_function;
            }
-            else
-                return false;
        }
    }

-    return false;
+exit_function:
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_post(rc->rcbValuesLock);
+#endif
+
+    return retVal;
 }

 static void
@ -1662,6 +1733,10 @@ reserveRcb(ReportControl* rc,  MmsServerConnection connection)
    rc->reserved = true;
    rc->clientConnection = connection;

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_wait(rc->rcbValuesLock);
+#endif
+
    if (rc->buffered) {
 #if (CONFIG_IEC61850_BRCB_WITH_RESVTMS == 1)
        if (rc->server->enableBRCBResvTms) {
@ -1677,6 +1752,10 @@ reserveRcb(ReportControl* rc,  MmsServerConnection connection)
            MmsValue_setBoolean(resvVal, true);
    }

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_post(rc->rcbValuesLock);
+#endif
+
    updateOwner(rc, connection);
 }

@ -1814,10 +1893,17 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme

                updateOwner(rc, connection);

-                MmsValue* rptEna = ReportControl_getRCBValue(rc, "RptEna");
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_wait(rc->rcbValuesLock);
+#endif

+                MmsValue* rptEna = ReportControl_getRCBValue(rc, "RptEna");
                MmsValue_update(rptEna, value);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+
                if (rc->buffered) {

                    if (rc->isResync == false) {
@ -1837,10 +1923,18 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme

                rc->sqNum = 0;

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_wait(rc->rcbValuesLock);
+#endif
+
                MmsValue* sqNum = ReportControl_getRCBValue(rc, "SqNum");

                MmsValue_setUint32(sqNum, 0U);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+
                retVal = DATA_ACCESS_ERROR_SUCCESS;

                if (self->rcbEventHandler) {
@ -1968,12 +2062,23 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme

        }
        else if (strcmp(elementName, "DatSet") == 0) {
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(rc->rcbValuesLock);
+#endif
+
            MmsValue* datSet = ReportControl_getRCBValue(rc, "DatSet");

            if (!MmsValue_equals(datSet, value)) {

                if (updateReportDataset(self, rc, value, connection)) {

+                    MmsValue_update(datSet, value);
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                    Semaphore_post(rc->rcbValuesLock);
+#endif
+
                    if (rc->buffered) {
                        purgeBuf(rc);

@ -1982,26 +2087,42 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
                        }
                    }

-                    MmsValue_update(datSet, value);
-
                    increaseConfRev(rc);
                }
                else {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                    Semaphore_post(rc->rcbValuesLock);
+#endif
+
                    retVal = DATA_ACCESS_ERROR_OBJECT_VALUE_INVALID;

                    goto exit_function;
                }
            }
+            else {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+            }

            retVal = DATA_ACCESS_ERROR_SUCCESS;
            goto exit_function;
        }
        else if (strcmp(elementName, "IntgPd") == 0) {
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(rc->rcbValuesLock);
+#endif
+
            MmsValue* intgPd = ReportControl_getRCBValue(rc, elementName);

            if (!MmsValue_equals(intgPd, value)) {
                MmsValue_update(intgPd, value);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+
                refreshIntegrityPeriod(rc);

                if (rc->buffered) {
@ -2013,15 +2134,29 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
                    }
                }
            }
+            else {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+            }

            goto exit_function;
        }
        else if (strcmp(elementName, "TrgOps") == 0) {
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(rc->rcbValuesLock);
+#endif
+
            MmsValue* trgOps = ReportControl_getRCBValue(rc, elementName);

            if (!MmsValue_equals(trgOps, value)) {
                MmsValue_update(trgOps, value);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+
                if (rc->buffered) {
                    purgeBuf(rc);

@ -2032,6 +2167,11 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme

                refreshTriggerOptions(rc);
            }
+            else {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+            }

            goto exit_function;
        }
@ -2062,18 +2202,34 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
                rc->isResync = false;
            }

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(rc->rcbValuesLock);
+#endif
            MmsValue* entryID = ReportControl_getRCBValue(rc, elementName);
            MmsValue_update(entryID, value);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_post(rc->rcbValuesLock);
+#endif
+
            goto exit_function;
        }

        else if (strcmp(elementName, "BufTm") == 0) {
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(rc->rcbValuesLock);
+#endif
+
            MmsValue* bufTm = ReportControl_getRCBValue(rc, elementName);

            if (!MmsValue_equals(bufTm, value)) {
                MmsValue_update(bufTm, value);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+
                if (rc->buffered) {
                    purgeBuf(rc);

@ -2084,15 +2240,29 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme

                refreshBufferTime(rc);
            }
+            else {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+            }

            goto exit_function;
        }
        else if (strcmp(elementName, "RptID") == 0) {
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(rc->rcbValuesLock);
+#endif
+
            MmsValue* rptId = ReportControl_getRCBValue(rc, elementName);

            if (!MmsValue_equals(rptId, value)) {
                MmsValue_update(rptId, value);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+
                if (rc->buffered) {
                    purgeBuf(rc);

@ -2101,6 +2271,11 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
                    }
                }
            }
+            else {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+                Semaphore_post(rc->rcbValuesLock);
+#endif
+            }

            goto exit_function;
        }
@ -2183,14 +2358,26 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
            goto exit_function;
        }

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* rcbValue = ReportControl_getRCBValue(rc, elementName);

        if (rcbValue) {
            if (dontUpdate == false) {
                MmsValue_update(rcbValue, value);
            }
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_post(rc->rcbValuesLock);
+#endif
        }
        else {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_post(rc->rcbValuesLock);
+#endif
+
            retVal = DATA_ACCESS_ERROR_OBJECT_VALUE_INVALID;

            goto exit_function;
@ -2280,9 +2467,17 @@ Reporting_disableReportControlInstance(MmsMapping* self, ReportControl* rc)
    rc->enabled = false;
    rc->clientConnection = NULL;

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_wait(rc->rcbValuesLock);
+#endif
+
    MmsValue* rptEna = ReportControl_getRCBValue(rc, "RptEna");
    MmsValue_setBoolean(rptEna, false);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_post(rc->rcbValuesLock);
+#endif
+
    if (rc->reserved) {
        rc->reserved = false;

@ -2296,8 +2491,16 @@ Reporting_disableReportControlInstance(MmsMapping* self, ReportControl* rc)
    if (rc->buffered == false) {

        if (rc->resvTms != -1) {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(rc->rcbValuesLock);
+#endif
+
            MmsValue* resv = ReportControl_getRCBValue(rc, "Resv");
            MmsValue_setBoolean(resv, false);
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_post(rc->rcbValuesLock);
+#endif
        }

        if (rc->resvTms != -1)
@ -2461,7 +2664,9 @@ enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI, uint64_

    ReportBuffer* buffer = reportControl->reportBuffer;

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
    Semaphore_wait(buffer->lock);
+#endif

    bool isBuffered = reportControl->buffered;
    bool overflow = false;
@ -2747,8 +2952,16 @@ enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI, uint64_
    #endif

        if (reportControl->enabled == false) {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(reportControl->rcbValuesLock);
+#endif
+
            MmsValue* entryIdValue = MmsValue_getElement(reportControl->rcbValues, 11);
            MmsValue_setOctetString(entryIdValue, (uint8_t*) entry->entryId, 8);
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_post(reportControl->rcbValuesLock);
+#endif
        }

        reportControl->lastEntryId = entryId;
@ -2851,7 +3064,9 @@ exit_function:
        /* TODO call user callback handler */
    }

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
    Semaphore_post(buffer->lock);
+#endif

    return;
 } /* enqueuReport() */
@ -2894,6 +3109,10 @@ sendNextReportEntrySegment(ReportControl* self)
    printf(" size: %i\n", report->entryLength);
 #endif

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_wait(self->rcbValuesLock);
+#endif
+
    if (isBuffered) {
        MmsValue* entryIdValue = MmsValue_getElement(self->rcbValues, 11);
        MmsValue_setOctetString(entryIdValue, (uint8_t*) report->entryId, 8);
@ -3424,6 +3643,11 @@ sendNextReportEntrySegment(ReportControl* self)
    }

 exit_function:
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+    Semaphore_post(self->rcbValuesLock);
+#endif
+
    self->segmented = segmented;
    return moreFollows;
 }
@ -3431,7 +3655,9 @@ exit_function:
 static void
 sendNextReportEntry(ReportControl* self)
 {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
    Semaphore_wait(self->reportBuffer->lock);
+#endif

    int messageCount = 0;

@ -3445,7 +3671,9 @@ sendNextReportEntry(ReportControl* self)
            break;
    }

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
    Semaphore_post(self->reportBuffer->lock);
+#endif
 }

 void
@ -3457,10 +3685,18 @@ Reporting_activateBufferedReports(MmsMapping* self)
        ReportControl* rc = (ReportControl*) element->data;

        if (rc->buffered) {
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(rc->rcbValuesLock);
+#endif
+
            if (updateReportDataset(self, rc, NULL, NULL))
                rc->isBuffering = true;
            else
                rc->isBuffering = false;
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_post(rc->rcbValuesLock);
+#endif
        }
    }
 }
@ -3686,9 +3922,19 @@ ReportControlBlock_getRptID(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* rptIdValue = ReportControl_getRCBValue(rc, "RptID");

-        return strdup(MmsValue_toString(rptIdValue));
+        char* rptIdStr = strdup(MmsValue_toString(rptIdValue));
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
+        return rptIdStr;
    }
    else {
        return self->rptId;
@ -3701,9 +3947,19 @@ ReportControlBlock_getDataSet(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* dataSetValue = ReportControl_getRCBValue(rc, "DatSet");

-        return strdup(MmsValue_toString(dataSetValue));
+        char* dataSetStr = strdup(MmsValue_toString(dataSetValue));
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
+        return dataSetStr;
    }
    else {
        return self->dataSetName;
@ -3716,10 +3972,18 @@ ReportControlBlock_getConfRev(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* confRevValue = ReportControl_getRCBValue(rc, "ConfRev");

        uint32_t confRev = MmsValue_toUint32(confRevValue);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
        return confRev;
    }
    else {
@ -3733,10 +3997,18 @@ ReportControlBlock_getOptFlds(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* optFldsValue = ReportControl_getRCBValue(rc, "OptFlds");

        uint32_t optFlds = MmsValue_getBitStringAsInteger(optFldsValue) / 2;

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
        return optFlds;
    }
    else {
@ -3750,10 +4022,18 @@ ReportControlBlock_getBufTm(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* bufTmValue = ReportControl_getRCBValue(rc, "BufTm");

        uint32_t bufTm = MmsValue_toUint32(bufTmValue);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
        return bufTm;
    }
    else {
@ -3767,10 +4047,18 @@ ReportControlBlock_getSqNum(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* sqNumValue = ReportControl_getRCBValue(rc, "SqNum");

        uint16_t sqNum = (uint16_t)MmsValue_toUint32(sqNumValue);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
        return sqNum;
    }
    else {
@ -3810,10 +4098,18 @@ ReportControlBlock_getGI(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* giValue = ReportControl_getRCBValue(rc, "GI");

        bool gi = MmsValue_getBoolean(giValue);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
        return gi;
    }
    else {
@ -3827,10 +4123,18 @@ ReportControlBlock_getPurgeBuf(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* purgeBufValue = ReportControl_getRCBValue(rc, "PurgeBuf");

        bool purgeBuf = MmsValue_getBoolean(purgeBufValue);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
        return purgeBuf;
    }
    else {
@ -3844,10 +4148,18 @@ ReportControlBlock_getEntryId(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* entryIdValue = ReportControl_getRCBValue(rc, "EntryID");

        MmsValue* entryId = MmsValue_clone(entryIdValue);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
        return entryId;
    }
    else {
@ -3861,10 +4173,18 @@ ReportControlBlock_getTimeofEntry(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* timeofEntryValue = ReportControl_getRCBValue(rc, "TimeofEntry");

        uint64_t timeofEntry = MmsValue_getBinaryTimeAsUtcMs(timeofEntryValue);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
        return timeofEntry;
    }
    else {
@ -3878,10 +4198,18 @@ ReportControlBlock_getResvTms(ReportControlBlock* self)
    if (self->trgOps & 64) {
        ReportControl* rc = (ReportControl*)(self->sibling);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_wait(rc->rcbValuesLock);
+#endif
+
        MmsValue* resvTmsValue = ReportControl_getRCBValue(rc, "ResvTms");

        int16_t resvTms = (int16_t)MmsValue_toInt32(resvTmsValue);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+        Semaphore_post(rc->rcbValuesLock);
+#endif
+
        return resvTms;
    }
    else {
@ -3896,10 +4224,19 @@ ReportControlBlock_getOwner(ReportControlBlock* self)
        ReportControl* rc = (ReportControl*)(self->sibling);

        if (rc->hasOwner) {
+
+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_wait(rc->rcbValuesLock);
+#endif
+
            MmsValue* ownerValue = ReportControl_getRCBValue(rc, "Owner");

            MmsValue* ownerValueCopy = MmsValue_clone(ownerValue);

+#if (CONFIG_MMS_THREADLESS_STACK != 1)
+            Semaphore_post(rc->rcbValuesLock);
+#endif
+
            return ownerValueCopy;
        }
        else
--- a/src/mms/inc_private/mms_server_libinternal.h
+++ b/src/mms/inc_private/mms_server_libinternal.h
@ -1,7 +1,7 @@
 /*
 *  mms_server_libinternal.h
 *
- *  Copyright 2013-2020 Michael Zillgith
+ *  Copyright 2013-2022 Michael Zillgith
 *
 *  This file is part of libIEC61850.
 *
--- a/src/mms/iso_mms/server/mms_read_service.c
+++ b/src/mms/iso_mms/server/mms_read_service.c
@ -1,7 +1,7 @@
 /*
 *  mms_read_service.c
 *
- *  Copyright 2013-2018 Michael Zillgith
+ *  Copyright 2013-2022 Michael Zillgith
 *
 *  This file is part of libIEC61850.
 *
@ -98,10 +98,9 @@ addComplexValueToResultList(MmsVariableSpecification* namedVariable,
                                LinkedList typedValues, MmsServerConnection connection,
                                MmsDomain* domain, char* nameIdStr)
 {
-
    MmsValue* value = addNamedVariableValue(namedVariable, connection, domain, nameIdStr);

-    if (value != NULL)
+    if (value)
        LinkedList_add(typedValues, value);
 }

@ -109,9 +108,8 @@ addComplexValueToResultList(MmsVariableSpecification* namedVariable,
 static void
 appendValueToResultList(MmsValue* value, LinkedList values)
 {
-
-	if (value != NULL )
-		LinkedList_add(values, value);
+    if (value)
+        LinkedList_add(values, value);
 }

 static void
@ -126,15 +124,15 @@ deleteValueList(LinkedList values)
 {
    LinkedList value = LinkedList_getNext(values);

-	while (value != NULL ) {
-	    MmsValue* typedValue = (MmsValue*) (value->data);
+    while (value) {
+        MmsValue* typedValue = (MmsValue*) (value->data);

-		MmsValue_deleteConditional(typedValue);
+        MmsValue_deleteConditional(typedValue);

-		value = LinkedList_getNext(value);
-	}
+        value = LinkedList_getNext(value);
+    }

-	LinkedList_destroyStatic(values);
+    LinkedList_destroyStatic(values);
 }

 static bool