ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/network_stats.c

Comparing projects/libstatgrab/src/libstatgrab/network_stats.c (file contents):
Revision 1.39 by ats, Sat Feb 14 00:29:29 2004 UTC vs.
Revision 1.44 by ats, Sat Feb 14 16:58:19 2004 UTC

#	Line 32 | Line 32
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>
#	Line 48 | Line 54
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>
#	Line 173 | Line 180 | network_stat_t *get_network_stats(int *entries){
180		#endif
181
182		if((knp=kstat_data_lookup(ksp, RLOOKUP))==NULL){
183	<	/* Not a network interface, so skip to the next entry */
183	>	/* This is a network interface, but it doesn't
184	>	* have the rbytes/obytes values; for instance,
185	>	* the loopback devices have this behaviour
186	>	* (although they do track packets in/out). */
187		continue;
188		}
189
#	Line 185 | Line 195 | network_stat_t *get_network_stats(int *entries){
195		network_stat_ptr->rx=knp->VALTYPE;
196
197		if((knp=kstat_data_lookup(ksp, WLOOKUP))==NULL){
188	–	/* Not a network interface, so skip to the next entry */
198		continue;
199		}
200		network_stat_ptr->tx=knp->VALTYPE;
#	Line 375 | Line 384 | network_iface_stat_t *get_network_iface_stats(int *ent
384		static network_iface_stat_t *network_iface_stats;
385		network_iface_stat_t *network_iface_stat_ptr;
386		static int sizeof_network_iface_stats=0;
387	<	static int ifaces;
387	>	int ifaces = 0;
388
389		#ifdef SOLARIS
390		kstat_ctl_t *kc;
391		kstat_t *ksp;
392		kstat_named_t *knp;
393	+	int sock;
394		#endif
395		#ifdef ALLBSD
396		struct ifaddrs *net, *net_ptr;
#	Line 395 | Line 405 | network_iface_stat_t *get_network_iface_stats(int *ent
405		char line[8096];
406		int sock;
407		#endif
408	<	ifaces = 0;
408	>
409		#ifdef ALLBSD
410		if(getifaddrs(&net) != 0){
411		return NULL;
#	Line 411 | Line 421 | network_iface_stat_t *get_network_iface_stats(int *ent
421		}
422		network_iface_stat_ptr = network_iface_stats + ifaces;
423
424	+	memset(&ifr, 0, sizeof(ifr));
425	+	strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
426	+
427	+	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0){
428	+	continue;
429	+	}
430	+	if((ifr.ifr_flags & IFF_UP) != 0){
431	+	network_iface_stat_ptr->up = 1;
432	+	}else{
433	+	network_iface_stat_ptr->up = 0;
434	+	}
435	+
436	+	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
437	+	network_iface_stat_ptr->interface_name = strdup(net_ptr->ifa_name);
438	+	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
439	+
440	+	network_iface_stat_ptr->speed = 0;
441	+	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
442	+	ifaces++;
443	+
444		memset(&ifmed, 0, sizeof(struct ifmediareq));
445		strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
446		if(ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
447	+	/* Not all interfaces support the media ioctls. */
448		continue;
449		}
450
#	Line 423 | Line 454 | network_iface_stat_t *get_network_iface_stats(int *ent
454		continue;
455		}
456
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	–
457		/* Only intrested in the first 4 bits)  - Assuming only ETHER devices */
458		x = ifmed.ifm_active & 0x0f;
459		switch(x){
#	Line 472 | Line 499 | network_iface_stat_t *get_network_iface_stats(int *ent
499		network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
500		}
501
475	–	memset(&ifr, 0, sizeof(ifr));
476	–	strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
477	–
478	–	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0){
479	–	continue;
480	–	}
481	–	if((ifr.ifr_flags & IFF_UP) != 0){
482	–	network_iface_stat_ptr->up = 1;
483	–	}else{
484	–	network_iface_stat_ptr->up = 0;
485	–	}
486	–
487	–	ifaces++;
502		}
503		freeifaddrs(net);
504		close(sock);
505		#endif
506
507		#ifdef SOLARIS
508	<	if ((kc = kstat_open()) == NULL) {
509	<	return NULL;
510	<	}
508	>	if ((kc = kstat_open()) == NULL) {
509	>	return NULL;
510	>	}
511
512	<	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
513	<	if (!strcmp(ksp->ks_class, "net")) {
514	<	kstat_read(kc, ksp, NULL);
515	<	if((knp=kstat_data_lookup(ksp, "ifspeed"))==NULL){
516	<	/* Not a network interface, so skip to the next entry */
512	>	if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
513	>	return NULL;
514	>	}
515	>
516	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
517	>	if (!strcmp(ksp->ks_class, "net")) {
518	>	struct ifreq ifr;
519	>
520	>	kstat_read(kc, ksp, NULL);
521	>
522	>	strncpy(ifr.ifr_name, ksp->ks_name, sizeof ifr.ifr_name);
523	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
524	>	/* Not a network interface. */
525		continue;
526		}
527	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
528	<	if(network_iface_stats==NULL){
527	>
528	>	network_iface_stats = network_iface_stat_malloc(ifaces + 1, &sizeof_network_iface_stats, network_iface_stats);
529	>	if (network_iface_stats == NULL) {
530		return NULL;
531		}
532		network_iface_stat_ptr = network_iface_stats + ifaces;
533	<	network_iface_stat_ptr->speed = knp->value.ui64 / (1000*1000);
533	>	ifaces++;
534
535	<	if((knp=kstat_data_lookup(ksp, "link_up"))==NULL){
536	<	/* Not a network interface, so skip to the next entry */
537	<	continue;
515	<	}
516	<	/* Solaris has 1 for up, and 0 for not. As we do too */
517	<	network_iface_stat_ptr->up = value.ui32;
535	>	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
536	>	network_iface_stat_ptr->interface_name = strdup(ksp->ks_name);
537	>	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
538
539	<	if((knp=kstat_data_lookup(ksp, "link_duplex"))==NULL){
540	<	/* Not a network interface, so skip to the next entry */
541	<	continue;
539	>	if ((ifr.ifr_flags & IFF_UP) != 0) {
540	>	network_iface_stat_ptr->up = 1;
541	>	} else {
542	>	network_iface_stat_ptr->up = 1;
543		}
544
545	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
546	<	if(knp->value.ui32 == 2){
547	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
545	>	if ((knp = kstat_data_lookup(ksp, "ifspeed")) != NULL) {
546	>	network_iface_stat_ptr->speed = knp->value.ui64 / (1000 * 1000);
547	>	} else {
548	>	network_iface_stat_ptr->speed = 0;
549		}
528	–	if(knp->value.ui32 == 1){
529	–	network_iface_stat_ptr->dup = HALF_DUPLEX;
530	–	}
550
551	<	if(network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
552	<	network_iface_stat_ptr->interface_name = strdup(ksp->ks_name);
553	<	if(network_iface_stat_ptr->interface_name == NULL) return NULL;
554	<	ifaces++;
551	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
552	>	if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) {
553	>	switch (knp->value.ui32) {
554	>	case 1:
555	>	network_iface_stat_ptr->dup = HALF_DUPLEX;
556	>	break;
557	>	case 2:
558	>	network_iface_stat_ptr->dup = FULL_DUPLEX;
559	>	break;
560	>	}
561	>	}
562		}
563		}
564	+
565	+	close(sock);
566		kstat_close(kc);
539	–
567		#endif
568		#ifdef LINUX
569		f = fopen("/proc/net/dev", "r");

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines