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 <liuhang...@gmail.com>
---
ip/iptoken.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/ip/iptoken.c b/ip/iptoken.c
index f1194c3e..dfd22734 100644
--- a/ip/iptoken.c
+++ b/ip/iptoken.c
@@ -59,13 +59,9 @@ static int print_token(struct nlmsghdr *n, void *arg)
if (len < 0)
return -1;
- if (ifi->ifi_family != AF_INET6)
- return -1;
- if (ifi->ifi_index == 0)
- return -1;
- if (ifindex > 0 && ifi->ifi_index != ifindex)
- return 0;
- if (ifi->ifi_flags & (IFF_LOOPBACK | IFF_NOARP))
+ if (ifi->ifi_family != AF_INET6 || ifi->ifi_index == 0 ||
+ (ifindex > 0 && ifi->ifi_index != ifindex) ||
+ (ifi->ifi_flags & (IFF_LOOPBACK | IFF_NOARP)))
return 0;
parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len);
--
2.19.2
