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

Small optimization of provider handling

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6170 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-01 14:53:57 +00:00
parent bb157c5864
commit ecc6c0bb5d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Shorewall-perl/Shorewall/Providers.pm
View File

@ -101,17 +101,13 @@ sub setup_providers() {
sub copy_and_edit_table( $$$ ) { sub copy_and_edit_table( $$$ ) {
my ( $duplicate, $number, $copy ) = @_; my ( $duplicate, $number, $copy ) = @_;
my $match = $copy;
$match =~ s/ /\|/g;
emitj ( "ip route show table $duplicate | while read net route; do", emitj ( "ip route show table $duplicate | while read net route; do",
' case $net in', ' case $net in',
' default|nexthop)', ' default|nexthop)',
' ;;', ' ;;',
' *)', ' *)',
' case $(find_device $route) in', ' case $(find_device $route) in',
" $match)", " $copy)",
" run_ip route add table $number \$net \$route", " run_ip route add table $number \$net \$route",
' ;;', ' ;;',
' esac', ' esac',
@ -165,17 +161,16 @@ sub setup_providers() {
emit "echo \"qt ip route flush table $number\" >> \${VARDIR}/undo_routing"; emit "echo \"qt ip route flush table $number\" >> \${VARDIR}/undo_routing";
if ( $duplicate ne '-' ) { if ( $duplicate ne '-' ) {
if ( $copy ne '-' ) { if ( $copy eq '-' ) {
copy_table ( $duplicate, $number );
} else {
if ( $copy eq 'none' ) { if ( $copy eq 'none' ) {
$copy = $interface; $copy = $interface;
} else { } else {
my @c = ( split /,/, $copy ); $copy =~ tr/,/|/;
$copy = "@c";
} }
copy_and_edit_table( $duplicate, $number ,$copy ); copy_and_edit_table( $duplicate, $number ,$copy );
} else {
copy_table ( $duplicate, $number );
} }
} else { } else {
fatal_error 'A non-empty COPY column requires that a routing table be specified in the DUPLICATE column' if $copy ne '-'; fatal_error 'A non-empty COPY column requires that a routing table be specified in the DUPLICATE column' if $copy ne '-';