Refactored mDNS Browse Interface (#32866)
* Refactored mDNS Browse Interface and necessary renaming done
* Restyled by clang-format
---------
Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/examples/chip-tool/commands/common/DeviceScanner.cpp b/examples/chip-tool/commands/common/DeviceScanner.cpp
index 35d74bd..9d3dbca 100644
--- a/examples/chip-tool/commands/common/DeviceScanner.cpp
+++ b/examples/chip-tool/commands/common/DeviceScanner.cpp
@@ -55,7 +55,7 @@
void DeviceScanner::OnNodeDiscovered(const DiscoveredNodeData & nodeData)
{
- auto & commissionData = nodeData.commissionData;
+ auto & commissionData = nodeData.nodeData;
auto discriminator = commissionData.longDiscriminator;
auto vendorId = static_cast<VendorId>(commissionData.vendorId);
diff --git a/examples/chip-tool/commands/common/DeviceScanner.h b/examples/chip-tool/commands/common/DeviceScanner.h
index 0f29c87..e8259ff 100644
--- a/examples/chip-tool/commands/common/DeviceScanner.h
+++ b/examples/chip-tool/commands/common/DeviceScanner.h
@@ -42,7 +42,7 @@
chip::Optional<chip::Dnssd::CommonResolutionData> mResolutionData;
};
-class DeviceScanner : public chip::Dnssd::CommissioningResolveDelegate,
+class DeviceScanner : public chip::Dnssd::DiscoverNodeDelegate,
public chip::Dnssd::DnssdBrowseDelegate
#if CONFIG_NETWORK_LAYER_BLE
,
@@ -56,7 +56,7 @@
CHIP_ERROR Get(uint16_t index, chip::Dnssd::CommonResolutionData & resolutionData);
void Log() const;
- /////////// CommissioningResolveDelegate Interface /////////
+ /////////// DiscoverNodeDelegate Interface /////////
void OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData & nodeData) override;
/////////// DnssdBrowseDelegate Interface /////////
diff --git a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
index 37955e8..9e30262 100644
--- a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
+++ b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
@@ -209,7 +209,7 @@
VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR);
auto & resolutionData = nodeData.resolutionData;
- auto & commissionData = nodeData.commissionData;
+ auto & commissionData = nodeData.nodeData;
if (!chip::CanCastTo<uint8_t>(resolutionData.numIPs))
{
diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
index 0f47e48..5ec206c 100644
--- a/examples/chip-tool/commands/pairing/PairingCommand.cpp
+++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -482,7 +482,7 @@
void PairingCommand::OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData)
{
// Ignore nodes with closed commissioning window
- VerifyOrReturn(nodeData.commissionData.commissioningMode != 0);
+ VerifyOrReturn(nodeData.nodeData.commissioningMode != 0);
auto & resolutionData = nodeData.resolutionData;
diff --git a/examples/platform/linux/ControllerShellCommands.cpp b/examples/platform/linux/ControllerShellCommands.cpp
index 49b1e20..aefbb3f 100644
--- a/examples/platform/linux/ControllerShellCommands.cpp
+++ b/examples/platform/linux/ControllerShellCommands.cpp
@@ -124,8 +124,8 @@
else
{
streamer_printf(sout, " Entry %d instanceName=%s host=%s longDiscriminator=%d vendorId=%d productId=%d\r\n", i,
- next->commissionData.instanceName, next->resolutionData.hostName,
- next->commissionData.longDiscriminator, next->commissionData.vendorId, next->commissionData.productId);
+ next->nodeData.instanceName, next->resolutionData.hostName, next->nodeData.longDiscriminator,
+ next->nodeData.vendorId, next->nodeData.productId);
}
}
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp
index 2c3001c..fd66ba4 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp
@@ -324,53 +324,50 @@
jstring jInstanceName = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getInstanceNameField));
if (jInstanceName != nullptr)
{
- chip::Platform::CopyString(outCppDiscoveredNodeData.commissionData.instanceName,
+ chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.instanceName,
chip::Dnssd::Commission::kInstanceNameMaxLength + 1, env->GetStringUTFChars(jInstanceName, 0));
}
jfieldID jLongDiscriminatorField = env->GetFieldID(jDiscoveredNodeDataClass, "longDiscriminator", "J");
- outCppDiscoveredNodeData.commissionData.vendorId =
+ outCppDiscoveredNodeData.nodeData.vendorId =
static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jLongDiscriminatorField));
- jfieldID jVendorIdField = env->GetFieldID(jDiscoveredNodeDataClass, "vendorId", "J");
- outCppDiscoveredNodeData.commissionData.vendorId =
- static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jVendorIdField));
+ jfieldID jVendorIdField = env->GetFieldID(jDiscoveredNodeDataClass, "vendorId", "J");
+ outCppDiscoveredNodeData.nodeData.vendorId = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jVendorIdField));
- jfieldID jProductIdField = env->GetFieldID(jDiscoveredNodeDataClass, "productId", "J");
- outCppDiscoveredNodeData.commissionData.productId =
- static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jProductIdField));
+ jfieldID jProductIdField = env->GetFieldID(jDiscoveredNodeDataClass, "productId", "J");
+ outCppDiscoveredNodeData.nodeData.productId = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jProductIdField));
jfieldID jCommissioningModeField = env->GetFieldID(jDiscoveredNodeDataClass, "commissioningMode", "B");
- outCppDiscoveredNodeData.commissionData.commissioningMode =
+ outCppDiscoveredNodeData.nodeData.commissioningMode =
static_cast<uint8_t>(env->GetByteField(jDiscoveredNodeData, jCommissioningModeField));
- jfieldID jDeviceTypeField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceType", "J");
- outCppDiscoveredNodeData.commissionData.deviceType =
- static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jDeviceTypeField));
+ jfieldID jDeviceTypeField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceType", "J");
+ outCppDiscoveredNodeData.nodeData.deviceType = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jDeviceTypeField));
jfieldID getDeviceNameField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceName", "Ljava/lang/String;");
jstring jDeviceName = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getDeviceNameField));
if (jDeviceName != nullptr)
{
- chip::Platform::CopyString(outCppDiscoveredNodeData.commissionData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
+ chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
env->GetStringUTFChars(jDeviceName, 0));
}
// TODO: map rotating ID
jfieldID jRotatingIdLenField = env->GetFieldID(jDiscoveredNodeDataClass, "rotatingIdLen", "I");
- outCppDiscoveredNodeData.commissionData.rotatingIdLen =
+ outCppDiscoveredNodeData.nodeData.rotatingIdLen =
static_cast<size_t>(env->GetIntField(jDiscoveredNodeData, jRotatingIdLenField));
jfieldID jPairingHintField = env->GetFieldID(jDiscoveredNodeDataClass, "pairingHint", "S");
- outCppDiscoveredNodeData.commissionData.pairingHint =
+ outCppDiscoveredNodeData.nodeData.pairingHint =
static_cast<uint16_t>(env->GetShortField(jDiscoveredNodeData, jPairingHintField));
jfieldID getPairingInstructionField = env->GetFieldID(jDiscoveredNodeDataClass, "pairingInstruction", "Ljava/lang/String;");
jstring jPairingInstruction = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getPairingInstructionField));
if (jPairingInstruction != nullptr)
{
- chip::Platform::CopyString(outCppDiscoveredNodeData.commissionData.pairingInstruction,
- chip::Dnssd::kMaxPairingInstructionLen + 1, env->GetStringUTFChars(jPairingInstruction, 0));
+ chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.pairingInstruction, chip::Dnssd::kMaxPairingInstructionLen + 1,
+ env->GetStringUTFChars(jPairingInstruction, 0));
}
jfieldID jPortField = env->GetFieldID(jDiscoveredNodeDataClass, "port", "I");
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/ConversionUtils.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/ConversionUtils.mm
index a13f231..902e386 100644
--- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/ConversionUtils.mm
+++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/ConversionUtils.mm
@@ -48,20 +48,20 @@
outDiscoveredNodeData:(chip::Dnssd::DiscoveredNodeData &)outDiscoveredNodeData
{
// setting CommissionNodeData
- outDiscoveredNodeData.commissionData.deviceType = objCDiscoveredNodeData.deviceType;
- outDiscoveredNodeData.commissionData.vendorId = objCDiscoveredNodeData.vendorId;
- outDiscoveredNodeData.commissionData.productId = objCDiscoveredNodeData.productId;
- outDiscoveredNodeData.commissionData.longDiscriminator = objCDiscoveredNodeData.longDiscriminator;
- outDiscoveredNodeData.commissionData.commissioningMode = objCDiscoveredNodeData.commissioningMode;
- outDiscoveredNodeData.commissionData.pairingHint = objCDiscoveredNodeData.pairingHint;
- memset(outDiscoveredNodeData.commissionData.deviceName, '\0', sizeof(outDiscoveredNodeData.commissionData.deviceName));
+ outDiscoveredNodeData.nodeData.deviceType = objCDiscoveredNodeData.deviceType;
+ outDiscoveredNodeData.nodeData.vendorId = objCDiscoveredNodeData.vendorId;
+ outDiscoveredNodeData.nodeData.productId = objCDiscoveredNodeData.productId;
+ outDiscoveredNodeData.nodeData.longDiscriminator = objCDiscoveredNodeData.longDiscriminator;
+ outDiscoveredNodeData.nodeData.commissioningMode = objCDiscoveredNodeData.commissioningMode;
+ outDiscoveredNodeData.nodeData.pairingHint = objCDiscoveredNodeData.pairingHint;
+ memset(outDiscoveredNodeData.nodeData.deviceName, '\0', sizeof(outDiscoveredNodeData.nodeData.deviceName));
if (objCDiscoveredNodeData.deviceName != nullptr) {
- chip::Platform::CopyString(outDiscoveredNodeData.commissionData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
+ chip::Platform::CopyString(outDiscoveredNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
[objCDiscoveredNodeData.deviceName UTF8String]);
}
- outDiscoveredNodeData.commissionData.rotatingIdLen = objCDiscoveredNodeData.rotatingIdLen;
+ outDiscoveredNodeData.nodeData.rotatingIdLen = objCDiscoveredNodeData.rotatingIdLen;
memcpy(
- outDiscoveredNodeData.commissionData.rotatingId, objCDiscoveredNodeData.rotatingId, objCDiscoveredNodeData.rotatingIdLen);
+ outDiscoveredNodeData.nodeData.rotatingId, objCDiscoveredNodeData.rotatingId, objCDiscoveredNodeData.rotatingIdLen);
// setting CommonResolutionData
outDiscoveredNodeData.resolutionData.port = objCDiscoveredNodeData.port;
@@ -121,17 +121,17 @@
DiscoveredNodeData * objCDiscoveredNodeData = [DiscoveredNodeData new];
// from CommissionNodeData
- objCDiscoveredNodeData.deviceType = cppDiscoveredNodedata->commissionData.deviceType;
- objCDiscoveredNodeData.vendorId = cppDiscoveredNodedata->commissionData.vendorId;
- objCDiscoveredNodeData.productId = cppDiscoveredNodedata->commissionData.productId;
- objCDiscoveredNodeData.longDiscriminator = cppDiscoveredNodedata->commissionData.longDiscriminator;
- objCDiscoveredNodeData.commissioningMode = cppDiscoveredNodedata->commissionData.commissioningMode;
- objCDiscoveredNodeData.pairingHint = cppDiscoveredNodedata->commissionData.pairingHint;
- objCDiscoveredNodeData.deviceName = [NSString stringWithCString:cppDiscoveredNodedata->commissionData.deviceName
+ objCDiscoveredNodeData.deviceType = cppDiscoveredNodedata->nodeData.deviceType;
+ objCDiscoveredNodeData.vendorId = cppDiscoveredNodedata->nodeData.vendorId;
+ objCDiscoveredNodeData.productId = cppDiscoveredNodedata->nodeData.productId;
+ objCDiscoveredNodeData.longDiscriminator = cppDiscoveredNodedata->nodeData.longDiscriminator;
+ objCDiscoveredNodeData.commissioningMode = cppDiscoveredNodedata->nodeData.commissioningMode;
+ objCDiscoveredNodeData.pairingHint = cppDiscoveredNodedata->nodeData.pairingHint;
+ objCDiscoveredNodeData.deviceName = [NSString stringWithCString:cppDiscoveredNodedata->nodeData.deviceName
encoding:NSUTF8StringEncoding];
- objCDiscoveredNodeData.rotatingIdLen = cppDiscoveredNodedata->commissionData.rotatingIdLen;
- objCDiscoveredNodeData.rotatingId = cppDiscoveredNodedata->commissionData.rotatingId;
- objCDiscoveredNodeData.instanceName = [NSString stringWithCString:cppDiscoveredNodedata->commissionData.instanceName
+ objCDiscoveredNodeData.rotatingIdLen = cppDiscoveredNodedata->nodeData.rotatingIdLen;
+ objCDiscoveredNodeData.rotatingId = cppDiscoveredNodedata->nodeData.rotatingId;
+ objCDiscoveredNodeData.instanceName = [NSString stringWithCString:cppDiscoveredNodedata->nodeData.instanceName
encoding:NSUTF8StringEncoding];
// from CommonResolutionData
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
index 402febd..9b26a86 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
@@ -83,10 +83,10 @@
CastingPlayerAttributes attributes;
snprintf(attributes.id, kIdMaxLength + 1, "%s%u", nodeData.resolutionData.hostName, nodeData.resolutionData.port);
- chip::Platform::CopyString(attributes.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, nodeData.commissionData.deviceName);
+ chip::Platform::CopyString(attributes.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, nodeData.nodeData.deviceName);
chip::Platform::CopyString(attributes.hostName, chip::Dnssd::kHostNameMaxLength + 1, nodeData.resolutionData.hostName);
chip::Platform::CopyString(attributes.instanceName, chip::Dnssd::Commission::kInstanceNameMaxLength + 1,
- nodeData.commissionData.instanceName);
+ nodeData.nodeData.instanceName);
attributes.numIPs = (unsigned int) nodeData.resolutionData.numIPs;
for (unsigned j = 0; j < attributes.numIPs; j++)
@@ -95,9 +95,9 @@
}
attributes.interfaceId = nodeData.resolutionData.interfaceId;
attributes.port = nodeData.resolutionData.port;
- attributes.productId = nodeData.commissionData.productId;
- attributes.vendorId = nodeData.commissionData.vendorId;
- attributes.deviceType = nodeData.commissionData.deviceType;
+ attributes.productId = nodeData.nodeData.productId;
+ attributes.vendorId = nodeData.nodeData.vendorId;
+ attributes.deviceType = nodeData.nodeData.deviceType;
memory::Strong<CastingPlayer> player = std::make_shared<CastingPlayer>(attributes);
diff --git a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
index 4cb7273..b98647d 100644
--- a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
@@ -226,20 +226,20 @@
getIpAddressForUDCRequest(selectedCommissioner->resolutionData.ipAddress, selectedCommissioner->resolutionData.numIPs);
ReturnErrorOnFailure(SendUserDirectedCommissioningRequest(chip::Transport::PeerAddress::UDP(
*ipAddressToUse, selectedCommissioner->resolutionData.port, selectedCommissioner->resolutionData.interfaceId)));
- mTargetVideoPlayerVendorId = selectedCommissioner->commissionData.vendorId;
- mTargetVideoPlayerProductId = selectedCommissioner->commissionData.productId;
- mTargetVideoPlayerDeviceType = selectedCommissioner->commissionData.deviceType;
+ mTargetVideoPlayerVendorId = selectedCommissioner->nodeData.vendorId;
+ mTargetVideoPlayerProductId = selectedCommissioner->nodeData.productId;
+ mTargetVideoPlayerDeviceType = selectedCommissioner->nodeData.deviceType;
mTargetVideoPlayerNumIPs = selectedCommissioner->resolutionData.numIPs;
for (size_t i = 0; i < mTargetVideoPlayerNumIPs && i < chip::Dnssd::CommonResolutionData::kMaxIPAddresses; i++)
{
mTargetVideoPlayerIpAddress[i] = selectedCommissioner->resolutionData.ipAddress[i];
}
chip::Platform::CopyString(mTargetVideoPlayerDeviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
- selectedCommissioner->commissionData.deviceName);
+ selectedCommissioner->nodeData.deviceName);
chip::Platform::CopyString(mTargetVideoPlayerHostName, chip::Dnssd::kHostNameMaxLength + 1,
selectedCommissioner->resolutionData.hostName);
chip::Platform::CopyString(mTargetVideoPlayerInstanceName, chip::Dnssd::Commission::kInstanceNameMaxLength + 1,
- selectedCommissioner->commissionData.instanceName);
+ selectedCommissioner->nodeData.instanceName);
mTargetVideoPlayerPort = selectedCommissioner->resolutionData.port;
return CHIP_NO_ERROR;
}
diff --git a/examples/tv-casting-app/tv-casting-common/src/ConversionUtils.cpp b/examples/tv-casting-app/tv-casting-common/src/ConversionUtils.cpp
index 322e9d4..a57e254 100644
--- a/examples/tv-casting-app/tv-casting-common/src/ConversionUtils.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/ConversionUtils.cpp
@@ -23,10 +23,10 @@
if (inPlayer == nullptr)
return CHIP_ERROR_INVALID_ARGUMENT;
- outNodeData.commissionData.vendorId = inPlayer->GetVendorId();
- outNodeData.commissionData.productId = static_cast<uint16_t>(inPlayer->GetProductId());
- outNodeData.commissionData.deviceType = inPlayer->GetDeviceType();
- outNodeData.resolutionData.numIPs = inPlayer->GetNumIPs();
+ outNodeData.nodeData.vendorId = inPlayer->GetVendorId();
+ outNodeData.nodeData.productId = static_cast<uint16_t>(inPlayer->GetProductId());
+ outNodeData.nodeData.deviceType = inPlayer->GetDeviceType();
+ outNodeData.resolutionData.numIPs = inPlayer->GetNumIPs();
const chip::Inet::IPAddress * ipAddresses = inPlayer->GetIpAddresses();
if (ipAddresses != nullptr)
@@ -37,8 +37,7 @@
}
}
- chip::Platform::CopyString(outNodeData.commissionData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
- inPlayer->GetDeviceName());
+ chip::Platform::CopyString(outNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, inPlayer->GetDeviceName());
chip::Platform::CopyString(outNodeData.resolutionData.hostName, chip::Dnssd::kHostNameMaxLength + 1, inPlayer->GetHostName());
return CHIP_NO_ERROR;
diff --git a/examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp b/examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp
index 7d9c7d5..c182856 100644
--- a/examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp
@@ -232,6 +232,6 @@
return false;
}
- return IsSameAs(discoveredNodeData->resolutionData.hostName, discoveredNodeData->commissionData.deviceName,
+ return IsSameAs(discoveredNodeData->resolutionData.hostName, discoveredNodeData->nodeData.deviceName,
discoveredNodeData->resolutionData.numIPs, discoveredNodeData->resolutionData.ipAddress);
}
diff --git a/src/controller/AbstractDnssdDiscoveryController.h b/src/controller/AbstractDnssdDiscoveryController.h
index 6e50d7b..c8c9053 100644
--- a/src/controller/AbstractDnssdDiscoveryController.h
+++ b/src/controller/AbstractDnssdDiscoveryController.h
@@ -36,7 +36,7 @@
* to maintain a list of DiscoveredNodes and providing the implementation
* of the template GetDiscoveredNodes() function.
*/
-class DLL_EXPORT AbstractDnssdDiscoveryController : public Dnssd::CommissioningResolveDelegate
+class DLL_EXPORT AbstractDnssdDiscoveryController : public Dnssd::DiscoverNodeDelegate
{
public:
explicit AbstractDnssdDiscoveryController(Dnssd::Resolver * resolver = nullptr) : mDNSResolver(resolver) {}
diff --git a/src/controller/CHIPCommissionableNodeController.cpp b/src/controller/CHIPCommissionableNodeController.cpp
index d187cc1..f116928 100644
--- a/src/controller/CHIPCommissionableNodeController.cpp
+++ b/src/controller/CHIPCommissionableNodeController.cpp
@@ -36,13 +36,13 @@
mDNSResolver.Shutdown(); // reset if already inited
ReturnErrorOnFailure(mDNSResolver.Init(DeviceLayer::UDPEndPointManager()));
#endif
- mDNSResolver.SetCommissioningDelegate(this);
+ mDNSResolver.SetDiscoveryDelegate(this);
return mDNSResolver.DiscoverCommissioners(discoveryFilter);
}
CommissionableNodeController::~CommissionableNodeController()
{
- mDNSResolver.SetCommissioningDelegate(nullptr);
+ mDNSResolver.SetDiscoveryDelegate(nullptr);
}
const Dnssd::DiscoveredNodeData * CommissionableNodeController::GetDiscoveredCommissioner(int idx)
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index c67c48c..a9c41d8 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -110,7 +110,7 @@
VerifyOrReturnError(params.systemState->TransportMgr() != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
ReturnErrorOnFailure(mDNSResolver.Init(params.systemState->UDPEndPointManager()));
- mDNSResolver.SetCommissioningDelegate(this);
+ mDNSResolver.SetDiscoveryDelegate(this);
RegisterDeviceDiscoveryDelegate(params.deviceDiscoveryDelegate);
mVendorId = params.controllerVendorId;
diff --git a/src/controller/SetUpCodePairer.cpp b/src/controller/SetUpCodePairer.cpp
index db09d91..3a995a6 100644
--- a/src/controller/SetUpCodePairer.cpp
+++ b/src/controller/SetUpCodePairer.cpp
@@ -332,23 +332,22 @@
bool SetUpCodePairer::NodeMatchesCurrentFilter(const Dnssd::DiscoveredNodeData & nodeData) const
{
- if (nodeData.commissionData.commissioningMode == 0)
+ if (nodeData.nodeData.commissioningMode == 0)
{
ChipLogProgress(Controller, "Discovered device does not have an open commissioning window.");
return false;
}
// The advertisement may not include a vendor id.
- if (IdIsPresent(mPayloadVendorID) && IdIsPresent(nodeData.commissionData.vendorId) &&
- mPayloadVendorID != nodeData.commissionData.vendorId)
+ if (IdIsPresent(mPayloadVendorID) && IdIsPresent(nodeData.nodeData.vendorId) && mPayloadVendorID != nodeData.nodeData.vendorId)
{
ChipLogProgress(Controller, "Discovered device does not match our vendor id.");
return false;
}
// The advertisement may not include a product id.
- if (IdIsPresent(mPayloadProductID) && IdIsPresent(nodeData.commissionData.productId) &&
- mPayloadProductID != nodeData.commissionData.productId)
+ if (IdIsPresent(mPayloadProductID) && IdIsPresent(nodeData.nodeData.productId) &&
+ mPayloadProductID != nodeData.nodeData.productId)
{
ChipLogProgress(Controller, "Discovered device does not match our product id.");
return false;
@@ -358,10 +357,10 @@
switch (mCurrentFilter.type)
{
case Dnssd::DiscoveryFilterType::kShortDiscriminator:
- discriminatorMatches = (((nodeData.commissionData.longDiscriminator >> 8) & 0x0F) == mCurrentFilter.code);
+ discriminatorMatches = (((nodeData.nodeData.longDiscriminator >> 8) & 0x0F) == mCurrentFilter.code);
break;
case Dnssd::DiscoveryFilterType::kLongDiscriminator:
- discriminatorMatches = (nodeData.commissionData.longDiscriminator == mCurrentFilter.code);
+ discriminatorMatches = (nodeData.nodeData.longDiscriminator == mCurrentFilter.code);
break;
default:
ChipLogError(Controller, "Unknown filter type; all matches will fail");
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
index aa1dd41..82a0485 100644
--- a/src/controller/java/CHIPDeviceController-JNI.cpp
+++ b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -1905,7 +1905,7 @@
jobject discoveredObj = env->NewObject(discoveredDeviceCls, constructor);
- env->SetLongField(discoveredObj, discrminatorID, data->commissionData.longDiscriminator);
+ env->SetLongField(discoveredObj, discrminatorID, data->nodeData.longDiscriminator);
char ipAddress[100];
data->resolutionData.ipAddress[0].ToString(ipAddress, 100);
@@ -1913,13 +1913,13 @@
env->SetObjectField(discoveredObj, ipAddressID, jniipAdress);
env->SetIntField(discoveredObj, portID, static_cast<jint>(data->resolutionData.port));
- env->SetLongField(discoveredObj, deviceTypeID, static_cast<jlong>(data->commissionData.deviceType));
- env->SetIntField(discoveredObj, vendorIdID, static_cast<jint>(data->commissionData.vendorId));
- env->SetIntField(discoveredObj, productIdID, static_cast<jint>(data->commissionData.productId));
+ env->SetLongField(discoveredObj, deviceTypeID, static_cast<jlong>(data->nodeData.deviceType));
+ env->SetIntField(discoveredObj, vendorIdID, static_cast<jint>(data->nodeData.vendorId));
+ env->SetIntField(discoveredObj, productIdID, static_cast<jint>(data->nodeData.productId));
jbyteArray jRotatingId;
- CHIP_ERROR err = JniReferences::GetInstance().N2J_ByteArray(
- env, data->commissionData.rotatingId, static_cast<jsize>(data->commissionData.rotatingIdLen), jRotatingId);
+ CHIP_ERROR err = JniReferences::GetInstance().N2J_ByteArray(env, data->nodeData.rotatingId,
+ static_cast<jsize>(data->nodeData.rotatingIdLen), jRotatingId);
if (err != CHIP_NO_ERROR)
{
@@ -1927,12 +1927,12 @@
return nullptr;
}
env->SetObjectField(discoveredObj, rotatingIdID, static_cast<jobject>(jRotatingId));
- env->SetObjectField(discoveredObj, instanceNameID, env->NewStringUTF(data->commissionData.instanceName));
- env->SetObjectField(discoveredObj, deviceNameID, env->NewStringUTF(data->commissionData.deviceName));
- env->SetObjectField(discoveredObj, pairingInstructionID, env->NewStringUTF(data->commissionData.pairingInstruction));
+ env->SetObjectField(discoveredObj, instanceNameID, env->NewStringUTF(data->nodeData.instanceName));
+ env->SetObjectField(discoveredObj, deviceNameID, env->NewStringUTF(data->nodeData.deviceName));
+ env->SetObjectField(discoveredObj, pairingInstructionID, env->NewStringUTF(data->nodeData.pairingInstruction));
- env->CallVoidMethod(discoveredObj, setCommissioningModeID, static_cast<jint>(data->commissionData.commissioningMode));
- env->CallVoidMethod(discoveredObj, setPairingHintID, static_cast<jint>(data->commissionData.pairingHint));
+ env->CallVoidMethod(discoveredObj, setCommissioningModeID, static_cast<jint>(data->nodeData.commissioningMode));
+ env->CallVoidMethod(discoveredObj, setPairingHintID, static_cast<jint>(data->nodeData.pairingHint));
return discoveredObj;
}
diff --git a/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp b/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp
index c82dd13..39d70e3 100644
--- a/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp
+++ b/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp
@@ -82,22 +82,22 @@
continue;
}
char rotatingId[chip::Dnssd::kMaxRotatingIdLen * 2 + 1] = "";
- Encoding::BytesToUppercaseHexString(dnsSdInfo->commissionData.rotatingId, dnsSdInfo->commissionData.rotatingIdLen,
- rotatingId, sizeof(rotatingId));
+ Encoding::BytesToUppercaseHexString(dnsSdInfo->nodeData.rotatingId, dnsSdInfo->nodeData.rotatingIdLen, rotatingId,
+ sizeof(rotatingId));
ChipLogProgress(Discovery, "Commissioner %d", i);
- ChipLogProgress(Discovery, "\tInstance name:\t\t%s", dnsSdInfo->commissionData.instanceName);
+ ChipLogProgress(Discovery, "\tInstance name:\t\t%s", dnsSdInfo->nodeData.instanceName);
ChipLogProgress(Discovery, "\tHost name:\t\t%s", dnsSdInfo->resolutionData.hostName);
ChipLogProgress(Discovery, "\tPort:\t\t\t%u", dnsSdInfo->resolutionData.port);
- ChipLogProgress(Discovery, "\tLong discriminator:\t%u", dnsSdInfo->commissionData.longDiscriminator);
- ChipLogProgress(Discovery, "\tVendor ID:\t\t%u", dnsSdInfo->commissionData.vendorId);
- ChipLogProgress(Discovery, "\tProduct ID:\t\t%u", dnsSdInfo->commissionData.productId);
- ChipLogProgress(Discovery, "\tCommissioning Mode\t%u", dnsSdInfo->commissionData.commissioningMode);
- ChipLogProgress(Discovery, "\tDevice Type\t\t%u", dnsSdInfo->commissionData.deviceType);
- ChipLogProgress(Discovery, "\tDevice Name\t\t%s", dnsSdInfo->commissionData.deviceName);
+ ChipLogProgress(Discovery, "\tLong discriminator:\t%u", dnsSdInfo->nodeData.longDiscriminator);
+ ChipLogProgress(Discovery, "\tVendor ID:\t\t%u", dnsSdInfo->nodeData.vendorId);
+ ChipLogProgress(Discovery, "\tProduct ID:\t\t%u", dnsSdInfo->nodeData.productId);
+ ChipLogProgress(Discovery, "\tCommissioning Mode\t%u", dnsSdInfo->nodeData.commissioningMode);
+ ChipLogProgress(Discovery, "\tDevice Type\t\t%u", dnsSdInfo->nodeData.deviceType);
+ ChipLogProgress(Discovery, "\tDevice Name\t\t%s", dnsSdInfo->nodeData.deviceName);
ChipLogProgress(Discovery, "\tRotating Id\t\t%s", rotatingId);
- ChipLogProgress(Discovery, "\tPairing Instruction\t%s", dnsSdInfo->commissionData.pairingInstruction);
- ChipLogProgress(Discovery, "\tPairing Hint\t\t%u", dnsSdInfo->commissionData.pairingHint);
+ ChipLogProgress(Discovery, "\tPairing Instruction\t%s", dnsSdInfo->nodeData.pairingInstruction);
+ ChipLogProgress(Discovery, "\tPairing Hint\t\t%u", dnsSdInfo->nodeData.pairingHint);
if (dnsSdInfo->resolutionData.GetMrpRetryIntervalIdle().HasValue())
{
ChipLogProgress(Discovery, "\tMrp Interval idle\t%u",
diff --git a/src/controller/python/ChipDeviceController-Discovery.cpp b/src/controller/python/ChipDeviceController-Discovery.cpp
index 7b50214..a889662 100644
--- a/src/controller/python/ChipDeviceController-Discovery.cpp
+++ b/src/controller/python/ChipDeviceController-Discovery.cpp
@@ -110,21 +110,21 @@
Json::Value jsonVal;
char rotatingId[Dnssd::kMaxRotatingIdLen * 2 + 1] = "";
- Encoding::BytesToUppercaseHexString(dnsSdInfo->commissionData.rotatingId, dnsSdInfo->commissionData.rotatingIdLen,
- rotatingId, sizeof(rotatingId));
+ Encoding::BytesToUppercaseHexString(dnsSdInfo->nodeData.rotatingId, dnsSdInfo->nodeData.rotatingIdLen, rotatingId,
+ sizeof(rotatingId));
ChipLogProgress(Discovery, "Commissionable Node %d", i);
- jsonVal["instanceName"] = dnsSdInfo->commissionData.instanceName;
+ jsonVal["instanceName"] = dnsSdInfo->nodeData.instanceName;
jsonVal["hostName"] = dnsSdInfo->resolutionData.hostName;
jsonVal["port"] = dnsSdInfo->resolutionData.port;
- jsonVal["longDiscriminator"] = dnsSdInfo->commissionData.longDiscriminator;
- jsonVal["vendorId"] = dnsSdInfo->commissionData.vendorId;
- jsonVal["productId"] = dnsSdInfo->commissionData.productId;
- jsonVal["commissioningMode"] = dnsSdInfo->commissionData.commissioningMode;
- jsonVal["deviceType"] = dnsSdInfo->commissionData.deviceType;
- jsonVal["deviceName"] = dnsSdInfo->commissionData.deviceName;
- jsonVal["pairingInstruction"] = dnsSdInfo->commissionData.pairingInstruction;
- jsonVal["pairingHint"] = dnsSdInfo->commissionData.pairingHint;
+ jsonVal["longDiscriminator"] = dnsSdInfo->nodeData.longDiscriminator;
+ jsonVal["vendorId"] = dnsSdInfo->nodeData.vendorId;
+ jsonVal["productId"] = dnsSdInfo->nodeData.productId;
+ jsonVal["commissioningMode"] = dnsSdInfo->nodeData.commissioningMode;
+ jsonVal["deviceType"] = dnsSdInfo->nodeData.deviceType;
+ jsonVal["deviceName"] = dnsSdInfo->nodeData.deviceName;
+ jsonVal["pairingInstruction"] = dnsSdInfo->nodeData.pairingInstruction;
+ jsonVal["pairingHint"] = dnsSdInfo->nodeData.pairingHint;
if (dnsSdInfo->resolutionData.GetMrpRetryIntervalIdle().HasValue())
{
jsonVal["mrpRetryIntervalIdle"] = dnsSdInfo->resolutionData.GetMrpRetryIntervalIdle().Value().count();
@@ -152,7 +152,7 @@
{
jsonVal["isICDOperatingAsLIT"] = dnsSdInfo->resolutionData.isICDOperatingAsLIT.Value();
}
- if (dnsSdInfo->commissionData.rotatingIdLen > 0)
+ if (dnsSdInfo->nodeData.rotatingIdLen > 0)
{
jsonVal["rotatingId"] = rotatingId;
}
@@ -174,22 +174,22 @@
continue;
}
char rotatingId[Dnssd::kMaxRotatingIdLen * 2 + 1] = "";
- Encoding::BytesToUppercaseHexString(dnsSdInfo->commissionData.rotatingId, dnsSdInfo->commissionData.rotatingIdLen,
- rotatingId, sizeof(rotatingId));
+ Encoding::BytesToUppercaseHexString(dnsSdInfo->nodeData.rotatingId, dnsSdInfo->nodeData.rotatingIdLen, rotatingId,
+ sizeof(rotatingId));
ChipLogProgress(Discovery, "Commissionable Node %d", i);
- ChipLogProgress(Discovery, "\tInstance name:\t\t%s", dnsSdInfo->commissionData.instanceName);
+ ChipLogProgress(Discovery, "\tInstance name:\t\t%s", dnsSdInfo->nodeData.instanceName);
ChipLogProgress(Discovery, "\tHost name:\t\t%s", dnsSdInfo->resolutionData.hostName);
ChipLogProgress(Discovery, "\tPort:\t\t\t%u", dnsSdInfo->resolutionData.port);
- ChipLogProgress(Discovery, "\tLong discriminator:\t%u", dnsSdInfo->commissionData.longDiscriminator);
- ChipLogProgress(Discovery, "\tVendor ID:\t\t%u", dnsSdInfo->commissionData.vendorId);
- ChipLogProgress(Discovery, "\tProduct ID:\t\t%u", dnsSdInfo->commissionData.productId);
- ChipLogProgress(Discovery, "\tCommissioning Mode\t%u", dnsSdInfo->commissionData.commissioningMode);
- ChipLogProgress(Discovery, "\tDevice Type\t\t%u", dnsSdInfo->commissionData.deviceType);
- ChipLogProgress(Discovery, "\tDevice Name\t\t%s", dnsSdInfo->commissionData.deviceName);
+ ChipLogProgress(Discovery, "\tLong discriminator:\t%u", dnsSdInfo->nodeData.longDiscriminator);
+ ChipLogProgress(Discovery, "\tVendor ID:\t\t%u", dnsSdInfo->nodeData.vendorId);
+ ChipLogProgress(Discovery, "\tProduct ID:\t\t%u", dnsSdInfo->nodeData.productId);
+ ChipLogProgress(Discovery, "\tCommissioning Mode\t%u", dnsSdInfo->nodeData.commissioningMode);
+ ChipLogProgress(Discovery, "\tDevice Type\t\t%u", dnsSdInfo->nodeData.deviceType);
+ ChipLogProgress(Discovery, "\tDevice Name\t\t%s", dnsSdInfo->nodeData.deviceName);
ChipLogProgress(Discovery, "\tRotating Id\t\t%s", rotatingId);
- ChipLogProgress(Discovery, "\tPairing Instruction\t%s", dnsSdInfo->commissionData.pairingInstruction);
- ChipLogProgress(Discovery, "\tPairing Hint\t\t%u", dnsSdInfo->commissionData.pairingHint);
+ ChipLogProgress(Discovery, "\tPairing Instruction\t%s", dnsSdInfo->nodeData.pairingInstruction);
+ ChipLogProgress(Discovery, "\tPairing Hint\t\t%u", dnsSdInfo->nodeData.pairingHint);
if (dnsSdInfo->resolutionData.GetMrpRetryIntervalIdle().HasValue())
{
ChipLogProgress(Discovery, "\tMrp Interval idle\t%u",
diff --git a/src/controller/python/ChipDeviceController-ScriptPairingDeviceDiscoveryDelegate.cpp b/src/controller/python/ChipDeviceController-ScriptPairingDeviceDiscoveryDelegate.cpp
index e5cb7d7..a83a56c 100644
--- a/src/controller/python/ChipDeviceController-ScriptPairingDeviceDiscoveryDelegate.cpp
+++ b/src/controller/python/ChipDeviceController-ScriptPairingDeviceDiscoveryDelegate.cpp
@@ -24,7 +24,7 @@
void ScriptPairingDeviceDiscoveryDelegate::OnDiscoveredDevice(const Dnssd::DiscoveredNodeData & nodeData)
{
// Ignore nodes with closed comissioning window
- VerifyOrReturn(nodeData.commissionData.commissioningMode != 0);
+ VerifyOrReturn(nodeData.nodeData.commissioningMode != 0);
VerifyOrReturn(mActiveDeviceCommissioner != nullptr);
const uint16_t port = nodeData.resolutionData.port;
diff --git a/src/controller/tests/TestCommissionableNodeController.cpp b/src/controller/tests/TestCommissionableNodeController.cpp
index c2aafe5..760b62e 100644
--- a/src/controller/tests/TestCommissionableNodeController.cpp
+++ b/src/controller/tests/TestCommissionableNodeController.cpp
@@ -38,9 +38,10 @@
void SetOperationalDelegate(OperationalResolveDelegate * delegate) override {}
CHIP_ERROR ResolveNodeId(const PeerId & peerId) override { return ResolveNodeIdStatus; }
void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override {}
- CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext &) override { return DiscoverCommissionersStatus; }
- CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext &) override
+ CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext &) override
{
+ if (DiscoveryType::kCommissionerNode == type)
+ return DiscoverCommissionersStatus;
return CHIP_ERROR_NOT_IMPLEMENTED;
}
CHIP_ERROR StopDiscovery(DiscoveryContext &) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
diff --git a/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm b/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm
index a0ccfd3..bf975b6 100644
--- a/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm
+++ b/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm
@@ -53,7 +53,7 @@
@implementation MTRCommissionableBrowserResult
@end
-class CommissionableBrowserInternal : public CommissioningResolveDelegate,
+class CommissionableBrowserInternal : public DiscoverNodeDelegate,
public DnssdBrowseDelegate
#if CONFIG_NETWORK_LAYER_BLE
,
@@ -156,12 +156,12 @@
mDiscoveredResults = discoveredResultsCopy;
}
- /////////// CommissioningResolveDelegate Interface /////////
+ /////////// DiscoverNodeDelegate Interface /////////
void OnNodeDiscovered(const DiscoveredNodeData & nodeData) override
{
assertChipStackLockedByCurrentThread();
- auto & commissionData = nodeData.commissionData;
+ auto & commissionData = nodeData.nodeData;
auto key = [NSString stringWithUTF8String:commissionData.instanceName];
if ([mDiscoveredResults objectForKey:key] == nil) {
// It should not happens.
diff --git a/src/lib/dnssd/ActiveResolveAttempts.h b/src/lib/dnssd/ActiveResolveAttempts.h
index 15796ab..ba6d8cf 100644
--- a/src/lib/dnssd/ActiveResolveAttempts.h
+++ b/src/lib/dnssd/ActiveResolveAttempts.h
@@ -159,17 +159,17 @@
case chip::Dnssd::DiscoveryFilterType::kNone:
return true;
case chip::Dnssd::DiscoveryFilterType::kShortDiscriminator:
- return browse.filter.code == static_cast<uint64_t>((data.commissionData.longDiscriminator >> 8) & 0x0F);
+ return browse.filter.code == static_cast<uint64_t>((data.nodeData.longDiscriminator >> 8) & 0x0F);
case chip::Dnssd::DiscoveryFilterType::kLongDiscriminator:
- return browse.filter.code == data.commissionData.longDiscriminator;
+ return browse.filter.code == data.nodeData.longDiscriminator;
case chip::Dnssd::DiscoveryFilterType::kVendorId:
- return browse.filter.code == data.commissionData.vendorId;
+ return browse.filter.code == data.nodeData.vendorId;
case chip::Dnssd::DiscoveryFilterType::kDeviceType:
- return browse.filter.code == data.commissionData.deviceType;
+ return browse.filter.code == data.nodeData.deviceType;
case chip::Dnssd::DiscoveryFilterType::kCommissioningMode:
- return browse.filter.code == data.commissionData.commissioningMode;
+ return browse.filter.code == data.nodeData.commissioningMode;
case chip::Dnssd::DiscoveryFilterType::kInstanceName:
- return strncmp(browse.filter.instanceName, data.commissionData.instanceName,
+ return strncmp(browse.filter.instanceName, data.nodeData.instanceName,
chip::Dnssd::Commission::kInstanceNameMaxLength + 1) == 0;
case chip::Dnssd::DiscoveryFilterType::kCommissioner:
case chip::Dnssd::DiscoveryFilterType::kCompressedFabricId:
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.cpp b/src/lib/dnssd/Discovery_ImplPlatform.cpp
index 6904480..c12019c 100644
--- a/src/lib/dnssd/Discovery_ImplPlatform.cpp
+++ b/src/lib/dnssd/Discovery_ImplPlatform.cpp
@@ -340,7 +340,7 @@
void DnssdService::ToDiscoveredNodeData(const Span<Inet::IPAddress> & addresses, DiscoveredNodeData & nodeData)
{
auto & resolutionData = nodeData.resolutionData;
- auto & commissionData = nodeData.commissionData;
+ auto & commissionData = nodeData.nodeData;
Platform::CopyString(resolutionData.hostName, mHostName);
Platform::CopyString(commissionData.instanceName, mName);
@@ -743,6 +743,21 @@
return error;
}
+CHIP_ERROR DiscoveryImplPlatform::StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context)
+{
+ switch (type)
+ {
+ case DiscoveryType::kCommissionableNode:
+ return DiscoverCommissionableNodes(filter, context);
+ case DiscoveryType::kCommissionerNode:
+ return DiscoverCommissioners(filter, context);
+ case DiscoveryType::kOperational:
+ return CHIP_ERROR_NOT_IMPLEMENTED;
+ default:
+ return CHIP_ERROR_INVALID_ARGUMENT;
+ }
+}
+
CHIP_ERROR DiscoveryImplPlatform::StopDiscovery(DiscoveryContext & context)
{
if (!context.GetBrowseIdentifier().HasValue())
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.h b/src/lib/dnssd/Discovery_ImplPlatform.h
index a3f7979..c6ba929 100644
--- a/src/lib/dnssd/Discovery_ImplPlatform.h
+++ b/src/lib/dnssd/Discovery_ImplPlatform.h
@@ -53,8 +53,9 @@
void SetOperationalDelegate(OperationalResolveDelegate * delegate) override { mOperationalDelegate = delegate; }
CHIP_ERROR ResolveNodeId(const PeerId & peerId) override;
void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override;
- CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) override;
- CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) override;
+ CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context);
+ CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context);
+ CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context) override;
CHIP_ERROR StopDiscovery(DiscoveryContext & context) override;
CHIP_ERROR ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId) override;
diff --git a/src/lib/dnssd/IncrementalResolve.cpp b/src/lib/dnssd/IncrementalResolve.cpp
index c36efbd..766d979 100644
--- a/src/lib/dnssd/IncrementalResolve.cpp
+++ b/src/lib/dnssd/IncrementalResolve.cpp
@@ -189,7 +189,7 @@
break;
case ServiceNameType::kCommissioner:
case ServiceNameType::kCommissionable:
- mSpecificResolutionData.Set<CommissionNodeData>();
+ mSpecificResolutionData.Set<DnssdNodeData>();
{
// Commission addresses start with instance name
@@ -199,10 +199,10 @@
return CHIP_ERROR_INVALID_ARGUMENT;
}
- Platform::CopyString(mSpecificResolutionData.Get<CommissionNodeData>().instanceName, nameCopy.Value());
+ Platform::CopyString(mSpecificResolutionData.Get<DnssdNodeData>().instanceName, nameCopy.Value());
}
- LogFoundCommissionSrvRecord(mSpecificResolutionData.Get<CommissionNodeData>().instanceName, mTargetHostName.Get());
+ LogFoundCommissionSrvRecord(mSpecificResolutionData.Get<DnssdNodeData>().instanceName, mTargetHostName.Get());
break;
default:
return CHIP_ERROR_INVALID_ARGUMENT;
@@ -304,9 +304,9 @@
}
}
- if (IsActiveCommissionParse())
+ if (IsActiveBrowseParse())
{
- TxtParser<CommissionNodeData> delegate(mSpecificResolutionData.Get<CommissionNodeData>());
+ TxtParser<DnssdNodeData> delegate(mSpecificResolutionData.Get<DnssdNodeData>());
if (!ParseTxtRecord(data.GetData(), &delegate))
{
return CHIP_ERROR_INVALID_ARGUMENT;
@@ -343,12 +343,12 @@
CHIP_ERROR IncrementalResolver::Take(DiscoveredNodeData & outputData)
{
- VerifyOrReturnError(IsActiveCommissionParse(), CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrReturnError(IsActiveBrowseParse(), CHIP_ERROR_INCORRECT_STATE);
IPAddressSorter::Sort(mCommonResolutionData.ipAddress, mCommonResolutionData.numIPs, mCommonResolutionData.interfaceId);
outputData.resolutionData = mCommonResolutionData;
- outputData.commissionData = mSpecificResolutionData.Get<CommissionNodeData>();
+ outputData.nodeData = mSpecificResolutionData.Get<DnssdNodeData>();
ResetToInactive();
diff --git a/src/lib/dnssd/IncrementalResolve.h b/src/lib/dnssd/IncrementalResolve.h
index b28b3cb..9d23864 100644
--- a/src/lib/dnssd/IncrementalResolve.h
+++ b/src/lib/dnssd/IncrementalResolve.h
@@ -99,7 +99,7 @@
/// method.
bool IsActive() const { return mSpecificResolutionData.Valid(); }
- bool IsActiveCommissionParse() const { return mSpecificResolutionData.Is<CommissionNodeData>(); }
+ bool IsActiveBrowseParse() const { return mSpecificResolutionData.Is<DnssdNodeData>(); }
bool IsActiveOperationalParse() const { return mSpecificResolutionData.Is<OperationalNodeData>(); }
ServiceNameType GetCurrentType() const { return mServiceNameType; }
@@ -143,7 +143,7 @@
/// Take the current value of the object and clear it once returned.
///
- /// Object must be in `IsActiveCommissionParse()` for this to succeed.
+ /// Object must be in `IsActiveBrowseParse()` for this to succeed.
/// Data will be returned (and cleared) even if not yet complete based
/// on `GetMissingRequiredInformation()`. This method takes as much data as
/// it was parsed so far.
@@ -170,7 +170,7 @@
/// Input data MUST have GetType() == QType::TXT
CHIP_ERROR OnTxtRecord(const mdns::Minimal::ResourceData & data, mdns::Minimal::BytesRange packetRange);
- /// Notify that a new IP addres has been found.
+ /// Notify that a new IP address has been found.
///
/// This is to be called on both A (if IPv4 support is enabled) and AAAA
/// addresses.
@@ -178,7 +178,7 @@
/// Prerequisite: IP address belongs to the right nost name
CHIP_ERROR OnIpAddress(Inet::InterfaceId interface, const Inet::IPAddress & addr);
- using ParsedRecordSpecificData = Variant<OperationalNodeData, CommissionNodeData>;
+ using ParsedRecordSpecificData = Variant<OperationalNodeData, DnssdNodeData>;
StoredServerName mRecordName; // Record name for what is parsed (SRV/PTR/TXT)
StoredServerName mTargetHostName; // `Target` for the SRV record
diff --git a/src/lib/dnssd/Resolver.h b/src/lib/dnssd/Resolver.h
index 6f9827b..bf684ce 100644
--- a/src/lib/dnssd/Resolver.h
+++ b/src/lib/dnssd/Resolver.h
@@ -78,12 +78,12 @@
void ClearBrowseIdentifier() { mBrowseIdentifier.ClearValue(); }
const Optional<intptr_t> & GetBrowseIdentifier() const { return mBrowseIdentifier; }
- void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) { mCommissioningDelegate = delegate; }
+ void SetDiscoveryDelegate(DiscoverNodeDelegate * delegate) { mDelegate = delegate; }
void OnNodeDiscovered(const DiscoveredNodeData & nodeData)
{
- if (mCommissioningDelegate != nullptr)
+ if (mDelegate != nullptr)
{
- mCommissioningDelegate->OnNodeDiscovered(nodeData);
+ mDelegate->OnNodeDiscovered(nodeData);
}
else
{
@@ -92,7 +92,7 @@
}
private:
- CommissioningResolveDelegate * mCommissioningDelegate = nullptr;
+ DiscoverNodeDelegate * mDelegate = nullptr;
Optional<intptr_t> mBrowseIdentifier;
};
@@ -168,31 +168,19 @@
virtual void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) = 0;
/**
- * Finds all commissionable nodes matching the given filter.
+ * Finds all nodes of given type matching the given filter.
*
* Whenever a new matching node is found, the node information is passed to
- * the `OnNodeDiscovered` method of the commissioning delegate configured
+ * the `OnNodeDiscovered` method of the discovery delegate configured
* in the context object.
*
* This method is expected to increase the reference count of the context
* object for as long as it takes to complete the discovery request.
*/
- virtual CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) = 0;
+ virtual CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context) = 0;
/**
- * Finds all commissioner nodes matching the given filter.
- *
- * Whenever a new matching node is found, the node information is passed to
- * the `OnNodeDiscovered` method of the commissioning delegate configured
- * in the context object.
- *
- * This method is expected to increase the reference count of the context
- * object for as long as it takes to complete the discovery request.
- */
- virtual CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) = 0;
-
- /**
- * Stop discovery (of commissionable or commissioner nodes).
+ * Stop discovery (of all node types).
*
* Some back ends may not support stopping discovery, so consumers should
* not assume they will stop getting callbacks after calling this.
diff --git a/src/lib/dnssd/ResolverProxy.cpp b/src/lib/dnssd/ResolverProxy.cpp
index 3e7446e..e43028e 100644
--- a/src/lib/dnssd/ResolverProxy.cpp
+++ b/src/lib/dnssd/ResolverProxy.cpp
@@ -36,7 +36,7 @@
void ResolverProxy::Shutdown()
{
VerifyOrReturn(mContext != nullptr);
- mContext->SetCommissioningDelegate(nullptr);
+ mContext->SetDiscoveryDelegate(nullptr);
mContext->Release();
mContext = nullptr;
}
@@ -45,14 +45,14 @@
{
VerifyOrReturnError(mContext != nullptr, CHIP_ERROR_INCORRECT_STATE);
- return mResolver.DiscoverCommissionableNodes(filter, *mContext);
+ return mResolver.StartDiscovery(DiscoveryType::kCommissionableNode, filter, *mContext);
}
CHIP_ERROR ResolverProxy::DiscoverCommissioners(DiscoveryFilter filter)
{
VerifyOrReturnError(mContext != nullptr, CHIP_ERROR_INCORRECT_STATE);
- return mResolver.DiscoverCommissioners(filter, *mContext);
+ return mResolver.StartDiscovery(DiscoveryType::kCommissionerNode, filter, *mContext);
}
CHIP_ERROR ResolverProxy::StopDiscovery()
diff --git a/src/lib/dnssd/ResolverProxy.h b/src/lib/dnssd/ResolverProxy.h
index 09a50e8..58617b0 100644
--- a/src/lib/dnssd/ResolverProxy.h
+++ b/src/lib/dnssd/ResolverProxy.h
@@ -44,11 +44,11 @@
CHIP_ERROR Init(Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPoint = nullptr);
void Shutdown();
- void SetCommissioningDelegate(CommissioningResolveDelegate * delegate)
+ void SetDiscoveryDelegate(DiscoverNodeDelegate * delegate)
{
if (mContext != nullptr)
{
- mContext->SetCommissioningDelegate(delegate);
+ mContext->SetDiscoveryDelegate(delegate);
}
}
diff --git a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
index b74d0ae..a5e7117 100644
--- a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
+++ b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
@@ -285,8 +285,7 @@
void SetOperationalDelegate(OperationalResolveDelegate * delegate) override { mOperationalDelegate = delegate; }
CHIP_ERROR ResolveNodeId(const PeerId & peerId) override;
void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override;
- CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) override;
- CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) override;
+ CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context) override;
CHIP_ERROR StopDiscovery(DiscoveryContext & context) override;
CHIP_ERROR ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId) override;
@@ -386,7 +385,7 @@
}
// SUCCESS. Call the delegates
- if (resolver->IsActiveCommissionParse())
+ if (resolver->IsActiveBrowseParse())
{
MATTER_TRACE_SCOPE("Active commissioning delegate call", "MinMdnsResolver");
DiscoveredNodeData nodeData;
@@ -412,13 +411,15 @@
case IncrementalResolver::ServiceNameType::kCommissioner:
discoveredNodeIsRelevant = mActiveResolves.HasBrowseFor(chip::Dnssd::DiscoveryType::kCommissionerNode);
mActiveResolves.CompleteCommissioner(nodeData);
+ nodeData.nodeType = DiscoveryType::kCommissionerNode;
break;
case IncrementalResolver::ServiceNameType::kCommissionable:
discoveredNodeIsRelevant = mActiveResolves.HasBrowseFor(chip::Dnssd::DiscoveryType::kCommissionableNode);
mActiveResolves.CompleteCommissionable(nodeData);
+ nodeData.nodeType = DiscoveryType::kCommissionableNode;
break;
default:
- ChipLogError(Discovery, "Unexpected type for commission data parsing");
+ ChipLogError(Discovery, "Unexpected type for browse data parsing");
continue;
}
@@ -685,20 +686,12 @@
}
}
-CHIP_ERROR MinMdnsResolver::DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context)
+CHIP_ERROR MinMdnsResolver::StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context)
{
// minmdns currently supports only one discovery context at a time so override the previous context
SetDiscoveryContext(&context);
- return BrowseNodes(DiscoveryType::kCommissionableNode, filter);
-}
-
-CHIP_ERROR MinMdnsResolver::DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context)
-{
- // minmdns currently supports only one discovery context at a time so override the previous context
- SetDiscoveryContext(&context);
-
- return BrowseNodes(DiscoveryType::kCommissionerNode, filter);
+ return BrowseNodes(type, filter);
}
CHIP_ERROR MinMdnsResolver::StopDiscovery(DiscoveryContext & context)
diff --git a/src/lib/dnssd/Resolver_ImplNone.cpp b/src/lib/dnssd/Resolver_ImplNone.cpp
index 36e2bd9..497c82a 100644
--- a/src/lib/dnssd/Resolver_ImplNone.cpp
+++ b/src/lib/dnssd/Resolver_ImplNone.cpp
@@ -40,11 +40,7 @@
{
ChipLogError(Discovery, "Failed to stop resolving node ID: dnssd resolving not available");
}
- CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) override
- {
- return CHIP_ERROR_NOT_IMPLEMENTED;
- }
- CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) override
+ CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context) override
{
return CHIP_ERROR_NOT_IMPLEMENTED;
}
diff --git a/src/lib/dnssd/TxtFields.cpp b/src/lib/dnssd/TxtFields.cpp
index d436507..b77d991 100644
--- a/src/lib/dnssd/TxtFields.cpp
+++ b/src/lib/dnssd/TxtFields.cpp
@@ -225,7 +225,7 @@
} // namespace Internal
-void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & val, CommissionNodeData & nodeData)
+void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & val, DnssdNodeData & nodeData)
{
TxtFieldKey keyType = Internal::GetTxtFieldKey(key);
switch (keyType)
diff --git a/src/lib/dnssd/TxtFields.h b/src/lib/dnssd/TxtFields.h
index 5546493..1947504 100644
--- a/src/lib/dnssd/TxtFields.h
+++ b/src/lib/dnssd/TxtFields.h
@@ -192,7 +192,7 @@
}
void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & value, CommonResolutionData & nodeData);
-void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & value, CommissionNodeData & nodeData);
+void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & value, DnssdNodeData & nodeData);
} // namespace Dnssd
} // namespace chip
diff --git a/src/lib/dnssd/Types.h b/src/lib/dnssd/Types.h
index 3718d9b..15dbf90 100644
--- a/src/lib/dnssd/Types.h
+++ b/src/lib/dnssd/Types.h
@@ -205,7 +205,7 @@
inline constexpr size_t kMaxPairingInstructionLen = 128;
/// Data that is specific to commisionable/commissioning node discovery
-struct CommissionNodeData
+struct DnssdNodeData
{
size_t rotatingIdLen = 0;
uint32_t deviceType = 0;
@@ -220,13 +220,13 @@
char deviceName[kMaxDeviceNameLen + 1] = {};
char pairingInstruction[kMaxPairingInstructionLen + 1] = {};
- CommissionNodeData() {}
+ DnssdNodeData() {}
void Reset()
{
// Let constructor clear things as default
- this->~CommissionNodeData();
- new (this) CommissionNodeData();
+ this->~DnssdNodeData();
+ new (this) DnssdNodeData();
}
bool IsInstanceName(const char * instance) const { return strcmp(instance, instanceName) == 0; }
@@ -298,12 +298,14 @@
struct DiscoveredNodeData
{
CommonResolutionData resolutionData;
- CommissionNodeData commissionData;
+ DnssdNodeData nodeData;
+ DiscoveryType nodeType;
void Reset()
{
resolutionData.Reset();
- commissionData.Reset();
+ nodeData.Reset();
+ nodeType = DiscoveryType::kUnknown;
}
DiscoveredNodeData() { Reset(); }
@@ -311,7 +313,7 @@
{
ChipLogDetail(Discovery, "Discovered node:");
resolutionData.LogDetail();
- commissionData.LogDetail();
+ nodeData.LogDetail();
}
};
@@ -319,10 +321,10 @@
/// - Commissioners
/// - Nodes in commissioning modes over IP (e.g. ethernet devices, devices already
/// connected to thread/wifi or devices with a commissioning window open)
-class CommissioningResolveDelegate
+class DiscoverNodeDelegate
{
public:
- virtual ~CommissioningResolveDelegate() = default;
+ virtual ~DiscoverNodeDelegate() = default;
/// Called within the CHIP event loop once a node is discovered.
///
diff --git a/src/lib/dnssd/platform/Dnssd.h b/src/lib/dnssd/platform/Dnssd.h
index 778e9bc..fcbeabe 100644
--- a/src/lib/dnssd/platform/Dnssd.h
+++ b/src/lib/dnssd/platform/Dnssd.h
@@ -288,8 +288,7 @@
* @retval Error code The resolve fails.
*
*/
-CHIP_ERROR ChipDnssdResolve(DnssdService * browseResult, chip::Inet::InterfaceId interface,
- CommissioningResolveDelegate * delegate);
+CHIP_ERROR ChipDnssdResolve(DnssdService * browseResult, chip::Inet::InterfaceId interface, DiscoverNodeDelegate * delegate);
#endif // CHIP_DEVICE_LAYER_TARGET_DARWIN
/**
diff --git a/src/lib/dnssd/tests/TestActiveResolveAttempts.cpp b/src/lib/dnssd/tests/TestActiveResolveAttempts.cpp
index 574268b..f4ef2f2 100644
--- a/src/lib/dnssd/tests/TestActiveResolveAttempts.cpp
+++ b/src/lib/dnssd/tests/TestActiveResolveAttempts.cpp
@@ -126,7 +126,7 @@
// once complete, nothing to schedule
Dnssd::DiscoveredNodeData data;
- data.commissionData.longDiscriminator = 1234;
+ data.nodeData.longDiscriminator = 1234;
attempts.CompleteCommissionable(data);
NL_TEST_ASSERT(inSuite, !attempts.GetTimeUntilNextExpectedResponse().HasValue());
NL_TEST_ASSERT(inSuite, !attempts.NextScheduled().HasValue());
@@ -375,7 +375,7 @@
attempts.Complete(MakePeerId(2));
attempts.Complete(MakePeerId(1));
Dnssd::DiscoveredNodeData data;
- data.commissionData.longDiscriminator = 1234;
+ data.nodeData.longDiscriminator = 1234;
attempts.CompleteCommissionable(data);
NL_TEST_ASSERT(inSuite, !attempts.GetTimeUntilNextExpectedResponse().HasValue());
diff --git a/src/lib/dnssd/tests/TestIncrementalResolve.cpp b/src/lib/dnssd/tests/TestIncrementalResolve.cpp
index 1cc3b71..03b585c 100644
--- a/src/lib/dnssd/tests/TestIncrementalResolve.cpp
+++ b/src/lib/dnssd/tests/TestIncrementalResolve.cpp
@@ -163,7 +163,7 @@
IncrementalResolver resolver;
NL_TEST_ASSERT(inSuite, !resolver.IsActive());
- NL_TEST_ASSERT(inSuite, !resolver.IsActiveCommissionParse());
+ NL_TEST_ASSERT(inSuite, !resolver.IsActiveBrowseParse());
NL_TEST_ASSERT(inSuite, !resolver.IsActiveOperationalParse());
NL_TEST_ASSERT(
inSuite,
@@ -183,7 +183,7 @@
NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestHostName.Serialized(), srvRecord) != CHIP_NO_ERROR);
NL_TEST_ASSERT(inSuite, !resolver.IsActive());
- NL_TEST_ASSERT(inSuite, !resolver.IsActiveCommissionParse());
+ NL_TEST_ASSERT(inSuite, !resolver.IsActiveBrowseParse());
NL_TEST_ASSERT(inSuite, !resolver.IsActiveOperationalParse());
}
@@ -199,7 +199,7 @@
NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestOperationalName.Serialized(), srvRecord) == CHIP_NO_ERROR);
NL_TEST_ASSERT(inSuite, resolver.IsActive());
- NL_TEST_ASSERT(inSuite, !resolver.IsActiveCommissionParse());
+ NL_TEST_ASSERT(inSuite, !resolver.IsActiveBrowseParse());
NL_TEST_ASSERT(inSuite, resolver.IsActiveOperationalParse());
NL_TEST_ASSERT(inSuite,
resolver.GetMissingRequiredInformation().HasOnly(IncrementalResolver::RequiredInformationBitFlags::kIpAddress));
@@ -218,7 +218,7 @@
NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestCommissionableNode.Serialized(), srvRecord) == CHIP_NO_ERROR);
NL_TEST_ASSERT(inSuite, resolver.IsActive());
- NL_TEST_ASSERT(inSuite, resolver.IsActiveCommissionParse());
+ NL_TEST_ASSERT(inSuite, resolver.IsActiveBrowseParse());
NL_TEST_ASSERT(inSuite, !resolver.IsActiveOperationalParse());
NL_TEST_ASSERT(inSuite,
resolver.GetMissingRequiredInformation().HasOnly(IncrementalResolver::RequiredInformationBitFlags::kIpAddress));
@@ -237,7 +237,7 @@
NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestCommissionerNode.Serialized(), srvRecord) == CHIP_NO_ERROR);
NL_TEST_ASSERT(inSuite, resolver.IsActive());
- NL_TEST_ASSERT(inSuite, resolver.IsActiveCommissionParse());
+ NL_TEST_ASSERT(inSuite, resolver.IsActiveBrowseParse());
NL_TEST_ASSERT(inSuite, !resolver.IsActiveOperationalParse());
NL_TEST_ASSERT(inSuite,
resolver.GetMissingRequiredInformation().HasOnly(IncrementalResolver::RequiredInformationBitFlags::kIpAddress));
@@ -336,7 +336,7 @@
NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestCommissionableNode.Serialized(), srvRecord) == CHIP_NO_ERROR);
// once initialized, parsing should be ready however no IP address is available
- NL_TEST_ASSERT(inSuite, resolver.IsActiveCommissionParse());
+ NL_TEST_ASSERT(inSuite, resolver.IsActiveBrowseParse());
NL_TEST_ASSERT(inSuite,
resolver.GetMissingRequiredInformation().HasOnly(IncrementalResolver::RequiredInformationBitFlags::kIpAddress));
NL_TEST_ASSERT(inSuite, resolver.GetTargetHostName() == kTestHostName.Serialized());
@@ -414,10 +414,10 @@
NL_TEST_ASSERT(inSuite, nodeData.resolutionData.ipAddress[1] == addr);
// parsed txt data for discovered nodes
- NL_TEST_ASSERT(inSuite, nodeData.commissionData.longDiscriminator == 22345);
- NL_TEST_ASSERT(inSuite, nodeData.commissionData.vendorId == 321);
- NL_TEST_ASSERT(inSuite, nodeData.commissionData.productId == 654);
- NL_TEST_ASSERT(inSuite, strcmp(nodeData.commissionData.deviceName, "mytest") == 0);
+ NL_TEST_ASSERT(inSuite, nodeData.nodeData.longDiscriminator == 22345);
+ NL_TEST_ASSERT(inSuite, nodeData.nodeData.vendorId == 321);
+ NL_TEST_ASSERT(inSuite, nodeData.nodeData.productId == 654);
+ NL_TEST_ASSERT(inSuite, strcmp(nodeData.nodeData.deviceName, "mytest") == 0);
}
const nlTest sTests[] = {
diff --git a/src/lib/dnssd/tests/TestTxtFields.cpp b/src/lib/dnssd/tests/TestTxtFields.cpp
index 95f13b5..4593a49 100644
--- a/src/lib/dnssd/tests/TestTxtFields.cpp
+++ b/src/lib/dnssd/tests/TestTxtFields.cpp
@@ -304,20 +304,20 @@
bool NodeDataIsEmpty(const DiscoveredNodeData & node)
{
- if (node.commissionData.longDiscriminator != 0 || node.commissionData.vendorId != 0 || node.commissionData.productId != 0 ||
- node.commissionData.commissioningMode != 0 || node.commissionData.deviceType != 0 ||
- node.commissionData.rotatingIdLen != 0 || node.commissionData.pairingHint != 0 ||
- node.resolutionData.mrpRetryIntervalIdle.HasValue() || node.resolutionData.mrpRetryIntervalActive.HasValue() ||
- node.resolutionData.mrpRetryActiveThreshold.HasValue() || node.resolutionData.isICDOperatingAsLIT.HasValue() ||
- node.resolutionData.supportsTcp || node.commissionData.commissionerPasscode != 0)
+ if (node.nodeData.longDiscriminator != 0 || node.nodeData.vendorId != 0 || node.nodeData.productId != 0 ||
+ node.nodeData.commissioningMode != 0 || node.nodeData.deviceType != 0 || node.nodeData.rotatingIdLen != 0 ||
+ node.nodeData.pairingHint != 0 || node.resolutionData.mrpRetryIntervalIdle.HasValue() ||
+ node.resolutionData.mrpRetryIntervalActive.HasValue() || node.resolutionData.mrpRetryActiveThreshold.HasValue() ||
+ node.resolutionData.isICDOperatingAsLIT.HasValue() || node.resolutionData.supportsTcp ||
+ node.nodeData.commissionerPasscode != 0)
{
return false;
}
- if (strcmp(node.commissionData.deviceName, "") != 0 || strcmp(node.commissionData.pairingInstruction, "") != 0)
+ if (strcmp(node.nodeData.deviceName, "") != 0 || strcmp(node.nodeData.pairingInstruction, "") != 0)
{
return false;
}
- for (uint8_t id : node.commissionData.rotatingId)
+ for (uint8_t id : node.nodeData.rotatingId)
{
if (id != 0)
{
@@ -337,78 +337,78 @@
// Long discriminator
strcpy(key, "D");
strcpy(val, "840");
- FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
- NL_TEST_ASSERT(inSuite, filled.commissionData.longDiscriminator == 840);
- filled.commissionData.longDiscriminator = 0;
+ FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.longDiscriminator == 840);
+ filled.nodeData.longDiscriminator = 0;
NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
// vendor and product
strcpy(key, "VP");
strcpy(val, "123+456");
- FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
- NL_TEST_ASSERT(inSuite, filled.commissionData.vendorId == 123);
- NL_TEST_ASSERT(inSuite, filled.commissionData.productId == 456);
- filled.commissionData.vendorId = 0;
- filled.commissionData.productId = 0;
+ FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.vendorId == 123);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.productId == 456);
+ filled.nodeData.vendorId = 0;
+ filled.nodeData.productId = 0;
NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
// Commissioning mode
strcpy(key, "CM");
strcpy(val, "1");
- FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
- NL_TEST_ASSERT(inSuite, filled.commissionData.commissioningMode == 1);
- filled.commissionData.commissioningMode = 0;
+ FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.commissioningMode == 1);
+ filled.nodeData.commissioningMode = 0;
NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
// Commissioning mode
strcpy(key, "CP");
strcpy(val, "1");
- FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
- NL_TEST_ASSERT(inSuite, filled.commissionData.commissionerPasscode == 1);
- filled.commissionData.commissionerPasscode = 0;
+ FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.commissionerPasscode == 1);
+ filled.nodeData.commissionerPasscode = 0;
NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
// Device type
strcpy(key, "DT");
strcpy(val, "1");
- FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
- NL_TEST_ASSERT(inSuite, filled.commissionData.deviceType == 1);
- filled.commissionData.deviceType = 0;
+ FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.deviceType == 1);
+ filled.nodeData.deviceType = 0;
NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
// Device name
strcpy(key, "DN");
strcpy(val, "abc");
- FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
- NL_TEST_ASSERT(inSuite, strcmp(filled.commissionData.deviceName, "abc") == 0);
- memset(filled.commissionData.deviceName, 0, sizeof(filled.commissionData.deviceName));
+ FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+ NL_TEST_ASSERT(inSuite, strcmp(filled.nodeData.deviceName, "abc") == 0);
+ memset(filled.nodeData.deviceName, 0, sizeof(filled.nodeData.deviceName));
NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
// Rotating device id
strcpy(key, "RI");
strcpy(val, "1A2B");
- FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
- NL_TEST_ASSERT(inSuite, filled.commissionData.rotatingId[0] == 0x1A);
- NL_TEST_ASSERT(inSuite, filled.commissionData.rotatingId[1] == 0x2B);
- NL_TEST_ASSERT(inSuite, filled.commissionData.rotatingIdLen == 2);
- filled.commissionData.rotatingIdLen = 0;
- memset(filled.commissionData.rotatingId, 0, sizeof(filled.commissionData.rotatingId));
+ FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.rotatingId[0] == 0x1A);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.rotatingId[1] == 0x2B);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.rotatingIdLen == 2);
+ filled.nodeData.rotatingIdLen = 0;
+ memset(filled.nodeData.rotatingId, 0, sizeof(filled.nodeData.rotatingId));
NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
// Pairing instruction
strcpy(key, "PI");
strcpy(val, "hint");
- FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
- NL_TEST_ASSERT(inSuite, strcmp(filled.commissionData.pairingInstruction, "hint") == 0);
- memset(filled.commissionData.pairingInstruction, 0, sizeof(filled.commissionData.pairingInstruction));
+ FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+ NL_TEST_ASSERT(inSuite, strcmp(filled.nodeData.pairingInstruction, "hint") == 0);
+ memset(filled.nodeData.pairingInstruction, 0, sizeof(filled.nodeData.pairingInstruction));
NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
// Pairing hint
strcpy(key, "PH");
strcpy(val, "1");
- FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
- NL_TEST_ASSERT(inSuite, filled.commissionData.pairingHint == 1);
- filled.commissionData.pairingHint = 0;
+ FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+ NL_TEST_ASSERT(inSuite, filled.nodeData.pairingHint == 1);
+ filled.nodeData.pairingHint = 0;
NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
}
diff --git a/src/lib/shell/commands/Dns.cpp b/src/lib/shell/commands/Dns.cpp
index 6abb2dc..1495533 100644
--- a/src/lib/shell/commands/Dns.cpp
+++ b/src/lib/shell/commands/Dns.cpp
@@ -40,7 +40,7 @@
Shell::Engine sShellDnsSubcommands;
Dnssd::ResolverProxy sResolverProxy;
-class DnsShellResolverDelegate : public Dnssd::CommissioningResolveDelegate, public AddressResolve::NodeListener
+class DnsShellResolverDelegate : public Dnssd::DiscoverNodeDelegate, public AddressResolve::NodeListener
{
public:
DnsShellResolverDelegate() { mSelfHandle.SetListener(this); }
@@ -92,20 +92,20 @@
}
char rotatingId[Dnssd::kMaxRotatingIdLen * 2 + 1];
- Encoding::BytesToUppercaseHexString(nodeData.commissionData.rotatingId, nodeData.commissionData.rotatingIdLen, rotatingId,
+ Encoding::BytesToUppercaseHexString(nodeData.nodeData.rotatingId, nodeData.nodeData.rotatingIdLen, rotatingId,
sizeof(rotatingId));
streamer_printf(streamer_get(), "DNS browse succeeded: \r\n");
+ streamer_printf(streamer_get(), " Node Type: %u\r\n", nodeData.nodeType);
streamer_printf(streamer_get(), " Hostname: %s\r\n", nodeData.resolutionData.hostName);
- streamer_printf(streamer_get(), " Vendor ID: %u\r\n", nodeData.commissionData.vendorId);
- streamer_printf(streamer_get(), " Product ID: %u\r\n", nodeData.commissionData.productId);
- streamer_printf(streamer_get(), " Long discriminator: %u\r\n", nodeData.commissionData.longDiscriminator);
- streamer_printf(streamer_get(), " Device type: %u\r\n", nodeData.commissionData.deviceType);
- streamer_printf(streamer_get(), " Device name: %s\n", nodeData.commissionData.deviceName);
- streamer_printf(streamer_get(), " Commissioning mode: %d\r\n",
- static_cast<int>(nodeData.commissionData.commissioningMode));
- streamer_printf(streamer_get(), " Pairing hint: %u\r\n", nodeData.commissionData.pairingHint);
- streamer_printf(streamer_get(), " Pairing instruction: %s\r\n", nodeData.commissionData.pairingInstruction);
+ streamer_printf(streamer_get(), " Vendor ID: %u\r\n", nodeData.nodeData.vendorId);
+ streamer_printf(streamer_get(), " Product ID: %u\r\n", nodeData.nodeData.productId);
+ streamer_printf(streamer_get(), " Long discriminator: %u\r\n", nodeData.nodeData.longDiscriminator);
+ streamer_printf(streamer_get(), " Device type: %u\r\n", nodeData.nodeData.deviceType);
+ streamer_printf(streamer_get(), " Device name: %s\n", nodeData.nodeData.deviceName);
+ streamer_printf(streamer_get(), " Commissioning mode: %d\r\n", static_cast<int>(nodeData.nodeData.commissioningMode));
+ streamer_printf(streamer_get(), " Pairing hint: %u\r\n", nodeData.nodeData.pairingHint);
+ streamer_printf(streamer_get(), " Pairing instruction: %s\r\n", nodeData.nodeData.pairingInstruction);
streamer_printf(streamer_get(), " Rotating ID %s\r\n", rotatingId);
auto retryInterval = nodeData.resolutionData.GetMrpRetryIntervalIdle();
@@ -237,7 +237,7 @@
}
sResolverProxy.Init(DeviceLayer::UDPEndPointManager());
- sResolverProxy.SetCommissioningDelegate(&sDnsShellResolverDelegate);
+ sResolverProxy.SetDiscoveryDelegate(&sDnsShellResolverDelegate);
return sShellDnsBrowseSubcommands.ExecCommand(argc, argv);
}
diff --git a/src/platform/Darwin/DnssdContexts.cpp b/src/platform/Darwin/DnssdContexts.cpp
index 27a9d81..46c7bb3 100644
--- a/src/platform/Darwin/DnssdContexts.cpp
+++ b/src/platform/Darwin/DnssdContexts.cpp
@@ -478,7 +478,7 @@
consumerCounter = std::move(consumerCounterToUse);
}
-ResolveContext::ResolveContext(CommissioningResolveDelegate * delegate, chip::Inet::IPAddressType cbAddressType,
+ResolveContext::ResolveContext(DiscoverNodeDelegate * delegate, chip::Inet::IPAddressType cbAddressType,
const char * instanceNameToResolve, std::shared_ptr<uint32_t> && consumerCounterToUse) :
browseThatCausedResolve(nullptr)
{
@@ -608,7 +608,7 @@
auto addresses = Span<Inet::IPAddress>(ips.data(), ips.size());
if (nullptr == callback)
{
- auto delegate = static_cast<CommissioningResolveDelegate *>(context);
+ auto delegate = static_cast<DiscoverNodeDelegate *>(context);
DiscoveredNodeData nodeData;
service.ToDiscoveredNodeData(addresses, nodeData);
delegate->OnNodeDiscovered(nodeData);
diff --git a/src/platform/Darwin/DnssdImpl.cpp b/src/platform/Darwin/DnssdImpl.cpp
index e9314f7..a9dccf2 100644
--- a/src/platform/Darwin/DnssdImpl.cpp
+++ b/src/platform/Darwin/DnssdImpl.cpp
@@ -408,7 +408,7 @@
return Resolve(sdCtx, interfaceId, addressType, type, name, domain);
}
-static CHIP_ERROR Resolve(CommissioningResolveDelegate * delegate, uint32_t interfaceId, chip::Inet::IPAddressType addressType,
+static CHIP_ERROR Resolve(DiscoverNodeDelegate * delegate, uint32_t interfaceId, chip::Inet::IPAddressType addressType,
const char * type, const char * name)
{
auto counterHolder = GetCounterHolder(name);
@@ -570,7 +570,7 @@
return Resolve(context, callback, interfaceId, service->mAddressType, regtype.c_str(), service->mName, domain);
}
-CHIP_ERROR ChipDnssdResolve(DnssdService * service, chip::Inet::InterfaceId interface, CommissioningResolveDelegate * delegate)
+CHIP_ERROR ChipDnssdResolve(DnssdService * service, chip::Inet::InterfaceId interface, DiscoverNodeDelegate * delegate)
{
VerifyOrReturnError(service != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
VerifyOrReturnError(IsSupportedProtocol(service->mProtocol), CHIP_ERROR_INVALID_ARGUMENT);
diff --git a/src/platform/Darwin/DnssdImpl.h b/src/platform/Darwin/DnssdImpl.h
index 351926a..de5419b 100644
--- a/src/platform/Darwin/DnssdImpl.h
+++ b/src/platform/Darwin/DnssdImpl.h
@@ -274,8 +274,8 @@
ResolveContext(void * cbContext, DnssdResolveCallback cb, chip::Inet::IPAddressType cbAddressType,
const char * instanceNameToResolve, BrowseContext * browseCausingResolve,
std::shared_ptr<uint32_t> && consumerCounterToUse);
- ResolveContext(CommissioningResolveDelegate * delegate, chip::Inet::IPAddressType cbAddressType,
- const char * instanceNameToResolve, std::shared_ptr<uint32_t> && consumerCounterToUse);
+ ResolveContext(DiscoverNodeDelegate * delegate, chip::Inet::IPAddressType cbAddressType, const char * instanceNameToResolve,
+ std::shared_ptr<uint32_t> && consumerCounterToUse);
virtual ~ResolveContext();
void DispatchFailure(const char * errorStr, CHIP_ERROR err) override;
diff --git a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp
index 9e78712..f63a10c 100644
--- a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp
+++ b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp
@@ -405,17 +405,16 @@
if (nodeData.resolutionData.numIPs == 0)
{
ChipLogError(AppServer, "OnCommissionableNodeFound no IP addresses returned for instance name=%s",
- nodeData.commissionData.instanceName);
+ nodeData.nodeData.instanceName);
return;
}
if (nodeData.resolutionData.port == 0)
{
- ChipLogError(AppServer, "OnCommissionableNodeFound no port returned for instance name=%s",
- nodeData.commissionData.instanceName);
+ ChipLogError(AppServer, "OnCommissionableNodeFound no port returned for instance name=%s", nodeData.nodeData.instanceName);
return;
}
- UDCClientState * client = mUdcClients.FindUDCClientState(nodeData.commissionData.instanceName);
+ UDCClientState * client = mUdcClients.FindUDCClientState(nodeData.nodeData.instanceName);
if (client != nullptr && client->GetUDCClientProcessingState() == UDCClientProcessingState::kDiscoveringNode)
{
ChipLogDetail(AppServer, "OnCommissionableNodeFound instance: name=%s old_state=%d new_state=%d", client->GetInstanceName(),
@@ -458,17 +457,17 @@
if (!foundV6)
{
ChipLogError(AppServer, "OnCommissionableNodeFound no v6 returned for instance name=%s",
- nodeData.commissionData.instanceName);
+ nodeData.nodeData.instanceName);
client->SetPeerAddress(
chip::Transport::PeerAddress::UDP(nodeData.resolutionData.ipAddress[0], nodeData.resolutionData.port));
}
#endif // INET_CONFIG_ENABLE_IPV4
- client->SetDeviceName(nodeData.commissionData.deviceName);
- client->SetLongDiscriminator(nodeData.commissionData.longDiscriminator);
- client->SetVendorId(nodeData.commissionData.vendorId);
- client->SetProductId(nodeData.commissionData.productId);
- client->SetRotatingId(nodeData.commissionData.rotatingId, nodeData.commissionData.rotatingIdLen);
+ client->SetDeviceName(nodeData.nodeData.deviceName);
+ client->SetLongDiscriminator(nodeData.nodeData.longDiscriminator);
+ client->SetVendorId(nodeData.nodeData.vendorId);
+ client->SetProductId(nodeData.nodeData.productId);
+ client->SetRotatingId(nodeData.nodeData.rotatingId, nodeData.nodeData.rotatingIdLen);
// Call the registered mUserConfirmationProvider, if any.
if (mUserConfirmationProvider != nullptr)
diff --git a/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp b/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp
index f7e7c2a..9c171b5 100644
--- a/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp
+++ b/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp
@@ -86,15 +86,15 @@
nodeData1.resolutionData.port = 5540;
nodeData1.resolutionData.ipAddress[0] = address;
nodeData1.resolutionData.numIPs = 1;
- Platform::CopyString(nodeData1.commissionData.instanceName, instanceName1);
+ Platform::CopyString(nodeData1.nodeData.instanceName, instanceName1);
Dnssd::DiscoveredNodeData nodeData2;
- nodeData2.resolutionData.port = 5540;
- nodeData2.resolutionData.ipAddress[0] = address;
- nodeData2.resolutionData.numIPs = 1;
- nodeData2.commissionData.longDiscriminator = disc2;
- Platform::CopyString(nodeData2.commissionData.instanceName, instanceName2);
- Platform::CopyString(nodeData2.commissionData.deviceName, deviceName2);
+ nodeData2.resolutionData.port = 5540;
+ nodeData2.resolutionData.ipAddress[0] = address;
+ nodeData2.resolutionData.numIPs = 1;
+ nodeData2.nodeData.longDiscriminator = disc2;
+ Platform::CopyString(nodeData2.nodeData.instanceName, instanceName2);
+ Platform::CopyString(nodeData2.nodeData.deviceName, deviceName2);
// test empty UserConfirmationProvider
udcServer.OnCommissionableNodeFound(nodeData2);
