Skip to content

Commit cc822ed

Browse files
su-shankarestyled-commits
su-shanka
and
restyled-commits
committed
Refactored mDNS Browse Interface (project-chip#32866)
* Refactored mDNS Browse Interface and necessary renaming done * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 9ce9b24 commit cc822ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+276
-287
lines changed

‎examples/chip-tool/commands/common/DeviceScanner.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ CHIP_ERROR DeviceScanner::Stop()
5555

5656
void DeviceScanner::OnNodeDiscovered(const DiscoveredNodeData & nodeData)
5757
{
58-
auto & commissionData = nodeData.commissionData;
58+
auto & commissionData = nodeData.nodeData;
5959

6060
auto discriminator = commissionData.longDiscriminator;
6161
auto vendorId = static_cast<VendorId>(commissionData.vendorId);

‎examples/chip-tool/commands/common/DeviceScanner.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct DeviceScannerResult
4141
chip::Optional<chip::Dnssd::CommonResolutionData> mResolutionData;
4242
};
4343

44-
class DeviceScanner : public chip::Dnssd::CommissioningResolveDelegate,
44+
class DeviceScanner : public chip::Dnssd::DiscoverNodeDelegate,
4545
public chip::Dnssd::DnssdBrowseDelegate
4646
#if CONFIG_NETWORK_LAYER_BLE
4747
,
@@ -55,7 +55,7 @@ class DeviceScanner : public chip::Dnssd::CommissioningResolveDelegate,
5555
CHIP_ERROR Get(uint16_t index, chip::Dnssd::CommonResolutionData & resolutionData);
5656
void Log() const;
5757

58-
/////////// CommissioningResolveDelegate Interface /////////
58+
/////////// DiscoverNodeDelegate Interface /////////
5959
void OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData & nodeData) override;
6060

6161
/////////// DnssdBrowseDelegate Interface /////////

‎examples/chip-tool/commands/common/RemoteDataModelLogger.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::DiscoveredNodeData & nodeDat
209209
VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR);
210210

211211
auto & resolutionData = nodeData.resolutionData;
212-
auto & commissionData = nodeData.commissionData;
212+
auto & commissionData = nodeData.nodeData;
213213

214214
if (!chip::CanCastTo<uint8_t>(resolutionData.numIPs))
215215
{

‎examples/chip-tool/commands/pairing/PairingCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ void PairingCommand::OnICDStayActiveComplete(NodeId deviceId, uint32_t promisedA
478478
void PairingCommand::OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData)
479479
{
480480
// Ignore nodes with closed commissioning window
481-
VerifyOrReturn(nodeData.commissionData.commissioningMode != 0);
481+
VerifyOrReturn(nodeData.nodeData.commissioningMode != 0);
482482

483483
auto & resolutionData = nodeData.resolutionData;
484484

‎examples/platform/linux/ControllerShellCommands.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ static CHIP_ERROR display(bool printHeader)
124124
else
125125
{
126126
streamer_printf(sout, " Entry %d instanceName=%s host=%s longDiscriminator=%d vendorId=%d productId=%d\r\n", i,
127-
next->commissionData.instanceName, next->resolutionData.hostName,
128-
next->commissionData.longDiscriminator, next->commissionData.vendorId, next->commissionData.productId);
127+
next->nodeData.instanceName, next->resolutionData.hostName, next->nodeData.longDiscriminator,
128+
next->nodeData.vendorId, next->nodeData.productId);
129129
}
130130
}
131131

‎examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp

+14-17
Original file line numberDiff line numberDiff line change
@@ -324,53 +324,50 @@ CHIP_ERROR convertJDiscoveredNodeDataToCppDiscoveredNodeData(jobject jDiscovered
324324
jstring jInstanceName = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getInstanceNameField));
325325
if (jInstanceName != nullptr)
326326
{
327-
chip::Platform::CopyString(outCppDiscoveredNodeData.commissionData.instanceName,
327+
chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.instanceName,
328328
chip::Dnssd::Commission::kInstanceNameMaxLength + 1, env->GetStringUTFChars(jInstanceName, 0));
329329
}
330330

331331
jfieldID jLongDiscriminatorField = env->GetFieldID(jDiscoveredNodeDataClass, "longDiscriminator", "J");
332-
outCppDiscoveredNodeData.commissionData.vendorId =
332+
outCppDiscoveredNodeData.nodeData.vendorId =
333333
static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jLongDiscriminatorField));
334334

335-
jfieldID jVendorIdField = env->GetFieldID(jDiscoveredNodeDataClass, "vendorId", "J");
336-
outCppDiscoveredNodeData.commissionData.vendorId =
337-
static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jVendorIdField));
335+
jfieldID jVendorIdField = env->GetFieldID(jDiscoveredNodeDataClass, "vendorId", "J");
336+
outCppDiscoveredNodeData.nodeData.vendorId = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jVendorIdField));
338337

339-
jfieldID jProductIdField = env->GetFieldID(jDiscoveredNodeDataClass, "productId", "J");
340-
outCppDiscoveredNodeData.commissionData.productId =
341-
static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jProductIdField));
338+
jfieldID jProductIdField = env->GetFieldID(jDiscoveredNodeDataClass, "productId", "J");
339+
outCppDiscoveredNodeData.nodeData.productId = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jProductIdField));
342340

343341
jfieldID jCommissioningModeField = env->GetFieldID(jDiscoveredNodeDataClass, "commissioningMode", "B");
344-
outCppDiscoveredNodeData.commissionData.commissioningMode =
342+
outCppDiscoveredNodeData.nodeData.commissioningMode =
345343
static_cast<uint8_t>(env->GetByteField(jDiscoveredNodeData, jCommissioningModeField));
346344

347-
jfieldID jDeviceTypeField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceType", "J");
348-
outCppDiscoveredNodeData.commissionData.deviceType =
349-
static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jDeviceTypeField));
345+
jfieldID jDeviceTypeField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceType", "J");
346+
outCppDiscoveredNodeData.nodeData.deviceType = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jDeviceTypeField));
350347

351348
jfieldID getDeviceNameField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceName", "Ljava/lang/String;");
352349
jstring jDeviceName = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getDeviceNameField));
353350
if (jDeviceName != nullptr)
354351
{
355-
chip::Platform::CopyString(outCppDiscoveredNodeData.commissionData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
352+
chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
356353
env->GetStringUTFChars(jDeviceName, 0));
357354
}
358355

359356
// TODO: map rotating ID
360357
jfieldID jRotatingIdLenField = env->GetFieldID(jDiscoveredNodeDataClass, "rotatingIdLen", "I");
361-
outCppDiscoveredNodeData.commissionData.rotatingIdLen =
358+
outCppDiscoveredNodeData.nodeData.rotatingIdLen =
362359
static_cast<size_t>(env->GetIntField(jDiscoveredNodeData, jRotatingIdLenField));
363360

364361
jfieldID jPairingHintField = env->GetFieldID(jDiscoveredNodeDataClass, "pairingHint", "S");
365-
outCppDiscoveredNodeData.commissionData.pairingHint =
362+
outCppDiscoveredNodeData.nodeData.pairingHint =
366363
static_cast<uint16_t>(env->GetShortField(jDiscoveredNodeData, jPairingHintField));
367364

368365
jfieldID getPairingInstructionField = env->GetFieldID(jDiscoveredNodeDataClass, "pairingInstruction", "Ljava/lang/String;");
369366
jstring jPairingInstruction = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getPairingInstructionField));
370367
if (jPairingInstruction != nullptr)
371368
{
372-
chip::Platform::CopyString(outCppDiscoveredNodeData.commissionData.pairingInstruction,
373-
chip::Dnssd::kMaxPairingInstructionLen + 1, env->GetStringUTFChars(jPairingInstruction, 0));
369+
chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.pairingInstruction, chip::Dnssd::kMaxPairingInstructionLen + 1,
370+
env->GetStringUTFChars(jPairingInstruction, 0));
374371
}
375372

376373
jfieldID jPortField = env->GetFieldID(jDiscoveredNodeDataClass, "port", "I");

‎examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/ConversionUtils.mm

+20-20
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,20 @@ + (CHIP_ERROR)convertToCppDiscoveredNodeDataFrom:(DiscoveredNodeData * _Nonnull)
4848
outDiscoveredNodeData:(chip::Dnssd::DiscoveredNodeData &)outDiscoveredNodeData
4949
{
5050
// setting CommissionNodeData
51-
outDiscoveredNodeData.commissionData.deviceType = objCDiscoveredNodeData.deviceType;
52-
outDiscoveredNodeData.commissionData.vendorId = objCDiscoveredNodeData.vendorId;
53-
outDiscoveredNodeData.commissionData.productId = objCDiscoveredNodeData.productId;
54-
outDiscoveredNodeData.commissionData.longDiscriminator = objCDiscoveredNodeData.longDiscriminator;
55-
outDiscoveredNodeData.commissionData.commissioningMode = objCDiscoveredNodeData.commissioningMode;
56-
outDiscoveredNodeData.commissionData.pairingHint = objCDiscoveredNodeData.pairingHint;
57-
memset(outDiscoveredNodeData.commissionData.deviceName, '\0', sizeof(outDiscoveredNodeData.commissionData.deviceName));
51+
outDiscoveredNodeData.nodeData.deviceType = objCDiscoveredNodeData.deviceType;
52+
outDiscoveredNodeData.nodeData.vendorId = objCDiscoveredNodeData.vendorId;
53+
outDiscoveredNodeData.nodeData.productId = objCDiscoveredNodeData.productId;
54+
outDiscoveredNodeData.nodeData.longDiscriminator = objCDiscoveredNodeData.longDiscriminator;
55+
outDiscoveredNodeData.nodeData.commissioningMode = objCDiscoveredNodeData.commissioningMode;
56+
outDiscoveredNodeData.nodeData.pairingHint = objCDiscoveredNodeData.pairingHint;
57+
memset(outDiscoveredNodeData.nodeData.deviceName, '\0', sizeof(outDiscoveredNodeData.nodeData.deviceName));
5858
if (objCDiscoveredNodeData.deviceName != nullptr) {
59-
chip::Platform::CopyString(outDiscoveredNodeData.commissionData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
59+
chip::Platform::CopyString(outDiscoveredNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
6060
[objCDiscoveredNodeData.deviceName UTF8String]);
6161
}
62-
outDiscoveredNodeData.commissionData.rotatingIdLen = objCDiscoveredNodeData.rotatingIdLen;
62+
outDiscoveredNodeData.nodeData.rotatingIdLen = objCDiscoveredNodeData.rotatingIdLen;
6363
memcpy(
64-
outDiscoveredNodeData.commissionData.rotatingId, objCDiscoveredNodeData.rotatingId, objCDiscoveredNodeData.rotatingIdLen);
64+
outDiscoveredNodeData.nodeData.rotatingId, objCDiscoveredNodeData.rotatingId, objCDiscoveredNodeData.rotatingIdLen);
6565

6666
// setting CommonResolutionData
6767
outDiscoveredNodeData.resolutionData.port = objCDiscoveredNodeData.port;
@@ -121,17 +121,17 @@ + (DiscoveredNodeData *)convertToObjCDiscoveredNodeDataFrom:(const chip::Dnssd::
121121
DiscoveredNodeData * objCDiscoveredNodeData = [DiscoveredNodeData new];
122122

123123
// from CommissionNodeData
124-
objCDiscoveredNodeData.deviceType = cppDiscoveredNodedata->commissionData.deviceType;
125-
objCDiscoveredNodeData.vendorId = cppDiscoveredNodedata->commissionData.vendorId;
126-
objCDiscoveredNodeData.productId = cppDiscoveredNodedata->commissionData.productId;
127-
objCDiscoveredNodeData.longDiscriminator = cppDiscoveredNodedata->commissionData.longDiscriminator;
128-
objCDiscoveredNodeData.commissioningMode = cppDiscoveredNodedata->commissionData.commissioningMode;
129-
objCDiscoveredNodeData.pairingHint = cppDiscoveredNodedata->commissionData.pairingHint;
130-
objCDiscoveredNodeData.deviceName = [NSString stringWithCString:cppDiscoveredNodedata->commissionData.deviceName
124+
objCDiscoveredNodeData.deviceType = cppDiscoveredNodedata->nodeData.deviceType;
125+
objCDiscoveredNodeData.vendorId = cppDiscoveredNodedata->nodeData.vendorId;
126+
objCDiscoveredNodeData.productId = cppDiscoveredNodedata->nodeData.productId;
127+
objCDiscoveredNodeData.longDiscriminator = cppDiscoveredNodedata->nodeData.longDiscriminator;
128+
objCDiscoveredNodeData.commissioningMode = cppDiscoveredNodedata->nodeData.commissioningMode;
129+
objCDiscoveredNodeData.pairingHint = cppDiscoveredNodedata->nodeData.pairingHint;
130+
objCDiscoveredNodeData.deviceName = [NSString stringWithCString:cppDiscoveredNodedata->nodeData.deviceName
131131
encoding:NSUTF8StringEncoding];
132-
objCDiscoveredNodeData.rotatingIdLen = cppDiscoveredNodedata->commissionData.rotatingIdLen;
133-
objCDiscoveredNodeData.rotatingId = cppDiscoveredNodedata->commissionData.rotatingId;
134-
objCDiscoveredNodeData.instanceName = [NSString stringWithCString:cppDiscoveredNodedata->commissionData.instanceName
132+
objCDiscoveredNodeData.rotatingIdLen = cppDiscoveredNodedata->nodeData.rotatingIdLen;
133+
objCDiscoveredNodeData.rotatingId = cppDiscoveredNodedata->nodeData.rotatingId;
134+
objCDiscoveredNodeData.instanceName = [NSString stringWithCString:cppDiscoveredNodedata->nodeData.instanceName
135135
encoding:NSUTF8StringEncoding];
136136

137137
// from CommonResolutionData

‎examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ void DeviceDiscoveryDelegateImpl::OnDiscoveredDevice(const chip::Dnssd::Discover
8383
CastingPlayerAttributes attributes;
8484
snprintf(attributes.id, kIdMaxLength + 1, "%s%u", nodeData.resolutionData.hostName, nodeData.resolutionData.port);
8585

86-
chip::Platform::CopyString(attributes.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, nodeData.commissionData.deviceName);
86+
chip::Platform::CopyString(attributes.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, nodeData.nodeData.deviceName);
8787
chip::Platform::CopyString(attributes.hostName, chip::Dnssd::kHostNameMaxLength + 1, nodeData.resolutionData.hostName);
8888
chip::Platform::CopyString(attributes.instanceName, chip::Dnssd::Commission::kInstanceNameMaxLength + 1,
89-
nodeData.commissionData.instanceName);
89+
nodeData.nodeData.instanceName);
9090

9191
attributes.numIPs = (unsigned int) nodeData.resolutionData.numIPs;
9292
for (unsigned j = 0; j < attributes.numIPs; j++)
@@ -95,9 +95,9 @@ void DeviceDiscoveryDelegateImpl::OnDiscoveredDevice(const chip::Dnssd::Discover
9595
}
9696
attributes.interfaceId = nodeData.resolutionData.interfaceId;
9797
attributes.port = nodeData.resolutionData.port;
98-
attributes.productId = nodeData.commissionData.productId;
99-
attributes.vendorId = nodeData.commissionData.vendorId;
100-
attributes.deviceType = nodeData.commissionData.deviceType;
98+
attributes.productId = nodeData.nodeData.productId;
99+
attributes.vendorId = nodeData.nodeData.vendorId;
100+
attributes.deviceType = nodeData.nodeData.deviceType;
101101

102102
memory::Strong<CastingPlayer> player = std::make_shared<CastingPlayer>(attributes);
103103

‎examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -226,20 +226,20 @@ CHIP_ERROR CastingServer::SendUserDirectedCommissioningRequest(Dnssd::Discovered
226226
getIpAddressForUDCRequest(selectedCommissioner->resolutionData.ipAddress, selectedCommissioner->resolutionData.numIPs);
227227
ReturnErrorOnFailure(SendUserDirectedCommissioningRequest(chip::Transport::PeerAddress::UDP(
228228
*ipAddressToUse, selectedCommissioner->resolutionData.port, selectedCommissioner->resolutionData.interfaceId)));
229-
mTargetVideoPlayerVendorId = selectedCommissioner->commissionData.vendorId;
230-
mTargetVideoPlayerProductId = selectedCommissioner->commissionData.productId;
231-
mTargetVideoPlayerDeviceType = selectedCommissioner->commissionData.deviceType;
229+
mTargetVideoPlayerVendorId = selectedCommissioner->nodeData.vendorId;
230+
mTargetVideoPlayerProductId = selectedCommissioner->nodeData.productId;
231+
mTargetVideoPlayerDeviceType = selectedCommissioner->nodeData.deviceType;
232232
mTargetVideoPlayerNumIPs = selectedCommissioner->resolutionData.numIPs;
233233
for (size_t i = 0; i < mTargetVideoPlayerNumIPs && i < chip::Dnssd::CommonResolutionData::kMaxIPAddresses; i++)
234234
{
235235
mTargetVideoPlayerIpAddress[i] = selectedCommissioner->resolutionData.ipAddress[i];
236236
}
237237
chip::Platform::CopyString(mTargetVideoPlayerDeviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
238-
selectedCommissioner->commissionData.deviceName);
238+
selectedCommissioner->nodeData.deviceName);
239239
chip::Platform::CopyString(mTargetVideoPlayerHostName, chip::Dnssd::kHostNameMaxLength + 1,
240240
selectedCommissioner->resolutionData.hostName);
241241
chip::Platform::CopyString(mTargetVideoPlayerInstanceName, chip::Dnssd::Commission::kInstanceNameMaxLength + 1,
242-
selectedCommissioner->commissionData.instanceName);
242+
selectedCommissioner->nodeData.instanceName);
243243
mTargetVideoPlayerPort = selectedCommissioner->resolutionData.port;
244244
return CHIP_NO_ERROR;
245245
}

‎examples/tv-casting-app/tv-casting-common/src/ConversionUtils.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ CHIP_ERROR ConvertToDiscoveredNodeData(TargetVideoPlayerInfo * inPlayer, chip::D
2323
if (inPlayer == nullptr)
2424
return CHIP_ERROR_INVALID_ARGUMENT;
2525

26-
outNodeData.commissionData.vendorId = inPlayer->GetVendorId();
27-
outNodeData.commissionData.productId = static_cast<uint16_t>(inPlayer->GetProductId());
28-
outNodeData.commissionData.deviceType = inPlayer->GetDeviceType();
29-
outNodeData.resolutionData.numIPs = inPlayer->GetNumIPs();
26+
outNodeData.nodeData.vendorId = inPlayer->GetVendorId();
27+
outNodeData.nodeData.productId = static_cast<uint16_t>(inPlayer->GetProductId());
28+
outNodeData.nodeData.deviceType = inPlayer->GetDeviceType();
29+
outNodeData.resolutionData.numIPs = inPlayer->GetNumIPs();
3030

3131
const chip::Inet::IPAddress * ipAddresses = inPlayer->GetIpAddresses();
3232
if (ipAddresses != nullptr)
@@ -37,8 +37,7 @@ CHIP_ERROR ConvertToDiscoveredNodeData(TargetVideoPlayerInfo * inPlayer, chip::D
3737
}
3838
}
3939

40-
chip::Platform::CopyString(outNodeData.commissionData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
41-
inPlayer->GetDeviceName());
40+
chip::Platform::CopyString(outNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, inPlayer->GetDeviceName());
4241
chip::Platform::CopyString(outNodeData.resolutionData.hostName, chip::Dnssd::kHostNameMaxLength + 1, inPlayer->GetHostName());
4342

4443
return CHIP_NO_ERROR;

‎examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,6 @@ bool TargetVideoPlayerInfo::IsSameAs(const chip::Dnssd::DiscoveredNodeData * dis
232232
return false;
233233
}
234234

235-
return IsSameAs(discoveredNodeData->resolutionData.hostName, discoveredNodeData->commissionData.deviceName,
235+
return IsSameAs(discoveredNodeData->resolutionData.hostName, discoveredNodeData->nodeData.deviceName,
236236
discoveredNodeData->resolutionData.numIPs, discoveredNodeData->resolutionData.ipAddress);
237237
}

‎src/controller/AbstractDnssdDiscoveryController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace Controller {
3636
* to maintain a list of DiscoveredNodes and providing the implementation
3737
* of the template GetDiscoveredNodes() function.
3838
*/
39-
class DLL_EXPORT AbstractDnssdDiscoveryController : public Dnssd::CommissioningResolveDelegate
39+
class DLL_EXPORT AbstractDnssdDiscoveryController : public Dnssd::DiscoverNodeDelegate
4040
{
4141
public:
4242
explicit AbstractDnssdDiscoveryController(Dnssd::Resolver * resolver = nullptr) : mDNSResolver(resolver) {}

‎src/controller/CHIPCommissionableNodeController.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ CHIP_ERROR CommissionableNodeController::DiscoverCommissioners(Dnssd::DiscoveryF
3636
mDNSResolver.Shutdown(); // reset if already inited
3737
ReturnErrorOnFailure(mDNSResolver.Init(DeviceLayer::UDPEndPointManager()));
3838
#endif
39-
mDNSResolver.SetCommissioningDelegate(this);
39+
mDNSResolver.SetDiscoveryDelegate(this);
4040
return mDNSResolver.DiscoverCommissioners(discoveryFilter);
4141
}
4242

4343
CommissionableNodeController::~CommissionableNodeController()
4444
{
45-
mDNSResolver.SetCommissioningDelegate(nullptr);
45+
mDNSResolver.SetDiscoveryDelegate(nullptr);
4646
}
4747

4848
const Dnssd::DiscoveredNodeData * CommissionableNodeController::GetDiscoveredCommissioner(int idx)

‎src/controller/CHIPDeviceController.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ CHIP_ERROR DeviceController::Init(ControllerInitParams params)
108108
VerifyOrReturnError(params.systemState->TransportMgr() != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
109109

110110
ReturnErrorOnFailure(mDNSResolver.Init(params.systemState->UDPEndPointManager()));
111-
mDNSResolver.SetCommissioningDelegate(this);
111+
mDNSResolver.SetDiscoveryDelegate(this);
112112
RegisterDeviceDiscoveryDelegate(params.deviceDiscoveryDelegate);
113113

114114
VerifyOrReturnError(params.operationalCredentialsDelegate != nullptr, CHIP_ERROR_INVALID_ARGUMENT);

0 commit comments

Comments
 (0)