snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmnet: simplify updateStats_dev() a bit

Browse source 
There is no need to have a variable holding the interface name and
doing the exercise of stripping the trailing colon. It is enough
to just compare the line to check whether it contains the device
name. And only if it does we sscanf() its contents.
This commit is contained in:
Carlos R. Mafra 2015-01-11 21:04:02 +00:00
parent cd4947f139
commit 49944a01ae
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
wmnet/drivers.c
View file

@ -316,36 +316,25 @@ int updateStats_ipchains(void) {
int updateStats_dev(void) {
FILE *dev;
char *ptr;
unsigned int flag = 0;
static char interface[16];
rx = False;
tx = False;
if ((dev = fopen("/proc/net/dev", "r")) == NULL) {
fprintf(stderr, "/proc/net/dev does not exist?\n"
"Perhaps we are not running Linux?\n");
dev = fopen("/proc/net/dev", "r");
if (!dev) {
fprintf(stderr, "/proc/net/dev does not exist\n");
exit(4);
}
/* the first two lines we can skip */
fgets(buffer, 256, dev);
fgets(buffer, 256, dev);
/* IP Chain Rules for Linux kernel 2_1.x */
while(flag != (ACCOUNT_IN_FOUND|ACCOUNT_OUT_FOUND) && fgets(buffer, 256, dev)) {
while(fgets(buffer, 256, dev)) {
sscanf(buffer, "%16s %llu %llu %*d %*d %*d %*d %*d %*d %llu %llu %*d %*d %*d %*d %*d %*d",
interface, &totalbytes_in, &totalpackets_in, &totalbytes_out, &totalpackets_out);
if (strcmp(buffer, device) > 0){
/* strip trailing colon */
ptr = interface;
while(*ptr != ':') ptr++;
*ptr = '\0';
if (!strcmp(interface, device)) {
flag = (ACCOUNT_IN_FOUND|ACCOUNT_OUT_FOUND);
sscanf(buffer, "%*s %llu %llu %*d %*d %*d %*d %*d %*d %llu %llu %*d %*d %*d %*d %*d %*d",
&totalbytes_in, &totalpackets_in, &totalbytes_out, &totalpackets_out);
if (totalpackets_in != lastpackets_in) {
diffbytes_in += totalbytes_in - lastbytes_in;
@ -360,6 +349,8 @@ int updateStats_dev(void) {
lastbytes_out = totalbytes_out;
tx = True;
}
break;
}
}