Decouple transport from session management.

examples/platform/nrf528xx/app/Server.cpp

@@ -34,7 +34,9 @@
 #include <support/ErrorStr.h>
 #include <system/SystemPacketBuffer.h>
 #include <transport/SecureSessionMgr.h>
+#include <transport/UDP.h>
 
+#include "Server.h"
 #include "chip-zcl/chip-zcl.h"
 
 extern "C" {
@@ -68,7 +70,7 @@ class ServerCallback : public SecureSessionMgrCallback
 {
 public:
     virtual void OnMessageReceived(const MessageHeader & header, Transport::PeerConnectionState * state,
-                                   System::PacketBuffer * buffer, SecureSessionMgr * mgr)
+                                   System::PacketBuffer * buffer, SecureSessionMgrBase * mgr)
     {
         const size_t data_len = buffer->DataLength();
         char src_addr[PeerAddress::kMaxToStringSize];
@@ -94,7 +96,7 @@ class ServerCallback : public SecureSessionMgrCallback
         }
     }
 
-    virtual void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgr * mgr)
+    virtual void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgrBase * mgr)
     {
         CHIP_ERROR err;
 
@@ -135,15 +137,21 @@ static ServerCallback gCallbacks;
 
 } // namespace
 
+void InitDataModelHandler()
+{
+    chipZclEndpointInit();
+}
+
 // The echo server assumes the platform's networking has been setup already
-void SetupTransport(IPAddressType type, SecureSessionMgr * transport)
+void StartServer(DemoSessionManager * sessions)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
-    err = transport->Init(EXAMPLE_SERVER_NODEID, &DeviceLayer::InetLayer, UdpListenParameters().SetAddressType(type));
+    err = sessions->Init(EXAMPLE_SERVER_NODEID, &DeviceLayer::SystemLayer,
+                         UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6));
     SuccessOrExit(err);
 
-    transport->SetDelegate(&gCallbacks);
+    sessions->SetDelegate(&gCallbacks);
 
 exit:
     if (err != CHIP_NO_ERROR)
@@ -155,14 +163,3 @@ void SetupTransport(IPAddressType type, SecureSessionMgr * transport)
         NRF_LOG_INFO("Lock Server Listening...");
     }
 }
-
-// The echo server assumes the platform's networking has been setup already
-void StartServer(SecureSessionMgr * transport_ipv6)
-{
-    SetupTransport(kIPAddressType_IPv6, transport_ipv6);
-}
-
-void InitDataModelHandler()
-{
-    chipZclEndpointInit();
-}

examples/platform/nrf528xx/app/chipinit.cpp

@@ -54,7 +54,7 @@ extern "C" {
 using namespace ::chip;
 using namespace ::chip::DeviceLayer;
 
-chip::SecureSessionMgr sTransportIPv6;
+DemoSessionManager sessions;
 
 static void * ot_calloc(size_t n, size_t size)
 {
@@ -144,7 +144,7 @@ ret_code_t ChipInit()
 
     // Init ZCL Data Model
     InitDataModelHandler();
-    StartServer(&sTransportIPv6);
+    StartServer(&sessions);
 
     return ret;
 }

examples/platform/nrf528xx/app/include/Server.h

@@ -22,10 +22,11 @@
 #include <inet/InetLayer.h>
 #include <system/SystemPacketBuffer.h>
 #include <transport/SecureSessionMgr.h>
+#include <transport/UDP.h>
 
-void SetupTransport(chip::Inet::IPAddressType type, chip::SecureSessionMgr * transport);
-void StartServer(chip::SecureSessionMgr * transport_ipv6);
+using DemoSessionManager = chip::SecureSessionMgr<chip::Transport::UDP>;
 
+void StartServer(DemoSessionManager * sessions);
 void InitDataModelHandler();
 
 #endif // NRF5_COMMON_SERVER_H

examples/wifi-echo/server/esp32/main/EchoServer.cpp

@@ -43,6 +43,7 @@
 #include <support/ErrorStr.h>
 #include <system/SystemPacketBuffer.h>
 #include <transport/SecureSessionMgr.h>
+#include <transport/Tuple.h>
 #include <transport/UDP.h>
 
 #include "DataModelHandler.h"
@@ -134,7 +135,7 @@ class EchoServerCallback : public SecureSessionMgrCallback
 {
 public:
     void OnMessageReceived(const MessageHeader & header, Transport::PeerConnectionState * state, System::PacketBuffer * buffer,
-                           SecureSessionMgr * mgr) override
+                           SecureSessionMgrBase * mgr) override
     {
         CHIP_ERROR err;
         const size_t data_len = buffer->DataLength();
@@ -191,13 +192,13 @@ class EchoServerCallback : public SecureSessionMgrCallback
         }
     }
 
-    void OnReceiveError(CHIP_ERROR error, const Transport::PeerAddress & source, SecureSessionMgr * mgr) override
+    void OnReceiveError(CHIP_ERROR error, const Transport::PeerAddress & source, SecureSessionMgrBase * mgr) override
     {
         ESP_LOGE(TAG, "ERROR: %s\n Got UDP error", ErrorStr(error));
         statusLED.BlinkOnError();
     }
 
-    void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgr * mgr) override
+    void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgrBase * mgr) override
     {
         CHIP_ERROR err;
 
@@ -237,25 +238,28 @@ class EchoServerCallback : public SecureSessionMgrCallback
     }
 };
 
-static EchoServerCallback gCallbacks;
+EchoServerCallback gCallbacks;
+
+SecureSessionMgr<Transport::UDP, // IPV6
+                 Transport::UDP  // IPV4
+                 >
+    sessions;
 
 } // namespace
 
 // The echo server assumes the platform's networking has been setup already
-void setupTransport(IPAddressType type, SecureSessionMgr * transport)
+void startServer()
 {
-    CHIP_ERROR err       = CHIP_NO_ERROR;
-    struct netif * netif = NULL;
-
-    if (type == kIPAddressType_IPv6)
-    {
-        tcpip_adapter_get_netif(TCPIP_ADAPTER_IF_AP, (void **) &netif);
-    }
+    CHIP_ERROR err           = CHIP_NO_ERROR;
+    struct netif * ipV6NetIf = NULL;
+    tcpip_adapter_get_netif(TCPIP_ADAPTER_IF_AP, (void **) &ipV6NetIf);
 
-    err = transport->Init(kLocalNodeId, &DeviceLayer::InetLayer, UdpListenParameters().SetAddressType(type).SetInterfaceId(netif));
+    err = sessions.Init(kLocalNodeId, &DeviceLayer::SystemLayer,
+                        UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6).SetInterfaceId(ipV6NetIf),
+                        UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv4));
     SuccessOrExit(err);
 
-    transport->SetDelegate(&gCallbacks);
+    sessions.SetDelegate(&gCallbacks);
 
 exit:
     if (err != CHIP_NO_ERROR)
@@ -267,10 +271,3 @@ void setupTransport(IPAddressType type, SecureSessionMgr * transport)
         ESP_LOGI(TAG, "Echo Server Listening...");
     }
 }
-
-// The echo server assumes the platform's networking has been setup already
-void startServer(SecureSessionMgr * transport_ipv4, SecureSessionMgr * transport_ipv6)
-{
-    setupTransport(kIPAddressType_IPv6, transport_ipv6);
-    setupTransport(kIPAddressType_IPv4, transport_ipv4);
-}

examples/wifi-echo/server/esp32/main/wifi-echo.cpp

@@ -50,7 +50,8 @@
 using namespace ::chip;
 using namespace ::chip::DeviceLayer;
 
-extern void startServer(SecureSessionMgr * transportIPv4, SecureSessionMgr * transportIPv6);
+extern void startServer();
+
 #if CONFIG_USE_ECHO_CLIENT
 extern void startClient(void);
 #endif // CONFIG_USE_ECHO_CLIENT
@@ -106,10 +107,6 @@ static EchoDeviceCallbacks EchoCallbacks;
 
 namespace {
 
-// Globals as these are large and will not fit onto the stack
-SecureSessionMgr sTransportIPv4;
-SecureSessionMgr sTransportIPv6;
-
 std::vector<Button> buttons          = { Button(), Button(), Button() };
 std::vector<gpio_num_t> button_gpios = { BUTTON_1_GPIO_NUM, BUTTON_2_GPIO_NUM, BUTTON_3_GPIO_NUM };
 
@@ -401,7 +398,7 @@ extern "C" void app_main()
 
     // Start the Echo Server
     InitDataModelHandler();
-    startServer(&sTransportIPv4, &sTransportIPv6);
+    startServer();
 #if CONFIG_USE_ECHO_CLIENT
     startClient();
 #endif

src/controller/CHIPDeviceController.cpp

@@ -145,9 +145,10 @@ CHIP_ERROR ChipDeviceController::ConnectDevice(NodeId remoteDeviceId, IPAddress
     mAppReqState     = appReqState;
     mOnNewConnection = onConnected;
 
-    mSessionManager = new SecureSessionMgr();
+    mSessionManager = new SecureSessionMgr<Transport::UDP>();
 
-    err = mSessionManager->Init(mLocalDeviceId, mInetLayer, Transport::UdpListenParameters().SetAddressType(deviceAddr.Type()));
+    err = mSessionManager->Init(mLocalDeviceId, mSystemLayer,
+                                Transport::UdpListenParameters(mInetLayer).SetAddressType(deviceAddr.Type()));
     SuccessOrExit(err);
 
     mSessionManager->SetDelegate(this);
@@ -341,13 +342,13 @@ void ChipDeviceController::ClearRequestState()
     }
 }
 
-void ChipDeviceController::OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgr * mgr)
+void ChipDeviceController::OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgrBase * mgr)
 {
     mOnNewConnection(this, state, mAppReqState);
 }
 
 void ChipDeviceController::OnMessageReceived(const MessageHeader & header, Transport::PeerConnectionState * state,
-                                             System::PacketBuffer * msgBuf, SecureSessionMgr * mgr)
+                                             System::PacketBuffer * msgBuf, SecureSessionMgrBase * mgr)
 {
     if (header.GetSourceNodeId().HasValue())
     {

src/controller/CHIPDeviceController.h

@@ -51,6 +51,8 @@ typedef void (*MessageReceiveHandler)(ChipDeviceController * deviceController, v
 
 class DLL_EXPORT ChipDeviceController : public SecureSessionMgrCallback
 {
+    friend class ChipDeviceControllerCallback;
+
 public:
     ChipDeviceController();
 
@@ -157,9 +159,9 @@ class DLL_EXPORT ChipDeviceController : public SecureSessionMgrCallback
     CHIP_ERROR GetLayers(Layer ** systemLayer, InetLayer ** inetLayer);
 
     virtual void OnMessageReceived(const MessageHeader & header, Transport::PeerConnectionState * state,
-                                   System::PacketBuffer * msgBuf, SecureSessionMgr * mgr);
+                                   System::PacketBuffer * msgBuf, SecureSessionMgrBase * mgr);
 
-    virtual void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgr * mgr);
+    virtual void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgrBase * mgr);
 
 private:
     enum
@@ -178,10 +180,7 @@ class DLL_EXPORT ChipDeviceController : public SecureSessionMgrCallback
     System::Layer * mSystemLayer;
     Inet::InetLayer * mInetLayer;
 
-    // TODO: CHIPDeviceController assumes a single device connection, where as
-    //       session manager handles multiple connections. Need to finalize design on this
-    //       as otherwise a single connection may end up processing data from other peers.
-    SecureSessionMgr * mSessionManager;
+    SecureSessionMgr<Transport::UDP> * mSessionManager;
 
     ConnectionState mConState;
     void * mAppReqState;

src/transport/Base.h

@@ -69,11 +69,11 @@ class Base : public ReferenceCounted<Base>
     virtual CHIP_ERROR SendMessage(const MessageHeader & header, const PeerAddress & address, System::PacketBuffer * msgBuf) = 0;
 
     /**
-     * Get the path that this transport is associated with.
+     * Determine if this transport can SendMessage to the specified peer address.
      *
-     * Within a system, only one transport should be associated with a path.
+     * Generally it is expected that a transport can send to any peer from which it receives a message.
      */
-    virtual Type GetType() = 0;
+    virtual bool CanSendToPeer(const Transport::PeerAddress & address) = 0;
 
 protected:
     /**