staticd : northbound backend code #5996
Conversation
There was a problem hiding this comment.
Thanks for your contribution to FRR!
- One of your commits has an improperly formatted commit message
- One of your commits has a missing or badly formatted
Signed-off-byline; we can't accept your contribution until all of your commits have one - One of your commits does not have a blank line between the summary and body; this will break
git log --oneline
If you are a new contributor to FRR, please see our contributing guidelines.
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedFedora 29 amd64 build: Failed (click for details)Package building failed for Fedora 29 amd64 build Debian 10 amd64 build: Failed (click for details)Package building failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11125/artifact/DEB10BUILD/config.status/config.status Ubuntu 14.04 amd64 build: Failed (click for details)Package building failed for Ubuntu 14.04 amd64 build: Ubuntu 14.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11125/artifact/CI001BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Package building failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11125/artifact/CI014BUILD/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Package building failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11125/artifact/U1804AMD64/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Package building failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11125/artifact/U1604I386/config.status/config.status Debian 8 amd64 build: Failed (click for details)Package building failed for Debian 8 amd64 build: Debian 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11125/artifact/CI008BLD/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Package building failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11125/artifact/U1804PPC64LEBUILD/config.status/config.status CentOS 7 amd64 build: Failed (click for details)Package building failed for CentOS 7 amd64 build Debian 9 amd64 build: Failed (click for details)Package building failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11125/artifact/CI021BUILD/config.status/config.status Successful on other platforms/tests
|
vishaldhingra
force-pushed
the
static_nb
branch
from
48bcd41 to
6324002
Compare
There was a problem hiding this comment.
Thanks for your contribution to FRR!
- One of your commits has a missing or badly formatted
Signed-off-byline; we can't accept your contribution until all of your commits have one
If you are a new contributor to FRR, please see our contributing guidelines.
vishaldhingra
force-pushed
the
static_nb
branch
from
6324002 to
630f692
Compare
vishaldhingra
changed the title
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedFedora 29 amd64 build: Failed (click for details)Package building failed for Fedora 29 amd64 build Debian 10 amd64 build: Failed (click for details)Package building failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11126/artifact/DEB10BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Package building failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11126/artifact/CI014BUILD/config.status/config.status Ubuntu 14.04 amd64 build: Failed (click for details)Package building failed for Ubuntu 14.04 amd64 build: Ubuntu 14.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11126/artifact/CI001BUILD/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Package building failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11126/artifact/U1604I386/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Package building failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11126/artifact/U1804AMD64/config.status/config.status Debian 8 amd64 build: Failed (click for details)Package building failed for Debian 8 amd64 build: Debian 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11126/artifact/CI008BLD/config.status/config.status CentOS 7 amd64 build: Failed (click for details)Package building failed for CentOS 7 amd64 build Ubuntu 18.04 ppc64le build: Failed (click for details)Package building failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11126/artifact/U1804PPC64LEBUILD/config.status/config.status Debian 9 amd64 build: Failed (click for details)Package building failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11126/artifact/CI021BUILD/config.status/config.status Successful on other platforms/tests
|
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedFedora 29 amd64 build: Failed (click for details)Package building failed for Fedora 29 amd64 build Debian 10 amd64 build: Failed (click for details)Package building failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11127/artifact/DEB10BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Package building failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11127/artifact/CI014BUILD/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Package building failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11127/artifact/U1804AMD64/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Package building failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11127/artifact/U1604I386/config.status/config.status CentOS 7 amd64 build: Failed (click for details)Package building failed for CentOS 7 amd64 build Debian 8 amd64 build: Failed (click for details)Package building failed for Debian 8 amd64 build: Debian 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11127/artifact/CI008BLD/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Package building failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11127/artifact/U1804PPC64LEBUILD/config.status/config.status Debian 9 amd64 build: Failed (click for details)Package building failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11127/artifact/CI021BUILD/config.status/config.status Ubuntu 14.04 amd64 build: Failed (click for details)Package building failed for Ubuntu 14.04 amd64 build: Ubuntu 14.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11127/artifact/CI001BUILD/config.status/config.status Successful on other platforms/tests
|
vishaldhingra
force-pushed
the
static_nb
branch
from
630f692 to
f28e740
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedDebian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/CI021BUILD/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/U1804PPC64LEBUILD/config.status/config.status NetBSD 8 amd64 build: Failed (click for details)Make failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/CI012BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/CI014BUILD/config.status/config.status Ubuntu 14.04 amd64 build: Failed (click for details)Make failed for Ubuntu 14.04 amd64 build: Ubuntu 14.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/CI001BUILD/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/U1604I386/config.status/config.status Debian 8 amd64 build: Failed (click for details)Make failed for Debian 8 amd64 build: Debian 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/CI008BLD/config.status/config.status Debian 10 amd64 build: Failed (click for details)Make failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/DEB10BUILD/config.status/config.status FreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/CI009BUILD/config.status/config.status Fedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/F29BUILD/config.status/config.status OpenBSD 6 amd64 build: Failed (click for details)Make failed for OpenBSD 6 amd64 build: OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/CI011BUILD/config.status/config.status NetBSD 6 amd64 build: Failed (click for details)Make failed for NetBSD 6 amd64 build: NetBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/CI007BUILD/config.status/config.status CentOS 7 amd64 build: Failed (click for details)Package building failed for CentOS 7 amd64 build Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/U1804AMD64/config.status/config.status FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11212/artifact/FBSD12AMD64/config.status/config.status Successful on other platforms/tests
|
vishaldhingra
force-pushed
the
static_nb
branch
from
f28e740 to
14de7c2
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedNetBSD 6 amd64 build: Failed (click for details)Make failed for NetBSD 6 amd64 build: NetBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/CI007BUILD/config.status/config.status CentOS 7 amd64 build: Failed (click for details)Package building failed for CentOS 7 amd64 build Debian 8 amd64 build: Failed (click for details)Make failed for Debian 8 amd64 build: Debian 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/CI008BLD/config.status/config.status FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/FBSD12AMD64/config.status/config.status Ubuntu 14.04 amd64 build: Failed (click for details)Make failed for Ubuntu 14.04 amd64 build: Ubuntu 14.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/CI001BUILD/config.status/config.status OpenBSD 6 amd64 build: Failed (click for details)Make failed for OpenBSD 6 amd64 build: OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/CI011BUILD/config.status/config.status Debian 10 amd64 build: Failed (click for details)Make failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/DEB10BUILD/config.status/config.status NetBSD 8 amd64 build: Failed (click for details)Make failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/CI012BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/CI014BUILD/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/U1804AMD64/config.status/config.status FreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/CI009BUILD/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/U1804PPC64LEBUILD/config.status/config.status Debian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/CI021BUILD/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/U1604I386/config.status/config.status Fedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11263/artifact/F29BUILD/config.status/config.status Successful on other platforms/tests
|
vishaldhingra
force-pushed
the
static_nb
branch
from
14de7c2 to
4d5cf8d
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedFedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/F29BUILD/config.status/config.status FreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/CI009BUILD/config.status/config.status FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/FBSD12AMD64/config.status/config.status Debian 10 amd64 build: Failed (click for details)Make failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/DEB10BUILD/config.status/config.status NetBSD 8 amd64 build: Failed (click for details)Make failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/CI012BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/CI014BUILD/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/U1804AMD64/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/U1604I386/config.status/config.status NetBSD 6 amd64 build: Failed (click for details)Make failed for NetBSD 6 amd64 build: NetBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/CI007BUILD/config.status/config.status CentOS 7 amd64 build: Failed (click for details)Package building failed for CentOS 7 amd64 build Debian 8 amd64 build: Failed (click for details)Make failed for Debian 8 amd64 build: Debian 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/CI008BLD/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/U1804PPC64LEBUILD/config.status/config.status Debian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/CI021BUILD/config.status/config.status Ubuntu 14.04 amd64 build: Failed (click for details)Make failed for Ubuntu 14.04 amd64 build: Ubuntu 14.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/CI001BUILD/config.status/config.status OpenBSD 6 amd64 build: Failed (click for details)Make failed for OpenBSD 6 amd64 build: OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11287/artifact/CI011BUILD/config.status/config.status Successful on other platforms/tests
|
vishaldhingra
force-pushed
the
static_nb
branch
from
4d5cf8d to
c9f5b29
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedFreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/CI009BUILD/config.status/config.status Debian 8 amd64 build: Failed (click for details)Make failed for Debian 8 amd64 build: Debian 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/CI008BLD/config.status/config.status Debian 10 amd64 build: Failed (click for details)Make failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/DEB10BUILD/config.status/config.status NetBSD 6 amd64 build: Failed (click for details)Make failed for NetBSD 6 amd64 build: NetBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/CI007BUILD/config.status/config.status CentOS 7 amd64 build: Failed (click for details)Package building failed for CentOS 7 amd64 build OpenBSD 6 amd64 build: Failed (click for details)Make failed for OpenBSD 6 amd64 build: OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/CI011BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/CI014BUILD/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/U1804AMD64/config.status/config.status FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/FBSD12AMD64/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/U1804PPC64LEBUILD/config.status/config.status NetBSD 8 amd64 build: Failed (click for details)Make failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/CI012BUILD/config.status/config.status Debian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/CI021BUILD/config.status/config.status Ubuntu 14.04 amd64 build: Failed (click for details)Make failed for Ubuntu 14.04 amd64 build: Ubuntu 14.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/CI001BUILD/config.status/config.status Fedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/F29BUILD/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11293/artifact/U1604I386/config.status/config.status Successful on other platforms/tests
|
vishaldhingra
force-pushed
the
static_nb
branch
from
c9f5b29 to
059410d
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedNetBSD 6 amd64 build: Failed (click for details)Make failed for NetBSD 6 amd64 build: NetBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/CI007BUILD/config.status/config.status CentOS 7 amd64 build: Failed (click for details)Package building failed for CentOS 7 amd64 build Debian 8 amd64 build: Failed (click for details)Make failed for Debian 8 amd64 build: Debian 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/CI008BLD/config.status/config.status FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/FBSD12AMD64/config.status/config.status Ubuntu 14.04 amd64 build: Failed (click for details)Make failed for Ubuntu 14.04 amd64 build: Ubuntu 14.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/CI001BUILD/config.status/config.status OpenBSD 6 amd64 build: Failed (click for details)Make failed for OpenBSD 6 amd64 build: OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/CI011BUILD/config.status/config.status Debian 10 amd64 build: Failed (click for details)Make failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/DEB10BUILD/config.status/config.status NetBSD 8 amd64 build: Failed (click for details)Make failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/CI012BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/CI014BUILD/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/U1804AMD64/config.status/config.status FreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/CI009BUILD/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/U1804PPC64LEBUILD/config.status/config.status Debian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/CI021BUILD/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/U1604I386/config.status/config.status Fedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11327/artifact/F29BUILD/config.status/config.status Successful on other platforms/tests
|
vishaldhingra
force-pushed
the
static_nb
branch
from
059410d to
db30b47
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedNetBSD 8 amd64 build: Failed (click for details)Make failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/CI012BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/CI014BUILD/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/U1804AMD64/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/U1604I386/config.status/config.status NetBSD 6 amd64 build: Failed (click for details)Make failed for NetBSD 6 amd64 build: NetBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/CI007BUILD/config.status/config.status CentOS 7 amd64 build: Failed (click for details)Package building failed for CentOS 7 amd64 build Debian 8 amd64 build: Failed (click for details)Make failed for Debian 8 amd64 build: Debian 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/CI008BLD/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/U1804PPC64LEBUILD/config.status/config.status Debian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/CI021BUILD/config.status/config.status Ubuntu 14.04 amd64 build: Failed (click for details)Make failed for Ubuntu 14.04 amd64 build: Ubuntu 14.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/CI001BUILD/config.status/config.status OpenBSD 6 amd64 build: Failed (click for details)Make failed for OpenBSD 6 amd64 build: OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/CI011BUILD/config.status/config.status Fedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/F29BUILD/config.status/config.status FreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/CI009BUILD/config.status/config.status FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/FBSD12AMD64/config.status/config.status Debian 10 amd64 build: Failed (click for details)Make failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11335/artifact/DEB10BUILD/config.status/config.status Successful on other platforms/tests
|
vishaldhingra
force-pushed
the
static_nb
branch
from
db30b47 to
7fe77b3
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedOpenBSD 6 amd64 build: Failed (click for details)Make failed for OpenBSD 6 amd64 build: OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11337/artifact/CI011BUILD/config.status/config.status Successful on other platforms/tests
Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
vishaldhingra
force-pushed
the
static_nb
branch
from
7fe77b3 to
8343c31
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedOpenBSD 6 amd64 build: Failed (click for details)Make failed for OpenBSD 6 amd64 build: OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11429/artifact/CI011BUILD/config.status/config.status Successful on other platforms/tests
|
vishaldhingra
force-pushed
the
static_nb
branch
from
8343c31 to
c22838c
Compare
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/fb766bfe6ba17d04ea6e1238fb3fdec6/raw/15dea7f9a42737f1c84074703b31e876b063729a/cr_5996_1585127008.diff | git apply
diff --git a/lib/yang.c b/lib/yang.c
index 735e76926..eca7dbeb0 100644
--- a/lib/yang.c
+++ b/lib/yang.c
@@ -697,12 +697,12 @@ const struct lyd_node *yang_dnode_get_pleaf(const struct lyd_node *dnode,
while (orig_dnode) {
switch (orig_dnode->schema->nodetype) {
- case LYS_LIST:
- if(!strcmp(orig_dnode->schema->name, lname))
- return orig_dnode;
- break;
- default:
- break;
+ case LYS_LIST:
+ if (!strcmp(orig_dnode->schema->name, lname))
+ return orig_dnode;
+ break;
+ default:
+ break;
}
orig_dnode = orig_dnode->parent;
diff --git a/staticd/static_nht.c b/staticd/static_nht.c
index 32864cd53..e1ccfe608 100644
--- a/staticd/static_nht.c
+++ b/staticd/static_nht.c
@@ -37,22 +37,23 @@ static void static_nht_update_rn(struct route_node *rn,
{
struct static_nexthop *nh;
- RNODE_FOREACH_NH(rn, nh) {
+ RNODE_FOREACH_NH(rn, nh)
+ {
if (nh->nh_vrf_id != nh_vrf_id)
continue;
if (nh->type != STATIC_IPV4_GATEWAY
- && nh->type != STATIC_IPV4_GATEWAY_IFNAME
- && nh->type != STATIC_IPV6_GATEWAY
- && nh->type != STATIC_IPV6_GATEWAY_IFNAME)
+ && nh->type != STATIC_IPV4_GATEWAY_IFNAME
+ && nh->type != STATIC_IPV6_GATEWAY
+ && nh->type != STATIC_IPV6_GATEWAY_IFNAME)
continue;
if (nhp->family == AF_INET
- && nhp->u.prefix4.s_addr == nh->addr.ipv4.s_addr)
+ && nhp->u.prefix4.s_addr == nh->addr.ipv4.s_addr)
nh->nh_valid = !!nh_num;
if (nhp->family == AF_INET6
- && memcmp(&nhp->u.prefix6, &nh->addr.ipv6, 16) == 0)
+ && memcmp(&nhp->u.prefix6, &nh->addr.ipv6, 16) == 0)
nh->nh_valid = !!nh_num;
if (nh->state == STATIC_START)
@@ -123,7 +124,8 @@ static void static_nht_reset_start_safi(struct prefix *nhp, afi_t afi,
return;
for (rn = route_top(stable); rn; rn = route_next(rn)) {
- RNODE_FOREACH_NH(rn, nh) {
+ RNODE_FOREACH_NH(rn, nh)
+ {
if (nh->nh_vrf_id != nh_vrf_id)
continue;
@@ -180,7 +182,7 @@ static void static_nht_mark_state_safi(struct prefix *sp, afi_t afi,
return;
RNODE_FOREACH_NH(rn, nh)
- nh->state = state;
+ nh->state = state;
route_unlock_node(rn);
}
diff --git a/staticd/static_routes.c b/staticd/static_routes.c
index a8c7fd334..8955e9934 100644
--- a/staticd/static_routes.c
+++ b/staticd/static_routes.c
@@ -43,8 +43,7 @@ void static_install_route(struct route_node *rn, safi_t safi,
si = ri->nh;
if (si)
- static_zebra_route_add(rn, svrf->vrf->vrf_id,
- safi, true);
+ static_zebra_route_add(rn, svrf->vrf->vrf_id, safi, true);
}
/* Uninstall static route from RIB. */
@@ -58,16 +57,13 @@ static void static_uninstall_route(struct route_node *rn, safi_t safi,
si = ri->nh;
if (si)
- static_zebra_route_add(rn, svrf->vrf->vrf_id,
- safi, true);
+ static_zebra_route_add(rn, svrf->vrf->vrf_id, safi, true);
else
- static_zebra_route_add(rn, svrf->vrf->vrf_id,
- safi, false);
+ static_zebra_route_add(rn, svrf->vrf->vrf_id, safi, false);
}
-struct route_node* static_add_route(afi_t afi, safi_t safi,
- struct prefix *p,
+struct route_node *static_add_route(afi_t afi, safi_t safi, struct prefix *p,
struct prefix_ipv6 *src_p,
struct static_vrf *svrf)
{
@@ -84,12 +80,11 @@ struct route_node* static_add_route(afi_t afi, safi_t safi,
/* Lookup static route prefix. */
rn = srcdest_rnode_get(stable, p, src_p);
} else {
- rn = srcdest_rnode_get(stable, p , NULL);
+ rn = srcdest_rnode_get(stable, p, NULL);
}
/* Make new static route structure. */
- ri = XCALLOC(MTYPE_STATIC_ROUTE_INFO,
- sizeof(struct static_route_info));
+ ri = XCALLOC(MTYPE_STATIC_ROUTE_INFO, sizeof(struct static_route_info));
ri->distance = ZEBRA_STATIC_DISTANCE_DEFAULT;
@@ -99,9 +94,8 @@ struct route_node* static_add_route(afi_t afi, safi_t safi,
vrf_set_user_cfged(svrf->vrf);
if (svrf->vrf->vrf_id == VRF_UNKNOWN) {
- ret = zebra_static_route_holdem(rn, NULL,
- safi, svrf, negate);
- if(!ret) {
+ ret = zebra_static_route_holdem(rn, NULL, safi, svrf, negate);
+ if (!ret) {
zlog_warn("rn creation failed");
return NULL;
}
@@ -109,8 +103,7 @@ struct route_node* static_add_route(afi_t afi, safi_t safi,
return rn;
}
-void static_del_route(struct route_node *rn,
- safi_t safi,
+void static_del_route(struct route_node *rn, safi_t safi,
struct static_vrf *svrf)
{
struct static_route_info *ri;
@@ -122,9 +115,8 @@ void static_del_route(struct route_node *rn,
ri = rn->info;
if (svrf->vrf->vrf_id == VRF_UNKNOWN) {
- ret = zebra_static_route_holdem(rn, NULL,
- safi, svrf, negate);
- if(!ret) {
+ ret = zebra_static_route_holdem(rn, NULL, safi, svrf, negate);
+ if (!ret) {
zlog_warn("rn deletion failed");
}
}
@@ -142,38 +134,33 @@ void static_del_route(struct route_node *rn,
}
-int static_add_nexthop_validate(struct static_vrf *svrf,
- static_types type, struct ipaddr *ipaddr)
+int static_add_nexthop_validate(struct static_vrf *svrf, static_types type,
+ struct ipaddr *ipaddr)
{
switch (type) {
- case STATIC_IPV4_GATEWAY:
- case STATIC_IPV4_GATEWAY_IFNAME:
- if (if_lookup_exact_address(&ipaddr->ipaddr_v4,
- AF_INET,
- svrf->vrf->vrf_id))
- return -1;
- break;
- case STATIC_IPV6_GATEWAY:
- case STATIC_IPV6_GATEWAY_IFNAME:
- if (if_lookup_exact_address(&ipaddr->ipaddr_v6,
- AF_INET6,
- svrf->vrf->vrf_id))
- return -1;
- break;
- default:
- break;
+ case STATIC_IPV4_GATEWAY:
+ case STATIC_IPV4_GATEWAY_IFNAME:
+ if (if_lookup_exact_address(&ipaddr->ipaddr_v4, AF_INET,
+ svrf->vrf->vrf_id))
+ return -1;
+ break;
+ case STATIC_IPV6_GATEWAY:
+ case STATIC_IPV6_GATEWAY_IFNAME:
+ if (if_lookup_exact_address(&ipaddr->ipaddr_v6, AF_INET6,
+ svrf->vrf->vrf_id))
+ return -1;
+ break;
+ default:
+ break;
}
return 1;
}
-struct static_nexthop* static_add_nexthop(struct route_node *rn,
- safi_t safi,
- struct static_vrf *svrf,
- static_types type,
- struct ipaddr *ipaddr,
- const char *ifname,
- const char *nh_vrf)
+struct static_nexthop *
+static_add_nexthop(struct route_node *rn, safi_t safi, struct static_vrf *svrf,
+ static_types type, struct ipaddr *ipaddr, const char *ifname,
+ const char *nh_vrf)
{
struct static_nexthop *si;
struct static_nexthop *pp;
@@ -189,7 +176,7 @@ struct static_nexthop* static_add_nexthop(struct route_node *rn,
ri = rn->info;
nh_svrf = static_vty_get_unknown_vrf(nh_vrf);
- if(!nh_svrf)
+ if (!nh_svrf)
return NULL;
/* Make new static route structure. */
@@ -205,16 +192,16 @@ struct static_nexthop* static_add_nexthop(struct route_node *rn,
si->ifindex = IFINDEX_INTERNAL;
switch (type) {
- case STATIC_IPV4_GATEWAY:
- case STATIC_IPV4_GATEWAY_IFNAME:
- si->addr.ipv4 = ipaddr->ipaddr_v4;
- break;
- case STATIC_IPV6_GATEWAY:
- case STATIC_IPV6_GATEWAY_IFNAME:
- si->addr.ipv6 = ipaddr->ipaddr_v6;
- break;
- default:
- break;
+ case STATIC_IPV4_GATEWAY:
+ case STATIC_IPV4_GATEWAY_IFNAME:
+ si->addr.ipv4 = ipaddr->ipaddr_v4;
+ break;
+ case STATIC_IPV6_GATEWAY:
+ case STATIC_IPV6_GATEWAY_IFNAME:
+ si->addr.ipv6 = ipaddr->ipaddr_v6;
+ break;
+ default:
+ break;
}
/*
@@ -244,9 +231,8 @@ struct static_nexthop* static_add_nexthop(struct route_node *rn,
si->next = cp;
if (nh_svrf->vrf->vrf_id == VRF_UNKNOWN) {
- ret = zebra_static_route_holdem(rn, si,
- safi, svrf, negate);
- if(!ret) {
+ ret = zebra_static_route_holdem(rn, si, safi, svrf, negate);
+ if (!ret) {
zlog_warn("nh creation failed");
}
return si;
@@ -287,9 +273,8 @@ struct static_nexthop* static_add_nexthop(struct route_node *rn,
return si;
}
-int static_delete_nexthop(struct route_node *rn,
- safi_t safi, struct static_vrf *svrf,
- struct static_nexthop *si)
+int static_delete_nexthop(struct route_node *rn, safi_t safi,
+ struct static_vrf *svrf, struct static_nexthop *si)
{
struct static_route_info *ri;
struct static_vrf *nh_svrf;
@@ -309,9 +294,8 @@ int static_delete_nexthop(struct route_node *rn,
si->next->prev = si->prev;
if (nh_svrf->vrf->vrf_id == VRF_UNKNOWN) {
- ret = zebra_static_route_holdem(rn, si,
- safi, svrf, negate);
- if(!ret) {
+ ret = zebra_static_route_holdem(rn, si, safi, svrf, negate);
+ if (!ret) {
zlog_warn("nh deletion failed");
}
@@ -352,7 +336,8 @@ static void static_ifindex_update_af(struct interface *ifp, bool up, afi_t afi,
continue;
for (rn = route_top(stable); rn; rn = srcdest_route_next(rn)) {
- RNODE_FOREACH_NH(rn, nh) {
+ RNODE_FOREACH_NH(rn, nh)
+ {
if (!nh->ifname[0])
continue;
if (up) {
@@ -395,7 +380,8 @@ static void static_fixup_vrf(struct static_vrf *svrf,
struct interface *ifp;
for (rn = route_top(stable); rn; rn = route_next(rn)) {
- RNODE_FOREACH_NH(rn, nh) {
+ RNODE_FOREACH_NH(rn, nh)
+ {
if (strcmp(svrf->vrf->name, nh->nh_vrfname) != 0)
continue;
@@ -434,7 +420,8 @@ static void static_enable_vrf(struct static_vrf *svrf,
struct vrf *vrf = svrf->vrf;
for (rn = route_top(stable); rn; rn = route_next(rn)) {
- RNODE_FOREACH_NH(rn, nh){
+ RNODE_FOREACH_NH(rn, nh)
+ {
nh->vrf_id = vrf->vrf_id;
if (nh->ifindex) {
ifp = if_lookup_by_name(nh->ifname,
@@ -503,7 +490,8 @@ static void static_cleanup_vrf(struct static_vrf *svrf,
struct static_nexthop *nh;
for (rn = route_top(stable); rn; rn = route_next(rn)) {
- RNODE_FOREACH_NH(rn, nh) {
+ RNODE_FOREACH_NH(rn, nh)
+ {
if (strcmp(svrf->vrf->name, nh->nh_vrfname) != 0)
continue;
@@ -531,7 +519,7 @@ static void static_disable_vrf(struct route_table *stable,
for (rn = route_top(stable); rn; rn = route_next(rn)) {
RNODE_FOREACH_NH(rn, nh)
- static_uninstall_route(rn, safi, info->svrf);
+ static_uninstall_route(rn, safi, info->svrf);
}
}
@@ -592,7 +580,8 @@ static void static_fixup_intf_nh(struct route_table *stable,
info = route_table_get_info(stable);
for (rn = route_top(stable); rn; rn = route_next(rn)) {
- RNODE_FOREACH_NH(rn, nh) {
+ RNODE_FOREACH_NH(rn, nh)
+ {
if (nh->nh_vrf_id != ifp->vrf_id)
continue;
@@ -646,7 +635,7 @@ void static_ifindex_update(struct interface *ifp, bool up)
void static_get_nh_type(static_types stype, char *type)
{
- switch(stype) {
+ switch (stype) {
case STATIC_IFNAME:
strcpy(type, "ifindex");
break;
@@ -674,10 +663,10 @@ void static_get_nh_type(static_types stype, char *type)
* deleted automatically if all it's nexthops gets deleted.
*/
int static_get_route_delete(afi_t afi, safi_t safi, uint8_t type,
- struct prefix *p, struct prefix_ipv6 *src_p,
- const char *gate_str, const char *ifname,
- const char *vrf, unsigned int *count,
- unsigned int *src_count)
+ struct prefix *p, struct prefix_ipv6 *src_p,
+ const char *gate_str, const char *ifname,
+ const char *vrf, unsigned int *count,
+ unsigned int *src_count)
{
struct route_node *rn;
struct route_table *stable;
@@ -695,21 +684,21 @@ int static_get_route_delete(afi_t afi, safi_t safi, uint8_t type,
rn = srcdest_rnode_lookup(stable, p, src_p);
if (!rn)
return 0;
- *src_count = (rn->lock)-1;
+ *src_count = (rn->lock) - 1;
route_unlock_node(rn);
}
rn = srcdest_rnode_lookup(stable, p, NULL);
if (!rn)
return 0;
- *count = (rn->lock)-1;
+ *count = (rn->lock) - 1;
route_unlock_node(rn);
return 1;
}
struct static_hold_route {
struct static_vrf *svrf;
- struct route_node *rn;
- struct static_nexthop *nh;
+ struct route_node *rn;
+ struct static_nexthop *nh;
safi_t safi;
};
@@ -718,20 +707,20 @@ static struct list *static_list;
static void static_list_delete(struct static_hold_route *shr)
{
- XFREE(MTYPE_STATIC_ROUTE, shr);
+ XFREE(MTYPE_STATIC_ROUTE, shr);
}
static int static_list_compare(void *arg1, void *arg2)
{
- struct static_hold_route *shr1 = arg1;
- struct static_hold_route *shr2 = arg2;
+ struct static_hold_route *shr1 = arg1;
+ struct static_hold_route *shr2 = arg2;
- if (shr1->rn != shr2->rn)
- return 1;
- if (shr1->nh != shr2->nh)
- return 1;
+ if (shr1->rn != shr2->rn)
+ return 1;
+ if (shr1->nh != shr2->nh)
+ return 1;
- return 0;
+ return 0;
}
void static_list_init(void)
@@ -741,16 +730,14 @@ void static_list_init(void)
static_list->del = (void (*)(void *))static_list_delete;
}
-int zebra_static_route_holdem(struct route_node *rn,
- struct static_nexthop *nh,
- safi_t safi,
- struct static_vrf *svrf,
- bool negate)
+int zebra_static_route_holdem(struct route_node *rn, struct static_nexthop *nh,
+ safi_t safi, struct static_vrf *svrf, bool negate)
{
struct static_hold_route *shr, *lookup;
struct listnode *node;
- zlog_warn("Static Route to not installed currently because dependent config not fully available");
+ zlog_warn(
+ "Static Route to not installed currently because dependent config not fully available");
shr = XCALLOC(MTYPE_STATIC_ROUTE, sizeof(*shr));
shr->rn = rn;
@@ -760,46 +747,46 @@ int zebra_static_route_holdem(struct route_node *rn,
for (ALL_LIST_ELEMENTS_RO(static_list, node, lookup)) {
- if (static_list_compare(shr, lookup) == 0)
- break;
- }
-
- if (lookup) {
- if (negate) {
- listnode_delete(static_list, lookup);
- static_list_delete(shr);
- static_list_delete(lookup);
- return 1;
- }
-
- /*
- * If a person enters the same line again
- * we need to silently accept it
- */
- goto shr_cleanup;
- }
-
- if (!negate) {
- listnode_add_sort(static_list, shr);
- return 1;
- }
+ if (static_list_compare(shr, lookup) == 0)
+ break;
+ }
+
+ if (lookup) {
+ if (negate) {
+ listnode_delete(static_list, lookup);
+ static_list_delete(shr);
+ static_list_delete(lookup);
+ return 1;
+ }
+
+ /*
+ * If a person enters the same line again
+ * we need to silently accept it
+ */
+ goto shr_cleanup;
+ }
+
+ if (!negate) {
+ listnode_add_sort(static_list, shr);
+ return 1;
+ }
shr_cleanup:
- XFREE(MTYPE_STATIC_ROUTE, shr);
+ XFREE(MTYPE_STATIC_ROUTE, shr);
return 1;
}
void static_config_install_delayed_routes(struct static_vrf *svrf)
{
- struct listnode *node, *nnode;
- struct static_hold_route *shr;
- struct static_vrf *osvrf, *nh_svrf = NULL;
- for (ALL_LIST_ELEMENTS(static_list, node, nnode, shr)) {
+ struct listnode *node, *nnode;
+ struct static_hold_route *shr;
+ struct static_vrf *osvrf, *nh_svrf = NULL;
+ for (ALL_LIST_ELEMENTS(static_list, node, nnode, shr)) {
osvrf = shr->svrf;
- if(shr->nh)
- nh_svrf = static_vrf_lookup_by_name(
- shr->nh->nh_vrfname);
+ if (shr->nh)
+ nh_svrf =
+ static_vrf_lookup_by_name(shr->nh->nh_vrfname);
if (osvrf != svrf && nh_svrf != svrf)
continue;
diff --git a/staticd/static_routes.h b/staticd/static_routes.h
index 69a106d52..24c2d980d 100644
--- a/staticd/static_routes.h
+++ b/staticd/static_routes.h
@@ -123,17 +123,17 @@ struct static_nexthop {
/*
* rib_dest_from_rnode
*/
-static inline struct static_route_info *static_route_info_from_rnode(
- struct route_node *rn)
+static inline struct static_route_info *
+static_route_info_from_rnode(struct route_node *rn)
{
return (struct static_route_info *)(rn->info);
}
-#define NH_FOREACH_ROUTE(ri, nh) \
- for ((nh) = ri ? ri->nh : NULL; (nh); (nh) = nh->next)
+#define NH_FOREACH_ROUTE(ri, nh) \
+ for ((nh) = ri ? ri->nh : NULL; (nh); (nh) = nh->next)
-#define RNODE_FOREACH_NH(rn, nh) \
- NH_FOREACH_ROUTE (static_route_info_from_rnode(rn), nh)
+#define RNODE_FOREACH_NH(rn, nh) \
+ NH_FOREACH_ROUTE(static_route_info_from_rnode(rn), nh)
extern bool mpls_enabled;
@@ -141,16 +141,13 @@ extern struct zebra_privs_t static_privs;
void static_fixup_vrf_ids(struct static_vrf *svrf);
-extern struct static_nexthop* static_add_nexthop (struct route_node *rn,
- safi_t safi,
- struct static_vrf *svrf,
- static_types type,
- struct ipaddr *ipaddr,
- const char *ifname,
- const char *nh_vrf);
+extern struct static_nexthop *
+static_add_nexthop(struct route_node *rn, safi_t safi, struct static_vrf *svrf,
+ static_types type, struct ipaddr *ipaddr, const char *ifname,
+ const char *nh_vrf);
-extern int static_delete_nexthop(struct route_node *rn,
- safi_t safi, struct static_vrf *svrf,
+extern int static_delete_nexthop(struct route_node *rn, safi_t safi,
+ struct static_vrf *svrf,
struct static_nexthop *si);
extern void static_cleanup_vrf_ids(struct static_vrf *disable_svrf);
@@ -164,30 +161,27 @@ extern void static_install_route(struct route_node *rn, safi_t safi,
/*** New API's remove this comment later ***/
-extern struct route_node* static_add_route(afi_t afi, safi_t safi,
+extern struct route_node *static_add_route(afi_t afi, safi_t safi,
struct prefix *p,
struct prefix_ipv6 *src_p,
struct static_vrf *svrf);
-extern void static_del_route(struct route_node *rn,
- safi_t safi,
+extern void static_del_route(struct route_node *rn, safi_t safi,
struct static_vrf *svrf);
void static_get_nh_type(static_types stype, char *type);
-int static_add_nexthop_validate(struct static_vrf *svrf,
- static_types type,
+int static_add_nexthop_validate(struct static_vrf *svrf, static_types type,
struct ipaddr *ipaddr);
int static_get_route_delete(afi_t afi, safi_t safi, uint8_t type,
- struct prefix *p, struct prefix_ipv6 *src_p,
- const char *gate_str, const char *ifname,
- const char *vrf, unsigned int *count,
- unsigned int *src_count);
+ struct prefix *p, struct prefix_ipv6 *src_p,
+ const char *gate_str, const char *ifname,
+ const char *vrf, unsigned int *count,
+ unsigned int *src_count);
void static_list_init(void);
-int zebra_static_route_holdem(struct route_node *rn,
- struct static_nexthop *nh, safi_t safi,
- struct static_vrf *svrf,
- bool negate);
+int zebra_static_route_holdem(struct route_node *rn, struct static_nexthop *nh,
+ safi_t safi, struct static_vrf *svrf,
+ bool negate);
void static_config_install_delayed_routes(struct static_vrf *svrf);
diff --git a/staticd/static_vrf.c b/staticd/static_vrf.c
index 57859eab7..0efdd878e 100644
--- a/staticd/static_vrf.c
+++ b/staticd/static_vrf.c
@@ -227,24 +227,24 @@ void static_vrf_terminate(void)
struct static_vrf *static_vty_get_unknown_vrf(const char *vrf_name)
{
- struct static_vrf *svrf;
- struct vrf *vrf;
-
- svrf = static_vrf_lookup_by_name(vrf_name);
-
- if (svrf)
- return svrf;
-
- vrf = vrf_get(VRF_UNKNOWN, vrf_name);
- if (!vrf) {
- return NULL;
- }
- svrf = vrf->info;
- if (!svrf) {
- return NULL;
- }
- /* Mark as having FRR configuration */
- vrf_set_user_cfged(vrf);
-
- return svrf;
+ struct static_vrf *svrf;
+ struct vrf *vrf;
+
+ svrf = static_vrf_lookup_by_name(vrf_name);
+
+ if (svrf)
+ return svrf;
+
+ vrf = vrf_get(VRF_UNKNOWN, vrf_name);
+ if (!vrf) {
+ return NULL;
+ }
+ svrf = vrf->info;
+ if (!svrf) {
+ return NULL;
+ }
+ /* Mark as having FRR configuration */
+ vrf_set_user_cfged(vrf);
+
+ return svrf;
}
diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index d1667343b..620c078c5 100644
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -45,13 +45,14 @@
#define STATICD_STR "Static route daemon\n"
-static int static_route_leak(
- struct vty *vty, const char *svrf, const char *nh_svrf,
- afi_t afi, safi_t safi, const char *negate, const char *dest_str,
- const char *mask_str, const char *src_str, const char *gate_str,
- const char *ifname, const char *flag_str, const char *tag_str,
- const char *distance_str, const char *label_str, const char *table_str,
- bool onlink)
+static int static_route_leak(struct vty *vty, const char *svrf,
+ const char *nh_svrf, afi_t afi, safi_t safi,
+ const char *negate, const char *dest_str,
+ const char *mask_str, const char *src_str,
+ const char *gate_str, const char *ifname,
+ const char *flag_str, const char *tag_str,
+ const char *distance_str, const char *label_str,
+ const char *table_str, bool onlink)
{
int ret;
struct prefix p, src;
@@ -149,240 +150,254 @@ static int static_route_leak(
static_get_nh_type(type, buf_nh_type);
- if(!negate) {
+ if (!negate) {
/* route processing */
if (src_str)
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix);
+ FRR_STATIC_ROUTE_SRC_KEY_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_src_prefix);
else
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix);
+ FRR_STATIC_ROUTE_KEY_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix);
nb_cli_enqueue_change(vty, xpath_list, NB_OP_CREATE, NULL);
/* Administrative distance. */
if (src_str)
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_DIS_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix);
+ FRR_STATIC_ROUTE_SRC_DIS_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_src_prefix);
else
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_KEY_DIS_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix);
+ FRR_STATIC_ROUTE_KEY_DIS_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix);
if (distance_str)
nb_cli_enqueue_change(vty, xpath_list, NB_OP_MODIFY,
- distance_str);
+ distance_str);
else
nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY,
- NULL);
+ NULL);
if (src_str)
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_TAG_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix);
+ FRR_STATIC_ROUTE_SRC_TAG_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_src_prefix);
else
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_KEY_TAG_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix);
+ FRR_STATIC_ROUTE_KEY_TAG_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix);
/* tag */
if (tag_str)
nb_cli_enqueue_change(vty, xpath_list, NB_OP_MODIFY,
- tag_str);
+ tag_str);
else
nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY,
- NULL);
+ NULL);
if (src_str)
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_TB_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix);
+ FRR_STATIC_ROUTE_SRC_TB_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_src_prefix);
else
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_KEY_TB_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix);
+ FRR_STATIC_ROUTE_KEY_TB_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix);
/* table-id */
if (table_str)
nb_cli_enqueue_change(vty, xpath_list, NB_OP_MODIFY,
- table_str);
+ table_str);
else
nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY,
- NULL);
+ NULL);
/* nexthop processing */
if (src_str) {
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_NH_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix, buf_nh_type,
- buf_gate_str, ifname, nh_svrf);
+ FRR_STATIC_ROUTE_SRC_NH_KEY_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_src_prefix, buf_nh_type,
+ buf_gate_str, ifname, nh_svrf);
} else {
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_NH_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_nh_type,
- buf_gate_str, ifname, nh_svrf);
+ FRR_STATIC_ROUTE_NH_KEY_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_nh_type, buf_gate_str, ifname,
+ nh_svrf);
}
nb_cli_enqueue_change(vty, xpath_list, NB_OP_CREATE, NULL);
if (src_str)
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_NH_BH_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix, buf_nh_type,
- buf_gate_str, ifname, nh_svrf);
+ FRR_STATIC_ROUTE_SRC_NH_BH_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_src_prefix, buf_nh_type,
+ buf_gate_str, ifname, nh_svrf);
else
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_NH_BH_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_nh_type,
- buf_gate_str, ifname, nh_svrf);
+ FRR_STATIC_ROUTE_NH_BH_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_nh_type, buf_gate_str, ifname,
+ nh_svrf);
/* Route flags */
if (flag_str) {
switch (flag_str[0]) {
- case 'r':
- bh_type = "reject";
- break;
- case 'b':
- bh_type = "unspec";
- break;
- case 'N':
- bh_type = "null";
- break;
- default:
- bh_type = NULL;
- break;
+ case 'r':
+ bh_type = "reject";
+ break;
+ case 'b':
+ bh_type = "unspec";
+ break;
+ case 'N':
+ bh_type = "null";
+ break;
+ default:
+ bh_type = NULL;
+ break;
}
nb_cli_enqueue_change(vty, xpath_list, NB_OP_MODIFY,
- bh_type);
+ bh_type);
} else {
nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY,
- NULL);
+ NULL);
}
if (label_str) {
- char *ostr; // copy of label string (start)
- char *nump; // pointer to next segment
+ char *ostr; // copy of label string (start)
+ char *nump; // pointer to next segment
ostr = XSTRDUP(MTYPE_TMP, label_str);
- while( (nump = strsep(&ostr,"/")) != NULL ) {
+ while ((nump = strsep(&ostr, "/")) != NULL) {
label_stack_id++;
if (src_str)
- snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_NH_LABEL_ID_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix,
- buf_nh_type,
- buf_gate_str,
- ifname, nh_svrf, label_stack_id);
+ snprintf(
+ xpath_list, sizeof(xpath_list),
+ FRR_STATIC_ROUTE_SRC_NH_LABEL_ID_KEY_XPATH,
+ "frr-staticd:static", "static",
+ svrf, buf_prefix,
+ buf_src_prefix, buf_nh_type,
+ buf_gate_str, ifname, nh_svrf,
+ label_stack_id);
else
- snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_NH_LABEL_ID_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_nh_type,
- buf_gate_str,
- ifname, nh_svrf, label_stack_id);
-
- nb_cli_enqueue_change(vty, xpath_list, NB_OP_MODIFY,
- nump);
+ snprintf(
+ xpath_list, sizeof(xpath_list),
+ FRR_STATIC_ROUTE_NH_LABEL_ID_KEY_XPATH,
+ "frr-staticd:static", "static",
+ svrf, buf_prefix, buf_nh_type,
+ buf_gate_str, ifname, nh_svrf,
+ label_stack_id);
+
+ nb_cli_enqueue_change(vty, xpath_list,
+ NB_OP_MODIFY, nump);
}
XFREE(MTYPE_TMP, ostr);
} else {
if (src_str)
- snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_NH_LABEL_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix,
- buf_nh_type, buf_gate_str,
- ifname, nh_svrf);
+ snprintf(xpath_list, sizeof(xpath_list),
+ FRR_STATIC_ROUTE_SRC_NH_LABEL_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_src_prefix,
+ buf_nh_type, buf_gate_str, ifname,
+ nh_svrf);
else
- snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_NH_LABEL_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_nh_type,
- buf_gate_str,
- ifname, nh_svrf);
- nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY, NULL);
+ snprintf(xpath_list, sizeof(xpath_list),
+ FRR_STATIC_ROUTE_NH_LABEL_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_nh_type, buf_gate_str,
+ ifname, nh_svrf);
+ nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY,
+ NULL);
}
ret = nb_cli_apply_changes(vty, xpath_list);
} else {
if (static_get_route_delete(afi, safi, type, &p, src_p,
- buf_gate_str,
- ifname, svrf, &count, &src_count)) {
+ buf_gate_str, ifname, svrf, &count,
+ &src_count)) {
- if(src_p) {
+ if (src_p) {
if (src_count == 2) {
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix);
- nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY, NULL);
+ FRR_STATIC_ROUTE_SRC_KEY_XPATH,
+ "frr-staticd:static", "static",
+ svrf, buf_prefix,
+ buf_src_prefix);
+ nb_cli_enqueue_change(vty, xpath_list,
+ NB_OP_DESTROY,
+ NULL);
if (count == 2) {
- snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix);
- nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY, NULL);
+ snprintf(
+ xpath_list,
+ sizeof(xpath_list),
+ FRR_STATIC_ROUTE_KEY_XPATH,
+ "frr-staticd:static",
+ "static", svrf,
+ buf_prefix);
+ nb_cli_enqueue_change(
+ vty, xpath_list,
+ NB_OP_DESTROY, NULL);
}
} else {
- snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_NH_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix,
- buf_nh_type,
- buf_gate_str,
- ifname, nh_svrf);
- nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY, NULL);
+ snprintf(
+ xpath_list, sizeof(xpath_list),
+ FRR_STATIC_ROUTE_SRC_NH_KEY_XPATH,
+ "frr-staticd:static", "static",
+ svrf, buf_prefix,
+ buf_src_prefix, buf_nh_type,
+ buf_gate_str, ifname, nh_svrf);
+ nb_cli_enqueue_change(vty, xpath_list,
+ NB_OP_DESTROY,
+ NULL);
}
} else {
if (count == 2) {
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix);
- nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY, NULL);
+ FRR_STATIC_ROUTE_KEY_XPATH,
+ "frr-staticd:static", "static",
+ svrf, buf_prefix);
+ nb_cli_enqueue_change(vty, xpath_list,
+ NB_OP_DESTROY,
+ NULL);
} else {
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_NH_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_nh_type,
- buf_gate_str,
- ifname, nh_svrf);
- nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY, NULL);
+ FRR_STATIC_ROUTE_NH_KEY_XPATH,
+ "frr-staticd:static", "static",
+ svrf, buf_prefix, buf_nh_type,
+ buf_gate_str, ifname, nh_svrf);
+ nb_cli_enqueue_change(vty, xpath_list,
+ NB_OP_DESTROY,
+ NULL);
}
}
} else {
if (src_p)
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_SRC_NH_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_src_prefix,
- buf_nh_type,
- buf_gate_str,
- ifname, nh_svrf);
+ FRR_STATIC_ROUTE_SRC_NH_KEY_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_src_prefix,
+ buf_nh_type, buf_gate_str, ifname,
+ nh_svrf);
else
snprintf(xpath_list, sizeof(xpath_list),
- FRR_STATIC_ROUTE_NH_KEY_XPATH,
- "frr-staticd:static","static",svrf,
- buf_prefix, buf_nh_type,
- buf_gate_str,
- ifname, nh_svrf);
- nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY, NULL);
+ FRR_STATIC_ROUTE_NH_KEY_XPATH,
+ "frr-staticd:static", "static", svrf,
+ buf_prefix, buf_nh_type, buf_gate_str,
+ ifname, nh_svrf);
+ nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY,
+ NULL);
}
ret = nb_cli_apply_changes(vty, xpath_list);
@@ -401,10 +416,10 @@ static int static_route(struct vty *vty, afi_t afi, safi_t safi,
if (!vrf_name)
vrf_name = VRF_DEFAULT_NAME;
- return static_route_leak(vty, vrf_name, vrf_name, afi, safi, negate, dest_str,
- mask_str, src_str, gate_str, ifname, flag_str,
- tag_str, distance_str, label_str, table_str,
- false);
+ return static_route_leak(vty, vrf_name, vrf_name, afi, safi, negate,
+ dest_str, mask_str, src_str, gate_str, ifname,
+ flag_str, tag_str, distance_str, label_str,
+ table_str, false);
}
/* Write static route configuration. */
@@ -428,9 +443,10 @@ int static_config(struct vty *vty, struct static_vrf *svrf, afi_t afi,
for (rn = route_top(stable); rn; rn = srcdest_route_next(rn)) {
ri = rn->info;
- if(!ri)
+ if (!ri)
continue;
- RNODE_FOREACH_NH(rn, nh) {
+ RNODE_FOREACH_NH(rn, nh)
+ {
vty_out(vty, "%s %s", spacing,
srcdest_rnode2str(rn, buf, sizeof(buf)));
@@ -492,8 +508,8 @@ int static_config(struct vty *vty, struct static_vrf *svrf, afi_t afi,
/*
* table ID from VRF overrides configured
*/
- if (ri->table_id &&
- svrf->vrf->data.l.table_id == RT_TABLE_MAIN)
+ if (ri->table_id
+ && svrf->vrf->data.l.table_id == RT_TABLE_MAIN)
vty_out(vty, " table %u", ri->table_id);
if (nh->onlink)
@@ -595,10 +611,10 @@ DEFPY(ip_route_blackhole_vrf,
* valid. Add an assert to make it happy
*/
assert(prefix);
- return static_route_leak(vty, vrf->name, vrf->name, AFI_IP, SAFI_UNICAST, no,
- prefix, mask_str, NULL, NULL, NULL, flag,
- tag_str, distance_str, label, table_str,
- false);
+ return static_route_leak(vty, vrf->name, vrf->name, AFI_IP,
+ SAFI_UNICAST, no, prefix, mask_str, NULL, NULL,
+ NULL, flag, tag_str, distance_str, label,
+ table_str, false);
}
DEFPY(ip_route_address_interface,
@@ -641,7 +657,7 @@ DEFPY(ip_route_address_interface,
flag = "Null0";
ifname = NULL;
}
- if(!vrf)
+ if (!vrf)
vrf = VRF_DEFAULT_NAME;
if (nexthop_vrf)
@@ -699,9 +715,9 @@ DEFPY(ip_route_address_interface_vrf,
else
nh_vrf = vrf->name;
- return static_route_leak(vty, vrf->name, nh_vrf, AFI_IP, SAFI_UNICAST, no,
- prefix, mask_str, NULL, gate_str, ifname, flag,
- tag_str, distance_str, label, table_str,
+ return static_route_leak(vty, vrf->name, nh_vrf, AFI_IP, SAFI_UNICAST,
+ no, prefix, mask_str, NULL, gate_str, ifname,
+ flag, tag_str, distance_str, label, table_str,
!!onlink);
}
@@ -743,19 +759,18 @@ DEFPY(ip_route,
ifname = NULL;
}
- if(!vrf)
+ if (!vrf)
vrf = VRF_DEFAULT_NAME;
if (nexthop_vrf) {
nh_vrf = nexthop_vrf;
- }
- else
+ } else
nh_vrf = vrf;
- return static_route_leak(
- vty, vrf, nh_vrf, AFI_IP, SAFI_UNICAST, no, prefix, mask_str,
- NULL, gate_str, ifname, flag, tag_str, distance_str, label,
- table_str, false);
+ return static_route_leak(vty, vrf, nh_vrf, AFI_IP, SAFI_UNICAST, no,
+ prefix, mask_str, NULL, gate_str, ifname, flag,
+ tag_str, distance_str, label, table_str,
+ false);
}
DEFPY(ip_route_vrf,
@@ -799,10 +814,10 @@ DEFPY(ip_route_vrf,
else
nh_vrf = vrf->name;
- return static_route_leak(
- vty, vrf->name, nh_vrf, AFI_IP, SAFI_UNICAST, no, prefix, mask_str,
- NULL, gate_str, ifname, flag, tag_str, distance_str, label,
- table_str, false);
+ return static_route_leak(vty, vrf->name, nh_vrf, AFI_IP, SAFI_UNICAST,
+ no, prefix, mask_str, NULL, gate_str, ifname,
+ flag, tag_str, distance_str, label, table_str,
+ false);
}
DEFPY(ipv6_route_blackhole,
@@ -877,10 +892,10 @@ DEFPY(ipv6_route_blackhole_vrf,
*/
assert(prefix);
- return static_route_leak(
- vty, vrf->name, vrf->name, AFI_IP6, SAFI_UNICAST, no, prefix_str, NULL,
- from_str, NULL, NULL, flag, tag_str, distance_str, label,
- table_str, false);
+ return static_route_leak(vty, vrf->name, vrf->name, AFI_IP6,
+ SAFI_UNICAST, no, prefix_str, NULL, from_str,
+ NULL, NULL, flag, tag_str, distance_str, label,
+ table_str, false);
}
DEFPY(ipv6_route_address_interface,
@@ -924,7 +939,7 @@ DEFPY(ipv6_route_address_interface,
ifname = NULL;
}
- if(!vrf)
+ if (!vrf)
vrf = VRF_DEFAULT_NAME;
if (nexthop_vrf)
@@ -932,10 +947,10 @@ DEFPY(ipv6_route_address_interface,
else
nh_vrf = vrf;
- return static_route_leak(
- vty, vrf, nh_vrf, AFI_IP6, SAFI_UNICAST, no, prefix_str, NULL,
- from_str, gate_str, ifname, flag, tag_str, distance_str, label,
- table_str, !!onlink);
+ return static_route_leak(vty, vrf, nh_vrf, AFI_IP6, SAFI_UNICAST, no,
+ prefix_str, NULL, from_str, gate_str, ifname,
+ flag, tag_str, distance_str, label, table_str,
+ !!onlink);
}
DEFPY(ipv6_route_address_interface_vrf,
@@ -982,10 +997,10 @@ DEFPY(ipv6_route_address_interface_vrf,
flag = "Null0";
ifname = NULL;
}
- return static_route_leak(
- vty, vrf->name, nh_vrf, AFI_IP6, SAFI_UNICAST, no, prefix_str, NULL,
- from_str, gate_str, ifname, flag, tag_str, distance_str, label,
- table_str, !!onlink);
+ return static_route_leak(vty, vrf->name, nh_vrf, AFI_IP6, SAFI_UNICAST,
+ no, prefix_str, NULL, from_str, gate_str,
+ ifname, flag, tag_str, distance_str, label,
+ table_str, !!onlink);
}
DEFPY(ipv6_route,
@@ -1021,7 +1036,7 @@ DEFPY(ipv6_route,
const char *nh_vrf;
const char *flag = NULL;
- if(!vrf)
+ if (!vrf)
vrf = VRF_DEFAULT_NAME;
if (nexthop_vrf)
@@ -1033,10 +1048,10 @@ DEFPY(ipv6_route,
flag = "Null0";
ifname = NULL;
}
- return static_route_leak(
- vty, vrf, nh_vrf, AFI_IP6, SAFI_UNICAST, no, prefix_str, NULL,
- from_str, gate_str, ifname, flag, tag_str, distance_str, label,
- table_str, false);
+ return static_route_leak(vty, vrf, nh_vrf, AFI_IP6, SAFI_UNICAST, no,
+ prefix_str, NULL, from_str, gate_str, ifname,
+ flag, tag_str, distance_str, label, table_str,
+ false);
}
DEFPY(ipv6_route_vrf,
@@ -1080,10 +1095,10 @@ DEFPY(ipv6_route_vrf,
flag = "Null0";
ifname = NULL;
}
- return static_route_leak(
- vty, vrf->name, nh_vrf, AFI_IP6, SAFI_UNICAST, no, prefix_str, NULL,
- from_str, gate_str, ifname, flag, tag_str, distance_str, label,
- table_str, false);
+ return static_route_leak(vty, vrf->name, nh_vrf, AFI_IP6, SAFI_UNICAST,
+ no, prefix_str, NULL, from_str, gate_str,
+ ifname, flag, tag_str, distance_str, label,
+ table_str, false);
}
DEFPY(debug_staticd,
debug_staticd_cmd,
diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c
index 9b331e055..3b91d563a 100644
--- a/staticd/static_zebra.c
+++ b/staticd/static_zebra.c
@@ -265,8 +265,8 @@ static void static_nht_hash_free(void *data)
XFREE(MTYPE_TMP, nhtd);
}
-void static_zebra_nht_register(struct route_node *rn,
- struct static_nexthop *si, bool reg)
+void static_zebra_nht_register(struct route_node *rn, struct static_nexthop *si,
+ bool reg)
{
struct static_nht_data *nhtd, lookup;
uint32_t cmd;
If you are a new contributor to FRR, please see our contributing guidelines.
vishaldhingra
force-pushed
the
static_nb
branch
from
c22838c to
d3e6d58
Compare
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
yang: Convert to `FRRouting` for organization
…on-fix pimd: Modified rp-info json o/p
JSON output was already in, just printing in CLI as well. ``` root@exit1-debian-9:~# vtysh -c 'show bgp ipv4 summary' IPv4 Unicast Summary: BGP router identifier 10.10.10.1, local AS number 65001 vrf-id 0 BGP table version 100003 RIB entries 200005, using 37 MiB of memory Peers 1, using 21 KiB of memory ... MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd PfxSnt ... 64 157 0 0 0 00:01:18 0 100003 Total number of neighbors 1 ``` JSON: ``` root@exit1-debian-9:~# vtysh -c 'show bgp ipv4 summary json' \ | > jq '.ipv4Unicast.peers."192.168.0.2".pfxSnt' 100003 ``` Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
…locks
lib, zebra: add missing extern "C" {} blocks to new header files
Stop sleeping if synchronous label-manager zapi session has trouble during init: retry using a timer instead. Move initial label-block request to a point where the LM zapi session is known to be running. Remove the use of the daemon 'instance' - we're using the session_id to distinguish the LM zapi session. Signed-off-by: Mark Stapp <mjs@voltanet.io>
bgpd: When static default route is present in RIB and advertised to p…
…safi_sndpfx bgpd: Show PfxSnt for `show bgp <afi> <safi>` command
ldpd: use a timer instead of sleeping in LM init
staticd yang has been modified to support below use cases 1. src-table for IPV6 address family. 2. distance,tag and table-id would be the key for a given prefix. Signed-off-by: VishalDhingra <vdhingra@vmware.com>
…terface Signed-off-by: VishalDhingra <vdhingra@vmware.com>
Signed-off-by: VishalDhingra <vdhingra@vmware.com>
Signed-off-by: VishalDhingra <vdhingra@vmware.com>
Signed-off-by: VishalDhingra <vdhingra@vmware.com>
1. Modifies the data structs to make the distance, tag and table-id property of a route, i.e created a hireachical data struct to save route and nexthop information. 2. Backend northbound implementation Signed-off-by: VishalDhingra <vdhingra@vmware.com>
vishaldhingra
force-pushed
the
static_nb
branch
from
f74e4f5 to
44c01a5
Compare
polychaeta
added
bgp
documentation
isis
ldp
ospf
ospfv3
pim
tests
Continuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-12030/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warningsWarnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
basic routing northbound callbacks
vrf northbound callbacks
staticd northbound callbacks
tag, distance, table-id is the property of route