diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2012-08-21 19:50:40 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2012-08-21 19:50:40 +0000 |
| commit | cd4341a106f5622841eca0e9637375cc8833778b (patch) | |
| tree | 70f2dd750f2a8339d458be88337c92b0b22ed6ab /sys/netinet6 | |
| parent | 3f292aafd4273f48c8dfde60d3ebbfdd7cfa46ad (diff) | |
Reverse the name and meaning of the IFXF_INET6_PRIVACY interface
flag. It is now called IFXF_INET6_NOPRIVACY. So IPv6 privacy
addresses are on by default without resetting the flag during
ifconfig down/up.
OK stsp@, sperreault@ (who wrote the same diff)
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index ea61dae2a18..5158eee25cc 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_ifattach.c,v 1.54 2012/08/15 14:00:32 sperreault Exp $ */ +/* $OpenBSD: in6_ifattach.c,v 1.55 2012/08/21 19:50:39 bluhm Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* @@ -645,9 +645,6 @@ in6_ifattach(struct ifnet *ifp, struct ifnet *altifp) } } } - - /* Enable autoconf privacy addresses. */ - ifp->if_xflags |= IFXF_INET6_PRIVACY; } /* diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 584cb253101..e99eb78da5f 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.60 2012/07/14 17:23:16 sperreault Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.61 2012/08/21 19:50:39 bluhm Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -1272,7 +1272,7 @@ prelist_update(struct nd_prefix *new, struct nd_defrouter *dr, struct mbuf *m) ifa6->ia6_updatetime = time_second; } - if ((!autoconf || ((ifp->if_xflags & IFXF_INET6_PRIVACY) && + if ((!autoconf || ((ifp->if_xflags & IFXF_INET6_NOPRIVACY) == 0 && !tempaddr_preferred)) && new->ndpr_vltime != 0) { /* * There is no SLAAC address and/or there is no preferred RFC @@ -1298,7 +1298,7 @@ nd6_addr_add(void *prptr, void *arg2) int ifa_plen, autoconf, privacy; autoconf = 1; - privacy = (pr->ndpr_ifp->if_xflags & IFXF_INET6_PRIVACY) != 0; + privacy = (pr->ndpr_ifp->if_xflags & IFXF_INET6_NOPRIVACY) == 0; /* Because prelist_update() runs in interrupt context it may run * again before this work queue task is run, causing multiple work |