X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fiptables.c;h=e035a88818f7069c9575beb6beae42d4e64e561a;hb=f8d0e8e1ab1bf901f43398b8549c302b85979b40;hp=12275cd09921aa594ba0e2f80e49b6c3da296780;hpb=a940e2555464956ae7b61d8d0d742f2acc001c5f;p=collectd.git diff --git a/src/iptables.c b/src/iptables.c index 12275cd0..e035a888 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -1,7 +1,8 @@ /** * collectd - src/iptables.c - * Copyright (C) 2007 Sjoerd van der Berg - * Copyright (C) 2007 Florian octo Forster + * Copyright (C) 2007 Sjoerd van der Berg + * Copyright (C) 2007-2010 Florian octo Forster + * Copyright (C) 2009 Marco Chiappero * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -19,18 +20,36 @@ * * Authors: * Sjoerd van der Berg - * Florian Forster + * Florian Forster + * Marco Chiappero **/ #include "collectd.h" + #include "common.h" #include "plugin.h" #include "configfile.h" -#if OWN_LIBIPTC -# include "libiptc/libiptc.h" -#else -# include +#include +#include + +/* + * iptc_handle_t was available before libiptc was officially available as a + * shared library. Note, that when the shared lib was introduced, the API and + * ABI have changed slightly: + * 'iptc_handle_t' used to be 'struct iptc_handle *' and most functions used + * 'iptc_handle_t *' as an argument. Now, most functions use 'struct + * iptc_handle *' (thus removing one level of pointer indirection). + * + * HAVE_IPTC_HANDLE_T is used to determine which API ought to be used. While + * this is somewhat hacky, I didn't find better way to solve that :-/ + * -tokkee + */ +#ifndef HAVE_IPTC_HANDLE_T +typedef struct iptc_handle iptc_handle_t; +#endif +#ifndef HAVE_IP6TC_HANDLE_T +typedef struct ip6tc_handle ip6tc_handle_t; #endif /* @@ -43,29 +62,37 @@ */ static const char *config_keys[] = { - "Chain", - NULL + "Chain", + "Chain6" }; -static int config_keys_num = 1; +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); +enum protocol_version_e +{ + IPV4, + IPV6 +}; +typedef enum protocol_version_e protocol_version_t; + /* - Each table/chain combo that will be queried goes into this list -*/ + * Each table/chain combo that will be queried goes into this list + */ #ifndef XT_TABLE_MAXNAMELEN # define XT_TABLE_MAXNAMELEN 32 #endif typedef struct { + protocol_version_t ip_version; char table[XT_TABLE_MAXNAMELEN]; char chain[XT_TABLE_MAXNAMELEN]; union { - int num; - char *comment; + int num; + char *comment; } rule; enum { - RTYPE_NUM, - RTYPE_COMMENT, - RTYPE_COMMENT_ALL + RTYPE_NUM, + RTYPE_COMMENT, + RTYPE_COMMENT_ALL } rule_type; char name[64]; } ip_chain_t; @@ -75,129 +102,202 @@ static int chain_num = 0; static int iptables_config (const char *key, const char *value) { - if (strcasecmp (key, "Chain") == 0) - { - ip_chain_t temp, *final, **list; - char *table; - int table_len; - char *chain; - int chain_len; - - char *value_copy; - char *fields[4]; - int fields_num; - - memset (&temp, 0, sizeof (temp)); - - value_copy = strdup (value); - if (value_copy == NULL) - { - char errbuf[1024]; - ERROR ("strdup failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - return (1); - } - - /* Chain [ [name]] */ - fields_num = strsplit (value_copy, fields, 4); - if (fields_num < 2) - { - free (value_copy); - return (1); - } - - table = fields[0]; - chain = fields[1]; - - table_len = strlen (table) + 1; - if ((unsigned int)table_len > sizeof(temp.table)) - { - ERROR ("Table `%s' too long.", table); - free (value_copy); - return (1); - } - sstrncpy (temp.table, table, table_len); - - chain_len = strlen (chain) + 1; - if ((unsigned int)chain_len > sizeof(temp.chain)) - { - ERROR ("Chain `%s' too long.", chain); - free (value_copy); - return (1); - } - sstrncpy (temp.chain, chain, chain_len); - - if (fields_num >= 3) - { - char *comment = fields[2]; - int rule = atoi (comment); - - if (rule) - { - temp.rule.num = rule; - temp.rule_type = RTYPE_NUM; - } - else - { - temp.rule.comment = strdup (comment); - if (temp.rule.comment == NULL) - { - free (value_copy); - return (1); - } - temp.rule_type = RTYPE_COMMENT; - } - } - else - { - temp.rule_type = RTYPE_COMMENT_ALL; - } - - if (fields_num >= 4) - sstrncpy (temp.name, fields[3], sizeof (temp.name)); - - free (value_copy); - value_copy = NULL; - table = NULL; - chain = NULL; - - list = (ip_chain_t **) realloc (chain_list, (chain_num + 1) * sizeof (ip_chain_t *)); - if (list == NULL) - { - char errbuf[1024]; - ERROR ("realloc failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - return (1); - } - - chain_list = list; - final = (ip_chain_t *) malloc( sizeof(temp) ); - if (final == NULL) - { - char errbuf[1024]; - ERROR ("malloc failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - return (1); - } - memcpy (final, &temp, sizeof (temp)); - chain_list[chain_num] = final; - chain_num++; - - DEBUG ("Chain #%i: table = %s; chain = %s;", chain_num, final->table, final->chain); - } - else - { - return (-1); - } - - return (0); + /* int ip_value; */ + protocol_version_t ip_version = 0; + + if (strcasecmp (key, "Chain") == 0) + ip_version = IPV4; + else if (strcasecmp (key, "Chain6") == 0) + ip_version = IPV6; + else + return (1); + + ip_chain_t temp = { 0 }; + ip_chain_t *final, **list; + char *table; + int table_len; + char *chain; + int chain_len; + + char *value_copy; + char *fields[4]; + int fields_num; + + value_copy = strdup (value); + if (value_copy == NULL) + { + char errbuf[1024]; + ERROR ("strdup failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + return (1); + } + + /* + * Time to fill the temp element + * Examine value string, it should look like: + * Chain[6]
[ [name]] + */ + + /* set IPv4 or IPv6 */ + temp.ip_version = ip_version; + + /* Chain
[ [name]] */ + fields_num = strsplit (value_copy, fields, 4); + if (fields_num < 2) + { + free (value_copy); + return (1); + } + + table = fields[0]; + chain = fields[1]; + + table_len = strlen (table) + 1; + if ((unsigned int)table_len > sizeof(temp.table)) + { + ERROR ("Table `%s' too long.", table); + free (value_copy); + return (1); + } + sstrncpy (temp.table, table, table_len); + + chain_len = strlen (chain) + 1; + if ((unsigned int)chain_len > sizeof(temp.chain)) + { + ERROR ("Chain `%s' too long.", chain); + free (value_copy); + return (1); + } + sstrncpy (temp.chain, chain, chain_len); + + if (fields_num >= 3) + { + char *comment = fields[2]; + int rule = atoi (comment); + + if (rule) + { + temp.rule.num = rule; + temp.rule_type = RTYPE_NUM; + } + else + { + temp.rule.comment = strdup (comment); + if (temp.rule.comment == NULL) + { + free (value_copy); + return (1); + } + temp.rule_type = RTYPE_COMMENT; + } + } + else + { + temp.rule_type = RTYPE_COMMENT_ALL; + } + + if (fields_num >= 4) + sstrncpy (temp.name, fields[3], sizeof (temp.name)); + + free (value_copy); + value_copy = NULL; + table = NULL; + chain = NULL; + + list = realloc (chain_list, (chain_num + 1) * sizeof (ip_chain_t *)); + if (list == NULL) + { + char errbuf[1024]; + ERROR ("realloc failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + sfree (temp.rule.comment); + return (1); + } + + chain_list = list; + final = malloc(sizeof (*final)); + if (final == NULL) + { + char errbuf[1024]; + ERROR ("malloc failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + sfree (temp.rule.comment); + return (1); + } + memcpy (final, &temp, sizeof (temp)); + chain_list[chain_num] = final; + chain_num++; + + DEBUG ("Chain #%i: table = %s; chain = %s;", chain_num, final->table, final->chain); + + return (0); } /* int iptables_config */ +static int submit6_match (const struct ip6t_entry_match *match, + const struct ip6t_entry *entry, + const ip_chain_t *chain, + int rule_num) +{ + int status; + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; + + /* Select the rules to collect */ + if (chain->rule_type == RTYPE_NUM) + { + if (chain->rule.num != rule_num) + return (0); + } + else + { + if (strcmp (match->u.user.name, "comment") != 0) + return (0); + if ((chain->rule_type == RTYPE_COMMENT) + && (strcmp (chain->rule.comment, (char *) match->data) != 0)) + return (0); + } + + vl.values = values; + vl.values_len = 1; + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "ip6tables", sizeof (vl.plugin)); + + status = ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance), + "%s-%s", chain->table, chain->chain); + if ((status < 1) || ((unsigned int)status >= sizeof (vl.plugin_instance))) + return (0); + + if (chain->name[0] != '\0') + { + sstrncpy (vl.type_instance, chain->name, sizeof (vl.type_instance)); + } + else + { + if (chain->rule_type == RTYPE_NUM) + ssnprintf (vl.type_instance, sizeof (vl.type_instance), + "%i", chain->rule.num); + else + sstrncpy (vl.type_instance, (char *) match->data, + sizeof (vl.type_instance)); + } + + sstrncpy (vl.type, "ipt_bytes", sizeof (vl.type)); + values[0].derive = (derive_t) entry->counters.bcnt; + plugin_dispatch_values (&vl); + + sstrncpy (vl.type, "ipt_packets", sizeof (vl.type)); + values[0].derive = (derive_t) entry->counters.pcnt; + plugin_dispatch_values (&vl); + + return (0); +} /* int submit_match */ + + /* This needs to return `int' for IPT_MATCH_ITERATE to work. */ static int submit_match (const struct ipt_entry_match *match, - const struct ipt_entry *entry, - const ip_chain_t *chain, - int rule_num) + const struct ipt_entry *entry, + const ip_chain_t *chain, + int rule_num) { int status; value_t values[1]; @@ -206,16 +306,16 @@ static int submit_match (const struct ipt_entry_match *match, /* Select the rules to collect */ if (chain->rule_type == RTYPE_NUM) { - if (chain->rule.num != rule_num) - return (0); + if (chain->rule.num != rule_num) + return (0); } else { - if (strcmp (match->u.user.name, "comment") != 0) - return (0); - if ((chain->rule_type == RTYPE_COMMENT) - && (strcmp (chain->rule.comment, (char *) match->data) != 0)) - return (0); + if (strcmp (match->u.user.name, "comment") != 0) + return (0); + if ((chain->rule_type == RTYPE_COMMENT) + && (strcmp (chain->rule.comment, (char *) match->data) != 0)) + return (0); } vl.values = values; @@ -224,94 +324,163 @@ static int submit_match (const struct ipt_entry_match *match, sstrncpy (vl.plugin, "iptables", sizeof (vl.plugin)); status = ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance), - "%s-%s", chain->table, chain->chain); + "%s-%s", chain->table, chain->chain); if ((status < 1) || ((unsigned int)status >= sizeof (vl.plugin_instance))) - return (0); + return (0); if (chain->name[0] != '\0') { - sstrncpy (vl.type_instance, chain->name, sizeof (vl.type_instance)); + sstrncpy (vl.type_instance, chain->name, sizeof (vl.type_instance)); } else { - if (chain->rule_type == RTYPE_NUM) - ssnprintf (vl.type_instance, sizeof (vl.type_instance), - "%i", chain->rule.num); - else - sstrncpy (vl.type_instance, (char *) match->data, - sizeof (vl.type_instance)); + if (chain->rule_type == RTYPE_NUM) + ssnprintf (vl.type_instance, sizeof (vl.type_instance), + "%i", chain->rule.num); + else + sstrncpy (vl.type_instance, (char *) match->data, + sizeof (vl.type_instance)); } sstrncpy (vl.type, "ipt_bytes", sizeof (vl.type)); - values[0].counter = (counter_t) entry->counters.bcnt; + values[0].derive = (derive_t) entry->counters.bcnt; plugin_dispatch_values (&vl); sstrncpy (vl.type, "ipt_packets", sizeof (vl.type)); - values[0].counter = (counter_t) entry->counters.pcnt; + values[0].derive = (derive_t) entry->counters.pcnt; plugin_dispatch_values (&vl); return (0); -} /* void submit_match */ +} /* int submit_match */ -static void submit_chain( iptc_handle_t *handle, ip_chain_t *chain ) { + +/* ipv6 submit_chain */ +static void submit6_chain (ip6tc_handle_t *handle, ip_chain_t *chain) +{ + const struct ip6t_entry *entry; + int rule_num; + + /* Find first rule for chain and use the iterate macro */ + entry = ip6tc_first_rule( chain->chain, handle ); + if (entry == NULL) + { + DEBUG ("ip6tc_first_rule failed: %s", ip6tc_strerror (errno)); + return; + } + + rule_num = 1; + while (entry) + { + if (chain->rule_type == RTYPE_NUM) + { + submit6_match (NULL, entry, chain, rule_num); + } + else + { + IP6T_MATCH_ITERATE( entry, submit6_match, entry, chain, rule_num ); + } + + entry = ip6tc_next_rule( entry, handle ); + rule_num++; + } /* while (entry) */ +} + + +/* ipv4 submit_chain */ +static void submit_chain (iptc_handle_t *handle, ip_chain_t *chain) +{ const struct ipt_entry *entry; int rule_num; - /* Find first rule for chain and use the iterate macro */ + /* Find first rule for chain and use the iterate macro */ entry = iptc_first_rule( chain->chain, handle ); if (entry == NULL) { - DEBUG ("iptc_first_rule failed: %s", iptc_strerror (errno)); - return; + DEBUG ("iptc_first_rule failed: %s", iptc_strerror (errno)); + return; } rule_num = 1; while (entry) { - if (chain->rule_type == RTYPE_NUM) - { - submit_match (NULL, entry, chain, rule_num); - } - else - { - IPT_MATCH_ITERATE( entry, submit_match, entry, chain, rule_num ); - } - - entry = iptc_next_rule( entry, handle ); - rule_num++; + if (chain->rule_type == RTYPE_NUM) + { + submit_match (NULL, entry, chain, rule_num); + } + else + { + IPT_MATCH_ITERATE( entry, submit_match, entry, chain, rule_num ); + } + + entry = iptc_next_rule( entry, handle ); + rule_num++; } /* while (entry) */ } static int iptables_read (void) { - int i; int num_failures = 0; + ip_chain_t *chain; - /* Init the iptc handle structure and query the correct table */ - for (i = 0; i < chain_num; i++) + /* Init the iptc handle structure and query the correct table */ + for (int i = 0; i < chain_num; i++) { - iptc_handle_t handle; - ip_chain_t *chain; - - chain = chain_list[i]; - if (!chain) - { - DEBUG ("iptables plugin: chain == NULL"); - continue; - } - - handle = iptc_init (chain->table); - if (!handle) - { - ERROR ("iptables plugin: iptc_init (%s) failed: %s", - chain->table, iptc_strerror (errno)); - num_failures++; - continue; - } - - submit_chain (&handle, chain); - iptc_free (&handle); + chain = chain_list[i]; + + if (!chain) + { + DEBUG ("iptables plugin: chain == NULL"); + continue; + } + + if ( chain->ip_version == IPV4 ) + { +#ifdef HAVE_IPTC_HANDLE_T + iptc_handle_t _handle; + iptc_handle_t *handle = &_handle; + + *handle = iptc_init (chain->table); +#else + iptc_handle_t *handle; + handle = iptc_init (chain->table); +#endif + + if (!handle) + { + ERROR ("iptables plugin: iptc_init (%s) failed: %s", + chain->table, iptc_strerror (errno)); + num_failures++; + continue; + } + + submit_chain (handle, chain); + iptc_free (handle); + } + else if ( chain->ip_version == IPV6 ) + { +#ifdef HAVE_IP6TC_HANDLE_T + ip6tc_handle_t _handle; + ip6tc_handle_t *handle = &_handle; + + *handle = ip6tc_init (chain->table); +#else + ip6tc_handle_t *handle; + handle = ip6tc_init (chain->table); +#endif + if (!handle) + { + ERROR ("iptables plugin: ip6tc_init (%s) failed: %s", + chain->table, ip6tc_strerror (errno)); + num_failures++; + continue; + } + + submit6_chain (handle, chain); + ip6tc_free (handle); + } + else + num_failures++; } /* for (i = 0 .. chain_num) */ return ((num_failures < chain_num) ? 0 : -1); @@ -319,15 +488,11 @@ static int iptables_read (void) static int iptables_shutdown (void) { - int i; - - for (i = 0; i < chain_num; i++) + for (int i = 0; i < chain_num; i++) { - if ((chain_list[i] != NULL) && (chain_list[i]->rule_type == RTYPE_COMMENT)) - { - sfree (chain_list[i]->rule.comment); - } - sfree (chain_list[i]); + if ((chain_list[i] != NULL) && (chain_list[i]->rule_type == RTYPE_COMMENT)) + sfree (chain_list[i]->rule.comment); + sfree (chain_list[i]); } sfree (chain_list); @@ -337,11 +502,8 @@ static int iptables_shutdown (void) void module_register (void) { plugin_register_config ("iptables", iptables_config, - config_keys, config_keys_num); + config_keys, config_keys_num); plugin_register_read ("iptables", iptables_read); plugin_register_shutdown ("iptables", iptables_shutdown); } /* void module_register */ -/* - * vim:shiftwidth=4:softtabstop=4:tabstop=8 - */