svn commit: r236179 - in projects/pf/head/contrib/pf: man pfctl

[Gleb Smirnoff]

Author: glebius
Date: Mon May 28 13:09:30 2012
New Revision: 236179
URL: http://svn.freebsd.org/changeset/base/236179

Log:
  Catch up with r235505 to kernel:
    Remove rtlabel stuff, that isn't supported in FreeBSD.

Modified:
  projects/pf/head/contrib/pf/man/pf.conf.5
  projects/pf/head/contrib/pf/pfctl/parse.y
  projects/pf/head/contrib/pf/pfctl/pf_print_state.c

Modified: projects/pf/head/contrib/pf/man/pf.conf.5
==============================================================================
--- projects/pf/head/contrib/pf/man/pf.conf.5	Mon May 28 12:13:04 2012	(r236178)
+++ projects/pf/head/contrib/pf/man/pf.conf.5	Mon May 28 13:09:30 2012	(r236179)
@@ -28,7 +28,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 31 2009
+.Dd May 28 2012
 .Dt PF.CONF 5
 .Os
 .Sh NAME
@@ -1479,13 +1479,6 @@ of the following keywords:
 .Bl -tag -width xxxxxxxxxxxxxx -compact
 .It Ar any
 Any address.
-.It Ar route Aq Ar label
-Any address whose associated route has label
-.Aq Ar label .
-See
-.Xr route 4
-and
-.Xr route 8 .
 .It Ar no-route
 Any address which is not currently routable.
 .It Ar urpf-failed
@@ -1594,7 +1587,6 @@ pass in proto tcp from any to any port 2
 pass in proto tcp from 10.0.0.0/8 port \*(Gt 1024 \e
       to ! 10.1.2.3 port != ssh
 pass in proto tcp from any os "OpenBSD"
-pass in proto tcp from route "DTAG"
 .Ed
 .It Ar all
 This is equivalent to "from any to any".
@@ -2949,9 +2941,9 @@ proto-list     = ( proto-name | proto-nu
 
 hosts          = "all" |
                  "from" ( "any" | "no-route" | "urpf-failed" | "self" | host |
-                 "{" host-list "}" | "route" string ) [ port ] [ os ]
+                 "{" host-list "}" ) [ port ] [ os ]
                  "to"   ( "any" | "no-route" | "self" | host |
-                 "{" host-list "}" | "route" string ) [ port ]
+                 "{" host-list "}" ) [ port ]
 
 ipspec         = "any" | host | "{" host-list "}"
 host           = [ "!" ] ( address [ "/" mask-bits ] | "\*(Lt" string "\*(Gt" )
@@ -3064,12 +3056,6 @@ sysctl which is automatically enabled wh
 rule is added or
 .Ar log (user)
 is specified.
-.Pp
-Route labels are not supported by the
-.Fx
-.Xr route 4
-system.
-Rules with a route label do not match any traffic.
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr carp 4 ,
@@ -3080,7 +3066,6 @@ Rules with a route label do not match an
 .Xr pf 4 ,
 .Xr pflow 4 ,
 .Xr pfsync 4 ,
-.Xr route 4 ,
 .Xr tcp 4 ,
 .Xr udp 4 ,
 .Xr hosts 5 ,
@@ -3090,7 +3075,6 @@ Rules with a route label do not match an
 .Xr ftp-proxy 8 ,
 .Xr pfctl 8 ,
 .Xr pflogd 8 ,
-.Xr route 8
 .Sh HISTORY
 The
 .Nm

Modified: projects/pf/head/contrib/pf/pfctl/parse.y
==============================================================================
--- projects/pf/head/contrib/pf/pfctl/parse.y	Mon May 28 12:13:04 2012	(r236178)
+++ projects/pf/head/contrib/pf/pfctl/parse.y	Mon May 28 13:09:30 2012	(r236179)
@@ -2909,26 +2909,6 @@ host		: STRING			{
 			$$->next = NULL;
 			$$->tail = $$;
 		}
-		| ROUTE	STRING		{
-			$$ = calloc(1, sizeof(struct node_host));
-			if ($$ == NULL) {
-				free($2);
-				err(1, "host: calloc");
-			}
-			$$->addr.type = PF_ADDR_RTLABEL;
-			if (strlcpy($$->addr.v.rtlabelname, $2,
-			    sizeof($$->addr.v.rtlabelname)) >=
-			    sizeof($$->addr.v.rtlabelname)) {
-				yyerror("route label too long, max %u chars",
-				    sizeof($$->addr.v.rtlabelname) - 1);
-				free($2);
-				free($$);
-				YYERROR;
-			}
-			$$->next = NULL;
-			$$->tail = $$;
-			free($2);
-		}
 		;
 
 number		: NUMBER

Modified: projects/pf/head/contrib/pf/pfctl/pf_print_state.c
==============================================================================
--- projects/pf/head/contrib/pf/pfctl/pf_print_state.c	Mon May 28 12:13:04 2012	(r236178)
+++ projects/pf/head/contrib/pf/pfctl/pf_print_state.c	Mon May 28 13:09:30 2012	(r236179)
@@ -119,9 +119,6 @@ print_addr(struct pf_addr_wrap *addr, sa
 	case PF_ADDR_URPFFAILED:
 		printf("urpf-failed");
 		return;
-	case PF_ADDR_RTLABEL:
-		printf("route \"%s\"", addr->v.rtlabelname);
-		return;
 	default:
 		printf("?");
 		return;