Client file service; connect timeout; other small changes

asn1/mms/mms.asn

@@ -29,7 +29,12 @@ ConfirmedServiceRequest ::= CHOICE {
     getVariableAccessAttributes     [6]                 GetVariableAccessAttributes-Request,
     defineNamedVariableList         [11]    IMPLICIT    DefineNamedVariableList-Request,
     getNamedVariableListAttributes  [12]                GetNamedVariableListAttributes-Request,
-    deleteNamedVariableList         [13]    IMPLICIT    DeleteNamedVariableList-Request
+    deleteNamedVariableList         [13]    IMPLICIT    DeleteNamedVariableList-Request,
+    fileOpen                        [72]    IMPLICIT    FileOpen-Request,
+    fileRead                        [73]    IMPLICIT    FileRead-Request,
+    fileClose                       [74]    IMPLICIT    FileClose-Request,
+    fileDelete                      [76]    IMPLICIT    FileDelete-Request,
+    fileDirectory                   [77]    IMPLICIT    FileDirectory-Request
 }
 
 Unconfirmed-PDU ::= SEQUENCE {
@@ -52,7 +57,12 @@ ConfirmedServiceResponse ::= CHOICE {
     getVariableAccessAttributes     [6]     IMPLICIT GetVariableAccessAttributes-Response,
     defineNamedVariableList         [11]    IMPLICIT DefineNamedVariableList-Response,
     getNamedVariableListAttributes  [12]    IMPLICIT GetNamedVariableListAttributes-Response,
-    deleteNamedVariableList         [13]    IMPLICIT DeleteNamedVariableList-Response
+    deleteNamedVariableList         [13]    IMPLICIT DeleteNamedVariableList-Response,
+    fileOpen                        [72]    IMPLICIT FileOpen-Response,
+    fileRead                        [73]    IMPLICIT FileRead-Response,
+    fileClose                       [74]    IMPLICIT FileClose-Response,
+    fileDelete                      [76]    IMPLICIT FileDelete-Response,
+    fileDirectory                   [77]    IMPLICIT FileDirectory-Response
 }
 
 
@@ -581,6 +591,53 @@ DeleteNamedVariableList-Response ::= SEQUENCE {
     numberDeleted [1] IMPLICIT Unsigned32
 }
 
+FileOpen-Request ::= SEQUENCE {
+    fileName [0] IMPLICIT FileName,
+    initialPosition [1] IMPLICIT Unsigned32
+}
+
+FileOpen-Response ::= SEQUENCE {
+    frsmID [0] IMPLICIT Integer32,
+    fileAttributes [1] IMPLICIT FileAttributes
+}
+
+FileRead-Request ::= Integer32 -- FRSM ID
+
+FileRead-Response ::= SEQUENCE {
+    fileData [0] IMPLICIT OCTET STRING,
+    moreFollows [1] IMPLICIT BOOLEAN DEFAULT TRUE
+}
+
+FileClose-Request ::= Integer32 -- FRSM ID
+
+FileClose-Response ::= NULL
+
+FileDelete-Request ::= FileName
+
+FileDelete-Response ::= NULL
+
+FileDirectory-Request ::= SEQUENCE {
+    fileSpecification [0] IMPLICIT FileName OPTIONAL,
+    continueAfter [1] IMPLICIT FileName OPTIONAL
+}
+
+FileDirectory-Response ::= SEQUENCE {
+    listOfDirectoryEntry [0] SEQUENCE OF DirectoryEntry,
+    moreFollows [1] IMPLICIT BOOLEAN DEFAULT FALSE
+}
+
+DirectoryEntry ::= SEQUENCE {
+    fileName [0] IMPLICIT FileName,
+    fileAttributes [1] IMPLICIT FileAttributes
+}
+
+FileAttributes ::= SEQUENCE {
+    sizeOfFile [0] IMPLICIT Unsigned32, -- in octets
+    lastModified [1] IMPLICIT GeneralizedTime OPTIONAL
+}
+
+FileName ::= SEQUENCE OF GraphicString
+
 TypeDescription ::= CHOICE {
     array [1] IMPLICIT SEQUENCE {
         packed [0] IMPLICIT BOOLEAN DEFAULT FALSE,

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AccessResult.java

@@ -1,5 +1,5 @@
 /**
- * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org)
+ * This class file was automatically generated by jASN1 v1.9.1-SNAPSHOT (http://www.openmuc.org)
  */
 
 package org.openmuc.openiec61850.internal.mms.asn1;
@@ -8,9 +8,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.*;
 
 public class AccessResult implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccess.java

@@ -1,20 +1,17 @@
 /**
- * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org)
+ * This class file was automatically generated by jASN1 v1.9.1-SNAPSHOT (http://www.openmuc.org)
  */
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.Serializable;
+import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
-
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import java.io.Serializable;
+import org.openmuc.jasn1.ber.*;
 
 public class AlternateAccess implements Serializable {
 
@@ -121,7 +118,7 @@ public void appendAsString(StringBuilder sb, int indentLevel) {
     private List<CHOICE> seqOf = null;
 
     public AlternateAccess() {
-        seqOf = new ArrayList<>();
+        seqOf = new ArrayList<CHOICE>();
     }
 
     public AlternateAccess(byte[] code) {
@@ -130,7 +127,7 @@ public AlternateAccess(byte[] code) {
 
     public List<CHOICE> getCHOICE() {
         if (seqOf == null) {
-            seqOf = new ArrayList<>();
+            seqOf = new ArrayList<CHOICE>();
         }
         return seqOf;
     }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccessSelection.java

@@ -1,5 +1,5 @@
 /**
- * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org)
+ * This class file was automatically generated by jASN1 v1.9.1-SNAPSHOT (http://www.openmuc.org)
  */
 
 package org.openmuc.openiec61850.internal.mms.asn1;
@@ -8,11 +8,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
-import org.openmuc.jasn1.ber.types.BerNull;
+import org.openmuc.jasn1.ber.*;
+import org.openmuc.jasn1.ber.types.*;
 import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public class AlternateAccessSelection implements Serializable {

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/BasicIdentifier.java

@@ -1,10 +1,10 @@
 /**
- * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org)
+ * This class file was automatically generated by jASN1 v1.9.1-SNAPSHOT (http://www.openmuc.org)
  */
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.string.BerVisibleString;
+import org.openmuc.jasn1.ber.types.string.*;
 
 public class BasicIdentifier extends BerVisibleString {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConcludeRequestPDU.java

@@ -1,10 +1,10 @@
 /**
- * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org)
+ * This class file was automatically generated by jASN1 v1.9.1-SNAPSHOT (http://www.openmuc.org)
  */
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.BerNull;
+import org.openmuc.jasn1.ber.types.*;
 
 public class ConcludeRequestPDU extends BerNull {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedErrorPDU.java

@@ -1,5 +1,5 @@
 /**
- * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org)
+ * This class file was automatically generated by jASN1 v1.9.1-SNAPSHOT (http://www.openmuc.org)
  */
 
 package org.openmuc.openiec61850.internal.mms.asn1;
@@ -8,10 +8,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.*;
 
 public class ConfirmedErrorPDU implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedRequestPDU.java

@@ -1,5 +1,5 @@
 /**
- * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org)
+ * This class file was automatically generated by jASN1 v1.9.1-SNAPSHOT (http://www.openmuc.org)
  */
 
 package org.openmuc.openiec61850.internal.mms.asn1;
@@ -8,11 +8,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
-import org.openmuc.jasn1.ber.types.BerInteger;
+import org.openmuc.jasn1.ber.*;
+import org.openmuc.jasn1.ber.types.*;
 
 public class ConfirmedRequestPDU implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedResponsePDU.java

@@ -1,5 +1,5 @@
 /**
- * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org)
+ * This class file was automatically generated by jASN1 v1.9.1-SNAPSHOT (http://www.openmuc.org)
  */
 
 package org.openmuc.openiec61850.internal.mms.asn1;
@@ -8,10 +8,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.*;
 import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class ConfirmedResponsePDU implements Serializable {