diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-06-16 17:49:22 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-06-16 17:53:18 +0200 |
| commit | 2baf59cfe686877ced6adee5f2b0d50c1a1c9845 (patch) | |
| tree | 6d77852ae6f53b5136c288c9ef7528a96aa934e6 | |
| parent | 1e743925a597055c82200540a7c8c3e2ec506878 (diff) | |
parser_bison: allow to use mark as datatype for maps and sets
Update the grammar to accept a MARK token as datatype.
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1012
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/parser_bison.y | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index eac3fcbe..5c4e2727 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -396,12 +396,12 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token XML "xml" %token JSON "json" -%type <string> identifier string comment_spec -%destructor { xfree($$); } identifier string comment_spec +%type <string> identifier type_identifier string comment_spec +%destructor { xfree($$); } identifier type_identifier string comment_spec %type <val> time_spec -%type <val> type_identifier +%type <val> type_identifier_list %type <datatype> data_type %type <cmd> line @@ -1025,7 +1025,7 @@ set_policy_spec : PERFORMANCE { $$ = NFT_SET_POL_PERFORMANCE; } | MEMORY { $$ = NFT_SET_POL_MEMORY; } ; -data_type : type_identifier +data_type : type_identifier_list { if ($1 & ~TYPE_MASK) $$ = concat_type_alloc($1); @@ -1034,7 +1034,7 @@ data_type : type_identifier } ; -type_identifier : identifier +type_identifier_list : type_identifier { const struct datatype *dtype = datatype_lookup_byname($1); if (dtype == NULL) { @@ -1044,7 +1044,7 @@ type_identifier : identifier } $$ = dtype->type; } - | type_identifier DOT identifier + | type_identifier_list DOT type_identifier { const struct datatype *dtype = datatype_lookup_byname($3); if (dtype == NULL) { @@ -1056,6 +1056,10 @@ type_identifier : identifier } ; +type_identifier : STRING { $$ = $1; } + | MARK { $$ = xstrdup("mark"); } + ; + hook_spec : TYPE STRING HOOK STRING PRIORITY NUM { $<chain>0->type = chain_type_name_lookup($2); |