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.67 by tdb, Thu Apr 8 10:56:13 2004 UTC vs.
Revision 1.73 by tdb, Mon Apr 25 14:12:05 2005 UTC

#	Line 52 | Line 52
52		/* Stuff which could be defined by defining KERNEL, but
53		* that would be a bad idea, so we'll just declare it here
54		*/
55	+	#include <linux/version.h>
56	+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
57	+	typedef __uint8_t __u8;
58	+	typedef __uint16_t __u16;
59	+	typedef __uint32_t __u32;
60	+	typedef __uint64_t __u64;
61	+	#else
62		typedef __uint8_t u8;
63		typedef __uint16_t u16;
64		typedef __uint32_t u32;
65		typedef __uint64_t u64;
66	+	#endif
67		#include <linux/ethtool.h>
68		#include <linux/sockios.h>
69		#include <unistd.h>
#	Line 112 | Line 120 | sg_network_io_stats *sg_get_network_io_stats(int *entr
120
121		#ifdef ALLBSD
122		if(getifaddrs(&net) != 0){
123	<	sg_set_error(SG_ERROR_GETIFADDRS, NULL);
123	>	sg_set_error_with_errno(SG_ERROR_GETIFADDRS, NULL);
124		return NULL;
125		}
126
#	Line 244 | Line 252 | sg_network_io_stats *sg_get_network_io_stats(int *entr
252		#ifdef LINUX
253		f=fopen("/proc/net/dev", "r");
254		if(f==NULL){
255	<	sg_set_error(SG_ERROR_OPEN, "/proc/net/dev");
255	>	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/net/dev");
256		return NULL;
257		}
258		/* read the 2 lines.. Its the title, so we dont care :) */
#	Line 294 | Line 302 | sg_network_io_stats *sg_get_network_io_stats(int *entr
302		sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
303		return NULL;
304		#endif
305	+	#ifdef HPUX
306	+	sg_set_error(SG_ERROR_UNSUPPORTED, "HP-UX");
307	+	return NULL;
308	+	#endif
309
310		*entries=interfaces;
311
#	Line 390 | Line 402 | sg_network_io_stats *sg_get_network_io_stats_diff(int
402		return diff;
403		}
404
405	+	int sg_network_io_compare_name(const void *va, const void *vb) {
406	+	const sg_network_io_stats *a = (const sg_network_io_stats *)va;
407	+	const sg_network_io_stats *b = (const sg_network_io_stats *)vb;
408	+
409	+	return strcmp(a->interface_name, b->interface_name);
410	+	}
411	+
412		/* NETWORK INTERFACE STATS */
413
414		static void network_iface_stat_init(sg_network_iface_stats *s) {
#	Line 430 | Line 449 | sg_network_iface_stats *sg_get_network_iface_stats(int
449
450		#ifdef ALLBSD
451		if(getifaddrs(&net) != 0){
452	<	sg_set_error(SG_ERROR_GETIFADDRS, NULL);
452	>	sg_set_error_with_errno(SG_ERROR_GETIFADDRS, NULL);
453		return NULL;
454		}
455
#	Line 538 | Line 557 | sg_network_iface_stats *sg_get_network_iface_stats(int
557		}
558
559		if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
560	<	sg_set_error(SG_ERROR_SOCKET, NULL);
560	>	sg_set_error_with_errno(SG_ERROR_SOCKET, NULL);
561		return NULL;
562		}
563
#	Line 597 | Line 616 | sg_network_iface_stats *sg_get_network_iface_stats(int
616		#ifdef LINUX
617		f = fopen("/proc/net/dev", "r");
618		if(f == NULL){
619	<	sg_set_error(SG_ERROR_OPEN, "/proc/net/dev");
619	>	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/net/dev");
620		return NULL;
621		}
622
623		/* Setup stuff so we can do the ioctl to get the info */
624		if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0){
625	<	sg_set_error(SG_ERROR_SOCKET, NULL);
625	>	sg_set_error_with_errno(SG_ERROR_SOCKET, NULL);
626		return NULL;
627		}
628
#	Line 664 | Line 683 | sg_network_iface_stats *sg_get_network_iface_stats(int
683		network_iface_stat_ptr->speed = ethcmd.speed;
684
685		switch (ethcmd.duplex) {
686	<	case 0x00:
686	>	case DUPLEX_FULL:
687		network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
688		break;
689	<	case 0x01:
689	>	case DUPLEX_HALF:
690		network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
691		break;
692		default:
#	Line 684 | Line 703 | sg_network_iface_stats *sg_get_network_iface_stats(int
703		close(sock);
704		fclose(f);
705		#endif
706	+	#ifdef CYGWIN
707	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
708	+	return NULL;
709	+	#endif
710	+	#ifdef HPUX
711	+	sg_set_error(SG_ERROR_UNSUPPORTED, "HP-UX");
712	+	return NULL;
713	+	#endif
714	+
715		*entries = ifaces;
716		return network_iface_stats;
717	+	}
718	+
719	+	int sg_network_iface_compare_name(const void *va, const void *vb) {
720	+	const sg_network_iface_stats *a = (const sg_network_iface_stats *)va;
721	+	const sg_network_iface_stats *b = (const sg_network_iface_stats *)vb;
722	+
723	+	return strcmp(a->interface_name, b->interface_name);
724		}
725

Diff Legend

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