Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dff2c035 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[INET_DIAG]: Introduce sk_diag_fill 



To be called from inet_diag_get_exact, also rename inet_diag_fill to
inet_csk_diag_fill, for consistency with inet_twsk_diag_fill.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c7d58aab

net/ipv4/inet_diag.c

+24 −10
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ static struct sock *idiagnl; 
#define INET_DIAG_PUT(skb, attrtype, attrlen) \

	RTA_DATA(__RTA_PUT(skb, attrtype, attrlen))



static int inet_diag_fill(struct sk_buff *skb, struct sock *sk,

static int inet_csk_diag_fill(struct sock *sk,

			      struct sk_buff *skb,

			      int ext, u32 pid, u32 seq, u16 nlmsg_flags,

			      const struct nlmsghdr *unlh)

{
@@ -212,6 +213,17 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw, 
	return -1;

}



static int sk_diag_fill(struct sock *sk, struct sk_buff *skb,

			int ext, u32 pid, u32 seq, u16 nlmsg_flags,

			const struct nlmsghdr *unlh)

{

	if (sk->sk_state == TCP_TIME_WAIT)

		return inet_twsk_diag_fill((struct inet_timewait_sock *)sk,

					   skb, ext, pid, seq, nlmsg_flags,

					   unlh);

	return inet_csk_diag_fill(sk, skb, ext, pid, seq, nlmsg_flags, unlh);

}



static int inet_diag_get_exact(struct sk_buff *in_skb,

			       const struct nlmsghdr *nlh)

{
@@ -263,7 +275,7 @@ static int inet_diag_get_exact(struct sk_buff *in_skb, 
	if (!rep)

		goto out;



	if (inet_diag_fill(rep, sk, req->idiag_ext,

	if (sk_diag_fill(sk, rep, req->idiag_ext,

			 NETLINK_CB(in_skb).pid,

			 nlh->nlmsg_seq, 0, nlh) <= 0)

		BUG();
@@ -442,7 +454,8 @@ static int inet_diag_bc_audit(const void *bytecode, int bytecode_len) 
	return len == 0 ? 0 : -EINVAL;

}



static int inet_diag_dump_sock(struct sk_buff *skb, struct sock *sk,

static int inet_csk_diag_dump(struct sock *sk,

			      struct sk_buff *skb,

			      struct netlink_callback *cb)

{

	struct inet_diag_req *r = NLMSG_DATA(cb->nlh);
@@ -473,7 +486,8 @@ static int inet_diag_dump_sock(struct sk_buff *skb, struct sock *sk, 
			return 0;

	}



	return inet_diag_fill(skb, sk, r->idiag_ext, NETLINK_CB(cb->skb).pid,

	return inet_csk_diag_fill(sk, skb, r->idiag_ext,

				  NETLINK_CB(cb->skb).pid,

				  cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh);

}
@@ -694,7 +708,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) 
				    cb->args[3] > 0)

					goto syn_recv;



				if (inet_diag_dump_sock(skb, sk, cb) < 0) {

				if (inet_csk_diag_dump(sk, skb, cb) < 0) {

					inet_listen_unlock(hashinfo);

					goto done;

				}
@@ -750,7 +764,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) 
			if (r->id.idiag_dport != inet->dport &&

			    r->id.idiag_dport)

				goto next_normal;

			if (inet_diag_dump_sock(skb, sk, cb) < 0) {

			if (inet_csk_diag_dump(sk, skb, cb) < 0) {

				read_unlock_bh(&head->lock);

				goto done;

			}