ospfd: External lsa handling in opaque capabilities enable/disable (backport #8557)#9135
Merged
donaldsharp merged 1 commit intostable/8.0from Jul 23, 2021
Merged
Conversation
Description: When opaque capability disabled/enabled , all the self-originated lsa will be flushed and it will make the neighbours to renegotiate. But here, external lsas are not being re-originated after negotiation Fix: Refresh/re-originate external lsas(Type-5 and Type-7) explicitly after re-negotiation. Signed-off-by: Rajesh Girada <rgirada@vmware.com> (cherry picked from commit a4d9009)
polychaeta
reviewed
Jul 23, 2021
polychaeta
left a comment
polychaeta
left a comment
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/900c8f010d9b3d93e8689c2d5c720c66/raw/dc951174852dc69d9f4c2ce3a64d64b29f4521fb/cr_9135_1627031446.diff | git apply
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index c850df55b..bfa31779e 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2143,8 +2143,8 @@ void ospf_external_lsa_rid_change(struct ospf *ospf)
else
force = LSA_REFRESH_IF_CHANGED;
- ospf_external_lsa_refresh(ospf, lsa,
- ei, force, 0);
+ ospf_external_lsa_refresh(ospf, lsa, ei,
+ force, 0);
} else {
if (!ospf_redistribute_check(ospf, ei,
NULL))
If you are a new contributor to FRR, please see our contributing guidelines.
After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.
Collaborator
Continuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests debian 10 amd64 part 1: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO1DEB10AMD64-20451/test Topology Tests failed for Topotests debian 10 amd64 part 1: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20451/artifact/TOPO1DEB10AMD64/ErrorLog/log_topotests.txt Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopotests debian 10 amd64 part 1: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO1DEB10AMD64-20451/test Topology Tests failed for Topotests debian 10 amd64 part 1: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20451/artifact/TOPO1DEB10AMD64/ErrorLog/log_topotests.txt |
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.
This is an automatic backport of pull request #8557 done by Mergify.
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/