collectd.git
6 years agovirt plugin: fix truncation warning
Ruben Kerkhof [Tue, 15 May 2018 19:20:24 +0000 (21:20 +0200)]
virt plugin: fix truncation warning

src/virt.c: In function ‘refresh_lists’:
src/virt.c:2123:61: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 5 [-Wformat-truncation=]
   snprintf(number_string, sizeof(number_string), "interface-%u", number);
                                                             ^~
src/virt.c:2123:50: note: directive argument in the range [1, 2147483647]
   snprintf(number_string, sizeof(number_string), "interface-%u", number);
                                                  ^~~~~~~~~~~~~~
src/virt.c:2123:3: note: ‘snprintf’ output between 12 and 21 bytes into a destination of size 15
   snprintf(number_string, sizeof(number_string), "interface-%u", number);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

6 years agonetlink plugin: fix truncation warnings
Ruben Kerkhof [Tue, 15 May 2018 19:05:27 +0000 (21:05 +0200)]
netlink plugin: fix truncation warnings

  CC       src/netlink_la-netlink.lo
src/netlink.c: In function ‘qos_filter_cb’:
src/netlink.c:544:58: warning: ‘%s’ directive output may be truncated writing up to 127 bytes into a region of size between 121 and 122 [-Wformat-truncation=]
       snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
                                                          ^~            ~~~~~~~
src/netlink.c:544:7: note: ‘snprintf’ output between 7 and 135 bytes into a destination of size 128
       snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/netlink.c:577:58: warning: ‘%s’ directive output may be truncated writing up to 127 bytes into a region of size between 121 and 122 [-Wformat-truncation=]
       snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
                                                          ^~            ~~~~~~~
src/netlink.c:577:7: note: ‘snprintf’ output between 7 and 135 bytes into a destination of size 128
       snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  CCLD     netlink.la

6 years agotable plugin: modernize code a bit
Ruben Kerkhof [Tue, 15 May 2018 19:54:09 +0000 (21:54 +0200)]
table plugin: modernize code a bit

6 years agoMerge branch 'collectd-5.8'
Ruben Kerkhof [Tue, 15 May 2018 15:05:18 +0000 (17:05 +0200)]
Merge branch 'collectd-5.8'

6 years agoMerge pull request #2776 from mfournier/unblock_pr_2737
Marc Fournier [Tue, 15 May 2018 13:37:45 +0000 (14:37 +0100)]
Merge pull request #2776 from mfournier/unblock_pr_2737

Unblock #2737

6 years agoTrigger Jenkins
Marc Fournier [Tue, 15 May 2018 12:06:02 +0000 (14:06 +0200)]
Trigger Jenkins

6 years agoMerge pull request #2774 from takahashi-tsc/bugfix-collectdmon-loop
Ruben Kerkhof [Tue, 15 May 2018 10:43:45 +0000 (12:43 +0200)]
Merge pull request #2774 from takahashi-tsc/bugfix-collectdmon-loop

Fix collecdmon not start collectd

6 years agoMerge pull request #2773 from takahashi-tsc/bugfix-writeredis-duration
Ruben Kerkhof [Tue, 15 May 2018 10:40:57 +0000 (12:40 +0200)]
Merge pull request #2773 from takahashi-tsc/bugfix-writeredis-duration

write_redis: fix "max_set_duration" deletes unexpected data

6 years agorun contrib/format.sh src/collectdmon.c
Toshiaki Takahashi [Tue, 15 May 2018 09:25:29 +0000 (09:25 +0000)]
run contrib/format.sh src/collectdmon.c

6 years agoFix collecdmon not start collectd
Toshiaki Takahashi [Tue, 15 May 2018 09:06:16 +0000 (09:06 +0000)]
Fix collecdmon not start collectd

Because collectdmon cannot exit parse command line options loop,
it cannot execute collectd start processing.

6 years agowrite_redis: fix "max_set_duration" deletes unexpected data
Toshiaki Takahashi [Tue, 15 May 2018 07:19:25 +0000 (07:19 +0000)]
write_redis: fix "max_set_duration" deletes unexpected data

The calculation result of the data range
when "max_set_duration" is used is incorrect,
because the (char []) type, i.e. string, variable "time" is used
as the number for the time calculation.
As a result, data in the wrong range is deleted.
With this change, the correct data is deleted
by calculation using a double type value.

6 years agocollectdmon: fix build failure on Xenial
Ruben Kerkhof [Tue, 15 May 2018 07:46:01 +0000 (09:46 +0200)]
collectdmon: fix build failure on Xenial

CC       src/collectdmon.o
src/collectdmon.c:262:44: error: comparison of unsigned expression >= 0 is always true [-Werror,-Wtautological-compare]
    while (((time_left = sleep(time_left)) >= 0) && loop == 0)
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~
1 error generated.

6 years agonut plugin: fix warning
Ruben Kerkhof [Mon, 14 May 2018 22:27:58 +0000 (00:27 +0200)]
nut plugin: fix warning

  CC       src/nut_la-nut.lo
In function ‘nut_ca_path’,
    inlined from ‘nut_config.part.1’ at src/nut.c:181:12,
    inlined from ‘nut_config’:
src/nut.c:148:5: warning: ‘strncpy’ specified bound depends on the length of the source argument [-Wstringop-overflow=]
     strncpy(ca_path, value, (strlen(value) + 1));
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/nut.c: In function ‘nut_config’:
src/nut.c:148:30: note: length computed here
     strncpy(ca_path, value, (strlen(value) + 1));
                              ^~~~~~~~~~~~~
  CCLD     nut.la

6 years agocollectdmon: modernize the code a bit
Ruben Kerkhof [Mon, 14 May 2018 22:08:35 +0000 (00:08 +0200)]
collectdmon: modernize the code a bit

6 years agocollectdmon: remove unneccesary cast
Ruben Kerkhof [Mon, 14 May 2018 21:38:09 +0000 (23:38 +0200)]
collectdmon: remove unneccesary cast

6 years agoFix syntax error introduced by previous
Ruben Kerkhof [Mon, 14 May 2018 21:37:22 +0000 (23:37 +0200)]
Fix syntax error introduced by previous

./configure: line 20320: syntax error near unexpected token `fi'
./configure: line 20320: `fi'
make: *** [Makefile:4418: config.status] Error 2

Oops, my bad.

6 years agoUse sane CFLAGS while checking for strtok_r
Ruben Kerkhof [Mon, 14 May 2018 21:23:36 +0000 (23:23 +0200)]
Use sane CFLAGS while checking for strtok_r

Instead of using the flags passed in via the environment.

This makes `./configure CC=clang CFLAGS="-Weverything` work properly.

6 years agoLook for more variants of liblua
Ruben Kerkhof [Mon, 14 May 2018 20:54:34 +0000 (22:54 +0200)]
Look for more variants of liblua

So we pick up liblua automatically on OpenBSD.

6 years agosnmp plugin: add some missing error handling
Ruben Kerkhof [Mon, 14 May 2018 20:12:28 +0000 (22:12 +0200)]
snmp plugin: add some missing error handling

Fixes CID #179226

6 years agowrite_sensu plugin: use the right size for buffer
Ruben Kerkhof [Mon, 14 May 2018 20:08:35 +0000 (22:08 +0200)]
write_sensu plugin: use the right size for buffer

I missed that r is a pointer, not an array.
Fixes CID #185580

6 years agowrite_riemann plugin: fix warning
Ruben Kerkhof [Mon, 14 May 2018 13:22:17 +0000 (15:22 +0200)]
write_riemann plugin: fix warning

src/write_riemann.c:185:50: warning: unused parameter 'host' [-Wunused-parameter]
wrr_notification_to_message(struct riemann_host *host, /* {{{ */
                                                 ^
1 warning generated.

6 years agowrite_sensu plugin: remove unused parameter
Ruben Kerkhof [Mon, 14 May 2018 13:18:33 +0000 (15:18 +0200)]
write_sensu plugin: remove unused parameter

  CC       src/write_sensu.lo
src/write_sensu.c:341:38: warning: unused parameter 'status' [-Wunused-parameter]
                                 int status) {
                                     ^
1 warning generated.

6 years agocurl_json_test.c: fix warnings
Ruben Kerkhof [Mon, 14 May 2018 13:14:32 +0000 (15:14 +0200)]
curl_json_test.c: fix warnings

src/curl_json_test.c:142:14: warning: unused parameter 'argc' [-Wunused-parameter]
int main(int argc, char **argv) {
             ^
src/curl_json_test.c:142:27: warning: unused parameter 'argv' [-Wunused-parameter]
int main(int argc, char **argv) {
                          ^
2 warnings generated.

6 years agoBind plugin: remove unused parameters
Ruben Kerkhof [Mon, 14 May 2018 13:08:22 +0000 (15:08 +0200)]
Bind plugin: remove unused parameters

  CC       src/bind_la-bind.lo
src/bind.c:911:49: warning: unused parameter 'statsnode' [-Wunused-parameter]
                                       xmlNode *statsnode,
                                                ^
src/bind.c:943:67: warning: unused parameter 'statsnode' [-Wunused-parameter]
                              xmlXPathContext *xpathCtx, xmlNode *statsnode,
                                                                  ^
src/bind.c:1062:70: warning: unused parameter 'statsnode' [-Wunused-parameter]
                                 xmlXPathContext *xpathCtx, xmlNode *statsnode,
                                                                     ^
3 warnings generated.

6 years agocollectd-tg: fix warning
Ruben Kerkhof [Mon, 14 May 2018 12:57:00 +0000 (14:57 +0200)]
collectd-tg: fix warning

src/collectd-tg.c:98:32: warning: unused parameter 'signal' [-Wunused-parameter]
static void signal_handler(int signal) /* {{{ */
                               ^

6 years agoMerge pull request #2772 from rubenk/static-initializers
Ruben Kerkhof [Mon, 14 May 2018 12:52:04 +0000 (14:52 +0200)]
Merge pull request #2772 from rubenk/static-initializers

Don't initialize static pointers to NULL

6 years agoRemove unreachable break statement
Ruben Kerkhof [Mon, 14 May 2018 12:25:06 +0000 (14:25 +0200)]
Remove unreachable break statement

src/daemon/collectd.c:492:7: warning: 'break' will never be executed [-Wunreachable-code-break]
      break;
      ^~~~~

6 years agoDon't initialize static numeric variables to 0
Ruben Kerkhof [Mon, 14 May 2018 12:10:34 +0000 (14:10 +0200)]
Don't initialize static numeric variables to 0

6 years agoDon't initialize static pointers to NULL
Ruben Kerkhof [Mon, 14 May 2018 10:48:25 +0000 (12:48 +0200)]
Don't initialize static pointers to NULL

This is the default

6 years agotcpconns: remove redundant include
Ruben Kerkhof [Mon, 14 May 2018 10:17:07 +0000 (12:17 +0200)]
tcpconns: remove redundant include

6 years agoMerge pull request #2771 from rubenk/stdbool
Ruben Kerkhof [Mon, 14 May 2018 09:38:16 +0000 (11:38 +0200)]
Merge pull request #2771 from rubenk/stdbool

Stdbool

6 years agoUse true and false for assignments to bool
Ruben Kerkhof [Sun, 13 May 2018 18:38:40 +0000 (20:38 +0200)]
Use true and false for assignments to bool

6 years agoclang-format
Ruben Kerkhof [Sun, 13 May 2018 17:30:31 +0000 (19:30 +0200)]
clang-format

6 years agoSet static bools to true instead of 1
Ruben Kerkhof [Sun, 13 May 2018 17:05:33 +0000 (19:05 +0200)]
Set static bools to true instead of 1

6 years agoNo need to initialize static bools to false
Ruben Kerkhof [Sun, 13 May 2018 16:56:18 +0000 (18:56 +0200)]
No need to initialize static bools to false

6 years agoTreewide: use bool instead of _Bool
Ruben Kerkhof [Sun, 13 May 2018 16:35:29 +0000 (18:35 +0200)]
Treewide: use bool instead of _Bool

It's about time

6 years agowrite_sensu: use sstrncpy
Ruben Kerkhof [Sun, 13 May 2018 15:06:54 +0000 (17:06 +0200)]
write_sensu: use sstrncpy

Fixes:
  CC       src/write_sensu.lo
src/write_sensu.c: In function ‘replace_str’:
src/write_sensu.c:630:3: warning: ‘strncpy’ output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
   strncpy(r, p, strlen(p));
   ^~~~~~~~~~~~~~~~~~~~~~~~
  CCLD     write_sensu.la

6 years agoMerge pull request #2767 from rpv-tomsk/tmpfix
Ruben Kerkhof [Mon, 7 May 2018 20:13:11 +0000 (22:13 +0200)]
Merge pull request #2767 from rpv-tomsk/tmpfix

netlink plugin: Handle new counter from Linux kernel version 4.6+.

6 years agonetlink plugin: Report `rx_nohandler` stats
Pavel Rochnyack [Mon, 7 May 2018 16:39:35 +0000 (23:39 +0700)]
netlink plugin: Report `rx_nohandler` stats

Added metric for new counter from Linux kernel version 4.6+.

Issue: #2510

6 years agonetlink plugin: Use of less strict rules in link_filter_cb()
Pavel Rochnyack [Mon, 7 May 2018 15:53:23 +0000 (22:53 +0700)]
netlink plugin: Use of less strict rules in link_filter_cb()

mnl_attr_validate2() function implements strict equality check of kernel and
userspace structures size. Additional counters was added to 4.6 Linux kernel,
sizes was changed and mismatch can occur.

This patch weakened validation.
Now Collectd just checks if structures, received from kernel space, has enough
data.

Closes: #2510

6 years agoMerge pull request #2761 from dago/patch-3
Ruben Kerkhof [Thu, 3 May 2018 13:51:32 +0000 (15:51 +0200)]
Merge pull request #2761 from dago/patch-3

Add endianness checks for AIX

6 years agoAdd endianness checks for AIX
Dagobert Michelsen [Thu, 3 May 2018 10:42:28 +0000 (12:42 +0200)]
Add endianness checks for AIX

6 years agoMerge pull request #2755 from dehotot/debug-option-rpms
Ruben Kerkhof [Wed, 2 May 2018 15:19:10 +0000 (17:19 +0200)]
Merge pull request #2755 from dehotot/debug-option-rpms

Add ability to turn on collectd "debug" feature in RPMs

6 years agoaggregation plugin: modernize the code a bit
Ruben Kerkhof [Wed, 2 May 2018 13:26:43 +0000 (15:26 +0200)]
aggregation plugin: modernize the code a bit

6 years agoapache plugin: modernize the code a bit
Ruben Kerkhof [Wed, 2 May 2018 13:15:15 +0000 (15:15 +0200)]
apache plugin: modernize the code a bit

6 years agoRun clang-format on src/bind.c after my change
Ruben Kerkhof [Wed, 2 May 2018 12:21:14 +0000 (14:21 +0200)]
Run clang-format on src/bind.c after my change

6 years agobind plugin: modernize the code a bit
Ruben Kerkhof [Wed, 2 May 2018 12:19:07 +0000 (14:19 +0200)]
bind plugin: modernize the code a bit

6 years agowrite_tsdb: ansify function declaration
Ruben Kerkhof [Wed, 2 May 2018 11:17:13 +0000 (13:17 +0200)]
write_tsdb: ansify function declaration

6 years agoDo not hide prototype of check_capability()
Ruben Kerkhof [Wed, 2 May 2018 10:42:56 +0000 (12:42 +0200)]
Do not hide prototype of check_capability()

We have a fallback definition for if <sys/capability.h> is not found.
That definition needs a prototype.

Noticed while checking with sparse on Mac OS.

6 years agoMerge branch 'collectd-5.8'
Ruben Kerkhof [Wed, 2 May 2018 10:27:01 +0000 (12:27 +0200)]
Merge branch 'collectd-5.8'

Conflicts:
src/collectd.conf.pod

6 years agoconfigure.ac: return is not a function
Ruben Kerkhof [Wed, 2 May 2018 10:23:56 +0000 (12:23 +0200)]
configure.ac: return is not a function

6 years agonetwork_parse.c: ansify function definition
Ruben Kerkhof [Wed, 2 May 2018 10:17:13 +0000 (12:17 +0200)]
network_parse.c: ansify function definition

6 years agoMerge pull request #2691 from lilydjwg/master
Pavel Rochnyak [Tue, 1 May 2018 12:13:51 +0000 (19:13 +0700)]
Merge pull request #2691 from lilydjwg/master

ping plugin: support specifying the address family

6 years agoping plugin: doc: wrap long lines
lilydjwg [Tue, 1 May 2018 11:52:53 +0000 (19:52 +0800)]
ping plugin: doc: wrap long lines

6 years agoAuto-Merge pull request #2760 from rpv-tomsk/tmpfix
collectd bot [Tue, 1 May 2018 09:12:01 +0000 (11:12 +0200)]
Auto-Merge pull request #2760 from rpv-tomsk/tmpfix

Automatically merged due to "Automerge" label

6 years agoping plugin: warn on invalid AddressFamily value instead of error
lilydjwg [Tue, 1 May 2018 08:40:09 +0000 (16:40 +0800)]
ping plugin: warn on invalid AddressFamily value instead of error

6 years agodocs: Fix typo in collectd.conf.pod
Pavel Rochnyack [Tue, 1 May 2018 08:30:43 +0000 (15:30 +0700)]
docs: Fix typo in collectd.conf.pod

6 years agoping plugin: reformat
lilydjwg [Tue, 1 May 2018 07:14:26 +0000 (15:14 +0800)]
ping plugin: reformat

6 years agoping plugin: update docs for AddressFamily option
lilydjwg [Tue, 1 May 2018 06:52:44 +0000 (14:52 +0800)]
ping plugin: update docs for AddressFamily option

6 years agoping plugin: check AddressFamily option value in ping_config
lilydjwg [Tue, 1 May 2018 06:10:30 +0000 (14:10 +0800)]
ping plugin: check AddressFamily option value in ping_config

6 years agoAdd ability to turn on collectd "debug" feature in RPMs
Alex White [Fri, 27 Apr 2018 09:47:04 +0000 (10:47 +0100)]
Add ability to turn on collectd "debug" feature in RPMs

6 years agoMerge pull request #2740 from melak/ros_radioname_null
Ruben Kerkhof [Mon, 9 Apr 2018 11:18:03 +0000 (13:18 +0200)]
Merge pull request #2740 from melak/ros_radioname_null

Fix routeros unset radio-name showing up as "(null)"

6 years agoMerge pull request #2741 from dago/mac
Ruben Kerkhof [Thu, 5 Apr 2018 17:05:32 +0000 (19:05 +0200)]
Merge pull request #2741 from dago/mac

Fix gcc issue on Mac byteorder

6 years agoFix gcc issue on Mac byteorder
Dagobert Michelsen [Thu, 5 Apr 2018 08:49:30 +0000 (10:49 +0200)]
Fix gcc issue on Mac byteorder

6 years agoFix routeros unset radio-name showing up as "(null)"
Tamas TEVESZ [Wed, 4 Apr 2018 16:25:28 +0000 (18:25 +0200)]
Fix routeros unset radio-name showing up as "(null)"

This happens when the `radio-name` property is unset on a wireless
interface. Why this is done is beyond me, but it does seem to be a thing.

6 years agoFix compilation on OpenBSD
Ruben Kerkhof [Wed, 4 Apr 2018 15:02:29 +0000 (17:02 +0200)]
Fix compilation on OpenBSD

  CC       src/libcollectdclient/libcollectdclient_la-server.lo
In file included from src/libcollectdclient/server.c:37:
/usr/include/net/if.h:121: error: field 'ifi_lastchange' has incomplete type
/usr/include/net/if.h:369: error: field 'ifru_addr' has incomplete type
/usr/include/net/if.h:370: error: field 'ifru_dstaddr' has incomplete type
/usr/include/net/if.h:371: error: field 'ifru_broadaddr' has incomplete type
/usr/include/net/if.h:399: error: field 'ifrau_addr' has incomplete type
/usr/include/net/if.h:405: error: field 'ifra_dstaddr' has incomplete type
/usr/include/net/if.h:407: error: field 'ifra_mask' has incomplete type
/usr/include/net/if.h:450: error: field 'addr' has incomplete type
/usr/include/net/if.h:451: error: field 'dstaddr' has incomplete type
/usr/include/net/if.h:457: error: expected specifier-qualifier-list before 'sa_family_t'
In file included from /usr/include/net/if.h:466,
                 from src/libcollectdclient/server.c:37:
/usr/include/net/if_arp.h:79: error: field 'arp_pa' has incomplete type
/usr/include/net/if_arp.h:80: error: field 'arp_ha' has incomplete type
*** Error 1 in . (Makefile:6017 'src/libcollectdclient/libcollectdclient_la-server.lo': @echo "  CC      " src/libcollectdclient/libcollectd...)
*** Error 1 in /home/ruben/src/collectd (Makefile:4188 'all')

6 years agoMerge pull request #2690 from shastah/fix-spec-typo
Ruben Kerkhof [Wed, 4 Apr 2018 14:52:56 +0000 (16:52 +0200)]
Merge pull request #2690 from shastah/fix-spec-typo

RPM spec: fix mbmon/mcelog typo

6 years agoMerge pull request #2717 from dago/endian
Ruben Kerkhof [Wed, 4 Apr 2018 12:44:44 +0000 (14:44 +0200)]
Merge pull request #2717 from dago/endian

Add fallback for endianness conversion

6 years agoFix conditional on byteorder to work on Solaris
Dagobert Michelsen [Wed, 4 Apr 2018 12:34:15 +0000 (14:34 +0200)]
Fix conditional on byteorder to work on Solaris

6 years agoMerge pull request #2376 from zerkms/ISSUE-2358
Ruben Kerkhof [Tue, 3 Apr 2018 21:29:17 +0000 (23:29 +0200)]
Merge pull request #2376 from zerkms/ISSUE-2358

Skip `0.0.0.0` hosts in ntpd plugin

6 years agoMerge pull request #2045 from rubenk/fix-readme
Ruben Kerkhof [Tue, 3 Apr 2018 21:28:03 +0000 (23:28 +0200)]
Merge pull request #2045 from rubenk/fix-readme

README: do not point users to non-existing file

6 years agodaemon: fix build warning
Ruben Kerkhof [Tue, 3 Apr 2018 20:00:46 +0000 (22:00 +0200)]
daemon: fix build warning

src/daemon/collectd.c:579:9: warning: declaration shadows a local variable [-Wshadow]
    int status;
        ^
src/daemon/collectd.c:558:7: note: previous declaration is here
  int status;
      ^

6 years agodaemon: make function static
Ruben Kerkhof [Tue, 3 Apr 2018 19:56:55 +0000 (21:56 +0200)]
daemon: make function static

Fixes the following build warning:

src/daemon/collectd.c:499:5: warning: no previous prototype for function 'configure_collectd' [-Wmissing-prototypes]
int configure_collectd(struct cmdline_config *config) {
    ^

6 years agodaemon: make function static
Ruben Kerkhof [Tue, 3 Apr 2018 19:55:49 +0000 (21:55 +0200)]
daemon: make function static

Fixes a build warning:

src/daemon/collectd.c:452:6: warning: no previous prototype for function 'read_cmdline' [-Wmissing-prototypes]
void read_cmdline(int argc, char **argv, struct cmdline_config *config) {
     ^

6 years agofilecount plugin: mark function as static
Ruben Kerkhof [Tue, 3 Apr 2018 19:48:27 +0000 (21:48 +0200)]
filecount plugin: mark function as static

Fixes a build warning:

CC       src/filecount.lo
src/filecount.c:66:6: warning: no previous prototype for function 'fc_free_dir' [-Wmissing-prototypes]
void fc_free_dir(fc_directory_conf_t *dir) {
     ^
1 warning generated.

6 years agoMerge branch 'master' into endian
Dagobert Michelsen [Tue, 3 Apr 2018 12:42:56 +0000 (14:42 +0200)]
Merge branch 'master' into endian

6 years agoInclude config.h early or _FILE_OFFSET_BITS is wrongly defined and bails out on Solar...
Dagobert Michelsen [Thu, 22 Mar 2018 13:54:01 +0000 (14:54 +0100)]
Include config.h early or _FILE_OFFSET_BITS is wrongly defined and bails out on Solaris 32 bit

6 years agoMerge pull request #2716 from dago/kstat
Ruben Kerkhof [Sat, 31 Mar 2018 10:18:39 +0000 (12:18 +0200)]
Merge pull request #2716 from dago/kstat

Include kstat.h when available

6 years agoMerge pull request #2688 from dstathis/master
Ruben Kerkhof [Sat, 31 Mar 2018 10:16:28 +0000 (12:16 +0200)]
Merge pull request #2688 from dstathis/master

change HAVE_UDEV_H to HAVE_LIBUDEV_H for bug 2651

6 years agoMerge pull request #2731 from elfiesmelfie/ovs_fixes
Ruben Kerkhof [Sat, 31 Mar 2018 09:17:08 +0000 (11:17 +0200)]
Merge pull request #2731 from elfiesmelfie/ovs_fixes

Ovs Fixes

6 years agoMerge remote-tracking branch 'origin/collectd-5.8'
Ruben Kerkhof [Fri, 30 Mar 2018 13:42:12 +0000 (15:42 +0200)]
Merge remote-tracking branch 'origin/collectd-5.8'

6 years agoAuto-Merge pull request #2736 from rpv-tomsk/collectd-collectd-5.8
collectd bot [Thu, 29 Mar 2018 19:17:13 +0000 (21:17 +0200)]
Auto-Merge pull request #2736 from rpv-tomsk/collectd-collectd-5.8

Automatically merged due to "Automerge" label

6 years agouuid plugin: Fixed hostname setting
Pavel Rochnyack [Thu, 29 Mar 2018 18:27:14 +0000 (01:27 +0700)]
uuid plugin: Fixed hostname setting

Closes: #2723
References: #2467

6 years agoMerge pull request #2722 from elfiesmelfie/increase_buffer
Pavel Rochnyak [Wed, 28 Mar 2018 15:28:12 +0000 (22:28 +0700)]
Merge pull request #2722 from elfiesmelfie/increase_buffer

dpdk: increase buffer size for parsing lcores

6 years agoMerge pull request #2721 from elfiesmelfie/update_README
Pavel Rochnyak [Wed, 28 Mar 2018 15:27:31 +0000 (22:27 +0700)]
Merge pull request #2721 from elfiesmelfie/update_README

README: Include compiler defenses suggestion

6 years agoMerge pull request #2703 from elfiesmelfie/fix_ipmi_bugfix_0.2
Pavel Rochnyak [Wed, 28 Mar 2018 15:26:21 +0000 (22:26 +0700)]
Merge pull request #2703 from elfiesmelfie/fix_ipmi_bugfix_0.2

Fixes for ipmi plugin

6 years agoMerge pull request #2704 from dhrupadb/patch-1
Pavel Rochnyak [Wed, 28 Mar 2018 14:39:24 +0000 (21:39 +0700)]
Merge pull request #2704 from dhrupadb/patch-1

Properly cleanup dropped MySQL connections.

6 years agoMerge pull request #2735 from rpv-tomsk/collectd-master
Pavel Rochnyak [Wed, 28 Mar 2018 14:17:48 +0000 (21:17 +0700)]
Merge pull request #2735 from rpv-tomsk/collectd-master

Tree wide: Replace sstrerror() with STRERRNO.

6 years agoAuto-Merge pull request #2734 from rpv-tomsk/fix-2732
collectd bot [Wed, 28 Mar 2018 14:12:50 +0000 (16:12 +0200)]
Auto-Merge pull request #2734 from rpv-tomsk/fix-2732

Automatically merged due to "Automerge" label

6 years agoTree wide: Replace sstrerror() with STRERRNO.
Pavel Rochnyack [Sat, 10 Feb 2018 11:40:06 +0000 (18:40 +0700)]
Tree wide: Replace sstrerror() with STRERRNO.

References: #2519

6 years agoperl plugin: Fix compile fail with message "void function cannot return value"
Pavel Rochnyack [Wed, 28 Mar 2018 13:23:32 +0000 (20:23 +0700)]
perl plugin: Fix compile fail with message "void function cannot return value"

Closes: #2732

6 years agoutils_ovs: fix resource leaks
Kavanagh, Mark B [Tue, 27 Feb 2018 17:28:55 +0000 (17:28 +0000)]
utils_ovs: fix resource leaks

In ovs_db_init(), upon failure of either ovs_db_event_thread_init()
and/or ovs_db_poll_thread_init(), ovs_db_destroy() is invoked, in
order to release OVSDB data resources.

However, in the event that ovs_db_destroy() returns an error value,
some OVSDB resources are never released, and are consequently lost.

Resolve this issue by checking the return value of ovs_db_destroy()
and manually releasing the appropriate resources accordingly.

Fixes: 5a90d0e ("ovs_events: Address PR comments")
Signed-off-by: Kavanagh, Mark B <mark.b.kavanagh@intel.com>
6 years agoutils_ovs: fix potential NULL
Kavanagh, Mark B [Mon, 26 Feb 2018 17:08:31 +0000 (17:08 +0000)]
utils_ovs: fix potential NULL

In ovs_utils_get_map_value(), YAJL_GET_ARRAY may return a NULL
pointer, which is subsequently dereferenced. Ensure that the
pointer is non-NULL before proceeding.

Fixes: 12f6497 ("ovs_events: Add external ids as metadata")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
6 years agoutils_ovs: fix potential NULL-string dereference
Kavanagh, Mark B [Mon, 26 Feb 2018 16:12:26 +0000 (16:12 +0000)]
utils_ovs: fix potential NULL-string dereference

In ovs_utils_get_map_value(), a potential NULL-string, returned
by YAJL_GET_STRING(), is passed to strcmp, and subsequently
dereferenced. Ensure that said string is non-NULL.

Fixes: cb59d85 ("ovs_events: Fix plugin collectd config file")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
6 years agoovs_stats: fix potential NULL array dereference
Kavanagh, Mark B [Mon, 26 Feb 2018 14:49:00 +0000 (14:49 +0000)]
ovs_stats: fix potential NULL array dereference

In ovs_stats_update_bridge(), YAJL_GET_ARRAY() may return a NULL
pointer. Ensure that a non-NULL pointer is returned, before
attempting to dererence same.

Fixes: 4256753 ("ovs_events: fix scan-build warnings #2205")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
6 years agoutils_ovs: fix potential NULL dereference
Mark Kavanagh [Mon, 19 Feb 2018 16:39:31 +0000 (16:39 +0000)]
utils_ovs: fix potential NULL dereference

In ovs_utils_get_map_value(), YAJL_GET_ARRAY may return NULL,
which is subsequently dereferenced.

Ensure that the returned pointer is non-NULL before attempting
to dereference it.

Fixes: 12f6497 ("ovs_events: Add external ids as metadata")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
6 years agoovs_stats: fix memory leak
Mark Kavanagh [Thu, 22 Feb 2018 11:55:44 +0000 (11:55 +0000)]
ovs_stats: fix memory leak

In ovs_stats_plugin_config(), memory may be allocated from the heap,
but is not subsequently freed in the case of failure later in the
function.

Fixes: bcf9c48 ("ovs_stats plugin: Fix a memory leak.")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
6 years agoovs_stats: fix potential NULL-string dereference
Mark Kavanagh [Wed, 21 Feb 2018 16:15:01 +0000 (16:15 +0000)]
ovs_stats: fix potential NULL-string dereference

The YAJL_GET_STRING macro may return NULL; ensure that the returned
string is non-NULL, before passing it to ovs_stats_new_port(), within
the context of the ovs_stats_update_bridge() function.

Since this change introduces another return path, a single 'failure'
return point is introduced to ovs_stats_bridge().

Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
6 years agoutils_ovs: fix potential strcmp() NULL ptr param
Mark Kavanagh [Mon, 19 Feb 2018 15:55:45 +0000 (15:55 +0000)]
utils_ovs: fix potential strcmp() NULL ptr param

YAJL_GET_STRING(array_values[0]) may return NULL if
array_values[0]->string is NULL; passing a NULL parameter to
strcmp() is not recommended, since the resultant behaviour may
be undefined.

Resolve the issue by adding a NULL check for the string returned
by YAJL_GET_STRING.

Fixes: cbq59d853 ("ovs_events: Fix plugin collectd config file")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
6 years agoovs_stats: fix potential NULL dereference
Mark Kavanagh [Mon, 19 Feb 2018 15:23:46 +0000 (15:23 +0000)]
ovs_stats: fix potential NULL dereference

ovs_stats_update_iface() passes a pointer to a potentially-NULL
string to sstrncpy(); this is obviously problematic.

Add a check to ensure that the relevant string is non-NULL.

Fixes: 1cc7599 ("ovs_stats plugin: Fix null dereference of "port".)
Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>