X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwireless.c;h=21bbcb401b141e0c09bb7f2a1cb8ce1db5f881b6;hb=aac35f0faf646c9e20d34aea54d43ed6efe194a1;hp=285fb744748c64714aa7eed8948e2f5b73df73c3;hpb=bc0a8f260e4e24bdf664c3dcff919b6f99bfe31d;p=collectd.git

diff --git a/src/wireless.c b/src/wireless.c
index 285fb744..21bbcb40 100644
--- a/src/wireless.c
+++ b/src/wireless.c
@@ -56,12 +56,13 @@ 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_g);
-	strcpy (vl.plugin, "wireless");
-	strncpy (vl.plugin_instance, plugin_instance,
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "wireless", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, plugin_instance,
 			sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void wireless_submit */
 
 #define POWER_MIN -90.0
@@ -128,7 +129,9 @@ static int wireless_read (void)
 			power = 1.0; /* invalid */
 		else if ((power >= 0.0) && (power <= 100.0))
 			power = wireless_percent_to_power (power);
-		else if (power > 100.0)
+		else if ((power > 100.0) && (power <= 256.0))
+			power = power - 256.0;
+		else if (power > 0.0)
 			power = 1.0; /* invalid */
 
 		/* noise [dBm] < 0.0 */
@@ -137,7 +140,9 @@ static int wireless_read (void)
 			noise = 1.0; /* invalid */
 		else if ((noise >= 0.0) && (noise <= 100.0))
 			noise = wireless_percent_to_power (noise);
-		else if (noise > 100.0)
+		else if ((noise > 100.0) && (noise <= 256.0))
+			noise = noise - 256.0;
+		else if (noise > 0.0)
 			noise = 1.0; /* invalid */
 
 		wireless_submit (device, "signal_quality", quality);