48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
|
From deef2321cf38ef0314bea307dbc27d376ad39624 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Sutter <psutter@redhat.com>
|
||
|
|
Date: Thu, 13 Sep 2018 20:45:38 +0200
|
||
|
|
Subject: [PATCH] iprule: Fix destination prefix output
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1623503
|
||
|
|
Upstream Status: iproute2.git commit 1a75322c5a8de
|
||
|
|
|
||
|
|
commit 1a75322c5a8dee6e1ed0017d76c87ef85c505b98
|
||
|
|
Author: Stefan Bader <stefan.bader@canonical.com>
|
||
|
|
Date: Tue Aug 28 16:27:29 2018 +0200
|
||
|
|
|
||
|
|
iprule: Fix destination prefix output
|
||
|
|
|
||
|
|
When adding support for JSON output the new code for printing
|
||
|
|
the destination prefix adds a stray blank character before
|
||
|
|
the bitmask. This causes some user-space parsing to fail.
|
||
|
|
|
||
|
|
Current output:
|
||
|
|
...: from x.x.x.x/l to y.y.y.y /l
|
||
|
|
Previous output:
|
||
|
|
...: from x.x.x.x/l to y.y.y.y/l
|
||
|
|
|
||
|
|
Fixes: 0dd4ccc5 "iprule: add json support"
|
||
|
|
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
|
||
|
|
Acked-by: Luca Boccassi <bluca@debian.org>
|
||
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||
|
|
---
|
||
|
|
ip/iprule.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ip/iprule.c b/ip/iprule.c
|
||
|
|
index 8b94214..744d6d8 100644
|
||
|
|
--- a/ip/iprule.c
|
||
|
|
+++ b/ip/iprule.c
|
||
|
|
@@ -239,7 +239,7 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
|
||
|
|
|
||
|
|
print_string(PRINT_FP, NULL, "to ", NULL);
|
||
|
|
print_color_string(PRINT_ANY, ifa_family_color(frh->family),
|
||
|
|
- "dst", "%s ", dst);
|
||
|
|
+ "dst", "%s", dst);
|
||
|
|
if (frh->dst_len != host_len)
|
||
|
|
print_uint(PRINT_ANY, "dstlen", "/%u ", frh->dst_len);
|
||
|
|
else
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|