diff options
| author |   florian <florian@openbsd.org> | 2020-03-28 16:15:45 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2020-03-28 16:15:45 +0000 |
| commit | 4fec1b251c8baa22ae58faaf4d543e8324c13eaf (patch) | |
| tree | 0cc5e656f5f41df89c45b18d132c1bff80bac840 | |
| parent | Export the number of arguments exposed by a probe to userland. (diff) | |
| download | wireguard-openbsd-4fec1b251c8baa22ae58faaf4d543e8324c13eaf.tar.xz wireguard-openbsd-4fec1b251c8baa22ae58faaf4d543e8324c13eaf.zip | |
Move ND6_PRIV_* constants from nd6.h to slaacd the only place where
they are used. Nobody in the wider eco system uses these.
While here reduce temporary address valid lifetime to 2 days as per
draft-ietf-6man-rfc4941bis. This should considerably reduce the amount
of addresses configured on an interface - a common complaint.
Original diff from Fernando Gont (fernando AT gont.com.ar), thanks!
Ports tree scanning by sthen@
| -rw-r--r-- | sbin/slaacd/engine.c | 7 | ||||
| -rw-r--r-- | sys/netinet6/nd6.h | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sbin/slaacd/engine.c b/sbin/slaacd/engine.c index be5d3fc827b..543e55b52bc 100644 --- a/sbin/slaacd/engine.c +++ b/sbin/slaacd/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.47 2019/11/22 15:30:00 florian Exp $ */ +/* $OpenBSD: engine.c,v 1.48 2020/03/28 16:15:45 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -86,6 +86,11 @@ #define RTR_SOLICITATION_INTERVAL 4 #define MAX_RTR_SOLICITATIONS 3 +/* constants for RFC 4941 autoconf privacy extension */ +#define ND6_PRIV_MAX_DESYNC_FACTOR 512 /* largest pow2 < 10 minutes */ +#define ND6_PRIV_VALID_LIFETIME 172800 /* 2 days */ +#define ND6_PRIV_PREFERRED_LIFETIME 86400 /* 1 day */ + enum if_state { IF_DOWN, IF_DELAY, diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 4449a7ed73c..82e674c5ecf 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.h,v 1.75 2019/06/21 17:11:43 mpi Exp $ */ +/* $OpenBSD: nd6.h,v 1.76 2020/03/28 16:15:45 florian Exp $ */ /* $KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $ */ /* @@ -89,11 +89,6 @@ struct in6_ndifreq { #define ND6_INFINITE_LIFETIME 0xffffffff -/* constants for RFC 4941 autoconf privacy extension */ -#define ND6_PRIV_MAX_DESYNC_FACTOR 512 /* largest pow2 < 10 minutes */ -#define ND6_PRIV_VALID_LIFETIME 604800 /* 1 week */ -#define ND6_PRIV_PREFERRED_LIFETIME 86400 /* 1 day */ - #ifdef _KERNEL #include <sys/queue.h> |