From mboxrd@z Thu Jan 1 00:00:00 1970 From: dsahern@kernel.org Subject: [PATCH v2 iproute2-next] ip route: print RTA_CACHEINFO if it exists Date: Wed, 30 May 2018 08:30:09 -0700 Message-ID: <20180530153009.4409-1-dsahern@kernel.org> Cc: David Ahern To: netdev@vger.kernel.org, stephen@networkplumber.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:44978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752726AbeE3PaL (ORCPT ); Wed, 30 May 2018 11:30:11 -0400 Sender: netdev-owner@vger.kernel.org List-ID: From: David Ahern RTA_CACHEINFO can be sent for non-cloned routes. If the attribute is present print it. Allows route dumps to print expires times for example which can exist on FIB entries. Signed-off-by: David Ahern --- v2 - leave print_cache_flags under r->rtm_flags & RTM_F_CLONED check ip/iproute.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ip/iproute.c b/ip/iproute.c index 56dd9f25e38e..254d7abd2abf 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -899,17 +899,14 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) rta_getattr_u32(tb[RTA_UID])); if (r->rtm_family == AF_INET) { - if (r->rtm_flags & RTM_F_CLONED) { + if (r->rtm_flags & RTM_F_CLONED) print_cache_flags(fp, r->rtm_flags); - if (tb[RTA_CACHEINFO]) - print_rta_cacheinfo(fp, RTA_DATA(tb[RTA_CACHEINFO])); - } + if (tb[RTA_CACHEINFO]) + print_rta_cacheinfo(fp, RTA_DATA(tb[RTA_CACHEINFO])); } else if (r->rtm_family == AF_INET6) { - if (r->rtm_flags & RTM_F_CLONED) { - if (tb[RTA_CACHEINFO]) - print_rta_cacheinfo(fp, RTA_DATA(tb[RTA_CACHEINFO])); - } + if (tb[RTA_CACHEINFO]) + print_rta_cacheinfo(fp, RTA_DATA(tb[RTA_CACHEINFO])); } if (tb[RTA_METRICS]) -- 2.11.0