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

Issue warning on missing IPSET

Browse Source
This commit is contained in:
Tom Eastep 2011-05-15 11:52:26 -07:00
parent 5580fd559a
commit f741b8a225
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,6 +244,7 @@ our $mangle_table;
our $filter_table; our $filter_table;
our $comment; our $comment;
our @comments; our @comments;
my $export;
# #
# Target Types # Target Types
@ -388,8 +389,8 @@ our %builtin_target = ( ACCEPT => 1,
# 2. The compiler can run multiple times in the same process so it has to be # 2. The compiler can run multiple times in the same process so it has to be
# able to re-initialize its dependent modules' state. # able to re-initialize its dependent modules' state.
# #
sub initialize( $$ ) { sub initialize( $$$ ) {
( $family, my $hard ) = @_; ( $family, my $hard, $export ) = @_;
%chain_table = ( raw => {}, %chain_table = ( raw => {},
mangle => {}, mangle => {},
@ -2819,6 +2820,10 @@ sub get_set_flags( $$ ) {
$setname =~ s/^\+//; $setname =~ s/^\+//;
unless ( $export || $> != 0 ) {
warning_message "Ipset $setname does not exist" unless qt "ipset -L $setname";
}
fatal_error "Invalid ipset name ($setname)" unless $setname =~ /^[a-zA-Z]\w*/; fatal_error "Invalid ipset name ($setname)" unless $setname =~ /^[a-zA-Z]\w*/;
have_capability 'OLD_IPSET_MATCH' ? "--set $setname $options " : "--match-set $setname $options "; have_capability 'OLD_IPSET_MATCH' ? "--set $setname $options " : "--match-set $setname $options ";

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

@ -54,7 +54,7 @@ our $family;
# #
sub initialize_package_globals() { sub initialize_package_globals() {
Shorewall::Config::initialize($family); Shorewall::Config::initialize($family);
Shorewall::Chains::initialize ($family, 1); Shorewall::Chains::initialize ($family, 1, $export );
Shorewall::Zones::initialize ($family); Shorewall::Zones::initialize ($family);
Shorewall::Nat::initialize; Shorewall::Nat::initialize;
Shorewall::Providers::initialize($family); Shorewall::Providers::initialize($family);
@ -817,7 +817,7 @@ sub compiler {
# We must reinitialize Shorewall::Chains before generating the iptables-restore input # We must reinitialize Shorewall::Chains before generating the iptables-restore input
# for stopping the firewall # for stopping the firewall
# #
Shorewall::Chains::initialize( $family, 0 ); Shorewall::Chains::initialize( $family, 0 , $export );
initialize_chain_table; initialize_chain_table;
# #
# S T O P _ F I R E W A L L # S T O P _ F I R E W A L L
@ -881,7 +881,7 @@ sub compiler {
# Re-initialize the chain table so that process_routestopped() has the same # Re-initialize the chain table so that process_routestopped() has the same
# environment that it would when called by compile_stop_firewall(). # environment that it would when called by compile_stop_firewall().
# #
Shorewall::Chains::initialize( $family , 0 ); Shorewall::Chains::initialize( $family , 0 , $export );
initialize_chain_table; initialize_chain_table;
if ( $debug ) { if ( $debug ) {