extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-05 13:08:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of iptables-restore/stop code. Don't purge ipsets on stop.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9762 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-03-30 18:00:23 +00:00
parent cddd1b1ae9
commit 715554e579
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -798,6 +798,11 @@ sub compiler {
# S T O P _ F I R E W A L L # S T O P _ F I R E W A L L
# (Writes the stop_firewall() function to the compiled script) # (Writes the stop_firewall() function to the compiled script)
# #
# We must reinitialize Shorewall::Chains before generating the iptables-restore input
# for stopping the firewall
#
Shorewall::Chains::initialize( $family );
initialize_chain_table;
compile_stop_firewall( $test ); compile_stop_firewall( $test );
# #
# Copy the footer to the object # Copy the footer to the object

9
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -39,7 +39,6 @@ our @EXPORT = qw( process_tos
setup_ecn setup_ecn
add_common_rules add_common_rules
setup_mac_lists setup_mac_lists
process_routestopped
process_rules process_rules
generate_matrix generate_matrix
setup_mss setup_mss
@ -2079,10 +2078,6 @@ sub compile_stop_firewall( $ ) {
stop_firewall() { stop_firewall() {
EOF EOF
Shorewall::Chains::initialize( $family );
initialize_chain_table;
if ( $config{ADMINISABSENTMINDED} ) { if ( $config{ADMINISABSENTMINDED} ) {
$filter_table->{OUTPUT}{policy} = 'ACCEPT'; $filter_table->{OUTPUT}{policy} = 'ACCEPT';
} }
@ -2272,10 +2267,8 @@ EOF
# #
grep -q '^-N' ${VARDIR}/ipsets.tmp && mv -f ${VARDIR}/ipsets.tmp ${VARDIR}/ipsets.save grep -q '^-N' ${VARDIR}/ipsets.tmp && mv -f ${VARDIR}/ipsets.tmp ${VARDIR}/ipsets.save
fi fi
fi
EOF EOF
emit " ipset -X $_" for @ipsets;
emit "fi\n";
} }
emit ' emit '