matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: red, gred, tbf: more helpful error messages 

$ 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>
This commit is contained in:
Florian Westphal 2010-01-12 21:44:29 +01:00 committed by Stephen Hemminger
parent 9e318455a3
commit ddf216c863
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tc/q_gred.c
View File

@ -215,16 +215,13 @@ static int gred_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct n
argc--; argv++; argc--; argv++;
} }
if (!ok)
return 0;
if (rate == 0) if (rate == 0)
get_rate(&rate, "10Mbit"); get_rate(&rate, "10Mbit");
if (!opt.qth_min || !opt.qth_max || !burst || !opt.limit || !avpkt || if (!opt.qth_min || !opt.qth_max || !burst || !opt.limit || !avpkt ||
(opt.DP<0)) { (opt.DP<0)) {
fprintf(stderr, "Required parameter (min, max, burst, limit, " fprintf(stderr, "Required parameter (min, max, burst, limit, "
"avpket, DP) is missing\n"); "avpkt, DP) is missing\n");
return -1; return -1;
} }

14
tc/q_red.c
View 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) static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
{ {
int ok=0;
struct tc_red_qopt opt; struct tc_red_qopt opt;
unsigned burst = 0; unsigned burst = 0;
unsigned avpkt = 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"); fprintf(stderr, "Illegal \"limit\"\n");
return -1; return -1;
} }
ok++;
} else if (strcmp(*argv, "min") == 0) { } else if (strcmp(*argv, "min") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_size(&opt.qth_min, *argv)) { if (get_size(&opt.qth_min, *argv)) {
fprintf(stderr, "Illegal \"min\"\n"); fprintf(stderr, "Illegal \"min\"\n");
return -1; return -1;
} }
ok++;
} else if (strcmp(*argv, "max") == 0) { } else if (strcmp(*argv, "max") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_size(&opt.qth_max, *argv)) { if (get_size(&opt.qth_max, *argv)) {
fprintf(stderr, "Illegal \"max\"\n"); fprintf(stderr, "Illegal \"max\"\n");
return -1; return -1;
} }
ok++;
} else if (strcmp(*argv, "burst") == 0) { } else if (strcmp(*argv, "burst") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_unsigned(&burst, *argv, 0)) { if (get_unsigned(&burst, *argv, 0)) {
fprintf(stderr, "Illegal \"burst\"\n"); fprintf(stderr, "Illegal \"burst\"\n");
return -1; return -1;
} }
ok++;
} else if (strcmp(*argv, "avpkt") == 0) { } else if (strcmp(*argv, "avpkt") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_size(&avpkt, *argv)) { if (get_size(&avpkt, *argv)) {
fprintf(stderr, "Illegal \"avpkt\"\n"); fprintf(stderr, "Illegal \"avpkt\"\n");
return -1; return -1;
} }
ok++;
} else if (strcmp(*argv, "probability") == 0) { } else if (strcmp(*argv, "probability") == 0) {
NEXT_ARG(); NEXT_ARG();
if (sscanf(*argv, "%lg", &probability) != 1) { if (sscanf(*argv, "%lg", &probability) != 1) {
fprintf(stderr, "Illegal \"probability\"\n"); fprintf(stderr, "Illegal \"probability\"\n");
return -1; return -1;
} }
ok++;
} else if (strcmp(*argv, "bandwidth") == 0) { } else if (strcmp(*argv, "bandwidth") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_rate(&rate, *argv)) { if (get_rate(&rate, *argv)) {
fprintf(stderr, "Illegal \"bandwidth\"\n"); fprintf(stderr, "Illegal \"bandwidth\"\n");
return -1; return -1;
} }
ok++;
} else if (strcmp(*argv, "ecn") == 0) { } else if (strcmp(*argv, "ecn") == 0) {
ecn_ok = 1; ecn_ok = 1;
ok++;
} else if (strcmp(*argv, "help") == 0) { } else if (strcmp(*argv, "help") == 0) {
explain(); explain();
return -1; return -1;
@ -112,14 +103,11 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
argc--; argv++; argc--; argv++;
} }
if (!ok)
return 0;
if (rate == 0) if (rate == 0)
get_rate(&rate, "10Mbit"); get_rate(&rate, "10Mbit");
if (!opt.qth_min || !opt.qth_max || !burst || !opt.limit || !avpkt) { 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; return -1;
} }

6
tc/q_tbf.c
View File

@ -158,8 +158,10 @@ static int tbf_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
argc--; argv++; argc--; argv++;
} }
if (!ok) if (!ok) {
return 0; explain();
return -1;
}
if (opt.rate.rate == 0 || !buffer) { if (opt.rate.rate == 0 || !buffer) {
fprintf(stderr, "Both \"rate\" and \"burst\" are required.\n"); fprintf(stderr, "Both \"rate\" and \"burst\" are required.\n");