jess
/
EIS-BLE-S3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add mutex protection to UDP client table

This commit is contained in:
jess 2026-04-03 03:47:26 -07:00
parent 5f550f031a
commit 3e0cbfd131
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/wifi_transport.c
View File

@ -5,6 +5,7 @@
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "freertos/queue.h" #include "freertos/queue.h"
#include "freertos/semphr.h"
#include "esp_wifi.h" #include "esp_wifi.h"
#include "esp_wifi_ap_get_sta_list.h" #include "esp_wifi_ap_get_sta_list.h"
#include "esp_netif.h" #include "esp_netif.h"
@ -31,13 +32,18 @@ static struct {
} clients[UDP_CLIENTS_MAX]; } clients[UDP_CLIENTS_MAX];
static int client_count; static int client_count;
static SemaphoreHandle_t client_mutex;
static void client_touch(const struct sockaddr_in *addr) static void client_touch(const struct sockaddr_in *addr)
{ {
xSemaphoreTake(client_mutex, portMAX_DELAY);
for (int i = 0; i < client_count; i++) { for (int i = 0; i < client_count; i++) {
if (clients[i].addr.sin_addr.s_addr == addr->sin_addr.s_addr && if (clients[i].addr.sin_addr.s_addr == addr->sin_addr.s_addr &&
clients[i].addr.sin_port == addr->sin_port) clients[i].addr.sin_port == addr->sin_port) {
xSemaphoreGive(client_mutex);
return; return;
}
} }
if (client_count < UDP_CLIENTS_MAX) { if (client_count < UDP_CLIENTS_MAX) {
@ -60,10 +66,13 @@ static void client_touch(const struct sockaddr_in *addr)
client_count++; client_count++;
printf("UDP: client added (%d)\n", client_count); printf("UDP: client added (%d)\n", client_count);
} }
xSemaphoreGive(client_mutex);
} }
static void client_remove_by_mac(const uint8_t *mac) static void client_remove_by_mac(const uint8_t *mac)
{ {
xSemaphoreTake(client_mutex, portMAX_DELAY);
for (int i = 0; i < client_count; ) { for (int i = 0; i < client_count; ) {
if (memcmp(clients[i].mac, mac, 6) == 0) { if (memcmp(clients[i].mac, mac, 6) == 0) {
clients[i] = clients[--client_count]; clients[i] = clients[--client_count];
@ -72,6 +81,7 @@ static void client_remove_by_mac(const uint8_t *mac)
i++; i++;
} }
} }
xSemaphoreGive(client_mutex);
} }
static void parse_udp_sysex(const uint8_t *data, uint16_t len) static void parse_udp_sysex(const uint8_t *data, uint16_t len)
@ -221,6 +231,7 @@ int wifi_send_sysex(const uint8_t *sysex, uint16_t len)
if (udp_sock < 0 || client_count == 0) if (udp_sock < 0 || client_count == 0)
return -1; return -1;
xSemaphoreTake(client_mutex, portMAX_DELAY);
int sent = 0; int sent = 0;
for (int i = 0; i < client_count; i++) { for (int i = 0; i < client_count; i++) {
int r = sendto(udp_sock, sysex, len, 0, int r = sendto(udp_sock, sysex, len, 0,
@ -228,6 +239,7 @@ int wifi_send_sysex(const uint8_t *sysex, uint16_t len)
sizeof(clients[i].addr)); sizeof(clients[i].addr));
if (r > 0) sent++; if (r > 0) sent++;
} }
xSemaphoreGive(client_mutex);
return sent > 0 ? 0 : -1; return sent > 0 ? 0 : -1;
} }
@ -347,6 +359,8 @@ static int udp_init(void)
int wifi_transport_init(void) int wifi_transport_init(void)
{ {
client_mutex = xSemaphoreCreateMutex();
int rc = wifi_ap_init(); int rc = wifi_ap_init();
if (rc) { if (rc) {
printf("WiFi: AP init failed: %d\n", rc); printf("WiFi: AP init failed: %d\n", rc);