espressif/esp-modbus
1
0
Fork 1
mirror of https://github.com/espressif/esp-modbus.git synced 2025-09-25 14:10:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_slave_crash_with_limited_connection_number' into 'main'

Browse Source 
fix slave accept - open limited connection

See merge request idf/esp-modbus!126
This commit is contained in:
Alex Lisitsyn
2025-08-19 16:13:15 +01:00
parent 079b51e23b d57b97cd35
commit 7b2dd251ee
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modbus/mb_ports/tcp/port_tcp_driver.c
View File

@@ -633,11 +633,23 @@ void mb_drv_tcp_task(void *ctx)
mb_uid_info_t node_info;
int sock_id = port_accept_connection(drv_obj->listen_sock_fd, &node_info);
if (sock_id) {
int fd = mb_drv_open(drv_obj, node_info, 0);
if (fd < 0) {
ESP_LOGE(TAG, "%p, unable to open node: %s", drv_obj, node_info.ip_addr_str);
if (drv_obj->mb_node_open_count >= MB_MAX_FDS) {
ESP_LOGE(TAG, "%p, unable to accept node, maximum is %u connections.", drv_obj, MB_MAX_FDS);
#if LWIP_SO_LINGER
struct linger sl;
sl.l_onoff = 1; // non-zero value enables linger option in lwip
sl.l_linger = 0; // timeout interval in seconds
setsockopt(sock_id, SOL_SOCKET, SO_LINGER, &sl, sizeof(sl));
#endif // LWIP_SO_LINGER
close(sock_id);
} else {
DRIVER_SEND_EVENT(ctx, MB_EVENT_CONNECT, fd);
// Create new node info and open it
int fd = mb_drv_open(drv_obj, node_info, 0);
if (fd < 0) {
ESP_LOGE(TAG, "%p, unable to open node: %s", drv_obj, node_info.ip_addr_str);
} else {
DRIVER_SEND_EVENT(ctx, MB_EVENT_CONNECT, fd);
}
}
}
} else {