From nobody Fri May 20 23:32:00 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9B5461B39DB1; Fri, 20 May 2022 23:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L4jg43sbSz4Zc2; Fri, 20 May 2022 23:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653089520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=74eSdFWHZujXVtXgXUkDo8sj1HtpkCvp+GO/5zTjnXU=; b=mHHaXzs6AlTOGfkirP8dp0S9YWMN5k+4D6OFI2BujoAOMboP0AHBhcHKvxyImx4fVvM0T7 T9h37nUGApnmBm6dxTNBAKqTjTev63zWYXzlzphgSnxZ20+g39rP5o47Gk1TJBWft9sTQw vEFZv9QHEMRHTd/SwV7DYpOxNrAqnxpwYCVJr+PkajsvammGu7dgIaiyhyjl8hiWTfLfcv dENwMEYxNFfXeNnh0k6/tcJYisXUJT0I/6qUtIaSA6i3b7jjuOASvynz91zeuIN9+ZjrM9 kSPA0XaC/hIVeFZIO2Pp6kIIsnrynnzcvouWnZuCeyRvmNIiBlcoVMa70d0QdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 662301BB1E; Fri, 20 May 2022 23:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24KNW0tN056429; Fri, 20 May 2022 23:32:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24KNW0uR056428; Fri, 20 May 2022 23:32:00 GMT (envelope-from git) Date: Fri, 20 May 2022 23:32:00 GMT Message-Id: <202205202332.24KNW0uR056428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 5af718a5927a - main - ping: if -S srcaddr uses a numeric address, use that protocol List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5af718a5927a9e078201ebc7ad1310e5b4918b7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653089520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=74eSdFWHZujXVtXgXUkDo8sj1HtpkCvp+GO/5zTjnXU=; b=OHSCQuKY8FjbYvHijWJfAy8Rfk2LYurBBFPXY9e5zAlXTtgixJrqequDwXXJWC3bQ4krxK qXTy0kVGnjPpI8qTIdqa7cDfJJMJs8CELMXUlonOSnLYzFgimZ+RlN1z4OJXAFPQQD+AUq Kfqf2KvWNh4UOFBOsCL1hi4QNLY/m3E1/e+IlWcAD5AQZP3xswEs2QAfRPImnZhPDAXawx V0hlJTSbXLU53hfNIinvj9a4Utb4GOMwAiGXoZka3YaHaZLGU9QLlKsflt0rBeEhrcrKSD plG/mZEYChxQ/VsLfT7j93JnSiUwhUvUxV9VMzof9jvT8ZTDdoqx1lakaP8blQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653089520; a=rsa-sha256; cv=none; b=AABk7SL55kAWZdS9nt5kbO2rUxZhFYzxJ7rrHOK+ZMwmQ1NSkIg8FeeY61nsVqMrEA2gfU IgDIkGf0y1Zw/axcO33KmNPku6zFVgk186/a9Gdaw+xalONINLLQl6Nbmnq3h7ZcbZjX2h TZLHsqT+7xxWc6o9jRNTffFjWqJPDisr806UTA26ThU/sN3Kx8vx8nJvzIZ7t7hB1jftpM iD2+8CQ5jIGaWOzfUESldA56HMSITVT6geSwXPr1x2kP9OfSq9W4Adb8SjdsGGI+a5Me+w H9hwacGdds5M10iC2+z3go3Hk7WunNv0scK7KrZK5/lIZkNf4tNuOABRbEnRdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=5af718a5927a9e078201ebc7ad1310e5b4918b7a commit 5af718a5927a9e078201ebc7ad1310e5b4918b7a Author: Mike Karels AuthorDate: 2022-05-20 14:16:01 +0000 Commit: Mike Karels CommitDate: 2022-05-20 23:30:47 +0000 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 --- sbin/ping/main.c | 12 ++++++++++++ sbin/ping/tests/ping_c1_s56_t1_S127.out | 6 ++++++ sbin/ping/tests/ping_c1_s8_t1_S1.out | 6 ++++++ sbin/ping/tests/ping_test.sh | 26 ++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/sbin/ping/main.c b/sbin/ping/main.c index 1d0b714f1480..11fa17b5ce2d 100644 --- a/sbin/ping/main.c +++ b/sbin/ping/main.c @@ -93,6 +93,18 @@ main(int argc, char *argv[]) case '6': ipv6 = true; break; +#endif +#if defined(INET) && defined(INET6) + case 'S': + /* + * If -S is given with a numeric parameter, + * force use of the corresponding version. + */ + if (inet_pton(AF_INET, optarg, &a) == 1) + ipv4 = true; + else if (inet_pton(AF_INET6, optarg, &a) == 1) + ipv6 = true; + break; #endif default: break; 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