From 5a24981048dc063bc96c3f14400ff4b5bc2df093 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Sun, 30 Jul 2023 19:01:32 +0100
Subject: [PATCH] - IED server: added code to create SMVCBs with the dynamic
 model API (LIB61850-67)

---
 src/iec61850/server/model/dynamic_model.c | 33 +++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/iec61850/server/model/dynamic_model.c b/src/iec61850/server/model/dynamic_model.c
index 790c9be3..68710320 100644
--- a/src/iec61850/server/model/dynamic_model.c
+++ b/src/iec61850/server/model/dynamic_model.c
@@ -166,7 +166,6 @@ IedModel_addSettingGroupControlBlock(IedModel* self, SettingGroupControlBlock* s
 }
 #endif /* (CONFIG_IEC61850_SETTING_GROUPS == 1) */
 
-
 static void
 IedModel_addGSEControlBlock(IedModel* self, GSEControlBlock* gcb)
 {
@@ -175,13 +174,29 @@ IedModel_addGSEControlBlock(IedModel* self, GSEControlBlock* gcb)
     else {
         GSEControlBlock* lastGcb = self->gseCBs;
 
-        while (lastGcb->sibling != NULL)
+        while (lastGcb->sibling)
             lastGcb = lastGcb->sibling;
 
         lastGcb->sibling = gcb;
     }
 }
 
+static void
+IedModel_addSMVControlBlock(IedModel* self, SVControlBlock* smvcb)
+{
+    if (self->svCBs == NULL) {
+        self->svCBs = smvcb;
+    }
+    else {
+        SVControlBlock* lastSvCB = self->svCBs;
+
+        while (lastSvCB->sibling)
+            lastSvCB = lastSvCB->sibling;
+
+        lastSvCB->sibling = smvcb;
+    }
+}
+
 LogicalDevice*
 LogicalDevice_createEx(const char* inst, IedModel* parent, const char* ldName)
 {
@@ -512,6 +527,14 @@ GSEControlBlock_create(const char* name, LogicalNode* parent, const char* appId,
     return self;
 }
 
+static void
+LogicalNode_addSMVControlBlock(LogicalNode* self, SVControlBlock* smvcb)
+{
+    IedModel* model = (IedModel*) self->parent->parent;
+
+    IedModel_addSMVControlBlock(model, smvcb);
+}
+
 SVControlBlock*
 SVControlBlock_create(const char* name, LogicalNode* parent, const char* svID, const char* dataSet, uint32_t confRev, uint8_t smpMod,
         uint16_t smpRate, uint8_t optFlds, bool isUnicast)
@@ -536,6 +559,12 @@ SVControlBlock_create(const char* name, LogicalNode* parent, const char* svID, c
 
         self->optFlds = optFlds;
         self->isUnicast = isUnicast;
+
+        self->dstAddress = NULL;
+        self->sibling = NULL;
+
+        if (parent)
+            LogicalNode_addSMVControlBlock(parent, self);
     }
 
     return self;