From 2bca368b1e7e7f8af805a98d55fed95383e1f6c7 Mon Sep 17 00:00:00 2001 From: chendejin Date: Mon, 30 Jun 2025 17:25:13 +0800 Subject: [PATCH 1/2] feat(openthread): move mesh local address judeging function to public --- .../openthread/include/esp_openthread_netif_glue.h | 11 +++++++++++ .../private_include/esp_openthread_netif_glue_priv.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/openthread/include/esp_openthread_netif_glue.h b/components/openthread/include/esp_openthread_netif_glue.h index b71d29d24a..c386cfd6c5 100644 --- a/components/openthread/include/esp_openthread_netif_glue.h +++ b/components/openthread/include/esp_openthread_netif_glue.h @@ -76,6 +76,17 @@ esp_netif_t *esp_openthread_get_netif(void); */ void esp_openthread_register_meshcop_e_handler(esp_event_handler_t handler, bool for_publish); +/** + * @brief This function judges the target address is openthread mesh local or not. + * + * @param[in] address The address. + * + * @return + * - True if the address is openthread mesh local, otherwise false + * + */ +bool is_openthread_internal_mesh_local_addr(const otIp6Address *address); + #ifdef __cplusplus } #endif diff --git a/components/openthread/private_include/esp_openthread_netif_glue_priv.h b/components/openthread/private_include/esp_openthread_netif_glue_priv.h index d5a9d1c072..ceebe3db4d 100644 --- a/components/openthread/private_include/esp_openthread_netif_glue_priv.h +++ b/components/openthread/private_include/esp_openthread_netif_glue_priv.h @@ -36,17 +36,6 @@ void esp_openthread_netif_glue_update(esp_openthread_mainloop_context_t *mainloo */ esp_err_t esp_openthread_netif_glue_process(otInstance *instance, const esp_openthread_mainloop_context_t *mainloop); -/** - * @brief This function judges the target address is openthread mesh local or not. - * - * @param[in] address The address. - * - * @return - * - True if the address is openthread mesh local, otherwise false - * - */ -bool is_openthread_internal_mesh_local_addr(const otIp6Address *address); - #ifdef __cplusplus } #endif From 4aa70712fae60352a7fae7ebaaa5ab1e65a6e1d3 Mon Sep 17 00:00:00 2001 From: Chen Dejin Date: Mon, 30 Jun 2025 12:13:19 +0000 Subject: [PATCH 2/2] fix(openthread/discovery): use mesh local for self-hosted service if OMR is not preferred * esp-openthread: thread_zigbee/esp-openthread@f54481eb0 * openthread: espressif/openthread@b945928d7 * esp-idf: espressif/esp-idf@2bca368b1 --- components/openthread/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/openthread/lib b/components/openthread/lib index fff1e900a1..8f3bd568ba 160000 --- a/components/openthread/lib +++ b/components/openthread/lib @@ -1 +1 @@ -Subproject commit fff1e900a1169e76ea06246100f81d005d5f7f44 +Subproject commit 8f3bd568ba77a5194e501b849966bc0ea16a8aff