X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwireless.c;h=21bbcb401b141e0c09bb7f2a1cb8ce1db5f881b6;hb=0421d0d777f6df3cf78fd5366c82b0ed7adb9684;hp=cc622e12789dcf7945ce34c1c8dad3cfc218294d;hpb=2354eda94fa44c8bcb8e39b24b117e7937110224;p=collectd.git diff --git a/src/wireless.c b/src/wireless.c index cc622e12..21bbcb40 100644 --- a/src/wireless.c +++ b/src/wireless.c @@ -56,11 +56,11 @@ 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)); - strncpy (vl.type, type, sizeof (vl.type)); + sstrncpy (vl.type, type, sizeof (vl.type)); plugin_dispatch_values (&vl); } /* void wireless_submit */ @@ -129,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 */ @@ -138,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);