From e207624c6d92e9c2979e1e310cab660f0320ca48 Mon Sep 17 00:00:00 2001 From: Paolo Abeni Date: Thu, 14 Dec 2017 13:04:12 +0100 Subject: trafgen: fix dinc()/ddec() modifiers currently, after dinc(), the valued stored inside the packet is not in the (min, max) range but in the (0, max - min + 1) range, 'counter->val' should be used instead of 'val'. Additionally the values computed for ddec() are corrupted, in: val = (val - counter->inc) % (counter->min - counter->max + 1); the divider is negative, we should use (counter->max - counter->min + 1) as in the INC case. Finally we can avoid the switch statement at update time, inverting the value of 'counter->inc' for decrement and using a data type wide enough for the 'inc' field. v1 -> v2: - changed 'counter->inc' type to int Signed-off-by: Paolo Abeni Signed-off-by: Tobias Klauser --- trafgen.c | 14 ++------------ trafgen_conf.h | 4 ++-- trafgen_parser.y | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/trafgen.c b/trafgen.c index d2d43bb..2897880 100644 --- a/trafgen.c +++ b/trafgen.c @@ -316,20 +316,10 @@ static void apply_counter(int id) struct counter *counter = &packet_dyn[id].cnt[j]; val = counter->val - counter->min; - - switch (counter->type) { - case TYPE_INC: - val = (val + counter->inc) % (counter->max - counter->min + 1); - break; - case TYPE_DEC: - val = (val - counter->inc) % (counter->min - counter->max + 1); - break; - default: - bug(); - } + val = (val + counter->inc) % (counter->max - counter->min + 1); counter->val = val + counter->min; - packets[id].payload[counter->off] = val; + packets[id].payload[counter->off] = counter->val; } } diff --git a/trafgen_conf.h b/trafgen_conf.h index a0bbe43..fcbbb17 100644 --- a/trafgen_conf.h +++ b/trafgen_conf.h @@ -22,8 +22,8 @@ enum csum { }; struct counter { - int type; - uint8_t min, max, inc, val; + int type, inc; + uint8_t min, max, val; off_t off; }; diff --git a/trafgen_parser.y b/trafgen_parser.y index a42dc30..4d83af6 100644 --- a/trafgen_parser.y +++ b/trafgen_parser.y @@ -147,7 +147,7 @@ static inline void __setup_new_counter(struct counter *c, uint8_t start, { c->min = start; c->max = stop; - c->inc = stepping; + c->inc = (type == TYPE_INC) ? stepping : -stepping; c->val = (type == TYPE_INC) ? start : stop; c->off = payload_last; c->type = type; -- cgit v1.2.3-54-g00ecf