From 931fda5d32d4e1a4d5ab5a2b10985ef2618ef54e Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Wed, 30 Oct 2024 10:57:49 +0000 Subject: [PATCH] - IED server: always send LastApplError in operate resp- independent of the control model (LIB61850-472) --- src/iec61850/server/mms_mapping/control.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c index 07ef4324..db741399 100644 --- a/src/iec61850/server/mms_mapping/control.c +++ b/src/iec61850/server/mms_mapping/control.c @@ -2379,7 +2379,6 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, const char checkResult = controlObject->checkHandler((ControlAction) controlObject, controlObject->checkHandlerParameter, ctlVal, testCondition, interlockCheck); - } if (checkResult == CONTROL_ACCEPTED) @@ -2453,12 +2452,9 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, const char abortControlOperation(controlObject, false, SELECT_STATE_REASON_OPERATE_FAILED, self); - if ((controlObject->ctlModel == 3) || (controlObject->ctlModel == 4)) - { - ControlObject_sendLastApplError(controlObject, connection, "Oper", - controlObject->errorValue, controlObject->addCauseValue, - ctlNum, origin, true); - } + ControlObject_sendLastApplError(controlObject, connection, "Oper", + controlObject->errorValue, controlObject->addCauseValue, + ctlNum, origin, true); } }