summaryrefslogtreecommitdiffstats
path: root/sys/netinet6/ip6_input.c
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-10-19 12:11:28 +0000
committermpi <mpi@openbsd.org>2015-10-19 12:11:28 +0000
commit8eadafcde6ecf101b7b2f84f3d4b34390b708a13 (patch)
treea51adca80872f77fecc174f05ff27d446da9d3d8 /sys/netinet6/ip6_input.c
parentStop checking for RTF_UP directly, call rtisvalid(9) instead. (diff)
downloadwireguard-openbsd-8eadafcde6ecf101b7b2f84f3d4b34390b708a13.tar.xz
wireguard-openbsd-8eadafcde6ecf101b7b2f84f3d4b34390b708a13.zip
Stop checking for RTF_UP directly, call rtisvalid(9) instead.
While here add two missing ``rtableid'' checks in in6_selectsrc(). ok bluhm@
Diffstat (limited to 'sys/netinet6/ip6_input.c')
-rw-r--r--sys/netinet6/ip6_input.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index e1d5ea58707..4cfcba24ac3 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_input.c,v 1.147 2015/10/13 10:29:16 mpi Exp $ */
+/* $OpenBSD: ip6_input.c,v 1.148 2015/10/19 12:11:28 mpi Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -415,8 +415,7 @@ ip6_input(struct mbuf *m)
/*
* Unicast check
*/
- if (ip6_forward_rt.ro_rt != NULL &&
- (ip6_forward_rt.ro_rt->rt_flags & RTF_UP) != 0 &&
+ if (rtisvalid(ip6_forward_rt.ro_rt) &&
IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst,
&ip6_forward_rt.ro_dst.sin6_addr) &&
rtableid == ip6_forward_rt.ro_tableid)