add IPv4-mapped address support
Subsystems (3)
Geliang Tang
v2 cover add IPv4-mapped address support
This patchset added the IPv4-mapped address support and the testcases.
v2:
- v1 calls mptcp_pm_addr_convert_v4mapped in mptcp_pm_nl_add_addr_received,
on the receiving side. v2 calls it in select_signal_address, on the sending side.
Geliang Tang (2):
mptcp: convert IPv4 address to IPv4-mapped
selftests: mptcp: add IPv4-mapped IPv6 testcases
net/mptcp/pm_netlink.c | 25 ++++++++++++-- .../testing/selftests/net/mptcp/mptcp_join.sh | 34 +++++++++++++++++++ 2 files changed, 56 insertions(+), 3 deletions(-)
Signature · 1 line
2.29.2
Geliang Tang
PATCH v2 1/2 mptcp: convert IPv4 address to IPv4-mapped
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.
--- net/mptcp/pm_netlink.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
net/mptcp/pm_netlink.c +22 -3
@@ -133,6 +133,19 @@ static bool lookup_subflow_by_saddr(const struct list_head *list,return false; } +static void mptcp_pm_addr_convert_v4mapped (struct mptcp_sock *msk, +struct mptcp_addr_info *addr) +{ +struct mptcp_addr_info local; + +local_address ((struct sock_common *)msk, &local); +if (ipv6_addr_v4mapped (&local.addr6) && + addr->family ==AF_INET ) { +ipv6_addr_set_v4mapped (addr->addr.s_addr, &addr->addr6); + addr->family =AF_INET6 ; + } +} +static struct mptcp_pm_addr_entry *select_local_address (const struct pm_nl_pernet *pernet,struct mptcp_sock *msk)
@@ -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); +/* avoid any address already in use by subflows and * pending join */
@@ -159,9 +174,11 @@ select_local_address(const struct pm_nl_pernet *pernet, }static struct mptcp_pm_addr_entry * -select_signal_address (struct pm_nl_pernet *pernet,unsigned int pos) +select_signal_address (struct pm_nl_pernet *pernet, +struct mptcp_sock *msk) {struct mptcp_pm_addr_entry *entry, *ret =NULL ; +unsigned int pos = msk->pm.add_addr_signaled;int i =0 ;rcu_read_lock ();
@@ -173,6 +190,9 @@ select_signal_address(struct pm_nl_pernet *pernet, unsigned int pos)list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) {if (!(entry->addr.flags &MPTCP_PM_ADDR_FLAG_SIGNAL ))continue ; + +mptcp_pm_addr_convert_v4mapped (msk, &entry->addr); +if (i++ == pos) { ret = entry;break ;
@@ -346,8 +366,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)/* check first for announce */ if (msk->pm.add_addr_signaled < msk->pm.add_addr_signal_max) { - local =select_signal_address (pernet, - msk->pm.add_addr_signaled); + local =select_signal_address (pernet, msk);if (local) {if (mptcp_pm_alloc_anno_list (msk, local)) {
Signature · 1 line
2.29.2
Geliang Tang
PATCH v2 2/2 selftests: mptcp: add IPv4-mapped IPv6 testcases
This patch added the IPv4-mapped IPv6 testcases, and the IPv4 convert to IPv4-mapped IPv6 testcases.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +34 -0
@@ -876,6 +876,40 @@ chk_join_nr "remove subflow and signal IPv6" 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 +# signal subflow IPv4-mapped +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl add "::ffff:10.0.3.2" flags subflow +run_tests $ns1 $ns2 "::ffff:10.0.1.1" 0 0 0 slow +chk_join_nr "single subflow IPv4-mapped" 1 1 1 + +# signal address IPv4-mapped +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 1 1 +ip netns exec $ns1 ./pm_nl_ctl add "::ffff:10.0.2.1" flags signal +run_tests $ns1 $ns2 "::ffff:10.0.1.1" +chk_join_nr "signal address IPv4-mapped" 1 1 1 +chk_add_nr 1 1 + +# signal subflow convert IPv4-mapped +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow +run_tests $ns1 $ns2 "::ffff:10.0.1.1" 0 0 0 slow +chk_join_nr "single subflow convert IPv4-mapped" 1 1 1 + +# signal address convert IPv4-mapped +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 1 1 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +run_tests $ns1 $ns2 "::ffff:10.0.1.1" +chk_join_nr "signal address convert IPv4-mapped" 1 1 1 +chk_add_nr 1 1 + # single subflow, backup reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1
Signature · 1 line
2.29.2
Mat Martineau
[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 1/2] mptcp: convert IPv4 address to IPv4-mapped
In reply to Geliang TangQuoted 33 lines · Geliang Tang
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(-)net/mptcp/pm_netlink.c +13
-0@@ -133,6 +133,19 @@ static bool lookup_subflow_by_saddr(const struct list_head *list,return false; } +static void mptcp_pm_addr_convert_v4mapped (struct mptcp_sock *msk, +struct mptcp_addr_info *addr) +{ +struct mptcp_addr_info local; + +local_address ((struct sock_common *)msk, &local); +if (ipv6_addr_v4mapped (&local.addr6) && + addr->family ==AF_INET ) { +ipv6_addr_set_v4mapped (addr->addr.s_addr, &addr->addr6); + addr->family =AF_INET6 ; + } +} +static struct
mptcp_pm_addr_entry* select_local_address(const structpm_nl_pernet*pernet,
structmptcp_sock*msk)
net/mptcp/pm_netlink.c select_local_address(const struct pm_nl_pernet *pernet, · line 162
Quoted 5 lines
net/mptcp/pm_netlink.c +2
-0@@ -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?
net/mptcp/pm_netlink.c select_local_address(const struct pm_nl_pernet *pernet, · line 165
Quoted 3 lines
net/mptcp/pm_netlink.c +0
-0/* avoid any address already in use by subflows and * pending join */
There's some code just below this comment that would need to be updated - I'm not sure why the address family needs to be checked before calling lookup_subflow_by_saddr(), except as an optimization.
I will talk to the group about v4mapped address handling at the meeting tomorrow to see if there are other opinions on how this should be handled (I will check this email thread and
https://github.com/multipath-tcp/mptcp_net-next/issues/122 for any updates first). I'll follow up on the github issue if needed.
Mat
Quoted 39 lines
net/mptcp/pm_netlink.c +0
-0@@ -159,9 +174,11 @@ select_local_address(const struct pm_nl_pernet *pernet, }static struct
mptcp_pm_addr_entry*net/mptcp/pm_netlink.c +2
-1-select_signal_address(struct pm_nl_pernet *pernet, unsigned int pos) +select_signal_address(struct pm_nl_pernet *pernet, + struct mptcp_sock *msk){ struct mptcp_pm_addr_entry *entry, *ret = NULL;net/mptcp/pm_netlink.c +1
-0+unsigned int pos = msk->pm.add_addr_signaled;int i = 0; rcu_read_lock();net/mptcp/pm_netlink.c +4
-2@@ -173,6 +190,9 @@ select_signal_address(struct pm_nl_pernet *pernet, unsigned int pos)list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) {if (!(entry->addr.flags &MPTCP_PM_ADDR_FLAG_SIGNAL ))continue ; + +mptcp_pm_addr_convert_v4mapped (msk, &entry->addr); +if (i++ == pos) { ret = entry;break ;@@ -346,8 +366,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)/* check first for announce */ if (msk->pm.add_addr_signaled < msk->pm.add_addr_signal_max) { - local =select_signal_address (pernet, - msk->pm.add_addr_signaled); + local =select_signal_address (pernet, msk);if (local) {if (mptcp_pm_alloc_anno_list (msk, local)) {Signature · 4 lines
2.29.2 _______________________________________________ mptcp mailing list -- mptcp(a)lists.01.org To unsubscribe send an email to mptcp-leave(a)lists.01.org
--
Mat Martineau
Intel
Matthieu Baerts
[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 1/2] mptcp: convert IPv4 address to IPv4-mapped
Hi Geliang, Mat,
Quoted 26 lines · Mat Martineau
Quoted 13 lines · Geliang Tang
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(-)net/mptcp/pm_netlink.c +0
-0net/mptcp/pm_netlink.c select_local_address(const struct pm_nl_pernet · line 163
Quoted 6 lines
net/mptcp/pm_netlink.c +2
-0@@ -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.
Quoted 2 lines
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?
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
From 36f5e1f9bade5329e82a85fb6330db57a165c04c Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <[email protected]>
Date: Fri, 18 Dec 2020 00:03:12 +0100
Subject: [PATCH] mptcp: support v4mappedv6
--- net/mptcp/pm_netlink.c | 22 +++++++++++++--------- net/mptcp/subflow.c | 17 +++++++++++------ 2 files changed, 24 insertions(+), 15 deletions(-)
net/mptcp/pm_netlink.c +13 -9
@@ -60,15 +60,20 @@ static bool addresses_equal(const struct mptcp_addr_info *a, {bool addr_equals = false; -if (a->family != b->family) -return false; - -if (a->family ==AF_INET ) - addr_equals = a->addr.s_addr == b->addr.s_addr; +if (a->family == b->family) { +if (a->family ==AF_INET ) + addr_equals = a->addr.s_addr == b->addr.s_addr;#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) - else - addr_equals = !ipv6_addr_cmp (&a->addr6, &b->addr6); + else + addr_equals = !ipv6_addr_cmp(&a->addr6, &b->addr6); + }else if (a->family ==AF_INET6 ) { +if (b->family ==AF_INET &&ipv6_addr_v4mapped (&a->addr6)) + addr_equals = a->addr6.s6_addr32[3 ] == b->addr.s_addr; + }else if (b->family ==AF_INET6 ) { +if (a->family ==AF_INET &&ipv6_addr_v4mapped (&b->addr6)) + addr_equals = a->addr.s_addr == b->addr6.s6_addr32[3 ];#endif + }if (!addr_equals)return false;
@@ -147,8 +152,7 @@ select_local_address(const struct pm_nl_pernet *pernet,/* avoid any address already in use by subflows and * pending join */ -if (entry->addr.family == ((struct sock *)msk)->sk_family && - !lookup_subflow_by_saddr (&msk->conn_list, &entry->addr)) { +if (!lookup_subflow_by_saddr (&msk->conn_list, &entry->addr)) { ret = entry;break ; }
net/mptcp/subflow.c +11 -6
@@ -1074,10 +1074,11 @@ void mptcpv6_handle_mapped(struct sock *sk, bool mapped)#endif static void mptcp_info2sockaddr (const struct mptcp_addr_info *info, -struct sockaddr_storage *addr) +struct sockaddr_storage *addr, +unsigned short family) {memset (addr,0 ,sizeof (*addr)); - addr->ss_family = info->family; + addr->ss_family = family;if (addr->ss_family ==AF_INET ) {struct sockaddr_in *in_addr = (struct sockaddr_in *)addr;
@@ -1088,7 +1089,11 @@ static void mptcp_info2sockaddr(const struct mptcp_addr_info *info, else if (addr->ss_family == AF_INET6) {struct sockaddr_in6 *in6_addr = (struct sockaddr_in6 *)addr; - in6_addr->sin6_addr = info->addr6; +if (info->family ==AF_INET ) +ipv6_addr_set_v4mapped (info->addr.s_addr, + &in6_addr->sin6_addr); +else + in6_addr->sin6_addr = info->addr6; in6_addr->sin6_port = info->port; }#endif
@@ -1132,11 +1137,11 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, subflow->remote_key = msk->remote_key; subflow->local_key = msk->local_key; subflow->token = msk->token; -mptcp_info2sockaddr (loc, &addr); +mptcp_info2sockaddr (loc, &addr, ssk->sk_family); addrlen =sizeof (struct sockaddr_in );#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) -if (loc->family ==AF_INET6 ) +if (addr.ss_family ==AF_INET6 ) addrlen =sizeof (struct sockaddr_in6 );#endif ssk->sk_bound_dev_if = loc->ifindex;
@@ -1152,7 +1157,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, subflow->remote_id = remote_id; subflow->request_join =1 ; subflow->request_bkup = !!(loc->flags &MPTCP_PM_ADDR_FLAG_BACKUP ); -mptcp_info2sockaddr (remote, &addr); +mptcp_info2sockaddr (remote, &addr, ssk->sk_family);mptcp_add_pending_subflow (msk, subflow); err =kernel_connect (sf, (struct sockaddr *)&addr, addrlen,O_NONBLOCK );
Signature · 1 line
2.29.2
Mat Martineau
[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 1/2] mptcp: convert IPv4 address to IPv4-mapped
Quoted 29 lines · Matthieu Baerts
Hi Geliang, Mat,
Quoted 26 lines · Mat Martineau
Quoted 13 lines · Geliang Tang
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(-)net/mptcp/pm_netlink.c +0
-0net/mptcp/pm_netlink.c select_local_address(const struct pm_nl_pernet · line 163
Quoted 6 lines
net/mptcp/pm_netlink.c +2
-0@@ -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.
Quoted 7 lines
Quoted 2 lines
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
Geliang Tang
[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 1/2] mptcp: convert IPv4 address to IPv4-mapped
In reply to Matthieu BaertsHi Matt,
Quoted 29 lines · Matthieu Baerts
Hi Geliang, Mat,
Quoted 26 lines · Mat Martineau
Quoted 13 lines · Geliang Tang
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(-)net/mptcp/pm_netlink.c +0
-0net/mptcp/pm_netlink.c select_local_address(const struct pm_nl_pernet · line 163
Quoted 6 lines
net/mptcp/pm_netlink.c +2
-0@@ -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.
Quoted 6 lines
Quoted 2 lines
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?
Thanks for your help. Your patch is much better than mine. I added your code in v3 with only a slightly change in addresses_equal. I added your Co-developed-by tag in v3 if you don't mind:
@@ -66,12 +66,11 @@ static bool addresses_equal(const struct mptcp_addr_info *a,
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
else
addr_equals = !ipv6_addr_cmp(&a->addr6, &b->addr6);- } else if (a->family == AF_INET6) {
- if (b->family == AF_INET && ipv6_addr_v4mapped(&a->addr6))
- addr_equals = a->addr6.s6_addr32[3] == b->addr.s_addr;
- } else if (b->family == AF_INET6) {
+ } else {
if (a->family == AF_INET && ipv6_addr_v4mapped(&b->addr6))
addr_equals = a->addr.s_addr == b->addr6.s6_addr32[3];
+ if (b->family == AF_INET && ipv6_addr_v4mapped(&a->addr6))
+ addr_equals = a->addr6.s6_addr32[3] == b->addr.s_addr;
#endif
}And I added the following code in mptcp_info2sockaddr to deal with the IPv4-mapped back to IPv4 case too:
net/mptcp/subflow.c +4 -1
@@ -1082,7 +1082,10 @@ static void mptcp_info2sockaddr(const struct mptcp_addr_info *info,if (addr->ss_family ==AF_INET ) {struct sockaddr_in *in_addr = (struct sockaddr_in *)addr; - in_addr->sin_addr = info->addr; +if (info->family ==AF_INET ) + in_addr->sin_addr = info->addr; +else + in_addr->sin_addr.s_addr = info->addr6.s6_addr32[3 ]; in_addr->sin_port = info->port; }#if IS_ENABLED (CONFIG_MPTCP_IPV6 )
Also in v3 I added two new IPv4-mapped back to IPv4 testcases:
+# signal subflow v6-map-v4
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl add "::ffff:10.0.3.2" flags subflow +run_tests $ns1 $ns2 10.0.1.1
+chk_join_nr "single subflow v6-map-v4" 1 1 1
+
+# signal address v6-map-v4
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+ip netns exec $ns1 ./pm_nl_ctl add "::ffff:10.0.2.1" flags signal +run_tests $ns1 $ns2 10.0.1.1
+chk_join_nr "signal address v6-map-v4" 1 1 1 +chk_add_nr 1 1
Thanks.
-Geliang
Quoted 117 lines
Cheers,
MattSignature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.netQuoted 1 line
From
36f5e1f9bade5329e82a85fb6330db57a165c04cMon Sep 17 00:00:00 2001From: Matthieu Baerts <matthieu.baerts(a)tessares.net>
Date: Fri, 18 Dec 2020 00:03:12 +0100
Subject: [PATCH] mptcp: support v4mappedv6Signed-off-by Matthieu Baerts <matthieu.baerts(a)tessares.net>--- net/mptcp/pm_netlink.c | 22 +++++++++++++--------- net/mptcp/subflow.c | 17 +++++++++++------ 2 files changed, 24 insertions(+), 15 deletions(-)net/mptcp/pm_netlink.c +13
-9@@ -60,15 +60,20 @@ static bool addresses_equal(const struct mptcp_addr_info *a, {bool addr_equals = false; -if (a->family != b->family) -return false; - -if (a->family ==AF_INET ) - addr_equals = a->addr.s_addr == b->addr.s_addr; +if (a->family == b->family) { +if (a->family ==AF_INET ) + addr_equals = a->addr.s_addr == b->addr.s_addr;#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) - else - addr_equals = !ipv6_addr_cmp (&a->addr6, &b->addr6); + else + addr_equals = !ipv6_addr_cmp(&a->addr6, &b->addr6); + }else if (a->family ==AF_INET6 ) { +if (b->family ==AF_INET &&ipv6_addr_v4mapped (&a->addr6)) + addr_equals = a->addr6.s6_addr32[3 ] == b->addr.s_addr; + }else if (b->family ==AF_INET6 ) { +if (a->family ==AF_INET &&ipv6_addr_v4mapped (&b->addr6)) + addr_equals = a->addr.s_addr == b->addr6.s6_addr32[3 ];#endif + }if (!addr_equals)return false;@@ -147,8 +152,7 @@ select_local_address(const struct pm_nl_pernet *pernet,/* avoid any address already in use by subflows and * pending join */ -if (entry->addr.family == ((struct sock *)msk)->sk_family && - !lookup_subflow_by_saddr (&msk->conn_list, &entry->addr)) { +if (!lookup_subflow_by_saddr (&msk->conn_list, &entry->addr)) { ret = entry;break ; }net/mptcp/subflow.c +11
-6@@ -1074,10 +1074,11 @@ void mptcpv6_handle_mapped(struct sock *sk, bool mapped)#endif static void mptcp_info2sockaddr (const struct mptcp_addr_info *info, -struct sockaddr_storage *addr) +struct sockaddr_storage *addr, +unsigned short family) {memset (addr,0 ,sizeof (*addr)); - addr->ss_family = info->family; + addr->ss_family = family;if (addr->ss_family ==AF_INET ) {struct sockaddr_in *in_addr = (struct sockaddr_in *)addr;@@ -1088,7 +1089,11 @@ static void mptcp_info2sockaddr(const struct mptcp_addr_info *info, else if (addr->ss_family == AF_INET6) {struct sockaddr_in6 *in6_addr = (struct sockaddr_in6 *)addr; - in6_addr->sin6_addr = info->addr6; +if (info->family ==AF_INET ) +ipv6_addr_set_v4mapped (info->addr.s_addr, + &in6_addr->sin6_addr); +else + in6_addr->sin6_addr = info->addr6; in6_addr->sin6_port = info->port; }#endif @@ -1132,11 +1137,11 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, subflow->remote_key = msk->remote_key; subflow->local_key = msk->local_key; subflow->token = msk->token; -mptcp_info2sockaddr (loc, &addr); +mptcp_info2sockaddr (loc, &addr, ssk->sk_family); addrlen =sizeof (struct sockaddr_in );#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) -if (loc->family ==AF_INET6 ) +if (addr.ss_family ==AF_INET6 ) addrlen =sizeof (struct sockaddr_in6 );#endif ssk->sk_bound_dev_if = loc->ifindex;@@ -1152,7 +1157,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, subflow->remote_id = remote_id; subflow->request_join =1 ; subflow->request_bkup = !!(loc->flags &MPTCP_PM_ADDR_FLAG_BACKUP ); -mptcp_info2sockaddr (remote, &addr); +mptcp_info2sockaddr (remote, &addr, ssk->sk_family);mptcp_add_pending_subflow (msk, subflow); err =kernel_connect (sf, (struct sockaddr *)&addr, addrlen,O_NONBLOCK );Signature · 1 line
2.29.2
Matthieu Baerts
[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 1/2] mptcp: convert IPv4 address to IPv4-mapped
Hi Geliang,
Quoted 35 lines · Geliang Tang
Hi Matt,
Quoted 32 lines · Matthieu Baerts
Hi Geliang, Mat,
Quoted 28 lines · Mat Martineau
Quoted 13 lines · Geliang Tang
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(-)net/mptcp/pm_netlink.c +0
-0net/mptcp/pm_netlink.c select_local_address(const struct pm_nl_pernet · line 163
Quoted 6 lines
net/mptcp/pm_netlink.c +2
-0@@ -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?
Quoted 7 lines
Quoted 3 lines
Maybe something like that the patch I joined?
I didn't try much but maybe more what we want?
Thanks for your help. Your patch is much better than mine. I added your code in v3 with only a slightly change in
addresses_equal. I added your Co-developed-by tag in v3 if you don't mind:
Of course I don't mind, that's the proper tag when a code is modified by different people!
Review static bool addresses_equal(const struct mptcp_addr_info *a, · line 73
Quoted 13 lines
(quoted diff) +3
-4@@ -66,12 +66,11 @@ static bool addresses_equal(const struct mptcp_addr_info *a, #if IS_ENABLED(CONFIG_MPTCP_IPV6) else addr_equals = !ipv6_addr_cmp(&a->addr6, &b->addr6); - } else if (a->family == AF_INET6) { - if (b->family == AF_INET && ipv6_addr_v4mapped(&a->addr6)) - addr_equals = a->addr6.s6_addr32[3] == b->addr.s_addr; - } else if (b->family == AF_INET6) { + } else { if (a->family == AF_INET && ipv6_addr_v4mapped(&b->addr6)) addr_equals = a->addr.s_addr == b->addr6.s6_addr32[3]; + if (b->family == AF_INET && ipv6_addr_v4mapped(&a->addr6)) + addr_equals = a->addr6.s6_addr32[3] == b->addr.s_addr;
I will need to check to verify if we can safely assume that if the families are not the same, the only possibility is one in v4 and the other one in v6. If we cannot assume that, we cannot really call ipv6_addr_v4mapped() without checking if it is v6. Could we have there a non initialised one (family == 0)? Or something else?
Quoted 5 lines
(quoted diff) +0
-0#endif }And I added the following code in
mptcp_info2sockaddrto deal with the IPv4-mapped back to IPv4 case too:
I see, good point!
But now I wonder if we need to support v4mapped addresses on the PM side. This seems to increase the complexity because the PM would then have to check if the local address is v4, v4 mapped in a v6 or a real v6. Just to avoid asking to connect from a (real) v6 to v4 or the opposite.
net/mptcp/subflow.c static void mptcp_info2sockaddr(const struct mptcp_addr_info *info, · line 1088
Quoted 11 lines
net/mptcp/subflow.c +4
-1@@ -1082,7 +1082,10 @@ static void mptcp_info2sockaddr(const struct mptcp_addr_info *info,if (addr->ss_family ==AF_INET ) {struct sockaddr_in *in_addr = (struct sockaddr_in *)addr; - in_addr->sin_addr = info->addr; +if (info->family ==AF_INET ) + in_addr->sin_addr = info->addr; +else + in_addr->sin_addr.s_addr = info->addr6.s6_addr32[3 ];
Link to my previous comment: we might need to be careful that if "info" has a real IPv6 address, we will not do what we want here.
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net