proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-14 12:52:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

eigrpd: make show ip eigrp vrf all neighbor work correctly

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2020-08-29 13:14:10 -04:00
parent b1d26a4003
commit fb41c4f32d
1 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
eigrpd/eigrp_vty.c
View File

@ -269,6 +269,26 @@ DEFPY (show_ip_eigrp_interfaces,
return CMD_SUCCESS;
}
static void eigrp_neighbors_helper(struct vty *vty, struct eigrp *eigrp,
const char *ifname, const char *detail)
{
struct eigrp_interface *ei;
struct listnode *node, *node2, *nnode2;
struct eigrp_neighbor *nbr;
show_ip_eigrp_neighbor_header(vty, eigrp);
for (ALL_LIST_ELEMENTS_RO(eigrp->eiflist, node, ei)) {
if (!ifname || strcmp(ei->ifp->name, ifname) == 0) {
for (ALL_LIST_ELEMENTS(ei->nbrs, node2, nnode2, nbr)) {
if (detail || (nbr->state == EIGRP_NEIGHBOR_UP))
show_ip_eigrp_neighbor_sub(vty, nbr,
!!detail);
}
}
}
}
DEFPY (show_ip_eigrp_neighbors,
show_ip_eigrp_neighbors_cmd,
"show ip eigrp [vrf NAME] neighbors [IFNAME] [detail]$detail",
@ -281,26 +301,27 @@ DEFPY (show_ip_eigrp_neighbors,
"Detailed Information\n")
{
struct eigrp *eigrp;
struct eigrp_interface *ei;
struct listnode *node, *node2, *nnode2;
struct eigrp_neighbor *nbr;
eigrp = eigrp_vty_get_eigrp(vty, vrf);
if (eigrp == NULL) {
vty_out(vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
if (vrf && strncmp(vrf, "all", sizeof("all")) == 0) {
struct vrf *vrf;
show_ip_eigrp_neighbor_header(vty, eigrp);
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
eigrp = eigrp_lookup(vrf->vrf_id);
if (!eigrp)
continue;
for (ALL_LIST_ELEMENTS_RO(eigrp->eiflist, node, ei)) {
if (!ifname || strcmp(ei->ifp->name, ifname) == 0) {
for (ALL_LIST_ELEMENTS(ei->nbrs, node2, nnode2, nbr)) {
if (detail || (nbr->state == EIGRP_NEIGHBOR_UP))
show_ip_eigrp_neighbor_sub(vty, nbr,
!!detail);
}
vty_out(vty, "VRF %s:\n", vrf->name);
eigrp_neighbors_helper(vty, eigrp, ifname, detail);
}
} else {
eigrp = eigrp_vty_get_eigrp(vty, vrf);
if (eigrp == NULL) {
vty_out(vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp_neighbors_helper(vty, eigrp, ifname, detail);
}
return CMD_SUCCESS;