Skip to content

Commit

Permalink
Add request message code to blockwise tracking.
Browse files Browse the repository at this point in the history 
Disables test for OSCORE outer blockwise GET.

Signed-off-by: Achim Kraus <achim.kraus@cloudcoap.net>
  • Loading branch information
@boaks
boaks committed Jul 13, 2023
1 parent aa19433 commit d4f9002
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 23 deletions.
2 changes: 1 addition & 1 deletion ...fornium-core/src/main/java/org/eclipse/californium/core/network/stack/BlockwiseLayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1520,7 +1520,7 @@ private Block2BlockwiseStatus getInboundBlock2Status(final KeyUri key, final Exc
lock.unlock();
}
if (size != null) {
LOGGER.debug("{}created tracker for {} inbound block2 transfer {}, transfers in progress: {}, {}", tag, key,
LOGGER.debug("{}created tracker for inbound block2 transfer {}, transfers in progress: {}, {}", tag,
status, size, response);
}
return status;
Expand Down
42 changes: 36 additions & 6 deletions californium-core/src/main/java/org/eclipse/californium/core/network/stack/KeyUri.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.net.InetSocketAddress;

import org.eclipse.californium.core.coap.CoAP.Code;
import org.eclipse.californium.core.coap.Request;
import org.eclipse.californium.core.network.Exchange;
import org.eclipse.californium.elements.util.StringUtil;
Expand All @@ -28,10 +29,13 @@
* address.
* <p>
* This class is used by the blockwise layer to correlate blockwise transfer
* exchanges.
* exchanges.
* <p>
* Note: since 3.9, the message code is also used part of the key.
*/
public final class KeyUri {

private final Code code;
private final String uri;
private final Object peersIdentity;
private final int hash;
Expand All @@ -44,16 +48,37 @@ public final class KeyUri {
* {@link InetSocketAddress}.
* @throws NullPointerException if uri or address is {@code null}
* @since 3.0
* @deprecated use {@link #KeyUri(String, Object, Code)} instead
*/
public KeyUri(final String requestUri, final Object peersIdentity) {
@Deprecated
public KeyUri(String requestUri, Object peersIdentity) {
this(requestUri, peersIdentity, null);
}

/**
* Creates a new key for a URI scoped to an endpoint address.
*
* @param requestUri The URI of the requested resource.
* @param peersIdentity peer's identity. Usually that's the peer's
* {@link InetSocketAddress}.
* @param code message code. {@code null} for ping request.
* @throws NullPointerException if uri or address is {@code null}
* @since 3.9
*/
public KeyUri(String requestUri, Object peersIdentity, Code code) {
if (requestUri == null) {
throw new NullPointerException("URI must not be null");
} else if (peersIdentity == null) {
throw new NullPointerException("peer's identity must not be null");
} else {
this.code = code;
this.uri = requestUri;
this.peersIdentity = peersIdentity;
this.hash = requestUri.hashCode() * 31 + peersIdentity.hashCode();
int hash = requestUri.hashCode() * 31 + peersIdentity.hashCode();
if (code != null) {
hash = hash * 31 + code.hashCode();
}
this.hash = hash;
}
}

Expand All @@ -75,6 +100,9 @@ public boolean equals(Object obj) {
if (!uri.equals(other.uri)) {
return false;
}
if (code != other.code && !code.equals(other.code)) {
return false;
}
return true;
}

Expand All @@ -86,7 +114,7 @@ public int hashCode() {
@Override
public String toString() {
StringBuilder b = new StringBuilder("KeyUri[");
b.append(uri);
b.append(code).append(", ").append(uri);
Object peer = this.peersIdentity;
if (peer instanceof InetSocketAddress) {
peer = StringUtil.toDisplayString((InetSocketAddress) peer);
Expand Down Expand Up @@ -124,8 +152,10 @@ public static KeyUri getKey(Exchange exchange) {
if (exchange == null) {
throw new NullPointerException("exchange must not be null");
}
String uri = getUri(exchange.getRequest());
return new KeyUri(uri, exchange.getPeersIdentity());
Request request = exchange.getRequest();
String uri = getUri(request);
Code code = request.getCode();
return new KeyUri(uri, exchange.getPeersIdentity(), code);
}

}
37 changes: 21 additions & 16 deletions cf-oscore/src/test/java/org/eclipse/californium/oscore/OSCoreOuterBlockwiseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import org.eclipse.californium.rule.CoapThreadsRule;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
Expand Down Expand Up @@ -174,8 +175,8 @@ public void testProxySmallGet() throws Exception {
client.setEndpoint(clientEndpoint);
cleanup.add(clientEndpoint);
CoapResponse response = client.advanced(request);
System.out.println(Utils.prettyPrint(response));
assertNotNull(response);
System.out.println(Utils.prettyPrint(response));
assertEquals(CoAP.ResponseCode.CONTENT, response.getCode());
assertFalse(response.getOptions().hasSize2());
assertFalse(response.getOptions().hasBlock1());
Expand Down Expand Up @@ -211,8 +212,8 @@ public void testProxyLargeGet() throws Exception {
client.setEndpoint(clientEndpoint);
cleanup.add(clientEndpoint);
CoapResponse response = client.advanced(request);
System.out.println(Utils.prettyPrint(response));
assertNotNull(response);
System.out.println(Utils.prettyPrint(response));
assertEquals(CoAP.ResponseCode.CONTENT, response.getCode());
assertFalse(response.getOptions().hasSize2());
assertFalse(response.getOptions().hasBlock1());
Expand Down Expand Up @@ -252,8 +253,8 @@ public void testOuterBlockwisePostProxyServerBW() throws Exception {
client.setEndpoint(clientEndpoint);
cleanup.add(clientEndpoint);
CoapResponse response = client.advanced(request);
System.out.println(Utils.prettyPrint(response));
assertNotNull(response);
System.out.println(Utils.prettyPrint(response));
assertEquals(response.getCode(), CoAP.ResponseCode.CONTENT);
assertFalse(response.getOptions().hasSize2());
assertFalse(response.getOptions().hasBlock1());
Expand Down Expand Up @@ -294,8 +295,8 @@ public void testOuterBlockwisePutProxyServerBW() throws Exception {
client.setEndpoint(clientEndpoint);
cleanup.add(clientEndpoint);
CoapResponse response = client.advanced(request);
System.out.println(Utils.prettyPrint(response));
assertNotNull(response);
System.out.println(Utils.prettyPrint(response));
assertEquals(response.getCode(), CoAP.ResponseCode.CHANGED);
assertFalse(response.getOptions().hasSize2());
assertFalse(response.getOptions().hasBlock1());
Expand All @@ -309,9 +310,14 @@ public void testOuterBlockwisePutProxyServerBW() throws Exception {
* Perform GET request via proxy with large response payload. The
* proxy->client response will be Block-Wise.
*
* Note: the initial request uses OSCORE/POST, but the follow up requests
* are bypassing the OSCORE layer and so use GET.
* Requires clarification and fixing.
*
* @throws Exception on test failure
*/
@Test
@Ignore
public void testOuterBlockwiseGetProxyClientBW() throws Exception {
startupServer(false);
startupProxy(false, true);
Expand All @@ -331,9 +337,10 @@ public void testOuterBlockwiseGetProxyClientBW() throws Exception {
CoapClient client = new CoapClient();
client.setEndpoint(clientEndpoint);
cleanup.add(clientEndpoint);
System.out.println(Utils.prettyPrint(request));
CoapResponse response = client.advanced(request);
System.out.println(Utils.prettyPrint(response));
assertNotNull(response);
System.out.println(Utils.prettyPrint(response));
assertEquals(CoAP.ResponseCode.CONTENT, response.getCode());
assertFalse(response.getOptions().hasBlock1());
assertFalse(response.getOptions().hasBlock2());
Expand Down Expand Up @@ -373,8 +380,8 @@ public void testOuterBlockwisePostProxyClientBW() throws Exception {
client.setEndpoint(clientEndpoint);
cleanup.add(clientEndpoint);
CoapResponse response = client.advanced(request);
System.out.println(Utils.prettyPrint(response));
assertNotNull(response);
System.out.println(Utils.prettyPrint(response));
assertEquals(response.getCode(), CoAP.ResponseCode.CONTENT);
assertFalse(response.getOptions().hasBlock1());
assertFalse(response.getOptions().hasBlock2());
Expand Down Expand Up @@ -425,9 +432,8 @@ public void testOuterBlockwiseExceedMaxUnfragmentedSizeProxyServerBW() throws Ex
client.setEndpoint(clientEndpoint);
cleanup.add(clientEndpoint);
CoapResponse response = client.advanced(request);

System.out.println(Utils.prettyPrint(response));
assertNotNull(response);
System.out.println(Utils.prettyPrint(response));
assertEquals(response.getCode(), CoAP.ResponseCode.REQUEST_ENTITY_TOO_LARGE);
assertFalse(response.getOptions().hasSize2());
assertFalse(response.getOptions().hasBlock1());
Expand Down Expand Up @@ -563,26 +569,21 @@ public MyResource(String name) {
@Override
public void handleGET(CoapExchange exchange) {
counter.incrementAndGet();
Response response = new Response(ResponseCode.CONTENT);
response.setPayload(currentPayload);
exchange.respond(response);
exchange.respond(ResponseCode.CONTENT, currentPayload, MediaTypeRegistry.TEXT_PLAIN);
}

@Override
public void handlePUT(CoapExchange exchange) {
counter.incrementAndGet();
currentPayload = exchange.getRequestText();
Response response = new Response(ResponseCode.CHANGED);
exchange.respond(response);
exchange.respond(ResponseCode.CHANGED);
}

@Override
public void handlePOST(CoapExchange exchange) {
counter.incrementAndGet();
currentPayload += exchange.getRequestText();
Response response = new Response(ResponseCode.CONTENT);
response.setPayload(currentPayload);
exchange.respond(response);
exchange.respond(ResponseCode.CONTENT, currentPayload, MediaTypeRegistry.TEXT_PLAIN);
}

public void setPayload(String payload) {
Expand Down Expand Up @@ -644,6 +645,10 @@ public void deliverRequest(Exchange exchange) {
coapTranslator.getExposedInterface(incomingRequest));
Request outgoingRequest = coapTranslator.getRequest(finalDestinationUri, incomingRequest);

System.out.println("Proxy: " + finalDestinationUri);
System.out.println(Utils.prettyPrint(incomingRequest));
System.out.println(Utils.prettyPrint(outgoingRequest));

// Now receive the response from the server and prepare the
// final response to the client
CoapResponse incomingResponse = proxyClient.advanced(outgoingRequest);
Expand Down

0 comments on commit d4f9002

Please sign in to comment.