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

modbus fix check of host name

Browse Source
This commit is contained in:
aleks
2024-06-06 13:33:24 +02:00
parent f81ef8229e
commit 1978b071c1
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -498,7 +498,7 @@ static BOOL xMBTCPPortMasterCheckHost(const CHAR *pcHostStr, ip_addr_t *pxHostAd
if (pxHostAddr) { if (pxHostAddr) {
*pxHostAddr = xTargetAddr; *pxHostAddr = xTargetAddr;
} }
ESP_LOGI(TAG, "Host[IP]: \"%s\"[%s]", pxAddrList->ai_canonname, pcStr); ESP_LOGI(TAG, "Host[IP]: [%s]", pcStr);
freeaddrinfo(pxAddrList); freeaddrinfo(pxAddrList);
return TRUE; return TRUE;
} }

8
freemodbus/tcp_slave/port/port_tcp_slave.c
View File

@@ -381,13 +381,7 @@ vMBTCPPortBindAddr(const CHAR* pcBindIp)
xHint.ai_socktype = (xConfig.eMbProto == MB_PROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM; xHint.ai_socktype = (xConfig.eMbProto == MB_PROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
// The LWIP has an issue when connection to IPv6 socket // The LWIP has an issue when connection to IPv6 socket
xHint.ai_protocol = (xConfig.eMbProto == MB_PROTO_UDP) ? IPPROTO_UDP : IPPROTO_TCP; xHint.ai_protocol = (xConfig.eMbProto == MB_PROTO_UDP) ? IPPROTO_UDP : IPPROTO_TCP;
xHint.ai_flags = AI_NUMERICSERV; xHint.ai_flags = AI_NUMERICSERV | AI_PASSIVE | AI_CANONNAME;
if (pcBindIp == NULL) {
xHint.ai_flags |= AI_PASSIVE;
} else {
xHint.ai_flags |= AI_CANONNAME;
}
if (asprintf(&pcStr, "%u", xConfig.usPort) == -1) { if (asprintf(&pcStr, "%u", xConfig.usPort) == -1) {
abort(); abort();