[nftables tree] Allow newlines in regular maps

Patrick McHardy netfilter-cvslog-bounces at lists.netfilter.org
Wed Mar 18 10:45:54 CET 2009


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=nftables.git;a=commit;h=28ac64e4e79a392a6fb327f6cbb57c14fc3f5110
commit 28ac64e4e79a392a6fb327f6cbb57c14fc3f5110
Author:     Patrick McHardy <kaber at trash.net>
AuthorDate: Wed Mar 18 10:45:31 2009 +0100
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Wed Mar 18 10:45:31 2009 +0100

    Allow newlines in regular maps
    
    The previous patch only handled sets and verdict maps.
    
    Signed-off-by: Patrick McHardy <kaber at trash.net>
       via  28ac64e4e79a392a6fb327f6cbb57c14fc3f5110 (commit)
      from  075935852307c39ada8e95beb22c9f0df7e597f8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 28ac64e4e79a392a6fb327f6cbb57c14fc3f5110
Author: Patrick McHardy <kaber at trash.net>
Date:   Wed Mar 18 10:45:31 2009 +0100

    Allow newlines in regular maps
    
    The previous patch only handled sets and verdict maps.
    
    Signed-off-by: Patrick McHardy <kaber at trash.net>

-----------------------------------------------------------------------

 src/parser.y |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
The previous patch only handled sets and verdict maps.

Signed-off-by: Patrick McHardy <kaber at trash.net>

diff --git a/src/parser.y b/src/parser.y
index c527ce1..cc7e467 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -913,12 +913,14 @@ map_list		:	map_list_expr
 				$1->location = @$;
 				$$ = $1;
 			}
-			|	map_list	COMMA
+			|	map_list	COMMA	opt_newline
 			;
 
-map_list_expr		:	map_lhs_expr	ARROW	concat_expr
+map_list_expr		:	opt_newline	map_lhs_expr	opt_newline
+	       					ARROW		opt_newline
+						concat_expr	opt_newline
 			{
-				$$ = mapping_expr_alloc(&@$, $1, $3);
+				$$ = mapping_expr_alloc(&@$, $2, $6);
 			}
 			;
 



More information about the netfilter-cvslog mailing list