diff options
author | Patrick McHardy <kaber@trash.net> | 2014-01-14 12:31:38 +0000 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2014-01-14 12:31:38 +0000 |
commit | 7d98127b61f5e530388ff2344ace69a292a9829d (patch) | |
tree | 86292dd6142764e406821465db1950def498fd30 /src | |
parent | 3f8820318302da097795ba7d8b2ae3f6dff6cf2e (diff) | |
parent | 5e8f8a1807917f92e568437598670b0026462c1c (diff) |
Merge remote-tracking branch 'origin/master' into next-3.14
Diffstat (limited to 'src')
-rw-r--r-- | src/netlink_delinearize.c | 8 | ||||
-rw-r--r-- | src/netlink_linearize.c | 14 | ||||
-rw-r--r-- | src/parser.y | 3 | ||||
-rw-r--r-- | src/scanner.l | 1 |
4 files changed, 12 insertions, 14 deletions
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 8f6ee381..59b50745 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_dreg(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 9ae9bb76..332383af 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); diff --git a/src/parser.y b/src/parser.y index 7c18875d..e5610e5a 100644 --- a/src/parser.y +++ b/src/parser.y @@ -150,7 +150,6 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token DASH "-" %token AT "@" %token ARROW "=>" -%token VMAP "vmap" %token INCLUDE "include" %token DEFINE "define" @@ -1273,7 +1272,7 @@ map_expr : concat_expr MAP expr } ; -verdict_map_expr : concat_expr VMAP expr +verdict_map_expr : concat_expr MAP expr { $$ = map_expr_alloc(&@$, $1, $3); } diff --git a/src/scanner.l b/src/scanner.l index 0b8abacb..5a5ec723 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -210,7 +210,6 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "$" { return '$'; } "=" { return '='; } "=>" { return ARROW; } -"vmap" { return VMAP; } "include" { return INCLUDE; } "define" { return DEFINE; } |