]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
tc: red, gred, tbf: more helpful error messages
authorFlorian Westphal <fw@strlen.de>
Tue, 12 Jan 2010 20:44:29 +0000 (21:44 +0100)
committerStephen Hemminger <stephen.hemminger@vyatta.com>
Thu, 21 Jan 2010 18:12:57 +0000 (10:12 -0800)
$ tc qdisc add dev eth1 root tbf
RTNETLINK answers: Invalid argument

$ tc qdisc add dev eth1 root red
RTNETLINK answers: Invalid argument

with patch:
$ tc qdisc add dev eth1 root red
Required parameter (min, max, burst, limit, avpkt) is missing

$ tc qdisc add dev eth1 root tbf
Usage: ... tbf limit BYTES burst BYTES[/BYTES] rate KBPS ...

Signed-off-by: Florian Westphal <fw@strlen.de>
tc/q_gred.c
tc/q_red.c
tc/q_tbf.c

index ecef42e972178028062c68e74904d5f041311a16..ab26801d40fc2371a5039145bd0a9877564f2c40 100644 (file)
@@ -215,16 +215,13 @@ static int gred_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct n
                argc--; argv++;
        }
 
-       if (!ok)
-               return 0;
-
        if (rate == 0)
                get_rate(&rate, "10Mbit");
 
        if (!opt.qth_min || !opt.qth_max || !burst || !opt.limit || !avpkt ||
            (opt.DP<0)) {
                fprintf(stderr, "Required parameter (min, max, burst, limit, "
-                   "avpket, DP) is missing\n");
+                   "avpkt, DP) is missing\n");
                return -1;
        }
 
index 6f93b26abf3c58a02b99d4207c7f68794f89942f..3ba6bc74cddb4defc0204a7ba238fa23ba95117d 100644 (file)
@@ -35,7 +35,6 @@ static void explain(void)
 
 static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
 {
-       int ok=0;
        struct tc_red_qopt opt;
        unsigned burst = 0;
        unsigned avpkt = 0;
@@ -55,52 +54,44 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
                                fprintf(stderr, "Illegal \"limit\"\n");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "min") == 0) {
                        NEXT_ARG();
                        if (get_size(&opt.qth_min, *argv)) {
                                fprintf(stderr, "Illegal \"min\"\n");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "max") == 0) {
                        NEXT_ARG();
                        if (get_size(&opt.qth_max, *argv)) {
                                fprintf(stderr, "Illegal \"max\"\n");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "burst") == 0) {
                        NEXT_ARG();
                        if (get_unsigned(&burst, *argv, 0)) {
                                fprintf(stderr, "Illegal \"burst\"\n");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "avpkt") == 0) {
                        NEXT_ARG();
                        if (get_size(&avpkt, *argv)) {
                                fprintf(stderr, "Illegal \"avpkt\"\n");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "probability") == 0) {
                        NEXT_ARG();
                        if (sscanf(*argv, "%lg", &probability) != 1) {
                                fprintf(stderr, "Illegal \"probability\"\n");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "bandwidth") == 0) {
                        NEXT_ARG();
                        if (get_rate(&rate, *argv)) {
                                fprintf(stderr, "Illegal \"bandwidth\"\n");
                                return -1;
                        }
-                       ok++;
                } else if (strcmp(*argv, "ecn") == 0) {
                        ecn_ok = 1;
-                       ok++;
                } else if (strcmp(*argv, "help") == 0) {
                        explain();
                        return -1;
@@ -112,14 +103,11 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
                argc--; argv++;
        }
 
-       if (!ok)
-               return 0;
-
        if (rate == 0)
                get_rate(&rate, "10Mbit");
 
        if (!opt.qth_min || !opt.qth_max || !burst || !opt.limit || !avpkt) {
-               fprintf(stderr, "Required parameter (min, max, burst, limit, avpket) is missing\n");
+               fprintf(stderr, "Required parameter (min, max, burst, limit, avpkt) is missing\n");
                return -1;
        }
 
index dbf95863bef7769b8fc5d2a992c40c85bed7adcd..06ccda317ab4682ddb7f8639c9ca57c996da6b8d 100644 (file)
@@ -158,8 +158,10 @@ static int tbf_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
                argc--; argv++;
        }
 
-       if (!ok)
-               return 0;
+       if (!ok) {
+               explain();
+               return -1;
+       }
 
        if (opt.rate.rate == 0 || !buffer) {
                fprintf(stderr, "Both \"rate\" and \"burst\" are required.\n");