eigrpd: Fix router-id display in show topo

Additionally fix weird non-standard output
routines to look like what people expect
code to look like.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
index c15eecc26611fab136cb1543b8485938b4801c40..fa68393946e1a414bb3309c58abfc962b7ba2be8 100644 (file)
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@ -433,13 +433,13 @@ void
 show_ip_eigrp_topology_header (struct vty *vty, struct eigrp *eigrp)
 {
   struct in_addr router_id;
-  router_id.s_addr = htonl(eigrp->router_id);
+  router_id.s_addr = eigrp->router_id;
 
-  vty_out (vty, "%s%s%d%s%s%s%s%s%s%s%s%s%s%s",
-            VTY_NEWLINE,
-            "EIGRP Topology Table for AS(", eigrp->AS, ")/ID(", inet_ntoa(router_id), ")", VTY_NEWLINE,VTY_NEWLINE,
-            "Codes: P - Passive, A - Active, U - Update, Q - Query, "
-            "R - Reply", VTY_NEWLINE ,"       ","r - reply Status, s - sia Status",VTY_NEWLINE,VTY_NEWLINE);
+  vty_out (vty, "%sEIGRP Topology Table for AS(%d)/ID(%s)%s%s",
+           VTY_NEWLINE, eigrp->AS, inet_ntoa(router_id), VTY_NEWLINE, VTY_NEWLINE);
+  vty_out (vty, "Codes: P - Passive, A - Active, U - Update, Q - Query, "
+           "R - Reply%s       r - reply Status, s - sia Status%s%s",
+           VTY_NEWLINE, VTY_NEWLINE,VTY_NEWLINE);
 }
 
 void