[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 1/2] mptcp: convert IPv4 address to IPv4-mapped

[Mat Martineau <mathew.j.martineau at linux.intel.com>]

[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]

On Fri, 18 Dec 2020, Matthieu Baerts wrote:

> Hi Geliang, Mat,
>
> On 17/12/2020 01:23, Mat Martineau wrote:
>> On Wed, 16 Dec 2020, Geliang Tang wrote:
>> 
>>> Currently, PM doesn't create subflow with IPv4-mapped IPv6 socket. This
>>> patch converts the IPv4 address to IPv4-mapped IPv6 address to fix it.
>>> 
>>> Signed-off-by: Geliang Tang <geliangtang(a)gmail.com>
>>> ---
>>> net/mptcp/pm_netlink.c | 25 ++++++++++++++++++++++---
>>> 1 file changed, 22 insertions(+), 3 deletions(-)
>>> 
>>> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
>>> index cc4ca013a06b..987e83cdee11 100644
>>> --- a/net/mptcp/pm_netlink.c
>>> +++ b/net/mptcp/pm_netlink.c
>>> @@ -145,6 +158,8 @@ select_local_address(const struct pm_nl_pernet 
>>> *pernet,
>>>         if (!(entry->addr.flags & MPTCP_PM_ADDR_FLAG_SUBFLOW))
>>>             continue;
>>> 
>>> +        mptcp_pm_addr_convert_v4mapped(msk, &entry->addr);
>>> +
>> 
>> This is modifying the contents of pernet->local_addr_list, not a copy of 
>> the entry, when the msk has a v4mapped address. I'm not sure that's the way 
>> to fix this, and might leave some corner cases unaddressed.
>> 
>> Did you look at modifying addresses_equal() so it can detect equivalent 
>> IPv4 and v4mapped addresses?
>
> Maybe something like that the patch I joined?
>
> I didn't try much but maybe more what we want?
>

I haven't tested it out, but yes, that's what I had in mind.

--
Mat Martineau
Intel