From 2bce4249a8e90c67a24e096f91047795f92ab548 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Thu, 11 Apr 2013 14:52:01 +0200 Subject: trafgen: parser: fix regression on last pkt element Jon Schipp reported that a arbitrary packet config such as ... { "MyPacket", "MyPacket", "MyPacket", "MyPacket", "MyPacket", "MyPacket", "MyPacket", "MyPacket", } ... doesn't work anymore, although it used to work. This regression was introduced by commit f9591eebe40c ("trafgen: lexer/parser: fix cpu() selection and whitespacing"). Reported-by: Jon Schipp Signed-off-by: Daniel Borkmann --- trafgen_parser.y | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'trafgen_parser.y') diff --git a/trafgen_parser.y b/trafgen_parser.y index 16701c7..8b8f3e6 100644 --- a/trafgen_parser.y +++ b/trafgen_parser.y @@ -349,9 +349,15 @@ cpu_delim | '-' { } ; +delimiter_nowhite + : ',' { } + | ',' K_WHITE { } + ; + noenforce_white : { } | K_WHITE { } + | delimiter_nowhite { } ; packet @@ -384,9 +390,8 @@ payload ; delimiter - : ',' { } + : delimiter_nowhite { } | K_WHITE { } - | ',' K_WHITE { } ; elem_delimiter -- cgit v1.2.3-54-g00ecf