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.

Sign up for GitHub

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

Jump to bottom

bgpd: Validate both nexthop information (NEXTHOP and NLRI) (backport #17435) #17439

Open
wants to merge 2 commits into
base: stable/10.2
Choose a base branch
from
Open

bgpd: Validate both nexthop information (NEXTHOP and NLRI) (backport #17435) #17439

wants to merge 2 commits into from
+201 −21

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 17, 2024

Closes #17308

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

@ton31337 @mergify
tests: Check if IPv6 prefix has a valid nexthop if multiple NLRIs exist
a4de7e4 
Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 229466e)
@ton31337 @mergify
bgpd: Validate both nexthop information (NEXTHOP and NLRI)
65a43b5 
If we receive an IPv6 prefix e.g.: 2001:db8:100::/64 with nextop: 0.0.0.0, and
mp_nexthop: fc00::2, we should not treat this with an invalid nexthop because
of 0.0.0.0. We MUST check for MP_REACH attribute also and decide later if we
have at least one a valid nexthop.

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

# Conflicts:
#	bgpd/bgp_route.c
@mergify mergify bot added the conflicts label Nov 17, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Nov 17, 2024

Cherry-pick of a0d2734 has failed:

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

You are currently cherry-picking commit a0d2734e87.
  (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:   bgpd/bgp_route.c

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

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

@frrbot frrbot bot added bgp tests Topotests, make check, etc labels Nov 17, 2024
@mergify mergify bot mentioned this pull request Nov 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bgp size/L stable/10.2 tests Topotests, make check, etc
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ton31337