d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ping: add a ping6 hard link for backwards compatibility

Browse Source 
When invoked as "ping6", ping will now attempt to use ICMPv6 for hostnames
that resolve both IPv4 and IPv6 addresses.

Reviewed by:	bz, manu
MFC-With:	r368045
Differential Revision:	https://reviews.freebsd.org/D27384
This commit is contained in:
asomers 2020-11-26 18:33:04 +00:00
parent 3d3de5ce17
commit f759f2c261
7 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ObsoleteFiles.inc
View File

@ -37,8 +37,6 @@
# done
# 20201124: ping6(8) was merged into ping(8)
OLD_FILES+=sbin/ping6
OLD_FILES+=rescue/ping6
OLD_FILES+=usr/lib/debug/sbin/ping6.debug
OLD_FILES+=usr/share/man/man8/ping6.8.gz
OLD_FILES+=usr/tests/sbin/ping6/Kyuafile

1
rescue/rescue/Makefile
View File

@ -103,6 +103,7 @@ CRUNCH_PROGS_sbin+= ccdconfig
.endif
.if ${MK_INET6_SUPPORT} != "no"
CRUNCH_ALIAS_ping= ping6
CRUNCH_PROGS_sbin+= rtsol
.endif

1
sbin/ping/Makefile
View File

@ -15,6 +15,7 @@ LIBADD= m
CFLAGS+= -DINET6 -DKAME_SCOPEID
SRCS+= ping6.c
LIBADD+= md
LINKS= ${BINDIR}/ping ${BINDIR}/ping6
.endif
.if ${MK_DYNAMICROOT} == "no"

3
sbin/ping/main.c
View File

@ -66,6 +66,9 @@ main(int argc, char *argv[])
struct in6_addr a6;
bool ipv6;
if (strcmp(getprogname(), "ping6") == 0)
ipv6 = true;
else
ipv6 = false;
#endif
ipv4 = false;

5
sbin/ping/ping.8
View File

@ -28,7 +28,7 @@
.\" @(#)ping.8 8.2 (Berkeley) 12/11/93
.\" $FreeBSD$
.\"
.Dd November 24, 2020
.Dd November 26, 2020
.Dt PING 8
.Os
.Sh NAME
@ -141,6 +141,9 @@ the specific IP version can be requested by
or
.Fl 6
options, respectively.
For backwards-compatibility, ICMPv6 can also be selected by invoking the binary
as
.Nm ping6 .
.Ss Options common to both IPv4 and IPv6 targets
.Bl -tag -width indent
.It Fl A

14
sbin/ping/tests/ping_test.sh
View File

@ -53,9 +53,23 @@ ping_6_c1_s8_t1_body() {
check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.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() {
if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then
atf_skip "IPv6 is not configured"
fi
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
}
atf_init_test_cases() {
atf_add_test_case ping_c1_s56_t1
atf_add_test_case ping_6_c1_s8_t1
atf_add_test_case ping6_c1_s8_t1
}
check_ping_statistics() {

2
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -2583,6 +2583,7 @@ OLD_DIRS+=usr/share/i18n/csmapper/GB
.endif
.if ${MK_INET6} == no
OLD_FILES+=sbin/ping6
OLD_FILES+=sbin/rtsol
OLD_FILES+=usr/sbin/ip6addrctl
OLD_FILES+=usr/sbin/mld6query
@ -2611,6 +2612,7 @@ OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
.endif
.if ${MK_INET6_SUPPORT} == no
OLD_FILES+=rescue/ping6
OLD_FILES+=rescue/rtsol
.endif