summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bgpd/bgp_network.c4
-rwxr-xr-xconfigure.ac39
-rw-r--r--lib/sockunion.c7
-rw-r--r--lib/vty.c11
-rw-r--r--ospf6d/ospf6d.h6
-rw-r--r--ripngd/ripngd.c8
-rw-r--r--zebra/connected.c2
-rw-r--r--zebra/ipforward_sysctl.c6
-rw-r--r--zebra/rt_socket.c5
9 files changed, 13 insertions, 75 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index dc0fd08d7..a2531e21b 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -715,7 +715,7 @@ bgp_listener (int sock, struct sockaddr *sa, socklen_t salen)
}
/* IPv6 supported version of BGP server socket setup. */
-#if defined (HAVE_IPV6) && ! defined (NRL)
+#ifdef HAVE_IPV6
int
bgp_socket (unsigned short port, const char *address)
{
@@ -815,7 +815,7 @@ bgp_socket (unsigned short port, const char *address)
}
return sock;
}
-#endif /* HAVE_IPV6 && !NRL */
+#endif /* HAVE_IPV6 */
void
bgp_close (void)
diff --git a/configure.ac b/configure.ac
index e737f5a66..2e4d4fb7f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1099,21 +1099,10 @@ AC_MSG_CHECKING(whether does this OS have IPv6 stack)
if test "${enable_ipv6}" = "no"; then
AC_MSG_RESULT(disabled)
else
-dnl ----------
-dnl INRIA IPv6
-dnl ----------
- if grep IPV6_INRIA_VERSION /usr/include/netinet/in.h >/dev/null 2>&1; then
- zebra_cv_ipv6=yes
- AC_DEFINE(HAVE_IPV6,1,INRIA IPv6)
- AC_DEFINE(INRIA_IPV6,1,INRIA IPv6)
- RIPNGD="ripngd"
- OSPF6D="ospf6d"
- LIB_IPV6=""
- AC_MSG_RESULT(INRIA IPv6)
dnl ---------
dnl KAME IPv6
dnl ---------
- elif grep WIDE /usr/include/netinet6/in6.h >/dev/null 2>&1; then
+ if grep WIDE /usr/include/netinet6/in6.h >/dev/null 2>&1; then
zebra_cv_ipv6=yes
AC_DEFINE(HAVE_IPV6,1,KAME IPv6)
AC_DEFINE(KAME,1,KAME IPv6)
@@ -1123,32 +1112,6 @@ dnl ---------
LIB_IPV6="-L/usr/local/v6/lib -linet6"
fi
AC_MSG_RESULT(KAME)
-dnl -------------------------
-dnl MUSICA IPv6
-dnl default host check
-dnl It is not used by Kheops
-dnl -------------------------
- elif grep MUSICA /usr/include6/netinet6/in6.h >/dev/null 2>&1; then
- zebra_cv_ipv6=yes
- AC_DEFINE(HAVE_IPV6,1,Musicia IPv6)
- AC_DEFINE(MUSICA,1,Musica IPv6 stack)
- AC_DEFINE(KAME,1,KAME IPv6 stack)
- RIPNGD="ripngd"
- OSPF6D="ospf6d"
- if test -d /usr/local/v6/lib -a -f /usr/local/v6/lib/libinet6.a; then
- LIB_IPV6="-L/usr/local/v6/lib -linet6"
- fi
- AC_MSG_RESULT(MUSICA)
-dnl ---------
-dnl NRL check
-dnl ---------
- elif grep NRL /usr/include/netinet6/in6.h >/dev/null 2>&1; then
- zebra_cv_ipv6=yes
- AC_DEFINE(HAVE_IPV6,1,NRL IPv6)
- AC_DEFINE(NRL,1,NRL)
- RIPNGD="ripngd"
- OSPF6D="ospf6d"
- AC_MSG_RESULT(NRL)
dnl ------------------------------------
dnl Solaris 9, 10 and potentially higher
dnl ------------------------------------
diff --git a/lib/sockunion.c b/lib/sockunion.c
index 4fd5f1444..d964c21c6 100644
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -312,13 +312,8 @@ sockunion_connect (int fd, union sockunion *peersu, unsigned short port,
{
#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
su.sin6.sin6_scope_id = ifindex;
-#ifdef MUSICA
- su.sin6.sin6_scope_id = ifindex;
-#endif
#endif /* HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID */
-#ifndef MUSICA
SET_IN6_LINKLOCAL_IFINDEX (su.sin6.sin6_addr, ifindex);
-#endif
}
#endif /* KAME */
break;
@@ -402,7 +397,7 @@ sockunion_bind (int sock, union sockunion *su, unsigned short port,
#endif /* SIN6_LEN */
if (su_addr == NULL)
{
-#if defined(LINUX_IPV6) || defined(NRL)
+#ifdef LINUX_IPV6
memset (&su->sin6.sin6_addr, 0, sizeof (struct in6_addr));
#else
su->sin6.sin6_addr = in6addr_any;
diff --git a/lib/vty.c b/lib/vty.c
index a38a7523c..0de075ccb 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -1775,7 +1775,7 @@ vty_accept (struct thread *thread)
return 0;
}
-#if defined(HAVE_IPV6) && !defined(NRL)
+#ifdef HAVE_IPV6
static void
vty_serv_sock_addrinfo (const char *hostname, unsigned short port)
{
@@ -1840,7 +1840,7 @@ vty_serv_sock_addrinfo (const char *hostname, unsigned short port)
freeaddrinfo (ainfo_save);
}
-#else /* HAVE_IPV6 && ! NRL */
+#else /* HAVE_IPV6 */
/* Make vty server socket. */
static void
@@ -1908,7 +1908,7 @@ vty_serv_sock_family (const char* addr, unsigned short port, int family)
/* Add vty server event. */
vty_event (VTY_SERV, accept_sock, NULL);
}
-#endif /* HAVE_IPV6 && ! NRL */
+#endif /* HAVE_IPV6 */
#ifdef VTYSH
/* For sockaddr_un. */
@@ -2143,12 +2143,7 @@ vty_serv_sock (const char *addr, unsigned short port, const char *path)
{
#ifdef HAVE_IPV6
-#ifdef NRL
- vty_serv_sock_family (addr, port, AF_INET);
- vty_serv_sock_family (addr, port, AF_INET6);
-#else /* ! NRL */
vty_serv_sock_addrinfo (addr, port);
-#endif /* NRL*/
#else /* ! HAVE_IPV6 */
vty_serv_sock_family (addr,port, AF_INET);
#endif /* HAVE_IPV6 */
diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h
index 78ae1a14b..4122b3093 100644
--- a/ospf6d/ospf6d.h
+++ b/ospf6d/ospf6d.h
@@ -30,12 +30,6 @@
/* global variables */
extern struct thread_master *master;
-#ifdef INRIA_IPV6
-#ifndef IPV6_PKTINFO
-#define IPV6_PKTINFO IPV6_RECVPKTINFO
-#endif /* IPV6_PKTINFO */
-#endif /* INRIA_IPV6 */
-
/* Historical for KAME. */
#ifndef IPV6_JOIN_GROUP
#ifdef IPV6_ADD_MEMBERSHIP
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index 8b71269c0..9cb7217b3 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -930,7 +930,7 @@ ripng_redistribute_add (int type, int sub_type, struct prefix_ipv6 *p,
return;
if (IN6_IS_ADDR_LOOPBACK (&p->prefix))
return;
-#if defined (MUSICA) || defined (LINUX)
+#ifdef LINUX
/* XXX As long as the RIPng redistribution is applied to all the connected
* routes, one needs to filter the ::/96 prefixes.
* However it could be a wanted case, it will be removed soon.
@@ -938,7 +938,7 @@ ripng_redistribute_add (int type, int sub_type, struct prefix_ipv6 *p,
if ((IN6_IS_ADDR_V4COMPAT(&p->prefix)) ||
(IN6_IS_ADDR_UNSPECIFIED (&p->prefix) && (p->prefixlen == 96)))
return;
-#endif /* MUSICA or LINUX */
+#endif /* LINUX */
rp = route_node_get (ripng->table, (struct prefix *) p);
rinfo = rp->info;
@@ -1027,7 +1027,7 @@ ripng_redistribute_delete (int type, int sub_type, struct prefix_ipv6 *p,
return;
if (IN6_IS_ADDR_LOOPBACK (&p->prefix))
return;
-#if defined (MUSICA) || defined (LINUX)
+#ifdef LINUX
/* XXX As long as the RIPng redistribution is applied to all the connected
* routes, one needs to filter the ::/96 prefixes.
* However it could be a wanted case, it will be removed soon.
@@ -1035,7 +1035,7 @@ ripng_redistribute_delete (int type, int sub_type, struct prefix_ipv6 *p,
if ((IN6_IS_ADDR_V4COMPAT(&p->prefix)) ||
(IN6_IS_ADDR_UNSPECIFIED (&p->prefix) && (p->prefixlen == 96)))
return;
-#endif /* MUSICA or LINUX */
+#endif /* LINUX */
rp = route_node_lookup (ripng->table, (struct prefix *) p);
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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 23:57:49 +0100