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.12 by pajs, Mon Mar 31 11:30:54 2003 UTC vs.
Revision 1.48 by tdb, Sat Mar 6 21:56:23 2004 UTC

#	Line 1 | Line 1
1	<	/*
1	>	/*
2		* i-scream central monitoring system
3	<	* http://www.i-scream.org.uk
4	<	* Copyright (C) 2000-2002 i-scream
3	>	* http://www.i-scream.org
4	>	* Copyright (C) 2000-2004 i-scream
5		*
6	<	* This program is free software; you can redistribute it and/or
7	<	* modify it under the terms of the GNU General Public License
8	<	* as published by the Free Software Foundation; either version 2
9	<	* of the License, or (at your option) any later version.
6	>	* This library is free software; you can redistribute it and/or
7	>	* modify it under the terms of the GNU Lesser General Public
8	>	* License as published by the Free Software Foundation; either
9	>	* version 2.1 of the License, or (at your option) any later version.
10		*
11	<	* This program is distributed in the hope that it will be useful,
11	>	* This library is distributed in the hope that it will be useful,
12		* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	<	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	<	* GNU General Public License for more details.
13	>	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14	>	* Lesser General Public License for more details.
15		*
16	<	* You should have received a copy of the GNU General Public License
17	<	* along with this program; if not, write to the Free Software
18	<	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16	>	* You should have received a copy of the GNU Lesser General Public
17	>	* License along with this library; if not, write to the Free Software
18	>	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19	>	* 02111-1307 USA
20	>	*
21	>	* $Id$
22		*/
23
24		#ifdef HAVE_CONFIG_H
#	Line 29 | 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>
44		#include <sys/types.h>
45		#include <regex.h>
46	+	#include <sys/ioctl.h>
47	+	#include <sys/socket.h>
48	+	#include <net/if.h>
49	+	#include <ctype.h>
50		#include "tools.h"
51	+	/* Stuff which could be defined by defining KERNEL, but
52	+	* that would be a bad idea, so we'll just declare it here
53	+	*/
54	+	typedef __uint8_t u8;
55	+	typedef __uint16_t u16;
56	+	typedef __uint32_t u32;
57	+	typedef __uint64_t u64;
58	+	#include <linux/ethtool.h>
59	+	#include <linux/sockios.h>
60	+	#include <unistd.h>
61		#endif
62	+	#ifdef ALLBSD
63	+	#include <sys/types.h>
64	+	#include <sys/socket.h>
65	+	#include <ifaddrs.h>
66	+	#include <net/if.h>
67	+	#include <net/if_media.h>
68	+	#include <sys/ioctl.h>
69	+	#endif
70
71		static network_stat_t *network_stats=NULL;
72		static int interfaces=0;
#	Line 46 | 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 95 | Line 131 | network_stat_t *get_network_stats(int *entries){
131		regex_t regex;
132		regmatch_t line_match[4];
133		#endif
134	+	#ifdef ALLBSD
135	+	struct ifaddrs *net, *net_ptr;
136	+	struct if_data *net_data;
137	+	#endif
138
139	+	#ifdef ALLBSD
140	+	if(getifaddrs(&net) != 0){
141	+	return NULL;
142	+	}
143	+
144	+	interfaces=0;
145	+
146	+	for(net_ptr=net;net_ptr!=NULL;net_ptr=net_ptr->ifa_next){
147	+	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
148	+	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
149	+	if(network_stats==NULL){
150	+	return NULL;
151	+	}
152	+	network_stat_ptr=network_stats+interfaces;
153	+
154	+	if(network_stat_ptr->interface_name!=NULL) free(network_stat_ptr->interface_name);
155	+	network_stat_ptr->interface_name=strdup(net_ptr->ifa_name);
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;
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	+	}
168	+	freeifaddrs(net);
169	+	#endif
170	+
171		#ifdef SOLARIS
172		if ((kc = kstat_open()) == NULL) {
173		return NULL;
#	Line 118 | 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 130 | 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){
133	–	/* Not a network interface, so skip to the next entry */
208		continue;
209		}
210		network_stat_ptr->tx=knp->VALTYPE;
#	Line 156 | 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 178 | 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++;
264		}
265		fclose(f);
266	+	regfree(&regex);
267
268		#endif
269	+
270	+	#ifdef CYGWIN
271	+	return NULL;
272	+	#endif
273	+
274		*entries=interfaces;
275
276		return network_stats;
277		}
278
279		long long transfer_diff(long long new, long long old){
280	<	#ifdef SOL7
281	<	#define MAXVAL 4294967296
280	>	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD)
281	>	#define MAXVAL 4294967296LL
282		#else
283	<	#define MAXVAL 18446744073709551616
283	>	#define MAXVAL 18446744073709551616LL
284		#endif
285		long long result;
286		if(new>=old){
#	Line 208 | Line 293 | long long transfer_diff(long long new, long long old){
293
294		}
295
296	<	network_stat_t *get_network_stats_diff(int *entries){
297	<	static network_stat_t *network_stats_diff=NULL;
298	<	static int sizeof_net_stats_diff=0;
299	<	network_stat_t *network_stats_ptr, *network_stats_diff_ptr;
300	<	int ifaces, x, y;
296	>	network_stat_t *get_network_stats_diff(int *entries) {
297	>	static network_stat_t *diff = NULL;
298	>	static int diff_count = 0;
299	>	network_stat_t *src, *dest;
300	>	int i, j, new_count;
301
302	<	if(network_stats==NULL){
303	<	network_stats_ptr=get_network_stats(&ifaces);
304	<	*entries=ifaces;
220	<	return network_stats_ptr;
302	>	if (network_stats == NULL) {
303	>	/* No previous stats, so we can't calculate a difference. */
304	>	return get_network_stats(entries);
305		}
306
307	<	network_stats_diff=network_stat_malloc(interfaces, &sizeof_net_stats_diff, network_stats_diff);
308	<	if(network_stats_diff==NULL){
307	>	/* Resize the results array to match the previous stats. */
308	>	diff = network_stat_malloc(interfaces, &diff_count, diff);
309	>	if (diff == NULL) {
310		return NULL;
311		}
312
313	<	network_stats_ptr=network_stats;
314	<	network_stats_diff_ptr=network_stats_diff;
313	>	/* Copy the previous stats into the result. */
314	>	for (i = 0; i < diff_count; i++) {
315	>	src = &network_stats[i];
316	>	dest = &diff[i];
317
318	<	for(ifaces=0;ifaces<interfaces;ifaces++){
319	<	if(network_stats_diff_ptr->interface_name!=NULL){
233	<	free(network_stats_diff_ptr->interface_name);
318	>	if (dest->interface_name != NULL) {
319	>	free(dest->interface_name);
320		}
321	<	network_stats_diff_ptr->interface_name=strdup(network_stats_ptr->interface_name);
322	<	network_stats_diff_ptr->tx=network_stats_ptr->tx;
323	<	network_stats_diff_ptr->rx=network_stats_ptr->rx;
324	<	network_stats_diff_ptr->systime=network_stats->systime;
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
332	<	network_stats_ptr++;
333	<	network_stats_diff_ptr++;
332	>	/* Get a new set of stats. */
333	>	if (get_network_stats(&new_count) == NULL) {
334	>	return NULL;
335		}
243	–	network_stats_ptr=get_network_stats(&ifaces);
244	–	network_stats_diff_ptr=network_stats_diff;
336
337	<	for(x=0;x<sizeof_net_stats_diff;x++){
337	>	/* For each previous stat... */
338	>	for (i = 0; i < diff_count; i++) {
339	>	dest = &diff[i];
340
341	<	if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
342	<	network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
343	<	network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);
344	<	network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
341	>	/* ... find the corresponding new stat ... */
342	>	for (j = 0; j < new_count; j++) {
343	>	/* Try the new stat in the same position first,
344	>	since that's most likely to be it. */
345	>	src = &network_stats[(i + j) % new_count];
346	>	if (strcmp(src->interface_name, dest->interface_name) == 0) {
347	>	break;
348	>	}
349	>	}
350	>	if (j == new_count) {
351	>	/* No match found. */
352	>	continue;
353	>	}
354	>
355	>	/* ... and subtract the previous stat from it to get the
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	>
367	>	*entries = diff_count;
368	>	return diff;
369	>	}
370	>	/* NETWORK INTERFACE STATS */
371	>
372	>	void network_iface_stat_init(int start, int end, network_iface_stat_t *net_stats){
373	>
374	>	for(net_stats+=start; start<end; start++){
375	>	net_stats->interface_name=NULL;
376	>	net_stats->speed=0;
377	>	net_stats->dup=UNKNOWN_DUPLEX;
378	>	net_stats++;
379	>	}
380	>	}
381	>
382	>	network_iface_stat_t *network_iface_stat_malloc(int needed_entries, int *cur_entries, network_iface_stat_t *net_stats){
383	>
384	>	if(net_stats==NULL){
385	>
386	>	if((net_stats=malloc(needed_entries * sizeof(network_iface_stat_t)))==NULL){
387	>	return NULL;
388	>	}
389	>	network_iface_stat_init(0, needed_entries, net_stats);
390	>	*cur_entries=needed_entries;
391	>
392	>	return net_stats;
393	>	}
394	>
395	>
396	>	if(*cur_entries<needed_entries){
397	>	net_stats=realloc(net_stats, (sizeof(network_iface_stat_t)*needed_entries));
398	>	if(net_stats==NULL){
399	>	return NULL;
400	>	}
401	>	network_iface_stat_init(*cur_entries, needed_entries, net_stats);
402	>	*cur_entries=needed_entries;
403	>	}
404	>
405	>	return net_stats;
406	>	}
407	>
408	>	network_iface_stat_t *get_network_iface_stats(int *entries){
409	>	static network_iface_stat_t *network_iface_stats;
410	>	network_iface_stat_t *network_iface_stat_ptr;
411	>	static int sizeof_network_iface_stats=0;
412	>	int ifaces = 0;
413	>
414	>	#ifdef SOLARIS
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;
422	>	struct ifmediareq ifmed;
423	>	struct ifreq ifr;
424	>	int sock;
425	>	int x;
426	>	#endif
427	>	#ifdef LINUX
428	>	FILE *f;
429	>	/* Horrible big enough, but it should be easily big enough */
430	>	char line[8096];
431	>	int sock;
432	>	#endif
433	>
434	>	#ifdef ALLBSD
435	>	if(getifaddrs(&net) != 0){
436	>	return NULL;
437	>	}
438	>
439	>	if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == 0) return NULL;
440	>
441	>	for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){
442	>	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
443	>	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
444	>	if(network_iface_stats==NULL){
445	>	return NULL;
446	>	}
447	>	network_iface_stat_ptr = network_iface_stats + ifaces;
448	>
449	>	memset(&ifr, 0, sizeof(ifr));
450	>	strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
451	>
452	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0){
453	>	continue;
454	>	}
455	>	if((ifr.ifr_flags & IFF_UP) != 0){
456	>	network_iface_stat_ptr->up = 1;
457		}else{
458	<
459	<	network_stats_ptr=network_stats;
460	<	for(y=0;y<ifaces;y++){
461	<	if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
462	<	network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
463	<	network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);
464	<	network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
458	>	network_iface_stat_ptr->up = 0;
459	>	}
460	>
461	>	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
462	>	network_iface_stat_ptr->interface_name = strdup(net_ptr->ifa_name);
463	>	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
464	>
465	>	network_iface_stat_ptr->speed = 0;
466	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
467	>	ifaces++;
468	>
469	>	memset(&ifmed, 0, sizeof(struct ifmediareq));
470	>	strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
471	>	if(ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
472	>	/* Not all interfaces support the media ioctls. */
473	>	continue;
474	>	}
475	>
476	>	/* We may need to change this if we start doing wireless devices too */
477	>	if( (ifmed.ifm_active | IFM_ETHER) != ifmed.ifm_active ){
478	>	/* Not a ETHER device */
479	>	continue;
480	>	}
481	>
482	>	/* Only intrested in the first 4 bits)  - Assuming only ETHER devices */
483	>	x = ifmed.ifm_active & 0x0f;
484	>	switch(x){
485	>	/* 10 Mbit connections. Speedy :) */
486	>	case(IFM_10_T):
487	>	case(IFM_10_2):
488	>	case(IFM_10_5):
489	>	case(IFM_10_STP):
490	>	case(IFM_10_FL):
491	>	network_iface_stat_ptr->speed = 10;
492	>	break;
493	>	/* 100 Mbit conneections */
494	>	case(IFM_100_TX):
495	>	case(IFM_100_FX):
496	>	case(IFM_100_T4):
497	>	case(IFM_100_VG):
498	>	case(IFM_100_T2):
499	>	network_iface_stat_ptr->speed = 100;
500	>	break;
501	>	/* 1000 Mbit connections */
502	>	case(IFM_1000_SX):
503	>	case(IFM_1000_LX):
504	>	case(IFM_1000_CX):
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 */
517	>	default:
518	>	network_iface_stat_ptr->speed = 0;
519	>	break;
520	>	}
521	>
522	>	if( (ifmed.ifm_active | IFM_FDX) == ifmed.ifm_active ){
523	>	network_iface_stat_ptr->dup = FULL_DUPLEX;
524	>	}else if( (ifmed.ifm_active | IFM_HDX) == ifmed.ifm_active ){
525	>	network_iface_stat_ptr->dup = HALF_DUPLEX;
526	>	}else{
527	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
528	>	}
529	>
530	>	}
531	>	freeifaddrs(net);
532	>	close(sock);
533	>	#endif
534	>
535	>	#ifdef SOLARIS
536	>	if ((kc = kstat_open()) == NULL) {
537	>	return NULL;
538	>	}
539	>
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	>
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	>	ifaces++;
562	>
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 ((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	>	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	>	}
578	>
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	<
263	<	network_stats_ptr++;
264	<	}
589	>	}
590		}
591	+	}
592
593	<	network_stats_ptr++;
594	<	network_stats_diff_ptr++;
593	>	close(sock);
594	>	kstat_close(kc);
595	>	#endif
596	>	#ifdef LINUX
597	>	f = fopen("/proc/net/dev", "r");
598	>	if(f == NULL){
599	>	return NULL;
600	>	}
601	>
602	>	/* Setup stuff so we can do the ioctl to get the info */
603	>	if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0){
604	>	return NULL;
605		}
606
607	<	*entries=sizeof_net_stats_diff;
608	<	return network_stats_diff;
609	<	}
607	>	/* Ignore first 2 lines.. Just headings */
608	>	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
609	>	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
610	>
611	>	while((fgets(line, sizeof(line), f)) != NULL){
612	>	char *name, *ptr;
613	>	struct ifreq ifr;
614	>	struct ethtool_cmd ethcmd;
615	>	int err;
616	>
617	>	/* Get the interface name */
618	>	ptr = strchr(line, ':');
619	>	if (ptr == NULL) continue;
620	>	*ptr='\0';
621	>	name = line;
622	>	while(isspace(*(name))){
623	>	name++;
624	>	}
625	>
626	>	memset(&ifr, 0, sizeof ifr);
627	>	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
628	>
629	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
630	>	continue;
631	>	}
632	>
633	>	/* We have a good interface to add */
634	>	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
635	>	if(network_iface_stats==NULL){
636	>	return NULL;
637	>	}
638	>	network_iface_stat_ptr = network_iface_stats + ifaces;
639	>	network_iface_stat_ptr->interface_name = strdup(name);
640	>	if ((ifr.ifr_flags & IFF_UP) != 0) {
641	>	network_iface_stat_ptr->up = 1;
642	>	} else {
643	>	network_iface_stat_ptr->up = 0;
644	>	}
645	>
646	>	memset(&ethcmd, 0, sizeof ethcmd);
647	>	ethcmd.cmd = ETHTOOL_GSET;
648	>	ifr.ifr_data = (caddr_t) &ethcmd;
649	>
650	>	err = ioctl(sock, SIOCETHTOOL, &ifr);
651	>	if (err == 0) {
652	>	network_iface_stat_ptr->speed = ethcmd.speed;
653	>
654	>	switch (ethcmd.duplex) {
655	>	case 0x00:
656	>	network_iface_stat_ptr->dup = FULL_DUPLEX;
657	>	break;
658	>	case 0x01:
659	>	network_iface_stat_ptr->dup = HALF_DUPLEX;
660	>	break;
661	>	default:
662	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
663	>	}
664	>	} else {
665	>	/* Not all interfaces support the ethtool ioctl. */
666	>	network_iface_stat_ptr->speed = 0;
667	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
668	>	}
669	>
670	>	ifaces++;
671	>	}
672	>	close(sock);
673	>	fclose(f);
674	>	#endif
675	>	*entries = ifaces;
676	>	return network_iface_stats;
677	>	}
678

Diff Legend

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