From fe038ac125271f6ce269a0bbef821e60f9ec2300 Mon Sep 17 00:00:00 2001 From: Yakun Xu Date: Thu, 12 Feb 2026 12:38:39 +0800 Subject: [PATCH] Thread: fixing style issues --- src/app/server/BUILD.gn | 19 +++++++++++++------ src/app/server/Dnssd.cpp | 6 +----- .../server/ThreadRendezvousAnnouncement.cpp | 10 +++------- src/app/server/ThreadRendezvousAnnouncement.h | 4 ---- src/app/server/tests/BUILD.gn | 1 + .../TestThreadRendezvousAnnouncement.cpp | 11 ----------- src/lib/dnssd/minimal_mdns/core/QNameString.h | 6 ++++++ .../core/tests/TestQNameString.cpp | 13 +++++++++++++ 8 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/app/server/BUILD.gn b/src/app/server/BUILD.gn index e6ff77aa418aa0..e5db0bd07437d2 100644 --- a/src/app/server/BUILD.gn +++ b/src/app/server/BUILD.gn @@ -58,6 +58,18 @@ source_set("joint_fabric") { ] } +static_library("thread_rendezvous_announcement") { + sources = [ + "ThreadRendezvousAnnouncement.cpp", + "ThreadRendezvousAnnouncement.h", + ] + deps = [ + "${chip_root}/src/lib/core", + "${chip_root}/src/lib/dnssd", + "${chip_root}/src/lib/dnssd/minimal_mdns", + ] +} + static_library("server") { output_name = "libCHIPAppServer" @@ -76,8 +88,6 @@ static_library("server") { "EchoHandler.h", "Server.cpp", "Server.h", - "ThreadRendezvousAnnouncement.cpp", - "ThreadRendezvousAnnouncement.h", ] public_configs = [ ":server_config" ] @@ -102,10 +112,7 @@ static_library("server") { ] if (chip_device_config_enable_thread_meshcop) { - public_deps += [ - "${chip_root}/src/lib/dnssd/minimal_mdns", - "${chip_root}/src/lib/dnssd/minimal_mdns/records", - ] + deps = [ ":thread_rendezvous_announcement" ] } if (chip_terms_and_conditions_required) { diff --git a/src/app/server/Dnssd.cpp b/src/app/server/Dnssd.cpp index 486ee9999b6b17..fd1c4f759632ab 100644 --- a/src/app/server/Dnssd.cpp +++ b/src/app/server/Dnssd.cpp @@ -41,12 +41,8 @@ #include #if CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP -#include -#include -#include -#include - #include +#include // nogncheck #endif using namespace chip; diff --git a/src/app/server/ThreadRendezvousAnnouncement.cpp b/src/app/server/ThreadRendezvousAnnouncement.cpp index d2511021d45873..5deb3fe468cc74 100644 --- a/src/app/server/ThreadRendezvousAnnouncement.cpp +++ b/src/app/server/ThreadRendezvousAnnouncement.cpp @@ -23,11 +23,9 @@ #include -#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP -#include // nogncheck -#include // nogncheck -#include // nogncheck -#endif +#include +#include +#include namespace chip { namespace app { @@ -113,7 +111,6 @@ CHIP_ERROR TxtStringsBuilder::FormatAndAdd(const char * format, ...) return CHIP_NO_ERROR; } -#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP CHIP_ERROR BuildThreadRendezvousAnnouncement(const Dnssd::CommissionAdvertisingParameters & params, System::PacketBufferHandle & outBuffer) { @@ -143,7 +140,6 @@ CHIP_ERROR BuildThreadRendezvousAnnouncement(const Dnssd::CommissionAdvertisingP return CHIP_NO_ERROR; } -#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP } // namespace app } // namespace chip diff --git a/src/app/server/ThreadRendezvousAnnouncement.h b/src/app/server/ThreadRendezvousAnnouncement.h index eb48e3409a7ddf..3d413437664343 100644 --- a/src/app/server/ThreadRendezvousAnnouncement.h +++ b/src/app/server/ThreadRendezvousAnnouncement.h @@ -58,8 +58,6 @@ class TxtStringsBuilder const char * mTxtStrings[Dnssd::CommissionAdvertisingParameters::kTxtMaxNumber]; }; -#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP - /** * @brief Builds the Thread Rendezvous Announcement packet buffer. * @@ -70,7 +68,5 @@ class TxtStringsBuilder CHIP_ERROR BuildThreadRendezvousAnnouncement(const Dnssd::CommissionAdvertisingParameters & params, System::PacketBufferHandle & outBuffer); -#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP - } // namespace app } // namespace chip diff --git a/src/app/server/tests/BUILD.gn b/src/app/server/tests/BUILD.gn index 47c50776d659fc..2828ae887405ba 100644 --- a/src/app/server/tests/BUILD.gn +++ b/src/app/server/tests/BUILD.gn @@ -30,6 +30,7 @@ chip_test_suite("tests") { public_deps = [ "${chip_root}/src/app/server", "${chip_root}/src/app/server:joint_fabric", + "${chip_root}/src/app/server:thread_rendezvous_announcement", "${chip_root}/src/lib/core", "${chip_root}/src/lib/support:testing", ] diff --git a/src/app/server/tests/TestThreadRendezvousAnnouncement.cpp b/src/app/server/tests/TestThreadRendezvousAnnouncement.cpp index 4d41c4d113dcb2..9e16865c0ce13e 100644 --- a/src/app/server/tests/TestThreadRendezvousAnnouncement.cpp +++ b/src/app/server/tests/TestThreadRendezvousAnnouncement.cpp @@ -45,17 +45,6 @@ TEST_F(TestThreadRendezvousAnnouncement, TxtStringsBuilder) TxtStringsBuilder builder; EXPECT_EQ(builder.Fill(params), CHIP_NO_ERROR); - - // Expected entries: - // VP=123+456 - // D=789 - // CM=1 - // DT=1 - // DN=TestDevice - // RI=1234567890 - // PH=2 - // PI=Press button - EXPECT_EQ(builder.GetCount(), 8u); const char * const * entries = builder.GetEntries(); diff --git a/src/lib/dnssd/minimal_mdns/core/QNameString.h b/src/lib/dnssd/minimal_mdns/core/QNameString.h index 0c57954dd5d637..d01763ed5e30fb 100644 --- a/src/lib/dnssd/minimal_mdns/core/QNameString.h +++ b/src/lib/dnssd/minimal_mdns/core/QNameString.h @@ -45,12 +45,18 @@ class QNameString private: bool EndsWith(const char * aSuffix, size_t aLength) const { + if (!Fit()) + { + return false; + } + const char * buffer = mBuffer.c_str(); size_t bufferLength = strlen(buffer); if (bufferLength < aLength) { return false; } + return memcmp(buffer + bufferLength - aLength, aSuffix, aLength) == 0; } diff --git a/src/lib/dnssd/minimal_mdns/core/tests/TestQNameString.cpp b/src/lib/dnssd/minimal_mdns/core/tests/TestQNameString.cpp index a3d9a39b06767a..eace2f5a1b64c4 100644 --- a/src/lib/dnssd/minimal_mdns/core/tests/TestQNameString.cpp +++ b/src/lib/dnssd/minimal_mdns/core/tests/TestQNameString.cpp @@ -64,4 +64,17 @@ TEST_F(TestQNameString, EndsWith) EXPECT_FALSE(qName.EndsWith("test")); EXPECT_FALSE(qName.EndsWith("abc.test")); } + +TEST_F(TestQNameString, LongQName) +{ + const testing::TestQName<10> kLong({ "label1234567890", "label1234567890", "label1234567890", "label1234567890", + "label1234567890", "label1234567890", "label1234567890", "label1234567890", + "label1234567890", "label1234567890" }); + QNameString qName(kLong.Serialized()); + + // QNameString buffer is 128 bytes. 10 * 15 + 9 = 159 bytes. + EXPECT_FALSE(qName.Fit()); + // EndsWith should return false if Fit() is false, even if the suffix matches what's in the buffer + EXPECT_FALSE(qName.EndsWith("label1234567890")); +} } // namespace