Merge pull request #4771 from thingsboard/Coap_oneEndPoint

Coap: noSec one Endpoint

common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java

@@ -87,12 +87,6 @@ public class DefaultCoapServerService implements CoapServerService {
     }
 
     private CoapServer createCoapServer() throws UnknownHostException {
-        server = new CoapServer();
-
-        CoapEndpoint.Builder noSecCoapEndpointBuilder = new CoapEndpoint.Builder();
-        InetAddress addr = InetAddress.getByName(coapServerContext.getHost());
-        InetSocketAddress sockAddr = new InetSocketAddress(addr, coapServerContext.getPort());
-        noSecCoapEndpointBuilder.setInetSocketAddress(sockAddr);
         NetworkConfig networkConfig = new NetworkConfig();
         networkConfig.setBoolean(NetworkConfig.Keys.BLOCKWISE_STRICT_BLOCK2_OPTION, true);
         networkConfig.setBoolean(NetworkConfig.Keys.BLOCKWISE_ENTITY_TOO_LARGE_AUTO_FAILOVER, true);
@@ -102,14 +96,23 @@ public class DefaultCoapServerService implements CoapServerService {
         networkConfig.setInt(NetworkConfig.Keys.PREFERRED_BLOCK_SIZE, 1024);
         networkConfig.setInt(NetworkConfig.Keys.MAX_MESSAGE_SIZE, 1024);
         networkConfig.setInt(NetworkConfig.Keys.MAX_RETRANSMIT, 4);
+        networkConfig.setInt(NetworkConfig.Keys.COAP_PORT, coapServerContext.getPort());
+        server = new CoapServer(networkConfig);
+
+        CoapEndpoint.Builder noSecCoapEndpointBuilder = new CoapEndpoint.Builder();
+        InetAddress addr = InetAddress.getByName(coapServerContext.getHost());
+        InetSocketAddress sockAddr = new InetSocketAddress(addr, coapServerContext.getPort());
+        noSecCoapEndpointBuilder.setInetSocketAddress(sockAddr);
+
         noSecCoapEndpointBuilder.setNetworkConfig(networkConfig);
         CoapEndpoint noSecCoapEndpoint = noSecCoapEndpointBuilder.build();
         server.addEndpoint(noSecCoapEndpoint);
-
         if (isDtlsEnabled()) {
             CoapEndpoint.Builder dtlsCoapEndpointBuilder = new CoapEndpoint.Builder();
             TbCoapDtlsSettings dtlsSettings = coapServerContext.getDtlsSettings();
             DtlsConnectorConfig dtlsConnectorConfig = dtlsSettings.dtlsConnectorConfig();
+            networkConfig.setInt(NetworkConfig.Keys.COAP_SECURE_PORT, dtlsConnectorConfig.getAddress().getPort());
+            dtlsCoapEndpointBuilder.setNetworkConfig(networkConfig);
             DTLSConnector connector = new DTLSConnector(dtlsConnectorConfig);
             dtlsCoapEndpointBuilder.setConnector(connector);
             CoapEndpoint dtlsCoapEndpoint = dtlsCoapEndpointBuilder.build();

common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java

@@ -18,7 +18,6 @@ package org.thingsboard.server.transport.coap;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.CoapResource;
 import org.eclipse.californium.core.CoapServer;
-import org.eclipse.californium.core.network.config.NetworkConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.coapserver.CoapServerService;
@@ -31,8 +30,6 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import java.net.UnknownHostException;
 
-import static org.eclipse.californium.core.network.config.NetworkConfigDefaults.DEFAULT_BLOCKWISE_STATUS_LIFETIME;
-
 @Service("CoapTransportService")
 @TbCoapServerComponent
 @Slf4j
@@ -55,14 +52,6 @@ public class CoapTransportService implements TbTransportService {
     public void init() throws UnknownHostException {
         log.info("Starting CoAP transport...");
         coapServer = coapServerService.getCoapServer();
-        coapServer.getConfig().setBoolean(NetworkConfig.Keys.BLOCKWISE_STRICT_BLOCK2_OPTION, true);
-        coapServer.getConfig().setBoolean(NetworkConfig.Keys.BLOCKWISE_ENTITY_TOO_LARGE_AUTO_FAILOVER, true);
-        coapServer.getConfig().setLong(NetworkConfig.Keys.BLOCKWISE_STATUS_LIFETIME, DEFAULT_BLOCKWISE_STATUS_LIFETIME);
-        coapServer.getConfig().setInt(NetworkConfig.Keys.MAX_RESOURCE_BODY_SIZE, 256 * 1024 * 1024);
-        coapServer.getConfig().setString(NetworkConfig.Keys.RESPONSE_MATCHING, "RELAXED");
-        coapServer.getConfig().setInt(NetworkConfig.Keys.PREFERRED_BLOCK_SIZE, 1024);
-        coapServer.getConfig().setInt(NetworkConfig.Keys.MAX_MESSAGE_SIZE, 1024);
-        coapServer.getConfig().setInt(NetworkConfig.Keys.MAX_RETRANSMIT, 10);
         CoapResource api = new CoapResource(API);
         api.add(new CoapTransportResource(coapTransportContext, coapServerService, V1));