#589: fix race condition about bootstrap finished at client side.

eclipse-leshan · Nov 7, 2018 · 05c3b0f · 05c3b0f
1 parent 9cab0aa
commit 05c3b0f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 12 deletions.
diff --git a/...client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/BootstrapResource.java b/...client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/BootstrapResource.java
@@ -19,12 +19,16 @@
 import static org.eclipse.leshan.core.californium.ResponseCodeUtil.toCoapResponseCode;
 
 import org.eclipse.californium.core.CoapResource;
+import org.eclipse.californium.core.coap.MediaTypeRegistry;
+import org.eclipse.californium.core.coap.MessageObserverAdapter;
+import org.eclipse.californium.core.coap.Response;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.eclipse.californium.core.server.resources.Resource;
 import org.eclipse.leshan.client.request.ServerIdentity;
 import org.eclipse.leshan.client.servers.BootstrapHandler;
 import org.eclipse.leshan.core.request.BootstrapFinishRequest;
 import org.eclipse.leshan.core.response.BootstrapFinishResponse;
+import org.eclipse.leshan.core.response.SendableResponse;
 
 /**
  * A CoAP {@link Resource} in charge of handling the Bootstrap Finish indication from the bootstrap server.
@@ -40,12 +44,25 @@ public BootstrapResource(BootstrapHandler bootstrapHandler) {
 
     @Override
     public void handlePOST(CoapExchange exchange) {
+        // Handle bootstrap request
         ServerIdentity identity = ResourceUtil.extractServerIdentity(exchange, bootstrapHandler);
-        BootstrapFinishResponse response = bootstrapHandler.finished(identity, new BootstrapFinishRequest());
-        if (response.getCode().isError()) {
-            exchange.respond(toCoapResponseCode(response.getCode()), response.getErrorMessage());
-        } else {
-            exchange.respond(toCoapResponseCode(response.getCode()));
+        final SendableResponse<BootstrapFinishResponse> sendableResponse = bootstrapHandler.finished(identity,
+                new BootstrapFinishRequest());
+
+        // Create CoAP response
+        Response coapResponse = new Response(toCoapResponseCode(sendableResponse.getResponse().getCode()));
+        if (sendableResponse.getResponse().getCode().isError()) {
+            coapResponse.setPayload(sendableResponse.getResponse().getErrorMessage());
+            coapResponse.getOptions().setContentFormat(MediaTypeRegistry.TEXT_PLAIN);
         }
+
+        // Send response
+        coapResponse.addMessageObserver(new MessageObserverAdapter() {
+            @Override
+            public void onSent() {
+                sendableResponse.sent();
+            }
+        });
+        exchange.respond(coapResponse);
     }
 }
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/BootstrapHandler.java b/leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/BootstrapHandler.java
@@ -16,8 +16,7 @@
  *******************************************************************************/
 package org.eclipse.leshan.client.servers;
 
-import static org.eclipse.leshan.LwM2mId.SECURITY;
-import static org.eclipse.leshan.LwM2mId.SERVER;
+import static org.eclipse.leshan.LwM2mId.*;
 
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -31,6 +30,7 @@
 import org.eclipse.leshan.core.request.Identity;
 import org.eclipse.leshan.core.response.BootstrapDeleteResponse;
 import org.eclipse.leshan.core.response.BootstrapFinishResponse;
+import org.eclipse.leshan.core.response.SendableResponse;
 
 /**
  * Handle bootstrap session state.
@@ -47,19 +47,25 @@ public BootstrapHandler(Map<Integer, LwM2mObjectEnabler> objectEnablers) {
         objects = objectEnablers;
     }
 
-    public synchronized BootstrapFinishResponse finished(ServerIdentity identity,
+    public synchronized SendableResponse<BootstrapFinishResponse> finished(ServerIdentity identity,
             BootstrapFinishRequest finishedRequest) {
         if (bootstrapping) {
             // only if the request is from the bootstrap server
             if (!isBootstrapServer(identity)) {
-                return BootstrapFinishResponse.badRequest("not from a bootstrap server");
+                return new SendableResponse<>(BootstrapFinishResponse.badRequest("not from a bootstrap server"));
             }
             // TODO delete bootstrap server (see 5.2.5.2 Bootstrap Delete)
 
-            bootstrappingLatch.countDown();
-            return BootstrapFinishResponse.success();
+            Runnable whenSent = new Runnable() {
+                @Override
+                public void run() {
+                    bootstrappingLatch.countDown();
+                }
+            };
+
+            return new SendableResponse<>(BootstrapFinishResponse.success(), whenSent);
         } else {
-            return BootstrapFinishResponse.badRequest("no pending bootstrap session");
+            return new SendableResponse<>(BootstrapFinishResponse.badRequest("no pending bootstrap session"));
         }
     }