From d268c858df7320db1bc959264594131ca90ef90c Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Thu, 11 Mar 2021 14:23:05 +0100 Subject: scanner: add fib scope makes no sense as-is because all keywords need to stay in the INITIAL scope. This can be changed after all saddr/daddr users have been scoped. Signed-off-by: Florian Westphal --- include/parser.h | 1 + src/parser_bison.y | 3 ++- src/scanner.l | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/parser.h b/include/parser.h index 586a9848..e338713d 100644 --- a/include/parser.h +++ b/include/parser.h @@ -31,6 +31,7 @@ enum startcond_type { PARSER_SC_CT, PARSER_SC_IP, PARSER_SC_IP6, + PARSER_SC_EXPR_FIB, PARSER_SC_EXPR_HASH, PARSER_SC_EXPR_IPSEC, PARSER_SC_EXPR_NUMGEN, diff --git a/src/parser_bison.y b/src/parser_bison.y index 9ef2602e..74ab69dd 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -862,6 +862,7 @@ opt_newline : NEWLINE ; close_scope_ct : { scanner_pop_start_cond(nft->scanner, PARSER_SC_CT); }; +close_scope_fib : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_FIB); }; close_scope_hash : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_HASH); }; close_scope_ip : { scanner_pop_start_cond(nft->scanner, PARSER_SC_IP); }; close_scope_ip6 : { scanner_pop_start_cond(nft->scanner, PARSER_SC_IP6); }; @@ -3873,7 +3874,7 @@ primary_expr : symbol_expr { $$ = $1; } | '(' basic_expr ')' { $$ = $2; } ; -fib_expr : FIB fib_tuple fib_result +fib_expr : FIB fib_tuple fib_result close_scope_fib { if (($2 & (NFTA_FIB_F_SADDR|NFTA_FIB_F_DADDR)) == 0) { erec_queue(error(&@2, "fib: need either saddr or daddr"), state->msgs); diff --git a/src/scanner.l b/src/scanner.l index 15d1beca..c78f34b6 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -199,6 +199,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) %s SCANSTATE_CT %s SCANSTATE_IP %s SCANSTATE_IP6 +%s SCANSTATE_EXPR_FIB %s SCANSTATE_EXPR_HASH %s SCANSTATE_EXPR_IPSEC %s SCANSTATE_EXPR_NUMGEN @@ -588,7 +589,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "dup" { return DUP; } "fwd" { return FWD; } -"fib" { return FIB; } +"fib" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_FIB); return FIB; } "osf" { return OSF; } -- cgit v1.2.3