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

handl gbit as well. 

const char *

(Logical change 1.6)
This commit is contained in:
osdl.org!shemminger 2004-06-02 20:22:08 +00:00
parent f1dfe7dec1
commit dbd90dc267
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tc/tc_util.c
View File

@ -24,7 +24,7 @@
#include "utils.h" #include "utils.h"
#include "tc_util.h" #include "tc_util.h"
int get_qdisc_handle(__u32 *h, char *str) int get_qdisc_handle(__u32 *h, const char *str)
{ {
__u32 maj; __u32 maj;
char *p; char *p;
@ -43,7 +43,7 @@ ok:
return 0; return 0;
} }
int get_tc_classid(__u32 *h, char *str) int get_tc_classid(__u32 *h, const char *str)
{ {
__u32 maj, min; __u32 maj, min;
char *p; char *p;
@ -98,7 +98,7 @@ char * sprint_tc_classid(__u32 h, char *buf)
} }
int get_rate(unsigned *rate, char *str) int get_rate(unsigned *rate, const char *str)
{ {
char *p; char *p;
double bps = strtod(str, &p); double bps = strtod(str, &p);
@ -109,6 +109,10 @@ int get_rate(unsigned *rate, char *str)
if (*p) { if (*p) {
if (strcasecmp(p, "kbps") == 0) if (strcasecmp(p, "kbps") == 0)
bps *= 1024; bps *= 1024;
else if (strcasecmp(p, "gbps") == 0)
bps *= 1024*1024*1024;
else if (strcasecmp(p, "gbit") == 0)
bps *= 1024*1024*1024/8;
else if (strcasecmp(p, "mbps") == 0) else if (strcasecmp(p, "mbps") == 0)
bps *= 1024*1024; bps *= 1024*1024;
else if (strcasecmp(p, "mbit") == 0) else if (strcasecmp(p, "mbit") == 0)
@ -174,7 +178,7 @@ char * sprint_rate(__u32 rate, char *buf)
return buf; return buf;
} }
int get_usecs(unsigned *usecs, char *str) int get_usecs(unsigned *usecs, const char *str)
{ {
double t; double t;
char *p; char *p;
@ -222,7 +226,7 @@ char * sprint_usecs(__u32 usecs, char *buf)
return buf; return buf;
} }
int get_size(unsigned *size, char *str) int get_size(unsigned *size, const char *str)
{ {
double sz; double sz;
char *p; char *p;
@ -234,6 +238,10 @@ int get_size(unsigned *size, char *str)
if (*p) { if (*p) {
if (strcasecmp(p, "kb") == 0 || strcasecmp(p, "k")==0) if (strcasecmp(p, "kb") == 0 || strcasecmp(p, "k")==0)
sz *= 1024; sz *= 1024;
else if (strcasecmp(p, "gb") == 0 || strcasecmp(p, "g")==0)
sz *= 1024*1024*1024;
else if (strcasecmp(p, "gbit") == 0)
sz *= 1024*1024*1024/8;
else if (strcasecmp(p, "mb") == 0 || strcasecmp(p, "m")==0) else if (strcasecmp(p, "mb") == 0 || strcasecmp(p, "m")==0)
sz *= 1024*1024; sz *= 1024*1024;
else if (strcasecmp(p, "mbit") == 0) else if (strcasecmp(p, "mbit") == 0)