[<prev] [next>] [day] [month] [year] [list]
Message-ID: <5100584B.6000108@stusta.de>
Date: Wed, 23 Jan 2013 22:38:19 +0100
From: Johannes Naab <jn@...sta.de>
To: netdev@...r.kernel.org
Subject: [PATCH] iproute2: tc netem rate: allow negative packet/cell overhead
From: Johannes Naab <jn@...sta.de>
by fixing the parsing of command-line tokens
Signed-off-by: Johannes Naab <jn@...sta.de>
---
The packet or cell overhead used with the rate extension can be negative. The
man page tc-netem(8) documents this. However, iproute2 currently does not
detect negative numbers as valid token.
> $ tc qdisc add dev eth0 root netem rate 1024bps -14
> What is "-14"?
> Usage: ... netem [ limit PACKETS ]
I developed this patch while doing a student project at
http://www.nav.ei.tum.de/.
tc/q_netem.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tc/q_netem.c b/tc/q_netem.c
index f8489e9..2583072 100644
--- a/tc/q_netem.c
+++ b/tc/q_netem.c
@@ -147,6 +147,8 @@ static int get_distribution(const char *type, __s16 *data, int maxdata)
}
#define NEXT_IS_NUMBER() (NEXT_ARG_OK() && isdigit(argv[1][0]))
+#define NEXT_IS_SIGNED_NUMBER() \
+ (NEXT_ARG_OK() && (isdigit(argv[1][0]) || argv[1][0] == '-'))
/* Adjust for the fact that psched_ticks aren't always usecs
(based on kernel PSCHED_CLOCK configuration */
@@ -393,7 +395,7 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
explain1("rate");
return -1;
}
- if (NEXT_IS_NUMBER()) {
+ if (NEXT_IS_SIGNED_NUMBER()) {
NEXT_ARG();
if (get_s32(&rate.packet_overhead, *argv, 0)) {
explain1("rate");
@@ -407,7 +409,7 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
return -1;
}
}
- if (NEXT_IS_NUMBER()) {
+ if (NEXT_IS_SIGNED_NUMBER()) {
NEXT_ARG();
if (get_s32(&rate.cell_overhead, *argv, 0)) {
explain1("rate");
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists