From b88c4216c8829984d41cf4946a840a9bf2e2caa9 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 21 Nov 2020 15:11:13 +0100 Subject: [PATCH] - IED server: send AddCause for invalid origin also in case of direct control models --- src/iec61850/server/mms_mapping/control.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c index 069171ac..6d36ebe8 100644 --- a/src/iec61850/server/mms_mapping/control.c +++ b/src/iec61850/server/mms_mapping/control.c @@ -2081,11 +2081,11 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari if (checkValidityOfOriginParameter(origin) == false) { indication = DATA_ACCESS_ERROR_OBJECT_VALUE_INVALID; - if ((controlObject->ctlModel == 2) || (controlObject->ctlModel == 4)) { - ControlObject_sendLastApplError(controlObject, connection, "Oper", - CONTROL_ERROR_NO_ERROR, ADD_CAUSE_INCONSISTENT_PARAMETERS, - ctlNum, origin, true); + ControlObject_sendLastApplError(controlObject, connection, "Oper", + CONTROL_ERROR_NO_ERROR, ADD_CAUSE_INCONSISTENT_PARAMETERS, + ctlNum, origin, true); + if ((controlObject->ctlModel == 2) || (controlObject->ctlModel == 4)) { unselectObject(controlObject, SELECT_STATE_REASON_OPERATE_FAILED); }