[PATCH 2.4] netfilter: export conntrack bucket count via sysctl

[PATCH 2.4] netfilter: export conntrack bucket count via sysctl

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 1972 bytes --]

Hi Dave!

This mail contains the seventh (and last) netfilter patch, please apply.


Author: Harald Welte <laforge@netfilter.org>, Patrick McHardy <kaber@trash.net>

This creates a new (read-only) sysctl to read out the number of hash buckets.


===== net/ipv4/netfilter/ip_conntrack_standalone.c 1.22 vs edited =====
--- 1.22/net/ipv4/netfilter/ip_conntrack_standalone.c	Fri Oct  3 08:21:19 2003
+++ edited/net/ipv4/netfilter/ip_conntrack_standalone.c	Thu Nov 27 06:28:59 2003
@@ -266,6 +266,7 @@
 
 /* From ip_conntrack_core.c */
 extern int ip_conntrack_max;
+extern unsigned int ip_conntrack_htable_size;
 
 /* From ip_conntrack_proto_tcp.c */
 extern unsigned long ip_ct_tcp_timeout_syn_sent;
@@ -292,6 +293,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_BUCKETS, "ip_conntrack_buckets",
+	 &ip_conntrack_htable_size, sizeof(unsigned int), 0444, NULL,
 	 &proc_dointvec},
 	{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT, "ip_conntrack_tcp_timeout_syn_sent",
 	 &ip_ct_tcp_timeout_syn_sent, sizeof(unsigned int), 0644, NULL,
===== include/linux/sysctl.h 1.53 vs edited =====
--- 1.53/include/linux/sysctl.h	Wed Oct 29 21:19:30 2003
+++ edited/include/linux/sysctl.h	Thu Nov 27 06:08:04 2003
@@ -376,6 +376,7 @@
 	NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11,
 	NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT=12,
 	NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT=13,
+	NET_IPV4_NF_CONNTRACK_BUCKETS=14,
 };
  
 /* /proc/sys/net/ipv6 */

-- 
- Harald Welte <laforge@netfilter.org>             http://www.netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 2.4] netfilter: export conntrack bucket count via sysctl

[David S. Miller]

On Sun, 30 Nov 2003 21:10:06 +0530
Harald Welte <laforge@netfilter.org> wrote:

> Author: Harald Welte <laforge@netfilter.org>, Patrick McHardy <kaber@trash.net>
> 
> This creates a new (read-only) sysctl to read out the number of hash buckets.

Applied, thanks.