Add support for table's persist flag
Phil Sutter
reviewerPATCH v3 1/1 Add support for table's persist flag
Bison parser lacked support for passing multiple flags, JSON parser did not support table flags at all.
Document also 'owner' flag (and describe their relationship in nft.8.
Signed-off-by Phil Sutter <[email protected]>
---
Changes since v2:
- Introduce a global parse_table_flag() function for use in both parsers.
Changes since v1:
- Add missing free_const() call, noticed by Quentin Deslandes.
--- doc/libnftables-json.adoc | 11 ++++- doc/nft.txt | 9 ++++ include/rule.h | 4 +- src/parser_bison.y | 35 +++++++++------ src/parser_json.c | 49 ++++++++++++++++++++- src/rule.c | 12 +++++ tests/shell/features/table_flag_persist.nft | 3 ++ tests/shell/testcases/owner/0002-persist | 36 +++++++++++++++ 8 files changed, 142 insertions(+), 17 deletions(-) create mode 100644 tests/shell/features/table_flag_persist.nft create mode 100755 tests/shell/testcases/owner/0002-persist
doc/libnftables-json.adoc +10 -1
@@ -202,12 +202,19 @@ Rename a chain. The new name is expected in a dedicated property named === TABLE [verse] +____ *{ "table": { "family":* 'STRING'*, "name":* 'STRING'*, - "handle":* 'NUMBER' + "handle":* 'NUMBER'*, + "flags":* 'TABLE_FLAGS' *}}* +'TABLE_FLAGS' := 'TABLE_FLAG' | *[* 'TABLE_FLAG_LIST' *]* +'TABLE_FLAG_LIST' := 'TABLE_FLAG' [*,* 'TABLE_FLAG_LIST' ] +'TABLE_FLAG' := *"dormant"* | *"owner"* | *"persist"* +____ + This object describes a table. *family*::
@@ -217,6 +224,8 @@ This object describes a table. *handle*:: The table's handle. In input, it is used only in *delete* command as alternative to *name*. +*flags*:: + The table's flags. === CHAIN [verse]
doc/nft.txt +9 -0
@@ -343,8 +343,17 @@ return an error. |Flag | Description |dormant | table is not evaluated any more (base chains are unregistered). +|owner | +table is owned by the creating process. +|persist | +table shall outlive the owning process. |================= +Creating a table with flag *owner* excludes other processes from manipulating +it or its contents. By default, it will be removed when the process exits. +Setting flag *persist* will prevent this and the resulting orphaned table will +accept a new owner, e.g. a restarting daemon maintaining the table. + .*Add, change, delete a table* --------------------------------------- # start nft in interactive mode
include/rule.h +3 -1
@@ -130,10 +130,12 @@ struct symbol *symbol_get(const struct scope *scope, const char *identifier);enum table_flags {TABLE_F_DORMANT = (1 <<0 ),TABLE_F_OWNER = (1 <<1 ), +TABLE_F_PERSIST = (1 <<2 ), }; -#define TABLE_FLAGS_MAX 2 +#define TABLE_FLAGS_MAX 3const char *table_flag_name (uint32_t flag); +unsigned int parse_table_flag (const char *name);/** * struct table - nftables table
src/parser_bison.y +22 -13
@@ -742,6 +742,8 @@ int nft_lex(void *, void *, void *); %type <rule> rule rule_alloc %destructor { rule_free($$); } rule +%type <val> table_flags table_flag + %type <val> set_flag_list set_flag %type <val> set_policy_spec
@@ -1905,20 +1907,9 @@ table_block_alloc : /* empty */ } ; -table_options : FLAGS STRING +table_options : FLAGS table_flags { - if (strcmp($2, "dormant") == 0) { - $<table>0->flags |= TABLE_F_DORMANT; - free_const($2); - } else if (strcmp($2, "owner") == 0) { - $<table>0->flags |= TABLE_F_OWNER; - free_const($2); - } else { - erec_queue(error(&@2, "unknown table option %s", $2), - state->msgs); - free_const($2); - YYERROR; - } + $<table>0->flags |= $2; } | comment_spec {
@@ -1930,6 +1921,24 @@ table_options : FLAGS STRING } ; +table_flags : table_flag + | table_flags COMMA table_flag + { + $$ = $1 | $3; + } + ; +table_flag : STRING + { + $$ = parse_table_flag($1); + free_const($1); + if ($$ == 0) { + erec_queue(error(&@1, "unknown table option %s", $1), + state->msgs); + YYERROR; + } + } + ; + table_block : /* empty */ { $$ = $<table>-1; } | table_block common_block | table_block stmt_separator
src/parser_json.c +47 -2
75 lines not on this page · raw message
src/rule.c +12 -0
@@ -1215,6 +1215,7 @@ struct table *table_lookup_fuzzy(const struct handle *h,static const char *table_flags_name[TABLE_FLAGS_MAX ] = {"dormant" ,"owner" , +"persist" , };const char *table_flag_name (uint32_t flag)
@@ -1225,6 +1226,17 @@ const char *table_flag_name(uint32_t flag)return table_flags_name[flag]; } +unsigned int parse_table_flag (const char *name) +{ +int i; + +for (i =0 ; i <TABLE_FLAGS_MAX ; i++) { +if (!strcmp (name, table_flags_name[i])) +return 1 << i; + } +return 0 ; +} +static void table_print_flags (const struct table *table,const char **delim,struct output_ctx *octx) {
tests/shell/features/table_flag_persist.nft new file +3 -0
@@ -0,0 +1,3 @@ +table t { + flags persist; +}
tests/shell/testcases/owner/0002-persist new file +36 -0
@@ -0,0 +1,36 @@ +#!/bin/bash + +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_table_flag_owner) +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_table_flag_persist) + +die() { + echo "$@" + exit 1 +} + +$NFT -f - <<EOF +table ip t { + flags owner, persist +} +EOF +[[ $? -eq 0 ]] || { + die "table add failed" +} + +$NFT list ruleset | grep -q 'table ip t' || { + die "table does not persist" +} +$NFT list ruleset | grep -q 'flags persist$' || { + die "unexpected flags in orphaned table" +} + +$NFT -f - <<EOF +table ip t { + flags owner, persist +} +EOF +[[ $? -eq 0 ]] || { + die "retake ownership failed" +} + +exit 0
Signature · 1 line
2.43.0
Phil Sutter
reviewerQuoted 6 lines · Phil Sutter
Bison parser lacked support for passing multiple flags, JSON parser did not support table flags at all.
Document also 'owner' flag (and describe their relationship in nft.8.
Signed-off-by Phil Sutter <[email protected]>
Patch applied.