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

zebra: Make nexthop_active check use the same debug

Browse Source 
When debugging why a route was not successfully installed into the
rib, it would be preferable that the end user only have to turn
on `debug zebra rib detail` as that is what we have been telling
people to do for the last couple of years.  Consolidate *back*
to this.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2020-09-29 07:54:35 -04:00
parent 81194feec9
commit a24d04f4db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zebra/zebra_nhg.c
View File

@ -1823,13 +1823,13 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK)) { if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK)) {
ifp = if_lookup_by_index(nexthop->ifindex, nexthop->vrf_id); ifp = if_lookup_by_index(nexthop->ifindex, nexthop->vrf_id);
if (!ifp) { if (!ifp) {
if (IS_ZEBRA_DEBUG_NHG_DETAIL) if (IS_ZEBRA_DEBUG_RIB_DETAILED)
zlog_debug("nexthop %pNHv marked onlink but nhif %u doesn't exist", zlog_debug("nexthop %pNHv marked onlink but nhif %u doesn't exist",
nexthop, nexthop->ifindex); nexthop, nexthop->ifindex);
return 0; return 0;
} }
if (!if_is_operative(ifp)) { if (!if_is_operative(ifp)) {
if (IS_ZEBRA_DEBUG_NHG_DETAIL) if (IS_ZEBRA_DEBUG_RIB_DETAILED)
zlog_debug("nexthop %pNHv marked onlink but nhif %s is not operational", zlog_debug("nexthop %pNHv marked onlink but nhif %s is not operational",
nexthop, ifp->name); nexthop, ifp->name);
return 0; return 0;
@ -1985,7 +1985,7 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
|| nexthop->type == NEXTHOP_TYPE_IPV6) || nexthop->type == NEXTHOP_TYPE_IPV6)
nexthop->ifindex = newhop->ifindex; nexthop->ifindex = newhop->ifindex;
else if (nexthop->ifindex != newhop->ifindex) { else if (nexthop->ifindex != newhop->ifindex) {
if (IS_ZEBRA_DEBUG_NHG_DETAIL) if (IS_ZEBRA_DEBUG_RIB_DETAILED)
zlog_debug( zlog_debug(
"%s: %pNHv given ifindex does not match nexthops ifindex found found: %pNHv", "%s: %pNHv given ifindex does not match nexthops ifindex found found: %pNHv",
__func__, nexthop, __func__, nexthop,
@ -2011,7 +2011,7 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
/* Only useful if installed */ /* Only useful if installed */
if (!CHECK_FLAG(match->status, ROUTE_ENTRY_INSTALLED)) { if (!CHECK_FLAG(match->status, ROUTE_ENTRY_INSTALLED)) {
if (IS_ZEBRA_DEBUG_NHG_DETAIL) if (IS_ZEBRA_DEBUG_RIB_DETAILED)
zlog_debug("%s: match %p (%u) not installed", zlog_debug("%s: match %p (%u) not installed",
__func__, match, __func__, match,
match->nhe->id); match->nhe->id);