selftests: Add new option for client-side passwords

Add new option to nettest to specify MD5 password to use for client
side. Update fcnal-test script. This is needed for a single instance
running both server and client modes to test password mismatches.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/fcnal-test.sh b/tools/testing/selftests/net/fcnal-test.sh
index edd33f8..5d15ded 100755 (executable)
--- a/tools/testing/selftests/net/fcnal-test.sh
+++ b/tools/testing/selftests/net/fcnal-test.sh
@@ -803,7 +803,7 @@ ipv4_tcp_md5_novrf()
        log_start
        run_cmd nettest -s -M ${MD5_PW} -m ${NSB_IP} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 0 "MD5: Single address config"
 
        # client sends MD5, server not configured
@@ -811,7 +811,7 @@ ipv4_tcp_md5_novrf()
        show_hint "Should timeout due to MD5 mismatch"
        run_cmd nettest -s &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 2 "MD5: Server no config, client uses password"
 
        # wrong password
@@ -819,7 +819,7 @@ ipv4_tcp_md5_novrf()
        show_hint "Should timeout since client uses wrong password"
        run_cmd nettest -s -M ${MD5_PW} -m ${NSB_IP} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: Client uses wrong password"
 
        # client from different address
@@ -827,7 +827,7 @@ ipv4_tcp_md5_novrf()
        show_hint "Should timeout due to MD5 mismatch"
        run_cmd nettest -s -M ${MD5_PW} -m ${NSB_LO_IP} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 2 "MD5: Client address does not match address configured with password"
 
        #
@@ -838,7 +838,7 @@ ipv4_tcp_md5_novrf()
        log_start
        run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsb nettest  -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest  -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 0 "MD5: Prefix config"
 
        # client in prefix, wrong password
@@ -846,7 +846,7 @@ ipv4_tcp_md5_novrf()
        show_hint "Should timeout since client uses wrong password"
        run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: Prefix config, client uses wrong password"
 
        # client outside of prefix
@@ -854,7 +854,7 @@ ipv4_tcp_md5_novrf()
        show_hint "Should timeout due to MD5 mismatch"
        run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsb nettest -l ${NSB_LO_IP} -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest -l ${NSB_LO_IP} -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 2 "MD5: Prefix config, client address not in configured prefix"
 }
 
@@ -871,7 +871,7 @@ ipv4_tcp_md5()
        log_start
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 0 "MD5: VRF: Single address config"
 
        # client sends MD5, server not configured
@@ -879,7 +879,7 @@ ipv4_tcp_md5()
        show_hint "Should timeout since server does not have MD5 auth"
        run_cmd nettest -s -d ${VRF} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Server no config, client uses password"
 
        # wrong password
@@ -887,7 +887,7 @@ ipv4_tcp_md5()
        show_hint "Should timeout since client uses wrong password"
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: VRF: Client uses wrong password"
 
        # client from different address
@@ -895,7 +895,7 @@ ipv4_tcp_md5()
        show_hint "Should timeout since server config differs from client"
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NSB_LO_IP} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Client address does not match address configured with password"
 
        #
@@ -906,7 +906,7 @@ ipv4_tcp_md5()
        log_start
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsb nettest  -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest  -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 0 "MD5: VRF: Prefix config"
 
        # client in prefix, wrong password
@@ -914,7 +914,7 @@ ipv4_tcp_md5()
        show_hint "Should timeout since client uses wrong password"
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: VRF: Prefix config, client uses wrong password"
 
        # client outside of prefix
@@ -922,7 +922,7 @@ ipv4_tcp_md5()
        show_hint "Should timeout since client address is outside of prefix"
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsb nettest -l ${NSB_LO_IP} -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest -l ${NSB_LO_IP} -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Prefix config, client address not in configured prefix"
 
        #
@@ -933,14 +933,14 @@ ipv4_tcp_md5()
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
        run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NSB_IP} &
        sleep 1
-       run_cmd_nsb nettest  -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest  -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF"
 
        log_start
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
        run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NSB_IP} &
        sleep 1
-       run_cmd_nsc nettest  -r ${NSA_IP} -M ${MD5_WRONG_PW}
+       run_cmd_nsc nettest  -r ${NSA_IP} -X ${MD5_WRONG_PW}
        log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF"
 
        log_start
@@ -948,7 +948,7 @@ ipv4_tcp_md5()
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
        run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NSB_IP} &
        sleep 1
-       run_cmd_nsc nettest -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsc nettest -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF with VRF pw"
 
        log_start
@@ -956,21 +956,21 @@ ipv4_tcp_md5()
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
        run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NSB_IP} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF with default VRF pw"
 
        log_start
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} &
        run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsb nettest  -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsb nettest  -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF"
 
        log_start
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} &
        run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsc nettest  -r ${NSA_IP} -M ${MD5_WRONG_PW}
+       run_cmd_nsc nettest  -r ${NSA_IP} -X ${MD5_WRONG_PW}
        log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF"
 
        log_start
@@ -978,7 +978,7 @@ ipv4_tcp_md5()
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} &
        run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsc nettest -r ${NSA_IP} -M ${MD5_PW}
+       run_cmd_nsc nettest -r ${NSA_IP} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF with VRF pw"
 
        log_start
@@ -986,7 +986,7 @@ ipv4_tcp_md5()
        run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} &
        run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} &
        sleep 1
-       run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF with default VRF pw"
 
        #
@@ -2267,7 +2267,7 @@ ipv6_tcp_md5_novrf()
        log_start
        run_cmd nettest -6 -s -M ${MD5_PW} -m ${NSB_IP6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 0 "MD5: Single address config"
 
        # client sends MD5, server not configured
@@ -2275,7 +2275,7 @@ ipv6_tcp_md5_novrf()
        show_hint "Should timeout due to MD5 mismatch"
        run_cmd nettest -6 -s &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 2 "MD5: Server no config, client uses password"
 
        # wrong password
@@ -2283,7 +2283,7 @@ ipv6_tcp_md5_novrf()
        show_hint "Should timeout since client uses wrong password"
        run_cmd nettest -6 -s -M ${MD5_PW} -m ${NSB_IP6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: Client uses wrong password"
 
        # client from different address
@@ -2291,7 +2291,7 @@ ipv6_tcp_md5_novrf()
        show_hint "Should timeout due to MD5 mismatch"
        run_cmd nettest -6 -s -M ${MD5_PW} -m ${NSB_LO_IP6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 2 "MD5: Client address does not match address configured with password"
 
        #
@@ -2302,7 +2302,7 @@ ipv6_tcp_md5_novrf()
        log_start
        run_cmd nettest -6 -s -M ${MD5_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsb nettest -6  -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 0 "MD5: Prefix config"
 
        # client in prefix, wrong password
@@ -2310,7 +2310,7 @@ ipv6_tcp_md5_novrf()
        show_hint "Should timeout since client uses wrong password"
        run_cmd nettest -6 -s -M ${MD5_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: Prefix config, client uses wrong password"
 
        # client outside of prefix
@@ -2318,7 +2318,7 @@ ipv6_tcp_md5_novrf()
        show_hint "Should timeout due to MD5 mismatch"
        run_cmd nettest -6 -s -M ${MD5_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsb nettest -6 -l ${NSB_LO_IP6} -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -l ${NSB_LO_IP6} -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 2 "MD5: Prefix config, client address not in configured prefix"
 }
 
@@ -2335,7 +2335,7 @@ ipv6_tcp_md5()
        log_start
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 0 "MD5: VRF: Single address config"
 
        # client sends MD5, server not configured
@@ -2343,7 +2343,7 @@ ipv6_tcp_md5()
        show_hint "Should timeout since server does not have MD5 auth"
        run_cmd nettest -6 -s -d ${VRF} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Server no config, client uses password"
 
        # wrong password
@@ -2351,7 +2351,7 @@ ipv6_tcp_md5()
        show_hint "Should timeout since client uses wrong password"
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: VRF: Client uses wrong password"
 
        # client from different address
@@ -2359,7 +2359,7 @@ ipv6_tcp_md5()
        show_hint "Should timeout since server config differs from client"
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NSB_LO_IP6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Client address does not match address configured with password"
 
        #
@@ -2370,7 +2370,7 @@ ipv6_tcp_md5()
        log_start
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsb nettest -6  -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 0 "MD5: VRF: Prefix config"
 
        # client in prefix, wrong password
@@ -2378,7 +2378,7 @@ ipv6_tcp_md5()
        show_hint "Should timeout since client uses wrong password"
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: VRF: Prefix config, client uses wrong password"
 
        # client outside of prefix
@@ -2386,7 +2386,7 @@ ipv6_tcp_md5()
        show_hint "Should timeout since client address is outside of prefix"
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsb nettest -6 -l ${NSB_LO_IP6} -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -l ${NSB_LO_IP6} -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Prefix config, client address not in configured prefix"
 
        #
@@ -2397,14 +2397,14 @@ ipv6_tcp_md5()
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
        run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NSB_IP6} &
        sleep 1
-       run_cmd_nsb nettest -6  -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF"
 
        log_start
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
        run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NSB_IP6} &
        sleep 1
-       run_cmd_nsc nettest -6  -r ${NSA_IP6} -M ${MD5_WRONG_PW}
+       run_cmd_nsc nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
        log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF"
 
        log_start
@@ -2412,7 +2412,7 @@ ipv6_tcp_md5()
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
        run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NSB_IP6} &
        sleep 1
-       run_cmd_nsc nettest -6 -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsc nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF with VRF pw"
 
        log_start
@@ -2420,21 +2420,21 @@ ipv6_tcp_md5()
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
        run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NSB_IP6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF with default VRF pw"
 
        log_start
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
        run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsb nettest -6  -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF"
 
        log_start
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
        run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsc nettest -6  -r ${NSA_IP6} -M ${MD5_WRONG_PW}
+       run_cmd_nsc nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
        log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF"
 
        log_start
@@ -2442,7 +2442,7 @@ ipv6_tcp_md5()
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
        run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsc nettest -6 -r ${NSA_IP6} -M ${MD5_PW}
+       run_cmd_nsc nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
        log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF with VRF pw"
 
        log_start
@@ -2450,7 +2450,7 @@ ipv6_tcp_md5()
        run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
        run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} &
        sleep 1
-       run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW}
+       run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
        log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF with default VRF pw"
 
        #

diff --git a/tools/testing/selftests/net/nettest.c b/tools/testing/selftests/net/nettest.c
index 4c8d457..e20e74e 100644 (file)
--- a/tools/testing/selftests/net/nettest.c
+++ b/tools/testing/selftests/net/nettest.c
@@ -85,6 +85,7 @@ struct sock_args {
        const char *serverns;
 
        const char *password;
+       const char *client_pw;
        /* prefix for MD5 password */
        const char *md5_prefix_str;
        union {
@@ -1655,6 +1656,8 @@ static int do_client(struct sock_args *args)
                break;
        }
 
+       args->password = args->client_pw;
+
        if (args->has_grp)
                sd = msock_client(args);
        else
@@ -1764,7 +1767,7 @@ static int ipc_parent(int cpid, int fd, struct sock_args *args)
        return client_status;
 }
 
-#define GETOPT_STR  "sr:l:p:t:g:P:DRn:M:m:d:BN:O:SCi6L:0:1:2:Fbq"
+#define GETOPT_STR  "sr:l:p:t:g:P:DRn:M:X:m:d:BN:O:SCi6L:0:1:2:Fbq"
 
 static void print_usage(char *prog)
 {
@@ -1796,6 +1799,7 @@ static void print_usage(char *prog)
        "    -n num        number of times to send message\n"
        "\n"
        "    -M password   use MD5 sum protection\n"
+       "    -X password   MD5 password for client mode\n"
        "    -m prefix/len prefix and length to use for MD5 key\n"
        "    -g grp        multicast group (e.g., 239.1.1.1)\n"
        "    -i            interactive mode (default is echo and terminate)\n"
@@ -1900,6 +1904,9 @@ int main(int argc, char *argv[])
                case 'M':
                        args.password = optarg;
                        break;
+               case 'X':
+                       args.client_pw = optarg;
+                       break;
                case 'm':
                        args.md5_prefix_str = optarg;
                        break;