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

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/tcpconns.c
index 5a042314d759f97a4b906d0d40f0b19798939a44,7c427e5f940b1a018e25b50533c5d1fd978689db..bb089b0f17aca93cce3620dba2cc445d6d46f3e1
--- 1/src/tcpconns.c
--- 2/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
  {