From 676b0499528a64061075034065c346ad9498cafd Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 10 Jan 2014 13:47:57 +0100 Subject: 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 --- src/netlink_delinearize.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/netlink_delinearize.c') 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); } -- cgit v1.2.3