From: Stephen Hemminger Subject: [PATCH iproute2-next 9/9] iproute: refactor printing of interface Date: Wed, 7 Feb 2018 09:10:17 -0800 Message-ID: <20180207171017.20558-10-sthemmin@microsoft.com> References: <20180207171017.20558-1-sthemmin@microsoft.com> Cc: netdev@vger.kernel.org, Stephen Hemminger , Stephen Hemminger To: dsahern@gmail.com Return-path: Received: from mail-pl0-f68.google.com ([209.85.160.68]:43198 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754764AbeBGRKc (ORCPT ); Wed, 7 Feb 2018 12:10:32 -0500 Received: by mail-pl0-f68.google.com with SMTP id f4-v6so388745plr.10 for ; Wed, 07 Feb 2018 09:10:32 -0800 (PST) In-Reply-To: <20180207171017.20558-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org List-ID: For JSON and colorization, make common code a function. Signed-off-by: Stephen Hemminger --- ip/iproute.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ip/iproute.c b/ip/iproute.c index c9139bf66bd2..91d2b1a61993 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -382,6 +382,14 @@ static void print_rt_pref(FILE *fp, unsigned int pref) } } +static void print_rta_if(FILE *fp, const struct rtattr *rta, + const char *prefix) +{ + const char *ifname = ll_index_to_name(rta_getattr_u32(rta)); + + fprintf(fp, "%s %s ", prefix, ifname); +} + static void print_cache_flags(FILE *fp, __u32 flags) { flags &= ~0xFFFF; @@ -710,7 +718,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) print_rta_via(fp, tb[RTA_VIA]); if (tb[RTA_OIF] && filter.oifmask != -1) - fprintf(fp, "dev %s ", ll_index_to_name(rta_getattr_u32(tb[RTA_OIF]))); + print_rta_if(fp, tb[RTA_OIF], "dev"); if (table && (table != RT_TABLE_MAIN || show_details > 0) && !filter.tb) fprintf(fp, "table %s ", rtnl_rttable_n2a(table, b1, sizeof(b1))); @@ -767,10 +775,8 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (tb[RTA_METRICS]) print_rta_metrics(fp, tb[RTA_METRICS]); - if (tb[RTA_IIF] && filter.iifmask != -1) { - fprintf(fp, "iif %s ", - ll_index_to_name(rta_getattr_u32(tb[RTA_IIF]))); - } + if (tb[RTA_IIF] && filter.iifmask != -1) + print_rta_if(fp, tb[RTA_IIF], "iif"); if (tb[RTA_MULTIPATH]) print_rta_multipath(fp, r, tb[RTA_MULTIPATH]); -- 2.15.1