scanner: add support for scope nesting

Adding a COUNTER scope introduces parsing errors.  Example:

add rule  ... counter ip saddr 1.2.3.4

This is supposed to be

    COUNTER	IP SADDR SYMBOL

but it will be parsed as

    COUNTER	IP STRING SYMBOL

... and rule fails with unknown saddr.
This is because IP state change gets popped right after it was pushed.

bison parser invokes scanner_pop_start_cond() helper via
'close_scope_counter' rule after it has processed the entire 'counter' rule.
But that happens *after* flex has executed the 'IP' rule.

IOW, the sequence of events is not the exepcted
"COUNTER close_scope_counter IP SADDR SYMBOL close_scope_ip", it is
"COUNTER IP close_scope_counter".

close_scope_counter pops the just-pushed SCANSTATE_IP and returns the
scanner to SCANSTATE_COUNTER, so next input token (saddr) gets parsed
as a string, which gets then rejected from bison.

To resolve this, defer the pop operation until the current state is done.
scanner_pop_start_cond() already gets the scope that it has been
completed as an argument, so we can compare it to the active state.

If those are not the same, just defer the pop operation until the
bison reports its done with the active flex scope.

This leads to following sequence of events:
  1. flex switches to SCANSTATE_COUNTER
  2. flex switches to SCANSTATE_IP
  3. bison calls scanner_pop_start_cond(SCANSTATE_COUNTER)
  4. flex remains in SCANSTATE_IP, bison continues
  5. bison calls scanner_pop_start_cond(SCANSTATE_IP) once the entire
     ip rule has completed: this pops both IP and COUNTER.

Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/include/parser.h b/include/parser.h
index 9fdebcd11dd2ef9160bea633627ca4abf5821019..0c229963d3be7013d2f79dcdc61148ef89f98431 100644 (file)
--- a/include/parser.h
+++ b/include/parser.h
@@ -23,6 +23,8 @@ struct parser_state {
        struct scope                    *scopes[SCOPE_NEST_MAX];
        unsigned int                    scope;
 
+       unsigned int                    flex_state_pop;
+       unsigned int                    startcond_type;
        struct list_head                *cmds;
 };
 

diff --git a/src/scanner.l b/src/scanner.l
index c139c01fa0e803b3bae1a57e95ecae306023068a..936c7c6499b06bcf428361df6372543fce60c523 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1017,11 +1017,29 @@ void scanner_destroy(struct nft_ctx *nft)
 
 static void scanner_push_start_cond(void *scanner, enum startcond_type type)
 {
+       struct parser_state *state = yyget_extra(scanner);
+
+       state->startcond_type = type;
+
        yy_push_state((int)type, scanner);
 }
 
 void scanner_pop_start_cond(void *scanner, enum startcond_type t)
 {
-       (void)yy_top_state(scanner); /* suppress gcc warning wrt. unused function */
+       struct parser_state *state = yyget_extra(scanner);
+
+       if (state->startcond_type != t) {
+               state->flex_state_pop++;
+               return; /* Can't pop just yet! */
+       }
+
+       while (state->flex_state_pop) {
+               state->flex_state_pop--;
+               state->startcond_type = yy_top_state(scanner);
+               yy_pop_state(scanner);
+       }
+
+       state->startcond_type = yy_top_state(scanner);
+
        yy_pop_state(scanner);
 }