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,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 58A2FC43331 for ; Wed, 13 Nov 2019 10:14:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36320204EC for ; Wed, 13 Nov 2019 10:14:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727542AbfKMKOG (ORCPT ); Wed, 13 Nov 2019 05:14:06 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:53664 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727183AbfKMKOG (ORCPT ); Wed, 13 Nov 2019 05:14:06 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from roid@mellanox.com) with ESMTPS (AES256-SHA encrypted); 13 Nov 2019 12:13:59 +0200 Received: from mtr-vdi-191.wap.labs.mlnx. (mtr-vdi-191.wap.labs.mlnx [10.209.100.28]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id xADADwQM009511; Wed, 13 Nov 2019 12:13:59 +0200 From: Roi Dayan To: netdev@vger.kernel.org Cc: David Ahern , Stephen Hemminger , Jiri Pirko , Eli Britstein , Roi Dayan Subject: [PATCH iproute2 1/5] tc_util: introduce a function to print JSON/non-JSON masked numbers Date: Wed, 13 Nov 2019 12:12:41 +0200 Message-Id: <20191113101245.182025-2-roid@mellanox.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20191113101245.182025-1-roid@mellanox.com> References: <20191113101245.182025-1-roid@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eli Britstein Introduce a function to print masked number with a different output for JSON or non-JSON methods, as a pre-step towards printing numbers using this common function. Signed-off-by: Eli Britstein Reviewed-by: Roi Dayan Acked-by: Jiri Pirko --- tc/tc_util.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ tc/tc_util.h | 2 ++ 2 files changed, 50 insertions(+) diff --git a/tc/tc_util.c b/tc/tc_util.c index 0eb530408d05..2b391f182b96 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -915,6 +915,42 @@ compat_xstats: *xstats = tb[TCA_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) +{ + SPRINT_BUF(namefrm); + __u32 value, mask; + SPRINT_BUF(out); + size_t done; + + if (attr) { + value = rta_getattr_type(attr); + mask = mask_attr ? rta_getattr_type(mask_attr) : type_max; + + if (is_json_context()) { + sprintf(namefrm, "\n %s %%u", name); + print_hu(PRINT_ANY, name, namefrm, + rta_getattr_type(attr)); + if (mask != type_max) { + char mask_name[SPRINT_BSIZE-6]; + + sprintf(mask_name, "%s_mask", name); + sprintf(namefrm, "\n %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); + + sprintf(namefrm, "\n %s %%s", name); + print_string(PRINT_ANY, name, namefrm, out); + } + } +} + void print_masked_u32(const char *name, struct rtattr *attr, struct rtattr *mask_attr) { @@ -958,3 +994,15 @@ void print_masked_u16(const char *name, struct rtattr *attr, sprintf(namefrm, " %s %%s", name); print_string(PRINT_ANY, name, namefrm, out); } + +static __u32 __rta_getattr_u8_u32(const struct rtattr *attr) +{ + return rta_getattr_u8(attr); +} + +void print_masked_u8(const char *name, struct rtattr *attr, + struct rtattr *mask_attr) +{ + print_masked_type(UINT8_MAX, __rta_getattr_u8_u32, name, attr, + mask_attr); +} diff --git a/tc/tc_util.h b/tc/tc_util.h index 0c3425abc62f..7e5d93cbac66 100644 --- a/tc/tc_util.h +++ b/tc/tc_util.h @@ -131,4 +131,6 @@ void print_masked_u32(const char *name, struct rtattr *attr, struct rtattr *mask_attr); void print_masked_u16(const char *name, struct rtattr *attr, struct rtattr *mask_attr); +void print_masked_u8(const char *name, struct rtattr *attr, + struct rtattr *mask_attr); #endif -- 2.8.4