Merge remote-tracking branch 'origin/next' into thirteen

[people/teissler/ipfire-2.x.git] / html / cgi-bin / qos.cgi

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 26e0eef5084c815cfe67eee1860bde0e493e89a1..300e6ae4515604170898a717bcadb37fa27c31ac 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -74,9 +74,8 @@ $qossettings{'DEFCLASS_INC'} = '';
 $qossettings{'DEFCLASS_OUT'} = '';
 $qossettings{'ACK'} = '';
 $qossettings{'MTU'} = '1492';
-$qossettings{'SFQ_PERTUB'} = '10';
-$qossettings{'QLENGTH'} = '30';
-$qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
+$qossettings{'QLENGTH'} = '1000';
+$qossettings{'RED_DEV'} = 'ppp0';
 $qossettings{'IMQ_DEV'} = 'imq0';
 $qossettings{'VALID'} = 'yes';
 ### Values that have to be initialized
@@ -113,6 +112,8 @@ $qossettings{'TOS'} = '';
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
 &Header::getcgihash(\%qossettings);
 
+$qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
+
 my %color = ();
 my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -529,7 +530,7 @@ END
        open( FILE, "> $level7file" ) or die "Unable to write $level7file";
        print FILE <<END
 102;$qossettings{'RED_DEV'};dns;;;
-102;$qossettings{'RED_DEV'};sip;;;
+102;$qossettings{'RED_DEV'};rtp;;;
 102;$qossettings{'RED_DEV'};skypetoskype;;;
 103;$qossettings{'RED_DEV'};ssh;;;
 103;$qossettings{'RED_DEV'};rdp;;;
@@ -538,6 +539,7 @@ END
 104;$qossettings{'RED_DEV'};pop3;;;
 120;$qossettings{'RED_DEV'};applejuice;;;
 120;$qossettings{'RED_DEV'};bittorrent;;;
+200;imq0;rtp;;;
 200;imq0;skypetoskype;;;
 203;imq0;ssh;;;
 203;imq0;rdp;;;
@@ -1445,9 +1447,6 @@ sub expert
                    <td width='33%' align='center'>$Lang::tr{'mtu QoS'}
                <tr><td width='33%' align='right'>$Lang::tr{'Queuelenght'}:<td width='33%' align='left'>
                        <input type='text' name='QLENGTH' maxlength='8' required='2' value='$qossettings{'QLENGTH'}' />
-                   <td width='33%' align='center'>&nbsp;
-               <tr><td width='33%' align='right'>SFQ Perturb:<td width='33%' align='left'>
-                       <input type='text' name='SFQ_PERTUB' maxlength='8' required='1' value='$qossettings{'SFQ_PERTUB'}' />
                    <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
                </table>
                </form>