Skip to content

Commit

Permalink
loosened the condition requiring ip6_accept_rtadv where it was too st…
Browse files Browse the repository at this point in the history
…rong;

generally it was the case when we need to consider redirect cases.
  • Loading branch information
jinmei committed Jun 3, 2003
1 parent b094c7d commit f128d55
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions kame/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
/* $KAME: nd6.c,v 1.315 2003/04/28 06:38:04 suz Exp $ */
/* $KAME: nd6.c,v 1.316 2003/06/03 08:25:55 jinmei Exp $ */

/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
Expand Down Expand Up @@ -1054,7 +1054,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;
#if defined(__NetBSD__) || defined(__OpenBSD__)
s = splsoftnet();
Expand Down
4 changes: 2 additions & 2 deletions kame/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
/* $KAME: nd6_nbr.c,v 1.122 2003/04/23 09:15:52 keiichi Exp $ */
/* $KAME: nd6_nbr.c,v 1.123 2003/06/03 08:25:55 jinmei Exp $ */

/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
Expand Down Expand Up @@ -959,7 +959,7 @@ nd6_na_input(m, off, icmp6len)
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
Expand Down

0 comments on commit f128d55

Please sign in to comment.