@@ -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);
+}
@@ -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