This can now be reduced to expressions that can expect saddr/daddr tokens. Signed-off-by: Florian Westphal <fw@xxxxxxxxx> --- src/scanner.l | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/scanner.l b/src/scanner.l index 509b1b0d77a2..728b2c79b395 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -396,8 +396,10 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "bridge" { return BRIDGE; } "ether" { scanner_push_start_cond(yyscanner, SCANSTATE_ETH); return ETHER; } -"saddr" { return SADDR; } -"daddr" { return DADDR; } +<SCANSTATE_ARP,SCANSTATE_CT,SCANSTATE_ETH,SCANSTATE_IP,SCANSTATE_IP6,SCANSTATE_EXPR_FIB,SCANSTATE_EXPR_IPSEC>{ + "saddr" { return SADDR; } + "daddr" { return DADDR; } +} "type" { return TYPE; } "typeof" { return TYPEOF; } -- 2.26.2