Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it clearer that /etc/rtadvd.conf is optional (normally, 

configurations were derived from kernel interface settings).

install rtadvd.conf into /usr/share/exapmles/rtadvd, instead of /etc.

sync with kame.
This commit is contained in:
itojun 2001-01-21 15:01:36 +00:00
parent 1e917b6c73
commit 14296ba1e6
7 changed files with 82 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distrib/sets/lists/etc/mi
View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.76 2001/01/18 02:01:53 thorpej Exp $ # $NetBSD: mi,v 1.77 2001/01/21 15:01:36 itojun Exp $
./.cshrc ./.cshrc
./.profile ./.profile
./dev/MAKEDEV.local ./dev/MAKEDEV.local
@ -153,7 +153,6 @@
./etc/remote ./etc/remote
./etc/rmt ./etc/rmt
./etc/rpc ./etc/rpc
./etc/rtadvd.conf
./etc/security ./etc/security
./etc/security.conf ./etc/security.conf
./etc/services ./etc/services

3
distrib/sets/lists/misc/mi
View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.55 2001/01/15 17:57:44 itojun Exp $ # $NetBSD: mi,v 1.56 2001/01/21 15:01:36 itojun Exp $
./usr/share/dict/README misc-reference-share ./usr/share/dict/README misc-reference-share
./usr/share/dict/eign misc-reference-share ./usr/share/dict/eign misc-reference-share
./usr/share/dict/propernames misc-reference-share ./usr/share/dict/propernames misc-reference-share
@ -408,6 +408,7 @@
./usr/share/examples/racoon/psk.txt.sample misc-ipsec-examples ./usr/share/examples/racoon/psk.txt.sample misc-ipsec-examples
./usr/share/examples/racoon/racoon.conf.sample misc-ipsec-examples ./usr/share/examples/racoon/racoon.conf.sample misc-ipsec-examples
./usr/share/examples/racoon/racoon.conf.sample-gssapi misc-ipsec-examples ./usr/share/examples/racoon/racoon.conf.sample-gssapi misc-ipsec-examples
./usr/share/examples/rtadvd/rtadvd.conf misc-rtadvd-examples
./usr/share/examples/supfiles/ftp.cs.umn.edu misc-sup-examples ./usr/share/examples/supfiles/ftp.cs.umn.edu misc-sup-examples
./usr/share/examples/supfiles/sup.au.netbsd.org misc-sup-examples ./usr/share/examples/supfiles/sup.au.netbsd.org misc-sup-examples
./usr/share/examples/supfiles/sup.jp.netbsd.org misc-sup-examples ./usr/share/examples/supfiles/sup.jp.netbsd.org misc-sup-examples

7
etc/mtree/NetBSD.dist
View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD.dist,v 1.134 2001/01/21 14:58:57 itojun Exp $ # $NetBSD: NetBSD.dist,v 1.135 2001/01/21 15:01:36 itojun Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
/set type=dir uname=root gname=wheel mode=0755 /set type=dir uname=root gname=wheel mode=0755
@ -964,6 +964,11 @@ racoon
# ./usr/share/examples/racoon # ./usr/share/examples/racoon
.. ..
# ./usr/share/examples/rtadvd
rtadvd
# ./usr/share/examples/rtadvd
..
# ./usr/share/examples/supfiles # ./usr/share/examples/supfiles
supfiles supfiles
# ./usr/share/examples/supfiles # ./usr/share/examples/supfiles

26
etc/rtadvd.conf
View File

@ -1,26 +0,0 @@
# $NetBSD: rtadvd.conf,v 1.4 2000/03/17 17:35:20 itojun Exp $
# common definitions.
# Note: All of the following parameters have default values defined
# in specifications, and hence you usually do not have to set them
# by hand unless you need special non-default values.
# You even do not need to create the configuration file. rtadvd
# would usually work well without a configuration file.
# See also: rtadvd(8)
#default:\
# :chlim#64:raflags#0:rltime#1800:rtime#30000:retrans#1000:\
# :pinfoflags#192:vltime#3600000:pltime#3600000:mtu#1500:
#ether:\
# :mtu#1500:tc=default:
# per-interface definitions.
# IPv6 prefixes are configured in this part. However, rtadvd
# automatically learns appropriate prefixes from the kernel's routing
# table and advertises the prefix, so you don't have to configure
# this part, either.
# If you don't want the automatic advertisement, invoke rtadvd with
# the -s option and configure this part by hand.
#ef0:\
# :addrs#1:addr="3ffe:0501:ffff:1000::":prefixlen#64:tc=ether:

5
usr.sbin/rtadvd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2000/05/23 11:37:58 itojun Exp $ # $NetBSD: Makefile,v 1.4 2001/01/21 15:01:37 itojun Exp $
PROG= rtadvd PROG= rtadvd
SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c
@ -8,4 +8,7 @@ MAN= rtadvd.8 rtadvd.conf.5
LDADD+= -lcompat LDADD+= -lcompat
DPADD+= ${LIBCOMPAT} DPADD+= ${LIBCOMPAT}
FILESDIR= /usr/share/examples/rtadvd
FILES= rtadvd.conf
.include <bsd.prog.mk> .include <bsd.prog.mk>

21
usr.sbin/rtadvd/rtadvd.conf Normal file
View File

@ -0,0 +1,21 @@
# $NetBSD: rtadvd.conf,v 1.1 2001/01/21 15:01:37 itojun Exp $
# $KAME: rtadvd.conf,v 1.12 2001/01/21 14:56:38 itojun Exp $
#
# Note: All of the following parameters have default values defined
# in specifications, and hence you usually do not have to set them
# by hand unless you need special non-default values.
#
# You even do not need to create the configuration file. rtadvd
# would usually work well without a configuration file.
# See also: rtadvd(8)
# per-interface definitions.
# Mainly IPv6 prefixes are configured in this part. However, rtadvd
# automatically learns appropriate prefixes from the kernel's routing
# table, and advertises the prefixes, so you don't have to configure
# this part, either.
# If you don't want the automatic advertisement, (uncomment and) configure
# this part by hand, and then invoke rtadvd with the -s option.
#ef0:\
# :addrs#1:addr="3ffe:501:ffff:1000::":prefixlen#64:

80
usr.sbin/rtadvd/rtadvd.conf.5
View File

@ -1,5 +1,5 @@
.\" $NetBSD: rtadvd.conf.5,v 1.5 2001/01/15 06:14:06 itojun Exp $ .\" $NetBSD: rtadvd.conf.5,v 1.6 2001/01/21 15:01:37 itojun Exp $
.\" $KAME: rtadvd.conf.5,v 1.18 2000/12/22 08:54:29 jinmei Exp $ .\" $KAME: rtadvd.conf.5,v 1.32 2001/01/19 05:32:05 jinmei Exp $
.\" .\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
.\" All rights reserved. .\" All rights reserved.
@ -37,11 +37,12 @@
.Sh DESCRIPTION .Sh DESCRIPTION
This file describes how the router advertisement packets must be constructed This file describes how the router advertisement packets must be constructed
for each of the interfaces. for each of the interfaces.
.Pp
As described in As described in
.Xr rtadvd 8 , .Xr rtadvd 8 ,
you do not have to set this configuration file up at all, you do not have to set this configuration file up at all,
unless you need some special configurations. unless you need some special configurations.
You may even omit to create this file. You may even omit the file as a whole.
In such cases, the In such cases, the
.Nm rtadvd .Nm rtadvd
daemon will automatically configure itself using default values daemon will automatically configure itself using default values
@ -151,8 +152,10 @@ betwen routers on the link
This value is used in consistency check for locally-configured and This value is used in consistency check for locally-configured and
advertised prefix lifetimes, and has its meaning when the local router advertised prefix lifetimes, and has its meaning when the local router
configures a prefix on the link with a lifetime that decrements in configures a prefix on the link with a lifetime that decrements in
real time. If the value is 0, it means the consistency check will be skipped real time.
for such prefixes. The default value is 0. If the value is 0, it means the consistency check will be skipped
for such prefixes.
The default value is 0.
.It Cm \&addrs .It Cm \&addrs
(num) Number of prefixes. (num) Number of prefixes.
Its default is 0, so it must explicitly be set to positve values Its default is 0, so it must explicitly be set to positve values
@ -257,36 +260,45 @@ capability.
See See
.Xr termcap 5 .Xr termcap 5
for details on the capability. for details on the capability.
.Sh EXAMPLE .Sh EXAMPLES
As presented above, all of the advertised parameters have default values
defined in specifications, and hence you usually do not have to set them
by hand, unless you need special non-default values.
It can cause interoperability problem if you use an ill-configured
parameter.
.Pp
To override a configuration parameter, you can specify the parameter alone.
With the following configuration,
.Xr rtadvd 8
overrides the router lifetime parameter for the
.Li ne0
interface.
.Bd -literal -offset .Bd -literal -offset
# ne0:\\
# common definitions. :rltime#0:
# .Ed
# Note: All of the following parameters have default values defined .Pp
# in specifications, and hence you usually do not have to set them The following example manually configures prefixes advertised from the
# by hand unless you need special non-default values. .Li ef0
# interface.
# You even do not need to create the configuration file. rtadvd The configuration must be used with the
# would usually work well without a configuration file. .Fl s
# See also: rtadvd(8) option to
.Xr rtadvd 8 .
#default:\\ .Bd -literal -offset
# :chlim#64:raflags#0:rltime#1800:rtime#30000:retrans#1000:\\ ef0:\\
# :pinfoflags#192:vltime#3600000:pltime#3600000:mtu#1500: :addrs#1:addr="3ffe:501:ffff:1000::":prefixlen#64:
#ether:\\ .Ed
# :mtu#1500:tc=default: .Pp
The following example presents the default values in an explicit manner.
# per-interface definitions. The configuration is provided just for reference purposes;
# Mainly IPv6 prefixes are configured in this part. However, rtadvd YOU DO NOT NEED TO HAVE IT AT ALL.
# automatically learns appropriate prefixes from the kernel's routing .Bd -literal -offset
# table, and advertises the prefixes, so you don't have to configure default:\\
# this part, either. :chlim#64:raflags#0:rltime#1800:rtime#0:retrans#0:\\
# If you don't want the automatic advertisement, invoke rtadvd with :pinfoflags#192:vltime#2592000:pltime#604800:mtu#0:
# the -s option and configure this part by hand. ef0:\\
:addrs#1:addr="3ffe:501:ffff:1000::":prefixlen#64:tc=default:
#ef0:\\
# :addrs#1:addr="3ffe:501:4819:1000::":prefixlen#64:tc=ether:
.Ed .Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr termcap 5 , .Xr termcap 5 ,