]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - tc/tc.c
tc flower: fix parsing vlan_id and vlan_prio
[mirror_iproute2.git] / tc / tc.c
diff --git a/tc/tc.c b/tc/tc.c
index 9b50e7474769affc0f297198b1fcbf6bd8a09d1a..af9b21dae1fcd0bc2d8c28c889b51b74581d27ce 100644 (file)
--- a/tc/tc.c
+++ b/tc/tc.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <dlfcn.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <errno.h>
 
-#include "SNAPSHOT.h"
+#include "version.h"
 #include "utils.h"
 #include "tc_util.h"
 #include "tc_common.h"
+#include "namespace.h"
+#include "rt_names.h"
+
+int show_stats;
+int show_details;
+int show_raw;
+int show_graph;
+int timestamp;
+
+int batch_mode;
+int use_iec;
+int force;
+bool use_names;
+int json;
+int color;
+int oneline;
+int brief;
+
+static char *conf_file;
 
-int show_stats = 0;
-int show_details = 0;
-int show_raw = 0;
-int show_pretty = 0;
-int batch_mode = 0;
-
-int resolve_hosts = 0;
-int use_iec = 0;
-int force = 0;
 struct rtnl_handle rth;
 
-static void *BODY = NULL;      /* cached handle dlopen(NULL) */
-static struct qdisc_util * qdisc_list;
-static struct filter_util * filter_list;
+static void *BODY;     /* cached handle dlopen(NULL) */
+static struct qdisc_util *qdisc_list;
+static struct filter_util *filter_list;
 
 static int print_noqopt(struct qdisc_util *qu, FILE *f,
                        struct rtattr *opt)
 {
        if (opt && RTA_PAYLOAD(opt))
                fprintf(f, "[Unknown qdisc, optlen=%u] ",
-                       (unsigned) RTA_PAYLOAD(opt));
+                       (unsigned int) RTA_PAYLOAD(opt));
        return 0;
 }
 
-static int parse_noqopt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
+static int parse_noqopt(struct qdisc_util *qu, int argc, char **argv,
+                       struct nlmsghdr *n, const char *dev)
 {
        if (argc) {
-               fprintf(stderr, "Unknown qdisc \"%s\", hence option \"%s\" is unparsable\n", qu->id, *argv);
+               fprintf(stderr,
+                       "Unknown qdisc \"%s\", hence option \"%s\" is unparsable\n",
+                       qu->id, *argv);
                return -1;
        }
        return 0;
@@ -67,22 +79,26 @@ static int print_nofopt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u
 {
        if (opt && RTA_PAYLOAD(opt))
                fprintf(f, "fh %08x [Unknown filter, optlen=%u] ",
-                       fhandle, (unsigned) RTA_PAYLOAD(opt));
+                       fhandle, (unsigned int) RTA_PAYLOAD(opt));
        else if (fhandle)
                fprintf(f, "fh %08x ", fhandle);
        return 0;
 }
 
-static int parse_nofopt(struct filter_util *qu, char *fhandle, int argc, char **argv, struct nlmsghdr *n)
+static int parse_nofopt(struct filter_util *qu, char *fhandle,
+                       int argc, char **argv, struct nlmsghdr *n)
 {
        __u32 handle;
 
        if (argc) {
-               fprintf(stderr, "Unknown filter \"%s\", hence option \"%s\" is unparsable\n", qu->id, *argv);
+               fprintf(stderr,
+                       "Unknown filter \"%s\", hence option \"%s\" is unparsable\n",
+                       qu->id, *argv);
                return -1;
        }
        if (fhandle) {
                struct tcmsg *t = NLMSG_DATA(n);
+
                if (get_u32(&handle, fhandle, 16)) {
                        fprintf(stderr, "Unparsable filter ID \"%s\"\n", fhandle);
                        return -1;
@@ -125,11 +141,9 @@ reg:
        return q;
 
 noexist:
-       q = malloc(sizeof(*q));
+       q = calloc(1, sizeof(*q));
        if (q) {
-
-               memset(q, 0, sizeof(*q));
-               q->id = strcpy(malloc(strlen(str)+1), str);
+               q->id = strdup(str);
                q->parse_qopt = parse_noqopt;
                q->print_qopt = print_noqopt;
                goto reg;
@@ -169,9 +183,8 @@ reg:
        filter_list = q;
        return q;
 noexist:
-       q = malloc(sizeof(*q));
+       q = calloc(1, sizeof(*q));
        if (q) {
-               memset(q, 0, sizeof(*q));
                strncpy(q->id, str, 15);
                q->parse_fopt = parse_nofopt;
                q->print_fopt = print_nofopt;
@@ -182,29 +195,34 @@ noexist:
 
 static void usage(void)
 {
-       fprintf(stderr, "Usage: tc [ OPTIONS ] OBJECT { COMMAND | help }\n"
-                       "       tc [-force] -batch filename\n"
-                       "where  OBJECT := { qdisc | class | filter | action | monitor }\n"
-                       "       OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] | -p[retty] | -b[atch] [filename] }\n");
+       fprintf(stderr,
+               "Usage: tc [ OPTIONS ] OBJECT { COMMAND | help }\n"
+               "       tc [-force] -batch filename\n"
+               "where  OBJECT := { qdisc | class | filter | chain |\n"
+               "                   action | monitor | exec }\n"
+               "       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[aw] |\n"
+               "                   -o[neline] | -j[son] | -p[retty] | -c[olor]\n"
+               "                   -b[atch] [filename] | -n[etns] name | -N[umeric] |\n"
+               "                    -nm | -nam[es] | { -cf | -conf } path\n"
+               "                    -br[ief] }\n");
 }
 
 static int do_cmd(int argc, char **argv)
 {
        if (matches(*argv, "qdisc") == 0)
                return do_qdisc(argc-1, argv+1);
-
        if (matches(*argv, "class") == 0)
                return do_class(argc-1, argv+1);
-
        if (matches(*argv, "filter") == 0)
                return do_filter(argc-1, argv+1);
-
+       if (matches(*argv, "chain") == 0)
+               return do_chain(argc-1, argv+1);
        if (matches(*argv, "actions") == 0)
                return do_action(argc-1, argv+1);
-
        if (matches(*argv, "monitor") == 0)
                return do_tcmonitor(argc-1, argv+1);
-
+       if (matches(*argv, "exec") == 0)
+               return do_exec(argc-1, argv+1);
        if (matches(*argv, "help") == 0) {
                usage();
                return 0;
@@ -215,21 +233,16 @@ static int do_cmd(int argc, char **argv)
        return -1;
 }
 
+static int tc_batch_cmd(int argc, char *argv[], void *data)
+{
+       return do_cmd(argc, argv);
+}
+
 static int batch(const char *name)
 {
-       char *line = NULL;
-       size_t len = 0;
-       int ret = 0;
+       int ret;
 
        batch_mode = 1;
-       if (name && strcmp(name, "-") != 0) {
-               if (freopen(name, "r", stdin) == NULL) {
-                       fprintf(stderr, "Cannot open file \"%s\" for reading: %s\n",
-                               name, strerror(errno));
-                       return -1;
-               }
-       }
-
        tc_core_init();
 
        if (rtnl_open(&rth, 0) < 0) {
@@ -237,24 +250,7 @@ static int batch(const char *name)
                return -1;
        }
 
-       cmdlineno = 0;
-       while (getcmdline(&line, &len, stdin) != -1) {
-               char *largv[100];
-               int largc;
-
-               largc = makeargs(line, largv, 100);
-               if (largc == 0)
-                       continue;       /* blank line */
-
-               if (do_cmd(largc, largv)) {
-                       fprintf(stderr, "Command failed %s:%d\n", name, cmdlineno);
-                       ret = 1;
-                       if (!force)
-                               break;
-               }
-       }
-       if (line)
-               free(line);
+       ret = do_batch(name, force, tc_batch_cmd, NULL);
 
        rtnl_close(&rth);
        return ret;
@@ -277,9 +273,11 @@ int main(int argc, char **argv)
                } else if (matches(argv[1], "-raw") == 0) {
                        ++show_raw;
                } else if (matches(argv[1], "-pretty") == 0) {
-                       ++show_pretty;
+                       ++pretty;
+               } else if (matches(argv[1], "-graph") == 0) {
+                       show_graph = 1;
                } else if (matches(argv[1], "-Version") == 0) {
-                       printf("tc utility, iproute2-ss%s\n", SNAPSHOT);
+                       printf("tc utility, iproute2-%s\n", version);
                        return 0;
                } else if (matches(argv[1], "-iec") == 0) {
                        ++use_iec;
@@ -288,18 +286,49 @@ int main(int argc, char **argv)
                        return 0;
                } else if (matches(argv[1], "-force") == 0) {
                        ++force;
-               } else  if (matches(argv[1], "-batch") == 0) {
+               } else if (matches(argv[1], "-batch") == 0) {
                        argc--; argv++;
                        if (argc <= 1)
                                usage();
                        batch_file = argv[1];
+               } else if (matches(argv[1], "-netns") == 0) {
+                       NEXT_ARG();
+                       if (netns_switch(argv[1]))
+                               return -1;
+               } else if (matches(argv[1], "-Numeric") == 0) {
+                       ++numeric;
+               } else if (matches(argv[1], "-names") == 0 ||
+                               matches(argv[1], "-nm") == 0) {
+                       use_names = true;
+               } else if (matches(argv[1], "-cf") == 0 ||
+                               matches(argv[1], "-conf") == 0) {
+                       NEXT_ARG();
+                       conf_file = argv[1];
+               } else if (matches_color(argv[1], &color)) {
+               } else if (matches(argv[1], "-timestamp") == 0) {
+                       timestamp++;
+               } else if (matches(argv[1], "-tshort") == 0) {
+                       ++timestamp;
+                       ++timestamp_short;
+               } else if (matches(argv[1], "-json") == 0) {
+                       ++json;
+               } else if (matches(argv[1], "-oneline") == 0) {
+                       ++oneline;
+               }else if (matches(argv[1], "-brief") == 0) {
+                       ++brief;
                } else {
-                       fprintf(stderr, "Option \"%s\" is unknown, try \"tc -help\".\n", argv[1]);
+                       fprintf(stderr,
+                               "Option \"%s\" is unknown, try \"tc -help\".\n",
+                               argv[1]);
                        return -1;
                }
                argc--; argv++;
        }
 
+       _SL_ = oneline ? "\\" : "\n";
+
+       check_enable_color(color, json);
+
        if (batch_file)
                return batch(batch_file);
 
@@ -314,8 +343,17 @@ int main(int argc, char **argv)
                exit(1);
        }
 
+       if (use_names && cls_names_init(conf_file)) {
+               ret = -1;
+               goto Exit;
+       }
+
        ret = do_cmd(argc-1, argv+1);
+Exit:
        rtnl_close(&rth);
 
+       if (use_names)
+               cls_names_uninit();
+
        return ret;
 }