matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

utils: relax strtoX checking in get_time_rtt 

ip route change dev tap0 192.168.7.0/24 rto_min 1ms
Error: argument "1ms" is wrong: "rto_min" value is invalid

get_time_rtt() checks for 's' or 'msec' and converts to milliseconds
if needed.

Fixes: 697ac63905 (utils: fix range checking for get_u32/get_u64 et all)
Signed-off-by: Florian Westphal <fw@strlen.de>
This commit is contained in:
Florian Westphal 2014-11-11 01:38:21 +01:00 committed by Stephen Hemminger
parent e4fc7e2625
commit 4d9a264f09
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/utils.c
View File

@ -144,8 +144,8 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw)
if (t < 0.0) if (t < 0.0)
return -1; return -1;
/* extra non-digits */ /* no digits? */
if (!p || p == arg || *p) if (!p || p == arg)
return -1; return -1;
/* over/underflow */ /* over/underflow */
@ -154,8 +154,8 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw)
} else { } else {
res = strtoul(arg, &p, 0); res = strtoul(arg, &p, 0);
/* empty string or trailing non-digits */ /* empty string? */
if (!p || p == arg || *p) if (!p || p == arg)
return -1; return -1;
/* overflow */ /* overflow */