QoS: Drop support for setting TOS bits per class

This is useless since no ISP will evaluate those settings
any more and it has a rather large impact on throughput.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 20b950d202eef5c28be4dbade82cf28a291eb218..9d7c7c5a6b491ee2c7219bc4b288b495bd486d74 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -134,7 +134,6 @@ case "\$1" in
                echo "[iptables]"
                iptables -t mangle -n -L QOS-OUT -v -x 2> /dev/null
                iptables -t mangle -n -L QOS-INC -v -x 2> /dev/null
-               iptables -t mangle -n -L QOS-TOS -v -x 2> /dev/null
                exit 0
          ;;
        esac
@@ -211,9 +210,7 @@ print <<END
 
        ### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
        iptables -t mangle -N QOS-OUT
-       iptables -t mangle -N QOS-TOS
        iptables -t mangle -I POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT
-       iptables -t mangle -A POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS
 
        ### Don't change mark on traffic for the ipsec tunnel
        iptables -t mangle -A QOS-OUT -m mark --mark 50 -j RETURN
@@ -424,7 +421,6 @@ print <<END
        ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
        iptables -t mangle -N QOS-INC
        iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
-       iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
 
        # If the packet is already marked, then skip the processing
        iptables -t mangle -A QOS-INC -m mark ! --mark 0 -j RETURN
@@ -511,22 +507,6 @@ print <<END
        # Save mark in connection tracking
        iptables -t mangle -A QOS-INC -j CONNMARK --save-mark
 
-       ### SETTING TOS BITS
-END
-;
-       foreach $classentry (sort @classes)
-       {
-               @classline = split( /\;/, $classentry );
-               $qossettings{'CLASS'} = $classline[1];
-               $qossettings{'TOS'} = abs $classline[7] * 2;
-               if ($qossettings{'TOS'} ne "0") {
-                       print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS'} -j TOS --set-tos $qossettings{'TOS'}\n";
-                       print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS'} -j RETURN\n";
-               }
-       }
-
-print <<END
-
        ## STARTING COLLECTOR
        /usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
        /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1
@@ -561,15 +541,11 @@ print <<END
        iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN >/dev/null 2>&1
        iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN >/dev/null 2>&1
        iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1
-       iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
+       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1
        iptables -t mangle --flush  QOS-OUT >/dev/null 2>&1
        iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1
-       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
-       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
        iptables -t mangle --flush  QOS-INC >/dev/null 2>&1
        iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1
-       iptables -t mangle --flush  QOS-TOS >/dev/null 2>&1
-       iptables -t mangle --delete-chain QOS-TOS >/dev/null 2>&1
        # remove l7-filter
        iptables -t mangle --delete PREROUTING -m layer7 --l7proto unset
 

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 320eef67d1e5971f99c15f443869a55690021885..8211a3ca0c8953c3e8f4a1afd93c30011e2239d9 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -883,18 +883,6 @@ END
                <tr><td width='33%' align='right'>Ceilburst:
                    <td width='33%' align='left'><input type='text' size='20' name='CBURST' maxlength='8' value="$qossettings{'CBURST'}" />
                    <td width='33%' align='center'>&nbsp;
-END
-;
-                       $selected{'TOS'}{$qossettings{'TOS'}} = "selected='selected'";
-print <<END
-               <tr><td width='33%' align='right'>TOS-Bit:
-                   <td width='33%' align='left'><select name='TOS'>
-                               <option value='0' $selected{'TOS'}{'0'}>$Lang::tr{'disabled'} (0)</option>
-                               <option value='8' $selected{'TOS'}{'8'}>$Lang::tr{'min delay'} (8)</option>
-                               <option value='4' $selected{'TOS'}{'4'}>$Lang::tr{'max throughput'} (4)</option>
-                               <option value='2' $selected{'TOS'}{'2'}>$Lang::tr{'max reliability'} (2)</option>
-                               <option value='1' $selected{'TOS'}{'1'}>$Lang::tr{'min costs'} (1)</option></select>
-                   <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'remark'}:
                    <td width='66%' colspan='2' align='left'><input type='text' name='REMARK' size='40' maxlength='40' value="$qossettings{'REMARK'}" />
                <tr><td width='33%' align='right'><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'required field'}