[PATCH iproute2 1/2] tc: u32: add support for json output
From: Wen Liang <hidden>
Date: 2021-09-07 01:58:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
Currently u32 filter output does not support json. This commit uses proper json functions to add support for it. Signed-off-by: Wen Liang <redacted> --- tc/f_u32.c | 66 ++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 34 deletions(-)
diff --git a/tc/f_u32.c b/tc/f_u32.c
index a5747f67..136fb740 100644
--- a/tc/f_u32.c
+++ b/tc/f_u32.c@@ -1213,11 +1213,11 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, if (handle) { SPRINT_BUF(b1); - fprintf(f, "fh %s ", sprint_u32_handle(handle, b1)); + print_string(PRINT_ANY, "fh", "fh %s ", sprint_u32_handle(handle, b1)); } if (TC_U32_NODE(handle)) - fprintf(f, "order %d ", TC_U32_NODE(handle)); + print_int(PRINT_ANY, "order", "order %d ", TC_U32_NODE(handle)); if (tb[TCA_U32_SEL]) { if (RTA_PAYLOAD(tb[TCA_U32_SEL]) < sizeof(*sel))
@@ -1227,15 +1227,13 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, } if (tb[TCA_U32_DIVISOR]) { - fprintf(f, "ht divisor %d ", - rta_getattr_u32(tb[TCA_U32_DIVISOR])); + print_int(PRINT_ANY, "ht divisor", "ht divisor %d ", rta_getattr_u32(tb[TCA_U32_DIVISOR])); } else if (tb[TCA_U32_HASH]) { __u32 htid = rta_getattr_u32(tb[TCA_U32_HASH]); - - fprintf(f, "key ht %x bkt %x ", TC_U32_USERHTID(htid), - TC_U32_HASH(htid)); + print_hex(PRINT_ANY, "key ht", "key ht %x ", TC_U32_USERHTID(htid)); + print_hex(PRINT_ANY, "bkt", "bkt %x ", TC_U32_HASH(htid)); } else { - fprintf(f, "??? "); + print_string(PRINT_ANY, NULL, "%s", "??? "); } if (tb[TCA_U32_CLASSID]) { SPRINT_BUF(b1);
@@ -1244,12 +1242,11 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, sprint_tc_classid(rta_getattr_u32(tb[TCA_U32_CLASSID]), b1)); } else if (sel && sel->flags & TC_U32_TERMINAL) { - fprintf(f, "terminal flowid ??? "); + print_bool(PRINT_ANY, "terminal flowid", "terminal flowid ??? ", true); } if (tb[TCA_U32_LINK]) { SPRINT_BUF(b1); - fprintf(f, "link %s ", - sprint_u32_handle(rta_getattr_u32(tb[TCA_U32_LINK]), + print_string(PRINT_ANY, "link", "link %s ", sprint_u32_handle(rta_getattr_u32(tb[TCA_U32_LINK]), b1)); }
@@ -1257,14 +1254,14 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u32 flags = rta_getattr_u32(tb[TCA_U32_FLAGS]); if (flags & TCA_CLS_FLAGS_SKIP_HW) - fprintf(f, "skip_hw "); + print_bool(PRINT_ANY, "skip_hw", "skip_hw ", true); if (flags & TCA_CLS_FLAGS_SKIP_SW) - fprintf(f, "skip_sw "); + print_bool(PRINT_ANY, "skip_sw", "skip_sw ", true); if (flags & TCA_CLS_FLAGS_IN_HW) - fprintf(f, "in_hw "); + print_bool(PRINT_ANY, "in_hw", "in_hw ", true); else if (flags & TCA_CLS_FLAGS_NOT_IN_HW) - fprintf(f, "not_in_hw "); + print_bool(PRINT_ANY, "not_in_hw", "not_in_hw ", true); } if (tb[TCA_U32_PCNT]) {
@@ -1275,10 +1272,10 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, pf = RTA_DATA(tb[TCA_U32_PCNT]); } - if (sel && show_stats && NULL != pf) - fprintf(f, " (rule hit %llu success %llu)", - (unsigned long long) pf->rcnt, - (unsigned long long) pf->rhit); + if (sel && show_stats && NULL != pf) { + print_lluint(PRINT_ANY, "rule hit", "(rule hit %llu ", (unsigned long long) pf->rcnt); + print_lluint(PRINT_ANY, "success", "success %llu)", (unsigned long long) pf->rhit); + } if (tb[TCA_U32_MARK]) { struct tc_u32_mark *mark = RTA_DATA(tb[TCA_U32_MARK]);
@@ -1286,8 +1283,9 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, if (RTA_PAYLOAD(tb[TCA_U32_MARK]) < sizeof(*mark)) { fprintf(f, "\n Invalid mark (kernel&iproute2 mismatch)\n"); } else { - fprintf(f, "\n mark 0x%04x 0x%04x (success %d)", - mark->val, mark->mask, mark->success); + print_0xhex(PRINT_ANY, "fwmark_value", "\n mark 0x%04x ", mark->val); + print_0xhex(PRINT_ANY, "fwmark_mask", "0x%04x ", mark->mask); + print_int(PRINT_ANY, "fwmark_success", "(success %d)", mark->success); } }
@@ -1298,38 +1296,38 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, for (i = 0; i < sel->nkeys; i++) { show_keys(f, sel->keys + i); if (show_stats && NULL != pf) - fprintf(f, " (success %llu ) ", - (unsigned long long) pf->kcnts[i]); + print_lluint(PRINT_ANY, "success", " (success %llu ) ", (unsigned long long) pf->kcnts[i]); } } if (sel->flags & (TC_U32_VAROFFSET | TC_U32_OFFSET)) { - fprintf(f, "\n offset "); - if (sel->flags & TC_U32_VAROFFSET) - fprintf(f, "%04x>>%d at %d ", - ntohs(sel->offmask), - sel->offshift, sel->offoff); + print_string(PRINT_ANY, NULL, "%s", "\n offset "); + if (sel->flags & TC_U32_VAROFFSET) { + print_hex(PRINT_ANY, "offset mask", "%04x", ntohs(sel->offmask)); + print_int(PRINT_ANY, "offset shift", ">>%d ", sel->offshift); + print_int(PRINT_ANY, "offset off", "at %d ", sel->offoff); + } if (sel->off) - fprintf(f, "plus %d ", sel->off); + print_int(PRINT_ANY, "plus", "plus %d ", sel->off); } if (sel->flags & TC_U32_EAT) - fprintf(f, " eat "); + print_string(PRINT_ANY, NULL, "%s", " eat "); if (sel->hmask) { - fprintf(f, "\n hash mask %08x at %d ", - (unsigned int)htonl(sel->hmask), sel->hoff); + print_hex(PRINT_ANY, "hash mask", "\n hash mask %08x ", (unsigned int)htonl(sel->hmask)); + print_int(PRINT_ANY, "hash off", "at %d ", sel->hoff); } } if (tb[TCA_U32_POLICE]) { - fprintf(f, "\n"); + print_nl(); tc_print_police(f, tb[TCA_U32_POLICE]); } if (tb[TCA_U32_INDEV]) { struct rtattr *idev = tb[TCA_U32_INDEV]; - fprintf(f, "\n input dev %s\n", rta_getattr_str(idev)); + print_string(PRINT_ANY, "input dev", "\n input dev %s\n", rta_getattr_str(idev)); } if (tb[TCA_U32_ACT])
--
2.26.3