X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fconntrack.c;h=3cd2deeed3553412a6bfdf6ce672409b8d4aafce;hp=4a72b2f61dc91d2b1eab973363139f65d03e6412;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=03af72c5ef8b98ddfcab87ea44b764f5b0e165aa diff --git a/src/conntrack.c b/src/conntrack.c index 4a72b2f6..3cd2deee 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -27,7 +27,7 @@ #include "plugin.h" #if !KERNEL_LINUX -# error "No applicable input method." +#error "No applicable input method." #endif #define CONNTRACK_FILE "/proc/sys/net/netfilter/nf_conntrack_count" @@ -35,72 +35,61 @@ #define CONNTRACK_FILE_OLD "/proc/sys/net/ipv4/netfilter/ip_conntrack_count" #define CONNTRACK_MAX_FILE_OLD "/proc/sys/net/ipv4/netfilter/ip_conntrack_max" -static const char *config_keys[] = -{ - "OldFiles" -}; -static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); +static const char *config_keys[] = {"OldFiles"}; +static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); /* Each table/chain combo that will be queried goes into this list */ static int old_files = 0; -static int conntrack_config(const char *key, const char *value) -{ - if (strcmp(key, "OldFiles") == 0) - old_files = 1; +static int conntrack_config(const char *key, const char *value) { + if (strcmp(key, "OldFiles") == 0) + old_files = 1; - return 0; + return 0; } -static void conntrack_submit (const char *type, const char *type_instance, - value_t conntrack) -{ - value_list_t vl = VALUE_LIST_INIT; - - vl.values = &conntrack; - vl.values_len = 1; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "conntrack", sizeof (vl.plugin)); - sstrncpy (vl.type, type, sizeof (vl.type)); - if (type_instance != NULL) - sstrncpy (vl.type_instance, type_instance, - sizeof (vl.type_instance)); - - plugin_dispatch_values (&vl); +static void conntrack_submit(const char *type, const char *type_instance, + value_t conntrack) { + value_list_t vl = VALUE_LIST_INIT; + + vl.values = &conntrack; + vl.values_len = 1; + sstrncpy(vl.plugin, "conntrack", sizeof(vl.plugin)); + sstrncpy(vl.type, type, sizeof(vl.type)); + if (type_instance != NULL) + sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance)); + + plugin_dispatch_values(&vl); } /* static void conntrack_submit */ -static int conntrack_read (void) -{ - value_t conntrack, conntrack_max, conntrack_pct; +static int conntrack_read(void) { + value_t conntrack, conntrack_max, conntrack_pct; - char const *path = old_files ? CONNTRACK_FILE_OLD : CONNTRACK_FILE; - if (parse_value_file (path, &conntrack, DS_TYPE_GAUGE) != 0) - { - ERROR ("conntrack plugin: Reading \"%s\" failed.", path); - return (-1); - } + char const *path = old_files ? CONNTRACK_FILE_OLD : CONNTRACK_FILE; + if (parse_value_file(path, &conntrack, DS_TYPE_GAUGE) != 0) { + ERROR("conntrack plugin: Reading \"%s\" failed.", path); + return -1; + } - path = old_files ? CONNTRACK_MAX_FILE_OLD : CONNTRACK_MAX_FILE; - if (parse_value_file (path, &conntrack_max, DS_TYPE_GAUGE) != 0) - { - ERROR ("conntrack plugin: Reading \"%s\" failed.", path); - return (-1); - } + path = old_files ? CONNTRACK_MAX_FILE_OLD : CONNTRACK_MAX_FILE; + if (parse_value_file(path, &conntrack_max, DS_TYPE_GAUGE) != 0) { + ERROR("conntrack plugin: Reading \"%s\" failed.", path); + return -1; + } - conntrack_pct.gauge = (conntrack.gauge / conntrack_max.gauge) * 100; + conntrack_pct.gauge = (conntrack.gauge / conntrack_max.gauge) * 100; - conntrack_submit ("conntrack", NULL, conntrack); - conntrack_submit ("conntrack", "max", conntrack_max); - conntrack_submit ("percent", "used", conntrack_pct); + conntrack_submit("conntrack", NULL, conntrack); + conntrack_submit("conntrack", "max", conntrack_max); + conntrack_submit("percent", "used", conntrack_pct); - return (0); + return 0; } /* static int conntrack_read */ -void module_register (void) -{ - plugin_register_config ("conntrack", conntrack_config, - config_keys, config_keys_num); - plugin_register_read ("conntrack", conntrack_read); +void module_register(void) { + plugin_register_config("conntrack", conntrack_config, config_keys, + config_keys_num); + plugin_register_read("conntrack", conntrack_read); } /* void module_register */