X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwireless.c;h=48705989773c4994e7c4960104693b306f069b0d;hb=b5c5890955fa19651ad8b3f48d99364d270a0d8f;hp=09df407070c01d5b7503c75238d088290055d636;hpb=c8ec3924c92ad3ca15229e8e923eaece64221337;p=collectd.git

diff --git a/src/wireless.c b/src/wireless.c
index 09df4070..48705989 100644
--- a/src/wireless.c
+++ b/src/wireless.c
@@ -64,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
@@ -93,6 +102,8 @@ static int wireless_read (void)
 	devices_found = 0;
 	while (fgets (buffer, sizeof (buffer), fh) != NULL)
 	{
+		char *endptr;
+
 		numfields = strsplit (buffer, fields, 8);
 
 		if (numfields < 5)
@@ -106,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[3], &endptr);
+		if (fields[3] == 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);