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.44 by ats, Sat Feb 14 16:58:19 2004 UTC vs.
Revision 1.66 by tdb, Wed Apr 7 21:08:40 2004 UTC

#	Line 1 | Line 1
1		/*
2	<	* i-scream central monitoring system
2	>	* i-scream libstatgrab
3		* http://www.i-scream.org
4		* Copyright (C) 2000-2004 i-scream
5		*
#	Line 28 | Line 28
28		#include <stdlib.h>
29		#include <string.h>
30		#include "statgrab.h"
31	+	#include "vector.h"
32	+	#include "tools.h"
33		#include <time.h>
34		#ifdef SOLARIS
35		#include <kstat.h>
#	Line 38 | Line 40
40		#include <net/if.h>
41		#include <netinet/in.h>
42		#include <sys/sockio.h>
43	+	#include <unistd.h>
44		#endif
45		#ifdef LINUX
46		#include <stdio.h>
#	Line 47 | Line 50
50		#include <sys/socket.h>
51		#include <net/if.h>
52		#include <ctype.h>
50	–	#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		*/
#	Line 66 | Line 68 | typedef __uint64_t u64;
68		#include <net/if.h>
69		#include <net/if_media.h>
70		#include <sys/ioctl.h>
71	+	#include <unistd.h>
72		#endif
73
74	<	static network_stat_t *network_stats=NULL;
75	<	static int interfaces=0;
76	<
77	<	void network_stat_init(int start, int end, network_stat_t *net_stats){
78	<
79	<	for(net_stats+=start; start<end; start++){
80	<	net_stats->interface_name=NULL;
81	<	net_stats->tx=0;
82	<	net_stats->rx=0;
80	<	net_stats++;
81	<	}
74	>	static void network_stat_init(sg_network_io_stats *s) {
75	>	s->interface_name = NULL;
76	>	s->tx = 0;
77	>	s->rx = 0;
78	>	s->ipackets = 0;
79	>	s->opackets = 0;
80	>	s->ierrors = 0;
81	>	s->oerrors = 0;
82	>	s->collisions = 0;
83		}
84
85	<	network_stat_t *network_stat_malloc(int needed_entries, int *cur_entries, network_stat_t *net_stats){
86	<
86	<	if(net_stats==NULL){
87	<
88	<	if((net_stats=malloc(needed_entries * sizeof(network_stat_t)))==NULL){
89	<	return NULL;
90	<	}
91	<	network_stat_init(0, needed_entries, net_stats);
92	<	*cur_entries=needed_entries;
93	<
94	<	return net_stats;
95	<	}
96	<
97	<
98	<	if(*cur_entries<needed_entries){
99	<	net_stats=realloc(net_stats, (sizeof(network_stat_t)*needed_entries));
100	<	if(net_stats==NULL){
101	<	return NULL;
102	<	}
103	<	network_stat_init(*cur_entries, needed_entries, net_stats);
104	<	*cur_entries=needed_entries;
105	<	}
106	<
107	<	return net_stats;
85	>	static void network_stat_destroy(sg_network_io_stats *s) {
86	>	free(s->interface_name);
87		}
88
89	+	VECTOR_DECLARE_STATIC(network_stats, sg_network_io_stats, 5,
90	+	network_stat_init, network_stat_destroy);
91
92	<	network_stat_t *get_network_stats(int *entries){
92	>	sg_network_io_stats *sg_get_network_io_stats(int *entries){
93	>	int interfaces;
94	>	sg_network_io_stats *network_stat_ptr;
95
113	–	static int sizeof_network_stats=0;
114	–	network_stat_t *network_stat_ptr;
115	–
96		#ifdef SOLARIS
97	<	kstat_ctl_t *kc;
98	<	kstat_t *ksp;
97	>	kstat_ctl_t *kc;
98	>	kstat_t *ksp;
99		kstat_named_t *knp;
100		#endif
101
#	Line 124 | Line 104 | network_stat_t *get_network_stats(int *entries){
104		/* Horrible big enough, but it should be easily big enough */
105		char line[8096];
106		regex_t regex;
107	<	regmatch_t line_match[4];
107	>	regmatch_t line_match[9];
108		#endif
109		#ifdef ALLBSD
110		struct ifaddrs *net, *net_ptr;
#	Line 133 | Line 113 | network_stat_t *get_network_stats(int *entries){
113
114		#ifdef ALLBSD
115		if(getifaddrs(&net) != 0){
116	+	sg_set_error(SG_ERROR_GETIFADDRS, NULL);
117		return NULL;
118		}
119
#	Line 140 | Line 121 | network_stat_t *get_network_stats(int *entries){
121
122		for(net_ptr=net;net_ptr!=NULL;net_ptr=net_ptr->ifa_next){
123		if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
124	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
125	<	if(network_stats==NULL){
124	>
125	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
126		return NULL;
127		}
128		network_stat_ptr=network_stats+interfaces;
129
130	<	if(network_stat_ptr->interface_name!=NULL) free(network_stat_ptr->interface_name);
131	<	network_stat_ptr->interface_name=strdup(net_ptr->ifa_name);
132	<	if(network_stat_ptr->interface_name==NULL) return NULL;
130	>	if (sg_update_string(&network_stat_ptr->interface_name,
131	>	net_ptr->ifa_name) < 0) {
132	>	return NULL;
133	>	}
134		net_data=(struct if_data *)net_ptr->ifa_data;
135		network_stat_ptr->rx=net_data->ifi_ibytes;
136	<	network_stat_ptr->tx=net_data->ifi_obytes;
136	>	network_stat_ptr->tx=net_data->ifi_obytes;
137	>	network_stat_ptr->ipackets=net_data->ifi_ipackets;
138	>	network_stat_ptr->opackets=net_data->ifi_opackets;
139	>	network_stat_ptr->ierrors=net_data->ifi_ierrors;
140	>	network_stat_ptr->oerrors=net_data->ifi_oerrors;
141	>	network_stat_ptr->collisions=net_data->ifi_collisions;
142		network_stat_ptr->systime=time(NULL);
143		interfaces++;
144		}
#	Line 159 | Line 146 | network_stat_t *get_network_stats(int *entries){
146		#endif
147
148		#ifdef SOLARIS
149	<	if ((kc = kstat_open()) == NULL) {
150	<	return NULL;
151	<	}
149	>	if ((kc = kstat_open()) == NULL) {
150	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
151	>	return NULL;
152	>	}
153
154		interfaces=0;
155
156	<	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
157	<	if (!strcmp(ksp->ks_class, "net")) {
158	<	kstat_read(kc, ksp, NULL);
156	>	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
157	>	if (!strcmp(ksp->ks_class, "net")) {
158	>	kstat_read(kc, ksp, NULL);
159
160		#ifdef SOL7
161	<	#define RLOOKUP "rbytes"
162	<	#define WLOOKUP "obytes"
161	>	#define LRX "rbytes"
162	>	#define LTX "obytes"
163	>	#define LIPACKETS "ipackets"
164	>	#define LOPACKETS "opackets"
165		#define VALTYPE value.ui32
166		#else
167	<	#define RLOOKUP "rbytes64"
168	<	#define WLOOKUP "obytes64"
167	>	#define LRX "rbytes64"
168	>	#define LTX "obytes64"
169	>	#define LIPACKETS "ipackets64"
170	>	#define LOPACKETS "opackets64"
171		#define VALTYPE value.ui64
172		#endif
173
174	<	if((knp=kstat_data_lookup(ksp, RLOOKUP))==NULL){
174	>	/* Read rx */
175	>	if((knp=kstat_data_lookup(ksp, LRX))==NULL){
176		/* This is a network interface, but it doesn't
177		* have the rbytes/obytes values; for instance,
178		* the loopback devices have this behaviour
179		* (although they do track packets in/out). */
180	+	/* FIXME: Show packet counts when byte counts
181	+	* not available. */
182		continue;
183		}
184
185	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
186	<	if(network_stats==NULL){
185	>	/* Create new network_stats */
186	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
187		return NULL;
188		}
189		network_stat_ptr=network_stats+interfaces;
190	+
191	+	/* Finish reading rx */
192		network_stat_ptr->rx=knp->VALTYPE;
193
194	<	if((knp=kstat_data_lookup(ksp, WLOOKUP))==NULL){
194	>	/* Read tx */
195	>	if((knp=kstat_data_lookup(ksp, LTX))==NULL){
196		continue;
197		}
198		network_stat_ptr->tx=knp->VALTYPE;
199	<	if(network_stat_ptr->interface_name!=NULL){
200	<	free(network_stat_ptr->interface_name);
199	>
200	>	/* Read ipackets */
201	>	if((knp=kstat_data_lookup(ksp, LIPACKETS))==NULL){
202	>	continue;
203		}
204	<	network_stat_ptr->interface_name=strdup(ksp->ks_name);
204	>	network_stat_ptr->ipackets=knp->VALTYPE;
205
206	+	/* Read opackets */
207	+	if((knp=kstat_data_lookup(ksp, LOPACKETS))==NULL){
208	+	continue;
209	+	}
210	+	network_stat_ptr->opackets=knp->VALTYPE;
211	+
212	+	/* Read ierrors */
213	+	if((knp=kstat_data_lookup(ksp, "ierrors"))==NULL){
214	+	continue;
215	+	}
216	+	network_stat_ptr->ierrors=knp->value.ui32;
217	+
218	+	/* Read oerrors */
219	+	if((knp=kstat_data_lookup(ksp, "oerrors"))==NULL){
220	+	continue;
221	+	}
222	+	network_stat_ptr->oerrors=knp->value.ui32;
223	+
224	+	/* Read collisions */
225	+	if((knp=kstat_data_lookup(ksp, "collisions"))==NULL){
226	+	continue;
227	+	}
228	+	network_stat_ptr->collisions=knp->value.ui32;
229	+
230	+	/* Read interface name */
231	+	if (sg_update_string(&network_stat_ptr->interface_name,
232	+	ksp->ks_name) < 0) {
233	+	return NULL;
234	+	}
235	+
236	+	/* Store systime */
237		network_stat_ptr->systime=time(NULL);
238	+
239		interfaces++;
240		}
241		}
#	Line 213 | Line 245 | network_stat_t *get_network_stats(int *entries){
245		#ifdef LINUX
246		f=fopen("/proc/net/dev", "r");
247		if(f==NULL){
248	+	sg_set_error(SG_ERROR_OPEN, "/proc/net/dev");
249		return NULL;
250		}
251		/* read the 2 lines.. Its the title, so we dont care :) */
#	Line 220 | Line 253 | network_stat_t *get_network_stats(int *entries){
253		fgets(line, sizeof(line), f);
254
255
256	<	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){
256	>	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){
257	>	sg_set_error(SG_ERROR_PARSE, NULL);
258		return NULL;
259		}
260
261		interfaces=0;
262
263		while((fgets(line, sizeof(line), f)) != NULL){
264	<	if((regexec(&regex, line, 4, line_match, 0))!=0){
264	>	if((regexec(&regex, line, 9, line_match, 0))!=0){
265		continue;
266		}
267	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
268	<	if(network_stats==NULL){
269	<	return NULL;
267	>
268	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
269	>	return NULL;
270		}
271	<	network_stat_ptr=network_stats+interfaces;
271	>	network_stat_ptr=network_stats+interfaces;
272
273		if(network_stat_ptr->interface_name!=NULL){
274		free(network_stat_ptr->interface_name);
275		}
276
277	<	network_stat_ptr->interface_name=get_string_match(line, &line_match[1]);
278	<	network_stat_ptr->rx=get_ll_match(line, &line_match[2]);
279	<	network_stat_ptr->tx=get_ll_match(line, &line_match[3]);
277	>	network_stat_ptr->interface_name=sg_get_string_match(line, &line_match[1]);
278	>	network_stat_ptr->rx=sg_get_ll_match(line, &line_match[2]);
279	>	network_stat_ptr->tx=sg_get_ll_match(line, &line_match[5]);
280	>	network_stat_ptr->ipackets=sg_get_ll_match(line, &line_match[3]);
281	>	network_stat_ptr->opackets=sg_get_ll_match(line, &line_match[6]);
282	>	network_stat_ptr->ierrors=sg_get_ll_match(line, &line_match[4]);
283	>	network_stat_ptr->oerrors=sg_get_ll_match(line, &line_match[7]);
284	>	network_stat_ptr->collisions=sg_get_ll_match(line, &line_match[8]);
285		network_stat_ptr->systime=time(NULL);
286
287		interfaces++;
#	Line 253 | Line 292 | network_stat_t *get_network_stats(int *entries){
292		#endif
293
294		#ifdef CYGWIN
295	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
296		return NULL;
297		#endif
298
#	Line 261 | Line 301 | network_stat_t *get_network_stats(int *entries){
301		return network_stats;
302		}
303
304	<	long long transfer_diff(long long new, long long old){
305	<	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD)
306	<	#define MAXVAL 4294967296LL
304	>	static long long transfer_diff(long long new, long long old){
305	>	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD) || defined(OPENBSD)
306	>	/* 32-bit quantities, so we must explicitly deal with wraparound. */
307	>	#define MAXVAL 0x100000000LL
308	>	if (new >= old) {
309	>	return new - old;
310	>	} else {
311	>	return MAXVAL + new - old;
312	>	}
313		#else
314	<	#define MAXVAL 18446744073709551616LL
314	>	/* 64-bit quantities, so plain subtraction works. */
315	>	return new - old;
316		#endif
270	–	long long result;
271	–	if(new>=old){
272	–	result = (new-old);
273	–	}else{
274	–	result = (MAXVAL+(new-old));
275	–	}
276	–
277	–	return result;
278	–
317		}
318
319	<	network_stat_t *get_network_stats_diff(int *entries) {
320	<	static network_stat_t *diff = NULL;
321	<	static int diff_count = 0;
322	<	network_stat_t *src, *dest;
323	<	int i, j, new_count;
319	>	sg_network_io_stats *sg_get_network_io_stats_diff(int *entries) {
320	>	VECTOR_DECLARE_STATIC(diff, sg_network_io_stats, 1,
321	>	network_stat_init, network_stat_destroy);
322	>	sg_network_io_stats *src = NULL, *dest;
323	>	int i, j, diff_count, new_count;
324
325		if (network_stats == NULL) {
326		/* No previous stats, so we can't calculate a difference. */
327	<	return get_network_stats(entries);
327	>	return sg_get_network_io_stats(entries);
328		}
329
330		/* Resize the results array to match the previous stats. */
331	<	diff = network_stat_malloc(interfaces, &diff_count, diff);
332	<	if (diff == NULL) {
331	>	diff_count = VECTOR_SIZE(network_stats);
332	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
333		return NULL;
334		}
335
#	Line 300 | Line 338 | network_stat_t *get_network_stats_diff(int *entries) {
338		src = &network_stats[i];
339		dest = &diff[i];
340
341	<	if (dest->interface_name != NULL) {
342	<	free(dest->interface_name);
341	>	if (sg_update_string(&dest->interface_name,
342	>	src->interface_name) < 0) {
343	>	return NULL;
344		}
306	–	dest->interface_name = strdup(src->interface_name);
345		dest->rx = src->rx;
346		dest->tx = src->tx;
347	+	dest->ipackets = src->ipackets;
348	+	dest->opackets = src->opackets;
349	+	dest->ierrors = src->ierrors;
350	+	dest->oerrors = src->oerrors;
351	+	dest->collisions = src->collisions;
352		dest->systime = src->systime;
353		}
354
355		/* Get a new set of stats. */
356	<	if (get_network_stats(&new_count) == NULL) {
356	>	if (sg_get_network_io_stats(&new_count) == NULL) {
357		return NULL;
358		}
359
#	Line 336 | Line 379 | network_stat_t *get_network_stats_diff(int *entries) {
379		difference. */
380		dest->rx = transfer_diff(src->rx, dest->rx);
381		dest->tx = transfer_diff(src->tx, dest->tx);
382	+	dest->ipackets = transfer_diff(src->ipackets, dest->ipackets);
383	+	dest->opackets = transfer_diff(src->opackets, dest->opackets);
384	+	dest->ierrors = transfer_diff(src->ierrors, dest->ierrors);
385	+	dest->oerrors = transfer_diff(src->oerrors, dest->oerrors);
386	+	dest->collisions = transfer_diff(src->collisions, dest->collisions);
387		dest->systime = src->systime - dest->systime;
388		}
389
390		*entries = diff_count;
391		return diff;
392		}
393	+
394		/* NETWORK INTERFACE STATS */
395
396	<	void network_iface_stat_init(int start, int end, network_iface_stat_t *net_stats){
397	<
398	<	for(net_stats+=start; start<end; start++){
399	<	net_stats->interface_name=NULL;
351	<	net_stats->speed=0;
352	<	net_stats->dup=UNKNOWN_DUPLEX;
353	<	net_stats++;
354	<	}
396	>	static void network_iface_stat_init(sg_network_iface_stats *s) {
397	>	s->interface_name = NULL;
398	>	s->speed = 0;
399	>	s->dup = SG_IFACE_DUPLEX_UNKNOWN;
400		}
401
402	<	network_iface_stat_t *network_iface_stat_malloc(int needed_entries, int *cur_entries, network_iface_stat_t *net_stats){
403	<
359	<	if(net_stats==NULL){
360	<
361	<	if((net_stats=malloc(needed_entries * sizeof(network_iface_stat_t)))==NULL){
362	<	return NULL;
363	<	}
364	<	network_iface_stat_init(0, needed_entries, net_stats);
365	<	*cur_entries=needed_entries;
366	<
367	<	return net_stats;
368	<	}
369	<
370	<
371	<	if(*cur_entries<needed_entries){
372	<	net_stats=realloc(net_stats, (sizeof(network_iface_stat_t)*needed_entries));
373	<	if(net_stats==NULL){
374	<	return NULL;
375	<	}
376	<	network_iface_stat_init(*cur_entries, needed_entries, net_stats);
377	<	*cur_entries=needed_entries;
378	<	}
379	<
380	<	return net_stats;
402	>	static void network_iface_stat_destroy(sg_network_iface_stats *s) {
403	>	free(s->interface_name);
404		}
405
406	<	network_iface_stat_t *get_network_iface_stats(int *entries){
407	<	static network_iface_stat_t *network_iface_stats;
408	<	network_iface_stat_t *network_iface_stat_ptr;
409	<	static int sizeof_network_iface_stats=0;
406	>	sg_network_iface_stats *sg_get_network_iface_stats(int *entries){
407	>	VECTOR_DECLARE_STATIC(network_iface_stats, sg_network_iface_stats, 5,
408	>	network_iface_stat_init, network_iface_stat_destroy);
409	>	sg_network_iface_stats *network_iface_stat_ptr;
410		int ifaces = 0;
411
412		#ifdef SOLARIS
413	<	kstat_ctl_t *kc;
414	<	kstat_t *ksp;
413	>	kstat_ctl_t *kc;
414	>	kstat_t *ksp;
415		kstat_named_t *knp;
416		int sock;
417		#endif
418		#ifdef ALLBSD
419	<	struct ifaddrs *net, *net_ptr;
419	>	struct ifaddrs *net, *net_ptr;
420		struct ifmediareq ifmed;
421		struct ifreq ifr;
422		int sock;
423		int x;
424		#endif
425		#ifdef LINUX
426	<	FILE *f;
427	<	/* Horrible big enough, but it should be easily big enough */
428	<	char line[8096];
426	>	FILE *f;
427	>	/* Horrible big enough, but it should be easily big enough */
428	>	char line[8096];
429		int sock;
430		#endif
431
432		#ifdef ALLBSD
433	<	if(getifaddrs(&net) != 0){
434	<	return NULL;
435	<	}
433	>	if(getifaddrs(&net) != 0){
434	>	sg_set_error(SG_ERROR_GETIFADDRS, NULL);
435	>	return NULL;
436	>	}
437
438		if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == 0) return NULL;
439
440		for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){
441	<	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
418	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
419	<	if(network_iface_stats==NULL){
420	<	return NULL;
421	<	}
422	<	network_iface_stat_ptr = network_iface_stats + ifaces;
441	>	if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
442
443	+	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
444	+	return NULL;
445	+	}
446	+	network_iface_stat_ptr = network_iface_stats + ifaces;
447	+
448		memset(&ifr, 0, sizeof(ifr));
449		strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
450
#	Line 433 | Line 457 | network_iface_stat_t *get_network_iface_stats(int *ent
457		network_iface_stat_ptr->up = 0;
458		}
459
460	<	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
461	<	network_iface_stat_ptr->interface_name = strdup(net_ptr->ifa_name);
462	<	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
460	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
461	>	net_ptr->ifa_name) < 0) {
462	>	return NULL;
463	>	}
464
465		network_iface_stat_ptr->speed = 0;
466	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
466	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
467		ifaces++;
468
469		memset(&ifmed, 0, sizeof(struct ifmediareq));
470	<	strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
470	>	sg_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;
#	Line 477 | Line 502 | network_iface_stat_t *get_network_iface_stats(int *ent
502		case(IFM_1000_SX):
503		case(IFM_1000_LX):
504		case(IFM_1000_CX):
505	<	#if defined(FREEBSD) && !defined(FREEBSD5)
506	<	case(IFM_1000_TX):
482	<	case(IFM_1000_FX):
483	<	#else
484	<	case(IFM_1000_T):
505	>	#if defined(IFM_1000_TX) && !defined(OPENBSD)
506	>	case(IFM_1000_TX): /* FreeBSD 4 and others (but NOT OpenBSD)? */
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 */
#	Line 492 | Line 520 | network_iface_stat_t *get_network_iface_stats(int *ent
520		}
521
522		if( (ifmed.ifm_active | IFM_FDX) == ifmed.ifm_active ){
523	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
523	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
524		}else if( (ifmed.ifm_active | IFM_HDX) == ifmed.ifm_active ){
525	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
525	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
526		}else{
527	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
527	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
528		}
529
530		}
#	Line 506 | Line 534 | network_iface_stat_t *get_network_iface_stats(int *ent
534
535		#ifdef SOLARIS
536		if ((kc = kstat_open()) == NULL) {
537	+	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
538		return NULL;
539		}
540
541		if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
542	+	sg_set_error(SG_ERROR_SOCKET, NULL);
543		return NULL;
544		}
545
#	Line 525 | Line 555 | network_iface_stat_t *get_network_iface_stats(int *ent
555		continue;
556		}
557
558	<	network_iface_stats = network_iface_stat_malloc(ifaces + 1, &sizeof_network_iface_stats, network_iface_stats);
529	<	if (network_iface_stats == NULL) {
558	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
559		return NULL;
560		}
561		network_iface_stat_ptr = network_iface_stats + ifaces;
562		ifaces++;
563
564	<	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
565	<	network_iface_stat_ptr->interface_name = strdup(ksp->ks_name);
566	<	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
564	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
565	>	ksp->ks_name) < 0) {
566	>	return NULL;
567	>	}
568
569		if ((ifr.ifr_flags & IFF_UP) != 0) {
570		network_iface_stat_ptr->up = 1;
#	Line 548 | Line 578 | network_iface_stat_t *get_network_iface_stats(int *ent
578		network_iface_stat_ptr->speed = 0;
579		}
580
581	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
581	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
582		if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) {
583		switch (knp->value.ui32) {
584		case 1:
585	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
585	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
586		break;
587		case 2:
588	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
588	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
589		break;
590		}
591		}
#	Line 567 | Line 597 | network_iface_stat_t *get_network_iface_stats(int *ent
597		#endif
598		#ifdef LINUX
599		f = fopen("/proc/net/dev", "r");
600	<	if(f == NULL){
601	<	return NULL;
602	<	}
600	>	if(f == NULL){
601	>	sg_set_error(SG_ERROR_OPEN, "/proc/net/dev");
602	>	return NULL;
603	>	}
604
605		/* Setup stuff so we can do the ioctl to get the info */
606		if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0){
607	+	sg_set_error(SG_ERROR_SOCKET, NULL);
608		return NULL;
609		}
610
611		/* Ignore first 2 lines.. Just headings */
612	<	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
613	<	if((fgets(line, sizeof(line), f)) == NULL) return NULL;
612	>	if((fgets(line, sizeof(line), f)) == NULL) {
613	>	sg_set_error(SG_ERROR_PARSE, NULL);
614	>	return NULL;
615	>	}
616	>	if((fgets(line, sizeof(line), f)) == NULL) {
617	>	sg_set_error(SG_ERROR_PARSE, NULL);
618	>	return NULL;
619	>	}
620
621	<	while((fgets(line, sizeof(line), f)) != NULL){
622	<	char *name, *ptr;
623	<	struct ifreq ifr;
624	<	struct ethtool_cmd ethcmd;
625	<	int err;
621	>	while((fgets(line, sizeof(line), f)) != NULL){
622	>	char *name, *ptr;
623	>	struct ifreq ifr;
624	>	struct ethtool_cmd ethcmd;
625	>	int err;
626
627		/* Get the interface name */
628	<	ptr = strchr(line, ':');
629	<	if (ptr == NULL) continue;
630	<	*ptr='\0';
631	<	name = line;
632	<	while(isspace(*(name))){
633	<	name++;
634	<	}
628	>	ptr = strchr(line, ':');
629	>	if (ptr == NULL) continue;
630	>	*ptr='\0';
631	>	name = line;
632	>	while(isspace(*(name))){
633	>	name++;
634	>	}
635
636	<	memset(&ifr, 0, sizeof ifr);
637	<	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
636	>	memset(&ifr, 0, sizeof ifr);
637	>	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
638
639		if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
640		continue;
641		}
642
643		/* We have a good interface to add */
644	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
607	<	if(network_iface_stats==NULL){
644	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
645		return NULL;
646		}
647		network_iface_stat_ptr = network_iface_stats + ifaces;
648	<	network_iface_stat_ptr->interface_name = strdup(name);
648	>
649	>	if (sg_update_string(&network_iface_stat_ptr->interface_name,
650	>	name) < 0) {
651	>	return NULL;
652	>	}
653		if ((ifr.ifr_flags & IFF_UP) != 0) {
654		network_iface_stat_ptr->up = 1;
655		} else {
656		network_iface_stat_ptr->up = 0;
657		}
658
659	<	memset(&ethcmd, 0, sizeof ethcmd);
660	<	ethcmd.cmd = ETHTOOL_GSET;
661	<	ifr.ifr_data = (caddr_t) &ethcmd;
659	>	memset(&ethcmd, 0, sizeof ethcmd);
660	>	ethcmd.cmd = ETHTOOL_GSET;
661	>	ifr.ifr_data = (caddr_t) &ethcmd;
662
663	<	err = ioctl(sock, SIOCETHTOOL, &ifr);
664	<	if (err == 0) {
663	>	err = ioctl(sock, SIOCETHTOOL, &ifr);
664	>	if (err == 0) {
665		network_iface_stat_ptr->speed = ethcmd.speed;
666
667		switch (ethcmd.duplex) {
668		case 0x00:
669	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
669	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_FULL;
670		break;
671		case 0x01:
672	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
672	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_HALF;
673		break;
674		default:
675	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
675	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
676		}
677		} else {
678		/* Not all interfaces support the ethtool ioctl. */
679		network_iface_stat_ptr->speed = 0;
680	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
680	>	network_iface_stat_ptr->dup = SG_IFACE_DUPLEX_UNKNOWN;
681		}
682
683		ifaces++;

Diff Legend

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