[netfilter-cvslog] r3263 - in
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6:
include/linux/netfilter include/linux/netfilter/ipv4
include/linux/netfilter/ipv6 include/linux/netfilter_ipv4
include/linux/netfilter_ipv6 net/ipv4/netfilter
net/ipv6/netfilter net/netfilter
laforge at netfilter.org
laforge at netfilter.org
Mon Nov 8 14:20:35 CET 2004
Author: laforge at netfilter.org
Date: 2004-11-08 14:20:35 +0100 (Mon, 08 Nov 2004)
New Revision: 3263
Added:
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_icmp.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_ipv4.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h
Removed:
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_icmp.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_ipv4.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv6/nf_conntrack_icmpv6.h
Modified:
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_l3proto_generic.c
Log:
slightly rearrange include directories
Copied: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_icmp.h (from rev 3261, trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_icmp.h)
Copied: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (from rev 3261, trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_ipv4.h)
Copied: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (from rev 3261, trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv6/nf_conntrack_icmpv6.h)
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h 2004-11-08 13:19:02 UTC (rev 3262)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h 2004-11-08 13:20:35 UTC (rev 3263)
@@ -61,8 +61,8 @@
};
#include <linux/netfilter/nf_conntrack_tcp.h>
-#include <linux/netfilter_ipv4/nf_conntrack_icmp.h>
-#include <linux/netfilter_ipv6/nf_conntrack_icmpv6.h>
+#include <linux/netfilter/ipv4/nf_conntrack_icmp.h>
+#include <linux/netfilter/ipv6/nf_conntrack_icmpv6.h>
#include <linux/netfilter/nf_conntrack_sctp.h>
/* per conntrack: protocol private data */
@@ -165,7 +165,7 @@
struct nf_conntrack_helper;
-#include <linux/netfilter_ipv4/nf_conntrack_ipv4.h>
+#include <linux/netfilter/ipv4/nf_conntrack_ipv4.h>
struct nf_conn
{
/* Usage count in here is 1 for hash table/destruct timer, 1 per skb,
Deleted: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_icmp.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_icmp.h 2004-11-08 13:19:02 UTC (rev 3262)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_icmp.h 2004-11-08 13:20:35 UTC (rev 3263)
@@ -1,23 +0,0 @@
-/*
- * nf_conntrack_icmp.h
- *
- * Definitions and Declarations for ICMP tracking.
- *
- * Derived from include/linux/netfiter_ipv4/ip_conntrack_icmp.h
- *
- * 16 Dec 2003: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - enable working with Layer 3 protocol independent connection tracking.
- */
-
-#ifndef _NF_CONNTRACK_ICMP_H
-#define _NF_CONNTRACK_ICMP_H
-/* ICMP tracking. */
-#include <asm/atomic.h>
-
-struct nf_ct_icmp
-{
- /* Optimization: when number in == number out, forget immediately. */
- atomic_t count;
-};
-
-#endif /* _NF_CONNTRACK_ICMP_H */
Deleted: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_ipv4.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_ipv4.h 2004-11-08 13:19:02 UTC (rev 3262)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv4/nf_conntrack_ipv4.h 2004-11-08 13:20:35 UTC (rev 3263)
@@ -1,42 +0,0 @@
-/*
- * nf_conntrack_ipv4.h
- *
- * Definitions and Declarations for IPv4 tracking.
- *
- * 23 Mar 2004: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - move L3 protocol dependent part from include/linux/netfilter_ipv4/
- * ip_conntarck.h
- */
-
-#ifndef _NF_CONNTRACK_IPV4_H
-#define _NF_CONNTRACK_IPV4_H
-
-#ifdef CONFIG_IP_NF_NAT_NEEDED
-#include <linux/netfilter_ipv4/ip_nat.h>
-
-/* per conntrack: nat application helper private data */
-union ip_conntrack_nat_help {
- /* insert nat helper private data here */
-};
-
-struct nf_conntrack_ipv4_nat {
- struct ip_nat_info info;
- union ip_conntrack_nat_help help;
-#if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \
- defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE)
- int masq_index;
-#endif
-};
-#endif /* CONFIG_IP_NF_NAT_NEEDED */
-
-struct nf_conntrack_ipv4 {
-#ifdef CONFIG_IP_NF_NAT_NEEDED
- struct nf_conntrack_ipv4_nat *nat;
-#endif
-};
-
-/* Returns new sk_buff, or NULL */
-struct sk_buff *
-nf_ct_ipv4_ct_gather_frags(struct sk_buff *skb);
-
-#endif /*_NF_CONNTRACK_IPV4_H*/
Deleted: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv6/nf_conntrack_icmpv6.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv6/nf_conntrack_icmpv6.h 2004-11-08 13:19:02 UTC (rev 3262)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter_ipv6/nf_conntrack_icmpv6.h 2004-11-08 13:20:35 UTC (rev 3263)
@@ -1,30 +0,0 @@
-/*
- * nf_conntrack_icmpv6.h
- *
- * Definitions and Declarations for ICMPv6 tracking.
- *
- * Derived from include/linux/netfiter_ipv4/ip_conntrack_icmp.h
- *
- * 21 Apl 2004: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - separated from nf_conntrack_icmp.h
- */
-
-#ifndef _NF_CONNTRACK_ICMPV6_H
-#define _NF_CONNTRACK_ICMPV6_H
-/* ICMPv6 tracking. */
-#include <asm/atomic.h>
-
-#ifndef ICMPV6_NI_QUERY
-#define ICMPV6_NI_QUERY 139
-#endif
-#ifndef ICMPV6_NI_REPLY
-#define ICMPV6_NI_REPLY 140
-#endif
-
-struct nf_ct_icmpv6
-{
- /* Optimization: when number in == number out, forget immediately. */
- atomic_t count;
-};
-
-#endif /* _NF_CONNTRACK_ICMPV6_H */
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2004-11-08 13:19:02 UTC (rev 3262)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2004-11-08 13:20:35 UTC (rev 3263)
@@ -28,7 +28,7 @@
#include <linux/netfilter/nf_conntrack_protocol.h>
#include <linux/netfilter/nf_conntrack_l3proto.h>
#include <linux/netfilter/nf_conntrack_core.h>
-#include <linux/netfilter_ipv4/nf_conntrack_ipv4.h>
+#include <linux/netfilter/ipv4/nf_conntrack_ipv4.h>
#if 0
#define DEBUGP printk
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 2004-11-08 13:19:02 UTC (rev 3262)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 2004-11-08 13:20:35 UTC (rev 3263)
@@ -26,7 +26,7 @@
#include <linux/netfilter/nf_conntrack_tuple.h>
#include <linux/netfilter/nf_conntrack_protocol.h>
#include <linux/netfilter/nf_conntrack_core.h>
-#include <linux/netfilter_ipv6/nf_conntrack_icmpv6.h>
+#include <linux/netfilter/ipv6/nf_conntrack_icmpv6.h>
unsigned long nf_ct_icmpv6_timeout = 30*HZ;
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_l3proto_generic.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_l3proto_generic.c 2004-11-08 13:19:02 UTC (rev 3262)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_l3proto_generic.c 2004-11-08 13:20:35 UTC (rev 3263)
@@ -27,7 +27,7 @@
#include <linux/netfilter/nf_conntrack_protocol.h>
#include <linux/netfilter/nf_conntrack_l3proto.h>
#include <linux/netfilter/nf_conntrack_core.h>
-#include <linux/netfilter_ipv4/nf_conntrack_ipv4.h>
+#include <linux/netfilter/ipv4/nf_conntrack_ipv4.h>
#if 0
#define DEBUGP printk
More information about the netfilter-cvslog
mailing list