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

zebra: Fix _route_entry_dump to handle nexthop family as appropriate

Browse Source 
The _route_entry_dump function was not handling the nexthop as passed
in from an upper level protocol appropriate and as such not displaying
the v4/v6 nexthop right in the case where we have both going.

Additionally dump the nexthop vrf as well.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-09-04 20:56:42 -04:00
parent c279fc5fdd
commit 2d68a0f2da
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zebra/zebra_rib.c
View File

@ -2209,7 +2209,6 @@ void _route_entry_dump(const char *func, union prefixconstptr pp,
union prefixconstptr src_pp, union prefixconstptr src_pp,
const struct route_entry *re) const struct route_entry *re)
{ {
const struct prefix *p = pp.p;
const struct prefix *src_p = src_pp.p; const struct prefix *src_p = src_pp.p;
bool is_srcdst = src_p && src_p->prefixlen; bool is_srcdst = src_p && src_p->prefixlen;
char straddr[PREFIX_STRLEN]; char straddr[PREFIX_STRLEN];
@ -2232,10 +2231,34 @@ void _route_entry_dump(const char *func, union prefixconstptr pp,
re->nexthop_num, re->nexthop_active_num); re->nexthop_num, re->nexthop_active_num);
for (ALL_NEXTHOPS(re->ng, nexthop)) { for (ALL_NEXTHOPS(re->ng, nexthop)) {
inet_ntop(p->family, &nexthop->gate, straddr, INET6_ADDRSTRLEN); struct interface *ifp;
zlog_debug("%s: %s %s[%u] vrf %u with flags %s%s%s", func, struct vrf *vrf = vrf_lookup_by_id(nexthop->vrf_id);
switch (nexthop->type) {
case NEXTHOP_TYPE_BLACKHOLE:
sprintf(straddr, "Blackhole");
break;
case NEXTHOP_TYPE_IFINDEX:
ifp = if_lookup_by_index(nexthop->ifindex,
nexthop->vrf_id);
sprintf(straddr, "%s", ifp ? ifp->name : "Unknown");
break;
case NEXTHOP_TYPE_IPV4:
/* fallthrough */
case NEXTHOP_TYPE_IPV4_IFINDEX:
inet_ntop(AF_INET, &nexthop->gate, straddr,
INET6_ADDRSTRLEN);
break;
case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_IPV6_IFINDEX:
inet_ntop(AF_INET6, &nexthop->gate, straddr,
INET6_ADDRSTRLEN);
break;
}
zlog_debug("%s: %s %s[%u] vrf %s(%u) with flags %s%s%s", func,
(nexthop->rparent ? " NH" : "NH"), straddr, (nexthop->rparent ? " NH" : "NH"), straddr,
nexthop->ifindex, nexthop->vrf_id, nexthop->ifindex, vrf ? vrf->name : "Unknown",
nexthop->vrf_id,
(CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE) (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE)
? "ACTIVE " ? "ACTIVE "
: ""), : ""),