From: <pcm...@us...> - 2009-08-06 14:14:03
|
Revision: 2173 http://audit-test.svn.sourceforge.net/audit-test/?rev=2173&view=rev Author: pcmoore_hp Date: 2009-08-06 14:13:48 +0000 (Thu, 06 Aug 2009) Log Message: ----------- Calculate the IPv6 prefix correctly using the 'ip' command instead of the hack we currently use. Modified Paths: -------------- trunk/tests/audit/network/addr_filter.bash Modified: trunk/tests/audit/network/addr_filter.bash =================================================================== --- trunk/tests/audit/network/addr_filter.bash 2009-04-22 14:23:49 UTC (rev 2172) +++ trunk/tests/audit/network/addr_filter.bash 2009-08-06 14:13:48 UTC (rev 2173) @@ -26,8 +26,7 @@ function get_ipv6_prefix { if [[ -n $LBLNET_SVR_IPV6 ]]; then - echo $LBLNET_SVR_IPV6 | \ - awk 'BEGIN { FS = ":" } { print $1":"$2":"$3":"$4":" }' + ip -f inet6 route show to match $LBLNET_SVR_IPV6 | cut -d'/' -f 1 elif [[ -n $LBLNET_PREFIX_IPV6 ]]; then echo $LBLNET_PREFIX_IPV6 | sed 's/:\/[0-9]*//;s/:0*/:/g;' else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pcm...@us...> - 2009-08-12 17:47:05
|
Revision: 2176 http://audit-test.svn.sourceforge.net/audit-test/?rev=2176&view=rev Author: pcmoore_hp Date: 2009-08-12 17:46:57 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Add some additional filtering to the IPv6 output from the 'ip' command, thanks to Stephan, ste...@at..., for pointing this out. Modified Paths: -------------- trunk/tests/audit/network/addr_filter.bash Modified: trunk/tests/audit/network/addr_filter.bash =================================================================== --- trunk/tests/audit/network/addr_filter.bash 2009-08-12 17:34:57 UTC (rev 2175) +++ trunk/tests/audit/network/addr_filter.bash 2009-08-12 17:46:57 UTC (rev 2176) @@ -26,7 +26,8 @@ function get_ipv6_prefix { if [[ -n $LBLNET_SVR_IPV6 ]]; then - ip -f inet6 route show to match $LBLNET_SVR_IPV6 | cut -d'/' -f 1 + ip -f inet6 route show to match $LBLNET_SVR_IPV6 | \ + grep -v default | cut -d'/' -f 1 elif [[ -n $LBLNET_PREFIX_IPV6 ]]; then echo $LBLNET_PREFIX_IPV6 | sed 's/:\/[0-9]*//;s/:0*/:/g;' else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |