extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 09:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Suppress duplicate progress messages

Browse Source
This commit is contained in:
Tom Eastep 2009-05-29 07:03:24 -07:00
parent c5667c7658
commit f2cb2cca9e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -471,7 +471,7 @@ sub generate_script_3($) {
fi fi
EOF EOF
pop_indent; pop_indent;
setup_forwarding( $family ); setup_forwarding( $family , 1 );
push_indent; push_indent;
emit<<'EOF'; emit<<'EOF';
set_state "Started" set_state "Started"
@ -480,7 +480,7 @@ else
if [ $COMMAND = refresh ]; then if [ $COMMAND = refresh ]; then
chainlist_reload chainlist_reload
EOF EOF
setup_forwarding( $family ); setup_forwarding( $family , 0 );
emit<<'EOF'; emit<<'EOF';
run_refreshed_exit run_refreshed_exit
do_iptables -N shorewall do_iptables -N shorewall
@ -490,7 +490,7 @@ EOF
restore_dynamic_rules restore_dynamic_rules
conditionally_flush_conntrack conditionally_flush_conntrack
EOF EOF
setup_forwarding( $family ); setup_forwarding( $family , 0 );
emit<<'EOF'; emit<<'EOF';
run_start_exit run_start_exit
do_iptables -N shorewall do_iptables -N shorewall

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

@ -192,8 +192,8 @@ sub setup_source_routing( $ ) {
} }
} }
sub setup_forwarding( $ ) { sub setup_forwarding( $$ ) {
my $family = shift; my ( $family, $first ) = @_;
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
if ( $config{IP_FORWARDING} eq 'on' ) { if ( $config{IP_FORWARDING} eq 'on' ) {
@ -219,12 +219,11 @@ sub setup_forwarding( $ ) {
my $interfaces = find_interfaces_by_option 'forward'; my $interfaces = find_interfaces_by_option 'forward';
if ( @$interfaces ) { if ( @$interfaces ) {
progress_message2 "$doing Interface forwarding...";
push_indent; push_indent;
push_indent; push_indent;
save_progress_message 'Setting up IPv6 Interface Forwarding...'; save_progress_message 'Setting up IPv6 Interface Forwarding...' if $first;
for my $interface ( @$interfaces ) { for my $interface ( @$interfaces ) {
my $file = "/proc/sys/net/ipv6/conf/$interface/forwarding"; my $file = "/proc/sys/net/ipv6/conf/$interface/forwarding";