diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2003-06-24 07:55:13 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2003-06-24 07:55:13 +0000 |
| commit | e2c34f26037d9c929320231be6d51f71dd96779b (patch) | |
| tree | 7f1e2d189cb1c8538d86d52398e63e5a79853696 /sys/netinet6 | |
| parent | 49fd39cc4d322b4c17e7a420de16d1abd086a2ac (diff) | |
remove unneeded checks of accept_rtadv. from kame
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/icmp6.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/nd6.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index ba3b6a4daac..eaa63cc3d3f 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.72 2003/06/24 07:47:54 itojun Exp $ */ +/* $OpenBSD: icmp6.c,v 1.73 2003/06/24 07:55:12 itojun Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -2405,7 +2405,7 @@ icmp6_redirect_output(m0, rt) icmp6_errcount(&icmp6stat.icp6s_outerrhist, ND_REDIRECT, 0); /* if we are not router, we don't send icmp6 redirect */ - if (!ip6_forwarding || ip6_accept_rtadv) + if (!ip6_forwarding) goto fail; /* sanity check */ diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 9ff47cb85ec..13b3ba70642 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.c,v 1.63 2003/06/24 07:48:51 itojun Exp $ */ +/* $OpenBSD: nd6.c,v 1.64 2003/06/24 07:55:12 itojun Exp $ */ /* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */ /* @@ -808,7 +808,7 @@ nd6_free(rt, gc) * even though it is not harmful, it was not really necessary. */ - if (!ip6_forwarding && ip6_accept_rtadv) { /* XXX: too restrictive? */ + if (!ip6_forwarding) { int s; s = splsoftnet(); dr = defrouter_lookup(&((struct sockaddr_in6 *)rt_key(rt))->sin6_addr, diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 2877ac37761..b167e2625f6 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.30 2003/06/24 07:47:54 itojun Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.31 2003/06/24 07:55:12 itojun Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -767,7 +767,7 @@ nd6_na_input(m, off, icmp6len) dr = defrouter_lookup(in6, rt->rt_ifp); if (dr) defrtrlist_del(dr); - else if (!ip6_forwarding && ip6_accept_rtadv) { + else if (!ip6_forwarding) { /* * Even if the neighbor is not in the default * router list, the neighbor may be used diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 5d08babbf63..c1849dd0b95 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.27 2003/06/24 07:47:54 itojun Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.28 2003/06/24 07:55:12 itojun Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -112,7 +112,7 @@ nd6_rs_input(m, off, icmp6len) union nd_opts ndopts; /* If I'm not a router, ignore it. */ - if (ip6_accept_rtadv != 0 || ip6_forwarding != 1) + if (ip6_accept_rtadv != 0 || !ip6_forwarding) goto freeit; /* Sanity checks */ |