|
 |
32391d |
From 66efa0a6dc179f814614fbd2f47c37d7e20e4405 Mon Sep 17 00:00:00 2001
|
|
|
32391d |
Message-Id: <66efa0a6dc179f814614fbd2f47c37d7e20e4405.1644243783.git.aclaudi@redhat.com>
|
|
|
32391d |
In-Reply-To: <b30268eda844bdebbb8e5e4f5735e3b1bb666368.1644243783.git.aclaudi@redhat.com>
|
|
|
32391d |
References: <b30268eda844bdebbb8e5e4f5735e3b1bb666368.1644243783.git.aclaudi@redhat.com>
|
|
|
32391d |
From: Andrea Claudi <aclaudi@redhat.com>
|
|
|
32391d |
Date: Mon, 7 Feb 2022 15:16:36 +0100
|
|
|
32391d |
Subject: [PATCH] tc: u32: add json support in `print_raw`, `print_ipv4`,
|
|
|
32391d |
`print_ipv6`
|
|
|
32391d |
|
|
|
32391d |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1989591
|
|
|
32391d |
Upstream Status: unknown commit 721435dc
|
|
|
32391d |
|
|
|
32391d |
commit 721435dcfd9274277af2fb6a4cec81d4a9bcc6b4
|
|
|
32391d |
Author: Wen Liang <liangwen12year@gmail.com>
|
|
|
32391d |
Date: Wed Jan 26 14:44:48 2022 -0500
|
|
|
32391d |
|
|
|
32391d |
tc: u32: add json support in `print_raw`, `print_ipv4`, `print_ipv6`
|
|
|
32391d |
|
|
|
32391d |
Currently the key struct of u32 filter does not support json. This
|
|
|
32391d |
commit adds json support for showing key.
|
|
|
32391d |
|
|
|
32391d |
Signed-off-by: Wen Liang <liangwen12year@gmail.com>
|
|
|
32391d |
Tested-by: Victor Nogueira <victor@mojatatu.com>
|
|
|
32391d |
Signed-off-by: David Ahern <dsahern@kernel.org>
|
|
|
32391d |
---
|
|
|
32391d |
tc/f_u32.c | 121 ++++++++++++++++++++++++++++++++++-------------------
|
|
|
32391d |
1 file changed, 79 insertions(+), 42 deletions(-)
|
|
|
32391d |
|
|
|
32391d |
diff --git a/tc/f_u32.c b/tc/f_u32.c
|
|
|
32391d |
index 11da202e..d787eb91 100644
|
|
|
32391d |
--- a/tc/f_u32.c
|
|
|
32391d |
+++ b/tc/f_u32.c
|
|
|
32391d |
@@ -824,23 +824,27 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key)
|
|
|
32391d |
{
|
|
|
32391d |
char abuf[256];
|
|
|
32391d |
|
|
|
32391d |
+ open_json_object("match");
|
|
|
32391d |
switch (key->off) {
|
|
|
32391d |
case 0:
|
|
|
32391d |
switch (ntohl(key->mask)) {
|
|
|
32391d |
case 0x0f000000:
|
|
|
32391d |
- fprintf(f, "\n match IP ihl %u",
|
|
|
32391d |
- ntohl(key->val) >> 24);
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_uint(PRINT_ANY, "ip_ihl", " match IP ihl %u",
|
|
|
32391d |
+ ntohl(key->val) >> 24);
|
|
|
32391d |
return;
|
|
|
32391d |
case 0x00ff0000:
|
|
|
32391d |
- fprintf(f, "\n match IP dsfield %#x",
|
|
|
32391d |
- ntohl(key->val) >> 16);
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_0xhex(PRINT_ANY, "ip_dsfield", " match IP dsfield %#x",
|
|
|
32391d |
+ ntohl(key->val) >> 16);
|
|
|
32391d |
return;
|
|
|
32391d |
}
|
|
|
32391d |
break;
|
|
|
32391d |
case 8:
|
|
|
32391d |
if (ntohl(key->mask) == 0x00ff0000) {
|
|
|
32391d |
- fprintf(f, "\n match IP protocol %d",
|
|
|
32391d |
- ntohl(key->val) >> 16);
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_int(PRINT_ANY, "ip_protocol", " match IP protocol %d",
|
|
|
32391d |
+ ntohl(key->val) >> 16);
|
|
|
32391d |
return;
|
|
|
32391d |
}
|
|
|
32391d |
break;
|
|
|
32391d |
@@ -849,11 +853,21 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key)
|
|
|
32391d |
int bits = mask2bits(key->mask);
|
|
|
32391d |
|
|
|
32391d |
if (bits >= 0) {
|
|
|
32391d |
- fprintf(f, "\n %s %s/%d",
|
|
|
32391d |
- key->off == 12 ? "match IP src" : "match IP dst",
|
|
|
32391d |
- inet_ntop(AF_INET, &key->val,
|
|
|
32391d |
- abuf, sizeof(abuf)),
|
|
|
32391d |
- bits);
|
|
|
32391d |
+ const char *addr;
|
|
|
32391d |
+
|
|
|
32391d |
+ if (key->off == 12) {
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_null(PRINT_FP, NULL, " match IP src ", NULL);
|
|
|
32391d |
+ open_json_object("src");
|
|
|
32391d |
+ } else {
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_null(PRINT_FP, NULL, " match IP dst ", NULL);
|
|
|
32391d |
+ open_json_object("dst");
|
|
|
32391d |
+ }
|
|
|
32391d |
+ addr = inet_ntop(AF_INET, &key->val, abuf, sizeof(abuf));
|
|
|
32391d |
+ print_string(PRINT_ANY, "address", "%s", addr);
|
|
|
32391d |
+ print_int(PRINT_ANY, "prefixlen", "/%d", bits);
|
|
|
32391d |
+ close_json_object();
|
|
|
32391d |
return;
|
|
|
32391d |
}
|
|
|
32391d |
}
|
|
|
32391d |
@@ -862,45 +876,52 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key)
|
|
|
32391d |
case 20:
|
|
|
32391d |
switch (ntohl(key->mask)) {
|
|
|
32391d |
case 0x0000ffff:
|
|
|
32391d |
- fprintf(f, "\n match dport %u",
|
|
|
32391d |
- ntohl(key->val) & 0xffff);
|
|
|
32391d |
+ print_uint(PRINT_ANY, "dport", "match dport %u",
|
|
|
32391d |
+ ntohl(key->val) & 0xffff);
|
|
|
32391d |
return;
|
|
|
32391d |
case 0xffff0000:
|
|
|
32391d |
- fprintf(f, "\n match sport %u",
|
|
|
32391d |
- ntohl(key->val) >> 16);
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_uint(PRINT_ANY, "sport", " match sport %u",
|
|
|
32391d |
+ ntohl(key->val) >> 16);
|
|
|
32391d |
return;
|
|
|
32391d |
case 0xffffffff:
|
|
|
32391d |
- fprintf(f, "\n match dport %u, match sport %u",
|
|
|
32391d |
- ntohl(key->val) & 0xffff,
|
|
|
32391d |
- ntohl(key->val) >> 16);
|
|
|
32391d |
-
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_uint(PRINT_ANY, "dport", " match dport %u, ",
|
|
|
32391d |
+ ntohl(key->val) & 0xffff);
|
|
|
32391d |
+ print_uint(PRINT_ANY, "sport", "match sport %u",
|
|
|
32391d |
+ ntohl(key->val) >> 16);
|
|
|
32391d |
return;
|
|
|
32391d |
}
|
|
|
32391d |
/* XXX: Default print_raw */
|
|
|
32391d |
}
|
|
|
32391d |
+ close_json_object();
|
|
|
32391d |
}
|
|
|
32391d |
|
|
|
32391d |
static void print_ipv6(FILE *f, const struct tc_u32_key *key)
|
|
|
32391d |
{
|
|
|
32391d |
char abuf[256];
|
|
|
32391d |
|
|
|
32391d |
+ open_json_object("match");
|
|
|
32391d |
switch (key->off) {
|
|
|
32391d |
case 0:
|
|
|
32391d |
switch (ntohl(key->mask)) {
|
|
|
32391d |
case 0x0f000000:
|
|
|
32391d |
- fprintf(f, "\n match IP ihl %u",
|
|
|
32391d |
- ntohl(key->val) >> 24);
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_uint(PRINT_ANY, "ip_ihl", " match IP ihl %u",
|
|
|
32391d |
+ ntohl(key->val) >> 24);
|
|
|
32391d |
return;
|
|
|
32391d |
case 0x00ff0000:
|
|
|
32391d |
- fprintf(f, "\n match IP dsfield %#x",
|
|
|
32391d |
- ntohl(key->val) >> 16);
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_0xhex(PRINT_ANY, "ip_dsfield", " match IP dsfield %#x",
|
|
|
32391d |
+ ntohl(key->val) >> 16);
|
|
|
32391d |
return;
|
|
|
32391d |
}
|
|
|
32391d |
break;
|
|
|
32391d |
case 8:
|
|
|
32391d |
if (ntohl(key->mask) == 0x00ff0000) {
|
|
|
32391d |
- fprintf(f, "\n match IP protocol %d",
|
|
|
32391d |
- ntohl(key->val) >> 16);
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_int(PRINT_ANY, "ip_protocol", " match IP protocol %d",
|
|
|
32391d |
+ ntohl(key->val) >> 16);
|
|
|
32391d |
return;
|
|
|
32391d |
}
|
|
|
32391d |
break;
|
|
|
32391d |
@@ -909,11 +930,21 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key)
|
|
|
32391d |
int bits = mask2bits(key->mask);
|
|
|
32391d |
|
|
|
32391d |
if (bits >= 0) {
|
|
|
32391d |
- fprintf(f, "\n %s %s/%d",
|
|
|
32391d |
- key->off == 12 ? "match IP src" : "match IP dst",
|
|
|
32391d |
- inet_ntop(AF_INET, &key->val,
|
|
|
32391d |
- abuf, sizeof(abuf)),
|
|
|
32391d |
- bits);
|
|
|
32391d |
+ const char *addr;
|
|
|
32391d |
+
|
|
|
32391d |
+ if (key->off == 12) {
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_null(PRINT_FP, NULL, " match IP src ", NULL);
|
|
|
32391d |
+ open_json_object("src");
|
|
|
32391d |
+ } else {
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_null(PRINT_FP, NULL, " match IP dst ", NULL);
|
|
|
32391d |
+ open_json_object("dst");
|
|
|
32391d |
+ }
|
|
|
32391d |
+ addr = inet_ntop(AF_INET, &key->val, abuf, sizeof(abuf));
|
|
|
32391d |
+ print_string(PRINT_ANY, "address", "%s", addr);
|
|
|
32391d |
+ print_int(PRINT_ANY, "prefixlen", "/%d", bits);
|
|
|
32391d |
+ close_json_object();
|
|
|
32391d |
return;
|
|
|
32391d |
}
|
|
|
32391d |
}
|
|
|
32391d |
@@ -922,31 +953,37 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key)
|
|
|
32391d |
case 20:
|
|
|
32391d |
switch (ntohl(key->mask)) {
|
|
|
32391d |
case 0x0000ffff:
|
|
|
32391d |
- fprintf(f, "\n match sport %u",
|
|
|
32391d |
- ntohl(key->val) & 0xffff);
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_uint(PRINT_ANY, "sport", " match sport %u",
|
|
|
32391d |
+ ntohl(key->val) & 0xffff);
|
|
|
32391d |
return;
|
|
|
32391d |
case 0xffff0000:
|
|
|
32391d |
- fprintf(f, "\n match dport %u",
|
|
|
32391d |
- ntohl(key->val) >> 16);
|
|
|
32391d |
+ print_uint(PRINT_ANY, "dport", "match dport %u",
|
|
|
32391d |
+ ntohl(key->val) >> 16);
|
|
|
32391d |
return;
|
|
|
32391d |
case 0xffffffff:
|
|
|
32391d |
- fprintf(f, "\n match sport %u, match dport %u",
|
|
|
32391d |
- ntohl(key->val) & 0xffff,
|
|
|
32391d |
- ntohl(key->val) >> 16);
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_uint(PRINT_ANY, "sport", " match sport %u, ",
|
|
|
32391d |
+ ntohl(key->val) & 0xffff);
|
|
|
32391d |
+ print_uint(PRINT_ANY, "dport", "match dport %u",
|
|
|
32391d |
+ ntohl(key->val) >> 16);
|
|
|
32391d |
|
|
|
32391d |
return;
|
|
|
32391d |
}
|
|
|
32391d |
/* XXX: Default print_raw */
|
|
|
32391d |
}
|
|
|
32391d |
+ close_json_object();
|
|
|
32391d |
}
|
|
|
32391d |
|
|
|
32391d |
static void print_raw(FILE *f, const struct tc_u32_key *key)
|
|
|
32391d |
{
|
|
|
32391d |
- fprintf(f, "\n match %08x/%08x at %s%d",
|
|
|
32391d |
- (unsigned int)ntohl(key->val),
|
|
|
32391d |
- (unsigned int)ntohl(key->mask),
|
|
|
32391d |
- key->offmask ? "nexthdr+" : "",
|
|
|
32391d |
- key->off);
|
|
|
32391d |
+ open_json_object("match");
|
|
|
32391d |
+ print_nl();
|
|
|
32391d |
+ print_hex(PRINT_ANY, "value", " match %08x", (unsigned int)ntohl(key->val));
|
|
|
32391d |
+ print_hex(PRINT_ANY, "mask", "/%08x ", (unsigned int)ntohl(key->mask));
|
|
|
32391d |
+ print_string(PRINT_ANY, "offmask", "at %s", key->offmask ? "nexthdr+" : "");
|
|
|
32391d |
+ print_int(PRINT_ANY, "off", "%d", key->off);
|
|
|
32391d |
+ close_json_object();
|
|
|
32391d |
}
|
|
|
32391d |
|
|
|
32391d |
static const struct {
|
|
|
32391d |
--
|
|
|
32391d |
2.34.1
|
|
|
32391d |
|