diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-06-29 01:23:24 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-07-04 13:37:22 -0400 |
commit | 08911475d1d0921401e37d83292b217e1411d10b (patch) | |
tree | 78e2ad7b4898fb76dc3c4b4bbe46fbaaf3cb1f18 /net/ipv4 | |
parent | 8fc02781688eda937657193ee28caf4914563d27 (diff) |
netfilter: nf_conntrack: generalize nf_ct_l4proto_net
This patch generalizes nf_ct_l4proto_net by splitting it into chunks and
moving the corresponding protocol part to where it really belongs to.
To clarify, note that we follow two different approaches to support per-net
depending if it's built-in or run-time loadable protocol tracker.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Gao feng <gaofeng@cn.fujitsu.com>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c index 9c2095c5571f..5241d997ab75 100644 --- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c +++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c | |||
@@ -388,6 +388,11 @@ static int icmp_init_net(struct net *net, u_int16_t proto) | |||
388 | return ret; | 388 | return ret; |
389 | } | 389 | } |
390 | 390 | ||
391 | static struct nf_proto_net *icmp_get_net_proto(struct net *net) | ||
392 | { | ||
393 | return &net->ct.nf_ct_proto.icmp.pn; | ||
394 | } | ||
395 | |||
391 | struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = | 396 | struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = |
392 | { | 397 | { |
393 | .l3proto = PF_INET, | 398 | .l3proto = PF_INET, |
@@ -418,4 +423,5 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = | |||
418 | }, | 423 | }, |
419 | #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ | 424 | #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ |
420 | .init_net = icmp_init_net, | 425 | .init_net = icmp_init_net, |
426 | .get_net_proto = icmp_get_net_proto, | ||
421 | }; | 427 | }; |