mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
2ed9f566c1
The californium docker container was based on californium 1.0.0, which is a very old release. This results in some SSL-related errors when running the Qt CoAP tests in the CI. This patch updates the docker container. Instead of a custom fork of a californium server, we use 3.8.0 release tag, and apply a custom patch locally. A similar docker container is already uploaded to DockerHub and used in Qt CoAP examples. Task-number: QTBUG-114798 Pick-to: 6.6 6.5 Change-Id: I07346f69a6790b4ae648e073440d68f28668cdd0 Reviewed-by: Sona Kurazyan <kurazyan.sona@gmail.com> Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
44 lines
2.2 KiB
Diff
44 lines
2.2 KiB
Diff
diff -ruN californium_3.8.0/demo-apps/cf-plugtest-server/src/main/java/org/eclipse/californium/plugtests/PlugtestServer.java californium/demo-apps/cf-plugtest-server/src/main/java/org/eclipse/californium/plugtests/PlugtestServer.java
|
|
--- californium_3.8.0/demo-apps/cf-plugtest-server/src/main/java/org/eclipse/californium/plugtests/PlugtestServer.java 2023-07-21 11:16:21.142201240 +0200
|
|
+++ californium/demo-apps/cf-plugtest-server/src/main/java/org/eclipse/californium/plugtests/PlugtestServer.java 2023-07-21 11:16:51.074210378 +0200
|
|
@@ -100,6 +100,14 @@
|
|
import org.eclipse.californium.unixhealth.NetSocketHealthLogger;
|
|
import org.eclipse.californium.unixhealth.NetStatLogger;
|
|
|
|
+import org.eclipse.californium.scandium.DTLSConnector;
|
|
+import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
|
|
+import org.eclipse.californium.scandium.dtls.pskstore.AdvancedSinglePskStore;
|
|
+import org.eclipse.californium.core.network.CoapEndpoint;
|
|
+
|
|
+import java.net.InetSocketAddress;
|
|
+import java.net.InetAddress;
|
|
+
|
|
import picocli.CommandLine;
|
|
import picocli.CommandLine.ArgGroup;
|
|
import picocli.CommandLine.Command;
|
|
@@ -437,7 +445,23 @@
|
|
// server.addEndpoint(new CoAPEndpoint(new InetSocketAddress("127.0.0.1", port)));
|
|
// server.addEndpoint(new CoAPEndpoint(new InetSocketAddress("2a01:c911:0:2010::10", port)));
|
|
// server.addEndpoint(new CoAPEndpoint(new InetSocketAddress("10.200.1.2", port)));
|
|
- server.addEndpoints(config);
|
|
+ // server.addEndpoints(config);
|
|
+
|
|
+ CoapEndpoint.Builder endpointBuilder = new CoapEndpoint.Builder();
|
|
+ endpointBuilder.setPort(5683);
|
|
+ server.addEndpoint(endpointBuilder.build());
|
|
+
|
|
+ AdvancedSinglePskStore pskStore = new AdvancedSinglePskStore("Client_identity", "secretPSK".getBytes());
|
|
+
|
|
+ DtlsConnectorConfig.Builder builder = new DtlsConnectorConfig.Builder(new Configuration());
|
|
+ builder.setAddress(new InetSocketAddress(5684));
|
|
+ builder.setAdvancedPskStore(pskStore);
|
|
+ DTLSConnector dtlsConnector = new DTLSConnector(builder.build());
|
|
+
|
|
+ endpointBuilder = new CoapEndpoint.Builder();
|
|
+ endpointBuilder.setConnector(dtlsConnector);
|
|
+ server.addEndpoint(endpointBuilder.build());
|
|
+
|
|
if (server.getEndpoints().isEmpty()) {
|
|
System.err.println("no endpoint available!");
|
|
System.exit(ERR_INIT_FAILED);
|