net: Add set,get helpers for inetpeer addresses (3abef286) · Commits · e / devices / android_kernel_sony_msm8998

include/net/inetpeer.h

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -71,6 +71,29 @@ void inet_initpeers(void) __init;

	#define INETPEER_METRICS_NEW (~(u32) 0)		#define INETPEER_METRICS_NEW (~(u32) 0)

			static inline void inetpeer_set_addr_v4(struct inetpeer_addr *iaddr, __be32 ip)
			{
			iaddr->addr.a4 = ip;
			iaddr->family = AF_INET;
			}

			static inline __be32 inetpeer_get_addr_v4(struct inetpeer_addr *iaddr)
			{
			return iaddr->addr.a4;
			}

			static inline void inetpeer_set_addr_v6(struct inetpeer_addr *iaddr,
			struct in6_addr *in6)
			{
			iaddr->addr.in6 = *in6;
			iaddr->family = AF_INET6;
			}

			static inline struct in6_addr inetpeer_get_addr_v6(struct inetpeer_addr iaddr)
			{
			return &iaddr->addr.in6;
			}

	/* can be called with or without local BH being disabled */		/* can be called with or without local BH being disabled */
	struct inet_peer inet_getpeer(struct inet_peer_base base,		struct inet_peer inet_getpeer(struct inet_peer_base base,
	const struct inetpeer_addr *daddr,		const struct inetpeer_addr *daddr,

net/ipv4/tcp_metrics.c

+27 −38

Original line number	Original line	Diff line number	Diff line
	@@ -247,14 +247,14 @@ static struct tcp_metrics_block __tcp_get_metrics_req(struct request_sock req,
	daddr.family = req->rsk_ops->family;		daddr.family = req->rsk_ops->family;
	switch (daddr.family) {		switch (daddr.family) {
	case AF_INET:		case AF_INET:
	saddr.addr.a4 = inet_rsk(req)->ir_loc_addr;		inetpeer_set_addr_v4(&saddr, inet_rsk(req)->ir_loc_addr);
	daddr.addr.a4 = inet_rsk(req)->ir_rmt_addr;		inetpeer_set_addr_v4(&daddr, inet_rsk(req)->ir_rmt_addr);
	hash = ipv4_addr_hash(inet_rsk(req)->ir_rmt_addr);		hash = ipv4_addr_hash(inet_rsk(req)->ir_rmt_addr);
	break;		break;
	#if IS_ENABLED(CONFIG_IPV6)		#if IS_ENABLED(CONFIG_IPV6)
	case AF_INET6:		case AF_INET6:
	saddr.addr.in6 = inet_rsk(req)->ir_v6_loc_addr;		inetpeer_set_addr_v6(&saddr, &inet_rsk(req)->ir_v6_loc_addr);
	daddr.addr.in6 = inet_rsk(req)->ir_v6_rmt_addr;		inetpeer_set_addr_v6(&daddr, &inet_rsk(req)->ir_v6_rmt_addr);
	hash = ipv6_addr_hash(&inet_rsk(req)->ir_v6_rmt_addr);		hash = ipv6_addr_hash(&inet_rsk(req)->ir_v6_rmt_addr);
	break;		break;
	#endif		#endif
	@@ -285,25 +285,19 @@ static struct tcp_metrics_block *__tcp_get_metrics_tw(struct inet_timewait_sock
	struct net *net;		struct net *net;

	if (tw->tw_family == AF_INET) {		if (tw->tw_family == AF_INET) {
	saddr.family = AF_INET;		inetpeer_set_addr_v4(&saddr, tw->tw_rcv_saddr);
	saddr.addr.a4 = tw->tw_rcv_saddr;		inetpeer_set_addr_v4(&daddr, tw->tw_daddr);
	daddr.family = AF_INET;
	daddr.addr.a4 = tw->tw_daddr;
	hash = ipv4_addr_hash(tw->tw_daddr);		hash = ipv4_addr_hash(tw->tw_daddr);
	}		}
	#if IS_ENABLED(CONFIG_IPV6)		#if IS_ENABLED(CONFIG_IPV6)
	else if (tw->tw_family == AF_INET6) {		else if (tw->tw_family == AF_INET6) {
	if (ipv6_addr_v4mapped(&tw->tw_v6_daddr)) {		if (ipv6_addr_v4mapped(&tw->tw_v6_daddr)) {
	saddr.family = AF_INET;		inetpeer_set_addr_v4(&saddr, tw->tw_rcv_saddr);
	saddr.addr.a4 = tw->tw_rcv_saddr;		inetpeer_set_addr_v4(&daddr, tw->tw_daddr);
	daddr.family = AF_INET;
	daddr.addr.a4 = tw->tw_daddr;
	hash = ipv4_addr_hash(tw->tw_daddr);		hash = ipv4_addr_hash(tw->tw_daddr);
	} else {		} else {
	saddr.family = AF_INET6;		inetpeer_set_addr_v6(&saddr, &tw->tw_v6_rcv_saddr);
	saddr.addr.in6 = tw->tw_v6_rcv_saddr;		inetpeer_set_addr_v6(&daddr, &tw->tw_v6_daddr);
	daddr.family = AF_INET6;
	daddr.addr.in6 = tw->tw_v6_daddr;
	hash = ipv6_addr_hash(&tw->tw_v6_daddr);		hash = ipv6_addr_hash(&tw->tw_v6_daddr);
	}		}
	}		}
	@@ -335,25 +329,19 @@ static struct tcp_metrics_block tcp_get_metrics(struct sock sk,
	struct net *net;		struct net *net;

	if (sk->sk_family == AF_INET) {		if (sk->sk_family == AF_INET) {
	saddr.family = AF_INET;		inetpeer_set_addr_v4(&saddr, inet_sk(sk)->inet_saddr);
	saddr.addr.a4 = inet_sk(sk)->inet_saddr;		inetpeer_set_addr_v4(&daddr, inet_sk(sk)->inet_daddr);
	daddr.family = AF_INET;
	daddr.addr.a4 = inet_sk(sk)->inet_daddr;
	hash = ipv4_addr_hash(inet_sk(sk)->inet_daddr);		hash = ipv4_addr_hash(inet_sk(sk)->inet_daddr);
	}		}
	#if IS_ENABLED(CONFIG_IPV6)		#if IS_ENABLED(CONFIG_IPV6)
	else if (sk->sk_family == AF_INET6) {		else if (sk->sk_family == AF_INET6) {
	if (ipv6_addr_v4mapped(&sk->sk_v6_daddr)) {		if (ipv6_addr_v4mapped(&sk->sk_v6_daddr)) {
	saddr.family = AF_INET;		inetpeer_set_addr_v4(&saddr, inet_sk(sk)->inet_saddr);
	saddr.addr.a4 = inet_sk(sk)->inet_saddr;		inetpeer_set_addr_v4(&daddr, inet_sk(sk)->inet_daddr);
	daddr.family = AF_INET;
	daddr.addr.a4 = inet_sk(sk)->inet_daddr;
	hash = ipv4_addr_hash(inet_sk(sk)->inet_daddr);		hash = ipv4_addr_hash(inet_sk(sk)->inet_daddr);
	} else {		} else {
	saddr.family = AF_INET6;		inetpeer_set_addr_v6(&saddr, &sk->sk_v6_rcv_saddr);
	saddr.addr.in6 = sk->sk_v6_rcv_saddr;		inetpeer_set_addr_v6(&daddr, &sk->sk_v6_daddr);
	daddr.family = AF_INET6;
	daddr.addr.in6 = sk->sk_v6_daddr;
	hash = ipv6_addr_hash(&sk->sk_v6_daddr);		hash = ipv6_addr_hash(&sk->sk_v6_daddr);
	}		}
	}		}
	@@ -796,18 +784,18 @@ static int tcp_metrics_fill_info(struct sk_buff *msg,
	switch (tm->tcpm_daddr.family) {		switch (tm->tcpm_daddr.family) {
	case AF_INET:		case AF_INET:
	if (nla_put_in_addr(msg, TCP_METRICS_ATTR_ADDR_IPV4,		if (nla_put_in_addr(msg, TCP_METRICS_ATTR_ADDR_IPV4,
	tm->tcpm_daddr.addr.a4) < 0)		inetpeer_get_addr_v4(&tm->tcpm_daddr)) < 0)
	goto nla_put_failure;		goto nla_put_failure;
	if (nla_put_in_addr(msg, TCP_METRICS_ATTR_SADDR_IPV4,		if (nla_put_in_addr(msg, TCP_METRICS_ATTR_SADDR_IPV4,
	tm->tcpm_saddr.addr.a4) < 0)		inetpeer_get_addr_v4(&tm->tcpm_saddr)) < 0)
	goto nla_put_failure;		goto nla_put_failure;
	break;		break;
	case AF_INET6:		case AF_INET6:
	if (nla_put_in6_addr(msg, TCP_METRICS_ATTR_ADDR_IPV6,		if (nla_put_in6_addr(msg, TCP_METRICS_ATTR_ADDR_IPV6,
	&tm->tcpm_daddr.addr.in6) < 0)		inetpeer_get_addr_v6(&tm->tcpm_daddr)) < 0)
	goto nla_put_failure;		goto nla_put_failure;
	if (nla_put_in6_addr(msg, TCP_METRICS_ATTR_SADDR_IPV6,		if (nla_put_in6_addr(msg, TCP_METRICS_ATTR_SADDR_IPV6,
	&tm->tcpm_saddr.addr.in6) < 0)		inetpeer_get_addr_v6(&tm->tcpm_saddr)) < 0)
	goto nla_put_failure;		goto nla_put_failure;
	break;		break;
	default:		default:
	@@ -956,20 +944,21 @@ static int __parse_nl_addr(struct genl_info info, struct inetpeer_addr addr,

	a = info->attrs[v4];		a = info->attrs[v4];
	if (a) {		if (a) {
	addr->family = AF_INET;		inetpeer_set_addr_v4(addr, nla_get_in_addr(a));
	addr->addr.a4 = nla_get_in_addr(a);
	if (hash)		if (hash)
	*hash = ipv4_addr_hash(addr->addr.a4);		*hash = ipv4_addr_hash(inetpeer_get_addr_v4(addr));
	return 0;		return 0;
	}		}
	a = info->attrs[v6];		a = info->attrs[v6];
	if (a) {		if (a) {
			struct in6_addr in6;

	if (nla_len(a) != sizeof(struct in6_addr))		if (nla_len(a) != sizeof(struct in6_addr))
	return -EINVAL;		return -EINVAL;
	addr->family = AF_INET6;		in6 = nla_get_in6_addr(a);
	addr->addr.in6 = nla_get_in6_addr(a);		inetpeer_set_addr_v6(addr, &in6);
	if (hash)		if (hash)
	*hash = ipv6_addr_hash(&addr->addr.in6);		*hash = ipv6_addr_hash(inetpeer_get_addr_v6(addr));
	return 0;		return 0;
	}		}
	return optional ? 1 : -EAFNOSUPPORT;		return optional ? 1 : -EAFNOSUPPORT;