diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index 6c5e27790774..bd2b2d1dc6bd 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -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 ./.profile ./dev/MAKEDEV.local @@ -153,7 +153,6 @@ ./etc/remote ./etc/rmt ./etc/rpc -./etc/rtadvd.conf ./etc/security ./etc/security.conf ./etc/services diff --git a/distrib/sets/lists/misc/mi b/distrib/sets/lists/misc/mi index 5fb608d1740f..4bca0e314c68 100644 --- a/distrib/sets/lists/misc/mi +++ b/distrib/sets/lists/misc/mi @@ -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/eign 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/racoon.conf.sample 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/sup.au.netbsd.org misc-sup-examples ./usr/share/examples/supfiles/sup.jp.netbsd.org misc-sup-examples diff --git a/etc/mtree/NetBSD.dist b/etc/mtree/NetBSD.dist index 65f8526e38b6..0f452b3a7f3c 100644 --- a/etc/mtree/NetBSD.dist +++ b/etc/mtree/NetBSD.dist @@ -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 /set type=dir uname=root gname=wheel mode=0755 @@ -964,6 +964,11 @@ racoon # ./usr/share/examples/racoon .. +# ./usr/share/examples/rtadvd +rtadvd +# ./usr/share/examples/rtadvd +.. + # ./usr/share/examples/supfiles supfiles # ./usr/share/examples/supfiles diff --git a/etc/rtadvd.conf b/etc/rtadvd.conf deleted file mode 100644 index 834534a74b5f..000000000000 --- a/etc/rtadvd.conf +++ /dev/null @@ -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: diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile index 94f61baf60cd..20f0db836d0a 100644 --- a/usr.sbin/rtadvd/Makefile +++ b/usr.sbin/rtadvd/Makefile @@ -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 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 DPADD+= ${LIBCOMPAT} +FILESDIR= /usr/share/examples/rtadvd +FILES= rtadvd.conf + .include diff --git a/usr.sbin/rtadvd/rtadvd.conf b/usr.sbin/rtadvd/rtadvd.conf new file mode 100644 index 000000000000..5c40cf651091 --- /dev/null +++ b/usr.sbin/rtadvd/rtadvd.conf @@ -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: diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5 index 6db13f997a49..835491dd5199 100644 --- a/usr.sbin/rtadvd/rtadvd.conf.5 +++ b/usr.sbin/rtadvd/rtadvd.conf.5 @@ -1,5 +1,5 @@ -.\" $NetBSD: rtadvd.conf.5,v 1.5 2001/01/15 06:14:06 itojun Exp $ -.\" $KAME: rtadvd.conf.5,v 1.18 2000/12/22 08:54:29 jinmei Exp $ +.\" $NetBSD: rtadvd.conf.5,v 1.6 2001/01/21 15:01:37 itojun 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. .\" All rights reserved. @@ -37,11 +37,12 @@ .Sh DESCRIPTION This file describes how the router advertisement packets must be constructed for each of the interfaces. +.Pp As described in .Xr rtadvd 8 , you do not have to set this configuration file up at all, 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 .Nm rtadvd 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 advertised prefix lifetimes, and has its meaning when the local router 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 -for such prefixes. The default value is 0. +real time. +If the value is 0, it means the consistency check will be skipped +for such prefixes. +The default value is 0. .It Cm \&addrs (num) Number of prefixes. Its default is 0, so it must explicitly be set to positve values @@ -200,14 +203,14 @@ is more than 0. .It Cm \&vltime (num) Valid lifetime field .Pq unit: seconds . -The default value is 2592000(30 days). +The default value is 2592000 (30 days). .It Cm \&vltimedecr (bool) This item means the advertised valid lifetime will decrements in real time, which is disabled by default. .It Cm \&pltime (num) Preferred lifetime field .Pq unit: seconds . -The default value is 604800(7 days). +The default value is 604800 (7 days). .It Cm \&pltimedecr (bool) This item means the advertised preferred lifetime will decrements in real time, which is disabled by default. @@ -257,36 +260,45 @@ capability. See .Xr termcap 5 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 -# -# 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. -# 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, invoke rtadvd with -# the -s option and configure this part by hand. - -#ef0:\\ -# :addrs#1:addr="3ffe:501:4819:1000::":prefixlen#64:tc=ether: - +ne0:\\ + :rltime#0: +.Ed +.Pp +The following example manually configures prefixes advertised from the +.Li ef0 +interface. +The configuration must be used with the +.Fl s +option to +.Xr rtadvd 8 . +.Bd -literal -offset +ef0:\\ + :addrs#1:addr="3ffe:501:ffff:1000::":prefixlen#64: +.Ed +.Pp +The following example presents the default values in an explicit manner. +The configuration is provided just for reference purposes; +YOU DO NOT NEED TO HAVE IT AT ALL. +.Bd -literal -offset +default:\\ + :chlim#64:raflags#0:rltime#1800:rtime#0:retrans#0:\\ + :pinfoflags#192:vltime#2592000:pltime#604800:mtu#0: +ef0:\\ + :addrs#1:addr="3ffe:501:ffff:1000::":prefixlen#64:tc=default: .Ed .Sh SEE ALSO .Xr termcap 5 ,