Author: bz
Date: Sun Mar 4 18:53:35 2012
New Revision: 232515
URL: http://svn.freebsd.org/changeset/base/232515
Log:
Rather than printing the output from route add for all FIBs just print them
for the default FIB followed by a statement with a list of FIB numbers for
all the other FIBs we install the routes for.
Request by: kib (to make it less noisy)
Tested by: kib
MFC after: 3 days
Modified:
head/etc/rc.d/routing
Modified: head/etc/rc.d/routing
==============================================================================
--- head/etc/rc.d/routing Sun Mar 4 18:51:45 2012 (r232514)
+++ head/etc/rc.d/routing Sun Mar 4 18:53:35 2012 (r232515)
@@ -147,14 +147,21 @@ static_inet6()
: ${fibs:=1}
# disallow "internal" addresses to appear on the wire
- i=0
- while test ${i} -lt ${fibs}; do
- setfib -F ${i} route ${_action} \
- -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
- setfib -F ${i} route ${_action} \
- -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
- i=$((i + 1))
- done
+ route ${_action} -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
+ route ${_action} -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
+ i=1
+ if test ${i} -lt ${fibs}; then
+ printf "Also installing reject routes for FIBs"
+ while test ${i} -lt ${fibs}; do
+ setfib -F ${i} route -q ${_action} \
+ -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
+ setfib -F ${i} route -q ${_action} \
+ -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
+ printf " %d" ${i}
+ i=$((i + 1))
+ done
+ printf "\n"
+ fi
case ${ipv6_defaultrouter} in
[Nn][Oo] | '')
@@ -226,14 +233,21 @@ static_inet6()
# for the host case, you will allow to omit the identifiers.
# Under this configuration, the packets will go to the default
# interface.
- i=0
- while test ${i} -lt ${fibs}; do
- setfib -F ${i} route ${_action} \
- -inet6 fe80:: -prefixlen 10 ::1 -reject
- setfib -F ${i} route ${_action} \
- -inet6 ff02:: -prefixlen 16 ::1 -reject
- i=$((i + 1))
- done
+ route ${_action} -inet6 fe80:: -prefixlen 10 ::1 -reject
+ route ${_action} -inet6 ff02:: -prefixlen 16 ::1 -reject
+ i=1
+ if test ${i} -lt ${fibs}; then
+ printf "Also installing reject routes for FIBs"
+ while test ${i} -lt ${fibs}; do
+ setfib -F ${i} route -q ${_action} \
+ -inet6 fe80:: -prefixlen 10 ::1 -reject
+ setfib -F ${i} route -q ${_action} \
+ -inet6 ff02:: -prefixlen 16 ::1 -reject
+ printf " %d" ${i}
+ i=$((i + 1))
+ done
+ printf "\n"
+ fi
case ${ipv6_default_interface} in
'')
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
