From 62bf8f5a89cf73241daf90c6100d4c9665683e55 Mon Sep 17 00:00:00 2001 From: apahl-cl Date: Mon, 4 May 2026 08:08:41 -0400 Subject: [PATCH] Switch instanceName used in FindCommissionableNode (#71877) * Switch instanceName used in FindCommissionableNode * Initialize mInstanceName (cherry picked from commit c71fb1f23e5fb2222295b0f90bb081c4f023f47e) --- src/controller/CHIPDeviceController.cpp | 2 +- src/controller/CHIPDeviceController.h | 2 +- .../user_directed_commissioning/UserDirectedCommissioning.h | 2 +- .../UserDirectedCommissioningServer.cpp | 2 +- .../user_directed_commissioning/tests/TestUdcMessages.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index 6e2d35a8c530c3..f3e9e53edd3500 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -1912,7 +1912,7 @@ CHIP_ERROR DeviceCommissioner::SetUdcListenPort(uint16_t listenPort) return CHIP_NO_ERROR; } -void DeviceCommissioner::FindCommissionableNode(char * instanceName) +void DeviceCommissioner::FindCommissionableNode(const char * instanceName) { Dnssd::DiscoveryFilter filter(Dnssd::DiscoveryFilterType::kInstanceName, instanceName); DiscoverCommissionableNodes(filter); diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index bd530b8745a7a6..27250823cbbbc3 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -784,7 +784,7 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController, * @param instanceName DNS-SD instance name for the client requesting commissioning * */ - void FindCommissionableNode(char * instanceName) override; + void FindCommissionableNode(const char * instanceName) override; /** * @brief diff --git a/src/protocols/user_directed_commissioning/UserDirectedCommissioning.h b/src/protocols/user_directed_commissioning/UserDirectedCommissioning.h index 762df865bd3b3d..90d65554b531dd 100644 --- a/src/protocols/user_directed_commissioning/UserDirectedCommissioning.h +++ b/src/protocols/user_directed_commissioning/UserDirectedCommissioning.h @@ -454,7 +454,7 @@ class DLL_EXPORT InstanceNameResolver * @param instanceName DNS-SD instance name for the client requesting commissioning * */ - virtual void FindCommissionableNode(char * instanceName) = 0; + virtual void FindCommissionableNode(const char * instanceName) = 0; virtual ~InstanceNameResolver() = default; }; diff --git a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp index b2937a864ff907..1a48b8825d83e4 100644 --- a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp +++ b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp @@ -120,7 +120,7 @@ void UserDirectedCommissioningServer::HandleNewUDC(const Transport::PeerAddress // Call the registered InstanceNameResolver, if any. if (mInstanceNameResolver != nullptr) { - mInstanceNameResolver->FindCommissionableNode(instanceName); + mInstanceNameResolver->FindCommissionableNode(client->GetInstanceName()); } else { diff --git a/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp b/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp index 49d9fde5686874..e3da78e80edfd2 100644 --- a/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp +++ b/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp @@ -47,7 +47,7 @@ class DLL_EXPORT TestCallback : public UserConfirmationProvider, public Instance void OnCommissionerPasscodeReady(UDCClientState state) {} - void FindCommissionableNode(char * instanceName) + void FindCommissionableNode(const char * instanceName) { mFindCommissionableNodeCalled = true; mInstanceName = instanceName; @@ -55,7 +55,7 @@ class DLL_EXPORT TestCallback : public UserConfirmationProvider, public Instance // virtual ~UserConfirmationProvider() = default; UDCClientState mState; - char * mInstanceName; + const char * mInstanceName = nullptr; bool mOnUserDirectedCommissioningRequestCalled = false; bool mFindCommissionableNodeCalled = false;