| 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
| ||
|
Message-ID: <20251115171958.1517032-2-stephen@networkplumber.org>
Date: Sat, 15 Nov 2025 09:19:17 -0800
From: Stephen Hemminger <stephen@...workplumber.org>
To: netdev@...r.kernel.org
Cc: Stephen Hemminger <stephen@...workplumber.org>
Subject: [PATCH iproute2-next v2 2/2] genl: move print_policy into genl
The function nl_print_policy was only used in the genl code
so it should be moved to that file.
Signed-off-by: Stephen Hemminger <stephen@...workplumber.org>
---
genl/ctrl.c | 92 +++++++++++++++++++++++++++++++++++++++++++-
include/libnetlink.h | 2 -
lib/libnetlink.c | 90 -------------------------------------------
3 files changed, 91 insertions(+), 93 deletions(-)
diff --git a/genl/ctrl.c b/genl/ctrl.c
index 17930b30..9412c2f0 100644
--- a/genl/ctrl.c
+++ b/genl/ctrl.c
@@ -175,6 +175,96 @@ static void print_ctrl_mcast(const struct rtattr *attr)
print_string(PRINT_FP, NULL, "\n", NULL);
}
+static const char *get_nla_type_str(unsigned int attr)
+{
+ switch (attr) {
+#define C(x) case NL_ATTR_TYPE_ ## x: return #x
+ C(U8);
+ C(U16);
+ C(U32);
+ C(U64);
+ C(STRING);
+ C(FLAG);
+ C(NESTED);
+ C(NESTED_ARRAY);
+ C(NUL_STRING);
+ C(BINARY);
+ C(S8);
+ C(S16);
+ C(S32);
+ C(S64);
+ C(BITFIELD32);
+ default:
+ return "unknown";
+ }
+}
+
+static void print_policy_attr(const struct rtattr *attr)
+{
+ struct rtattr *tp[NL_POLICY_TYPE_ATTR_MAX + 1];
+
+ parse_rtattr_nested(tp, ARRAY_SIZE(tp) - 1, attr);
+
+ if (tp[NL_POLICY_TYPE_ATTR_TYPE]) {
+ print_uint(PRINT_ANY, "attr", "attr[%u]:",
+ attr->rta_type & ~NLA_F_NESTED);
+ print_string(PRINT_ANY, "type", " type=%s",
+ get_nla_type_str(rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_TYPE])));
+ }
+
+ if (tp[NL_POLICY_TYPE_ATTR_POLICY_IDX])
+ print_uint(PRINT_ANY, "policy", " policy:%u",
+ rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_POLICY_IDX]));
+
+ if (tp[NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE])
+ print_uint(PRINT_ANY, "maxattr", " maxattr:%u",
+ rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE]));
+
+ if (tp[NL_POLICY_TYPE_ATTR_MIN_VALUE_S] && tp[NL_POLICY_TYPE_ATTR_MAX_VALUE_S]) {
+ print_s64(PRINT_ANY, "min_value", " range:[%lld",
+ rta_getattr_u64(tp[NL_POLICY_TYPE_ATTR_MIN_VALUE_S]));
+ print_s64(PRINT_ANY, "max_value", "%lld]",
+ rta_getattr_u64(tp[NL_POLICY_TYPE_ATTR_MAX_VALUE_S]));
+ }
+
+ if (tp[NL_POLICY_TYPE_ATTR_MIN_VALUE_U] && tp[NL_POLICY_TYPE_ATTR_MAX_VALUE_U]) {
+ print_u64(PRINT_ANY, "min_value", " range:[%llu",
+ rta_getattr_u64(tp[NL_POLICY_TYPE_ATTR_MIN_VALUE_U]));
+ print_u64(PRINT_ANY, "max_value", "%llu]",
+ rta_getattr_u64(tp[NL_POLICY_TYPE_ATTR_MAX_VALUE_U]));
+ }
+
+ if (tp[NL_POLICY_TYPE_ATTR_MIN_LENGTH])
+ print_uint(PRINT_ANY, "min_length", " min len:%u",
+ rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_MIN_LENGTH]));
+
+ if (tp[NL_POLICY_TYPE_ATTR_MAX_LENGTH])
+ print_uint(PRINT_ANY, "max_length", " max len:%u",
+ rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_MAX_LENGTH]));
+}
+
+static void print_policy(const struct rtattr *attr)
+{
+ const struct rtattr *pos;
+
+ open_json_array(PRINT_JSON, NULL);
+ rtattr_for_each_nested(pos, attr) {
+ const struct rtattr *a;
+
+ open_json_array(PRINT_JSON, NULL);
+
+ print_uint(PRINT_ANY, "policy", " policy[%u]:", pos->rta_type & ~NLA_F_NESTED);
+
+ rtattr_for_each_nested(a, pos) {
+ open_json_object(NULL);
+ print_policy_attr(a);
+ close_json_object();
+ }
+ close_json_array(PRINT_JSON, NULL);
+ }
+ close_json_array(PRINT_JSON, NULL);
+}
+
/*
* The controller sends one nlmsg per family
*/
@@ -238,7 +328,7 @@ static int print_ctrl(struct rtnl_ctrl_data *ctrl,
print_ops(tb[CTRL_ATTR_OP_POLICY]);
if (tb[CTRL_ATTR_POLICY])
- nl_print_policy(tb[CTRL_ATTR_POLICY]);
+ print_policy(tb[CTRL_ATTR_POLICY]);
/* end of family definitions .. */
print_string(PRINT_FP, NULL, "\n", NULL);
diff --git a/include/libnetlink.h b/include/libnetlink.h
index 3cd0931a..e91505d9 100644
--- a/include/libnetlink.h
+++ b/include/libnetlink.h
@@ -374,6 +374,4 @@ int rtnl_from_file(FILE *, rtnl_listen_filter_t handler,
RTA_OK(attr, RTA_PAYLOAD(nest) - ((char *)(attr) - (char *)RTA_DATA((nest)))); \
(attr) = RTA_TAIL((attr)))
-void nl_print_policy(const struct rtattr *attr);
-
#endif /* __LIBNETLINK_H__ */
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 305bd4b0..6b275a1f 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -1562,96 +1562,6 @@ int __parse_rtattr_nested_compat(struct rtattr *tb[], int max,
return 0;
}
-static const char *get_nla_type_str(unsigned int attr)
-{
- switch (attr) {
-#define C(x) case NL_ATTR_TYPE_ ## x: return #x
- C(U8);
- C(U16);
- C(U32);
- C(U64);
- C(STRING);
- C(FLAG);
- C(NESTED);
- C(NESTED_ARRAY);
- C(NUL_STRING);
- C(BINARY);
- C(S8);
- C(S16);
- C(S32);
- C(S64);
- C(BITFIELD32);
- default:
- return "unknown";
- }
-}
-
-static void _nl_print_policy(const struct rtattr *attr)
-{
- struct rtattr *tp[NL_POLICY_TYPE_ATTR_MAX + 1];
-
- parse_rtattr_nested(tp, ARRAY_SIZE(tp) - 1, attr);
-
- if (tp[NL_POLICY_TYPE_ATTR_TYPE]) {
- print_uint(PRINT_ANY, "attr", "attr[%u]:",
- attr->rta_type & ~NLA_F_NESTED);
- print_string(PRINT_ANY, "type", " type=%s",
- get_nla_type_str(rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_TYPE])));
- }
-
- if (tp[NL_POLICY_TYPE_ATTR_POLICY_IDX])
- print_uint(PRINT_ANY, "policy", " policy:%u",
- rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_POLICY_IDX]));
-
- if (tp[NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE])
- print_uint(PRINT_ANY, "maxattr", " maxattr:%u",
- rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE]));
-
- if (tp[NL_POLICY_TYPE_ATTR_MIN_VALUE_S] && tp[NL_POLICY_TYPE_ATTR_MAX_VALUE_S]) {
- print_s64(PRINT_ANY, "min_value", " range:[%lld",
- rta_getattr_u64(tp[NL_POLICY_TYPE_ATTR_MIN_VALUE_S]));
- print_s64(PRINT_ANY, "max_value", "%lld]",
- rta_getattr_u64(tp[NL_POLICY_TYPE_ATTR_MAX_VALUE_S]));
- }
-
- if (tp[NL_POLICY_TYPE_ATTR_MIN_VALUE_U] && tp[NL_POLICY_TYPE_ATTR_MAX_VALUE_U]) {
- print_u64(PRINT_ANY, "min_value", " range:[%llu",
- rta_getattr_u64(tp[NL_POLICY_TYPE_ATTR_MIN_VALUE_U]));
- print_u64(PRINT_ANY, "max_value", "%llu]",
- rta_getattr_u64(tp[NL_POLICY_TYPE_ATTR_MAX_VALUE_U]));
- }
-
- if (tp[NL_POLICY_TYPE_ATTR_MIN_LENGTH])
- print_uint(PRINT_ANY, "min_length", " min len:%u",
- rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_MIN_LENGTH]));
-
- if (tp[NL_POLICY_TYPE_ATTR_MAX_LENGTH])
- print_uint(PRINT_ANY, "max_length", " max len:%u",
- rta_getattr_u32(tp[NL_POLICY_TYPE_ATTR_MAX_LENGTH]));
-}
-
-void nl_print_policy(const struct rtattr *attr)
-{
- const struct rtattr *pos;
-
- open_json_array(PRINT_JSON, NULL);
- rtattr_for_each_nested(pos, attr) {
- const struct rtattr *a;
-
- open_json_array(PRINT_JSON, NULL);
-
- print_uint(PRINT_ANY, "policy", " policy[%u]:", pos->rta_type & ~NLA_F_NESTED);
-
- rtattr_for_each_nested(a, pos) {
- open_json_object(NULL);
- _nl_print_policy(a);
- close_json_object();
- }
- close_json_array(PRINT_JSON, NULL);
- }
- close_json_array(PRINT_JSON, NULL);
-}
-
int rtnl_tunneldump_req(struct rtnl_handle *rth, int family, int ifindex,
__u8 flags)
{
--
2.51.0
Powered by blists - more mailing lists