From d9f17a96ad825f983756112a47500666c6984661 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Mon, 14 Jan 2013 11:52:28 +0100
Subject: [PATCH] trafgen: allow spaces between operands

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 src/trafgen.c        |  2 +-
 src/trafgen_lexer.l  | 20 ++++++++++----------
 src/trafgen_parser.y |  1 -
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/trafgen.c b/src/trafgen.c
index 672ccc77..19a2568a 100644
--- a/src/trafgen.c
+++ b/src/trafgen.c
@@ -264,7 +264,7 @@ static void example(void)
 	"  # TCP Ackn. Number\n"
 	"  0, 0, 0, 0,\n"
 	"  # TCP Header length + TCP SYN Flag\n"
-	"  0x80, c8((1<<1)|(1<<6)),\n"
+	"  0x80, c8((1 << 1) | (1 << 6)),\n"
 	"  # Window Size\n"
 	"  0x00, 0x10,\n"
 	"  # TCP Checksum (offset IP, offset TCP)\n"
diff --git a/src/trafgen_lexer.l b/src/trafgen_lexer.l
index af2c5890..a0b67bd5 100644
--- a/src/trafgen_lexer.l
+++ b/src/trafgen_lexer.l
@@ -56,16 +56,16 @@ number_ascii	([a-zA-Z])
 "const32"|"c32"	{ return K_CONST32; }
 "const64"|"c64"	{ return K_CONST64; }
 
-"-"		{ return '-'; }
-"+"		{ return '+'; }
-"*"		{ return '*'; }
-"/"		{ return '/'; }
-"%"		{ return '%'; }
-"&"		{ return '&'; }
-"|"		{ return '|'; }
-"<"		{ return '<'; }
-">"		{ return '>'; }
-"^"		{ return '^'; }
+[ ]*"-"[ ]*	{ return '-'; }
+[ ]*"+"[ ]*	{ return '+'; }
+[ ]*"*"[ ]*	{ return '*'; }
+[ ]*"/"[ ]*	{ return '/'; }
+[ ]*"%"[ ]*	{ return '%'; }
+[ ]*"&"[ ]*	{ return '&'; }
+[ ]*"|"[ ]*	{ return '|'; }
+[ ]*"<"[ ]*	{ return '<'; }
+[ ]*">"[ ]*	{ return '>'; }
+[ ]*"^"[ ]*	{ return '^'; }
 "{"		{ return '{'; }
 "}"		{ return '}'; }
 "("		{ return '('; }
diff --git a/src/trafgen_parser.y b/src/trafgen_parser.y
index c67b44ba..ede081a0 100644
--- a/src/trafgen_parser.y
+++ b/src/trafgen_parser.y
@@ -15,7 +15,6 @@
 #include <signal.h>
 #include <stdint.h>
 #include <errno.h>
-#include <math.h>
 
 #include "xmalloc.h"
 #include "trafgen_parser.tab.h"
-- 
2.11.4.GIT