author | Marc Fournier <marc.fournier@camptocamp.com> | |
Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100) |
src/collectd.conf.in | patch | blob | history | |
src/collectd.conf.pod | patch | blob | history | |
src/netapp.c | patch | blob | history | |
src/openldap.c | patch | blob | history | |
src/rrdtool.c | patch | blob | history |
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index a75bcc04f90c114046468d1f51a7149fe9bb75eb..bb1d6671238457727686eed2a632e194e167c581 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
#<Plugin iptables>
# Chain table chain
+# Chain6 table chain
#</Plugin>
#<Plugin irq>
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 4072d54c088ba2bc6fc8207e2a9ddce5d52f001d..b992eac126a140fc4f42051a31526df13eb18cca 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
=item B<Chain> I<Table> I<Chain> [I<Comment|Number> [I<Name>]]
-Select the rules to count. If only I<Table> and I<Chain> are given, this plugin
-will collect the counters of all rules which have a comment-match. The comment
-is then used as type-instance.
+=item B<Chain6> I<Table> I<Chain> [I<Comment|Number> [I<Name>]]
+
+Select the iptables/ip6tables filter rules to count packets and bytes from.
+
+If only I<Table> and I<Chain> are given, this plugin will collect the counters
+of all rules which have a comment-match. The comment is then used as
+type-instance.
If I<Comment> or I<Number> is given, only the rule with the matching comment or
the I<n>th rule will be collected. Again, the comment (or the number) will be
diff --git a/src/netapp.c b/src/netapp.c
index 020bfba192baffad8eb59661c464aaaf77bc585c..8a8a7fe4ea0863e3aed4f18052abd11e03c5de96 100644 (file)
--- a/src/netapp.c
+++ b/src/netapp.c
{
notification_t n;
- memset (&n, 0, sizeof (&n));
+ memset (&n, 0, sizeof (n));
n.time = cdtime ();
sstrncpy (n.host, hostname, sizeof (n.host));
sstrncpy (n.plugin, "netapp", sizeof (n.plugin));
diff --git a/src/openldap.c b/src/openldap.c
index ffcdb94e8049000961cd19bc65a167387532f9c0..0a86d521e508158ebd97b8a84bfe67568e927b23 100644 (file)
--- a/src/openldap.c
+++ b/src/openldap.c
#include "plugin.h"
#include "configfile.h"
+#if defined(__APPLE__)
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wdeprecated-declarations"
+#endif
+
#include <lber.h>
#include <ldap.h>
plugin_register_complex_config ("openldap", cldap_config);
plugin_register_init ("openldap", cldap_init);
} /* }}} void module_register */
+
+#if defined(__APPLE__)
+#pragma clang diagnostic pop
+#endif
diff --git a/src/rrdtool.c b/src/rrdtool.c
index 4a3c345ef3ae34f198f8ce89f5b4806e2fe51b95..fd5fb56334346e406b7a1747b5e41ab2459f7722 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
return (1);
}
- len = strlen (datadir);
- while ((len > 0) && (datadir[len - 1] == '/'))
+ len = strlen (tmp);
+ while ((len > 0) && (tmp[len - 1] == '/'))
{
len--;
- datadir[len] = 0;
+ tmp[len] = 0;
}
if (len == 0)
return (1);
}
- sfree (datadir);
+ if (datadir != NULL)
+ {
+ sfree (datadir);
+ }
+
datadir = tmp;
}
else if (strcasecmp ("StepSize", key) == 0)