#88 shortId of Security object for bootstrap server should be equal to 0

eclipse-leshan · Mar 4, 2016 · 2e6122b · 2e6122b
1 parent d5cb926
commit 2e6122b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Security.java b/leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Security.java
@@ -64,15 +64,15 @@ public Security(String serverUri, boolean bootstrapServer, int securityMode, byt
     /**
      * Returns a new security instance (NoSec) for a boostrap server.
      */
-    public static Security noSecBootstap(String serverUri, int shortServerId) {
-        return new Security(serverUri, true, 3, new byte[0], new byte[0], new byte[0], shortServerId);
+    public static Security noSecBootstap(String serverUri) {
+        return new Security(serverUri, true, 3, new byte[0], new byte[0], new byte[0], 0);
     }
 
     /**
      * Returns a new security instance (PSK) for a boostrap server.
      */
-    public static Security pskBootstrap(String serverUri, int shortServerId, byte[] pskIdentity, byte[] privateKey) {
-        return new Security(serverUri, true, 0, pskIdentity.clone(), new byte[0], privateKey.clone(), shortServerId);
+    public static Security pskBootstrap(String serverUri, byte[] pskIdentity, byte[] privateKey) {
+        return new Security(serverUri, true, 0, pskIdentity.clone(), new byte[0], privateKey.clone(), 0);
     }
 
     /**

diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/LeshanClientDemo.java b/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/LeshanClientDemo.java
@@ -174,9 +174,9 @@ public static void createAndStartClient(String endpoint, String localAddress, in
         ObjectsInitializer initializer = new ObjectsInitializer();
         if (needBootstrap) {
             if (pskIdentity == null)
-                initializer.setInstancesForObject(SECURITY, noSecBootstap(serverURI, 123));
+                initializer.setInstancesForObject(SECURITY, noSecBootstap(serverURI));
             else
-                initializer.setInstancesForObject(SECURITY, pskBootstrap(serverURI, 123, pskIdentity, pskKey));
+                initializer.setInstancesForObject(SECURITY, pskBootstrap(serverURI, pskIdentity, pskKey));
         } else {
             if (pskIdentity == null) {
                 initializer.setInstancesForObject(SECURITY, noSec(serverURI, 123));

diff --git a/...ts/src/test/java/org/eclipse/leshan/integration/tests/BootstrapIntegrationTestHelper.java b/...ts/src/test/java/org/eclipse/leshan/integration/tests/BootstrapIntegrationTestHelper.java
@@ -125,7 +125,7 @@ public void createPSKClient(String pskIdentity, byte[] pskKey) {
 
         byte[] pskId = pskIdentity.getBytes(Charsets.UTF_8);
 
-        Security security = Security.pskBootstrap(bsUrl, 42, pskId, pskKey);
+        Security security = Security.pskBootstrap(bsUrl, pskId, pskKey);
 
         initializer.setInstancesForObject(LwM2mId.SECURITY, security);