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 /lib/sockunion.c | |
| 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 'lib/sockunion.c')
| -rw-r--r-- | lib/sockunion.c | 7 |
1 files changed, 1 insertions, 6 deletions
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; |