diff --git a/CHANGELOG b/CHANGELOG
index fd9d8018..e2d99d48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,10 @@ Changes to version 0.9.2
- client/server: support for MMS journals and IEC 61850 log service
- Abstract interface for log storage providers: logging_api.h and LogStorage class
- log storage implementation using sqlite
+- server: negative delete data set response is now compatible with new test procedures (TPCL 1.1)
+- FileSystem API is now intended to access the complete file system. Path translation for VMD filestore is done by MMS file service implementation (removed FileSystem_setBasePath function)
- added CDC_DPL_create function
+- MMS server: fixed raced condition when opening/closing connections in multi-threaded configuration.
Changes to version 0.9.1
diff --git a/examples/server_example_config_file/vmd-filestore/model.cfg b/examples/server_example_config_file/model.cfg
similarity index 95%
rename from examples/server_example_config_file/vmd-filestore/model.cfg
rename to examples/server_example_config_file/model.cfg
index 58fdeaee..02feeb04 100644
--- a/examples/server_example_config_file/vmd-filestore/model.cfg
+++ b/examples/server_example_config_file/model.cfg
@@ -1,8 +1,3 @@
-Dynamic model generator
-parse data type templates ...
-parse IED section ...
-parse communication section ...
-Found connectedAP accessPoint1 for IED simpleIO
MODEL(simpleIO){
LD(GenericIO){
LN(LLN0){
@@ -42,6 +37,10 @@ DE(GGIO1$MX$AnIn4);
}
RC(EventsRCB01 Events 0 Events 1 24 111 50 1000);
RC(AnalogValuesRCB01 AnalogValues 0 AnalogValues 1 24 111 50 1000);
+LC(EventLog Events GenericIO/LLN0$EventLog 19 0 0 1)
+LC(GeneralLog - - 19 0 0 1)
+LOG(GeneralLog)
+LOG(EventLog)
GC(gcbEvents events Events 2 0 -1 -1 ){
PA(4 273 4096 010ccd010001);
}
diff --git a/examples/server_example_config_file/simpleIO_direct_control_goose.icd b/examples/server_example_config_file/simpleIO_direct_control_goose.icd
index e66f9a95..72552c45 100644
--- a/examples/server_example_config_file/simpleIO_direct_control_goose.icd
+++ b/examples/server_example_config_file/simpleIO_direct_control_goose.icd
@@ -67,7 +67,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/server_example_logging/simpleIO_direct_control.icd b/examples/server_example_logging/simpleIO_direct_control.icd
index b48a383e..216f1f76 100644
--- a/examples/server_example_logging/simpleIO_direct_control.icd
+++ b/examples/server_example_logging/simpleIO_direct_control.icd
@@ -1,281 +1,306 @@
-
-
-
- Station bus
- 10
-
-
- 10.0.0.2
- 255.255.255.0
- 10.0.0.1
- 0001
- 00000001
- 0001
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Station bus
+ 10
+
+
+ 10.0.0.2
+ 255.255.255.0
+ 10.0.0.1
+ 0001
+ 00000001
+ 0001
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- status-only
-
-
-
-
-
- MZ Automation
-
-
- 0.7.3
-
-
- libiec61850 server example
-
-
-
-
-
-
-
- status-only
-
-
-
-
- direct-with-normal-security
-
-
-
-
- direct-with-normal-security
-
-
-
-
- direct-with-normal-security
-
-
-
-
- direct-with-normal-security
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- status-only
- direct-with-normal-security
- sbo-with-normal-security
- direct-with-enhanced-security
- sbo-with-enhanced-security
-
-
- not-supported
- bay-control
- station-control
- remote-control
- automatic-bay
- automatic-station
- automatic-remote
- maintenance
- process
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ status-only
+
+
+
+
+
+ MZ Automation
+
+
+ 0.7.3
+
+
+ libiec61850 server example
+
+
+
+
+
+
+
+ status-only
+
+
+
+
+ direct-with-normal-security
+
+
+
+
+ direct-with-normal-security
+
+
+
+
+ direct-with-normal-security
+
+
+
+
+ direct-with-normal-security
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ status-only
+ direct-with-normal-security
+ sbo-with-normal-security
+ direct-with-enhanced-security
+ sbo-with-enhanced-security
+
+
+ not-supported
+ bay-control
+ station-control
+ remote-control
+ automatic-bay
+ automatic-station
+ automatic-remote
+ maintenance
+ process
+
+
diff --git a/src/iec61850/server/model/config_file_parser.c b/src/iec61850/server/model/config_file_parser.c
index a1ba90bb..1d4b67dc 100644
--- a/src/iec61850/server/model/config_file_parser.c
+++ b/src/iec61850/server/model/config_file_parser.c
@@ -241,6 +241,10 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle)
if (matchedItems < 1) goto exit_error;
+ /* remove trailing ')' character */
+ int nameLen = strlen(nameString);
+ nameString[nameLen - 1] = 0;
+
Log_create(nameString, currentLN);
}
else if (StringUtils_startsWith((char*) lineBuffer, "GC")) {
diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar
index cd7d60b7..d9a0b3fb 100644
Binary files a/tools/model_generator/genmodel.jar and b/tools/model_generator/genmodel.jar differ
diff --git a/tools/model_generator/modelviewer.jar b/tools/model_generator/modelviewer.jar
index ec5e4ba8..9beb17fe 100644
Binary files a/tools/model_generator/modelviewer.jar and b/tools/model_generator/modelviewer.jar differ