From: Florian Westphal <fw@strlen.de>
Date: Thu, 11 Mar 2021 13:23:12 +0000 (+0100)
Subject: scanner: move until,over,used keywords away from init state
X-Git-Tag: v0.9.9~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46e0b54cad76125a70184339c49cbd1dfde1c4ea;p=thirdparty%2Fnftables.git

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 e373ff84..d09189ae 100644
--- 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; }