X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fiptables.c;h=c48199ad26c7d7059b105160e695e36b4b71d2ea;hb=caa30bd46d739c5527d59106e07568ad9056d99e;hp=1df35fa04d940b2f24e48625c3afc04ba7d0f51f;hpb=2f0dfdda8bc499fdb161c6a5850ec176e75bd4fa;p=collectd.git diff --git a/src/iptables.c b/src/iptables.c index 1df35fa0..c48199ad 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -47,22 +47,6 @@ * them Although other collectd models don't seem to care much for options * eitherway for what to log */ -/* Limit to ~125MByte/s (~1GBit/s) */ -static data_source_t dsrc[1] = -{ - {"value", DS_TYPE_COUNTER, 0.0, 134217728.0} -}; - -static data_set_t ipt_bytes_ds = -{ - "ipt_bytes", 1, dsrc -}; - -static data_set_t ipt_packets_ds = -{ - "ipt_packets", 1, dsrc -}; - #if IPTABLES_HAVE_READ /* * Config format should be `Chain table chainname', @@ -351,29 +335,22 @@ static int iptables_shutdown (void) int i; for (i = 0; i < chain_num; i++) + { sfree (chain_list[i]); + } sfree (chain_list); return (0); } /* int iptables_shutdown */ #endif /* IPTABLES_HAVE_READ */ -void module_register (modreg_e load) +void module_register (void) { - if (load & MR_DATASETS) - { - plugin_register_data_set (&ipt_bytes_ds); - plugin_register_data_set (&ipt_packets_ds); - } - #if IPTABLES_HAVE_READ - if (load & MR_READ) - { - plugin_register_config ("iptables", iptables_config, - config_keys, config_keys_num); - plugin_register_read ("iptables", iptables_read); - plugin_register_shutdown ("iptables", iptables_shutdown); - } + plugin_register_config ("iptables", iptables_config, + config_keys, config_keys_num); + plugin_register_read ("iptables", iptables_read); + plugin_register_shutdown ("iptables", iptables_shutdown); #endif } /* void module_register */