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>
diff --git a/lib/sockunion.c b/lib/sockunion.c
index 5dcf725..1a355d3 100644
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -304,13 +304,8 @@
{
#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;
@@ -394,7 +389,7 @@
#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;