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

Revert "isisd: avoid fast-reroute on down adjacency when the interface is down"

Browse Source 
This reverts commit 08e4960ab4.
This commit is contained in:
Donatas Abraitis 2022-07-10 21:41:07 +03:00
parent 2ba9ccf735
commit c179a46b86
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
isisd/isis_adjacency.c
View File

@ -328,8 +328,7 @@ void isis_adj_state_change(struct isis_adjacency **padj,
if (new_state == old_state) if (new_state == old_state)
return; return;
if (old_state == ISIS_ADJ_UP && if (old_state == ISIS_ADJ_UP) {
!CHECK_FLAG(adj->circuit->flags, ISIS_CIRCUIT_IF_DOWN_FROM_Z)) {
if (IS_DEBUG_EVENTS) if (IS_DEBUG_EVENTS)
zlog_debug( zlog_debug(
"ISIS-Adj (%s): Starting fast-reroute on state change " "ISIS-Adj (%s): Starting fast-reroute on state change "

5
isisd/isis_circuit.c
View File

@ -1618,10 +1618,8 @@ static int isis_ifp_up(struct interface *ifp)
{ {
struct isis_circuit *circuit = ifp->info; struct isis_circuit *circuit = ifp->info;
if (circuit) { if (circuit)
UNSET_FLAG(circuit->flags, ISIS_CIRCUIT_IF_DOWN_FROM_Z);
isis_csm_state_change(IF_UP_FROM_Z, circuit, ifp); isis_csm_state_change(IF_UP_FROM_Z, circuit, ifp);
}
return 0; return 0;
} }
@ -1632,7 +1630,6 @@ static int isis_ifp_down(struct interface *ifp)
struct isis_circuit *circuit = ifp->info; struct isis_circuit *circuit = ifp->info;
if (circuit) { if (circuit) {
SET_FLAG(circuit->flags, ISIS_CIRCUIT_IF_DOWN_FROM_Z);
for (afi = AFI_IP; afi <= AFI_IP6; afi++) for (afi = AFI_IP; afi <= AFI_IP6; afi++)
isis_circuit_switchover_routes( isis_circuit_switchover_routes(
circuit, afi == AFI_IP ? AF_INET : AF_INET6, circuit, afi == AFI_IP ? AF_INET : AF_INET6,

1
isisd/isis_circuit.h
View File

@ -142,7 +142,6 @@ struct isis_circuit {
struct list *ipv6_non_link; /* our non-link local IPv6 addresses */ struct list *ipv6_non_link; /* our non-link local IPv6 addresses */
uint16_t upadjcount[ISIS_LEVELS]; uint16_t upadjcount[ISIS_LEVELS];
#define ISIS_CIRCUIT_FLAPPED_AFTER_SPF 0x01 #define ISIS_CIRCUIT_FLAPPED_AFTER_SPF 0x01
#define ISIS_CIRCUIT_IF_DOWN_FROM_Z 0x02
uint8_t flags; uint8_t flags;
bool disable_threeway_adj; bool disable_threeway_adj;
struct { struct {