Merge remote-tracking branch 'origin/pr/1188'

diff --git a/.travis.yml b/.travis.yml
index 3bc8e0a..09adb4d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,25 @@
 sudo: false
+compiler:
+  - gcc
+  - clang
+addons:
+  apt:
+    packages:
+      - iptables-dev
+      - libcap-dev
+      - libdbi-dev
+      - libhiredis-dev
+      - libnfnetlink-dev
+      - libnotify-dev
+      - libpcap-dev
+      - libperl-dev
+      - libprotobuf-c0-dev
+      - librrd-dev
+      - libsnmp-dev
+      - libudev-dev
+      - libvarnishapi-dev
+      - libyajl-dev
+      - linux-libc-dev
+      - protobuf-c-compiler
 language: c
-script: sh build.sh && ./configure && make && make check
+script: sh build.sh && ./configure && make distcheck

diff --git a/bindings/perl/lib/Collectd/Unixsock.pm b/bindings/perl/lib/Collectd/Unixsock.pm
index 5c6a5f9..69c755b 100644 (file)
--- a/bindings/perl/lib/Collectd/Unixsock.pm
+++ b/bindings/perl/lib/Collectd/Unixsock.pm
@@ -137,13 +137,13 @@ sub _parse_identifier
 
 sub _escape_argument
 {
-       local $_ = shift;
+    my $arg = shift;
 
-       return $_ if /^\w+$/;
+       return $arg if $arg =~ /^\w+$/;
 
-       s#\\#\\\\#g;
-       s#"#\\"#g;
-       return "\"$_\"";
+       $arg =~ s#\\#\\\\#g;
+       $arg =~ s#"#\\"#g;
+       return "\"$arg\"";
 }
 
 # Send a command on a socket, including any required argument escaping.

diff --git a/bindings/perl/t/01_methods.t b/bindings/perl/t/01_methods.t
index 2f7818b..4e94f8e 100644 (file)
--- a/bindings/perl/t/01_methods.t
+++ b/bindings/perl/t/01_methods.t
@@ -16,7 +16,7 @@ sub test_query {
     my ($nresults, $resultdata) = @$results;
     my $r = $s->getval(%{Collectd::Unixsock::_parse_identifier($attr)});
     is(ref $r, 'HASH', "Got a result for $attr");
-    is(scalar keys $r, $nresults, "$nresults result result for $attr");
+    is(scalar keys %$r, $nresults, "$nresults result result for $attr");
     is_deeply($r, $resultdata, "Data or $attr matches");
 }
 

diff --git a/configure.ac b/configure.ac
index 3378122..6a71154 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3749,8 +3749,8 @@ fi
 # }}} --with-python
 
 # --with-librabbitmq {{{
-with_librabbitmq_cppflags="-I/usr/local/include"
-with_librabbitmq_ldflags="-L/usr/local/lib"
+with_librabbitmq_cppflags=""
+with_librabbitmq_ldflags=""
 AC_ARG_WITH(librabbitmq, [AS_HELP_STRING([--with-librabbitmq@<:@=PREFIX@:>@], [Path to librabbitmq.])],
 [
        if test "x$withval" != "xno" && test "x$withval" != "xyes"
@@ -5262,6 +5262,7 @@ plugin_disk="no"
 plugin_drbd="no"
 plugin_entropy="no"
 plugin_ethstat="no"
+plugin_fhcount="no"
 plugin_fscache="no"
 plugin_interface="no"
 plugin_ipmi="no"
@@ -5305,6 +5306,7 @@ then
        plugin_disk="yes"
        plugin_drbd="yes"
        plugin_entropy="yes"
+       plugin_fhcount="yes"
        plugin_fscache="yes"
        plugin_interface="yes"
        plugin_ipc="yes"
@@ -5650,7 +5652,7 @@ AC_PLUGIN([email],       [yes],                [EMail statistics])
 AC_PLUGIN([entropy],     [$plugin_entropy],    [Entropy statistics])
 AC_PLUGIN([ethstat],     [$plugin_ethstat],    [Stats from NIC driver])
 AC_PLUGIN([exec],        [yes],                [Execution of external programs])
-AC_PLUGIN([fhcount],     [yes],                [File handles statistics])
+AC_PLUGIN([fhcount],     [$plugin_fhcount],    [File handles statistics])
 AC_PLUGIN([filecount],   [yes],                [Count files in directories])
 AC_PLUGIN([fscache],     [$plugin_fscache],    [fscache statistics])
 AC_PLUGIN([gmond],       [$with_libganglia],   [Ganglia plugin])

diff --git a/src/apcups.c b/src/apcups.c
index dc533f1..718061a 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -32,9 +32,6 @@
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif

diff --git a/src/ceph.c b/src/ceph.c
index d928a7b..419ca6e 100644 (file)
--- a/src/ceph.c
+++ b/src/ceph.c
@@ -43,7 +43,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/un.h>

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index bd39295..aaeeaf4 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -2288,7 +2288,7 @@ expected from them. This is documented in great detail in L<collectd-exec(5)>.
 =head2 Plugin C<fhcount>
 
 The C<fhcount> plugin provides statistics about used, unused and total number of
-file handles.
+file handles on Linux.
 
 The I<fhcount plugin> provides the following configuration options:
 

diff --git a/src/curl_json.c b/src/curl_json.c
index 5aceae4..8063242 100644 (file)
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -28,7 +28,6 @@
 #include "utils_avltree.h"
 #include "utils_complain.h"
 
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>
 

diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index a40e604..58325b9 100644 (file)
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@ -32,7 +32,6 @@
 #include "configfile.h"
 
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <netdb.h>
 

diff --git a/src/daemon/collectd.h b/src/daemon/collectd.h
index 80b753c..66b4856 100644 (file)
--- a/src/daemon/collectd.h
+++ b/src/daemon/collectd.h
@@ -95,6 +95,9 @@
 #  include <time.h>
 # endif
 #endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 
 #if HAVE_ASSERT_H
 # include <assert.h>

diff --git a/src/daemon/common.c b/src/daemon/common.c
index abe9a6e..8f22011 100644 (file)
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -46,7 +46,6 @@
 
 /* for getaddrinfo */
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netdb.h>
 
 #if HAVE_NETINET_IN_H

diff --git a/src/email.c b/src/email.c
index 365af27..1bf9add 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -50,7 +50,6 @@
 # include <pthread.h>
 #endif
 
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/select.h>
 

diff --git a/src/gmond.c b/src/gmond.c
index 4660713..c778d48 100644 (file)
--- a/src/gmond.c
+++ b/src/gmond.c
@@ -33,9 +33,6 @@
 #if HAVE_PTHREAD_H
 # include <pthread.h>
 #endif
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif

diff --git a/src/hddtemp.c b/src/hddtemp.c
index 82c158c..3de18fd 100644 (file)
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -35,7 +35,6 @@
 #include "configfile.h"
 
 # include <netdb.h>
-# include <sys/socket.h>
 # include <netinet/in.h>
 # include <netinet/tcp.h>
 # include <libgen.h> /* for basename */

diff --git a/src/interface.c b/src/interface.c
index df8ffb4..e17711e 100644 (file)
--- a/src/interface.c
+++ b/src/interface.c
@@ -31,9 +31,6 @@
 #if HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 #endif
-#if HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 
 /* One cannot include both. This sucks. */
 #if HAVE_LINUX_IF_H

diff --git a/src/ipc.c b/src/ipc.c
index 3763f24..b403847 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -32,6 +32,9 @@
 #include "configfile.h"
 
 #if KERNEL_LINUX
+  /* _GNU_SOURCE is needed for struct shm_info.used_ids on musl libc */
+# define _GNU_SOURCE
+
   /* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
   /* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */
   /* X/OPEN tells us to use <sys/{types,ipc,shm}.h> for shmctl() */

diff --git a/src/iptables.c b/src/iptables.c
index 606b24d..806b7a4 100644 (file)
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -29,8 +29,6 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#include <sys/socket.h>
-
 #include <libiptc/libiptc.h>
 #include <libiptc/libip6tc.h>
 

diff --git a/src/ipvs.c b/src/ipvs.c
index 38e4641..4345a46 100644 (file)
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -37,9 +37,6 @@
 #if HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif /* HAVE_ARPA_INET_H */
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif /* HAVE_SYS_SOCKET_H */
 #if HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif /* HAVE_NETINET_IN_H */

diff --git a/src/madwifi.c b/src/madwifi.c
index d3a5803..bb33b15 100644 (file)
--- a/src/madwifi.c
+++ b/src/madwifi.c
@@ -96,7 +96,6 @@
 
 #include <dirent.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
 
 #if !KERNEL_LINUX
 # error "No applicable input method."

diff --git a/src/mbmon.c b/src/mbmon.c
index d23062d..5e87f00 100644 (file)
--- a/src/mbmon.c
+++ b/src/mbmon.c
@@ -29,7 +29,6 @@
 #include "configfile.h"
 
 #include <netdb.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 

diff --git a/src/memcached.c b/src/memcached.c
index 472b089..f684abf 100644 (file)
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -34,7 +34,6 @@
 #include "configfile.h"
 
 #include <netdb.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>

diff --git a/src/netlink.c b/src/netlink.c
index aa9760f..e1f378d 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -30,7 +30,6 @@
 #include "common.h"
 
 #include <asm/types.h>
-#include <sys/socket.h>
 
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>

diff --git a/src/network.c b/src/network.c
index 0c74e22..9169000 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -39,9 +39,6 @@
 #if HAVE_PTHREAD_H
 # include <pthread.h>
 #endif
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif

diff --git a/src/ntpd.c b/src/ntpd.c
index 952ab7c..dbde660 100644 (file)
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -38,9 +38,6 @@
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 #if HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif

diff --git a/src/olsrd.c b/src/olsrd.c
index 6d0576c..bbf387f 100644 (file)
--- a/src/olsrd.c
+++ b/src/olsrd.c
@@ -30,7 +30,6 @@
 
 #include <sys/types.h>
 #include <netdb.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 

diff --git a/src/pf.c b/src/pf.c
index 29f3a3d..d11bd8a 100644 (file)
--- a/src/pf.c
+++ b/src/pf.c
@@ -26,9 +26,6 @@
 #if HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 #if HAVE_NET_IF_H
 # include <net/if.h>
 #endif

diff --git a/src/pinba.c b/src/pinba.c
index 9f0a800..b6e7b15 100644 (file)
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -29,7 +29,6 @@
 #include "configfile.h"
 
 #include <pthread.h>
-#include <sys/socket.h>
 #include <netdb.h>
 #include <poll.h>
 

diff --git a/src/powerdns.c b/src/powerdns.c
index 7b7cab3..5ea1b09 100644 (file)
--- a/src/powerdns.c
+++ b/src/powerdns.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 
 #ifndef UNIX_PATH_MAX

diff --git a/src/routeros.c b/src/routeros.c
index 400ee42..667c2fa 100644 (file)
--- a/src/routeros.c
+++ b/src/routeros.c
@@ -331,7 +331,7 @@ static int cr_config_router (oconfig_item_t *ci) /* {{{ */
   router_data = malloc (sizeof (*router_data));
   if (router_data == NULL)
     return (-1);
-  memset (router_data, 0, sizeof (router_data));
+  memset (router_data, 0, sizeof (*router_data));
   router_data->connection = NULL;
   router_data->node = NULL;
   router_data->service = NULL;

diff --git a/src/statsd.c b/src/statsd.c
index 5b0bdd6..9a6da1d 100644 (file)
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -35,7 +35,6 @@
 #include <pthread.h>
 
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netdb.h>
 #include <poll.h>
 

diff --git a/src/tcpconns.c b/src/tcpconns.c
index 5d4bb69..8f40be6 100644 (file)
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@ -71,13 +71,10 @@
 
 #if KERNEL_LINUX
 # include <asm/types.h>
-/* sys/socket.h is necessary to compile when using netlink on older systems. */
-# include <sys/socket.h>
 # include <linux/netlink.h>
 #if HAVE_LINUX_INET_DIAG_H
 # include <linux/inet_diag.h>
 #endif
-# include <sys/socket.h>
 # include <arpa/inet.h>
 /* #endif KERNEL_LINUX */
 
@@ -90,9 +87,6 @@
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 #if HAVE_NET_IF_H
 # include <net/if.h>
 #endif
@@ -113,7 +107,6 @@
 /* This is for OpenBSD and NetBSD. */
 #elif HAVE_LIBKVM_NLIST
 # include <sys/queue.h>
-# include <sys/socket.h>
 # include <net/route.h>
 # include <netinet/in.h>
 # include <netinet/in_systm.h>

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 201e182..56e8d14 100644 (file)
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -28,7 +28,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netdb.h>
 
 /*

diff --git a/src/unixsock.c b/src/unixsock.c
index 664c018..e6c75a6 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -39,7 +39,6 @@
 /* Folks without pthread will need to disable this plugin. */
 #include <pthread.h>
 
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
 

diff --git a/src/utils_dns.c b/src/utils_dns.c
index f83fc02..4c763a1 100644 (file)
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@ -40,10 +40,6 @@
 #include "plugin.h"
 #include "common.h"
 
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-
 #if HAVE_NET_IF_ARP_H
 # include <net/if_arp.h>
 #endif

diff --git a/src/write_graphite.c b/src/write_graphite.c
index f82f852..7fc9eb9 100644 (file)
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -54,7 +54,6 @@
 /* Folks without pthread will need to disable this plugin. */
 #include <pthread.h>
 
-#include <sys/socket.h>
 #include <netdb.h>
 
 #define WG_DEFAULT_NODE "localhost"

diff --git a/src/write_log.c b/src/write_log.c
index e37aae9..ebf0e12 100644 (file)
--- a/src/write_log.c
+++ b/src/write_log.c
@@ -35,7 +35,6 @@
 /* Folks without pthread will need to disable this plugin. */
 #include <pthread.h>
 
-#include <sys/socket.h>
 #include <netdb.h>
 
 #define WL_BUF_SIZE 8192

diff --git a/src/write_riemann.c b/src/write_riemann.c
index 26fa3f4..73d202c 100644 (file)
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -33,7 +33,6 @@
 #include "utils_cache.h"
 #include "riemann.pb-c.h"
 
-#include <sys/socket.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netdb.h>

diff --git a/src/write_sensu.c b/src/write_sensu.c
index 791acb3..67c0496 100644 (file)
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -29,7 +29,6 @@
 #include "common.h"
 #include "configfile.h"
 #include "utils_cache.h"
-#include <sys/socket.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netdb.h>

diff --git a/src/write_tsdb.c b/src/write_tsdb.c
index 2c39ec1..4a62614 100644 (file)
--- a/src/write_tsdb.c
+++ b/src/write_tsdb.c
@@ -49,7 +49,6 @@
 #include "utils_cache.h"
 
 #include <pthread.h>
-#include <sys/socket.h>
 #include <netdb.h>
 
 #ifndef WT_DEFAULT_NODE

diff --git a/src/zookeeper.c b/src/zookeeper.c
index 63ee6c9..abdbf20 100644 (file)
--- a/src/zookeeper.c
+++ b/src/zookeeper.c
@@ -29,7 +29,6 @@
 #include "plugin.h"
 
 #include <netdb.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>