X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwireless.c;h=f2a3cf5832de46792371fbc2ff499ac42efaa114;hb=7c643fa8b9d103ad27c0996c788ba3c910a5b2a4;hp=c771b9abb0f70580d7899be87b008ce84d586e55;hpb=528a9dfd368b95c4f741827fe4e953124eb17270;p=collectd.git diff --git a/src/wireless.c b/src/wireless.c index c771b9ab..f2a3cf58 100644 --- a/src/wireless.c +++ b/src/wireless.c @@ -1,82 +1,39 @@ /** * collectd - src/wireless.c - * Copyright (C) 2006 Florian octo Forster + * Copyright (C) 2006,2007 Florian octo Forster * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * - * Author: - * Florian octo Forster + * Authors: + * Florian octo Forster **/ #include "collectd.h" #include "common.h" #include "plugin.h" -#define MODULE_NAME "wireless" -#define BUFSIZE 1024 - -#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 char *filename_template = "wireless-%s.rrd"; - -static char *ds_def[] = -{ - "DS:quality:GAUGE:"COLLECTD_HEARTBEAT":0:U", - "DS:power:GAUGE:"COLLECTD_HEARTBEAT":U:0", - "DS:noise:GAUGE:"COLLECTD_HEARTBEAT":U:0", - NULL -}; -static int ds_num = 3; - -#if WIRELESS_HAVE_READ -static int proc_file_found = 0; -#endif - -static void wireless_init (void) -{ -#if WIRELESS_HAVE_READ - if (access (WIRELESS_PROC_FILE, R_OK) == 0) - proc_file_found = 1; - else - proc_file_found = 0; -#endif - - return; -} - -static void wireless_write (char *host, char *inst, char *val) -{ - char file[BUFSIZE]; - int status; - - status = snprintf (file, BUFSIZE, filename_template, inst); - if (status < 1) - return; - else if (status >= BUFSIZE) - return; - - rrd_update_file (host, file, val, ds_def, ds_num); -} - -#if WIRELESS_HAVE_READ #if 0 static double wireless_dbm_to_watt (double dbm) { @@ -93,20 +50,24 @@ static double wireless_dbm_to_watt (double dbm) } #endif -static void wireless_submit (char *device, - double quality, double power, double noise) +static void wireless_submit (const char *plugin_instance, const char *type, + double value) { - char buf[BUFSIZE]; - int status; + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; - status = snprintf (buf, BUFSIZE, "%u:%f:%f:%f", - (unsigned int) curtime, - quality, power, noise); - if ((status < 1) || (status >= BUFSIZE)) - return; + values[0].gauge = value; - plugin_submit (MODULE_NAME, device, buf); -} + vl.values = values; + vl.values_len = 1; + 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 (&vl); +} /* void wireless_submit */ #define POWER_MIN -90.0 #define POWER_MAX -50.0 @@ -117,12 +78,11 @@ static double wireless_percent_to_power (double quality) return ((quality * (POWER_MAX - POWER_MIN)) + POWER_MIN); } /* double wireless_percent_to_power */ -static void wireless_read (void) +static int wireless_read (void) { #ifdef KERNEL_LINUX - FILE *fh; - char buffer[BUFSIZE]; + char buffer[1024]; char *device; double quality; @@ -132,19 +92,20 @@ static void wireless_read (void) char *fields[8]; int numfields; + int devices_found; int len; - if (!proc_file_found) - return; - /* 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)); - return; + char errbuf[1024]; + WARNING ("wireless: fopen: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + return (-1); } - while (fgets (buffer, BUFSIZE, fh) != NULL) + devices_found = 0; + while (fgets (buffer, sizeof (buffer), fh) != NULL) { char *endptr; @@ -172,32 +133,41 @@ static void 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 */ - noise = strtod (fields[3], &endptr); - if (fields[3] == endptr) + 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) + else if ((noise > 100.0) && (noise <= 256.0)) + noise = noise - 256.0; + else if (noise > 0.0) noise = 1.0; /* invalid */ - wireless_submit (device, quality, power, noise); + wireless_submit (device, "signal_quality", quality); + wireless_submit (device, "signal_power", power); + wireless_submit (device, "signal_noise", noise); + + devices_found++; } fclose (fh); + + /* If no wireless devices are present return an error, so the plugin + * code delays our read function. */ + if (devices_found == 0) + return (-1); #endif /* KERNEL_LINUX */ -} -#else -# define wireless_read NULL -#endif /* WIRELESS_HAVE_READ */ + + return (0); +} /* int wireless_read */ void module_register (void) { - plugin_register (MODULE_NAME, wireless_init, wireless_read, wireless_write); -} - -#undef BUFSIZE -#undef MODULE_NAME + plugin_register_read ("wireless", wireless_read); +} /* void module_register */