diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2020-10-19 23:32:43 +0200 |
|---|---|---|
| committer | Michal Kubecek <mkubecek@suse.cz> | 2020-10-21 11:39:00 +0200 |
| commit | 0f5f1bacee2bfb0b29fe037f8236b3cd714fb10e (patch) | |
| tree | 3b0f9f70558f2f471ae28498f3883636f587f4eb | |
| parent | c7fe2f38477f5f90569f73bacd6fab3a8a739f62 (diff) | |
| download | ethtool-0f5f1bacee2bfb0b29fe037f8236b3cd714fb10e.tar.gz | |
netlink: support 64-bit attribute types in pretty printed messages
Add NLA_U64 (unsigned), NLA_X64 (unsigned, printed as hex) and NLA_S64
(signed) attribute types in pretty printing code.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
| -rw-r--r-- | netlink/prettymsg.c | 10 | ||||
| -rw-r--r-- | netlink/prettymsg.h | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/netlink/prettymsg.c b/netlink/prettymsg.c index d5d999f..0a1fae3 100644 --- a/netlink/prettymsg.c +++ b/netlink/prettymsg.c @@ -9,6 +9,7 @@ #include <errno.h> #include <stdint.h> #include <limits.h> +#include <inttypes.h> #include <linux/genetlink.h> #include <linux/rtnetlink.h> #include <linux/if_link.h> @@ -110,6 +111,9 @@ static int pretty_print_attr(const struct nlattr *attr, case NLA_U32: printf("%u", mnl_attr_get_u32(attr)); break; + case NLA_U64: + printf("%" PRIu64, mnl_attr_get_u64(attr)); + break; case NLA_X8: printf("0x%02x", mnl_attr_get_u8(attr)); break; @@ -119,6 +123,9 @@ static int pretty_print_attr(const struct nlattr *attr, case NLA_X32: printf("0x%08x", mnl_attr_get_u32(attr)); break; + case NLA_X64: + printf("%" PRIx64, mnl_attr_get_u64(attr)); + break; case NLA_S8: printf("%d", (int)mnl_attr_get_u8(attr)); break; @@ -128,6 +135,9 @@ static int pretty_print_attr(const struct nlattr *attr, case NLA_S32: printf("%d", (int)mnl_attr_get_u32(attr)); break; + case NLA_S64: + printf("%" PRId64, (int64_t)mnl_attr_get_u64(attr)); + break; case NLA_STRING: printf("\"%.*s\"", alen, (const char *)adata); break; diff --git a/netlink/prettymsg.h b/netlink/prettymsg.h index 6987c6e..25990cc 100644 --- a/netlink/prettymsg.h +++ b/netlink/prettymsg.h @@ -17,12 +17,15 @@ enum pretty_nla_format { NLA_U8, NLA_U16, NLA_U32, + NLA_U64, NLA_X8, NLA_X16, NLA_X32, + NLA_X64, NLA_S8, NLA_S16, NLA_S32, + NLA_S64, NLA_STRING, NLA_FLAG, NLA_BOOL, @@ -62,12 +65,15 @@ struct pretty_nlmsg_desc { #define NLATTR_DESC_U8(_name) NLATTR_DESC(_name, NLA_U8) #define NLATTR_DESC_U16(_name) NLATTR_DESC(_name, NLA_U16) #define NLATTR_DESC_U32(_name) NLATTR_DESC(_name, NLA_U32) +#define NLATTR_DESC_U64(_name) NLATTR_DESC(_name, NLA_U64) #define NLATTR_DESC_X8(_name) NLATTR_DESC(_name, NLA_X8) #define NLATTR_DESC_X16(_name) NLATTR_DESC(_name, NLA_X16) #define NLATTR_DESC_X32(_name) NLATTR_DESC(_name, NLA_X32) +#define NLATTR_DESC_X64(_name) NLATTR_DESC(_name, NLA_X64) #define NLATTR_DESC_S8(_name) NLATTR_DESC(_name, NLA_U8) #define NLATTR_DESC_S16(_name) NLATTR_DESC(_name, NLA_U16) #define NLATTR_DESC_S32(_name) NLATTR_DESC(_name, NLA_U32) +#define NLATTR_DESC_S64(_name) NLATTR_DESC(_name, NLA_S64) #define NLATTR_DESC_STRING(_name) NLATTR_DESC(_name, NLA_STRING) #define NLATTR_DESC_FLAG(_name) NLATTR_DESC(_name, NLA_FLAG) #define NLATTR_DESC_BOOL(_name) NLATTR_DESC(_name, NLA_BOOL) |