: nf_conntrack: proc/sysctl compatibility
Subsystems (2)
cover : nf_conntrack: proc/sysctl compatibility
These patches are a new attempt at proc and sysctl compatibility. The first three patches clean up the old sysctls a bit (move all protocol specific sysctls to the individual source files and perform automatic registration), the third and fourth patch introduce the actual compatibilty.
include/linux/netfilter.h | 8 include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 7 include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 25 + include/net/netfilter/nf_conntrack.h | 5 include/net/netfilter/nf_conntrack_l3proto.h | 6 include/net/netfilter/nf_conntrack_l4proto.h | 12 net/ipv4/netfilter/Kconfig | 11 net/ipv4/netfilter/Makefile | 5 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 130 +++-- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 412 ++++++++++++++++++ net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 43 + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 73 --- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 26 - net/netfilter/Makefile | 1 net/netfilter/nf_conntrack_core.c | 10 net/netfilter/nf_conntrack_expect.c | 1 net/netfilter/nf_conntrack_l3proto_generic.c | 3 net/netfilter/nf_conntrack_proto.c | 133 +++++ net/netfilter/nf_conntrack_proto_generic.c | 43 + net/netfilter/nf_conntrack_proto_sctp.c | 170 ++++--- net/netfilter/nf_conntrack_proto_tcp.c | 249 ++++++++++ net/netfilter/nf_conntrack_proto_udp.c | 68 ++ net/netfilter/nf_conntrack_standalone.c | 150 ------ net/netfilter/nf_sysctl.c | 132 +++++ 25 files changed, 1358 insertions(+), 366 deletions(-)
Patrick McHardy:
[NETFILTER]: nf_conntrack: move extern declaration to header files [NETFILTER]: nf_conntrack: automatic sysctl registation for conntrack protocols [NETFILTER]: nf_conntrack: move conntrack protocol sysctls to individual modules [NETFILTER]: nf_conntrack: sysctl compatibility with old connection tracking [NETFILTER]: nf_conntrack: /proc compatibility with old connection tracking
PATCH 1/5 : nf_conntrack: move extern declaration to header files
[NETFILTER]: nf_conntrack: move extern declaration to header files
Using extern in a C file is a bad idea because the compiler can't catch type errors.
---
commit 45df81e6d97daa98b77ef71b2488c167af1f6c80
tree 28d8d6c4da0ede0a6d43a844a8745349a8bdba81
parent b5b8962c41e0f59e1c98ae8b6671c6210517a6a9
author Patrick McHardy <[email protected]> Fri, 24 Nov 2006 19:20:04 +0100 committer Patrick McHardy <[email protected]> Fri, 24 Nov 2006 19:20:04 +0100
include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 4 ++++ include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 25 ++++++++++++++++++++++++ include/net/netfilter/nf_conntrack.h | 5 +++++ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 ------ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 ----------------- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 3 --- net/netfilter/nf_conntrack_expect.c | 1 - net/netfilter/nf_conntrack_l3proto_generic.c | 2 -- net/netfilter/nf_conntrack_standalone.c | 3 --- 9 files changed, 34 insertions(+), 33 deletions(-)
include/net/netfilter/ipv4/nf_conntrack_ipv4.h +4 -0
@@ -37,4 +37,8 @@ #endifstruct sk_buff *nf_ct_ipv4_ct_gather_frags (struct sk_buff *skb); +extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4; +extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4; +extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp; +#endif /*_NF_CONNTRACK_IPV4_H*/
include/net/netfilter/ipv6/nf_conntrack_ipv6.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef _NF_CONNTRACK_IPV6_H +#define _NF_CONNTRACK_IPV6_H + +extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6; + +extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6; +extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6; +extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6; + +extern int nf_ct_ipv6_skip_exthdr (struct sk_buff *skb,int start, +u8 *nexthdrp,int len); + +extern int nf_ct_frag6_init (void ); +extern void nf_ct_frag6_cleanup (void ); +extern struct sk_buff *nf_ct_frag6_gather (struct sk_buff *skb); +extern void nf_ct_frag6_output (unsigned int hooknum,struct sk_buff *skb, +struct net_device *in, +struct net_device *out, +int (*okfn)(struct sk_buff *)); + +extern unsigned int nf_ct_frag6_timeout; +extern unsigned int nf_ct_frag6_low_thresh; +extern unsigned int nf_ct_frag6_high_thresh; + +#endif /* _NF_CONNTRACK_IPV6_H*/
include/net/netfilter/nf_conntrack.h +5 -0
@@ -79,6 +79,8 @@ struct nf_conn_help {#include <net/netfilter/ipv4/nf_conntrack_ipv4.h> +#include <net/netfilter/ipv6/nf_conntrack_ipv6.h> +struct nf_conn {/* Usage count in here is 1 for hash table/destruct timer, 1 per skb,
@@ -241,7 +243,10 @@ static inline int nf_ct_is_dying(structextern unsigned int nf_conntrack_htable_size;extern int nf_conntrack_checksum; +extern atomic_t nf_conntrack_count; +extern int nf_conntrack_max; +DECLARE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat);#define NF_CT_STAT_INC (count) (__get_cpu_var(nf_conntrack_stat).count++)/* no helper, no nat */
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +0 -6
@@ -38,8 +38,6 @@ #else #define DEBUGP(format, args...)#endif -DECLARE_PER_CPU(struct nf_conntrack_stat, nf_conntrack_stat); -static int ipv4_pkt_to_tuple (const struct sk_buff *skb,unsigned int nhoff,struct nf_conntrack_tuple *tuple) {
@@ -429,10 +427,6 @@ #endif .me = THIS_MODULE, }; -extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4; -extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4; -extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp; -MODULE_ALIAS ("nf_conntrack-" __stringify(AF_INET ));MODULE_LICENSE ("GPL" );
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +0 -18
@@ -43,8 +43,6 @@ #else #define DEBUGP(format, args...)#endif -DECLARE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat); -static int ipv6_pkt_to_tuple (const struct sk_buff *skb,unsigned int nhoff,struct nf_conntrack_tuple *tuple) {
@@ -211,11 +209,6 @@ out:return nf_conntrack_confirm (pskb); } -extern struct sk_buff *nf_ct_frag6_gather (struct sk_buff *skb); -extern void nf_ct_frag6_output (unsigned int hooknum,struct sk_buff *skb, -struct net_device *in, -struct net_device *out, -int (*okfn)(struct sk_buff *)); static unsigned int ipv6_defrag(unsigned int hooknum, struct sk_buff **pskb, const struct net_device *in,
@@ -335,11 +328,6 @@ #ifdef CONFIG_SYSCTL/* From nf_conntrack_proto_icmpv6.c */ extern unsigned int nf_ct_icmpv6_timeout; -/* From nf_conntrack_reasm.c */ -extern unsigned int nf_ct_frag6_timeout; -extern unsigned int nf_ct_frag6_low_thresh; -extern unsigned int nf_ct_frag6_high_thresh; -static struct ctl_table_header *nf_ct_ipv6_sysctl_header;static ctl_table nf_ct_sysctl_table[] = {
@@ -458,12 +446,6 @@ #endif .me = THIS_MODULE, }; -extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6; -extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6; -extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6; -extern int nf_ct_frag6_init (void ); -extern void nf_ct_frag6_cleanup (void ); -MODULE_ALIAS ("nf_conntrack-" __stringify(AF_INET6 ));MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Yasuyuki KOZAKAI @USAGI <[email protected]>" );
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +0 -3
@@ -142,9 +142,6 @@ static int icmpv6_new(struct nf_conn *coreturn 1 ; } -extern int -nf_ct_ipv6_skip_exthdr (struct sk_buff *skb,int start,u8 *nexthdrp,int len); -extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6; static int icmpv6_error_message(struct sk_buff *skb, unsigned int icmp6off,
net/netfilter/nf_conntrack_expect.c +0 -1
@@ -28,7 +28,6 @@ #include <net/netfilter/nf_conntrack_tupLIST_HEAD (nf_conntrack_expect_list);kmem_cache_t *nf_conntrack_expect_cachep__read_mostly ; -DECLARE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat);static unsigned int nf_conntrack_expect_next_id;/* nf_conntrack_expect helper functions */
net/netfilter/nf_conntrack_l3proto_generic.c +0 -2
@@ -37,8 +37,6 @@ #else #define DEBUGP(format, args...)#endif -DECLARE_PER_CPU(struct nf_conntrack_stat, nf_conntrack_stat); -static int generic_pkt_to_tuple (const struct sk_buff *skb,unsigned int nhoff,struct nf_conntrack_tuple *tuple) {
net/netfilter/nf_conntrack_standalone.c +0 -3
@@ -44,9 +44,6 @@ #endifMODULE_LICENSE ("GPL" ); -extern atomic_t nf_conntrack_count; -DECLARE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat); -#ifdef CONFIG_PROC_FS int print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,
PATCH 2/5 : nf_conntrack: automatic sysctl registation for conntrack protocols
In reply to Patrick McHardy[NETFILTER]: nf_conntrack: automatic sysctl registation for conntrack protocols
Add helper functions for sysctl registration with optional instantiating of common path elements (like net/netfilter) and use it for support for automatic registation of conntrack protocol sysctls.
---
commit 8393250806afefb7cece0a4a9309b02477e6bef1
tree 71a6789b78f5f674096d4be091f4d02c9af83e99
parent 45df81e6d97daa98b77ef71b2488c167af1f6c80
author Patrick McHardy <[email protected]> Sat, 25 Nov 2006 19:03:40 +0100 committer Patrick McHardy <[email protected]> Sat, 25 Nov 2006 19:03:40 +0100
include/linux/netfilter.h | 8 ++ include/net/netfilter/nf_conntrack_l3proto.h | 6 + include/net/netfilter/nf_conntrack_l4proto.h | 6 + net/netfilter/Makefile | 1 net/netfilter/nf_conntrack_proto.c | 101 ++++++++++++++++++++ net/netfilter/nf_conntrack_standalone.c | 4 - net/netfilter/nf_sysctl.c | 132 ++++++++++++++++++++++++++ 7 files changed, 254 insertions(+), 4 deletions(-)
include/linux/netfilter.h +8 -0
@@ -117,6 +117,14 @@ void nf_unregister_hooks(struct nf_hook_int nf_register_sockopt (struct nf_sockopt_ops *reg);void nf_unregister_sockopt (struct nf_sockopt_ops *reg); +/* Sysctl registration */ +struct ctl_table_header *nf_register_sysctl_table (struct ctl_table *path, +struct ctl_table *table); +void nf_unregister_sysctl_table (struct ctl_table_header *header, +struct ctl_table *table); +extern struct ctl_table nf_net_netfilter_sysctl_path[]; +extern struct ctl_table nf_net_ipv4_netfilter_sysctl_path[]; +extern struct list_head nf_hooks[NPROTO ][NF_MAX_HOOKS ];/* those NF_LOG_* defines and struct nf_loginfo are legacy definitios that will
include/net/netfilter/nf_conntrack_l3proto.h +6 -0
@@ -75,6 +75,12 @@ struct nf_conntrack_l3protoint (*nfattr_to_tuple)(struct nfattr *tb[],struct nf_conntrack_tuple *t); +#ifdef CONFIG_SYSCTL +struct ctl_table_header *ctl_table_header; +struct ctl_table *ctl_table_path; +struct ctl_table *ctl_table; +#endif /* CONFIG_SYSCTL */ +/* Module (if any) which this is connected to. */ struct module *me; };
include/net/netfilter/nf_conntrack_l4proto.h +6 -0
@@ -76,6 +76,12 @@ struct nf_conntrack_l4protoint (*nfattr_to_tuple)(struct nfattr *tb[],struct nf_conntrack_tuple *t); +#ifdef CONFIG_SYSCTL +struct ctl_table_header **ctl_table_header; +struct ctl_table *ctl_table; +unsigned int *ctl_table_users; +#endif /* CONFIG_SYSCTL */ +/* Module (if any) which this is connected to. */ struct module *me; };
net/netfilter/Makefile +1 -0
@@ -4,6 +4,7 @@ nf_conntrack-y := nf_conntrack_core.o nf nf_conntrack-$(CONFIG_NF_CONNTRACK_EVENTS) += nf_conntrack_ecache.o obj-$(CONFIG_NETFILTER) = netfilter.o +obj-$(CONFIG_SYSCTL) += nf_sysctl.o obj-$(CONFIG_NETFILTER_NETLINK) += nfnetlink.o obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += nfnetlink_queue.o
net/netfilter/nf_conntrack_proto.c +101 -0
149 lines not on this page · raw message
net/netfilter/nf_conntrack_standalone.c +0 -4
@@ -331,10 +331,6 @@ int nf_conntrack_checksum __read_mostly#ifdef CONFIG_SYSCTL -/* From nf_conntrack_core.c */ -extern int nf_conntrack_max; -extern unsigned int nf_conntrack_htable_size; -/* From nf_conntrack_proto_tcp.c */ extern unsigned int nf_ct_tcp_timeout_syn_sent;extern unsigned int nf_ct_tcp_timeout_syn_recv;
net/netfilter/nf_sysctl.c new file +132 -0
132 lines not on this page · raw message
Re: [NETFILTER 02/05]: nf_conntrack: automatic sysctl registation for conntrack protocols
From: Patrick McHardy <[email protected]>
Date: Sun, 26 Nov 2006 15:44:50 +0100 (MET)
Quoted 7 lines
[NETFILTER]:
nf_conntrack: automatic sysctl registation for conntrack protocolsAdd helper functions for sysctl registration with optional instantiating of common path elements (like net/netfilter) and use it for support for automatic registation of conntrack protocol sysctls.
Signed-off-by Patrick McHardy <[email protected]>
The automatic registration is good idea. I expected only nf_ct_register_sysctl().
Quoted 16 lines
net/netfilter/nf_conntrack_proto.c +16
-0+static int nf_ct_l3proto_register_sysctl (struct nf_conntrack_l3proto *l3proto) +{ +int err =0 ; + +#ifdef CONFIG_SYSCTL +mutex_lock (&nf_ct_proto_sysctl_mutex); +if (l3proto->ctl_table !=NULL ) { + err =nf_ct_register_sysctl (&l3proto->ctl_table_header, + l3proto->ctl_table_path, + l3proto->ctl_table,NULL ); + } +mutex_unlock (&nf_ct_proto_sysctl_mutex); +#endif +return err; +} +
net/netfilter/nf_conntrack_proto.c static int kill_l4proto(struct nf_conn * · line 181
Quoted 10 lines
net/netfilter/nf_conntrack_proto.c +10
-0+static void nf_ct_l3proto_unregister_sysctl (struct nf_conntrack_l3proto *l3proto) +{ +#ifdef CONFIG_SYSCTL +mutex_lock (&nf_ct_proto_sysctl_mutex); +if (l3proto->ctl_table !=NULL ) +nf_ct_unregister_sysctl (&l3proto->ctl_table_header, + l3proto->ctl_table,NULL ); +mutex_unlock (&nf_ct_proto_sysctl_mutex); +#endif +}
How about inline ?
Quoted 1 line
+
(snip)
net/netfilter/nf_conntrack_proto.c int nf_conntrack_l3proto_register(struct · line 203
Quoted 13 lines
int
nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto){net/netfilter/nf_conntrack_proto.c +6
-0int ret =0 ;@@ -139,6 +195,12 @@ int nf_conntrack_l3proto_register(struct goto out_unlock; } nf_ct_l3protos[proto->l3proto] = proto; +write_unlock_bh (&nf_conntrack_lock); + + ret =nf_ct_l3proto_register_sysctl (proto); +if (ret <0 ) +nf_conntrack_l3proto_unregister (proto); +return ret;
Is this safe ? The neither nf_ct_unregister_sysctl nor nf_unregister_sysctl doesn't have NULL check for header. nf_conntrack_l4proto_register() has same issue as well.
Quoted 16 lines
net/netfilter/nf_conntrack_proto.c +2
-0out_unlock:write_unlock_bh (&nf_conntrack_lock);@@ -165,6 +227,8 @@ int nf_conntrack_l3proto_unregister(stru nf_ct_l3protos[proto->l3proto] = &nf_conntrack_l3proto_generic;write_unlock_bh (&nf_conntrack_lock); +nf_ct_l3proto_unregister_sysctl (proto); +/* Somebody could be still looking at the proto in bh. */ synchronize_net ();@@ -175,6 +239,35 @@ out:return ret; }
(snip)
net/netfilter/nf_sysctl.c line 27
Quoted 7 lines
net/netfilter/nf_sysctl.c new file +7
-0+static struct ctl_table * +path_dup (struct ctl_table *path,struct ctl_table *table) +{ +struct ctl_table *t, *last =NULL , *tmp; + +for (t = path; t !=NULL ; t = t->child) { + tmp =kmemdup (t,2 *sizeof (*t),GFP_KERNEL );
Why twice space is necessary ?
Quoted 10 lines
net/netfilter/nf_sysctl.c new file +10
-0+if (tmp ==NULL ) { +if (last !=NULL ) +path_free (path, table); +return NULL ; + } + +if (last !=NULL ) + last->child = tmp; +else + path = tmp;
net/netfilter/nf_sysctl.c line 47
Quoted 10 lines
net/netfilter/nf_sysctl.c new file +10
-0+ last = tmp; + } + +if (last !=NULL ) + last->child = table; +else + path = table; + +return path; +}
-- Yasuyuki Kozakai
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [NETFILTER 02/05]: nf_conntrack: automatic sysctl registation for conntrack protocols
Quoted 6 lines · Yasuyuki KOZAKAI
From: Patrick McHardy <[email protected]>
Date: Sun, 26 Nov 2006 15:44:50 +0100 (MET)Quoted 2 lines
[NETFILTER]:
nf_conntrack: automatic sysctl registation for conntrack protocols
Quoted 8 lines
Quoted 5 lines
Add helper functions for sysctl registration with optional instantiating of common path elements (like net/netfilter) and use it for support for automatic registation of conntrack protocol sysctls.
Signed-off-by Patrick McHardy <[email protected]>The automatic registration is good idea. I expected only
nf_ct_register_sysctl().
I had that at first, but since the shared sysctl table stuff is fairly specific to the conntrack protocols I put it there. If we find other users for this we can still move it.
Quoted 21 lines
Quoted 21 lines
(quoted diff) +21
-0+static int nf_ct_l3proto_register_sysctl(struct nf_conntrack_l3proto *l3proto) +{ + int err = 0; + +#ifdef CONFIG_SYSCTL + mutex_lock(&nf_ct_proto_sysctl_mutex); + if (l3proto->ctl_table != NULL) { + err = nf_ct_register_sysctl(&l3proto->ctl_table_header, + l3proto->ctl_table_path, + l3proto->ctl_table, NULL); + } + mutex_unlock(&nf_ct_proto_sysctl_mutex); +#endif + return err; +} + +static void nf_ct_l3proto_unregister_sysctl(struct nf_conntrack_l3proto *l3proto) +{ +#ifdef CONFIG_SYSCTL + mutex_lock(&nf_ct_proto_sysctl_mutex); + if (l3proto->ctl_table != NULL)
Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ nf_ct_unregister_sysctl(&l3proto->ctl_table_header, + l3proto->ctl_table, NULL); + mutex_unlock(&nf_ct_proto_sysctl_mutex); +#endif +}How about inline ?
Both are in really performance-uncritical paths, so I'll let the compiler decide.
Quoted 18 lines
Quoted 3 lines
+
(snip)
Quoted 10 lines
int
nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto){ int ret = 0;(quoted diff) +3
-0@@ -139,6 +195,12 @@ int nf_conntrack_l3proto_register(struct goto out_unlock; } nf_ct_l3protos[proto->l3proto] = proto; + write_unlock_bh(&nf_conntrack_lock); + + ret = nf_ct_l3proto_register_sysctl(proto);
Quoted 8 lines
Review int nf_conntrack_l3proto_register(struct · line 203
Quoted 3 lines
(quoted diff) +3
-0+ if (ret < 0) + nf_conntrack_l3proto_unregister(proto); + return ret;Is this safe ? The neither
nf_ct_unregister_sysctlnornf_unregister_sysctldoesn't have NULL check for header.nf_conntrack_l4proto_register()has same issue as well.
D'oh :) Good catch, I added this before adding the cleanup part in unregister. I've changed the check in unregister_sysctl to check for a non-NULL header.
Quoted 10 lines
Review int nf_conntrack_l3proto_register(struct
Quoted 7 lines
(quoted diff) +7
-0+static struct ctl_table * +path_dup(struct ctl_table *path, struct ctl_table *table) +{ + struct ctl_table *t, *last = NULL, *tmp; + + for (t = path; t != NULL; t = t->child) { + tmp = kmemdup(t, 2 * sizeof(*t), GFP_KERNEL);Why twice space is necessary ?
Once for the element, once for the 0-terminator. I've added a comment ..
net/netfilter/nf_conntrack_proto.c +3 -2
@@ -173,7 +173,7 @@ static void nf_ct_l3proto_unregister_sys {#ifdef CONFIG_SYSCTL mutex_lock (&nf_ct_proto_sysctl_mutex); -if (l3proto->ctl_table !=NULL ) +if (l3proto->ctl_table_header !=NULL )nf_ct_unregister_sysctl (&l3proto->ctl_table_header, l3proto->ctl_table,NULL );mutex_unlock (&nf_ct_proto_sysctl_mutex);
@@ -260,7 +260,8 @@ static void nf_ct_l4proto_unregister_sys {#ifdef CONFIG_SYSCTL mutex_lock (&nf_ct_proto_sysctl_mutex); -if (l4proto->ctl_table !=NULL ) +if (l4proto->ctl_table_header !=NULL && + *l4proto->ctl_table_header !=NULL )nf_ct_unregister_sysctl (l4proto->ctl_table_header, l4proto->ctl_table, l4proto->ctl_table_users);
net/netfilter/nf_sysctl.c +2 -0
@@ -24,6 +24,8 @@ path_dup(struct ctl_table *path, structstruct ctl_table *t, *last =NULL , *tmp;for (t = path; t !=NULL ; t = t->child) { +/* twice the size since path elements are terminated by an +* empty element */ tmp =kmemdup (t,2 *sizeof (*t),GFP_KERNEL );if (tmp ==NULL ) {if (last !=NULL )
Re: [NETFILTER 02/05]: nf_conntrack: automatic sysctl registation for conntrack protocols
Quoted 14 lines · Patrick McHardy
net/netfilter/nf_conntrack_proto.c +1
-1@@ -173,7 +173,7 @@ static void nf_ct_l3proto_unregister_sys {#ifdef CONFIG_SYSCTL mutex_lock (&nf_ct_proto_sysctl_mutex); -if (l3proto->ctl_table !=NULL ) +if (l3proto->ctl_table_header !=NULL )nf_ct_unregister_sysctl (&l3proto->ctl_table_header, l3proto->ctl_table,NULL );mutex_unlock (&nf_ct_proto_sysctl_mutex);
net/netfilter/nf_conntrack_proto.c static void nf_ct_l4proto_unregister_sys · line 267
Quoted 9 lines
net/netfilter/nf_conntrack_proto.c +2
-1@@ -260,7 +260,8 @@ static void nf_ct_l4proto_unregister_sys {#ifdef CONFIG_SYSCTL mutex_lock (&nf_ct_proto_sysctl_mutex); -if (l4proto->ctl_table !=NULL ) +if (l4proto->ctl_table_header !=NULL && + *l4proto->ctl_table_header !=NULL )nf_ct_unregister_sysctl (l4proto->ctl_table_header, l4proto->ctl_table, l4proto->ctl_table_users);
And a simiar change for the compat stuff, but I've also removed the double pointer for the header since the compat tables are not supposed to be shared.
include/net/netfilter/nf_conntrack_l4proto.h +1 -1
@@ -81,7 +81,7 @@ #ifdef CONFIG_SYSCTLstruct ctl_table *ctl_table;unsigned int *ctl_table_users;#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT -struct ctl_table_header **ctl_compat_table_header; +struct ctl_table_header *ctl_compat_table_header;struct ctl_table *ctl_compat_table;#endif #endif
net/ipv4/netfilter/nf_conntrack_proto_icmp.c +0 -2
@@ -337,7 +337,6 @@ static struct ctl_table icmp_sysctl_tabl } }; #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT -static struct ctl_table_header *icmp_compat_sysctl_header; static struct ctl_table icmp_compat_sysctl_table[] = { { .ctl_name = NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT,
@@ -377,7 +376,6 @@ #ifdef CONFIG_SYSCTL .ctl_table_header = &icmp_sysctl_header, .ctl_table = icmp_sysctl_table, #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT - .ctl_compat_table_header= &icmp_compat_sysctl_header, .ctl_compat_table = icmp_compat_sysctl_table,#endif #endif
net/netfilter/nf_conntrack_proto.c +3 -3
@@ -255,7 +255,7 @@ #ifdef CONFIG_SYSCTL }#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT if (l4proto->ctl_compat_table !=NULL ) { - err =nf_ct_register_sysctl (l4proto->ctl_compat_table_header, + err =nf_ct_register_sysctl (&l4proto->ctl_compat_table_header, nf_net_ipv4_netfilter_sysctl_path, l4proto->ctl_compat_table,NULL );if (err ==0 )
@@ -281,8 +281,8 @@ #ifdef CONFIG_SYSCTL l4proto->ctl_table, l4proto->ctl_table_users);#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT -if (l4proto->ctl_compat_table !=NULL ) -nf_ct_unregister_sysctl (l4proto->ctl_compat_table_header, +if (l4proto->ctl_compat_table_header !=NULL ) +nf_ct_unregister_sysctl (&l4proto->ctl_compat_table_header, l4proto->ctl_compat_table,NULL );#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ mutex_unlock (&nf_ct_proto_sysctl_mutex);
net/netfilter/nf_conntrack_proto_generic.c +0 -2
@@ -87,7 +87,6 @@ static struct ctl_table generic_sysctl_t } }; #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT -static struct ctl_table_header *generic_compat_sysctl_header; static struct ctl_table generic_compat_sysctl_table[] = { { .ctl_name = NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT,
@@ -119,7 +118,6 @@ #ifdef CONFIG_SYSCTL .ctl_table_header = &generic_sysctl_header, .ctl_table = generic_sysctl_table, #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT - .ctl_compat_table_header= &generic_compat_sysctl_header, .ctl_compat_table = generic_compat_sysctl_table,#endif #endif
net/netfilter/nf_conntrack_proto_sctp.c +0 -2
@@ -575,7 +575,6 @@ static struct ctl_table sctp_sysctl_tabl }; #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT -static struct ctl_table_header *sctp_compat_sysctl_header; static struct ctl_table sctp_compat_sysctl_table[] = { { .ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,
@@ -656,7 +655,6 @@ #ifdef CONFIG_SYSCTL .ctl_table_header = &sctp_sysctl_header, .ctl_table = sctp_sysctl_table, #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT - .ctl_compat_table_header= &sctp_compat_sysctl_header, .ctl_compat_table = sctp_compat_sysctl_table,#endif #endif
net/netfilter/nf_conntrack_proto_tcp.c +0 -2
@@ -1275,7 +1275,6 @@ static struct ctl_table tcp_sysctl_table }; #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT -static struct ctl_table_header *tcp_compat_sysctl_header; static struct ctl_table tcp_compat_sysctl_table[] = { { .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,
@@ -1404,7 +1403,6 @@ #ifdef CONFIG_SYSCTL .ctl_table_header = &tcp_sysctl_header, .ctl_table = tcp_sysctl_table, #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT - .ctl_compat_table_header= &tcp_compat_sysctl_header, .ctl_compat_table = tcp_compat_sysctl_table,#endif #endif
net/netfilter/nf_conntrack_proto_udp.c +0 -2
@@ -173,7 +173,6 @@ static struct ctl_table udp_sysctl_table } }; #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT -static struct ctl_table_header *udp_compat_sysctl_header; static struct ctl_table udp_compat_sysctl_table[] = { { .ctl_name = NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT,
@@ -220,7 +219,6 @@ #ifdef CONFIG_SYSCTL .ctl_table_header = &udp_sysctl_header, .ctl_table = udp_sysctl_table, #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT - .ctl_compat_table_header= &udp_compat_sysctl_header, .ctl_compat_table = udp_compat_sysctl_table,#endif #endif
PATCH 3/5 : nf_conntrack: move conntrack protocol sysctls to individual modules
In reply to Patrick McHardy[NETFILTER]: nf_conntrack: move conntrack protocol sysctls to individual modules
---
commit 12950ff977daaa602f90041d74889f2fee564100
tree 4f7840787ce4fd82cadce1cd3bb890a1431f7a16
parent 8393250806afefb7cece0a4a9309b02477e6bef1
author Patrick McHardy <[email protected]> Sat, 25 Nov 2006 19:08:26 +0100 committer Patrick McHardy <[email protected]> Sat, 25 Nov 2006 19:08:26 +0100
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 53 --------- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 23 ++++ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 55 +-------- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 23 ++++ net/netfilter/nf_conntrack_core.c | 8 + net/netfilter/nf_conntrack_proto.c | 12 ++ net/netfilter/nf_conntrack_proto_generic.c | 23 ++++ net/netfilter/nf_conntrack_proto_sctp.c | 101 ++++++----------- net/netfilter/nf_conntrack_proto_tcp.c | 140 ++++++++++++++++++++++-- net/netfilter/nf_conntrack_proto_udp.c | 40 ++++++- net/netfilter/nf_conntrack_standalone.c | 142 ------------------------ 11 files changed, 293 insertions(+), 327 deletions(-)
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +0 -53
@@ -266,44 +266,6 @@ static struct nf_hook_ops ipv4_conntrack }, }; -#ifdef CONFIG_SYSCTL -/* From nf_conntrack_proto_icmp.c */ -extern unsigned int nf_ct_icmp_timeout; -static struct ctl_table_header *nf_ct_ipv4_sysctl_header; - -static ctl_table nf_ct_sysctl_table[] = { - { - .ctl_name =NET_NF_CONNTRACK_ICMP_TIMEOUT , - .procname ="nf_conntrack_icmp_timeout" , - .data = &nf_ct_icmp_timeout, - .maxlen =sizeof (unsigned int ), - .mode =0644 , - .proc_handler = &proc_dointvec_jiffies, - }, - { .ctl_name =0 } -}; - -static ctl_table nf_ct_netfilter_table[] = { - { - .ctl_name =NET_NETFILTER , - .procname ="netfilter" , - .mode =0555 , - .child = nf_ct_sysctl_table, - }, - { .ctl_name =0 } -}; - -static ctl_table nf_ct_net_table[] = { - { - .ctl_name =CTL_NET , - .procname ="net" , - .mode =0555 , - .child = nf_ct_netfilter_table, - }, - { .ctl_name =0 } -}; -#endif -/* Fast function for those who don't want to parse /proc (and I don't blame them). */ /* Reversing the socket's dst/src point of view gives us the reply
@@ -472,20 +434,8 @@ static int __init nf_conntrack_l3proto_iprintk ("nf_conntrack_ipv4: can't register hooks.\n" ); goto cleanup_ipv4; } -#ifdef CONFIG_SYSCTL - nf_ct_ipv4_sysctl_header =register_sysctl_table (nf_ct_net_table,0 ); -if (nf_ct_ipv4_sysctl_header ==NULL ) { -printk ("nf_conntrack: can't register to sysctl.\n" ); - ret = -ENOMEM ; - goto cleanup_hooks; - } -#endif return ret; -#ifdef CONFIG_SYSCTL - cleanup_hooks: -nf_unregister_hooks (ipv4_conntrack_ops,ARRAY_SIZE (ipv4_conntrack_ops)); -#endif cleanup_ipv4:nf_conntrack_l3proto_unregister (&nf_conntrack_l3proto_ipv4); cleanup_icmp:
@@ -502,9 +452,6 @@ #endif static void __exit nf_conntrack_l3proto_ipv4_fini(void) {synchronize_net (); -#ifdef CONFIG_SYSCTL -unregister_sysctl_table (nf_ct_ipv4_sysctl_header); -#endif nf_unregister_hooks (ipv4_conntrack_ops,ARRAY_SIZE (ipv4_conntrack_ops));nf_conntrack_l3proto_unregister (&nf_conntrack_l3proto_ipv4);nf_conntrack_l4proto_unregister (&nf_conntrack_l4proto_icmp);
net/ipv4/netfilter/nf_conntrack_proto_icmp.c +22 -1
@@ -25,7 +25,7 @@ #include <net/netfilter/nf_conntrack_tup#include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_core.h> -unsigned long nf_ct_icmp_timeout__read_mostly =30 *HZ ; +static unsigned long nf_ct_icmp_timeout__read_mostly =30 *HZ ;#if 0 #define DEBUGP printk
@@ -321,6 +321,23 @@ static int icmp_nfattr_to_tuple(struct n }#endif +#ifdef CONFIG_SYSCTL +static struct ctl_table_header *icmp_sysctl_header; +static struct ctl_table icmp_sysctl_table[] = { + { + .ctl_name =NET_NF_CONNTRACK_ICMP_TIMEOUT , + .procname ="nf_conntrack_icmp_timeout" , + .data = &nf_ct_icmp_timeout, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name =0 + } +}; +#endif /* CONFIG_SYSCTL */ +struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp = { .l3proto =PF_INET ,
@@ -340,6 +357,10 @@ #if defined(CONFIG_NF_CT_NETLINK) || \ .tuple_to_nfattr = icmp_tuple_to_nfattr, .nfattr_to_tuple = icmp_nfattr_to_tuple,#endif +#ifdef CONFIG_SYSCTL + .ctl_table_header = &icmp_sysctl_header, + .ctl_table = icmp_sysctl_table, +#endif };EXPORT_SYMBOL (nf_conntrack_l4proto_icmp);
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +5 -50
87 lines not on this page · raw message
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +22 -1
@@ -33,7 +33,7 @@ #include <net/netfilter/nf_conntrack_l4p#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/ipv6/nf_conntrack_icmpv6.h> -unsigned long nf_ct_icmpv6_timeout__read_mostly =30 *HZ ; +static unsigned long nf_ct_icmpv6_timeout__read_mostly =30 *HZ ;#if 0 #define DEBUGP printk
@@ -298,6 +298,23 @@ static int icmpv6_nfattr_to_tuple(struct }#endif +#ifdef CONFIG_SYSCTL +static struct ctl_table_header *icmpv6_sysctl_header; +static struct ctl_table icmpv6_sysctl_table[] = { + { + .ctl_name =NET_NF_CONNTRACK_ICMPV6_TIMEOUT , + .procname ="nf_conntrack_icmpv6_timeout" , + .data = &nf_ct_icmpv6_timeout, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name =0 + } +}; +#endif /* CONFIG_SYSCTL */ +struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 = { .l3proto =PF_INET6 ,
@@ -315,6 +332,10 @@ #if defined(CONFIG_NF_CT_NETLINK) || \ .tuple_to_nfattr = icmpv6_tuple_to_nfattr, .nfattr_to_tuple = icmpv6_nfattr_to_tuple,#endif +#ifdef CONFIG_SYSCTL + .ctl_table_header = &icmpv6_sysctl_header, + .ctl_table = icmpv6_sysctl_table, +#endif };EXPORT_SYMBOL (nf_conntrack_l4proto_icmpv6);
net/netfilter/nf_conntrack_core.c +8 -0
@@ -1071,6 +1071,8 @@ void nf_conntrack_cleanup(void)free_conntrack_hash (nf_conntrack_hash, nf_conntrack_vmalloc, nf_conntrack_htable_size); +nf_conntrack_l4proto_unregister (&nf_conntrack_l4proto_generic); +/* free l3proto protocol tables */ for (i =0 ; i <PF_MAX ; i++)if (nf_ct_protos[i]) {
@@ -1196,6 +1198,10 @@ int __init nf_conntrack_init(void) goto err_free_conntrack_slab; } + ret =nf_conntrack_l4proto_register (&nf_conntrack_l4proto_generic); +if (ret <0 ) + goto out_free_expect_slab; +/* Don't NEED lock here, but good form anyway. */ write_lock_bh (&nf_conntrack_lock);for (i =0 ; i <AF_MAX ; i++)
@@ -1213,6 +1219,8 @@ int __init nf_conntrack_init(void)return ret; +out_free_expect_slab: +kmem_cache_destroy (nf_conntrack_expect_cachep); err_free_conntrack_slab:nf_conntrack_unregister_cache (NF_CT_F_BASIC ); err_free_hash:
net/netfilter/nf_conntrack_proto.c +10 -2
@@ -252,7 +252,7 @@ #ifdef CONFIG_SYSCTL l4proto->ctl_table_users); }mutex_unlock (&nf_ct_proto_sysctl_mutex); -#endif +#endif /* CONFIG_SYSCTL */ return err; }
@@ -265,7 +265,7 @@ #ifdef CONFIG_SYSCTL l4proto->ctl_table, l4proto->ctl_table_users);mutex_unlock (&nf_ct_proto_sysctl_mutex); -#endif +#endif /* CONFIG_SYSCTL */ }/* FIXME: Allow NULL functions and sub in pointers to generic for
@@ -279,6 +279,9 @@ int nf_conntrack_l4proto_register(struct goto out; } +if (l4proto == &nf_conntrack_l4proto_generic) +return nf_ct_l4proto_register_sysctl (l4proto); + retry:write_lock_bh (&nf_conntrack_lock);if (nf_ct_protos[l4proto->l3proto]) {
@@ -345,6 +348,11 @@ int nf_conntrack_l4proto_unregister(stru goto out; } +if (l4proto == &nf_conntrack_l4proto_generic) { +nf_ct_l4proto_unregister_sysctl (l4proto); + goto out; + } +write_lock_bh (&nf_conntrack_lock);if (nf_ct_protos[l4proto->l3proto][l4proto->l4proto] != l4proto) {
net/netfilter/nf_conntrack_proto_generic.c +22 -1
@@ -17,7 +17,7 @@ #include <linux/timer.h>#include <linux/netfilter.h> #include <net/netfilter/nf_conntrack_l4proto.h> -unsigned int nf_ct_generic_timeout__read_mostly =600 *HZ ; +static unsigned int nf_ct_generic_timeout__read_mostly =600 *HZ ; static int generic_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,
@@ -71,6 +71,23 @@ static int new(struct nf_conn *conntrackreturn 1 ; } +#ifdef CONFIG_SYSCTL +static struct ctl_table_header *generic_sysctl_header; +static struct ctl_table generic_sysctl_table[] = { + { + .ctl_name =NET_NF_CONNTRACK_GENERIC_TIMEOUT , + .procname ="nf_conntrack_generic_timeout" , + .data = &nf_ct_generic_timeout, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name =0 + } +}; +#endif /* CONFIG_SYSCTL */ +struct nf_conntrack_l4proto nf_conntrack_l4proto_generic = { .l3proto =PF_UNSPEC ,
@@ -82,4 +99,8 @@ struct nf_conntrack_l4proto nf_conntrack .print_conntrack = generic_print_conntrack, .packet = packet, .new = new, +#ifdef CONFIG_SYSCTL + .ctl_table_header = &generic_sysctl_header, + .ctl_table = generic_sysctl_table, +#endif };
net/netfilter/nf_conntrack_proto_sctp.c +38 -63
134 lines not on this page · raw message
net/netfilter/nf_conntrack_proto_tcp.c +128 -12
169 lines not on this page · raw message
net/netfilter/nf_conntrack_proto_udp.c +38 -2
@@ -29,8 +29,8 @@ #include <linux/netfilter_ipv6.h>#include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_ecache.h> -unsigned int nf_ct_udp_timeout__read_mostly =30 *HZ ; -unsigned int nf_ct_udp_timeout_stream__read_mostly =180 *HZ ; +static unsigned int nf_ct_udp_timeout__read_mostly =30 *HZ ; +static unsigned int nf_ct_udp_timeout_stream__read_mostly =180 *HZ ; static int udp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,
@@ -148,6 +148,32 @@ static int udp_error(struct sk_buff *skbreturn NF_ACCEPT ; } +#ifdef CONFIG_SYSCTL +static unsigned int udp_sysctl_table_users; +static struct ctl_table_header *udp_sysctl_header; +static struct ctl_table udp_sysctl_table[] = { + { + .ctl_name =NET_NF_CONNTRACK_UDP_TIMEOUT , + .procname ="nf_conntrack_udp_timeout" , + .data = &nf_ct_udp_timeout, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name =NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM , + .procname ="nf_conntrack_udp_timeout_stream" , + .data = &nf_ct_udp_timeout_stream, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name =0 + } +}; +#endif /* CONFIG_SYSCTL */ +struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 = { .l3proto =PF_INET ,
@@ -165,6 +191,11 @@ #if defined(CONFIG_NF_CT_NETLINK) || \ .tuple_to_nfattr = nf_ct_port_tuple_to_nfattr, .nfattr_to_tuple = nf_ct_port_nfattr_to_tuple,#endif +#ifdef CONFIG_SYSCTL + .ctl_table_users = &udp_sysctl_table_users, + .ctl_table_header = &udp_sysctl_header, + .ctl_table = udp_sysctl_table, +#endif }; struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 =
@@ -184,6 +215,11 @@ #if defined(CONFIG_NF_CT_NETLINK) || \ .tuple_to_nfattr = nf_ct_port_tuple_to_nfattr, .nfattr_to_tuple = nf_ct_port_nfattr_to_tuple,#endif +#ifdef CONFIG_SYSCTL + .ctl_table_users = &udp_sysctl_table_users, + .ctl_table_header = &udp_sysctl_header, + .ctl_table = udp_sysctl_table, +#endif };EXPORT_SYMBOL (nf_conntrack_l4proto_udp4);
net/netfilter/nf_conntrack_standalone.c +0 -142
160 lines not on this page · raw message
Re: [NETFILTER 03/05]: nf_conntrack: move conntrack protocol sysctls to individual modules
From: Patrick McHardy <[email protected]>
Date: Sun, 26 Nov 2006 15:44:52 +0100 (MET)
Quoted 7 lines
[NETFILTER]:
nf_conntrack: move conntrack protocol sysctls to individual modulesSigned-off-by Patrick McHardy <[email protected]>net/netfilter/nf_conntrack_proto_tcp.c +0
-0
(snip)
net/netfilter/nf_conntrack_proto_tcp.c static int nfattr_to_tcp(struct nfattr * · line 1173
Quoted 2 lines
net/netfilter/nf_conntrack_proto_tcp.c +2
-0+#ifdef CONFIG_SYSCTL +static unsigned int tcp_syctl_table_users;
tcp_sysctl_table_users ? (second 's' is missing)
-- Yasuyuki Kozakai
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [NETFILTER 03/05]: nf_conntrack: move conntrack protocol sysctls to individual modules
Quoted 5 lines · Yasuyuki KOZAKAI
net/netfilter/nf_conntrack_proto_tcp.c static int nfattr_to_tcp(struct nfattr * · line 1173
Quoted 2 lines
net/netfilter/nf_conntrack_proto_tcp.c +2
-0+#ifdef CONFIG_SYSCTL +static unsigned int tcp_syctl_table_users;
tcp_sysctl_table_users? (second 's' is missing)
Fixed, thanks :)
PATCH 4/5 : nf_conntrack: sysctl compatibility with old connection tracking
In reply to Patrick McHardy[NETFILTER]: nf_conntrack: sysctl compatibility with old connection tracking
This patch adds an option to keep the connection tracking sysctls visible under their old names.
---
commit 143277a143b7c61beb1d5d6640354e2c64a3a4b6
tree dcb29bb16dcd4fac11d6c36de003ed5048d9443c
parent 12950ff977daaa602f90041d74889f2fee564100
author Patrick McHardy <[email protected]> Sun, 26 Nov 2006 15:22:05 +0100 committer Patrick McHardy <[email protected]> Sun, 26 Nov 2006 15:22:05 +0100
include/net/netfilter/nf_conntrack_l4proto.h | 6 + net/ipv4/netfilter/Kconfig | 11 ++ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 58 +++++++++++++ net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 20 ++++ net/netfilter/nf_conntrack_core.c | 2 net/netfilter/nf_conntrack_proto.c | 20 ++++ net/netfilter/nf_conntrack_proto_generic.c | 20 ++++ net/netfilter/nf_conntrack_proto_sctp.c | 69 +++++++++++++++ net/netfilter/nf_conntrack_proto_tcp.c | 109 ++++++++++++++++++++++++ net/netfilter/nf_conntrack_proto_udp.c | 28 ++++++ 10 files changed, 342 insertions(+), 1 deletions(-)
include/net/netfilter/nf_conntrack_l4proto.h +5 -1
@@ -80,7 +80,11 @@ #ifdef CONFIG_SYSCTLstruct ctl_table_header **ctl_table_header;struct ctl_table *ctl_table;unsigned int *ctl_table_users; -#endif /* CONFIG_SYSCTL */ +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT +struct ctl_table_header **ctl_compat_table_header; +struct ctl_table *ctl_compat_table; +#endif +#endif /* Module (if any) which this is connected to. */ struct module *me;
net/ipv4/netfilter/Kconfig +11 -0
@@ -19,6 +19,17 @@ config NF_CONNTRACK_IPV4 To compile it as a module, choose M here. If unsure, say N. +config NF_CONNTRACK_PROC_COMPAT + bool "proc/sysctl compatibility with old connection tracking" + depends on NF_CONNTRACK + default y + help + This option enables /proc and sysctl compatibility with the old + layer 3 dependant connection tracking. This is needed to keep + old programs that have not been adapted to the new names working. + + If unsure, say Y. + # connection tracking, helpers and protocols config IP_NF_CONNTRACK tristate "Connection tracking (required for masq/NAT)"
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +58 -0
70 lines not on this page · raw message
net/ipv4/netfilter/nf_conntrack_proto_icmp.c +20 -0
@@ -336,6 +336,22 @@ static struct ctl_table icmp_sysctl_tabl .ctl_name = 0 } }; +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT +static struct ctl_table_header *icmp_compat_sysctl_header; +static struct ctl_table icmp_compat_sysctl_table[] = { + { + .ctl_name =NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT , + .procname ="ip_conntrack_icmp_timeout" , + .data = &nf_ct_icmp_timeout, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name =0 + } +}; +#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ #endif /* CONFIG_SYSCTL */ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp =
@@ -360,6 +376,10 @@ #endif#ifdef CONFIG_SYSCTL .ctl_table_header = &icmp_sysctl_header, .ctl_table = icmp_sysctl_table, +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT + .ctl_compat_table_header= &icmp_compat_sysctl_header, + .ctl_compat_table = icmp_compat_sysctl_table, +#endif #endif };
net/netfilter/nf_conntrack_core.c +2 -0
@@ -66,10 +66,12 @@ DEFINE_RWLOCK(nf_conntrack_lock);/* nf_conntrack_standalone needs this */ atomic_t nf_conntrack_count =ATOMIC_INIT (0 ); +EXPORT_SYMBOL_GPL (nf_conntrack_count);void (*nf_conntrack_destroyed)(struct nf_conn *conntrack) =NULL ;unsigned int nf_conntrack_htable_size__read_mostly ;int nf_conntrack_max__read_mostly ; +EXPORT_SYMBOL_GPL (nf_conntrack_max);struct list_head *nf_conntrack_hash__read_mostly ;struct nf_conn nf_conntrack_untracked__read_mostly ;unsigned int nf_ct_log_invalid__read_mostly ;
net/netfilter/nf_conntrack_proto.c +20 -0
@@ -250,7 +250,22 @@ #ifdef CONFIG_SYSCTL nf_net_netfilter_sysctl_path, l4proto->ctl_table, l4proto->ctl_table_users); +if (err <0 ) + goto out; } +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT +if (l4proto->ctl_compat_table !=NULL ) { + err =nf_ct_register_sysctl (l4proto->ctl_compat_table_header, + nf_net_ipv4_netfilter_sysctl_path, + l4proto->ctl_compat_table,NULL ); +if (err ==0 ) + goto out; +nf_ct_unregister_sysctl (l4proto->ctl_table_header, + l4proto->ctl_table, + l4proto->ctl_table_users); + } +#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ +out:mutex_unlock (&nf_ct_proto_sysctl_mutex);#endif /* CONFIG_SYSCTL */ return err;
@@ -264,6 +279,11 @@ #ifdef CONFIG_SYSCTLnf_ct_unregister_sysctl (l4proto->ctl_table_header, l4proto->ctl_table, l4proto->ctl_table_users); +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT +if (l4proto->ctl_compat_table !=NULL ) +nf_ct_unregister_sysctl (l4proto->ctl_compat_table_header, + l4proto->ctl_compat_table,NULL ); +#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ mutex_unlock (&nf_ct_proto_sysctl_mutex);#endif /* CONFIG_SYSCTL */ }
net/netfilter/nf_conntrack_proto_generic.c +20 -0
@@ -86,6 +86,22 @@ static struct ctl_table generic_sysctl_t .ctl_name = 0 } }; +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT +static struct ctl_table_header *generic_compat_sysctl_header; +static struct ctl_table generic_compat_sysctl_table[] = { + { + .ctl_name =NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT , + .procname ="ip_conntrack_generic_timeout" , + .data = &nf_ct_generic_timeout, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name =0 + } +}; +#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ #endif /* CONFIG_SYSCTL */ struct nf_conntrack_l4proto nf_conntrack_l4proto_generic =
@@ -102,5 +118,9 @@ struct nf_conntrack_l4proto nf_conntrack#ifdef CONFIG_SYSCTL .ctl_table_header = &generic_sysctl_header, .ctl_table = generic_sysctl_table, +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT + .ctl_compat_table_header= &generic_compat_sysctl_header, + .ctl_compat_table = generic_compat_sysctl_table, +#endif #endif };
net/netfilter/nf_conntrack_proto_sctp.c +69 -0
81 lines not on this page · raw message
net/netfilter/nf_conntrack_proto_tcp.c +109 -0
121 lines not on this page · raw message
net/netfilter/nf_conntrack_proto_udp.c +28 -0
@@ -172,6 +172,30 @@ static struct ctl_table udp_sysctl_table .ctl_name = 0 } }; +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT +static struct ctl_table_header *udp_compat_sysctl_header; +static struct ctl_table udp_compat_sysctl_table[] = { + { + .ctl_name =NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT , + .procname ="ip_conntrack_udp_timeout" , + .data = &nf_ct_udp_timeout, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name =NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM , + .procname ="ip_conntrack_udp_timeout_stream" , + .data = &nf_ct_udp_timeout_stream, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name =0 + } +}; +#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ #endif /* CONFIG_SYSCTL */ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 =
@@ -195,6 +219,10 @@ #ifdef CONFIG_SYSCTL .ctl_table_users = &udp_sysctl_table_users, .ctl_table_header = &udp_sysctl_header, .ctl_table = udp_sysctl_table, +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT + .ctl_compat_table_header= &udp_compat_sysctl_header, + .ctl_compat_table = udp_compat_sysctl_table, +#endif #endif };
PATCH 5/5 : nf_conntrack: /proc compatibility with old connection tracking
In reply to Patrick McHardy[NETFILTER]: nf_conntrack: /proc compatibility with old connection tracking
This patch adds /proc/net/ip_conntrack, /proc/net/ip_conntrack_expect and /proc/net/stat/ip_conntrack files to keep old programs using them working.
The /proc/net/ip_conntrack and /proc/net/ip_conntrack_expect files show only IPv4 entries, the /proc/net/stat/ip_conntrack shows global statistics.
---
commit 7ea75129c8e4f4aec73f7c6b1bb5b3abfe0df498
tree 43de09d262fbe45cac2161d34fefc898ac82e95b
parent 143277a143b7c61beb1d5d6640354e2c64a3a4b6
author Patrick McHardy <[email protected]> Sun, 26 Nov 2006 15:39:34 +0100 committer Patrick McHardy <[email protected]> Sun, 26 Nov 2006 15:39:34 +0100
include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 3 net/ipv4/netfilter/Makefile | 5 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 13 + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 412 +++++++++++++++++++++++ net/netfilter/nf_conntrack_l3proto_generic.c | 1 net/netfilter/nf_conntrack_standalone.c | 1 6 files changed, 434 insertions(+), 1 deletions(-)
include/net/netfilter/ipv4/nf_conntrack_ipv4.h +3 -0
@@ -41,4 +41,7 @@ extern struct nf_conntrack_l4proto nf_coextern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp; +extern int nf_conntrack_ipv4_compat_init (void ); +extern void nf_conntrack_ipv4_compat_fini (void ); +#endif /*_NF_CONNTRACK_IPV4_H*/
net/ipv4/netfilter/Makefile +5 -0
@@ -88,6 +88,11 @@ obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o # objects for l3 independent conntrack nf_conntrack_ipv4-objs := nf_conntrack_l3proto_ipv4.o nf_conntrack_proto_icmp.o +ifeq ($(CONFIG_NF_CONNTRACK_PROC_COMPAT),y) +ifeq ($(CONFIG_PROC_FS),y) +nf_conntrack_ipv4-objs += nf_conntrack_l3proto_ipv4_compat.o +endif +endif # l3 independent conntrack obj-$(CONFIG_NF_CONNTRACK_IPV4) += nf_conntrack_ipv4.o
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +12 -1
@@ -492,8 +492,16 @@ static int __init nf_conntrack_l3proto_iprintk ("nf_conntrack_ipv4: can't register hooks.\n" ); goto cleanup_ipv4; } +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT + ret =nf_conntrack_ipv4_compat_init (); +if (ret <0 ) + goto cleanup_hooks; +#endif return ret; - +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT + cleanup_hooks: +nf_unregister_hooks (ipv4_conntrack_ops,ARRAY_SIZE (ipv4_conntrack_ops)); +#endif cleanup_ipv4:nf_conntrack_l3proto_unregister (&nf_conntrack_l3proto_ipv4); cleanup_icmp:
@@ -510,6 +518,9 @@ static int __init nf_conntrack_l3proto_i static void __exit nf_conntrack_l3proto_ipv4_fini(void) {synchronize_net (); +#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT +nf_conntrack_ipv4_compat_fini (); +#endif nf_unregister_hooks (ipv4_conntrack_ops,ARRAY_SIZE (ipv4_conntrack_ops));nf_conntrack_l3proto_unregister (&nf_conntrack_l3proto_ipv4);nf_conntrack_l4proto_unregister (&nf_conntrack_l4proto_icmp);
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c new file +412 -0
412 lines not on this page · raw message
net/netfilter/nf_conntrack_l3proto_generic.c +1 -0
@@ -92,3 +92,4 @@ struct nf_conntrack_l3proto nf_conntrack .prepare = generic_prepare, .get_features = generic_get_features, }; +EXPORT_SYMBOL_GPL (nf_conntrack_l3proto_generic);
net/netfilter/nf_conntrack_standalone.c +1 -0
@@ -52,6 +52,7 @@ print_tuple(struct seq_file *s, const st {return l3proto->print_tuple (s, tuple) || l4proto->print_tuple (s, tuple); } +EXPORT_SYMBOL_GPL (print_tuple);#ifdef CONFIG_NF_CT_ACCT static unsigned int