@@ -212,6 +212,7 @@ do_transfer()
rm_nr_ns1="$7"
rm_nr_ns2="$8"
speed="$9"
+ with_port="${10}"
port=$((10000+$TEST_COUNT))
TEST_COUNT=$((TEST_COUNT+1))
@@ -253,6 +254,11 @@ do_transfer()
-s ${srv_proto} ${local_addr} < "$sin" > "$sout" &
spid=$!
+ if [ "$with_port" -gt 0 ];then
+ ip netns exec ${listener_ns} $mptcp_connect -t $timeout -l -p $with_port \
+ -s ${srv_proto} ${local_addr} < "$sin" > "$sout" &
+ fi
+
sleep 1
if [ "$test_link_fail" -eq 0 ];then
@@ -348,6 +354,7 @@ run_tests()
rm_nr_ns1="${5:-0}"
rm_nr_ns2="${6:-0}"
speed="${7:-fast}"
+ with_port="${8:-0}"
lret=0
oldin=""
@@ -362,7 +369,7 @@ run_tests()
fi
do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \
- ${test_linkfail} ${rm_nr_ns1} ${rm_nr_ns2} ${speed}
+ ${test_linkfail} ${rm_nr_ns1} ${rm_nr_ns2} ${speed} ${with_port}
lret=$?
if [ "$test_linkfail" -eq 1 ];then
@@ -717,6 +724,23 @@ chk_join_nr "remove subflow and signal IPv6" 2 2 2
chk_add_nr 1 1
chk_rm_nr 1 1
+# subflow with port
+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 port 10100
+run_tests $ns1 $ns2 10.0.1.1
+chk_join_nr "single subflow with port" 1 1 1
+
+# signal address with port
+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 port 10100
+run_tests $ns1 $ns2 10.0.1.1 0 0 0 fast 10100
+chk_join_nr "signal address with port" 1 1 1
+chk_add_nr 1 1
+
# single subflow, syncookies
reset_with_cookies
ip netns exec $ns1 ./pm_nl_ctl limits 0 1
This patch added testcases for ADD_ADDR with port. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- .../testing/selftests/net/mptcp/mptcp_join.sh | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)