nhrpd by eqvinox · Pull Request #257 · FRRouting/frr

eqvinox · 2017-03-07T15:36:17Z

nhrpd, as implemented by Timo Teräs.

Exchanged a few private mails with him, he's OK with the rebase and adding signoffs for him; he can't promise too much but as it is really the same code he hopes to submit future patches to the mailing list.

This provides DMVPN support and integrates to strongSwan. Please read README.nhrpd and README.kernel for more details. [DL: cherry-picked from dafa05e65fe4b3b3ed5525443f554215ba14f42c] [DL: merge partially resolved, this commit will not build.] Signed-off-by: Timo Teräs <timo.teras@iki.fi> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

2612 is already in use for ldpd. (Change to SERVICES file resolved in rebasing) Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

[DL: resolved renaming & conflicts] Signed-off-by: Timo Teräs <timo.teras@iki.fi> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

fixes https://bugzilla.quagga.net/show_bug.cgi?id=908 With kernel-headers-3.10.0 we have: In file included from netlink_gre.c:15:0: /usr/include/linux/ipv6.h:19:8: error: redefinition of 'struct in6_pktinfo' struct in6_pktinfo { ^ In file included from netlink_gre.c:10:0: /usr/include/netinet/in.h:536:8: note: originally defined here struct in6_pktinfo ^ In file included from netlink_gre.c:15:0: /usr/include/linux/ipv6.h:24:8: error: redefinition of 'struct ip6_mtuinfo' struct ip6_mtuinfo { ^ In file included from netlink_gre.c:10:0: /usr/include/netinet/in.h:543:8: note: originally defined here struct ip6_mtuinfo So instead of libc's netinet/in.h include kernel's linux/in.h and the add sys/socket.h for struct sockaddr since it does not seem to be defined in kernel headers. Signed-off-by: Timo Teräs <timo.teras@iki.fi> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

Signed-off-by: Timo Teräs <timo.teras@iki.fi> [DL: adapted for FRR, changed port number 2612->2610] Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

NetDEF-CI · 2017-03-07T16:09:20Z

Continous Integration Result: FAILED

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

This is a comment from an EXPERIMENTAL 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 and apply patch from patchwork: Successful

Building Stage: Failed

Ubuntu1204 amd64 build: Successful
Ubuntu1404 amd64 build: Successful
Debian8 amd64 build: Successful
Fedora24 amd64 build: Successful
CentOS7 amd64 build: Successful
Ubuntu1604 amd64 build: Successful
CentOS6 amd64 build: Successful

FreeBSD9 amd64 build: Failed

Make failed for FreeBSD9 amd64 build:
(see full make log at /browse/FRR-FRRPULLREQ-339/artifact/CI004BUILD/ErrorLog/log_make.txt)

  CC       zbuf.o
In file included from zbuf.c:15:
zbuf.h:15:20: error: endian.h: No such file or directory
In file included from zbuf.c:15:
zbuf.h: In function 'zbuf_get_be16':
zbuf.h:125: warning: implicit declaration of function 'be16toh'
zbuf.h: In function 'zbuf_get_be32':
zbuf.h:131: warning: implicit declaration of function 'be32toh'
zbuf.h: In function 'zbuf_put_be16':

FreeBSD9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI004BUILD/config.status/config.status

FreeBSD10 amd64 build: Failed

Make failed for FreeBSD10 amd64 build:
(see full make log at /browse/FRR-FRRPULLREQ-339/artifact/CI003BUILD/ErrorLog/log_make.txt)

  CC       zbuf.o
In file included from zbuf.c:15:
./zbuf.h:15:10: fatal error: 'endian.h' file not found
#include <endian.h>
         ^
1 error generated.
*** Error code 1
Stop.
make[2]: stopped in /usr/home/ci/cibuild.339/frr-source/nhrpd

FreeBSD10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI003BUILD/config.status/config.status

FreeBSD11 amd64 build: Failed

Make failed for FreeBSD11 amd64 build:
(see full make log at /browse/FRR-FRRPULLREQ-339/artifact/CI009BUILD/ErrorLog/log_make.txt)

  CC       zbuf.o
In file included from zbuf.c:15:
./zbuf.h:15:10: fatal error: 'endian.h' file not found
#include <endian.h>
         ^
1 error generated.
*** Error code 1
Stop.
make[2]: stopped in /usr/home/ci/cibuild.339/frr-source/nhrpd

FreeBSD11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI009BUILD/config.status/config.status

OmniOS amd64 build: Failed

OmniOS amd64 build: config.log output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI010BUILD/config.log/config.log
Configure failed for OmniOS amd64 build:
(see full configure log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI010BUILD/ErrorLog/log_configure.txt)

checking for netinet6/nd6.h... no
checking for perl module XML::LibXML... ok
checking for crypt in -lcrypt... yes
checking for res_init in -lresolv... yes
checking for CARES... no
configure: error: Package requirements (libcares) were not met:
No package 'libcares' found
Consider adjusting the PKG_CONFIG_PATH environment variable if you

OpenBSD60 amd64 build: Failed

Configure failed for OpenBSD60 amd64 build:
(see full configure log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI011BUILD/ErrorLog/log_configure.txt)

checking for netinet6/nd6.h... yes
checking for perl module XML::LibXML... ok
checking for crypt in -lcrypt... no
checking for res_init in -lresolv... no
checking for CARES... no
configure: error: Package requirements (libcares) were not met:
Package libcares was not found in the pkg-config search path
Consider adjusting the PKG_CONFIG_PATH environment variable if you

OpenBSD60 amd64 build: config.log output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI011BUILD/config.log/config.log

NetBSD7 amd64 build: Failed

Make failed for NetBSD7 amd64 build:
(see full make log at /browse/FRR-FRRPULLREQ-339/artifact/CI012BUILD/ErrorLog/log_make.txt)

  CC       zbuf.o
In file included from zbuf.c:15:0:
zbuf.h:15:20: fatal error: endian.h: No such file or directory
 #include <endian.h>
                    ^
compilation terminated.
*** Error code 1
Stop.
make[2]: stopped in /home/ci/cibuild.339/frr-source/nhrpd

NetBSD7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI012BUILD/config.status/config.status

NetBSD6 amd64 build: Failed

Configure failed for NetBSD6 amd64 build:
(see full configure log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI007BUILD/ErrorLog/log_configure.txt)

checking for netinet6/nd6.h... yes
checking for perl module XML::LibXML... ok
checking for crypt in -lcrypt... yes
checking for res_init in -lresolv... yes
checking for CARES... no
configure: error: Package requirements (libcares) were not met:
No package 'libcares' found
Consider adjusting the PKG_CONFIG_PATH environment variable if you

NetBSD6 amd64 build: config.log output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-339/artifact/CI007BUILD/config.log/config.log

NetDEF-CI · 2017-03-07T16:40:22Z

Continous Integration Result: FAILED

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

This is a comment from an EXPERIMENTAL 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 and apply patch from patchwork: Successful

Building Stage: Failed

Ubuntu1204 amd64 build: Successful
Ubuntu1404 amd64 build: Successful
Ubuntu1604 amd64 build: Successful
Debian8 amd64 build: Successful
CentOS7 amd64 build: Successful
CentOS6 amd64 build: Successful

Fedora24 amd64 build: Failed

Configure failed for Fedora24 amd64 build:
(see full configure log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI015BUILD/ErrorLog/log_configure.txt)

checking for netinet6/nd6.h... no
checking for perl module XML::LibXML... ok
checking for crypt in -lcrypt... yes
checking for res_init in -lresolv... no
checking for CARES... no
configure: error: Package requirements (libcares) were not met:
No package 'libcares' found
Consider adjusting the PKG_CONFIG_PATH environment variable if you

Fedora24 amd64 build: config.log output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI015BUILD/config.log/config.log

FreeBSD11 amd64 build: Failed

Make failed for FreeBSD11 amd64 build:
(see full make log at /browse/FRR-FRRPULLREQ-341/artifact/CI009BUILD/ErrorLog/log_make.txt)

  CC       zbuf.o
In file included from zbuf.c:15:
./zbuf.h:15:10: fatal error: 'endian.h' file not found
#include <endian.h>
         ^
*** Error code 1
Stop.
make[2]: stopped in /usr/home/ci/cibuild.341/frr-source/nhrpd
*** Error code 1

FreeBSD11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI009BUILD/config.status/config.status

NetBSD6 amd64 build: Failed

Make failed for NetBSD6 amd64 build:
(see full make log at /browse/FRR-FRRPULLREQ-341/artifact/CI007BUILD/ErrorLog/log_make.txt)

  CC       zbuf.o
In file included from zbuf.c:15:0:
zbuf.h:15:20: fatal error: endian.h: No such file or directory
compilation terminated.
*** Error code 1
Stop.
make: stopped in /home/ci/cibuild.341/frr-source/nhrpd
*** Error code 1
Stop.

NetBSD6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI007BUILD/config.status/config.status

OmniOS amd64 build: Failed

OmniOS amd64 build: config.log output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI010BUILD/config.log/config.log
Configure failed for OmniOS amd64 build:
(see full configure log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI010BUILD/ErrorLog/log_configure.txt)

checking for netinet6/nd6.h... no
checking for perl module XML::LibXML... ok
checking for crypt in -lcrypt... yes
checking for res_init in -lresolv... yes
checking for CARES... no
configure: error: Package requirements (libcares) were not met:
No package 'libcares' found
Consider adjusting the PKG_CONFIG_PATH environment variable if you

OpenBSD60 amd64 build: Failed

Configure failed for OpenBSD60 amd64 build:
(see full configure log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI011BUILD/ErrorLog/log_configure.txt)

checking for netinet6/nd6.h... yes
checking for perl module XML::LibXML... ok
checking for crypt in -lcrypt... no
checking for res_init in -lresolv... no
checking for CARES... no
configure: error: Package requirements (libcares) were not met:
Package libcares was not found in the pkg-config search path
Consider adjusting the PKG_CONFIG_PATH environment variable if you

OpenBSD60 amd64 build: config.log output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI011BUILD/config.log/config.log

FreeBSD10 amd64 build: Failed

Make failed for FreeBSD10 amd64 build:
(see full make log at /browse/FRR-FRRPULLREQ-341/artifact/CI003BUILD/ErrorLog/log_make.txt)

  CC       zbuf.o
In file included from zbuf.c:15:
./zbuf.h:15:10: fatal error: 'endian.h' file not found
#include <endian.h>
         ^
1 error generated.
*** Error code 1
Stop.
make[2]: stopped in /usr/home/ci/cibuild.341/frr-source/nhrpd

FreeBSD10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI003BUILD/config.status/config.status

NetBSD7 amd64 build: Failed

NetBSD7 amd64 build: config.log output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI012BUILD/config.log/config.log
Configure failed for NetBSD7 amd64 build:
(see full configure log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI012BUILD/ErrorLog/log_configure.txt)

checking for netinet6/nd6.h... yes
checking for perl module XML::LibXML... ok
checking for crypt in -lcrypt... yes
checking for res_init in -lresolv... yes
checking for CARES... no
configure: error: Package requirements (libcares) were not met:
No package 'libcares' found
Consider adjusting the PKG_CONFIG_PATH environment variable if you

FreeBSD9 amd64 build: Failed

Make failed for FreeBSD9 amd64 build:
(see full make log at /browse/FRR-FRRPULLREQ-341/artifact/CI004BUILD/ErrorLog/log_make.txt)

  CC       zbuf.o
In file included from zbuf.c:15:
zbuf.h:15:20: error: endian.h: No such file or directory
In file included from zbuf.c:15:
zbuf.h: In function 'zbuf_get_be16':
zbuf.h:125: warning: implicit declaration of function 'be16toh'
zbuf.h: In function 'zbuf_get_be32':
zbuf.h:131: warning: implicit declaration of function 'be32toh'
zbuf.h: In function 'zbuf_put_be16':

FreeBSD9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-341/artifact/CI004BUILD/config.status/config.status

NetDEF-CI · 2017-03-07T18:20:05Z

Continous 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-342/

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

proto_redistnum() now accepts full protocol strings and not partial names per FRRouting#10 Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: fix proto_redistnum() oversight from #257

fabled and others added 9 commits March 7, 2017 16:20

nhrpd: adapt to API changes

819dc8b

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

nhrpd: change VTY port 2612->2610

442deed

2612 is already in use for ldpd. (Change to SERVICES file resolved in rebasing) Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

nhrpd: include headers in dist tarball

fac2c62

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

doc: add initial nhrpd documentation

caba609

[DL: resolved renaming & conflicts] Signed-off-by: Timo Teräs <timo.teras@iki.fi> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

distro/redhat: package nhrpd

729f041

Signed-off-by: Timo Teräs <timo.teras@iki.fi> [DL: adapted for FRR, changed port number 2612->2610] Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

cumulus, tools: Allow nhrpd to be brought up

c838ce0

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

build: only default-enable nhrpd on Linux

42350cf

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

donaldsharp merged commit ae6ba9b into FRRouting:master Mar 7, 2017

eqvinox deleted the nhrpd branch March 7, 2017 22:37

Jafaral added a commit that referenced this pull request Apr 3, 2017

Merge pull request #316 from qlyoung/fix-logc

ea4aa14

lib: fix proto_redistnum() oversight from #257

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

nhrpd#257

nhrpd#257
donaldsharp merged 9 commits intoFRRouting:masterfrom
opensourcerouting:nhrpd

eqvinox commented Mar 7, 2017

Uh oh!

NetDEF-CI commented Mar 7, 2017

Uh oh!

NetDEF-CI commented Mar 7, 2017

Uh oh!

NetDEF-CI commented Mar 7, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

eqvinox commented Mar 7, 2017

Uh oh!

NetDEF-CI commented Mar 7, 2017

Continous Integration Result: FAILED

Get source and apply patch from patchwork: Successful

Building Stage: Failed

FreeBSD9 amd64 build: Failed

FreeBSD10 amd64 build: Failed

FreeBSD11 amd64 build: Failed

OmniOS amd64 build: Failed

OpenBSD60 amd64 build: Failed

NetBSD7 amd64 build: Failed

NetBSD6 amd64 build: Failed

Uh oh!

NetDEF-CI commented Mar 7, 2017

Continous Integration Result: FAILED

Get source and apply patch from patchwork: Successful

Building Stage: Failed

Fedora24 amd64 build: Failed

FreeBSD11 amd64 build: Failed

NetBSD6 amd64 build: Failed

OmniOS amd64 build: Failed

OpenBSD60 amd64 build: Failed

FreeBSD10 amd64 build: Failed

NetBSD7 amd64 build: Failed

FreeBSD9 amd64 build: Failed

Uh oh!

NetDEF-CI commented Mar 7, 2017

Continous Integration Result: SUCCESSFUL

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants