diff options
| -rw-r--r-- | sbin/ifconfig/brconfig.h | 4 | ||||
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 6 | ||||
| -rw-r--r-- | sys/net/if.h | 4 | ||||
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 6 |
5 files changed, 11 insertions, 14 deletions
diff --git a/sbin/ifconfig/brconfig.h b/sbin/ifconfig/brconfig.h index 81728b5012f..1e797a0450d 100644 --- a/sbin/ifconfig/brconfig.h +++ b/sbin/ifconfig/brconfig.h @@ -1,4 +1,4 @@ -/* $OpenBSD: brconfig.h,v 1.5 2011/11/02 02:03:47 haesbaert Exp $ */ +/* $OpenBSD: brconfig.h,v 1.6 2012/08/21 19:50:39 bluhm Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -69,7 +69,7 @@ int bridge_rule(int, char **, int); "\024\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\6NOTRAILERS" \ "\7RUNNING\10NOARP\11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX" \ "\15LINK0\16LINK1\17LINK2\20MULTICAST\21TXREADY\22NOINET6" \ - "\23INET6_PRIVACY\24MPLS\25WOL" + "\23INET6_NOPRIVACY\24MPLS\25WOL" void printb(char *, unsigned int, char *); diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index bd92def8c06..587f8a0ca9c 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.255 2012/04/15 03:10:43 jsg Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.256 2012/08/21 19:50:39 bluhm Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -337,8 +337,8 @@ const struct cmd { { "pltime", NEXTARG, 0, setia6pltime }, { "vltime", NEXTARG, 0, setia6vltime }, { "eui64", 0, 0, setia6eui64 }, - { "autoconfprivacy", IFXF_INET6_PRIVACY, 0, setifxflags }, - { "-autoconfprivacy", -IFXF_INET6_PRIVACY, 0, setifxflags }, + { "autoconfprivacy", -IFXF_INET6_NOPRIVACY, 0, setifxflags }, + { "-autoconfprivacy", IFXF_INET6_NOPRIVACY, 0, setifxflags }, #endif /*INET6*/ #ifndef SMALL { "hwfeatures", NEXTARG0, 0, printifhwfeatures }, diff --git a/sys/net/if.h b/sys/net/if.h index 9a1fc0fca5c..3f0bd6b7341 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.131 2011/12/02 03:15:31 haesbaert Exp $ */ +/* $OpenBSD: if.h,v 1.132 2012/08/21 19:50:39 bluhm Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -337,7 +337,7 @@ struct ifnet { /* and the entries */ #define IFXF_TXREADY 0x1 /* interface is ready to tx */ #define IFXF_NOINET6 0x2 /* don't do inet6 */ -#define IFXF_INET6_PRIVACY 0x4 /* autoconf privacy extension */ +#define IFXF_INET6_NOPRIVACY 0x4 /* don't autoconf privacy */ #define IFXF_MPLS 0x8 /* supports MPLS */ #define IFXF_WOL 0x10 /* wake on lan enabled */ 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 |