feedc0de/esp-modbus
1
0
Fork 0
forked from espressif/esp-modbus
Code Pull Requests Activity

Merge branch 'bugfix/fix_tcp_master_close_sockets' into 'master'

Browse Source 
fix for closing tcp connections and watchdog timeout

Closes IDFGH-11539 and IDFGH-11690

See merge request idf/esp-modbus!53
This commit is contained in:
Alex Lisitsyn
2023-12-22 17:07:33 +08:00
parent f0e78b6d27 bf271f4286
commit 64c5400492
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
freemodbus/tcp_master/port/port_tcp_master.c
View File

@@ -236,8 +236,6 @@ static BOOL xMBTCPPortMasterCloseConnection(MbSlaveInfo_t *pxInfo)
static void xMBTCPPortMasterShutdown(void) static void xMBTCPPortMasterShutdown(void)
{ {
xSemaphoreGive(xShutdownSema); xSemaphoreGive(xShutdownSema);
vTaskDelete(NULL);
xMbPortConfig.xMbTcpTaskHandle = NULL;
for (USHORT ucCnt = 0; ucCnt < MB_TCP_PORT_MAX_CONN; ucCnt++) { for (USHORT ucCnt = 0; ucCnt < MB_TCP_PORT_MAX_CONN; ucCnt++) {
MbSlaveInfo_t* pxInfo = xMbPortConfig.pxMbSlaveInfo[ucCnt]; MbSlaveInfo_t* pxInfo = xMbPortConfig.pxMbSlaveInfo[ucCnt];
@@ -251,6 +249,8 @@ static void xMBTCPPortMasterShutdown(void)
} }
} }
free(xMbPortConfig.pxMbSlaveInfo); free(xMbPortConfig.pxMbSlaveInfo);
vTaskDelete(NULL);
xMbPortConfig.xMbTcpTaskHandle = NULL;
} }
void vMBTCPPortMasterSetNetOpt(void *pvNetIf, eMBPortIpVer xIpVersion, eMBPortProto xProto) void vMBTCPPortMasterSetNetOpt(void *pvNetIf, eMBPortIpVer xIpVersion, eMBPortProto xProto)
@@ -754,6 +754,8 @@ static void vMBTCPPortMasterTask(void *pvParameters)
break; break;
} }
putchar(ucDot); putchar(ucDot);
// if we don't yield we run the risk of hogging CPU
vTaskDelay(pdMS_TO_TICKS(MB_TCP_CONNECTION_TIMEOUT_MS));
xErr = xMBTCPPortMasterConnect(pxInfo); xErr = xMBTCPPortMasterConnect(pxInfo);
switch(xErr) switch(xErr)
{ {