diff mbox

[nftables] netlink: Allow invert the ranges

Message ID 1401210934-4900-1-git-send-email-alvaroneay@gmail.com
State Not Applicable
Headers show

Commit Message

Alvaro Neira May 27, 2014, 5:15 p.m. UTC 
From: Álvaro Neira Ayuso <alvaroneay@gmail.com>

This patch fix the bug:

http://bugzilla.netfilter.org/show_bug.cgi?id=924

Before, nftables doesn't permit invert ranges. This patch allows
add rules like this:

nft add rule ip test input ip daddr != 192.168.1.2-192.168.1.55

Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
---
 src/netlink_linearize.c |   43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index e3f06af..4b6400a 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -182,6 +182,10 @@  static enum nft_cmp_ops netlink_gen_cmp_op(enum ops op)
 	}
 }
 
+static void netlink_gen_range(struct netlink_linearize_ctx *ctx,
+			      const struct expr *expr,
+			      enum nft_registers dreg);
+
 static void netlink_gen_cmp(struct netlink_linearize_ctx *ctx,
 			    const struct expr *expr,
 			    enum nft_registers dreg)
@@ -196,7 +200,8 @@  static void netlink_gen_cmp(struct netlink_linearize_ctx *ctx,
 	sreg = get_register(ctx);
 	netlink_gen_expr(ctx, expr->left, sreg);
 
-	if (expr->right->ops->type == EXPR_PREFIX) {
+	switch (expr->right->ops->type) {
+	case EXPR_PREFIX: {
 		mpz_t mask;
 
 		mpz_init(mask);
@@ -216,7 +221,11 @@  static void netlink_gen_cmp(struct netlink_linearize_ctx *ctx,
 		nft_rule_add_expr(ctx->nlr, nle);
 
 		right = expr->right->prefix;
-	} else {
+		break;
+		}
+	case EXPR_RANGE:
+		return netlink_gen_range(ctx, expr, dreg);
+	default:
 		right = expr->right;
 	}
 
@@ -247,16 +256,38 @@  static void netlink_gen_range(struct netlink_linearize_ctx *ctx,
 
 	nle = alloc_nft_expr("cmp");
 	nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_SREG, sreg);
-	nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_OP,
-			      netlink_gen_cmp_op(OP_GTE));
+	switch (expr->op) {
+	case OP_EQ:
+		nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_OP,
+				      netlink_gen_cmp_op(OP_GTE));
+		break;
+	case OP_NEQ:
+		nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_OP,
+				      netlink_gen_cmp_op(OP_LT));
+		break;
+	default:
+		BUG("invalid comparison operation %u\n", expr->op);
+	}
+
 	netlink_gen_data(range->left, &nld);
 	nft_rule_expr_set(nle, NFT_EXPR_CMP_DATA, nld.value, nld.len);
 	nft_rule_add_expr(ctx->nlr, nle);
 
 	nle = alloc_nft_expr("cmp");
 	nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_SREG, sreg);
-	nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_OP,
-			      netlink_gen_cmp_op(OP_LTE));
+	switch (expr->op) {
+	case OP_EQ:
+		nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_OP,
+				      netlink_gen_cmp_op(OP_LTE));
+		break;
+	case OP_NEQ:
+		nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_OP,
+				      netlink_gen_cmp_op(OP_GT));
+		break;
+	default:
+		BUG("invalid comparison operation %u\n", expr->op);
+	}
+
 	netlink_gen_data(range->right, &nld);
 	nft_rule_expr_set(nle, NFT_EXPR_CMP_DATA, nld.value, nld.len);
 	nft_rule_add_expr(ctx->nlr, nle);