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

Merge pull request #8305 from donaldsharp/bgp_ll_ifp_change

Browse Source 
bgpd: Reset LLA NHT's interface if there is a change
This commit is contained in:
Russ White 2021-03-23 10:08:18 -04:00 committed by GitHub
commit 28e16a993b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bgpd/bgp_nht.c
View File

@ -194,6 +194,16 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,
bnc->srte_color, bnc->bgp->name_pretty,
peer);
}
} else {
if (BGP_DEBUG(nht, NHT)) {
char buf[PREFIX2STR_BUFFER];
zlog_debug(
"Found existing bnc %s(%s) flags 0x%x ifindex %d #paths %d peer %p",
bnc_str(bnc, buf, PREFIX2STR_BUFFER),
bnc->bgp->name_pretty, bnc->flags, bnc->ifindex,
bnc->path_count, bnc->nht_info);
}
}
if (is_bgp_static_route) {
@ -237,6 +247,11 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,
UNSET_FLAG(bnc->flags, BGP_NEXTHOP_REGISTERED);
UNSET_FLAG(bnc->flags, BGP_NEXTHOP_VALID);
}
if (peer && (bnc->ifindex != ifindex)) {
UNSET_FLAG(bnc->flags, BGP_NEXTHOP_REGISTERED);
UNSET_FLAG(bnc->flags, BGP_NEXTHOP_VALID);
bnc->ifindex = ifindex;
}
if (bgp_route->inst_type == BGP_INSTANCE_TYPE_VIEW) {
SET_FLAG(bnc->flags, BGP_NEXTHOP_REGISTERED);
SET_FLAG(bnc->flags, BGP_NEXTHOP_VALID);
@ -506,6 +521,11 @@ static int bgp_nht_ifp_initial(struct thread *thread)
if (!ifp)
return 0;
if (BGP_DEBUG(nht, NHT))
zlog_debug(
"Handle NHT initial update for Intf %s(%d) status %s",
ifp->name, ifp->ifindex, if_is_up(ifp) ? "up" : "down");
if (if_is_up(ifp))
bgp_nht_ifp_up(ifp);
else