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.28 by tdb, Thu Feb 12 23:58:32 2004 UTC vs.
Revision 1.81 by tdb, Wed Jun 9 14:44:28 2010 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>
36		#include <sys/sysinfo.h>
37	+	#include <sys/types.h>
38	+	#include <sys/socket.h>
39	+	#include <sys/ioctl.h>
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>
39	–	#include <regex.h>
48		#include <sys/ioctl.h>
49		#include <sys/socket.h>
50		#include <net/if.h>
51		#include <ctype.h>
52	<	#include "tools.h"
53	<	/* Stuff which could be defined by defining KERNEL, but
54	<	* that would be a bad idea, so we'll just declare it here
55	<	*/
52	>	#include <linux/version.h>
53	>	#include <asm/types.h>
54	>	/* These aren't defined by asm/types.h unless the kernel is being
55	>	compiled, but some versions of ethtool.h need them. */
56		typedef __uint8_t u8;
57		typedef __uint16_t u16;
58		typedef __uint32_t u32;
59	+	typedef __uint64_t u64;
60		#include <linux/ethtool.h>
61		#include <linux/sockios.h>
62	+	#include <unistd.h>
63		#endif
64		#ifdef ALLBSD
65		#include <sys/types.h>
#	Line 58 | Line 68 | typedef __uint32_t u32;
68		#include <net/if.h>
69		#include <net/if_media.h>
70		#include <sys/ioctl.h>
71	+	#include <unistd.h>
72		#endif
73	+	#ifdef WIN32
74	+	#include <windows.h>
75	+	#include <Iphlpapi.h>
76	+	#include "win32.h"
77	+	#endif
78
79	<	static network_stat_t *network_stats=NULL;
80	<	static int interfaces=0;
79	>	static void network_stat_init(sg_network_io_stats *s) {
80	>	s->interface_name = NULL;
81	>	s->tx = 0;
82	>	s->rx = 0;
83	>	s->ipackets = 0;
84	>	s->opackets = 0;
85	>	s->ierrors = 0;
86	>	s->oerrors = 0;
87	>	s->collisions = 0;
88	>	}
89
90	<	void network_stat_init(int start, int end, network_stat_t *net_stats){
91	<
68	<	for(net_stats+=start; start<end; start++){
69	<	net_stats->interface_name=NULL;
70	<	net_stats->tx=0;
71	<	net_stats->rx=0;
72	<	net_stats++;
73	<	}
90	>	static void network_stat_destroy(sg_network_io_stats *s) {
91	>	free(s->interface_name);
92		}
93
94	<	network_stat_t *network_stat_malloc(int needed_entries, int *cur_entries, network_stat_t *net_stats){
94	>	VECTOR_DECLARE_STATIC(network_stats, sg_network_io_stats, 5,
95	>	network_stat_init, network_stat_destroy);
96
97	<	if(net_stats==NULL){
97	>	#ifdef WIN32
98	>	static PMIB_IFTABLE win32_get_devices()
99	>	{
100	>	PMIB_IFTABLE if_table;
101	>	PMIB_IFTABLE tmp;
102	>	unsigned long dwSize = 0;
103
104	<	if((net_stats=malloc(needed_entries * sizeof(network_stat_t)))==NULL){
105	<	return NULL;
106	<	}
107	<	network_stat_init(0, needed_entries, net_stats);
84	<	*cur_entries=needed_entries;
85	<
86	<	return net_stats;
104	>	// Allocate memory for pointers
105	>	if_table = sg_malloc(sizeof(MIB_IFTABLE));
106	>	if(if_table == NULL) {
107	>	return NULL;
108		}
109
110	<
111	<	if(*cur_entries<needed_entries){
112	<	net_stats=realloc(net_stats, (sizeof(network_stat_t)*needed_entries));
113	<	if(net_stats==NULL){
110	>	// Get necessary size for the buffer
111	>	if(GetIfTable(if_table, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) {
112	>	tmp = sg_realloc(if_table, dwSize);
113	>	if(tmp == NULL) {
114	>	free(if_table);
115		return NULL;
116		}
117	<	network_stat_init(*cur_entries, needed_entries, net_stats);
96	<	*cur_entries=needed_entries;
117	>	if_table = tmp;
118		}
119
120	<	return net_stats;
120	>	// Get the data
121	>	if(GetIfTable(if_table, &dwSize, 0) != NO_ERROR) {
122	>	free(if_table);
123	>	return NULL;
124	>	}
125	>	return if_table;
126		}
127	+	#endif /* WIN32 */
128
129	+	sg_network_io_stats *sg_get_network_io_stats(int *entries){
130	+	int interfaces;
131	+	sg_network_io_stats *network_stat_ptr;
132
103	–	network_stat_t *get_network_stats(int *entries){
104	–
105	–	static int sizeof_network_stats=0;
106	–	network_stat_t *network_stat_ptr;
107	–
133		#ifdef SOLARIS
134	<	kstat_ctl_t *kc;
135	<	kstat_t *ksp;
134	>	kstat_ctl_t *kc;
135	>	kstat_t *ksp;
136		kstat_named_t *knp;
137		#endif
138
#	Line 116 | Line 141 | network_stat_t *get_network_stats(int *entries){
141		/* Horrible big enough, but it should be easily big enough */
142		char line[8096];
143		regex_t regex;
144	<	regmatch_t line_match[4];
144	>	regmatch_t line_match[9];
145		#endif
146		#ifdef ALLBSD
147		struct ifaddrs *net, *net_ptr;
148		struct if_data *net_data;
149		#endif
150	+	#ifdef WIN32
151	+	PMIB_IFTABLE if_table;
152	+	MIB_IFROW if_row;
153	+	int i, no, j;
154
155	+	/* used for duplicate interface names. 5 for space, hash, up to two
156	+	* numbers and terminating slash */
157	+	char buf[5];
158	+	#endif
159	+
160		#ifdef ALLBSD
161		if(getifaddrs(&net) != 0){
162	+	sg_set_error_with_errno(SG_ERROR_GETIFADDRS, NULL);
163		return NULL;
164		}
165
#	Line 132 | Line 167 | network_stat_t *get_network_stats(int *entries){
167
168		for(net_ptr=net;net_ptr!=NULL;net_ptr=net_ptr->ifa_next){
169		if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
170	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
171	<	if(network_stats==NULL){
170	>
171	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
172		return NULL;
173		}
174		network_stat_ptr=network_stats+interfaces;
175
176	<	if(network_stat_ptr->interface_name!=NULL) free(network_stat_ptr->interface_name);
177	<	network_stat_ptr->interface_name=strdup(net_ptr->ifa_name);
178	<	if(network_stat_ptr->interface_name==NULL) return NULL;
176	>	if (sg_update_string(&network_stat_ptr->interface_name,
177	>	net_ptr->ifa_name) < 0) {
178	>	return NULL;
179	>	}
180		net_data=(struct if_data *)net_ptr->ifa_data;
181		network_stat_ptr->rx=net_data->ifi_ibytes;
182	<	network_stat_ptr->tx=net_data->ifi_obytes;
182	>	network_stat_ptr->tx=net_data->ifi_obytes;
183	>	network_stat_ptr->ipackets=net_data->ifi_ipackets;
184	>	network_stat_ptr->opackets=net_data->ifi_opackets;
185	>	network_stat_ptr->ierrors=net_data->ifi_ierrors;
186	>	network_stat_ptr->oerrors=net_data->ifi_oerrors;
187	>	network_stat_ptr->collisions=net_data->ifi_collisions;
188		network_stat_ptr->systime=time(NULL);
189		interfaces++;
190		}
#	Line 151 | Line 192 | network_stat_t *get_network_stats(int *entries){
192		#endif
193
194		#ifdef SOLARIS
195	<	if ((kc = kstat_open()) == NULL) {
196	<	return NULL;
197	<	}
195	>	if ((kc = kstat_open()) == NULL) {
196	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
197	>	return NULL;
198	>	}
199
200		interfaces=0;
201
202	<	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
203	<	if (!strcmp(ksp->ks_class, "net")) {
204	<	kstat_read(kc, ksp, NULL);
202	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
203	>	if (strcmp(ksp->ks_class, "net") == 0) {
204	>	kstat_read(kc, ksp, NULL);
205
206		#ifdef SOL7
207	<	#define RLOOKUP "rbytes"
208	<	#define WLOOKUP "obytes"
207	>	#define LRX "rbytes"
208	>	#define LTX "obytes"
209	>	#define LIPACKETS "ipackets"
210	>	#define LOPACKETS "opackets"
211		#define VALTYPE value.ui32
212		#else
213	<	#define RLOOKUP "rbytes64"
214	<	#define WLOOKUP "obytes64"
213	>	#define LRX "rbytes64"
214	>	#define LTX "obytes64"
215	>	#define LIPACKETS "ipackets64"
216	>	#define LOPACKETS "opackets64"
217		#define VALTYPE value.ui64
218		#endif
219
220	<	if((knp=kstat_data_lookup(ksp, RLOOKUP))==NULL){
221	<	/* Not a network interface, so skip to the next entry */
220	>	/* Read rx */
221	>	if((knp=kstat_data_lookup(ksp, LRX))==NULL){
222	>	/* This is a network interface, but it doesn't
223	>	* have the rbytes/obytes values; for instance,
224	>	* the loopback devices have this behaviour
225	>	* (although they do track packets in/out). */
226	>	/* FIXME: Show packet counts when byte counts
227	>	* not available. */
228		continue;
229		}
230
231	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
232	<	if(network_stats==NULL){
231	>	/* Create new network_stats */
232	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
233	>	kstat_close(kc);
234		return NULL;
235		}
236		network_stat_ptr=network_stats+interfaces;
237	+
238	+	/* Read interface name */
239	+	if (sg_update_string(&network_stat_ptr->interface_name,
240	+	ksp->ks_name) < 0) {
241	+	kstat_close(kc);
242	+	return NULL;
243	+	}
244	+
245	+	/* Finish reading rx */
246		network_stat_ptr->rx=knp->VALTYPE;
247
248	<	if((knp=kstat_data_lookup(ksp, WLOOKUP))==NULL){
249	<	/* Not a network interface, so skip to the next entry */
248	>	/* Read tx */
249	>	if((knp=kstat_data_lookup(ksp, LTX))==NULL){
250		continue;
251		}
252		network_stat_ptr->tx=knp->VALTYPE;
253	<	if(network_stat_ptr->interface_name!=NULL){
254	<	free(network_stat_ptr->interface_name);
253	>
254	>	/* Read ipackets */
255	>	if((knp=kstat_data_lookup(ksp, LIPACKETS))==NULL){
256	>	continue;
257		}
258	<	network_stat_ptr->interface_name=strdup(ksp->ks_name);
258	>	network_stat_ptr->ipackets=knp->VALTYPE;
259
260	+	/* Read opackets */
261	+	if((knp=kstat_data_lookup(ksp, LOPACKETS))==NULL){
262	+	continue;
263	+	}
264	+	network_stat_ptr->opackets=knp->VALTYPE;
265	+
266	+	/* Read ierrors */
267	+	if((knp=kstat_data_lookup(ksp, "ierrors"))==NULL){
268	+	continue;
269	+	}
270	+	network_stat_ptr->ierrors=knp->value.ui32;
271	+
272	+	/* Read oerrors */
273	+	if((knp=kstat_data_lookup(ksp, "oerrors"))==NULL){
274	+	continue;
275	+	}
276	+	network_stat_ptr->oerrors=knp->value.ui32;
277	+
278	+	/* Read collisions */
279	+	if((knp=kstat_data_lookup(ksp, "collisions"))==NULL){
280	+	continue;
281	+	}
282	+	network_stat_ptr->collisions=knp->value.ui32;
283	+
284	+
285	+	/* Store systime */
286		network_stat_ptr->systime=time(NULL);
287	+
288		interfaces++;
289		}
290		}
#	Line 203 | Line 294 | network_stat_t *get_network_stats(int *entries){
294		#ifdef LINUX
295		f=fopen("/proc/net/dev", "r");
296		if(f==NULL){
297	+	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/net/dev");
298		return NULL;
299		}
300		/* read the 2 lines.. Its the title, so we dont care :) */
#	Line 210 | Line 302 | network_stat_t *get_network_stats(int *entries){
302		fgets(line, sizeof(line), f);
303
304
305	<	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){
305	>	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){
306	>	sg_set_error(SG_ERROR_PARSE, NULL);
307		return NULL;
308		}
309
310		interfaces=0;
311
312		while((fgets(line, sizeof(line), f)) != NULL){
313	<	if((regexec(&regex, line, 4, line_match, 0))!=0){
313	>	if((regexec(&regex, line, 9, line_match, 0))!=0){
314		continue;
315		}
316	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
317	<	if(network_stats==NULL){
318	<	return NULL;
316	>
317	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
318	>	return NULL;
319		}
320	<	network_stat_ptr=network_stats+interfaces;
320	>	network_stat_ptr=network_stats+interfaces;
321
322		if(network_stat_ptr->interface_name!=NULL){
323		free(network_stat_ptr->interface_name);
324		}
325
326	<	network_stat_ptr->interface_name=get_string_match(line, &line_match[1]);
327	<	network_stat_ptr->rx=get_ll_match(line, &line_match[2]);
328	<	network_stat_ptr->tx=get_ll_match(line, &line_match[3]);
326	>	network_stat_ptr->interface_name=sg_get_string_match(line, &line_match[1]);
327	>	network_stat_ptr->rx=sg_get_ll_match(line, &line_match[2]);
328	>	network_stat_ptr->tx=sg_get_ll_match(line, &line_match[5]);
329	>	network_stat_ptr->ipackets=sg_get_ll_match(line, &line_match[3]);
330	>	network_stat_ptr->opackets=sg_get_ll_match(line, &line_match[6]);
331	>	network_stat_ptr->ierrors=sg_get_ll_match(line, &line_match[4]);
332	>	network_stat_ptr->oerrors=sg_get_ll_match(line, &line_match[7]);
333	>	network_stat_ptr->collisions=sg_get_ll_match(line, &line_match[8]);
334		network_stat_ptr->systime=time(NULL);
335
336		interfaces++;
#	Line 243 | Line 341 | network_stat_t *get_network_stats(int *entries){
341		#endif
342
343		#ifdef CYGWIN
344	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
345		return NULL;
346		#endif
347	+	#ifdef HPUX
348	+	sg_set_error(SG_ERROR_UNSUPPORTED, "HP-UX");
349	+	return NULL;
350	+	#endif
351
352	+	#ifdef WIN32
353	+	interfaces = 0;
354	+
355	+	if((if_table = win32_get_devices()) == NULL) {
356	+	sg_set_error(SG_ERROR_DEVICES, "network");
357	+	return NULL;
358	+	}
359	+
360	+	if(VECTOR_RESIZE(network_stats, if_table->dwNumEntries) < 0) {
361	+	free(if_table);
362	+	return NULL;
363	+	}
364	+
365	+	for (i=0; i<if_table->dwNumEntries; i++) {
366	+	network_stat_ptr=network_stats+i;
367	+	if_row = if_table->table[i];
368	+
369	+	if(sg_update_string(&network_stat_ptr->interface_name,
370	+	if_row.bDescr) < 0) {
371	+	free(if_table);
372	+	return NULL;
373	+	}
374	+	network_stat_ptr->tx = if_row.dwOutOctets;
375	+	network_stat_ptr->rx = if_row.dwInOctets;
376	+	network_stat_ptr->ipackets = if_row.dwInUcastPkts + if_row.dwInNUcastPkts;
377	+	network_stat_ptr->opackets = if_row.dwOutUcastPkts + if_row.dwOutNUcastPkts;
378	+	network_stat_ptr->ierrors = if_row.dwInErrors;
379	+	network_stat_ptr->oerrors = if_row.dwOutErrors;
380	+	network_stat_ptr->collisions = 0; /* can't do that */
381	+	network_stat_ptr->systime = time(NULL);
382	+
383	+	interfaces++;
384	+	}
385	+	free(if_table);
386	+
387	+	/* Please say there's a nicer way to do this...  If windows has two (or
388	+	* more) identical network cards, GetIfTable returns them with the same
389	+	* name, not like in Device Manager where the other has a #2 etc after
390	+	* it. So, add the #number here. Should we be doing this? Or should the
391	+	* end programs be dealing with duplicate names? Currently breaks
392	+	* watch.pl in rrdgraphing. But Unix does not have the issue of
393	+	* duplicate net device names.
394	+	*/
395	+	for (i=0; i<interfaces; i++) {
396	+	no = 2;
397	+	for(j=i+1; j<interfaces; j++) {
398	+	network_stat_ptr=network_stats+j;
399	+	if(strcmp(network_stats[i].interface_name,
400	+	network_stat_ptr->interface_name) == 0) {
401	+	if(snprintf(buf, sizeof(buf), " #%d", no) < 0) {
402	+	break;
403	+	}
404	+	if(sg_concat_string(&network_stat_ptr->interface_name, buf) != 0) {
405	+	return NULL;
406	+	}
407	+
408	+	no++;
409	+	}
410	+	}
411	+	}
412	+	#endif
413	+
414		*entries=interfaces;
415
416		return network_stats;
417		}
418
419	<	long long transfer_diff(long long new, long long old){
420	<	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD)
421	<	#define MAXVAL 4294967296LL
419	>	static long long transfer_diff(long long new, long long old){
420	>	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD) || defined(OPENBSD) || defined(WIN32)
421	>	/* 32-bit quantities, so we must explicitly deal with wraparound. */
422	>	#define MAXVAL 0x100000000LL
423	>	if (new >= old) {
424	>	return new - old;
425	>	} else {
426	>	return MAXVAL + new - old;
427	>	}
428		#else
429	<	#define MAXVAL 18446744073709551616LL
429	>	/* 64-bit quantities, so plain subtraction works. */
430	>	return new - old;
431		#endif
260	–	long long result;
261	–	if(new>=old){
262	–	result = (new-old);
263	–	}else{
264	–	result = (MAXVAL+(new-old));
265	–	}
266	–
267	–	return result;
268	–
432		}
433
434	<	network_stat_t *get_network_stats_diff(int *entries) {
435	<	static network_stat_t *diff = NULL;
436	<	static int diff_count = 0;
437	<	network_stat_t *src, *dest;
438	<	int i, j, new_count;
434	>	sg_network_io_stats *sg_get_network_io_stats_diff(int *entries) {
435	>	VECTOR_DECLARE_STATIC(diff, sg_network_io_stats, 1,
436	>	network_stat_init, network_stat_destroy);
437	>	sg_network_io_stats *src = NULL, *dest;
438	>	int i, j, diff_count, new_count;
439
440		if (network_stats == NULL) {
441		/* No previous stats, so we can't calculate a difference. */
442	<	return get_network_stats(entries);
442	>	return sg_get_network_io_stats(entries);
443		}
444
445		/* Resize the results array to match the previous stats. */
446	<	diff = network_stat_malloc(interfaces, &diff_count, diff);
447	<	if (diff == NULL) {
446	>	diff_count = VECTOR_SIZE(network_stats);
447	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
448		return NULL;
449		}
450
#	Line 290 | Line 453 | network_stat_t *get_network_stats_diff(int *entries) {
453		src = &network_stats[i];
454		dest = &diff[i];
455
456	<	if (dest->interface_name != NULL) {
457	<	free(dest->interface_name);
456	>	if (sg_update_string(&dest->interface_name,
457	>	src->interface_name) < 0) {
458	>	return NULL;
459		}
296	–	dest->interface_name = strdup(src->interface_name);
460		dest->rx = src->rx;
461		dest->tx = src->tx;
462	+	dest->ipackets = src->ipackets;
463	+	dest->opackets = src->opackets;
464	+	dest->ierrors = src->ierrors;
465	+	dest->oerrors = src->oerrors;
466	+	dest->collisions = src->collisions;
467		dest->systime = src->systime;
468		}
469
470		/* Get a new set of stats. */
471	<	if (get_network_stats(&new_count) == NULL) {
471	>	if (sg_get_network_io_stats(&new_count) == NULL) {
472		return NULL;
473		}
474
#	Line 326 | Line 494 | network_stat_t *get_network_stats_diff(int *entries) {
494		difference. */
495		dest->rx = transfer_diff(src->rx, dest->rx);
496		dest->tx = transfer_diff(src->tx, dest->tx);
497	+	dest->ipackets = transfer_diff(src->ipackets, dest->ipackets);
498	+	dest->opackets = transfer_diff(src->opackets, dest->opackets);
499	+	dest->ierrors = transfer_diff(src->ierrors, dest->ierrors);
500	+	dest->oerrors = transfer_diff(src->oerrors, dest->oerrors);
501	+	dest->collisions = transfer_diff(src->collisions, dest->collisions);
502		dest->systime = src->systime - dest->systime;
503		}
504
505		*entries = diff_count;
506		return diff;
507		}
335	–	/* NETWORK INTERFACE STATS */
508
509	<	void network_iface_stat_init(int start, int end, network_iface_stat_t *net_stats){
509	>	int sg_network_io_compare_name(const void *va, const void *vb) {
510	>	const sg_network_io_stats *a = (const sg_network_io_stats *)va;
511	>	const sg_network_io_stats *b = (const sg_network_io_stats *)vb;
512
513	<	for(net_stats+=start; start<end; start++){
340	<	net_stats->interface_name=NULL;
341	<	net_stats->speed=0;
342	<	net_stats->dup=NO_DUPLEX;
343	<	net_stats++;
344	<	}
513	>	return strcmp(a->interface_name, b->interface_name);
514		}
515
516	<	network_iface_stat_t *network_iface_stat_malloc(int needed_entries, int *cur_entries, network_iface_stat_t *net_stats){
516	>	/* NETWORK INTERFACE STATS */
517
518	<	if(net_stats==NULL){
518	>	static void network_iface_stat_init(sg_network_iface_stats *s) {
519	>	s->interface_name = NULL;
520	>	s->speed = 0;
521	>	s->duplex = SG_IFACE_DUPLEX_UNKNOWN;
522	>	}
523
524	<	if((net_stats=malloc(needed_entries * sizeof(network_iface_stat_t)))==NULL){
525	<	return NULL;
353	<	}
354	<	network_iface_stat_init(0, needed_entries, net_stats);
355	<	*cur_entries=needed_entries;
356	<
357	<	return net_stats;
358	<	}
359	<
360	<
361	<	if(*cur_entries<needed_entries){
362	<	net_stats=realloc(net_stats, (sizeof(network_iface_stat_t)*needed_entries));
363	<	if(net_stats==NULL){
364	<	return NULL;
365	<	}
366	<	network_iface_stat_init(*cur_entries, needed_entries, net_stats);
367	<	*cur_entries=needed_entries;
368	<	}
369	<
370	<	return net_stats;
524	>	static void network_iface_stat_destroy(sg_network_iface_stats *s) {
525	>	free(s->interface_name);
526		}
527
528	<	network_iface_stat_t *get_network_iface_stats(int *entries){
529	<	static network_iface_stat_t *network_iface_stats;
530	<	network_iface_stat_t *network_iface_stat_ptr;
531	<	static int sizeof_network_iface_stats=0;
532	<	static int ifaces;
528	>	sg_network_iface_stats *sg_get_network_iface_stats(int *entries){
529	>	VECTOR_DECLARE_STATIC(network_iface_stats, sg_network_iface_stats, 5,
530	>	network_iface_stat_init, network_iface_stat_destroy);
531	>	sg_network_iface_stats *network_iface_stat_ptr;
532	>	int ifaces = 0;
533
534		#ifdef SOLARIS
535	<	kstat_ctl_t *kc;
536	<	kstat_t *ksp;
535	>	kstat_ctl_t *kc;
536	>	kstat_t *ksp;
537		kstat_named_t *knp;
538	+	int sock;
539		#endif
540		#ifdef ALLBSD
541	<	struct ifaddrs *net, *net_ptr;
541	>	struct ifaddrs *net, *net_ptr;
542		struct ifmediareq ifmed;
543	<	int s;
543	>	struct ifreq ifr;
544	>	int sock;
545		int x;
546		#endif
547		#ifdef LINUX
548	<	FILE *f;
549	<	/* Horrible big enough, but it should be easily big enough */
550	<	char line[8096];
394	<	void *eth_tool_cmd_buf;
395	<	int buf_size;
548	>	FILE *f;
549	>	/* Horrible big enough, but it should be easily big enough */
550	>	char line[8096];
551		int sock;
552		#endif
553	<	ifaces = 0;
553	>	#ifdef WIN32
554	>	PMIB_IFTABLE if_table;
555	>	MIB_IFROW if_row;
556	>	int i,j,no;
557	>	char buf[5];
558	>	#endif
559	>
560		#ifdef ALLBSD
561	<	if(getifaddrs(&net) != 0){
562	<	return NULL;
563	<	}
561	>	if(getifaddrs(&net) != 0){
562	>	sg_set_error_with_errno(SG_ERROR_GETIFADDRS, NULL);
563	>	return NULL;
564	>	}
565
566	<	if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == NULL) return NULL;
566	>	if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == 0) return NULL;
567
568		for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){
569	<	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
408	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
409	<	if(network_iface_stats==NULL){
410	<	return NULL;
411	<	}
412	<	network_iface_stat_ptr = network_iface_stats + ifaces;
569	>	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
570
571	+	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
572	+	return NULL;
573	+	}
574	+	network_iface_stat_ptr = network_iface_stats + ifaces;
575	+
576	+	memset(&ifr, 0, sizeof(ifr));
577	+	strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
578	+
579	+	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0){
580	+	continue;
581	+	}
582	+	if((ifr.ifr_flags & IFF_UP) != 0){
583	+	network_iface_stat_ptr->up = 1;
584	+	}else{
585	+	network_iface_stat_ptr->up = 0;
586	+	}
587	+
588	+	if (sg_update_string(&network_iface_stat_ptr->interface_name,
589	+	net_ptr->ifa_name) < 0) {
590	+	return NULL;
591	+	}
592	+
593	+	network_iface_stat_ptr->speed = 0;
594	+	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_UNKNOWN;
595	+	ifaces++;
596	+
597		memset(&ifmed, 0, sizeof(struct ifmediareq));
598	<	strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
599	<	if(ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
598	>	sg_strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
599	>	if(ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
600	>	/* Not all interfaces support the media ioctls. */
601		continue;
602		}
603
#	Line 423 | Line 607 | network_iface_stat_t *get_network_iface_stats(int *ent
607		continue;
608		}
609
610	<	if(network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
611	<	network_iface_stat_ptr->interface_name = strdup(net_ptr->ifa_name);
428	<	if(network_iface_stat_ptr->interface_name == NULL) return NULL;
429	<
430	<	/* Only intrested in the first 4 bits)  - Assuming only ETHER devices */
431	<	x = ifmed.ifm_active & 0x0f;
610	>	/* Assuming only ETHER devices */
611	>	x = IFM_SUBTYPE(ifmed.ifm_active);
612		switch(x){
613		/* 10 Mbit connections. Speedy :) */
614		case(IFM_10_T):
#	Line 438 | Line 618 | network_iface_stat_t *get_network_iface_stats(int *ent
618		case(IFM_10_FL):
619		network_iface_stat_ptr->speed = 10;
620		break;
621	<	/* 100 Mbit conneections */
621	>	/* 100 Mbit connections */
622		case(IFM_100_TX):
623		case(IFM_100_FX):
624		case(IFM_100_T4):
#	Line 450 | Line 630 | network_iface_stat_t *get_network_iface_stats(int *ent
630		case(IFM_1000_SX):
631		case(IFM_1000_LX):
632		case(IFM_1000_CX):
633	<	#ifdef FREEBSD5
634	<	case(IFM_1000_T):
455	<	#else
456	<	case(IFM_1000_TX):
457	<	case(IFM_1000_FX):
633	>	#if defined(IFM_1000_TX) && !defined(OPENBSD)
634	>	case(IFM_1000_TX): /* FreeBSD 4 and others (but NOT OpenBSD)? */
635		#endif
636	+	#ifdef IFM_1000_FX
637	+	case(IFM_1000_FX): /* FreeBSD 4 */
638	+	#endif
639	+	#ifdef IFM_1000_T
640	+	case(IFM_1000_T): /* FreeBSD 5 */
641	+	#endif
642		network_iface_stat_ptr->speed = 1000;
643		break;
644		/* We don't know what it is */
#	Line 465 | Line 648 | network_iface_stat_t *get_network_iface_stats(int *ent
648		}
649
650		if( (ifmed.ifm_active | IFM_FDX) == ifmed.ifm_active ){
651	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
651	>	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_FULL;
652		}else if( (ifmed.ifm_active | IFM_HDX) == ifmed.ifm_active ){
653	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
653	>	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_HALF;
654		}else{
655	<	network_iface_stat_ptr->dup = NO_DUPLEX;
655	>	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_UNKNOWN;
656		}
657	<	ifaces++;
657	>
658		}
659		freeifaddrs(net);
660	+	close(sock);
661		#endif
662
663		#ifdef SOLARIS
664	<	if ((kc = kstat_open()) == NULL) {
665	<	return NULL;
666	<	}
664	>	if ((kc = kstat_open()) == NULL) {
665	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
666	>	return NULL;
667	>	}
668
669	<	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
670	<	if (!strcmp(ksp->ks_class, "net")) {
671	<	kstat_read(kc, ksp, NULL);
672	<	if((knp=kstat_data_lookup(ksp, "ifspeed"))==NULL){
673	<	/* Not a network interface, so skip to the next entry */
669	>	if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
670	>	sg_set_error_with_errno(SG_ERROR_SOCKET, NULL);
671	>	kstat_close(kc);
672	>	return NULL;
673	>	}
674	>
675	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
676	>	if (strcmp(ksp->ks_class, "net") == 0) {
677	>	struct ifreq ifr;
678	>
679	>	kstat_read(kc, ksp, NULL);
680	>
681	>	strncpy(ifr.ifr_name, ksp->ks_name, sizeof ifr.ifr_name);
682	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
683	>	/* Not a network interface. */
684		continue;
685		}
686	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
687	<	if(network_iface_stats==NULL){
686	>
687	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
688	>	kstat_close(kc);
689		return NULL;
690		}
691		network_iface_stat_ptr = network_iface_stats + ifaces;
692	<	network_iface_stat_ptr->speed = knp->value.ui64 / (1000*1000);
692	>	ifaces++;
693
694	<	if((knp=kstat_data_lookup(ksp, "link_duplex"))==NULL){
695	<	/* Not a network interface, so skip to the next entry */
696	<	continue;
694	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
695	>	ksp->ks_name) < 0) {
696	>	kstat_close(kc);
697	>	return NULL;
698		}
699
700	<	if(knp->value.ui64 == 0){
701	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
702	<	}else{
703	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
700	>	if ((ifr.ifr_flags & IFF_UP) != 0) {
701	>	if ((knp = kstat_data_lookup(ksp, "link_up")) != NULL) {
702	>	/* take in to account if link
703	>	* is up as well as interface */
704	>	if (knp->value.ui32 != 0u) {
705	>	network_iface_stat_ptr->up = 1;
706	>	} else {
707	>	network_iface_stat_ptr->up = 0;
708	>	}
709	>	}
710	>	else {
711	>	/* maintain compatibility */
712	>	network_iface_stat_ptr->up = 1;
713	>	}
714	>	} else {
715	>	network_iface_stat_ptr->up = 0;
716		}
717
718	<	if(network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
719	<	network_iface_stat_ptr->interface_name = strdup(ksp->ks_name);
720	<	if(network_iface_stat_ptr->interface_name == NULL) return NULL;
721	<	ifaces++;
718	>	if ((knp = kstat_data_lookup(ksp, "ifspeed")) != NULL) {
719	>	network_iface_stat_ptr->speed = knp->value.ui64 / (1000 * 1000);
720	>	} else {
721	>	network_iface_stat_ptr->speed = 0;
722	>	}
723	>
724	>	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_UNKNOWN;
725	>	if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) {
726	>	switch (knp->value.ui32) {
727	>	case 1:
728	>	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_HALF;
729	>	break;
730	>	case 2:
731	>	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_FULL;
732	>	break;
733	>	}
734	>	}
735		}
736		}
737	+
738	+	close(sock);
739		kstat_close(kc);
740	<
517	<	#endif
740	>	#endif
741		#ifdef LINUX
519	–
742		f = fopen("/proc/net/dev", "r");
743	<	if(f == NULL){
744	<	return NULL;
745	<	}
743	>	if(f == NULL){
744	>	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/net/dev");
745	>	return NULL;
746	>	}
747
748		/* Setup stuff so we can do the ioctl to get the info */
749		if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0){
750	+	sg_set_error_with_errno(SG_ERROR_SOCKET, NULL);
751		return NULL;
752		}
753
530	–	buf_size = sizeof(struct ethtool_cmd);
531	–	eth_tool_cmd_buf = malloc(buf_size);
532	–	if(eth_tool_cmd_buf == NULL) return NULL;
533	–
754		/* Ignore first 2 lines.. Just headings */
755	<	fgets(line, sizeof(line), f);
756	<	fgets(line, sizeof(line), f);
755	>	if((fgets(line, sizeof(line), f)) == NULL) {
756	>	sg_set_error(SG_ERROR_PARSE, NULL);
757	>	return NULL;
758	>	}
759	>	if((fgets(line, sizeof(line), f)) == NULL) {
760	>	sg_set_error(SG_ERROR_PARSE, NULL);
761	>	return NULL;
762	>	}
763
764	<	while((fgets(line, sizeof(line), f)) != NULL){
765	<	char *name, *ptr;
766	<	struct ifreq ifr;
767	<	struct ethtool_cmd *ethcmd;
768	<	int err;
764	>	while((fgets(line, sizeof(line), f)) != NULL){
765	>	char *name, *ptr;
766	>	struct ifreq ifr;
767	>	struct ethtool_cmd ethcmd;
768	>	int err;
769
770		/* Get the interface name */
771	<	ptr = strchr(line, ':');
772	<	if (ptr == NULL) continue;
773	<	*ptr='\0';
774	<	name = line;
775	<	while(isspace(*(name))){
776	<	name++;
777	<	}
771	>	ptr = strchr(line, ':');
772	>	if (ptr == NULL) continue;
773	>	*ptr='\0';
774	>	name = line;
775	>	while(isspace(*(name))){
776	>	name++;
777	>	}
778
779	<	memset(&ifr, 0, sizeof(ifr));
780	<	memset(eth_tool_cmd_buf, 0, buf_size);
555	<	ifr.ifr_data = (caddr_t) eth_tool_cmd_buf;
556	<	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
779	>	memset(&ifr, 0, sizeof ifr);
780	>	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
781
782	<	ethcmd = (struct ethtool_cmd *)(&ifr)->ifr_data;
783	<	ethcmd->cmd = ETHTOOL_GSET;
782	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
783	>	continue;
784	>	}
785
561	–	err = ioctl(sock, SIOCETHTOOL, &ifr);
562	–	if(err < 0){
563	–	/* This could fail if the interface doesn't support the command. Carry
564	–	* on to the next :)
565	–	*/
566	–	continue;
567	–	}
568	–
786		/* We have a good interface to add */
787	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
571	<	if(network_iface_stats==NULL){
787	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
788		return NULL;
789		}
790		network_iface_stat_ptr = network_iface_stats + ifaces;
791	<	network_iface_stat_ptr->interface_name = strdup(name);
792	<	network_iface_stat_ptr->speed = ethcmd->speed;
793	<	network_iface_stat_ptr->dup = NO_DUPLEX;
794	<	if(ethcmd->duplex == 0x00){
579	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
791	>
792	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
793	>	name) < 0) {
794	>	return NULL;
795		}
796	<	if(ethcmd->duplex == 0x01){
797	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
796	>	if ((ifr.ifr_flags & IFF_UP) != 0) {
797	>	network_iface_stat_ptr->up = 1;
798	>	} else {
799	>	network_iface_stat_ptr->up = 0;
800		}
801	+
802	+	memset(&ethcmd, 0, sizeof ethcmd);
803	+	ethcmd.cmd = ETHTOOL_GSET;
804	+	ifr.ifr_data = (caddr_t) &ethcmd;
805	+
806	+	err = ioctl(sock, SIOCETHTOOL, &ifr);
807	+	if (err == 0) {
808	+	network_iface_stat_ptr->speed = ethcmd.speed;
809	+
810	+	switch (ethcmd.duplex) {
811	+	case DUPLEX_FULL:
812	+	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_FULL;
813	+	break;
814	+	case DUPLEX_HALF:
815	+	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_HALF;
816	+	break;
817	+	default:
818	+	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_UNKNOWN;
819	+	}
820	+	} else {
821	+	/* Not all interfaces support the ethtool ioctl. */
822	+	network_iface_stat_ptr->speed = 0;
823	+	network_iface_stat_ptr->duplex = SG_IFACE_DUPLEX_UNKNOWN;
824	+	}
825	+
826		ifaces++;
827		}
828	+	close(sock);
829	+	fclose(f);
830	+	#endif
831	+	#ifdef CYGWIN
832	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
833	+	return NULL;
834	+	#endif
835	+	#ifdef HPUX
836	+	sg_set_error(SG_ERROR_UNSUPPORTED, "HP-UX");
837	+	return NULL;
838	+	#endif
839	+	#ifdef WIN32
840	+	ifaces = 0;
841
842	<	free(eth_tool_cmd_buf);
842	>	if((if_table = win32_get_devices()) == NULL) {
843	>	sg_set_error(SG_ERROR_DEVICES, "network interfaces");
844	>	return NULL;
845	>	}
846	>
847	>	if(VECTOR_RESIZE(network_iface_stats, if_table->dwNumEntries) < 0) {
848	>	free(if_table);
849	>	return NULL;
850	>	}
851	>
852	>	for(i=0; i<if_table->dwNumEntries; i++) {
853	>	network_iface_stat_ptr=network_iface_stats+i;
854	>	if_row = if_table->table[i];
855	>
856	>	if(sg_update_string(&network_iface_stat_ptr->interface_name,
857	>	if_row.bDescr) < 0) {
858	>	free(if_table);
859	>	return NULL;
860	>	}
861	>	network_iface_stat_ptr->speed = if_row.dwSpeed /1000000;
862	>
863	>	if((if_row.dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED ||
864	>	if_row.dwOperStatus ==
865	>	MIB_IF_OPER_STATUS_OPERATIONAL) &&
866	>	if_row.dwAdminStatus == 1) {
867	>	network_iface_stat_ptr->up = 1;
868	>	} else {
869	>	network_iface_stat_ptr->up = 0;
870	>	}
871	>
872	>	ifaces++;
873	>	}
874	>	free(if_table);
875	>
876	>	/* again with the renumbering */
877	>	for (i=0; i<ifaces; i++) {
878	>	no = 2;
879	>	for(j=i+1; j<ifaces; j++) {
880	>	network_iface_stat_ptr=network_iface_stats+j;
881	>	if(strcmp(network_iface_stats[i].interface_name,
882	>	network_iface_stat_ptr->interface_name) == 0) {
883	>	if(snprintf(buf, sizeof(buf), " #%d", no) < 0) {
884	>	break;
885	>	}
886	>	if(sg_concat_string(&network_iface_stat_ptr->interface_name, buf) != 0) {
887	>	return NULL;
888	>	}
889	>
890	>	no++;
891	>	}
892	>	}
893	>	}
894		#endif
895	+
896	+	#ifdef SG_ENABLE_DEPRECATED
897	+	network_iface_stat_ptr->dup = network_iface_stat_ptr->duplex;
898	+	#endif
899	+
900		*entries = ifaces;
901		return network_iface_stats;
902	+	}
903	+
904	+	int sg_network_iface_compare_name(const void *va, const void *vb) {
905	+	const sg_network_iface_stats *a = (const sg_network_iface_stats *)va;
906	+	const sg_network_iface_stats *b = (const sg_network_iface_stats *)vb;
907	+
908	+	return strcmp(a->interface_name, b->interface_name);
909		}
910

Diff Legend

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