[ICSK]: Introduce inet_csk_ctl_sock_create

Consolidating open coded sequences in tcp and dccp, v4 and v6.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 4e5a9ff99fc3d08af5519369c9ab887b59fdb06c..363a067403ee85b35f3b8383f453316f2e0ff4ec 100644 (file)
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -321,4 +321,8 @@ extern void inet_csk_listen_stop(struct sock *sk);
 
 extern void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);
 
+extern int inet_csk_ctl_sock_create(struct socket **sock,
+                                   unsigned short family,
+                                   unsigned short type,
+                                   unsigned char protocol);
 #endif /* _INET_CONNECTION_SOCK_H */

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index f53bce590ade68f1154f90c7515882ad4ab1a27a..7098f1055f4a8eb448c0b6b979afac4f2c3432b2 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1099,29 +1099,6 @@ static struct inet_protosw dccp_v4_protosw = {
        .flags          = INET_PROTOSW_ICSK,
 };
 
-static char dccp_v4_ctl_socket_err_msg[] __initdata =
-       KERN_ERR "DCCP: Failed to create the control socket.\n";
-
-static int __init dccp_v4_ctl_sock_init(void)
-{
-       int rc = sock_create_kern(PF_INET, SOCK_DCCP, IPPROTO_DCCP,
-                                 &dccp_v4_ctl_socket);
-       if (rc < 0)
-               printk(dccp_v4_ctl_socket_err_msg);
-       else {
-               dccp_v4_ctl_socket->sk->sk_allocation = GFP_ATOMIC;
-               inet_sk(dccp_v4_ctl_socket->sk)->uc_ttl = -1;
-
-               /* Unhash it so that IP input processing does not even
-                * see it, we do not wish this socket to see incoming
-                * packets.
-                */
-               dccp_v4_ctl_socket->sk->sk_prot->unhash(dccp_v4_ctl_socket->sk);
-       }
-
-       return rc;
-}
-
 static int __init dccp_v4_init(void)
 {
        int err = proto_register(&dccp_v4_prot, 1);
@@ -1135,7 +1112,8 @@ static int __init dccp_v4_init(void)
 
        inet_register_protosw(&dccp_v4_protosw);
 
-       err = dccp_v4_ctl_sock_init();
+       err = inet_csk_ctl_sock_create(&dccp_v4_ctl_socket, PF_INET,
+                                      SOCK_DCCP, IPPROTO_DCCP);
        if (err)
                goto out_unregister_protosw;
 out:

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 3c9f0836404fb59f4730a7949e8be7b0961dec21..6bd9979334a24b2e661d39d4c9d3a7f0516b93bb 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1229,29 +1229,6 @@ static struct inet_protosw dccp_v6_protosw = {
        .flags          = INET_PROTOSW_ICSK,
 };
 
-static char dccp_v6_ctl_socket_err_msg[] __initdata =
-       KERN_ERR "DCCP: Failed to create the control socket.\n";
-
-static int __init dccp_v6_ctl_sock_init(void)
-{
-       int rc = sock_create_kern(PF_INET6, SOCK_DCCP, IPPROTO_DCCP,
-                                 &dccp_v6_ctl_socket);
-       if (rc < 0)
-               printk(dccp_v6_ctl_socket_err_msg);
-       else {
-               dccp_v6_ctl_socket->sk->sk_allocation = GFP_ATOMIC;
-               inet_sk(dccp_v6_ctl_socket->sk)->uc_ttl = -1;
-
-               /* Unhash it so that IP input processing does not even
-                * see it, we do not wish this socket to see incoming
-                * packets.
-                */
-               dccp_v6_ctl_socket->sk->sk_prot->unhash(dccp_v6_ctl_socket->sk);
-       }
-
-       return rc;
-}
-
 static int __init dccp_v6_init(void)
 {
        int err = proto_register(&dccp_v6_prot, 1);
@@ -1265,7 +1242,9 @@ static int __init dccp_v6_init(void)
 
        inet6_register_protosw(&dccp_v6_protosw);
 
-       if (dccp_v6_ctl_sock_init() != 0)
+       err = inet_csk_ctl_sock_create(&dccp_v6_ctl_socket, PF_INET6,
+                                      SOCK_DCCP, IPPROTO_DCCP);
+       if (err != 0)
                goto out_unregister_protosw;
 out:
        return err;

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index ae20281d8deb085e58eec67def12fef96da3b1fd..359f48cec99a52fc7dd3a9d3f41033ca2253e2ce 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -648,3 +648,22 @@ void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr)
 }
 
 EXPORT_SYMBOL_GPL(inet_csk_addr2sockaddr);
+
+int inet_csk_ctl_sock_create(struct socket **sock, unsigned short family,
+                            unsigned short type, unsigned char protocol)
+{
+       int rc = sock_create_kern(family, type, protocol, sock);
+
+       if (rc == 0) {
+               (*sock)->sk->sk_allocation = GFP_ATOMIC;
+               inet_sk((*sock)->sk)->uc_ttl = -1;
+               /*
+                * Unhash it so that IP input processing does not even see it,
+                * we do not wish this socket to see incoming packets.
+                */
+               (*sock)->sk->sk_prot->unhash((*sock)->sk);
+       }
+       return rc;
+}
+
+EXPORT_SYMBOL_GPL(inet_csk_ctl_sock_create);

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 57e7a26e82137bcf668ff06dc7b6d758497928d4..4eb903db1b128754c01b902eee27528f467fb15a 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1828,21 +1828,10 @@ struct proto tcp_prot = {
        .rsk_prot               = &tcp_request_sock_ops,
 };
 
-
-
 void __init tcp_v4_init(struct net_proto_family *ops)
 {
-       int err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_TCP, &tcp_socket);
-       if (err < 0)
+       if (inet_csk_ctl_sock_create(&tcp_socket, PF_INET, SOCK_RAW, IPPROTO_TCP) < 0)
                panic("Failed to create the TCP control socket.\n");
-       tcp_socket->sk->sk_allocation   = GFP_ATOMIC;
-       inet_sk(tcp_socket->sk)->uc_ttl = -1;
-
-       /* Unhash it so that IP input processing does not even
-        * see it, we do not wish this socket to see incoming
-        * packets.
-        */
-       tcp_socket->sk->sk_prot->unhash(tcp_socket->sk);
 }
 
 EXPORT_SYMBOL(ipv4_specific);

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 14de50380f4eacdd8db3697d0f0295a8a0bcc314..af6a0c60f903b00160b195847380c6fdb46acdcc 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1605,21 +1605,12 @@ static struct inet_protosw tcpv6_protosw = {
 
 void __init tcpv6_init(void)
 {
-       int err;
-
        /* register inet6 protocol */
        if (inet6_add_protocol(&tcpv6_protocol, IPPROTO_TCP) < 0)
                printk(KERN_ERR "tcpv6_init: Could not register protocol\n");
        inet6_register_protosw(&tcpv6_protosw);
 
-       err = sock_create_kern(PF_INET6, SOCK_RAW, IPPROTO_TCP, &tcp6_socket);
-       if (err < 0)
+       if (inet_csk_ctl_sock_create(&tcp6_socket, PF_INET6, SOCK_RAW,
+                                    IPPROTO_TCP) < 0)
                panic("Failed to create the TCPv6 control socket.\n");
-       tcp6_socket->sk->sk_allocation = GFP_ATOMIC;
-
-       /* Unhash it so that IP input processing does not even
-        * see it, we do not wish this socket to see incoming
-        * packets.
-        */
-       tcp6_socket->sk->sk_prot->unhash(tcp6_socket->sk);
 }