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

Revert "Move $test to the config module."

Browse Source 
This reverts commit 876d76b294.
This commit is contained in:
Tom Eastep 2017-03-04 18:45:40 -08:00
parent 0b3a32b365
commit 63cf7dd699
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,9 @@ sub process_arprules() {
#
# Generate the arptables_load() function
#
sub create_arptables_load() {
sub create_arptables_load( $ ) {
my $test = shift;
emit ( '#',
'# Create the input to arptables-restore and pass that input to the utility',
'#',

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

@ -8654,7 +8654,9 @@ sub create_nfobjects() {
#
# Generate the netfilter input
#
sub create_netfilter_load() {
sub create_netfilter_load( $ ) {
my $test = shift;
$mode = NULL_MODE;
emit ( '#',

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

@ -49,6 +49,8 @@ our $VERSION = 'MODULEVERSION';
our $export;
our $test;
our $family;
our $have_arptables;
@ -361,8 +363,8 @@ sub generate_script_3($) {
progress_message2 "Creating ip6tables-restore input...";
}
create_netfilter_load;
create_arptables_load if $have_arptables;
create_netfilter_load( $test );
create_arptables_load( $test ) if $have_arptables;
create_chainlist_reload( $_[0] );
create_save_ipsets;
create_load_ipsets;
@ -929,7 +931,7 @@ sub compiler {
# S T O P _ F I R E W A L L
# (Writes the stop_firewall() function to the compiled script)
#
compile_stop_firewall( $export , $have_arptables, $update );
compile_stop_firewall( $test, $export , $have_arptables, $update );
#
# U P D O W N
# (Writes the updown() function to the compiled script)
@ -998,7 +1000,7 @@ sub compiler {
initialize_chain_table(0);
if ( $debug ) {
compile_stop_firewall( $export, $have_arptables, $update );
compile_stop_firewall( $test, $export, $have_arptables, $update );
disable_script;
} else {
#

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

@ -179,7 +179,6 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
$debug
$file_format
$comment
$test
%config
%origin
@ -245,10 +244,6 @@ Exporter::export_ok_tags('internal');
our $VERSION = 'MODULEVERSION';
#
# Compiling for test - this is initialized in the Compiler module.
#
our $test;
#
# describe the current command, it's present progressive, and it's completion.
#

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

@ -2500,8 +2500,8 @@ sub setup_mss( ) {
#
# Compile the stop_firewall() function
#
sub compile_stop_firewall( $$$ ) {
my ( $export, $have_arptables, $convert ) = @_;
sub compile_stop_firewall( $$$$ ) {
my ( $test, $export, $have_arptables, $convert ) = @_;
my $input = $filter_table->{INPUT};
my $output = $filter_table->{OUTPUT};