Skip to content

Commit 8a4c025

Browse files
[OpenThread] Increase SRP service count (project-chip#19900)
We assumed that MAX_FABRICS + 1 slots for SRP services is enough, but to pass Pre-SVE tests it must be possible to open the commissioning window after having been commissioned to MAX_FABRICS fabrics, and the commissionable instance name changes on opening the window. Therefore, if the extended discovery is enabled, two slots for the commissionable services are needed for a short time: the old service to be removed and the new service to be added. Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
1 parent 47c9ea5 commit 8a4c025

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/include/platform/CHIPDeviceConfig.h

+6
Original file line numberDiff line numberDiff line change
@@ -799,8 +799,14 @@
799799
* Amount of services available for advertising using SRP.
800800
*/
801801
#ifndef CHIP_DEVICE_CONFIG_THREAD_SRP_MAX_SERVICES
802+
#if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY && CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY
803+
#define CHIP_DEVICE_CONFIG_THREAD_SRP_MAX_SERVICES (CHIP_CONFIG_MAX_FABRICS + 3)
804+
#elif CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY || CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY
805+
#define CHIP_DEVICE_CONFIG_THREAD_SRP_MAX_SERVICES (CHIP_CONFIG_MAX_FABRICS + 2)
806+
#else
802807
#define CHIP_DEVICE_CONFIG_THREAD_SRP_MAX_SERVICES (CHIP_CONFIG_MAX_FABRICS + 1)
803808
#endif
809+
#endif
804810

805811
/**
806812
* CHIP_DEVICE_CONFIG_ENABLE_THREAD_COMMISSIONABLE_DISCOVERY

src/platform/qpg/CHIPDevicePlatformConfig.h

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#if CHIP_ENABLE_OPENTHREAD
3434
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD 1
3535
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
36-
#define CHIP_DEVICE_CONFIG_THREAD_SRP_MAX_SERVICES (CHIP_CONFIG_MAX_FABRICS + 1)
3736
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT 1
3837
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_COMMISSIONABLE_DISCOVERY 1
3938
#endif

0 commit comments

Comments
 (0)