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.60 by ats, Mon Apr 5 00:16:24 2004 UTC vs.
Revision 1.69 by ats, Sun Jul 18 21:30:11 2004 UTC

#	Line 1 | Line 1
1		/*
2	<	* i-scream central monitoring system
2	>	* i-scream libstatgrab
3		* http://www.i-scream.org
4		* Copyright (C) 2000-2004 i-scream
5		*
#	Line 40 | Line 40
40		#include <net/if.h>
41		#include <netinet/in.h>
42		#include <sys/sockio.h>
43	+	#include <unistd.h>
44		#endif
45		#ifdef LINUX
46		#include <stdio.h>
47		#include <sys/types.h>
47	–	#include <regex.h>
48		#include <sys/ioctl.h>
49		#include <sys/socket.h>
50		#include <net/if.h>
#	Line 70 | Line 70 | typedef __uint64_t u64;
70		#include <unistd.h>
71		#endif
72
73	<	static void network_stat_init(network_stat_t *s) {
73	>	static void network_stat_init(sg_network_io_stats *s) {
74		s->interface_name = NULL;
75		s->tx = 0;
76		s->rx = 0;
#	Line 81 | Line 81 | static void network_stat_init(network_stat_t *s) {
81		s->collisions = 0;
82		}
83
84	<	static void network_stat_destroy(network_stat_t *s) {
84	>	static void network_stat_destroy(sg_network_io_stats *s) {
85		free(s->interface_name);
86		}
87
88	<	VECTOR_DECLARE_STATIC(network_stats, network_stat_t, 5,
89	<	network_stat_init, network_stat_destroy);
88	>	VECTOR_DECLARE_STATIC(network_stats, sg_network_io_stats, 5,
89	>	network_stat_init, network_stat_destroy);
90
91	<	network_stat_t *get_network_stats(int *entries){
91	>	sg_network_io_stats *sg_get_network_io_stats(int *entries){
92		int interfaces;
93	<	network_stat_t *network_stat_ptr;
93	>	sg_network_io_stats *network_stat_ptr;
94
95		#ifdef SOLARIS
96	<	kstat_ctl_t *kc;
97	<	kstat_t *ksp;
96	>	kstat_ctl_t *kc;
97	>	kstat_t *ksp;
98		kstat_named_t *knp;
99		#endif
100
#	Line 112 | Line 112 | network_stat_t *get_network_stats(int *entries){
112
113		#ifdef ALLBSD
114		if(getifaddrs(&net) != 0){
115	+	sg_set_error_with_errno(SG_ERROR_GETIFADDRS, NULL);
116		return NULL;
117		}
118
#	Line 125 | Line 126 | network_stat_t *get_network_stats(int *entries){
126		}
127		network_stat_ptr=network_stats+interfaces;
128
129	<	if (update_string(&network_stat_ptr->interface_name,
130	<	net_ptr->ifa_name) == NULL) {
129	>	if (sg_update_string(&network_stat_ptr->interface_name,
130	>	net_ptr->ifa_name) < 0) {
131		return NULL;
132		}
133		net_data=(struct if_data *)net_ptr->ifa_data;
#	Line 144 | Line 145 | network_stat_t *get_network_stats(int *entries){
145		#endif
146
147		#ifdef SOLARIS
148	<	if ((kc = kstat_open()) == NULL) {
149	<	return NULL;
150	<	}
148	>	if ((kc = kstat_open()) == NULL) {
149	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
150	>	return NULL;
151	>	}
152
153		interfaces=0;
154
155	<	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
156	<	if (!strcmp(ksp->ks_class, "net")) {
157	<	kstat_read(kc, ksp, NULL);
155	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
156	>	if (!strcmp(ksp->ks_class, "net")) {
157	>	kstat_read(kc, ksp, NULL);
158
159		#ifdef SOL7
160		#define LRX "rbytes"
#	Line 225 | Line 227 | network_stat_t *get_network_stats(int *entries){
227		network_stat_ptr->collisions=knp->value.ui32;
228
229		/* Read interface name */
230	<	if (update_string(&network_stat_ptr->interface_name,
231	<	ksp->ks_name) == NULL) {
230	>	if (sg_update_string(&network_stat_ptr->interface_name,
231	>	ksp->ks_name) < 0) {
232		return NULL;
233		}
234
#	Line 242 | Line 244 | network_stat_t *get_network_stats(int *entries){
244		#ifdef LINUX
245		f=fopen("/proc/net/dev", "r");
246		if(f==NULL){
247	+	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/net/dev");
248		return NULL;
249		}
250		/* read the 2 lines.. Its the title, so we dont care :) */
#	Line 250 | Line 253 | network_stat_t *get_network_stats(int *entries){
253
254
255		if((regcomp(&regex, "^ *([^:]+): *([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){
256	+	sg_set_error(SG_ERROR_PARSE, NULL);
257		return NULL;
258		}
259
#	Line 263 | Line 267 | network_stat_t *get_network_stats(int *entries){
267		if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
268		return NULL;
269		}
270	<	network_stat_ptr=network_stats+interfaces;
270	>	network_stat_ptr=network_stats+interfaces;
271
272		if(network_stat_ptr->interface_name!=NULL){
273		free(network_stat_ptr->interface_name);
274		}
275
276	<	network_stat_ptr->interface_name=get_string_match(line, &line_match[1]);
277	<	network_stat_ptr->rx=get_ll_match(line, &line_match[2]);
278	<	network_stat_ptr->tx=get_ll_match(line, &line_match[5]);
279	<	network_stat_ptr->ipackets=get_ll_match(line, &line_match[3]);
280	<	network_stat_ptr->opackets=get_ll_match(line, &line_match[6]);
281	<	network_stat_ptr->ierrors=get_ll_match(line, &line_match[4]);
282	<	network_stat_ptr->oerrors=get_ll_match(line, &line_match[7]);
283	<	network_stat_ptr->collisions=get_ll_match(line, &line_match[8]);
276	>	network_stat_ptr->interface_name=sg_get_string_match(line, &line_match[1]);
277	>	network_stat_ptr->rx=sg_get_ll_match(line, &line_match[2]);
278	>	network_stat_ptr->tx=sg_get_ll_match(line, &line_match[5]);
279	>	network_stat_ptr->ipackets=sg_get_ll_match(line, &line_match[3]);
280	>	network_stat_ptr->opackets=sg_get_ll_match(line, &line_match[6]);
281	>	network_stat_ptr->ierrors=sg_get_ll_match(line, &line_match[4]);
282	>	network_stat_ptr->oerrors=sg_get_ll_match(line, &line_match[7]);
283	>	network_stat_ptr->collisions=sg_get_ll_match(line, &line_match[8]);
284		network_stat_ptr->systime=time(NULL);
285
286		interfaces++;
#	Line 287 | Line 291 | network_stat_t *get_network_stats(int *entries){
291		#endif
292
293		#ifdef CYGWIN
294	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
295		return NULL;
296		#endif
297
#	Line 295 | Line 300 | network_stat_t *get_network_stats(int *entries){
300		return network_stats;
301		}
302
303	<	long long transfer_diff(long long new, long long old){
303	>	static long long transfer_diff(long long new, long long old){
304		#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD) || defined(OPENBSD)
305		/* 32-bit quantities, so we must explicitly deal with wraparound. */
306		#define MAXVAL 0x100000000LL
#	Line 310 | Line 315 | long long transfer_diff(long long new, long long old){
315		#endif
316		}
317
318	<	network_stat_t *get_network_stats_diff(int *entries) {
319	<	VECTOR_DECLARE_STATIC(diff, network_stat_t, 1,
320	<	network_stat_init, network_stat_destroy);
321	<	network_stat_t *src = NULL, *dest;
318	>	sg_network_io_stats *sg_get_network_io_stats_diff(int *entries) {
319	>	VECTOR_DECLARE_STATIC(diff, sg_network_io_stats, 1,
320	>	network_stat_init, network_stat_destroy);
321	>	sg_network_io_stats *src = NULL, *dest;
322		int i, j, diff_count, new_count;
323
324		if (network_stats == NULL) {
325		/* No previous stats, so we can't calculate a difference. */
326	<	return get_network_stats(entries);
326	>	return sg_get_network_io_stats(entries);
327		}
328
329		/* Resize the results array to match the previous stats. */
#	Line 332 | Line 337 | network_stat_t *get_network_stats_diff(int *entries) {
337		src = &network_stats[i];
338		dest = &diff[i];
339
340	<	if (update_string(&dest->interface_name,
341	<	src->interface_name) == NULL) {
340	>	if (sg_update_string(&dest->interface_name,
341	>	src->interface_name) < 0) {
342		return NULL;
343		}
344		dest->rx = src->rx;
#	Line 347 | Line 352 | network_stat_t *get_network_stats_diff(int *entries) {
352		}
353
354		/* Get a new set of stats. */
355	<	if (get_network_stats(&new_count) == NULL) {
355	>	if (sg_get_network_io_stats(&new_count) == NULL) {
356		return NULL;
357		}
358
#	Line 385 | Line 390 | network_stat_t *get_network_stats_diff(int *entries) {
390		return diff;
391		}
392
393	+	int sg_network_io_compare_name(const void *va, const void *vb) {
394	+	const sg_network_io_stats *a = (const sg_network_io_stats *)va;
395	+	const sg_network_io_stats *b = (const sg_network_io_stats *)vb;
396	+
397	+	return strcmp(a->interface_name, b->interface_name);
398	+	}
399	+
400		/* NETWORK INTERFACE STATS */
401
402	<	static void network_iface_stat_init(network_iface_stat_t *s) {
402	>	static void network_iface_stat_init(sg_network_iface_stats *s) {
403		s->interface_name = NULL;
404		s->speed = 0;
405	<	s->dup = UNKNOWN_DUPLEX;
405	>	s->dup = SG_IFACE_DUPLEX_UNKNOWN;
406		}
407
408	<	static void network_iface_stat_destroy(network_iface_stat_t *s) {
408	>	static void network_iface_stat_destroy(sg_network_iface_stats *s) {
409		free(s->interface_name);
410		}
411
412	<	network_iface_stat_t *get_network_iface_stats(int *entries){
413	<	VECTOR_DECLARE_STATIC(network_iface_stats, network_iface_stat_t, 5,
414	<	network_iface_stat_init, network_iface_stat_destroy);
415	<	network_iface_stat_t *network_iface_stat_ptr;
412	>	sg_network_iface_stats *sg_get_network_iface_stats(int *entries){
413	>	VECTOR_DECLARE_STATIC(network_iface_stats, sg_network_iface_stats, 5,
414	>	network_iface_stat_init, network_iface_stat_destroy);
415	>	sg_network_iface_stats *network_iface_stat_ptr;
416		int ifaces = 0;
417
418		#ifdef SOLARIS
419	<	kstat_ctl_t *kc;
420	<	kstat_t *ksp;
419	>	kstat_ctl_t *kc;
420	>	kstat_t *ksp;
421		kstat_named_t *knp;
422		int sock;
423		#endif
424		#ifdef ALLBSD
425	<	struct ifaddrs *net, *net_ptr;
425	>	struct ifaddrs *net, *net_ptr;
426		struct ifmediareq ifmed;
427		struct ifreq ifr;
428		int sock;
429		int x;
430		#endif
431		#ifdef LINUX
432	<	FILE *f;
433	<	/* Horrible big enough, but it should be easily big enough */
434	<	char line[8096];
432	>	FILE *f;
433	>	/* Horrible big enough, but it should be easily big enough */
434	>	char line[8096];
435		int sock;
436		#endif
437
438		#ifdef ALLBSD
439	<	if(getifaddrs(&net) != 0){
440	<	return NULL;
441	<	}
439	>	if(getifaddrs(&net) != 0){
440	>	sg_set_error_with_errno(SG_ERROR_GETIFADDRS, NULL);
441	>	return NULL;
442	>	}
443
444		if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == 0) return NULL;
445
446		for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){
447	<	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
447	>	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
448
449		if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
450	<	return NULL;
451	<	}
452	<	network_iface_stat_ptr = network_iface_stats + ifaces;
450	>	return NULL;
451	>	}
452	>	network_iface_stat_ptr = network_iface_stats + ifaces;
453
454		memset(&ifr, 0, sizeof(ifr));
455		strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
#	Line 450 | Line 463 | network_iface_stat_t *get_network_iface_stats(int *ent
463		network_iface_stat_ptr->up = 0;
464		}
465
466	<	if (update_string(&network_iface_stat_ptr->interface_name,
467	<	net_ptr->ifa_name) == NULL) {
466	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
467	>	net_ptr->ifa_name) < 0) {
468		return NULL;
469		}
470
471		network_iface_stat_ptr->speed = 0;
472	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
472	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
473		ifaces++;
474
475		memset(&ifmed, 0, sizeof(struct ifmediareq));
476	<	strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
476	>	sg_strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
477		if(ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
478		/* Not all interfaces support the media ioctls. */
479		continue;
#	Line 513 | Line 526 | network_iface_stat_t *get_network_iface_stats(int *ent
526		}
527
528		if( (ifmed.ifm_active | IFM_FDX) == ifmed.ifm_active ){
529	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
529	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
530		}else if( (ifmed.ifm_active | IFM_HDX) == ifmed.ifm_active ){
531	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
531	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
532		}else{
533	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
533	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
534		}
535
536		}
#	Line 527 | Line 540 | network_iface_stat_t *get_network_iface_stats(int *ent
540
541		#ifdef SOLARIS
542		if ((kc = kstat_open()) == NULL) {
543	+	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
544		return NULL;
545		}
546
547		if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
548	+	sg_set_error_with_errno(SG_ERROR_SOCKET, NULL);
549		return NULL;
550		}
551
#	Line 552 | Line 567 | network_iface_stat_t *get_network_iface_stats(int *ent
567		network_iface_stat_ptr = network_iface_stats + ifaces;
568		ifaces++;
569
570	<	if (update_string(&network_iface_stat_ptr->interface_name,
571	<	ksp->ks_name) == NULL) {
570	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
571	>	ksp->ks_name) < 0) {
572		return NULL;
573		}
574
#	Line 569 | Line 584 | network_iface_stat_t *get_network_iface_stats(int *ent
584		network_iface_stat_ptr->speed = 0;
585		}
586
587	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
587	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
588		if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) {
589		switch (knp->value.ui32) {
590		case 1:
591	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
591	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
592		break;
593		case 2:
594	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
594	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
595		break;
596		}
597		}
#	Line 588 | Line 603 | network_iface_stat_t *get_network_iface_stats(int *ent
603		#endif
604		#ifdef LINUX
605		f = fopen("/proc/net/dev", "r");
606	<	if(f == NULL){
607	<	return NULL;
608	<	}
606	>	if(f == NULL){
607	>	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/net/dev");
608	>	return NULL;
609	>	}
610
611		/* Setup stuff so we can do the ioctl to get the info */
612		if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0){
613	+	sg_set_error_with_errno(SG_ERROR_SOCKET, NULL);
614		return NULL;
615		}
616
617		/* Ignore first 2 lines.. Just headings */
618	<	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
619	<	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
618	>	if((fgets(line, sizeof(line), f)) == NULL) {
619	>	sg_set_error(SG_ERROR_PARSE, NULL);
620	>	return NULL;
621	>	}
622	>	if((fgets(line, sizeof(line), f)) == NULL) {
623	>	sg_set_error(SG_ERROR_PARSE, NULL);
624	>	return NULL;
625	>	}
626
627	<	while((fgets(line, sizeof(line), f)) != NULL){
628	<	char *name, *ptr;
629	<	struct ifreq ifr;
630	<	struct ethtool_cmd ethcmd;
631	<	int err;
627	>	while((fgets(line, sizeof(line), f)) != NULL){
628	>	char *name, *ptr;
629	>	struct ifreq ifr;
630	>	struct ethtool_cmd ethcmd;
631	>	int err;
632
633		/* Get the interface name */
634	<	ptr = strchr(line, ':');
635	<	if (ptr == NULL) continue;
636	<	*ptr='\0';
637	<	name = line;
638	<	while(isspace(*(name))){
639	<	name++;
640	<	}
634	>	ptr = strchr(line, ':');
635	>	if (ptr == NULL) continue;
636	>	*ptr='\0';
637	>	name = line;
638	>	while(isspace(*(name))){
639	>	name++;
640	>	}
641
642	<	memset(&ifr, 0, sizeof ifr);
643	<	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
642	>	memset(&ifr, 0, sizeof ifr);
643	>	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
644
645		if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
646		continue;
#	Line 629 | Line 652 | network_iface_stat_t *get_network_iface_stats(int *ent
652		}
653		network_iface_stat_ptr = network_iface_stats + ifaces;
654
655	<	if (update_string(&network_iface_stat_ptr->interface_name,
656	<	name) == NULL) {
655	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
656	>	name) < 0) {
657		return NULL;
658		}
659		if ((ifr.ifr_flags & IFF_UP) != 0) {
#	Line 639 | Line 662 | network_iface_stat_t *get_network_iface_stats(int *ent
662		network_iface_stat_ptr->up = 0;
663		}
664
665	<	memset(&ethcmd, 0, sizeof ethcmd);
666	<	ethcmd.cmd = ETHTOOL_GSET;
667	<	ifr.ifr_data = (caddr_t) &ethcmd;
665	>	memset(&ethcmd, 0, sizeof ethcmd);
666	>	ethcmd.cmd = ETHTOOL_GSET;
667	>	ifr.ifr_data = (caddr_t) &ethcmd;
668
669	<	err = ioctl(sock, SIOCETHTOOL, &ifr);
670	<	if (err == 0) {
669	>	err = ioctl(sock, SIOCETHTOOL, &ifr);
670	>	if (err == 0) {
671		network_iface_stat_ptr->speed = ethcmd.speed;
672
673		switch (ethcmd.duplex) {
674		case 0x00:
675	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
675	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
676		break;
677		case 0x01:
678	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
678	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
679		break;
680		default:
681	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
681	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
682		}
683		} else {
684		/* Not all interfaces support the ethtool ioctl. */
685		network_iface_stat_ptr->speed = 0;
686	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
686	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
687		}
688
689		ifaces++;
#	Line 670 | Line 693 | network_iface_stat_t *get_network_iface_stats(int *ent
693		#endif
694		*entries = ifaces;
695		return network_iface_stats;
696	+	}
697	+
698	+	int sg_network_iface_compare_name(const void *va, const void *vb) {
699	+	const sg_network_iface_stats *a = (const sg_network_iface_stats *)va;
700	+	const sg_network_iface_stats *b = (const sg_network_iface_stats *)vb;
701	+
702	+	return strcmp(a->interface_name, b->interface_name);
703		}
704

Diff Legend

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