proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-05 11:26:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: fix internal ldp-sync state flags when feature is disabled

Browse Source 
When enabling "mpls ldp-sync" under "router ospf" ospfd configures
SET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG) so internally knowing
that the ldp-sync feature is enabled. However the flag is not cleared when
turning of the feature using "nompls ldp-sync"!

https://github.com/FRRouting/frr/issues/16375

Signed-off-by: Christian Breunig <christian@breunig.cc>
(cherry picked from commit 5a70378a47)
This commit is contained in:
Christian Breunig 2024-07-13 08:43:36 +02:00 committed by Mergify
parent 743eecd288
commit f34dfab805
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ospfd/ospf_ldp_sync.c
View File

@ -901,7 +901,7 @@ DEFPY (no_mpls_ldp_sync,
* stop holddown timer if running * stop holddown timer if running
* restore ospf cost * restore ospf cost
*/ */
SET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG); UNSET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG);
ldp_sync_info->enabled = LDP_IGP_SYNC_DEFAULT; ldp_sync_info->enabled = LDP_IGP_SYNC_DEFAULT;
ldp_sync_info->state = LDP_IGP_SYNC_STATE_NOT_REQUIRED; ldp_sync_info->state = LDP_IGP_SYNC_STATE_NOT_REQUIRED;
EVENT_OFF(ldp_sync_info->t_holddown); EVENT_OFF(ldp_sync_info->t_holddown);

4
tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync.ref
View File

@ -5,8 +5,8 @@
"ldpIgpSyncState":"Sync achieved" "ldpIgpSyncState":"Sync achieved"
}, },
"r2-eth2":{ "r2-eth2":{
"ldpIgpSyncEnabled":false, "ldpIgpSyncEnabled":true,
"holdDownTimeInSec":50, "holdDownTimeInSec":50,
"ldpIgpSyncState":"Sync not required" "ldpIgpSyncState":"Sync achieved"
} }
} }

4
tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref
View File

@ -5,8 +5,8 @@
"ldpIgpSyncState":"Holding down until Sync" "ldpIgpSyncState":"Holding down until Sync"
}, },
"r2-eth2":{ "r2-eth2":{
"ldpIgpSyncEnabled":false, "ldpIgpSyncEnabled":true,
"holdDownTimeInSec":50, "holdDownTimeInSec":50,
"ldpIgpSyncState":"Sync not required" "ldpIgpSyncState":"Sync achieved"
} }
} }

4
tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref
View File

@ -1,7 +1,7 @@
{ {
"r2-eth2":{ "r2-eth2":{
"ldpIgpSyncEnabled":false, "ldpIgpSyncEnabled":true,
"holdDownTimeInSec":50, "holdDownTimeInSec":50,
"ldpIgpSyncState":"Sync not required" "ldpIgpSyncState":"Sync achieved"
} }
} }

4
tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync.ref
View File

@ -1,8 +1,8 @@
{ {
"r3-eth1":{ "r3-eth1":{
"ldpIgpSyncEnabled":false, "ldpIgpSyncEnabled":true,
"holdDownTimeInSec":50, "holdDownTimeInSec":50,
"ldpIgpSyncState":"Sync not required" "ldpIgpSyncState":"Sync achieved"
}, },
"r3-eth2":{ "r3-eth2":{
"ldpIgpSyncEnabled":true, "ldpIgpSyncEnabled":true,

4
tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref
View File

@ -1,8 +1,8 @@
{ {
"r3-eth1":{ "r3-eth1":{
"ldpIgpSyncEnabled":false, "ldpIgpSyncEnabled":true,
"holdDownTimeInSec":50, "holdDownTimeInSec":50,
"ldpIgpSyncState":"Sync not required" "ldpIgpSyncState":"Sync achieved"
}, },
"r3-eth2":{ "r3-eth2":{
"ldpIgpSyncEnabled":true, "ldpIgpSyncEnabled":true,

4
tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref
View File

@ -1,8 +1,8 @@
{ {
"r3-eth1":{ "r3-eth1":{
"ldpIgpSyncEnabled":false, "ldpIgpSyncEnabled":true,
"holdDownTimeInSec":50, "holdDownTimeInSec":50,
"ldpIgpSyncState":"Sync not required" "ldpIgpSyncState":"Sync achieved"
}, },
"r3-eth2":{ "r3-eth2":{
"ldpIgpSyncEnabled":true, "ldpIgpSyncEnabled":true,