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

Apply Mr-4's special route handling in COPY (modified).

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-05-04 13:27:34 -07:00
parent 14cf5aa0d6
commit 4621dccd53
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -226,16 +226,24 @@ sub copy_and_edit_table( $$$$$ ) {
my $filter = $family == F_IPV6 ? q(fgrep -v ' cache ' | sed 's/ via :: / /' | ) : '';
my %copied;
my @copy;
my @bup_copy;
my $bup_copy;
#
# Remove duplicates
#
for ( split ',', $copy ) {
unless ( $copied{$_} ) {
fatal_error "Unknown interface ($_)" unless known_interface($_);
push @copy, $_;
if ( known_inerface($_) ) {
push @copy, $;
} elsif ( $_ =~ /^(?:blackhole|unreachable|prohibit)$/ ) {
push @bup_copy, $_ ;
} else {
fatal_error "Unknown interface ($_)";
}
$copied{$_} = 1;
}
}
$bup_copy = join( '|' , @bup_copy );
#
# Map physical names in $copy to logical names
#
@ -255,11 +263,13 @@ sub copy_and_edit_table( $$$$$ ) {
emit ( ' case $net in',
' default)',
' ;;',
' blackhole|prohibit|unreachable)',
' ;;' );
if ( $bup_copy ) {
emit (" $bup_copy)",
" run_ip route add table $id \$net \$route $realm",
' ;;',
' *)',
' ;;' );
}
emit ( ' *)',
' case $(find_device $route) in',
" $copy)" );
if ( $family == F_IPV4 ) {