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.34 by tdb, Fri Feb 13 15:40:13 2004 UTC vs.
Revision 1.39 by ats, Sat Feb 14 00:29:29 2004 UTC

#	Line 385 | Line 385 | network_iface_stat_t *get_network_iface_stats(int *ent
385		#ifdef ALLBSD
386		struct ifaddrs *net, *net_ptr;
387		struct ifmediareq ifmed;
388	<	int s;
388	>	struct ifreq ifr;
389	>	int sock;
390		int x;
391		#endif
392		#ifdef LINUX
393		FILE *f;
394		/* Horrible big enough, but it should be easily big enough */
395		char line[8096];
395	–	void *eth_tool_cmd_buf;
396	–	int buf_size;
396		int sock;
397		#endif
398		ifaces = 0;
#	Line 402 | Line 401 | network_iface_stat_t *get_network_iface_stats(int *ent
401		return NULL;
402		}
403
404	<	if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == NULL) return NULL;
404	>	if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == 0) return NULL;
405
406		for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){
407		if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
#	Line 414 | Line 413 | network_iface_stat_t *get_network_iface_stats(int *ent
413
414		memset(&ifmed, 0, sizeof(struct ifmediareq));
415		strlcpy(ifmed.ifm_name, net_ptr->ifa_name, sizeof(ifmed.ifm_name));
416	<	if(ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
416	>	if(ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed) == -1){
417		continue;
418		}
419
#	Line 472 | Line 471 | network_iface_stat_t *get_network_iface_stats(int *ent
471		}else{
472		network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
473		}
474	+
475	+	memset(&ifr, 0, sizeof(ifr));
476	+	strncpy(ifr.ifr_name, net_ptr->ifa_name, sizeof(ifr.ifr_name));
477	+
478	+	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0){
479	+	continue;
480	+	}
481	+	if((ifr.ifr_flags & IFF_UP) != 0){
482	+	network_iface_stat_ptr->up = 1;
483	+	}else{
484	+	network_iface_stat_ptr->up = 0;
485	+	}
486	+
487		ifaces++;
488		}
489		freeifaddrs(net);
490	<	close(s);
490	>	close(sock);
491		#endif
492
493		#ifdef SOLARIS
#	Line 497 | Line 509 | network_iface_stat_t *get_network_iface_stats(int *ent
509		network_iface_stat_ptr = network_iface_stats + ifaces;
510		network_iface_stat_ptr->speed = knp->value.ui64 / (1000*1000);
511
512	+	if((knp=kstat_data_lookup(ksp, "link_up"))==NULL){
513	+	/* Not a network interface, so skip to the next entry */
514	+	continue;
515	+	}
516	+	/* Solaris has 1 for up, and 0 for not. As we do too */
517	+	network_iface_stat_ptr->up = value.ui32;
518	+
519		if((knp=kstat_data_lookup(ksp, "link_duplex"))==NULL){
520		/* Not a network interface, so skip to the next entry */
521		continue;
#	Line 520 | Line 539 | network_iface_stat_t *get_network_iface_stats(int *ent
539
540		#endif
541		#ifdef LINUX
523	–
542		f = fopen("/proc/net/dev", "r");
543		if(f == NULL){
544		return NULL;
#	Line 531 | Line 549 | network_iface_stat_t *get_network_iface_stats(int *ent
549		return NULL;
550		}
551
534	–	buf_size = sizeof(struct ethtool_cmd);
535	–	eth_tool_cmd_buf = malloc(buf_size);
536	–	if(eth_tool_cmd_buf == NULL) return NULL;
537	–
552		/* Ignore first 2 lines.. Just headings */
553		if((fgets(line, sizeof(line), f)) == NULL) return NULL;
554		if((fgets(line, sizeof(line), f)) == NULL) return NULL;
#	Line 542 | Line 556 | network_iface_stat_t *get_network_iface_stats(int *ent
556		while((fgets(line, sizeof(line), f)) != NULL){
557		char *name, *ptr;
558		struct ifreq ifr;
559	<	struct ethtool_cmd *ethcmd;
559	>	struct ethtool_cmd ethcmd;
560		int err;
561
562		/* Get the interface name */
#	Line 554 | Line 568 | network_iface_stat_t *get_network_iface_stats(int *ent
568		name++;
569		}
570
571	<	memset(&ifr, 0, sizeof(ifr));
572	<	memset(eth_tool_cmd_buf, 0, buf_size);
559	<	ifr.ifr_data = (caddr_t) eth_tool_cmd_buf;
560	<	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
571	>	memset(&ifr, 0, sizeof ifr);
572	>	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
573
574	<	ethcmd = (struct ethtool_cmd *) ifr.ifr_data;
575	<	ethcmd->cmd = ETHTOOL_GSET;
574	>	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
575	>	continue;
576	>	}
577
565	–	err = ioctl(sock, SIOCETHTOOL, &ifr);
566	–	if(err < 0){
567	–	/* This could fail if the interface doesn't support the command. Carry
568	–	* on to the next :)
569	–	*/
570	–	continue;
571	–	}
572	–
578		/* We have a good interface to add */
579		network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
580		if(network_iface_stats==NULL){
#	Line 577 | Line 582 | network_iface_stat_t *get_network_iface_stats(int *ent
582		}
583		network_iface_stat_ptr = network_iface_stats + ifaces;
584		network_iface_stat_ptr->interface_name = strdup(name);
585	<	network_iface_stat_ptr->speed = ethcmd->speed;
586	<	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
587	<	if(ethcmd->duplex == 0x00){
588	<	network_iface_stat_ptr->dup = FULL_DUPLEX;
585	>	if ((ifr.ifr_flags & IFF_UP) != 0) {
586	>	network_iface_stat_ptr->up = 1;
587	>	} else {
588	>	network_iface_stat_ptr->up = 0;
589		}
590	<	if(ethcmd->duplex == 0x01){
591	<	network_iface_stat_ptr->dup = HALF_DUPLEX;
590	>
591	>	memset(&ethcmd, 0, sizeof ethcmd);
592	>	ethcmd.cmd = ETHTOOL_GSET;
593	>	ifr.ifr_data = (caddr_t) &ethcmd;
594	>
595	>	err = ioctl(sock, SIOCETHTOOL, &ifr);
596	>	if (err == 0) {
597	>	network_iface_stat_ptr->speed = ethcmd.speed;
598	>
599	>	switch (ethcmd.duplex) {
600	>	case 0x00:
601	>	network_iface_stat_ptr->dup = FULL_DUPLEX;
602	>	break;
603	>	case 0x01:
604	>	network_iface_stat_ptr->dup = HALF_DUPLEX;
605	>	break;
606	>	default:
607	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
608	>	}
609	>	} else {
610	>	/* Not all interfaces support the ethtool ioctl. */
611	>	network_iface_stat_ptr->speed = 0;
612	>	network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
613		}
614	+
615		ifaces++;
616		}
617		close(sock);
618	<	free(eth_tool_cmd_buf);
618	>	fclose(f);
619		#endif
620		*entries = ifaces;
621		return network_iface_stats;

Diff Legend

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