bluetooth: mesh: Use bt_get_name to get device name #81901
+39
−15
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
By default if CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME or CONFIG_BT_MESH_PB_GATT_USE_DEVICE_NAME is enabled, the mesh stack will add BT_DATA_NAME_COMPLETE AD Type along with the Mesh Proxy Service or Mesh Provisioning Service advertisements accordingly. When BT_LE_ADV_OPT_USE_NAME was present and CONFIG_BT_DEVICE_NAME_DYNAMIC is enabled, the advertised name was automatically updated by the host. This turned out to be a side-effect rather than expected behavior and after zephyrproject-rtos#71700 this behavior waa changed. But customers use dynamic name feature. This commit makes the mesh stack use bt_get_name to get the device name, which returns runtime name if CONFIG_BT_DEVICE_NAME_DYNAMIC is enabled. Signed-off-by: Pavel Vasilyev <[email protected]>
zephyrbot
requested review from
akredalen,
alxelax,
Andrewpini,
HaavardRei,
jhedberg,
KyraLengfeld,
LingaoM and
omkar3141
jhedberg
reviewed
Nov 25, 2024
Comment on lines
+41
to
+45
| #if defined(CONFIG_BT_DEVICE_NAME_DYNAMIC) | ||
| #define BT_DEVICE_NAME_LEN strlen(bt_get_name()) | ||
| #else | ||
| #define BT_DEVICE_NAME_LEN (sizeof(CONFIG_BT_DEVICE_NAME) - 1) | ||
| #endif |
There was a problem hiding this comment.
Did you consider putting variants of a #define BT_DEVICE_NAME into the conditional branches too, so that in the static case you don't end up resolving to a function call but just a string literal? I suspect the compiler will likely optimize this anyway since it should know that bt_get_name() just returns the string literal, but since you have these conditional branches anyway you could remove some doubt by just having that extra define.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By default if CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME or CONFIG_BT_MESH_PB_GATT_USE_DEVICE_NAME is enabled, the mesh stack will add BT_DATA_NAME_COMPLETE AD Type along with the Mesh Proxy Service or Mesh Provisioning Service advertisements accordingly.
When BT_LE_ADV_OPT_USE_NAME was present and
CONFIG_BT_DEVICE_NAME_DYNAMIC is enabled, the advertised name was automatically updated by the host. This turned out to be a side-effect rather than expected behavior and after #71700 this behavior waa changed.
But customers use dynamic name feature.
This commit makes the mesh stack use bt_get_name to get the device name, which returns runtime name if CONFIG_BT_DEVICE_NAME_DYNAMIC is enabled.