121 lines
4.5 KiB
Diff
121 lines
4.5 KiB
Diff
From 52754e4b7d4b52e9852869d7e2f6af1b890677f1 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <52754e4b7d4b52e9852869d7e2f6af1b890677f1.1611877215.git.aclaudi@redhat.com>
|
|
In-Reply-To: <cb7ce51cc1abd7b98370b903ec96205ebfe48661.1611877215.git.aclaudi@redhat.com>
|
|
References: <cb7ce51cc1abd7b98370b903ec96205ebfe48661.1611877215.git.aclaudi@redhat.com>
|
|
From: Andrea Claudi <aclaudi@redhat.com>
|
|
Date: Fri, 29 Jan 2021 00:35:04 +0100
|
|
Subject: [PATCH] tc: flower: fix json output with mpls lse
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1885770
|
|
Upstream Status: unknown commit 676a1a70
|
|
|
|
commit 676a1a708f8e99d6a4faa3de8a093f8f8c14b9da
|
|
Author: Guillaume Nault <gnault@redhat.com>
|
|
Date: Tue Jan 12 11:30:53 2021 +0100
|
|
|
|
tc: flower: fix json output with mpls lse
|
|
|
|
The json output of the TCA_FLOWER_KEY_MPLS_OPTS attribute was invalid.
|
|
|
|
Example:
|
|
|
|
$ tc filter add dev eth0 ingress protocol mpls_uc flower mpls \
|
|
lse depth 1 label 100 \
|
|
lse depth 2 label 200
|
|
|
|
$ tc -json filter show dev eth0 ingress
|
|
...{"eth_type":"8847",
|
|
" mpls":[" lse":["depth":1,"label":100],
|
|
" lse":["depth":2,"label":200]]}...
|
|
|
|
This is invalid as the arrays, introduced by "[", can't contain raw
|
|
string:value pairs. Those must be enclosed into "{}" to form valid json
|
|
ojects. Also, there are spurious whitespaces before the mpls and lse
|
|
strings because of the indentation used for normal output.
|
|
|
|
Fix this by putting all LSE parameters (depth, label, tc, bos and ttl)
|
|
into the same json object. The "mpls" key now directly contains a list
|
|
of such objects.
|
|
|
|
Also, handle strings differently for normal and json output, so that
|
|
json strings don't get spurious indentation whitespaces.
|
|
|
|
Normal output isn't modified.
|
|
The json output now looks like:
|
|
|
|
$ tc -json filter show dev eth0 ingress
|
|
...{"eth_type":"8847",
|
|
"mpls":[{"depth":1,"label":100},
|
|
{"depth":2,"label":200}]}...
|
|
|
|
Fixes: eb09a15c12fb ("tc: flower: support multiple MPLS LSE match")
|
|
Signed-off-by: Guillaume Nault <gnault@redhat.com>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
---
|
|
tc/f_flower.c | 16 +++++++++-------
|
|
1 file changed, 9 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/tc/f_flower.c b/tc/f_flower.c
|
|
index 00c919fd..27731078 100644
|
|
--- a/tc/f_flower.c
|
|
+++ b/tc/f_flower.c
|
|
@@ -2476,7 +2476,7 @@ static void flower_print_u32(const char *name, struct rtattr *attr)
|
|
print_uint(PRINT_ANY, name, namefrm, rta_getattr_u32(attr));
|
|
}
|
|
|
|
-static void flower_print_mpls_opt_lse(const char *name, struct rtattr *lse)
|
|
+static void flower_print_mpls_opt_lse(struct rtattr *lse)
|
|
{
|
|
struct rtattr *tb[TCA_FLOWER_KEY_MPLS_OPT_LSE_MAX + 1];
|
|
struct rtattr *attr;
|
|
@@ -2493,7 +2493,8 @@ static void flower_print_mpls_opt_lse(const char *name, struct rtattr *lse)
|
|
RTA_PAYLOAD(lse));
|
|
|
|
print_nl();
|
|
- open_json_array(PRINT_ANY, name);
|
|
+ print_string(PRINT_FP, NULL, " lse", NULL);
|
|
+ open_json_object(NULL);
|
|
attr = tb[TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH];
|
|
if (attr)
|
|
print_hhu(PRINT_ANY, "depth", " depth %u",
|
|
@@ -2511,10 +2512,10 @@ static void flower_print_mpls_opt_lse(const char *name, struct rtattr *lse)
|
|
attr = tb[TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL];
|
|
if (attr)
|
|
print_hhu(PRINT_ANY, "ttl", " ttl %u", rta_getattr_u8(attr));
|
|
- close_json_array(PRINT_JSON, NULL);
|
|
+ close_json_object();
|
|
}
|
|
|
|
-static void flower_print_mpls_opts(const char *name, struct rtattr *attr)
|
|
+static void flower_print_mpls_opts(struct rtattr *attr)
|
|
{
|
|
struct rtattr *lse;
|
|
int rem;
|
|
@@ -2523,11 +2524,12 @@ static void flower_print_mpls_opts(const char *name, struct rtattr *attr)
|
|
return;
|
|
|
|
print_nl();
|
|
- open_json_array(PRINT_ANY, name);
|
|
+ print_string(PRINT_FP, NULL, " mpls", NULL);
|
|
+ open_json_array(PRINT_JSON, "mpls");
|
|
rem = RTA_PAYLOAD(attr);
|
|
lse = RTA_DATA(attr);
|
|
while (RTA_OK(lse, rem)) {
|
|
- flower_print_mpls_opt_lse(" lse", lse);
|
|
+ flower_print_mpls_opt_lse(lse);
|
|
lse = RTA_NEXT(lse, rem);
|
|
};
|
|
if (rem)
|
|
@@ -2650,7 +2652,7 @@ static int flower_print_opt(struct filter_util *qu, FILE *f,
|
|
flower_print_ip_attr("ip_ttl", tb[TCA_FLOWER_KEY_IP_TTL],
|
|
tb[TCA_FLOWER_KEY_IP_TTL_MASK]);
|
|
|
|
- flower_print_mpls_opts(" mpls", tb[TCA_FLOWER_KEY_MPLS_OPTS]);
|
|
+ flower_print_mpls_opts(tb[TCA_FLOWER_KEY_MPLS_OPTS]);
|
|
flower_print_u32("mpls_label", tb[TCA_FLOWER_KEY_MPLS_LABEL]);
|
|
flower_print_u8("mpls_tc", tb[TCA_FLOWER_KEY_MPLS_TC]);
|
|
flower_print_u8("mpls_bos", tb[TCA_FLOWER_KEY_MPLS_BOS]);
|
|
--
|
|
2.29.2
|
|
|