Skip to content

shell/gnrc_icmpv6_echo: fix incorrect use of gnrc_netif_highlander() #13737

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
miri64 merged 1 commit into from
Mar 27, 2020
Merged

shell/gnrc_icmpv6_echo: fix incorrect use of gnrc_netif_highlander() #13737

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
16 changes: 14 additions & 2 deletions sys/shell/commands/sc_gnrc_icmpv6_echo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,16 @@ static void _usage(char *cmdname)
"of any responses, otherwise wait for two RTTs");
}

/* get the next netif, returns true if there are more */
static bool _netif_get(gnrc_netif_t **current_netif)
{
gnrc_netif_t *netif = *current_netif;
netif = gnrc_netif_iter(netif);

*current_netif = netif;
return !gnrc_netif_highlander() && gnrc_netif_iter(netif);
}

static int _configure(int argc, char **argv, _ping_data_t *data)
{
char *cmdname = argv[0];
Expand All @@ -187,8 +197,10 @@ static int _configure(int argc, char **argv, _ping_data_t *data)
if (iface) {
data->netif = gnrc_netif_get_by_pid(atoi(iface));
}
else if (gnrc_netif_highlander()) {
data->netif = gnrc_netif_iter(NULL);
/* preliminary select the first interface */
else if (_netif_get(&data->netif)) {
/* don't take it if there is more than one interface */
data->netif = NULL;
}

if (ipv6_addr_from_str(&data->host, data->hostname) == NULL) {
Expand Down