From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12B88C432C3 for ; Thu, 14 Nov 2019 12:45:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8F0F2071B for ; Thu, 14 Nov 2019 12:45:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726828AbfKNMo6 (ORCPT ); Thu, 14 Nov 2019 07:44:58 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:33964 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726674AbfKNMo6 (ORCPT ); Thu, 14 Nov 2019 07:44:58 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from roid@mellanox.com) with ESMTPS (AES256-SHA encrypted); 14 Nov 2019 14:44:54 +0200 Received: from dev-r-vrt-139.mtr.labs.mlnx (dev-r-vrt-139.mtr.labs.mlnx [10.212.139.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id xAECirEG024546; Thu, 14 Nov 2019 14:44:53 +0200 From: Roi Dayan To: netdev@vger.kernel.org Cc: David Ahern , Stephen Hemminger , Jiri Pirko , Eli Britstein , Roi Dayan Subject: [PATCH iproute2 v2 2/5] tc_util: add an option to print masked numbers with/without a newline Date: Thu, 14 Nov 2019 14:44:38 +0200 Message-Id: <20191114124441.2261-3-roid@mellanox.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20191114124441.2261-1-roid@mellanox.com> References: <20191114124441.2261-1-roid@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eli Britstein Add an option to print masked numbers with or without a newline, as a pre-step towards using a common function. Signed-off-by: Eli Britstein Reviewed-by: Roi Dayan Acked-by: Jiri Pirko --- tc/f_flower.c | 4 ++-- tc/m_ct.c | 4 ++-- tc/tc_util.c | 25 +++++++++++++------------ tc/tc_util.h | 6 +++--- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/tc/f_flower.c b/tc/f_flower.c index a2a230162f78..41b81217e47e 100644 --- a/tc/f_flower.c +++ b/tc/f_flower.c @@ -1847,13 +1847,13 @@ static void flower_print_ct_label(struct rtattr *attr, static void flower_print_ct_zone(struct rtattr *attr, struct rtattr *mask_attr) { - print_masked_u16("ct_zone", attr, mask_attr); + print_masked_u16("ct_zone", attr, mask_attr, false); } static void flower_print_ct_mark(struct rtattr *attr, struct rtattr *mask_attr) { - print_masked_u32("ct_mark", attr, mask_attr); + print_masked_u32("ct_mark", attr, mask_attr, false); } static void flower_print_key_id(const char *name, struct rtattr *attr) diff --git a/tc/m_ct.c b/tc/m_ct.c index d79eb5e361ac..8df2f6103601 100644 --- a/tc/m_ct.c +++ b/tc/m_ct.c @@ -466,8 +466,8 @@ static int print_ct(struct action_util *au, FILE *f, struct rtattr *arg) print_string(PRINT_ANY, "action", " %s", "clear"); } - print_masked_u32("mark", tb[TCA_CT_MARK], tb[TCA_CT_MARK_MASK]); - print_masked_u16("zone", tb[TCA_CT_ZONE], NULL); + print_masked_u32("mark", tb[TCA_CT_MARK], tb[TCA_CT_MARK_MASK], false); + print_masked_u16("zone", tb[TCA_CT_ZONE], NULL, false); ct_print_labels(tb[TCA_CT_LABELS], tb[TCA_CT_LABELS_MASK]); ct_print_nat(ct_action, tb); diff --git a/tc/tc_util.c b/tc/tc_util.c index 6bd098feff14..e9f3e5a227f9 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -918,7 +918,7 @@ compat_xstats: static void print_masked_type(__u32 type_max, __u32 (*rta_getattr_type)(const struct rtattr *), const char *name, struct rtattr *attr, - struct rtattr *mask_attr) + struct rtattr *mask_attr, bool newline) { SPRINT_BUF(namefrm); __u32 value, mask; @@ -939,23 +939,24 @@ static void print_masked_type(__u32 type_max, char mask_name[SPRINT_BSIZE-6]; sprintf(mask_name, "%s_mask", name); - print_string(PRINT_FP, NULL, "%s ", _SL_); - sprintf(namefrm, "%s %%u", mask_name); + if (newline) + print_string(PRINT_FP, NULL, "%s ", _SL_); + sprintf(namefrm, " %s %%u", mask_name); print_hu(PRINT_ANY, mask_name, namefrm, mask); } } else { done = sprintf(out, "%u", value); if (mask != type_max) sprintf(out + done, "/0x%x", mask); - - print_string(PRINT_FP, NULL, "%s ", _SL_); - sprintf(namefrm, "%s %%s", name); + if (newline) + print_string(PRINT_FP, NULL, "%s ", _SL_); + sprintf(namefrm, " %s %%s", name); print_string(PRINT_ANY, name, namefrm, out); } } void print_masked_u32(const char *name, struct rtattr *attr, - struct rtattr *mask_attr) + struct rtattr *mask_attr, bool newline) { __u32 value, mask; SPRINT_BUF(namefrm); @@ -972,12 +973,12 @@ void print_masked_u32(const char *name, struct rtattr *attr, if (mask != UINT32_MAX) sprintf(out + done, "/0x%x", mask); - sprintf(namefrm, " %s %%s", name); + sprintf(namefrm, "%s %s %%s", newline ? "\n " : "", name); print_string(PRINT_ANY, name, namefrm, out); } void print_masked_u16(const char *name, struct rtattr *attr, - struct rtattr *mask_attr) + struct rtattr *mask_attr, bool newline) { __u16 value, mask; SPRINT_BUF(namefrm); @@ -994,7 +995,7 @@ void print_masked_u16(const char *name, struct rtattr *attr, if (mask != UINT16_MAX) sprintf(out + done, "/0x%x", mask); - sprintf(namefrm, " %s %%s", name); + sprintf(namefrm, "%s %s %%s", newline ? "\n " : "", name); print_string(PRINT_ANY, name, namefrm, out); } @@ -1004,8 +1005,8 @@ static __u32 __rta_getattr_u8_u32(const struct rtattr *attr) } void print_masked_u8(const char *name, struct rtattr *attr, - struct rtattr *mask_attr) + struct rtattr *mask_attr, bool newline) { print_masked_type(UINT8_MAX, __rta_getattr_u8_u32, name, attr, - mask_attr); + mask_attr, newline); } diff --git a/tc/tc_util.h b/tc/tc_util.h index 7e5d93cbac66..9adf2ab42138 100644 --- a/tc/tc_util.h +++ b/tc/tc_util.h @@ -128,9 +128,9 @@ int action_a2n(char *arg, int *result, bool allow_num); bool tc_qdisc_block_exists(__u32 block_index); void print_masked_u32(const char *name, struct rtattr *attr, - struct rtattr *mask_attr); + struct rtattr *mask_attr, bool newline); void print_masked_u16(const char *name, struct rtattr *attr, - struct rtattr *mask_attr); + struct rtattr *mask_attr, bool newline); void print_masked_u8(const char *name, struct rtattr *attr, - struct rtattr *mask_attr); + struct rtattr *mask_attr, bool newline); #endif -- 2.8.4