usagi/kernel/linux26/net/ipv4/netfilter Kconfig ip_conntrack_proto_tcp.c ip_conntrack_standalone.c nf_conntrack_l3proto_ipv4.c nf_conntrack_proto_icmp.c usagi/kernel/linux26/net/ipv6/netfilter Kconfig nf_conntrack_l3proto_ipv6.c nf_conntrack_proto_frag6.c nf_conntrack_proto_icmpv6.c usagi/kernel/linux26/net/netfilter ...

kozakai     2004/10/18 03:35:39 JST

  Modified files:        (Branch: bCONNTRACK-20041001)
    kernel/linux26/net/ipv4/netfilter Kconfig 
                                      ip_conntrack_proto_tcp.c 
                                      ip_conntrack_standalone.c 
                                      nf_conntrack_l3proto_ipv4.c 
                                      nf_conntrack_proto_icmp.c 
    kernel/linux26/net/ipv6/netfilter Kconfig 
                                      nf_conntrack_l3proto_ipv6.c 
                                      nf_conntrack_proto_frag6.c 
                                      nf_conntrack_proto_icmpv6.c 
    kernel/linux26/net/netfilter Kconfig Makefile 
                                 nf_conntrack_core.c 
                                 nf_conntrack_ftp.c 
                                 nf_conntrack_proto_generic.c 
                                 nf_conntrack_proto_tcp.c 
                                 nf_conntrack_proto_udp.c 
                                 nf_conntrack_standalone.c 
    kernel/linux26/include/linux sysctl.h 
    kernel/linux26/include/linux/netfilter nf_conntrack.h 
                                           nf_conntrack_protocol.h 
                                           nf_conntrack_tcp.h 
                                           nf_conntrack_tuple.h 
    kernel/linux26/include/linux/netfilter_ipv4 
                                                nf_conntrack_icmp.h 
                                                nf_conntrack_ipv4.h 
    kernel/linux26/include/linux/netfilter_ipv6 
                                                nf_conntrack_frag6.h 
                                                nf_conntrack_icmpv6.h 
  Added files:           (Branch: bCONNTRACK-20041001)
    kernel/linux26/net/netfilter nf_conntrack_proto_sctp.c 
    kernel/linux26/include/linux/netfilter nf_conntrack_sctp.h 
  Log:
  synchronized with ip_conntrack of linux 2.6.9-rc4 except of the L3/L4 protocol
  list.
  
  comliping is fine, but I haven't finished bugfixes yet.
  
  Revision  Changes    Path
  1.1.1.15.2.2 +0 -15     usagi/kernel/linux26/net/ipv4/netfilter/Kconfig
  1.1.1.17.2.1 +11 -5     usagi/kernel/linux26/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
  1.1.1.23.2.1 +3 -3      usagi/kernel/linux26/net/ipv4/netfilter/ip_conntrack_standalone.c
  1.1.6.3   +56 -137   usagi/kernel/linux26/net/ipv4/netfilter/Attic/nf_conntrack_l3proto_ipv4.c
  1.1.6.3   +155 -7    usagi/kernel/linux26/net/ipv4/netfilter/Attic/nf_conntrack_proto_icmp.c
  1.8.2.2   +0 -15     usagi/kernel/linux26/net/ipv6/netfilter/Kconfig
  1.1.6.3   +107 -130  usagi/kernel/linux26/net/ipv6/netfilter/Attic/nf_conntrack_l3proto_ipv6.c
  1.1.6.3   +3 -5      usagi/kernel/linux26/net/ipv6/netfilter/Attic/nf_conntrack_proto_frag6.c
  1.1.6.3   +126 -11   usagi/kernel/linux26/net/ipv6/netfilter/Attic/nf_conntrack_proto_icmpv6.c
  1.1.12.2  +49 -3     usagi/kernel/linux26/net/netfilter/Attic/Kconfig
  1.1.12.2  +3 -0      usagi/kernel/linux26/net/netfilter/Attic/Makefile
  1.1.12.3  +154 -68   usagi/kernel/linux26/net/netfilter/Attic/nf_conntrack_core.c
  1.1.12.2  +1 -3      usagi/kernel/linux26/net/netfilter/Attic/nf_conntrack_ftp.c
  1.1.12.3  +3 -6      usagi/kernel/linux26/net/netfilter/Attic/nf_conntrack_proto_generic.c
  1.1.12.3  +994 -134  usagi/kernel/linux26/net/netfilter/Attic/nf_conntrack_proto_tcp.c
  1.1.12.3  +120 -16   usagi/kernel/linux26/net/netfilter/Attic/nf_conntrack_proto_udp.c
  1.1.12.3  +206 -30   usagi/kernel/linux26/net/netfilter/Attic/nf_conntrack_standalone.c
  1.37.2.3  +17 -4     usagi/kernel/linux26/include/linux/sysctl.h
  1.1.12.3  +41 -5     usagi/kernel/linux26/include/linux/netfilter/Attic/nf_conntrack.h
  1.1.12.3  +31 -6     usagi/kernel/linux26/include/linux/netfilter/Attic/nf_conntrack_protocol.h
  1.1.12.2  +34 -9     usagi/kernel/linux26/include/linux/netfilter/Attic/nf_conntrack_tcp.h
  1.1.12.2  +6 -0      usagi/kernel/linux26/include/linux/netfilter/Attic/nf_conntrack_tuple.h
  1.1.6.2   +0 -1      usagi/kernel/linux26/include/linux/netfilter_ipv4/Attic/nf_conntrack_icmp.h
  1.1.6.2   +4 -0      usagi/kernel/linux26/include/linux/netfilter_ipv4/Attic/nf_conntrack_ipv4.h
  1.1.6.2   +0 -1      usagi/kernel/linux26/include/linux/netfilter_ipv6/Attic/nf_conntrack_frag6.h
  1.1.6.2   +0 -1      usagi/kernel/linux26/include/linux/netfilter_ipv6/Attic/nf_conntrack_icmpv6.h