209 lines
6.8 KiB
Diff
209 lines
6.8 KiB
Diff
|
From 43d5837615201d68108151e70c06cc0e90622fcc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Sutter <psutter@redhat.com>
|
||
|
|
Date: Wed, 27 Apr 2022 14:46:47 +0200
|
||
|
|
Subject: [PATCH] src: rename CMD_OBJ_SETELEM to CMD_OBJ_ELEMENTS
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2073287
|
||
|
|
Upstream Status: nftables commit 9ed076c6f5abc
|
||
|
|
|
||
|
|
commit 9ed076c6f5abcbbad1b6b721dca29f87963f0ecc
|
||
|
|
Author: Pablo Neira Ayuso <pablo@netfilter.org>
|
||
|
|
Date: Fri May 8 14:44:01 2020 +0200
|
||
|
|
|
||
|
|
src: rename CMD_OBJ_SETELEM to CMD_OBJ_ELEMENTS
|
||
|
|
|
||
|
|
The CMD_OBJ_ELEMENTS provides an expression that contains the list of
|
||
|
|
set elements. This leaves room to introduce CMD_OBJ_SETELEMS in a follow
|
||
|
|
up patch.
|
||
|
|
|
||
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||
|
|
---
|
||
|
|
include/rule.h | 4 ++--
|
||
|
|
src/cache.c | 6 +++---
|
||
|
|
src/evaluate.c | 6 +++---
|
||
|
|
src/parser_bison.y | 8 ++++----
|
||
|
|
src/parser_json.c | 2 +-
|
||
|
|
src/rule.c | 8 ++++----
|
||
|
|
6 files changed, 17 insertions(+), 17 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/rule.h b/include/rule.h
|
||
|
|
index 3637462..7fe607f 100644
|
||
|
|
--- a/include/rule.h
|
||
|
|
+++ b/include/rule.h
|
||
|
|
@@ -542,7 +542,7 @@ enum cmd_ops {
|
||
|
|
* enum cmd_obj - command objects
|
||
|
|
*
|
||
|
|
* @CMD_OBJ_INVALID: invalid
|
||
|
|
- * @CMD_OBJ_SETELEM: set element(s)
|
||
|
|
+ * @CMD_OBJ_ELEMENTS: set element(s)
|
||
|
|
* @CMD_OBJ_SET: set
|
||
|
|
* @CMD_OBJ_SETS: multiple sets
|
||
|
|
* @CMD_OBJ_RULE: rule
|
||
|
|
@@ -570,7 +570,7 @@ enum cmd_ops {
|
||
|
|
*/
|
||
|
|
enum cmd_obj {
|
||
|
|
CMD_OBJ_INVALID,
|
||
|
|
- CMD_OBJ_SETELEM,
|
||
|
|
+ CMD_OBJ_ELEMENTS,
|
||
|
|
CMD_OBJ_SET,
|
||
|
|
CMD_OBJ_SETS,
|
||
|
|
CMD_OBJ_RULE,
|
||
|
|
diff --git a/src/cache.c b/src/cache.c
|
||
|
|
index 05f0d68..a45111a 100644
|
||
|
|
--- a/src/cache.c
|
||
|
|
+++ b/src/cache.c
|
||
|
|
@@ -25,7 +25,7 @@ static unsigned int evaluate_cache_add(struct cmd *cmd, unsigned int flags)
|
||
|
|
case CMD_OBJ_FLOWTABLE:
|
||
|
|
flags |= NFT_CACHE_TABLE;
|
||
|
|
break;
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
flags |= NFT_CACHE_TABLE |
|
||
|
|
NFT_CACHE_CHAIN |
|
||
|
|
NFT_CACHE_SET |
|
||
|
|
@@ -53,7 +53,7 @@ static unsigned int evaluate_cache_add(struct cmd *cmd, unsigned int flags)
|
||
|
|
static unsigned int evaluate_cache_del(struct cmd *cmd, unsigned int flags)
|
||
|
|
{
|
||
|
|
switch (cmd->obj) {
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
flags |= NFT_CACHE_SETELEM;
|
||
|
|
break;
|
||
|
|
default:
|
||
|
|
@@ -66,7 +66,7 @@ static unsigned int evaluate_cache_del(struct cmd *cmd, unsigned int flags)
|
||
|
|
static unsigned int evaluate_cache_get(struct cmd *cmd, unsigned int flags)
|
||
|
|
{
|
||
|
|
switch (cmd->obj) {
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
flags |= NFT_CACHE_TABLE |
|
||
|
|
NFT_CACHE_SET |
|
||
|
|
NFT_CACHE_SETELEM;
|
||
|
|
diff --git a/src/evaluate.c b/src/evaluate.c
|
||
|
|
index e495faf..fd6db8a 100644
|
||
|
|
--- a/src/evaluate.c
|
||
|
|
+++ b/src/evaluate.c
|
||
|
|
@@ -3815,7 +3815,7 @@ static int table_evaluate(struct eval_ctx *ctx, struct table *table)
|
||
|
|
static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd)
|
||
|
|
{
|
||
|
|
switch (cmd->obj) {
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
return setelem_evaluate(ctx, &cmd->expr);
|
||
|
|
case CMD_OBJ_SET:
|
||
|
|
handle_merge(&cmd->set->handle, &cmd->handle);
|
||
|
|
@@ -3847,7 +3847,7 @@ static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd)
|
||
|
|
static int cmd_evaluate_delete(struct eval_ctx *ctx, struct cmd *cmd)
|
||
|
|
{
|
||
|
|
switch (cmd->obj) {
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
return setelem_evaluate(ctx, &cmd->expr);
|
||
|
|
case CMD_OBJ_SET:
|
||
|
|
case CMD_OBJ_RULE:
|
||
|
|
@@ -3874,7 +3874,7 @@ static int cmd_evaluate_get(struct eval_ctx *ctx, struct cmd *cmd)
|
||
|
|
struct set *set;
|
||
|
|
|
||
|
|
switch (cmd->obj) {
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
table = table_lookup(&cmd->handle, &ctx->nft->cache);
|
||
|
|
if (table == NULL)
|
||
|
|
return table_not_found(ctx);
|
||
|
|
diff --git a/src/parser_bison.y b/src/parser_bison.y
|
||
|
|
index dc87571..96f0a4c 100644
|
||
|
|
--- a/src/parser_bison.y
|
||
|
|
+++ b/src/parser_bison.y
|
||
|
|
@@ -1019,7 +1019,7 @@ add_cmd : TABLE table_spec
|
||
|
|
}
|
||
|
|
| ELEMENT set_spec set_block_expr
|
||
|
|
{
|
||
|
|
- $$ = cmd_alloc(CMD_ADD, CMD_OBJ_SETELEM, &$2, &@$, $3);
|
||
|
|
+ $$ = cmd_alloc(CMD_ADD, CMD_OBJ_ELEMENTS, &$2, &@$, $3);
|
||
|
|
}
|
||
|
|
| FLOWTABLE flowtable_spec flowtable_block_alloc
|
||
|
|
'{' flowtable_block '}'
|
||
|
|
@@ -1116,7 +1116,7 @@ create_cmd : TABLE table_spec
|
||
|
|
}
|
||
|
|
| ELEMENT set_spec set_block_expr
|
||
|
|
{
|
||
|
|
- $$ = cmd_alloc(CMD_CREATE, CMD_OBJ_SETELEM, &$2, &@$, $3);
|
||
|
|
+ $$ = cmd_alloc(CMD_CREATE, CMD_OBJ_ELEMENTS, &$2, &@$, $3);
|
||
|
|
}
|
||
|
|
| FLOWTABLE flowtable_spec flowtable_block_alloc
|
||
|
|
'{' flowtable_block '}'
|
||
|
|
@@ -1208,7 +1208,7 @@ delete_cmd : TABLE table_spec
|
||
|
|
}
|
||
|
|
| ELEMENT set_spec set_block_expr
|
||
|
|
{
|
||
|
|
- $$ = cmd_alloc(CMD_DELETE, CMD_OBJ_SETELEM, &$2, &@$, $3);
|
||
|
|
+ $$ = cmd_alloc(CMD_DELETE, CMD_OBJ_ELEMENTS, &$2, &@$, $3);
|
||
|
|
}
|
||
|
|
| FLOWTABLE flowtable_spec
|
||
|
|
{
|
||
|
|
@@ -1266,7 +1266,7 @@ delete_cmd : TABLE table_spec
|
||
|
|
|
||
|
|
get_cmd : ELEMENT set_spec set_block_expr
|
||
|
|
{
|
||
|
|
- $$ = cmd_alloc(CMD_GET, CMD_OBJ_SETELEM, &$2, &@$, $3);
|
||
|
|
+ $$ = cmd_alloc(CMD_GET, CMD_OBJ_ELEMENTS, &$2, &@$, $3);
|
||
|
|
}
|
||
|
|
;
|
||
|
|
|
||
|
|
diff --git a/src/parser_json.c b/src/parser_json.c
|
||
|
|
index 2250be9..15902a8 100644
|
||
|
|
--- a/src/parser_json.c
|
||
|
|
+++ b/src/parser_json.c
|
||
|
|
@@ -3391,7 +3391,7 @@ static struct cmd *json_parse_cmd_add(struct json_ctx *ctx,
|
||
|
|
{ "rule", CMD_OBJ_RULE, json_parse_cmd_add_rule },
|
||
|
|
{ "set", CMD_OBJ_SET, json_parse_cmd_add_set },
|
||
|
|
{ "map", CMD_OBJ_SET, json_parse_cmd_add_set },
|
||
|
|
- { "element", CMD_OBJ_SETELEM, json_parse_cmd_add_element },
|
||
|
|
+ { "element", CMD_OBJ_ELEMENTS, json_parse_cmd_add_element },
|
||
|
|
{ "flowtable", CMD_OBJ_FLOWTABLE, json_parse_cmd_add_flowtable },
|
||
|
|
{ "counter", CMD_OBJ_COUNTER, json_parse_cmd_add_object },
|
||
|
|
{ "quota", CMD_OBJ_QUOTA, json_parse_cmd_add_object },
|
||
|
|
diff --git a/src/rule.c b/src/rule.c
|
||
|
|
index 9ae6d19..afb6dc9 100644
|
||
|
|
--- a/src/rule.c
|
||
|
|
+++ b/src/rule.c
|
||
|
|
@@ -1456,7 +1456,7 @@ void cmd_free(struct cmd *cmd)
|
||
|
|
handle_free(&cmd->handle);
|
||
|
|
if (cmd->data != NULL) {
|
||
|
|
switch (cmd->obj) {
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
expr_free(cmd->expr);
|
||
|
|
break;
|
||
|
|
case CMD_OBJ_SET:
|
||
|
|
@@ -1580,7 +1580,7 @@ static int do_command_add(struct netlink_ctx *ctx, struct cmd *cmd, bool excl)
|
||
|
|
return mnl_nft_rule_add(ctx, cmd, flags | NLM_F_APPEND);
|
||
|
|
case CMD_OBJ_SET:
|
||
|
|
return do_add_set(ctx, cmd, flags);
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
return do_add_setelems(ctx, cmd, flags);
|
||
|
|
case CMD_OBJ_COUNTER:
|
||
|
|
case CMD_OBJ_QUOTA:
|
||
|
|
@@ -1659,7 +1659,7 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd)
|
||
|
|
return mnl_nft_rule_del(ctx, cmd);
|
||
|
|
case CMD_OBJ_SET:
|
||
|
|
return mnl_nft_set_del(ctx, cmd);
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
return do_delete_setelems(ctx, cmd);
|
||
|
|
case CMD_OBJ_COUNTER:
|
||
|
|
return mnl_nft_obj_del(ctx, cmd, NFT_OBJECT_COUNTER);
|
||
|
|
@@ -2519,7 +2519,7 @@ static int do_command_get(struct netlink_ctx *ctx, struct cmd *cmd)
|
||
|
|
table = table_lookup(&cmd->handle, &ctx->nft->cache);
|
||
|
|
|
||
|
|
switch (cmd->obj) {
|
||
|
|
- case CMD_OBJ_SETELEM:
|
||
|
|
+ case CMD_OBJ_ELEMENTS:
|
||
|
|
return do_get_setelems(ctx, cmd, table);
|
||
|
|
default:
|
||
|
|
BUG("invalid command object type %u\n", cmd->obj);
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|