iptables: replace libnftnl table list by linux list
Pablo Neira Ayuso
maintainerPATCH 1/1 iptables: replace libnftnl table list by linux list
This patch removes the libnftnl table list by linux list. This comes with an extra memory allocation to store the nft_table object. Probably, there is no need to cache the entire nftnl_table in the near future.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- iptables/nft-cache.c | 72 ++++++++++++++++++++++++++++-------------- iptables/nft-cache.h | 10 +++++- iptables/nft.c | 74 +++++++++++--------------------------------- iptables/nft.h | 2 +- 4 files changed, 77 insertions(+), 81 deletions(-)
iptables/nft-cache.c +49 -23
@@ -107,50 +107,78 @@ static void mnl_genid_get(struct nft_handle *h, uint32_t *genid) "Could not fetch rule set generation id: %s\n", nft_strerror(errno)); } +static struct nft_table *nft_table_alloc (void ) +{ +struct nftnl_table *nftnl; +struct nft_table *table; + + table =malloc (sizeof (struct nft_table )); +if (!table) +return NULL ; + + nftnl =nftnl_table_alloc (); +if (!nftnl) { +free (table); +return NULL ; + } + table->nftnl = nftnl; + +return table; +} + +static void nft_table_free (struct nft_table *table) +{ +nftnl_table_free (table->nftnl); +free (table); +} + +static void nft_table_list_free (struct list_head *table_list) +{ +struct nft_table *table, *next; + +list_for_each_entry_safe (table, next, table_list, list) { +list_del (&table->list); +nft_table_free (table); + } +} +static int nftnl_table_list_cb (const struct nlmsghdr *nlh,void *data) { -struct nftnl_table *t; -struct nftnl_table_list *list = data; +struct list_head *list = data; +struct nft_table *t; - t =nftnl_table_alloc (); -if (t ==NULL ) + t =nft_table_alloc (); +if (!t) goto err; -if (nftnl_table_nlmsg_parse (nlh, t) <0 ) +if (nftnl_table_nlmsg_parse (nlh, t->nftnl) <0 ) goto out; -nftnl_table_list_add_tail (t, list); +list_add_tail (&t->list, list);return MNL_CB_OK ; out: -nftnl_table_free (t); +nft_table_free (t); err:return MNL_CB_OK ; }static int fetch_table_cache (struct nft_handle *h) { -char buf[16536 ];struct nlmsghdr *nlh; -struct nftnl_table_list *list; +char buf[16536 ];int i, ret; -if (h->cache->tables) -return 0 ; - - list =nftnl_table_list_alloc (); -if (list ==NULL ) +if (!list_empty (&h->cache->tables))return 0 ; nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_GETTABLE , h->family,NLM_F_DUMP , h->seq); - ret =mnl_talk (h, nlh, nftnl_table_list_cb, list); + ret =mnl_talk (h, nlh, nftnl_table_list_cb, &h->cache->tables);if (ret <0 && errno ==EINTR )assert (nft_restart (h) >=0 ); - h->cache->tables = list; -for (i =0 ; i <NFT_TABLE_MAX ; i++) {enum nft_table_type type = h->tables[i].type;
@@ -613,10 +641,8 @@ static int flush_cache(struct nft_handle *h, struct nft_cache *c, c->table[i].sets =NULL ; } } -if (c->tables) { -nftnl_table_list_free (c->tables); - c->tables =NULL ; - } +if (!list_empty (&c->tables)) +nft_table_list_free (&c->tables);return 1 ; }
@@ -689,9 +715,9 @@ void nft_release_cache(struct nft_handle *h) } } -struct nftnl_table_list *nftnl_table_list_get (struct nft_handle *h) +struct list_head *nft_table_list_get (struct nft_handle *h) { -return h->cache->tables; +return &h->cache->tables; } struct nftnl_set_list *
iptables/nft-cache.h +9 -1
@@ -1,6 +1,8 @@#ifndef _NFT_CACHE_H_#define _NFT_CACHE_H_ +#include <libiptc/linux_list.h> +struct nft_handle ;struct nft_cmd ;
@@ -17,6 +19,12 @@ struct nftnl_chain_list * nft_chain_list_get(struct nft_handle *h, const char *table, const char *chain);struct nftnl_set_list *nft_set_list_get (struct nft_handle *h,const char *table,const char *set); -struct nftnl_table_list *nftnl_table_list_get (struct nft_handle *h); +struct list_head *nft_table_list_get (struct nft_handle *h); + +struct nft_table { +struct list_head list; +struct nftnl_table *nftnl; +}; +#endif /* _NFT_CACHE_H_ */
iptables/nft.c +18 -56
131 lines not on this page · raw message
iptables/nft.h +1 -1
@@ -38,7 +38,7 @@ enum nft_cache_level { };struct nft_cache { -struct nftnl_table_list *tables; +struct list_head tables;struct {struct nftnl_chain_list *chains;struct nftnl_set_list *sets;
Signature · 1 line
2.20.1