Commit c6d27706 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller
Browse files

tcp: Factorise sk_family-independent comparison in inet_bind2_bucket_match(_addr_any). 



This is a prep patch to make the following patches cleaner that touch
inet_bind2_bucket_match() and inet_bind2_bucket_match_addr_any().

Both functions have duplicated comparison for netns, port, and l3mdev.
Let's factorise them.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8cdd9f1a

net/ipv4/inet_hashtables.c

+13 −15
Original line number Diff line number Diff line
@@ -815,41 +815,39 @@ static bool inet_bind2_bucket_match(const struct inet_bind2_bucket *tb, 
				    const struct net *net, unsigned short port,

				    int l3mdev, const struct sock *sk)

{

	if (!net_eq(ib2_net(tb), net) || tb->port != port ||

	    tb->l3mdev != l3mdev)

		return false;



#if IS_ENABLED(CONFIG_IPV6)

	if (sk->sk_family != tb->family)

		return false;



	if (sk->sk_family == AF_INET6)

		return net_eq(ib2_net(tb), net) && tb->port == port &&

			tb->l3mdev == l3mdev &&

			ipv6_addr_equal(&tb->v6_rcv_saddr, &sk->sk_v6_rcv_saddr);

	else

		return ipv6_addr_equal(&tb->v6_rcv_saddr, &sk->sk_v6_rcv_saddr);

#endif

		return net_eq(ib2_net(tb), net) && tb->port == port &&

			tb->l3mdev == l3mdev && tb->rcv_saddr == sk->sk_rcv_saddr;

	return tb->rcv_saddr == sk->sk_rcv_saddr;

}



bool inet_bind2_bucket_match_addr_any(const struct inet_bind2_bucket *tb, const struct net *net,

				      unsigned short port, int l3mdev, const struct sock *sk)

{

	if (!net_eq(ib2_net(tb), net) || tb->port != port ||

	    tb->l3mdev != l3mdev)

		return false;



#if IS_ENABLED(CONFIG_IPV6)

	if (sk->sk_family != tb->family) {

		if (sk->sk_family == AF_INET)

			return net_eq(ib2_net(tb), net) && tb->port == port &&

				tb->l3mdev == l3mdev &&

				ipv6_addr_any(&tb->v6_rcv_saddr);

			return ipv6_addr_any(&tb->v6_rcv_saddr);



		return false;

	}



	if (sk->sk_family == AF_INET6)

		return net_eq(ib2_net(tb), net) && tb->port == port &&

			tb->l3mdev == l3mdev &&

			ipv6_addr_any(&tb->v6_rcv_saddr);

	else

		return ipv6_addr_any(&tb->v6_rcv_saddr);

#endif

		return net_eq(ib2_net(tb), net) && tb->port == port &&

			tb->l3mdev == l3mdev && tb->rcv_saddr == 0;

	return tb->rcv_saddr == 0;

}



/* The socket's bhash2 hashbucket spinlock must be held when this is called */