[PATCH 1/2] Revert "qos.cgi: Removed last two P2P lines"

[PATCH 1/2] Revert "qos.cgi: Removed last two P2P lines"

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]

This reverts commit 652da33c019a9ed4bab40670c88356b18ac9cccf.

As Michael wrote on the list:
"This creates a class which uses the l7 filter to match any P2P traffic and throttle it."

Patch is dropped.
---
 html/cgi-bin/qos.cgi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 6d1c61638..f3bbd1bf4 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -474,11 +474,13 @@ imq0;200;1;$DOWN[20];$DOWN[1];;;8;VoIP;
 imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN;
 imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic;
 imq0;210;6;1;$DOWN[1];;;0;Default;
+imq0;220;7;1;$DOWN[1];;;1;P2P;
 $qossettings{'RED_DEV'};101;1;$UP[10];$UP[1];;;8;ACKs;
 $qossettings{'RED_DEV'};102;2;$UP[10];$UP[1];;;8;VoIP;
 $qossettings{'RED_DEV'};103;4;$UP[10];$UP[1];;;2;VPN;
 $qossettings{'RED_DEV'};104;5;$UP[10];$UP[1];;;8;Webtraffic;
 $qossettings{'RED_DEV'};110;6;1;$UP[1];;;0;Default;
+$qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P;
 END
 ;
 		close FILE;
-- 
2.25.1

[PATCH 2/2] Revert "Core Update 167: Ship qos.cgi"

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 757 bytes --]

This reverts commit dcb3c4aaac5f572f0198d09a504b1cd8103d77b6.

We don't need to ship 'qos.cgi' - corresponding patch was dropped.
---
 config/rootfiles/core/167/filelists/files | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/rootfiles/core/167/filelists/files b/config/rootfiles/core/167/filelists/files
index 5c6669d2e..41871bbeb 100644
--- a/config/rootfiles/core/167/filelists/files
+++ b/config/rootfiles/core/167/filelists/files
@@ -5,7 +5,6 @@ lib/udev/network-hotplug-bridges
 srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/location-block.cgi
-srv/web/ipfire/cgi-bin/qos.cgi
 usr/lib/firewall/rules.pl
 var/ipfire/backup/include
 var/ipfire/ids-functions.pl
-- 
2.25.1