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

Don't require functions called from Shorewall::Compiler::compiler to know the current indentation.

Browse Source 
Also, add an optional 'times' parameter to push_indent() and pop_indent().

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-11-30 07:49:42 -08:00
parent 87e205208d
commit 53fd0e7c8c
5 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -7484,7 +7484,6 @@ sub create_stop_load( $ ) {
sub initialize_switches() { sub initialize_switches() {
if ( keys %switches ) { if ( keys %switches ) {
push_indent; push_indent;
emit( 'if [ $COMMAND = start ]; then' ); emit( 'if [ $COMMAND = start ]; then' );
push_indent; push_indent;
while ( my ( $switch, $setting ) = each %switches ) { while ( my ( $switch, $setting ) = each %switches ) {
@ -7493,7 +7492,6 @@ sub initialize_switches() {
} }
pop_indent; pop_indent;
emit "fi\n"; emit "fi\n";
pop_indent; pop_indent;
} }
} }

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

@ -459,10 +459,10 @@ sub generate_script_3($) {
fatal_error "$iptables_save_file does not exist" fatal_error "$iptables_save_file does not exist"
fi fi
EOF EOF
pop_indent; push_indent;
setup_load_distribution; setup_load_distribution;
setup_forwarding( $family , 1 ); setup_forwarding( $family , 1 );
push_indent; pop_indent;
my $config_dir = $globals{CONFIGDIR}; my $config_dir = $globals{CONFIGDIR};
@ -473,8 +473,10 @@ else
if [ \$COMMAND = refresh ]; then if [ \$COMMAND = refresh ]; then
chainlist_reload chainlist_reload
EOF EOF
push_indent(2);
setup_load_distribution; setup_load_distribution;
setup_forwarding( $family , 0 ); setup_forwarding( $family , 0 );
pop_indent(2);
emit( ' run_refreshed_exit' , emit( ' run_refreshed_exit' ,
' do_iptables -N shorewall' , ' do_iptables -N shorewall' ,
@ -482,13 +484,17 @@ EOF
' else' , ' else' ,
' setup_netfilter' ); ' setup_netfilter' );
push_indent(2);
setup_load_distribution; setup_load_distribution;
pop_indent(2);
emit<<"EOF"; emit<<"EOF";
conditionally_flush_conntrack conditionally_flush_conntrack
EOF EOF
push_indent(2);
initialize_switches; initialize_switches;
setup_forwarding( $family , 0 ); setup_forwarding( $family , 0 );
pop_indent(2);
emit<<"EOF"; emit<<"EOF";
run_start_exit run_start_exit

38
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1489,24 +1489,32 @@ sub progress_message3 {
# #
# Push/Pop Indent # Push/Pop Indent
# #
sub push_indent() { sub push_indent(;$) {
if ( $indent2 ) { my $times = shift || 1;
$indent2 = '';
$indent = $indent1 = $indent1 . "\t"; while ( $times-- ) {
} else { if ( $indent2 ) {
$indent2 = ' '; $indent2 = '';
$indent = $indent1 . $indent2; $indent = $indent1 = $indent1 . "\t";
} else {
$indent2 = ' ';
$indent = $indent1 . $indent2;
}
} }
} }
sub pop_indent() { sub pop_indent(;$) {
if ( $indent2 ) { my $times = shift || 1;
$indent2 = '';
$indent = $indent1; while ( $times-- ) {
} else { if ( $indent2 ) {
$indent1 = substr( $indent1 , 0, -1 ); $indent2 = '';
$indent2 = ' '; $indent = $indent1;
$indent = $indent1 . $indent2; } else {
$indent1 = substr( $indent1 , 0, -1 );
$indent2 = ' ';
$indent = $indent1 . $indent2;
}
} }
} }

26
Shorewall/Perl/Shorewall/Proc.pm
View File

@ -219,30 +219,30 @@ sub setup_forwarding( $$ ) {
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
if ( $config{IP_FORWARDING} eq 'on' ) { if ( $config{IP_FORWARDING} eq 'on' ) {
emit ' echo 1 > /proc/sys/net/ipv4/ip_forward'; emit 'echo 1 > /proc/sys/net/ipv4/ip_forward';
emit ' progress_message2 IPv4 Forwarding Enabled'; emit 'progress_message2 IPv4 Forwarding Enabled';
} elsif ( $config{IP_FORWARDING} eq 'off' ) { } elsif ( $config{IP_FORWARDING} eq 'off' ) {
emit ' echo 0 > /proc/sys/net/ipv4/ip_forward'; emit 'echo 0 > /proc/sys/net/ipv4/ip_forward';
emit ' progress_message2 IPv4 Forwarding Disabled!'; emit 'progress_message2 IPv4 Forwarding Disabled!';
} }
emit ''; emit '';
emit ( ' echo 1 > /proc/sys/net/bridge/bridge-nf-call-iptables' , emit ( 'echo 1 > /proc/sys/net/bridge/bridge-nf-call-iptables' ,
'' ''
) if have_bridges; ) if have_bridges;
} else { } else {
if ( $config{IP_FORWARDING} eq 'on' ) { if ( $config{IP_FORWARDING} eq 'on' ) {
emit ' echo 1 > /proc/sys/net/ipv6/conf/all/forwarding'; emit 'echo 1 > /proc/sys/net/ipv6/conf/all/forwarding';
emit ' progress_message2 IPv6 Forwarding Enabled'; emit 'progress_message2 IPv6 Forwarding Enabled';
} elsif ( $config{IP_FORWARDING} eq 'off' ) { } elsif ( $config{IP_FORWARDING} eq 'off' ) {
emit ' echo 0 > /proc/sys/net/ipv6/conf/all/forwarding'; emit 'echo 0 > /proc/sys/net/ipv6/conf/all/forwarding';
emit ' progress_message2 IPv6 Forwarding Disabled!'; emit 'progress_message2 IPv6 Forwarding Disabled!';
} }
emit ''; emit '';
emit ( ' echo 1 > /proc/sys/net/bridge/bridge-nf-call-ip6tables' , emit ( 'echo 1 > /proc/sys/net/bridge/bridge-nf-call-ip6tables' ,
'' ''
) if have_bridges; ) if have_bridges;
@ -251,9 +251,6 @@ sub setup_forwarding( $$ ) {
if ( @$interfaces ) { if ( @$interfaces ) {
progress_message2 "$doing Interface forwarding..." if $first; progress_message2 "$doing Interface forwarding..." if $first;
push_indent;
push_indent;
save_progress_message 'Setting up IPv6 Interface Forwarding...'; save_progress_message 'Setting up IPv6 Interface Forwarding...';
for my $interface ( @$interfaces ) { for my $interface ( @$interfaces ) {
@ -270,9 +267,6 @@ sub setup_forwarding( $$ ) {
" error_message \"WARNING: Cannot set IPv6 forwarding on $interface\"" ) unless $optional; " error_message \"WARNING: Cannot set IPv6 forwarding on $interface\"" ) unless $optional;
emit "fi\n"; emit "fi\n";
} }
pop_indent;
pop_indent;
} }
} }
} }

2
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -1952,7 +1952,7 @@ sub handle_stickiness( $ ) {
sub setup_load_distribution() { sub setup_load_distribution() {
emit ( '', emit ( '',
" distribute_load $maxload @load_interfaces" , "distribute_load $maxload @load_interfaces" ,
'' ''
) if @load_interfaces; ) if @load_interfaces;
} }