Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 05:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_tables: add nft_register_basechain() and nft_unregister_basechain()

Browse Source 
This wrapper functions take care of hook registration for basechains.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Pablo Neira Ayuso 2015-06-15 02:42:31 +02:00
parent 2cbce139fc
commit d8ee8f7c56
1 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
net/netfilter/nf_tables_api.c
View File

@ -127,13 +127,38 @@ static void nft_trans_destroy(struct nft_trans *trans)
kfree(trans);
}
static int nft_register_basechain(struct nft_base_chain *basechain,
unsigned int hook_nops)
{
return nf_register_hooks(basechain->ops, hook_nops);
}
static void nft_unregister_basechain(struct nft_base_chain *basechain,
unsigned int hook_nops)
{
nf_unregister_hooks(basechain->ops, hook_nops);
}
static int nf_tables_register_hooks(const struct nft_table *table,
struct nft_chain *chain,
unsigned int hook_nops)
{
if (table->flags & NFT_TABLE_F_DORMANT ||
!(chain->flags & NFT_BASE_CHAIN))
return 0;
return nft_register_basechain(nft_base_chain(chain), hook_nops);
}
static void nf_tables_unregister_hooks(const struct nft_table *table,
const struct nft_chain *chain,
struct nft_chain *chain,
unsigned int hook_nops)
{
if (!(table->flags & NFT_TABLE_F_DORMANT) &&
chain->flags & NFT_BASE_CHAIN)
nf_unregister_hooks(nft_base_chain(chain)->ops, hook_nops);
if (table->flags & NFT_TABLE_F_DORMANT ||
!(chain->flags & NFT_BASE_CHAIN))
return;
nft_unregister_basechain(nft_base_chain(chain), hook_nops);
}
/* Internal table flags */
@ -560,7 +585,7 @@ static int nf_tables_table_enable(const struct nft_af_info *afi,
if (!(chain->flags & NFT_BASE_CHAIN))
continue;
err = nf_register_hooks(nft_base_chain(chain)->ops, afi->nops);
err = nft_register_basechain(nft_base_chain(chain), afi->nops);
if (err < 0)
goto err;
@ -575,20 +600,20 @@ err:
if (i-- <= 0)
break;
nf_unregister_hooks(nft_base_chain(chain)->ops, afi->nops);
nft_unregister_basechain(nft_base_chain(chain), afi->nops);
}
return err;
}
static void nf_tables_table_disable(const struct nft_af_info *afi,
struct nft_table *table)
struct nft_table *table)
{
struct nft_chain *chain;
list_for_each_entry(chain, &table->chains, list) {
if (chain->flags & NFT_BASE_CHAIN)
nf_unregister_hooks(nft_base_chain(chain)->ops,
afi->nops);
nft_unregister_basechain(nft_base_chain(chain),
afi->nops);
}
}
@ -1421,12 +1446,9 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
chain->table = table;
nla_strlcpy(chain->name, name, NFT_CHAIN_MAXNAMELEN);
if (!(table->flags & NFT_TABLE_F_DORMANT) &&
chain->flags & NFT_BASE_CHAIN) {
err = nf_register_hooks(nft_base_chain(chain)->ops, afi->nops);
if (err < 0)
goto err1;
}
err = nf_tables_register_hooks(table, chain, afi->nops);
if (err < 0)
goto err1;
nft_ctx_init(&ctx, skb, nlh, afi, table, chain, nla);
err = nft_trans_chain_add(&ctx, NFT_MSG_NEWCHAIN);