netfilter patches for 3.0.0-rc1
Subsystems (2)
Pablo Neira Ayuso
maintainerHi!
If you have some netfilter patch for 3.0.0-rc1 which is not here:
http://1984.lsi.us.es/git/?p=net-next-2.6/.git;a=shortlog;h=refs/heads/pablo/nf-next-2.6-updates
Please, resend it asap.
Thank you.
Quoted 8 lines · Pablo Neira Ayuso
Hi!
If you have some netfilter patch for 3.0.0-rc1 which is not here:
http://1984.lsi.us.es/git/?p=net-next-2.6/.git;a=shortlog;h=refs/heads/pablo/nf-next-2.6-updates
Please, resend it asap.
Thank you.
parent 6b914d11bc76286fd6d39833d046a3ce32a9b3cb (v3.0-rc1-100-g6b914d1) commit 0dacfcea39b2a655310257f13cc2cd42d53f47f4
Author: Jan Engelhardt <[email protected]> Date: Thu Apr 21 09:32:45 2011 +0200
netfilter: provide config option to disable ancient procfs parts
--- net/netfilter/Kconfig | 10 ++++++++++ net/netfilter/nf_conntrack_expect.c | 12 ++++++------ net/netfilter/nf_conntrack_standalone.c | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-)
net/netfilter/Kconfig +10 -0
@@ -75,6 +75,16 @@ config NF_CONNTRACK_ZONES If unsure, say `N'. +config NF_CONNTRACK_PROCFS + bool "Supply CT list in procfs (OBSOLETE)" + default y + depends on PROC_FS + ---help--- + This option enables for the list of known conntrack entries + to be shown in procfs under net/netfilter/nf_conntrack. This + is considered obsolete in favor of using the conntrack(8) + tool which uses Netlink. + config NF_CONNTRACK_EVENTS bool "Connection tracking events" depends on NETFILTER_ADVANCED
net/netfilter/nf_conntrack_expect.c +6 -6
@@ -474,7 +474,7 @@ void nf_ct_remove_userspace_expectations(void) }EXPORT_SYMBOL_GPL (nf_ct_remove_userspace_expectations); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_NF_CONNTRACK_PROCFS struct ct_expect_iter_state { struct seq_net_private p; unsigned int bucket;
@@ -602,25 +602,25 @@ static const struct file_operations exp_file_ops = { .llseek = seq_lseek, .release = seq_release_net, }; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_NF_CONNTRACK_PROCFS */ static int exp_proc_init (struct net *net) { -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_NF_CONNTRACK_PROCFS struct proc_dir_entry *proc; proc =proc_net_fops_create (net,"nf_conntrack_expect" ,0440 , &exp_file_ops);if (!proc)return -ENOMEM ; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_NF_CONNTRACK_PROCFS */ return 0 ; }static void exp_proc_remove (struct net *net) { -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_NF_CONNTRACK_PROCFS proc_net_remove (net,"nf_conntrack_expect" ); -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_NF_CONNTRACK_PROCFS */ }module_param_named (expect_hashsize, nf_ct_expect_hsize, uint,0400 );
net/netfilter/nf_conntrack_standalone.c +2 -2
@@ -34,7 +34,7 @@MODULE_LICENSE ("GPL" ); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_NF_CONNTRACK_PROCFS int print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, const struct nf_conntrack_l3proto *l3proto,
@@ -396,7 +396,7 @@ static int nf_conntrack_standalone_init_proc(struct net *net)static void nf_conntrack_standalone_fini_proc (struct net *net) { } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_NF_CONNTRACK_PROCFS */ /* Sysctl support */
Signature · 1 line
# Created with git-export-patch
Pablo Neira Ayuso
maintaineroption to disable /proc/net/nf_conntrack procfs [was Re: netfilter patches for 3.0.0-rc1]
Quoted 17 lines · Jan Engelhardt
netfilter: provide config option to disable ancient procfs parts
Signed-off-by Jan Engelhardt <[email protected]>--- net/netfilter/Kconfig | 10 ++++++++++ net/netfilter/nf_conntrack_expect.c | 12 ++++++------ net/netfilter/nf_conntrack_standalone.c | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-)net/netfilter/Kconfig +0
-0@@ -75,6 +75,16 @@ config NF_CONNTRACK_ZONES If unsure, say `N'.
net/netfilter/Kconfig config NF_CONNTRACK_ZONES · line 87
Quoted 10 lines
net/netfilter/Kconfig +10
-0+config NF_CONNTRACK_PROCFS + bool "Supply CT list in procfs (OBSOLETE)" + default y + depends on PROC_FS + ---help--- + This option enables for the list of known conntrack entries + to be shown in procfs under net/netfilter/nf_conntrack. This + is considered obsolete in favor of using the conntrack(8) + tool which uses Netlink. +
This still misses /proc/net/ip_conntrack which would be available. See nf_conntrack_l3proto_ipv4_compat.c
Re: option to disable /proc/net/nf_conntrack procfs [was Re: netfilter patches for 3.0.0-rc1]
Quoted 16 lines · Pablo Neira Ayuso
Review
Quoted 12 lines · Jan Engelhardt
netfilter: provide config option to disable ancient procfs parts
(quoted diff) +10
-0+config NF_CONNTRACK_PROCFS + bool "Supply CT list in procfs (OBSOLETE)" + default y + depends on PROC_FS + ---help--- + This option enables for the list of known conntrack entries + to be shown in procfs under net/netfilter/nf_conntrack. This + is considered obsolete in favor of using the conntrack(8) + tool which uses Netlink. +This still misses
/proc/net/ip_conntrackwhich would be available. Seenf_conntrack_l3proto_ipv4_compat.c
Hm indeed. New try:
parent 6b914d11bc76286fd6d39833d046a3ce32a9b3cb (v3.0-rc1-100-g6b914d1) commit 80a72a00f509c26f9fa50434e0a3df6274f01484
Author: Jan Engelhardt <[email protected]> Date: Thu Apr 21 09:32:45 2011 +0200
netfilter: provide config option to disable ancient procfs parts
--- net/ipv4/netfilter/Kconfig | 2 +- net/netfilter/Kconfig | 10 ++++++++++ net/netfilter/nf_conntrack_expect.c | 12 ++++++------ net/netfilter/nf_conntrack_standalone.c | 4 ++-- 4 files changed, 19 insertions(+), 9 deletions(-)
net/ipv4/netfilter/Kconfig +1 -1
@@ -27,7 +27,7 @@ config NF_CONNTRACK_IPV4 config NF_CONNTRACK_PROC_COMPAT bool "proc/sysctl compatibility with old connection tracking" - depends on NF_CONNTRACK_IPV4 + depends on NF_CONNTRACK_PROCFS && NF_CONNTRACK_IPV4 default y help This option enables /proc and sysctl compatibility with the old
net/netfilter/Kconfig +10 -0
@@ -75,6 +75,16 @@ config NF_CONNTRACK_ZONES If unsure, say `N'. +config NF_CONNTRACK_PROCFS + bool "Supply CT list in procfs (OBSOLETE)" + default y + depends on PROC_FS + ---help--- + This option enables for the list of known conntrack entries + to be shown in procfs under net/netfilter/nf_conntrack. This + is considered obsolete in favor of using the conntrack(8) + tool which uses Netlink. + config NF_CONNTRACK_EVENTS bool "Connection tracking events" depends on NETFILTER_ADVANCED
net/netfilter/nf_conntrack_expect.c +6 -6
@@ -474,7 +474,7 @@ void nf_ct_remove_userspace_expectations(void) }EXPORT_SYMBOL_GPL (nf_ct_remove_userspace_expectations); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_NF_CONNTRACK_PROCFS struct ct_expect_iter_state { struct seq_net_private p; unsigned int bucket;
@@ -602,25 +602,25 @@ static const struct file_operations exp_file_ops = { .llseek = seq_lseek, .release = seq_release_net, }; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_NF_CONNTRACK_PROCFS */ static int exp_proc_init (struct net *net) { -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_NF_CONNTRACK_PROCFS struct proc_dir_entry *proc; proc =proc_net_fops_create (net,"nf_conntrack_expect" ,0440 , &exp_file_ops);if (!proc)return -ENOMEM ; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_NF_CONNTRACK_PROCFS */ return 0 ; }static void exp_proc_remove (struct net *net) { -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_NF_CONNTRACK_PROCFS proc_net_remove (net,"nf_conntrack_expect" ); -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_NF_CONNTRACK_PROCFS */ }module_param_named (expect_hashsize, nf_ct_expect_hsize, uint,0400 );
net/netfilter/nf_conntrack_standalone.c +2 -2
@@ -34,7 +34,7 @@MODULE_LICENSE ("GPL" ); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_NF_CONNTRACK_PROCFS int print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, const struct nf_conntrack_l3proto *l3proto,
@@ -396,7 +396,7 @@ static int nf_conntrack_standalone_init_proc(struct net *net)static void nf_conntrack_standalone_fini_proc (struct net *net) { } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_NF_CONNTRACK_PROCFS */ /* Sysctl support */
Signature · 1 line
# Created with git-export-patch
Re: option to disable /proc/net/nf_conntrack procfs [was Re: netfilter patches for 3.0.0-rc1]
Quoted 21 lines · Jan Engelhardt
Quoted 16 lines · Pablo Neira Ayuso
net/netfilter/Kconfig config NF_CONNTRACK_ZONES · line 87
Quoted 12 lines · Jan Engelhardt
netfilter: provide config option to disable ancient procfs parts
net/netfilter/Kconfig +10
-0+config NF_CONNTRACK_PROCFS + bool "Supply CT list in procfs (OBSOLETE)" + default y + depends on PROC_FS + ---help--- + This option enables for the list of known conntrack entries + to be shown in procfs under net/netfilter/nf_conntrack. This + is considered obsolete in favor of using the conntrack(8) + tool which uses Netlink. +This still misses
/proc/net/ip_conntrackwhich would be available. Seenf_conntrack_l3proto_ipv4_compat.cHm indeed. New try:
Quoted 8 lines
parent
6b914d11bc76286fd6d39833d046a3ce32a9b3cb(v3.0-rc1-100-g6b914d1) commit80a72a00f509c26f9fa50434e0a3df6274f01484Author: Jan Engelhardt <[email protected]> Date: Thu Apr 21 09:32:45 2011 +0200netfilter: provide config option to disable ancient procfs parts
Signed-off-by Jan Engelhardt <[email protected]>
Applied, thanks.