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

[Max Laier]

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