dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@nickAS21

Browse Source 
fix_bug_lwm2m: add resource "tbfw" and "tbsw" to root coap
This commit is contained in:
nick 2025-03-11 07:32:13 +02:00
parent ae95cef789
commit 27f493e797
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java
View File

@ -18,6 +18,8 @@ package org.thingsboard.server.transport.lwm2m.server;
import jakarta.annotation.PreDestroy; import jakarta.annotation.PreDestroy;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.californium.core.CoapResource;
import org.eclipse.californium.core.CoapServer;
import org.eclipse.californium.elements.config.Configuration; import org.eclipse.californium.elements.config.Configuration;
import org.eclipse.californium.scandium.config.DtlsConfig; import org.eclipse.californium.scandium.config.DtlsConfig;
import org.eclipse.californium.scandium.dtls.cipher.CipherSuite; import org.eclipse.californium.scandium.dtls.cipher.CipherSuite;
@ -58,6 +60,7 @@ import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_W
import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_WITH_AES_128_CCM_8; import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_WITH_AES_128_CCM_8;
import static org.thingsboard.server.transport.lwm2m.server.LwM2MNetworkConfig.getCoapConfig; import static org.thingsboard.server.transport.lwm2m.server.LwM2MNetworkConfig.getCoapConfig;
import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FIRMWARE_UPDATE_COAP_RESOURCE; import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FIRMWARE_UPDATE_COAP_RESOURCE;
import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.SOFTWARE_UPDATE_COAP_RESOURCE;
import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.setDtlsConnectorConfigCidLength; import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.setDtlsConnectorConfigCidLength;
@Slf4j @Slf4j
@ -85,14 +88,6 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
@AfterStartUp(order = AfterStartUp.AFTER_TRANSPORT_SERVICE) @AfterStartUp(order = AfterStartUp.AFTER_TRANSPORT_SERVICE)
public void init() { public void init() {
this.server = getLhServer(); this.server = getLhServer();
/*
* Add a resource to the server.
* CoapResource ->
* path = FW_PACKAGE or SW_PACKAGE
* nameFile = "BC68JAR01A09_TO_BC68JAR01A10.bin"
* "coap://host:port/{path}/{token}/{nameFile}"
*/
new LwM2mTransportCoapResource(otaPackageDataCache, FIRMWARE_UPDATE_COAP_RESOURCE);
this.context.setServer(server); this.context.setServer(server);
this.startLhServer(); this.startLhServer();
} }
@ -168,7 +163,7 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
serverCoapConfig.setTransient(DtlsConfig.DTLS_CONNECTION_ID_LENGTH); serverCoapConfig.setTransient(DtlsConfig.DTLS_CONNECTION_ID_LENGTH);
if (config.getDtlsCidLength() != null) { if (config.getDtlsCidLength() != null) {
setDtlsConnectorConfigCidLength( serverCoapConfig, config.getDtlsCidLength()); setDtlsConnectorConfigCidLength(serverCoapConfig, config.getDtlsCidLength());
} }
/* Create DTLS Config */ /* Create DTLS Config */
@ -191,6 +186,17 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
// Create LWM2M server // Create LWM2M server
builder.setEndpointsProviders(endpointsBuilder.build()); builder.setEndpointsProviders(endpointsBuilder.build());
LeshanServer leshanServer = builder.build();
CoapServer coapServer = ((CaliforniumServerEndpointsProvider) (leshanServer.getEndpointsProvider()).toArray()[0]).getCoapServer();
if (coapServer != null) {
CoapResource root = (CoapResource) coapServer.getRoot();
if (root == null) {
root = new CoapResource("");
coapServer.add(root);
}
root.add(new LwM2mTransportCoapResource(otaPackageDataCache, FIRMWARE_UPDATE_COAP_RESOURCE));
root.add(new LwM2mTransportCoapResource(otaPackageDataCache, SOFTWARE_UPDATE_COAP_RESOURCE));
}
return builder.build(); return builder.build();
} }