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
This commit is contained in:
Bjoern A. Zeeb 2012-03-04 18:53:35 +00:00
parent abbe8356ea
commit 9f0b9a0853
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=232515

View File

@ -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
'')