From e72ca3fbb0aeaa382e6a5a14dada38a56ffab160 Mon Sep 17 00:00:00 2001 From: Johannes Naab Date: Wed, 23 Jan 2013 11:38:19 +0000 Subject: [PATCH] iproute2: tc netem rate: allow negative packet/cell overhead by fixing the parsing of command-line tokens Signed-off-by: Johannes Naab --- 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 f8489e9a..2583072a 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");