From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 16 May 2017 11:58:55 +0000 (-0400)
Subject: Merge branch 'master' into vrf_stuff
X-Git-Tag: reindent-master-before~149^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F537%2Fhead;p=mirror%2Ffrr.git

Merge branch 'master' into vrf_stuff
---

910a5c0e21145755b0d849b11b81df8e78d0e871
diff --cc eigrpd/eigrp_dump.c
index 3de7a53c10,010f201cd5..5c15f26d7f
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@@ -310,15 -310,10 +310,16 @@@ show_ip_eigrp_topology_header (struct v
  void
  show_ip_eigrp_prefix_entry (struct vty *vty, struct eigrp_prefix_entry *tn)
  {
 +  struct list *successors = eigrp_topology_get_successor(tn);
 +
    vty_out (vty, "%-3c",(tn->state > 0) ? 'A' : 'P');
 -  vty_out (vty, "%s/%u, ",inet_ntoa (tn->destination_ipv4->prefix),tn->destination_ipv4->prefixlen);
 -  vty_out (vty, "%u successors, ",eigrp_topology_get_successor(tn)->count);
 -  vty_out (vty, "FD is %u, serno: %" PRIu64 " %s",tn->fdistance, tn->serno, VTY_NEWLINE);
++
 +  vty_out (vty, "%s/%u, ",
 +	   inet_ntoa (tn->destination_ipv4->prefix), tn->destination_ipv4->prefixlen);
 +  vty_out (vty, "%u successors, ", successors->count);
-   vty_out (vty, "FD is %u, serno: %lu %s", tn->fdistance, tn->serno, VTY_NEWLINE);
++  vty_out (vty, "FD is %u, serno: %" PRIu64 " %s", tn->fdistance, tn->serno, VTY_NEWLINE);
 +
 +  list_delete(successors);
  }
  
  void