webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

QoS: Drop support for setting TOS bits per class

Browse Source 
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>
This commit is contained in:
Michael Tremer
2019-10-21 20:45:37 +02:00
committed by Arne Fitzenreiter
parent 6f07564242
commit 76bf53db8b
2 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/qos/makeqosscripts.pl
View File

@@ -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

12
html/cgi-bin/qos.cgi
View File

@@ -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'}