mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-05 01:14:48 +00:00
Merge pull request #7777 from volta-networks/fix_zebra_rib_c++
zebra: avoid c++ reserved keyword
This commit is contained in:
commit
19ff5340a1
@ -343,8 +343,8 @@ int route_entry_update_nhe(struct route_entry *re,
|
||||
struct nhg_hash_entry *new_nhghe);
|
||||
|
||||
/* NHG replace has happend, we have to update route_entry pointers to new one */
|
||||
void rib_handle_nhg_replace(struct nhg_hash_entry *old,
|
||||
struct nhg_hash_entry *new);
|
||||
void rib_handle_nhg_replace(struct nhg_hash_entry *old_entry,
|
||||
struct nhg_hash_entry *new_entry);
|
||||
|
||||
#define route_entry_dump(prefix, src, re) _route_entry_dump(__func__, prefix, src, re)
|
||||
extern void _route_entry_dump(const char *func, union prefixconstptr pp,
|
||||
|
@ -250,8 +250,8 @@ done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
void rib_handle_nhg_replace(struct nhg_hash_entry *old,
|
||||
struct nhg_hash_entry *new)
|
||||
void rib_handle_nhg_replace(struct nhg_hash_entry *old_entry,
|
||||
struct nhg_hash_entry *new_entry)
|
||||
{
|
||||
struct zebra_router_table *zrt;
|
||||
struct route_node *rn;
|
||||
@ -259,15 +259,15 @@ void rib_handle_nhg_replace(struct nhg_hash_entry *old,
|
||||
|
||||
if (IS_ZEBRA_DEBUG_RIB_DETAILED || IS_ZEBRA_DEBUG_NHG_DETAIL)
|
||||
zlog_debug("%s: replacing routes nhe (%u) OLD %p NEW %p",
|
||||
__func__, new->id, new, old);
|
||||
__func__, new_entry->id, new_entry, old_entry);
|
||||
|
||||
/* We have to do them ALL */
|
||||
RB_FOREACH (zrt, zebra_router_table_head, &zrouter.tables) {
|
||||
for (rn = route_top(zrt->table); rn;
|
||||
rn = srcdest_route_next(rn)) {
|
||||
RNODE_FOREACH_RE_SAFE (rn, re, next) {
|
||||
if (re->nhe && re->nhe == old)
|
||||
route_entry_update_nhe(re, new);
|
||||
if (re->nhe && re->nhe == old_entry)
|
||||
route_entry_update_nhe(re, new_entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user