Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / eigrpd / eigrp_vty.c

diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c
index 66dfbaa5385dc5dc98050d35bff73c4c11b6ebf7..33f728ec4b923a71378b0014bb4f8018e9b47c93 100644 (file)
--- a/eigrpd/eigrp_vty.c
+++ b/eigrpd/eigrp_vty.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * EIGRP VTY Interface.
  * Copyright (C) 2013-2016
@@ -11,22 +12,6 @@
  *   Tomas Hvorkovy
  *   Martin Kontsek
  *   Lukas Koribsky
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -55,29 +40,23 @@
 #include "eigrpd/eigrp_dump.h"
 #include "eigrpd/eigrp_const.h"
 
-#ifndef VTYSH_EXTRACT_PL
 #include "eigrpd/eigrp_vty_clippy.c"
-#endif
 
-static void eigrp_vty_display_prefix_entry(struct vty *vty,
-                                          struct eigrp *eigrp,
-                                          struct eigrp_prefix_entry *pe,
+static void eigrp_vty_display_prefix_entry(struct vty *vty, struct eigrp *eigrp,
+                                          struct eigrp_prefix_descriptor *pe,
                                           bool all)
 {
        bool first = true;
-       struct eigrp_nexthop_entry *te;
+       struct eigrp_route_descriptor *te;
        struct listnode *node;
 
        for (ALL_LIST_ELEMENTS_RO(pe->entries, node, te)) {
                if (all
-                   || (((te->flags
-                         & EIGRP_NEXTHOP_ENTRY_SUCCESSOR_FLAG)
-                        == EIGRP_NEXTHOP_ENTRY_SUCCESSOR_FLAG)
-                       || ((te->flags
-                            & EIGRP_NEXTHOP_ENTRY_FSUCCESSOR_FLAG)
-                           == EIGRP_NEXTHOP_ENTRY_FSUCCESSOR_FLAG))) {
-                       show_ip_eigrp_nexthop_entry(vty, eigrp, te,
-                                                   &first);
+                   || (((te->flags & EIGRP_ROUTE_DESCRIPTOR_SUCCESSOR_FLAG)
+                        == EIGRP_ROUTE_DESCRIPTOR_SUCCESSOR_FLAG)
+                       || ((te->flags & EIGRP_ROUTE_DESCRIPTOR_FSUCCESSOR_FLAG)
+                           == EIGRP_ROUTE_DESCRIPTOR_FSUCCESSOR_FLAG))) {
+                       show_ip_eigrp_route_descriptor(vty, eigrp, te, &first);
                        first = false;
                }
        }
@@ -104,7 +83,7 @@ static struct eigrp *eigrp_vty_get_eigrp(struct vty *vty, const char *vrf_name)
 static void eigrp_topology_helper(struct vty *vty, struct eigrp *eigrp,
                                  const char *all)
 {
-       struct eigrp_prefix_entry *tn;
+       struct eigrp_prefix_descriptor *tn;
        struct route_node *rn;
 
        show_ip_eigrp_topology_header(vty, eigrp);
@@ -168,7 +147,7 @@ DEFPY (show_ip_eigrp_topology,
        "For a specific prefix\n")
 {
        struct eigrp *eigrp;
-       struct eigrp_prefix_entry *tn;
+       struct eigrp_prefix_descriptor *tn;
        struct route_node *rn;
        struct prefix cmp;
 
@@ -244,14 +223,14 @@ DEFPY (show_ip_eigrp_interfaces,
        struct eigrp *eigrp;
 
        if (vrf && strncmp(vrf, "all", sizeof("all")) == 0) {
-               struct vrf *vrf;
+               struct vrf *v;
 
-               RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
-                       eigrp = eigrp_lookup(vrf->vrf_id);
+               RB_FOREACH (v, vrf_name_head, &vrfs_by_name) {
+                       eigrp = eigrp_lookup(v->vrf_id);
                        if (!eigrp)
                                continue;
 
-                       vty_out(vty, "VRF %s:\n", vrf->name);
+                       vty_out(vty, "VRF %s:\n", v->name);
 
                        eigrp_interface_helper(vty, eigrp, ifname, detail);
                }