cvs commit: src/sys/contrib/ipfilter/netinet - Imported sources

[Darren Reed]

darrenr     2004-06-21 22:26:12 UTC

  FreeBSD src repository

  src/sys/contrib/ipfilter/netinet - Imported sources
  Update of /home/ncvs/src/sys/contrib/ipfilter/netinet
  In directory repoman.freebsd.org:/tmp/cvs-serv49083
  
  Log Message:
  Import ipfilter 3.4.35 (destinated for RELENG_4) to vendor branch
  
  Status:
  
  Vendor Tag:	DARRENR
  Release Tags:	v3-4-35
  		
  C src/sys/contrib/ipfilter/netinet/ip_auth.c
  C src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
  U src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c
  U src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c
  U src/sys/contrib/ipfilter/netinet/ip_h323_pxy.c
  C src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
  C src/sys/contrib/ipfilter/netinet/ip_frag.h
  C src/sys/contrib/ipfilter/netinet/ip_frag.c
  C src/sys/contrib/ipfilter/netinet/ip_fil.h
  C src/sys/contrib/ipfilter/netinet/ip_fil.c
  C src/sys/contrib/ipfilter/netinet/ip_compat.h
  U src/sys/contrib/ipfilter/netinet/ip_auth.h
  C src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
  C src/sys/contrib/ipfilter/netinet/fil.c
  C src/sys/contrib/ipfilter/netinet/ip_state.c
  U src/sys/contrib/ipfilter/netinet/ip_proxy.h
  U src/sys/contrib/ipfilter/netinet/ip_proxy.c
  C src/sys/contrib/ipfilter/netinet/ip_nat.h
  C src/sys/contrib/ipfilter/netinet/ip_nat.c
  C src/sys/contrib/ipfilter/netinet/ip_log.c
  C src/sys/contrib/ipfilter/netinet/ip_state.h
  U src/sys/contrib/ipfilter/netinet/mlfk_ipl.c
  C src/sys/contrib/ipfilter/netinet/ipl.h
  
  16 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jDARRENR:yesterday -jDARRENR src/sys/contrib/ipfilter/netinet