extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-22 07:33:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use shorter names for dbl exclusion chains

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2024-03-02 14:54:45 -08:00
parent 91d5dbb7ba
commit 337a4bd6ec
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2443,17 +2443,17 @@ sub output_option_chain($) {
# #
# Blacklist Source Exclusion Chain for an interface # Blacklist Source Exclusion Chain for an interface
# #
sub nodbl_src_chain($$) { sub nodbl_src_chain($) {
my ( $interface, $end ) = ( $_[0], $_[1] ); my $interface = shift;
( $config{USE_PHYSICAL_NAMES} ? chain_base( get_physical( $interface ) ) : get_logical( $interface ) ) . '_' . $end; ( $config{USE_PHYSICAL_NAMES} ? chain_base( get_physical( $interface ) ) : get_logical( $interface ) ) . '_nosbl';
} }
# #
# Blacklist Destination Exclusion Chain for an interface # Blacklist Destination Exclusion Chain for an interface
# #
sub nodbl_dst_chain($$) { sub nodbl_dst_chain($) {
my ($interface, $end) = ( $_[0], $_[1] ); my $interface = shift;
( $config{USE_PHYSICAL_NAMES} ? chain_base( get_physical( $interface ) ) : get_logical( $interface ) ) . '_' . $end; ( $config{USE_PHYSICAL_NAMES} ? chain_base( get_physical( $interface ) ) : get_logical( $interface ) ) . '_nodbl';
} }
# #

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

@ -966,7 +966,7 @@ sub add_common_rules ( $ ) {
# #
# We need to create an intermediate chain # We need to create an intermediate chain
# #
$chainref = new_standard_chain( $src_target = nodbl_src_chain( $interface , $dbl_src_target )); $chainref = new_standard_chain( $src_target = nodbl_src_chain( $interface ));
for (@nodbl) { for (@nodbl) {
add_ijump( $chainref, j => 'RETURN', s => $_ ); add_ijump( $chainref, j => 'RETURN', s => $_ );
@ -975,7 +975,7 @@ sub add_common_rules ( $ ) {
add_ijump( $chainref, j => $dbl_src_target ); add_ijump( $chainref, j => $dbl_src_target );
if ( $dbl_src_target ne $dbl_dst_target ) { if ( $dbl_src_target ne $dbl_dst_target ) {
$chainref = new_standard_chain( $dst_target = nodbl_dst_chain( $interface , $dbl_dst_target )); $chainref = new_standard_chain( $dst_target = nodbl_dst_chain( $interface ));
for ( @nodbl ){ for ( @nodbl ){
add_ijump( $chainref, j => 'RETURN', -d => $_ ); add_ijump( $chainref, j => 'RETURN', -d => $_ );