Revert "QoS: Drop support for subclasses"

This reverts commit bc4d4da87009ebffcd93d30dcbfffff797b92588.

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index e5d038e2e089668ca677137da255114814bc6143..0c07a60f135fc2a609706b55685e5aefe1eef46f 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -35,22 +35,26 @@ my $errormessage = "";
 my $c = "";
 my $direntry = "";
 my $classentry = "";
 my $c = "";
 my $direntry = "";
 my $classentry = "";

+my $subclassentry = "";

 my $l7ruleentry = "";
 my $portruleentry = "";
 my $tosruleentry = "";
 my @tmp = ();
 my @classes = ();
 my $l7ruleentry = "";
 my $portruleentry = "";
 my $tosruleentry = "";
 my @tmp = ();
 my @classes = ();

+my @subclasses = ();

 my @l7rules = ();
 my @portrules = ();
 my @tosrules = ();
 my @tmpline = ();
 my @classline = ();
 my @l7rules = ();
 my @portrules = ();
 my @tosrules = ();
 my @tmpline = ();
 my @classline = ();

+my @subclassline = ();

 my @tosruleline = ();
 my @l7ruleline = ();
 my @portruleline = ();
 my @proto = ();
 my %selected= () ;
 my $classfile = "/var/ipfire/qos/classes";
 my @tosruleline = ();
 my @l7ruleline = ();
 my @portruleline = ();
 my @proto = ();
 my %selected= () ;
 my $classfile = "/var/ipfire/qos/classes";

+my $subclassfile = "/var/ipfire/qos/subclasses";

 my $level7file = "/var/ipfire/qos/level7config";
 my $portfile = "/var/ipfire/qos/portconfig";
 my $tosfile = "/var/ipfire/qos/tosconfig";
 my $level7file = "/var/ipfire/qos/level7config";
 my $portfile = "/var/ipfire/qos/portconfig";
 my $tosfile = "/var/ipfire/qos/tosconfig";


@@ -77,6 +81,9 @@ $qossettings{'VALID'} = 'yes';
 open( FILE, "< $classfile" ) or die "Unable to read $classfile";
 @classes = <FILE>;
 close FILE;
 open( FILE, "< $classfile" ) or die "Unable to read $classfile";
 @classes = <FILE>;
 close FILE;

+open( FILE, "< $subclassfile" ) or die "Unable to read $subclassfile";
+@subclasses = <FILE>;
+close FILE;

 open( FILE, "< $level7file" ) or die "Unable to read $level7file";
 @l7rules = <FILE>;
 close FILE;
 open( FILE, "< $level7file" ) or die "Unable to read $level7file";
 @l7rules = <FILE>;
 close FILE;


@@ -176,6 +183,27 @@ foreach $classentry (sort @classes)
                print "\n";
        }
 }
                print "\n";
        }
 }

+foreach $subclassentry (sort @subclasses) {
+       @subclassline = split( /\;/, $subclassentry );
+       if ($qossettings{'RED_DEV'} eq $subclassline[0]) {
+               $qossettings{'DEVICE'} = $subclassline[0];
+               $qossettings{'CLASS'} = $subclassline[1];
+               $qossettings{'SCLASS'} = $subclassline[2];
+               $qossettings{'SPRIO'} = $subclassline[3];
+               $qossettings{'SRATE'} = $subclassline[4];
+               $qossettings{'SCEIL'} = $subclassline[5];
+               $qossettings{'SBURST'} = $subclassline[6];
+               $qossettings{'SCBURST'} = $subclassline[7];
+               print "\ttc class add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} classid 1:$qossettings{'SCLASS'} htb rate $qossettings{'SRATE'}kbit ceil $qossettings{'SCEIL'}kbit prio $qossettings{'SPRIO'} ";
+               if ($qossettings{'SBURST'} > 0) {
+                       print "burst $qossettings{'SBURST'}k ";
+               }
+               if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
+                       print "cburst $qossettings{'CBURST'}k";
+               }
+               print "\n";
+       }
+}

 
 print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
 foreach $classentry (sort @classes)
 
 print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
 foreach $classentry (sort @classes)


@@ -187,6 +215,14 @@ foreach $classentry (sort @classes)
                print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
        }
 }
                print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
        }
 }

+foreach $subclassentry (sort @subclasses) {
+       @subclassline = split( /\;/, $subclassentry );
+       if ($qossettings{'RED_DEV'} eq $subclassline[0]) {
+               $qossettings{'DEVICE'} = $subclassline[0];
+               $qossettings{'SCLASS'} = $subclassline[2];
+               print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n";
+       }
+}

 print <<END
 
        ### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
 print <<END
 
        ### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES


@@ -385,6 +421,27 @@ foreach $classentry (sort @classes)
                print "\n";
        }
 }
                print "\n";
        }
 }

+foreach $subclassentry (sort @subclasses) {
+       @subclassline = split( /\;/, $subclassentry );
+       if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) {
+               $qossettings{'DEVICE'} = $subclassline[0];
+               $qossettings{'CLASS'} = $subclassline[1];
+               $qossettings{'SCLASS'} = $subclassline[2];
+               $qossettings{'SPRIO'} = $subclassline[3];
+               $qossettings{'SRATE'} = $subclassline[4];
+               $qossettings{'SCEIL'} = $subclassline[5];
+               $qossettings{'SBURST'} = $subclassline[6];
+               $qossettings{'SCBURST'} = $subclassline[7];
+               print "\ttc class add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} classid 2:$qossettings{'SCLASS'} htb rate $qossettings{'SRATE'}kbit ceil $qossettings{'SCEIL'}kbit prio $qossettings{'SPRIO'} ";
+               if ($qossettings{'SBURST'} > 0) {
+                       print "burst $qossettings{'SBURST'}k ";
+               }
+               if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
+                       print "cburst $qossettings{'CBURST'}k";
+               }
+               print "\n";
+       }
+}

 
 print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
 foreach $classentry (sort @classes)
 
 print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
 foreach $classentry (sort @classes)


@@ -396,6 +453,15 @@ foreach $classentry (sort @classes)
                print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
        }
 }
                print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
        }
 }

+foreach $subclassentry (sort @subclasses) {
+       @subclassline = split( /\;/, $subclassentry );
+       if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) {
+               $qossettings{'DEVICE'} = $subclassline[0];
+               $qossettings{'SCLASS'} = $subclassline[2];
+               print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n";
+       }
+}
+

 print <<END
 
        ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
 print <<END
 
        ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES


@@ -522,6 +588,17 @@ END
                        print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS'} -j RETURN\n";
                }
        }
                        print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS'} -j RETURN\n";
                }
        }

+       foreach $subclassentry (sort @subclasses)
+       {
+               @subclassline = split( /\;/, $subclassentry );
+               $qossettings{'SUBCLASS'} = $subclassline[1];
+               $qossettings{'TOS'} = $subclassline[8];
+               $qossettings{'TOS'} = abs $qossettings{'TOS'} * 2;
+               if ($qossettings{'TOS'} ne "0") {
+                       print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'SUBCLASS'} -j TOS --set-tos $qossettings{'TOS'}\n";
+                       print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'SUBCLASS'} -j RETURN\n";
+               }
+       }

 
 print <<END
 
 
 print <<END
 

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 61b1c807803e636a3647d28e75b6ac475bd47f5b..412efdc470f2290825f77fd4a69fefc2f4af0f4f 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -30,7 +30,6 @@ WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv

-WARNING: translation string unused: Subclass

 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed


@@ -40,7 +39,6 @@ WARNING: translation string unused: add cron
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service

-WARNING: translation string unused: add subclass

 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: addon
 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: addon


@@ -142,7 +140,6 @@ WARNING: translation string unused: ccd maxclients
 WARNING: translation string unused: cfg restart
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: cfg restart
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config

-WARNING: translation string unused: class in use

 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect
 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect


@@ -551,7 +548,6 @@ WARNING: translation string unused: proxy no proxy extend
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk

-WARNING: translation string unused: qos add subclass

 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3581a688a88023125c68880439092fd6bf7be3bd..9ca53b50a132a0a95e6103deefeaa4de845fabfe 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -80,6 +80,7 @@ WARNING: untranslated string: Scan for Files = Scan for files
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: Scan from Directory = Scan from directory
 WARNING: untranslated string: Set time on boot = Force setting the system clock on boot
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: Scan from Directory = Scan from directory
 WARNING: untranslated string: Set time on boot = Force setting the system clock on boot

+WARNING: untranslated string: Subclass = Subclass

 WARNING: untranslated string: TOS Rule = TOS-Rule
 WARNING: untranslated string: TOS rule = TOS rule
 WARNING: untranslated string: The class number does not match the specified interface. = The class number does not match the specified interface.
 WARNING: untranslated string: TOS Rule = TOS-Rule
 WARNING: untranslated string: TOS rule = TOS rule
 WARNING: untranslated string: The class number does not match the specified interface. = The class number does not match the specified interface.


@@ -106,6 +107,7 @@ WARNING: untranslated string: add new alias = Add a new alias
 WARNING: untranslated string: add new lease = Add a new fixed lease
 WARNING: untranslated string: add printer = Add printer
 WARNING: untranslated string: add share = Add share
 WARNING: untranslated string: add new lease = Add a new fixed lease
 WARNING: untranslated string: add printer = Add printer
 WARNING: untranslated string: add share = Add share

+WARNING: untranslated string: add subclass = Add subclass

 WARNING: untranslated string: add user = Add user
 WARNING: untranslated string: added from dhcp lease list = Added from DHCP lease list
 WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: add user = Add user
 WARNING: untranslated string: added from dhcp lease list = Added from DHCP lease list
 WARNING: untranslated string: addons = Addons


@@ -463,6 +465,7 @@ WARNING: untranslated string: check all = Check all
 WARNING: untranslated string: check vpn lr = Check
 WARNING: untranslated string: cipher = Encryption:
 WARNING: untranslated string: city = City
 WARNING: untranslated string: check vpn lr = Check
 WARNING: untranslated string: cipher = Encryption:
 WARNING: untranslated string: city = City

+WARNING: untranslated string: class in use = The class is already in use.

 WARNING: untranslated string: clear playlist = Empty playlist
 WARNING: untranslated string: clenabled = Provide time to local network
 WARNING: untranslated string: click to disable = Enabled (click to disable)
 WARNING: untranslated string: clear playlist = Empty playlist
 WARNING: untranslated string: clenabled = Provide time to local network
 WARNING: untranslated string: click to disable = Enabled (click to disable)


@@ -1514,6 +1517,7 @@ WARNING: untranslated string: proxy reports weekly = Weekly reports
 WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: pulse = Pulse
 WARNING: untranslated string: pulse dial = Pulse dial:
 WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: pulse = Pulse
 WARNING: untranslated string: pulse dial = Pulse dial:

+WARNING: untranslated string: qos add subclass = Add subclass

 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
 WARNING: untranslated string: qos graphs = Qos Graphs
 WARNING: untranslated string: qos warning = The rule <strong>must</strong> be saved, otherwise it will be discarded!
 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
 WARNING: untranslated string: qos graphs = Qos Graphs
 WARNING: untranslated string: qos warning = The rule <strong>must</strong> be saved, otherwise it will be discarded!

diff --git a/doc/language_issues.es b/doc/language_issues.es
index a4c5bf1f5f6be24f09e0cfd99e66e70ca3e8d45a..2af165d6b1986616ace19987274e05d3870e4180 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -9,7 +9,6 @@ WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv

-WARNING: translation string unused: Subclass

 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed


@@ -19,7 +18,6 @@ WARNING: translation string unused: add cron
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service

-WARNING: translation string unused: add subclass

 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed


@@ -131,7 +129,6 @@ WARNING: translation string unused: cfg restart
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media

-WARNING: translation string unused: class in use

 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect
 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect


@@ -478,7 +475,6 @@ WARNING: translation string unused: proxy no proxy extend
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk

-WARNING: translation string unused: qos add subclass

 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 3d657059feff0bc65b54e23bc3a90a787eb5bb22..f48d65a809eeb0636e2d79e256d43d020df52830 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -31,7 +31,6 @@ WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv

-WARNING: translation string unused: Subclass

 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed


@@ -41,7 +40,6 @@ WARNING: translation string unused: add cron
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service

-WARNING: translation string unused: add subclass

 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed


@@ -161,7 +159,6 @@ WARNING: translation string unused: cfg restart
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media

-WARNING: translation string unused: class in use

 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect
 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect


@@ -580,7 +577,6 @@ WARNING: translation string unused: proxy no proxy extend
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk

-WARNING: translation string unused: qos add subclass

 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 973a7c12cb7b8413ee56c7d3e1d0244f32b3cfda..59c649954130fe49f4fb9aecec1c57af6dfad187 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -10,7 +10,6 @@ WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv

-WARNING: translation string unused: Subclass

 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed


@@ -20,7 +19,6 @@ WARNING: translation string unused: add cron
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service

-WARNING: translation string unused: add subclass

 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed


@@ -139,7 +137,6 @@ WARNING: translation string unused: cfg restart
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media

-WARNING: translation string unused: class in use

 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect
 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect


@@ -555,7 +552,6 @@ WARNING: translation string unused: proxy no proxy extend
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk

-WARNING: translation string unused: qos add subclass

 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 2d5e067267df0967fa0171f2d14dcf8b5d4c69b4..836745e5af0d46688625e034b637903d330e8879 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -10,7 +10,6 @@ WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv

-WARNING: translation string unused: Subclass

 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed


@@ -20,7 +19,6 @@ WARNING: translation string unused: add cron
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service

-WARNING: translation string unused: add subclass

 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed


@@ -138,7 +136,6 @@ WARNING: translation string unused: cfg restart
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media

-WARNING: translation string unused: class in use

 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect
 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect


@@ -550,7 +547,6 @@ WARNING: translation string unused: proxy no proxy extend
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk

-WARNING: translation string unused: qos add subclass

 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index a4c5bf1f5f6be24f09e0cfd99e66e70ca3e8d45a..2af165d6b1986616ace19987274e05d3870e4180 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -9,7 +9,6 @@ WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv

-WARNING: translation string unused: Subclass

 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed


@@ -19,7 +18,6 @@ WARNING: translation string unused: add cron
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service

-WARNING: translation string unused: add subclass

 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed


@@ -131,7 +129,6 @@ WARNING: translation string unused: cfg restart
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media

-WARNING: translation string unused: class in use

 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect
 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect


@@ -478,7 +475,6 @@ WARNING: translation string unused: proxy no proxy extend
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk

-WARNING: translation string unused: qos add subclass

 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 06e68dfd30be7ebb6b45b0de5f835cd5cfac54b0..b904157b1b7f1be7b7f992cdafb08dfd316af278 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -10,7 +10,6 @@ WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv

-WARNING: translation string unused: Subclass

 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed


@@ -20,7 +19,6 @@ WARNING: translation string unused: add cron
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service

-WARNING: translation string unused: add subclass

 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed


@@ -132,7 +130,6 @@ WARNING: translation string unused: cfg restart
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media

-WARNING: translation string unused: class in use

 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect
 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect


@@ -481,7 +478,6 @@ WARNING: translation string unused: proxy no proxy extend
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk

-WARNING: translation string unused: qos add subclass

 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 5bbf9a1b500a436743dc33cd25751188afab7a46..cf773d8cbdf8db2b703b71ee12d435f5b3e6de0e 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -31,7 +31,6 @@ WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv

-WARNING: translation string unused: Subclass

 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: access allowed


@@ -41,7 +40,6 @@ WARNING: translation string unused: add cron
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service
 WARNING: translation string unused: add network
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add service

-WARNING: translation string unused: add subclass

 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed


@@ -161,7 +159,6 @@ WARNING: translation string unused: cfg restart
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media
 WARNING: translation string unused: check for net traffic update
 WARNING: translation string unused: choose config
 WARNING: translation string unused: choose media

-WARNING: translation string unused: class in use

 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect
 WARNING: translation string unused: clear cache
 WARNING: translation string unused: compression
 WARNING: translation string unused: connect


@@ -583,7 +580,6 @@ WARNING: translation string unused: proxy no proxy extend
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk

-WARNING: translation string unused: qos add subclass

 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
 WARNING: translation string unused: reboot question

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 320eef67d1e5971f99c15f443869a55690021885..b7af11204ebd29c9cf20145e5e0c84e76cd3d567 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -38,16 +38,19 @@ my $errormessage = "";
 my $c = "";
 my $direntry = "";
 my $classentry = "";
 my $c = "";
 my $direntry = "";
 my $classentry = "";

+my $subclassentry = "";

 my $l7ruleentry = "";
 my $portruleentry = "";
 my $tosruleentry = "";
 my @tmp = ();
 my @classes = ();
 my $l7ruleentry = "";
 my $portruleentry = "";
 my $tosruleentry = "";
 my @tmp = ();
 my @classes = ();

+my @subclasses = ();

 my @l7rules = ();
 my @portrules = ();
 my @tosrules = ();
 my @tmpline = ();
 my @classline = ();
 my @l7rules = ();
 my @portrules = ();
 my @tosrules = ();
 my @tmpline = ();
 my @classline = ();

+my @subclassline = ();

 my @l7ruleline = ();
 my @portruleline = ();
 my @tosruleline = ();
 my @l7ruleline = ();
 my @portruleline = ();
 my @tosruleline = ();


@@ -55,6 +58,7 @@ my @proto = ();
 my %selected= ();
 my @checked = ();
 my $classfile = "/var/ipfire/qos/classes";
 my %selected= ();
 my @checked = ();
 my $classfile = "/var/ipfire/qos/classes";

+my $subclassfile = "/var/ipfire/qos/subclasses";

 my $level7file = "/var/ipfire/qos/level7config";
 my $portfile = "/var/ipfire/qos/portconfig";
 my $tosfile = "/var/ipfire/qos/tosconfig";
 my $level7file = "/var/ipfire/qos/level7config";
 my $portfile = "/var/ipfire/qos/portconfig";
 my $tosfile = "/var/ipfire/qos/tosconfig";


@@ -81,6 +85,7 @@ $qossettings{'IMQ_DEV_SEL'} = '';
 $qossettings{'PRIO'} = '';
 $qossettings{'SPD'} = '';
 $qossettings{'CLASS'} = '';
 $qossettings{'PRIO'} = '';
 $qossettings{'SPD'} = '';
 $qossettings{'CLASS'} = '';

+$qossettings{'SCLASS'} = '';

 $qossettings{'QPORT'} = '';
 $qossettings{'DPORT'} = '';
 $qossettings{'QIP'} = '';
 $qossettings{'QPORT'} = '';
 $qossettings{'DPORT'} = '';
 $qossettings{'QIP'} = '';


@@ -93,6 +98,7 @@ $qossettings{'MAXBWDTH'} = '';
 $qossettings{'BURST'} = '';
 $qossettings{'CBURST'} = '';
 $qossettings{'DOCLASS'} = '';
 $qossettings{'BURST'} = '';
 $qossettings{'CBURST'} = '';
 $qossettings{'DOCLASS'} = '';

+$qossettings{'DOSCLASS'} = '';

 $qossettings{'DOLEVEL7'} = '';
 $qossettings{'DOPORT'} = '';
 $qossettings{'CLASS'} = '';
 $qossettings{'DOLEVEL7'} = '';
 $qossettings{'DOPORT'} = '';
 $qossettings{'CLASS'} = '';


@@ -188,12 +194,60 @@ elsif ($qossettings{'DOCLASS'} eq $Lang::tr{'delete'})
                }
        }
        close FILE;
                }
        }
        close FILE;

+       open( FILE, "< $subclassfile" ) or die "Unable to read $classfile";
+       @tmp = <FILE>;
+       close FILE;
+       open( FILE, "> $subclassfile" ) or die "Unable to write $classfile";
+       foreach $subclassentry (sort @tmp)
+       {
+               @tmpline = split( /\;/, $subclassentry );
+               if ( $tmpline[1] ne $qossettings{'CLASS'} )
+               {
+                       print FILE $subclassentry;
+               }
+       }
+       close FILE;

        $message = "$Lang::tr{'Class'} $qossettings{'CLASS'} $Lang::tr{'Class was deleted'}";
 }
 
 ############################################################################################################################
 ############################################################################################################################
 
        $message = "$Lang::tr{'Class'} $qossettings{'CLASS'} $Lang::tr{'Class was deleted'}";
 }
 
 ############################################################################################################################
 ############################################################################################################################
 

+if ($qossettings{'DOSCLASS'} eq $Lang::tr{'save'})
+{
+       &validsubclass();
+       &validminbwdth();
+       if ( $qossettings{'VALID'} eq 'yes' ) {
+               open( FILE, ">> $subclassfile" ) or die "Unable to write $subclassfile";
+               print FILE <<END
+$qossettings{'DEVICE'};$qossettings{'CLASS'};$qossettings{'SCLASS'};$qossettings{'PRIO'};$qossettings{'MINBWDTH'};$qossettings{'MAXBWDTH'};$qossettings{'BURST'};$qossettings{'CBURST'};$qossettings{'TOS'};
+END
+;
+               close FILE;
+       } else {
+               $qossettings{'ACTION'} = $Lang::tr{'qos add subclass'};
+       }
+} elsif ($qossettings{'DOSCLASS'} eq $Lang::tr{'delete'})
+{
+       open( FILE, "< $subclassfile" ) or die "Unable to read $classfile";
+       @tmp = <FILE>;
+       close FILE;
+       open( FILE, "> $subclassfile" ) or die "Unable to write $classfile";
+       foreach $subclassentry (sort @tmp)
+       {
+               @tmpline = split( /\;/, $subclassentry );
+               if ( $tmpline[2] ne $qossettings{'CLASS'} )
+               {
+                       print FILE $subclassentry;
+               }
+       }
+       close FILE;
+       $message = "$Lang::tr{'Subclass'} $qossettings{'CLASS'} $Lang::tr{'was deleted'}.";
+}
+
+############################################################################################################################
+############################################################################################################################
+

 if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'})
 {
        if ( $qossettings{'QIP'} ne '' ) {
 if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'})
 {
        if ( $qossettings{'QIP'} ne '' ) {


@@ -558,6 +612,13 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'parentclass add'} )
        &Header::closepage();
        exit
 }
        &Header::closepage();
        exit
 }

+elsif ($qossettings{'ACTION'} eq $Lang::tr{'qos add subclass'})
+{
+       &subclass();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit
+}

 elsif ($qossettings{'ACTION'} eq $Lang::tr{'Add Rule'})
 {
        &Header::openbox('100%', 'center', $Lang::tr{'Add Rule'});
 elsif ($qossettings{'ACTION'} eq $Lang::tr{'Add Rule'})
 {
        &Header::openbox('100%', 'center', $Lang::tr{'Add Rule'});


@@ -906,6 +967,81 @@ END
        &Header::closebox();
 }
 
        &Header::closebox();
 }
 

+sub subclass {
+       &Header::openbox('100%', 'center', $Lang::tr{'Subclass'});
+       print <<END
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <table width='66%'>
+END
+;
+       if ( $message ne "" ) {
+               print "<tr><td colspan='3' align='center'>$message";
+       }
+       print <<END
+               <tr><td colspan='3' width='100%'>$Lang::tr{'current class'}: $qossettings{'CLASS'}
+               <tr><td width='100%' colspan='3'>$Lang::tr{'enter data'}
+               <tr><td width='33%' align='right'>$Lang::tr{'Subclass'}:<td width='33%' align='left'><select name='SCLASS'>
+END
+;
+       if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
+               $qossettings{'DEVICE'} = $qossettings{'RED_DEV'};
+               for ( $c = 1000 ; $c <= 1020 ; $c++ )
+               {
+                       if ( $qossettings{'SCLASS'} ne $c )
+                       { print "<option value='$c'>$c</option>\n"; }
+                       else { print "<option selected value='$c'>$c</option>\n"; }
+               }
+       } elsif ($qossettings{'CLASS'} >= 200 && $qossettings{'CLASS'} < 221) {
+               $qossettings{'DEVICE'} = $qossettings{'IMQ_DEV'};
+               for ( $c = 2000 ; $c <= 2020 ; $c++ )
+               {
+                       if ( $qossettings{'SCLASS'} ne $c )
+                       { print "<option value='$c'>$c</option>\n"; }
+                       else { print "<option selected value='$c'>$c</option>\n"; }
+               }
+       }
+       print <<END
+               </select>
+               <td width='33%' align='center'>&nbsp;
+               <tr><td width='33%' align='right'>$Lang::tr{'priority'}:<td width='33%' align='left'><select name='PRIO'>
+END
+;
+               for ( $c = 1 ; $c <= 7 ; $c++ )
+               {
+                       if ( $qossettings{'PRIO'} ne $c )
+                       { print "<option value='$c'>$c</option>\n"; }
+                       else { print "<option selected value='$c'>$c</option>\n"; }
+               }
+               print <<END
+               <td width='33%' align='center'>&nbsp;
+               <tr><td width='33%' align='right'>$Lang::tr{'guaranteed bandwith'}:
+                   <td width='33%' align='left'><input type='text' name='MINBWDTH' maxlength='8' required='1' value="$qossettings{'MINBWDTH'}" />
+                   <td width='33%' align='center'>&nbsp;
+               <tr><td width='33%' align='right'>$Lang::tr{'max bandwith'}:
+                   <td width='33%' align='left'><input type='text' name='MAXBWDTH' maxlength='8' required='1' value="$qossettings{'MAXBWDTH'}" />
+                   <td width='33%' align='center'>&nbsp;
+               <tr><td width='33%' align='right'>Burst:
+                   <td width='33%' align='left'><input type='text' name='BURST' maxlength='8' value="$qossettings{'BURST'}" />
+                   <td width='33%' align='center'>&nbsp;
+               <tr><td width='33%' align='right'>Ceilburst:
+                   <td width='33%' align='left'><input type='text' name='CBURST' maxlength='8' value="$qossettings{'CBURST'}" />
+                   <td width='33%' align='center'>&nbsp;
+               <tr><td width='33%' align='right'>TOS-Bit:
+                   <td width='33%' align='left'><select name='TOS'>
+                               <option value='0'>$Lang::tr{'disabled'} (0)</option>
+                               <option value='8'>$Lang::tr{'min delay'} (8)</option>
+                               <option value='4'>$Lang::tr{'max throughput'} (4)</option>
+                               <option value='2'>$Lang::tr{'max reliability'} (2)</option>
+                               <option value='1'>$Lang::tr{'min costs'} (1)</option></select>
+                   <td width='33%' align='center'><input type='hidden' name='CLASS' value="$qossettings{'CLASS'}" />
+                                                       <input type='hidden' name='DEVICE' value="$qossettings{'DEVICE'}" />
+                                                       <input type='submit' name='DOSCLASS' value='$Lang::tr{'save'}' />&nbsp;<input type='reset' value='$Lang::tr{'reset'}' />
+               </table></form>
+END
+;
+       &Header::closebox();
+}
+

 sub level7rule {
        &Header::openbox('100%', 'center', $Lang::tr{'Level7 Rule'});
        print <<END
 sub level7rule {
        &Header::openbox('100%', 'center', $Lang::tr{'Level7 Rule'});
        print <<END


@@ -1028,6 +1164,9 @@ sub showclasses {
        @classes = <FILE>;
        close FILE;
        if (@classes) {
        @classes = <FILE>;
        close FILE;
        if (@classes) {

+               open( FILE, "< $subclassfile" ) or die "Unable to read $subclassfile";
+               @subclasses = <FILE>;
+               close FILE;

                open( FILE, "< $level7file" ) or die "Unable to read $level7file";
                @l7rules = <FILE>;
                close FILE;
                open( FILE, "< $level7file" ) or die "Unable to read $level7file";
                @l7rules = <FILE>;
                close FILE;


@@ -1064,6 +1203,11 @@ sub showclasses {
                                    <td align='center' bgcolor='$color{'color22'}'>$classline[7]</td>
                                    <td align='right'  bgcolor='$color{'color22'}'>
                                        <table border='0'><tr>
                                    <td align='center' bgcolor='$color{'color22'}'>$classline[7]</td>
                                    <td align='right'  bgcolor='$color{'color22'}'>
                                        <table border='0'><tr>

+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]' />
+                                               <input type='hidden' name='ACTION' value='$Lang::tr{'qos add subclass'}' />
+                                               <input type='image' alt='$Lang::tr{'add subclass'}' title='$Lang::tr{'add subclass'}' src='/images/addblue.gif' />
+                                       </form>

                                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='CLASS' value='$classline[1]' />
                                                <input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' />
                                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='CLASS' value='$classline[1]' />
                                                <input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' />


@@ -1242,6 +1386,41 @@ END
                                }
 END
 ;
                                }
 END
 ;

+                               foreach $subclassentry (sort @subclasses)
+                               {
+                                       @subclassline = split( /\;/, $subclassentry );
+                                       if ( $subclassline[1] eq $classline[1] ) {
+                                               print <<END
+                                                       <tr><td align='center' bgcolor='#FAFAFA'>$Lang::tr{'Subclass'}:
+                                                           <td align='center' bgcolor='#FAFAFA'>$subclassline[2]
+                                                           <td align='center' bgcolor='#FAFAFA'>$subclassline[3]
+                                                           <td align='center' bgcolor='#FAFAFA'>$subclassline[4]
+                                                           <td align='center' bgcolor='#FAFAFA'>$subclassline[5]
+                                                           <td align='center' bgcolor='#FAFAFA'>$subclassline[6]
+                                                           <td align='center' bgcolor='#FAFAFA'>$subclassline[7]
+                                                           <td align='center' bgcolor='#FAFAFA'>$subclassline[8]
+                                                           <td align='right'  bgcolor='#FAFAFA'>
+                                               <table border='0'><tr>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]' />
+                                                       <input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' />
+                                                       <input type='image' alt='$Lang::tr{'Add Rule'}' title='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
+                                               </form>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]' />
+                                                       <input type='hidden' name='DOSCLASS' value='$Lang::tr{'edit'}' />
+                                                       <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+                                               </form>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]' />
+                                                       <input type='hidden' name='DOSCLASS' value='$Lang::tr{'delete'}' />
+                                                       <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
+                                               </form>
+                                               </table>
+END
+;
+                                       }
+                               }

                        print <<END
                        </table>
 END
                        print <<END
                        </table>
 END


@@ -1309,3 +1488,21 @@ sub validclass {
                }
        }
 }
                }
        }
 }

+
+sub validsubclass {
+       if ( $qossettings{'VALID'} eq 'yes' ) {
+               open( FILE, "< $subclassfile" ) or die "Unable to read $subclassfile";
+               @tmp = <FILE>;
+               close FILE;
+               foreach $subclassentry (sort @tmp)
+               {
+                       @tmpline = split( /\;/, $subclassentry );
+                       if ( $tmpline[2] eq $qossettings{'SCLASS'} )
+                       {
+                               $qossettings{'VALID'} = 'no';
+                               $message = "$Lang::tr{'class in use'}";
+                               last
+                       }
+               }
+       }
+}