Skip to content

Commit 3b657f6

Browse files
su-shankasu-shanka
committed
Refactored DiscoveredNodeData definition and usage
1 parent 35ced57 commit 3b657f6

File tree

54 files changed

+806
-442
lines changed

Some content is hidden

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

54 files changed

+806
-442
lines changed

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

+3-3
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.nodeData;
58+
auto & commissionData = nodeData.Get<CommissionNodeData>();
5959

6060
auto discriminator = commissionData.longDiscriminator;
6161
auto vendorId = static_cast<VendorId>(commissionData.vendorId);
@@ -64,7 +64,7 @@ void DeviceScanner::OnNodeDiscovered(const DiscoveredNodeData & nodeData)
6464
ChipLogProgress(chipTool, "OnNodeDiscovered (MDNS): discriminator: %u, vendorId: %u, productId: %u", discriminator, vendorId,
6565
productId);
6666

67-
auto & resolutionData = nodeData.resolutionData;
67+
auto & resolutionData = (CommonResolutionData &)commissionData;
6868

6969
auto & instanceData = mDiscoveredResults[commissionData.instanceName];
7070
auto & interfaceData = instanceData[resolutionData.interfaceId.GetPlatformInterface()];
@@ -76,7 +76,7 @@ void DeviceScanner::OnNodeDiscovered(const DiscoveredNodeData & nodeData)
7676
interfaceData.push_back(result);
7777
}
7878

79-
nodeData.LogDetail();
79+
commissionData.LogDetail();
8080
}
8181

8282
void DeviceScanner::OnBrowseAdd(chip::Dnssd::DnssdService service)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,12 @@ CHIP_ERROR LogIssueNOCChain(const char * noc, const char * icac, const char * rc
204204
return gDelegate->LogJSON(valueStr.c_str());
205205
}
206206

207-
CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::DiscoveredNodeData & nodeData)
207+
CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::CommissionNodeData & nodeData)
208208
{
209209
VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR);
210210

211-
auto & resolutionData = nodeData.resolutionData;
212-
auto & commissionData = nodeData.nodeData;
211+
auto & commissionData = nodeData;
212+
auto & resolutionData = (chip::Dnssd::CommonResolutionData &)commissionData;
213213

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ CHIP_ERROR LogErrorAsJSON(const CHIP_ERROR & error);
4343
CHIP_ERROR LogGetCommissionerNodeId(chip::NodeId value);
4444
CHIP_ERROR LogGetCommissionerRootCertificate(const char * value);
4545
CHIP_ERROR LogIssueNOCChain(const char * noc, const char * icac, const char * rcac, const char * ipk);
46-
CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::DiscoveredNodeData & nodeData);
46+
CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::CommissionNodeData & nodeData);
4747
void SetDelegate(RemoteDataModelLoggerDelegate * delegate);
4848
}; // namespace RemoteDataModelLogger

‎examples/chip-tool/commands/discover/DiscoverCommissionablesCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
using namespace ::chip;
2525

26-
void DiscoverCommissionablesCommandBase::OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData)
26+
void DiscoverCommissionablesCommandBase::OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData & nodeData)
2727
{
2828
nodeData.LogDetail();
2929
LogErrorOnFailure(RemoteDataModelLogger::LogDiscoveredNodeData(nodeData));

‎examples/chip-tool/commands/discover/DiscoverCommissionablesCommand.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class DiscoverCommissionablesCommandBase : public CHIPCommand, public chip::Cont
3131
}
3232

3333
/////////// DeviceDiscoveryDelegate Interface /////////
34-
void OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData) override;
34+
void OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData & nodeData) override;
3535

3636
/////////// CHIPCommand Interface /////////
3737
chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(30); }

‎examples/chip-tool/commands/discover/DiscoverCommissionersCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void DiscoverCommissionersCommand::Shutdown()
3232
[[maybe_unused]] int commissionerCount = 0;
3333
for (int i = 0; i < CHIP_DEVICE_CONFIG_MAX_DISCOVERED_NODES; i++)
3434
{
35-
const Dnssd::DiscoveredNodeData * commissioner = mCommissionableNodeController.GetDiscoveredCommissioner(i);
35+
const Dnssd::CommissionNodeData * commissioner = mCommissionableNodeController.GetDiscoveredCommissioner(i);
3636
if (commissioner != nullptr)
3737
{
3838
ChipLogProgress(chipTool, "Discovered Commissioner #%d", commissionerCount);

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -479,12 +479,12 @@ void PairingCommand::OnICDStayActiveComplete(NodeId deviceId, uint32_t promisedA
479479
ChipLogValueX64(deviceId), promisedActiveDuration);
480480
}
481481

482-
void PairingCommand::OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData)
482+
void PairingCommand::OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData & nodeData)
483483
{
484484
// Ignore nodes with closed commissioning window
485-
VerifyOrReturn(nodeData.nodeData.commissioningMode != 0);
485+
VerifyOrReturn(nodeData.commissioningMode != 0);
486486

487-
auto & resolutionData = nodeData.resolutionData;
487+
auto & resolutionData = (chip::Dnssd::CommonResolutionData &)nodeData;
488488

489489
const uint16_t port = resolutionData.port;
490490
char buf[chip::Inet::IPAddress::kMaxStringLength];

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class PairingCommand : public CHIPCommand,
201201
void OnICDStayActiveComplete(NodeId deviceId, uint32_t promisedActiveDuration) override;
202202

203203
/////////// DeviceDiscoveryDelegate Interface /////////
204-
void OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData) override;
204+
void OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData & nodeData) override;
205205

206206
/////////// DeviceAttestationDelegate /////////
207207
chip::Optional<uint16_t> FailSafeExpiryTimeoutSecs() const override;

‎examples/platform/linux/ControllerShellCommands.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,16 @@ static CHIP_ERROR display(bool printHeader)
116116

117117
for (int i = 0; i < 10; i++)
118118
{
119-
const Dnssd::DiscoveredNodeData * next = GetDeviceCommissioner()->GetDiscoveredDevice(i);
119+
const Dnssd::CommissionNodeData * next = GetDeviceCommissioner()->GetDiscoveredDevice(i);
120120
if (next == nullptr)
121121
{
122122
streamer_printf(sout, " Entry %d null\r\n", i);
123123
}
124124
else
125125
{
126126
streamer_printf(sout, " Entry %d instanceName=%s host=%s longDiscriminator=%d vendorId=%d productId=%d\r\n", i,
127-
next->nodeData.instanceName, next->resolutionData.hostName, next->nodeData.longDiscriminator,
128-
next->nodeData.vendorId, next->nodeData.productId);
127+
next->instanceName, next->hostName, next->longDiscriminator,
128+
next->vendorId, next->productId);
129129
}
130130
}
131131

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ CHIP_ERROR convertTargetVideoPlayerInfoToJVideoPlayer(TargetVideoPlayerInfo * ta
301301
}
302302

303303
CHIP_ERROR convertJDiscoveredNodeDataToCppDiscoveredNodeData(jobject jDiscoveredNodeData,
304-
chip::Dnssd::DiscoveredNodeData & outCppDiscoveredNodeData)
304+
chip::Dnssd::CommissionNodeData & outCppDiscoveredNodeData)
305305
{
306306
ChipLogProgress(AppServer, "convertJDiscoveredNodeDataToCppDiscoveredNodeData called");
307307
VerifyOrReturnError(jDiscoveredNodeData != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -316,69 +316,69 @@ CHIP_ERROR convertJDiscoveredNodeDataToCppDiscoveredNodeData(jobject jDiscovered
316316
jstring jHostName = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getHostNameField));
317317
if (jHostName != nullptr)
318318
{
319-
chip::Platform::CopyString(outCppDiscoveredNodeData.resolutionData.hostName, chip::Dnssd::kHostNameMaxLength + 1,
319+
chip::Platform::CopyString(outCppDiscoveredNodeData.hostName, chip::Dnssd::kHostNameMaxLength + 1,
320320
env->GetStringUTFChars(jHostName, 0));
321321
}
322322

323323
jfieldID getInstanceNameField = env->GetFieldID(jDiscoveredNodeDataClass, "instanceName", "Ljava/lang/String;");
324324
jstring jInstanceName = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getInstanceNameField));
325325
if (jInstanceName != nullptr)
326326
{
327-
chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.instanceName,
327+
chip::Platform::CopyString(outCppDiscoveredNodeData.instanceName,
328328
chip::Dnssd::Commission::kInstanceNameMaxLength + 1, env->GetStringUTFChars(jInstanceName, 0));
329329
}
330330

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

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

338338
jfieldID jProductIdField = env->GetFieldID(jDiscoveredNodeDataClass, "productId", "J");
339-
outCppDiscoveredNodeData.nodeData.productId = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jProductIdField));
339+
outCppDiscoveredNodeData.productId = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jProductIdField));
340340

341341
jfieldID jCommissioningModeField = env->GetFieldID(jDiscoveredNodeDataClass, "commissioningMode", "B");
342-
outCppDiscoveredNodeData.nodeData.commissioningMode =
342+
outCppDiscoveredNodeData.commissioningMode =
343343
static_cast<uint8_t>(env->GetByteField(jDiscoveredNodeData, jCommissioningModeField));
344344

345345
jfieldID jDeviceTypeField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceType", "J");
346-
outCppDiscoveredNodeData.nodeData.deviceType = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jDeviceTypeField));
346+
outCppDiscoveredNodeData.deviceType = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jDeviceTypeField));
347347

348348
jfieldID getDeviceNameField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceName", "Ljava/lang/String;");
349349
jstring jDeviceName = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getDeviceNameField));
350350
if (jDeviceName != nullptr)
351351
{
352-
chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
352+
chip::Platform::CopyString(outCppDiscoveredNodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
353353
env->GetStringUTFChars(jDeviceName, 0));
354354
}
355355

356356
// TODO: map rotating ID
357357
jfieldID jRotatingIdLenField = env->GetFieldID(jDiscoveredNodeDataClass, "rotatingIdLen", "I");
358-
outCppDiscoveredNodeData.nodeData.rotatingIdLen =
358+
outCppDiscoveredNodeData.rotatingIdLen =
359359
static_cast<size_t>(env->GetIntField(jDiscoveredNodeData, jRotatingIdLenField));
360360

361361
jfieldID jPairingHintField = env->GetFieldID(jDiscoveredNodeDataClass, "pairingHint", "S");
362-
outCppDiscoveredNodeData.nodeData.pairingHint =
362+
outCppDiscoveredNodeData.pairingHint =
363363
static_cast<uint16_t>(env->GetShortField(jDiscoveredNodeData, jPairingHintField));
364364

365365
jfieldID getPairingInstructionField = env->GetFieldID(jDiscoveredNodeDataClass, "pairingInstruction", "Ljava/lang/String;");
366366
jstring jPairingInstruction = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getPairingInstructionField));
367367
if (jPairingInstruction != nullptr)
368368
{
369-
chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.pairingInstruction, chip::Dnssd::kMaxPairingInstructionLen + 1,
369+
chip::Platform::CopyString(outCppDiscoveredNodeData.pairingInstruction, chip::Dnssd::kMaxPairingInstructionLen + 1,
370370
env->GetStringUTFChars(jPairingInstruction, 0));
371371
}
372372

373373
jfieldID jPortField = env->GetFieldID(jDiscoveredNodeDataClass, "port", "I");
374-
outCppDiscoveredNodeData.resolutionData.port = static_cast<uint16_t>(env->GetIntField(jDiscoveredNodeData, jPortField));
374+
outCppDiscoveredNodeData.port = static_cast<uint16_t>(env->GetIntField(jDiscoveredNodeData, jPortField));
375375

376376
jfieldID jNumIpsField = env->GetFieldID(jDiscoveredNodeDataClass, "numIPs", "I");
377-
outCppDiscoveredNodeData.resolutionData.numIPs = static_cast<size_t>(env->GetIntField(jDiscoveredNodeData, jNumIpsField));
377+
outCppDiscoveredNodeData.numIPs = static_cast<size_t>(env->GetIntField(jDiscoveredNodeData, jNumIpsField));
378378

379379
jfieldID jIPAddressesField = env->GetFieldID(jDiscoveredNodeDataClass, "ipAddresses", "Ljava/util/List;");
380380
jobject jIPAddresses = env->GetObjectField(jDiscoveredNodeData, jIPAddressesField);
381-
if (jIPAddresses == nullptr && outCppDiscoveredNodeData.resolutionData.numIPs > 0)
381+
if (jIPAddresses == nullptr && outCppDiscoveredNodeData.numIPs > 0)
382382
{
383383
return CHIP_ERROR_INVALID_ARGUMENT;
384384
}
@@ -400,11 +400,11 @@ CHIP_ERROR convertJDiscoveredNodeDataToCppDiscoveredNodeData(jobject jDiscovered
400400
chip::Inet::IPAddress addressInet;
401401
chip::JniUtfString addressJniString(env, jIPAddressStr);
402402
VerifyOrReturnError(chip::Inet::IPAddress::FromString(addressJniString.c_str(), addressInet), CHIP_ERROR_INVALID_ARGUMENT);
403-
outCppDiscoveredNodeData.resolutionData.ipAddress[ipAddressCount] = addressInet;
403+
outCppDiscoveredNodeData.ipAddress[ipAddressCount] = addressInet;
404404

405405
if (ipAddressCount == 0)
406406
{
407-
outCppDiscoveredNodeData.resolutionData.interfaceId = chip::Inet::InterfaceId::FromIPAddress(addressInet);
407+
outCppDiscoveredNodeData.interfaceId = chip::Inet::InterfaceId::FromIPAddress(addressInet);
408408
}
409409
ipAddressCount++;
410410
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ CHIP_ERROR convertJVideoPlayerToTargetVideoPlayerInfo(jobject videoPlayer, Targe
3333
CHIP_ERROR convertTargetVideoPlayerInfoToJVideoPlayer(TargetVideoPlayerInfo * targetVideoPlayerInfo, jobject & outVideoPlayer);
3434

3535
CHIP_ERROR convertJDiscoveredNodeDataToCppDiscoveredNodeData(jobject jDiscoveredNodeData,
36-
chip::Dnssd::DiscoveredNodeData & cppDiscoveredNodeData);
36+
chip::Dnssd::CommissionNodeData & cppDiscoveredNodeData);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ JNI_METHOD(jboolean, sendCommissioningRequest)(JNIEnv * env, jobject, jobject jD
372372
chip::DeviceLayer::StackLock lock;
373373
ChipLogProgress(AppServer, "JNI_METHOD sendCommissioningRequest called");
374374

375-
chip::Dnssd::DiscoveredNodeData commissioner;
375+
chip::Dnssd::CommissionNodeData commissioner;
376376
CHIP_ERROR err = convertJDiscoveredNodeDataToCppDiscoveredNodeData(jDiscoveredNodeData, commissioner);
377377
VerifyOrExit(err == CHIP_NO_ERROR,
378378
ChipLogError(AppServer,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ - (void)getDiscoveredCommissioner:(int)index
456456
block:^{
457457
chip::Optional<TargetVideoPlayerInfo *> associatedConnectableVideoPlayer;
458458
DiscoveredNodeData * commissioner = nil;
459-
const chip::Dnssd::DiscoveredNodeData * cppDiscoveredNodeData
459+
const chip::Dnssd::CommissionNodeData * cppDiscoveredNodeData
460460
= CastingServer::GetInstance()->GetDiscoveredCommissioner(
461461
index, associatedConnectableVideoPlayer);
462462
if (cppDiscoveredNodeData != nullptr) {
@@ -530,7 +530,7 @@ - (void)sendUserDirectedCommissioningRequest:(DiscoveredNodeData * _Nonnull)comm
530530
block:^{
531531
bool udcRequestStatus;
532532

533-
chip::Dnssd::DiscoveredNodeData cppCommissioner;
533+
chip::Dnssd::CommissionNodeData cppCommissioner;
534534
if ([ConversionUtils convertToCppDiscoveredNodeDataFrom:commissioner
535535
outDiscoveredNodeData:cppCommissioner]
536536
!= CHIP_NO_ERROR) {

‎examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CommissionerDiscoveryDelegateImpl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ class CommissionerDiscoveryDelegateImpl : public chip::Controller::DeviceDiscove
6161
}
6262
}
6363

64-
void OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData)
64+
void OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData & nodeData)
6565
{
6666
ChipLogProgress(AppServer, "CommissionerDiscoveryDelegateImpl().OnDiscoveredDevice() called");
67-
__block const chip::Dnssd::DiscoveredNodeData cppNodeData = nodeData;
67+
__block const chip::Dnssd::CommissionNodeData cppNodeData = nodeData;
6868
dispatch_async(mClientQueue, ^{
6969
DiscoveredNodeData * objCDiscoveredNodeData = [ConversionUtils convertToObjCDiscoveredNodeDataFrom:&cppNodeData];
7070
mDiscoveredCommissioners.push_back(objCDiscoveredNodeData); // add to the list of discovered commissioners

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
outTargetVideoPlayerInfo:(TargetVideoPlayerInfo &)outTargetVideoPlayerInfo;
4444

4545
+ (CHIP_ERROR)convertToCppDiscoveredNodeDataFrom:(DiscoveredNodeData * _Nonnull)objCDiscoveredNodeData
46-
outDiscoveredNodeData:(chip::Dnssd::DiscoveredNodeData &)outDiscoveredNodeData;
46+
outDiscoveredNodeData:(chip::Dnssd::CommissionNodeData &)outDiscoveredNodeData;
4747

4848
/**
4949
* @brief C++ to Objective C converters
5050
*/
5151
+ (ContentApp * _Nonnull)convertToObjCContentAppFrom:(TargetEndpointInfo * _Nonnull)cppTargetEndpointInfo;
5252

5353
+ (DiscoveredNodeData * _Nonnull)convertToObjCDiscoveredNodeDataFrom:
54-
(const chip::Dnssd::DiscoveredNodeData * _Nonnull)cppDiscoveredNodedata;
54+
(const chip::Dnssd::CommissionNodeData * _Nonnull)cppDiscoveredNodedata;
5555

5656
+ (VideoPlayer * _Nonnull)convertToObjCVideoPlayerFrom:(TargetVideoPlayerInfo * _Nonnull)cppTargetVideoPlayerInfo;
5757

0 commit comments

Comments
 (0)