From owner-cvs-src@FreeBSD.ORG  Tue May  3 16:43:37 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 78F5216A4CE; Tue,  3 May 2005 16:43:37 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4E80843D5C; Tue,  3 May 2005 16:43:37 +0000 (GMT)
	(envelope-from mlaier@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 j43GhWKR053654;
	Tue, 3 May 2005 16:43:32 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j43GhW90053653;
	Tue, 3 May 2005 16:43:32 GMT
	(envelope-from mlaier)
Message-Id: <200505031643.j43GhW90053653@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Tue, 3 May 2005 16:43:32 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/contrib/pf/net if_pflog.c if_pflog.h
 if_pfsync.c if_pfsync.h pf.c pf_if.c pf_ioctl.c pf_norm.c
 pf_osfp.c pf_subr.c pf_table.c pfvar.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 May 2005 16:43:37 -0000

mlaier      2005-05-03 16:43:32 UTC

  FreeBSD src repository

  Modified files:
    sys/contrib/pf/net   if_pflog.c if_pflog.h if_pfsync.c 
                         if_pfsync.h pf.c pf_if.c pf_ioctl.c 
                         pf_norm.c pf_osfp.c pf_subr.c pf_table.c 
                         pfvar.h 
  Log:
  Resolve conflicts created during the import of pf 3.7 Some features are
  missing and will be implemented in a second step.  This is functional as is.
  
  Tested by:      freebsd-pf, pfsense.org
  Obtained from:  OpenBSD
  X-MFC after:    never (breaks API/ABI)
  
  Revision  Changes    Path
  1.12      +4 -5      src/sys/contrib/pf/net/if_pflog.c
  1.5       +4 -6      src/sys/contrib/pf/net/if_pflog.h
  1.15      +250 -99   src/sys/contrib/pf/net/if_pfsync.c
  1.5       +37 -26    src/sys/contrib/pf/net/if_pfsync.h
  1.29      +908 -445  src/sys/contrib/pf/net/pf.c
  1.10      +70 -81    src/sys/contrib/pf/net/pf_if.c
  1.19      +541 -416  src/sys/contrib/pf/net/pf_ioctl.c
  1.11      +359 -48   src/sys/contrib/pf/net/pf_norm.c
  1.5       +3 -3      src/sys/contrib/pf/net/pf_osfp.c
  1.2       +0 -0      src/sys/contrib/pf/net/pf_subr.c
  1.6       +194 -141  src/sys/contrib/pf/net/pf_table.c
  1.11      +172 -64   src/sys/contrib/pf/net/pfvar.h