Make chip::Dnssd::kMaxDeviceNameLen configurable

sharadb-amazon · Apr 17, 2024 · 9961c45 · 9961c45
1 parent 035d302
commit 9961c45
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/examples/tv-casting-app/android/args.gni b/examples/tv-casting-app/android/args.gni
@@ -34,4 +34,6 @@ chip_config_network_layer_ble = false
 
 chip_max_discovered_ip_addresses = 20
 
+chip_max_device_name_len = 128
+
 enable_rtti = true
diff --git a/examples/tv-casting-app/darwin/args.gni b/examples/tv-casting-app/darwin/args.gni
@@ -38,3 +38,5 @@ chip_enable_rotating_device_id = true
 chip_config_network_layer_ble = false
 
 chip_max_discovered_ip_addresses = 20
+
+chip_max_device_name_len = 128
diff --git a/examples/tv-casting-app/linux/args.gni b/examples/tv-casting-app/linux/args.gni
@@ -32,4 +32,6 @@ chip_enable_rotating_device_id = true
 
 chip_max_discovered_ip_addresses = 20
 
+chip_max_device_name_len = 128
+
 matter_enable_tracing_support = true
diff --git a/src/lib/dnssd/Types.h b/src/lib/dnssd/Types.h
@@ -200,7 +200,7 @@ struct OperationalNodeData
     void Reset() { peerId = PeerId(); }
 };
 
-inline constexpr size_t kMaxDeviceNameLen         = 32;
+inline constexpr size_t kMaxDeviceNameLen         = CHIP_DEVICE_CONFIG_MAX_DEVICE_NAME_LEN;
 inline constexpr size_t kMaxRotatingIdLen         = 50;
 inline constexpr size_t kMaxPairingInstructionLen = 128;
 

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -81,6 +81,9 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
     # Define the default number of ip addresses to discover
     chip_max_discovered_ip_addresses = 5
 
+    # Maximum length of the deviceName in the node discovery data
+    chip_max_device_name_len = 32
+
     # Allows enabling dynamic setting of the local MRP configuration, for
     # devices with multiple radios that have different sleep behavior for
     # different radios.
@@ -380,7 +383,10 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       defines += [ "CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID=${chip_device_config_device_product_id}" ]
     }
 
-    defines += [ "CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES=${chip_max_discovered_ip_addresses}" ]
+    defines += [
+      "CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES=${chip_max_discovered_ip_addresses}",
+      "CHIP_DEVICE_CONFIG_MAX_DEVICE_NAME_LEN=${chip_max_device_name_len}",
+    ]
 
     visibility = [
       ":platform_config_header",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,4 +34,6 @@ chip_config_network_layer_ble = false

		chip_max_discovered_ip_addresses = 20

		chip_max_device_name_len = 128

		enable_rtti = true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,3 +38,5 @@ chip_enable_rotating_device_id = true
		chip_config_network_layer_ble = false

		chip_max_discovered_ip_addresses = 20

		chip_max_device_name_len = 128
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,6 @@ chip_enable_rotating_device_id = true

		chip_max_discovered_ip_addresses = 20

		chip_max_device_name_len = 128

		matter_enable_tracing_support = true