Skip to content

Commit 97964db

Browse files
[dnssd] remove constants for _A subtype and AP TXT field (project-chip#28332)
* [dnssd] remove constants for _A subtype and AP TXT field The _A subtype and AP TXT field were removed from the spec long time ago but the constants describing the maximum lengths are still present in the SDK. * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 4fe0df0 commit 97964db

File tree

2 files changed

+15
-20
lines changed

2 files changed

+15
-20
lines changed

src/lib/dnssd/Constants.h

+7-9
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ constexpr size_t kHostNameMaxLength = 16; // MAC or 802.15.4 Extended Address in
3535
* Matter DNS service subtypes
3636
*/
3737

38-
constexpr size_t kSubTypeShortDiscriminatorMaxLength = 4; // _S<dd>
39-
constexpr size_t kSubTypeLongDiscriminatorMaxLength = 6; // _L<dddd>
40-
constexpr size_t kSubTypeVendorIdMaxLength = 7; // _V<ddddd>
41-
constexpr size_t kSubTypeDeviceTypeMaxLength = 12; // _T<dddddddddd>
42-
constexpr size_t kSubTypeCommissioningModeMaxLength = 3; // _C<d>
43-
constexpr size_t kSubTypeAdditionalCommissioningMaxLength = 3; // _A<d>
44-
constexpr size_t kSubTypeCompressedFabricIdMaxLength = 18; // _I<16-hex-digits>
38+
constexpr size_t kSubTypeShortDiscriminatorMaxLength = 4; // _S<dd>
39+
constexpr size_t kSubTypeLongDiscriminatorMaxLength = 6; // _L<dddd>
40+
constexpr size_t kSubTypeVendorIdMaxLength = 7; // _V<ddddd>
41+
constexpr size_t kSubTypeDeviceTypeMaxLength = 12; // _T<dddddddddd>
42+
constexpr size_t kSubTypeCommissioningModeMaxLength = 3; // _CM
43+
constexpr size_t kSubTypeCompressedFabricIdMaxLength = 18; // _I<16-hex-digits>
4544

4645
/*
4746
* Matter operational node service settings
@@ -68,8 +67,7 @@ namespace Commission {
6867

6968
#define SUBTYPES \
7069
(std::initializer_list<size_t>{ kSubTypeShortDiscriminatorMaxLength, kSubTypeLongDiscriminatorMaxLength, \
71-
kSubTypeVendorIdMaxLength, kSubTypeDeviceTypeMaxLength, kSubTypeCommissioningModeMaxLength, \
72-
kSubTypeAdditionalCommissioningMaxLength })
70+
kSubTypeVendorIdMaxLength, kSubTypeDeviceTypeMaxLength, kSubTypeCommissioningModeMaxLength })
7371

7472
constexpr size_t kInstanceNameMaxLength = 16; // 64-bit random number in hex
7573
constexpr size_t kSubTypeMaxNumber = SUBTYPES.size();

src/lib/dnssd/TxtFields.h

+8-11
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@ static constexpr System::Clock::Milliseconds32 kMaxRetryInterval = 3600000_ms32;
3838
static constexpr size_t kKeyTcpSupportedMaxLength = 1;
3939

4040
// Commissionable/commissioner node TXT entries
41-
static constexpr size_t kKeyLongDiscriminatorMaxLength = 5;
42-
static constexpr size_t kKeyVendorProductMaxLength = 11;
43-
static constexpr size_t kKeyAdditionalCommissioningMaxLength = 1;
44-
static constexpr size_t kKeyCommissioningModeMaxLength = 1;
45-
static constexpr size_t kKeyDeviceTypeMaxLength = 10;
46-
static constexpr size_t kKeyDeviceNameMaxLength = 32;
47-
static constexpr size_t kKeyRotatingDeviceIdMaxLength = 100;
48-
static constexpr size_t kKeyPairingInstructionMaxLength = 128;
49-
static constexpr size_t kKeyPairingHintMaxLength = 10;
41+
static constexpr size_t kKeyLongDiscriminatorMaxLength = 5;
42+
static constexpr size_t kKeyVendorProductMaxLength = 11;
43+
static constexpr size_t kKeyCommissioningModeMaxLength = 1;
44+
static constexpr size_t kKeyDeviceTypeMaxLength = 10;
45+
static constexpr size_t kKeyDeviceNameMaxLength = 32;
46+
static constexpr size_t kKeyRotatingDeviceIdMaxLength = 100;
47+
static constexpr size_t kKeyPairingInstructionMaxLength = 128;
48+
static constexpr size_t kKeyPairingHintMaxLength = 10;
5049

5150
enum class TxtKeyUse : uint8_t
5251
{
@@ -60,7 +59,6 @@ enum class TxtFieldKey : uint8_t
6059
kUnknown,
6160
kLongDiscriminator,
6261
kVendorProduct,
63-
kAdditionalPairing,
6462
kCommissioningMode,
6563
kDeviceType,
6664
kDeviceName,
@@ -87,7 +85,6 @@ constexpr const TxtFieldInfo txtFieldInfo[static_cast<size_t>(TxtFieldKey::kCoun
8785
{ TxtFieldKey::kUnknown, 0, "", TxtKeyUse::kNone },
8886
{ TxtFieldKey::kLongDiscriminator, kKeyLongDiscriminatorMaxLength, "D", TxtKeyUse::kCommission },
8987
{ TxtFieldKey::kVendorProduct, kKeyVendorProductMaxLength, "VP", TxtKeyUse::kCommission },
90-
{ TxtFieldKey::kAdditionalPairing, kKeyAdditionalCommissioningMaxLength, "AP", TxtKeyUse::kCommission },
9188
{ TxtFieldKey::kCommissioningMode, kKeyCommissioningModeMaxLength, "CM", TxtKeyUse::kCommission },
9289
{ TxtFieldKey::kDeviceType, kKeyDeviceTypeMaxLength, "DT", TxtKeyUse::kCommission },
9390
{ TxtFieldKey::kDeviceName, kKeyDeviceNameMaxLength, "DN", TxtKeyUse::kCommission },

0 commit comments

Comments
 (0)