From owner-cvs-all@FreeBSD.ORG  Thu Aug 12 22:06:55 2004
Return-Path: <owner-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 CDF5716A4CE; Thu, 12 Aug 2004 22:06:55 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id AB80343D41; Thu, 12 Aug 2004 22:06:55 +0000 (GMT)
	(envelope-from csjp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7CM6tqb044450;
	Thu, 12 Aug 2004 22:06:55 GMT
	(envelope-from csjp@repoman.freebsd.org)
Received: (from csjp@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7CM6tIf044449;
	Thu, 12 Aug 2004 22:06:55 GMT
	(envelope-from csjp)
Message-Id: <200408122206.i7CM6tIf044449@repoman.freebsd.org>
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
Date: Thu, 12 Aug 2004 22:06:55 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sbin/ipfw ipfw.8 ipfw2.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 12 Aug 2004 22:06:56 -0000

csjp        2004-08-12 22:06:55 UTC

  FreeBSD src repository

  Modified files:
    sbin/ipfw            ipfw.8 ipfw2.c 
  Log:
  Add the ability to associate ipfw rules with a specific prison ID.
  Since the only thing truly unique about a prison is it's ID, I figured
  this would be the most granular way of handling this.
  
  This commit makes the following changes:
  
  - Adds tokenizing and parsing for the ``jail'' command line option
    to the ipfw(8) userspace utility.
  - Append the ipfw opcode list with O_JAIL.
  - While Iam here, add a comment informing others that if they
    want to add additional opcodes, they should append them to the end
    of the list to avoid ABI breakage.
  - Add ``fw_prid'' to the ipfw ucred cache structure.
  - When initializing ucred cache, if the process is jailed,
    set fw_prid to the prison ID, otherwise set it to -1.
  - Update man page to reflect these changes.
  
  This change was a strong motivator behind the ucred caching
  mechanism in ipfw.
  
  A sample usage of this new functionality could be:
  
      ipfw add count ip from any to any jail 2
  
  It should be noted that because ucred based constraints
  are only implemented for TCP and UDP packets, the same
  applies for jail associations.
  
  Conceptual head nod by: pjd
  Reviewed by:    rwatson
  Approved by:    bmilekic (mentor)
  
  Revision  Changes    Path
  1.149     +4 -0      src/sbin/ipfw/ipfw.8
  1.54      +22 -0     src/sbin/ipfw/ipfw2.c