diff options
| author | Mike Karels <karels@FreeBSD.org> | 2022-05-20 14:16:01 +0000 |
|---|---|---|
| committer | Mike Karels <karels@FreeBSD.org> | 2022-05-20 23:30:47 +0000 |
| commit | 5af718a5927a9e078201ebc7ad1310e5b4918b7a (patch) | |
| tree | c152e28bcdbbf8806905572ebf3960d4dc992885 /sbin/ping/tests | |
| parent | 72bf76d6b8c9e9de81661b68389e0035805b8606 (diff) | |
| download | src-5af718a5927a9e078201ebc7ad1310e5b4918b7a.tar.gz src-5af718a5927a9e078201ebc7ad1310e5b4918b7a.zip | |
ping: if -S srcaddr uses a numeric address, use that protocol
The command "ping -S dotted.quad hostname" fails on dual-stack hosts
with the confusing message "ping: invalid source address: Name does
not resolve" because IPv6 is selected in preference. If the argument
to -S is numeric (likely), select the corresponding address family,
as if -4 or -6 was specified. Add tests that either IPv4 or IPv6 can
be forced via a -S parameter.
Reviewed by: asomers
Differential Revision: https://reviews.freebsd.org/D35271
MFC after: 1 week
Diffstat (limited to 'sbin/ping/tests')
| -rw-r--r-- | sbin/ping/tests/ping_c1_s56_t1_S127.out | 6 | ||||
| -rw-r--r-- | sbin/ping/tests/ping_c1_s8_t1_S1.out | 6 | ||||
| -rw-r--r-- | sbin/ping/tests/ping_test.sh | 26 |
3 files changed, 38 insertions, 0 deletions
diff --git a/sbin/ping/tests/ping_c1_s56_t1_S127.out b/sbin/ping/tests/ping_c1_s56_t1_S127.out new file mode 100644 index 000000000000..07d90918293b --- /dev/null +++ b/sbin/ping/tests/ping_c1_s56_t1_S127.out @@ -0,0 +1,6 @@ +PING localhost from: 56 data bytes +64 bytes from: icmp_seq=0 ttl= time= ms + +--- localhost ping statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss +round-trip min/avg/max/stddev = /// ms diff --git a/sbin/ping/tests/ping_c1_s8_t1_S1.out b/sbin/ping/tests/ping_c1_s8_t1_S1.out new file mode 100644 index 000000000000..81c56e6cf586 --- /dev/null +++ b/sbin/ping/tests/ping_c1_s8_t1_S1.out @@ -0,0 +1,6 @@ +PING6(56=40+8+8 bytes) ::1 --> ::1 +16 bytes from ::1, icmp_seq=0 hlim= time= ms + +--- localhost ping6 statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss +round-trip min/avg/max/std-dev = /// ms diff --git a/sbin/ping/tests/ping_test.sh b/sbin/ping/tests/ping_test.sh index 54af89f4a22b..7f11af7e9818 100644 --- a/sbin/ping/tests/ping_test.sh +++ b/sbin/ping/tests/ping_test.sh @@ -49,6 +49,18 @@ ping_c1_s56_t1_body() { check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1.out } +atf_test_case ping_c1_s56_t1_S127 +ping_c1_s56_t1_S127_head() { + atf_set "descr" "Check that ping -S 127.0.0.1 localhost succeeds" +} +ping_c1_s56_t1_S127_body() { + require_ipv4 + require_ipv6 + atf_check -s exit:0 -o save:std.out -e empty \ + ping -c 1 -s 56 -t 1 -S 127.0.0.1 localhost + check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1_S127.out +} + atf_test_case ping_6_c1_s8_t1 ping_6_c1_s8_t1_head() { atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet" @@ -60,6 +72,18 @@ ping_6_c1_s8_t1_body() { check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out } +atf_test_case ping_c1_s8_t1_S1 +ping_c1_s8_t1_S1_head() { + atf_set "descr" "Check that ping -S ::1 localhost succeeds" +} +ping_c1_s8_t1_S1_body() { + require_ipv4 + require_ipv6 + atf_check -s exit:0 -o save:std.out -e empty \ + ping -c 1 -s 8 -t 1 -S ::1 localhost + check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s8_t1_S1.out +} + atf_test_case ping6_c1_s8_t1 ping6_c1_s8_t1_head() { atf_set "descr" "Use IPv6 when invoked as ping6" @@ -104,7 +128,9 @@ ping6_46_body() { atf_init_test_cases() { atf_add_test_case ping_c1_s56_t1 + atf_add_test_case ping_c1_s56_t1_S127 atf_add_test_case ping_6_c1_s8_t1 + atf_add_test_case ping_c1_s8_t1_S1 atf_add_test_case ping6_c1_s8_t1 atf_add_test_case ping_c1t6 atf_add_test_case ping6_c1t4 |