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.58 by tdb, Sun Apr 4 21:54:48 2004 UTC vs.
Revision 1.73 by tdb, Mon Apr 25 14:12:05 2005 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 28 | Line 28
28		#include <stdlib.h>
29		#include <string.h>
30		#include "statgrab.h"
31	+	#include "vector.h"
32	+	#include "tools.h"
33		#include <time.h>
34		#ifdef SOLARIS
35		#include <kstat.h>
#	Line 38 | 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>
45	–	#include <regex.h>
48		#include <sys/ioctl.h>
49		#include <sys/socket.h>
50		#include <net/if.h>
51		#include <ctype.h>
50	–	#include "tools.h"
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 69 | Line 78 | typedef __uint64_t u64;
78		#include <unistd.h>
79		#endif
80
81	<	static network_stat_t *network_stats=NULL;
82	<	static int interfaces=0;
83	<
84	<	void network_stat_init(int start, int end, network_stat_t *net_stats){
85	<
86	<	for(net_stats+=start; start<end; start++){
87	<	net_stats->interface_name=NULL;
88	<	net_stats->tx=0;
89	<	net_stats->rx=0;
81	<	net_stats->ipackets=0;
82	<	net_stats->opackets=0;
83	<	net_stats->ierrors=0;
84	<	net_stats->oerrors=0;
85	<	net_stats->collisions=0;
86	<	net_stats++;
87	<	}
81	>	static void network_stat_init(sg_network_io_stats *s) {
82	>	s->interface_name = NULL;
83	>	s->tx = 0;
84	>	s->rx = 0;
85	>	s->ipackets = 0;
86	>	s->opackets = 0;
87	>	s->ierrors = 0;
88	>	s->oerrors = 0;
89	>	s->collisions = 0;
90		}
91
92	<	network_stat_t *network_stat_malloc(int needed_entries, int *cur_entries, network_stat_t *net_stats){
93	<
92	<	if(net_stats==NULL){
93	<
94	<	if((net_stats=malloc(needed_entries * sizeof(network_stat_t)))==NULL){
95	<	return NULL;
96	<	}
97	<	network_stat_init(0, needed_entries, net_stats);
98	<	*cur_entries=needed_entries;
99	<
100	<	return net_stats;
101	<	}
102	<
103	<
104	<	if(*cur_entries<needed_entries){
105	<	net_stats=realloc(net_stats, (sizeof(network_stat_t)*needed_entries));
106	<	if(net_stats==NULL){
107	<	return NULL;
108	<	}
109	<	network_stat_init(*cur_entries, needed_entries, net_stats);
110	<	*cur_entries=needed_entries;
111	<	}
112	<
113	<	return net_stats;
92	>	static void network_stat_destroy(sg_network_io_stats *s) {
93	>	free(s->interface_name);
94		}
95
96	+	VECTOR_DECLARE_STATIC(network_stats, sg_network_io_stats, 5,
97	+	network_stat_init, network_stat_destroy);
98
99	<	network_stat_t *get_network_stats(int *entries){
99	>	sg_network_io_stats *sg_get_network_io_stats(int *entries){
100	>	int interfaces;
101	>	sg_network_io_stats *network_stat_ptr;
102
119	–	static int sizeof_network_stats=0;
120	–	network_stat_t *network_stat_ptr;
121	–
103		#ifdef SOLARIS
104	<	kstat_ctl_t *kc;
105	<	kstat_t *ksp;
104	>	kstat_ctl_t *kc;
105	>	kstat_t *ksp;
106		kstat_named_t *knp;
107		#endif
108
#	Line 139 | Line 120 | network_stat_t *get_network_stats(int *entries){
120
121		#ifdef ALLBSD
122		if(getifaddrs(&net) != 0){
123	+	sg_set_error_with_errno(SG_ERROR_GETIFADDRS, NULL);
124		return NULL;
125		}
126
#	Line 146 | Line 128 | network_stat_t *get_network_stats(int *entries){
128
129		for(net_ptr=net;net_ptr!=NULL;net_ptr=net_ptr->ifa_next){
130		if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
131	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
132	<	if(network_stats==NULL){
131	>
132	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
133		return NULL;
134		}
135		network_stat_ptr=network_stats+interfaces;
136
137	<	if(network_stat_ptr->interface_name!=NULL) free(network_stat_ptr->interface_name);
138	<	network_stat_ptr->interface_name=strdup(net_ptr->ifa_name);
139	<	if(network_stat_ptr->interface_name==NULL) return NULL;
137	>	if (sg_update_string(&network_stat_ptr->interface_name,
138	>	net_ptr->ifa_name) < 0) {
139	>	return NULL;
140	>	}
141		net_data=(struct if_data *)net_ptr->ifa_data;
142		network_stat_ptr->rx=net_data->ifi_ibytes;
143		network_stat_ptr->tx=net_data->ifi_obytes;
#	Line 170 | Line 153 | network_stat_t *get_network_stats(int *entries){
153		#endif
154
155		#ifdef SOLARIS
156	<	if ((kc = kstat_open()) == NULL) {
157	<	return NULL;
158	<	}
156	>	if ((kc = kstat_open()) == NULL) {
157	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
158	>	return NULL;
159	>	}
160
161		interfaces=0;
162
163	<	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
164	<	if (!strcmp(ksp->ks_class, "net")) {
165	<	kstat_read(kc, ksp, NULL);
163	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
164	>	if (!strcmp(ksp->ks_class, "net")) {
165	>	kstat_read(kc, ksp, NULL);
166
167		#ifdef SOL7
168		#define LRX "rbytes"
#	Line 206 | Line 190 | network_stat_t *get_network_stats(int *entries){
190		}
191
192		/* Create new network_stats */
193	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
210	<	if(network_stats==NULL){
193	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
194		return NULL;
195		}
196		network_stat_ptr=network_stats+interfaces;
#	Line 252 | Line 235 | network_stat_t *get_network_stats(int *entries){
235		network_stat_ptr->collisions=knp->value.ui32;
236
237		/* Read interface name */
238	<	if(network_stat_ptr->interface_name!=NULL){
239	<	free(network_stat_ptr->interface_name);
238	>	if (sg_update_string(&network_stat_ptr->interface_name,
239	>	ksp->ks_name) < 0) {
240	>	return NULL;
241		}
258	–	network_stat_ptr->interface_name=strdup(ksp->ks_name);
242
243		/* Store systime */
244		network_stat_ptr->systime=time(NULL);
#	Line 269 | Line 252 | network_stat_t *get_network_stats(int *entries){
252		#ifdef LINUX
253		f=fopen("/proc/net/dev", "r");
254		if(f==NULL){
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 277 | Line 261 | network_stat_t *get_network_stats(int *entries){
261
262
263		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){
264	+	sg_set_error(SG_ERROR_PARSE, NULL);
265		return NULL;
266		}
267
#	Line 286 | Line 271 | network_stat_t *get_network_stats(int *entries){
271		if((regexec(&regex, line, 9, line_match, 0))!=0){
272		continue;
273		}
274	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
275	<	if(network_stats==NULL){
276	<	return NULL;
274	>
275	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
276	>	return NULL;
277		}
278	<	network_stat_ptr=network_stats+interfaces;
278	>	network_stat_ptr=network_stats+interfaces;
279
280		if(network_stat_ptr->interface_name!=NULL){
281		free(network_stat_ptr->interface_name);
282		}
283
284	<	network_stat_ptr->interface_name=get_string_match(line, &line_match[1]);
285	<	network_stat_ptr->rx=get_ll_match(line, &line_match[2]);
286	<	network_stat_ptr->tx=get_ll_match(line, &line_match[5]);
287	<	network_stat_ptr->ipackets=get_ll_match(line, &line_match[3]);
288	<	network_stat_ptr->opackets=get_ll_match(line, &line_match[6]);
289	<	network_stat_ptr->ierrors=get_ll_match(line, &line_match[4]);
290	<	network_stat_ptr->oerrors=get_ll_match(line, &line_match[7]);
291	<	network_stat_ptr->collisions=get_ll_match(line, &line_match[8]);
284	>	network_stat_ptr->interface_name=sg_get_string_match(line, &line_match[1]);
285	>	network_stat_ptr->rx=sg_get_ll_match(line, &line_match[2]);
286	>	network_stat_ptr->tx=sg_get_ll_match(line, &line_match[5]);
287	>	network_stat_ptr->ipackets=sg_get_ll_match(line, &line_match[3]);
288	>	network_stat_ptr->opackets=sg_get_ll_match(line, &line_match[6]);
289	>	network_stat_ptr->ierrors=sg_get_ll_match(line, &line_match[4]);
290	>	network_stat_ptr->oerrors=sg_get_ll_match(line, &line_match[7]);
291	>	network_stat_ptr->collisions=sg_get_ll_match(line, &line_match[8]);
292		network_stat_ptr->systime=time(NULL);
293
294		interfaces++;
#	Line 314 | Line 299 | network_stat_t *get_network_stats(int *entries){
299		#endif
300
301		#ifdef CYGWIN
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
312		return network_stats;
313		}
314
315	<	long long transfer_diff(long long new, long long old){
315	>	static long long transfer_diff(long long new, long long old){
316		#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD) || defined(OPENBSD)
317		/* 32-bit quantities, so we must explicitly deal with wraparound. */
318		#define MAXVAL 0x100000000LL
#	Line 337 | Line 327 | long long transfer_diff(long long new, long long old){
327		#endif
328		}
329
330	<	network_stat_t *get_network_stats_diff(int *entries) {
331	<	static network_stat_t *diff = NULL;
332	<	static int diff_count = 0;
333	<	network_stat_t *src = NULL, *dest;
334	<	int i, j, new_count;
330	>	sg_network_io_stats *sg_get_network_io_stats_diff(int *entries) {
331	>	VECTOR_DECLARE_STATIC(diff, sg_network_io_stats, 1,
332	>	network_stat_init, network_stat_destroy);
333	>	sg_network_io_stats *src = NULL, *dest;
334	>	int i, j, diff_count, new_count;
335
336		if (network_stats == NULL) {
337		/* No previous stats, so we can't calculate a difference. */
338	<	return get_network_stats(entries);
338	>	return sg_get_network_io_stats(entries);
339		}
340
341		/* Resize the results array to match the previous stats. */
342	<	diff = network_stat_malloc(interfaces, &diff_count, diff);
343	<	if (diff == NULL) {
342	>	diff_count = VECTOR_SIZE(network_stats);
343	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
344		return NULL;
345		}
346
#	Line 359 | Line 349 | network_stat_t *get_network_stats_diff(int *entries) {
349		src = &network_stats[i];
350		dest = &diff[i];
351
352	<	if (dest->interface_name != NULL) {
353	<	free(dest->interface_name);
352	>	if (sg_update_string(&dest->interface_name,
353	>	src->interface_name) < 0) {
354	>	return NULL;
355		}
365	–	dest->interface_name = strdup(src->interface_name);
356		dest->rx = src->rx;
357		dest->tx = src->tx;
358		dest->ipackets = src->ipackets;
#	Line 374 | Line 364 | network_stat_t *get_network_stats_diff(int *entries) {
364		}
365
366		/* Get a new set of stats. */
367	<	if (get_network_stats(&new_count) == NULL) {
367	>	if (sg_get_network_io_stats(&new_count) == NULL) {
368		return NULL;
369		}
370
#	Line 411 | Line 401 | network_stat_t *get_network_stats_diff(int *entries) {
401		*entries = diff_count;
402		return diff;
403		}
414	–	/* NETWORK INTERFACE STATS */
404
405	<	void network_iface_stat_init(int start, int end, network_iface_stat_t *net_stats){
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	<	for(net_stats+=start; start<end; start++){
419	<	net_stats->interface_name=NULL;
420	<	net_stats->speed=0;
421	<	net_stats->dup=UNKNOWN_DUPLEX;
422	<	net_stats++;
423	<	}
409	>	return strcmp(a->interface_name, b->interface_name);
410		}
411
412	<	network_iface_stat_t *network_iface_stat_malloc(int needed_entries, int *cur_entries, network_iface_stat_t *net_stats){
412	>	/* NETWORK INTERFACE STATS */
413
414	<	if(net_stats==NULL){
414	>	static void network_iface_stat_init(sg_network_iface_stats *s) {
415	>	s->interface_name = NULL;
416	>	s->speed = 0;
417	>	s->dup = SG_IFACE_DUPLEX_UNKNOWN;
418	>	}
419
420	<	if((net_stats=malloc(needed_entries * sizeof(network_iface_stat_t)))==NULL){
421	<	return NULL;
432	<	}
433	<	network_iface_stat_init(0, needed_entries, net_stats);
434	<	*cur_entries=needed_entries;
435	<
436	<	return net_stats;
437	<	}
438	<
439	<
440	<	if(*cur_entries<needed_entries){
441	<	net_stats=realloc(net_stats, (sizeof(network_iface_stat_t)*needed_entries));
442	<	if(net_stats==NULL){
443	<	return NULL;
444	<	}
445	<	network_iface_stat_init(*cur_entries, needed_entries, net_stats);
446	<	*cur_entries=needed_entries;
447	<	}
448	<
449	<	return net_stats;
420	>	static void network_iface_stat_destroy(sg_network_iface_stats *s) {
421	>	free(s->interface_name);
422		}
423
424	<	network_iface_stat_t *get_network_iface_stats(int *entries){
425	<	static network_iface_stat_t *network_iface_stats;
426	<	network_iface_stat_t *network_iface_stat_ptr;
427	<	static int sizeof_network_iface_stats=0;
424	>	sg_network_iface_stats *sg_get_network_iface_stats(int *entries){
425	>	VECTOR_DECLARE_STATIC(network_iface_stats, sg_network_iface_stats, 5,
426	>	network_iface_stat_init, network_iface_stat_destroy);
427	>	sg_network_iface_stats *network_iface_stat_ptr;
428		int ifaces = 0;
429
430		#ifdef SOLARIS
431	<	kstat_ctl_t *kc;
432	<	kstat_t *ksp;
431	>	kstat_ctl_t *kc;
432	>	kstat_t *ksp;
433		kstat_named_t *knp;
434		int sock;
435		#endif
436		#ifdef ALLBSD
437	<	struct ifaddrs *net, *net_ptr;
437	>	struct ifaddrs *net, *net_ptr;
438		struct ifmediareq ifmed;
439		struct ifreq ifr;
440		int sock;
441		int x;
442		#endif
443		#ifdef LINUX
444	<	FILE *f;
445	<	/* Horrible big enough, but it should be easily big enough */
446	<	char line[8096];
444	>	FILE *f;
445	>	/* Horrible big enough, but it should be easily big enough */
446	>	char line[8096];
447		int sock;
448		#endif
449
450		#ifdef ALLBSD
451	<	if(getifaddrs(&net) != 0){
452	<	return NULL;
453	<	}
451	>	if(getifaddrs(&net) != 0){
452	>	sg_set_error_with_errno(SG_ERROR_GETIFADDRS, NULL);
453	>	return NULL;
454	>	}
455
456		if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == 0) return NULL;
457
458		for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){
459	<	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
487	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
488	<	if(network_iface_stats==NULL){
489	<	return NULL;
490	<	}
491	<	network_iface_stat_ptr = network_iface_stats + ifaces;
459	>	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
460
461	+	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
462	+	return NULL;
463	+	}
464	+	network_iface_stat_ptr = network_iface_stats + ifaces;
465	+
466		memset(&ifr, 0, sizeof(ifr));
467		strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
468
#	Line 502 | Line 475 | network_iface_stat_t *get_network_iface_stats(int *ent
475		network_iface_stat_ptr->up = 0;
476		}
477
478	<	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
479	<	network_iface_stat_ptr->interface_name = strdup(net_ptr->ifa_name);
480	<	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
478	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
479	>	net_ptr->ifa_name) < 0) {
480	>	return NULL;
481	>	}
482
483		network_iface_stat_ptr->speed = 0;
484	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
484	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
485		ifaces++;
486
487		memset(&ifmed, 0, sizeof(struct ifmediareq));
488	<	strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
488	>	sg_strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
489		if(ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
490		/* Not all interfaces support the media ioctls. */
491		continue;
#	Line 564 | Line 538 | network_iface_stat_t *get_network_iface_stats(int *ent
538		}
539
540		if( (ifmed.ifm_active | IFM_FDX) == ifmed.ifm_active ){
541	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
541	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
542		}else if( (ifmed.ifm_active | IFM_HDX) == ifmed.ifm_active ){
543	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
543	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
544		}else{
545	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
545	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
546		}
547
548		}
#	Line 578 | Line 552 | network_iface_stat_t *get_network_iface_stats(int *ent
552
553		#ifdef SOLARIS
554		if ((kc = kstat_open()) == NULL) {
555	+	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
556		return NULL;
557		}
558
559		if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
560	+	sg_set_error_with_errno(SG_ERROR_SOCKET, NULL);
561		return NULL;
562		}
563
#	Line 597 | Line 573 | network_iface_stat_t *get_network_iface_stats(int *ent
573		continue;
574		}
575
576	<	network_iface_stats = network_iface_stat_malloc(ifaces + 1, &sizeof_network_iface_stats, network_iface_stats);
601	<	if (network_iface_stats == NULL) {
576	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
577		return NULL;
578		}
579		network_iface_stat_ptr = network_iface_stats + ifaces;
580		ifaces++;
581
582	<	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
583	<	network_iface_stat_ptr->interface_name = strdup(ksp->ks_name);
584	<	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
582	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
583	>	ksp->ks_name) < 0) {
584	>	return NULL;
585	>	}
586
587		if ((ifr.ifr_flags & IFF_UP) != 0) {
588		network_iface_stat_ptr->up = 1;
#	Line 620 | Line 596 | network_iface_stat_t *get_network_iface_stats(int *ent
596		network_iface_stat_ptr->speed = 0;
597		}
598
599	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
599	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
600		if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) {
601		switch (knp->value.ui32) {
602		case 1:
603	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
603	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
604		break;
605		case 2:
606	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
606	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
607		break;
608		}
609		}
#	Line 639 | Line 615 | network_iface_stat_t *get_network_iface_stats(int *ent
615		#endif
616		#ifdef LINUX
617		f = fopen("/proc/net/dev", "r");
618	<	if(f == NULL){
619	<	return NULL;
620	<	}
618	>	if(f == NULL){
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_with_errno(SG_ERROR_SOCKET, NULL);
626		return NULL;
627		}
628
629		/* Ignore first 2 lines.. Just headings */
630	<	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
631	<	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
630	>	if((fgets(line, sizeof(line), f)) == NULL) {
631	>	sg_set_error(SG_ERROR_PARSE, NULL);
632	>	return NULL;
633	>	}
634	>	if((fgets(line, sizeof(line), f)) == NULL) {
635	>	sg_set_error(SG_ERROR_PARSE, NULL);
636	>	return NULL;
637	>	}
638
639	<	while((fgets(line, sizeof(line), f)) != NULL){
640	<	char *name, *ptr;
641	<	struct ifreq ifr;
642	<	struct ethtool_cmd ethcmd;
643	<	int err;
639	>	while((fgets(line, sizeof(line), f)) != NULL){
640	>	char *name, *ptr;
641	>	struct ifreq ifr;
642	>	struct ethtool_cmd ethcmd;
643	>	int err;
644
645		/* Get the interface name */
646	<	ptr = strchr(line, ':');
647	<	if (ptr == NULL) continue;
648	<	*ptr='\0';
649	<	name = line;
650	<	while(isspace(*(name))){
651	<	name++;
652	<	}
646	>	ptr = strchr(line, ':');
647	>	if (ptr == NULL) continue;
648	>	*ptr='\0';
649	>	name = line;
650	>	while(isspace(*(name))){
651	>	name++;
652	>	}
653
654	<	memset(&ifr, 0, sizeof ifr);
655	<	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
654	>	memset(&ifr, 0, sizeof ifr);
655	>	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
656
657		if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
658		continue;
659		}
660
661		/* We have a good interface to add */
662	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
679	<	if(network_iface_stats==NULL){
662	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
663		return NULL;
664		}
665		network_iface_stat_ptr = network_iface_stats + ifaces;
666	<	network_iface_stat_ptr->interface_name = strdup(name);
666	>
667	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
668	>	name) < 0) {
669	>	return NULL;
670	>	}
671		if ((ifr.ifr_flags & IFF_UP) != 0) {
672		network_iface_stat_ptr->up = 1;
673		} else {
674		network_iface_stat_ptr->up = 0;
675		}
676
677	<	memset(&ethcmd, 0, sizeof ethcmd);
678	<	ethcmd.cmd = ETHTOOL_GSET;
679	<	ifr.ifr_data = (caddr_t) &ethcmd;
677	>	memset(&ethcmd, 0, sizeof ethcmd);
678	>	ethcmd.cmd = ETHTOOL_GSET;
679	>	ifr.ifr_data = (caddr_t) &ethcmd;
680
681	<	err = ioctl(sock, SIOCETHTOOL, &ifr);
682	<	if (err == 0) {
681	>	err = ioctl(sock, SIOCETHTOOL, &ifr);
682	>	if (err == 0) {
683		network_iface_stat_ptr->speed = ethcmd.speed;
684
685		switch (ethcmd.duplex) {
686	<	case 0x00:
687	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
686	>	case DUPLEX_FULL:
687	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
688		break;
689	<	case 0x01:
690	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
689	>	case DUPLEX_HALF:
690	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
691		break;
692		default:
693	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
693	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
694		}
695		} else {
696		/* Not all interfaces support the ethtool ioctl. */
697		network_iface_stat_ptr->speed = 0;
698	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
698	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
699		}
700
701		ifaces++;
#	Line 716 | Line 703 | network_iface_stat_t *get_network_iface_stats(int *ent
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