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

eigrpd: Cleanup eigrp_if_name_string

Browse Source 
This function was excessively complicated.  Simplify and
make everyone use the same access macro.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2019-11-22 08:03:25 -05:00
parent 4fd9a6ce4a
commit 152e64e301
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eigrpd/eigrp_dump.c
View File

@ -144,13 +144,10 @@ void eigrp_header_dump(struct eigrp_header *eigrph)
const char *eigrp_if_name_string(struct eigrp_interface *ei)
{
static char buf[EIGRP_IF_STRING_MAXLEN] = "";
if (!ei)
return "inactive";
snprintf(buf, EIGRP_IF_STRING_MAXLEN, "%s", ei->ifp->name);
return buf;
return ei->ifp->name;
}
const char *eigrp_topology_ip_string(struct eigrp_prefix_entry *tn)
@ -209,7 +206,7 @@ void show_ip_eigrp_interface_header(struct vty *vty, struct eigrp *eigrp)
void show_ip_eigrp_interface_sub(struct vty *vty, struct eigrp *eigrp,
struct eigrp_interface *ei)
{
vty_out(vty, "%-11s ", eigrp_if_name_string(ei));
vty_out(vty, "%-11s ", IF_NAME(ei));
vty_out(vty, "%-11u", ei->params.bandwidth);
vty_out(vty, "%-11u", ei->params.delay);
vty_out(vty, "%-7u", ei->nbrs->count);
@ -250,7 +247,7 @@ void show_ip_eigrp_neighbor_sub(struct vty *vty, struct eigrp_neighbor *nbr,
{
vty_out(vty, "%-3u %-17s %-21s", 0, eigrp_neigh_ip_string(nbr),
eigrp_if_name_string(nbr->ei));
IF_NAME(nbr->ei));
if (nbr->t_holddown)
vty_out(vty, "%-7lu",
thread_timer_remain_second(nbr->t_holddown));
@ -313,11 +310,11 @@ void show_ip_eigrp_nexthop_entry(struct vty *vty, struct eigrp *eigrp,
if (te->adv_router == eigrp->neighbor_self)
vty_out(vty, "%-7s%s, %s\n", " ", "via Connected",
eigrp_if_name_string(te->ei));
IF_NAME(te->ei));
else {
vty_out(vty, "%-7s%s%s (%u/%u), %s\n", " ", "via ",
inet_ntoa(te->adv_router->src), te->distance,
te->reported_distance, eigrp_if_name_string(te->ei));
te->reported_distance, IF_NAME(te->ei));
}
}