Lets strtoul(...) func set pointer of unit name for ring size option,
instead of check each character by isdigit(...).
Signed-off-by: Vadim Kochan <vadi...@gmail.com>
---
trafgen.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/trafgen.c b/trafgen.c
index 36694d2..c74a973 100644
--- a/trafgen.c
+++ b/trafgen.c
@@ -978,7 +978,7 @@ int main(int argc, char **argv)
bool prio_high = false, set_irq_aff = true, set_sock_mem = true;
int c, opt_index, vals[4] = {0}, irq;
uint64_t gap = 0;
- unsigned int i, j;
+ unsigned int i;
char *confname = NULL, *ptr;
unsigned long cpus_tmp, orig_num = 0;
unsigned long long tx_packets, tx_bytes;
@@ -1155,24 +1155,19 @@ int main(int argc, char **argv)
shaper_set_rate(&ctx.sh, rate, shape_type);
break;
case 'S':
- ptr = optarg;
-
- for (j = i = strlen(optarg); i > 0; --i) {
- if (!isdigit(optarg[j - i]))
- break;
- ptr++;
- }
+ ctx.reserve_size = strtoul(optarg, &ptr, 0);
+ if (ctx.reserve_size == 0 && ptr == optarg)
+ panic("Invalid ring size param\n");
if (!strncmp(ptr, "KiB", strlen("KiB")))
- ctx.reserve_size = 1 << 10;
+ ctx.reserve_size *= 1 << 10;
else if (!strncmp(ptr, "MiB", strlen("MiB")))
ctx.reserve_size = 1 << 20;
else if (!strncmp(ptr, "GiB", strlen("GiB")))
- ctx.reserve_size = 1 << 30;
+ ctx.reserve_size *= 1 << 30;
else
- panic("Syntax error in ring size param!\n");
+ panic("Invalid ring size unit type\n");
- ctx.reserve_size *= strtoul(optarg, NULL, 0);
break;
case '?':
switch (optopt) {
--
2.6.3
--
You received this message because you are subscribed to the Google Groups
"netsniff-ng" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to netsniff-ng+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
