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 ...

Fri Dec 30 03:32:24 PST 2005

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