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 @@ -1,217 +1,229 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (C) 2019 Jan Sucan * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include "main.h" #ifdef INET #include "ping.h" #endif #ifdef INET6 #include "ping6.h" #endif #if defined(INET) && defined(INET6) #define OPTSTR PING6OPTS PING4OPTS #elif defined(INET) #define OPTSTR PING4OPTS #elif defined(INET6) #define OPTSTR PING6OPTS #else #error At least one of INET and INET6 is required #endif int main(int argc, char *argv[]) { #if defined(INET) && defined(INET6) struct in_addr a; struct in6_addr a6; #endif #if defined(INET) || defined(INET6) struct addrinfo hints; #endif int ch; #ifdef INET bool ipv4 = false; #endif #ifdef INET6 bool ipv6 = false; if (strcmp(getprogname(), "ping6") == 0) ipv6 = true; #endif while ((ch = getopt(argc, argv, ":" OPTSTR)) != -1) { switch(ch) { #ifdef INET case '4': ipv4 = true; break; #endif #ifdef INET6 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; } } if (optind >= argc) usage(); optreset = 1; optind = 1; #if defined(INET) && defined(INET6) if (ipv4 && ipv6) errx(1, "-4 and -6 cannot be used simultaneously"); #endif #if defined(INET) && defined(INET6) if (inet_pton(AF_INET, argv[argc - 1], &a) == 1) { if (ipv6) errx(1, "IPv6 requested but IPv4 target address " "provided"); hints.ai_family = AF_INET; } else if (inet_pton(AF_INET6, argv[argc - 1], &a6) == 1) { if (ipv4) errx(1, "IPv4 requested but IPv6 target address " "provided"); hints.ai_family = AF_INET6; } else if (ipv6) hints.ai_family = AF_INET6; else if (ipv4) hints.ai_family = AF_INET; else { if (!feature_present("inet6")) hints.ai_family = AF_INET; else if (!feature_present("inet")) hints.ai_family = AF_INET6; else { struct addrinfo *res; memset(&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_RAW; hints.ai_family = AF_UNSPEC; getaddrinfo(argv[argc - 1], NULL, &hints, &res); if (res != NULL) { hints.ai_family = res[0].ai_family; freeaddrinfo(res); } } } #elif defined(INET) hints.ai_family = AF_INET; #elif defined(INET6) hints.ai_family = AF_INET6; #endif #ifdef INET if (hints.ai_family == AF_INET) return ping(argc, argv); #endif /* INET */ #ifdef INET6 if (hints.ai_family == AF_INET6) return ping6(argc, argv); #endif /* INET6 */ errx(1, "Unknown host"); } void usage(void) { (void)fprintf(stderr, "usage:\n" #ifdef INET "\tping [-4AaDdfHnoQqRrv] [-C pcp] [-c count] " "[-G sweepmaxsize]\n" " [-g sweepminsize] [-h sweepincrsize] [-i wait] " "[-l preload]\n" " [-M mask | time] [-m ttl] " #ifdef IPSEC "[-P policy] " #endif "[-p pattern] [-S src_addr] \n" " [-s packetsize] [-t timeout] [-W waittime] [-z tos] " "IPv4-host\n" "\tping [-4AaDdfHLnoQqRrv] [-C pcp] [-c count] [-I iface] " "[-i wait]\n" " [-l preload] [-M mask | time] [-m ttl] " #ifdef IPSEC "[-P policy] " #endif "[-p pattern]\n" " [-S src_addr] [-s packetsize] [-T ttl] [-t timeout] [-W waittime]\n" " [-z tos] IPv4-mcast-group\n" #endif /* INET */ #ifdef INET6 "\tping [-6AaDd" #if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC) "E" #endif "fHnNoOq" #ifdef IPV6_USE_MIN_MTU "u" #endif "vyY" #if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC) "Z" #endif "] " "[-b bufsiz] [-c count] [-e gateway]\n" " [-I interface] [-i wait] [-k addrtype] [-l preload] " "[-m hoplimit]\n" " [-p pattern]" #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) " [-P policy]" #endif " [-S sourceaddr] [-s packetsize] [-t timeout]\n" " [-W waittime] [-z tclass] [IPv6-hops ...] IPv6-host\n" #endif /* INET6 */ ); exit(1); } 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 @@ -1,124 +1,150 @@ # # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # # Copyright (C) 2019 Jan Sucan # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ require_ipv4() { if ! getaddrinfo -f inet localhost 1>/dev/null 2>&1; then atf_skip "IPv4 is not configured" fi } require_ipv6() { if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then atf_skip "IPv6 is not configured" fi } atf_test_case ping_c1_s56_t1 ping_c1_s56_t1_head() { atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet" } ping_c1_s56_t1_body() { require_ipv4 atf_check -s exit:0 -o save:std.out -e empty \ ping -4 -c 1 -s 56 -t 1 localhost 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" } ping_6_c1_s8_t1_body() { require_ipv6 atf_check -s exit:0 -o save:std.out -e empty \ ping -6 -c 1 -s 8 -t 1 localhost 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" } ping6_c1_s8_t1_body() { require_ipv6 atf_check -s exit:0 -o save:std.out -e empty \ ping6 -c 1 -s 8 -t 1 localhost check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out } ping_c1t6_head() { atf_set "descr" "-t6 is not interpreted as -t -6 by ping" } ping_c1t6_body() { require_ipv4 atf_check -s exit:0 -o ignore -e empty ping -c1 -t6 127.0.0.1 } ping6_c1t4_head() { atf_set "descr" "-t4 is not interpreted as -t -4 by ping6" } ping6_c1t4_body() { require_ipv6 atf_check -s exit:0 -o ignore -e empty ping6 -c1 -t4 ::1 } ping_46_head() { atf_set "descr" "-4 and -6 may not be used together" } ping_46_body() { atf_check -s exit:1 -e ignore ping -4 -6 } ping6_46_head() { atf_set "descr" "-4 and -6 may not be used together" } ping6_46_body() { atf_check -s exit:1 -e ignore ping6 -4 -6 } 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 atf_add_test_case ping_46 atf_add_test_case ping6_46 } check_ping_statistics() { sed -e 's/0.[0-9]\{3\}//g' \ -e 's/[1-9][0-9]*.[0-9]\{3\}//g' \ -e 's/localhost ([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\})/localhost/' \ -e 's/from [0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\}/from/' \ -e 's/ttl=[0-9][0-9]*/ttl=/' \ -e 's/hlim=[0-9][0-9]*/hlim=/' \ "$1" >"$1".filtered atf_check -s exit:0 diff -u "$1".filtered "$2" }