extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-15 10:51:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup of generated code

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3849 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-05-03 19:03:21 +00:00
parent dd20b68169
commit 3b830ff051
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Shorewall/compiler
View File

@ -55,7 +55,8 @@ fatal_error() # $* = Error Message
# #
save_command() save_command()
{ {
echo "${INDENT}${@}" >&3
[ $# -gt 0 ] && echo "${INDENT}${@}" >&3 || echo >&3
} }
save_command_unindented() save_command_unindented()
@ -90,7 +91,7 @@ progress_message_and_save()
indent() { indent() {
if [ -n "$INDENT" ]; then if [ -n "$INDENT" ]; then
if [ -n "$HAVEAWK" ]; then if [ -n "$HAVEAWK" ]; then
eval awk \''BEGIN { indent=1; }; { if (indent == 1) print "'"$INDENT"'" $0; else print; }; { indent=1; }; /\\$/ { indent=0; };'\' $1 eval awk \''BEGIN { indent=1; }; /^[[:space:]]*$/ { print ""; indent=1; next; }; { if (indent == 1) print "'"$INDENT"'" $0; else print; }; { indent=1; }; /\\$/ { indent=0; };'\' $1
else else
eval sed \'s\/^/"$INDENT"\/\' $1 eval sed \'s\/^/"$INDENT"\/\' $1
fi fi
@ -1196,6 +1197,11 @@ __EOF__
eval ${table}_number=$number eval ${table}_number=$number
indent >&3 << __EOF__
#
# Add Provider $table ($number)
#
__EOF__
save_command "qt ip route flush table $number" save_command "qt ip route flush table $number"
if [ "x${duplicate:=-}" != x- ]; then if [ "x${duplicate:=-}" != x- ]; then
@ -1290,7 +1296,6 @@ find_interface_addresses $interface | while read address; do
run_ip rule add from \$address pref \$(( $rulebase + \$rulenum )) table $number run_ip rule add from \$address pref \$(( $rulebase + \$rulenum )) table $number
rulenum=\$((\$rulenum + 1)) rulenum=\$((\$rulenum + 1))
done done
__EOF__ __EOF__
else else
indent >&3 << __EOF__ indent >&3 << __EOF__
@ -1298,9 +1303,15 @@ __EOF__
find_interface_addresses $interface | while read address; do find_interface_addresses $interface | while read address; do
qt ip rule del from \$address qt ip rule del from \$address
done done
__EOF__ __EOF__
fi fi
indent >&3 << __EOF__
progress_message " Provider $table ($number) Added"
__EOF__
} }
verify_provider() verify_provider()
@ -1360,9 +1371,10 @@ __EOF__
balance= balance=
progress_message2 "$DOING $1..." progress_message2 "$DOING $1..."
save_progress_message "Adding Providers..." save_command
save_command "if [ -z \"\$NOROUTES\" ]; then" save_command "if [ -z \"\$NOROUTES\" ]; then"
INDENT="$INDENT " INDENT="$INDENT "
save_progress_message "Adding Providers..."
save_command "DEFAULT_ROUTE=" save_command "DEFAULT_ROUTE="
while read table number mark duplicate interface gateway options copy; do while read table number mark duplicate interface gateway options copy; do
@ -1422,7 +1434,7 @@ __EOF__
save_command "run_ip route flush cache" save_command "run_ip route flush cache"
INDENT="$save_indent" INDENT="$save_indent"
save_command "fi" save_command "fi"
save_command "" save_command
fi fi
} }
@ -4246,7 +4258,7 @@ append_action_file() # $1 = File Name
save_command "LEVEL=$LEVEL" save_command "LEVEL=$LEVEL"
save_command "TAG=$TAG" save_command "TAG=$TAG"
eval sed \'s\/^/"$INDENT"\/\' $user_exit >&3 append_file $user_exit
fi fi
} }
@ -5046,7 +5058,7 @@ add_nat_rule() {
if [ -n "$DETECT_DNAT_IPADDRS" -a "$source" != "$FW" ]; then if [ -n "$DETECT_DNAT_IPADDRS" -a "$source" != "$FW" ]; then
save_command "" save_command
if [ $(list_count1 $interfaces) -eq 1 ]; then if [ $(list_count1 $interfaces) -eq 1 ]; then
save_command "addr=\$(find_first_interface_address $interface)" save_command "addr=\$(find_first_interface_address $interface)"
else else