extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-23 08:03:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the IPv6-related functions in prog.header6

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9006 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-12 16:56:11 +00:00
parent f6c3dba1b9
commit eb435688e3
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Shorewall-perl/prog.header6
View File

@ -259,7 +259,7 @@ reload_kernel_modules() {
} }
# #
# Load kernel modules required for Shorewall # Load kernel modules required for Shorewall6
# #
load_kernel_modules() # $1 = Yes, if we are to save moduleinfo in $VARDIR load_kernel_modules() # $1 = Yes, if we are to save moduleinfo in $VARDIR
{ {
@ -372,7 +372,7 @@ find_nexthop() # $1 = interface
# #
find_default_interface() { find_default_interface() {
ip -6 route list | while read first rest; do ip -6 route list | while read first rest; do
[ "$first" = default ] && echo $(find_device $rest) && return [ "$first" = '2000::/3' ] && echo $(find_device $rest) && return
done done
} }
@ -418,7 +418,7 @@ find_first_interface_address() # $1 = interface
# #
# get the line of output containing the first IP address # get the line of output containing the first IP address
# #
addr=$(ip -f inet addr show $1 2> /dev/null | grep 'inet6 .* global' | head -n1) addr=$(ip -f inet6 addr show $1 2> /dev/null | grep 'inet6 .* global' | head -n1)
# #
# If there wasn't one, bail out now # If there wasn't one, bail out now
# #
@ -427,7 +427,7 @@ find_first_interface_address() # $1 = interface
# Strip off the trailing VLSM mask (or the peer IP in case of a P-t-P link) # Strip off the trailing VLSM mask (or the peer IP in case of a P-t-P link)
# along with everything else on the line # along with everything else on the line
# #
echo $addr | sed 's/\s*inet //;s/\/.*//;s/ peer.*//' echo $addr | sed 's/\s*inet6 //;s/\/.*//;s/ peer.*//'
} }
find_first_interface_address_if_any() # $1 = interface find_first_interface_address_if_any() # $1 = interface
@ -435,12 +435,12 @@ find_first_interface_address_if_any() # $1 = interface
# #
# get the line of output containing the first IP address # get the line of output containing the first IP address
# #
addr=$(ip -f inet addr show $1 2> /dev/null | grep 'inet .* global' | head -n1) addr=$(ip -f inet6 addr show $1 2> /dev/null | grep 'inet6 2.* global' | head -n1)
# #
# Strip off the trailing VLSM mask (or the peer IP in case of a P-t-P link) # Strip off the trailing VLSM mask (or the peer IP in case of a P-t-P link)
# along with everything else on the line # along with everything else on the line
# #
[ -n "$addr" ] && echo $addr | sed 's/\s*inet //;s/\/.*//;s/ peer.*//' || echo 0.0.0.0 [ -n "$addr" ] && echo $addr | sed 's/\s*inet6 //;s/\/.*//;s/ peer.*//' || echo ::
} }
# #
@ -448,7 +448,7 @@ find_first_interface_address_if_any() # $1 = interface
# #
interface_is_usable() # $1 = interface interface_is_usable() # $1 = interface
{ {
interface_is_up $1 && [ "$(find_first_interface_address_if_any $1)" != 0.0.0.0 ] && run_isusable_exit $1 interface_is_up $1 && [ "$(find_first_interface_address_if_any $1)" != :: ] && run_isusable_exit $1
} }
# #
@ -457,7 +457,7 @@ interface_is_usable() # $1 = interface
# #
find_interface_addresses() # $1 = interface find_interface_addresses() # $1 = interface
{ {
ip -f inet addr show $1 2> /dev/null | grep inet\ | sed 's/\s*inet //;s/\/.*//;s/ peer.*//' ip -f inet6 addr show $1 2> /dev/null | grep 'inet6 2' | sed 's/\s*inet6 //;s/\/.*//;s/ peer.*//'
} }
# #
@ -471,7 +471,7 @@ get_routed_networks() # $1 = interface name, $2-n = Fatal error message
ip -6 route show dev $1 2> /dev/null | ip -6 route show dev $1 2> /dev/null |
while read address rest; do while read address rest; do
case "$address" in case "$address" in
default) 2000::/3)
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then
shift shift
fatal_error "$@" fatal_error "$@"
@ -481,8 +481,8 @@ get_routed_networks() # $1 = interface name, $2-n = Fatal error message
;; ;;
multicast|broadcast|prohibit|nat|throw|nexthop) multicast|broadcast|prohibit|nat|throw|nexthop)
;; ;;
*) 2*)
[ "$address" = "${address%/*}" ] && address="${address}/32" [ "$address" = "${address%/*}" ] && address="${address}/128"
echo $address echo $address
;; ;;
esac esac
@ -678,14 +678,14 @@ restore_default_route() {
while read route ; do while read route ; do
case $route in case $route in
default*) 2000::/3*)
if [ -n "$default_route" ]; then if [ -n "$default_route" ]; then
case "$default_route" in case "$default_route" in
*metric*) *metric*)
# #
# Don't restore a route with a metric -- we only replace the one with metric == 0 # Don't restore a route with a metric -- we only replace the one with metric == 0
# #
qt ip -6 route delete default metric 0 && \ qt ip -6 route delete 2000::/3 metric 0 && \
progress_message "Default Route with metric 0 deleted" progress_message "Default Route with metric 0 deleted"
;; ;;
*) *)