- added logs and LCBs to config file example

- fixed parser bug in config_file_parser.c
9 years ago · 9f96006ffb
parent 325c3e0b7e
commit 9f96006ffb
7 changed files with 323 additions and 280 deletions
--- a/3
+++ b/3
@ -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
--- a/examples/server_example_config_file/vmd-filestore/model.cfg
+++ b/examples/server_example_config_file/vmd-filestore/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);
 }
--- a/examples/server_example_config_file/simpleIO_direct_control_goose.icd
+++ b/examples/server_example_config_file/simpleIO_direct_control_goose.icd
@ -68,6 +68,18 @@
              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" entryID="true" configRef="true" />
              <RptEnabled max="1" />
 	        </ReportControl>
+	        
+			<LogControl name="EventLog" datSet="Events" logName="EventLog" logEna="false">
+				<TrgOps dchg="true" qchg="true" />
+			</LogControl>
+		
+			<LogControl name="GeneralLog" datSet="" logName="" logEna="false">
+				<TrgOps dchg="true" qchg="true" />
+			</LogControl>
+		
+			<Log />
+			<Log name="EventLog" />
+            
            <GSEControl appID="events" name="gcbEvents" type="GOOSE" datSet="Events" confRev="2"/> 
            <GSEControl appID="analog" name="gcbAnalogValues" type="GOOSE" datSet="AnalogValues" confRev="2"/> 
            <DOI name="Mod">
--- a/examples/server_example_logging/simpleIO_direct_control.icd
+++ b/examples/server_example_logging/simpleIO_direct_control.icd
@ -41,54 +41,79 @@
 					<LN0 lnClass="LLN0" lnType="LLN01" inst="">

 						<DataSet name="Events" desc="Events">
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1" doName="SPCSO1" daName="stVal" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1" doName="SPCSO2" daName="stVal" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1" doName="SPCSO3" daName="stVal" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1" doName="SPCSO4" daName="stVal" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1"
+								doName="SPCSO1" daName="stVal" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1"
+								doName="SPCSO2" daName="stVal" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1"
+								doName="SPCSO3" daName="stVal" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1"
+								doName="SPCSO4" daName="stVal" />
 						</DataSet>

 						<DataSet name="Events2" desc="Events2">
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1" doName="SPCSO1" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1" doName="SPCSO2" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1" doName="SPCSO3" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1" doName="SPCSO4" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1"
+								doName="SPCSO1" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1"
+								doName="SPCSO2" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1"
+								doName="SPCSO3" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="ST" lnInst="1"
+								doName="SPCSO4" />
 						</DataSet>

 						<DataSet name="Measurements" desc="Measurements">
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1" doName="AnIn1" daName="mag.f" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1" doName="AnIn1" daName="q" />
-			  <FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1" doName="AnIn2" daName="mag.f" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1" doName="AnIn2" daName="q" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1" doName="AnIn3" daName="mag.f" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1" doName="AnIn3" daName="q" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1" doName="AnIn4" daName="mag.f" />
-              <FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1" doName="AnIn4" daName="q" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1"
+								doName="AnIn1" daName="mag.f" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1"
+								doName="AnIn1" daName="q" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1"
+								doName="AnIn2" daName="mag.f" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1"
+								doName="AnIn2" daName="q" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1"
+								doName="AnIn3" daName="mag.f" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1"
+								doName="AnIn3" daName="q" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1"
+								doName="AnIn4" daName="mag.f" />
+							<FCDA ldInst="GenericIO" lnClass="GGIO" fc="MX" lnInst="1"
+								doName="AnIn4" daName="q" />
 						</DataSet>

-            <ReportControl name="EventsRCB" confRev="4294967295" datSet="Events" rptID="Events1" buffered="false" intgPd="1000" bufTime="50">
+						<ReportControl name="EventsRCB" confRev="4294967295"
+							datSet="Events" rptID="Events1" buffered="false" intgPd="1000"
+							bufTime="50">
 							<TrgOps period="true" />
-              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" entryID="true" configRef="true" />
+							<OptFields seqNum="true" timeStamp="true" dataSet="true"
+								reasonCode="true" entryID="true" configRef="true" />
 							<RptEnabled max="1" />
 						</ReportControl>

-            <ReportControl name="EventsIndexed" indexed="true" confRev="1" datSet="Events" rptID="Events2" buffered="false" intgPd="1000" bufTime="50">
+						<ReportControl name="EventsIndexed" indexed="true"
+							confRev="1" datSet="Events" rptID="Events2" buffered="false"
+							intgPd="1000" bufTime="50">
 							<TrgOps period="true" />
-              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" entryID="true" configRef="true" />
+							<OptFields seqNum="true" timeStamp="true" dataSet="true"
+								reasonCode="true" entryID="true" configRef="true" />
 							<RptEnabled max="3" />
 						</ReportControl>

-            <ReportControl name="Measurements" indexed="true" confRev="1" datSet="Measurements" rptID="Measurements" buffered="true" intgPd="1000" bufTime="50">
+						<ReportControl name="Measurements" indexed="true"
+							confRev="1" datSet="Measurements" rptID="Measurements" buffered="true"
+							intgPd="1000" bufTime="50">
 							<TrgOps period="false" />
-              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" entryID="true" configRef="true" />
+							<OptFields seqNum="true" timeStamp="true" dataSet="true"
+								reasonCode="true" entryID="true" configRef="true" />
 							<RptEnabled max="3" />
 						</ReportControl>

 						<LogControl name="EventLog" datSet="Events" logName="EventLog">
-			  <TrgOps dchg="true" qchg="true"/>
+							<TrgOps dchg="true" qchg="true" />
 						</LogControl>

 						<LogControl name="GeneralLog" datSet="" logName="">
-                          <TrgOps dchg="true" qchg="true"/>
+							<TrgOps dchg="true" qchg="true" />
 						</LogControl>


--- 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")) {
--- a/tools/model_generator/genmodel.jar
+++ b/tools/model_generator/genmodel.jar
--- a/tools/model_generator/modelviewer.jar
+++ b/tools/model_generator/modelviewer.jar