X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwireless.c;h=285fb744748c64714aa7eed8948e2f5b73df73c3;hb=48b794525072b1ff00a90497ef0bb1f4030510f4;hp=929d5d8a711608dc6c7b47e3dd025e3a8dbe058c;hpb=881f4cb30f6daa4ccf7153e19267bac89c19f05b;p=collectd.git

diff --git a/src/wireless.c b/src/wireless.c
index 929d5d8a..285fb744 100644
--- a/src/wireless.c
+++ b/src/wireless.c
@@ -23,40 +23,12 @@
 #include "common.h"
 #include "plugin.h"
 
-#if defined(KERNEL_LINUX)
-# define WIRELESS_HAVE_READ 1
-#else
-# define WIRELESS_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
 #endif
 
 #define WIRELESS_PROC_FILE "/proc/net/wireless"
 
-static data_source_t data_source_quality[1] =
-{
-	{"value", DS_TYPE_GAUGE, 0, NAN}
-};
-
-static data_set_t quality_ds =
-{
-	"signal_quality", 1, data_source_quality
-};
-
-static data_source_t data_source_signal[1] =
-{
-	{"value", DS_TYPE_GAUGE, NAN, 0}
-};
-
-static data_set_t power_ds =
-{
-	"signal_power", 1, data_source_signal
-};
-
-static data_set_t noise_ds =
-{
-	"signal_noise", 1, data_source_signal
-};
-
-#if WIRELESS_HAVE_READ
 #if 0
 static double wireless_dbm_to_watt (double dbm)
 {
@@ -84,7 +56,7 @@ static void wireless_submit (const char *plugin_instance, const char *type,
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname);
+	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "wireless");
 	strncpy (vl.plugin_instance, plugin_instance,
 			sizeof (vl.plugin_instance));
@@ -92,6 +64,15 @@ static void wireless_submit (const char *plugin_instance, const char *type,
 	plugin_dispatch_values (type, &vl);
 } /* void wireless_submit */
 
+#define POWER_MIN -90.0
+#define POWER_MAX -50.0
+static double wireless_percent_to_power (double quality)
+{
+	assert ((quality >= 0.0) && (quality <= 100.0));
+
+	return ((quality * (POWER_MAX - POWER_MIN)) + POWER_MIN);
+} /* double wireless_percent_to_power */
+
 static int wireless_read (void)
 {
 #ifdef KERNEL_LINUX
@@ -112,13 +93,17 @@ static int wireless_read (void)
 	/* there are a variety of names for the wireless device */
 	if ((fh = fopen (WIRELESS_PROC_FILE, "r")) == NULL)
 	{
-		syslog (LOG_WARNING, "wireless: fopen: %s", strerror (errno));
+		char errbuf[1024];
+		WARNING ("wireless: fopen: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
 
 	devices_found = 0;
 	while (fgets (buffer, sizeof (buffer), fh) != NULL)
 	{
+		char *endptr;
+
 		numfields = strsplit (buffer, fields, 8);
 
 		if (numfields < 5)
@@ -132,19 +117,28 @@ static int wireless_read (void)
 		fields[0][len] = '\0';
 
 		device  = fields[0];
-		quality = atof (fields[2]);
-		power   = atof (fields[3]);
-		noise   = atof (fields[4]);
 
-		/* Fill in invalid values when conversion failed.. */
-		if (quality == 0.0)
-			quality = -1.0; /* quality >= 0 */
-
-		if (power == 0.0)
-			power = 1.0; /* power <= 0 */
-
-		if (noise == 0.0)
-			noise = 1.0; /* noise <= 0 */
+		quality = strtod (fields[2], &endptr);
+		if (fields[2] == endptr)
+			quality = -1.0; /* invalid */
+
+		/* power [dBm] < 0.0 */
+		power = strtod (fields[3], &endptr);
+		if (fields[3] == endptr)
+			power = 1.0; /* invalid */
+		else if ((power >= 0.0) && (power <= 100.0))
+			power = wireless_percent_to_power (power);
+		else if (power > 100.0)
+			power = 1.0; /* invalid */
+
+		/* noise [dBm] < 0.0 */
+		noise = strtod (fields[4], &endptr);
+		if (fields[4] == endptr)
+			noise = 1.0; /* invalid */
+		else if ((noise >= 0.0) && (noise <= 100.0))
+			noise = wireless_percent_to_power (noise);
+		else if (noise > 100.0)
+			noise = 1.0; /* invalid */
 
 		wireless_submit (device, "signal_quality", quality);
 		wireless_submit (device, "signal_power", power);
@@ -163,15 +157,8 @@ static int wireless_read (void)
 
 	return (0);
 } /* int wireless_read */
-#endif /* WIRELESS_HAVE_READ */
 
 void module_register (void)
 {
-	plugin_register_data_set (&quality_ds);
-	plugin_register_data_set (&power_ds);
-	plugin_register_data_set (&noise_ds);
-
-#if WIRELESS_HAVE_READ
 	plugin_register_read ("wireless", wireless_read);
-#endif /* WIRELESS_HAVE_READ */
-}
+} /* void module_register */