This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via d704e75d750b38e77d01ca32fd5a4d70470467ce (commit) via 41c242bff8222d8e2100af708ddfd9719ac078c7 (commit) from 4ba4645d12a5fb9b92b653ae282a1b65418f181e (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d704e75d750b38e77d01ca32fd5a4d70470467ce Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 22 17:48:14 2019 +0200

QoS: Do no classify as default when L7 filter isn't done

We need to allow some more packets to pass through the mangle chains so that the layer 7 filter can determine what protocol it finds.

If L7 filter decides that a connection is of type "unknown", we mark it as default, or it is marked with the correct class.

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

commit 41c242bff8222d8e2100af708ddfd9719ac078c7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Oct 22 15:54:37 2019 +0000

Revert "Revert "Revert "core137: Remove imq0 and unload imq module after QoS has been stopped"""

This reverts commit e4d242da4ae1074b75d5d45eeb16061ba178f6c4.

this fails because we let QoS running and it doesn't like if the imq0 device was removed. (why imq0 can removed when it is up?)

-----------------------------------------------------------------------

Summary of changes: config/qos/makeqosscripts.pl | 7 +------ config/rootfiles/core/137/update.sh | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-)

Difference in files: diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 1a5d01d52..cbbbf70f8 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -205,9 +205,6 @@ foreach $classentry (sort @classes) } print <<END

- ### add l7-filter to PREROUTING chain to see all traffic - iptables -t mangle -A PREROUTING -m layer7 --l7proto unset - ### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES iptables -t mangle -N QOS-OUT iptables -t mangle -I POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT @@ -502,7 +499,7 @@ END

print <<END ### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS - iptables -t mangle -A QOS-INC -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_INC'} + iptables -t mangle -A QOS-INC -m mark --mark 0 -m layer7 ! --l7proto unset -j MARK --set-mark $qossettings{'DEFCLASS_INC'}

# Save mark in connection tracking iptables -t mangle -A QOS-INC -j CONNMARK --save-mark @@ -540,8 +537,6 @@ print <<END iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1 iptables -t mangle --flush QOS-INC >/dev/null 2>&1 iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1 - # remove l7-filter - iptables -t mangle --delete PREROUTING -m layer7 --l7proto unset

rmmod sch_htb >/dev/null 2>&1

diff --git a/config/rootfiles/core/137/update.sh b/config/rootfiles/core/137/update.sh index 5b0e6982f..f2e83fc77 100644 --- a/config/rootfiles/core/137/update.sh +++ b/config/rootfiles/core/137/update.sh @@ -82,12 +82,6 @@ rm -rf /lib/modules

# Stop services

-# Delete imq0 if it is still present after QoS has been stopped -if [ -d "/sys/class/net/imq0" ]; then - ip link del dev imq0 - modprobe -r imq -fi - # Extract files extract_files

hooks/post-receive -- IPFire 2.x development tree