scanner: dccp, th: Move to own scopes

With them in place, heavily shared keywords 'sport' and 'dport' may be
isolated.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/include/parser.h b/include/parser.h
index e80a7753ea715137d78dff1588c3617c36f013f3..ab372ad0bae886dc2e111c054f22424563903352 100644 (file)
--- a/include/parser.h
+++ b/include/parser.h
@@ -46,6 +46,7 @@ enum startcond_type {
        PARSER_SC_VLAN,
        PARSER_SC_CMD_LIST,
        PARSER_SC_EXPR_COMP,
+       PARSER_SC_EXPR_DCCP,
        PARSER_SC_EXPR_FIB,
        PARSER_SC_EXPR_HASH,
        PARSER_SC_EXPR_IPSEC,
@@ -54,6 +55,7 @@ enum startcond_type {
        PARSER_SC_EXPR_RT,
        PARSER_SC_EXPR_SCTP_CHUNK,
        PARSER_SC_EXPR_SOCKET,
+       PARSER_SC_EXPR_TH,
        PARSER_SC_EXPR_UDP,
        PARSER_SC_EXPR_UDPLITE,
 

diff --git a/src/parser_bison.y b/src/parser_bison.y
index 7ec1c02f9e6af24910baf27de0709d05530e8178..d7b2d250d91be87e2b0dd729e255b20a71f24e81 100644 (file)
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -933,6 +933,7 @@ close_scope_arp             : { scanner_pop_start_cond(nft->scanner, PARSER_SC_ARP); };
 close_scope_comp       : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_COMP); };
 close_scope_ct         : { scanner_pop_start_cond(nft->scanner, PARSER_SC_CT); };
 close_scope_counter    : { scanner_pop_start_cond(nft->scanner, PARSER_SC_COUNTER); };
+close_scope_dccp       : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_DCCP); };
 close_scope_eth                : { scanner_pop_start_cond(nft->scanner, PARSER_SC_ETH); };
 close_scope_fib                : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_FIB); };
 close_scope_hash       : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_HASH); };
@@ -953,6 +954,7 @@ close_scope_sctp_chunk      : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_S
 close_scope_secmark    : { scanner_pop_start_cond(nft->scanner, PARSER_SC_SECMARK); };
 close_scope_socket     : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_SOCKET); }
 close_scope_tcp                : { scanner_pop_start_cond(nft->scanner, PARSER_SC_TCP); };
+close_scope_th         : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_TH); };
 close_scope_udp                : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_UDP); };
 close_scope_udplite    : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_UDPLITE); };
 
@@ -4827,7 +4829,7 @@ primary_rhs_expr  :       symbol_expr             { $$ = $1; }
                                                         BYTEORDER_HOST_ENDIAN,
                                                         sizeof(data) * BITS_PER_BYTE, &data);
                        }
-                       |       DCCP
+                       |       DCCP    close_scope_dccp
                        {
                                uint8_t data = IPPROTO_DCCP;
                                $$ = constant_expr_alloc(&@$, &inet_protocol_type,
@@ -5288,7 +5290,7 @@ payload_raw_expr  :       AT      payload_base_spec       COMMA   NUM     COMMA   NUM
 
 payload_base_spec      :       LL_HDR          { $$ = PROTO_BASE_LL_HDR; }
                        |       NETWORK_HDR     { $$ = PROTO_BASE_NETWORK_HDR; }
-                       |       TRANSPORT_HDR   { $$ = PROTO_BASE_TRANSPORT_HDR; }
+                       |       TRANSPORT_HDR   close_scope_th  { $$ = PROTO_BASE_TRANSPORT_HDR; }
                        |       STRING
                        {
                                if (!strcmp($1, "ih")) {
@@ -5621,7 +5623,7 @@ tcpopt_field_maxseg       :       SIZE            { $$ = TCPOPT_MAXSEG_SIZE; }
 tcpopt_field_mptcp     :       SUBTYPE         { $$ = TCPOPT_MPTCP_SUBTYPE; }
                        ;
 
-dccp_hdr_expr          :       DCCP    dccp_hdr_field
+dccp_hdr_expr          :       DCCP    dccp_hdr_field  close_scope_dccp
                        {
                                $$ = payload_expr_alloc(&@$, &proto_dccp, $2);
                        }
@@ -5749,7 +5751,7 @@ sctp_hdr_field            :       SPORT           { $$ = SCTPHDR_SPORT; }
                        |       CHECKSUM        { $$ = SCTPHDR_CHECKSUM; }
                        ;
 
-th_hdr_expr            :       TRANSPORT_HDR   th_hdr_field
+th_hdr_expr            :       TRANSPORT_HDR   th_hdr_field    close_scope_th
                        {
                                $$ = payload_expr_alloc(&@$, &proto_th, $2);
                                if ($$)

diff --git a/src/scanner.l b/src/scanner.l
index d6fb91bd102b2c7004bbfe3c4bd3b4d03545aee5..ed26811c5d9061cb63f5b3f6321dfe20960a20a1 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -212,6 +212,7 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 %s SCANSTATE_VLAN
 %s SCANSTATE_CMD_LIST
 %s SCANSTATE_EXPR_COMP
+%s SCANSTATE_EXPR_DCCP
 %s SCANSTATE_EXPR_FIB
 %s SCANSTATE_EXPR_HASH
 %s SCANSTATE_EXPR_IPSEC
@@ -220,6 +221,7 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 %s SCANSTATE_EXPR_RT
 %s SCANSTATE_EXPR_SCTP_CHUNK
 %s SCANSTATE_EXPR_SOCKET
+%s SCANSTATE_EXPR_TH
 %s SCANSTATE_EXPR_UDP
 %s SCANSTATE_EXPR_UDPLITE
 
@@ -422,7 +424,7 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 
 "ll"                   { return LL_HDR; }
 "nh"                   { return NETWORK_HDR; }
-"th"                   { return TRANSPORT_HDR; }
+"th"                   { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_TH); return TRANSPORT_HDR; }
 
 "bridge"               { return BRIDGE; }
 
@@ -558,13 +560,17 @@ addrstring        ({macaddr}|{ip4addr}|{ip6addr})
 <SCANSTATE_EXPR_UDPLITE>{
        "csumcov"       { return CSUMCOV; }
 }
-"sport"                        { return SPORT; }
-"dport"                        { return DPORT; }
+<SCANSTATE_EXPR_DCCP,SCANSTATE_SCTP,SCANSTATE_TCP,SCANSTATE_EXPR_TH,SCANSTATE_EXPR_UDP,SCANSTATE_EXPR_UDPLITE>{
+       "sport"                 { return SPORT; }
+}
+<SCANSTATE_CT,SCANSTATE_EXPR_DCCP,SCANSTATE_SCTP,SCANSTATE_TCP,SCANSTATE_EXPR_TH,SCANSTATE_EXPR_UDP,SCANSTATE_EXPR_UDPLITE>{
+       "dport"                 { return DPORT; }
+}
 "port"                 { return PORT; }
 
 "tcp"                  { scanner_push_start_cond(yyscanner, SCANSTATE_TCP); return TCP; }
 
-"dccp"                 { return DCCP; }
+"dccp"                 { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_DCCP); return DCCP; }
 
 "sctp"                 { scanner_push_start_cond(yyscanner, SCANSTATE_SCTP); return SCTP; }