Commit bcc32640 authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Jakub Kicinski
Browse files

mptcp: pm: move generic helper at the top 



In prevision to another change importing all generic PM helpers from
pm_netlink.c to there.

No behavioural changes intended.

Reviewed-by: default avatarGeliang Tang <geliang@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250307-net-next-mptcp-pm-reorg-v1-12-abef20ada03b@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a1467312

net/mptcp/pm.c

+27 −27
Original line number Diff line number Diff line
@@ -12,6 +12,33 @@ 
#include "mib.h"

#include "mptcp_pm_gen.h"



/* path manager helpers */



/* if sk is ipv4 or ipv6_only allows only same-family local and remote addresses,

 * otherwise allow any matching local/remote pair

 */

bool mptcp_pm_addr_families_match(const struct sock *sk,

				  const struct mptcp_addr_info *loc,

				  const struct mptcp_addr_info *rem)

{

	bool mptcp_is_v4 = sk->sk_family == AF_INET;



#if IS_ENABLED(CONFIG_MPTCP_IPV6)

	bool loc_is_v4 = loc->family == AF_INET || ipv6_addr_v4mapped(&loc->addr6);

	bool rem_is_v4 = rem->family == AF_INET || ipv6_addr_v4mapped(&rem->addr6);



	if (mptcp_is_v4)

		return loc_is_v4 && rem_is_v4;



	if (ipv6_only_sock(sk))

		return !loc_is_v4 && !rem_is_v4;



	return loc_is_v4 == rem_is_v4;

#else

	return mptcp_is_v4 && loc->family == AF_INET && rem->family == AF_INET;

#endif

}



/* path manager command handlers */



int mptcp_pm_announce_addr(struct mptcp_sock *msk,
@@ -325,8 +352,6 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq) 
	}

}



/* path manager helpers */



bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb,

			      unsigned int opt_size, unsigned int remaining,

			      struct mptcp_addr_info *addr, bool *echo,
@@ -574,31 +599,6 @@ void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) 
	}

}



/* if sk is ipv4 or ipv6_only allows only same-family local and remote addresses,

 * otherwise allow any matching local/remote pair

 */

bool mptcp_pm_addr_families_match(const struct sock *sk,

				  const struct mptcp_addr_info *loc,

				  const struct mptcp_addr_info *rem)

{

	bool mptcp_is_v4 = sk->sk_family == AF_INET;



#if IS_ENABLED(CONFIG_MPTCP_IPV6)

	bool loc_is_v4 = loc->family == AF_INET || ipv6_addr_v4mapped(&loc->addr6);

	bool rem_is_v4 = rem->family == AF_INET || ipv6_addr_v4mapped(&rem->addr6);



	if (mptcp_is_v4)

		return loc_is_v4 && rem_is_v4;



	if (ipv6_only_sock(sk))

		return !loc_is_v4 && !rem_is_v4;



	return loc_is_v4 == rem_is_v4;

#else

	return mptcp_is_v4 && loc->family == AF_INET && rem->family == AF_INET;

#endif

}



void mptcp_pm_worker(struct mptcp_sock *msk)

{

	struct mptcp_pm_data *pm = &msk->pm;