holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Avoid compiling tcrules twice

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4782 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-11-01 21:56:33 +00:00
parent 5551fe4589
commit 4bc13dd2d8
4 changed files with 89 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
Shorewall/compiler
View File

@ -875,23 +875,11 @@ setup_tc1() {
#
# Process the TC Rules File
#
if strip_file_and_lib_load tcrules tcrules; then
if [ -n "$LIB_tcrules_LOADED" ]; then
save_progress_message "Setting up TC Rules..."
save_command setup_tc_rules
save_command
while read mark sources dests proto ports sports user testval length tos; do
expandv mark sources dests proto ports sports user testval length tos
if [ "x$mark" = xCOMMENT ]; then
if [ -n "$COMMENTS" ]; then
comment=$(echo $sources $dests $proto $ports $sports $user $testval $length $tos)
save_command COMMENT=\"$comment\"
else
error_message "COMMENT ignored -- requires comment support in iptables/Netfilter"
fi
else
rule=$(echo "$mark $sources $dests $proto $ports $sports $user $testval $length $tos")
process_tc_rule
fi
done < $TMP_DIR/tcrules
fi
#
# Just in case the file ended with a comment
@ -1023,20 +1011,8 @@ __EOF__
if [ -s $TMP_DIR/tcrules ]; then
save_progress_message "Refreshing Traffic Control Rules..."
while read mark sources dests proto ports sports user testval; do
if [ "x$mark" = xCOMMENT ]; then
if [ -n "$COMMENTS" ]; then
comment=$(echo $sources $dests $proto $ports $sports $user $testval $length $tos)
save_command COMMENT=\"$comment\"
else
error_message "COMMENT ignored -- requires comment support in iptables/Netfilter"
fi
else
expandv mark sources dests proto ports sports user testval tos
rule=$(echo "$mark $sources $dests $proto $ports $sports $user $testval $tos")
process_tc_rule
fi
done < $TMP_DIR/tcrules
save_command setup_tc_rules
save_command
fi
#
# Just in case the file ended with a comment
@ -5233,34 +5209,9 @@ __EOF__
[ -d \${VARDIR} ] || mkdir -p \${VARDIR}
}
__EOF__
if [ "$TC_ENABLED" = Internal ]; then
strip_file_and_lib_load tcdevices tc
strip_file_and_lib_load tcclasses tc
[ -n "$LIB_tc_LOADED" ] && setup_traffic_shaping
fi
cat >&3 << __EOF__
#
# Start/Restart/Reload the firewall
#
define_firewall() {
local restore_file=\$1
__EOF__
INDENT=" "
cat >&3 << __EOF__
load_kernel_modules
__EOF__
progress_message2 "Initializing..."
save_progress_message "Initializing..."
report_capabilities
@ -5312,6 +5263,53 @@ __EOF__
determine_interfaces
determine_hosts
if strip_file_and_lib_load tcrules tcrules; then
process_tc_rules
fi
if [ "$TC_ENABLED" = Internal ]; then
strip_file_and_lib_load tcdevices tc
strip_file_and_lib_load tcclasses tc
[ -n "$LIB_tc_LOADED" ] && setup_traffic_shaping
fi
cat >&3 << __EOF__
#
# Start/Restart/Reload the firewall
#
define_firewall() {
local restore_file=\$1
__EOF__
INDENT=" "
cat >&3 << __EOF__
load_kernel_modules
__EOF__
save_progress_message "Initializing..."
for interface in $ALL_INTERFACES; do
if interface_has_option $interface norfc1918; then
indent >&3 << __EOF__
addr=\$(ip -f inet addr show $interface 2> /dev/null | grep 'inet\ ' | head -n1)
if [ -n "\$addr" ]; then
addr=\$(echo \$addr | sed 's/inet //;s/\/.*//;s/ peer.*//')
for network in 10.0.0.0/8 176.16.0.0/12 192.168.0.0/16; do
if in_network \$addr \$network; then
startup_error "The 'norfc1918' option has been specified on an interface with an RFC 1918 address. Interface:$interface"
fi
done
fi
__EOF__
fi
done
append_file init
strip_file rules

14
Shorewall/lib.config
View File

@ -378,19 +378,7 @@ validate_interfaces_file() {
lib_load maclist "The 'maclist' option"
;;
norfc1918)
if [ "$PROGRAM" = compiler ]; then
indent >&3 << __EOF__
addr=\$(ip -f inet addr show $interface 2> /dev/null | grep 'inet\ ' | head -n1)
if [ -n "\$addr" ]; then
addr=\$(echo \$addr | sed 's/inet //;s/\/.*//;s/ peer.*//')
for network in 10.0.0.0/8 176.16.0.0/12 192.168.0.0/16; do
if in_network \$addr \$network; then
startup_error "The 'norfc1918' option has been specified on an interface with an RFC 1918 address. Interface:$interface"
fi
done
fi
__EOF__
else
if [ "$PROGRAM" != compiler ]; then
addr=$(ip -f inet addr show $interface 2> /dev/null | grep inet | head -n1)
if [ -n "$addr" ]; then
addr=$(echo $addr | sed 's/inet //;s/\/.*//;s/ peer.*//')

35
Shorewall/lib.tcrules
View File

@ -405,3 +405,38 @@ process_tc_rule()
progress_message " TC Rule \"$rule\" $DONE"
save_progress_message_short " TC Rule \\\"$rule\\\" Added"
}
#
# Process the tcrules file
#
process_tc_rules()
{
cat >&3 << __EOF__
#
# Create Marking Rules from the tcrules file
#
setup_tc_rules()
{
__EOF__
INDENT=" "
while read mark sources dests proto ports sports user testval length tos; do
expandv mark sources dests proto ports sports user testval length tos
if [ "x$mark" = xCOMMENT ]; then
if [ -n "$COMMENTS" ]; then
comment=$(echo $sources $dests $proto $ports $sports $user $testval $length $tos)
save_command COMMENT=\"$comment\"
else
error_message "COMMENT ignored -- requires comment support in iptables/Netfilter"
fi
else
rule=$(echo "$mark $sources $dests $proto $ports $sports $user $testval $length $tos")
process_tc_rule
fi
done < $TMP_DIR/tcrules
INDENT=""
save_command "}"
save_command
}

1
Shorewall/lib.tunnels
View File

@ -274,6 +274,7 @@ setup_tunnels() # $1 = name of tunnels file
"Tunnel \"$tunnel\" Ignored"
;;
esac
save_command
else
error_message "ERROR: Invalid gateway zone ($z)" \
" -- Tunnel \"$tunnel\" Ignored"