Fix deduplication for OSCORE.

Swap OSCORE and CongestionControl layers. Add logback configuration for unittests. Issue eclipse-californium#2294 Signed-off-by: Achim Kraus <[email protected]>
boaks · Oct 28, 2024 · e21ea8b · e21ea8b
1 parent 093f608
commit e21ea8b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/cf-oscore/src/main/java/org/eclipse/californium/oscore/OSCoreUdpStack.java b/cf-oscore/src/main/java/org/eclipse/californium/oscore/OSCoreUdpStack.java
@@ -56,8 +56,8 @@ public OSCoreUdpStack(String tag, Configuration config, EndpointContextMatcher m
 				new ExchangeCleanupLayer(config),
 				new ObserveLayer(config),
 				new BlockwiseLayer(tag, false, config, matchingStrategy),
-				CongestionControlLayer.newImplementation(tag, config),
-				new ObjectSecurityLayer(ctxDb)};
+				new ObjectSecurityLayer(ctxDb),
+				CongestionControlLayer.newImplementation(tag, config)};
 		setLayers(layers);
 	}
 }
diff --git a/cf-oscore/src/test/resources/logback-test.xml b/cf-oscore/src/test/resources/logback-test.xml
@@ -0,0 +1,21 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder 
+			by default -->
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} %level [%logger{0}]: %msg \(%class{25}.%method:%line\)%n</pattern>
+		</encoder>
+	</appender>
+
+	<logger name="ch.qos.logback" level="ERROR" additivity="false">
+		<appender-ref ref="STDOUT" />
+	</logger>
+
+	<!-- Strictly speaking, the level attribute is not necessary since -->
+	<!-- the level of the root level is set to DEBUG by default. -->
+	<root level="WARN">
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>