From owner-cvs-src@FreeBSD.ORG  Fri Dec 30 11:32:24 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: 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 9ACB116A41F;
	Fri, 30 Dec 2005 11:32:24 +0000 (GMT)
	(envelope-from guido@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 42AA043D5A;
	Fri, 30 Dec 2005 11:32:24 +0000 (GMT)
	(envelope-from guido@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 jBUBWOhb042630;
	Fri, 30 Dec 2005 11:32:24 GMT
	(envelope-from guido@repoman.freebsd.org)
Received: (from guido@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBUBWOY3042629;
	Fri, 30 Dec 2005 11:32:24 GMT (envelope-from guido)
Message-Id: <200512301132.jBUBWOY3042629@repoman.freebsd.org>
From: Guido van Rooij <guido@FreeBSD.org>
Date: Fri, 30 Dec 2005 11:32:24 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/contrib/ipfilter/netinet fil.c ip_auth.c
 ip_compat.h ip_fil.h ip_fil_freebsd.c ip_frag.c ip_frag.h
 ip_ftp_pxy.c ip_htable.c ip_log.c ip_nat.c ip_nat.h ip_proxy.c
 ip_proxy.h ip_raudio_pxy.c ip_rcmd_pxy.c ip_state.c ip_state.h ...
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 30 Dec 2005 11:32:24 -0000

guido       2005-12-30 11:32:24 UTC

  FreeBSD src repository

  Modified files:
    sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_compat.h 
                                 ip_fil.h ip_fil_freebsd.c 
                                 ip_frag.c ip_frag.h ip_ftp_pxy.c 
                                 ip_htable.c ip_log.c ip_nat.c 
                                 ip_nat.h ip_proxy.c ip_proxy.h 
                                 ip_raudio_pxy.c ip_rcmd_pxy.c 
                                 ip_state.c ip_state.h ip_sync.c 
                                 ipl.h mlfk_ipl.c 
  Log:
  Resolve conflicts
  
  Revision  Changes    Path
  1.48      +425 -302  src/sys/contrib/ipfilter/netinet/fil.c
  1.42      +7 -13     src/sys/contrib/ipfilter/netinet/ip_auth.c
  1.30      +132 -14   src/sys/contrib/ipfilter/netinet/ip_compat.h
  1.33      +24 -4     src/sys/contrib/ipfilter/netinet/ip_fil.h
  1.3       +42 -3     src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  1.30      +14 -8     src/sys/contrib/ipfilter/netinet/ip_frag.c
  1.18      +4 -0      src/sys/contrib/ipfilter/netinet/ip_frag.h
  1.26      +2 -1      src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
  1.3       +3 -6      src/sys/contrib/ipfilter/netinet/ip_htable.c
  1.31      +3 -9      src/sys/contrib/ipfilter/netinet/ip_log.c
  1.40      +70 -31    src/sys/contrib/ipfilter/netinet/ip_nat.c
  1.25      +2 -3      src/sys/contrib/ipfilter/netinet/ip_nat.h
  1.26      +7 -9      src/sys/contrib/ipfilter/netinet/ip_proxy.c
  1.16      +1 -1      src/sys/contrib/ipfilter/netinet/ip_proxy.h
  1.12      +1 -1      src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
  1.13      +3 -1      src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
  1.36      +161 -93   src/sys/contrib/ipfilter/netinet/ip_state.c
  1.18      +3 -3      src/sys/contrib/ipfilter/netinet/ip_state.h
  1.3       +9 -5      src/sys/contrib/ipfilter/netinet/ip_sync.c
  1.24      +2 -2      src/sys/contrib/ipfilter/netinet/ipl.h
  1.17      +1 -0      src/sys/contrib/ipfilter/netinet/mlfk_ipl.c