scanner: arp: move to own scope

allows to move the arp specific tokens out of the INITIAL scope.

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

diff --git a/include/parser.h b/include/parser.h
index cdc5fd094af54f382dd07c65edffe3fbc76effad..38039677cd1dfdd0bb2ce6422b55fa8dfbf43331 100644 (file)
--- a/include/parser.h
+++ b/include/parser.h
@@ -28,6 +28,7 @@ struct parser_state {
 
 enum startcond_type {
        PARSER_SC_BEGIN,
+       PARSER_SC_ARP,
        PARSER_SC_CT,
        PARSER_SC_ETH,
        PARSER_SC_IP,

diff --git a/src/parser_bison.y b/src/parser_bison.y
index 9cfa336643e51bda3bd3a3d76d85d28be59b4ca7..a22f61c4c99b5b9628b507f6fb779c7f28205eef 100644 (file)
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -861,6 +861,7 @@ opt_newline         :       NEWLINE
                        |       /* empty */
                        ;
 
+close_scope_arp                : { scanner_pop_start_cond(nft->scanner, PARSER_SC_ARP); };
 close_scope_ct         : { scanner_pop_start_cond(nft->scanner, PARSER_SC_CT); };
 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); };
@@ -2431,7 +2432,7 @@ family_spec               :       /* empty */             { $$ = NFPROTO_IPV4; }
 family_spec_explicit   :       IP      close_scope_ip  { $$ = NFPROTO_IPV4; }
                        |       IP6     close_scope_ip6 { $$ = NFPROTO_IPV6; }
                        |       INET                    { $$ = NFPROTO_INET; }
-                       |       ARP                     { $$ = NFPROTO_ARP; }
+                       |       ARP     close_scope_arp { $$ = NFPROTO_ARP; }
                        |       BRIDGE                  { $$ = NFPROTO_BRIDGE; }
                        |       NETDEV                  { $$ = NFPROTO_NETDEV; }
                        ;
@@ -4544,7 +4545,7 @@ keyword_expr              :       ETHER   close_scope_eth { $$ = symbol_value(&@$, "ether"); }
                        |       IP      close_scope_ip  { $$ = symbol_value(&@$, "ip"); }
                        |       IP6     close_scope_ip6 { $$ = symbol_value(&@$, "ip6"); }
                        |       VLAN                    { $$ = symbol_value(&@$, "vlan"); }
-                       |       ARP                     { $$ = symbol_value(&@$, "arp"); }
+                       |       ARP     close_scope_arp { $$ = symbol_value(&@$, "arp"); }
                        |       DNAT                    { $$ = symbol_value(&@$, "dnat"); }
                        |       SNAT                    { $$ = symbol_value(&@$, "snat"); }
                        |       ECN                     { $$ = symbol_value(&@$, "ecn"); }
@@ -5104,7 +5105,7 @@ vlan_hdr_field            :       ID              { $$ = VLANHDR_VID; }
                        |       TYPE            { $$ = VLANHDR_TYPE; }
                        ;
 
-arp_hdr_expr           :       ARP     arp_hdr_field
+arp_hdr_expr           :       ARP     arp_hdr_field   close_scope_arp
                        {
                                $$ = payload_expr_alloc(&@$, &proto_arp, $2);
                        }

diff --git a/src/scanner.l b/src/scanner.l
index b1b03b95126349d1f1ff3022225951f34f56cb3c..509b1b0d77a2cb52c9464bbb3c2b329f1a133171 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -196,6 +196,7 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 %option nodefault
 %option warn
 %option stack
+%s SCANSTATE_ARP
 %s SCANSTATE_CT
 %s SCANSTATE_ETH
 %s SCANSTATE_IP
@@ -405,12 +406,14 @@ addrstring        ({macaddr}|{ip4addr}|{ip6addr})
 "cfi"                  { return CFI; }
 "pcp"                  { return PCP; }
 
-"arp"                  { return ARP; }
-"htype"                        { return HTYPE; }
-"ptype"                        { return PTYPE; }
-"hlen"                 { return HLEN; }
-"plen"                 { return PLEN; }
-"operation"            { return OPERATION; }
+"arp"                  { scanner_push_start_cond(yyscanner, SCANSTATE_ARP); return ARP; }
+<SCANSTATE_ARP>{
+       "htype"                 { return HTYPE; }
+       "ptype"                 { return PTYPE; }
+       "hlen"                  { return HLEN; }
+       "plen"                  { return PLEN; }
+       "operation"             { return OPERATION; }
+}
 
 "ip"                   { scanner_push_start_cond(yyscanner, SCANSTATE_IP); return IP; }
 "version"              { return HDRVERSION; }