Skip to content

Commit 2a5dc2a

Browse files
remove address resolve change that are out of scope
1 parent 167bd46 commit 2a5dc2a

File tree

5 files changed

+9
-35
lines changed

5 files changed

+9
-35
lines changed

src/app/icd/server/ICDCheckInSender.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,10 @@ namespace app {
2727

2828
using namespace Protocols::SecureChannel;
2929

30-
ICDCheckInSender::ICDCheckInSender(Messaging::ExchangeManager * exchangeManager, AddressResolve::Resolver * addressResolver)
30+
ICDCheckInSender::ICDCheckInSender(Messaging::ExchangeManager * exchangeManager)
3131
{
3232
VerifyOrDie(exchangeManager != nullptr);
33-
VerifyOrDie(addressResolver != nullptr);
34-
3533
mExchangeManager = exchangeManager;
36-
mAddressResolver = addressResolver;
37-
3834
mAddressLookupHandle.SetListener(this);
3935
}
4036

@@ -111,7 +107,7 @@ CHIP_ERROR ICDCheckInSender::RequestResolve(ICDMonitoringEntry & entry, FabricTa
111107
memcpy(mHmac128KeyHandle.AsMutable<Crypto::Symmetric128BitsKeyByteArray>(),
112108
entry.hmacKeyHandle.As<Crypto::Symmetric128BitsKeyByteArray>(), sizeof(Crypto::Symmetric128BitsKeyByteArray));
113109

114-
CHIP_ERROR err = mAddressResolver->LookupNode(request, mAddressLookupHandle);
110+
CHIP_ERROR err = AddressResolve::Resolver::Instance().LookupNode(request, mAddressLookupHandle);
115111

116112
if (err == CHIP_NO_ERROR)
117113
{

src/app/icd/server/ICDCheckInSender.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace app {
3131
class ICDCheckInSender : public AddressResolve::NodeListener
3232
{
3333
public:
34-
ICDCheckInSender(Messaging::ExchangeManager * exchangeManager, AddressResolve::Resolver * mAddressResolver);
34+
ICDCheckInSender(Messaging::ExchangeManager * exchangeManager);
3535
~ICDCheckInSender() = default;
3636

3737
CHIP_ERROR RequestResolve(ICDMonitoringEntry & entry, FabricTable * fabricTable, uint32_t counter);
@@ -50,7 +50,6 @@ class ICDCheckInSender : public AddressResolve::NodeListener
5050
// This is used when a node address is required.
5151
AddressResolve::NodeLookupHandle mAddressLookupHandle;
5252

53-
AddressResolve::Resolver * mAddressResolver = nullptr;
5453
Messaging::ExchangeManager * mExchangeManager = nullptr;
5554

5655
Crypto::Aes128KeyHandle mAes128KeyHandle = Crypto::Aes128KeyHandle();

src/app/icd/server/ICDManager.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,14 @@ static_assert(UINT8_MAX >= CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS,
5252
"ICDManager::mOpenExchangeContextCount cannot hold count for the max exchange count");
5353

5454
void ICDManager::Init(PersistentStorageDelegate * storage, FabricTable * fabricTable, Crypto::SymmetricKeystore * symmetricKeystore,
55-
Messaging::ExchangeManager * exchangeManager, SubscriptionsInfoProvider * subInfoProvider,
56-
AddressResolve::Resolver * addressResolver)
55+
Messaging::ExchangeManager * exchangeManager, SubscriptionsInfoProvider * subInfoProvider)
5756
{
5857
#if CHIP_CONFIG_ENABLE_ICD_CIP
5958
VerifyOrDie(storage != nullptr);
6059
VerifyOrDie(fabricTable != nullptr);
6160
VerifyOrDie(symmetricKeystore != nullptr);
6261
VerifyOrDie(exchangeManager != nullptr);
6362
VerifyOrDie(subInfoProvider != nullptr);
64-
VerifyOrDie(addressResolver != nullptr);
6563
#endif // CHIP_CONFIG_ENABLE_ICD_CIP
6664

6765
#if CHIP_CONFIG_ENABLE_ICD_LIT
@@ -89,7 +87,6 @@ void ICDManager::Init(PersistentStorageDelegate * storage, FabricTable * fabricT
8987
mSymmetricKeystore = symmetricKeystore;
9088
mExchangeManager = exchangeManager;
9189
mSubInfoProvider = subInfoProvider;
92-
mAddressResolver = addressResolver;
9390

9491
VerifyOrDie(ICDConfigurationData::GetInstance().GetICDCounter().Init(mStorage, DefaultStorageKeyAllocator::ICDCheckInCounter(),
9592
ICDConfigurationData::kICDCounterPersistenceIncrement) ==
@@ -117,7 +114,6 @@ void ICDManager::Shutdown()
117114
mStorage = nullptr;
118115
mFabricTable = nullptr;
119116
mSubInfoProvider = nullptr;
120-
mAddressResolver = nullptr;
121117
mICDSenderPool.ReleaseAll();
122118

123119
#if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
@@ -217,7 +213,7 @@ void ICDManager::SendCheckInMsgs()
217213

218214
// SenderPool will be released upon transition from active to idle state
219215
// This will happen when all ICD Check-In messages are sent on the network
220-
ICDCheckInSender * sender = mICDSenderPool.CreateObject(mExchangeManager, mAddressResolver);
216+
ICDCheckInSender * sender = mICDSenderPool.CreateObject(mExchangeManager);
221217
VerifyOrReturn(sender != nullptr, ChipLogError(AppServer, "Failed to allocate ICDCheckinSender"));
222218

223219
if (CHIP_NO_ERROR != sender->RequestResolve(entry, mFabricTable, counterValue))

src/app/icd/server/ICDManager.h

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <app/icd/server/ICDStateObserver.h>
2727
#include <credentials/FabricTable.h>
2828
#include <crypto/SessionKeystore.h>
29-
#include <lib/address_resolve/AddressResolve.h>
3029
#include <lib/support/BitFlags.h>
3130
#include <messaging/ExchangeMgr.h>
3231
#include <platform/CHIPDeviceConfig.h>
@@ -116,8 +115,7 @@ class ICDManager : public ICDListener, public TestEventTriggerHandler
116115
~ICDManager() = default;
117116

118117
void Init(PersistentStorageDelegate * storage, FabricTable * fabricTable, Crypto::SymmetricKeystore * symmetricKeyStore,
119-
Messaging::ExchangeManager * exchangeManager, SubscriptionsInfoProvider * subInfoProvider,
120-
AddressResolve::Resolver * adressResolver);
118+
Messaging::ExchangeManager * exchangeManager, SubscriptionsInfoProvider * subInfoProvider);
121119
void Shutdown();
122120

123121
/**
@@ -325,7 +323,6 @@ class ICDManager : public ICDListener, public TestEventTriggerHandler
325323
Messaging::ExchangeManager * mExchangeManager = nullptr;
326324
Crypto::SymmetricKeystore * mSymmetricKeystore = nullptr;
327325
SubscriptionsInfoProvider * mSubInfoProvider = nullptr;
328-
AddressResolve::Resolver * mAddressResolver = nullptr;
329326
ObjectPool<ICDCheckInSender, (CHIP_CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC * CHIP_CONFIG_MAX_FABRICS)> mICDSenderPool;
330327
#endif // CHIP_CONFIG_ENABLE_ICD_CIP
331328

src/app/icd/server/tests/TestICDManager.cpp

+3-17
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,6 @@ class TestSubscriptionsInfoProvider : public SubscriptionsInfoProvider
124124
bool mHasPersistedSubscription = false;
125125
};
126126

127-
class TestAddressResolver : public AddressResolve::Resolver
128-
{
129-
public:
130-
TestAddressResolver() = default;
131-
virtual ~TestAddressResolver() = default;
132-
133-
CHIP_ERROR Init(System::Layer * systemLayer) override { return CHIP_NO_ERROR; };
134-
CHIP_ERROR LookupNode(const NodeLookupRequest & request, Impl::NodeLookupHandle & handle) override { return CHIP_NO_ERROR; };
135-
CHIP_ERROR TryNextResult(Impl::NodeLookupHandle & handle) override { return CHIP_NO_ERROR; };
136-
CHIP_ERROR CancelLookup(Impl::NodeLookupHandle & handle, FailureCallback cancel_method) override { return CHIP_NO_ERROR; };
137-
void Shutdown() override{};
138-
};
139-
140127
System::Clock::Internal::MockClock * pMockClock = nullptr;
141128
System::Clock::ClockBase * pRealClock = nullptr;
142129
chip::Test::LoopbackMessagingContext * pMessagingContext = nullptr;
@@ -218,7 +205,7 @@ class TestICDManager : public ::testing::Test
218205
mICDStateObserver.ResetAll();
219206
mICDManager.RegisterObserver(&mICDStateObserver);
220207
mICDManager.Init(&testStorage, &(pMessagingContext->GetFabricTable()), &mKeystore,
221-
&(pMessagingContext->GetExchangeManager()), &mSubInfoProvider, &mAddressResolver);
208+
&(pMessagingContext->GetExchangeManager()), &mSubInfoProvider);
222209
}
223210

224211
// Performs teardown for each individual test in the test suite
@@ -228,7 +215,6 @@ class TestICDManager : public ::testing::Test
228215
pMessagingContext->TearDown();
229216
}
230217

231-
TestAddressResolver mAddressResolver;
232218
TestSessionKeystoreImpl mKeystore;
233219
ICDManager mICDManager;
234220
TestSubscriptionsInfoProvider mSubInfoProvider;
@@ -591,7 +577,7 @@ TEST_F(TestICDManager, TestICDCounter)
591577
// Shut down and reinit ICDManager to increment counter
592578
mICDManager.Shutdown();
593579
mICDManager.Init(&(testStorage), &(pMessagingContext->GetFabricTable()), &(mKeystore),
594-
&(pMessagingContext->GetExchangeManager()), &(mSubInfoProvider), &mAddressResolver);
580+
&(pMessagingContext->GetExchangeManager()), &(mSubInfoProvider));
595581
mICDManager.RegisterObserver(&(mICDStateObserver));
596582

597583
EXPECT_EQ(counter + ICDConfigurationData::kICDCounterPersistenceIncrement,
@@ -997,7 +983,7 @@ TEST_F(TestICDManager, TestICDStateObserverOnICDModeChangeOnInit)
997983
mICDManager.Shutdown();
998984
mICDManager.RegisterObserver(&(mICDStateObserver));
999985
mICDManager.Init(&testStorage, &(pMessagingContext->GetFabricTable()), &mKeystore, &(pMessagingContext->GetExchangeManager()),
1000-
&mSubInfoProvider, &mAddressResolver);
986+
&mSubInfoProvider);
1001987

1002988
// We have a registration, transition to LIT mode
1003989
EXPECT_TRUE(mICDStateObserver.mOnICDModeChangeCalled);

0 commit comments

Comments
 (0)