1diff -Nru --exclude .depend --exclude *.o --exclude *.ver --exclude .*.flags --exclude *.orig --exclude *.rej --exclude *~ linux-2.4.20-plain/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.20-ftp/net/ipv4/netfilter/ip_conntrack_core.c 2--- linux-2.4.20-plain/net/ipv4/netfilter/ip_conntrack_core.c Fri Nov 29 00:53:15 2002 3+++ linux-2.4.20-ftp/net/ipv4/netfilter/ip_conntrack_core.c Tue Jan 7 19:43:29 2003 4@@ -966,23 +966,28 @@ 5 related_to->expecting >= related_to->helper->max_expected) { 6 struct list_head *cur_item; 7 /* old == NULL */ 8- if (net_ratelimit()) 9- printk(KERN_WARNING 10- "ip_conntrack: max number of expected " 11- "connections %i of %s reached for " 12- "%u.%u.%u.%u->%u.%u.%u.%u%s\n", 13- related_to->helper->max_expected, 14- related_to->helper->name, 15- NIPQUAD(related_to->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.ip), 16- NIPQUAD(related_to->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.ip), 17- related_to->helper->flags & IP_CT_HELPER_F_REUSE_EXPECT ? 18- ", reusing" : ""); 19 if (!(related_to->helper->flags & 20 IP_CT_HELPER_F_REUSE_EXPECT)) { 21 WRITE_UNLOCK(&ip_conntrack_lock); 22+ if (net_ratelimit()) 23+ printk(KERN_WARNING 24+ "ip_conntrack: max number of expected " 25+ "connections %i of %s reached for " 26+ "%u.%u.%u.%u->%u.%u.%u.%u\n", 27+ related_to->helper->max_expected, 28+ related_to->helper->name, 29+ NIPQUAD(related_to->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.ip), 30+ NIPQUAD(related_to->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.ip)); 31 return -EPERM; 32 } 33- 34+ DEBUGP("ip_conntrack: max number of expected " 35+ "connections %i of %s reached for " 36+ "%u.%u.%u.%u->%u.%u.%u.%u, reusing\n", 37+ related_to->helper->max_expected, 38+ related_to->helper->name, 39+ NIPQUAD(related_to->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.ip), 40+ NIPQUAD(related_to->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.ip)); 41+ 42 /* choose the the oldest expectation to evict */ 43 list_for_each(cur_item, &related_to->sibling_list) { 44 struct ip_conntrack_expect *cur; 45