From 8eeb6f06b39e4969bc4566d49f72002a7f10353f Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 11 Dec 2021 12:04:26 +0100 Subject: [PATCH] - MMS server: query log service returns services error instead of reject message when log does not exist (LIB61850-290) --- src/mms/iso_mms/server/mms_journal_service.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mms/iso_mms/server/mms_journal_service.c b/src/mms/iso_mms/server/mms_journal_service.c index fb6339a6..8cdafb68 100644 --- a/src/mms/iso_mms/server/mms_journal_service.c +++ b/src/mms/iso_mms/server/mms_journal_service.c @@ -1,7 +1,7 @@ /* * mms_journal_service.c * - * Copyright 2016 Michael Zillgith + * Copyright 2016-2021 Michael Zillgith * * This file is part of libIEC61850. * @@ -453,7 +453,8 @@ mmsServer_handleReadJournalRequest( if (DEBUG_MMS_SERVER) printf("MMS_SERVER: readJournal domain %s not found\n", domainId); - mmsMsg_createMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_REQUEST_INVALID_ARGUMENT, response); + mmsMsg_createServiceErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_NON_EXISTENT); + return; } @@ -463,7 +464,8 @@ mmsServer_handleReadJournalRequest( if (DEBUG_MMS_SERVER) printf("MMS_SERVER: readJournal journal %s not found\n", logName); - mmsMsg_createMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_REQUEST_INVALID_ARGUMENT, response); + mmsMsg_createServiceErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_NON_EXISTENT); + return; } @@ -494,6 +496,7 @@ mmsServer_handleReadJournalRequest( printf("MMS_SERVER: readJournal missing valid argument combination\n"); mmsMsg_createMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_REQUEST_INVALID_ARGUMENT, response); + return; }