patch-2.3.99-pre6 linux/net/ipv4/ip_fragment.c

• Lines: 33
• Date: Mon Apr 24 13:59:56 2000
• Orig file: v2.3.99-pre5/linux/net/ipv4/ip_fragment.c
• Orig date: Thu Feb 10 17:11:24 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/net/ipv4/ip_fragment.c linux/net/ipv4/ip_fragment.c
@@ -5,7 +5,7 @@
  *
  *		The IP fragmentation functionality.
  *		
- * Version:	$Id: ip_fragment.c,v 1.47 2000/02/09 21:11:33 davem Exp $
+ * Version:	$Id: ip_fragment.c,v 1.49 2000/04/15 01:48:10 davem Exp $
  *
  * Authors:	Fred N. van Kempen <waltje@uWalt.NL.Mugnet.ORG>
  *		Alan Cox <Alan.Cox@linux.org>
@@ -387,9 +387,14 @@
 	*/
 	skb->security = qp->fragments->skb->security;
 
+#ifdef CONFIG_NETFILTER
+	/* Connection association is same as fragment (if any). */
+	skb->nfct = qp->fragments->skb->nfct;
+	nf_conntrack_get(skb->nfct);
 #ifdef CONFIG_NETFILTER_DEBUG
 	skb->nf_debug = qp->fragments->skb->nf_debug;
 #endif
+#endif
 
 	/* Done with all fragments. Fixup the new IP header. */
 	iph = skb->nh.iph;
@@ -594,7 +599,7 @@
 	 */
 out_oversize:
 	if (net_ratelimit())
-		printk(KERN_INFO "Oversized packet received from %d.%d.%d.%d\n",
+		printk(KERN_INFO "Oversized packet received from %u.%u.%u.%u\n",
 			NIPQUAD(iph->saddr));
 	/* the skb isn't in a fragment, so fall through to free it */
 out_freeskb: