X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fiptables.c;h=c39aff8fcd8d7d0ce3078bfad5d17ea0ccb2ed02;hb=aff80830f1154a5b6c4da16a0b1033aafde14e24;hp=e1694af3475407ae75ba98de73e8b48598e63a56;hpb=ec404735b0676bb44fdba10f3760e1ba9632405a;p=collectd.git diff --git a/src/iptables.c b/src/iptables.c index e1694af3..c39aff8f 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -1,6 +1,8 @@ /** * collectd - src/iptables.c - * Copyright (C) 2007 Sjoerd van der Berg + * 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 @@ -18,6 +20,8 @@ * * Authors: * Sjoerd van der Berg + * Florian Forster + * Marco Chiappero **/ #include "collectd.h" @@ -25,11 +29,38 @@ #include "plugin.h" #include "configfile.h" +#include + #if OWN_LIBIPTC -# include "libiptc/libiptc.h" -#else +# include "owniptc/libiptc.h" +# include "owniptc/libip6tc.h" + +# define HAVE_IPTC_HANDLE_T 1 +# define HAVE_IP6TC_HANDLE_T 1 + +#else /* if !OWN_LIBIPTC */ # include -#endif +# 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 +#endif /* !OWN_LIBIPTC */ /* * (Module-)Global variables @@ -42,16 +73,25 @@ static const char *config_keys[] = { "Chain", - NULL + "Chain6" }; -static int config_keys_num = 1; +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); /* Each table/chain combo that will be queried goes into this list */ + +enum protocol_version_e +{ + IPV4, + IPV6 +}; +typedef enum protocol_version_e protocol_version_t; + #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 @@ -73,7 +113,15 @@ static int chain_num = 0; static int iptables_config (const char *key, const char *value) { + /* 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; + + if (( ip_version == IPV4 ) || ( ip_version == IPV6 )) { ip_chain_t temp, *final, **list; char *table; @@ -96,6 +144,15 @@ static int iptables_config (const char *key, const char *value) 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) @@ -191,6 +248,66 @@ static int iptables_config (const char *key, const char *value) 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, @@ -218,7 +335,6 @@ static int submit_match (const struct ipt_entry_match *match, vl.values = values; vl.values_len = 1; - vl.time = time (NULL); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "iptables", sizeof (vl.plugin)); @@ -242,17 +358,52 @@ static int submit_match (const struct ipt_entry_match *match, } 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 */ + + +/* ipv6 submit_chain */ +static void submit6_chain( ip6tc_handle_t *handle, ip_chain_t *chain ) +{ + const struct ip6t_entry *entry; + int rule_num; -static void submit_chain( iptc_handle_t *handle, ip_chain_t *chain ) { + /* 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; @@ -286,31 +437,67 @@ 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++) { - 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; - } + 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++; - submit_chain (&handle, chain); - iptc_free (&handle); } /* for (i = 0 .. chain_num) */ return ((num_failures < chain_num) ? 0 : -1);