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.

Sign up for GitHub

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

Jump to bottom

nhrpd #257

Merged
merged 9 commits into from
Mar 7, 2017
Merged

nhrpd #257

merged 9 commits into from
Mar 7, 2017

Commits on Mar 7, 2017

  1. nhrpd: implement next hop resolution protocol 

    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 <[email protected]>
Signed-off-by: David Lamparter <[email protected]>
    @fabled @eqvinox
    fabled authored and eqvinox committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    2fb975d View commit details
    Browse the repository at this point in the history

  2. nhrpd: adapt to API changes 

    Signed-off-by: David Lamparter <[email protected]>
    @eqvinox
    eqvinox committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    819dc8b View commit details
    Browse the repository at this point in the history

  3. nhrpd: change VTY port 2612->2610 

    2612 is already in use for ldpd.
(Change to SERVICES file resolved in rebasing)

Signed-off-by: David Lamparter <[email protected]>
    @eqvinox
    eqvinox committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    442deed View commit details
    Browse the repository at this point in the history

  4. nhrpd: include headers in dist tarball 

    Signed-off-by: David Lamparter <[email protected]>
    @eqvinox
    eqvinox committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    fac2c62 View commit details
    Browse the repository at this point in the history

  5. doc: add initial nhrpd documentation 

    [DL: resolved renaming & conflicts]
Signed-off-by: Timo Teräs <[email protected]>
Signed-off-by: David Lamparter <[email protected]>
    @fabled @eqvinox
    fabled authored and eqvinox committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    caba609 View commit details
    Browse the repository at this point in the history

  6. nhrpd: workaround old kernel vs. glibc definition conflics 

    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 <[email protected]>
Signed-off-by: David Lamparter <[email protected]>
    @fabled @eqvinox
    fabled authored and eqvinox committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    836c52d View commit details
    Browse the repository at this point in the history

  7. distro/redhat: package nhrpd 

    Signed-off-by: Timo Teräs <[email protected]>
[DL: adapted for FRR, changed port number 2612->2610]
Signed-off-by: David Lamparter <[email protected]>
    @fabled @eqvinox
    fabled authored and eqvinox committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    729f041 View commit details
    Browse the repository at this point in the history

  8. cumulus, tools: Allow nhrpd to be brought up 

    Signed-off-by: Donald Sharp <[email protected]>
    @donaldsharp @eqvinox
    donaldsharp authored and eqvinox committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    c838ce0 View commit details
    Browse the repository at this point in the history

  9. build: only default-enable nhrpd on Linux 

    Signed-off-by: David Lamparter <[email protected]>
    @eqvinox
    eqvinox committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    42350cf View commit details
    Browse the repository at this point in the history