Remove block1 in error response.

Fixes: issue eclipse-californium#1937 Signed-off-by: Achim Kraus <[email protected]>
bosch-io · Mar 11, 2022 · e8648a0 · e8648a0
1 parent a893cae
commit e8648a0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/...fornium-core/src/main/java/org/eclipse/californium/core/network/stack/BlockwiseLayer.java b/...fornium-core/src/main/java/org/eclipse/californium/core/network/stack/BlockwiseLayer.java
@@ -568,12 +568,28 @@ private void handleInboundBlockwiseUpload(final Exchange exchange, final Request
 		}
 	}
 
-	private void sendBlock1ErrorResponse(KeyUri key, Block1BlockwiseStatus status, Exchange exchange, Request request,
+	/**
+	 * Send block1 error response.
+	 * 
+	 * Note: before version 2.7.1 a block1 option was used in the response.
+	 * According <a href="https://github.com/core-wg/corrclar/issues/21" target=
+	 * "_blank">CorrClar - RFC7959 - Block1 Option in Error Response 4.08
+	 * (Request Entity Incomplete)</a>, it seems to be not intended. If your
+	 * device requires that, you may override this method and respond with an
+	 * block1 option.
+	 * 
+	 * @param key URI key
+	 * @param status blockwise status
+	 * @param exchange exchange
+	 * @param request current request
+	 * @param errorCode error code for the error response
+	 * @param message textual message for the error response
+	 * @since 2.7.1 no block1 option is used in the response
+	 */
+	protected void sendBlock1ErrorResponse(KeyUri key, Block1BlockwiseStatus status, Exchange exchange, Request request,
 			ResponseCode errorCode, String message) {
 
-		BlockOption block1 = request.getOptions().getBlock1();
 		Response error = Response.createResponse(request, errorCode);
-		error.getOptions().setBlock1(block1.getSzx(), block1.isM(), block1.getNum());
 		error.setPayload(message);
 		clearBlock1Status(key, status);
 		exchange.setCurrentResponse(error);

diff --git a/...ore/src/test/java/org/eclipse/californium/core/test/lockstep/BlockwiseServerSideTest.java b/...ore/src/test/java/org/eclipse/californium/core/test/lockstep/BlockwiseServerSideTest.java
@@ -909,7 +909,7 @@ public void testRandomAccessPUTAttemp() throws Exception {
 		Token tok = generateNextToken();
 
 		client.sendRequest(CON, PUT, tok, ++mid).path(RESOURCE_PATH).block1(2, true, 64).payload(reqtPayload.substring(2*64, 3*64)).go();
-		client.expectResponse(ACK, REQUEST_ENTITY_INCOMPLETE, tok, mid).block1(2, true, 64).go();
+		client.expectResponse(ACK, REQUEST_ENTITY_INCOMPLETE, tok, mid).go();
 	}
 
 	@Test