netdev - [PATCH iproute2-next 1/8] tc_util: introduce a function to print JSON/non-JSON masked numbers

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20191112145154.145289-2-roid@mellanox.com>
Date:   Tue, 12 Nov 2019 16:51:47 +0200
From:   Roi Dayan <roid@...lanox.com>
To:     netdev@...r.kernel.org
Cc:     David Ahern <dsahern@...il.com>,
        Stephen Hemminger <stephen@...workplumber.org>,
        Jiri Pirko <jiri@...lanox.com>,
        Eli Britstein <elibr@...lanox.com>,
        Roi Dayan <roid@...lanox.com>
Subject: [PATCH iproute2-next 1/8] tc_util: introduce a function to print JSON/non-JSON masked numbers

From: Eli Britstein <elibr@...lanox.com>

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 <elibr@...lanox.com>
Reviewed-by: Roi Dayan <roid@...lanox.com>
Acked-by: Jiri Pirko <jiri@...lanox.com>
---
 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