alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/openthread_platform_udp_send_rules' into 'master'

Browse Source 
openthread: fix platform udp send rules for OT netif

See merge request espressif/esp-idf!23206
This commit is contained in:
Shu Chen 2023-04-24 14:02:21 +08:00
commit 8b422cbfa0
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/openthread/port/esp_openthread_netif_glue.c
View File

@ -68,9 +68,9 @@ static bool is_addr_locator(const otIp6Address *address)
return address->mFields.m32[2] == 0xff000000 && address->mFields.m16[6] == 0xfe;
}
static bool is_openthread_internal_mesh_local_addr(const otIp6AddressInfo *address_info)
bool is_openthread_internal_mesh_local_addr(const otIp6Address *address)
{
return is_addr_locator(address_info->mAddress) && is_mesh_local_addr(address_info->mAddress);
return is_addr_locator(address) && is_mesh_local_addr(address);
}
static esp_err_t notify_packets_pending(void)
@ -89,7 +89,7 @@ static void process_thread_address(const otIp6AddressInfo *address_info, bool is
bool is_multicast = address_info->mAddress->mFields.m8[0] == 0xff;
esp_ip6_addr_t addr;
if (is_openthread_internal_mesh_local_addr(address_info)) {
if (is_openthread_internal_mesh_local_addr(address_info->mAddress)) {
return;
}

22
components/openthread/port/esp_openthread_udp.c
View File

@ -16,6 +16,7 @@
#include "esp_openthread_common_macro.h"
#include "esp_openthread_lock.h"
#include "esp_openthread_netif_glue.h"
#include "esp_openthread_netif_glue_priv.h"
#include "esp_openthread_task_queue.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
@ -322,6 +323,7 @@ static bool is_multicast(const otIp6Address *address)
static void udp_send_task(void *ctx)
{
err_t err = ERR_OK;
udp_send_task_t *task = (udp_send_task_t *)ctx;
struct pbuf *send_buf = NULL;
uint16_t len = otMessageGetLength(task->message);
@ -349,14 +351,24 @@ static void udp_send_task(void *ctx)
task->pcb->flags |= UDP_FLAGS_MULTICAST_LOOP;
}
send_buf = pbuf_alloc(PBUF_TRANSPORT, len, PBUF_RAM);
otMessageRead(task->message, 0, send_buf->payload, len);
VerifyOrExit(send_buf != NULL);
udp_sendto(task->pcb, send_buf, &task->peer_addr, task->peer_port);
otMessageRead(task->message, 0, send_buf->payload, len);
if (task->netif_index == get_netif_index(OT_NETIF_THREAD)) {
// If the input arguments indicated the netif is OT, directly send the message.
err = udp_sendto_if_src(task->pcb, send_buf, &task->peer_addr, task->peer_port, netif_get_by_index(task->netif_index), &task->source_addr);
} else {
// Otherwise, let Lwip to determine which netif will be used.
err = udp_sendto(task->pcb, send_buf, &task->peer_addr, task->peer_port);
}
exit:
if (send_buf) {
pbuf_free(send_buf);
}
if (err != ERR_OK) {
ESP_LOGE(OT_PLAT_LOG_TAG, "Failed to Send UDP message, err: %d", err);
}
esp_openthread_task_switching_lock_acquire(portMAX_DELAY);
otMessageFree(task->message);
esp_openthread_task_switching_lock_release();
@ -376,7 +388,6 @@ otError otPlatUdpSend(otUdpSocket *udp_socket, otMessage *message, const otMessa
{
udp_send_task_t *task = (udp_send_task_t *)malloc(sizeof(udp_send_task_t));
otError error = OT_ERROR_NONE;
VerifyOrExit(task != NULL, error = OT_ERROR_NO_BUFS);
task->pcb = (struct udp_pcb *)udp_socket->mHandle;
task->message = message;
@ -396,6 +407,11 @@ otError otPlatUdpSend(otUdpSocket *udp_socket, otMessage *message, const otMessa
if (is_link_local(&message_info->mPeerAddr) || is_multicast(&message_info->mPeerAddr)) {
task->netif_index = get_netif_index(message_info->mIsHostInterface ? OT_NETIF_BACKBONE : OT_NETIF_THREAD);
}
if (is_openthread_internal_mesh_local_addr(&message_info->mPeerAddr)) {
// If the destination address is a openthread mesh local address, set the netif OT.
task->netif_index = get_netif_index(OT_NETIF_THREAD);
}
tcpip_callback(udp_send_task, task);
exit:

12
components/openthread/private_include/esp_openthread_netif_glue_priv.h
View File

@ -7,6 +7,7 @@
#pragma once
#include "esp_openthread.h"
#include "openthread/ip6.h"
#include "openthread/instance.h"
#ifdef __cplusplus
@ -44,6 +45,17 @@ 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