Cleanup of code

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@624 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-07-02 23:12:14 +00:00
parent 6a1c9df7c9
commit 5b9d1f7460

View File

@ -2890,6 +2890,12 @@ rules_chain() # $1 = source zone, $2 = destination zone
fatal_error "No appropriate chain for zone $1 to zone $2" fatal_error "No appropriate chain for zone $1 to zone $2"
} }
#
# Note: The following set of IP address manipulation functions have anomalous
# behavior when the shell only supports 32-bit signed arithmatic and
# the IP address is 128.0.0.0 or 128.0.0.1.
#
# #
# echo the list of subnets routed out of a given interface # echo the list of subnets routed out of a given interface
# #
@ -2909,7 +2915,7 @@ get_routed_subnets() # $1 = interface name
done done
} }
# #
# Convert an IP address in quad format to an integer # Convert an IP address in dot quad format to an integer
# #
decodeaddr() { decodeaddr() {
local x local x
@ -2927,7 +2933,7 @@ decodeaddr() {
IFS=$ifs IFS=$ifs
} }
# #
# convert an integer to quad format # convert an integer to dot quad format
# #
encodeaddr() { encodeaddr() {
addr=$1 addr=$1
@ -2942,7 +2948,8 @@ encodeaddr() {
echo $y echo $y
} }
# #
# Enumerate the members of an IP range # Enumerate the members of an IP range -- When using a shell supporting only
# 32-bit signed arithmetic, the range cannot span 128.0.0.0.
# #
ip_range() { ip_range() {
local first local first
@ -3559,7 +3566,7 @@ initialize_netfilter () {
done < /var/lib/shorewall/save done < /var/lib/shorewall/save
fi fi
echo "Creating input Chains..." echo "Creating Interface Chains..."
for interface in $all_interfaces; do for interface in $all_interfaces; do
createchain `forward_chain $interface` no createchain `forward_chain $interface` no
@ -4600,7 +4607,7 @@ added_param_value_no() # $1 = Parameter Name, $2 = Parameter value
# #
do_initialize() { do_initialize() {
# #
# Code to see if shell can support xor # Code to determine if shell can support xor
# #
check_xor() { check_xor() {
echo $(( 256 ^ -1 )) echo $(( 256 ^ -1 ))
@ -4623,10 +4630,6 @@ do_initialize() {
# #
terminator=startup_error terminator=startup_error
# #
# So that emacs doesn't get lost
#
LEFTSHIFT='<<'
#
# Clear all configuration variables # Clear all configuration variables
# #
version= version=
@ -4811,6 +4814,10 @@ do_initialize() {
strip_file interfaces strip_file interfaces
strip_file hosts strip_file hosts
# #
# So that emacs doesn't get lost, we use $LEFTSHIFT rather than <<
#
LEFTSHIFT='<<'
#
# Determine the capabilities of the installed iptables/netfilter # Determine the capabilities of the installed iptables/netfilter
# #
determine_capabilities determine_capabilities