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: fix AIGP calculation in route advertisement (backport #17168) #17187

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 22, 2024

Currently the AIGP is always incremented when a route with the
attribute is advertised. That is incorrect when the nexthop is
unchanged, as is commonly the case in route reflection.

Adjust the AIGP for propagation only when the nexthop is set
to ourselves.


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

In this topotest, the route reflector advertises a route with the
aigp attribute to its client, some with the nexthop unchanged and
some with the nexthp changed. Different aigp values are sent to
the clients depending on the nexthop setting.

Signed-off-by: Enke Chen <[email protected]>
(cherry picked from commit 7e7f65c)
Currently the AIGP is always incremented when a route with the
attribute is advertised. That is incorrect when the nexthop is
unchanged, as is commonly the case in route reflection.

Adjust the AIGP for propagation only when the nexthop is set
to ourselves.

Signed-off-by: Enke Chen <[email protected]>
(cherry picked from commit fc82d77)

# Conflicts:
#	bgpd/bgp_attr.c
#	bgpd/bgp_attr.h
Copy link
Author

mergify bot commented Oct 22, 2024

Cherry-pick of fc82d77 has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bgpd/bgp_attr.c
	both modified:   bgpd/bgp_attr.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

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.

2 participants