tc: dont be limited to HTB

diff --git a/plugins.d/tc-qos-helper.sh b/plugins.d/tc-qos-helper.sh
index 29e31ec5028e04a72fe3d57e8e1a6870f18e0d01..86f71712282bd307c7eb1d0cf64634958083228d 100755 (executable)
--- a/plugins.d/tc-qos-helper.sh
+++ b/plugins.d/tc-qos-helper.sh
@@ -41,7 +41,6 @@ show_tc() {
        local x="$1"
 
        echo "BEGIN $x"
-
        $tc_cmd -s class show dev $x
 
        # check FireQOS names for classes
@@ -51,12 +50,12 @@ show_tc() {
                echo "SETDEVICENAME $name"
 
                interface_classes=
+               interface_classes_monitor=
                . /var/run/fireqos/$name.conf
                for n in $interface_classes_monitor
                do
-                               setclassname $(echo $n | tr '|' ' ')
+                       setclassname $(echo $n | tr '|' ' ')
                done
-
                echo "SETDEVICEGROUP $interface_dev"
        fi
        echo "END $x"

diff --git a/src/plugin_tc.c b/src/plugin_tc.c
index d151879106a29accaff9690d33c04984f47fb7c4..ee942729739a85a35f1eb900d36ce3880867c1b9 100755 (executable)
--- a/src/plugin_tc.c
+++ b/src/plugin_tc.c
@@ -558,10 +558,10 @@ void *tc_main(void *ptr)
                                class = NULL;
 
                                if(words[1] && words[2] && words[3] && words[4] && (strcmp(words[3], "parent") == 0 || strcmp(words[3], "root") == 0)) {
-                                       char *type     = words[1];  // the class: htb, fq_codel, etc
+                                       //char *type     = words[1];  // the class: htb, fq_codel, etc
 
                                        // we are only interested for HTB classes
-                                       if(strcmp(type, "htb") != 0) continue;
+                                       //if(strcmp(type, "htb") != 0) continue;
 
                                        char *id       = words[2];      // the class major:minor
                                        char *parent   = words[3];      // 'parent' or 'root'