tc class: Show class names from file
It is possible to use class names from file /etc/iproute2/cls_names
which tc will use when showing class info:
# tc/tc -nm class show dev lo
class htb 1:10 parent 1:1 leaf 10: prio 0 rate 5Mbit ceil 5Mbit burst 15Kb cburst 1600b
class htb 1:1 root rate 6Mbit ceil 6Mbit burst 15Kb cburst 1599b
class htb web#1:20 parent 1:1 leaf 20: prio 0 rate 3Mbit ceil 6Mbit burst 15Kb cburst 1599b
class htb 1:2 root rate 6Mbit ceil 6Mbit burst 15Kb cburst 1599b
class htb 1:30 parent 1:1 leaf 30: prio 0 rate 1Kbit ceil 6Mbit burst 15Kb cburst 1599b
class htb voip#1:40 parent 1:2 leaf 40: prio 0 rate 5Mbit ceil 5Mbit burst 15Kb cburst 1600b
class htb 1:50 parent 1:2 leaf 50: prio 0 rate 3Mbit ceil 6Mbit burst 15Kb cburst 1599b
class htb 1:60 parent 1:2 leaf 60: prio 0 rate 1Kbit ceil 6Mbit burst 15Kb cburst 1599b
or to specify via file path:
# tc/tc -nm -cf /tmp/cls_names class show dev lo
Class names file contains simple "maj:min name" structure:
1:20 web
1:40 voip
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
diff --git a/tc/tc_util.c b/tc/tc_util.c
index f1fca0a..feae439 100644
--- a/tc/tc_util.c
+++ b/tc/tc_util.c
@@ -23,12 +23,34 @@
#include <math.h>
#include "utils.h"
+#include "names.h"
#include "tc_util.h"
+#include "tc_common.h"
#ifndef LIBDIR
#define LIBDIR "/usr/lib"
#endif
+static struct db_names *cls_names = NULL;
+
+#define NAMES_DB "/etc/iproute2/cls_names"
+
+int cls_names_init(char *path)
+{
+ cls_names = db_names_alloc(path ?: NAMES_DB);
+ if (!cls_names) {
+ fprintf(stderr, "Error while opening class names file\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+void cls_names_uninit(void)
+{
+ db_names_free(cls_names);
+}
+
const char *get_tc_lib(void)
{
const char *lib_dir;
@@ -97,20 +119,34 @@
int print_tc_classid(char *buf, int len, __u32 h)
{
+ char handle[40] = {};
+
if (h == TC_H_ROOT)
- sprintf(buf, "root");
+ sprintf(handle, "root");
else if (h == TC_H_UNSPEC)
- snprintf(buf, len, "none");
+ snprintf(handle, len, "none");
else if (TC_H_MAJ(h) == 0)
- snprintf(buf, len, ":%x", TC_H_MIN(h));
+ snprintf(handle, len, ":%x", TC_H_MIN(h));
else if (TC_H_MIN(h) == 0)
- snprintf(buf, len, "%x:", TC_H_MAJ(h)>>16);
+ snprintf(handle, len, "%x:", TC_H_MAJ(h) >> 16);
else
- snprintf(buf, len, "%x:%x", TC_H_MAJ(h)>>16, TC_H_MIN(h));
+ snprintf(handle, len, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h));
+
+ if (use_names) {
+ char clname[IDNAME_MAX] = {};
+
+ if (id_to_name(cls_names, h, clname))
+ snprintf(buf, len, "%s#%s", clname, handle);
+ else
+ snprintf(buf, len, "%s", handle);
+ } else {
+ snprintf(buf, len, "%s", handle);
+ }
+
return 0;
}
-char * sprint_tc_classid(__u32 h, char *buf)
+char *sprint_tc_classid(__u32 h, char *buf)
{
if (print_tc_classid(buf, SPRINT_BSIZE-1, h))
strcpy(buf, "???");