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

Finish fix for SAME

Browse Source
This commit is contained in:
Tom Eastep 2010-09-11 11:45:50 -07:00
parent d2d13c11a7
commit fc5743c0bf
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/Tc.pm
View File

@ -259,7 +259,7 @@ sub process_tc_rule( ) {
require_capability ('CONNMARK' , "SAVE/RESTORE Rules", '' ) if $tccmd->{connmark};
$target = "$tccmd->{target} ";
$target = $tccmd->{target};
my $marktype = $tccmd->{mark};
if ( $marktype == NOMARK ) {
@ -268,7 +268,7 @@ sub process_tc_rule( ) {
$mark =~ s/^[|&]//;
}
if ( $target eq 'sticky ' ) {
if ( $target eq 'sticky' ) {
if ( $chain eq 'tcout' ) {
$target = 'sticko';
} else {
@ -278,7 +278,7 @@ sub process_tc_rule( ) {
ensure_mangle_chain( $target );
$sticky++;
} elsif ( $target eq 'IPMARK ' ) {
} elsif ( $target eq 'IPMARK' ) {
my ( $srcdst, $mask1, $mask2, $shift ) = ('src', 255, 0, 0 );
require_capability 'IPMARK_TARGET', 'IPMARK', 's';
@ -315,7 +315,7 @@ sub process_tc_rule( ) {
}
$target = "IPMARK --addr $srcdst --and-mask $mask1 --or-mask $mask2 --shift $shift";
} elsif ( $target eq 'TPROXY ' ) {
} elsif ( $target eq 'TPROXY' ) {
require_capability( 'TPROXY_TARGET', 'Use of TPROXY', 's');
fatal_error "Invalid TPROXY specification( $cmd/$rest )" if $rest;
@ -338,7 +338,7 @@ sub process_tc_rule( ) {
$port = 0;
}
$target .= "--on-port $port";
$target .= " --on-port $port";
if ( defined $ip && $ip ne '' ) {
validate_address $ip, 1;
@ -1440,7 +1440,7 @@ sub setup_tc() {
mark => HIGHMARK ,
mask => '' } ,
{ match => sub ( $ ) { $_[0] =~ '&.*' },
target => 'MARK --and-mark ' ,
target => 'MARK --and-mark' ,
mark => HIGHMARK ,
mask => '' ,
connmark => 0