kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 14:03:55 +01:00
Code Releases Activity

Merge pull request #13737 from benpicco/highlander-fix

Browse Source 
shell/gnrc_icmpv6_echo: fix incorrect use of gnrc_netif_highlander()
This commit is contained in:
Martine Lenders 2020-03-27 15:48:47 +01:00 committed by GitHub
commit 155dd303c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/shell/commands/sc_gnrc_icmpv6_echo.c
View File

@ -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];
@ -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) {