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

Commit ed75986f authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller
Browse files

net/smc: ipv6 support for smc_diag.c 



Update smc_diag.c to support ipv6 addresses on the diagnosis interface.

Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 877ae5be

net/smc/smc_diag.c

+30 −9
Original line number Diff line number Diff line
@@ -38,17 +38,27 @@ static void smc_diag_msg_common_fill(struct smc_diag_msg *r, struct sock *sk) 
{

	struct smc_sock *smc = smc_sk(sk);



	r->diag_family = sk->sk_family;

	if (!smc->clcsock)

		return;

	r->id.idiag_sport = htons(smc->clcsock->sk->sk_num);

	r->id.idiag_dport = smc->clcsock->sk->sk_dport;

	r->id.idiag_if = smc->clcsock->sk->sk_bound_dev_if;

	sock_diag_save_cookie(sk, r->id.idiag_cookie);

	if (sk->sk_protocol == SMCPROTO_SMC) {

		r->diag_family = PF_INET;

		memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));

		memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));

		r->id.idiag_src[0] = smc->clcsock->sk->sk_rcv_saddr;

		r->id.idiag_dst[0] = smc->clcsock->sk->sk_daddr;

#if IS_ENABLED(CONFIG_IPV6)

	} else if (sk->sk_protocol == SMCPROTO_SMC6) {

		r->diag_family = PF_INET6;

		memcpy(&r->id.idiag_src, &smc->clcsock->sk->sk_v6_rcv_saddr,

		       sizeof(smc->clcsock->sk->sk_v6_rcv_saddr));

		memcpy(&r->id.idiag_dst, &smc->clcsock->sk->sk_v6_daddr,

		       sizeof(smc->clcsock->sk->sk_v6_daddr));

#endif

	}

}



static int smc_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,
@@ -153,7 +163,8 @@ static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb, 
	return -EMSGSIZE;

}



static int smc_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)

static int smc_diag_dump_proto(struct proto *prot, struct sk_buff *skb,

			       struct netlink_callback *cb)

{

	struct net *net = sock_net(skb->sk);

	struct nlattr *bc = NULL;
@@ -161,8 +172,8 @@ static int smc_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) 
	struct sock *sk;

	int rc = 0;



	read_lock(&smc_proto.h.smc_hash->lock);

	head = &smc_proto.h.smc_hash->ht;

	read_lock(&prot->h.smc_hash->lock);

	head = &prot->h.smc_hash->ht;

	if (hlist_empty(head))

		goto out;
@@ -175,7 +186,17 @@ static int smc_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) 
	}



out:

	read_unlock(&smc_proto.h.smc_hash->lock);

	read_unlock(&prot->h.smc_hash->lock);

	return rc;

}



static int smc_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)

{

	int rc = 0;



	rc = smc_diag_dump_proto(&smc_proto, skb, cb);

	if (!rc)

		rc = smc_diag_dump_proto(&smc_proto6, skb, cb);

	return rc;

}