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

Issue a warning if the contents of the DUPLICATE column may be invalid.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-03-09 07:57:13 -08:00
parent a167e3449e
commit 8c4c856caa
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/Perl/Shorewall/Nat.pm
View File

@ -29,7 +29,7 @@ use Shorewall::Config qw(:DEFAULT :internal);
use Shorewall::IPAddrs; use Shorewall::IPAddrs;
use Shorewall::Zones; use Shorewall::Zones;
use Shorewall::Chains qw(:DEFAULT :internal); use Shorewall::Chains qw(:DEFAULT :internal);
use Shorewall::Providers qw( lookup_provider ); use Shorewall::Providers qw( provider_realm );
use strict; use strict;
@ -144,7 +144,7 @@ sub process_one_masq1( $$$$$$$$$$ )
fatal_error "Missing Provider ($fullinterface)" unless supplied $provider; fatal_error "Missing Provider ($fullinterface)" unless supplied $provider;
$fullinterface =~ s/[(]\w*[)]//; $fullinterface =~ s/[(]\w*[)]//;
my $realm = lookup_provider( $provider ); my $realm = provider_realm( $provider );
fatal_error "$provider is not a shared-interface provider" unless $realm; fatal_error "$provider is not a shared-interface provider" unless $realm;

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

@ -43,7 +43,7 @@ our @EXPORT = qw( process_providers
setup_load_distribution setup_load_distribution
have_providers have_providers
); );
our @EXPORT_OK = qw( initialize lookup_provider ); our @EXPORT_OK = qw( initialize provider_realm );
our $VERSION = '4.4_24'; our $VERSION = '4.4_24';
use constant { LOCAL_TABLE => 255, use constant { LOCAL_TABLE => 255,
@ -377,6 +377,26 @@ sub start_provider( $$$$ ) {
} }
} }
#
# Look up a provider and return it's number. If unknown provider, 0 is returned
#
sub lookup_provider( $ ) {
my $provider = $_[0];
my $providerref = $providers{ $provider };
unless ( $providerref ) {
my $provider_number = numeric_value $provider;
if ( defined $provider_number ) {
for ( values %providers ) {
$providerref = $_, last if $_->{number} == $provider_number;
}
}
}
$providerref ? $providerref->{number} : 0;
}
# #
# Process a record in the providers file # Process a record in the providers file
# #
@ -572,6 +592,8 @@ sub process_a_provider( $ ) {
if ( $duplicate ne '-' ) { if ( $duplicate ne '-' ) {
fatal_error "The DUPLICATE column must be empty when USE_DEFAULT_RT=Yes" if $config{USE_DEFAULT_RT}; fatal_error "The DUPLICATE column must be empty when USE_DEFAULT_RT=Yes" if $config{USE_DEFAULT_RT};
my $p = lookup_provider( $duplicate );
warning_message "Unknown routing table ($duplicate)" unless $p && ( $p == MAIN_TABLE || $p < BALANCE_TABLE );
} elsif ( $copy ne '-' ) { } elsif ( $copy ne '-' ) {
fatal_error "The COPY column must be empty when USE_DEFAULT_RT=Yes" if $config{USE_DEFAULT_RT}; fatal_error "The COPY column must be empty when USE_DEFAULT_RT=Yes" if $config{USE_DEFAULT_RT};
fatal_error 'A non-empty COPY column requires that a routing table be specified in the DUPLICATE column' unless $copy eq 'none'; fatal_error 'A non-empty COPY column requires that a routing table be specified in the DUPLICATE column' unless $copy eq 'none';
@ -1717,7 +1739,11 @@ sub compile_updown() {
); );
} }
sub lookup_provider( $ ) { #
# Lookup the passed provider. Raise a fatal error if provider is unknown.
# Return the provider's realm if it is a shared provider; otherwise, return zero
#
sub provider_realm( $ ) {
my $provider = $_[0]; my $provider = $_[0];
my $providerref = $providers{ $provider }; my $providerref = $providers{ $provider };