Code

collectd.git
8 years agoFixed memory issue, changed the way to stop the thread, cleaned-up the code.
Nicolas JOURDEN [Tue, 1 Dec 2015 14:46:27 +0000 (15:46 +0100)]
Fixed memory issue, changed the way to stop the thread, cleaned-up the code.

9 years agoEnable to disconnect at shutdown, changed default values, fixed time unit issue,...
Nicolas JOURDEN [Mon, 23 Nov 2015 14:02:58 +0000 (15:02 +0100)]
Enable to disconnect at shutdown, changed default values, fixed time unit issue, fixed a typo and display precision.

9 years agogps: merge manpage into main collectd.conf.pod
Marc Fournier [Sat, 21 Nov 2015 10:36:09 +0000 (11:36 +0100)]
gps: merge manpage into main collectd.conf.pod

Also mention plugin in README and attribute Nicolas in AUTHORS file.

9 years agogps: make plugin compatible with older libgps versions
Marc Fournier [Sat, 21 Nov 2015 10:16:05 +0000 (11:16 +0100)]
gps: make plugin compatible with older libgps versions

9 years agoFixed time to ms instead of us, added a possibility to reconnect if gpsd server resta...
Nicolas JOURDEN [Fri, 20 Nov 2015 16:27:55 +0000 (17:27 +0100)]
Fixed time to ms instead of us, added a possibility to reconnect if gpsd server restarted.

9 years agoMerging with changes made by Florian Foster.
Nicolas JOURDEN [Fri, 20 Nov 2015 15:44:08 +0000 (16:44 +0100)]
Merging with changes made by Florian Foster.

9 years agogps plugin: Use cf_util_get_service() to read the "Port" option.
Florian Forster [Fri, 20 Nov 2015 13:58:10 +0000 (14:58 +0100)]
gps plugin: Use cf_util_get_service() to read the "Port" option.

This allows users to provide unquoted numeric ports, too.

9 years agogps plugin: Store timeout and pause as cdtime_t.
Florian Forster [Fri, 20 Nov 2015 13:57:07 +0000 (14:57 +0100)]
gps plugin: Store timeout and pause as cdtime_t.

This allows to specify sub-second precision in the usual manner in the
config file.

9 years agogps plugin: Coding style cleanup.
Florian Forster [Fri, 20 Nov 2015 13:16:04 +0000 (14:16 +0100)]
gps plugin: Coding style cleanup.

* Include <gps.h> and <pthread.h> unconditionally -- the code doesn't
  compile without these headers.
* Convert all data in cgps_data_t to gauge_t.
* Rename the "gps_data_read" variable to "data", protected by "data_lock".
* Handle errors and continue, allowing the following code to be outdented.
* Add "satellites-visible" in addition to "satellites-used".
* Remove newlines from log messages. Unify prefix to "gps plugin:".
* Unify function and type names to use the "cgps_" prefix.
* Don't check for NULL when calling free().

9 years agoApplied comments from Florian FOSTER, added more documentation, pause, fixed some...
Nicolas JOURDEN [Thu, 19 Nov 2015 09:22:33 +0000 (10:22 +0100)]
Applied comments from Florian FOSTER, added more documentation, pause, fixed some typos.

9 years agoApplied comments from Florian FOSTER, added more documentation, pause, fixed some...
Nicolas JOURDEN [Thu, 19 Nov 2015 09:22:33 +0000 (10:22 +0100)]
Applied comments from Florian FOSTER, added more documentation, pause, fixed some typos.

9 years agoMerge branch 'GPSd'
Nicolas JOURDEN [Tue, 17 Nov 2015 14:12:47 +0000 (15:12 +0100)]
Merge branch 'GPSd'

9 years agoInitial support of GPSd in collectd.
Nicolas JOURDEN [Tue, 10 Nov 2015 14:59:08 +0000 (15:59 +0100)]
Initial support of GPSd in collectd.

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)]
Merge branch 'collectd-5.5'

9 years agoAdd utils_ignorelist back to daemon (#1323)
Benjamin Drung [Tue, 27 Oct 2015 09:23:46 +0000 (10:23 +0100)]
Add utils_ignorelist back to daemon (#1323)

commit 216c6246b73645ac093de15b87aedc9abc6ebc80 moves the collectd
daemon files into the src/daemon/ directory, but also silently drops
utils_ignorelist. Dropping utils_ignorelist from the daemon has the
drawback that it cannot be used by plugins any more and that 16 plugins
need to bundle ignorelist.

Thus add utils_ignorelist back to the collectd daemon.

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Sun, 8 Nov 2015 16:14:54 +0000 (17:14 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoFix clang complaining about extraneous parenthesis.
Nathan Ward [Thu, 29 Oct 2015 01:22:44 +0000 (14:22 +1300)]
Fix clang complaining about extraneous parenthesis.

9 years agoASN_GAUGE (SNMP-SMIv2 Gauge32) is unsigned, not signed.
Nathan Ward [Wed, 28 Oct 2015 12:46:29 +0000 (01:46 +1300)]
ASN_GAUGE (SNMP-SMIv2 Gauge32) is unsigned, not signed.

9 years agoStart write threads after plugin initialization.
Jan Andres [Wed, 21 Oct 2015 11:50:43 +0000 (13:50 +0200)]
Start write threads after plugin initialization.

Some plugins such as "network" create own threads from within their
init callbacks which can then start submitting data to the queue
right away, even if the read threads haven't been started yet.

If write threads are started before plugin initialization, this can
result in a race where a plugin's write callback gets called before
that plugin's init callback has completed.

To fix this, delay starting the write threads until after all plugins
have been initialized.

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Pierre-Yves Ritschard [Fri, 6 Nov 2015 09:32:55 +0000 (10:32 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agostatsd: provide a gauge for counters, holding the absolute count.
Pierre-Yves Ritschard [Mon, 19 Oct 2015 09:53:26 +0000 (11:53 +0200)]
statsd: provide a gauge for counters, holding the absolute count.

When not using StoreRates false, this allows statsd aggregators
to hold on to the absolute count, if needed.

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Fri, 6 Nov 2015 08:42:11 +0000 (09:42 +0100)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 6 Nov 2015 08:40:56 +0000 (09:40 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agobattery: add missing capacity type to types.db
Marc Fournier [Fri, 6 Nov 2015 08:32:40 +0000 (09:32 +0100)]
battery: add missing capacity type to types.db

For the record, "capacity" was introduced by a2e732f8.

Also fix a bogus example in collectd.conf.

Thanks to @ryan-williams for reporting the problem !

Fix #1338

9 years agoapcups: prefix plugin name in INFO and DEBUG statements
Sergey [Tue, 3 Nov 2015 06:19:50 +0000 (07:19 +0100)]
apcups: prefix plugin name in INFO and DEBUG statements

Fixes #1329

9 years agoMerge pull request #1311 from pyr/fix/1282
Pierre-Yves Ritschard [Mon, 2 Nov 2015 08:20:54 +0000 (09:20 +0100)]
Merge pull request #1311 from pyr/fix/1282

statsd: provide a gauge for counters, holding the absolute count.

9 years agoMerge pull request #1309 from baryonix/time_fix
Marc Fournier [Fri, 30 Oct 2015 21:33:19 +0000 (22:33 +0100)]
Merge pull request #1309 from baryonix/time_fix

Fix TIMESPEC_TO_CDTIME_T() on 32-bit arch.

9 years agowrite_redis plugin: Add support for StoreRates option
Brian Kelly [Thu, 30 Jul 2015 13:42:36 +0000 (09:42 -0400)]
write_redis plugin: Add support for StoreRates option

9 years agowrite_redis plugin: Improve ZREMRANGEBYRANK command debug message
Brian Kelly [Fri, 17 Jul 2015 13:22:27 +0000 (09:22 -0400)]
write_redis plugin: Improve ZREMRANGEBYRANK command debug message

9 years agowrite_redis plugin: Fix ZREMBYRANK command debug message
Brian Kelly [Fri, 17 Jul 2015 13:05:21 +0000 (09:05 -0400)]
write_redis plugin: Fix ZREMBYRANK command debug message

9 years agowrite_redis plugin: Add option to limit sorted set size
Brian Kelly [Wed, 15 Jul 2015 17:53:19 +0000 (13:53 -0400)]
write_redis plugin: Add option to limit sorted set size

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Tue, 27 Oct 2015 23:03:06 +0000 (00:03 +0100)]
Merge branch 'collectd-5.5'

9 years agowrite_redis: fix a few typos in manpage
Ruben Kerkhof [Tue, 28 Jul 2015 09:59:35 +0000 (11:59 +0200)]
write_redis: fix a few typos in manpage

Also correct the maximum length of the node name.
The callback name is "write_redis/%s" so the maximum
length of a node name is DATA_MAX_NAME_LEN - strlen("write_redis") -1.

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Tue, 27 Oct 2015 22:39:38 +0000 (23:39 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agowrite_redis: remove unused variable from wr_write()
Marc Fournier [Tue, 27 Oct 2015 22:32:20 +0000 (23:32 +0100)]
write_redis: remove unused variable from wr_write()

9 years agowrite_redis plugin: Remove old zadd command formatting code that should not be there...
Brian Kelly [Wed, 15 Jul 2015 15:40:18 +0000 (11:40 -0400)]
write_redis plugin: Remove old zadd command formatting code that should not be there to fix sorted set key names

9 years agocollectd.conf.pod: correct a small typo
Marc Fournier [Fri, 23 Oct 2015 13:56:58 +0000 (15:56 +0200)]
collectd.conf.pod: correct a small typo

9 years agoFix a few typos in collectd-exec(5)
Douglas Thrift [Tue, 20 Oct 2015 23:19:02 +0000 (16:19 -0700)]
Fix a few typos in collectd-exec(5)

9 years agostatsd: provide a gauge for counters, holding the absolute count.
Pierre-Yves Ritschard [Mon, 19 Oct 2015 09:53:26 +0000 (11:53 +0200)]
statsd: provide a gauge for counters, holding the absolute count.

When not using StoreRates false, this allows statsd aggregators
to hold on to the absolute count, if needed.

9 years agoFix TIMESPEC_TO_CDTIME_T() on 32-bit arch.
Jan Andres [Sat, 17 Oct 2015 18:07:10 +0000 (20:07 +0200)]
Fix TIMESPEC_TO_CDTIME_T() on 32-bit arch.

Add ULL prefix to constant to ensure we get a 64-bit unsigned multiply.

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Wed, 14 Oct 2015 07:10:50 +0000 (09:10 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Wed, 14 Oct 2015 07:10:38 +0000 (09:10 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoprocesses: correctly count processes on FreeBSD
Herve COMMOWICK [Wed, 14 Oct 2015 06:57:05 +0000 (08:57 +0200)]
processes: correctly count processes on FreeBSD

because actually we count threads instead of processes

(partial backport of 85c31a6d66 for collectd-5.4 /mf)

9 years agoFix 'Modification of a read-only value attempted' error
Ciaran Mac An Iomaire [Wed, 7 Oct 2015 15:20:20 +0000 (08:20 -0700)]
Fix 'Modification of a read-only value attempted' error

9 years agoprocesses: correctly count processes on {free,open}BSD
Herve COMMOWICK [Thu, 8 Oct 2015 09:41:45 +0000 (11:41 +0200)]
processes: correctly count processes on {free,open}BSD

because actually we count threads instead of processes

9 years agosystemd.collectd.service: backport changes from master branch
Marc Fournier [Wed, 14 Oct 2015 06:50:28 +0000 (08:50 +0200)]
systemd.collectd.service: backport changes from master branch

9 years agoMerge remote-tracking branch 'origin/pr/1264'
Marc Fournier [Wed, 14 Oct 2015 06:47:39 +0000 (08:47 +0200)]
Merge remote-tracking branch 'origin/pr/1264'

9 years agopython: Fix double-free bug.
Sven Trenkel [Sun, 4 Oct 2015 00:05:24 +0000 (00:05 +0000)]
python: Fix double-free bug.

9 years agoMerge pull request #1289 from trenkel/master
trenkel [Wed, 7 Oct 2015 14:51:29 +0000 (16:51 +0200)]
Merge pull request #1289 from trenkel/master

python: Fix double-free bug.

9 years agopython: Fix double-free bug.
Sven Trenkel [Sun, 4 Oct 2015 00:05:24 +0000 (00:05 +0000)]
python: Fix double-free bug.

9 years agosystemd: drop all capabilities by default
Ruben Kerkhof [Wed, 9 Sep 2015 16:52:26 +0000 (18:52 +0200)]
systemd: drop all capabilities by default

dns and ping need CAP_NET_RAW, iptables needs CAP_NET_ADMIN
so leave those commented out in the .service file.

9 years agoMake /home, /root and /run/user inaccessible
Ruben Kerkhof [Wed, 9 Sep 2015 15:52:53 +0000 (17:52 +0200)]
Make /home, /root and /run/user inaccessible

9 years agoMount /usr, /boot and /etc readonly
Ruben Kerkhof [Wed, 9 Sep 2015 15:51:17 +0000 (17:51 +0200)]
Mount /usr, /boot and /etc readonly

9 years agoNo need to wait 10 seconds before restarting
Ruben Kerkhof [Wed, 9 Sep 2015 15:49:49 +0000 (17:49 +0200)]
No need to wait 10 seconds before restarting

Systemd makes sure the process is gone before starting a new one

9 years agoOnly restart collectd on failure
Ruben Kerkhof [Wed, 9 Sep 2015 15:49:10 +0000 (17:49 +0200)]
Only restart collectd on failure

Do what the comment says ;)

9 years agoNotifyAccess is the default
Ruben Kerkhof [Wed, 9 Sep 2015 15:47:01 +0000 (17:47 +0200)]
NotifyAccess is the default

9 years agoLet systemd handle logging
Ruben Kerkhof [Wed, 9 Sep 2015 15:46:32 +0000 (17:46 +0200)]
Let systemd handle logging

9 years agonotify_systemd: unset NOTIFY_SOCKET later
Ruben Kerkhof [Tue, 8 Sep 2015 14:46:27 +0000 (16:46 +0200)]
notify_systemd: unset NOTIFY_SOCKET later

getenv returns a pointer, possibly to a static buffer.
If I understand the specs correctly, unsetenv is basically free
to do what it wants with this, so don't keep using the pointer
after we do unsetenv.

9 years agonotify_systemd: remove dead code
Ruben Kerkhof [Tue, 8 Sep 2015 14:13:47 +0000 (16:13 +0200)]
notify_systemd: remove dead code

The whole function is already wrapped in #ifdef KERNEL_LINUX

9 years agonotify_systemd: use close-on-exit on socket
Ruben Kerkhof [Tue, 8 Sep 2015 14:11:56 +0000 (16:11 +0200)]
notify_systemd: use close-on-exit on socket

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Mon, 14 Sep 2015 08:58:22 +0000 (10:58 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Mon, 14 Sep 2015 08:57:37 +0000 (10:57 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agogmond: fix linking against libganglia at build time
Marc Fournier [Sun, 13 Sep 2015 22:03:44 +0000 (00:03 +0200)]
gmond: fix linking against libganglia at build time

Current versions of libganglia don't ship the ganglia-config utility
anymore. Change the configure script to not expect it to be in $PATH and
provide sensible defaults instead.

Fix #1129

9 years agolog_logstash: fix timestamp field to respect ISO 8601 format
Marc Fournier [Fri, 11 Sep 2015 21:59:10 +0000 (23:59 +0200)]
log_logstash: fix timestamp field to respect ISO 8601 format

Fixes #1132

9 years agovirt: Add PluginInstanceFormat none, as default
Ruben Kerkhof [Tue, 30 Jun 2015 13:04:11 +0000 (15:04 +0200)]
virt: Add PluginInstanceFormat none, as default

Fixes #1100

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Fri, 11 Sep 2015 21:29:08 +0000 (23:29 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 11 Sep 2015 21:21:49 +0000 (23:21 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoPluginInterfaceFormat supports multiple fields
Ruben Kerkhof [Tue, 30 Jun 2015 12:41:41 +0000 (14:41 +0200)]
PluginInterfaceFormat supports multiple fields

Document this.

9 years agoDon't access freed memory
Ruben Kerkhof [Tue, 30 Jun 2015 12:13:24 +0000 (14:13 +0200)]
Don't access freed memory

The fields array contains pointers into the value_copy string.

9 years agoFix error message
Ruben Kerkhof [Tue, 30 Jun 2015 11:03:13 +0000 (13:03 +0200)]
Fix error message

9 years agoMerge remote-tracking branch 'origin/pr/1135'
Marc Fournier [Fri, 11 Sep 2015 20:41:55 +0000 (22:41 +0200)]
Merge remote-tracking branch 'origin/pr/1135'

9 years agoMerge remote-tracking branch 'origin/pr/1260'
Marc Fournier [Fri, 11 Sep 2015 20:34:18 +0000 (22:34 +0200)]
Merge remote-tracking branch 'origin/pr/1260'

9 years agoMerge remote-tracking branch 'origin/pr/1205'
Marc Fournier [Fri, 11 Sep 2015 20:30:28 +0000 (22:30 +0200)]
Merge remote-tracking branch 'origin/pr/1205'

9 years agomysql: use mysql_config --include for include path
Ruben Kerkhof [Sat, 1 Aug 2015 17:03:34 +0000 (19:03 +0200)]
mysql: use mysql_config --include for include path

According to the mysql_config manpage, --cflags shows the
compiler flags the library was compiled with. We certainly don't
want to use those.

9 years agomysql: just search for mysql_get_server_version
Ruben Kerkhof [Sat, 1 Aug 2015 17:02:15 +0000 (19:02 +0200)]
mysql: just search for mysql_get_server_version

If we found that symbol, assume we also found mysql_init.

9 years agomysql: respect mysql_libs when searching for symbol
Ruben Kerkhof [Sat, 1 Aug 2015 16:59:53 +0000 (18:59 +0200)]
mysql: respect mysql_libs when searching for symbol

We always looked in libmysqlclient, but this doesn't
work for compatible databases such as Percona.

Respect the list return by mysql_config --libs_r instead.

Fixes #1098

9 years agoadded ZFS ARC cache to memory, treating it like Linux cached memory
Brian ONeill [Thu, 6 Aug 2015 20:11:23 +0000 (16:11 -0400)]
added ZFS ARC cache to memory, treating it like Linux cached memory

9 years agoMerge remote-tracking branch 'origin/pr/1229'
Marc Fournier [Fri, 11 Sep 2015 20:17:44 +0000 (22:17 +0200)]
Merge remote-tracking branch 'origin/pr/1229'

9 years agoMerge remote-tracking branch 'origin/pr/1254'
Marc Fournier [Fri, 11 Sep 2015 20:17:20 +0000 (22:17 +0200)]
Merge remote-tracking branch 'origin/pr/1254'

9 years agoLog http error codes other than 200. New config option LogHttpError [true/false].
vzubko [Fri, 28 Aug 2015 18:23:21 +0000 (11:23 -0700)]
Log http error codes other than 200. New config option LogHttpError [true/false].

9 years agoFix copy-paste error in debug message in snmp plugin
Denys Berkovskyy [Tue, 8 Sep 2015 10:38:18 +0000 (11:38 +0100)]
Fix copy-paste error in debug message in snmp plugin

9 years agomqtt plugin: Initialize locks on startup.
Florian Forster [Fri, 11 Sep 2015 05:23:56 +0000 (07:23 +0200)]
mqtt plugin: Initialize locks on startup.

D'oh!

Issue: #1262

9 years agoconfigure: print out build flags and options in summary
Marc Fournier [Tue, 8 Sep 2015 07:06:11 +0000 (09:06 +0200)]
configure: print out build flags and options in summary

9 years agoconfigure: move werror flag to features
Marc Fournier [Tue, 8 Sep 2015 07:03:24 +0000 (09:03 +0200)]
configure: move werror flag to features

9 years agoMake building with -Werror optional.
Ruben Kerkhof [Fri, 14 Aug 2015 22:15:59 +0000 (00:15 +0200)]
Make building with -Werror optional.

I noticed various downstream distros patch out -Werror
for one reason or another. This adds an option to make that
easier. It is still on by default.

9 years agoplugin.c: emit log message when plugin loading succeeds
Marc Fournier [Thu, 3 Sep 2015 17:24:19 +0000 (19:24 +0200)]
plugin.c: emit log message when plugin loading succeeds

9 years agoMerge pull request #1253 from rubenk/fix-osx-build
Marc Fournier [Thu, 3 Sep 2015 17:06:24 +0000 (19:06 +0200)]
Merge pull request #1253 from rubenk/fix-osx-build

gettimeofday() needs <sys/time.h>

9 years agodbi plugin interval documentation
Michal Bebjak [Thu, 3 Sep 2015 10:21:21 +0000 (12:21 +0200)]
dbi plugin interval documentation

9 years agoFix compilation for master
Michal Bebjak [Thu, 3 Sep 2015 10:21:05 +0000 (12:21 +0200)]
Fix compilation for master

9 years agogettimeofday() needs <sys/time.h>
Ruben Kerkhof [Thu, 3 Sep 2015 09:49:11 +0000 (11:49 +0200)]
gettimeofday() needs <sys/time.h>

Fixes #1247

9 years agocollectd-tg: Fall back to gettimeofday(3) if clock_gettime(3) is not available.
Florian Forster [Tue, 1 Sep 2015 20:16:11 +0000 (22:16 +0200)]
collectd-tg: Fall back to gettimeofday(3) if clock_gettime(3) is not available.

Sometimes Mac OS/X is stupid. clock_gettime() was introduced in 1997, just
sayin'.

Fixes: #1247
9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Wed, 26 Aug 2015 22:44:23 +0000 (00:44 +0200)]
Merge branch 'collectd-5.5'

9 years agosrc/daemon/utils_time_test.c: add ULL suffix to large literals
Marc Fournier [Wed, 26 Aug 2015 22:20:12 +0000 (00:20 +0200)]
src/daemon/utils_time_test.c: add ULL suffix to large literals

This should prevent some 32bit compilers from complaining about:
`integer constant is too large for 'long' type`

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Wed, 26 Aug 2015 21:40:18 +0000 (23:40 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoFix harmless build warnings with newer binutils
Ruben Kerkhof [Fri, 14 Aug 2015 20:25:20 +0000 (22:25 +0200)]
Fix harmless build warnings with newer binutils

I see a lot of those on Rawhide:
ar: `u' modifier ignored since `D' is the default (see `U')

It's going to take a while to get this fixed upstream.
Meanwhile, silence the warnings.

Macro copied from libvirt.

9 years agoliboconfig: Fix implicit declaration warning
Ruben Kerkhof [Sun, 16 Aug 2015 10:28:43 +0000 (12:28 +0200)]
liboconfig: Fix implicit declaration warning

strlen declaration is in string.h

9 years agoDon't unlock lock twice
Ruben Kerkhof [Sun, 16 Aug 2015 11:47:24 +0000 (13:47 +0200)]
Don't unlock lock twice

Fixes make check on OpenBSD

9 years agopf: fix compilation on OpenBSD
Ruben Kerkhof [Sun, 16 Aug 2015 12:39:23 +0000 (14:39 +0200)]
pf: fix compilation on OpenBSD

9 years agodns: fix compilation on OpenBSD
Ruben Kerkhof [Sun, 16 Aug 2015 13:07:03 +0000 (15:07 +0200)]
dns: fix compilation on OpenBSD

OpenBSD doesn't have pcap-bpf.h

pcap.h has been including pcap/bpf.h since 2006.
Since we require a pcap which has PCAP_ERROR_IFACE_NOT_UP, introduced in 2008
this shouldn't break anything.

9 years agocoding style fixes over 94e5622
Marc Fournier [Wed, 26 Aug 2015 21:28:50 +0000 (23:28 +0200)]
coding style fixes over 94e5622