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

Use -o when copying routing tables

Browse Source
This commit is contained in:
Tom Eastep 2011-05-14 13:56:39 -07:00
parent 05e385a748
commit 00add745b7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,13 +140,13 @@ sub copy_table( $$$ ) {
my $filter = $family == F_IPV6 ? q(sed 's/ via :: / /' | ) : ''; my $filter = $family == F_IPV6 ? q(sed 's/ via :: / /' | ) : '';
if ( $realm ) { if ( $realm ) {
emit ( "\$IP -$family route show table $duplicate | sed -r 's/ realm [[:alnum:]_]+//' | while read net route; do" ) emit ( "\$IP -$family -o route show table $duplicate | sed -r 's/ realm [[:alnum:]_]+//' | while read net route; do" )
} else { } else {
emit ( "\$IP -$family route show table $duplicate | ${filter}while read net route; do" ) emit ( "\$IP -$family -o route show table $duplicate | ${filter}while read net route; do" )
} }
emit ( ' case $net in', emit ( ' case $net in',
' default|nexthop)', ' default)',
' ;;', ' ;;',
' *)', ' *)',
" run_ip route add table $number \$net \$route $realm", " run_ip route add table $number \$net \$route $realm",
@ -172,13 +172,13 @@ sub copy_and_edit_table( $$$$ ) {
$copy =~ s/\+/*/; $copy =~ s/\+/*/;
if ( $realm ) { if ( $realm ) {
emit ( "\$IP -$family route show table $duplicate | sed -r 's/ realm [[:alnum:]]+//' | while read net route; do" ) emit ( "\$IP -$family -o route show table $duplicate | sed -r 's/ realm [[:alnum:]]+//' | while read net route; do" )
} else { } else {
emit ( "\$IP -$family route show table $duplicate | ${filter}while read net route; do" ) emit ( "\$IP -$family -o route show table $duplicate | ${filter}while read net route; do" )
} }
emit ( ' case $net in', emit ( ' case $net in',
' default|nexthop)', ' default)',
' ;;', ' ;;',
' *)', ' *)',
' case $(find_device $route) in', ' case $(find_device $route) in',