32 |
|
#ifdef SOLARIS |
33 |
|
#include <kstat.h> |
34 |
|
#include <sys/sysinfo.h> |
35 |
+ |
#include <sys/types.h> |
36 |
+ |
#include <sys/socket.h> |
37 |
+ |
#include <sys/ioctl.h> |
38 |
+ |
#include <net/if.h> |
39 |
+ |
#include <netinet/in.h> |
40 |
+ |
#include <sys/sockio.h> |
41 |
|
#endif |
42 |
|
#ifdef LINUX |
43 |
|
#include <stdio.h> |
54 |
|
typedef __uint8_t u8; |
55 |
|
typedef __uint16_t u16; |
56 |
|
typedef __uint32_t u32; |
57 |
+ |
typedef __uint64_t u64; |
58 |
|
#include <linux/ethtool.h> |
59 |
|
#include <linux/sockios.h> |
60 |
+ |
#include <unistd.h> |
61 |
|
#endif |
62 |
|
#ifdef ALLBSD |
63 |
|
#include <sys/types.h> |
77 |
|
net_stats->interface_name=NULL; |
78 |
|
net_stats->tx=0; |
79 |
|
net_stats->rx=0; |
80 |
+ |
net_stats->ipackets=0; |
81 |
+ |
net_stats->opackets=0; |
82 |
+ |
net_stats->ierrors=0; |
83 |
+ |
net_stats->oerrors=0; |
84 |
+ |
net_stats->collisions=0; |
85 |
|
net_stats++; |
86 |
|
} |
87 |
|
} |
129 |
|
/* Horrible big enough, but it should be easily big enough */ |
130 |
|
char line[8096]; |
131 |
|
regex_t regex; |
132 |
< |
regmatch_t line_match[4]; |
132 |
> |
regmatch_t line_match[9]; |
133 |
|
#endif |
134 |
|
#ifdef ALLBSD |
135 |
|
struct ifaddrs *net, *net_ptr; |
156 |
|
if(network_stat_ptr->interface_name==NULL) return NULL; |
157 |
|
net_data=(struct if_data *)net_ptr->ifa_data; |
158 |
|
network_stat_ptr->rx=net_data->ifi_ibytes; |
159 |
< |
network_stat_ptr->tx=net_data->ifi_obytes; |
159 |
> |
network_stat_ptr->tx=net_data->ifi_obytes; |
160 |
> |
network_stat_ptr->ipackets=net_data->ifi_ipackets; |
161 |
> |
network_stat_ptr->opackets=net_data->ifi_opackets; |
162 |
> |
network_stat_ptr->ierrors=net_data->ifi_ierrors; |
163 |
> |
network_stat_ptr->oerrors=net_data->ifi_oerrors; |
164 |
> |
network_stat_ptr->collisions=net_data->ifi_collisions; |
165 |
|
network_stat_ptr->systime=time(NULL); |
166 |
|
interfaces++; |
167 |
|
} |
180 |
|
kstat_read(kc, ksp, NULL); |
181 |
|
|
182 |
|
#ifdef SOL7 |
183 |
< |
#define RLOOKUP "rbytes" |
184 |
< |
#define WLOOKUP "obytes" |
183 |
> |
#define LRX "rbytes" |
184 |
> |
#define LTX "obytes" |
185 |
> |
#define LIPACKETS "ipackets" |
186 |
> |
#define LOPACKETS "opackets" |
187 |
|
#define VALTYPE value.ui32 |
188 |
|
#else |
189 |
< |
#define RLOOKUP "rbytes64" |
190 |
< |
#define WLOOKUP "obytes64" |
189 |
> |
#define LRX "rbytes64" |
190 |
> |
#define LTX "obytes64" |
191 |
> |
#define LIPACKETS "ipackets64" |
192 |
> |
#define LOPACKETS "opackets64" |
193 |
|
#define VALTYPE value.ui64 |
194 |
|
#endif |
195 |
|
|
196 |
< |
if((knp=kstat_data_lookup(ksp, RLOOKUP))==NULL){ |
197 |
< |
/* Not a network interface, so skip to the next entry */ |
196 |
> |
/* Read rx */ |
197 |
> |
if((knp=kstat_data_lookup(ksp, LRX))==NULL){ |
198 |
> |
/* This is a network interface, but it doesn't |
199 |
> |
* have the rbytes/obytes values; for instance, |
200 |
> |
* the loopback devices have this behaviour |
201 |
> |
* (although they do track packets in/out). */ |
202 |
|
continue; |
203 |
|
} |
204 |
|
|
205 |
+ |
/* Create new network_stats */ |
206 |
|
network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats); |
207 |
|
if(network_stats==NULL){ |
208 |
|
return NULL; |
209 |
|
} |
210 |
|
network_stat_ptr=network_stats+interfaces; |
211 |
+ |
|
212 |
+ |
/* Finish reading rx */ |
213 |
|
network_stat_ptr->rx=knp->VALTYPE; |
214 |
|
|
215 |
< |
if((knp=kstat_data_lookup(ksp, WLOOKUP))==NULL){ |
216 |
< |
/* Not a network interface, so skip to the next entry */ |
215 |
> |
/* Read tx */ |
216 |
> |
if((knp=kstat_data_lookup(ksp, LTX))==NULL){ |
217 |
|
continue; |
218 |
|
} |
219 |
|
network_stat_ptr->tx=knp->VALTYPE; |
220 |
+ |
|
221 |
+ |
/* Read ipackets */ |
222 |
+ |
if((knp=kstat_data_lookup(ksp, LIPACKETS))==NULL){ |
223 |
+ |
continue; |
224 |
+ |
} |
225 |
+ |
network_stat_ptr->ipackets=knp->VALTYPE; |
226 |
+ |
|
227 |
+ |
/* Read opackets */ |
228 |
+ |
if((knp=kstat_data_lookup(ksp, LOPACKETS))==NULL){ |
229 |
+ |
continue; |
230 |
+ |
} |
231 |
+ |
network_stat_ptr->opackets=knp->VALTYPE; |
232 |
+ |
|
233 |
+ |
/* Read ierrors */ |
234 |
+ |
if((knp=kstat_data_lookup(ksp, "ierrors"))==NULL){ |
235 |
+ |
continue; |
236 |
+ |
} |
237 |
+ |
network_stat_ptr->ierrors=knp->value.ui32; |
238 |
+ |
|
239 |
+ |
/* Read oerrors */ |
240 |
+ |
if((knp=kstat_data_lookup(ksp, "oerrors"))==NULL){ |
241 |
+ |
continue; |
242 |
+ |
} |
243 |
+ |
network_stat_ptr->oerrors=knp->value.ui32; |
244 |
+ |
|
245 |
+ |
/* Read collisions */ |
246 |
+ |
if((knp=kstat_data_lookup(ksp, "collisions"))==NULL){ |
247 |
+ |
continue; |
248 |
+ |
} |
249 |
+ |
network_stat_ptr->collisions=knp->value.ui32; |
250 |
+ |
|
251 |
+ |
/* Read interface name */ |
252 |
|
if(network_stat_ptr->interface_name!=NULL){ |
253 |
|
free(network_stat_ptr->interface_name); |
254 |
|
} |
255 |
|
network_stat_ptr->interface_name=strdup(ksp->ks_name); |
256 |
|
|
257 |
+ |
/* Store systime */ |
258 |
|
network_stat_ptr->systime=time(NULL); |
259 |
+ |
|
260 |
|
interfaces++; |
261 |
|
} |
262 |
|
} |
273 |
|
fgets(line, sizeof(line), f); |
274 |
|
|
275 |
|
|
276 |
< |
if((regcomp(®ex, "^[[:space:]]*([^:]+):[[:space:]]*([[:digit:]]+)[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+([[:digit:]]+)", REG_EXTENDED))!=0){ |
276 |
> |
if((regcomp(®ex, "^ *([^:]+): *([0-9]+) +([0-9]+) +([0-9]+) +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+ +([0-9]+) +([0-9]+) +([0-9]+) +[0-9]+ +[0-9]+ +([0-9]+)", REG_EXTENDED))!=0){ |
277 |
|
return NULL; |
278 |
|
} |
279 |
|
|
280 |
|
interfaces=0; |
281 |
|
|
282 |
|
while((fgets(line, sizeof(line), f)) != NULL){ |
283 |
< |
if((regexec(®ex, line, 4, line_match, 0))!=0){ |
283 |
> |
if((regexec(®ex, line, 9, line_match, 0))!=0){ |
284 |
|
continue; |
285 |
|
} |
286 |
|
network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats); |
295 |
|
|
296 |
|
network_stat_ptr->interface_name=get_string_match(line, &line_match[1]); |
297 |
|
network_stat_ptr->rx=get_ll_match(line, &line_match[2]); |
298 |
< |
network_stat_ptr->tx=get_ll_match(line, &line_match[3]); |
298 |
> |
network_stat_ptr->tx=get_ll_match(line, &line_match[5]); |
299 |
> |
network_stat_ptr->ipackets=get_ll_match(line, &line_match[3]); |
300 |
> |
network_stat_ptr->opackets=get_ll_match(line, &line_match[6]); |
301 |
> |
network_stat_ptr->ierrors=get_ll_match(line, &line_match[4]); |
302 |
> |
network_stat_ptr->oerrors=get_ll_match(line, &line_match[7]); |
303 |
> |
network_stat_ptr->collisions=get_ll_match(line, &line_match[8]); |
304 |
|
network_stat_ptr->systime=time(NULL); |
305 |
|
|
306 |
|
interfaces++; |
320 |
|
} |
321 |
|
|
322 |
|
long long transfer_diff(long long new, long long old){ |
323 |
< |
#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) |
324 |
< |
#define MAXVAL 4294967296LL |
323 |
> |
#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD) |
324 |
> |
#define MAXVAL 0xffffffffLL |
325 |
|
#else |
326 |
< |
#define MAXVAL 18446744073709551616LL |
326 |
> |
#define MAXVAL 0xffffffffffffffffLL |
327 |
|
#endif |
328 |
|
long long result; |
329 |
|
if(new>=old){ |
364 |
|
dest->interface_name = strdup(src->interface_name); |
365 |
|
dest->rx = src->rx; |
366 |
|
dest->tx = src->tx; |
367 |
+ |
dest->ipackets = src->ipackets; |
368 |
+ |
dest->opackets = src->opackets; |
369 |
+ |
dest->ierrors = src->ierrors; |
370 |
+ |
dest->oerrors = src->oerrors; |
371 |
+ |
dest->collisions = src->collisions; |
372 |
|
dest->systime = src->systime; |
373 |
|
} |
374 |
|
|
399 |
|
difference. */ |
400 |
|
dest->rx = transfer_diff(src->rx, dest->rx); |
401 |
|
dest->tx = transfer_diff(src->tx, dest->tx); |
402 |
+ |
dest->ipackets = transfer_diff(src->ipackets, dest->ipackets); |
403 |
+ |
dest->opackets = transfer_diff(src->opackets, dest->opackets); |
404 |
+ |
dest->ierrors = transfer_diff(src->ierrors, dest->ierrors); |
405 |
+ |
dest->oerrors = transfer_diff(src->oerrors, dest->oerrors); |
406 |
+ |
dest->collisions = transfer_diff(src->collisions, dest->collisions); |
407 |
|
dest->systime = src->systime - dest->systime; |
408 |
|
} |
409 |
|
|
417 |
|
for(net_stats+=start; start<end; start++){ |
418 |
|
net_stats->interface_name=NULL; |
419 |
|
net_stats->speed=0; |
420 |
< |
net_stats->dup=UNKNOWN_DUPEX; |
420 |
> |
net_stats->dup=UNKNOWN_DUPLEX; |
421 |
|
net_stats++; |
422 |
|
} |
423 |
|
} |
452 |
|
static network_iface_stat_t *network_iface_stats; |
453 |
|
network_iface_stat_t *network_iface_stat_ptr; |
454 |
|
static int sizeof_network_iface_stats=0; |
455 |
< |
static int ifaces; |
455 |
> |
int ifaces = 0; |
456 |
|
|
457 |
|
#ifdef SOLARIS |
458 |
|
kstat_ctl_t *kc; |
459 |
|
kstat_t *ksp; |
460 |
|
kstat_named_t *knp; |
461 |
+ |
int sock; |
462 |
|
#endif |
463 |
|
#ifdef ALLBSD |
464 |
|
struct ifaddrs *net, *net_ptr; |
465 |
|
struct ifmediareq ifmed; |
466 |
< |
int s; |
466 |
> |
struct ifreq ifr; |
467 |
> |
int sock; |
468 |
|
int x; |
469 |
|
#endif |
470 |
|
#ifdef LINUX |
471 |
|
FILE *f; |
472 |
|
/* Horrible big enough, but it should be easily big enough */ |
473 |
|
char line[8096]; |
394 |
– |
void *eth_tool_cmd_buf; |
395 |
– |
int buf_size; |
474 |
|
int sock; |
475 |
|
#endif |
476 |
< |
ifaces = 0; |
476 |
> |
|
477 |
|
#ifdef ALLBSD |
478 |
|
if(getifaddrs(&net) != 0){ |
479 |
|
return NULL; |
480 |
|
} |
481 |
|
|
482 |
< |
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == NULL) return NULL; |
482 |
> |
if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == 0) return NULL; |
483 |
|
|
484 |
|
for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){ |
485 |
|
if(net_ptr->ifa_addr->sa_family != AF_LINK) continue; |
489 |
|
} |
490 |
|
network_iface_stat_ptr = network_iface_stats + ifaces; |
491 |
|
|
492 |
+ |
memset(&ifr, 0, sizeof(ifr)); |
493 |
+ |
strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name)); |
494 |
+ |
|
495 |
+ |
if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0){ |
496 |
+ |
continue; |
497 |
+ |
} |
498 |
+ |
if((ifr.ifr_flags & IFF_UP) != 0){ |
499 |
+ |
network_iface_stat_ptr->up = 1; |
500 |
+ |
}else{ |
501 |
+ |
network_iface_stat_ptr->up = 0; |
502 |
+ |
} |
503 |
+ |
|
504 |
+ |
if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name); |
505 |
+ |
network_iface_stat_ptr->interface_name = strdup(net_ptr->ifa_name); |
506 |
+ |
if (network_iface_stat_ptr->interface_name == NULL) return NULL; |
507 |
+ |
|
508 |
+ |
network_iface_stat_ptr->speed = 0; |
509 |
+ |
network_iface_stat_ptr->dup = UNKNOWN_DUPLEX; |
510 |
+ |
ifaces++; |
511 |
+ |
|
512 |
|
memset(&ifmed, 0, sizeof(struct ifmediareq)); |
513 |
|
strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name)); |
514 |
< |
if(ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){ |
514 |
> |
if(ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){ |
515 |
> |
/* Not all interfaces support the media ioctls. */ |
516 |
|
continue; |
517 |
|
} |
518 |
|
|
522 |
|
continue; |
523 |
|
} |
524 |
|
|
426 |
– |
if(network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name); |
427 |
– |
network_iface_stat_ptr->interface_name = strdup(net_ptr->ifa_name); |
428 |
– |
if(network_iface_stat_ptr->interface_name == NULL) return NULL; |
429 |
– |
|
525 |
|
/* Only intrested in the first 4 bits) - Assuming only ETHER devices */ |
526 |
|
x = ifmed.ifm_active & 0x0f; |
527 |
|
switch(x){ |
545 |
|
case(IFM_1000_SX): |
546 |
|
case(IFM_1000_LX): |
547 |
|
case(IFM_1000_CX): |
548 |
< |
#ifdef FREEBSD5 |
549 |
< |
case(IFM_1000_T): |
455 |
< |
#else |
456 |
< |
case(IFM_1000_TX): |
457 |
< |
case(IFM_1000_FX): |
548 |
> |
#ifdef IFM_1000_TX |
549 |
> |
case(IFM_1000_TX): /* FreeBSD 4 and others? */ |
550 |
|
#endif |
551 |
+ |
#ifdef IFM_1000_FX |
552 |
+ |
case(IFM_1000_FX): /* FreeBSD 4 */ |
553 |
+ |
#endif |
554 |
+ |
#ifdef IFM_1000_T |
555 |
+ |
case(IFM_1000_T): /* FreeBSD 5 */ |
556 |
+ |
#endif |
557 |
|
network_iface_stat_ptr->speed = 1000; |
558 |
|
break; |
559 |
|
/* We don't know what it is */ |
567 |
|
}else if( (ifmed.ifm_active | IFM_HDX) == ifmed.ifm_active ){ |
568 |
|
network_iface_stat_ptr->dup = HALF_DUPLEX; |
569 |
|
}else{ |
570 |
< |
network_iface_stat_ptr->dup = UNKNOWN_DUPEX; |
570 |
> |
network_iface_stat_ptr->dup = UNKNOWN_DUPLEX; |
571 |
|
} |
572 |
< |
ifaces++; |
572 |
> |
|
573 |
|
} |
574 |
|
freeifaddrs(net); |
575 |
+ |
close(sock); |
576 |
|
#endif |
577 |
|
|
578 |
|
#ifdef SOLARIS |
579 |
< |
if ((kc = kstat_open()) == NULL) { |
580 |
< |
return NULL; |
581 |
< |
} |
579 |
> |
if ((kc = kstat_open()) == NULL) { |
580 |
> |
return NULL; |
581 |
> |
} |
582 |
|
|
583 |
< |
for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { |
584 |
< |
if (!strcmp(ksp->ks_class, "net")) { |
585 |
< |
kstat_read(kc, ksp, NULL); |
586 |
< |
if((knp=kstat_data_lookup(ksp, "ifspeed"))==NULL){ |
587 |
< |
/* Not a network interface, so skip to the next entry */ |
583 |
> |
if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) { |
584 |
> |
return NULL; |
585 |
> |
} |
586 |
> |
|
587 |
> |
for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { |
588 |
> |
if (!strcmp(ksp->ks_class, "net")) { |
589 |
> |
struct ifreq ifr; |
590 |
> |
|
591 |
> |
kstat_read(kc, ksp, NULL); |
592 |
> |
|
593 |
> |
strncpy(ifr.ifr_name, ksp->ks_name, sizeof ifr.ifr_name); |
594 |
> |
if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) { |
595 |
> |
/* Not a network interface. */ |
596 |
|
continue; |
597 |
|
} |
598 |
< |
network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats); |
599 |
< |
if(network_iface_stats==NULL){ |
598 |
> |
|
599 |
> |
network_iface_stats = network_iface_stat_malloc(ifaces + 1, &sizeof_network_iface_stats, network_iface_stats); |
600 |
> |
if (network_iface_stats == NULL) { |
601 |
|
return NULL; |
602 |
|
} |
603 |
|
network_iface_stat_ptr = network_iface_stats + ifaces; |
604 |
< |
network_iface_stat_ptr->speed = knp->value.ui64 / (1000*1000); |
604 |
> |
ifaces++; |
605 |
|
|
606 |
< |
if((knp=kstat_data_lookup(ksp, "link_duplex"))==NULL){ |
607 |
< |
/* Not a network interface, so skip to the next entry */ |
608 |
< |
continue; |
606 |
> |
if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name); |
607 |
> |
network_iface_stat_ptr->interface_name = strdup(ksp->ks_name); |
608 |
> |
if (network_iface_stat_ptr->interface_name == NULL) return NULL; |
609 |
> |
|
610 |
> |
if ((ifr.ifr_flags & IFF_UP) != 0) { |
611 |
> |
network_iface_stat_ptr->up = 1; |
612 |
> |
} else { |
613 |
> |
network_iface_stat_ptr->up = 1; |
614 |
|
} |
615 |
|
|
616 |
< |
if(knp->value.ui64 == 0){ |
617 |
< |
network_iface_stat_ptr->dup = FULL_DUPLEX; |
618 |
< |
}else{ |
619 |
< |
network_iface_stat_ptr->dup = HALF_DUPLEX; |
616 |
> |
if ((knp = kstat_data_lookup(ksp, "ifspeed")) != NULL) { |
617 |
> |
network_iface_stat_ptr->speed = knp->value.ui64 / (1000 * 1000); |
618 |
> |
} else { |
619 |
> |
network_iface_stat_ptr->speed = 0; |
620 |
|
} |
621 |
|
|
622 |
< |
if(network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name); |
623 |
< |
network_iface_stat_ptr->interface_name = strdup(ksp->ks_name); |
624 |
< |
if(network_iface_stat_ptr->interface_name == NULL) return NULL; |
625 |
< |
ifaces++; |
622 |
> |
network_iface_stat_ptr->dup = UNKNOWN_DUPLEX; |
623 |
> |
if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) { |
624 |
> |
switch (knp->value.ui32) { |
625 |
> |
case 1: |
626 |
> |
network_iface_stat_ptr->dup = HALF_DUPLEX; |
627 |
> |
break; |
628 |
> |
case 2: |
629 |
> |
network_iface_stat_ptr->dup = FULL_DUPLEX; |
630 |
> |
break; |
631 |
> |
} |
632 |
> |
} |
633 |
|
} |
634 |
|
} |
635 |
+ |
|
636 |
+ |
close(sock); |
637 |
|
kstat_close(kc); |
516 |
– |
|
638 |
|
#endif |
639 |
|
#ifdef LINUX |
519 |
– |
|
640 |
|
f = fopen("/proc/net/dev", "r"); |
641 |
|
if(f == NULL){ |
642 |
|
return NULL; |
647 |
|
return NULL; |
648 |
|
} |
649 |
|
|
530 |
– |
buf_size = sizeof(struct ethtool_cmd); |
531 |
– |
eth_tool_cmd_buf = malloc(buf_size); |
532 |
– |
if(eth_tool_cmd_buf == NULL) return NULL; |
533 |
– |
|
650 |
|
/* Ignore first 2 lines.. Just headings */ |
651 |
|
if((fgets(line, sizeof(line), f)) == NULL) return NULL; |
652 |
|
if((fgets(line, sizeof(line), f)) == NULL) return NULL; |
654 |
|
while((fgets(line, sizeof(line), f)) != NULL){ |
655 |
|
char *name, *ptr; |
656 |
|
struct ifreq ifr; |
657 |
< |
struct ethtool_cmd *ethcmd; |
657 |
> |
struct ethtool_cmd ethcmd; |
658 |
|
int err; |
659 |
|
|
660 |
|
/* Get the interface name */ |
666 |
|
name++; |
667 |
|
} |
668 |
|
|
669 |
< |
memset(&ifr, 0, sizeof(ifr)); |
670 |
< |
memset(eth_tool_cmd_buf, 0, buf_size); |
555 |
< |
ifr.ifr_data = (caddr_t) eth_tool_cmd_buf; |
556 |
< |
strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); |
669 |
> |
memset(&ifr, 0, sizeof ifr); |
670 |
> |
strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name); |
671 |
|
|
672 |
< |
ethcmd = (struct ethtool_cmd *) ifr.ifr_data; |
673 |
< |
ethcmd->cmd = ETHTOOL_GSET; |
672 |
> |
if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) { |
673 |
> |
continue; |
674 |
> |
} |
675 |
|
|
561 |
– |
err = ioctl(sock, SIOCETHTOOL, &ifr); |
562 |
– |
if(err < 0){ |
563 |
– |
/* This could fail if the interface doesn't support the command. Carry |
564 |
– |
* on to the next :) |
565 |
– |
*/ |
566 |
– |
continue; |
567 |
– |
} |
568 |
– |
|
676 |
|
/* We have a good interface to add */ |
677 |
|
network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats); |
678 |
|
if(network_iface_stats==NULL){ |
680 |
|
} |
681 |
|
network_iface_stat_ptr = network_iface_stats + ifaces; |
682 |
|
network_iface_stat_ptr->interface_name = strdup(name); |
683 |
< |
network_iface_stat_ptr->speed = ethcmd->speed; |
684 |
< |
network_iface_stat_ptr->dup = UNKNOWN_DUPEX; |
685 |
< |
if(ethcmd->duplex == 0x00){ |
686 |
< |
network_iface_stat_ptr->dup = FULL_DUPLEX; |
683 |
> |
if ((ifr.ifr_flags & IFF_UP) != 0) { |
684 |
> |
network_iface_stat_ptr->up = 1; |
685 |
> |
} else { |
686 |
> |
network_iface_stat_ptr->up = 0; |
687 |
|
} |
688 |
< |
if(ethcmd->duplex == 0x01){ |
689 |
< |
network_iface_stat_ptr->dup = HALF_DUPLEX; |
688 |
> |
|
689 |
> |
memset(ðcmd, 0, sizeof ethcmd); |
690 |
> |
ethcmd.cmd = ETHTOOL_GSET; |
691 |
> |
ifr.ifr_data = (caddr_t) ðcmd; |
692 |
> |
|
693 |
> |
err = ioctl(sock, SIOCETHTOOL, &ifr); |
694 |
> |
if (err == 0) { |
695 |
> |
network_iface_stat_ptr->speed = ethcmd.speed; |
696 |
> |
|
697 |
> |
switch (ethcmd.duplex) { |
698 |
> |
case 0x00: |
699 |
> |
network_iface_stat_ptr->dup = FULL_DUPLEX; |
700 |
> |
break; |
701 |
> |
case 0x01: |
702 |
> |
network_iface_stat_ptr->dup = HALF_DUPLEX; |
703 |
> |
break; |
704 |
> |
default: |
705 |
> |
network_iface_stat_ptr->dup = UNKNOWN_DUPLEX; |
706 |
> |
} |
707 |
> |
} else { |
708 |
> |
/* Not all interfaces support the ethtool ioctl. */ |
709 |
> |
network_iface_stat_ptr->speed = 0; |
710 |
> |
network_iface_stat_ptr->dup = UNKNOWN_DUPLEX; |
711 |
|
} |
712 |
+ |
|
713 |
|
ifaces++; |
714 |
|
} |
715 |
< |
|
716 |
< |
free(eth_tool_cmd_buf); |
715 |
> |
close(sock); |
716 |
> |
fclose(f); |
717 |
|
#endif |
718 |
|
*entries = ifaces; |
719 |
|
return network_iface_stats; |