Imagelibrary/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-02-05 21:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[components][lwip]: fix ping timeout handling and support LWIP_SO_SNDRCVTIMEO_NONSTANDARD

Browse Source
This commit is contained in:
CYFS
2026-02-05 14:30:11 +08:00
committed by Rbb666
parent 68da106253
commit 25b6953501
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/net/lwip/lwip-1.4.1/src/apps/ping/ping.c
View File

@@ -135,11 +135,12 @@ int lwip_ping_recv(int s, int *ttl)
/* using the lwIP custom ping */
rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
{
#if LWIP_VERSION_MAJOR >= 2U
struct timeval timeout = { PING_RCV_TIMEO / RT_TICK_PER_SECOND, PING_RCV_TIMEO % RT_TICK_PER_SECOND };
#if LWIP_SO_SNDRCVTIMEO_NONSTANDARD
int timeout = (int)PING_RCV_TIMEO;
#else
int timeout = PING_RCV_TIMEO * 1000UL / RT_TICK_PER_SECOND;
#endif
struct timeval timeout = { PING_RCV_TIMEO / RT_TICK_PER_SECOND, PING_RCV_TIMEO % RT_TICK_PER_SECOND };
#endif / * LWIP_SO_SNDRCVTIMEO_NONSTANDARD */
int s, ttl, recv_len;
ip_addr_t target_addr;

9
components/net/lwip/lwip-2.0.3/src/apps/ping/ping.c
View File

@@ -135,11 +135,12 @@ int lwip_ping_recv(int s, int *ttl)
/* using the lwIP custom ping */
rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
{
#if LWIP_VERSION_MAJOR >= 2U
struct timeval timeout = { PING_RCV_TIMEO / RT_TICK_PER_SECOND, PING_RCV_TIMEO % RT_TICK_PER_SECOND };
#if LWIP_SO_SNDRCVTIMEO_NONSTANDARD
int timeout = (int)PING_RCV_TIMEO;
#else
int timeout = PING_RCV_TIMEO * 1000UL / RT_TICK_PER_SECOND;
#endif
struct timeval timeout = { PING_RCV_TIMEO / RT_TICK_PER_SECOND, PING_RCV_TIMEO % RT_TICK_PER_SECOND };
#endif / * LWIP_SO_SNDRCVTIMEO_NONSTANDARD */
int s, ttl, recv_len;
ip_addr_t target_addr;

9
components/net/lwip/lwip-2.1.2/src/apps/ping/ping.c
View File

@@ -135,11 +135,12 @@ int lwip_ping_recv(int s, int *ttl)
/* using the lwIP custom ping */
rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
{
#if LWIP_VERSION_MAJOR >= 2U
struct timeval timeout = { PING_RCV_TIMEO / RT_TICK_PER_SECOND, PING_RCV_TIMEO % RT_TICK_PER_SECOND };
#if LWIP_SO_SNDRCVTIMEO_NONSTANDARD
int timeout = (int)PING_RCV_TIMEO;
#else
int timeout = PING_RCV_TIMEO * 1000UL / RT_TICK_PER_SECOND;
#endif
struct timeval timeout = { PING_RCV_TIMEO / RT_TICK_PER_SECOND, PING_RCV_TIMEO % RT_TICK_PER_SECOND };
#endif / * LWIP_SO_SNDRCVTIMEO_NONSTANDARD */
int s, ttl, recv_len;
ip_addr_t target_addr;