Commit 4d57ca2b authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Pablo Neira Ayuso
Browse files

netfilter: bitwise: add helper for dumping boolean operations. 



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: default avatarJeremy Sowden <jeremy@azazel.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 71d6ded3

net/netfilter/nft_bitwise.c

+21 −8
Original line number Diff line number Diff line
@@ -143,9 +143,24 @@ static int nft_bitwise_init(const struct nft_ctx *ctx, 
	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)

{

	const struct nft_bitwise *priv = nft_expr_priv(expr);

	int err = 0;



	if (nft_dump_register(skb, NFTA_BITWISE_SREG, priv->sreg))

		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)))

		return -1;



	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;

	switch (priv->op) {

	case NFT_BITWISE_BOOL:

		err = nft_bitwise_dump_bool(skb, priv);

		break;

	}



	return 0;

	return err;

}



static struct nft_data zero;