Bring trunk up to date with branch

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7095 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep
2007-08-09 15:16:08 +00:00
parent c27b3fb5b7
commit 8472d60c28
13 changed files with 78 additions and 103 deletions

View File

@ -1,4 +1,3 @@
#!/bin/sh
#
# Clear Proxy Arp
#
@ -145,24 +144,6 @@ restore_dynamic_rules() {
fi
}
#
# The following functions also appear in lib.base. They are duplicated here so that
# restore scripts from prior versions continue to work.
#
get_device_mtu1() # $1 = device
{
local output="$(ip link list dev $1 2> /dev/null)" # quotes required for /bin/ash
local mtu
if [ -n "$output" ]; then
mtu=$(find_mtu $output)
if [ -n "$mtu" ]; then
[ $mtu = 1500 ] || echo mtu $(($mtu + 100))
fi
fi
}
#
# Get a list of all configured broadcast addresses on the system
#
@ -170,4 +151,3 @@ get_all_bcasts()
{
ip -f inet addr show 2> /dev/null | grep 'inet.*brd' | sed 's/inet.*brd //; s/scope.*//;' | sort -u
}