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, master has been updated via b83d68f3fd925f1361237335b92e34ac36215591 (commit) from ab4a5a35af5bb45b8f6d1d104924d89379a0dbb9 (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 b83d68f3fd925f1361237335b92e34ac36215591 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jan 3 22:19:37 2011 +0100

qos: fix vpn downstream rate counting.

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

Summary of changes: config/qos/makeqosscripts.pl | 14 +++++++++++++- config/rootfiles/core/44/filelists/files | 1 + config/rootfiles/core/44/update.sh | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletions(-)

Difference in files: diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 243cf85..0b97b85 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -517,6 +517,9 @@ print <<END

### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES iptables -t mangle -N QOS-INC + iptables -t mangle -A POSTROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN + iptables -t mangle -A POSTROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN + iptables -t mangle -A POSTROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN iptables -t mangle -A POSTROUTING -m mark ! --mark 0 ! -o $qossettings{'RED_DEV'} -j IMQ --todev 0 iptables -t mangle -I FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC iptables -t mangle -A FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS @@ -531,6 +534,9 @@ 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'} -p ah -j RETURN + iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN + iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0 iptables -t mangle -I PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS @@ -690,6 +696,12 @@ print <<END tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 # STOP IMQ-DEVICE ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1 + iptables -t mangle --delete POSTROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN >/dev/null 2>&1 + iptables -t mangle --delete POSTROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN >/dev/null 2>&1 + iptables -t mangle --delete POSTROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN >/dev/null 2>&1 + iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN >/dev/null 2>&1 + 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 -m mark ! --mark 0 ! -o $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1 iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1 # rmmod imq # this crash on 2.6.25.xx diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files index 765ee74..ec42996 100644 --- a/config/rootfiles/core/44/filelists/files +++ b/config/rootfiles/core/44/filelists/files @@ -39,6 +39,7 @@ var/ipfire/langs/en.pl var/ipfire/langs/fr.pl var/ipfire/langs/es.pl var/ipfire/menu.d/10-system.menu +var/ipfire/qos/bin/makeqosscripts.pl usr/local/bin/timectrl usr/local/bin/rebuild-initrd usr/local/bin/scanhd diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index e30a0e0..5b1b9ee 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -210,6 +210,15 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi

+# +# Rebuild qosscript if enabled +# +if [ -e /var/ipfire/qos/enable ]; then + /usr/local/bin/qosctrl stop + /usr/local/bin/qosctrl generate + /usr/local/bin/qosctrl start +fi + # Add pakfire and fireinfo cronjobs... grep -v "# fireinfo" /var/spool/cron/root.orig | grep -v "/usr/bin/sendprofile" |

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