netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] parser: fix ether keyword clash
@ 2014-04-11 13:51 Patrick McHardy
  0 siblings, 0 replies; only message in thread
From: Patrick McHardy @ 2014-04-11 13:51 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Due to the renaming of the "eth" keyword to "ether", parsing of arphrd
type "ether" fails.

Fix similar to TCP, UDP etc by allocating a constant arphrd expression for
the ether keyword without a following key.

Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 src/parser.y | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/parser.y b/src/parser.y
index af34857..de5c0ed 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -1639,6 +1639,13 @@ eth_hdr_expr		:	ETHER	eth_hdr_field
 			{
 				$$ = payload_expr_alloc(&@$, &proto_eth, $2);
 			}
+			|	ETHER
+			{
+				uint16_t data = ARPHRD_ETHER;
+				$$ = constant_expr_alloc(&@$, &arphrd_type,
+							 BYTEORDER_BIG_ENDIAN,
+							 sizeof(data) * BITS_PER_BYTE, &data);
+			}
 			;
 
 eth_hdr_field		:	SADDR		{ $$ = ETHHDR_SADDR; }
-- 
1.9.0


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2014-04-11 13:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-11 13:51 [PATCH] parser: fix ether keyword clash Patrick McHardy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).