diff options
| author |   jca <jca@openbsd.org> | 2015-11-30 21:04:15 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2015-11-30 21:04:15 +0000 |
| commit | 375b1a79b2229b2dfd519dae08e4ff1d7d79df84 (patch) | |
| tree | 748eab3c0cbd418e72bc357f46ae6419f3e34270 | |
| parent | Clean up get_next_msg(): kill dead argument/code (diff) | |
| download | wireguard-openbsd-375b1a79b2229b2dfd519dae08e4ff1d7d79df84.tar.xz wireguard-openbsd-375b1a79b2229b2dfd519dae08e4ff1d7d79df84.zip | |
Kill Mobile IPv6 references. Also spotted by florian@
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.h | 12 |
2 files changed, 5 insertions, 13 deletions
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8 index 34d928c0c33..9b41b027ee9 100644 --- a/usr.sbin/rtadvd/rtadvd.8 +++ b/usr.sbin/rtadvd/rtadvd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rtadvd.8,v 1.33 2015/11/30 20:52:28 jca Exp $ +.\" $OpenBSD: rtadvd.8,v 1.34 2015/11/30 21:04:15 jca Exp $ .\" $KAME: rtadvd.8,v 1.18 2002/04/28 10:43:02 jinmei Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -101,10 +101,6 @@ If this option is specified, .Nm will run in the foreground and log to .Em stderr . -.\".It Fl m -.\"Enables Mobile IPv6 support. -.\"This changes the content of router advertisement option, as well as -.\"permitted configuration directives. .It Fl s Do not add or delete prefixes dynamically. Only statically configured prefixes, if any, will be advertised. diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h index e41721a6e96..5ff7d67ee8d 100644 --- a/usr.sbin/rtadvd/rtadvd.h +++ b/usr.sbin/rtadvd/rtadvd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtadvd.h,v 1.17 2014/01/07 14:58:40 gsoares Exp $ */ +/* $OpenBSD: rtadvd.h,v 1.18 2015/11/30 21:04:15 jca Exp $ */ /* $KAME: rtadvd.h,v 1.20 2002/05/29 10:13:10 itojun Exp $ */ /* @@ -47,17 +47,13 @@ #define DEF_ADVVALIDLIFETIME 2592000 #define DEF_ADVPREFERREDLIFETIME 604800 -/*XXX int-to-double comparison for INTERVAL items */ -#define mobileip6 0 - +/* XXX int-to-double comparison for INTERVAL items */ #define MAXROUTERLIFETIME 9000 -#define MIN_MAXINTERVAL (mobileip6 ? 1.5 : 4.0) +#define MIN_MAXINTERVAL 4.0 #define MAX_MAXINTERVAL 1800 -#define MIN_MININTERVAL (mobileip6 ? 0.05 : 3.0) +#define MIN_MININTERVAL 3.0 #define MAXREACHABLETIME 3600000 -#undef miobileip6 - #define MAX_INITIAL_RTR_ADVERT_INTERVAL 16 #define MAX_INITIAL_RTR_ADVERTISEMENTS 3 #define MAX_FINAL_RTR_ADVERTISEMENTS 3 |