bgpd: update source address for bgp neighbor#20330
Merged
riw777 merged 1 commit intoFRRouting:masterfrom Jan 6, 2026
Merged
Conversation
anlancs
force-pushed
the
bgpd-update-source
branch
from
cb4f9c1 to
dbee111
Compare
Member
|
Please add an additional topotest for this problem that is found. I would like to ensure that this stays fixed. |
donaldsharp
reviewed
Dec 27, 2025
| /* Send an open message */ | ||
| bgp_open_send(connection); | ||
|
|
||
| if (peer->bfd_config) |
Member
There was a problem hiding this comment.
Do we need the call to bgp_peer_bfd_update_source in bgp_establish() if this is done here? In other words why is it needed here -vs- there.
Member
There was a problem hiding this comment.
What about the case of bgp_connect_success_w_delayopen? Won't that not work?
Contributor
Author
There was a problem hiding this comment.
repush it for bgp_connect_success_w_delayopen, which is also with this problem.
Contributor
Author
There was a problem hiding this comment.
update the commit log: the bgp_establish can’t be reached for bfd strict mode without this commit in this case.
The two bgp ipv6 neighbors: A and B, A is with "neighbor B bfd" and B is with "neighbor A bfd strict". Ater bgp neighbor is established, then delete and add the global address (2001::75/64) on A. BFD of A will wrongly use "fe80::x" as source address forever: ``` 2025/12/24 01:50:52 BFD: [SSYGJ-9ZAE0] zclient: add local address 2001::75/64 (VRF 6) 2025/12/24 01:50:52 BGP: [HFMHR-E3VMR] Rx Intf address add VRF vrf1 IF enp1s0 addr 2001::75/64 2025/12/24 01:50:52 BGP: [WJWH8-SHS78] bgp_peer_bfd_update_source: address [2001::75->3001::77] to [fe80::2e53:4aff:fe00:677->3001::77] <- 2025/12/24 01:50:52 BGP: [TT430-NZ800] zclient_bfd_command: multi hop is configured, not sending interface ``` The reason is currently A doesn't update BFD source until bgp neighbor is established. But B uses BFD's strict mode, doesn't response A's OPEN message until BFD is UP, It is dead lock for A and B. So the bgp neighbor between A and B will not be established and BFD is keeping in DOWN status because A is with "fe80::x" as source address. So updating the source address not only when the bgp neighbor is established, but also when the tcp connection is established. Signed-off-by: anlan_cs <anlan_cs@126.com>
anlancs
force-pushed
the
bgpd-update-source
branch
from
dbee111 to
fe068d3
Compare
riw777
approved these changes
Dec 30, 2025
Member
riw777
left a comment
riw777
left a comment
There was a problem hiding this comment.
looks like @donaldsharp 's comment has been resolved ... looks good
Member
|
@Mergifyio backport stable/10.5 stable/10.4 stable/10.3 |
✅ Backports have been createdDetails
|
This was referenced Jan 6, 2026
donaldsharp
added a commit
that referenced
this pull request
Jan 6, 2026
bgpd: update source address for bgp neighbor (backport #20330)
Jafaral
added a commit
that referenced
this pull request
Jan 6, 2026
bgpd: update source address for bgp neighbor (backport #20330)
donaldsharp
added a commit
that referenced
this pull request
Jan 7, 2026
bgpd: update source address for bgp neighbor (backport #20330)
17 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The two bgp ipv6 neighbors: A and B, A is with "neighbor B bfd" and B is with "neighbor A bfd strict mode".
Ater bgp neighbor is established, then delete and add the global address (2001::75/64) on A, BFD of A will always use "fe80::x" as source address forever:
The reason is currently A doesn't update BFD source until bgp neighbor is established.
But B uses BFD's strict mode, doesn't response A's OPEN message until BFD is UP, It is dead lock for A and B. So the bgp neighbor between A and B will not be
established and BFD is keeping in DOWN status because A is with "fe80::x" as source address.
So updating the source address not only when the bgp neighbor is established, but also when the tcp connection is established.