wireless plugin: Correct the handling of cards returning signal and noise quality...

[collectd.git] / src / traffic.c

diff --git a/src/traffic.c b/src/traffic.c
index d6ab873..14b7dc3 100644 (file)
--- a/src/traffic.c
+++ b/src/traffic.c
@@ -49,6 +49,18 @@
 
 #define MODULE_NAME "traffic"
 
+/*
+ * Various people have reported problems with `getifaddrs' and varying versions
+ * of `glibc'. That's why it's disabled by default. Since more statistics are
+ * available this way one may enable it using the `--enable-getifaddrs' option
+ * of the configure script. -octo
+ */
+#if KERNEL_LINUX
+# if !COLLECT_GETIFADDRS
+#  undef HAVE_GETIFADDRS
+# endif /* !COLLECT_GETIFADDRS */
+#endif /* KERNEL_LINUX */
+
 #if HAVE_GETIFADDRS || KERNEL_LINUX || HAVE_LIBKSTAT || HAVE_LIBSTATGRAB
 # define TRAFFIC_HAVE_READ 1
 #else
@@ -62,16 +74,17 @@
  */
 /* TODO: Move this to `interface-%s/<blah>.rrd' in version 4. */
 static char *bytes_file   = "traffic-%s.rrd";
-static char *packets_file = "if_packets-%s.rrd";
-static char *errors_file  = "if_errors-%s.rrd";
+static char *packets_file = "interface-%s/if_packets.rrd";
+static char *errors_file  = "interface-%s/if_errors.rrd";
 /* TODO: Maybe implement multicast and broadcast counters */
 
 static char *config_keys[] =
 {
-       "Ignore",
+       "Interface",
+       "IgnoreSelected",
        NULL
 };
-static int config_keys_num = 1;
+static int config_keys_num = 2;
 
 static char *bytes_ds_def[] =
 {
@@ -97,8 +110,14 @@ static char *errors_ds_def[] =
 };
 static int errors_ds_num = 2;
 
-static char **if_ignore_list = NULL;
-static int    if_ignore_list_num = 0;
+static char **if_list = NULL;
+static int    if_list_num = 0;
+/* 
+ * if_list_action:
+ * 0 => default is to collect selected interface
+ * 1 => ignore selcted interfaces
+ */
+static int    if_list_action = 0;
 
 #ifdef HAVE_LIBKSTAT
 #define MAX_NUMIF 256
@@ -111,25 +130,36 @@ static int traffic_config (char *key, char *value)
 {
        char **temp;
 
-       if (strcasecmp (key, "Ignore") != 0)
-               return (-1);
+       if (strcasecmp (key, "Interface") == 0)
+       {
+               temp = (char **) realloc (if_list, (if_list_num + 1) * sizeof (char *));
+               if (temp == NULL)
+               {
+                       syslog (LOG_EMERG, "Cannot allocate more memory.");
+                       return (1);
+               }
+               if_list = temp;
 
-       temp = (char **) realloc (if_ignore_list, (if_ignore_list_num + 1) * sizeof (char *));
-       if (temp == NULL)
+               if ((if_list[if_list_num] = strdup (value)) == NULL)
+               {
+                       syslog (LOG_EMERG, "Cannot allocate memory.");
+                       return (1);
+               }
+               if_list_num++;
+       }
+       else if (strcasecmp (key, "IgnoreSelected") == 0)
        {
-               syslog (LOG_EMERG, "Cannot allocate more memory.");
-               return (1);
+               if ((strcasecmp (value, "True") == 0)
+                               || (strcasecmp (value, "Yes") == 0)
+                               || (strcasecmp (value, "On") == 0))
+                       if_list_action = 1;
+               else
+                       if_list_action = 0;
        }
-       if_ignore_list = temp;
-
-       if ((if_ignore_list[if_ignore_list_num] = strdup (value)) == NULL)
+       else
        {
-               syslog (LOG_EMERG, "Cannot allocate memory.");
-               return (1);
+               return (-1);
        }
-       if_ignore_list_num++;
-
-       syslog (LOG_NOTICE, "traffic: Ignoring interface `%s'", value);
 
        return (0);
 }
@@ -178,17 +208,22 @@ static void traffic_init (void)
 
 /*
  * Check if this interface/instance should be ignored. This is called from
- * both, `submit' and `write' to give client and server the ability to ignore
- * certain stuff..
+ * both, `submit' and `write' to give client and server the ability to
+ * ignore certain stuff..
  */
 static int check_ignore_if (const char *interface)
 {
        int i;
 
-       for (i = 0; i < if_ignore_list_num; i++)
-               if (strcasecmp (interface, if_ignore_list[i]) == 0)
-                       return (1);
-       return (0);
+       /* If no interfaces are given collect all interfaces. Mostly to be
+        * backwards compatible, but also because this is much easier. */
+       if (if_list_num < 1)
+               return (0);
+
+       for (i = 0; i < if_list_num; i++)
+               if (strcasecmp (interface, if_list[i]) == 0)
+                       return (if_list_action);
+       return (1 - if_list_action);
 }
 
 static void generic_write (char *host, char *inst, char *val,
@@ -245,7 +280,7 @@ static void bytes_submit (char *dev,
        plugin_submit (MODULE_NAME, dev, buf);
 }
 
-#if HAVE_GETIFADDRS || HAVE_LIBKSTAT
+#if HAVE_GETIFADDRS || KERNEL_LINUX || HAVE_LIBKSTAT
 static void packets_submit (char *dev,
                unsigned long long rx,
                unsigned long long tx)
@@ -281,7 +316,7 @@ static void errors_submit (char *dev,
                return;
        plugin_submit ("if_errors", dev, buf);
 }
-#endif /* HAVE_GETIFADDRS || HAVE_LIBKSTAT */
+#endif /* HAVE_GETIFADDRS || KERNEL_LINUX || HAVE_LIBKSTAT */
 
 static void traffic_read (void)
 {
@@ -368,13 +403,20 @@ static void traffic_read (void)
                
                numfields = strsplit (dummy, fields, 16);
 
-               if (numfields < 9)
+               if (numfields < 11)
                        continue;
 
                incoming = atoll (fields[0]);
                outgoing = atoll (fields[8]);
-
                bytes_submit (device, incoming, outgoing);
+
+               incoming = atoll (fields[1]);
+               outgoing = atoll (fields[9]);
+               packets_submit (device, incoming, outgoing);
+
+               incoming = atoll (fields[2]);
+               outgoing = atoll (fields[10]);
+               errors_submit (device, incoming, outgoing);
        }
 
        fclose (fh);