extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-03 12:09:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Generate ALL_ACASTS during 'restore' processing

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2020-09-11 13:11:44 -07:00
parent fe7bb4abca
commit 6cab1c3c8c
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,7 +281,8 @@ sub generate_script_2() {
'# Set global variables holding detected IP information' , '# Set global variables holding detected IP information' ,
'#' , '#' ,
'detect_configuration()', 'detect_configuration()',
'{' ); '{'
);
my $global_variables = have_global_variables; my $global_variables = have_global_variables;
my $optional_interfaces = find_interfaces_by_option( 'optional' ); my $optional_interfaces = find_interfaces_by_option( 'optional' );
@ -290,6 +291,7 @@ sub generate_script_2() {
if ( have_address_variables || @$optional_interfaces ) { if ( have_address_variables || @$optional_interfaces ) {
emit( 'local interface', emit( 'local interface',
'local iface',
'', '',
'interface="$1"', 'interface="$1"',
'' ''
@ -312,7 +314,7 @@ sub generate_script_2() {
if ( $global_variables == ( ALL_COMMANDS | NOT_RESTORE ) ) { if ( $global_variables == ( ALL_COMMANDS | NOT_RESTORE ) ) {
verify_required_interfaces(0); verify_required_interfaces(0);
set_global_variables(0, 0); set_global_variables($family == F_IPV4, 0);
handle_optional_interfaces; handle_optional_interfaces;
} }

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

@ -2437,11 +2437,10 @@ sub generate_all_acasts() {
@wildacasts = '*' unless @wildacasts; @wildacasts = '*' unless @wildacasts;
emit( 'local iface', emit( '',
'',
'ALL_ACASTS=', 'ALL_ACASTS=',
'', '',
'for iface in $(find_all_interfaces1); do' ); 'for $iface in $(find_all_interfaces1); do' );
push_indent; push_indent;