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

Eliminate one generated function

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9296 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-01-16 22:39:12 +00:00
parent ac66faf91a
commit 7f5a1c1056
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Shorewall-perl/Shorewall/Compiler.pm
View File

@ -626,7 +626,7 @@ sub generate_script_2 () {
} }
emit( "\n#", emit( "\n#",
'# Setup Common Rules', '# Setup Common Rules (/proc)',
'#', '#',
'setup_common_rules() {' 'setup_common_rules() {'
); );
@ -672,27 +672,6 @@ sub generate_script_3 () {
# #
sub generate_script_4($) { sub generate_script_4($) {
emit 'cat > ${VARDIR}/proxyarp << __EOF__';
dump_proxy_arp;
emit_unindented '__EOF__';
emit( '',
'if [ "$COMMAND" != refresh ]; then' );
push_indent;
emit 'cat > ${VARDIR}/zones << __EOF__';
dump_zone_contents;
emit_unindented '__EOF__';
pop_indent;
emit "fi\n";
emit '> ${VARDIR}/nat';
add_addresses;
pop_indent; pop_indent;
emit "}\n"; emit "}\n";
@ -785,7 +764,30 @@ sub generate_script_4($) {
emit( 'setup_common_rules', emit( 'setup_common_rules',
'', '',
'setup_routing_and_traffic_shaping', 'setup_routing_and_traffic_shaping',
'', '');
emit 'cat > ${VARDIR}/proxyarp << __EOF__';
dump_proxy_arp;
emit_unindented '__EOF__';
emit( '',
'if [ "$COMMAND" != refresh ]; then' );
push_indent;
emit 'cat > ${VARDIR}/zones << __EOF__';
dump_zone_contents;
emit_unindented '__EOF__';
pop_indent;
emit "fi\n";
emit '> ${VARDIR}/nat';
add_addresses;
emit( '',
'if [ $COMMAND = restore ]; then', 'if [ $COMMAND = restore ]; then',
' iptables_save_file=${VARDIR}/$(basename $0)-iptables', ' iptables_save_file=${VARDIR}/$(basename $0)-iptables',
' if [ -f $iptables_save_file ]; then' ); ' if [ -f $iptables_save_file ]; then' );