extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-11 16:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct handling of default chain when a mark range is specified.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2014-01-07 13:15:51 -08:00
parent 42dd8dfee9
commit 7e6fc3229d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,12 +215,12 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$ ) {
our $matches = ''; our $matches = '';
our $params = ''; our $params = '';
our $done = 0; our $done = 0;
my $default_chain = 0; our $default_chain = 0;
our $restriction = 0; our $restriction = 0;
our $exceptionrule = ''; our $exceptionrule = '';
my $device = ''; my $device = '';
our $cmd; our $cmd;
my $designator; our $designator;
my $fw = firewall_zone; my $fw = firewall_zone;
sub handle_mark_param( $ ) { sub handle_mark_param( $ ) {
@ -253,6 +253,9 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$ ) {
my $marks = ( ( $mark2val - $markval ) >> $shift ) + 1; my $marks = ( ( $mark2val - $markval ) >> $shift ) + 1;
$chain ||= $designator;
$chain ||= $default_chain;
my $chainref = ensure_chain( 'mangle', $chain = $chainnames{$chain} ); my $chainref = ensure_chain( 'mangle', $chain = $chainnames{$chain} );
for ( my $packet = 0; $packet < $marks; $packet++, $markval += $increment ) { for ( my $packet = 0; $packet < $marks; $packet++, $markval += $increment ) {
@ -367,9 +370,8 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$ ) {
minparams => 1, minparams => 1,
maxparams => 1, maxparams => 1,
function => sub () { function => sub () {
$chain = $designator || $default_chain;
$target = 'CONNMARK'; $target = 'CONNMARK';
handle_mark_param('--set-mark'); handle_mark_param('--set-mark' );
}, },
}, },