corrected speed footer not working with dhcp and static

[ipfire-2.x.git] / config / qos / makeqosscripts.pl

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index c3dac4044afede0a14f051fe76d8b58ff89c6e4a..929b93f104eff8442af02e93b7a800722d308ffd 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -1,11 +1,23 @@
 #!/usr/bin/perl
-#
-# IPFire Scripts
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The IPFire Team
-#
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 use strict;
 # enable only the following on debugging purpose
@@ -144,7 +156,7 @@ case "\$1" in
 
        ### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT
        ip link set dev $qossettings{'RED_DEV'} qlen $qossettings{'QLENGTH'}
-       ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
+       #ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
 
        ### ADD HTB QDISC FOR $qossettings{'RED_DEV'}
        tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'}
@@ -311,9 +323,9 @@ print "\n\t### SET PORT-RULES\n";
                                print "-d $qossettings{'DIP'} ";
                        }
                        print "-p $qossettings{'PPROT'} ";
-                       if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
-                               print "-m multiport ";
-                       }
+#                      if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
+#                              print "-m multiport ";
+#                      }
                        if ($qossettings{'QPORT'} ne ''){
                                print "--sport $qossettings{'QPORT'} ";
                        }
@@ -329,9 +341,9 @@ print "\n\t### SET PORT-RULES\n";
                                print "-d $qossettings{'DIP'} ";
                        }
                        print "-p $qossettings{'PPROT'} ";
-                       if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
-                               print "-m multiport ";
-                       }
+#                      if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
+#                              print "-m multiport ";
+#                      }
                        if ($qossettings{'QPORT'} ne ''){
                                print "--sport $qossettings{'QPORT'} ";
                        }
@@ -531,9 +543,9 @@ print "\n\t### SET PORT-RULES\n";
                                print "-d $qossettings{'DIP'} ";
                        }
                        print "-p $qossettings{'PPROT'} ";
-                       if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
-                               print "-m multiport ";
-                       }
+#                      if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
+#                              print "-m multiport ";
+#                      }
                        if ($qossettings{'QPORT'} ne ''){
                                print "--sport $qossettings{'QPORT'} ";
                        }
@@ -549,9 +561,9 @@ print "\n\t### SET PORT-RULES\n";
                                print "-d $qossettings{'DIP'} ";
                        }
                        print "-p $qossettings{'PPROT'} ";
-                       if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
-                               print "-m multiport ";
-                       }
+#                      if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
+#                              print "-m multiport ";
+#                      }
                        if ($qossettings{'QPORT'} ne ''){
                                print "--sport $qossettings{'QPORT'} ";
                        }
@@ -636,7 +648,8 @@ print <<END
   ;;
   clear|stop)
        ### RESET EVERYTHING TO A KNOWN STATE
-       killall -9 qosd
+       killall qosd
+       (sleep 3 && killall -9 qosd &>/dev/null) &
        # DELETE QDISCS
        tc qdisc del dev $qossettings{'RED_DEV'} root
        tc qdisc del dev $qossettings{'IMQ_DEV'} root