extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 17:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the connmark implementation

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2020-07-07 18:00:37 -07:00
parent 89201bd294
commit 4b3f9ae1e7
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,7 +473,7 @@ sub validate_tc_device( ) {
if ( @redirected ) { if ( @redirected ) {
fatal_error "IFB devices may not have IN-BANDWIDTH" if $inband ne '-' && $inband; fatal_error "IFB devices may not have IN-BANDWIDTH" if $inband ne '-' && $inband;
$classify = 1; $classify = 1 unless $connmark;
for my $rdevice ( @redirected ) { for my $rdevice ( @redirected ) {
fatal_error "Invalid device name ($rdevice)" if $rdevice =~ /[:+]/; fatal_error "Invalid device name ($rdevice)" if $rdevice =~ /[:+]/;
@ -667,6 +667,7 @@ sub validate_tc_class( ) {
if ( $mark ne '-' ) { if ( $mark ne '-' ) {
fatal_error "MARK may not be specified when TC_BITS=0" unless $config{TC_BITS}; fatal_error "MARK may not be specified when TC_BITS=0" unless $config{TC_BITS};
fatal_error "MARK may not be specified for an interface with the 'classify' option" if $devref->{classify};
( $mark, my $priority ) = split/:/, $mark, 2; ( $mark, my $priority ) = split/:/, $mark, 2;

9
Shorewall/manpages/shorewall-tcdevices.xml
View File

@ -200,6 +200,11 @@
marks. You must do all classification using CLASSIFY rules in <ulink marks. You must do all classification using CLASSIFY rules in <ulink
url="shorewall-mangle.html">shorewall-mangle</ulink>(5).</para> url="shorewall-mangle.html">shorewall-mangle</ulink>(5).</para>
<para><emphasis role="bold">connmark</emphasis> -- Added in
Shorewall 5.2.7. May only be specified if the REDIRECTED_INTERFACES
column is non-empty. It allows packet marks to be used to classify
traffic for these interfaces.</para>
<para><option>htb</option> - Use the <firstterm>Hierarchical Token <para><option>htb</option> - Use the <firstterm>Hierarchical Token
Bucket</firstterm> queuing discipline. This is the default.</para> Bucket</firstterm> queuing discipline. This is the default.</para>
@ -248,7 +253,9 @@
enter each listed interface to be passed through the egress filters enter each listed interface to be passed through the egress filters
defined for this device, thus providing a form of incoming traffic defined for this device, thus providing a form of incoming traffic
shaping. When this column is non-empty, the <emphasis shaping. When this column is non-empty, the <emphasis
role="bold">classify</emphasis> option is assumed.</para> role="bold">classify</emphasis> option is assumed unless the
<emphasis role="bold">connmark</emphasis> option is
specified.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>