Add new rate and duplicate arguments.

(Logical change 1.41)
This commit is contained in:
osdl.net!shemminger 2004-07-01 11:02:04 +00:00
parent 9615dc1da4
commit ffb79d0691
1 changed files with 13 additions and 30 deletions

View File

@ -25,8 +25,10 @@
static void explain(void) static void explain(void)
{ {
fprintf(stderr, "Usage: ... netem latency TIME rate KBPS [ mtu BYTES ]\n"); fprintf(stderr,
fprintf(stderr, " [ limit BYTES]\n"); "Usage: ... netem latency TIME [ gap PACKETS] \n" \
" [ loss PERCENT ] [ duplicate PERCENT ]\n" \
" [ rate KBPS ] [ limit BYTES]\n");
} }
static void explain1(const char *arg) static void explain1(const char *arg)
@ -40,18 +42,14 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
struct nlmsghdr *n) struct nlmsghdr *n)
{ {
struct tc_netem_qopt opt; struct tc_netem_qopt opt;
unsigned mtu=1500, rate=0;
int ok = 0; int ok = 0;
memset(&opt, 0, sizeof(opt)); memset(&opt, 0, sizeof(opt));
opt.limit = 1000;
while (argc > 0) { while (argc > 0) {
if (matches(*argv, "limit") == 0) { if (matches(*argv, "limit") == 0) {
NEXT_ARG(); NEXT_ARG();
if (opt.limit || rate) {
fprintf(stderr, "Double \"limit/rate\" spec\n");
return -1;
}
if (get_size(&opt.limit, *argv)) { if (get_size(&opt.limit, *argv)) {
explain1("limit"); explain1("limit");
return -1; return -1;
@ -80,21 +78,17 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
return -1; return -1;
} }
ok++; ok++;
} else if (matches(*argv, "rate") == 0) { } else if (matches(*argv, "duplicate") == 0) {
NEXT_ARG(); NEXT_ARG();
if (rate) { if (get_percent(&opt.duplicate, *argv)) {
fprintf(stderr, "Double \"rate\" spec\n"); explain1("duplicate");
return -1;
}
if (get_rate(&rate, *argv)) {
explain1("rate");
return -1; return -1;
} }
ok++; ok++;
} else if (strcmp(*argv, "mtu") == 0) { } else if (matches(*argv, "rate") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_size(&mtu, *argv)) { if (get_rate(&opt.rate, *argv)) {
explain1("mtu"); explain1("rate");
return -1; return -1;
} }
ok++; ok++;
@ -109,19 +103,8 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
argc--; argv++; argc--; argv++;
} }
if (!ok) if (ok)
return 0; addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
if (!opt.limit && !rate) {
fprintf(stderr, "Either \"limit\" or \"rate\" are required.\n");
return -1;
}
/* Compute netem bandwith product as limit */
if (opt.limit == 0)
opt.limit = ((double)rate * (double)opt.latency/1000000.);
addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
return 0; return 0;
} }