From 516c8f5a40eea8deb5355b1d82bd36a034dc8323 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Mon, 13 Jun 2016 18:49:28 +0200 Subject: [PATCH] - add readJournal flag in initate response servicesSupportedCalled --- .../iso_mms/server/mms_association_service.c | 14 ++++++++++---- tools/model_generator/genmodel.jar | Bin 84529 -> 85990 bytes tools/model_generator/manifest-dyncCode.mf | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 tools/model_generator/manifest-dyncCode.mf diff --git a/src/mms/iso_mms/server/mms_association_service.c b/src/mms/iso_mms/server/mms_association_service.c index 6cce6be..7065d55 100644 --- a/src/mms/iso_mms/server/mms_association_service.c +++ b/src/mms/iso_mms/server/mms_association_service.c @@ -46,6 +46,8 @@ #define MMS_SERVICE_DEFINE_NAMED_TYPE 0x02 #define MMS_SERVICE_GET_NAMED_TYPE_ATTRIBUTES 0x01 +#define MMS_SERVICE_READ_JOURNAL 0x40 + #define MMS_SERVICE_FILE_OPEN 0x80 #define MMS_SERVICE_FILE_READ 0x40 #define MMS_SERVICE_FILE_CLOSE 0x20 @@ -63,11 +65,11 @@ static uint8_t servicesSupported[] = { 0x00 -#if MMS_STATUS_SERVICE == 1 +#if (MMS_STATUS_SERVICE == 1) | MMS_SERVICE_STATUS #endif | MMS_SERVICE_GET_NAME_LIST -#if MMS_IDENTIFY_SERVICE == 1 +#if (MMS_IDENTIFY_SERVICE == 1) | MMS_SERVICE_IDENTIFY #endif | MMS_SERVICE_READ @@ -85,9 +87,13 @@ static uint8_t servicesSupported[] = 0x00, 0x00, 0x00, - 0x00, 0x00 -#if MMS_FILE_SERVICE == 1 +#if (MMS_JOURNAL_SERVICE == 1) + | MMS_SERVICE_READ_JOURNAL +#endif + , + 0x00 +#if (MMS_FILE_SERVICE == 1) | MMS_SERVICE_FILE_OPEN | MMS_SERVICE_FILE_READ | MMS_SERVICE_FILE_CLOSE diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar index d9a0b3fb232cde40c64a32a9c4497a4ab005815d..92cc01549d899d525a3398d62b7d72be22243d3c 100644 GIT binary patch delta 4152 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 diff --git a/tools/model_generator/manifest-dyncCode.mf b/tools/model_generator/manifest-dyncCode.mf new file mode 100644 index 0000000..9fba372 --- /dev/null +++ b/tools/model_generator/manifest-dyncCode.mf @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +Main-Class: com.libiec61850.tools.DynamicCodeGenerator