summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-01-10 13:47:57 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-01-10 18:37:18 +0100
commit676b0499528a64061075034065c346ad9498cafd (patch)
tree9b25cec2f7ae5497f59444b668c013fa55ea6e47
parent4097ad726fce2398b42795d7b316d39fb8ea6ee5 (diff)
netlink: fix wrong type in attributes
Fix inconsistent attribute types in meta and cmp expressions, use uint32_t. This problem was added when converting nft to use libmnl and libnftables. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/netlink_delinearize.c8
-rw-r--r--src/netlink_linearize.c14
2 files changed, 11 insertions, 11 deletions
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 7e4e38c4..3d98131b 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -103,7 +103,7 @@ static void netlink_parse_immediate(struct netlink_parse_ctx *ctx,
static enum ops netlink_parse_cmp_op(const struct nft_rule_expr *nle)
{
- switch (nft_rule_expr_get_u8(nle, NFT_EXPR_CMP_OP)) {
+ switch (nft_rule_expr_get_u32(nle, NFT_EXPR_CMP_OP)) {
case NFT_CMP_EQ:
return OP_EQ;
case NFT_CMP_NEQ:
@@ -132,7 +132,7 @@ static void netlink_parse_cmp(struct netlink_parse_ctx *ctx,
nld.value = nft_rule_expr_get(nle, NFT_EXPR_CMP_DATA, &nld.len);
left = netlink_get_register(ctx, loc,
- nft_rule_expr_get_u8(nle, NFT_EXPR_CMP_SREG));
+ nft_rule_expr_get_u32(nle, NFT_EXPR_CMP_SREG));
if (left == NULL)
return netlink_error(ctx, loc,
"Relational expression has no left "
@@ -332,9 +332,9 @@ static void netlink_parse_meta(struct netlink_parse_ctx *ctx,
struct expr *expr;
expr = meta_expr_alloc(loc,
- nft_rule_expr_get_u8(nle, NFT_EXPR_META_KEY));
+ nft_rule_expr_get_u32(nle, NFT_EXPR_META_KEY));
netlink_set_register(ctx,
- nft_rule_expr_get_u8(nle, NFT_EXPR_META_DREG),
+ nft_rule_expr_get_u32(nle, NFT_EXPR_META_DREG),
expr);
}
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index e64e92a8..79cb6a70 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -210,9 +210,9 @@ static void netlink_gen_cmp(struct netlink_linearize_ctx *ctx,
}
nle = alloc_nft_expr("cmp");
- nft_rule_expr_set_u8(nle, NFT_EXPR_CMP_SREG, sreg);
- nft_rule_expr_set_u8(nle, NFT_EXPR_CMP_OP,
- netlink_gen_cmp_op(expr->op));
+ 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(expr->op));
netlink_gen_data(right, &nld);
nft_rule_expr_set(nle, NFT_EXPR_CMP_DATA, nld.value, nld.len);
release_register(ctx);
@@ -235,7 +235,7 @@ static void netlink_gen_range(struct netlink_linearize_ctx *ctx,
netlink_gen_expr(ctx, expr->left, sreg);
nle = alloc_nft_expr("cmp");
- nft_rule_expr_set_u8(nle, NFT_EXPR_CMP_SREG, sreg);
+ 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));
netlink_gen_data(range->left, &nld);
@@ -243,7 +243,7 @@ static void netlink_gen_range(struct netlink_linearize_ctx *ctx,
nft_rule_add_expr(ctx->nlr, nle);
nle = alloc_nft_expr("cmp");
- nft_rule_expr_set_u8(nle, NFT_EXPR_CMP_SREG, sreg);
+ 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));
netlink_gen_data(range->right, &nld);
@@ -283,8 +283,8 @@ static void netlink_gen_flagcmp(struct netlink_linearize_ctx *ctx,
nle = alloc_nft_expr("cmp");
netlink_gen_raw_data(zero, expr->right->byteorder, len, &nld);
- nft_rule_expr_set_u8(nle, NFT_EXPR_CMP_SREG, sreg);
- nft_rule_expr_set_u8(nle, NFT_EXPR_CMP_OP, NFT_CMP_NEQ);
+ nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_SREG, sreg);
+ nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_OP, NFT_CMP_NEQ);
netlink_gen_data(expr->right, &nld);
nft_rule_expr_set(nle, NFT_EXPR_CMP_DATA, nld.value, nld.len);
nft_rule_add_expr(ctx->nlr, nle);