github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

netfilter: bitwise: add helper for dumping boolean operations.

Browse Source 
Split the code specific to dumping bitwise boolean operations out into a
separate function.  A similar function will be added later for shift
operations.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Jeremy Sowden 2020-01-15 20:05:54 +00:00 committed by Pablo Neira Ayuso
parent 71d6ded3ac
commit 4d57ca2be1
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/netfilter/nft_bitwise.c
View File

@ -143,9 +143,24 @@ static int nft_bitwise_init(const struct nft_ctx *ctx,
return err; return err;
} }
static int nft_bitwise_dump_bool(struct sk_buff *skb,
const struct nft_bitwise *priv)
{
if (nft_data_dump(skb, NFTA_BITWISE_MASK, &priv->mask,
NFT_DATA_VALUE, priv->len) < 0)
return -1;
if (nft_data_dump(skb, NFTA_BITWISE_XOR, &priv->xor,
NFT_DATA_VALUE, priv->len) < 0)
return -1;
return 0;
}
static int nft_bitwise_dump(struct sk_buff *skb, const struct nft_expr *expr) static int nft_bitwise_dump(struct sk_buff *skb, const struct nft_expr *expr)
{ {
const struct nft_bitwise *priv = nft_expr_priv(expr); const struct nft_bitwise *priv = nft_expr_priv(expr);
int err = 0;
if (nft_dump_register(skb, NFTA_BITWISE_SREG, priv->sreg)) if (nft_dump_register(skb, NFTA_BITWISE_SREG, priv->sreg))
return -1; return -1;
@ -156,15 +171,13 @@ static int nft_bitwise_dump(struct sk_buff *skb, const struct nft_expr *expr)
if (nla_put_be32(skb, NFTA_BITWISE_OP, htonl(priv->op))) if (nla_put_be32(skb, NFTA_BITWISE_OP, htonl(priv->op)))
return -1; return -1;
if (nft_data_dump(skb, NFTA_BITWISE_MASK, &priv->mask, switch (priv->op) {
NFT_DATA_VALUE, priv->len) < 0) case NFT_BITWISE_BOOL:
return -1; err = nft_bitwise_dump_bool(skb, priv);
break;
}
if (nft_data_dump(skb, NFTA_BITWISE_XOR, &priv->xor, return err;
NFT_DATA_VALUE, priv->len) < 0)
return -1;
return 0;
} }
static struct nft_data zero; static struct nft_data zero;