ditch fastroute, an ipf feature that made its way into pf before

route-to and friends were introduced making it obsolete. one even
has to look it up int the ipf manual to get and idea what it's
supposed to do.  reuse some kernel bits for the upcoming nat64
stuff.  "kill it with fire" from mcbride, "what mcbride said"
from mpf, "kill kill kill" and ok henning.

2 files changed, 7 insertions, 17 deletions

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 2e665265647..4fba39e65b8 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.597 2010/12/31 12:15:31 bluhm Exp $	*/
+/*	$OpenBSD: parse.y,v 1.598 2011/04/05 13:48:18 mikeb Exp $	*/
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -453,7 +453,7 @@ int	parseport(char *, struct range *r, int);
 %token	PASS BLOCK MATCH SCRUB RETURN IN OS OUT LOG QUICK ON FROM TO FLAGS
 %token	RETURNRST RETURNICMP RETURNICMP6 PROTO INET INET6 ALL ANY ICMPTYPE
 %token	ICMP6TYPE CODE KEEP MODULATE STATE PORT BINATTO NODF
-%token	MINTTL ERROR ALLOWOPTS FASTROUTE FILENAME ROUTETO DUPTO REPLYTO NO LABEL
+%token	MINTTL ERROR ALLOWOPTS FILENAME ROUTETO DUPTO REPLYTO NO LABEL
 %token	NOROUTE URPFFAILED FRAGMENT USER GROUP MAXMSS MAXIMUM TTL TOS DROP TABLE
 %token	REASSEMBLE ANCHOR
 %token	SET OPTIMIZATION TIMEOUT LIMIT LOGINTERFACE BLOCKPOLICY RANDOMID
@@ -2028,7 +2028,7 @@ pfrule		: action dir logquick interface af proto fromto
 					memcpy(&r.route.key, $8.route.key,
 					    sizeof(struct pf_poolhashkey));
 			}
-			if (r.rt && r.rt != PF_FASTROUTE) {
+			if (r.rt) {
 				decide_address_family($8.route.host, &r.af);
 				if ((r.route.opts & PF_POOL_TYPEMASK) ==
 				    PF_POOL_NONE && ($8.route.host->next != NULL ||
@@ -2293,11 +2293,6 @@ filter_opt	: USER uids {
 			    sizeof(filter_opts.nat.pool_opts));
 			filter_opts.nat.pool_opts.staticport = 1;
 		}
-		| FASTROUTE {
-			filter_opts.route.host = NULL;
-			filter_opts.route.rt = PF_FASTROUTE;
-			filter_opts.route.pool_opts = 0;
-		}
 		| ROUTETO routespec pool_opts {
 			filter_opts.route.host = $2;
 			filter_opts.route.rt = PF_ROUTETO;
@@ -4032,7 +4027,7 @@ rule_consistent(struct pf_rule *r, int anchor_call)
 			problems++;
 		}
 		if (r->rt) {
-			yyerror("route-to, reply-to, dup-to and fastroute "
+			yyerror("route-to, reply-to and dup-to "
 			   "must not be used on match rules");
 			problems++;
 		}
@@ -5040,7 +5035,6 @@ lookup(char *s)
 		{ "divert-to",		DIVERTTO},
 		{ "drop",		DROP},
 		{ "dup-to",		DUPTO},
-		{ "fastroute",		FASTROUTE},
 		{ "file",		FILENAME},
 		{ "fingerprints",	FINGERPRINTS},
 		{ "flags",		FLAGS},
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 3e5699cb5d2..f6ab2c68312 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_parser.c,v 1.273 2011/01/23 11:19:55 bluhm Exp $ */
+/*	$OpenBSD: pfctl_parser.c,v 1.274 2011/04/05 13:48:18 mikeb Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1056,12 +1056,8 @@ print_rule(struct pf_rule *r, const char *anchor_call, int verbose)
 			printf(" reply-to");
 		else if (r->rt == PF_DUPTO)
 			printf(" dup-to");
-		else if (r->rt == PF_FASTROUTE)
-			printf(" fastroute");
-		if (r->rt != PF_FASTROUTE) {
-			printf(" ");
-			print_pool(&r->route, 0, 0, r->af, PF_POOL_ROUTE, verbose);
-		}
+		printf(" ");
+		print_pool(&r->route, 0, 0, r->af, PF_POOL_ROUTE, verbose);
 	}
 }