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>

diff --git a/include/rule.h b/include/rule.h
index 1a4ec3d8bc375b03159a7fabe52e8c754a87654d..f0f7ee33a3ae31e737f4c01e59db927c446785ef 100644 (file)
--- a/include/rule.h
+++ b/include/rule.h
@@ -558,7 +558,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
@@ -586,7 +586,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 05f0d68edf03ae63d29591eca68914d291ac0a2d..a45111a7920e57fd9dbc8b4fef42c7593bc254f3 100644 (file)
--- 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 a057be5e553a8ecc55f3529ca17b41b1b898bc8b..506f2c6a257e4d055f54c2d2ac875ce0c071899a 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -3977,7 +3977,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);
@@ -4009,7 +4009,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:
@@ -4036,7 +4036,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 39d3eac83b163fedd9e294c873f4b48486f206a0..8e937ca305d12395a429d8176df2708333615d2f 100644 (file)
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -980,7 +980,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 '}'
@@ -1077,7 +1077,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 '}'
@@ -1169,7 +1169,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
                        {
@@ -1227,7 +1227,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 3a84bd96af31feb782690e3094e3d7141598c2cc..9fdef6913ad5687627de42e206682eb8e68be3b1 100644 (file)
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -3293,7 +3293,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 c58aa359259e2c4c416981c8e1fdbcc3e33f6fcd..227b9f30b91d9a4eaca59dcc48674eeb4011c0ae 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -1521,7 +1521,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:
@@ -1645,7 +1645,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:
@@ -1724,7 +1724,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);
@@ -2588,7 +2588,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);