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

More defined => supplied changes

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-06-18 13:08:26 -07:00
parent 6f2cc31dde
commit 96f6dc3558
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3223,17 +3223,17 @@ sub get_configuration( $ ) {
warning_message "LOGBURST Ignored when LOGLIMIT is specified" if $config{LOGBURST}; warning_message "LOGBURST Ignored when LOGLIMIT is specified" if $config{LOGBURST};
} elsif ( $config{LOGRATE} || $config{LOGBURST} ) { } elsif ( $config{LOGRATE} || $config{LOGBURST} ) {
if ( defined $config{LOGRATE} ) { if ( supplied $config{LOGRATE} ) {
fatal_error"Invalid LOGRATE ($config{LOGRATE})" unless $config{LOGRATE} =~ /^\d+\/(second|minute)$/; fatal_error"Invalid LOGRATE ($config{LOGRATE})" unless $config{LOGRATE} =~ /^\d+\/(second|minute)$/;
} }
if ( defined $config{LOGBURST} ) { if ( supplied $config{LOGBURST} ) {
fatal_error"Invalid LOGBURST ($config{LOGBURST})" unless $config{LOGBURST} =~ /^\d+$/; fatal_error"Invalid LOGBURST ($config{LOGBURST})" unless $config{LOGBURST} =~ /^\d+$/;
} }
$globals{LOGLIMIT} = '-m limit '; $globals{LOGLIMIT} = '-m limit ';
$globals{LOGLIMIT} .= "--limit $config{LOGRATE} " if defined $config{LOGRATE}; $globals{LOGLIMIT} .= "--limit $config{LOGRATE} " if supplied $config{LOGRATE};
$globals{LOGLIMIT} .= "--limit-burst $config{LOGBURST} " if defined $config{LOGBURST}; $globals{LOGLIMIT} .= "--limit-burst $config{LOGBURST} " if supplied $config{LOGBURST};
} else { } else {
$globals{LOGLIMIT} = ''; $globals{LOGLIMIT} = '';
} }
@ -3246,7 +3246,7 @@ sub get_configuration( $ ) {
check_trivalue ( 'ROUTE_FILTER', '' ); check_trivalue ( 'ROUTE_FILTER', '' );
} else { } else {
$val = $config{ROUTE_FILTER}; $val = $config{ROUTE_FILTER};
if ( defined $val ) { if ( supplied $val ) {
if ( $val =~ /\d+/ ) { if ( $val =~ /\d+/ ) {
fatal_error "Invalid value ($val) for ROUTE_FILTER" unless $val < 3; fatal_error "Invalid value ($val) for ROUTE_FILTER" unless $val < 3;
} else { } else {
@ -3272,7 +3272,7 @@ sub get_configuration( $ ) {
default 'STARTUP_LOG' , ''; default 'STARTUP_LOG' , '';
if ( $config{STARTUP_LOG} ne '' ) { if ( $config{STARTUP_LOG} ne '' ) {
if ( defined $config{LOG_VERBOSITY} ) { if ( supplied $config{LOG_VERBOSITY} ) {
if ( $config{LOG_VERBOSITY} eq '' ) { if ( $config{LOG_VERBOSITY} eq '' ) {
$config{LOG_VERBOSITY} = 2; $config{LOG_VERBOSITY} = 2;
} else { } else {
@ -3294,7 +3294,7 @@ sub get_configuration( $ ) {
default_yes_no 'DETECT_DNAT_IPADDRS' , ''; default_yes_no 'DETECT_DNAT_IPADDRS' , '';
default_yes_no 'CLEAR_TC' , $family == F_IPV4 ? 'Yes' : ''; default_yes_no 'CLEAR_TC' , $family == F_IPV4 ? 'Yes' : '';
if ( defined $config{CLAMPMSS} ) { if ( supplied $config{CLAMPMSS} ) {
default_yes_no 'CLAMPMSS' , '' unless $config{CLAMPMSS} =~ /^\d+$/; default_yes_no 'CLAMPMSS' , '' unless $config{CLAMPMSS} =~ /^\d+$/;
} else { } else {
$config{CLAMPMSS} = ''; $config{CLAMPMSS} = '';
@ -3527,7 +3527,7 @@ sub get_configuration( $ ) {
$val = numeric_value $config{OPTIMIZE}; $val = numeric_value $config{OPTIMIZE};
fatal_error "Invalid OPTIMIZE value ($config{OPTIMIZE})" unless defined( $val ) && $val >= 0 && ( $val & ( 4096 ^ -1 ) ) <= 15; fatal_error "Invalid OPTIMIZE value ($config{OPTIMIZE})" unless supplied( $val ) && $val >= 0 && ( $val & ( 4096 ^ -1 ) ) <= 15;
$globals{MARKING_CHAIN} = $config{MARK_IN_FORWARD_CHAIN} ? 'tcfor' : 'tcpre'; $globals{MARKING_CHAIN} = $config{MARK_IN_FORWARD_CHAIN} ? 'tcfor' : 'tcpre';