Merge pull request #8626 from idryzhov/fix-isis-topo1

[mirror_frr.git] / eigrpd / eigrp_dump.c

diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
index 924c169da1051b89f7d672875515e291faddaac8..e1ad51a9dbb1f7d4350accd2788e75a4310e8601 100644 (file)
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@ -236,15 +236,14 @@ void show_ip_eigrp_topology_header(struct vty *vty, struct eigrp *eigrp)
                "Codes: P - Passive, A - Active, U - Update, Q - Query, R - Reply\n       r - reply Status, s - sia Status\n\n");
 }
 
-void show_ip_eigrp_prefix_entry(struct vty *vty, struct eigrp_prefix_entry *tn)
+void show_ip_eigrp_prefix_descriptor(struct vty *vty,
+                                    struct eigrp_prefix_descriptor *tn)
 {
        struct list *successors = eigrp_topology_get_successor(tn);
-       char buffer[PREFIX_STRLEN];
 
        vty_out(vty, "%-3c", (tn->state > 0) ? 'A' : 'P');
 
-       vty_out(vty, "%s, ",
-               prefix2str(tn->destination, buffer, PREFIX_STRLEN));
+       vty_out(vty, "%pFX, ", tn->destination);
        vty_out(vty, "%u successors, ", (successors) ? successors->count : 0);
        vty_out(vty, "FD is %u, serno: %" PRIu64 " \n", tn->fdistance,
                tn->serno);
@@ -253,14 +252,15 @@ void show_ip_eigrp_prefix_entry(struct vty *vty, struct eigrp_prefix_entry *tn)
                list_delete(&successors);
 }
 
-void show_ip_eigrp_nexthop_entry(struct vty *vty, struct eigrp *eigrp,
-                                struct eigrp_nexthop_entry *te, bool *first)
+void show_ip_eigrp_route_descriptor(struct vty *vty, struct eigrp *eigrp,
+                                   struct eigrp_route_descriptor *te,
+                                   bool *first)
 {
        if (te->reported_distance == EIGRP_MAX_METRIC)
                return;
 
        if (*first) {
-               show_ip_eigrp_prefix_entry(vty, te->prefix);
+               show_ip_eigrp_prefix_descriptor(vty, te->prefix);
                *first = false;
        }