[netfilter-cvslog] r3270 - in trunk/patch-o-matic-ng/nf_conntrack: . linux-2.6/net/ipv6/netfilter

yasuyuki at netfilter.org yasuyuki at netfilter.org
Wed Nov 10 20:53:42 CET 2004


Author: yasuyuki at netfilter.org
Date: 2004-11-10 20:53:41 +0100 (Wed, 10 Nov 2004)
New Revision: 3270

Modified:
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c
Log:
changed 'reasm' to 'nfct_reasm'
surrounded processing nfct_reasm with CONFIG_NF_CONNTRACK



Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c	2004-11-10 19:30:18 UTC (rev 3269)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c	2004-11-10 19:53:41 UTC (rev 3270)
@@ -227,7 +227,7 @@
 				      const struct net_device *out,
 				      int (*okfn)(struct sk_buff *))
 {
-	struct sk_buff *reasm = (*pskb)->reasm;
+	struct sk_buff *reasm = (*pskb)->nfct_reasm;
 
 	/* This packet is fragmented and has reassembled packet. */
 	if (reasm) {

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c	2004-11-10 19:30:18 UTC (rev 3269)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c	2004-11-10 19:53:41 UTC (rev 3270)
@@ -842,9 +842,9 @@
 		s->nfct = skb->nfct;
 		s->nfcache = skb->nfcache;
 
-		nf_conntrack_put_reasm(s->reasm);
+		nf_conntrack_put_reasm(s->nfct_reasm);
 		nf_conntrack_get_reasm(skb);
-		s->reasm = skb;
+		s->nfct_reasm = skb;
 
 		s2 = s->next;
 		NF_HOOK_THRESH(PF_INET6, hooknum, s, in, out, okfn,

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch	2004-11-10 19:30:18 UTC (rev 3269)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch	2004-11-10 19:53:41 UTC (rev 3270)
@@ -1,5 +1,5 @@
---- linux-2.6.10-rc1/./net/Makefile	2004-09-14 02:13:55.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/./net/Makefile	2004-10-27 11:28:17.429989192 +0900
+--- 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/
@@ -8,36 +8,42 @@
  
  ifeq ($(CONFIG_NET),y)
  obj-$(CONFIG_SYSCTL)		+= sysctl_net.o
---- linux-2.6.10-rc1/./net/core/skbuff.c	2004-10-27 10:41:07.748166216 +0900
-+++ linux-2.6.10-rc1-nfct/./net/core/skbuff.c	2004-10-27 11:28:17.430989040 +0900
-@@ -240,6 +240,7 @@ void __kfree_skb(struct sk_buff *skb)
+--- 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);
-+	nf_conntrack_put_reasm(skb->reasm);
++#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 +313,8 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -312,6 +315,10 @@ struct sk_buff *skb_clone(struct sk_buff
  	C(nfct);
  	nf_conntrack_get(skb->nfct);
  	C(nfctinfo);
-+	C(reasm);
-+	nf_conntrack_get_reasm(skb->reasm);
++#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 +382,8 @@ static void copy_skb_header(struct sk_bu
+@@ -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;
-+	nf_conntrack_get_reasm(old->reasm);
-+	new->reasm	= old->reasm;
++#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-09-30 21:04:21.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/./net/core/netfilter.c	2004-10-27 11:28:17.431988888 +0900
+--- 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. */
@@ -54,20 +60,22 @@
  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-09-30 21:04:27.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/./net/ipv6/ip6_output.c	2004-10-27 11:28:17.432988736 +0900
-@@ -478,6 +478,9 @@ static void ip6_copy_metadata(struct sk_
+--- 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;
-+	nf_conntrack_put_reasm(from->reasm);
-+	nf_conntrack_get_reasm(to->reasm);
-+	to->reasm = from->reasm;
++#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-09-30 21:04:28.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/./net/ipv6/netfilter/Makefile	2004-10-27 11:28:17.432988736 +0900
+--- 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.
  obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
  obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
@@ -78,8 +86,8 @@
 +
 +# l3 independent conntrack
 +obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o
---- linux-2.6.10-rc1/./net/ipv6/netfilter/Kconfig	2004-09-30 21:04:28.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/./net/ipv6/netfilter/Kconfig	2004-10-27 11:28:17.432988736 +0900
+--- 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-11 04:23:17.879109160 +0900
 @@ -239,5 +239,20 @@ config IP6_NF_RAW
  	  <file:Documentation/modules.txt>.  If unsure, say `N'.
  	  help
@@ -101,8 +109,8 @@
 +
  endmenu
  
---- linux-2.6.10-rc1/./net/ipv4/netfilter/Makefile	2004-10-27 10:41:07.757164848 +0900
-+++ linux-2.6.10-rc1-nfct/./net/ipv4/netfilter/Makefile	2004-10-27 11:28:17.432988736 +0900
+--- 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
  obj-$(CONFIG_IP_NF_COMPAT_IPFWADM) += ipfwadm.o
  
@@ -113,8 +121,8 @@
 +
 +# l3 independent conntrack
 +obj-$(CONFIG_NF_CONNTRACK_IPV4) += nf_conntrack_ipv4.o
---- linux-2.6.10-rc1/./net/ipv4/netfilter/Kconfig	2004-10-27 10:41:07.757164848 +0900
-+++ linux-2.6.10-rc1-nfct/./net/ipv4/netfilter/Kconfig	2004-10-27 11:28:17.433988584 +0900
+--- 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-11 04:23:22.683378800 +0900
 @@ -732,5 +732,20 @@ config IP_NF_COMPAT_IPFWADM
  
  	  To compile it as a module, choose M here.  If unsure, say N.
@@ -136,8 +144,8 @@
 +
  endmenu
  
---- linux-2.6.10-rc1/./net/Kconfig	2004-08-25 08:16:03.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/./net/Kconfig	2004-10-27 11:28:17.433988584 +0900
+--- 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"
  source "net/ipv6/netfilter/Kconfig"
  source "net/decnet/netfilter/Kconfig"
@@ -146,8 +154,8 @@
  
  endif
  
---- linux-2.6.10-rc1/./include/linux/netfilter.h	2004-09-30 21:02:02.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/./include/linux/netfilter.h	2004-10-27 11:28:17.434988432 +0900
+--- 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);
@@ -156,8 +164,8 @@
  
  #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-10-27 10:41:07.646181720 +0900
-+++ linux-2.6.10-rc1-nfct/./include/linux/sysctl.h	2004-10-27 11:31:51.297476392 +0900
+--- 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
  	NET_DECNET=15,
  	NET_ECONET=16,
@@ -209,20 +217,23 @@
  /* /proc/sys/net/ipv4 */
  enum
  {
---- linux-2.6.10-rc1/./include/linux/skbuff.h	2004-10-12 09:28:58.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/./include/linux/skbuff.h	2004-10-27 11:28:17.435988280 +0900
-@@ -251,6 +251,7 @@ struct sk_buff {
+--- 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 {
  	__u32			nfcache;
  	__u32			nfctinfo;
  	struct nf_conntrack	*nfct;
-+	struct sk_buff		*reasm;
++#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
++	struct sk_buff		*nfct_reasm;
++#endif
  #ifdef CONFIG_NETFILTER_DEBUG
          unsigned int		nf_debug;
  #endif
-@@ -1148,10 +1149,22 @@ static inline void nf_conntrack_get(stru
+@@ -1148,10 +1151,26 @@ static inline void nf_conntrack_get(stru
  	if (nfct)
  		atomic_inc(&nfct->use);
  }
++#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 +static inline void nf_conntrack_get_reasm(struct sk_buff *skb)
 +{
 +	if (skb)
@@ -233,17 +244,20 @@
 +	if (skb)
 +		kfree_skb(skb);
 +}
++#endif
  static inline void nf_reset(struct sk_buff *skb)
  {
  	nf_conntrack_put(skb->nfct);
  	skb->nfct = NULL;
-+	nf_conntrack_put_reasm(skb->reasm);
-+	skb->reasm = NULL;
++#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
++	nf_conntrack_put_reasm(skb->nfct_reasm);
++	skb->nfct_reasm = NULL;
++#endif
  #ifdef CONFIG_NETFILTER_DEBUG
  	skb->nf_debug = 0;
  #endif
---- linux-2.6.10-rc1/./include/linux/netfilter_ipv6.h	2004-09-14 02:11:32.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/./include/linux/netfilter_ipv6.h	2004-10-27 11:28:17.435988280 +0900
+--- 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
 @@ -56,6 +56,7 @@
  
  enum nf_ip6_hook_priorities {




More information about the netfilter-cvslog mailing list