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

OSPF6 point to multipoint #14546

Merged
merged 15 commits into from
Oct 31, 2023

Conversation

adrianomarto
Copy link
Contributor

@adrianomarto adrianomarto commented Oct 7, 2023

This pull request is based on the pull request #9198 by @eqvinox. It adds the following changes to it:

  • Rebasing and conflicting the original commits
  • Including checksum in OSPF6 Hello messages
  • OSPF6 point-to-multipoint topotest

@donaldsharp
Copy link
Member

please fold in the commits that fix the compile. From my perspective having code that does not compile completely breaks git bisecting and is a no go.

eqvinox and others added 12 commits October 10, 2023 07:54
This function is not implemented anywhere.  Not sure it ever existed.

Signed-off-by: David Lamparter <[email protected]>
Both for virtual links and correct PtMP operation, advertising local
addresses as Intra-Prefix with LA set is a prerequisite.  Add the
appropriate entries.

Signed-off-by: David Lamparter <[email protected]>
For PtMP the cost may need to be recalculated when the LL addr changes
(since neighbors are configured by LL addr and a different entry with a
different cost may match.)

Signed-off-by: David Lamparter <[email protected]>
Add a list of configured neighbors for each interface.  Only stores cost
(and "existence") for now.

Signed-off-by: David Lamparter <[email protected]>
This adds a knob to refuse forming adjacencies with neighbors not listed
in the config.  Only works on PtP/PtMP of course, otherwise the DR/BDR
machinery gets broken.

Signed-off-by: David Lamparter <[email protected]>
With the configured neighbor list, unicast hellos can be sent.  Allow
disabling multicast hellos for that scenario.

Signed-off-by: David Lamparter <[email protected]>
Some lower layers still don't handle multicast correctly (or
efficiently.)  Add option to send unicast hellos on explicitly
configured neighbors for PtP/PtMP.

Signed-off-by: David Lamparter <[email protected]>
This adds the PtMP interface type, which is effectively identical to PtP
except that all the database flooding & updates are unicast.

Signed-off-by: David Lamparter <[email protected]>
To announce connected prefixes, or not to announce connected prefixes,
that is the question...

Signed-off-by: David Lamparter <[email protected]>
Update & add docs for all the stuff in the previous 10-ish commits.

Signed-off-by: David Lamparter <[email protected]>
Including checksum in OSPF6 Hello messages.

Signed-off-by: Adriano Marto Reis <[email protected]>
* Check if FRR is running
* Check if OSPFv3 converges
* Check OSPFv3 Routing Tables
* Check Linux Kernel Routing Table

Signed-off-by: Adriano Marto Reis <[email protected]>
@adrianomarto adrianomarto force-pushed the ospf6-point-to-multipoint branch from 846c975 to ea97e98 Compare October 9, 2023 22:41
@adrianomarto
Copy link
Contributor Author

I combined the commits that fixed the code compilation with those that broke it.

Now OSPF6 shares the /128 prefix by default. Adjusting the expected
number of next hops according to that.

Signed-off-by: Adriano Marto Reis <[email protected]>
@adrianomarto adrianomarto force-pushed the ospf6-point-to-multipoint branch from ea97e98 to 108adcd Compare October 10, 2023 02:09
@riw777 riw777 self-requested a review October 10, 2023 14:04
Copy link
Member

@riw777 riw777 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just two really minor questions, otherwise good ...

ospf6d/ospf6_interface.c Show resolved Hide resolved
ospf6d/ospf6_interface.h Outdated Show resolved Hide resolved
@github-actions github-actions bot added the rebase PR needs rebase label Oct 28, 2023
@adrianomarto adrianomarto force-pushed the ospf6-point-to-multipoint branch from 515250d to 06efab2 Compare October 28, 2023 05:40
Moving ospf6_if_p2xp_neighcfg to ospf6_interface.h so we don't need to
include ospf6_neighbor.h.

Signed-off-by: Adriano Marto Reis <[email protected]>
@adrianomarto adrianomarto force-pushed the ospf6-point-to-multipoint branch from 06efab2 to 5a31132 Compare October 28, 2023 05:46
Applying clang-format to the original commits.

Signed-off-by: Adriano Marto Reis <[email protected]>
@adrianomarto adrianomarto force-pushed the ospf6-point-to-multipoint branch from 298e14e to f83a824 Compare October 28, 2023 06:36
@riw777
Copy link
Member

riw777 commented Oct 31, 2023

ci failures are unrelated ... trying to rerun just the failures, let's see what happens

@riw777 riw777 requested a review from donaldsharp October 31, 2023 15:16
Copy link
Member

@riw777 riw777 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good ...

@donaldsharp donaldsharp merged commit 8e3a96e into FRRouting:master Oct 31, 2023
79 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants