Revert "Importing pfSense patch altq_codel.diff"

This reverts commit cf3bb1a7166bec431631defe01c8d4e706a99638.

TAG:		CODEL

1 files changed, 31 insertions, 97 deletions

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 7e32d16..0805ecc 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <altq/altq_priq.h>
 #include <altq/altq_hfsc.h>
 #include <altq/altq_fairq.h>
-#include <altq/altq_codel.h>
 
 #include <stdio.h>
 #include <unistd.h>
@@ -320,7 +319,6 @@ struct pool_opts {
 
 struct node_hfsc_opts	 hfsc_opts;
 struct node_fairq_opts	 fairq_opts;
-struct codel_opts	 codel_opts;
 struct node_state_opt	*keep_state_defaults = NULL;
 
 int		 disallow_table(struct node_host *, const char *);
@@ -445,7 +443,6 @@ typedef struct {
 		struct pool_opts	 pool_opts;
 		struct node_hfsc_opts	 hfsc_opts;
 		struct node_fairq_opts	 fairq_opts;
-		struct codel_opts	 codel_opts;
 	} v;
 	int lineno;
 } YYSTYPE;
@@ -470,8 +467,8 @@ int	parseport(char *, struct range *r, int);
 %token	REQUIREORDER SYNPROXY FINGERPRINTS NOSYNC DEBUG SKIP HOSTID
 %token	ANTISPOOF FOR INCLUDE
 %token	BITMASK RANDOM SOURCEHASH ROUNDROBIN STATICPORT PROBABILITY
-%token	ALTQ CBQ PRIQ HFSC FAIRQ CODEL BANDWIDTH TBRSIZE LINKSHARE REALTIME UPPERLIMIT
-%token	QUEUE PRIORITY QLIMIT HOGS BUCKETS RTABLE INTERVAL
+%token	ALTQ CBQ PRIQ HFSC FAIRQ BANDWIDTH TBRSIZE LINKSHARE REALTIME UPPERLIMIT
+%token	QUEUE PRIORITY QLIMIT HOGS BUCKETS RTABLE
 %token	DNPIPE DNQUEUE
 %token	LOAD RULESET_OPTIMIZATION
 %token	STICKYADDRESS MAXSRCSTATES MAXSRCNODES SOURCETRACK GLOBAL RULE
@@ -522,7 +519,6 @@ int	parseport(char *, struct range *r, int);
 %type	<v.number>		priqflags_list priqflags_item
 %type	<v.hfsc_opts>		hfscopts_list hfscopts_item hfsc_opts
 %type	<v.fairq_opts>		fairqopts_list fairqopts_item fairq_opts
-%type	<v.codel_opts>		codelopts_list codelopts_item codel_opts
 %type	<v.queue_bwspec>	bandwidth
 %type	<v.filter_opts>		filter_opts filter_opt filter_opts_l
 %type	<v.antispoof_opts>	antispoof_opts antispoof_opt antispoof_opts_l
@@ -1504,7 +1500,7 @@ altqif		: ALTQ interface queue_opts QUEUE qassign {
 			a.scheduler = $3.scheduler.qtype;
 			a.qlimit = $3.qlimit;
 			a.tbrsize = $3.tbrsize;
-			if ($5 == NULL && $3.scheduler.qtype != ALTQT_CODEL) {
+			if ($5 == NULL) {
 				yyerror("no child queues specified");
 				YYERROR;
 			}
@@ -1714,15 +1710,6 @@ scheduler	: CBQ				{
                         $$.qtype = ALTQT_FAIRQ;
                         $$.data.fairq_opts = $3;
                 }
-		| CODEL {
-			$$.qtype = ALTQT_CODEL;
-			bzero(&$$.data.codel_opts,
-				sizeof(struct codel_opts));
-		}
-                | CODEL '(' codel_opts ')'      {
-                        $$.qtype = ALTQT_CODEL;
-                        $$.data.codel_opts = $3;
-                }
 		;
 
 cbqflags_list	: cbqflags_item				{ $$ |= $1; }
@@ -1740,8 +1727,6 @@ cbqflags_item	: STRING	{
 				$$ = CBQCLF_RED|CBQCLF_ECN;
 			else if (!strcmp($1, "rio"))
 				$$ = CBQCLF_RIO;
-			else if (!strcmp($1, "codel"))
-				$$ = CBQCLF_CODEL;
 			else {
 				yyerror("unknown cbq flag \"%s\"", $1);
 				free($1);
@@ -1764,8 +1749,6 @@ priqflags_item	: STRING	{
 				$$ = PRCF_RED|PRCF_ECN;
 			else if (!strcmp($1, "rio"))
 				$$ = PRCF_RIO;
-			else if (!strcmp($1, "codel"))
-				$$ = PRCF_CODEL;
 			else {
 				yyerror("unknown priq flag \"%s\"", $1);
 				free($1);
@@ -1866,8 +1849,6 @@ hfscopts_item	: LINKSHARE bandwidth				{
 				hfsc_opts.flags |= HFCF_RED|HFCF_ECN;
 			else if (!strcmp($1, "rio"))
 				hfsc_opts.flags |= HFCF_RIO;
-			else if (!strcmp($1, "codel"))
-				hfsc_opts.flags |= HFCF_CODEL;
 			else {
 				yyerror("unknown hfsc flag \"%s\"", $1);
 				free($1);
@@ -1923,8 +1904,6 @@ fairqopts_item	: LINKSHARE bandwidth				{
 				fairq_opts.flags |= FARF_RED|FARF_ECN;
 			else if (!strcmp($1, "rio"))
 				fairq_opts.flags |= FARF_RIO;
-			else if (!strcmp($1, "codel"))
-				fairq_opts.flags |= FARF_CODEL;
 			else {
 				yyerror("unknown fairq flag \"%s\"", $1);
 				free($1);
@@ -1934,45 +1913,6 @@ fairqopts_item	: LINKSHARE bandwidth				{
 		}
 		;
 
-codel_opts	:	{
-				bzero(&codel_opts,
-				    sizeof(struct codel_opts));
-			}
-		    codelopts_list				{
-			$$ = codel_opts;
-		}
-		;
-
-codelopts_list	: codelopts_item
-		| codelopts_list comma codelopts_item
-		;
-
-codelopts_item	: QLIMIT number					{
-			if (codel_opts.target) {
-				yyerror("target already specified");
-				YYERROR;
-			}
-			codel_opts.target = $2;
-		}
-		| INTERVAL number				{
-			if (codel_opts.interval) {
-				yyerror("interval already specified");
-				YYERROR;
-			}
-			codel_opts.interval = $2;
-		}
-		| STRING					{
-			if (!strcmp($1, "ecn"))
-				codel_opts.ecn = 1;
-			else {
-				yyerror("unknown codel option \"%s\"", $1);
-				free($1);
-				YYERROR;
-			}
-			free($1);
-		}
-		;
-
 qassign		: /* empty */		{ $$ = NULL; }
 		| qassign_item		{ $$ = $1; }
 		| '{' optnl qassign_list '}'	{ $$ = $3; }
@@ -5142,8 +5082,7 @@ expand_altq(struct pf_altq *a, struct node_if *interfaces,
 
 	if ((pf->loadopt & PFCTL_FLAG_ALTQ) == 0) {
 		FREE_LIST(struct node_if, interfaces);
-		if (nqueues)
-			FREE_LIST(struct node_queue, nqueues);
+		FREE_LIST(struct node_queue, nqueues);
 		return (0);
 	}
 
@@ -5205,40 +5144,37 @@ expand_altq(struct pf_altq *a, struct node_if *interfaces,
 						errs++;
 			}
 
-			if (nqueues) {
-				LOOP_THROUGH(struct node_queue, queue, nqueues,
-					n = calloc(1, sizeof(struct node_queue));
-					if (n == NULL)
-						err(1, "expand_altq: calloc");
-					if (pa.scheduler == ALTQT_CBQ ||
-					    pa.scheduler == ALTQT_HFSC /* ||
-					    pa.scheduler == ALTQT_FAIRQ */)
-						if (strlcpy(n->parent, qname,
-						    sizeof(n->parent)) >=
-						    sizeof(n->parent))
-							errx(1, "expand_altq: strlcpy");
-					if (strlcpy(n->queue, queue->queue,
-					    sizeof(n->queue)) >= sizeof(n->queue))
-						errx(1, "expand_altq: strlcpy");
-					if (strlcpy(n->ifname, interface->ifname,
-					    sizeof(n->ifname)) >= sizeof(n->ifname))
+			LOOP_THROUGH(struct node_queue, queue, nqueues,
+				n = calloc(1, sizeof(struct node_queue));
+				if (n == NULL)
+					err(1, "expand_altq: calloc");
+				if (pa.scheduler == ALTQT_CBQ ||
+				    pa.scheduler == ALTQT_HFSC /* ||
+				    pa.scheduler == ALTQT_FAIRQ */)
+					if (strlcpy(n->parent, qname,
+					    sizeof(n->parent)) >=
+					    sizeof(n->parent))
 						errx(1, "expand_altq: strlcpy");
-					n->scheduler = pa.scheduler;
-					n->next = NULL;
-					n->tail = n;
-					if (queues == NULL)
-						queues = n;
-					else {
-						queues->tail->next = n;
-						queues->tail = n;
-					}
-				);
-			}
+				if (strlcpy(n->queue, queue->queue,
+				    sizeof(n->queue)) >= sizeof(n->queue))
+					errx(1, "expand_altq: strlcpy");
+				if (strlcpy(n->ifname, interface->ifname,
+				    sizeof(n->ifname)) >= sizeof(n->ifname))
+					errx(1, "expand_altq: strlcpy");
+				n->scheduler = pa.scheduler;
+				n->next = NULL;
+				n->tail = n;
+				if (queues == NULL)
+					queues = n;
+				else {
+					queues->tail->next = n;
+					queues->tail = n;
+				}
+			);
 		}
 	);
 	FREE_LIST(struct node_if, interfaces);
-	if (nqueues)
-		FREE_LIST(struct node_queue, nqueues);
+	FREE_LIST(struct node_queue, nqueues);
 
 	return (errs);
 }
@@ -5652,7 +5588,6 @@ lookup(char *s)
 		{ "buckets",		BUCKETS},
 		{ "cbq",		CBQ},
 		{ "code",		CODE},
-		{ "codelq",		CODEL},
 		{ "crop",		FRAGCROP},
 		{ "debug",		DEBUG},
 		{ "divert-reply",	DIVERTREPLY},
@@ -5687,7 +5622,6 @@ lookup(char *s)
 		{ "include",		INCLUDE},
 		{ "inet",		INET},
 		{ "inet6",		INET6},
-		{ "interval",		INTERVAL},
 		{ "keep",		KEEP},
 		{ "label",		LABEL},
 		{ "limit",		LIMIT},