diff -urN linux-2.4.27-rc3-20040729-pomng-20040729/include/linux/sysctl.h linux-2.4.27-rc3-20040729-pomng-20040729-count/include/linux/sysctl.h --- linux-2.4.27-rc3-20040729-pomng-20040729/include/linux/sysctl.h Fri Jul 30 10:48:54 2004 +++ linux-2.4.27-rc3-20040729-pomng-20040729-count/include/linux/sysctl.h Fri Jul 30 11:32:39 2004 @@ -399,6 +399,7 @@ NET_IPV4_NF_CONNTRACK_TCP_LOOSE=17, NET_IPV4_NF_CONNTRACK_TCP_BE_LIBERAL=18, NET_IPV4_NF_CONNTRACK_TCP_MAX_RETRANS=19, + NET_IPV4_NF_CONNTRACK_COUNT=20, }; /* /proc/sys/net/ipv6 */ diff -urN linux-2.4.27-rc3-20040729-pomng-20040729/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.27-rc3-20040729-pomng-20040729-count/net/ipv4/netfilter/ip_conntrack_core.c --- linux-2.4.27-rc3-20040729-pomng-20040729/net/ipv4/netfilter/ip_conntrack_core.c Fri Jul 30 10:48:54 2004 +++ linux-2.4.27-rc3-20040729-pomng-20040729-count/net/ipv4/netfilter/ip_conntrack_core.c Fri Jul 30 11:31:55 2004 @@ -61,7 +61,7 @@ static LIST_HEAD(helpers); unsigned int ip_conntrack_htable_size = 0; int ip_conntrack_max = 0; -static atomic_t ip_conntrack_count = ATOMIC_INIT(0); +atomic_t ip_conntrack_count = ATOMIC_INIT(0); struct list_head *ip_conntrack_hash; static kmem_cache_t *ip_conntrack_cachep; diff -urN linux-2.4.27-rc3-20040729-pomng-20040729/net/ipv4/netfilter/ip_conntrack_standalone.c linux-2.4.27-rc3-20040729-pomng-20040729-count/net/ipv4/netfilter/ip_conntrack_standalone.c --- linux-2.4.27-rc3-20040729-pomng-20040729/net/ipv4/netfilter/ip_conntrack_standalone.c Fri Jul 30 10:48:54 2004 +++ linux-2.4.27-rc3-20040729-pomng-20040729-count/net/ipv4/netfilter/ip_conntrack_standalone.c Fri Jul 30 11:31:55 2004 @@ -248,6 +248,7 @@ /* From ip_conntrack_core.c */ extern int ip_conntrack_max; +extern atomic_t ip_conntrack_count; extern unsigned int ip_conntrack_htable_size; /* From ip_conntrack_proto_tcp.c */ @@ -280,6 +281,9 @@ static ctl_table ip_ct_sysctl_table[] = { {NET_IPV4_NF_CONNTRACK_MAX, "ip_conntrack_max", &ip_conntrack_max, sizeof(int), 0644, NULL, + &proc_dointvec}, + {NET_IPV4_NF_CONNTRACK_COUNT, "ip_conntrack_count", + &ip_conntrack_count, sizeof(int), 0444, NULL, &proc_dointvec}, {NET_IPV4_NF_CONNTRACK_BUCKETS, "ip_conntrack_buckets", &ip_conntrack_htable_size, sizeof(unsigned int), 0444, NULL,