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.43 by ats, Sat Feb 14 15:48:42 2004 UTC vs.
Revision 1.48 by tdb, Sat Mar 6 21:56:23 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 71 | Line 77 | void network_stat_init(int start, int end, network_sta
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		}
#	Line 145 | Line 156 | network_stat_t *get_network_stats(int *entries){
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		}
#	Line 174 | Line 190 | network_stat_t *get_network_stats(int *entries){
190		#endif
191
192		if((knp=kstat_data_lookup(ksp, RLOOKUP))==NULL){
193	<	/* Not a network interface, so skip to the next entry */
193	>	/* This is a network interface, but it doesn't
194	>	* have the rbytes/obytes values; for instance,
195	>	* the loopback devices have this behaviour
196	>	* (although they do track packets in/out). */
197		continue;
198		}
199
#	Line 186 | Line 205 | network_stat_t *get_network_stats(int *entries){
205		network_stat_ptr->rx=knp->VALTYPE;
206
207		if((knp=kstat_data_lookup(ksp, WLOOKUP))==NULL){
189	–	/* Not a network interface, so skip to the next entry */
208		continue;
209		}
210		network_stat_ptr->tx=knp->VALTYPE;
#	Line 212 | Line 230 | network_stat_t *get_network_stats(int *entries){
230		fgets(line, sizeof(line), f);
231
232
233	<	if((regcomp(&regex, "^[[:space:]]*([^:]+):[[:space:]]*([[:digit:]]+)[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+([[:digit:]]+)", REG_EXTENDED))!=0){
233	>	if((regcomp(&regex, "^[[:space:]]*([^:]+):[[:space:]]*([[:digit:]]+)[[:space:]]+([[:digit:]]+)[[:space:]]+([[:digit:]]+)[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+([[:digit:]]+)[[:space:]]+([[:digit:]]+)[[:space:]]+([[:digit:]]+)[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+([[:digit:]]+)", REG_EXTENDED))!=0){
234		return NULL;
235		}
236
#	Line 234 | Line 252 | network_stat_t *get_network_stats(int *entries){
252
253		network_stat_ptr->interface_name=get_string_match(line, &line_match[1]);
254		network_stat_ptr->rx=get_ll_match(line, &line_match[2]);
255	<	network_stat_ptr->tx=get_ll_match(line, &line_match[3]);
255	>	network_stat_ptr->tx=get_ll_match(line, &line_match[5]);
256	>	network_stat_ptr->ipackets=get_ll_match(line, &line_match[3]);
257	>	network_stat_ptr->opackets=get_ll_match(line, &line_match[6]);
258	>	network_stat_ptr->ierrors=get_ll_match(line, &line_match[4]);
259	>	network_stat_ptr->oerrors=get_ll_match(line, &line_match[7]);
260	>	network_stat_ptr->collisions=get_ll_match(line, &line_match[8]);
261		network_stat_ptr->systime=time(NULL);
262
263		interfaces++;
#	Line 254 | Line 277 | network_stat_t *get_network_stats(int *entries){
277		}
278
279		long long transfer_diff(long long new, long long old){
280	<	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD)
280	>	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD)
281		#define MAXVAL 4294967296LL
282		#else
283		#define MAXVAL 18446744073709551616LL
#	Line 298 | Line 321 | network_stat_t *get_network_stats_diff(int *entries) {
321		dest->interface_name = strdup(src->interface_name);
322		dest->rx = src->rx;
323		dest->tx = src->tx;
324	+	dest->ipackets = src->ipackets;
325	+	dest->opackets = src->opackets;
326	+	dest->ierrors = src->ierrors;
327	+	dest->oerrors = src->oerrors;
328	+	dest->collisions = src->collisions;
329		dest->systime = src->systime;
330		}
331
#	Line 328 | Line 356 | network_stat_t *get_network_stats_diff(int *entries) {
356		difference. */
357		dest->rx = transfer_diff(src->rx, dest->rx);
358		dest->tx = transfer_diff(src->tx, dest->tx);
359	+	dest->ipackets = transfer_diff(src->ipackets, dest->ipackets);
360	+	dest->opackets = transfer_diff(src->opackets, dest->opackets);
361	+	dest->ierrors = transfer_diff(src->ierrors, dest->ierrors);
362	+	dest->oerrors = transfer_diff(src->oerrors, dest->oerrors);
363	+	dest->collisions = transfer_diff(src->collisions, dest->collisions);
364		dest->systime = src->systime - dest->systime;
365		}
366
#	Line 382 | Line 415 | network_iface_stat_t *get_network_iface_stats(int *ent
415		kstat_ctl_t *kc;
416		kstat_t *ksp;
417		kstat_named_t *knp;
418	+	int sock;
419		#endif
420		#ifdef ALLBSD
421		struct ifaddrs *net, *net_ptr;
#	Line 468 | Line 502 | network_iface_stat_t *get_network_iface_stats(int *ent
502		case(IFM_1000_SX):
503		case(IFM_1000_LX):
504		case(IFM_1000_CX):
505	<	#if defined(FREEBSD) && !defined(FREEBSD5)
506	<	case(IFM_1000_TX):
473	<	case(IFM_1000_FX):
474	<	#else
475	<	case(IFM_1000_T):
505	>	#ifdef IFM_1000_TX
506	>	case(IFM_1000_TX): /* FreeBSD 4 and others? */
507		#endif
508	+	#ifdef IFM_1000_FX
509	+	case(IFM_1000_FX): /* FreeBSD 4 */
510	+	#endif
511	+	#ifdef IFM_1000_T
512	+	case(IFM_1000_T): /* FreeBSD 5 */
513	+	#endif
514		network_iface_stat_ptr->speed = 1000;
515		break;
516		/* We don't know what it is */
#	Line 496 | Line 533 | network_iface_stat_t *get_network_iface_stats(int *ent
533		#endif
534
535		#ifdef SOLARIS
536	<	if ((kc = kstat_open()) == NULL) {
537	<	return NULL;
538	<	}
536	>	if ((kc = kstat_open()) == NULL) {
537	>	return NULL;
538	>	}
539
540	<	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
541	<	if (!strcmp(ksp->ks_class, "net")) {
542	<	kstat_read(kc, ksp, NULL);
543	<	if((knp=kstat_data_lookup(ksp, "ifspeed"))==NULL){
544	<	/* Not a network interface, so skip to the next entry */
540	>	if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
541	>	return NULL;
542	>	}
543	>
544	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
545	>	if (!strcmp(ksp->ks_class, "net")) {
546	>	struct ifreq ifr;
547	>
548	>	kstat_read(kc, ksp, NULL);
549	>
550	>	strncpy(ifr.ifr_name, ksp->ks_name, sizeof ifr.ifr_name);
551	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
552	>	/* Not a network interface. */
553		continue;
554		}
555	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
556	<	if(network_iface_stats==NULL){
555	>
556	>	network_iface_stats = network_iface_stat_malloc(ifaces + 1, &sizeof_network_iface_stats, network_iface_stats);
557	>	if (network_iface_stats == NULL) {
558		return NULL;
559		}
560		network_iface_stat_ptr = network_iface_stats + ifaces;
561	<	network_iface_stat_ptr->speed = knp->value.ui64 / (1000*1000);
561	>	ifaces++;
562
563	<	if((knp=kstat_data_lookup(ksp, "link_up"))==NULL){
564	<	/* Not a network interface, so skip to the next entry */
565	<	continue;
520	<	}
521	<	/* Solaris has 1 for up, and 0 for not. As we do too */
522	<	network_iface_stat_ptr->up = knp->value.ui32;
563	>	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
564	>	network_iface_stat_ptr->interface_name = strdup(ksp->ks_name);
565	>	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
566
567	<	if((knp=kstat_data_lookup(ksp, "link_duplex"))==NULL){
568	<	/* Not a network interface, so skip to the next entry */
569	<	continue;
567	>	if ((ifr.ifr_flags & IFF_UP) != 0) {
568	>	network_iface_stat_ptr->up = 1;
569	>	} else {
570	>	network_iface_stat_ptr->up = 1;
571		}
572
573	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
574	<	if(knp->value.ui32 == 2){
575	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
573	>	if ((knp = kstat_data_lookup(ksp, "ifspeed")) != NULL) {
574	>	network_iface_stat_ptr->speed = knp->value.ui64 / (1000 * 1000);
575	>	} else {
576	>	network_iface_stat_ptr->speed = 0;
577		}
533	–	if(knp->value.ui32 == 1){
534	–	network_iface_stat_ptr->dup = HALF_DUPLEX;
535	–	}
578
579	<	if(network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
580	<	network_iface_stat_ptr->interface_name = strdup(ksp->ks_name);
581	<	if(network_iface_stat_ptr->interface_name == NULL) return NULL;
582	<	ifaces++;
579	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
580	>	if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) {
581	>	switch (knp->value.ui32) {
582	>	case 1:
583	>	network_iface_stat_ptr->dup = HALF_DUPLEX;
584	>	break;
585	>	case 2:
586	>	network_iface_stat_ptr->dup = FULL_DUPLEX;
587	>	break;
588	>	}
589	>	}
590		}
591		}
592	+
593	+	close(sock);
594		kstat_close(kc);
544	–
595		#endif
596		#ifdef LINUX
597		f = fopen("/proc/net/dev", "r");

Diff Legend

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