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

Merge pull request #15226 from donaldsharp/nhg_debugs

Browse Source 
Nhg debugs
This commit is contained in:
Donatas Abraitis 2024-01-25 09:56:00 +02:00 committed by GitHub
commit 0f7577deae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
zebra/zebra_nhg.c
View File

@ -72,25 +72,13 @@ static uint32_t nhg_get_next_id(void)
while (1) {
id_counter++;
if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug("%s: ID %u checking", __func__, id_counter);
if (id_counter == ZEBRA_NHG_PROTO_LOWER) {
if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug("%s: ID counter wrapped", __func__);
id_counter = 0;
continue;
}
if (zebra_nhg_lookup_id(id_counter)) {
if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug("%s: ID already exists", __func__);
continue;
}
break;
if (!zebra_nhg_lookup_id(id_counter))
break;
}
return id_counter;
@ -690,12 +678,6 @@ static bool zebra_nhe_find(struct nhg_hash_entry **nhe, /* return value */
struct nhg_hash_entry *newnhe, *backup_nhe;
struct nexthop *nh = NULL;
if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug(
"%s: id %u, lookup %p, vrf %d, type %d, depends %p%s",
__func__, lookup->id, lookup, lookup->vrf_id,
lookup->type, nhg_depends,
(from_dplane ? " (from dplane)" : ""));
if (lookup->id)
(*nhe) = zebra_nhg_lookup_id(lookup->id);
@ -703,7 +685,10 @@ static bool zebra_nhe_find(struct nhg_hash_entry **nhe, /* return value */
(*nhe) = hash_lookup(zrouter.nhgs, lookup);
if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug("%s: lookup => %p (%pNG)", __func__, *nhe, *nhe);
zlog_debug("%s: id %u, lookup %p, vrf %d, type %d, depends %p%s => Found %p(%pNG)",
__func__, lookup->id, lookup, lookup->vrf_id,
lookup->type, nhg_depends,
(from_dplane ? " (from dplane)" : ""), *nhe, *nhe);
/* If we found an existing object, we're done */
if (*nhe)
@ -1537,13 +1522,11 @@ zebra_nhg_rib_find_nhe(struct nhg_hash_entry *rt_nhe, afi_t rt_afi)
return NULL;
}
if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug("%s: rt_nhe %p (%pNG)", __func__, rt_nhe, rt_nhe);
zebra_nhe_find(&nhe, rt_nhe, NULL, rt_afi, false);
if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug("%s: => nhe %p (%pNG)", __func__, nhe, nhe);
zlog_debug("%s: rt_nhe %p(%pNG) => nhe %p(%pNG)", __func__,
rt_nhe, rt_nhe, nhe, nhe);
return nhe;
}