[netfilter-cvslog] r3493 - in trunk/patch-o-matic-ng/nf_conntrack:
. linux-2.6/include/linux/netfilter
linux-2.6/net/ipv4/netfilter linux-2.6/net/netfilter
yasuyuki at netfilter.org
yasuyuki at netfilter.org
Wed Dec 22 07:42:46 CET 2004
Author: yasuyuki at netfilter.org
Date: 2004-12-22 07:42:45 +0100 (Wed, 22 Dec 2004)
New Revision: 3493
Modified:
trunk/patch-o-matic-ng/nf_conntrack/info
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.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/netfilter/nf_conntrack_core.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
Log:
fixed compiling error on linux 2.6.10-rc3
Modified: trunk/patch-o-matic-ng/nf_conntrack/info
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/info 2004-12-22 06:24:01 UTC (rev 3492)
+++ trunk/patch-o-matic-ng/nf_conntrack/info 2004-12-22 06:42:45 UTC (rev 3493)
@@ -1,5 +1,5 @@
Author: Yasuyuki KOZAKAI @ USAGI/WIDE Project <yasuyuki.kozakai at toshiba.co.jp>
Status: Testing
Repository: extra
-Requires: linux >= 2.6.10-rc1
+Requires: linux >= 2.6.10-rc3
Recompile: kernel
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h 2004-12-22 06:24:01 UTC (rev 3492)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h 2004-12-22 06:42:45 UTC (rev 3493)
@@ -62,6 +62,8 @@
return NF_ACCEPT;
}
+extern void __nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb);
+
extern struct list_head *nf_conntrack_hash;
extern struct list_head nf_conntrack_expect_list;
DECLARE_RWLOCK_EXTERN(nf_conntrack_lock);
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-12-22 06:24:01 UTC (rev 3492)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2004-12-22 06:42:45 UTC (rev 3493)
@@ -485,9 +485,13 @@
}
#endif
+ /* For use by REJECT target */
+ ip_ct_attach = __nf_conntrack_attach;
+
return ret;
cleanup:
+ ip_ct_attach = NULL;
#ifdef CONFIG_SYSCTL
unregister_sysctl_table(nf_ct_ipv4_sysctl_header);
cleanup_localinops:
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c 2004-12-22 06:24:01 UTC (rev 3492)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c 2004-12-22 06:42:45 UTC (rev 3493)
@@ -1385,7 +1385,7 @@
}
/* Used by ipt_REJECT and ip6t_REJECT. */
-static void __nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb)
+void __nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb)
{
struct nf_conn *ct;
enum nf_conntrack_info ctinfo;
@@ -1458,7 +1458,6 @@
{
int i;
- nf_ct_attach = NULL;
/* This makes sure all current packets have passed through
netfilter framework. Roll on, two-stage module
delete... */
@@ -1541,9 +1540,6 @@
for (i = 0; i < nf_conntrack_htable_size; i++)
INIT_LIST_HEAD(&nf_conntrack_hash[i]);
- /* For use by REJECT target */
- nf_ct_attach = __nf_conntrack_attach;
-
/* Set up fake conntrack:
- to never be deleted, not in any hashes */
atomic_set(&nf_conntrack_untracked.ct_general.use, 1);
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c 2004-12-22 06:24:01 UTC (rev 3492)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c 2004-12-22 06:42:45 UTC (rev 3493)
@@ -824,3 +824,4 @@
EXPORT_SYMBOL(nf_ct_get_tuple);
EXPORT_SYMBOL(nf_ct_invert_tuple);
EXPORT_SYMBOL(nf_conntrack_in);
+EXPORT_SYMBOL(__nf_conntrack_attach);
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch 2004-12-22 06:24:01 UTC (rev 3492)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch 2004-12-22 06:42:45 UTC (rev 3493)
@@ -1,82 +1,6 @@
---- linux-2.6.10-rc1/net/Makefile 2004-10-19 06:53:51.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/Makefile 2004-11-10 22:12:49.000000000 +0900
-@@ -41,6 +41,7 @@ obj-$(CONFIG_DECNET) += decnet/
- obj-$(CONFIG_ECONET) += econet/
- obj-$(CONFIG_VLAN_8021Q) += 8021q/
- obj-$(CONFIG_IP_SCTP) += sctp/
-+obj-$(CONFIG_NETFILTER) += netfilter/
-
- ifeq ($(CONFIG_NET),y)
- obj-$(CONFIG_SYSCTL) += sysctl_net.o
---- linux-2.6.10-rc1/net/core/skbuff.c 2004-11-10 21:58:52.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/core/skbuff.c 2004-11-10 22:48:11.000000000 +0900
-@@ -240,6 +240,9 @@ void __kfree_skb(struct sk_buff *skb)
- }
- #ifdef CONFIG_NETFILTER
- nf_conntrack_put(skb->nfct);
-+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
-+ nf_conntrack_put_reasm(skb->nfct_reasm);
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- nf_bridge_put(skb->nf_bridge);
- #endif
-@@ -312,6 +315,10 @@ struct sk_buff *skb_clone(struct sk_buff
- C(nfct);
- nf_conntrack_get(skb->nfct);
- C(nfctinfo);
-+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
-+ C(nfct_reasm);
-+ nf_conntrack_get_reasm(skb->nfct_reasm);
-+#endif
- #ifdef CONFIG_NETFILTER_DEBUG
- C(nf_debug);
- #endif
-@@ -379,6 +386,10 @@ static void copy_skb_header(struct sk_bu
- new->nfct = old->nfct;
- nf_conntrack_get(old->nfct);
- new->nfctinfo = old->nfctinfo;
-+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
-+ nf_conntrack_get_reasm(old->nfct_reasm);
-+ new->nfct_reasm = old->nfct_reasm;
-+#endif
- #ifdef CONFIG_NETFILTER_DEBUG
- new->nf_debug = old->nf_debug;
- #endif
---- linux-2.6.10-rc1/net/core/netfilter.c 2004-10-19 06:54:07.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/core/netfilter.c 2004-11-10 22:54:47.000000000 +0900
-@@ -807,6 +807,7 @@ EXPORT_SYMBOL(nf_log_packet);
- and hence manufactured ICMP or RST packets will not be associated
- with it. */
- void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *);
-+void (*nf_ct_attach)(struct sk_buff *, struct sk_buff *);
-
- void __init netfilter_init(void)
- {
-@@ -819,6 +820,7 @@ void __init netfilter_init(void)
- }
-
- EXPORT_SYMBOL(ip_ct_attach);
-+EXPORT_SYMBOL(nf_ct_attach);
- EXPORT_SYMBOL(ip_route_me_harder);
- EXPORT_SYMBOL(nf_getsockopt);
- EXPORT_SYMBOL(nf_hook_slow);
---- linux-2.6.10-rc1/net/ipv6/ip6_output.c 2004-10-19 06:53:10.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/ipv6/ip6_output.c 2004-11-10 22:47:29.000000000 +0900
-@@ -478,6 +478,11 @@ static void ip6_copy_metadata(struct sk_
- to->nfct = from->nfct;
- nf_conntrack_get(to->nfct);
- to->nfctinfo = from->nfctinfo;
-+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
-+ nf_conntrack_put_reasm(from->nfct_reasm);
-+ nf_conntrack_get_reasm(to->nfct_reasm);
-+ to->nfct_reasm = from->nfct_reasm;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- nf_bridge_put(to->nf_bridge);
- to->nf_bridge = from->nf_bridge;
---- linux-2.6.10-rc1/net/ipv6/netfilter/Makefile 2004-10-19 06:54:32.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/ipv6/netfilter/Makefile 2004-11-10 22:12:49.000000000 +0900
-@@ -24,3 +24,9 @@ obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.
+--- linux-2.6.10-rc3/net/ipv6/netfilter/Makefile 2004-10-19 06:54:32.000000000 +0900
++++ linux-2.6.10-rc3-nfct/net/ipv6/netfilter/Makefile 2004-12-22 14:20:07.000000000 +0900
+@@ -24,3 +24,9 @@
obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
@@ -86,9 +10,9 @@
+
+# l3 independent conntrack
+obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o
---- linux-2.6.10-rc1/net/ipv6/netfilter/Kconfig 2004-10-19 06:55:06.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/ipv6/netfilter/Kconfig 2004-11-10 23:49:32.000000000 +0900
-@@ -239,5 +239,19 @@ config IP6_NF_RAW
+--- linux-2.6.10-rc3/net/ipv6/netfilter/Kconfig 2004-10-19 06:55:06.000000000 +0900
++++ linux-2.6.10-rc3-nfct/net/ipv6/netfilter/Kconfig 2004-12-22 14:20:07.000000000 +0900
+@@ -239,5 +239,19 @@
<file:Documentation/modules.txt>. If unsure, say `N'.
help
@@ -108,9 +32,23 @@
+
endmenu
---- linux-2.6.10-rc1/net/ipv4/netfilter/Makefile 2004-11-10 21:58:52.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/ipv4/netfilter/Makefile 2004-11-10 22:12:49.000000000 +0900
-@@ -101,3 +101,9 @@ obj-$(CONFIG_IP_NF_COMPAT_IPCHAINS) += i
+--- linux-2.6.10-rc3/net/ipv6/ip6_output.c 2004-12-08 19:45:13.000000000 +0900
++++ linux-2.6.10-rc3-nfct/net/ipv6/ip6_output.c 2004-12-22 14:20:07.000000000 +0900
+@@ -475,6 +475,11 @@
+ to->nfct = from->nfct;
+ nf_conntrack_get(to->nfct);
+ to->nfctinfo = from->nfctinfo;
++#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
++ nf_conntrack_put_reasm(from->nfct_reasm);
++ nf_conntrack_get_reasm(to->nfct_reasm);
++ to->nfct_reasm = from->nfct_reasm;
++#endif
+ #ifdef CONFIG_BRIDGE_NETFILTER
+ nf_bridge_put(to->nf_bridge);
+ to->nf_bridge = from->nf_bridge;
+--- linux-2.6.10-rc3/net/ipv4/netfilter/Makefile 2004-12-08 19:45:13.000000000 +0900
++++ linux-2.6.10-rc3-nfct/net/ipv4/netfilter/Makefile 2004-12-22 14:20:07.000000000 +0900
+@@ -101,3 +101,9 @@
obj-$(CONFIG_IP_NF_COMPAT_IPFWADM) += ipfwadm.o
obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o
@@ -120,9 +58,9 @@
+
+# l3 independent conntrack
+obj-$(CONFIG_NF_CONNTRACK_IPV4) += nf_conntrack_ipv4.o
---- linux-2.6.10-rc1/net/ipv4/netfilter/Kconfig 2004-11-10 21:58:52.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/ipv4/netfilter/Kconfig 2004-11-10 23:49:09.000000000 +0900
-@@ -732,5 +732,19 @@ config IP_NF_COMPAT_IPFWADM
+--- linux-2.6.10-rc3/net/ipv4/netfilter/Kconfig 2004-12-08 19:45:13.000000000 +0900
++++ linux-2.6.10-rc3-nfct/net/ipv4/netfilter/Kconfig 2004-12-22 14:20:07.000000000 +0900
+@@ -732,5 +732,19 @@
To compile it as a module, choose M here. If unsure, say N.
@@ -142,9 +80,53 @@
+
endmenu
---- linux-2.6.10-rc1/net/Kconfig 2004-10-19 06:53:10.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/Kconfig 2004-11-10 22:12:49.000000000 +0900
-@@ -216,6 +216,7 @@ source "net/ipv4/netfilter/Kconfig"
+--- linux-2.6.10-rc3/net/core/skbuff.c 2004-12-08 19:45:13.000000000 +0900
++++ linux-2.6.10-rc3-nfct/net/core/skbuff.c 2004-12-22 14:20:07.000000000 +0900
+@@ -240,6 +240,9 @@
+ }
+ #ifdef CONFIG_NETFILTER
+ nf_conntrack_put(skb->nfct);
++#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
++ nf_conntrack_put_reasm(skb->nfct_reasm);
++#endif
+ #ifdef CONFIG_BRIDGE_NETFILTER
+ nf_bridge_put(skb->nf_bridge);
+ #endif
+@@ -312,6 +315,10 @@
+ C(nfct);
+ nf_conntrack_get(skb->nfct);
+ C(nfctinfo);
++#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
++ C(nfct_reasm);
++ nf_conntrack_get_reasm(skb->nfct_reasm);
++#endif
+ #ifdef CONFIG_NETFILTER_DEBUG
+ C(nf_debug);
+ #endif
+@@ -379,6 +386,10 @@
+ new->nfct = old->nfct;
+ nf_conntrack_get(old->nfct);
+ new->nfctinfo = old->nfctinfo;
++#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
++ nf_conntrack_get_reasm(old->nfct_reasm);
++ new->nfct_reasm = old->nfct_reasm;
++#endif
+ #ifdef CONFIG_NETFILTER_DEBUG
+ new->nf_debug = old->nf_debug;
+ #endif
+--- linux-2.6.10-rc3/net/Makefile 2004-12-08 19:45:13.000000000 +0900
++++ linux-2.6.10-rc3-nfct/net/Makefile 2004-12-22 14:20:07.000000000 +0900
+@@ -42,6 +42,7 @@
+ obj-$(CONFIG_ECONET) += econet/
+ obj-$(CONFIG_VLAN_8021Q) += 8021q/
+ obj-$(CONFIG_IP_SCTP) += sctp/
++obj-$(CONFIG_NETFILTER) += netfilter/
+
+ ifeq ($(CONFIG_NET),y)
+ obj-$(CONFIG_SYSCTL) += sysctl_net.o
+--- linux-2.6.10-rc3/net/Kconfig 2004-12-08 19:45:13.000000000 +0900
++++ linux-2.6.10-rc3-nfct/net/Kconfig 2004-12-22 14:20:07.000000000 +0900
+@@ -216,6 +216,7 @@
source "net/ipv6/netfilter/Kconfig"
source "net/decnet/netfilter/Kconfig"
source "net/bridge/netfilter/Kconfig"
@@ -152,19 +134,9 @@
endif
---- linux-2.6.10-rc1/include/linux/netfilter.h 2004-10-19 06:54:08.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/include/linux/netfilter.h 2004-11-10 22:54:35.000000000 +0900
-@@ -179,6 +179,7 @@ ip6t_find_target_lock(const char *name,
- extern inline struct arpt_target *
- arpt_find_target_lock(const char *name, int *error, struct semaphore *mutex);
- extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *);
-+extern void (*nf_ct_attach)(struct sk_buff *, struct sk_buff *);
-
- #ifdef CONFIG_NETFILTER_DEBUG
- extern void nf_dump_skb(int pf, struct sk_buff *skb);
---- linux-2.6.10-rc1/include/linux/sysctl.h 2004-11-10 21:58:52.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/include/linux/sysctl.h 2004-11-10 22:12:49.000000000 +0900
-@@ -191,6 +191,7 @@ enum
+--- linux-2.6.10-rc3/include/linux/sysctl.h 2004-12-08 19:45:13.000000000 +0900
++++ linux-2.6.10-rc3-nfct/include/linux/sysctl.h 2004-12-22 14:20:07.000000000 +0900
+@@ -191,6 +191,7 @@
NET_DECNET=15,
NET_ECONET=16,
NET_SCTP=17,
@@ -172,7 +144,7 @@
};
/* /proc/sys/kernel/random */
-@@ -255,6 +256,42 @@ enum
+@@ -255,6 +256,42 @@
NET_UNIX_MAX_DGRAM_QLEN=3,
};
@@ -215,9 +187,9 @@
/* /proc/sys/net/ipv4 */
enum
{
---- linux-2.6.10-rc1/include/linux/skbuff.h 2004-10-19 06:55:36.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/include/linux/skbuff.h 2004-11-10 22:52:28.000000000 +0900
-@@ -251,6 +251,9 @@ struct sk_buff {
+--- linux-2.6.10-rc3/include/linux/skbuff.h 2004-10-19 06:55:36.000000000 +0900
++++ linux-2.6.10-rc3-nfct/include/linux/skbuff.h 2004-12-22 14:20:07.000000000 +0900
+@@ -251,6 +251,9 @@
__u32 nfcache;
__u32 nfctinfo;
struct nf_conntrack *nfct;
@@ -227,7 +199,7 @@
#ifdef CONFIG_NETFILTER_DEBUG
unsigned int nf_debug;
#endif
-@@ -1148,10 +1151,26 @@ static inline void nf_conntrack_get(stru
+@@ -1148,10 +1151,26 @@
if (nfct)
atomic_inc(&nfct->use);
}
@@ -254,8 +226,8 @@
#ifdef CONFIG_NETFILTER_DEBUG
skb->nf_debug = 0;
#endif
---- linux-2.6.10-rc1/include/linux/netfilter_ipv6.h 2004-10-19 06:54:55.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/include/linux/netfilter_ipv6.h 2004-11-10 22:12:49.000000000 +0900
+--- linux-2.6.10-rc3/include/linux/netfilter_ipv6.h 2004-10-19 06:54:55.000000000 +0900
++++ linux-2.6.10-rc3-nfct/include/linux/netfilter_ipv6.h 2004-12-22 14:20:07.000000000 +0900
@@ -56,6 +56,7 @@
enum nf_ip6_hook_priorities {
@@ -264,7 +236,7 @@
NF_IP6_PRI_SELINUX_FIRST = -225,
NF_IP6_PRI_CONNTRACK = -200,
NF_IP6_PRI_BRIDGE_SABOTAGE_FORWARD = -175,
-@@ -68,4 +69,6 @@ enum nf_ip6_hook_priorities {
+@@ -68,4 +69,6 @@
NF_IP6_PRI_LAST = INT_MAX,
};
More information about the netfilter-cvslog
mailing list