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>

diff --git a/ip/iptoken.c b/ip/iptoken.c
index f1194c3e1aa453007639babfc122e13829d55ba6..9f35689006cfe80c591ab82e32c92968e3c27e89 100644 (file)
--- a/ip/iptoken.c
+++ b/ip/iptoken.c
@@ -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))