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

Fix exclusion in the IPv6 hosts file

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9085 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-17 02:18:33 +00:00
parent 879ea6707c
commit 7faa4d19b4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall-perl/Shorewall/Rules.pm
View File

@ -1608,7 +1608,7 @@ sub generate_matrix() {
my $num = 1; my $num = 1;
for my $host ( @{$exclusionsref} ) { for my $host ( @{$exclusionsref} ) {
my ( $interface, $net ) = split /:/, $host; my ( $interface, $net ) = split /\|/, $host;
insert_rule $chainref , $num++, join( '', match_dest_dev $interface , match_dest_net( $net ), '-j RETURN' ); insert_rule $chainref , $num++, join( '', match_dest_dev $interface , match_dest_net( $net ), '-j RETURN' );
} }
} }
@ -1620,7 +1620,7 @@ sub generate_matrix() {
my ( $chainref, $exclusionsref ) = @_; my ( $chainref, $exclusionsref ) = @_;
for my $host ( @{$exclusionsref} ) { for my $host ( @{$exclusionsref} ) {
my ( $interface, $net ) = split /:/, $host; my ( $interface, $net ) = split /\|/, $host;
add_rule $chainref , join( '', match_dest_dev $interface, match_dest_net( $net ), '-j RETURN' ); add_rule $chainref , join( '', match_dest_dev $interface, match_dest_net( $net ), '-j RETURN' );
} }
} }
@ -1664,7 +1664,7 @@ sub generate_matrix() {
add_rule ensure_filter_chain( "${zone}2${zone}", 1 ) , '-j ACCEPT' if rules_target( $zone, $zone ) eq 'ACCEPT'; add_rule ensure_filter_chain( "${zone}2${zone}", 1 ) , '-j ACCEPT' if rules_target( $zone, $zone ) eq 'ACCEPT';
for my $host ( @$exclusions ) { for my $host ( @$exclusions ) {
my ( $interface, $net ) = split /:/, $host; my ( $interface, $net ) = split /\|/, $host;
my $rule = match_source_dev( $interface ) . match_source_net( $net ) . '-j RETURN'; my $rule = match_source_dev( $interface ) . match_source_net( $net ) . '-j RETURN';
add_rule $frwd_ref , $rule; add_rule $frwd_ref , $rule;
add_rule $in_ref , $rule; add_rule $in_ref , $rule;

2
Shorewall-perl/Shorewall/Zones.pm
View File

@ -529,7 +529,7 @@ sub add_group_to_zone($$$$$)
validate_host $host, 0; validate_host $host, 0;
} }
push @$new, $switched ? "$interface:$host" : $host; push @$new, $switched ? "$interface|$host" : $host;
} }
$zoneref->{options}{in_out}{routeback} = 1 if $options->{routeback}; $zoneref->{options}{in_out}{routeback} = 1 if $options->{routeback};