From patchwork Wed May 30 15:30:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 922860 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="vTDMjAmq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40wvfw2Fl8z9s1R for ; Thu, 31 May 2018 01:30:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753441AbeE3PaN (ORCPT ); Wed, 30 May 2018 11:30:13 -0400 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 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C46C52075D; Wed, 30 May 2018 15:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527694210; bh=M6J7Tff7hHni3lqnr9lRPz2Ya1tMH1NqnRe80H0ocnY=; h=From:To:Cc:Subject:Date:From; b=vTDMjAmqlK+DYdDLFSvlN1CAiQj+u8pJ8ymzwZO0TMAUgge3mVobl7YNeQ8mvmHQG /Uq1Ed/Bc9dBJPIZ4uWkjWJpQRyEsEV80JJJHpi4zatmZ8TaxCysNQsG/hrGwRpkiO EpXtwjMY0zaCHRSTazGdtfHK0P9rllwztryUjFUQ= From: dsahern@kernel.org To: netdev@vger.kernel.org, stephen@networkplumber.org Cc: David Ahern 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> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Stephen Hemminger --- 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])