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

clean up UDP sessions when WiFi station disconnects

This commit is contained in:
jess 2026-04-02 16:10:59 -07:00
parent 1ea5c760d7
commit a611a72c48
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
main/wifi_transport.c
View File

@ -6,6 +6,7 @@
#include "freertos/task.h" #include "freertos/task.h"
#include "freertos/queue.h" #include "freertos/queue.h"
#include "esp_wifi.h" #include "esp_wifi.h"
#include "esp_wifi_ap_get_sta_list.h"
#include "esp_netif.h" #include "esp_netif.h"
#include "esp_event.h" #include "esp_event.h"
#include "lwip/sockets.h" #include "lwip/sockets.h"
@ -21,10 +22,12 @@
#define CLIENT_TIMEOUT_MS 30000 #define CLIENT_TIMEOUT_MS 30000
static int udp_sock = -1; static int udp_sock = -1;
static esp_netif_t *ap_netif;
static struct { static struct {
struct sockaddr_in addr; struct sockaddr_in addr;
TickType_t last_seen; TickType_t last_seen;
uint8_t mac[6];
bool active; bool active;
} clients[MAX_UDP_CLIENTS]; } clients[MAX_UDP_CLIENTS];
@ -46,6 +49,20 @@ static void client_touch(const struct sockaddr_in *addr)
clients[client_count].addr = *addr; clients[client_count].addr = *addr;
clients[client_count].last_seen = now; clients[client_count].last_seen = now;
clients[client_count].active = true; clients[client_count].active = true;
memset(clients[client_count].mac, 0, 6);
wifi_sta_list_t sta_list;
wifi_sta_mac_ip_list_t ip_list;
if (esp_wifi_ap_get_sta_list(&sta_list) == ESP_OK &&
esp_wifi_ap_get_sta_list_with_ip(&sta_list, &ip_list) == ESP_OK) {
for (int j = 0; j < ip_list.num; j++) {
if (ip_list.sta[j].ip.addr == addr->sin_addr.s_addr) {
memcpy(clients[client_count].mac, ip_list.sta[j].mac, 6);
break;
}
}
}
client_count++; client_count++;
printf("UDP: client added (%d/%d)\n", client_count, MAX_UDP_CLIENTS); printf("UDP: client added (%d/%d)\n", client_count, MAX_UDP_CLIENTS);
} }
@ -66,6 +83,18 @@ static void clients_expire(void)
} }
} }
static void client_remove_by_mac(const uint8_t *mac)
{
for (int i = 0; i < client_count; ) {
if (memcmp(clients[i].mac, mac, 6) == 0) {
clients[i] = clients[--client_count];
printf("UDP: client removed by MAC (%d/%d)\n", client_count, MAX_UDP_CLIENTS);
} else {
i++;
}
}
}
static void parse_udp_sysex(const uint8_t *data, uint16_t len) static void parse_udp_sysex(const uint8_t *data, uint16_t len)
{ {
if (len < 3 || data[0] != 0xF0 || data[1] != 0x7D) if (len < 3 || data[0] != 0xF0 || data[1] != 0x7D)
@ -219,12 +248,15 @@ int wifi_get_client_count(void)
static void wifi_event_handler(void *arg, esp_event_base_t base, static void wifi_event_handler(void *arg, esp_event_base_t base,
int32_t id, void *data) int32_t id, void *data)
{ {
(void)arg; (void)data; (void)arg;
if (base == WIFI_EVENT) { if (base == WIFI_EVENT) {
if (id == WIFI_EVENT_AP_STACONNECTED) if (id == WIFI_EVENT_AP_STACONNECTED) {
printf("WiFi: station connected\n"); printf("WiFi: station connected\n");
else if (id == WIFI_EVENT_AP_STADISCONNECTED) } else if (id == WIFI_EVENT_AP_STADISCONNECTED) {
wifi_event_ap_stadisconnected_t *evt = data;
printf("WiFi: station disconnected\n"); printf("WiFi: station disconnected\n");
client_remove_by_mac(evt->mac);
}
} }
} }
@ -250,7 +282,7 @@ static void sta_event_handler(void *arg, esp_event_base_t base,
static int wifi_ap_init(void) static int wifi_ap_init(void)
{ {
esp_netif_create_default_wifi_ap(); ap_netif = esp_netif_create_default_wifi_ap();
esp_netif_create_default_wifi_sta(); esp_netif_create_default_wifi_sta();
wifi_init_config_t wifi_cfg = WIFI_INIT_CONFIG_DEFAULT(); wifi_init_config_t wifi_cfg = WIFI_INIT_CONFIG_DEFAULT();