From owner-svn-src-user@FreeBSD.ORG  Tue Mar 31 09:54:54 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0E1D1065674;
	Tue, 31 Mar 2009 09:54:54 +0000 (UTC)
	(envelope-from piso@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B038E8FC1E;
	Tue, 31 Mar 2009 09:54:54 +0000 (UTC)
	(envelope-from piso@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2V9ssFF093736;
	Tue, 31 Mar 2009 09:54:54 GMT (envelope-from piso@svn.freebsd.org)
Received: (from piso@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2V9ssOq093734;
	Tue, 31 Mar 2009 09:54:54 GMT (envelope-from piso@svn.freebsd.org)
Message-Id: <200903310954.n2V9ssOq093734@svn.freebsd.org>
From: Paolo Pisati <piso@FreeBSD.org>
Date: Tue, 31 Mar 2009 09:54:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190589 - user/piso/sbin/ipfw
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2009 09:54:55 -0000

Author: piso
Date: Tue Mar 31 09:54:54 2009
New Revision: 190589
URL: http://svn.freebsd.org/changeset/base/190589

Log:
  -document 'reass' action in the help message
  -make ipfw recognize the "reass" token

Modified:
  user/piso/sbin/ipfw/ipfw2.c
  user/piso/sbin/ipfw/main.c

Modified: user/piso/sbin/ipfw/ipfw2.c
==============================================================================
--- user/piso/sbin/ipfw/ipfw2.c	Tue Mar 31 07:40:36 2009	(r190588)
+++ user/piso/sbin/ipfw/ipfw2.c	Tue Mar 31 09:54:54 2009	(r190589)
@@ -211,6 +211,7 @@ static struct _s_x rule_actions[] = {
 	{ "check-state",	TOK_CHECKSTATE },
 	{ "//",			TOK_COMMENT },
 	{ "nat",                TOK_NAT },
+	{ "reass",		TOK_REASS },
 	{ "setfib",		TOK_SETFIB },
 	{ NULL, 0 }	/* terminator */
 };

Modified: user/piso/sbin/ipfw/main.c
==============================================================================
--- user/piso/sbin/ipfw/main.c	Tue Mar 31 07:40:36 2009	(r190588)
+++ user/piso/sbin/ipfw/main.c	Tue Mar 31 09:54:54 2009	(r190589)
@@ -54,7 +54,7 @@ help(void)
 "RULE-BODY:	check-state [PARAMS] | ACTION [PARAMS] ADDR [OPTION_LIST]\n"
 "ACTION:	check-state | allow | count | deny | unreach{,6} CODE |\n"
 "               skipto N | {divert|tee} PORT | forward ADDR |\n"
-"               pipe N | queue N | nat N | setfib FIB\n"
+"               pipe N | queue N | nat N | setfib FIB | reass\n"
 "PARAMS: 	[log [logamount LOGLIMIT]] [altq QUEUE_NAME]\n"
 "ADDR:		[ MAC dst src ether_type ] \n"
 "		[ ip from IPADDR [ PORT ] to IPADDR [ PORTLIST ] ]\n"