From 1710339753788c5b58d64fd4951a23cbf1d7314e Mon Sep 17 00:00:00 2001 From: Pankaj Garg Date: Thu, 30 Sep 2021 14:15:20 -0700 Subject: [PATCH] Remove unnecessary dependencies on FabricTable objects (#10126) --- examples/shell/shell_common/cmd_ping.cpp | 5 ++--- examples/shell/shell_common/cmd_send.cpp | 5 ++--- src/app/server/Mdns.cpp | 4 ++-- src/app/server/Server.cpp | 5 ++--- src/app/server/Server.h | 4 ++-- src/app/tests/TestCommandInteraction.cpp | 3 +-- src/app/tests/TestEventLogging.cpp | 3 +-- src/app/tests/TestInteractionModelEngine.cpp | 3 +-- src/app/tests/TestReportingEngine.cpp | 3 +-- src/app/tests/integration/chip_im_initiator.cpp | 3 +-- src/app/tests/integration/chip_im_responder.cpp | 3 +-- src/app/util/basic-types.h | 2 ++ src/channel/ChannelContext.cpp | 2 +- src/channel/ChannelContext.h | 4 ++-- src/controller/CHIPDevice.cpp | 2 +- src/controller/CHIPDevice.h | 6 +++--- src/controller/CHIPDeviceController.cpp | 6 +++--- src/controller/CHIPDeviceController.h | 2 +- src/controller/CHIPDeviceControllerFactory.cpp | 6 +++--- src/controller/CHIPDeviceControllerSystemState.h | 6 +++--- src/controller/tests/TestDevice.cpp | 2 +- src/messaging/ExchangeACL.h | 4 ++-- src/messaging/ExchangeContext.h | 4 ++-- src/messaging/tests/MessagingContext.cpp | 4 +--- src/messaging/tests/MessagingContext.h | 2 -- src/messaging/tests/echo/echo_requester.cpp | 6 ++---- src/messaging/tests/echo/echo_responder.cpp | 6 ++---- src/protocols/secure_channel/CASEServer.cpp | 2 +- src/protocols/secure_channel/CASEServer.h | 6 +++--- src/protocols/secure_channel/CASESession.cpp | 11 +++++------ src/protocols/secure_channel/CASESession.h | 14 +++++--------- src/transport/FabricTable.cpp | 3 --- src/transport/FabricTable.h | 4 ---- src/transport/SecureSession.h | 2 +- src/transport/SecureSessionTable.h | 1 - src/transport/SessionHandle.h | 5 ++--- src/transport/SessionManager.cpp | 5 +---- src/transport/SessionManager.h | 5 +---- src/transport/SessionMessageCounter.h | 1 - src/transport/tests/TestSessionHandle.cpp | 1 - src/transport/tests/TestSessionManager.cpp | 15 +++++---------- 41 files changed, 69 insertions(+), 111 deletions(-) diff --git a/examples/shell/shell_common/cmd_ping.cpp b/examples/shell/shell_common/cmd_ping.cpp index 1de3db22086a3d..f5151e80427580 100644 --- a/examples/shell/shell_common/cmd_ping.cpp +++ b/examples/shell/shell_common/cmd_ping.cpp @@ -129,7 +129,6 @@ class PingArguments } gPingArguments; Protocols::Echo::EchoClient gEchoClient; -Transport::FabricTable gFabrics; CHIP_ERROR SendEchoRequest(streamer_t * stream); void EchoTimerHandler(chip::System::Layer * systemLayer, void * appState); @@ -306,7 +305,7 @@ void StartPinging(streamer_t * stream, char * destination) #if INET_CONFIG_ENABLE_TCP_ENDPOINT if (gPingArguments.IsUsingTCP()) { - err = gSessionManager.Init(&DeviceLayer::SystemLayer(), &gTCPManager, &gFabrics, &gMessageCounterManager); + err = gSessionManager.Init(&DeviceLayer::SystemLayer(), &gTCPManager, &gMessageCounterManager); SuccessOrExit(err); err = gExchangeManager.Init(&gSessionManager); @@ -315,7 +314,7 @@ void StartPinging(streamer_t * stream, char * destination) else #endif { - err = gSessionManager.Init(&DeviceLayer::SystemLayer(), &gUDPManager, &gFabrics, &gMessageCounterManager); + err = gSessionManager.Init(&DeviceLayer::SystemLayer(), &gUDPManager, &gMessageCounterManager); SuccessOrExit(err); err = gExchangeManager.Init(&gSessionManager); diff --git a/examples/shell/shell_common/cmd_send.cpp b/examples/shell/shell_common/cmd_send.cpp index 8e1a29070f6449..c9a5da4dd8f6c2 100644 --- a/examples/shell/shell_common/cmd_send.cpp +++ b/examples/shell/shell_common/cmd_send.cpp @@ -201,7 +201,6 @@ void ProcessCommand(streamer_t * stream, char * destination) { CHIP_ERROR err = CHIP_NO_ERROR; - Transport::FabricTable fabrics; Transport::PeerAddress peerAddress; if (!chip::Inet::IPAddress::FromString(destination, gDestAddr)) @@ -227,7 +226,7 @@ void ProcessCommand(streamer_t * stream, char * destination) { peerAddress = Transport::PeerAddress::TCP(gDestAddr, gSendArguments.GetPort()); - err = gSessionManager.Init(&DeviceLayer::SystemLayer(), &gTCPManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&DeviceLayer::SystemLayer(), &gTCPManager, &gMessageCounterManager); SuccessOrExit(err); } else @@ -235,7 +234,7 @@ void ProcessCommand(streamer_t * stream, char * destination) { peerAddress = Transport::PeerAddress::UDP(gDestAddr, gSendArguments.GetPort(), INET_NULL_INTERFACEID); - err = gSessionManager.Init(&DeviceLayer::SystemLayer(), &gUDPManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&DeviceLayer::SystemLayer(), &gUDPManager, &gMessageCounterManager); SuccessOrExit(err); } diff --git a/src/app/server/Mdns.cpp b/src/app/server/Mdns.cpp index d924dd90694836..ca94651553839e 100644 --- a/src/app/server/Mdns.cpp +++ b/src/app/server/Mdns.cpp @@ -44,7 +44,7 @@ namespace { bool HaveOperationalCredentials() { // Look for any fabric info that has a useful operational identity. - for (const Transport::FabricInfo & fabricInfo : Server::GetInstance().GetFabricTable()) + for (const FabricInfo & fabricInfo : Server::GetInstance().GetFabricTable()) { if (fabricInfo.IsInitialized()) { @@ -247,7 +247,7 @@ CHIP_ERROR MdnsServer::GetCommissionableInstanceName(char * buffer, size_t buffe /// Set MDNS operational advertisement CHIP_ERROR MdnsServer::AdvertiseOperational() { - for (const Transport::FabricInfo & fabricInfo : Server::GetInstance().GetFabricTable()) + for (const FabricInfo & fabricInfo : Server::GetInstance().GetFabricTable()) { if (fabricInfo.IsInitialized()) { diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp index 503cbd317193db..ae9d67928a39db 100644 --- a/src/app/server/Server.cpp +++ b/src/app/server/Server.cpp @@ -41,14 +41,13 @@ #include #include #include -#include #include +using chip::kMinValidFabricIndex; using chip::RendezvousInformationFlag; using chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr; using chip::Inet::IPAddressType; using chip::Transport::BleListenParameters; -using chip::Transport::kMinValidFabricIndex; using chip::Transport::PeerAddress; using chip::Transport::UdpListenParameters; @@ -117,7 +116,7 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint #endif SuccessOrExit(err); - err = mSessions.Init(&DeviceLayer::SystemLayer(), &mTransports, &mFabrics, &mMessageCounterManager); + err = mSessions.Init(&DeviceLayer::SystemLayer(), &mTransports, &mMessageCounterManager); SuccessOrExit(err); err = mExchangeMgr.Init(&mSessions); diff --git a/src/app/server/Server.h b/src/app/server/Server.h index e305996179f0a3..968e6dbcf4176c 100644 --- a/src/app/server/Server.h +++ b/src/app/server/Server.h @@ -61,7 +61,7 @@ class Server : public Messaging::ExchangeDelegate CHIP_ERROR AddTestCommissioning(); - Transport::FabricTable & GetFabricTable() { return mFabrics; } + FabricTable & GetFabricTable() { return mFabrics; } Messaging::ExchangeManager & GetExchangeManager() { return mExchangeMgr; } @@ -125,7 +125,7 @@ class Server : public Messaging::ExchangeDelegate SessionManager mSessions; CASEServer mCASEServer; Messaging::ExchangeManager mExchangeMgr; - Transport::FabricTable mFabrics; + FabricTable mFabrics; SessionIDAllocator mSessionIDAllocator; secure_channel::MessageCounterManager mMessageCounterManager; #if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT diff --git a/src/app/tests/TestCommandInteraction.cpp b/src/app/tests/TestCommandInteraction.cpp index 179755a058c482..e116c707a68b59 100644 --- a/src/app/tests/TestCommandInteraction.cpp +++ b/src/app/tests/TestCommandInteraction.cpp @@ -418,14 +418,13 @@ void InitializeChip(nlTestSuite * apSuite) { CHIP_ERROR err = CHIP_NO_ERROR; chip::Optional peer(chip::Transport::Type::kUndefined); - chip::Transport::FabricTable fabrics; err = chip::Platform::MemoryInit(); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); chip::gSystemLayer.Init(); - err = chip::gSessionManager.Init(&chip::gSystemLayer, &chip::gTransportManager, &fabrics, &chip::gMessageCounterManager); + err = chip::gSessionManager.Init(&chip::gSystemLayer, &chip::gTransportManager, &chip::gMessageCounterManager); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); err = chip::gExchangeManager.Init(&chip::gSessionManager); diff --git a/src/app/tests/TestEventLogging.cpp b/src/app/tests/TestEventLogging.cpp index 358cf9b9e818b7..2f49146fc10d63 100644 --- a/src/app/tests/TestEventLogging.cpp +++ b/src/app/tests/TestEventLogging.cpp @@ -71,14 +71,13 @@ void InitializeChip(nlTestSuite * apSuite) { CHIP_ERROR err = CHIP_NO_ERROR; chip::Optional peer(chip::Transport::Type::kUndefined); - chip::Transport::FabricTable fabrics; err = chip::Platform::MemoryInit(); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); gSystemLayer.Init(); - err = gSessionManager.Init(&gSystemLayer, &gTransportManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&gSystemLayer, &gTransportManager, &gMessageCounterManager); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); err = gExchangeManager.Init(&gSessionManager); diff --git a/src/app/tests/TestInteractionModelEngine.cpp b/src/app/tests/TestInteractionModelEngine.cpp index 525334a107c554..ea568a662467d7 100644 --- a/src/app/tests/TestInteractionModelEngine.cpp +++ b/src/app/tests/TestInteractionModelEngine.cpp @@ -135,14 +135,13 @@ void InitializeChip(nlTestSuite * apSuite) { CHIP_ERROR err = CHIP_NO_ERROR; chip::Optional peer(chip::Transport::Type::kUndefined); - chip::Transport::FabricTable fabrics; err = chip::Platform::MemoryInit(); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); gSystemLayer.Init(); - err = gSessionManager.Init(&gSystemLayer, &gTransportManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&gSystemLayer, &gTransportManager, &gMessageCounterManager); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); err = gExchangeManager.Init(&gSessionManager); diff --git a/src/app/tests/TestReportingEngine.cpp b/src/app/tests/TestReportingEngine.cpp index b15f189f7b5282..e90a497bf523bf 100644 --- a/src/app/tests/TestReportingEngine.cpp +++ b/src/app/tests/TestReportingEngine.cpp @@ -158,14 +158,13 @@ void InitializeChip(nlTestSuite * apSuite) { CHIP_ERROR err = CHIP_NO_ERROR; chip::Optional peer(chip::Transport::Type::kUndefined); - chip::Transport::FabricTable fabrics; err = chip::Platform::MemoryInit(); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); chip::gSystemLayer.Init(); - err = chip::gSessionManager.Init(&chip::gSystemLayer, &chip::gTransportManager, &fabrics, &chip::gMessageCounterManager); + err = chip::gSessionManager.Init(&chip::gSystemLayer, &chip::gTransportManager, &chip::gMessageCounterManager); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); err = chip::gExchangeManager.Init(&chip::gSessionManager); diff --git a/src/app/tests/integration/chip_im_initiator.cpp b/src/app/tests/integration/chip_im_initiator.cpp index 2ac627ae1b93ab..18b242e25432a4 100644 --- a/src/app/tests/integration/chip_im_initiator.cpp +++ b/src/app/tests/integration/chip_im_initiator.cpp @@ -679,7 +679,6 @@ int main(int argc, char * argv[]) std::mutex mutex; std::unique_lock lock(mutex); MockInteractionModelApp mockDelegate; - chip::Transport::FabricTable fabrics; if (argc <= 1) { @@ -702,7 +701,7 @@ int main(int argc, char * argv[]) .SetListenPort(IM_CLIENT_PORT)); SuccessOrExit(err); - err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gTransportManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gTransportManager, &gMessageCounterManager); SuccessOrExit(err); err = gExchangeManager.Init(&gSessionManager); diff --git a/src/app/tests/integration/chip_im_responder.cpp b/src/app/tests/integration/chip_im_responder.cpp index 95eff98ed341fb..b0700f9c7a9c96 100644 --- a/src/app/tests/integration/chip_im_responder.cpp +++ b/src/app/tests/integration/chip_im_responder.cpp @@ -203,7 +203,6 @@ int main(int argc, char * argv[]) MockInteractionModelApp mockDelegate; chip::Optional peer(chip::Transport::Type::kUndefined); const chip::FabricIndex gFabricIndex = 0; - chip::Transport::FabricTable fabrics; InitializeChip(); @@ -211,7 +210,7 @@ int main(int argc, char * argv[]) chip::Transport::UdpListenParameters(&chip::DeviceLayer::InetLayer).SetAddressType(chip::Inet::kIPAddressType_IPv4)); SuccessOrExit(err); - err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gTransportManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gTransportManager, &gMessageCounterManager); SuccessOrExit(err); err = gExchangeManager.Init(&gSessionManager); diff --git a/src/app/util/basic-types.h b/src/app/util/basic-types.h index b49abb1a4d40b4..e33bcc51aa82f3 100644 --- a/src/app/util/basic-types.h +++ b/src/app/util/basic-types.h @@ -49,4 +49,6 @@ typedef uint32_t TransactionId; typedef uint32_t StatusCode; typedef uint8_t Percent; typedef uint16_t Percent100ths; + +static constexpr FabricIndex kUndefinedFabricIndex = 0; } // namespace chip diff --git a/src/channel/ChannelContext.cpp b/src/channel/ChannelContext.cpp index d0c7749aed3843..fbeb539a2ff873 100644 --- a/src/channel/ChannelContext.cpp +++ b/src/channel/ChannelContext.cpp @@ -274,7 +274,7 @@ void ChannelContext::EnterCasePairingState() ExchangeContext * ctxt = mExchangeManager->NewContext(session.Value(), prepare.mCasePairingSession); VerifyOrReturn(ctxt != nullptr); - Transport::FabricInfo * fabric = mFabricsTable->FindFabricWithIndex(mFabricIndex); + FabricInfo * fabric = mFabricsTable->FindFabricWithIndex(mFabricIndex); VerifyOrReturn(fabric != nullptr); CHIP_ERROR err = prepare.mCasePairingSession->EstablishSession(addr, fabric, prepare.mBuilder.GetPeerNodeId(), mExchangeManager->GetNextKeyId(), ctxt, this); diff --git a/src/channel/ChannelContext.h b/src/channel/ChannelContext.h index dbef0be4a5bf69..3f4a99e957445d 100644 --- a/src/channel/ChannelContext.h +++ b/src/channel/ChannelContext.h @@ -80,7 +80,7 @@ class ChannelContext : public ReferenceCountedFindFabricWithIndex(mFabricIndex); + FabricInfo * fabric = mFabricsTable->FindFabricWithIndex(mFabricIndex); ReturnErrorCodeIf(fabric == nullptr, CHIP_ERROR_INCORRECT_STATE); ReturnErrorOnFailure(mCASESession.EstablishSession(mDeviceAddress, fabric, mDeviceId, keyID, exchange, this)); diff --git a/src/controller/CHIPDevice.h b/src/controller/CHIPDevice.h index 069c795359e36d..b86970b6d816f2 100644 --- a/src/controller/CHIPDevice.h +++ b/src/controller/CHIPDevice.h @@ -88,7 +88,7 @@ struct ControllerDeviceInitParams #if CONFIG_NETWORK_LAYER_BLE Ble::BleLayer * bleLayer = nullptr; #endif - Transport::FabricTable * fabricsTable = nullptr; + FabricTable * fabricsTable = nullptr; DeviceControllerInteractionModelDelegate * imDelegate = nullptr; }; @@ -517,9 +517,9 @@ class DLL_EXPORT Device : public Messaging::ExchangeDelegate, public SessionEsta static void OnOpenPairingWindowSuccessResponse(void * context); static void OnOpenPairingWindowFailureResponse(void * context, uint8_t status); - FabricIndex mFabricIndex = Transport::kUndefinedFabricIndex; + FabricIndex mFabricIndex = kUndefinedFabricIndex; - Transport::FabricTable * mFabricsTable = nullptr; + FabricTable * mFabricsTable = nullptr; bool mDeviceOperationalCertProvisioned = false; diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index 7bf7055caa59b7..e893220c2c6b83 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -155,7 +155,7 @@ CHIP_ERROR DeviceController::Init(ControllerInitParams params) CHIP_ERROR DeviceController::ProcessControllerNOCChain(const ControllerInitParams & params) { - Transport::FabricInfo newFabric; + FabricInfo newFabric; ReturnErrorCodeIf(params.ephemeralKeypair == nullptr, CHIP_ERROR_INVALID_ARGUMENT); newFabric.SetEphemeralKey(params.ephemeralKeypair); @@ -187,7 +187,7 @@ CHIP_ERROR DeviceController::ProcessControllerNOCChain(const ControllerInitParam ReturnErrorOnFailure(newFabric.SetNOCCert(chipCertSpan)); newFabric.SetVendorId(params.controllerVendorId); - Transport::FabricInfo * fabric = params.systemState->Fabrics()->FindFabricWithIndex(mFabricIndex); + FabricInfo * fabric = params.systemState->Fabrics()->FindFabricWithIndex(mFabricIndex); ReturnErrorCodeIf(fabric == nullptr, CHIP_ERROR_INCORRECT_STATE); ReturnErrorOnFailure(fabric->SetFabricInfo(newFabric)); @@ -683,7 +683,7 @@ CHIP_ERROR DeviceCommissioner::PairDevice(NodeId remoteDeviceId, RendezvousParam uint16_t keyID = 0; - Transport::FabricInfo * fabric = mSystemState->Fabrics()->FindFabricWithIndex(mFabricIndex); + FabricInfo * fabric = mSystemState->Fabrics()->FindFabricWithIndex(mFabricIndex); VerifyOrExit(IsOperationalNodeId(remoteDeviceId), err = CHIP_ERROR_INVALID_ARGUMENT); VerifyOrExit(mState == State::Initialized, err = CHIP_ERROR_INCORRECT_STATE); diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index ed5b1ce5c06de7..96e0524ac8ddbe 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -306,7 +306,7 @@ class DLL_EXPORT DeviceController : public Messaging::ExchangeDelegate, void PersistNextKeyId(); - FabricIndex mFabricIndex = Transport::kMinValidFabricIndex; + FabricIndex mFabricIndex = kMinValidFabricIndex; OperationalCredentialsDelegate * mOperationalCredentialsDelegate; diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp index fa141799243532..ee9f8dd7eb2caf 100644 --- a/src/controller/CHIPDeviceControllerFactory.cpp +++ b/src/controller/CHIPDeviceControllerFactory.cpp @@ -129,14 +129,14 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState(FactoryInitParams params) params.imDelegate = chip::Platform::New(); } - stateParams.fabricTable = chip::Platform::New(); + stateParams.fabricTable = chip::Platform::New(); stateParams.sessionMgr = chip::Platform::New(); stateParams.exchangeMgr = chip::Platform::New(); stateParams.messageCounterManager = chip::Platform::New(); ReturnErrorOnFailure(stateParams.fabricTable->Init(mStorageDelegate)); - ReturnErrorOnFailure(stateParams.sessionMgr->Init(stateParams.systemLayer, stateParams.transportMgr, stateParams.fabricTable, - stateParams.messageCounterManager)); + ReturnErrorOnFailure( + stateParams.sessionMgr->Init(stateParams.systemLayer, stateParams.transportMgr, stateParams.messageCounterManager)); ReturnErrorOnFailure(stateParams.exchangeMgr->Init(stateParams.sessionMgr)); ReturnErrorOnFailure(stateParams.messageCounterManager->Init(stateParams.exchangeMgr)); diff --git a/src/controller/CHIPDeviceControllerSystemState.h b/src/controller/CHIPDeviceControllerSystemState.h index 741b941aa53e26..f2d04909868f2c 100644 --- a/src/controller/CHIPDeviceControllerSystemState.h +++ b/src/controller/CHIPDeviceControllerSystemState.h @@ -55,7 +55,7 @@ struct DeviceControllerSystemStateParams SessionManager * sessionMgr = nullptr; Messaging::ExchangeManager * exchangeMgr = nullptr; secure_channel::MessageCounterManager * messageCounterManager = nullptr; - Transport::FabricTable * fabricTable = nullptr; + FabricTable * fabricTable = nullptr; DeviceControllerInteractionModelDelegate * imDelegate = nullptr; }; @@ -116,7 +116,7 @@ class DeviceControllerSystemState SessionManager * SessionMgr() { return mSessionMgr; }; Messaging::ExchangeManager * ExchangeMgr() { return mExchangeMgr; } secure_channel::MessageCounterManager * MessageCounterManager() { return mMessageCounterManager; }; - Transport::FabricTable * Fabrics() { return mFabrics; }; + FabricTable * Fabrics() { return mFabrics; }; DeviceControllerInteractionModelDelegate * IMDelegate() { return mIMDelegate; } #if CONFIG_NETWORK_LAYER_BLE Ble::BleLayer * BleLayer() { return mBleLayer; }; @@ -134,7 +134,7 @@ class DeviceControllerSystemState SessionManager * mSessionMgr = nullptr; Messaging::ExchangeManager * mExchangeMgr = nullptr; secure_channel::MessageCounterManager * mMessageCounterManager = nullptr; - Transport::FabricTable * mFabrics = nullptr; + FabricTable * mFabrics = nullptr; DeviceControllerInteractionModelDelegate * mIMDelegate = nullptr; std::atomic mRefCount{ 1 }; diff --git a/src/controller/tests/TestDevice.cpp b/src/controller/tests/TestDevice.cpp index 8b9fdaca7101d6..3390e031e146f3 100644 --- a/src/controller/tests/TestDevice.cpp +++ b/src/controller/tests/TestDevice.cpp @@ -72,7 +72,7 @@ void TestDevice_EstablishSessionDirectly(nlTestSuite * inSuite, void * inContext BleListenParameters(&blelayer) #endif ); - sessionManager.Init(&systemLayer, &transportMgr, fabrics, &messageCounterManager); + sessionManager.Init(&systemLayer, &transportMgr, &messageCounterManager); exchangeMgr.Init(&sessionManager); messageCounterManager.Init(&exchangeMgr); diff --git a/src/messaging/ExchangeACL.h b/src/messaging/ExchangeACL.h index abc2d2008ee9a4..bc41524e117f71 100644 --- a/src/messaging/ExchangeACL.h +++ b/src/messaging/ExchangeACL.h @@ -102,7 +102,7 @@ class DLL_EXPORT CASEACLSubject class DLL_EXPORT CASEExchangeACL : public ExchangeACL { public: - CASEExchangeACL(Transport::FabricInfo * info) : mFabricInfo(info) {} + CASEExchangeACL(FabricInfo * info) : mFabricInfo(info) {} virtual ~CASEExchangeACL() {} PermissionLevel GetPermissionLevel(const ACLSubject & subject, const ACLTarget & target) override @@ -116,7 +116,7 @@ class DLL_EXPORT CASEExchangeACL : public ExchangeACL } private: - Transport::FabricInfo * mFabricInfo; + FabricInfo * mFabricInfo; }; } // namespace Messaging diff --git a/src/messaging/ExchangeContext.h b/src/messaging/ExchangeContext.h index 56faa0c0a57504..e5e16d77c2f7a7 100644 --- a/src/messaging/ExchangeContext.h +++ b/src/messaging/ExchangeContext.h @@ -150,11 +150,11 @@ class DLL_EXPORT ExchangeContext : public ReliableMessageContext, public Referen ExchangeMessageDispatch * GetMessageDispatch() { return mDispatch; } - ExchangeACL * GetExchangeACL(Transport::FabricTable & table) + ExchangeACL * GetExchangeACL(FabricTable & table) { if (mExchangeACL == nullptr) { - Transport::FabricInfo * fabric = table.FindFabricWithIndex(mSecureSession.Value().GetFabricIndex()); + FabricInfo * fabric = table.FindFabricWithIndex(mSecureSession.Value().GetFabricIndex()); if (fabric != nullptr) { mExchangeACL = chip::Platform::New(fabric); diff --git a/src/messaging/tests/MessagingContext.cpp b/src/messaging/tests/MessagingContext.cpp index 5f82f21415aea5..3f963bb8565fbd 100644 --- a/src/messaging/tests/MessagingContext.cpp +++ b/src/messaging/tests/MessagingContext.cpp @@ -30,9 +30,7 @@ CHIP_ERROR MessagingContext::Init(nlTestSuite * suite, TransportMgrBase * transp mIOContext = ioContext; - mFabrics.Reset(); - - ReturnErrorOnFailure(mSessionManager.Init(&GetSystemLayer(), transport, &mFabrics, &mMessageCounterManager)); + ReturnErrorOnFailure(mSessionManager.Init(&GetSystemLayer(), transport, &mMessageCounterManager)); ReturnErrorOnFailure(mExchangeManager.Init(&mSessionManager)); ReturnErrorOnFailure(mMessageCounterManager.Init(&mExchangeManager)); diff --git a/src/messaging/tests/MessagingContext.h b/src/messaging/tests/MessagingContext.h index 21878322087456..3448974cba2a31 100644 --- a/src/messaging/tests/MessagingContext.h +++ b/src/messaging/tests/MessagingContext.h @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -103,7 +102,6 @@ class MessagingContext Transport::PeerAddress mBobAddress; SecurePairingUsingTestSecret mPairingAliceToBob; SecurePairingUsingTestSecret mPairingBobToAlice; - Transport::FabricTable mFabrics; FabricIndex mSrcFabricIndex = 0; FabricIndex mDestFabricIndex = 0; }; diff --git a/src/messaging/tests/echo/echo_requester.cpp b/src/messaging/tests/echo/echo_requester.cpp index 27ab7046356b9d..f1d727d5e29f05 100644 --- a/src/messaging/tests/echo/echo_requester.cpp +++ b/src/messaging/tests/echo/echo_requester.cpp @@ -200,8 +200,6 @@ int main(int argc, char * argv[]) { CHIP_ERROR err = CHIP_NO_ERROR; - chip::Transport::FabricTable fabrics; - if (argc <= 1) { printf("Missing Echo Server IP address\n"); @@ -234,7 +232,7 @@ int main(int argc, char * argv[]) .SetListenPort(ECHO_CLIENT_PORT)); SuccessOrExit(err); - err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gTCPManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gTCPManager, &gMessageCounterManager); SuccessOrExit(err); } else @@ -244,7 +242,7 @@ int main(int argc, char * argv[]) .SetListenPort(ECHO_CLIENT_PORT)); SuccessOrExit(err); - err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gUDPManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gUDPManager, &gMessageCounterManager); SuccessOrExit(err); } diff --git a/src/messaging/tests/echo/echo_responder.cpp b/src/messaging/tests/echo/echo_responder.cpp index f4e3fe9b2de1bb..d6160c8cf6a277 100644 --- a/src/messaging/tests/echo/echo_responder.cpp +++ b/src/messaging/tests/echo/echo_responder.cpp @@ -61,8 +61,6 @@ int main(int argc, char * argv[]) bool useTCP = false; bool disableEcho = false; - chip::Transport::FabricTable fabrics; - const chip::FabricIndex gFabricIndex = 0; if (argc > 2) @@ -89,7 +87,7 @@ int main(int argc, char * argv[]) chip::Transport::TcpListenParameters(&chip::DeviceLayer::InetLayer).SetAddressType(chip::Inet::kIPAddressType_IPv4)); SuccessOrExit(err); - err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gTCPManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gTCPManager, &gMessageCounterManager); SuccessOrExit(err); } else @@ -98,7 +96,7 @@ int main(int argc, char * argv[]) chip::Transport::UdpListenParameters(&chip::DeviceLayer::InetLayer).SetAddressType(chip::Inet::kIPAddressType_IPv4)); SuccessOrExit(err); - err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gUDPManager, &fabrics, &gMessageCounterManager); + err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gUDPManager, &gMessageCounterManager); SuccessOrExit(err); } diff --git a/src/protocols/secure_channel/CASEServer.cpp b/src/protocols/secure_channel/CASEServer.cpp index 2ff3818be38f78..926210afb49964 100644 --- a/src/protocols/secure_channel/CASEServer.cpp +++ b/src/protocols/secure_channel/CASEServer.cpp @@ -31,7 +31,7 @@ namespace chip { CHIP_ERROR CASEServer::ListenForSessionEstablishment(Messaging::ExchangeManager * exchangeManager, TransportMgrBase * transportMgr, Ble::BleLayer * bleLayer, SessionManager * sessionManager, - Transport::FabricTable * fabrics, SessionIDAllocator * idAllocator) + FabricTable * fabrics, SessionIDAllocator * idAllocator) { VerifyOrReturnError(transportMgr != nullptr, CHIP_ERROR_INVALID_ARGUMENT); VerifyOrReturnError(exchangeManager != nullptr, CHIP_ERROR_INVALID_ARGUMENT); diff --git a/src/protocols/secure_channel/CASEServer.h b/src/protocols/secure_channel/CASEServer.h index 0ec220a9f448f8..c2699b2a3f9f25 100644 --- a/src/protocols/secure_channel/CASEServer.h +++ b/src/protocols/secure_channel/CASEServer.h @@ -38,8 +38,8 @@ class CASEServer : public SessionEstablishmentDelegate, public Messaging::Exchan } CHIP_ERROR ListenForSessionEstablishment(Messaging::ExchangeManager * exchangeManager, TransportMgrBase * transportMgr, - Ble::BleLayer * bleLayer, SessionManager * sessionManager, - Transport::FabricTable * fabrics, SessionIDAllocator * idAllocator); + Ble::BleLayer * bleLayer, SessionManager * sessionManager, FabricTable * fabrics, + SessionIDAllocator * idAllocator); //////////// SessionEstablishmentDelegate Implementation /////////////// void OnSessionEstablishmentError(CHIP_ERROR error) override; @@ -65,7 +65,7 @@ class CASEServer : public SessionEstablishmentDelegate, public Messaging::Exchan SessionManager * mSessionManager = nullptr; Ble::BleLayer * mBleLayer = nullptr; - Transport::FabricTable * mFabrics = nullptr; + FabricTable * mFabrics = nullptr; CHIP_ERROR InitCASEHandshake(Messaging::ExchangeContext * ec); diff --git a/src/protocols/secure_channel/CASESession.cpp b/src/protocols/secure_channel/CASESession.cpp index 8fc36b4cf6c9d1..f9c79d6090859e 100644 --- a/src/protocols/secure_channel/CASESession.cpp +++ b/src/protocols/secure_channel/CASESession.cpp @@ -234,8 +234,7 @@ CHIP_ERROR CASESession::Init(uint16_t localSessionId, SessionEstablishmentDelega } CHIP_ERROR -CASESession::ListenForSessionEstablishment(uint16_t localSessionId, Transport::FabricTable * fabrics, - SessionEstablishmentDelegate * delegate) +CASESession::ListenForSessionEstablishment(uint16_t localSessionId, FabricTable * fabrics, SessionEstablishmentDelegate * delegate) { VerifyOrReturnError(fabrics != nullptr, CHIP_ERROR_INVALID_ARGUMENT); ReturnErrorOnFailure(Init(localSessionId, delegate)); @@ -249,8 +248,8 @@ CASESession::ListenForSessionEstablishment(uint16_t localSessionId, Transport::F return CHIP_NO_ERROR; } -CHIP_ERROR CASESession::EstablishSession(const Transport::PeerAddress peerAddress, Transport::FabricInfo * fabric, - NodeId peerNodeId, uint16_t localSessionId, ExchangeContext * exchangeCtxt, +CHIP_ERROR CASESession::EstablishSession(const Transport::PeerAddress peerAddress, FabricInfo * fabric, NodeId peerNodeId, + uint16_t localSessionId, ExchangeContext * exchangeCtxt, SessionEstablishmentDelegate * delegate) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -431,7 +430,7 @@ CHIP_ERROR CASESession::HandleSigma1(System::PacketBufferHandle && msg) ByteSpan initiatorPubKey; const ByteSpan * ipkListSpan = GetIPKList(); - FabricIndex fabricIndex = Transport::kUndefinedFabricIndex; + FabricIndex fabricIndex = kUndefinedFabricIndex; SuccessOrExit(err = mCommissioningHash.AddData(ByteSpan{ msg->Start(), msg->DataLength() })); @@ -463,7 +462,7 @@ CHIP_ERROR CASESession::HandleSigma1(System::PacketBufferHandle && msg) VerifyOrExit(mFabricsTable != nullptr, err = CHIP_ERROR_INCORRECT_STATE); fabricIndex = mFabricsTable->FindDestinationIDCandidate(destinationIdentifier, initiatorRandom, ipkListSpan, GetIPKListEntries()); - VerifyOrExit(fabricIndex != Transport::kUndefinedFabricIndex, err = CHIP_ERROR_KEY_NOT_FOUND); + VerifyOrExit(fabricIndex != kUndefinedFabricIndex, err = CHIP_ERROR_KEY_NOT_FOUND); mFabricInfo = mFabricsTable->FindFabricWithIndex(fabricIndex); VerifyOrExit(mFabricInfo != nullptr, err = CHIP_ERROR_INCORRECT_STATE); diff --git a/src/protocols/secure_channel/CASESession.h b/src/protocols/secure_channel/CASESession.h index 07ccdfdcf9f195..733e5b84ab1b9f 100644 --- a/src/protocols/secure_channel/CASESession.h +++ b/src/protocols/secure_channel/CASESession.h @@ -97,8 +97,7 @@ class DLL_EXPORT CASESession : public Messaging::ExchangeDelegate, public Pairin * * @return CHIP_ERROR The result of initialization */ - CHIP_ERROR ListenForSessionEstablishment(uint16_t mySessionId, Transport::FabricTable * fabrics, - SessionEstablishmentDelegate * delegate); + CHIP_ERROR ListenForSessionEstablishment(uint16_t mySessionId, FabricTable * fabrics, SessionEstablishmentDelegate * delegate); /** * @brief @@ -113,7 +112,7 @@ class DLL_EXPORT CASESession : public Messaging::ExchangeDelegate, public Pairin * * @return CHIP_ERROR The result of initialization */ - CHIP_ERROR EstablishSession(const Transport::PeerAddress peerAddress, Transport::FabricInfo * fabric, NodeId peerNodeId, + CHIP_ERROR EstablishSession(const Transport::PeerAddress peerAddress, FabricInfo * fabric, NodeId peerNodeId, uint16_t mySessionId, Messaging::ExchangeContext * exchangeCtxt, SessionEstablishmentDelegate * delegate); @@ -188,10 +187,7 @@ class DLL_EXPORT CASESession : public Messaging::ExchangeDelegate, public Pairin return &mMessageDispatch; } - FabricIndex GetFabricIndex() const - { - return mFabricInfo != nullptr ? mFabricInfo->GetFabricIndex() : Transport::kUndefinedFabricIndex; - } + FabricIndex GetFabricIndex() const { return mFabricInfo != nullptr ? mFabricInfo->GetFabricIndex() : kUndefinedFabricIndex; } // TODO: remove Clear, we should create a new instance instead reset the old instance. /** @brief This function zeroes out and resets the memory used by the object. @@ -279,8 +275,8 @@ class DLL_EXPORT CASESession : public Messaging::ExchangeDelegate, public Pairin Messaging::ExchangeContext * mExchangeCtxt = nullptr; SessionEstablishmentExchangeDispatch mMessageDispatch; - Transport::FabricTable * mFabricsTable = nullptr; - Transport::FabricInfo * mFabricInfo = nullptr; + FabricTable * mFabricsTable = nullptr; + FabricInfo * mFabricInfo = nullptr; uint8_t mResumptionId[kCASEResumptionIDSize]; // Sigma1 initiator random, maintained to be reused post-Sigma1, such as when generating Sigma2 S2RK key diff --git a/src/transport/FabricTable.cpp b/src/transport/FabricTable.cpp index 89a17299991148..d31f09f0ca3751 100644 --- a/src/transport/FabricTable.cpp +++ b/src/transport/FabricTable.cpp @@ -31,8 +31,6 @@ namespace chip { using namespace Credentials; using namespace Crypto; -namespace Transport { - CHIP_ERROR FabricInfo::SetFabricLabel(const uint8_t * fabricLabel) { const char * charFabricLabel = Uint8::to_const_char(fabricLabel); @@ -588,5 +586,4 @@ CHIP_ERROR FabricTable::SetFabricDelegate(FabricTableDelegate * delegate) return CHIP_NO_ERROR; } -} // namespace Transport } // namespace chip diff --git a/src/transport/FabricTable.h b/src/transport/FabricTable.h index e627fe053fa708..89d2ff2f8b857c 100644 --- a/src/transport/FabricTable.h +++ b/src/transport/FabricTable.h @@ -32,16 +32,13 @@ #include #include #include -#include #ifdef ENABLE_HSM_CASE_OPS_KEY #define CASE_OPS_KEY 0xCA5EECC0 #endif namespace chip { -namespace Transport { -static constexpr FabricIndex kUndefinedFabricIndex = 0; static constexpr FabricIndex kMinValidFabricIndex = 1; static constexpr FabricIndex kMaxValidFabricIndex = std::min(UINT8_MAX, CHIP_CONFIG_MAX_DEVICE_ADMINS); static constexpr uint8_t kFabricLabelMaxLengthInBytes = 32; @@ -403,5 +400,4 @@ class DLL_EXPORT FabricTable uint8_t mFabricCount = 0; }; -} // namespace Transport } // namespace chip diff --git a/src/transport/SecureSession.h b/src/transport/SecureSession.h index bbc81e111001d6..16577c8dc61a1e 100644 --- a/src/transport/SecureSession.h +++ b/src/transport/SecureSession.h @@ -21,8 +21,8 @@ #pragma once +#include #include -#include #include #include #include diff --git a/src/transport/SecureSessionTable.h b/src/transport/SecureSessionTable.h index 940cb670784865..4bc1eea9042a4d 100644 --- a/src/transport/SecureSessionTable.h +++ b/src/transport/SecureSessionTable.h @@ -19,7 +19,6 @@ #include #include #include -#include #include namespace chip { diff --git a/src/transport/SessionHandle.h b/src/transport/SessionHandle.h index ab58d952a2fe02..0b738011af3469 100644 --- a/src/transport/SessionHandle.h +++ b/src/transport/SessionHandle.h @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -34,7 +33,7 @@ class SessionHandle SessionHandle(NodeId peerNodeId, FabricIndex fabric) : mPeerNodeId(peerNodeId), mFabric(fabric) {} SessionHandle(Transport::UnauthenticatedSessionHandle session) : - mPeerNodeId(kPlaceholderNodeId), mFabric(Transport::kUndefinedFabricIndex), mUnauthenticatedSessionHandle(session) + mPeerNodeId(kPlaceholderNodeId), mFabric(kUndefinedFabricIndex), mUnauthenticatedSessionHandle(session) {} SessionHandle(NodeId peerNodeId, uint16_t localSessionId, uint16_t peerSessionId, FabricIndex fabric) : @@ -46,7 +45,7 @@ class SessionHandle bool IsSecure() const { return !mUnauthenticatedSessionHandle.HasValue(); } - bool HasFabricIndex() const { return (mFabric != Transport::kUndefinedFabricIndex); } + bool HasFabricIndex() const { return (mFabric != kUndefinedFabricIndex); } FabricIndex GetFabricIndex() const { return mFabric; } void SetFabricIndex(FabricIndex fabricId) { mFabric = fabricId; } diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp index c6fa054918e031..ce627caacb5bb5 100644 --- a/src/transport/SessionManager.cpp +++ b/src/transport/SessionManager.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -69,7 +68,7 @@ SessionManager::SessionManager() : mState(State::kNotReady) {} SessionManager::~SessionManager() {} -CHIP_ERROR SessionManager::Init(System::Layer * systemLayer, TransportMgrBase * transportMgr, Transport::FabricTable * fabrics, +CHIP_ERROR SessionManager::Init(System::Layer * systemLayer, TransportMgrBase * transportMgr, Transport::MessageCounterManagerInterface * messageCounterManager) { VerifyOrReturnError(mState == State::kNotReady, CHIP_ERROR_INCORRECT_STATE); @@ -78,7 +77,6 @@ CHIP_ERROR SessionManager::Init(System::Layer * systemLayer, TransportMgrBase * mState = State::kInitialized; mSystemLayer = systemLayer; mTransportMgr = transportMgr; - mFabrics = fabrics; mMessageCounterManager = messageCounterManager; mGlobalEncryptedMessageCounter.Init(); @@ -99,7 +97,6 @@ void SessionManager::Shutdown() mState = State::kNotReady; mSystemLayer = nullptr; mTransportMgr = nullptr; - mFabrics = nullptr; mCB = nullptr; } diff --git a/src/transport/SessionManager.h b/src/transport/SessionManager.h index 82cecf7cd36085..159251a8202421 100644 --- a/src/transport/SessionManager.h +++ b/src/transport/SessionManager.h @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -241,10 +240,9 @@ class DLL_EXPORT SessionManager : public TransportMgrDelegate * * @param systemLayer System, layer to use * @param transportMgr Transport to use - * @param fabrics A table of device administrators * @param messageCounterManager The message counter manager */ - CHIP_ERROR Init(System::Layer * systemLayer, TransportMgrBase * transportMgr, Transport::FabricTable * fabrics, + CHIP_ERROR Init(System::Layer * systemLayer, TransportMgrBase * transportMgr, Transport::MessageCounterManagerInterface * messageCounterManager); /** @@ -297,7 +295,6 @@ class DLL_EXPORT SessionManager : public TransportMgrDelegate SessionManagerDelegate * mCB = nullptr; TransportMgrBase * mTransportMgr = nullptr; - Transport::FabricTable * mFabrics = nullptr; Transport::MessageCounterManagerInterface * mMessageCounterManager = nullptr; GlobalUnencryptedMessageCounter mGlobalUnencryptedMessageCounter; diff --git a/src/transport/SessionMessageCounter.h b/src/transport/SessionMessageCounter.h index 44efe61c2cd267..cce774675512e7 100644 --- a/src/transport/SessionMessageCounter.h +++ b/src/transport/SessionMessageCounter.h @@ -21,7 +21,6 @@ #pragma once #include -#include #include #include #include diff --git a/src/transport/tests/TestSessionHandle.cpp b/src/transport/tests/TestSessionHandle.cpp index b478b2a2446477..49e47d874e18fb 100644 --- a/src/transport/tests/TestSessionHandle.cpp +++ b/src/transport/tests/TestSessionHandle.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/src/transport/tests/TestSessionManager.cpp b/src/transport/tests/TestSessionManager.cpp index e2825443dafe83..8e16e7b101c058 100644 --- a/src/transport/tests/TestSessionManager.cpp +++ b/src/transport/tests/TestSessionManager.cpp @@ -121,8 +121,7 @@ void CheckSimpleInitTest(nlTestSuite * inSuite, void * inContext) err = transportMgr.Init("LOOPBACK"); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - Transport::FabricTable fabrics; - err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &fabrics, &gMessageCounterManager); + err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &gMessageCounterManager); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); } @@ -148,8 +147,7 @@ void CheckMessageTest(nlTestSuite * inSuite, void * inContext) err = transportMgr.Init("LOOPBACK"); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - Transport::FabricTable fabrics; - err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &fabrics, &gMessageCounterManager); + err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &gMessageCounterManager); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); callback.mSuite = inSuite; @@ -236,8 +234,7 @@ void SendEncryptedPacketTest(nlTestSuite * inSuite, void * inContext) err = transportMgr.Init("LOOPBACK"); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - Transport::FabricTable fabrics; - err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &fabrics, &gMessageCounterManager); + err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &gMessageCounterManager); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); callback.mSuite = inSuite; @@ -310,8 +307,7 @@ void SendBadEncryptedPacketTest(nlTestSuite * inSuite, void * inContext) err = transportMgr.Init("LOOPBACK"); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - Transport::FabricTable fabrics; - err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &fabrics, &gMessageCounterManager); + err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &gMessageCounterManager); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); callback.mSuite = inSuite; @@ -415,8 +411,7 @@ void StaleConnectionDropTest(nlTestSuite * inSuite, void * inContext) err = transportMgr.Init("LOOPBACK"); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - Transport::FabricTable fabrics; - err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &fabrics, &gMessageCounterManager); + err = sessionManager.Init(ctx.GetInetLayer().SystemLayer(), &transportMgr, &gMessageCounterManager); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); callback.mSuite = inSuite;