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

ospf6d: fix interface type handling #4995

Merged
merged 3 commits into from
Sep 24, 2019

Conversation

eqvinox
Copy link
Contributor

@eqvinox eqvinox commented Sep 17, 2019

cf. #3930 & #4873

This only worked in Quagga because we get interface state before reading config. For any interface added later when there was already some config in ospf6d, it'd go to broadcast mode.

We can't skip reading interface state if there's no area yet, we'll be
missing information later when the interface is configured.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
If the user configured an interface to be in a particular mode, we need
to be consistent about that.  No looking at if_is_pointopoint() or
if_is_broadcast().

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
If the interface doesn't exist in system, we'll default to broadcast and
then later not change that when the interface comes up.  Explicitly
track whether the user configured the type and properly auto-set it if
they didn't.

Fixes: FRRouting#3930
Fixes: FRRouting#4873
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
@LabN-CI
Copy link
Collaborator

LabN-CI commented Sep 17, 2019

🚧 Basic BGPD CI results: Partial FAILURE, 132 tests failed, has VALGRIND issues

Results table
_ _
Result SUCCESS git merge/4995 5aeb4f3
Date 09/17/2019
Start 10:30:21
Finish 10:52:03
Run-Time 21:42
Total 1936
Pass 1804
Fail 132
Valgrind-Errors 0
Valgrind-Loss 48
Details vncregress-2019-09-17-10:30:21.txt
Log autoscript-2019-09-17-10:31:15.log.bz2
Memory 433 432 360

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-8931/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Successful

Building Stage: Failed

Ubuntu 18.04 ppc64le build: Failed (click for details) Ubuntu 18.04 ppc64le build: config.log output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-8931/artifact/U1804PPC64LEBUILD/config.log/ Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-8931/artifact/U1804PPC64LEBUILD/config.status/ Ubuntu 18.04 ppc64le build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-8931/artifact/U1804PPC64LEBUILD/ErrorLog/ Ubuntu 18.04 ppc64le build: No useful log found
Successful on other platforms
  • Ubuntu 18.04 amd64 build
  • FreeBSD 12 amd64 build
  • Ubuntu 14.04 amd64 build
  • Debian 8 amd64 build
  • Debian 9 amd64 build
  • FreeBSD 11 amd64 build
  • OpenBSD 6 amd64 build
  • NetBSD 6 amd64 build
  • NetBSD 7 amd64 build
  • CentOS 7 amd64 build
  • Ubuntu 16.04 amd64 build
  • Ubuntu 12.04 amd64 build
  • Ubuntu 16.04 i386 build
  • Fedora 29 amd64 build
  • Debian 10 amd64 build

@riw777 riw777 self-requested a review September 17, 2019 15:47
@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-8931/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.


CLANG Static Analyzer Summary

  • Github Pull Request 4995, comparing to Git base SHA b6534e2
  • Base image data for Git b6534e2 does not exist - compare skipped

1 Static Analyzer issues remaining.

See details at
https://ci1.netdef.org/browse/FRR-FRRPULLREQ-8931/artifact/shared/static_analysis/index.html

@LabN-CI
Copy link
Collaborator

LabN-CI commented Sep 18, 2019

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/4995 5aeb4f3
Date 09/18/2019
Start 01:22:40
Finish 01:44:21
Run-Time 21:41
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2019-09-18-01:22:40.txt
Log autoscript-2019-09-18-01:23:29.log.bz2
Memory 404 431 359

For details, please contact louberger

Copy link
Member

@rwestphal rwestphal left a comment

Choose a reason for hiding this comment

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

Reads good to me.

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.

@riw777 riw777 merged commit e4bf00f into FRRouting:master Sep 24, 2019
@eqvinox eqvinox deleted the ospf6d-iftype branch April 18, 2021 07:38
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.

6 participants