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

Some optimizations in Shorewall::Rules::compile_stop_firewall()

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

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9770 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-03-31 22:42:37 +00:00
parent 48155417b1
commit 39131f3809
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2071,6 +2071,10 @@ sub setup_mss( ) {
sub compile_stop_firewall( $ ) { sub compile_stop_firewall( $ ) {
my $test = shift; my $test = shift;
my $input = $filter_table->{INPUT};
my $output = $filter_table->{OUTPUT};
my $forward = $filter_table->{FORWARD};
emit <<'EOF'; emit <<'EOF';
# #
# Stop/restore the firewall after an error or because of a 'stop' or 'clear' command # Stop/restore the firewall after an error or because of a 'stop' or 'clear' command
@ -2078,9 +2082,7 @@ sub compile_stop_firewall( $ ) {
stop_firewall() { stop_firewall() {
EOF EOF
if ( $config{ADMINISABSENTMINDED} ) { $output->{policy} = 'ACCEPT' if $config{ADMINISABSENTMINDED};
$filter_table->{OUTPUT}{policy} = 'ACCEPT';
}
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
emit( ' deletechain() {', emit( ' deletechain() {',
@ -2190,22 +2192,22 @@ EOF
add_rule $filter_table->{$_}, '-m state --state ESTABLISHED,RELATED -j ACCEPT' for @chains; add_rule $filter_table->{$_}, '-m state --state ESTABLISHED,RELATED -j ACCEPT' for @chains;
if ( $family == F_IPV6 ) { if ( $family == F_IPV6 ) {
add_rule $filter_table->{INPUT}, '-s ff80::/10 -j ACCEPT'; add_rule $input, '-s ff80::/10 -j ACCEPT';
add_rule $filter_table->{INPUT}, '-d ff80::/10 -j ACCEPT'; add_rule $input, '-d ff80::/10 -j ACCEPT';
add_rule $filter_table->{INPUT}, '-d ff00::/10 -j ACCEPT'; add_rule $input, '-d ff00::/10 -j ACCEPT';
unless ( $config{ADMINISABSENTMINDED} ) { unless ( $config{ADMINISABSENTMINDED} ) {
add_rule $filter_table->{OUTPUT}, '-d ff80::/10 -j ACCEPT'; add_rule $output, '-d ff80::/10 -j ACCEPT';
add_rule $filter_table->{OUTPUT}, '-d ff00::/10 -j ACCEPT'; add_rule $output, '-d ff00::/10 -j ACCEPT';
} }
} }
process_routestopped; process_routestopped;
add_rule $filter_table->{INPUT}, '-i lo -j ACCEPT'; add_rule $input, '-i lo -j ACCEPT';
add_rule $filter_table->{INPUT}, '-i lo -j ACCEPT'; add_rule $input, '-i lo -j ACCEPT';
add_rule $filter_table->{OUTPUT}, '-o lo -j ACCEPT' unless $config{ADMINISABSENTMINDED}; add_rule $output, '-o lo -j ACCEPT' unless $config{ADMINISABSENTMINDED};
my $interfaces = find_interfaces_by_option 'dhcp'; my $interfaces = find_interfaces_by_option 'dhcp';
@ -2213,12 +2215,12 @@ EOF
my $ports = $family == F_IPV4 ? '67:68' : '546:547'; my $ports = $family == F_IPV4 ? '67:68' : '546:547';
for my $interface ( @$interfaces ) { for my $interface ( @$interfaces ) {
add_rule $filter_table->{INPUT}, "-p udp -i $interface --dport $ports -j ACCEPT"; add_rule $input, "-p udp -i $interface --dport $ports -j ACCEPT";
add_rule $filter_table->{OUTPUT}, "-p udp -o $interface --dport $ports -j ACCEPT" unless $config{ADMINISABSENTMINDED}; add_rule $output, "-p udp -o $interface --dport $ports -j ACCEPT" unless $config{ADMINISABSENTMINDED};
# #
# This might be a bridge # This might be a bridge
# #
add_rule $filter_table->{FORWARD}, "-p udp -i $interface -o $interface --dport $ports -j ACCEPT"; add_rule $forward, "-p udp -i $interface -o $interface --dport $ports -j ACCEPT";
} }
} }