diff options
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/icmp6.c | 7 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index e98ddeb0800..4255ecadda5 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.222 2018/03/27 15:03:52 dhill Exp $ */ +/* $OpenBSD: icmp6.c,v 1.223 2018/05/21 15:52:22 bluhm Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -448,9 +448,8 @@ icmp6_input(struct mbuf **mp, int *offp, int proto, int af) if (ifp == NULL) goto freeit; - if (ifp->if_type == IFT_CARP && - icmp6->icmp6_type == ICMP6_ECHO_REQUEST && - carp_lsdrop(m, AF_INET6, ip6->ip6_src.s6_addr32, + if (icmp6->icmp6_type == ICMP6_ECHO_REQUEST && + carp_lsdrop(ifp, m, AF_INET6, ip6->ip6_src.s6_addr32, ip6->ip6_dst.s6_addr32, 1)) { if_put(ifp); goto freeit; diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index c4911a9f3a7..527a8f70298 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.214 2018/02/19 08:59:53 mpi Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.215 2018/05/21 15:52:22 bluhm Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -245,8 +245,7 @@ ip6_input_if(struct mbuf **mp, int *offp, int nxt, int af, struct ifnet *ifp) } #if NCARP > 0 - if (ifp->if_type == IFT_CARP && - carp_lsdrop(m, AF_INET6, ip6->ip6_src.s6_addr32, + if (carp_lsdrop(ifp, m, AF_INET6, ip6->ip6_src.s6_addr32, ip6->ip6_dst.s6_addr32, (ip6->ip6_nxt == IPPROTO_ICMPV6 ? 0 : 1))) goto bad; #endif @@ -495,8 +494,8 @@ ip6_input_if(struct mbuf **mp, int *offp, int nxt, int af, struct ifnet *ifp) } #if NCARP > 0 - if (ifp->if_type == IFT_CARP && ip6->ip6_nxt == IPPROTO_ICMPV6 && - carp_lsdrop(m, AF_INET6, ip6->ip6_src.s6_addr32, + if (ip6->ip6_nxt == IPPROTO_ICMPV6 && + carp_lsdrop(ifp, m, AF_INET6, ip6->ip6_src.s6_addr32, ip6->ip6_dst.s6_addr32, 1)) goto bad; #endif |