Skip to content

subsys: net: ip: Support ping times #15327

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

Closed
wants to merge 1 commit into from
Closed

subsys: net: ip: Support ping times #15327

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
39 changes: 23 additions & 16 deletions subsys/net/ip/net_shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2786,6 +2786,7 @@ static int cmd_net_ping(const struct shell *shell, size_t argc, char *argv[])
return -EOPNOTSUPP;
#else
char *host;
int times = 1;
int ret;

ARG_UNUSED(argc);
Expand All @@ -2799,26 +2800,32 @@ static int cmd_net_ping(const struct shell *shell, size_t argc, char *argv[])

shell_for_ping = shell;

if (IS_ENABLED(CONFIG_NET_IPV6)) {
ret = ping_ipv6(shell, host);
if (!ret) {
goto wait_reply;
} else if (ret == -EIO) {
PR_WARNING("Cannot send IPv6 ping\n");
return -ENOEXEC;
}
if (argv[2]) {
Copy link
Contributor

@easonxiang easonxiang Apr 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if argv[i] are set to NULL by default, if not, we need check argc as well.
if ((argc > 2) && argv[2])

Copy link
Author

@bublover bublover Apr 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @easonxiang.
Just refer to argv [1] above.

Well.We might follow another PR Jukkar memtioned.

times = atoi(argv[2]);
}

if (IS_ENABLED(CONFIG_NET_IPV4)) {
ret = ping_ipv4(shell, host);
if (ret) {
if (ret == -EIO) {
PR_WARNING("Cannot send IPv4 ping\n");
} else if (ret == -EINVAL) {
PR_WARNING("Invalid IP address\n");
while (times--) {
if (IS_ENABLED(CONFIG_NET_IPV6)) {
ret = ping_ipv6(shell, host);
if (!ret) {
goto wait_reply;
} else if (ret == -EIO) {
PR_WARNING("Cannot send IPv6 ping\n");
return -ENOEXEC;
}
}

return -ENOEXEC;
if (IS_ENABLED(CONFIG_NET_IPV4)) {
ret = ping_ipv4(shell, host);
if (ret) {
if (ret == -EIO) {
PR_WARNING("Cannot send IPv4 ping\n");
} else if (ret == -EINVAL) {
PR_WARNING("Invalid IP address\n");
}

return -ENOEXEC;
}
}
}

Expand Down