matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip/iptoken: fix dump error when ipv6 disabled 

When we disable IPv6 from the start up (ipv6.disable=1), there will be
no IPv6 route info in the dump message. If we return -1 when
ifi->ifi_family != AF_INET6, we will get error like

$ ip token list
Dump terminated

which will make user feel confused. There is no need to return -1 if the
dump message not match. Return 0 is enough.

Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Hangbin Liu 2019-06-26 09:44:07 +08:00 committed by Stephen Hemminger
parent f799505372
commit 5a403866f3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ip/iptoken.c
View File

@ -60,9 +60,9 @@ static int print_token(struct nlmsghdr *n, void *arg)
return -1;
if (ifi->ifi_family != AF_INET6)
return -1;
return 0;
if (ifi->ifi_index == 0)
return -1;
return 0;
if (ifindex > 0 && ifi->ifi_index != ifindex)
return 0;
if (ifi->ifi_flags & (IFF_LOOPBACK | IFF_NOARP))