diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-02-16 16:00:01 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-02-16 16:00:01 +0000 |
| commit | adcce09577c48aeb228910c0f7e4f83726f03ff2 (patch) | |
| tree | d3a2a4681def8bae9a2e0bb1016cc97bb778d08b /sys/netinet6 | |
| parent | b93cb4dfe10d7b92352d9466ed143940ddfd6cfe (diff) | |
cosmetic sync with kame
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6_cksum.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 13 | ||||
| -rw-r--r-- | sys/netinet6/nd6.c | 8 |
3 files changed, 16 insertions, 9 deletions
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c index 1fdbc02d592..4486f715bfb 100644 --- a/sys/netinet6/in6_cksum.c +++ b/sys/netinet6/in6_cksum.c @@ -1,5 +1,5 @@ -/* $OpenBSD: in6_cksum.c,v 1.7 2001/02/16 08:22:05 itojun Exp $ */ -/* $KAME: in6_cksum.c,v 1.9 2000/09/09 15:33:31 itojun Exp $ */ +/* $OpenBSD: in6_cksum.c,v 1.8 2001/02/16 15:59:38 itojun Exp $ */ +/* $KAME: in6_cksum.c,v 1.10 2000/12/03 00:53:59 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index a5fd6d5028d..7d222266f81 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -1,5 +1,5 @@ -/* $OpenBSD: in6_ifattach.c,v 1.15 2001/02/07 11:43:53 itojun Exp $ */ -/* $KAME: in6_ifattach.c,v 1.102 2001/02/07 11:01:29 itojun Exp $ */ +/* $OpenBSD: in6_ifattach.c,v 1.16 2001/02/16 15:59:38 itojun Exp $ */ +/* $KAME: in6_ifattach.c,v 1.112 2001/02/10 15:44:59 jinmei Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -871,7 +871,14 @@ in6_ifdetach(ifp) /* cleanup multicast address kludge table, if there is any */ in6_purgemkludge(ifp); - /* remove neighbor management table */ + /* + * remove neighbor management table. we call it twice just to make + * sure we nuke everything. maybe we need just one call. + * XXX: since the first call did not release addresses, some prefixes + * might remain. We should call nd6_purge() again to release the + * prefixes after removing all addresses above. + * (Or can we just delay calling nd6_purge until at this point?) + */ nd6_purge(ifp); /* remove route to link-local allnodes multicast (ff02::1) */ diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 53618307ae5..c7f72da2688 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,5 +1,5 @@ -/* $OpenBSD: nd6.c,v 1.25 2001/02/16 08:48:06 itojun Exp $ */ -/* $KAME: nd6.c,v 1.114 2001/02/08 10:57:00 itojun Exp $ */ +/* $OpenBSD: nd6.c,v 1.26 2001/02/16 16:00:00 itojun Exp $ */ +/* $KAME: nd6.c,v 1.126 2001/02/16 12:49:45 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -1797,7 +1797,7 @@ nd6_output(ifp, origifp, m0, dst, rt0) * XXX: we currently do not make neighbor cache on any interface * other than ARCnet, Ethernet, FDDI and GIF. * - * draft-ietf-ngtrans-mech-06.txt says: + * RFC2893 says: * - unidirectional tunnels needs no ND */ switch (ifp->if_type) { @@ -1834,7 +1834,7 @@ nd6_output(ifp, origifp, m0, dst, rt0) /* * We skip link-layer address resolution and NUD * if the gateway is not a neighbor from ND point - * of view, regardless the value of the value of + * of view, regardless the value of the * nd_ifinfo.flags. * The second condition is a bit tricky: we skip * if the gateway is our own address, which is |