[PATCH iproute2 2/2] tc: u32: add json support in `print_raw`, `print_ipv4`, `print_ipv6`
From: Wen Liang <hidden>
Date: 2021-09-07 01:58:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Wen Liang <redacted> --- tc/f_u32.c | 72 +++++++++++++++++++++++------------------------------- 1 file changed, 30 insertions(+), 42 deletions(-)
diff --git a/tc/f_u32.c b/tc/f_u32.c
index 136fb740..8558ab6d 100644
--- a/tc/f_u32.c
+++ b/tc/f_u32.c@@ -828,19 +828,16 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key) case 0: switch (ntohl(key->mask)) { case 0x0f000000: - fprintf(f, "\n match IP ihl %u", - ntohl(key->val) >> 24); + print_uint(PRINT_ANY, "match IP ihl", "\n match IP ihl %u", ntohl(key->val) >> 24); return; case 0x00ff0000: - fprintf(f, "\n match IP dsfield %#x", - ntohl(key->val) >> 16); + print_0xhex(PRINT_ANY, "match IP dsfield", "\n match IP dsfield %#x", ntohl(key->val) >> 16); return; } break; case 8: if (ntohl(key->mask) == 0x00ff0000) { - fprintf(f, "\n match IP protocol %d", - ntohl(key->val) >> 16); + print_int(PRINT_ANY, "match IP protocol", "\n match IP protocol %d", ntohl(key->val) >> 16); return; } break;
@@ -849,11 +846,12 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key) int bits = mask2bits(key->mask); if (bits >= 0) { - fprintf(f, "\n %s %s/%d", - key->off == 12 ? "match IP src" : "match IP dst", - inet_ntop(AF_INET, &key->val, - abuf, sizeof(abuf)), - bits); + if (key->off == 12) + print_string(PRINT_ANY, "match IP", "\n %s ", "src"); + else + print_string(PRINT_ANY, "match IP", "\n %s ", "dst"); + print_string(PRINT_ANY, "IP Addr", "%s", inet_ntop(AF_INET, &key->val, abuf, sizeof(abuf))); + print_int(PRINT_ANY, "IP Addr prefix", "/%d", bits); return; } }
@@ -862,18 +860,14 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key) case 20: switch (ntohl(key->mask)) { case 0x0000ffff: - fprintf(f, "\n match dport %u", - ntohl(key->val) & 0xffff); + print_uint(PRINT_ANY, "match dport", "match dport %u", ntohl(key->val) & 0xffff); return; case 0xffff0000: - fprintf(f, "\n match sport %u", - ntohl(key->val) >> 16); + print_uint(PRINT_ANY, "match sport", "\n match sport %u", ntohl(key->val) >> 16); return; case 0xffffffff: - fprintf(f, "\n match dport %u, match sport %u", - ntohl(key->val) & 0xffff, - ntohl(key->val) >> 16); - + print_uint(PRINT_ANY, "match dport", "\n match dport %u, ", ntohl(key->val) & 0xffff); + print_uint(PRINT_ANY, "match sport", "match sport %u", ntohl(key->val) >> 16); return; } /* XXX: Default print_raw */
@@ -888,19 +882,16 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key) case 0: switch (ntohl(key->mask)) { case 0x0f000000: - fprintf(f, "\n match IP ihl %u", - ntohl(key->val) >> 24); + print_uint(PRINT_ANY, "match IP ihl", "\n match IP ihl %u", ntohl(key->val) >> 24); return; case 0x00ff0000: - fprintf(f, "\n match IP dsfield %#x", - ntohl(key->val) >> 16); + print_0xhex(PRINT_ANY, "match IP dsfield", "\n match IP dsfield %#x", ntohl(key->val) >> 16); return; } break; case 8: if (ntohl(key->mask) == 0x00ff0000) { - fprintf(f, "\n match IP protocol %d", - ntohl(key->val) >> 16); + print_int(PRINT_ANY, "match IP protocol", "\n match IP protocol %d", ntohl(key->val) >> 16); return; } break;
@@ -909,11 +900,12 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key) int bits = mask2bits(key->mask); if (bits >= 0) { - fprintf(f, "\n %s %s/%d", - key->off == 12 ? "match IP src" : "match IP dst", - inet_ntop(AF_INET, &key->val, - abuf, sizeof(abuf)), - bits); + if (key->off == 12) + print_string(PRINT_ANY, "match IP", "\n %s ", "src"); + else + print_string(PRINT_ANY, "match IP", "\n %s ", "dst"); + print_string(PRINT_ANY, "IP Addr", "%s", inet_ntop(AF_INET, &key->val, abuf, sizeof(abuf))); + print_int(PRINT_ANY, "IP Addr prefix", "/%d", bits); return; } }
@@ -922,17 +914,14 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key) case 20: switch (ntohl(key->mask)) { case 0x0000ffff: - fprintf(f, "\n match sport %u", - ntohl(key->val) & 0xffff); + print_uint(PRINT_ANY, "match sport", "\n match sport %u", ntohl(key->val) & 0xffff); return; case 0xffff0000: - fprintf(f, "\n match dport %u", - ntohl(key->val) >> 16); + print_uint(PRINT_ANY, "match dport", "match dport %u", ntohl(key->val) >> 16); return; case 0xffffffff: - fprintf(f, "\n match sport %u, match dport %u", - ntohl(key->val) & 0xffff, - ntohl(key->val) >> 16); + print_uint(PRINT_ANY, "match sport", "\n match sport %u, ", ntohl(key->val) & 0xffff); + print_uint(PRINT_ANY, "match dport", "match dport %u", ntohl(key->val) >> 16); return; }
@@ -942,11 +931,10 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key) static void print_raw(FILE *f, const struct tc_u32_key *key) { - fprintf(f, "\n match %08x/%08x at %s%d", - (unsigned int)ntohl(key->val), - (unsigned int)ntohl(key->mask), - key->offmask ? "nexthdr+" : "", - key->off); + print_hex(PRINT_ANY, "match value", "\n match %08x", (unsigned int)ntohl(key->val)); + print_hex(PRINT_ANY, "match mask", "/%08x ", (unsigned int)ntohl(key->mask)); + print_string(PRINT_ANY, "match offmask", "at %s", key->offmask ? "nexthdr+" : ""); + print_int(PRINT_ANY, "match off", "%d", key->off); } static const struct {
--
2.26.3