Commit 7f1fb60c authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

inet_diag: Partly rename inet_ to sock_ 



The ultimate goal is to get the sock_diag module, that works in
family+protocol terms. Currently this is suitable to do on the
inet_diag basis, so rename parts of the code. It will be moved
to sock_diag.c later.

Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5f43c1e

include/linux/netlink.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ 
#define NETLINK_UNUSED		1	/* Unused number				*/

#define NETLINK_UNUSED		1	/* Unused number				*/

#define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/

#define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/

#define NETLINK_FIREWALL	3	/* Firewalling hook				*/

#define NETLINK_FIREWALL	3	/* Firewalling hook				*/

#define NETLINK_INET_DIAG	4	/* INET socket monitoring			*/

#define NETLINK_SOCK_DIAG	4	/* socket monitoring				*/

#define NETLINK_NFLOG		5	/* netfilter/iptables ULOG */

#define NETLINK_NFLOG		5	/* netfilter/iptables ULOG */

#define NETLINK_XFRM		6	/* ipsec */

#define NETLINK_XFRM		6	/* ipsec */

#define NETLINK_SELINUX		7	/* SELinux event notifications */

#define NETLINK_SELINUX		7	/* SELinux event notifications */
@@ -27,6 +27,8 @@ 
#define NETLINK_RDMA		20

#define NETLINK_RDMA		20

#define NETLINK_CRYPTO		21	/* Crypto layer */

#define NETLINK_CRYPTO		21	/* Crypto layer */





#define NETLINK_INET_DIAG	NETLINK_SOCK_DIAG



#define MAX_LINKS 32		

#define MAX_LINKS 32		





struct sockaddr_nl {

struct sockaddr_nl {

net/dccp/diag.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,4 +71,4 @@ module_exit(dccp_diag_fini); 
MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Arnaldo Carvalho de Melo <acme@mandriva.com>");

MODULE_AUTHOR("Arnaldo Carvalho de Melo <acme@mandriva.com>");

MODULE_DESCRIPTION("DCCP inet_diag handler");

MODULE_DESCRIPTION("DCCP inet_diag handler");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_INET_DIAG, DCCPDIAG_GETSOCK);
 
MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, DCCPDIAG_GETSOCK);

net/ipv4/inet_diag.c

+19 −14
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ struct inet_diag_entry { 
	u16 userlocks;

	u16 userlocks;

};

};





static struct sock *idiagnl;

static struct sock *sdiagnl;





#define INET_DIAG_PUT(skb, attrtype, attrlen) \

#define INET_DIAG_PUT(skb, attrtype, attrlen) \

	RTA_DATA(__RTA_PUT(skb, attrtype, attrlen))

	RTA_DATA(__RTA_PUT(skb, attrtype, attrlen))
@@ -56,7 +56,7 @@ static const struct inet_diag_handler *inet_diag_lock_handler(int type) 
{

{

	if (!inet_diag_table[type])

	if (!inet_diag_table[type])

		request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK,

		request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK,

			       NETLINK_INET_DIAG, type);

			       NETLINK_SOCK_DIAG, type);





	mutex_lock(&inet_diag_table_mutex);

	mutex_lock(&inet_diag_table_mutex);

	if (!inet_diag_table[type])

	if (!inet_diag_table[type])
@@ -312,7 +312,7 @@ static int inet_diag_get_exact(struct sk_buff *in_skb, 
		kfree_skb(rep);

		kfree_skb(rep);

		goto out;

		goto out;

	}

	}

	err = netlink_unicast(idiagnl, rep, NETLINK_CB(in_skb).pid,

	err = netlink_unicast(sdiagnl, rep, NETLINK_CB(in_skb).pid,

			      MSG_DONTWAIT);

			      MSG_DONTWAIT);

	if (err > 0)

	if (err > 0)

		err = 0;

		err = 0;
@@ -870,20 +870,25 @@ static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
				return -EINVAL;

				return -EINVAL;

		}

		}





		return netlink_dump_start(idiagnl, skb, nlh,

		return netlink_dump_start(sdiagnl, skb, nlh,

					  inet_diag_dump, NULL, 0);

					  inet_diag_dump, NULL, 0);

	}

	}





	return inet_diag_get_exact(skb, nlh);

	return inet_diag_get_exact(skb, nlh);

}

}





static DEFINE_MUTEX(inet_diag_mutex);

static int sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)

{

	return inet_diag_rcv_msg(skb, nlh);

}



static DEFINE_MUTEX(sock_diag_mutex);





static void inet_diag_rcv(struct sk_buff *skb)

static void sock_diag_rcv(struct sk_buff *skb)

{

{

	mutex_lock(&inet_diag_mutex);

	mutex_lock(&sock_diag_mutex);

	netlink_rcv_skb(skb, &inet_diag_rcv_msg);

	netlink_rcv_skb(skb, &sock_diag_rcv_msg);

	mutex_unlock(&inet_diag_mutex);

	mutex_unlock(&sock_diag_mutex);

}

}





int inet_diag_register(const struct inet_diag_handler *h)

int inet_diag_register(const struct inet_diag_handler *h)
@@ -929,9 +934,9 @@ static int __init inet_diag_init(void) 
	if (!inet_diag_table)

	if (!inet_diag_table)

		goto out;

		goto out;





	idiagnl = netlink_kernel_create(&init_net, NETLINK_INET_DIAG, 0,

	sdiagnl = netlink_kernel_create(&init_net, NETLINK_SOCK_DIAG, 0,

					inet_diag_rcv, NULL, THIS_MODULE);

					sock_diag_rcv, NULL, THIS_MODULE);

	if (idiagnl == NULL)

	if (sdiagnl == NULL)

		goto out_free_table;

		goto out_free_table;

	err = 0;

	err = 0;

out:

out:
@@ -943,11 +948,11 @@ static int __init inet_diag_init(void) 




static void __exit inet_diag_exit(void)

static void __exit inet_diag_exit(void)

{

{

	netlink_kernel_release(idiagnl);

	netlink_kernel_release(sdiagnl);

	kfree(inet_diag_table);

	kfree(inet_diag_table);

}

}





module_init(inet_diag_init);

module_init(inet_diag_init);

module_exit(inet_diag_exit);

module_exit(inet_diag_exit);

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_INET_DIAG);
 
MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_SOCK_DIAG);

net/ipv4/tcp_diag.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,4 +54,4 @@ static void __exit tcp_diag_exit(void) 
module_init(tcp_diag_init);

module_init(tcp_diag_init);

module_exit(tcp_diag_exit);

module_exit(tcp_diag_exit);

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_INET_DIAG, TCPDIAG_GETSOCK);
 
MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, TCPDIAG_GETSOCK);

security/selinux/hooks.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1090,7 +1090,7 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc 
			return SECCLASS_NETLINK_ROUTE_SOCKET;

			return SECCLASS_NETLINK_ROUTE_SOCKET;

		case NETLINK_FIREWALL:

		case NETLINK_FIREWALL:

			return SECCLASS_NETLINK_FIREWALL_SOCKET;

			return SECCLASS_NETLINK_FIREWALL_SOCKET;

		case NETLINK_INET_DIAG:

		case NETLINK_SOCK_DIAG:

			return SECCLASS_NETLINK_TCPDIAG_SOCKET;

			return SECCLASS_NETLINK_TCPDIAG_SOCKET;

		case NETLINK_NFLOG:

		case NETLINK_NFLOG:

			return SECCLASS_NETLINK_NFLOG_SOCKET;

			return SECCLASS_NETLINK_NFLOG_SOCKET;