aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-14 01:29:59 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-14 01:29:59 -0400
commitb76c4b27fee9c88294d3152784291fc6f6d23401 (patch)
treeafdaf5706f8d930d9ac5441ebdb6245e1a136fa7 /net/dccp
parent7b1cffa8c90269dc3dc721d084d1e0d742d87c31 (diff)
[NETNS][DCCPV4]: Actually create ctl socket on each net and use it.
Move the call to inet_ctl_sock_create to init callback (and inet_ctl_sock_destroy to exit one) and use proper ctl sock in dccp_v4_ctl_send_reset. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ipv4.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 85931dce744c..cad62d8d87a0 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -505,7 +505,8 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb)
505 const struct iphdr *rxiph; 505 const struct iphdr *rxiph;
506 struct sk_buff *skb; 506 struct sk_buff *skb;
507 struct dst_entry *dst; 507 struct dst_entry *dst;
508 struct sock *ctl_sk = init_net.dccp.v4_ctl_sk; 508 struct net *net = dev_net(rxskb->dst->dev);
509 struct sock *ctl_sk = net->dccp.v4_ctl_sk;
509 510
510 /* Never send a reset in response to a reset. */ 511 /* Never send a reset in response to a reset. */
511 if (dccp_hdr(rxskb)->dccph_type == DCCP_PKT_RESET) 512 if (dccp_hdr(rxskb)->dccph_type == DCCP_PKT_RESET)
@@ -991,11 +992,16 @@ static struct inet_protosw dccp_v4_protosw = {
991 992
992static int dccp_v4_init_net(struct net *net) 993static int dccp_v4_init_net(struct net *net)
993{ 994{
994 return 0; 995 int err;
996
997 err = inet_ctl_sock_create(&net->dccp.v4_ctl_sk, PF_INET,
998 SOCK_DCCP, IPPROTO_DCCP, net);
999 return err;
995} 1000}
996 1001
997static void dccp_v4_exit_net(struct net *net) 1002static void dccp_v4_exit_net(struct net *net)
998{ 1003{
1004 inet_ctl_sock_destroy(net->dccp.v4_ctl_sk);
999} 1005}
1000 1006
1001static struct pernet_operations dccp_v4_ops = { 1007static struct pernet_operations dccp_v4_ops = {
@@ -1016,19 +1022,12 @@ static int __init dccp_v4_init(void)
1016 1022
1017 inet_register_protosw(&dccp_v4_protosw); 1023 inet_register_protosw(&dccp_v4_protosw);
1018 1024
1019 err = inet_ctl_sock_create(&init_net.dccp.v4_ctl_sk, PF_INET,
1020 SOCK_DCCP, IPPROTO_DCCP, &init_net);
1021 if (err)
1022 goto out_unregister_protosw;
1023
1024 err = register_pernet_subsys(&dccp_v4_ops); 1025 err = register_pernet_subsys(&dccp_v4_ops);
1025 if (err) 1026 if (err)
1026 goto out_destroy_ctl_sock; 1027 goto out_destroy_ctl_sock;
1027out: 1028out:
1028 return err; 1029 return err;
1029out_destroy_ctl_sock: 1030out_destroy_ctl_sock:
1030 inet_ctl_sock_destroy(init_net.dccp.v4_ctl_sk);
1031out_unregister_protosw:
1032 inet_unregister_protosw(&dccp_v4_protosw); 1031 inet_unregister_protosw(&dccp_v4_protosw);
1033 inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP); 1032 inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP);
1034out_proto_unregister: 1033out_proto_unregister:
@@ -1039,7 +1038,6 @@ out_proto_unregister:
1039static void __exit dccp_v4_exit(void) 1038static void __exit dccp_v4_exit(void)
1040{ 1039{
1041 unregister_pernet_subsys(&dccp_v4_ops); 1040 unregister_pernet_subsys(&dccp_v4_ops);
1042 inet_ctl_sock_destroy(init_net.dccp.v4_ctl_sk);
1043 inet_unregister_protosw(&dccp_v4_protosw); 1041 inet_unregister_protosw(&dccp_v4_protosw);
1044 inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP); 1042 inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP);
1045 proto_unregister(&dccp_v4_prot); 1043 proto_unregister(&dccp_v4_prot);