|
 |
7e9df8 |
From 2ed28d2a92d05a4a1d8bd98dab1607741202f4a3 Mon Sep 17 00:00:00 2001
|
|
|
7e9df8 |
From: Michal Kubecek <mkubecek@suse.cz>
|
|
|
7e9df8 |
Date: Mon, 19 Oct 2020 23:32:43 +0200
|
|
|
7e9df8 |
Subject: [PATCH 35/37] netlink: support 64-bit attribute types in pretty
|
|
|
7e9df8 |
printed messages
|
|
|
7e9df8 |
|
|
|
7e9df8 |
Add NLA_U64 (unsigned), NLA_X64 (unsigned, printed as hex) and NLA_S64
|
|
|
7e9df8 |
(signed) attribute types in pretty printing code.
|
|
|
7e9df8 |
|
|
|
7e9df8 |
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
|
|
|
7e9df8 |
(cherry picked from commit 0f5f1bacee2bfb0b29fe037f8236b3cd714fb10e)
|
|
|
7e9df8 |
---
|
|
|
7e9df8 |
netlink/prettymsg.c | 10 ++++++++++
|
|
|
7e9df8 |
netlink/prettymsg.h | 6 ++++++
|
|
|
7e9df8 |
2 files changed, 16 insertions(+)
|
|
|
7e9df8 |
|
|
|
7e9df8 |
diff --git a/netlink/prettymsg.c b/netlink/prettymsg.c
|
|
|
7e9df8 |
index d5d999fddfbb..0a1fae3da54e 100644
|
|
|
7e9df8 |
--- a/netlink/prettymsg.c
|
|
|
7e9df8 |
+++ b/netlink/prettymsg.c
|
|
|
7e9df8 |
@@ -9,6 +9,7 @@
|
|
|
7e9df8 |
#include <errno.h>
|
|
|
7e9df8 |
#include <stdint.h>
|
|
|
7e9df8 |
#include <limits.h>
|
|
|
7e9df8 |
+#include <inttypes.h>
|
|
|
7e9df8 |
#include <linux/genetlink.h>
|
|
|
7e9df8 |
#include <linux/rtnetlink.h>
|
|
|
7e9df8 |
#include <linux/if_link.h>
|
|
|
7e9df8 |
@@ -110,6 +111,9 @@ static int pretty_print_attr(const struct nlattr *attr,
|
|
|
7e9df8 |
case NLA_U32:
|
|
|
7e9df8 |
printf("%u", mnl_attr_get_u32(attr));
|
|
|
7e9df8 |
break;
|
|
|
7e9df8 |
+ case NLA_U64:
|
|
|
7e9df8 |
+ printf("%" PRIu64, mnl_attr_get_u64(attr));
|
|
|
7e9df8 |
+ break;
|
|
|
7e9df8 |
case NLA_X8:
|
|
|
7e9df8 |
printf("0x%02x", mnl_attr_get_u8(attr));
|
|
|
7e9df8 |
break;
|
|
|
7e9df8 |
@@ -119,6 +123,9 @@ static int pretty_print_attr(const struct nlattr *attr,
|
|
|
7e9df8 |
case NLA_X32:
|
|
|
7e9df8 |
printf("0x%08x", mnl_attr_get_u32(attr));
|
|
|
7e9df8 |
break;
|
|
|
7e9df8 |
+ case NLA_X64:
|
|
|
7e9df8 |
+ printf("%" PRIx64, mnl_attr_get_u64(attr));
|
|
|
7e9df8 |
+ break;
|
|
|
7e9df8 |
case NLA_S8:
|
|
|
7e9df8 |
printf("%d", (int)mnl_attr_get_u8(attr));
|
|
|
7e9df8 |
break;
|
|
|
7e9df8 |
@@ -128,6 +135,9 @@ static int pretty_print_attr(const struct nlattr *attr,
|
|
|
7e9df8 |
case NLA_S32:
|
|
|
7e9df8 |
printf("%d", (int)mnl_attr_get_u32(attr));
|
|
|
7e9df8 |
break;
|
|
|
7e9df8 |
+ case NLA_S64:
|
|
|
7e9df8 |
+ printf("%" PRId64, (int64_t)mnl_attr_get_u64(attr));
|
|
|
7e9df8 |
+ break;
|
|
|
7e9df8 |
case NLA_STRING:
|
|
|
7e9df8 |
printf("\"%.*s\"", alen, (const char *)adata);
|
|
|
7e9df8 |
break;
|
|
|
7e9df8 |
diff --git a/netlink/prettymsg.h b/netlink/prettymsg.h
|
|
|
7e9df8 |
index 6987c6ec5bca..25990cceffca 100644
|
|
|
7e9df8 |
--- a/netlink/prettymsg.h
|
|
|
7e9df8 |
+++ b/netlink/prettymsg.h
|
|
|
7e9df8 |
@@ -17,12 +17,15 @@ enum pretty_nla_format {
|
|
|
7e9df8 |
NLA_U8,
|
|
|
7e9df8 |
NLA_U16,
|
|
|
7e9df8 |
NLA_U32,
|
|
|
7e9df8 |
+ NLA_U64,
|
|
|
7e9df8 |
NLA_X8,
|
|
|
7e9df8 |
NLA_X16,
|
|
|
7e9df8 |
NLA_X32,
|
|
|
7e9df8 |
+ NLA_X64,
|
|
|
7e9df8 |
NLA_S8,
|
|
|
7e9df8 |
NLA_S16,
|
|
|
7e9df8 |
NLA_S32,
|
|
|
7e9df8 |
+ NLA_S64,
|
|
|
7e9df8 |
NLA_STRING,
|
|
|
7e9df8 |
NLA_FLAG,
|
|
|
7e9df8 |
NLA_BOOL,
|
|
|
7e9df8 |
@@ -62,12 +65,15 @@ struct pretty_nlmsg_desc {
|
|
|
7e9df8 |
#define NLATTR_DESC_U8(_name) NLATTR_DESC(_name, NLA_U8)
|
|
|
7e9df8 |
#define NLATTR_DESC_U16(_name) NLATTR_DESC(_name, NLA_U16)
|
|
|
7e9df8 |
#define NLATTR_DESC_U32(_name) NLATTR_DESC(_name, NLA_U32)
|
|
|
7e9df8 |
+#define NLATTR_DESC_U64(_name) NLATTR_DESC(_name, NLA_U64)
|
|
|
7e9df8 |
#define NLATTR_DESC_X8(_name) NLATTR_DESC(_name, NLA_X8)
|
|
|
7e9df8 |
#define NLATTR_DESC_X16(_name) NLATTR_DESC(_name, NLA_X16)
|
|
|
7e9df8 |
#define NLATTR_DESC_X32(_name) NLATTR_DESC(_name, NLA_X32)
|
|
|
7e9df8 |
+#define NLATTR_DESC_X64(_name) NLATTR_DESC(_name, NLA_X64)
|
|
|
7e9df8 |
#define NLATTR_DESC_S8(_name) NLATTR_DESC(_name, NLA_U8)
|
|
|
7e9df8 |
#define NLATTR_DESC_S16(_name) NLATTR_DESC(_name, NLA_U16)
|
|
|
7e9df8 |
#define NLATTR_DESC_S32(_name) NLATTR_DESC(_name, NLA_U32)
|
|
|
7e9df8 |
+#define NLATTR_DESC_S64(_name) NLATTR_DESC(_name, NLA_S64)
|
|
|
7e9df8 |
#define NLATTR_DESC_STRING(_name) NLATTR_DESC(_name, NLA_STRING)
|
|
|
7e9df8 |
#define NLATTR_DESC_FLAG(_name) NLATTR_DESC(_name, NLA_FLAG)
|
|
|
7e9df8 |
#define NLATTR_DESC_BOOL(_name) NLATTR_DESC(_name, NLA_BOOL)
|
|
|
7e9df8 |
--
|
|
|
7e9df8 |
2.26.2
|
|
|
7e9df8 |
|