iproute2: tc netem rate: allow negative packet/cell overhead

by fixing the parsing of command-line tokens

Signed-off-by: Johannes Naab <jn@stusta.de>

diff --git a/tc/q_netem.c b/tc/q_netem.c
index f8489e9a788a472c63b7b3a18af68b51a53e4410..2583072a735e6512db77e5cd0cd369f88727561c 100644 (file)
--- 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");