Merge branch 'sb/iptables'

Conflicts:

	configure.in
	src/Makefile.am
	src/collectd.conf.in

diff --cc configure.in
index cf9fce2,24b3579..7251383
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1046,7 -1087,7 +1087,8 @@@ AC_COLLECTD([dns],       [disable], [mo
  AC_COLLECTD([email],     [disable], [module], [email statistics])
  AC_COLLECTD([quota],     [enable],  [module], [quota statistics (experimental)])
  AC_COLLECTD([hddtemp],   [disable], [module], [hdd temperature statistics])
+ AC_COLLECTD([iptables],  [disable], [module], [IPtables statistics])
 +AC_COLLECTD([irq],       [disable], [module], [irq statistics])
  AC_COLLECTD([load],      [disable], [module], [system load statistics])
  AC_COLLECTD([mbmon],     [disable], [module], [motherboard monitor statistics])
  AC_COLLECTD([memory],    [disable], [module], [memory statistics])
@@@ -1100,7 -1142,6 +1143,8 @@@ Configuration
      dns . . . . . . . . $enable_dns
      email . . . . . . . $enable_email
      hddtemp . . . . . . $enable_hddtemp
 +    irq . . . . . . . . $enable_irq
++    iptables  . . . . . $enable_iptables
      load  . . . . . . . $enable_load
      mbmon . . . . . . . $enable_mbmon
      memory  . . . . . . $enable_memory

diff --cc src/Makefile.am
index 2e2d637,88ce2c4..aee7479
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -208,14 -208,17 +208,25 @@@ collectd_LDADD += "-dlopen" hddtemp.l
  collectd_DEPENDENCIES += hddtemp.la
  endif
  
+ if BUILD_MODULE_IPTABLES
+ pkglib_LTLIBRARIES += iptables.la
+ iptables_la_SOURCES = iptables.c
+ iptables_la_LDFLAGS = -module -avoid-version
+ if BUILD_WITH_LIBIPTC
+ iptables_la_LDFLAGS += -liptc
+ endif
+ collectd_LDADD += "-dlopen" iptables.la
+ collectd_DEPENDENCIES += iptables.la
+ endif
+ 
 +if BUILD_MODULE_IRQ
 +pkglib_LTLIBRARIES += irq.la
 +irq_la_SOURCES = irq.c
 +irq_la_LDFLAGS = -module -avoid-version
 +collectd_LDADD += "-dlopen" irq.la
 +collectd_DEPENDENCIES += irq.la
 +endif
 +
  if BUILD_MODULE_LOAD
  pkglib_LTLIBRARIES += load.la
  load_la_SOURCES = load.c

diff --cc src/collectd.conf.in
index fcceb54,7cfcc9d..b3f9963
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -30,7 -30,7 +30,8 @@@
  @BUILD_MODULE_DISK_TRUE@LoadPlugin disk
  @BUILD_MODULE_DNS_TRUE@LoadPlugin dns
  @BUILD_MODULE_HDDTEMP_TRUE@LoadPlugin hddtemp
+ @BUILD_MODULE_IPTABLES_TRUE@LoadPlugin iptables
 +@BUILD_MODULE_IRQ_TRUE@LoadPlugin irq
  @BUILD_MODULE_LOAD_TRUE@LoadPlugin load
  @BUILD_MODULE_MBMON_TRUE@LoadPlugin mbmon
  @BUILD_MODULE_MEMORY_TRUE@LoadPlugin memory
@@@ -71,13 -71,10 +72,17 @@@
  #     Port 7634
  #</Plugin>
  
+ #<Plugin iptables>
+ #     Chain table chain
+ #</Plugin>
+ 
 +#<Plugin irq>
 +#     Irq 7
 +#     Irq 8
 +#     Irq 9
 +#     IgnoreSelected true
 +#</Plugin>
 +
  #<Plugin mbmon>
  #     Host 127.0.0.1
  #     Port 411