Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bgpd: Do not start BGP session if BGP identifier is not set (backport #17959) #18005

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 4, 2025

Closes #17955


This is an automatic backport of pull request #17959 done by Mergify.

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit c9a2928)

# Conflicts:
#	doc/user/bgp.rst
If we have IPv6-only network and no IPv4 addresses at all, then by default
0.0.0.0 is created which is treated as malformed according to RFC 6286.

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 739f2b5)

# Conflicts:
#	bgpd/bgp_fsm.c
#	bgpd/bgpd.h
Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 48560b5)
@mergify mergify bot added the conflicts label Feb 4, 2025
Copy link
Author

mergify bot commented Feb 4, 2025

Cherry-pick of c9a2928 has failed:

On branch mergify/bp/stable/10.0/pr-17959
Your branch is up to date with 'origin/stable/10.0'.

You are currently cherry-picking commit c9a292895.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/user/bgp.rst

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 739f2b5 has failed:

On branch mergify/bp/stable/10.0/pr-17959
Your branch is ahead of 'origin/stable/10.0' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 739f2b566.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   bgpd/bgp_network.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bgpd/bgp_fsm.c
	both modified:   bgpd/bgpd.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ton31337
Copy link
Member

ton31337 commented Feb 4, 2025

Replaced by #18017.

@ton31337 ton31337 closed this Feb 4, 2025
@ton31337 ton31337 deleted the mergify/bp/stable/10.0/pr-17959 branch February 4, 2025 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant