Attachment 172410 Details for Bug 210924 – proposed fix for parser.y

[patch] proposed fix for parser.y

210924_pfctl_parser.y_fix.patch (text/plain), 1.36 KB, created by Oliver Peter on 2016-07-12 13:13:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Peter

Created: 2016-07-12 13:13:43 UTC

Size: 1.36 KB

patch

obsolete

>diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
>index e0cfa3d..73b2ff6 100644
>--- a/sbin/pfctl/parse.y
>+++ b/sbin/pfctl/parse.y
>@@ -456,7 +456,7 @@ int	parseport(char *, struct range *r, int);
> %token	ANTISPOOF FOR INCLUDE
> %token	BITMASK RANDOM SOURCEHASH ROUNDROBIN STATICPORT PROBABILITY
> %token	ALTQ CBQ CODEL PRIQ HFSC FAIRQ BANDWIDTH TBRSIZE LINKSHARE REALTIME
>-%token	UPPERLIMIT QUEUE PRIORITY QLIMIT HOGS BUCKETS RTABLE TARGET INTERVAL
>+%token	UPPERLIMIT QUEUE PRIORITY QLIMIT HOGS BUCKETS RTABLE TARGET ALTQINTERVAL
> %token	LOAD RULESET_OPTIMIZATION PRIO
> %token	STICKYADDRESS MAXSRCSTATES MAXSRCNODES SOURCETRACK GLOBAL RULE
> %token	MAXSRCCONN MAXSRCCONNRATE OVERLOAD FLUSH SLOPPY
>@@ -1933,7 +1933,7 @@ codelopts_list	: codelopts_item
> 		| codelopts_list comma codelopts_item
> 		;
> 
>-codelopts_item	: INTERVAL number				{
>+codelopts_item	: ALTQINTERVAL number				{
> 			if (codel_opts.interval) {
> 				yyerror("interval already specified");
> 				YYERROR;
>@@ -5431,6 +5431,7 @@ lookup(char *s)
> 		{ "all",		ALL},
> 		{ "allow-opts",		ALLOWOPTS},
> 		{ "altq",		ALTQ},
>+		{ "altqinterval",	ALTQINTERVAL},
> 		{ "anchor",		ANCHOR},
> 		{ "antispoof",		ANTISPOOF},
> 		{ "any",		ANY},
>@@ -5473,7 +5474,6 @@ lookup(char *s)
> 		{ "include",		INCLUDE},
> 		{ "inet",		INET},
> 		{ "inet6",		INET6},
>-		{ "interval",		INTERVAL},
> 		{ "keep",		KEEP},
> 		{ "label",		LABEL},
> 		{ "limit",		LIMIT},

Actions: View | Diff

Attachments on bug 210924: 172410