mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 17:58:07 +02:00
Rename a variable
This commit is contained in:
parent
28b0e99492
commit
3f7a1f9574
@ -524,8 +524,8 @@ EOF
|
|||||||
#
|
#
|
||||||
sub compiler {
|
sub compiler {
|
||||||
|
|
||||||
my ( $scriptfile, $directory, $verbosity, $timestamp , $debug, $chains , $log , $log_verbosity ) =
|
my ( $scriptfilename, $directory, $verbosity, $timestamp , $debug, $chains , $log , $log_verbosity ) =
|
||||||
( '', '', -1, '', 0, '', '', -1 );
|
( '', '', -1, '', 0, '', '', -1 );
|
||||||
|
|
||||||
$export = 0;
|
$export = 0;
|
||||||
$test = 0;
|
$test = 0;
|
||||||
@ -545,7 +545,7 @@ sub compiler {
|
|||||||
defined($val) && ($val == F_IPV4 || $val == F_IPV6);
|
defined($val) && ($val == F_IPV4 || $val == F_IPV6);
|
||||||
}
|
}
|
||||||
|
|
||||||
my %parms = ( object => { store => \$scriptfile },
|
my %parms = ( object => { store => \$scriptfilename },
|
||||||
directory => { store => \$directory },
|
directory => { store => \$directory },
|
||||||
family => { store => \$family , validate => \&validate_family } ,
|
family => { store => \$family , validate => \&validate_family } ,
|
||||||
verbosity => { store => \$verbosity , validate => \&validate_verbosity } ,
|
verbosity => { store => \$verbosity , validate => \&validate_verbosity } ,
|
||||||
@ -596,9 +596,9 @@ sub compiler {
|
|||||||
require_capability( 'XCONNMARK' , 'HIGH_ROUTE_MARKS=Yes' , 's' ) if $config{HIGH_ROUTE_MARKS};
|
require_capability( 'XCONNMARK' , 'HIGH_ROUTE_MARKS=Yes' , 's' ) if $config{HIGH_ROUTE_MARKS};
|
||||||
require_capability( 'MANGLE_ENABLED' , 'Traffic Shaping' , 's' ) if $config{TC_ENABLED};
|
require_capability( 'MANGLE_ENABLED' , 'Traffic Shaping' , 's' ) if $config{TC_ENABLED};
|
||||||
|
|
||||||
if ( $scriptfile ) {
|
if ( $scriptfilename ) {
|
||||||
set_command( 'compile', 'Compiling', 'Compiled' );
|
set_command( 'compile', 'Compiling', 'Compiled' );
|
||||||
create_temp_script( $scriptfile , $export );
|
create_temp_script( $scriptfilename , $export );
|
||||||
} else {
|
} else {
|
||||||
set_command( 'check', 'Checking', 'Checked' );
|
set_command( 'check', 'Checking', 'Checked' );
|
||||||
}
|
}
|
||||||
@ -646,7 +646,7 @@ sub compiler {
|
|||||||
|
|
||||||
enable_script;
|
enable_script;
|
||||||
|
|
||||||
if ( $scriptfile ) {
|
if ( $scriptfilename ) {
|
||||||
#
|
#
|
||||||
# Place Header in the script
|
# Place Header in the script
|
||||||
#
|
#
|
||||||
@ -686,7 +686,7 @@ sub compiler {
|
|||||||
#
|
#
|
||||||
setup_zone_mss;
|
setup_zone_mss;
|
||||||
|
|
||||||
if ( $scriptfile ) {
|
if ( $scriptfilename ) {
|
||||||
emit 'return 0';
|
emit 'return 0';
|
||||||
pop_indent;
|
pop_indent;
|
||||||
emit '}';
|
emit '}';
|
||||||
@ -699,7 +699,7 @@ sub compiler {
|
|||||||
#
|
#
|
||||||
enable_script;
|
enable_script;
|
||||||
|
|
||||||
if ( $scriptfile ) {
|
if ( $scriptfilename ) {
|
||||||
emit( "\n#",
|
emit( "\n#",
|
||||||
'# Setup routing and traffic shaping',
|
'# Setup routing and traffic shaping',
|
||||||
'#',
|
'#',
|
||||||
@ -717,7 +717,7 @@ sub compiler {
|
|||||||
#
|
#
|
||||||
setup_tc;
|
setup_tc;
|
||||||
|
|
||||||
if ( $scriptfile ) {
|
if ( $scriptfilename ) {
|
||||||
pop_indent;
|
pop_indent;
|
||||||
emit "}\n";
|
emit "}\n";
|
||||||
}
|
}
|
||||||
@ -778,7 +778,7 @@ sub compiler {
|
|||||||
#
|
#
|
||||||
setup_accounting;
|
setup_accounting;
|
||||||
|
|
||||||
if ( $scriptfile ) {
|
if ( $scriptfilename ) {
|
||||||
#
|
#
|
||||||
# Generate the zone by zone matrix
|
# Generate the zone by zone matrix
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user