From 14a9968a56f8b35138bab172aa7ce796f5d98e03 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 24 Aug 2018 13:26:57 +0200 Subject: parser_bison: Fix for ECN keyword in LHS of relational Of all possible TCP flags, 'ecn' is special since it is recognized by lex as a keyword (there is a a field in IPv4 and IPv6 headers with the same name). Therefore it is listed in keyword_expr, but that was sufficient for RHS only. The following statement reproduces the issue: | tcp flags & (syn | ecn) == (syn | ecn) The solution is to limit binop expressions to accept an RHS expression on RHS ("real" LHS expressions don't make much sense there anyway), which then allows keyword_expr to occur there. In order to maintain the recursive behaviour if braces are present, allow primary_rhs_expr to consist of a basic_rhs_expr enclosed in braces. This in turn requires for braced RHS part in relational_expr to be dropped, otherwise bison complains about shift/reduce conflict. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/py/inet/tcp.t | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/py/inet/tcp.t') diff --git a/tests/py/inet/tcp.t b/tests/py/inet/tcp.t index d66ba843..f96e3634 100644 --- a/tests/py/inet/tcp.t +++ b/tests/py/inet/tcp.t @@ -78,6 +78,7 @@ tcp flags cwr;ok tcp flags != cwr;ok tcp flags == syn;ok tcp flags & (syn|fin) == (syn|fin);ok;tcp flags & (fin | syn) == fin | syn +tcp flags & (fin | syn | rst | psh | ack | urg | ecn | cwr) == fin | syn | rst | psh | ack | urg | ecn | cwr;ok;tcp flags == 0xff tcp window 22222;ok tcp window 22;ok -- cgit v1.2.3