add IPv4-mapped address support
Subsystems (3)
Geliang Tang
v3 cover add IPv4-mapped address support
This patchset added the IPv4-mapped address support and the testcases.
v3:
- add Matt's code in it.
- deal with the IPv4-mapped back to IPv4 case too.
- add two new IPv4-mapped back to IPv4 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 with IPv4-mapped address
selftests: mptcp: add IPv4-mapped IPv6 testcases
net/mptcp/pm_netlink.c | 21 ++++---- net/mptcp/subflow.c | 22 +++++--- .../testing/selftests/net/mptcp/mptcp_join.sh | 51 +++++++++++++++++++ 3 files changed, 78 insertions(+), 16 deletions(-)
Signature · 1 line
2.29.2
Geliang Tang
PATCH v3 1/2 mptcp: convert IPv4 address with IPv4-mapped address
Currently, PM doesn't create subflow with IPv4-mapped IPv6 socket. This patch added IPv4-mapped Ipv6 address support, by converting the IPv4 address with IPv4-mapped IPv6 address.
--- net/mptcp/pm_netlink.c | 21 ++++++++++++--------- net/mptcp/subflow.c | 22 +++++++++++++++------- 2 files changed, 27 insertions(+), 16 deletions(-)
net/mptcp/pm_netlink.c +12 -9
@@ -60,15 +60,19 @@ 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_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 + }if (!addr_equals)return false;
@@ -147,8 +151,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 +15 -7
@@ -1074,21 +1074,29 @@ 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; - 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 ) 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 +1140,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 +1160,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
Geliang Tang
PATCH v3 2/2 selftests: mptcp: add IPv4-mapped IPv6 testcases
This patch added the IPv4-mapped IPv6 testcases, and the IPv4 address converting with the IPv4-mapped IPv6 address testcases.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +51 -0
@@ -790,6 +790,57 @@ 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" +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 v4-map-v6 +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" +chk_join_nr "single subflow v4-map-v6" 1 1 1 + +# signal address v4-map-v6 +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 v4-map-v6" 1 1 1 +chk_add_nr 1 1 + +# 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 + # 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 v3 mptcp-next 1/2] mptcp: convert IPv4 address with IPv4-mapped address
In reply to Geliang TangQuoted 67 lines · Geliang Tang
Currently, PM doesn't create subflow with IPv4-mapped IPv6 socket. This patch added IPv4-mapped Ipv6 address support, by converting the IPv4 address with IPv4-mapped IPv6 address.
Co-developed-by Matthieu Baerts <matthieu.baerts(a)tessares.net>Signed-off-by Matthieu Baerts <matthieu.baerts(a)tessares.net>Signed-off-by Geliang Tang <geliangtang(a)gmail.com>---
net/mptcp/pm_netlink.c| 21 ++++++++++++---------net/mptcp/subflow.c| 22 +++++++++++++++-------2 files changed, 27 insertions(+), 16 deletions(-)net/mptcp/pm_netlink.c +12
-9@@ -60,15 +60,19 @@ 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_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 + }if (!addr_equals)return false;@@ -147,8 +151,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 +2
-2@@ -1074,21 +1074,29 @@ 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;
net/mptcp/subflow.c void mptcpv6_handle_mapped(struct sock *sk, bool mapped) · line 1089
Quoted 10 lines
net/mptcp/subflow.c +5
-1+ addr->ss_family = family;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 ];
One small fix - addr6 needs CONFIG_MPTCP_IPV6, this breaks non-IPv6 builds.
The rest looks good to me! Tests pass on my system.
Mat
Quoted 44 lines
net/mptcp/subflow.c +5
-1in_addr->sin_port = info->port; }#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) 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
net/mptcp/subflow.c +3
-3@@ -1132,11 +1140,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 +1160,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 · 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