Skip to content

lwIP: constrain ping address resolution to IPv4 #11528

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

Open
Old-Ding wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −6
Open

lwIP: constrain ping address resolution to IPv4 #11528

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
5 changes: 3 additions & 2 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 @@ -140,7 +140,7 @@ rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
int timeout = (int)PING_RCV_TIMEO;
#else
struct timeval timeout = { PING_RCV_TIMEO / RT_TICK_PER_SECOND, PING_RCV_TIMEO % RT_TICK_PER_SECOND };
#endif / * LWIP_SO_SNDRCVTIMEO_NONSTANDARD */
#endif /* LWIP_SO_SNDRCVTIMEO_NONSTANDARD */

int s, ttl, recv_len;
ip_addr_t target_addr;
Expand All @@ -159,13 +159,14 @@ rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
}

memset(&hint, 0, sizeof(hint));
hint.ai_family = AF_INET;
/* convert URL to IP */
if (lwip_getaddrinfo(target_name, NULL, &hint, &res) != 0)
{
rt_kprintf("ping: unknown host %s\n", target_name);
return -RT_ERROR;
}
memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
h = (struct sockaddr_in *)res->ai_addr;
memcpy(&ina, &h->sin_addr, sizeof(ina));
lwip_freeaddrinfo(res);
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
Expand Down
5 changes: 3 additions & 2 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 @@ -140,7 +140,7 @@ rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
int timeout = (int)PING_RCV_TIMEO;
#else
struct timeval timeout = { PING_RCV_TIMEO / RT_TICK_PER_SECOND, PING_RCV_TIMEO % RT_TICK_PER_SECOND };
#endif / * LWIP_SO_SNDRCVTIMEO_NONSTANDARD */
#endif /* LWIP_SO_SNDRCVTIMEO_NONSTANDARD */

int s, ttl, recv_len;
ip_addr_t target_addr;
Expand All @@ -159,13 +159,14 @@ rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
}

rt_memset(&hint, 0, sizeof(hint));
hint.ai_family = AF_INET;
/* convert URL to IP */
if (lwip_getaddrinfo(target_name, NULL, &hint, &res) != 0)
{
rt_kprintf("ping: unknown host %s\n", target_name);
return -RT_ERROR;
}
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
h = (struct sockaddr_in *)res->ai_addr;
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
lwip_freeaddrinfo(res);
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
Expand Down
5 changes: 3 additions & 2 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 @@ -140,7 +140,7 @@ rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
int timeout = (int)PING_RCV_TIMEO;
#else
struct timeval timeout = { PING_RCV_TIMEO / RT_TICK_PER_SECOND, PING_RCV_TIMEO % RT_TICK_PER_SECOND };
#endif / * LWIP_SO_SNDRCVTIMEO_NONSTANDARD */
#endif /* LWIP_SO_SNDRCVTIMEO_NONSTANDARD */

int s, ttl, recv_len;
ip_addr_t target_addr;
Expand All @@ -159,13 +159,14 @@ rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
}

memset(&hint, 0, sizeof(hint));
hint.ai_family = AF_INET;
/* convert URL to IP */
if (lwip_getaddrinfo(target_name, NULL, &hint, &res) != 0)
{
rt_kprintf("ping: unknown host %s\n", target_name);
return -RT_ERROR;
}
memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
h = (struct sockaddr_in *)res->ai_addr;
memcpy(&ina, &h->sin_addr, sizeof(ina));
lwip_freeaddrinfo(res);
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
Expand Down
Loading