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

Merge branch '4.5.9'

Browse Source
This commit is contained in:
Tom Eastep 2012-11-14 11:17:18 -08:00
commit 34e3e4bf82
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shorewall/Perl/Shorewall/Tc.pm
View File

@ -266,6 +266,7 @@ sub process_tc_rule( ) {
my $rest; my $rest;
my $matches = ''; my $matches = '';
my $mark1; my $mark1;
my $exceptionrule = '';
my %processtcc = ( sticky => sub() { my %processtcc = ( sticky => sub() {
if ( $chain eq 'tcout' ) { if ( $chain eq 'tcout' ) {
@ -391,6 +392,8 @@ sub process_tc_rule( ) {
} }
$target .= ' --tproxy-mark'; $target .= ' --tproxy-mark';
$exceptionrule = '-p tcp ';
}, },
TTL => sub() { TTL => sub() {
fatal_error "TTL is not supported in IPv6 - use HL instead" if $family == F_IPV6; fatal_error "TTL is not supported in IPv6 - use HL instead" if $family == F_IPV6;
@ -673,7 +676,7 @@ sub process_tc_rule( ) {
"$target " . join( '/', in_hex( $markval ) , $mask ) , "$target " . join( '/', in_hex( $markval ) , $mask ) ,
'', '',
$target , $target ,
'' ); $exceptionrule );
} }
} elsif ( ( my $result = expand_rule( ensure_chain( 'mangle' , $chain ) , } elsif ( ( my $result = expand_rule( ensure_chain( 'mangle' , $chain ) ,
$restrictions{$chain} | $restriction, $restrictions{$chain} | $restriction,
@ -694,7 +697,7 @@ sub process_tc_rule( ) {
$mark ? "$target $mark" : $target, $mark ? "$target $mark" : $target,
'' , '' ,
$target , $target ,
'' ) ) $exceptionrule ) )
&& $device ) { && $device ) {
# #
# expand_rule() returns destination device if any # expand_rule() returns destination device if any