diff options
author | Peter Hessler <phessler@cvs.openbsd.org> | 2012-07-08 09:30:04 +0000 |
---|---|---|
committer | Peter Hessler <phessler@cvs.openbsd.org> | 2012-07-08 09:30:04 +0000 |
commit | ae4650b9b9ddf82f4889fd374b11644c19e7692d (patch) | |
tree | 3d087a75c4fe9681222042b85470213fa52b4104 /usr.sbin/rtadvd | |
parent | d9181871b7b272e4ff6ae832ae2d5911ce751213 (diff) |
Add noifprefix, an option to send an RA with no prefix information.
From Stephane A. Sezer, many thanks!
OK phessler@, jasper@
Diffstat (limited to 'usr.sbin/rtadvd')
-rw-r--r-- | usr.sbin/rtadvd/config.c | 4 | ||||
-rw-r--r-- | usr.sbin/rtadvd/rtadvd.conf.5 | 20 |
2 files changed, 19 insertions, 5 deletions
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index d536071c278..374bb929928 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.26 2008/04/23 10:17:50 pyr Exp $ */ +/* $OpenBSD: config.c,v 1.27 2012/07/08 09:30:03 phessler Exp $ */ /* $KAME: config.c,v 1.62 2002/05/29 10:13:10 itojun Exp $ */ /* @@ -320,7 +320,7 @@ getconfig(intface) now.tv_sec + pfx->preflifetime; } } - if (tmp->pfxs == 0) + if (tmp->pfxs == 0 && !agetflag("noifprefix")) get_prefix(tmp); MAYHAVE(val, "mtu", 0); diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5 index 1315b52d4d0..b6eb7de6e3c 100644 --- a/usr.sbin/rtadvd/rtadvd.conf.5 +++ b/usr.sbin/rtadvd/rtadvd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rtadvd.conf.5,v 1.25 2010/09/19 21:59:23 jmc Exp $ +.\" $OpenBSD: rtadvd.conf.5,v 1.26 2012/07/08 09:30:03 phessler Exp $ .\" $KAME: rtadvd.conf.5,v 1.46 2003/06/17 08:26:35 itojun Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: September 19 2010 $ +.Dd $Mdocdate: July 8 2012 $ .Dt RTADVD.CONF 5 .Os .Sh NAME @@ -142,7 +142,9 @@ which will be attached to router advertisement header. These items can be omitted, then .Nm rtadvd will automatically get appropriate prefixes from the kernel's routing table, -and advertise the prefixes with the default parameters. +and advertise the prefixes with the default parameters, unless the +.Cm noifprefix +flag is specified. Keywords other than .Cm clockskew can be augmented with a number, like @@ -184,6 +186,18 @@ is used for the .Xr termcap 5 file format as well as IPv6 numeric addresses, the field MUST be quoted using double quotes. +.It Cm \&noifprefix +(bool) Specifies whether +.Nm rtadvd +should gather prefix information from the interface if no +.Cm addr +is specified. If no +.Cm addr +is given, and +.Cm noifprefix +is set, +.Nm rtadvd +will send RA packets with no prefix information. .It Cm \&vltime (num) Valid lifetime field .Pq unit: seconds . |