From 017c9d9282919c628c8f093a5d9db40444448898 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Tue, 9 Mar 2021 17:21:43 +0100 Subject: [PATCH] - fixed cherry-pick conflict --- src/iec61850/server/mms_mapping/mms_goose.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/iec61850/server/mms_mapping/mms_goose.c b/src/iec61850/server/mms_mapping/mms_goose.c index 405a8e17..783adbb6 100644 --- a/src/iec61850/server/mms_mapping/mms_goose.c +++ b/src/iec61850/server/mms_mapping/mms_goose.c @@ -337,7 +337,8 @@ MmsGooseControlBlock_disable(MmsGooseControlBlock self) void MmsGooseControlBlock_checkAndPublish(MmsGooseControlBlock self, uint64_t currentTime, MmsMapping* mapping) { - if (currentTime >= self->nextPublishTime) { + if (self->publisher) { + if (currentTime >= self->nextPublishTime) { IedServer_lockDataModel(mapping->iedServer); @@ -352,8 +353,6 @@ MmsGooseControlBlock_checkAndPublish(MmsGooseControlBlock self, uint64_t current if (self->retransmissionsLeft > 0) { self->nextPublishTime = currentTime + self->minTime; - if (self->retransmissionsLeft > 0) { - self->nextPublishTime = currentTime + self->minTime; if (self->retransmissionsLeft > 1) GoosePublisher_setTimeAllowedToLive(self->publisher, self->minTime * 3);