-
Notifications
You must be signed in to change notification settings - Fork 409
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Experimental add coap over tcp support
- Loading branch information
1 parent
a325a69
commit 4f53094
Showing
10 changed files
with
384 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
.../org/eclipse/leshan/client/californium/endpoint/coaptcp/CoapTcpClientEndpointFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2022 Sierra Wireless and others. | ||
| * | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v2.0 | ||
| * and Eclipse Distribution License v1.0 which accompany this distribution. | ||
| * | ||
| * The Eclipse Public License is available at | ||
| * http://www.eclipse.org/legal/epl-v20.html | ||
| * and the Eclipse Distribution License is available at | ||
| * http://www.eclipse.org/org/documents/edl-v10.html. | ||
| * | ||
| * Contributors: | ||
| * Sierra Wireless - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.leshan.client.californium.endpoint.coaptcp; | ||
|
|
||
| import java.net.InetAddress; | ||
| import java.net.InetSocketAddress; | ||
| import java.security.cert.Certificate; | ||
| import java.util.List; | ||
|
|
||
| import org.eclipse.californium.core.network.CoapEndpoint; | ||
| import org.eclipse.californium.core.network.CoapEndpoint.Builder; | ||
| import org.eclipse.californium.core.network.Endpoint; | ||
| import org.eclipse.californium.elements.Connector; | ||
| import org.eclipse.californium.elements.EndpointContextMatcher; | ||
| import org.eclipse.californium.elements.TcpEndpointContextMatcher; | ||
| import org.eclipse.californium.elements.UDPConnector; | ||
| import org.eclipse.californium.elements.config.Configuration; | ||
| import org.eclipse.californium.elements.tcp.netty.TcpClientConnector; | ||
| import org.eclipse.leshan.client.californium.CaliforniumConnectionController; | ||
| import org.eclipse.leshan.client.californium.endpoint.CaliforniumClientEndpointFactory; | ||
| import org.eclipse.leshan.client.endpoint.ClientEndpointToolbox; | ||
| import org.eclipse.leshan.client.servers.ServerIdentity; | ||
| import org.eclipse.leshan.client.servers.ServerInfo; | ||
| import org.eclipse.leshan.core.californium.DefaultExceptionTranslator; | ||
| import org.eclipse.leshan.core.californium.ExceptionTranslator; | ||
| import org.eclipse.leshan.core.californium.identity.DefaultCoapIdentityHandler; | ||
| import org.eclipse.leshan.core.californium.identity.IdentityHandler; | ||
| import org.eclipse.leshan.core.endpoint.Protocol; | ||
|
|
||
| public class CoapTcpClientEndpointFactory implements CaliforniumClientEndpointFactory { | ||
|
|
||
| private final String loggingTag = null; | ||
| protected EndpointContextMatcher unsecuredContextMatcher = new TcpEndpointContextMatcher(); | ||
|
|
||
| public CoapTcpClientEndpointFactory() { | ||
| } | ||
|
|
||
| @Override | ||
| public Protocol getProtocol() { | ||
| return Protocol.COAP_TCP; | ||
| } | ||
|
|
||
| @Override | ||
| public Endpoint createCoapEndpoint(InetAddress clientAddress, Configuration defaultConfiguration, | ||
| ServerInfo serverInfo, boolean clientInitiatedOnly, List<Certificate> trustStore, | ||
| ClientEndpointToolbox toolbox) { | ||
| return createEndpointBuilder(new InetSocketAddress(clientAddress, 0), serverInfo, defaultConfiguration).build(); | ||
| } | ||
|
|
||
| /** | ||
| * This method is intended to be overridden. | ||
| * | ||
| * @param address the IP address and port, if null the connector is bound to an ephemeral port on the wildcard | ||
| * address. | ||
| * @param coapConfig the CoAP config used to create this endpoint. | ||
| * @return the {@link Builder} used for unsecured communication. | ||
| */ | ||
| protected CoapEndpoint.Builder createEndpointBuilder(InetSocketAddress address, ServerInfo serverInfo, | ||
| Configuration coapConfig) { | ||
| CoapEndpoint.Builder builder = new CoapEndpoint.Builder(); | ||
| builder.setConnector(createUnsecuredConnector(address, coapConfig)); | ||
| builder.setConfiguration(coapConfig); | ||
| if (loggingTag != null) { | ||
| builder.setLoggingTag("[" + loggingTag + "-coap://]"); | ||
| } else { | ||
| builder.setLoggingTag("[coap://]"); | ||
| } | ||
| if (unsecuredContextMatcher != null) { | ||
| builder.setEndpointContextMatcher(unsecuredContextMatcher); | ||
| } | ||
| return builder; | ||
| } | ||
|
|
||
| /** | ||
| * By default create an {@link UDPConnector}. | ||
| * <p> | ||
| * This method is intended to be overridden. | ||
| * | ||
| * @param address the IP address and port, if null the connector is bound to an ephemeral port on the wildcard | ||
| * address | ||
| * @param coapConfig the Configuration | ||
| * @return the {@link Connector} used for unsecured {@link CoapEndpoint} | ||
| */ | ||
| protected Connector createUnsecuredConnector(InetSocketAddress address, Configuration coapConfig) { | ||
| return new TcpClientConnector(coapConfig); | ||
| } | ||
|
|
||
| @Override | ||
| public IdentityHandler createIdentityHandler() { | ||
| // TODO TCP : maybe we need a more specific one | ||
| return new DefaultCoapIdentityHandler(); | ||
| } | ||
|
|
||
| @Override | ||
| public ExceptionTranslator createExceptionTranslator() { | ||
| // TODO TCP : maybe we need a more specific one | ||
| return new DefaultExceptionTranslator(); | ||
| } | ||
|
|
||
| @Override | ||
| public CaliforniumConnectionController createConnectionController() { | ||
| return new CaliforniumConnectionController() { | ||
| @Override | ||
| public void forceReconnection(Endpoint endpoint, ServerIdentity identity, boolean resume) { | ||
| // no connection in coap, so nothing to do; | ||
| } | ||
| }; | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...org/eclipse/leshan/client/californium/endpoint/coaptcp/CoapTcpClientProtocolProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2022 Sierra Wireless and others. | ||
| * | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v2.0 | ||
| * and Eclipse Distribution License v1.0 which accompany this distribution. | ||
| * | ||
| * The Eclipse Public License is available at | ||
| * http://www.eclipse.org/legal/epl-v20.html | ||
| * and the Eclipse Distribution License is available at | ||
| * http://www.eclipse.org/org/documents/edl-v10.html. | ||
| * | ||
| * Contributors: | ||
| * Sierra Wireless - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.leshan.client.californium.endpoint.coaptcp; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import org.eclipse.californium.core.config.CoapConfig; | ||
| import org.eclipse.californium.elements.config.Configuration; | ||
| import org.eclipse.californium.elements.config.Configuration.ModuleDefinitionsProvider; | ||
| import org.eclipse.californium.elements.config.SystemConfig; | ||
| import org.eclipse.californium.elements.config.TcpConfig; | ||
| import org.eclipse.californium.elements.config.UdpConfig; | ||
| import org.eclipse.leshan.client.californium.endpoint.CaliforniumClientEndpointFactory; | ||
| import org.eclipse.leshan.client.californium.endpoint.ClientProtocolProvider; | ||
| import org.eclipse.leshan.core.endpoint.Protocol; | ||
|
|
||
| public class CoapTcpClientProtocolProvider implements ClientProtocolProvider { | ||
|
|
||
| @Override | ||
| public Protocol getProtocol() { | ||
| return Protocol.COAP_TCP; | ||
| } | ||
|
|
||
| @Override | ||
| public void applyDefaultValue(Configuration configuration) { | ||
| configuration.set(CoapConfig.MAX_ACTIVE_PEERS, 10); | ||
| configuration.set(CoapConfig.PROTOCOL_STAGE_THREAD_COUNT, 1); | ||
| } | ||
|
|
||
| @Override | ||
| public List<ModuleDefinitionsProvider> getModuleDefinitionsProviders() { | ||
| return Arrays.asList(SystemConfig.DEFINITIONS, CoapConfig.DEFINITIONS, UdpConfig.DEFINITIONS, | ||
| TcpConfig.DEFINITIONS); | ||
| } | ||
|
|
||
| @Override | ||
| public CaliforniumClientEndpointFactory createDefaultEndpointFactory() { | ||
| return new CoapTcpClientEndpointFactory(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
.../org/eclipse/leshan/server/californium/endpoint/coaptcp/CoapTcpServerEndpointFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2022 Sierra Wireless and others. | ||
| * | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v2.0 | ||
| * and Eclipse Distribution License v1.0 which accompany this distribution. | ||
| * | ||
| * The Eclipse Public License is available at | ||
| * http://www.eclipse.org/legal/epl-v20.html | ||
| * and the Eclipse Distribution License is available at | ||
| * http://www.eclipse.org/org/documents/edl-v10.html. | ||
| * | ||
| * Contributors: | ||
| * Sierra Wireless - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.leshan.server.californium.endpoint.coaptcp; | ||
|
|
||
| import java.net.InetSocketAddress; | ||
| import java.net.URI; | ||
|
|
||
| import org.eclipse.californium.core.network.CoapEndpoint; | ||
| import org.eclipse.californium.core.network.CoapEndpoint.Builder; | ||
| import org.eclipse.californium.core.network.serialization.TcpDataParser; | ||
| import org.eclipse.californium.core.network.serialization.TcpDataSerializer; | ||
| import org.eclipse.californium.elements.Connector; | ||
| import org.eclipse.californium.elements.EndpointContextMatcher; | ||
| import org.eclipse.californium.elements.TcpEndpointContextMatcher; | ||
| import org.eclipse.californium.elements.UDPConnector; | ||
| import org.eclipse.californium.elements.config.Configuration; | ||
| import org.eclipse.californium.elements.tcp.netty.TcpServerConnector; | ||
| import org.eclipse.leshan.core.californium.DefaultExceptionTranslator; | ||
| import org.eclipse.leshan.core.californium.ExceptionTranslator; | ||
| import org.eclipse.leshan.core.californium.identity.DefaultCoapIdentityHandler; | ||
| import org.eclipse.leshan.core.californium.identity.IdentityHandler; | ||
| import org.eclipse.leshan.core.endpoint.EndpointUriUtil; | ||
| import org.eclipse.leshan.core.endpoint.Protocol; | ||
| import org.eclipse.leshan.server.LeshanServer; | ||
| import org.eclipse.leshan.server.californium.endpoint.CaliforniumServerEndpointFactory; | ||
| import org.eclipse.leshan.server.californium.observation.LwM2mObservationStore; | ||
| import org.eclipse.leshan.server.californium.observation.ObservationSerDes; | ||
| import org.eclipse.leshan.server.observation.LwM2mNotificationReceiver; | ||
| import org.eclipse.leshan.server.security.ServerSecurityInfo; | ||
|
|
||
| public class CoapTcpServerEndpointFactory implements CaliforniumServerEndpointFactory { | ||
|
|
||
| private final String loggingTag = null; | ||
| protected EndpointContextMatcher unsecuredContextMatcher = new TcpEndpointContextMatcher(); | ||
| protected URI endpointUri = null; | ||
|
|
||
| public CoapTcpServerEndpointFactory(URI uri) { | ||
| this.endpointUri = uri; | ||
| } | ||
|
|
||
| @Override | ||
| public Protocol getProtocol() { | ||
| return Protocol.COAP_TCP; | ||
| } | ||
|
|
||
| @Override | ||
| public URI getUri() { | ||
| return endpointUri; | ||
| } | ||
|
|
||
| @Override | ||
| public CoapEndpoint createCoapEndpoint(Configuration defaultCaliforniumConfiguration, | ||
| ServerSecurityInfo serverSecurityInfo, LwM2mNotificationReceiver notificationReceiver, | ||
| LeshanServer server) { | ||
| return createUnsecuredEndpointBuilder(EndpointUriUtil.getSocketAddr(endpointUri), | ||
| defaultCaliforniumConfiguration, server, notificationReceiver).build(); | ||
| } | ||
|
|
||
| /** | ||
| * This method is intended to be overridden. | ||
| * | ||
| * @param address the IP address and port, if null the connector is bound to an ephemeral port on the wildcard | ||
| * address. | ||
| * @param coapConfig the CoAP config used to create this endpoint. | ||
| * @return the {@link Builder} used for unsecured communication. | ||
| */ | ||
| protected CoapEndpoint.Builder createUnsecuredEndpointBuilder(InetSocketAddress address, Configuration coapConfig, | ||
| LeshanServer server, LwM2mNotificationReceiver notificationReceiver) { | ||
| CoapEndpoint.Builder builder = new CoapEndpoint.Builder(); | ||
| builder.setConnector(createUnsecuredConnector(address, coapConfig)); | ||
| builder.setConfiguration(coapConfig); | ||
| if (loggingTag != null) { | ||
| builder.setLoggingTag("[" + loggingTag + "-coap://]"); | ||
| } else { | ||
| builder.setLoggingTag("[coap://]"); | ||
| } | ||
| if (unsecuredContextMatcher != null) { | ||
| builder.setEndpointContextMatcher(unsecuredContextMatcher); | ||
| } | ||
| builder.setObservationStore(new LwM2mObservationStore(server.getRegistrationStore(), notificationReceiver, | ||
| new ObservationSerDes(new TcpDataParser(), new TcpDataSerializer()))); | ||
| return builder; | ||
| } | ||
|
|
||
| /** | ||
| * By default create an {@link UDPConnector}. | ||
| * <p> | ||
| * This method is intended to be overridden. | ||
| * | ||
| * @param address the IP address and port, if null the connector is bound to an ephemeral port on the wildcard | ||
| * address | ||
| * @param coapConfig the Configuration | ||
| * @return the {@link Connector} used for unsecured {@link CoapEndpoint} | ||
| */ | ||
| protected Connector createUnsecuredConnector(InetSocketAddress address, Configuration coapConfig) { | ||
| return new TcpServerConnector(address, coapConfig); | ||
| } | ||
|
|
||
| @Override | ||
| public IdentityHandler createIdentityHandler() { | ||
| // TODO TCP : maybe we need a more specific one | ||
| return new DefaultCoapIdentityHandler(); | ||
| } | ||
|
|
||
| @Override | ||
| public ExceptionTranslator createExceptionTranslator() { | ||
| // TODO TCP : maybe we need a more specific one | ||
| return new DefaultExceptionTranslator(); | ||
| } | ||
| } |
Oops, something went wrong.