me-no-dev/AsyncTCP
1
0
Fork 1
mirror of https://github.com/me-no-dev/AsyncTCP.git synced 2025-07-31 11:17:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add mutex locking required by ESP32 v3.1.0 (#189)

Browse Source
This commit is contained in:
Daniel Öster
2025-01-20 13:20:32 +03:00
committed by GitHub
parent 17039c38d2
commit ca0ead01dd
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/AsyncTCP.cpp
View File

@ -35,6 +35,22 @@ extern "C"{
* TCP/IP Event Task * TCP/IP Event Task
* */ * */
// https://github.com/espressif/arduino-esp32/issues/10526
#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
#define TCP_MUTEX_LOCK() \
if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) { \
LOCK_TCPIP_CORE(); \
}
#define TCP_MUTEX_UNLOCK() \
if (sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) { \
UNLOCK_TCPIP_CORE(); \
}
#else // CONFIG_LWIP_TCPIP_CORE_LOCKING
#define TCP_MUTEX_LOCK()
#define TCP_MUTEX_UNLOCK()
#endif // CONFIG_LWIP_TCPIP_CORE_LOCKING
typedef enum { typedef enum {
LWIP_TCP_SENT, LWIP_TCP_RECV, LWIP_TCP_FIN, LWIP_TCP_ERROR, LWIP_TCP_POLL, LWIP_TCP_CLEAR, LWIP_TCP_ACCEPT, LWIP_TCP_CONNECTED, LWIP_TCP_DNS LWIP_TCP_SENT, LWIP_TCP_RECV, LWIP_TCP_FIN, LWIP_TCP_ERROR, LWIP_TCP_POLL, LWIP_TCP_CLEAR, LWIP_TCP_ACCEPT, LWIP_TCP_CONNECTED, LWIP_TCP_DNS
} lwip_event_t; } lwip_event_t;
@ -688,8 +704,10 @@ bool AsyncClient::connect(IPAddress ip, uint16_t port){
addr.type = IPADDR_TYPE_V4; addr.type = IPADDR_TYPE_V4;
addr.u_addr.ip4.addr = ip; addr.u_addr.ip4.addr = ip;
TCP_MUTEX_LOCK();
tcp_pcb* pcb = tcp_new_ip_type(IPADDR_TYPE_V4); tcp_pcb* pcb = tcp_new_ip_type(IPADDR_TYPE_V4);
if (!pcb){ if (!pcb){
TCP_MUTEX_UNLOCK();
log_e("pcb == NULL"); log_e("pcb == NULL");
return false; return false;
} }
@ -699,6 +717,7 @@ bool AsyncClient::connect(IPAddress ip, uint16_t port){
tcp_recv(pcb, &_tcp_recv); tcp_recv(pcb, &_tcp_recv);
tcp_sent(pcb, &_tcp_sent); tcp_sent(pcb, &_tcp_sent);
tcp_poll(pcb, &_tcp_poll, 1); tcp_poll(pcb, &_tcp_poll, 1);
TCP_MUTEX_UNLOCK();
//_tcp_connect(pcb, &addr, port,(tcp_connected_fn)&_s_connected); //_tcp_connect(pcb, &addr, port,(tcp_connected_fn)&_s_connected);
esp_err_t err = _tcp_connect(pcb, _closed_slot, &addr, port,(tcp_connected_fn)&_tcp_connected); esp_err_t err = _tcp_connect(pcb, _closed_slot, &addr, port,(tcp_connected_fn)&_tcp_connected);
return err == ESP_OK; return err == ESP_OK;
@ -711,8 +730,9 @@ bool AsyncClient::connect(const char* host, uint16_t port){
log_e("failed to start task"); log_e("failed to start task");
return false; return false;
} }
TCP_MUTEX_LOCK();
err_t err = dns_gethostbyname(host, &addr, (dns_found_callback)&_tcp_dns_found, this); err_t err = dns_gethostbyname(host, &addr, (dns_found_callback)&_tcp_dns_found, this);
TCP_MUTEX_UNLOCK();
if(err == ERR_OK) { if(err == ERR_OK) {
return connect(IPAddress(addr.u_addr.ip4.addr), port); return connect(IPAddress(addr.u_addr.ip4.addr), port);
} else if(err == ERR_INPROGRESS) { } else if(err == ERR_INPROGRESS) {
@ -800,11 +820,13 @@ int8_t AsyncClient::_close(){
int8_t err = ERR_OK; int8_t err = ERR_OK;
if(_pcb) { if(_pcb) {
//log_i(""); //log_i("");
TCP_MUTEX_LOCK();
tcp_arg(_pcb, NULL); tcp_arg(_pcb, NULL);
tcp_sent(_pcb, NULL); tcp_sent(_pcb, NULL);
tcp_recv(_pcb, NULL); tcp_recv(_pcb, NULL);
tcp_err(_pcb, NULL); tcp_err(_pcb, NULL);
tcp_poll(_pcb, NULL, 0); tcp_poll(_pcb, NULL, 0);
TCP_MUTEX_UNLOCK();
_tcp_clear_events(this); _tcp_clear_events(this);
err = _tcp_close(_pcb, _closed_slot); err = _tcp_close(_pcb, _closed_slot);
if(err != ERR_OK) { if(err != ERR_OK) {
@ -1271,7 +1293,9 @@ void AsyncServer::begin(){
return; return;
} }
int8_t err; int8_t err;
TCP_MUTEX_LOCK();
_pcb = tcp_new_ip_type(IPADDR_TYPE_V4); _pcb = tcp_new_ip_type(IPADDR_TYPE_V4);
TCP_MUTEX_UNLOCK();
if (!_pcb){ if (!_pcb){
log_e("_pcb == NULL"); log_e("_pcb == NULL");
return; return;
@ -1294,14 +1318,18 @@ void AsyncServer::begin(){
log_e("listen_pcb == NULL"); log_e("listen_pcb == NULL");
return; return;
} }
TCP_MUTEX_LOCK();
tcp_arg(_pcb, (void*) this); tcp_arg(_pcb, (void*) this);
tcp_accept(_pcb, &_s_accept); tcp_accept(_pcb, &_s_accept);
TCP_MUTEX_UNLOCK();
} }
void AsyncServer::end(){ void AsyncServer::end(){
if(_pcb){ if(_pcb){
TCP_MUTEX_LOCK();
tcp_arg(_pcb, NULL); tcp_arg(_pcb, NULL);
tcp_accept(_pcb, NULL); tcp_accept(_pcb, NULL);
TCP_MUTEX_UNLOCK();
if(tcp_close(_pcb) != ERR_OK){ if(tcp_close(_pcb) != ERR_OK){
_tcp_abort(_pcb, -1); _tcp_abort(_pcb, -1);
} }