From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sun, 26 Oct 2014 18:45:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/488'
X-Git-Tag: collectd-5.5.0~169
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=5c78be034ebf8edbf2ae98e9163a38b2d61fbb68;p=collectd.git

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

5c78be034ebf8edbf2ae98e9163a38b2d61fbb68
diff --cc src/tcpconns.c
index 5a042314,7c427e5f..bb089b0f
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@@ -277,15 -274,12 +278,17 @@@ static const char *config_keys[] 
  static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
  
  static int port_collect_listening = 0;
+ static int port_collect_total = 0;
  static port_entry_t *port_list_head = NULL;
+ static uint32_t count_total[TCP_STATE_MAX + 1];
  
  #if KERNEL_LINUX
 +#if HAVE_STRUCT_LINUX_INET_DIAG_REQ
 +/* This depends on linux inet_diag_req because if this structure is missing,
 + * sequence_number is useless and we get a compilation warning.
 + */
  static uint32_t sequence_number = 0;
 +#endif
  
  enum
  {