Subject: Re: [PATCH net-next 1/4] mptcp: export local_address

From: Larysa Zaremba <[email-masked]>
Date: Fri, 9 Jun 2023 13:25:38 +0200

On Thu, Jun 08, 2023 at 03:20:49PM +0200, Matthieu Baerts wrote:
> From: Geliang Tang <[email-masked]>
> 
> Rename local_address() with "mptcp_" prefix and export it in protocol.h.
> 
> This function will be re-used in the common PM code (pm.c) in the
> following commit.
> 
> Signed-off-by: Geliang Tang <[email-masked]>
> Reviewed-by: Matthieu Baerts <[email-masked]>
> Signed-off-by: Matthieu Baerts <[email-masked]>

Checkpatch on patchwork complains about line length exceeding 80 columns.
But from what I see, changed files do not comply anyway.

Reviewed-by: Larysa Zaremba <[email-masked]>

> ---
>  net/mptcp/pm_netlink.c | 17 ++++++++---------
>  net/mptcp/protocol.h   |  1 +
>  2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index bc343dab5e3f..c55ed3dda0d8 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -86,8 +86,7 @@ bool mptcp_addresses_equal(const struct mptcp_addr_info *a,
>  	return a->port == b->port;
>  }
>  
> -static void local_address(const struct sock_common *skc,
> -			  struct mptcp_addr_info *addr)
> +void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_info *addr)
>  {
>  	addr->family = skc->skc_family;
>  	addr->port = htons(skc->skc_num);
> @@ -122,7 +121,7 @@ static bool lookup_subflow_by_saddr(const struct list_head *list,
>  	list_for_each_entry(subflow, list, node) {
>  		skc = (struct sock_common *)mptcp_subflow_tcp_sock(subflow);
>  
> -		local_address(skc, &cur);
> +		mptcp_local_address(skc, &cur);
>  		if (mptcp_addresses_equal(&cur, saddr, saddr->port))
>  			return true;
>  	}
> @@ -263,7 +262,7 @@ bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk)
>  	struct mptcp_addr_info saddr;
>  	bool ret = false;
>  
> -	local_address((struct sock_common *)sk, &saddr);
> +	mptcp_local_address((struct sock_common *)sk, &saddr);
>  
>  	spin_lock_bh(&msk->pm.lock);
>  	list_for_each_entry(entry, &msk->pm.anno_list, list) {
> @@ -541,7 +540,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
>  		struct mptcp_addr_info mpc_addr;
>  		bool backup = false;
>  
> -		local_address((struct sock_common *)msk->first, &mpc_addr);
> +		mptcp_local_address((struct sock_common *)msk->first, &mpc_addr);
>  		rcu_read_lock();
>  		entry = __lookup_addr(pernet, &mpc_addr, false);
>  		if (entry) {
> @@ -752,7 +751,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,
>  		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
>  		struct mptcp_addr_info local, remote;
>  
> -		local_address((struct sock_common *)ssk, &local);
> +		mptcp_local_address((struct sock_common *)ssk, &local);
>  		if (!mptcp_addresses_equal(&local, addr, addr->port))
>  			continue;
>  
> @@ -1070,8 +1069,8 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
>  	/* The 0 ID mapping is defined by the first subflow, copied into the msk
>  	 * addr
>  	 */
> -	local_address((struct sock_common *)msk, &msk_local);
> -	local_address((struct sock_common *)skc, &skc_local);
> +	mptcp_local_address((struct sock_common *)msk, &msk_local);
> +	mptcp_local_address((struct sock_common *)skc, &skc_local);
>  	if (mptcp_addresses_equal(&msk_local, &skc_local, false))
>  		return 0;
>  
> @@ -1491,7 +1490,7 @@ static int mptcp_nl_remove_id_zero_address(struct net *net,
>  		if (list_empty(&msk->conn_list) || mptcp_pm_is_userspace(msk))
>  			goto next;
>  
> -		local_address((struct sock_common *)msk, &msk_local);
> +		mptcp_local_address((struct sock_common *)msk, &msk_local);
>  		if (!mptcp_addresses_equal(&msk_local, addr, addr->port))
>  			goto next;
>  
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index c5255258bfb3..6e6cffc04ced 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -638,6 +638,7 @@ void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk);
>  
>  bool mptcp_addresses_equal(const struct mptcp_addr_info *a,
>  			   const struct mptcp_addr_info *b, bool use_port);
> +void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_info *addr);
>  
>  /* called with sk socket lock held */
>  int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,
> 
> -- 
> 2.40.1
> 
>