X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmadwifi.c;h=053bd7fa2c7a47851c33ae1e19e5c5b38d058132;hb=368f4ecd555efbef0cdd61a18f9b3ca5115f74c2;hp=9d973ec059a94335ca42477a8791d3dd9ef27a8c;hpb=ee203ecd5fae28ab12f158e03e18f2b57394897a;p=collectd.git

diff --git a/src/madwifi.c b/src/madwifi.c
index 9d973ec0..053bd7fa 100644
--- a/src/madwifi.c
+++ b/src/madwifi.c
@@ -23,7 +23,7 @@
 
 
 /**
- * There are several data streams provided by Madwifi plugin, some are 
+ * There are several data streams provided by Madwifi plugin, some are
  * connected to network interface, some are connected to each node
  * associated to that interface. Nodes represents other sides in
  * wireless communication, for example on network interface in AP mode,
@@ -42,18 +42,18 @@
  *	node_stat	Node statistic counters
  *
  * Both statistic counters have type instances for each counter returned
- * by Madwifi. See madwifi.h for content of ieee80211_nodestats, 
+ * by Madwifi. See madwifi.h for content of ieee80211_nodestats,
  * ieee80211_stats and ath_stats structures. Type instances use the same
  * name as fields in these structures (like ns_rx_dup). Some fields are
  * not reported, because they are not counters (like ns_tx_deauth_code
  * or ast_tx_rssi). Fields ns_rx_bytes and ns_tx_bytes are reported as
  * node_octets data stream instead of type instance of node_stat.
  * Statistics are not logged when they are zero.
- * 
+ *
  * There are two sets of these counters - the first 'WatchList' is a
  * set of counters that are individually logged. The second 'MiscList'
  * is a set of counters that are summed together and the sum is logged.
- * By default, the most important statistics are in the WatchList and 
+ * By default, the most important statistics are in the WatchList and
  * many error statistics are in MiscList. There are also many statistics
  * that are not in any of these sets, so they are not monitored by default.
  * It is possible to alter these lists using configuration options:
@@ -89,14 +89,13 @@
 
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_ignorelist.h"
 
 #include <dirent.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
 
 #if !KERNEL_LINUX
 # error "No applicable input method."
@@ -368,35 +367,34 @@ static int init_state = 0;
 static inline int item_watched(int i)
 {
 	assert (i >= 0);
-	assert (i < ((STATIC_ARRAY_SIZE (watch_items) + 1) * 32));
+	assert ((size_t) i < (STATIC_ARRAY_SIZE (watch_items) * 32));
 	return watch_items[i / 32] & FLAG (i);
 }
 
 static inline int item_summed(int i)
 {
 	assert (i >= 0);
-	assert (i < ((STATIC_ARRAY_SIZE (misc_items) + 1) * 32));
+	assert ((size_t) i < (STATIC_ARRAY_SIZE (misc_items) * 32));
 	return misc_items[i / 32] & FLAG (i);
 }
 
 static inline void watchlist_add (uint32_t *wl, int item)
 {
 	assert (item >= 0);
-	assert (item < ((WL_LEN + 1) * 32));
+	assert (item < WL_LEN * 32);
 	wl[item / 32] |= FLAG (item);
 }
 
 static inline void watchlist_remove (uint32_t *wl, int item)
 {
 	assert (item >= 0);
-	assert (item < ((WL_LEN + 1) * 32));
+	assert (item < WL_LEN * 32);
 	wl[item / 32] &= ~FLAG (item);
 }
 
 static inline void watchlist_set (uint32_t *wl, uint32_t val)
 {
-	int i;
-	for (i = 0; i < WL_LEN; i++)
+	for (int i = 0; i < WL_LEN; i++)
 		wl[i] = val;
 }
 
@@ -404,9 +402,8 @@ static inline void watchlist_set (uint32_t *wl, uint32_t val)
 static int watchitem_find (const char *name)
 {
 	int max = STATIC_ARRAY_SIZE (specs);
-	int i;
 
-	for (i = 0; i < max; i++)
+	for (int i = 0; i < max; i++)
 		if (strcasecmp (name, specs[i].name) == 0)
 			return i;
 
@@ -420,16 +417,15 @@ static int watchitem_find (const char *name)
 
 static int madwifi_real_init (void)
 {
-	int max = STATIC_ARRAY_SIZE (specs);
-	int i;
+	size_t max = STATIC_ARRAY_SIZE (specs);
 
-	for (i = 0; i < STATIC_ARRAY_SIZE (bounds); i++)
+	for (size_t i = 0; i < STATIC_ARRAY_SIZE (bounds); i++)
 		bounds[i] = 0;
 
 	watchlist_set(watch_items, 0);
 	watchlist_set(misc_items, 0);
 
-	for (i = 0; i < max; i++)
+	for (size_t i = 0; i < max; i++)
 	{
 		bounds[specs[i].flags & SRC_MASK] = i;
 
@@ -440,7 +436,7 @@ static int madwifi_real_init (void)
 			misc_items[i / 32] |= FLAG (i);
 	}
 
-	for (i = 0; i < STATIC_ARRAY_SIZE (bounds); i++)
+	for (size_t i = 0; i < STATIC_ARRAY_SIZE (bounds); i++)
 		bounds[i]++;
 
 	return (0);
@@ -561,20 +557,20 @@ static void submit (const char *dev, const char *type, const char *ti1,
 	plugin_dispatch_values (&vl);
 }
 
-static void submit_counter (const char *dev, const char *type, const char *ti1,
-				const char *ti2, counter_t val)
+static void submit_derive (const char *dev, const char *type, const char *ti1,
+				const char *ti2, derive_t val)
 {
 	value_t item;
-	item.counter = val;
+	item.derive = val;
 	submit (dev, type, ti1, ti2, &item, 1);
 }
 
-static void submit_counter2 (const char *dev, const char *type, const char *ti1,
-				const char *ti2, counter_t val1, counter_t val2)
+static void submit_derive2 (const char *dev, const char *type, const char *ti1,
+				const char *ti2, derive_t val1, derive_t val2)
 {
 	value_t items[2];
-	items[0].counter = val1;
-	items[1].counter = val2;
+	items[0].derive = val1;
+	items[1].derive = val2;
 	submit (dev, type, ti1, ti2, items, 2);
 }
 
@@ -590,16 +586,15 @@ static void submit_antx (const char *dev, const char *name,
 		u_int32_t *vals, int vals_num)
 {
 	char ti2[16];
-	int i;
 
-	for (i = 0; i < vals_num; i++)
+	for (int i = 0; i < vals_num; i++)
 	{
 		if (vals[i] == 0)
 			continue;
 
-		ssnprintf (ti2, sizeof (ti2), "antenna%i", i);
-		submit_counter (dev, "ath_stat", name, ti2,
-				(counter_t) vals[i]);
+		ssnprintf (ti2, sizeof (ti2), "%i", i);
+		submit_derive (dev, "ath_stat", name, ti2,
+				(derive_t) vals[i]);
 	}
 }
 
@@ -615,37 +610,45 @@ process_stat_struct (int which, const void *ptr, const char *dev, const char *ma
 			 const char *type_name, const char *misc_name)
 {
 	uint32_t misc = 0;
-	int i;
 
 	assert (which >= 1);
-	assert (which < STATIC_ARRAY_SIZE (bounds));
+	assert (((size_t) which) < STATIC_ARRAY_SIZE (bounds));
 
-	for (i = bounds[which - 1]; i < bounds[which]; i++)
+	for (int i = bounds[which - 1]; i < bounds[which]; i++)
 	{
 		uint32_t val = *(uint32_t *)(((char *) ptr) + specs[i].offset) ;
 
 		if (item_watched (i) && (val != 0))
-			submit_counter (dev, type_name, specs[i].name, mac, val);
+			submit_derive (dev, type_name, specs[i].name, mac, val);
 
 		if (item_summed (i))
 			misc += val;
 	}
-	
+
 	if (misc != 0)
-		submit_counter (dev, type_name, misc_name, mac, misc);
+		submit_derive (dev, type_name, misc_name, mac, misc);
 
 }
 
-static void
+static int
 process_athstats (int sk, const char *dev)
 {
 	struct ifreq ifr;
 	struct ath_stats stats;
+	int status;
 
 	sstrncpy (ifr.ifr_name, dev, sizeof (ifr.ifr_name));
 	ifr.ifr_data = (void *) &stats;
-	if (ioctl (sk, SIOCGATHSTATS, &ifr) < 0)
-		return;
+	status = ioctl (sk, SIOCGATHSTATS, &ifr);
+	if (status < 0)
+	{
+		/* Silent, because not all interfaces support all ioctls. */
+		DEBUG ("madwifi plugin: Sending IO-control "
+				"SIOCGATHSTATS to device %s "
+				"failed with status %i.",
+				dev, status);
+		return (status);
+	}
 
 	/* These stats are handled as a special case, because they are
 	   eight values each */
@@ -660,29 +663,41 @@ process_athstats (int sk, const char *dev)
 
 	/* All other ath statistics */
 	process_stat_struct (ATH_STAT, &stats, dev, NULL, "ath_stat", "ast_misc");
+	return (0);
 }
 
-static void
+static int
 process_80211stats (int sk, const char *dev)
 {
 	struct ifreq ifr;
 	struct ieee80211_stats stats;
+	int status;
+
 	sstrncpy (ifr.ifr_name, dev, sizeof (ifr.ifr_name));
 	ifr.ifr_data = (void *) &stats;
-	if (ioctl(sk, SIOCG80211STATS, &ifr) < 0)
-		return;
+	status = ioctl(sk, SIOCG80211STATS, &ifr);
+	if (status < 0)
+	{
+		/* Silent, because not all interfaces support all ioctls. */
+		DEBUG ("madwifi plugin: Sending IO-control "
+				"SIOCG80211STATS to device %s "
+				"failed with status %i.",
+				dev, status);
+		return (status);
+	}
 
 	process_stat_struct (IFA_STAT, &stats, dev, NULL, "ath_stat", "is_misc");
+	return (0);
 }
 
 
-static void
+static int
 process_station (int sk, const char *dev, struct ieee80211req_sta_info *si)
 {
-	struct iwreq iwr;
 	static char mac[DATA_MAX_NAME_LEN];
 	struct ieee80211req_sta_stats stats;
 	const struct ieee80211_nodestats *ns = &stats.is_stats;
+	int status;
 
 	macaddr_to_str (mac, sizeof (mac), si->isi_macaddr);
 
@@ -693,52 +708,65 @@ process_station (int sk, const char *dev, struct ieee80211req_sta_info *si)
 	if (item_watched (STAT_NODE_RSSI))
 		submit_gauge (dev, "node_rssi", mac, NULL, si->isi_rssi);
 
-	memset (&iwr, 0, sizeof (iwr));
+	struct iwreq iwr = {
+		.u.data.pointer = (void *) &stats,
+		.u.data.length = sizeof (stats)
+	};
 	sstrncpy(iwr.ifr_name, dev, sizeof (iwr.ifr_name));
-	iwr.u.data.pointer = (void *) &stats;
-	iwr.u.data.length = sizeof (stats);
+
 	memcpy(stats.is_u.macaddr, si->isi_macaddr, IEEE80211_ADDR_LEN);
-	if (ioctl(sk, IEEE80211_IOCTL_STA_STATS, &iwr) < 0)
-		return;
+	status = ioctl(sk, IEEE80211_IOCTL_STA_STATS, &iwr);
+	if (status < 0)
+	{
+		/* Silent, because not all interfaces support all ioctls. */
+		DEBUG ("madwifi plugin: Sending IO-control "
+				"IEEE80211_IOCTL_STA_STATS to device %s "
+				"failed with status %i.",
+				dev, status);
+		return (status);
+	}
 
 	/* These two stats are handled as a special case as they are
 	   a pair of 64bit values */
 	if (item_watched (STAT_NODE_OCTETS))
-		submit_counter2 (dev, "node_octets", mac, NULL,
+		submit_derive2 (dev, "node_octets", mac, NULL,
 			ns->ns_rx_bytes, ns->ns_tx_bytes);
 
 	/* This stat is handled as a special case, because it is stored
 	   as uin64_t, but we will ignore upper half */
 	if (item_watched (STAT_NS_RX_BEACONS))
-		submit_counter (dev, "node_stat", "ns_rx_beacons", mac,
+		submit_derive (dev, "node_stat", "ns_rx_beacons", mac,
 			(ns->ns_rx_beacons & 0xFFFFFFFF));
 
 	/* All other node statistics */
 	process_stat_struct (NOD_STAT, ns, dev, mac, "node_stat", "ns_misc");
+	return (0);
 }
 
-static void
+static int
 process_stations (int sk, const char *dev)
 {
-	uint8_t buf[24*1024];
-	struct iwreq iwr;
+	uint8_t buf[24*1024] = { 0 };
 	uint8_t *cp;
-	int len, nodes;
+	int nodes;
+	size_t len;
 	int status;
 
-	memset (&iwr, 0, sizeof (iwr));
+	struct iwreq iwr = {
+		.u.data.pointer = (void *) buf,
+		.u.data.length = sizeof (buf)
+	};
 	sstrncpy (iwr.ifr_name, dev, sizeof (iwr.ifr_name));
-	iwr.u.data.pointer = (void *) buf;
-	iwr.u.data.length = sizeof (buf);
 
 	status = ioctl (sk, IEEE80211_IOCTL_STA_INFO, &iwr);
 	if (status < 0)
 	{
-		ERROR ("madwifi plugin: Sending IO-control "
+		/* Silent, because not all interfaces support all ioctls. */
+		DEBUG ("madwifi plugin: Sending IO-control "
 				"IEEE80211_IOCTL_STA_INFO to device %s "
 				"failed with status %i.",
 				dev, status);
-		return;
+		return (status);
 	}
 
 	len = iwr.u.data.length;
@@ -756,33 +784,48 @@ process_stations (int sk, const char *dev)
 
 	if (item_watched (STAT_ATH_NODES))
 		submit_gauge (dev, "ath_nodes", NULL, NULL, nodes);
+	return (0);
 }
 
-static void
+static int
 process_device (int sk, const char *dev)
 {
-	process_athstats (sk, dev);
-	process_80211stats (sk, dev);
-	process_stations (sk, dev);
+	int num_success = 0;
+	int status;
+
+	status = process_athstats (sk, dev);
+	if (status == 0)
+		num_success++;
+
+	status = process_80211stats (sk, dev);
+	if (status == 0)
+		num_success++;
+
+	status = process_stations (sk, dev);
+	if (status == 0)
+		num_success++;
+
+	return ((num_success == 0) ? -1 : 0);
 }
 
 static int
 check_devname (const char *dev)
 {
-	char buf[256];
-	char buf2[256];
+	char buf[PATH_MAX];
+	char buf2[PATH_MAX];
 	int i;
 
 	if (dev[0] == '.')
 		return 0;
-	
+
 	ssnprintf (buf, sizeof (buf), "/sys/class/net/%s/device/driver", dev);
-	buf[sizeof (buf) - 1] = 0;
+	buf[sizeof (buf) - 1] = '\0';
 
 	i = readlink (buf, buf2, sizeof (buf2) - 1);
 	if (i < 0)
 		return 0;
-	buf2[sizeof (buf2) - 1] = 0;
+
+	buf2[i] = '\0';
 
 	if (strstr (buf2, "/drivers/ath_") == NULL)
 		return 0;
@@ -793,22 +836,46 @@ static int
 sysfs_iterate(int sk)
 {
 	struct dirent *de;
+	DIR *nets;
+	int status;
+	int num_success;
+	int num_fail;
 
-	DIR *nets = opendir ("/sys/class/net/");
+	nets = opendir ("/sys/class/net/");
 	if (nets == NULL)
 	{
 		WARNING ("madwifi plugin: opening /sys/class/net failed");
 		return (-1);
 	}
 
+	num_success = 0;
+	num_fail = 0;
 	while ((de = readdir (nets)))
-		if (check_devname (de->d_name) &&
-		    (ignorelist_match (ignorelist, de->d_name) == 0))
-			process_device (sk, de->d_name);
+	{
+		if (check_devname (de->d_name) == 0)
+			continue;
+
+		if (ignorelist_match (ignorelist, de->d_name) != 0)
+			continue;
+
+		status = process_device (sk, de->d_name);
+		if (status != 0)
+		{
+			ERROR ("madwifi plugin: Processing interface "
+					"%s failed.", de->d_name);
+			num_fail++;
+		}
+		else
+		{
+			num_success++;
+		}
+	} /* while (readdir) */
 
 	closedir(nets);
 
-	return 0;
+	if ((num_success == 0) && (num_fail != 0))
+		return (-1);
+	return (0);
 }
 
 static int
@@ -817,13 +884,18 @@ procfs_iterate(int sk)
 	char buffer[1024];
 	char *device, *dummy;
 	FILE *fh;
-	
+	int status;
+	int num_success;
+	int num_fail;
+
 	if ((fh = fopen ("/proc/net/dev", "r")) == NULL)
 	{
 		WARNING ("madwifi plugin: opening /proc/net/dev failed");
 		return (-1);
 	}
 
+	num_success = 0;
+	num_fail = 0;
 	while (fgets (buffer, sizeof (buffer), fh) != NULL)
 	{
 		dummy = strchr(buffer, ':');
@@ -838,11 +910,26 @@ procfs_iterate(int sk)
 		if (device[0] == 0)
 			continue;
 
-		if (ignorelist_match (ignorelist, device) == 0)
-			process_device (sk, device);
-	}
+		if (ignorelist_match (ignorelist, device) != 0)
+			continue;
+
+		status = process_device (sk, device);
+		if (status != 0)
+		{
+			ERROR ("madwifi plugin: Processing interface "
+					"%s failed.", device);
+			num_fail++;
+		}
+		else
+		{
+			num_success++;
+		}
+	} /* while (fgets) */
 
 	fclose(fh);
+
+	if ((num_success == 0) && (num_fail != 0))
+		return (-1);
 	return 0;
 }
 
@@ -862,7 +949,7 @@ static int madwifi_read (void)
 
 /* procfs iteration is not safe because it does not check whether given
    interface is madwifi interface and there are private ioctls used, which
-   may do something completely different on non-madwifi devices.   
+   may do something completely different on non-madwifi devices.
    Therefore, it is not used unless explicitly enabled (and should be used
    together with ignorelist). */