scanner: move until,over,used keywords away from init state

Only applicable for limit and quota. "ct count" also needs 'over'.

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

diff --git a/src/scanner.l b/src/scanner.l
index e373ff848ba902240d35c950413d23e058371f34..d09189ae4492e27593f3b683ba1c9f7edfbc5276 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -370,11 +370,13 @@ addrstring        ({macaddr}|{ip4addr}|{ip6addr})
        "rate"                  { return RATE; }
        "burst"                 { return BURST; }
 }
-"until"                        { return UNTIL; }
-"over"                 { return OVER; }
+<SCANSTATE_CT,SCANSTATE_LIMIT,SCANSTATE_QUOTA>"over"           { return OVER; }
 
 "quota"                        { scanner_push_start_cond(yyscanner, SCANSTATE_QUOTA); return QUOTA; }
-<SCANSTATE_QUOTA>"used"        { return USED; }
+<SCANSTATE_QUOTA>{
+       "used"          { return USED; }
+       "until"         { return UNTIL; }
+}
 
 "second"               { return SECOND; }
 "minute"               { return MINUTE; }