Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Mar 2012 18:53:35 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r232515 - head/etc/rc.d
Message-ID:  <201203041853.q24IrZ5m048169@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 	'')



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203041853.q24IrZ5m048169>