diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2014-06-28 21:12:37 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-06-03 20:40:03 +0200 |
| commit | 1cbb5dfc290b8975984fcc91711b625dbeb6daa2 (patch) | |
| tree | 4996b105c8e496ef02074bfd01531ff169fc8676 /zebra | |
| parent | pimd: Fix compiler warning in pim_mroute.c (diff) | |
| download | frr-1cbb5dfc290b8975984fcc91711b625dbeb6daa2.tar.xz frr-1cbb5dfc290b8975984fcc91711b625dbeb6daa2.zip | |
build: remove INRIA, NRL and MUSICA IPv6 quirks
Valar dohaeris.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Greg Troxel <gdt@ir.bbn.com>
Acked-by: Feng Lu <lu.feng@6wind.com>
Acked-by: Paul Jakma <paul@jakma.org>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/connected.c | 2 | ||||
| -rw-r--r-- | zebra/ipforward_sysctl.c | 6 | ||||
| -rw-r--r-- | zebra/rt_socket.c | 5 |
3 files changed, 2 insertions, 11 deletions
diff --git a/zebra/connected.c b/zebra/connected.c index 7da40ce03..42b5a8ab9 100644 --- a/zebra/connected.c +++ b/zebra/connected.c @@ -372,7 +372,7 @@ connected_up_ipv6 (struct interface *ifp, struct connected *ifc) /* Apply mask to the network. */ apply_mask_ipv6 (&p); -#if ! defined (MUSICA) && ! defined (LINUX) +#ifndef LINUX /* XXX: It is already done by rib_bogus_ipv6 within rib_add_ipv6 */ if (IN6_IS_ADDR_UNSPECIFIED (&p.prefix)) return; diff --git a/zebra/ipforward_sysctl.c b/zebra/ipforward_sysctl.c index 882441826..57ed18578 100644 --- a/zebra/ipforward_sysctl.c +++ b/zebra/ipforward_sysctl.c @@ -23,10 +23,6 @@ #include "privs.h" #include "zebra/ipforward.h" -#ifdef NRL -#include <netinet6/in6.h> -#endif /* NRL */ - #include "log.h" #define MIB_SIZ 4 @@ -106,7 +102,7 @@ int mib_ipv6[MIB_SIZ] = { CTL_NET, PF_INET6, -#if defined(KAME) || defined(NRL) +#if defined(KAME) IPPROTO_IPV6, IPV6CTL_FORWARDING #else /* NOT KAME */ diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index ee1c696fb..43508284d 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -263,13 +263,8 @@ sin6_masklen (struct in6_addr mask) char *p, *lim; int len; -#if defined (INRIA) - if (IN_ANYADDR6 (mask)) - return sizeof (long); -#else /* ! INRIA */ if (IN6_IS_ADDR_UNSPECIFIED (&mask)) return sizeof (long); -#endif /* ! INRIA */ sin6.sin6_addr = mask; len = sizeof (struct sockaddr_in6); |