diff options
Diffstat (limited to 'sys/netinet6/mld6.c')
| -rw-r--r-- | sys/netinet6/mld6.c | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 3fd26c77f33..d9066563b6e 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mld6.c,v 1.1 1999/12/08 06:50:23 itojun Exp $ */ +/* $OpenBSD: mld6.c,v 1.2 1999/12/10 10:04:28 angelos Exp $ */ /* * Copyright (C) 1998 WIDE Project. @@ -68,13 +68,6 @@ * @(#)igmp.c 8.1 (Berkeley) 7/19/93 */ -#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__) -#include "opt_inet.h" -#ifdef __NetBSD__ /*XXX*/ -#include "opt_ipsec.h" -#endif -#endif - #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> @@ -141,11 +134,7 @@ void mld6_start_listening(in6m) struct in6_multi *in6m; { -#ifdef __NetBSD__ - int s = splsoftnet(); -#else int s = splnet(); -#endif /* * (draft-ietf-ipngwg-mld, page 10) @@ -196,9 +185,6 @@ mld6_input(m, off) struct ifnet *ifp = m->m_pkthdr.rcvif; struct in6_multi *in6m; struct in6_ifaddr *ia; -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 - struct ifmultiaddr *ifma; -#endif int timer; /* timer value in the MLD query header */ /* source address validation */ @@ -263,30 +249,15 @@ mld6_input(m, off) mld6_all_nodes_linklocal.s6_addr16[1] = htons(ifp->if_index); /* XXX */ -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 - LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) -#else for (in6m = ia->ia6_multiaddrs.lh_first; in6m; in6m = in6m->in6m_entry.le_next) -#endif { -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 - if (ifma->ifma_addr->sa_family != AF_INET6) - continue; - in6m = (struct in6_multi *)ifma->ifma_protospec; - if (IN6_ARE_ADDR_EQUAL(&in6m->in6m_addr, - &mld6_all_nodes_linklocal) || - IPV6_ADDR_MC_SCOPE(&in6m->in6m_addr) < - IPV6_ADDR_SCOPE_LINKLOCAL) - continue; -#else if (IN6_ARE_ADDR_EQUAL(&in6m->in6m_addr, &mld6_all_nodes_linklocal) || IPV6_ADDR_MC_SCOPE(&in6m->in6m_addr) < IPV6_ADDR_SCOPE_LINKLOCAL) continue; -#endif if (IN6_IS_ADDR_UNSPECIFIED(&mldh->mld6_addr) || IN6_ARE_ADDR_EQUAL(&mldh->mld6_addr, @@ -363,11 +334,8 @@ mld6_fasttimeo() if (!mld6_timers_are_running) return; -#ifdef __NetBSD__ - s = splsoftnet(); -#else s = splnet(); -#endif + mld6_timers_are_running = 0; IN6_FIRST_MULTI(step, in6m); while (in6m != NULL) { @@ -420,11 +388,6 @@ mld6_sendpkt(in6m, type, dst) } mh->m_next = md; -#ifdef IPSEC -#ifndef __OpenBSD__ /*KAME IPSEC*/ - mh->m_pkthdr.rcvif = NULL; -#endif -#endif mh->m_pkthdr.len = sizeof(struct ip6_hdr) + sizeof(struct mld6_hdr); mh->m_len = sizeof(struct ip6_hdr); MH_ALIGN(mh, sizeof(struct ip6_hdr)); |