lib: introduce print_nl

[mirror_iproute2.git] / tc / q_htb.c

diff --git a/tc/q_htb.c b/tc/q_htb.c
index a811c2845e6740459eaddd9de262844f587717bb..c8b2941d945b7e2cde4473920338adefe7ac48df 100644 (file)
--- a/tc/q_htb.c
+++ b/tc/q_htb.c
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -59,8 +58,8 @@ static void explain1(char *arg)
     explain();
 }
 
-
-static int htb_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
+static int htb_parse_opt(struct qdisc_util *qu, int argc,
+                        char **argv, struct nlmsghdr *n, const char *dev)
 {
        unsigned int direct_qlen = ~0U;
        struct tc_htb_glob opt = {
@@ -99,19 +98,17 @@ static int htb_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
                }
                argc--; argv++;
        }
-       tail = NLMSG_TAIL(n);
-       addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);
+       tail = addattr_nest(n, 1024, TCA_OPTIONS);
        addattr_l(n, 2024, TCA_HTB_INIT, &opt, NLMSG_ALIGN(sizeof(opt)));
        if (direct_qlen != ~0U)
                addattr_l(n, 2024, TCA_HTB_DIRECT_QLEN,
                          &direct_qlen, sizeof(direct_qlen));
-       tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail;
+       addattr_nest_end(n, tail);
        return 0;
 }
 
-static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
+static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n, const char *dev)
 {
-       int ok = 0;
        struct tc_htb_opt opt = {};
        __u32 rtab[256], ctab[256];
        unsigned buffer = 0, cbuffer = 0;
@@ -129,7 +126,6 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
                        if (get_u32(&opt.prio, *argv, 10)) {
                                explain1("prio"); return -1;
                        }
-                       ok++;
                } else if (matches(*argv, "mtu") == 0) {
                        NEXT_ARG();
                        if (get_u32(&mtu, *argv, 10)) {
@@ -163,7 +159,6 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
                                explain1("buffer");
                                return -1;
                        }
-                       ok++;
                } else if (matches(*argv, "cburst") == 0 ||
                           strcmp(*argv, "cbuffer") == 0 ||
                           strcmp(*argv, "cmaxburst") == 0) {
@@ -172,29 +167,36 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
                                explain1("cbuffer");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "ceil") == 0) {
                        NEXT_ARG();
                        if (ceil64) {
                                fprintf(stderr, "Double \"ceil\" spec\n");
                                return -1;
                        }
-                       if (get_rate64(&ceil64, *argv)) {
+                       if (strchr(*argv, '%')) {
+                               if (get_percent_rate64(&ceil64, *argv, dev)) {
+                                       explain1("ceil");
+                                       return -1;
+                               }
+                       } else if (get_rate64(&ceil64, *argv)) {
                                explain1("ceil");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "rate") == 0) {
                        NEXT_ARG();
                        if (rate64) {
                                fprintf(stderr, "Double \"rate\" spec\n");
                                return -1;
                        }
-                       if (get_rate64(&rate64, *argv)) {
+                       if (strchr(*argv, '%')) {
+                               if (get_percent_rate64(&rate64, *argv, dev)) {
+                                       explain1("rate");
+                                       return -1;
+                               }
+                       } else if (get_rate64(&rate64, *argv)) {
                                explain1("rate");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "help") == 0) {
                        explain();
                        return -1;
@@ -206,9 +208,6 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
                argc--; argv++;
        }
 
-       /*      if (!ok)
-               return 0;*/
-
        if (!rate64) {
                fprintf(stderr, "\"rate\" is required.\n");
                return -1;
@@ -245,8 +244,7 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
        }
        opt.cbuffer = tc_calc_xmittime(ceil64, cbuffer);
 
-       tail = NLMSG_TAIL(n);
-       addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);
+       tail = addattr_nest(n, 1024, TCA_OPTIONS);
 
        if (rate64 >= (1ULL << 32))
                addattr_l(n, 1124, TCA_HTB_RATE64, &rate64, sizeof(rate64));
@@ -257,7 +255,7 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
        addattr_l(n, 2024, TCA_HTB_PARMS, &opt, sizeof(opt));
        addattr_l(n, 3024, TCA_HTB_RTAB, rtab, 1024);
        addattr_l(n, 4024, TCA_HTB_CTAB, ctab, 1024);
-       tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail;
+       addattr_nest_end(n, tail);
        return 0;
 }
 
@@ -284,9 +282,10 @@ static int htb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
                if (RTA_PAYLOAD(tb[TCA_HTB_PARMS])  < sizeof(*hopt)) return -1;
 
                if (!hopt->level) {
-                       fprintf(f, "prio %d ", (int)hopt->prio);
+                       print_int(PRINT_ANY, "prio", "prio %d ", (int)hopt->prio);
                        if (show_details)
-                               fprintf(f, "quantum %d ", (int)hopt->quantum);
+                               print_int(PRINT_ANY, "quantum", "quantum %d ",
+                                         (int)hopt->quantum);
                }
 
                rate64 = hopt->rate.rate;
@@ -332,16 +331,21 @@ static int htb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
                gopt = RTA_DATA(tb[TCA_HTB_INIT]);
                if (RTA_PAYLOAD(tb[TCA_HTB_INIT])  < sizeof(*gopt)) return -1;
 
-               fprintf(f, "r2q %d default %x direct_packets_stat %u",
-                       gopt->rate2quantum, gopt->defcls, gopt->direct_pkts);
-               if (show_details)
-                       fprintf(f, " ver %d.%d", gopt->version >> 16, gopt->version & 0xffff);
+               print_int(PRINT_ANY, "r2q", "r2q %d", gopt->rate2quantum);
+               print_uint(PRINT_ANY, "default", " default %u", gopt->defcls);
+               print_uint(PRINT_ANY, "direct_packets_stat",
+                          " direct_packets_stat %u", gopt->direct_pkts);
+               if (show_details) {
+                       sprintf(b1, "%d.%d", gopt->version >> 16, gopt->version & 0xffff);
+                       print_string(PRINT_ANY, "ver", " ver %s", b1);
+               }
        }
        if (tb[TCA_HTB_DIRECT_QLEN] &&
            RTA_PAYLOAD(tb[TCA_HTB_DIRECT_QLEN]) >= sizeof(__u32)) {
                __u32 direct_qlen = rta_getattr_u32(tb[TCA_HTB_DIRECT_QLEN]);
 
-               fprintf(f, " direct_qlen %u", direct_qlen);
+               print_uint(PRINT_ANY, "direct_qlen", " direct_qlen %u",
+                          direct_qlen);
        }
        return 0;
 }