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.23 by tdb, Mon Jan 19 16:49:21 2004 UTC vs.
Revision 1.55 by ats, Tue Mar 9 11:29:46 2004 UTC

#	Line 32 | 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;
#	Line 55 | 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 102 | Line 129 | network_stat_t *get_network_stats(int *entries){
129		/* Horrible big enough, but it should be easily big enough */
130		char line[8096];
131		regex_t regex;
132	<	regmatch_t line_match[4];
132	>	regmatch_t line_match[9];
133		#endif
134		#ifdef ALLBSD
135		struct ifaddrs *net, *net_ptr;
#	Line 129 | Line 156 | network_stat_t *get_network_stats(int *entries){
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;
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		}
#	Line 148 | Line 180 | network_stat_t *get_network_stats(int *entries){
180		kstat_read(kc, ksp, NULL);
181
182		#ifdef SOL7
183	<	#define RLOOKUP "rbytes"
184	<	#define WLOOKUP "obytes"
183	>	#define LRX "rbytes"
184	>	#define LTX "obytes"
185	>	#define LIPACKETS "ipackets"
186	>	#define LOPACKETS "opackets"
187		#define VALTYPE value.ui32
188		#else
189	<	#define RLOOKUP "rbytes64"
190	<	#define WLOOKUP "obytes64"
189	>	#define LRX "rbytes64"
190	>	#define LTX "obytes64"
191	>	#define LIPACKETS "ipackets64"
192	>	#define LOPACKETS "opackets64"
193		#define VALTYPE value.ui64
194		#endif
195
196	<	if((knp=kstat_data_lookup(ksp, RLOOKUP))==NULL){
197	<	/* Not a network interface, so skip to the next entry */
196	>	/* Read rx */
197	>	if((knp=kstat_data_lookup(ksp, LRX))==NULL){
198	>	/* This is a network interface, but it doesn't
199	>	* have the rbytes/obytes values; for instance,
200	>	* the loopback devices have this behaviour
201	>	* (although they do track packets in/out). */
202	>	/* FIXME: Show packet counts when byte counts
203	>	* not available. */
204		continue;
205		}
206
207	+	/* Create new network_stats */
208		network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
209		if(network_stats==NULL){
210		return NULL;
211		}
212		network_stat_ptr=network_stats+interfaces;
213	+
214	+	/* Finish reading rx */
215		network_stat_ptr->rx=knp->VALTYPE;
216
217	<	if((knp=kstat_data_lookup(ksp, WLOOKUP))==NULL){
218	<	/* Not a network interface, so skip to the next entry */
217	>	/* Read tx */
218	>	if((knp=kstat_data_lookup(ksp, LTX))==NULL){
219		continue;
220		}
221		network_stat_ptr->tx=knp->VALTYPE;
222	+
223	+	/* Read ipackets */
224	+	if((knp=kstat_data_lookup(ksp, LIPACKETS))==NULL){
225	+	continue;
226	+	}
227	+	network_stat_ptr->ipackets=knp->VALTYPE;
228	+
229	+	/* Read opackets */
230	+	if((knp=kstat_data_lookup(ksp, LOPACKETS))==NULL){
231	+	continue;
232	+	}
233	+	network_stat_ptr->opackets=knp->VALTYPE;
234	+
235	+	/* Read ierrors */
236	+	if((knp=kstat_data_lookup(ksp, "ierrors"))==NULL){
237	+	continue;
238	+	}
239	+	network_stat_ptr->ierrors=knp->value.ui32;
240	+
241	+	/* Read oerrors */
242	+	if((knp=kstat_data_lookup(ksp, "oerrors"))==NULL){
243	+	continue;
244	+	}
245	+	network_stat_ptr->oerrors=knp->value.ui32;
246	+
247	+	/* Read collisions */
248	+	if((knp=kstat_data_lookup(ksp, "collisions"))==NULL){
249	+	continue;
250	+	}
251	+	network_stat_ptr->collisions=knp->value.ui32;
252	+
253	+	/* Read interface name */
254		if(network_stat_ptr->interface_name!=NULL){
255		free(network_stat_ptr->interface_name);
256		}
257		network_stat_ptr->interface_name=strdup(ksp->ks_name);
258
259	+	/* Store systime */
260		network_stat_ptr->systime=time(NULL);
261	+
262		interfaces++;
263		}
264		}
#	Line 196 | Line 275 | network_stat_t *get_network_stats(int *entries){
275		fgets(line, sizeof(line), f);
276
277
278	<	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){
278	>	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){
279		return NULL;
280		}
281
282		interfaces=0;
283
284		while((fgets(line, sizeof(line), f)) != NULL){
285	<	if((regexec(&regex, line, 4, line_match, 0))!=0){
285	>	if((regexec(&regex, line, 9, line_match, 0))!=0){
286		continue;
287		}
288		network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
#	Line 218 | Line 297 | network_stat_t *get_network_stats(int *entries){
297
298		network_stat_ptr->interface_name=get_string_match(line, &line_match[1]);
299		network_stat_ptr->rx=get_ll_match(line, &line_match[2]);
300	<	network_stat_ptr->tx=get_ll_match(line, &line_match[3]);
300	>	network_stat_ptr->tx=get_ll_match(line, &line_match[5]);
301	>	network_stat_ptr->ipackets=get_ll_match(line, &line_match[3]);
302	>	network_stat_ptr->opackets=get_ll_match(line, &line_match[6]);
303	>	network_stat_ptr->ierrors=get_ll_match(line, &line_match[4]);
304	>	network_stat_ptr->oerrors=get_ll_match(line, &line_match[7]);
305	>	network_stat_ptr->collisions=get_ll_match(line, &line_match[8]);
306		network_stat_ptr->systime=time(NULL);
307
308		interfaces++;
#	Line 238 | Line 322 | network_stat_t *get_network_stats(int *entries){
322		}
323
324		long long transfer_diff(long long new, long long old){
325	<	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD)
326	<	#define MAXVAL 4294967296LL
325	>	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD)
326	>	#define MAXVAL 0xffffffffLL
327		#else
328	<	#define MAXVAL 18446744073709551616LL
328	>	#define MAXVAL 0xffffffffffffffffLL
329		#endif
330		long long result;
331		if(new>=old){
#	Line 254 | Line 338 | long long transfer_diff(long long new, long long old){
338
339		}
340
341	<	network_stat_t *get_network_stats_diff(int *entries){
342	<	static network_stat_t *network_stats_diff=NULL;
343	<	static int sizeof_net_stats_diff=0;
344	<	network_stat_t *network_stats_ptr, *network_stats_diff_ptr;
345	<	int ifaces, x, y;
341	>	network_stat_t *get_network_stats_diff(int *entries) {
342	>	static network_stat_t *diff = NULL;
343	>	static int diff_count = 0;
344	>	network_stat_t *src, *dest;
345	>	int i, j, new_count;
346
347	<	if(network_stats==NULL){
348	<	network_stats_ptr=get_network_stats(&ifaces);
349	<	*entries=ifaces;
266	<	return network_stats_ptr;
347	>	if (network_stats == NULL) {
348	>	/* No previous stats, so we can't calculate a difference. */
349	>	return get_network_stats(entries);
350		}
351
352	<	network_stats_diff=network_stat_malloc(interfaces, &sizeof_net_stats_diff, network_stats_diff);
353	<	if(network_stats_diff==NULL){
352	>	/* Resize the results array to match the previous stats. */
353	>	diff = network_stat_malloc(interfaces, &diff_count, diff);
354	>	if (diff == NULL) {
355		return NULL;
356		}
357
358	<	network_stats_ptr=network_stats;
359	<	network_stats_diff_ptr=network_stats_diff;
358	>	/* Copy the previous stats into the result. */
359	>	for (i = 0; i < diff_count; i++) {
360	>	src = &network_stats[i];
361	>	dest = &diff[i];
362
363	<	for(ifaces=0;ifaces<interfaces;ifaces++){
364	<	if(network_stats_diff_ptr->interface_name!=NULL){
279	<	free(network_stats_diff_ptr->interface_name);
363	>	if (dest->interface_name != NULL) {
364	>	free(dest->interface_name);
365		}
366	<	network_stats_diff_ptr->interface_name=strdup(network_stats_ptr->interface_name);
367	<	network_stats_diff_ptr->tx=network_stats_ptr->tx;
368	<	network_stats_diff_ptr->rx=network_stats_ptr->rx;
369	<	network_stats_diff_ptr->systime=network_stats->systime;
370	<
371	<	network_stats_ptr++;
372	<	network_stats_diff_ptr++;
366	>	dest->interface_name = strdup(src->interface_name);
367	>	dest->rx = src->rx;
368	>	dest->tx = src->tx;
369	>	dest->ipackets = src->ipackets;
370	>	dest->opackets = src->opackets;
371	>	dest->ierrors = src->ierrors;
372	>	dest->oerrors = src->oerrors;
373	>	dest->collisions = src->collisions;
374	>	dest->systime = src->systime;
375		}
376	<	network_stats_ptr=get_network_stats(&ifaces);
377	<	if (network_stats_ptr == NULL) {
376	>
377	>	/* Get a new set of stats. */
378	>	if (get_network_stats(&new_count) == NULL) {
379		return NULL;
380		}
293	–	network_stats_diff_ptr=network_stats_diff;
381
382	<	for(x=0;x<sizeof_net_stats_diff;x++){
382	>	/* For each previous stat... */
383	>	for (i = 0; i < diff_count; i++) {
384	>	dest = &diff[i];
385
386	<	if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
387	<	network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
388	<	network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);
389	<	network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
386	>	/* ... find the corresponding new stat ... */
387	>	for (j = 0; j < new_count; j++) {
388	>	/* Try the new stat in the same position first,
389	>	since that's most likely to be it. */
390	>	src = &network_stats[(i + j) % new_count];
391	>	if (strcmp(src->interface_name, dest->interface_name) == 0) {
392	>	break;
393	>	}
394	>	}
395	>	if (j == new_count) {
396	>	/* No match found. */
397	>	continue;
398	>	}
399	>
400	>	/* ... and subtract the previous stat from it to get the
401	>	difference. */
402	>	dest->rx = transfer_diff(src->rx, dest->rx);
403	>	dest->tx = transfer_diff(src->tx, dest->tx);
404	>	dest->ipackets = transfer_diff(src->ipackets, dest->ipackets);
405	>	dest->opackets = transfer_diff(src->opackets, dest->opackets);
406	>	dest->ierrors = transfer_diff(src->ierrors, dest->ierrors);
407	>	dest->oerrors = transfer_diff(src->oerrors, dest->oerrors);
408	>	dest->collisions = transfer_diff(src->collisions, dest->collisions);
409	>	dest->systime = src->systime - dest->systime;
410	>	}
411	>
412	>	*entries = diff_count;
413	>	return diff;
414	>	}
415	>	/* NETWORK INTERFACE STATS */
416	>
417	>	void network_iface_stat_init(int start, int end, network_iface_stat_t *net_stats){
418	>
419	>	for(net_stats+=start; start<end; start++){
420	>	net_stats->interface_name=NULL;
421	>	net_stats->speed=0;
422	>	net_stats->dup=UNKNOWN_DUPLEX;
423	>	net_stats++;
424	>	}
425	>	}
426	>
427	>	network_iface_stat_t *network_iface_stat_malloc(int needed_entries, int *cur_entries, network_iface_stat_t *net_stats){
428	>
429	>	if(net_stats==NULL){
430	>
431	>	if((net_stats=malloc(needed_entries * sizeof(network_iface_stat_t)))==NULL){
432	>	return NULL;
433	>	}
434	>	network_iface_stat_init(0, needed_entries, net_stats);
435	>	*cur_entries=needed_entries;
436	>
437	>	return net_stats;
438	>	}
439	>
440	>
441	>	if(*cur_entries<needed_entries){
442	>	net_stats=realloc(net_stats, (sizeof(network_iface_stat_t)*needed_entries));
443	>	if(net_stats==NULL){
444	>	return NULL;
445	>	}
446	>	network_iface_stat_init(*cur_entries, needed_entries, net_stats);
447	>	*cur_entries=needed_entries;
448	>	}
449	>
450	>	return net_stats;
451	>	}
452	>
453	>	network_iface_stat_t *get_network_iface_stats(int *entries){
454	>	static network_iface_stat_t *network_iface_stats;
455	>	network_iface_stat_t *network_iface_stat_ptr;
456	>	static int sizeof_network_iface_stats=0;
457	>	int ifaces = 0;
458	>
459	>	#ifdef SOLARIS
460	>	kstat_ctl_t *kc;
461	>	kstat_t *ksp;
462	>	kstat_named_t *knp;
463	>	int sock;
464	>	#endif
465	>	#ifdef ALLBSD
466	>	struct ifaddrs *net, *net_ptr;
467	>	struct ifmediareq ifmed;
468	>	struct ifreq ifr;
469	>	int sock;
470	>	int x;
471	>	#endif
472	>	#ifdef LINUX
473	>	FILE *f;
474	>	/* Horrible big enough, but it should be easily big enough */
475	>	char line[8096];
476	>	int sock;
477	>	#endif
478	>
479	>	#ifdef ALLBSD
480	>	if(getifaddrs(&net) != 0){
481	>	return NULL;
482	>	}
483	>
484	>	if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == 0) return NULL;
485	>
486	>	for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){
487	>	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
488	>	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
489	>	if(network_iface_stats==NULL){
490	>	return NULL;
491	>	}
492	>	network_iface_stat_ptr = network_iface_stats + ifaces;
493	>
494	>	memset(&ifr, 0, sizeof(ifr));
495	>	strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
496	>
497	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0){
498	>	continue;
499	>	}
500	>	if((ifr.ifr_flags & IFF_UP) != 0){
501	>	network_iface_stat_ptr->up = 1;
502		}else{
503	<
504	<	network_stats_ptr=network_stats;
505	<	for(y=0;y<ifaces;y++){
506	<	if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
507	<	network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
508	<	network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);
509	<	network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
503	>	network_iface_stat_ptr->up = 0;
504	>	}
505	>
506	>	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
507	>	network_iface_stat_ptr->interface_name = strdup(net_ptr->ifa_name);
508	>	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
509	>
510	>	network_iface_stat_ptr->speed = 0;
511	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
512	>	ifaces++;
513	>
514	>	memset(&ifmed, 0, sizeof(struct ifmediareq));
515	>	strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
516	>	if(ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
517	>	/* Not all interfaces support the media ioctls. */
518	>	continue;
519	>	}
520	>
521	>	/* We may need to change this if we start doing wireless devices too */
522	>	if( (ifmed.ifm_active | IFM_ETHER) != ifmed.ifm_active ){
523	>	/* Not a ETHER device */
524	>	continue;
525	>	}
526	>
527	>	/* Only intrested in the first 4 bits)  - Assuming only ETHER devices */
528	>	x = ifmed.ifm_active & 0x0f;
529	>	switch(x){
530	>	/* 10 Mbit connections. Speedy :) */
531	>	case(IFM_10_T):
532	>	case(IFM_10_2):
533	>	case(IFM_10_5):
534	>	case(IFM_10_STP):
535	>	case(IFM_10_FL):
536	>	network_iface_stat_ptr->speed = 10;
537	>	break;
538	>	/* 100 Mbit conneections */
539	>	case(IFM_100_TX):
540	>	case(IFM_100_FX):
541	>	case(IFM_100_T4):
542	>	case(IFM_100_VG):
543	>	case(IFM_100_T2):
544	>	network_iface_stat_ptr->speed = 100;
545	>	break;
546	>	/* 1000 Mbit connections */
547	>	case(IFM_1000_SX):
548	>	case(IFM_1000_LX):
549	>	case(IFM_1000_CX):
550	>	#if defined(IFM_1000_TX) && !defined(OPENBSD)
551	>	case(IFM_1000_TX): /* FreeBSD 4 and others (but NOT OpenBSD)? */
552	>	#endif
553	>	#ifdef IFM_1000_FX
554	>	case(IFM_1000_FX): /* FreeBSD 4 */
555	>	#endif
556	>	#ifdef IFM_1000_T
557	>	case(IFM_1000_T): /* FreeBSD 5 */
558	>	#endif
559	>	network_iface_stat_ptr->speed = 1000;
560	>	break;
561	>	/* We don't know what it is */
562	>	default:
563	>	network_iface_stat_ptr->speed = 0;
564	>	break;
565	>	}
566	>
567	>	if( (ifmed.ifm_active | IFM_FDX) == ifmed.ifm_active ){
568	>	network_iface_stat_ptr->dup = FULL_DUPLEX;
569	>	}else if( (ifmed.ifm_active | IFM_HDX) == ifmed.ifm_active ){
570	>	network_iface_stat_ptr->dup = HALF_DUPLEX;
571	>	}else{
572	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
573	>	}
574	>
575	>	}
576	>	freeifaddrs(net);
577	>	close(sock);
578	>	#endif
579	>
580	>	#ifdef SOLARIS
581	>	if ((kc = kstat_open()) == NULL) {
582	>	return NULL;
583	>	}
584	>
585	>	if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
586	>	return NULL;
587	>	}
588	>
589	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
590	>	if (!strcmp(ksp->ks_class, "net")) {
591	>	struct ifreq ifr;
592	>
593	>	kstat_read(kc, ksp, NULL);
594	>
595	>	strncpy(ifr.ifr_name, ksp->ks_name, sizeof ifr.ifr_name);
596	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
597	>	/* Not a network interface. */
598	>	continue;
599	>	}
600	>
601	>	network_iface_stats = network_iface_stat_malloc(ifaces + 1, &sizeof_network_iface_stats, network_iface_stats);
602	>	if (network_iface_stats == NULL) {
603	>	return NULL;
604	>	}
605	>	network_iface_stat_ptr = network_iface_stats + ifaces;
606	>	ifaces++;
607	>
608	>	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
609	>	network_iface_stat_ptr->interface_name = strdup(ksp->ks_name);
610	>	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
611	>
612	>	if ((ifr.ifr_flags & IFF_UP) != 0) {
613	>	network_iface_stat_ptr->up = 1;
614	>	} else {
615	>	network_iface_stat_ptr->up = 1;
616	>	}
617	>
618	>	if ((knp = kstat_data_lookup(ksp, "ifspeed")) != NULL) {
619	>	network_iface_stat_ptr->speed = knp->value.ui64 / (1000 * 1000);
620	>	} else {
621	>	network_iface_stat_ptr->speed = 0;
622	>	}
623	>
624	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
625	>	if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) {
626	>	switch (knp->value.ui32) {
627	>	case 1:
628	>	network_iface_stat_ptr->dup = HALF_DUPLEX;
629		break;
630	+	case 2:
631	+	network_iface_stat_ptr->dup = FULL_DUPLEX;
632	+	break;
633		}
634	<
312	<	network_stats_ptr++;
313	<	}
634	>	}
635		}
636	+	}
637
638	<	network_stats_ptr++;
639	<	network_stats_diff_ptr++;
638	>	close(sock);
639	>	kstat_close(kc);
640	>	#endif
641	>	#ifdef LINUX
642	>	f = fopen("/proc/net/dev", "r");
643	>	if(f == NULL){
644	>	return NULL;
645	>	}
646	>
647	>	/* Setup stuff so we can do the ioctl to get the info */
648	>	if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0){
649	>	return NULL;
650		}
651
652	<	*entries=sizeof_net_stats_diff;
653	<	return network_stats_diff;
654	<	}
652	>	/* Ignore first 2 lines.. Just headings */
653	>	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
654	>	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
655	>
656	>	while((fgets(line, sizeof(line), f)) != NULL){
657	>	char *name, *ptr;
658	>	struct ifreq ifr;
659	>	struct ethtool_cmd ethcmd;
660	>	int err;
661	>
662	>	/* Get the interface name */
663	>	ptr = strchr(line, ':');
664	>	if (ptr == NULL) continue;
665	>	*ptr='\0';
666	>	name = line;
667	>	while(isspace(*(name))){
668	>	name++;
669	>	}
670	>
671	>	memset(&ifr, 0, sizeof ifr);
672	>	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
673	>
674	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
675	>	continue;
676	>	}
677	>
678	>	/* We have a good interface to add */
679	>	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
680	>	if(network_iface_stats==NULL){
681	>	return NULL;
682	>	}
683	>	network_iface_stat_ptr = network_iface_stats + ifaces;
684	>	network_iface_stat_ptr->interface_name = strdup(name);
685	>	if ((ifr.ifr_flags & IFF_UP) != 0) {
686	>	network_iface_stat_ptr->up = 1;
687	>	} else {
688	>	network_iface_stat_ptr->up = 0;
689	>	}
690	>
691	>	memset(&ethcmd, 0, sizeof ethcmd);
692	>	ethcmd.cmd = ETHTOOL_GSET;
693	>	ifr.ifr_data = (caddr_t) &ethcmd;
694	>
695	>	err = ioctl(sock, SIOCETHTOOL, &ifr);
696	>	if (err == 0) {
697	>	network_iface_stat_ptr->speed = ethcmd.speed;
698	>
699	>	switch (ethcmd.duplex) {
700	>	case 0x00:
701	>	network_iface_stat_ptr->dup = FULL_DUPLEX;
702	>	break;
703	>	case 0x01:
704	>	network_iface_stat_ptr->dup = HALF_DUPLEX;
705	>	break;
706	>	default:
707	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
708	>	}
709	>	} else {
710	>	/* Not all interfaces support the ethtool ioctl. */
711	>	network_iface_stat_ptr->speed = 0;
712	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
713	>	}
714	>
715	>	ifaces++;
716	>	}
717	>	close(sock);
718	>	fclose(f);
719	>	#endif
720	>	*entries = ifaces;
721	>	return network_iface_stats;
722	>	}
723

Diff Legend

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