diff mbox series

[1/2] ip nexthop: Add space to display properly when showing a group

Message ID 20190810001843.32068-2-sharpd@cumulusnetworks.com
State Accepted
Delegated to: stephen hemminger
Headers show
Series iproute2: Improve usability of `ip nexthop` | expand

Commit Message

Donald Sharp Aug. 10, 2019, 12:18 a.m. UTC
When displaying a nexthop group made up of other nexthops, the display
line shows this when you have additional data at the end:

id 42 group 43/44/45/46/47/48/49/50/51/52/53/54/55/56/57/58/59/60/61/62/63/64/65/66/67/68/69/70/71/72/73/74proto zebra

Modify code so that it shows:

id 42 group 43/44/45/46/47/48/49/50/51/52/53/54/55/56/57/58/59/60/61/62/63/64/65/66/67/68/69/70/71/72/73/74 proto zebra

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---
 ip/ipnexthop.c | 1 +
 1 file changed, 1 insertion(+)

Comments

David Ahern Aug. 12, 2019, 6:14 p.m. UTC | #1
On 8/9/19 6:18 PM, Donald Sharp wrote:
> When displaying a nexthop group made up of other nexthops, the display
> line shows this when you have additional data at the end:
> 
> id 42 group 43/44/45/46/47/48/49/50/51/52/53/54/55/56/57/58/59/60/61/62/63/64/65/66/67/68/69/70/71/72/73/74proto zebra
> 
> Modify code so that it shows:
> 
> id 42 group 43/44/45/46/47/48/49/50/51/52/53/54/55/56/57/58/59/60/61/62/63/64/65/66/67/68/69/70/71/72/73/74 proto zebra
> 
> Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
> ---
>  ip/ipnexthop.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/ip/ipnexthop.c b/ip/ipnexthop.c
> index 97f09e74..f35aab52 100644
> --- a/ip/ipnexthop.c
> +++ b/ip/ipnexthop.c
> @@ -186,6 +186,7 @@ static void print_nh_group(FILE *fp, const struct rtattr *grps_attr)
>  
>  		close_json_object();
>  	}
> +	print_string(PRINT_FP, NULL, "%s", " ");
>  	close_json_array(PRINT_JSON, NULL);
>  }
>  
> 

Looks right to me:
Reviewed-by: David Ahern <dsahern@gmail.com>

Stephen: this should go through your tree.
diff mbox series

Patch

diff --git a/ip/ipnexthop.c b/ip/ipnexthop.c
index 97f09e74..f35aab52 100644
--- a/ip/ipnexthop.c
+++ b/ip/ipnexthop.c
@@ -186,6 +186,7 @@  static void print_nh_group(FILE *fp, const struct rtattr *grps_attr)
 
 		close_json_object();
 	}
+	print_string(PRINT_FP, NULL, "%s", " ");
 	close_json_array(PRINT_JSON, NULL);
 }