* [PATCH iproute2] ip-route: fix json formatting for multipath routing
@ 2019-10-31 15:09 Andrea Claudi
2019-10-31 16:11 ` David Ahern
0 siblings, 1 reply; 4+ messages in thread
From: Andrea Claudi @ 2019-10-31 15:09 UTC (permalink / raw)
To: netdev; +Cc: stephen, dsahern
json output for multipath routing is broken due to some non-jsonified
print in print_rta_multipath(). To reproduce the issue:
$ ip route add default \
nexthop via 192.168.1.1 weight 1 \
nexthop via 192.168.2.1 weight 1
$ ip -j route | jq
parse error: Invalid numeric literal at line 1, column 58
Fix this opening a "multipath" json array that can contain multiple
route objects, and using print_*() instead of fprintf().
This is the output for the above commands applying this patch:
[
{
"dst": "default",
"flags": [],
"multipath": [
{
"gateway": "192.168.1.1",
"dev": "wlp61s0",
"weight": 1,
"flags": [
"linkdown"
]
},
{
"gateway": "192.168.2.1",
"dev": "ens1u1",
"weight": 1,
"flags": []
}
]
}
]
Fixes: f48e14880a0e5 ("iproute: refactor multipath print")
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
Reported-by: Patrick Hagara <phagara@redhat.com>
---
ip/iproute.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/ip/iproute.c b/ip/iproute.c
index a453385113cb9..4c268c72c5bd6 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -649,12 +649,16 @@ static void print_rta_multipath(FILE *fp, const struct rtmsg *r,
int len = RTA_PAYLOAD(rta);
int first = 1;
+ open_json_array(PRINT_JSON, "multipath");
+
while (len >= sizeof(*nh)) {
struct rtattr *tb[RTA_MAX + 1];
if (nh->rtnh_len > len)
break;
+ open_json_object(NULL);
+
if (!is_json_context()) {
if ((r->rtm_flags & RTM_F_CLONED) &&
r->rtm_type == RTN_MULTICAST) {
@@ -689,22 +693,29 @@ static void print_rta_multipath(FILE *fp, const struct rtmsg *r,
if ((r->rtm_flags & RTM_F_CLONED) &&
r->rtm_type == RTN_MULTICAST) {
- fprintf(fp, "%s", ll_index_to_name(nh->rtnh_ifindex));
+ print_string(PRINT_ANY, "dev", "%s",
+ ll_index_to_name(nh->rtnh_ifindex));
if (nh->rtnh_hops != 1)
- fprintf(fp, "(ttl>%d)", nh->rtnh_hops);
- fprintf(fp, " ");
+ print_uint(PRINT_ANY, "ttl", "(ttl>%d)",
+ nh->rtnh_hops);
+ print_string(PRINT_FP, NULL, " ", NULL);
} else {
- fprintf(fp, "dev %s ", ll_index_to_name(nh->rtnh_ifindex));
+ print_string(PRINT_ANY, "dev", "dev %s ",
+ ll_index_to_name(nh->rtnh_ifindex));
if (r->rtm_family != AF_MPLS)
- fprintf(fp, "weight %d ",
- nh->rtnh_hops+1);
+ print_uint(PRINT_ANY, "weight", "weight %d ",
+ nh->rtnh_hops + 1);
}
print_rt_flags(fp, nh->rtnh_flags);
len -= NLMSG_ALIGN(nh->rtnh_len);
nh = RTNH_NEXT(nh);
+
+ close_json_object();
}
+
+ close_json_array(PRINT_JSON, "multipath");
}
int print_route(struct nlmsghdr *n, void *arg)
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH iproute2] ip-route: fix json formatting for multipath routing
2019-10-31 15:09 [PATCH iproute2] ip-route: fix json formatting for multipath routing Andrea Claudi
@ 2019-10-31 16:11 ` David Ahern
2019-10-31 16:28 ` Andrea Claudi
2019-11-01 16:37 ` Stephen Hemminger
0 siblings, 2 replies; 4+ messages in thread
From: David Ahern @ 2019-10-31 16:11 UTC (permalink / raw)
To: Andrea Claudi, netdev; +Cc: stephen
On 10/31/19 9:09 AM, Andrea Claudi wrote:
> json output for multipath routing is broken due to some non-jsonified
> print in print_rta_multipath(). To reproduce the issue:
>
> $ ip route add default \
> nexthop via 192.168.1.1 weight 1 \
> nexthop via 192.168.2.1 weight 1
> $ ip -j route | jq
> parse error: Invalid numeric literal at line 1, column 58
>
> Fix this opening a "multipath" json array that can contain multiple
> route objects, and using print_*() instead of fprintf().
>
> This is the output for the above commands applying this patch:
>
> [
> {
> "dst": "default",
> "flags": [],
> "multipath": [
> {
> "gateway": "192.168.1.1",
> "dev": "wlp61s0",
> "weight": 1,
> "flags": [
> "linkdown"
> ]
> },
> {
> "gateway": "192.168.2.1",
> "dev": "ens1u1",
> "weight": 1,
> "flags": []
> }
> ]
> }
> ]
>
> Fixes: f48e14880a0e5 ("iproute: refactor multipath print")
> Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
> Reported-by: Patrick Hagara <phagara@redhat.com>
> ---
> ip/iproute.c | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
This is fixed -next by 4ecefff3cf25 ("ip: fix ip route show json output
for multipath nexthops"). Stephen can cherry pick it for master
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH iproute2] ip-route: fix json formatting for multipath routing
2019-10-31 16:11 ` David Ahern
@ 2019-10-31 16:28 ` Andrea Claudi
2019-11-01 16:37 ` Stephen Hemminger
1 sibling, 0 replies; 4+ messages in thread
From: Andrea Claudi @ 2019-10-31 16:28 UTC (permalink / raw)
To: David Ahern; +Cc: linux-netdev, Stephen Hemminger
On Thu, Oct 31, 2019 at 5:11 PM David Ahern <dsahern@gmail.com> wrote:
>
> On 10/31/19 9:09 AM, Andrea Claudi wrote:
> > json output for multipath routing is broken due to some non-jsonified
> > print in print_rta_multipath(). To reproduce the issue:
> >
> > $ ip route add default \
> > nexthop via 192.168.1.1 weight 1 \
> > nexthop via 192.168.2.1 weight 1
> > $ ip -j route | jq
> > parse error: Invalid numeric literal at line 1, column 58
> >
> > Fix this opening a "multipath" json array that can contain multiple
> > route objects, and using print_*() instead of fprintf().
> >
> > This is the output for the above commands applying this patch:
> >
> > [
> > {
> > "dst": "default",
> > "flags": [],
> > "multipath": [
> > {
> > "gateway": "192.168.1.1",
> > "dev": "wlp61s0",
> > "weight": 1,
> > "flags": [
> > "linkdown"
> > ]
> > },
> > {
> > "gateway": "192.168.2.1",
> > "dev": "ens1u1",
> > "weight": 1,
> > "flags": []
> > }
> > ]
> > }
> > ]
> >
> > Fixes: f48e14880a0e5 ("iproute: refactor multipath print")
> > Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
> > Reported-by: Patrick Hagara <phagara@redhat.com>
> > ---
> > ip/iproute.c | 23 +++++++++++++++++------
> > 1 file changed, 17 insertions(+), 6 deletions(-)
> >
>
> This is fixed -next by 4ecefff3cf25 ("ip: fix ip route show json output
> for multipath nexthops"). Stephen can cherry pick it for master
Oops, I overlooked that. Thanks David for pointing this out, please
ignore this and sorry for the noise.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH iproute2] ip-route: fix json formatting for multipath routing
2019-10-31 16:11 ` David Ahern
2019-10-31 16:28 ` Andrea Claudi
@ 2019-11-01 16:37 ` Stephen Hemminger
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Hemminger @ 2019-11-01 16:37 UTC (permalink / raw)
To: David Ahern; +Cc: Andrea Claudi, netdev
On Thu, 31 Oct 2019 10:11:23 -0600
David Ahern <dsahern@gmail.com> wrote:
> On 10/31/19 9:09 AM, Andrea Claudi wrote:
> > json output for multipath routing is broken due to some non-jsonified
> > print in print_rta_multipath(). To reproduce the issue:
> >
> > $ ip route add default \
> > nexthop via 192.168.1.1 weight 1 \
> > nexthop via 192.168.2.1 weight 1
> > $ ip -j route | jq
> > parse error: Invalid numeric literal at line 1, column 58
> >
> > Fix this opening a "multipath" json array that can contain multiple
> > route objects, and using print_*() instead of fprintf().
> >
> > This is the output for the above commands applying this patch:
> >
> > [
> > {
> > "dst": "default",
> > "flags": [],
> > "multipath": [
> > {
> > "gateway": "192.168.1.1",
> > "dev": "wlp61s0",
> > "weight": 1,
> > "flags": [
> > "linkdown"
> > ]
> > },
> > {
> > "gateway": "192.168.2.1",
> > "dev": "ens1u1",
> > "weight": 1,
> > "flags": []
> > }
> > ]
> > }
> > ]
> >
> > Fixes: f48e14880a0e5 ("iproute: refactor multipath print")
> > Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
> > Reported-by: Patrick Hagara <phagara@redhat.com>
> > ---
> > ip/iproute.c | 23 +++++++++++++++++------
> > 1 file changed, 17 insertions(+), 6 deletions(-)
> >
>
> This is fixed -next by 4ecefff3cf25 ("ip: fix ip route show json output
> for multipath nexthops"). Stephen can cherry pick it for master
Sure, cherry-picked the other commit (it was clean)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-01 16:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-31 15:09 [PATCH iproute2] ip-route: fix json formatting for multipath routing Andrea Claudi
2019-10-31 16:11 ` David Ahern
2019-10-31 16:28 ` Andrea Claudi
2019-11-01 16:37 ` Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).