From 820c37fbb77fb6aebee12b77cab19ad96c77aa5b 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 3d70c8a7f7..31197195f4 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 a9d287593ba8d696e50b60ce99340a2333b2129a Mon Sep 17 00:00:00 2001 From: Chen Dejin Date: Tue, 1 Jul 2025 03:00:23 +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@820c37fbb --- components/openthread/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/openthread/lib b/components/openthread/lib index 82d979d37a..ba23976c8d 160000 --- a/components/openthread/lib +++ b/components/openthread/lib @@ -1 +1 @@ -Subproject commit 82d979d37af37abd1d23254f25cd52c699892406 +Subproject commit ba23976c8dd357ee696b2448b274797b40c0fc12