add IPv4-mapped address support
Subsystems (3)
Geliang Tang
cover add IPv4-mapped address support
This patchset added the IPv4-mapped address support and the testcases.
Geliang Tang (2):
mptcp: convert IPv4 address to IPv4-mapped
selftests: mptcp: add IPv4-mapped IPv6 testcases
net/mptcp/pm_netlink.c | 16 +++++++++ .../testing/selftests/net/mptcp/mptcp_join.sh | 34 +++++++++++++++++++ 2 files changed, 50 insertions(+)
Signature · 1 line
2.26.2
Geliang Tang
PATCH 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.
Signed-off-by Geliang Tang <geliangtang(a)gmail.com>
--- net/mptcp/pm_netlink.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
net/mptcp/pm_netlink.c +16 -0
@@ -132,6 +132,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)
@@ -144,6 +157,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 */
@@ -397,6 +412,7 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) remote.port = sk->sk_dport; else use_port = true; +mptcp_pm_addr_convert_v4mapped (msk, &remote);memset (&local,0 ,sizeof (local)); local.family = remote.family;
Signature · 1 line
2.26.2
Geliang Tang
PATCH 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.
Signed-off-by Geliang Tang <geliangtang(a)gmail.com>
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +34 -0
@@ -790,6 +790,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.26.2