[rendezvous] Add initial support for IP rendezvous

examples/all-clusters-app/esp32/main/EchoServer.cpp

@@ -42,6 +42,7 @@
 #include <support/ErrorStr.h>
 #include <system/SystemPacketBuffer.h>
 #include <transport/SecureSessionMgr.h>
+#include <transport/TransportMgr.h>
 #include <transport/raw/Tuple.h>
 #include <transport/raw/UDP.h>
 
@@ -122,7 +123,7 @@ class EchoServerCallback : public SecureSessionMgrDelegate
 {
 public:
     void OnMessageReceived(const PacketHeader & header, const PayloadHeader & payloadHeader, Transport::PeerConnectionState * state,
-                           System::PacketBuffer * buffer, SecureSessionMgrBase * mgr) override
+                           System::PacketBuffer * buffer, SecureSessionMgr * mgr) override
     {
         CHIP_ERROR err;
         const size_t data_len = buffer->DataLength();
@@ -179,13 +180,13 @@ class EchoServerCallback : public SecureSessionMgrDelegate
         }
     }
 
-    void OnReceiveError(CHIP_ERROR error, const Transport::PeerAddress & source, SecureSessionMgrBase * mgr) override
+    void OnReceiveError(CHIP_ERROR error, const Transport::PeerAddress & source, SecureSessionMgr * mgr) override
     {
         ESP_LOGE(TAG, "ERROR: %s\n Got UDP error", ErrorStr(error));
         statusLED1.BlinkOnError();
     }
 
-    void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgrBase * mgr) override
+    void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgr * mgr) override
     {
         ESP_LOGI(TAG, "Received a new connection.");
     }
@@ -218,15 +219,16 @@ class EchoServerCallback : public SecureSessionMgrDelegate
 
 EchoServerCallback gCallbacks;
 
-SecureSessionMgr<Transport::UDP, // IPV6
-                 Transport::UDP  // IPV4
-                 >
-    sessions;
+TransportMgr<Transport::UDP, // IPV6
+             Transport::UDP  // IPV4
+             >
+    gTransports;
+SecureSessionMgr sessions;
 
 } // namespace
 
 namespace chip {
-SecureSessionMgrBase & SessionManager()
+SecureSessionMgr & SessionManager()
 {
     return sessions;
 }
@@ -242,9 +244,11 @@ void PairingComplete(SecurePairingSession * pairing)
 void startServer()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
-    err            = sessions.Init(kLocalNodeId, &DeviceLayer::SystemLayer,
-                        UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6).SetInterfaceId(NULL),
-                        UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv4));
+    err            = sessions.Init(kLocalNodeId, &DeviceLayer::SystemLayer);
+    SuccessOrExit(err);
+    err = gTransports.Init(&sessions, nullptr,
+                           UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6).SetInterfaceId(nullptr),
+                           UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv4));
     SuccessOrExit(err);
 
     sessions.SetDelegate(&gCallbacks);

examples/common/chip-app-server/DataModelHandler.cpp

@@ -41,7 +41,7 @@ extern "C" {
  * @param [in] buffer The buffer holding the message.  This function guarantees
  *                    that it will free the buffer before returning.
  */
-void HandleDataModelMessage(const PacketHeader & header, System::PacketBuffer * buffer, SecureSessionMgrBase * mgr)
+void HandleDataModelMessage(const PacketHeader & header, System::PacketBuffer * buffer, SecureSessionMgr * mgr)
 {
     EmberApsFrame frame;
     bool ok = extractApsFrame(buffer->Start(), buffer->DataLength(), &frame) > 0;

examples/common/chip-app-server/RendezvousServer.cpp

@@ -56,7 +56,8 @@ void RendezvousServer::OnRendezvousConnectionClosed()
     ChipLogProgress(AppServer, "OnRendezvousConnectionClosed");
 }
 
-void RendezvousServer::OnRendezvousMessageReceived(PacketBuffer * buffer)
+void RendezvousServer::OnRendezvousMessageReceived(const PacketHeader & packetHeader, const PeerAddress & peerAddress,
+                                                   PacketBuffer * buffer)
 {
     chip::System::PacketBuffer::Free(buffer);
 }

examples/common/chip-app-server/Server.cpp

@@ -50,7 +50,7 @@ class ServerCallback : public SecureSessionMgrDelegate
 {
 public:
     void OnMessageReceived(const PacketHeader & header, const PayloadHeader & payloadHeader, Transport::PeerConnectionState * state,
-                           System::PacketBuffer * buffer, SecureSessionMgrBase * mgr) override
+                           System::PacketBuffer * buffer, SecureSessionMgr * mgr) override
     {
         const size_t data_len = buffer->DataLength();
         char src_addr[PeerAddress::kMaxToStringSize];
@@ -77,20 +77,21 @@ class ServerCallback : public SecureSessionMgrDelegate
         }
     }
 
-    void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgrBase * mgr) override
+    void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgr * mgr) override
     {
         ChipLogProgress(AppServer, "Received a new connection.");
     }
 };
 
-DemoSessionManager gSessions;
+DemoTransportMgr gTransports;
+SecureSessionMgr gSessions;
 ServerCallback gCallbacks;
 SecurePairingUsingTestSecret gTestPairing;
 RendezvousServer gRendezvousServer;
 
 } // namespace
 
-SecureSessionMgrBase & chip::SessionManager()
+SecureSessionMgr & chip::SessionManager()
 {
     return gSessions;
 }
@@ -104,8 +105,7 @@ void InitServer()
 
     InitDataModelHandler();
 
-    err = gSessions.Init(EXAMPLE_SERVER_NODEID, &DeviceLayer::SystemLayer,
-                         UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6));
+    err = gSessions.Init(EXAMPLE_SERVER_NODEID, &DeviceLayer::SystemLayer);
     SuccessOrExit(err);
 
     // This flag is used to bypass BLE in the cirque test
@@ -123,12 +123,15 @@ void InitServer()
     }
 #endif
 
+    // Init transport before operations with secure session mgr.
+    gTransports.Init(&gSessions, gRendezvousServer.GetRendezvousSession(),
+                     UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6));
+
     err = gSessions.NewPairing(peer, &gTestPairing);
     SuccessOrExit(err);
 
     gSessions.SetDelegate(&gCallbacks);
     chip::Mdns::DiscoveryManager::GetInstance().StartPublishDevice(chip::Inet::kIPAddressType_IPv6);
-
 exit:
     if (err != CHIP_NO_ERROR)
     {

examples/common/chip-app-server/include/DataModelHandler.h

@@ -34,7 +34,6 @@ extern "C" {
  * @param [in] buffer The buffer holding the message.  This function guarantees
  *                    that it will free the buffer before returning.
  */
-void HandleDataModelMessage(const chip::PacketHeader & header, chip::System::PacketBuffer * buffer,
-                            chip::SecureSessionMgrBase * mgr);
+void HandleDataModelMessage(const chip::PacketHeader & header, chip::System::PacketBuffer * buffer, chip::SecureSessionMgr * mgr);
 void InitDataModelHandler();
 }

examples/common/chip-app-server/include/RendezvousServer.h

@@ -34,8 +34,10 @@ class RendezvousServer : public RendezvousSessionDelegate
     void OnRendezvousConnectionOpened() override;
     void OnRendezvousConnectionClosed() override;
     void OnRendezvousError(CHIP_ERROR err) override;
-    void OnRendezvousMessageReceived(System::PacketBuffer * buffer) override;
+    void OnRendezvousMessageReceived(const PacketHeader & packetHeader, const Transport::PeerAddress & peerAddress,
+                                     System::PacketBuffer * buffer) override;
     void OnRendezvousStatusUpdate(Status status, CHIP_ERROR err) override;
+    RendezvousSession * GetRendezvousSession() { return &mRendezvousSession; };
 
 private:
     RendezvousSession mRendezvousSession;

examples/common/chip-app-server/include/Server.h

@@ -17,10 +17,10 @@
 
 #pragma once
 
-#include <transport/SecureSessionMgr.h>
+#include <transport/TransportMgr.h>
 #include <transport/raw/UDP.h>
 
-using DemoSessionManager = chip::SecureSessionMgr<chip::Transport::UDP>;
+using DemoTransportMgr = chip::TransportMgr<chip::Transport::UDP>;
 
 /**
  * Initialize DataModelHandler and start CHIP datamodel server, the server

examples/common/chip-app-server/include/SessionManager.h

@@ -20,5 +20,5 @@
 #include <transport/SecureSessionMgr.h>
 
 namespace chip {
-SecureSessionMgrBase & SessionManager();
+SecureSessionMgr & SessionManager();
 } // namespace chip

examples/temperature-measurement-app/esp32/main/ResponseServer.cpp

@@ -42,6 +42,7 @@
 #include <support/ErrorStr.h>
 #include <system/SystemPacketBuffer.h>
 #include <transport/SecureSessionMgr.h>
+#include <transport/TransportMgr.h>
 #include <transport/raw/Tuple.h>
 #include <transport/raw/UDP.h>
 
@@ -61,7 +62,7 @@ class ResponseServerCallback : public SecureSessionMgrDelegate
 {
 public:
     void OnMessageReceived(const PacketHeader & header, const PayloadHeader & payloadHeader, Transport::PeerConnectionState * state,
-                           System::PacketBuffer * buffer, SecureSessionMgrBase * mgr) override
+                           System::PacketBuffer * buffer, SecureSessionMgr * mgr) override
     {
         CHIP_ERROR err;
         const size_t data_len = buffer->DataLength();
@@ -90,12 +91,12 @@ class ResponseServerCallback : public SecureSessionMgrDelegate
         }
     }
 
-    void OnReceiveError(CHIP_ERROR error, const Transport::PeerAddress & source, SecureSessionMgrBase * mgr) override
+    void OnReceiveError(CHIP_ERROR error, const Transport::PeerAddress & source, SecureSessionMgr * mgr) override
     {
         ESP_LOGE(TAG, "ERROR: %s\n Got UDP error", ErrorStr(error));
     }
 
-    void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgrBase * mgr) override
+    void OnNewConnection(Transport::PeerConnectionState * state, SecureSessionMgr * mgr) override
     {
         ESP_LOGI(TAG, "Received a new connection.");
     }
@@ -127,16 +128,16 @@ class ResponseServerCallback : public SecureSessionMgrDelegate
 };
 
 ResponseServerCallback gCallbacks;
-
-SecureSessionMgr<Transport::UDP, // IPV6
-                 Transport::UDP  // IPV4
-                 >
-    sessions;
+TransportMgr<Transport::UDP, // IPV6
+             Transport::UDP  // IPV4
+             >
+    gTransports;
+SecureSessionMgr sessions;
 
 } // namespace
 
 namespace chip {
-SecureSessionMgrBase & SessionManager()
+SecureSessionMgr & SessionManager()
 {
     return sessions;
 }
@@ -152,9 +153,11 @@ void PairingComplete(SecurePairingSession * pairing)
 void startServer()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
-    err            = sessions.Init(kLocalNodeId, &DeviceLayer::SystemLayer,
-                        UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6).SetInterfaceId(nullptr),
-                        UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv4));
+    err            = sessions.Init(kLocalNodeId, &DeviceLayer::SystemLayer);
+    SuccessOrExit(err);
+    err = gTransports.Init(&sessions, nullptr,
+                           UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6).SetInterfaceId(nullptr),
+                           UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv4));
     SuccessOrExit(err);
 
     sessions.SetDelegate(&gCallbacks);

src/app/util/chip-message-send.cpp

@@ -25,7 +25,7 @@
 #include <assert.h>
 #include <inet/InetLayer.h> // PacketBuffer and the like
 #include <support/logging/CHIPLogging.h>
-#include <transport/SecureSessionMgr.h> // For SecureSessionMgrBase
+#include <transport/SecureSessionMgr.h> // For SecureSessionMgr
 
 using namespace chip;
 
@@ -35,7 +35,7 @@ using namespace chip;
 //
 // https://github.com/project-chip/connectedhomeip/issues/2566 tracks that API.
 namespace chip {
-extern SecureSessionMgrBase & SessionManager();
+extern SecureSessionMgr & SessionManager();
 }
 
 extern "C" {

src/controller/CHIPDevice.cpp

@@ -165,7 +165,7 @@ CHIP_ERROR Device::Deserialize(const SerializedDevice & input)
 }
 
 void Device::OnMessageReceived(const PacketHeader & header, const PayloadHeader & payloadHeader,
-                               Transport::PeerConnectionState * state, System::PacketBuffer * msgBuf, SecureSessionMgrBase * mgr)
+                               Transport::PeerConnectionState * state, System::PacketBuffer * msgBuf, SecureSessionMgr * mgr)
 {
     if (mState == ConnectionState::SecureConnected && mStatusDelegate != nullptr)
     {
@@ -186,7 +186,7 @@ CHIP_ERROR Device::LoadSecureSessionParameters()
     err = pairingSession.FromSerializable(mPairing);
     SuccessOrExit(err);
 
-    err = mSessionManager->ResetTransport(Transport::UdpListenParameters(mInetLayer).SetAddressType(mDeviceAddr.Type()));
+    err = mTransportMgr->ResetTransport(Transport::UdpListenParameters(mInetLayer).SetAddressType(mDeviceAddr.Type()));
     SuccessOrExit(err);
 
     err = mSessionManager->NewPairing(

src/controller/CHIPDevice.h

@@ -31,6 +31,7 @@
 #include <support/DLLUtil.h>
 #include <transport/SecurePairingSession.h>
 #include <transport/SecureSessionMgr.h>
+#include <transport/TransportMgr.h>
 #include <transport/raw/MessageHeader.h>
 #include <transport/raw/UDP.h>
 
@@ -41,6 +42,8 @@ class DeviceController;
 class DeviceStatusDelegate;
 struct SerializedDevice;
 
+using DeviceTransportMgr = TransportMgr<Transport::UDP>;
+
 class DLL_EXPORT Device
 {
 public:
@@ -93,11 +96,13 @@ class DLL_EXPORT Device
      *   that of this device object. If these objects are freed, while the device object is
      *   still using them, it can lead to unknown behavior and crashes.
      *
+     * @param[in] transportMgr Transport manager object pointer
      * @param[in] sessionMgr   Secure session manager object pointer
      * @param[in] inetLayer    InetLayer object pointer
      */
-    void Init(SecureSessionMgr<Transport::UDP> * sessionMgr, Inet::InetLayer * inetLayer)
+    void Init(DeviceTransportMgr * transportMgr, SecureSessionMgr * sessionMgr, Inet::InetLayer * inetLayer)
     {
+        mTransportMgr   = transportMgr;
         mSessionManager = sessionMgr;
         mInetLayer      = inetLayer;
     }
@@ -113,16 +118,17 @@ class DLL_EXPORT Device
      *   uninitialzed/unpaired device objects. The object is initialized only when the device
      *   is actually paired.
      *
+     * @param[in] transportMgr Transport manager object pointer
      * @param[in] sessionMgr   Secure session manager object pointer
      * @param[in] inetLayer    InetLayer object pointer
      * @param[in] deviceId     Node ID of the device
      * @param[in] devicePort   Port on which device is listening (typically CHIP_PORT)
      * @param[in] interfaceId  Local Interface ID that should be used to talk to the device
      */
-    void Init(SecureSessionMgr<Transport::UDP> * sessionMgr, Inet::InetLayer * inetLayer, NodeId deviceId, uint16_t devicePort,
-              Inet::InterfaceId interfaceId)
+    void Init(DeviceTransportMgr * transportMgr, SecureSessionMgr * sessionMgr, Inet::InetLayer * inetLayer, NodeId deviceId,
+              uint16_t devicePort, Inet::InterfaceId interfaceId)
     {
-        Init(sessionMgr, inetLayer);
+        Init(transportMgr, sessionMgr, inetLayer);
         mDeviceId   = deviceId;
         mDevicePort = devicePort;
         mInterface  = interfaceId;
@@ -156,7 +162,7 @@ class DLL_EXPORT Device
      * @param[in] mgr           Pointer to secure session manager which received the message
      */
     void OnMessageReceived(const PacketHeader & header, const PayloadHeader & payloadHeader, Transport::PeerConnectionState * state,
-                           System::PacketBuffer * msgBuf, SecureSessionMgrBase * mgr);
+                           System::PacketBuffer * msgBuf, SecureSessionMgr * mgr);
 
     /**
      * @brief
@@ -202,7 +208,9 @@ class DLL_EXPORT Device
 
     DeviceStatusDelegate * mStatusDelegate;
 
-    SecureSessionMgr<Transport::UDP> * mSessionManager;
+    SecureSessionMgr * mSessionManager;
+
+    DeviceTransportMgr * mTransportMgr;
 
     /**
      * @brief