tc: parse attributes with NLA_F_NESTED flag

[mirror_iproute2.git] / tc / tc_qdisc.c

diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c
index 8cc4b73d9d10733191db898d90d6d73b4ee66de1..181fe2f0403f5bc5b3f2c009a5912f550c9d0d7c 100644 (file)
--- a/tc/tc_qdisc.c
+++ b/tc/tc_qdisc.c
@@ -27,18 +27,19 @@
 
 static int usage(void)
 {
-       fprintf(stderr, "Usage: tc qdisc [ add | del | replace | change | show ] dev STRING\n");
-       fprintf(stderr, "       [ handle QHANDLE ] [ root | ingress | clsact | parent CLASSID ]\n");
-       fprintf(stderr, "       [ estimator INTERVAL TIME_CONSTANT ]\n");
-       fprintf(stderr, "       [ stab [ help | STAB_OPTIONS] ]\n");
-       fprintf(stderr, "       [ ingress_block BLOCK_INDEX ] [ egress_block BLOCK_INDEX ]\n");
-       fprintf(stderr, "       [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "       tc qdisc show [ dev STRING ] [ ingress | clsact ] [ invisible ]\n");
-       fprintf(stderr, "Where:\n");
-       fprintf(stderr, "QDISC_KIND := { [p|b]fifo | tbf | prio | cbq | red | etc. }\n");
-       fprintf(stderr, "OPTIONS := ... try tc qdisc add <desired QDISC_KIND> help\n");
-       fprintf(stderr, "STAB_OPTIONS := ... try tc qdisc add stab help\n");
+       fprintf(stderr,
+               "Usage: tc qdisc [ add | del | replace | change | show ] dev STRING\n"
+               "       [ handle QHANDLE ] [ root | ingress | clsact | parent CLASSID ]\n"
+               "       [ estimator INTERVAL TIME_CONSTANT ]\n"
+               "       [ stab [ help | STAB_OPTIONS] ]\n"
+               "       [ ingress_block BLOCK_INDEX ] [ egress_block BLOCK_INDEX ]\n"
+               "       [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n"
+               "\n"
+               "       tc qdisc show [ dev STRING ] [ ingress | clsact ] [ invisible ]\n"
+               "Where:\n"
+               "QDISC_KIND := { [p|b]fifo | tbf | prio | cbq | red | etc. }\n"
+               "OPTIONS := ... try tc qdisc add <desired QDISC_KIND> help\n"
+               "STAB_OPTIONS := ... try tc qdisc add stab help\n");
        return -1;
 }
 
@@ -182,14 +183,13 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv)
                        return -1;
                }
 
-               tail = NLMSG_TAIL(&req.n);
-               addattr_l(&req.n, sizeof(req), TCA_STAB, NULL, 0);
+               tail = addattr_nest(&req.n, sizeof(req), TCA_STAB);
                addattr_l(&req.n, sizeof(req), TCA_STAB_BASE, &stab.szopts,
                          sizeof(stab.szopts));
                if (stab.data)
                        addattr_l(&req.n, sizeof(req), TCA_STAB_DATA, stab.data,
                                  stab.szopts.tsize * sizeof(__u16));
-               tail->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)tail;
+               addattr_nest_end(&req.n, tail);
                if (stab.data)
                        free(stab.data);
        }
@@ -200,10 +200,8 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv)
                ll_init_map(&rth);
 
                idx = ll_name_to_index(d);
-               if (idx == 0) {
-                       fprintf(stderr, "Cannot find device \"%s\"\n", d);
-                       return 1;
-               }
+               if (!idx)
+                       return -nodev(d);
                req.t.tcm_ifindex = idx;
        }
 
@@ -215,8 +213,7 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv)
 
 static int filter_ifindex;
 
-int print_qdisc(const struct sockaddr_nl *who,
-               struct nlmsghdr *n, void *arg)
+int print_qdisc(struct nlmsghdr *n, void *arg)
 {
        FILE *fp = (FILE *)arg;
        struct tcmsg *t = NLMSG_DATA(n);
@@ -238,7 +235,7 @@ int print_qdisc(const struct sockaddr_nl *who,
        if (filter_ifindex && filter_ifindex != t->tcm_ifindex)
                return 0;
 
-       parse_rtattr(tb, TCA_MAX, TCA_RTA(t), len);
+       parse_rtattr_flags(tb, TCA_MAX, TCA_RTA(t), len, NLA_F_NESTED);
 
        if (tb[TCA_KIND] == NULL) {
                fprintf(stderr, "print_qdisc: NULL kind\n");
@@ -271,8 +268,7 @@ int print_qdisc(const struct sockaddr_nl *who,
        print_string(PRINT_FP, NULL, " ", NULL);
 
        if (filter_ifindex == 0)
-               print_string(PRINT_ANY, "dev", "dev %s ",
-                            ll_index_to_name(t->tcm_ifindex));
+               print_devname(PRINT_ANY, t->tcm_ifindex);
 
        if (t->tcm_parent == TC_H_ROOT)
                print_bool(PRINT_ANY, "root", "root ", true);
@@ -317,16 +313,15 @@ int print_qdisc(const struct sockaddr_nl *who,
                if (q)
                        q->print_qopt(q, fp, tb[TCA_OPTIONS]);
                else
-                       print_string(PRINT_FP, NULL,
-                                    "[cannot parse qdisc parameters]", NULL);
+                       fprintf(stderr, "Cannot parse qdisc parameters\n");
        }
        close_json_object();
 
-       print_string(PRINT_FP, NULL, "\n", NULL);
+       print_nl();
 
        if (show_details && tb[TCA_STAB]) {
                print_size_table(fp, " ", tb[TCA_STAB]);
-               print_string(PRINT_FP, NULL, "\n", NULL);
+               print_nl();
        }
 
        if (show_stats) {
@@ -334,12 +329,12 @@ int print_qdisc(const struct sockaddr_nl *who,
 
                if (tb[TCA_STATS] || tb[TCA_STATS2] || tb[TCA_XSTATS]) {
                        print_tcstats_attr(fp, tb, " ", &xstats);
-                       print_string(PRINT_FP, NULL, "\n", NULL);
+                       print_nl();
                }
 
                if (q && xstats && q->print_xstats) {
                        q->print_xstats(q, fp, xstats);
-                       print_string(PRINT_FP, NULL, "\n", NULL);
+                       print_nl();
                }
        }
        close_json_object();
@@ -380,10 +375,8 @@ static int tc_qdisc_list(int argc, char **argv)
 
        if (d[0]) {
                t.tcm_ifindex = ll_name_to_index(d);
-               if (t.tcm_ifindex == 0) {
-                       fprintf(stderr, "Cannot find device \"%s\"\n", d);
-                       return 1;
-               }
+               if (!t.tcm_ifindex)
+                       return -nodev(d);
                filter_ifindex = t.tcm_ifindex;
        }
 
@@ -454,8 +447,7 @@ struct tc_qdisc_block_exists_ctx {
        bool found;
 };
 
-static int tc_qdisc_block_exists_cb(const struct sockaddr_nl *who,
-                                   struct nlmsghdr *n, void *arg)
+static int tc_qdisc_block_exists_cb(struct nlmsghdr *n, void *arg)
 {
        struct tc_qdisc_block_exists_ctx *ctx = arg;
        struct tcmsg *t = NLMSG_DATA(n);
@@ -469,7 +461,7 @@ static int tc_qdisc_block_exists_cb(const struct sockaddr_nl *who,
        if (len < 0)
                return -1;
 
-       parse_rtattr(tb, TCA_MAX, TCA_RTA(t), len);
+       parse_rtattr_flags(tb, TCA_MAX, TCA_RTA(t), len, NLA_F_NESTED);
 
        if (tb[TCA_KIND] == NULL)
                return -1;