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.1 by pajs, Tue Feb 18 19:28:30 2003 UTC vs.
Revision 1.67 by tdb, Thu Apr 8 10:56:13 2004 UTC

#	Line 1 | Line 1
1	<	/*
2	<	* i-scream central monitoring system
3	<	* http://www.i-scream.org.uk
4	<	* Copyright (C) 2000-2002 i-scream
1	>	/*
2	>	* i-scream libstatgrab
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
25		#include "config.h"
26		#endif
27
25	–	#include <stdio.h>
26	–	#include "statgrab.h"
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 <string.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>
48	+	#include <sys/ioctl.h>
49	+	#include <sys/socket.h>
50	+	#include <net/if.h>
51	+	#include <ctype.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	+	typedef __uint8_t u8;
56	+	typedef __uint16_t u16;
57	+	typedef __uint32_t u32;
58	+	typedef __uint64_t u64;
59	+	#include <linux/ethtool.h>
60	+	#include <linux/sockios.h>
61	+	#include <unistd.h>
62	+	#endif
63	+	#ifdef ALLBSD
64	+	#include <sys/types.h>
65	+	#include <sys/socket.h>
66	+	#include <ifaddrs.h>
67	+	#include <net/if.h>
68	+	#include <net/if_media.h>
69	+	#include <sys/ioctl.h>
70	+	#include <unistd.h>
71	+	#endif
72
73	<	#define START_VAL 1
73	>	static void network_stat_init(sg_network_io_stats *s) {
74	>	s->interface_name = NULL;
75	>	s->tx = 0;
76	>	s->rx = 0;
77	>	s->ipackets = 0;
78	>	s->opackets = 0;
79	>	s->ierrors = 0;
80	>	s->oerrors = 0;
81	>	s->collisions = 0;
82	>	}
83
84	<	network_stat_t *network_stat_init(int num_iface, int *wmark, network_stat_t *net_stats){
85	<	int x;
86	<	network_stat_t *net_stats_ptr;
84	>	static void network_stat_destroy(sg_network_io_stats *s) {
85	>	free(s->interface_name);
86	>	}
87
88	<	if(*wmark==-1){
89	<	printf("new malloc\n");
90	<	if((net_stats=malloc(START_VAL * sizeof(network_stat_t)))==NULL){
88	>	VECTOR_DECLARE_STATIC(network_stats, sg_network_io_stats, 5,
89	>	network_stat_init, network_stat_destroy);
90	>
91	>	sg_network_io_stats *sg_get_network_io_stats(int *entries){
92	>	int interfaces;
93	>	sg_network_io_stats *network_stat_ptr;
94	>
95	>	#ifdef SOLARIS
96	>	kstat_ctl_t *kc;
97	>	kstat_t *ksp;
98	>	kstat_named_t *knp;
99	>	#endif
100	>
101	>	#ifdef LINUX
102	>	FILE *f;
103	>	/* Horrible big enough, but it should be easily big enough */
104	>	char line[8096];
105	>	regex_t regex;
106	>	regmatch_t line_match[9];
107	>	#endif
108	>	#ifdef ALLBSD
109	>	struct ifaddrs *net, *net_ptr;
110	>	struct if_data *net_data;
111	>	#endif
112	>
113	>	#ifdef ALLBSD
114	>	if(getifaddrs(&net) != 0){
115	>	sg_set_error(SG_ERROR_GETIFADDRS, NULL);
116	>	return NULL;
117	>	}
118	>
119	>	interfaces=0;
120	>
121	>	for(net_ptr=net;net_ptr!=NULL;net_ptr=net_ptr->ifa_next){
122	>	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
123	>
124	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
125		return NULL;
126		}
127	<	*wmark=START_VAL;
128	<	net_stats_ptr=net_stats;
129	<	for(x=0;x<(*wmark);x++){
130	<	net_stats_ptr->interface_name=NULL;
131	<	net_stats_ptr++;
127	>	network_stat_ptr=network_stats+interfaces;
128	>
129	>	if (sg_update_string(&network_stat_ptr->interface_name,
130	>	net_ptr->ifa_name) < 0) {
131	>	return NULL;
132		}
133	<	return net_stats;
133	>	net_data=(struct if_data *)net_ptr->ifa_data;
134	>	network_stat_ptr->rx=net_data->ifi_ibytes;
135	>	network_stat_ptr->tx=net_data->ifi_obytes;
136	>	network_stat_ptr->ipackets=net_data->ifi_ipackets;
137	>	network_stat_ptr->opackets=net_data->ifi_opackets;
138	>	network_stat_ptr->ierrors=net_data->ifi_ierrors;
139	>	network_stat_ptr->oerrors=net_data->ifi_oerrors;
140	>	network_stat_ptr->collisions=net_data->ifi_collisions;
141	>	network_stat_ptr->systime=time(NULL);
142	>	interfaces++;
143		}
144	<	if(num_iface>(*wmark-1)){
145	<	if((net_stats=realloc(net_stats, (*wmark)*2 * sizeof(network_stat_t)))==NULL){
144	>	freeifaddrs(net);
145	>	#endif
146	>
147	>	#ifdef SOLARIS
148	>	if ((kc = kstat_open()) == NULL) {
149	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
150	>	return NULL;
151	>	}
152	>
153	>	interfaces=0;
154	>
155	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
156	>	if (!strcmp(ksp->ks_class, "net")) {
157	>	kstat_read(kc, ksp, NULL);
158	>
159	>	#ifdef SOL7
160	>	#define LRX "rbytes"
161	>	#define LTX "obytes"
162	>	#define LIPACKETS "ipackets"
163	>	#define LOPACKETS "opackets"
164	>	#define VALTYPE value.ui32
165	>	#else
166	>	#define LRX "rbytes64"
167	>	#define LTX "obytes64"
168	>	#define LIPACKETS "ipackets64"
169	>	#define LOPACKETS "opackets64"
170	>	#define VALTYPE value.ui64
171	>	#endif
172	>
173	>	/* Read rx */
174	>	if((knp=kstat_data_lookup(ksp, LRX))==NULL){
175	>	/* This is a network interface, but it doesn't
176	>	* have the rbytes/obytes values; for instance,
177	>	* the loopback devices have this behaviour
178	>	* (although they do track packets in/out). */
179	>	/* FIXME: Show packet counts when byte counts
180	>	* not available. */
181	>	continue;
182	>	}
183	>
184	>	/* Create new network_stats */
185	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
186	>	return NULL;
187	>	}
188	>	network_stat_ptr=network_stats+interfaces;
189	>
190	>	/* Finish reading rx */
191	>	network_stat_ptr->rx=knp->VALTYPE;
192	>
193	>	/* Read tx */
194	>	if((knp=kstat_data_lookup(ksp, LTX))==NULL){
195	>	continue;
196	>	}
197	>	network_stat_ptr->tx=knp->VALTYPE;
198	>
199	>	/* Read ipackets */
200	>	if((knp=kstat_data_lookup(ksp, LIPACKETS))==NULL){
201	>	continue;
202	>	}
203	>	network_stat_ptr->ipackets=knp->VALTYPE;
204	>
205	>	/* Read opackets */
206	>	if((knp=kstat_data_lookup(ksp, LOPACKETS))==NULL){
207	>	continue;
208	>	}
209	>	network_stat_ptr->opackets=knp->VALTYPE;
210	>
211	>	/* Read ierrors */
212	>	if((knp=kstat_data_lookup(ksp, "ierrors"))==NULL){
213	>	continue;
214	>	}
215	>	network_stat_ptr->ierrors=knp->value.ui32;
216	>
217	>	/* Read oerrors */
218	>	if((knp=kstat_data_lookup(ksp, "oerrors"))==NULL){
219	>	continue;
220	>	}
221	>	network_stat_ptr->oerrors=knp->value.ui32;
222	>
223	>	/* Read collisions */
224	>	if((knp=kstat_data_lookup(ksp, "collisions"))==NULL){
225	>	continue;
226	>	}
227	>	network_stat_ptr->collisions=knp->value.ui32;
228	>
229	>	/* Read interface name */
230	>	if (sg_update_string(&network_stat_ptr->interface_name,
231	>	ksp->ks_name) < 0) {
232	>	return NULL;
233	>	}
234	>
235	>	/* Store systime */
236	>	network_stat_ptr->systime=time(NULL);
237	>
238	>	interfaces++;
239	>	}
240	>	}
241	>
242	>	kstat_close(kc);
243	>	#endif
244	>	#ifdef LINUX
245	>	f=fopen("/proc/net/dev", "r");
246	>	if(f==NULL){
247	>	sg_set_error(SG_ERROR_OPEN, "/proc/net/dev");
248	>	return NULL;
249	>	}
250	>	/* read the 2 lines.. Its the title, so we dont care :) */
251	>	fgets(line, sizeof(line), f);
252	>	fgets(line, sizeof(line), f);
253	>
254	>
255	>	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){
256	>	sg_set_error(SG_ERROR_PARSE, NULL);
257	>	return NULL;
258	>	}
259	>
260	>	interfaces=0;
261	>
262	>	while((fgets(line, sizeof(line), f)) != NULL){
263	>	if((regexec(&regex, line, 9, line_match, 0))!=0){
264	>	continue;
265	>	}
266	>
267	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
268		return NULL;
269		}
270	+	network_stat_ptr=network_stats+interfaces;
271
272	<	*wmark=(*wmark)*2;
273	<	net_stats_ptr=net_stats+num_iface;
60	<	for(x=num_iface;x<(*wmark);x++){
61	<	net_stats_ptr->interface_name=NULL;
62	<	net_stats_ptr++;
272	>	if(network_stat_ptr->interface_name!=NULL){
273	>	free(network_stat_ptr->interface_name);
274		}
275	<	return net_stats;
275	>
276	>	network_stat_ptr->interface_name=sg_get_string_match(line, &line_match[1]);
277	>	network_stat_ptr->rx=sg_get_ll_match(line, &line_match[2]);
278	>	network_stat_ptr->tx=sg_get_ll_match(line, &line_match[5]);
279	>	network_stat_ptr->ipackets=sg_get_ll_match(line, &line_match[3]);
280	>	network_stat_ptr->opackets=sg_get_ll_match(line, &line_match[6]);
281	>	network_stat_ptr->ierrors=sg_get_ll_match(line, &line_match[4]);
282	>	network_stat_ptr->oerrors=sg_get_ll_match(line, &line_match[7]);
283	>	network_stat_ptr->collisions=sg_get_ll_match(line, &line_match[8]);
284	>	network_stat_ptr->systime=time(NULL);
285	>
286	>	interfaces++;
287		}
288	+	fclose(f);
289	+	regfree(&regex);
290
291	<	return net_stats;
291	>	#endif
292	>
293	>	#ifdef CYGWIN
294	>	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
295	>	return NULL;
296	>	#endif
297	>
298	>	*entries=interfaces;
299	>
300	>	return network_stats;
301		}
302
303	<	network_stat_t *get_network_stats(int *entries){
304	<	kstat_ctl_t *kc;
305	<	kstat_t *ksp;
303	>	static long long transfer_diff(long long new, long long old){
304	>	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD) || defined(OPENBSD)
305	>	/* 32-bit quantities, so we must explicitly deal with wraparound. */
306	>	#define MAXVAL 0x100000000LL
307	>	if (new >= old) {
308	>	return new - old;
309	>	} else {
310	>	return MAXVAL + new - old;
311	>	}
312	>	#else
313	>	/* 64-bit quantities, so plain subtraction works. */
314	>	return new - old;
315	>	#endif
316	>	}
317	>
318	>	sg_network_io_stats *sg_get_network_io_stats_diff(int *entries) {
319	>	VECTOR_DECLARE_STATIC(diff, sg_network_io_stats, 1,
320	>	network_stat_init, network_stat_destroy);
321	>	sg_network_io_stats *src = NULL, *dest;
322	>	int i, j, diff_count, new_count;
323	>
324	>	if (network_stats == NULL) {
325	>	/* No previous stats, so we can't calculate a difference. */
326	>	return sg_get_network_io_stats(entries);
327	>	}
328	>
329	>	/* Resize the results array to match the previous stats. */
330	>	diff_count = VECTOR_SIZE(network_stats);
331	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
332	>	return NULL;
333	>	}
334	>
335	>	/* Copy the previous stats into the result. */
336	>	for (i = 0; i < diff_count; i++) {
337	>	src = &network_stats[i];
338	>	dest = &diff[i];
339	>
340	>	if (sg_update_string(&dest->interface_name,
341	>	src->interface_name) < 0) {
342	>	return NULL;
343	>	}
344	>	dest->rx = src->rx;
345	>	dest->tx = src->tx;
346	>	dest->ipackets = src->ipackets;
347	>	dest->opackets = src->opackets;
348	>	dest->ierrors = src->ierrors;
349	>	dest->oerrors = src->oerrors;
350	>	dest->collisions = src->collisions;
351	>	dest->systime = src->systime;
352	>	}
353	>
354	>	/* Get a new set of stats. */
355	>	if (sg_get_network_io_stats(&new_count) == NULL) {
356	>	return NULL;
357	>	}
358	>
359	>	/* For each previous stat... */
360	>	for (i = 0; i < diff_count; i++) {
361	>	dest = &diff[i];
362	>
363	>	/* ... find the corresponding new stat ... */
364	>	for (j = 0; j < new_count; j++) {
365	>	/* Try the new stat in the same position first,
366	>	since that's most likely to be it. */
367	>	src = &network_stats[(i + j) % new_count];
368	>	if (strcmp(src->interface_name, dest->interface_name) == 0) {
369	>	break;
370	>	}
371	>	}
372	>	if (j == new_count) {
373	>	/* No match found. */
374	>	continue;
375	>	}
376	>
377	>	/* ... and subtract the previous stat from it to get the
378	>	difference. */
379	>	dest->rx = transfer_diff(src->rx, dest->rx);
380	>	dest->tx = transfer_diff(src->tx, dest->tx);
381	>	dest->ipackets = transfer_diff(src->ipackets, dest->ipackets);
382	>	dest->opackets = transfer_diff(src->opackets, dest->opackets);
383	>	dest->ierrors = transfer_diff(src->ierrors, dest->ierrors);
384	>	dest->oerrors = transfer_diff(src->oerrors, dest->oerrors);
385	>	dest->collisions = transfer_diff(src->collisions, dest->collisions);
386	>	dest->systime = src->systime - dest->systime;
387	>	}
388	>
389	>	*entries = diff_count;
390	>	return diff;
391	>	}
392	>
393	>	/* NETWORK INTERFACE STATS */
394	>
395	>	static void network_iface_stat_init(sg_network_iface_stats *s) {
396	>	s->interface_name = NULL;
397	>	s->speed = 0;
398	>	s->dup = SG_IFACE_DUPLEX_UNKNOWN;
399	>	}
400	>
401	>	static void network_iface_stat_destroy(sg_network_iface_stats *s) {
402	>	free(s->interface_name);
403	>	}
404	>
405	>	sg_network_iface_stats *sg_get_network_iface_stats(int *entries){
406	>	VECTOR_DECLARE_STATIC(network_iface_stats, sg_network_iface_stats, 5,
407	>	network_iface_stat_init, network_iface_stat_destroy);
408	>	sg_network_iface_stats *network_iface_stat_ptr;
409	>	int ifaces = 0;
410	>
411	>	#ifdef SOLARIS
412	>	kstat_ctl_t *kc;
413	>	kstat_t *ksp;
414		kstat_named_t *knp;
415	<
416	<	int interfaces=0;
417	<	network_stat_t *network_stat_ptr;
418	<	static network_stat_t *network_stats=NULL;
419	<	static int watermark=-1;
415	>	int sock;
416	>	#endif
417	>	#ifdef ALLBSD
418	>	struct ifaddrs *net, *net_ptr;
419	>	struct ifmediareq ifmed;
420	>	struct ifreq ifr;
421	>	int sock;
422	>	int x;
423	>	#endif
424	>	#ifdef LINUX
425	>	FILE *f;
426	>	/* Horrible big enough, but it should be easily big enough */
427	>	char line[8096];
428	>	int sock;
429	>	#endif
430
431	<	if ((kc = kstat_open()) == NULL) {
432	<	return NULL;
433	<	}
431	>	#ifdef ALLBSD
432	>	if(getifaddrs(&net) != 0){
433	>	sg_set_error(SG_ERROR_GETIFADDRS, NULL);
434	>	return NULL;
435	>	}
436
437	<	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
85	<	if (!strcmp(ksp->ks_class, "net")) {
86	<	kstat_read(kc, ksp, NULL);
437	>	if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == 0) return NULL;
438
439	<	if((knp=kstat_data_lookup(ksp, "rbytes64"))==NULL){
440	<	/* Not a network interface, so skip to the next entry */
439	>	for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){
440	>	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
441	>
442	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
443	>	return NULL;
444	>	}
445	>	network_iface_stat_ptr = network_iface_stats + ifaces;
446	>
447	>	memset(&ifr, 0, sizeof(ifr));
448	>	strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
449	>
450	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0){
451	>	continue;
452	>	}
453	>	if((ifr.ifr_flags & IFF_UP) != 0){
454	>	network_iface_stat_ptr->up = 1;
455	>	}else{
456	>	network_iface_stat_ptr->up = 0;
457	>	}
458	>
459	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
460	>	net_ptr->ifa_name) < 0) {
461	>	return NULL;
462	>	}
463	>
464	>	network_iface_stat_ptr->speed = 0;
465	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
466	>	ifaces++;
467	>
468	>	memset(&ifmed, 0, sizeof(struct ifmediareq));
469	>	sg_strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
470	>	if(ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
471	>	/* Not all interfaces support the media ioctls. */
472	>	continue;
473	>	}
474	>
475	>	/* We may need to change this if we start doing wireless devices too */
476	>	if( (ifmed.ifm_active | IFM_ETHER) != ifmed.ifm_active ){
477	>	/* Not a ETHER device */
478	>	continue;
479	>	}
480	>
481	>	/* Only intrested in the first 4 bits)  - Assuming only ETHER devices */
482	>	x = ifmed.ifm_active & 0x0f;
483	>	switch(x){
484	>	/* 10 Mbit connections. Speedy :) */
485	>	case(IFM_10_T):
486	>	case(IFM_10_2):
487	>	case(IFM_10_5):
488	>	case(IFM_10_STP):
489	>	case(IFM_10_FL):
490	>	network_iface_stat_ptr->speed = 10;
491	>	break;
492	>	/* 100 Mbit conneections */
493	>	case(IFM_100_TX):
494	>	case(IFM_100_FX):
495	>	case(IFM_100_T4):
496	>	case(IFM_100_VG):
497	>	case(IFM_100_T2):
498	>	network_iface_stat_ptr->speed = 100;
499	>	break;
500	>	/* 1000 Mbit connections */
501	>	case(IFM_1000_SX):
502	>	case(IFM_1000_LX):
503	>	case(IFM_1000_CX):
504	>	#if defined(IFM_1000_TX) && !defined(OPENBSD)
505	>	case(IFM_1000_TX): /* FreeBSD 4 and others (but NOT OpenBSD)? */
506	>	#endif
507	>	#ifdef IFM_1000_FX
508	>	case(IFM_1000_FX): /* FreeBSD 4 */
509	>	#endif
510	>	#ifdef IFM_1000_T
511	>	case(IFM_1000_T): /* FreeBSD 5 */
512	>	#endif
513	>	network_iface_stat_ptr->speed = 1000;
514	>	break;
515	>	/* We don't know what it is */
516	>	default:
517	>	network_iface_stat_ptr->speed = 0;
518	>	break;
519	>	}
520	>
521	>	if( (ifmed.ifm_active | IFM_FDX) == ifmed.ifm_active ){
522	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
523	>	}else if( (ifmed.ifm_active | IFM_HDX) == ifmed.ifm_active ){
524	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
525	>	}else{
526	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
527	>	}
528	>
529	>	}
530	>	freeifaddrs(net);
531	>	close(sock);
532	>	#endif
533	>
534	>	#ifdef SOLARIS
535	>	if ((kc = kstat_open()) == NULL) {
536	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
537	>	return NULL;
538	>	}
539	>
540	>	if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
541	>	sg_set_error(SG_ERROR_SOCKET, NULL);
542	>	return NULL;
543	>	}
544	>
545	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
546	>	if (!strcmp(ksp->ks_class, "net")) {
547	>	struct ifreq ifr;
548	>
549	>	kstat_read(kc, ksp, NULL);
550	>
551	>	strncpy(ifr.ifr_name, ksp->ks_name, sizeof ifr.ifr_name);
552	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
553	>	/* Not a network interface. */
554		continue;
555		}
556	<	network_stats=network_stat_init(interfaces, &watermark, network_stats);
557	<	if(network_stats==NULL){
556	>
557	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
558		return NULL;
559		}
560	<	network_stat_ptr=network_stats+interfaces;
561	<	network_stat_ptr->rx=knp->value.ui64;
560	>	network_iface_stat_ptr = network_iface_stats + ifaces;
561	>	ifaces++;
562
563	<	if((knp=kstat_data_lookup(ksp, "obytes64"))==NULL){
564	<	/* Not a network interface, so skip to the next entry */
565	<	continue;
563	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
564	>	ksp->ks_name) < 0) {
565	>	return NULL;
566		}
567	<	network_stat_ptr->tx=knp->value.ui64;
568	<	if(network_stat_ptr->interface_name!=NULL){
569	<	free(network_stat_ptr->interface_name);
567	>
568	>	if ((ifr.ifr_flags & IFF_UP) != 0) {
569	>	network_iface_stat_ptr->up = 1;
570	>	} else {
571	>	network_iface_stat_ptr->up = 1;
572		}
573	<	network_stat_ptr->interface_name=strdup(ksp->ks_name);
574	<	interfaces++;
573	>
574	>	if ((knp = kstat_data_lookup(ksp, "ifspeed")) != NULL) {
575	>	network_iface_stat_ptr->speed = knp->value.ui64 / (1000 * 1000);
576	>	} else {
577	>	network_iface_stat_ptr->speed = 0;
578	>	}
579	>
580	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
581	>	if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) {
582	>	switch (knp->value.ui32) {
583	>	case 1:
584	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
585	>	break;
586	>	case 2:
587	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
588	>	break;
589	>	}
590	>	}
591		}
592		}
111	–
593
594	<	*entries=interfaces;
594	>	close(sock);
595	>	kstat_close(kc);
596	>	#endif
597	>	#ifdef LINUX
598	>	f = fopen("/proc/net/dev", "r");
599	>	if(f == NULL){
600	>	sg_set_error(SG_ERROR_OPEN, "/proc/net/dev");
601	>	return NULL;
602	>	}
603
604	<	return network_stats;
604	>	/* Setup stuff so we can do the ioctl to get the info */
605	>	if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0){
606	>	sg_set_error(SG_ERROR_SOCKET, NULL);
607	>	return NULL;
608	>	}
609
610	+	/* Ignore first 2 lines.. Just headings */
611	+	if((fgets(line, sizeof(line), f)) == NULL) {
612	+	sg_set_error(SG_ERROR_PARSE, NULL);
613	+	return NULL;
614	+	}
615	+	if((fgets(line, sizeof(line), f)) == NULL) {
616	+	sg_set_error(SG_ERROR_PARSE, NULL);
617	+	return NULL;
618	+	}
619	+
620	+	while((fgets(line, sizeof(line), f)) != NULL){
621	+	char *name, *ptr;
622	+	struct ifreq ifr;
623	+	struct ethtool_cmd ethcmd;
624	+	int err;
625	+
626	+	/* Get the interface name */
627	+	ptr = strchr(line, ':');
628	+	if (ptr == NULL) continue;
629	+	*ptr='\0';
630	+	name = line;
631	+	while(isspace(*(name))){
632	+	name++;
633	+	}
634	+
635	+	memset(&ifr, 0, sizeof ifr);
636	+	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
637	+
638	+	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
639	+	continue;
640	+	}
641	+
642	+	/* We have a good interface to add */
643	+	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
644	+	return NULL;
645	+	}
646	+	network_iface_stat_ptr = network_iface_stats + ifaces;
647	+
648	+	if (sg_update_string(&network_iface_stat_ptr->interface_name,
649	+	name) < 0) {
650	+	return NULL;
651	+	}
652	+	if ((ifr.ifr_flags & IFF_UP) != 0) {
653	+	network_iface_stat_ptr->up = 1;
654	+	} else {
655	+	network_iface_stat_ptr->up = 0;
656	+	}
657	+
658	+	memset(&ethcmd, 0, sizeof ethcmd);
659	+	ethcmd.cmd = ETHTOOL_GSET;
660	+	ifr.ifr_data = (caddr_t) &ethcmd;
661	+
662	+	err = ioctl(sock, SIOCETHTOOL, &ifr);
663	+	if (err == 0) {
664	+	network_iface_stat_ptr->speed = ethcmd.speed;
665	+
666	+	switch (ethcmd.duplex) {
667	+	case 0x00:
668	+	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
669	+	break;
670	+	case 0x01:
671	+	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
672	+	break;
673	+	default:
674	+	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
675	+	}
676	+	} else {
677	+	/* Not all interfaces support the ethtool ioctl. */
678	+	network_iface_stat_ptr->speed = 0;
679	+	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
680	+	}
681	+
682	+	ifaces++;
683	+	}
684	+	close(sock);
685	+	fclose(f);
686	+	#endif
687	+	*entries = ifaces;
688	+	return network_iface_stats;
689		}
690

Diff Legend

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