Skip to content

[components][lwip]: fix ping timeout handling and support LWIP_SO_SND… #11174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rbb666 merged 1 commit into from
Feb 5, 2026
+15 −12
Merged

[components][lwip]: fix ping timeout handling and support LWIP_SO_SND… #11174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions components/net/lwip/lwip-1.4.1/src/apps/ping/ping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions components/net/lwip/lwip-2.0.3/src/apps/ping/ping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions components/net/lwip/lwip-2.1.2/src/apps/ping/ping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down