From 896f5f18e53b25d131b013f5f0fe17bcd8f6f1dd Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 2 Feb 2019 17:48:50 +0100 Subject: [PATCH] - IEC 61850 server: don't send bufOvfl for unbuffered reports (see #101) --- src/iec61850/server/mms_mapping/reporting.c | 8 +------- src/mms/iso_mms/client/mms_client_read.c | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/iec61850/server/mms_mapping/reporting.c b/src/iec61850/server/mms_mapping/reporting.c index 1297c2aa..129092b3 100644 --- a/src/iec61850/server/mms_mapping/reporting.c +++ b/src/iec61850/server/mms_mapping/reporting.c @@ -325,6 +325,7 @@ sendReport(ReportControl* self, bool isIntegrity, bool isGI) LinkedList_add(reportElements, optFlds); /* delete option fields for unsupported options */ + MmsValue_setBitStringBit(optFlds, 6, false); /* bufOvfl */ MmsValue_setBitStringBit(optFlds, 7, false); /* entryID */ MmsValue_setBitStringBit(optFlds, 9, false); /* segmentation */ @@ -339,13 +340,6 @@ sendReport(ReportControl* self, bool isIntegrity, bool isGI) if (MmsValue_getBitStringBit(optFlds, 4)) /* data set reference */ LinkedList_add(reportElements, datSet); - if (MmsValue_getBitStringBit(optFlds, 6)) { /* bufOvfl */ - MmsValue* bufOvfl = MmsValue_newBoolean(false); - - LinkedList_add(reportElements, bufOvfl); - LinkedList_add(deletableElements, bufOvfl); - } - if (MmsValue_getBitStringBit(optFlds, 8)) LinkedList_add(reportElements, self->confRev); diff --git a/src/mms/iso_mms/client/mms_client_read.c b/src/mms/iso_mms/client/mms_client_read.c index fbd97672..5847fd07 100644 --- a/src/mms/iso_mms/client/mms_client_read.c +++ b/src/mms/iso_mms/client/mms_client_read.c @@ -53,7 +53,7 @@ mmsClient_parseListOfAccessResults(AccessResult_t** accessResultList, int listSi if (presentType == AccessResult_PR_failure) { if (DEBUG_MMS_CLIENT) - printf("access error!\n"); + printf("MMS CLIENT: received access error!\n"); if (accessResultList[i]->choice.failure.size > 0) { int errorCode = (int) accessResultList[i]->choice.failure.buf[0];