Merge branch 'master' of github.com:beanit/openiec61850

Bugfix NPE in ClientAssociation#close()

bin/iec61850bean-console-client.bat

@@ -1,6 +1,7 @@
-::BATCH file for windows
+::BATCH file to windows
+@echo off
 
 set BATDIR=%~dp0
-set LIBDIR="%BATDIR%..\build\libs-all"
+set LIBDIR="%BATDIR%..\build\libs-all\*"
 
-java  -Djava.ext.dirs=%LIBDIR% com.beanit.iec61850bean.app.ConsoleClient %*
+java -cp %LIBDIR% com.beanit.iec61850bean.app.ConsoleClient %*

bin/iec61850bean-console-server.bat

@@ -1,6 +1,8 @@
 ::BATCH file to windows
+@echo off
 
 set BATDIR=%~dp0
-set LIBDIR="%BATDIR%..\build\libs-all"
+set LIBDIR="%BATDIR%..\build\libs-all\*"
+
+java -Dlogback.configurationFile=logback.xml -cp %LIBDIR% com.beanit.iec61850bean.app.ConsoleServer %*
 
-java -Dlogback.configurationFile=logback.xml -Djava.ext.dirs=%LIBDIR% com.beanit.iec61850bean.app.ConsoleServer %*

bin/iec61850bean-gui-client.bat

@@ -1,6 +1,7 @@
 ::BATCH file to windows
+@echo off
 
 set BATDIR=%~dp0
-set LIBDIR="%BATDIR%..\build\libs-all"
+set LIBDIR="%BATDIR%..\build\libs-all\*"
 
-java -Djava.ext.dirs=%LIBDIR% com.beanit.iec61850bean.clientgui.ClientGui %*
+java -cp %LIBDIR% com.beanit.iec61850bean.clientgui.ClientGui %*

build.gradle.kts

@@ -6,9 +6,9 @@ plugins {
     signing
     eclipse
     id("biz.aQute.bnd.builder") version "5.1.1"
-    id("com.diffplug.gradle.spotless") version "4.4.0"
-    id("io.codearte.nexus-staging") version "0.21.2"
-    id("net.ltgt.errorprone") version "1.2.1"
+    id("com.diffplug.spotless") version "5.9.0"
+    id("io.codearte.nexus-staging") version "0.22.0"
+    id("net.ltgt.errorprone") version "1.3.0"
 }
 
 var cfgJavaVersion = JavaVersion.VERSION_1_8
@@ -21,7 +21,7 @@ val sonatypeStagingProfileId: String? by project
 
 //----------- project specific configuration start --------------------
 
-val cfgVersion = "1.9.0"
+val cfgVersion = "1.9.1-SNAPSHOT"
 val cfgGroup = "com.beanit"
 val cfgCopyToRoot = false
 val cfgSignPom = true
@@ -40,8 +40,6 @@ tasks.register<Tar>("tar") {
     into(project.name) {
         from("./") {
             include("build.gradle.kts")
-            include("configuration.gradle.kts")
-            include("settings.gradle.kts")
             include("LICENSE.txt")
             include("doc/**")
             include("bin/**")
@@ -132,7 +130,7 @@ configure(javaProjects) {
     apply(plugin = "signing")
     apply(plugin = "eclipse")
     apply(plugin = "biz.aQute.bnd.builder")
-    apply(plugin = "com.diffplug.gradle.spotless")
+    apply(plugin = "com.diffplug.spotless")
     apply(plugin = "net.ltgt.errorprone")
 
     tasks.publish {
@@ -151,9 +149,9 @@ configure(javaProjects) {
     }
 
     dependencies {
-        testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
-        testImplementation("com.tngtech.archunit:archunit-junit5:0.14.1")
-        errorprone("com.google.errorprone:error_prone_core:2.4.0")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+        testImplementation("com.tngtech.archunit:archunit-junit5:0.15.0")
+        errorprone("com.google.errorprone:error_prone_core:2.5.1")
     }
 
     tasks.test {

src/main/java/com/beanit/iec61850bean/BdaOptFlds.java

@@ -61,7 +61,7 @@ public final class BdaOptFlds extends BdaBitString {
     if (reportTimestamp) {
       value[0] = (byte) (value[0] | 0x20);
     } else {
-      value[0] = (byte) (value[0] & 0x2f);
+      value[0] = (byte) (value[0] & 0xdf);
     }
   }
 

src/main/java/com/beanit/iec61850bean/ClientAssociation.java

@@ -110,6 +110,7 @@ public final class ClientAssociation {
   private int responseTimeout;
 
   private int invokeId = 0;
+  private byte[] servicesSupported = null;
 
   private int negotiatedMaxPduSize;
   private ClientEventListener reportListener = null;
@@ -390,6 +391,16 @@ public final class ClientAssociation {
     return invokeId;
   }
 
+  /**
+   * Gets the ServicesSupported. The 11-byte array of bit flags is available after InitiateResponse
+   * is received from the server, otherwise null is returned
+   *
+   * @return the ServicesSupported byte array, or null.
+   */
+  public byte[] getServicesSupported() {
+    return servicesSupported;
+  }
+
   private ConfirmedServiceResponse encodeWriteReadDecode(ConfirmedServiceRequest serviceRequest)
       throws ServiceError, IOException {
 
@@ -567,7 +578,7 @@ public final class ClientAssociation {
       throw new IOException("Unsupported version number was negotiated.");
     }
 
-    byte[] servicesSupported =
+    servicesSupported =
         initiateResponsePdu.getInitResponseDetail().getServicesSupportedCalled().value;
     if ((servicesSupported[0] & 0x40) != 0x40) {
       throw new IOException("Obligatory services are not supported by the server.");
@@ -2099,15 +2110,17 @@ public final class ClientAssociation {
           closed = true;
           acseAssociation.close();
           lastIOException = e;
-          Thread t1 =
-              new Thread(
-                  new Runnable() {
-                    @Override
-                    public void run() {
-                      reportListener.associationClosed(lastIOException);
-                    }
-                  });
-          t1.start();
+          if (reportListener != null) {
+            Thread t1 =
+                new Thread(
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        reportListener.associationClosed(lastIOException);
+                      }
+                    });
+            t1.start();
+          }
 
           MMSpdu mmsPdu = new MMSpdu();
           mmsPdu.setConfirmedRequestPDU(new ConfirmedRequestPDU());

src/main/java/com/beanit/iec61850bean/ClientSap.java

@@ -33,11 +33,11 @@ public final class ClientSap {
 
   private static final byte[] DEFAULT_TSEL_LOCAL = new byte[] {0, 0};
   private static final byte[] DEFAULT_TSEL_REMOTE = new byte[] {0, 1};
-  private static final int DEFAUTL_TPDU_SIZE_PARAMETER = 10; // size = 1024
-  private final int proposedMaxServOutstandingCalling = 5;
-  private final int proposedMaxServOutstandingCalled = 5;
-  private final int proposedDataStructureNestingLevel = 10;
+  private static final int DEFAULT_TPDU_SIZE_PARAMETER = 10; // size = 1024
   private final ClientAcseSap acseSap;
+  private int proposedMaxServOutstandingCalling = 5;
+  private int proposedMaxServOutstandingCalled = 5;
+  private int proposedDataStructureNestingLevel = 10;
   private int proposedMaxMmsPduSize = 65000;
   private byte[] servicesSupportedCalling =
       new byte[] {(byte) 0xee, 0x1c, 0, 0, 0x04, 0x08, 0, 0, 0x79, (byte) 0xef, 0x18};
@@ -49,7 +49,7 @@ public final class ClientSap {
     acseSap = new ClientAcseSap();
     acseSap.tSap.tSelLocal = DEFAULT_TSEL_LOCAL;
     acseSap.tSap.tSelRemote = DEFAULT_TSEL_REMOTE;
-    acseSap.tSap.setMaxTPDUSizeParam(DEFAUTL_TPDU_SIZE_PARAMETER);
+    acseSap.tSap.setMaxTPDUSizeParam(DEFAULT_TPDU_SIZE_PARAMETER);
   }
 
   /**
@@ -62,7 +62,7 @@ public final class ClientSap {
     acseSap = new ClientAcseSap(socketFactory);
     acseSap.tSap.tSelLocal = DEFAULT_TSEL_LOCAL;
     acseSap.tSap.tSelRemote = DEFAULT_TSEL_REMOTE;
-    acseSap.tSap.setMaxTPDUSizeParam(DEFAUTL_TPDU_SIZE_PARAMETER);
+    acseSap.tSap.setMaxTPDUSizeParam(DEFAULT_TPDU_SIZE_PARAMETER);
   }
 
   /**
@@ -91,6 +91,18 @@ public final class ClientSap {
     }
   }
 
+  public void setProposedMaxServOutstandingCalling(int proposedMaxServOutstandingCalling) {
+    this.proposedMaxServOutstandingCalling = proposedMaxServOutstandingCalling;
+  }
+
+  public void setProposedMaxServOutstandingCalled(int proposedMaxServOutstandingCalled) {
+    this.proposedMaxServOutstandingCalled = proposedMaxServOutstandingCalled;
+  }
+
+  public void setProposedDataStructureNestingLevel(int proposedDataStructureNestingLevel) {
+    this.proposedDataStructureNestingLevel = proposedDataStructureNestingLevel;
+  }
+
   /**
    * Gets the ServicesSupportedCalling parameter.
    *

src/main/java/com/beanit/iec61850bean/internal/util/SequenceNumber.java

@@ -28,20 +28,25 @@ public class SequenceNumber {
 
   public static int getIncrement(int value, int minValue, int maxValue) {
     assert (value >= minValue) && (value <= maxValue);
-    if (value == maxValue) {
-      return minValue;
-    } else {
-      return ++value;
-    }
+    return (value == maxValue) ? minValue : value + 1;
   }
 
   public int getAndIncrement() {
     int oldValue = value;
-    if (value == maxValue) {
-      value = minValue;
-    } else {
-      ++value;
-    }
+    value = (value == maxValue) ? minValue : value + 1;
     return oldValue;
   }
+
+  public int get() {
+    return value;
+  }
+
+  public void increment() {
+    value = (value == maxValue) ? minValue : value + 1;
+  }
+
+  public int incrementAndGet() {
+    value = (value == maxValue) ? minValue : value + 1;
+    return value;
+  }
 }