From eb95b5ec1a5c3bd4e57f3a134828f8de2875cb43 Mon Sep 17 00:00:00 2001
From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
Date: Fri, 8 Dec 2017 15:16:47 +0100
Subject: [PATCH] Nest: Minor formatting changes

---
 nest/iface.c   |  2 +-
 nest/proto.c   |  5 +++--
 nest/rt-show.c | 14 +++++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nest/iface.c b/nest/iface.c
index 5e0a2450..a876e9ff 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -880,7 +880,7 @@ if_show_summary(void)
 {
   struct iface *i;
 
-  cli_msg(-2005,  "%-10s %-6s %-18s %s", "Interface", "State", "IPv4 address", "IPv6 address");
+  cli_msg(-2005, "%-10s %-6s %-18s %s", "Interface", "State", "IPv4 address", "IPv6 address");
   WALK_LIST(i, iface_list)
     {
       byte a4[IPA_MAX_TEXT_LENGTH + 17];
diff --git a/nest/proto.c b/nest/proto.c
index a2a2bc7e..d7650517 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1662,13 +1662,14 @@ proto_cmd_show(struct proto *p, uintptr_t verbose, int cnt)
 
   /* First protocol - show header */
   if (!cnt)
-    cli_msg(-2002, "name     proto    table    state  since       info");
+    cli_msg(-2002, "%-10s %-10s %-10s %-6s %-12s  %s",
+	    "Name", "Proto", "Table", "State", "Since", "Info");
 
   buf[0] = 0;
   if (p->proto->get_status)
     p->proto->get_status(p, buf);
   tm_format_time(tbuf, &config->tf_proto, p->last_state_change);
-  cli_msg(-1002, "%-8s %-8s %-8s %-5s  %-10s  %s",
+  cli_msg(-1002, "%-10s %-10s %-10s %-6s %-12s  %s",
 	  p->name,
 	  p->proto->name,
 	  p->main_channel ? p->main_channel->table->name : "---",
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 9989afa4..41a141a2 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -63,7 +63,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, ea_list *tm
   if (d->last_table != d->tab)
     rt_show_table(c, d);
 
-  cli_printf(c, -1007, "%-18s %s [%s %s%s]%s%s", ia, rta_dest_name(a->dest),
+  cli_printf(c, -1007, "%-20s %s [%s %s%s]%s%s", ia, rta_dest_name(a->dest),
 	     a->src->proto->name, tm, from, primary ? (sync_error ? " !" : " *") : "", info);
 
   if (a->dest == RTD_UNICAST)
@@ -71,6 +71,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, ea_list *tm
     {
       char mpls[MPLS_MAX_LABEL_STACK*12 + 5], *lsp = mpls;
       char *onlink = (nh->flags & RNF_ONLINK) ? " onlink" : "";
+      char weight[16] = "";
 
       if (nh->labels)
         {
@@ -81,11 +82,14 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, ea_list *tm
       *lsp = '\0';
 
       if (a->nh.next)
-	cli_printf(c, -1007, "\tvia %I%s on %s%s weight %d",
-		   nh->gw, mpls, nh->iface->name, onlink, nh->weight + 1);
+	bsprintf(weight, " weight %d", nh->weight + 1);
+
+      if (ipa_nonzero(nh->gw))
+	cli_printf(c, -1007, "\tvia %I on %s%s%s%s",
+		   nh->gw, nh->iface->name, mpls, onlink, weight);
       else
-	cli_printf(c, -1007, "\tvia %I%s on %s%s",
-		   nh->gw, mpls, nh->iface->name, onlink);
+	cli_printf(c, -1007, "\tdev %s%s%s",
+		   nh->iface->name, mpls,  onlink, weight);
     }
 
   if (d->verbose)