From owner-cvs-all@FreeBSD.ORG  Tue Dec  6 02:51:42 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8038F16A41F;
	Tue,  6 Dec 2005 02:51:42 +0000 (GMT) (envelope-from ume@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0DAD443D5A;
	Tue,  6 Dec 2005 02:51:42 +0000 (GMT) (envelope-from ume@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB62pf9b084094;
	Tue, 6 Dec 2005 02:51:41 GMT (envelope-from ume@repoman.freebsd.org)
Received: (from ume@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB62pf1G084093;
	Tue, 6 Dec 2005 02:51:41 GMT (envelope-from ume)
Message-Id: <200512060251.jB62pf1G084093@repoman.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Tue, 6 Dec 2005 02:51:41 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sbin/ipfw ipfw.8 ipfw2.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Dec 2005 02:51:42 -0000

ume         2005-12-06 02:51:41 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sbin/ipfw            ipfw.8 ipfw2.c 
  Log:
  MFC: We couldn't specify the rule for filtering tunnel traffic since an
  IPv6 support was committed:
  
  - Stop treating `ip' and `ipv6' as special in `proto' option as they
    conflict with /etc/protocols.
  
  - Disuse `ipv4' in `proto' option as it is corresponding to `ipv6'.
  
  - When protocol is specified as numeric, treat it as it is even it is
    41 (ipv6).
  
  - Allow zero for protocol as it is valid number of `ip'.
  
          sbin/ipfw/ipfw.8:       1.180
          src/sbin/ipfw/ipfw2.c:  1.80
  
  Revision   Changes    Path
  1.175.2.3  +13 -0     src/sbin/ipfw/ipfw.8
  1.76.2.2   +49 -16    src/sbin/ipfw/ipfw2.c