diff --git a/src/wireless.c b/src/wireless.c
index 007272e1ed28bd5bbf2cca0a831a1f6bbdea0d7a..f7ba735d37687356d16d3d7bd5b3ff230736563d 100644 (file)
--- a/src/wireless.c
+++ b/src/wireless.c
#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)
{
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
+#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
devices_found = 0;
while (fgets (buffer, sizeof (buffer), fh) != NULL)
{
+ char *endptr;
+
numfields = strsplit (buffer, fields, 8);
if (numfields < 5)
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 <= 256.0))
+ power = power - 256.0;
+ else if (power > 0.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 <= 256.0))
+ noise = noise - 256.0;
+ else if (noise > 0.0)
+ noise = 1.0; /* invalid */
wireless_submit (device, "signal_quality", quality);
wireless_submit (device, "signal_power", power);
return (0);
} /* int wireless_read */
-#endif /* WIRELESS_HAVE_READ */
-void module_register (modreg_e load)
+void module_register (void)
{
- if (load & MR_DATASETS)
- {
- plugin_register_data_set (&quality_ds);
- plugin_register_data_set (&power_ds);
- plugin_register_data_set (&noise_ds);
- }
-
-#if WIRELESS_HAVE_READ
- if (load & MR_READ)
- plugin_register_read ("wireless", wireless_read);
-#endif /* WIRELESS_HAVE_READ */
+ plugin_register_read ("wireless", wireless_read);
} /* void module_register */