diff --git a/sbin/ping/main.c b/sbin/ping/main.c
index 686b412a19b7..65896a5dba7b 100644
--- a/sbin/ping/main.c
+++ b/sbin/ping/main.c
@@ -1,297 +1,301 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
  * 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 <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>
 
 #include <err.h>
 #include <math.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sysexits.h>
 #include <unistd.h>
 
 #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
 
 /* various options */
 u_int options;
 
 char *hostname;
 
 /* counters */
 long nreceived;		/* # of packets we got back */
 long nrepeats;		/* number of duplicates */
 long ntransmitted;	/* sequence # for outbound packets = #sent */
 long nrcvtimeout = 0;	/* # of packets we got back after waittime */
 
 /* nonzero if we've been told to finish up */
 volatile sig_atomic_t seenint;
 volatile sig_atomic_t seeninfo;
 
 /* timing */
 int timing;		/* flag to do timing */
 double tmin = 999999999.0;	/* minimum round trip time */
 double tmax = 0.0;	/* maximum round trip time */
 double tsum = 0.0;	/* sum of all times, for doing average */
 double tsumsq = 0.0;	/* sum of all times squared, for std. dev. */
 
 int
 main(int argc, char *argv[])
 {
 #if defined(INET)
 	struct in_addr a;
 #endif
 #if defined(INET6)
 	struct in6_addr a6;
 #endif
 #if defined(INET) && defined(INET6)
 	struct addrinfo hints, *res, *ai;
+	const char *target;
 	int error;
 #endif
 	int opt;
 
 #ifdef INET6
 	if (strcmp(getprogname(), "ping6") == 0)
 		return ping6(argc, argv);
 #endif
 
 	while ((opt = getopt(argc, argv, ":" OPTSTR)) != -1) {
 		switch (opt) {
 #ifdef INET
 		case '4':
 			goto ping4;
 #endif
 #ifdef INET6
 		case '6':
 			goto ping6;
 #endif
 		case 'S':
 			/*
 			 * If -S is given with a numeric parameter,
 			 * force use of the corresponding version.
 			 */
 #ifdef INET
 			if (inet_pton(AF_INET, optarg, &a) == 1)
 				goto ping4;
 #endif
 #ifdef INET6
 			if (inet_pton(AF_INET6, optarg, &a6) == 1)
 				goto ping6;
 #endif
 			break;
 		default:
 			break;
 		}
 	}
 
 	/*
 	 * For IPv4, only one positional argument, the target, is allowed.
 	 * For IPv6, multiple positional argument are allowed; the last
 	 * one is the target, and preceding ones are intermediate hops.
 	 * This nuance is lost here, but the only case where it matters is
 	 * an error.
 	 */
 	if (optind >= argc)
 		usage();
 
 #if defined(INET) && defined(INET6)
+	target = argv[argc - 1];
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_socktype = SOCK_RAW;
 	if (feature_present("inet") && !feature_present("inet6"))
 		hints.ai_family = AF_INET;
 	if (feature_present("inet6") && !feature_present("inet"))
 		hints.ai_family = AF_INET6;
 	else
 		hints.ai_family = AF_UNSPEC;
-	error = getaddrinfo(argv[argc - 1], NULL, &hints, &res);
+	error = getaddrinfo(target, NULL, &hints, &res);
 	if (res == NULL)
-		errx(1, "%s", gai_strerror(error));
+		errx(EX_NOHOST, "cannot resolve %s: %s",
+		    target, gai_strerror(error));
 	for (ai = res; ai != NULL; ai = ai->ai_next) {
 		if (ai->ai_family == AF_INET) {
 			freeaddrinfo(res);
 			goto ping4;
 		}
 		if (ai->ai_family == AF_INET6) {
 			freeaddrinfo(res);
 			goto ping6;
 		}
 	}
 	freeaddrinfo(res);
-	errx(1, "Unknown host");
+	errx(EX_NOHOST, "cannot resolve %s", target);
 #endif
 #ifdef INET
 ping4:
 	optreset = 1;
 	optind = 1;
 	return ping(argc, argv);
 #endif
 #ifdef INET6
 ping6:
 	optreset = 1;
 	optind = 1;
 	return ping6(argc, argv);
 #endif
 }
 
 /*
  * onsignal --
  *	Set the global bit that causes the main loop to quit.
  */
 void
 onsignal(int sig)
 {
 	switch (sig) {
 	case SIGALRM:
 	case SIGINT:
 		/*
 		 * When doing reverse DNS lookups, the seenint flag might not
 		 * be noticed for a while.  Just exit if we get a second SIGINT.
 		 */
 		if (!(options & F_HOSTNAME) && seenint != 0)
 			_exit(nreceived ? 0 : 2);
 		seenint++;
 		break;
 	case SIGINFO:
 		seeninfo++;
 		break;
 	}
 }
 
 /*
  * pr_summary --
  *	Print out summary statistics to the given output stream.
  */
 void
 pr_summary(FILE * restrict stream)
 {
 	fprintf(stream, "\n--- %s ping statistics ---\n", hostname);
 	fprintf(stream, "%ld packets transmitted, ", ntransmitted);
 	fprintf(stream, "%ld packets received, ", nreceived);
 	if (nrepeats)
 		fprintf(stream, "+%ld duplicates, ", nrepeats);
 	if (ntransmitted) {
 		if (nreceived > ntransmitted)
 			fprintf(stream, "-- somebody's duplicating packets!");
 		else
 			fprintf(stream, "%.1f%% packet loss",
 			    ((((double)ntransmitted - nreceived) * 100.0) /
 			    ntransmitted));
 	}
 	if (nrcvtimeout)
 		fprintf(stream, ", %ld packets out of wait time", nrcvtimeout);
 	fputc('\n', stream);
 	if (nreceived && timing) {
 		/* Only display average to microseconds */
 		double num = nreceived + nrepeats;
 		double avg = tsum / num;
 		double stddev = sqrt(fmax(0, tsumsq / num - avg * avg));
 		fprintf(stream,
 		    "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n",
 		    tmin, avg, tmax, stddev);
 	}
 	fflush(stream);
 }
 
 void
 usage(void)
 {
 	(void)fprintf(stderr,
 	    "usage:\n"
 #ifdef INET
 	    "\tping [-4AaDdfHnoQqRrv] [-C pcp] [-c count] "
 	    "[-G sweepmaxsize]\n"
 	    "\t    [-g sweepminsize] [-h sweepincrsize] [-i wait] "
 	    "[-l preload]\n"
 	    "\t    [-M mask | time] [-m ttl] "
 #ifdef IPSEC
 	    "[-P policy] "
 #endif
 	    "[-p pattern] [-S src_addr] \n"
 	    "\t    [-s packetsize] [-t timeout] [-W waittime] [-z tos] "
 	    "IPv4-host\n"
 	    "\tping [-4AaDdfHLnoQqRrv] [-C pcp] [-c count] [-I iface] "
 	    "[-i wait]\n"
 	    "\t    [-l preload] [-M mask | time] [-m ttl] "
 #ifdef IPSEC
 	    "[-P policy] "
 #endif
 	    "[-p pattern]\n"
 	    "\t    [-S src_addr] [-s packetsize] [-T ttl] [-t timeout] [-W waittime]\n"
 	    "\t    [-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 pcp] [-c count] [-e gateway]\n"
 	    "\t    [-I interface] [-i wait] [-k addrtype] [-l preload] "
 	    "[-m hoplimit]\n"
 	    "\t    [-p pattern]"
 #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
 	    " [-P policy]"
 #endif
 	    " [-S sourceaddr] [-s packetsize] [-t timeout]\n"
 	    "\t    [-W waittime] [-z tclass] [IPv6-hops ...] IPv6-host\n"
 #endif	/* INET6 */
 	    );
 
 	exit(1);
 }
diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c
index a71ef8a84aee..10deb57ad6bc 100644
--- a/sbin/ping/ping6.c
+++ b/sbin/ping/ping6.c
@@ -1,2782 +1,2783 @@
 /*	$KAME: ping6.c,v 1.169 2003/07/25 06:01:47 itojun Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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.
  */
 
 /*	BSDI	ping.c,v 2.3 1996/01/21 17:56:50 jch Exp	*/
 
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Mike Muuss.
  *
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
  */
 
 #if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 
 #include <sys/cdefs.h>
 /*
  * Using the InterNet Control Message Protocol (ICMP) "ECHO" facility,
  * measure round-trip-delays and packet loss across network paths.
  *
  * Author -
  *	Mike Muuss
  *	U. S. Army Ballistic Research Laboratory
  *	December, 1983
  *
  * Status -
  *	Public Domain.  Distribution Unlimited.
  * Bugs -
  *	More statistics could always be gathered.
  *	This program has to run SUID to ROOT to access the ICMP socket.
  */
 /*
  * NOTE:
  * USE_SIN6_SCOPE_ID assumes that sin6_scope_id has the same semantics
  * as IPV6_PKTINFO.  Some people object it (sin6_scope_id specifies *link*
  * while IPV6_PKTINFO specifies *interface*.  Link is defined as collection of
  * network attached to 1 or more interfaces)
  */
 
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 #include <netdb.h>
 
 #include <capsicum_helpers.h>
 #include <casper/cap_dns.h>
 #include <libcasper.h>
 
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <time.h>
 #include <unistd.h>
 
 #ifdef IPSEC
 #include <netipsec/ah.h>
 #include <netipsec/ipsec.h>
 #endif
 
 #include <md5.h>
 
 #include "main.h"
 #include "ping6.h"
 
 struct tv32 {
 	u_int32_t tv32_sec;
 	u_int32_t tv32_nsec;
 };
 
 #define MAXPACKETLEN	131072
 #define	IP6LEN		40
 #define ICMP6ECHOLEN	8	/* icmp echo header len excluding time */
 #define ICMP6ECHOTMLEN sizeof(struct tv32)
 #define ICMP6_NIQLEN	(ICMP6ECHOLEN + 8)
 # define CONTROLLEN	10240	/* ancillary data buffer size RFC3542 20.1 */
 /* FQDN case, 64 bits of nonce + 32 bits ttl */
 #define ICMP6_NIRLEN	(ICMP6ECHOLEN + 12)
 #define	EXTRA		256	/* for AH and various other headers. weird. */
 #define	DEFDATALEN	ICMP6ECHOTMLEN
 #define MAXDATALEN	MAXPACKETLEN - IP6LEN - ICMP6ECHOLEN
 #define	NROUTES		9		/* number of record route slots */
 #define	MAXWAIT		10000		/* max ms to wait for response */
 #define	MAXALARM	(60 * 60)	/* max seconds for alarm timeout */
 
 #define	A(bit)		rcvd_tbl[(bit)>>3]	/* identify byte in array */
 #define	B(bit)		(1 << ((bit) & 0x07))	/* identify bit in byte */
 #define	SET(bit)	(A(bit) |= B(bit))
 #define	CLR(bit)	(A(bit) &= (~B(bit)))
 #define	TST(bit)	(A(bit) & B(bit))
 
 #define	F_FLOOD		0x0001
 #define	F_INTERVAL	0x0002
 #define	F_PINGFILLED	0x0008
 #define	F_QUIET		0x0010
 #define	F_RROUTE	0x0020
 #define	F_SO_DEBUG	0x0040
 #define	F_VERBOSE	0x0100
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
 #define	F_POLICY	0x0400
 #else
 #define F_AUTHHDR	0x0200
 #define F_ENCRYPT	0x0400
 #endif /*IPSEC_POLICY_IPSEC*/
 #endif /*IPSEC*/
 #define F_NODEADDR	0x0800
 #define F_FQDN		0x1000
 #define F_INTERFACE	0x2000
 #define F_SRCADDR	0x4000
 #define F_FQDNOLD	0x20000
 #define F_NIGROUP	0x40000
 #define F_SUPTYPES	0x80000
 #define F_NOMINMTU	0x100000
 #define F_ONCE		0x200000
 #define F_AUDIBLE	0x400000
 #define F_MISSED	0x800000
 #define F_DONTFRAG	0x1000000
 #define F_NOUSERDATA	(F_NODEADDR | F_FQDN | F_FQDNOLD | F_SUPTYPES)
 #define	F_WAITTIME	0x2000000
 #define	F_DOT		0x4000000
 
 #define IN6LEN		sizeof(struct in6_addr)
 #define SA6LEN		sizeof(struct sockaddr_in6)
 #define DUMMY_PORT	10101
 
 #define SIN6(s)	((struct sockaddr_in6 *)(s))
 
 /*
  * MAX_DUP_CHK is the number of bits in received table, i.e. the maximum
  * number of received sequence numbers we can keep track of.  Change 128
  * to 8192 for complete accuracy...
  */
 #define	MAX_DUP_CHK	(8 * 8192)
 static int mx_dup_ck = MAX_DUP_CHK;
 static char rcvd_tbl[MAX_DUP_CHK / 8];
 
 static struct sockaddr_in6 dst;	/* who to ping6 */
 static struct sockaddr_in6 src;	/* src addr of this packet */
 static socklen_t srclen;
 static size_t datalen = DEFDATALEN;
 static int ssend;		/* send socket file descriptor */
 static int srecv;		/* receive socket file descriptor */
 static u_char outpack[MAXPACKETLEN];
 static char BSPACE = '\b';	/* characters written for flood */
 static char BBELL = '\a';	/* characters written for AUDIBLE */
 static const char *DOT = ".";
 static size_t DOTlen = 1;
 static size_t DOTidx = 0;
 static int ident;		/* process id to identify our packets */
 static u_int8_t nonce[8];	/* nonce field for node information */
 static int hoplimit = -1;	/* hoplimit */
 static int tclass = -1;		/* traffic class */
 static int pcp = -2;		/* vlan priority code point */
 static u_char *packet = NULL;
 static cap_channel_t *capdns;
 
 /* counters */
 static long nmissedmax;		/* max value of ntransmitted - nreceived - 1 */
 static long npackets;		/* max packets to transmit */
 static long ntransmitfailures;	/* number of transmit failures */
 static int interval = 1000;	/* interval between packets in ms */
 static int waittime = MAXWAIT;	/* timeout for each packet */
 
 /* for node addresses */
 static u_short naflags;
 
 /* for ancillary data(advanced API) */
 static struct msghdr smsghdr;
 static struct iovec smsgiov;
 static char *scmsg = 0;
 
 static cap_channel_t *capdns_setup(void);
 static void	 fill(char *, char *);
 static int	 get_hoplim(struct msghdr *);
 static int	 get_pathmtu(struct msghdr *);
 static struct in6_pktinfo *get_rcvpktinfo(struct msghdr *);
 static size_t	 pingerlen(void);
 static int	 pinger(void);
 static const char *pr_addr(struct sockaddr *, int);
 static void	 pr_icmph(struct icmp6_hdr *, u_char *);
 static void	 pr_iph(struct ip6_hdr *);
 static void	 pr_suptypes(struct icmp6_nodeinfo *, size_t);
 static void	 pr_nodeaddr(struct icmp6_nodeinfo *, int);
 static int	 myechoreply(const struct icmp6_hdr *);
 static int	 mynireply(const struct icmp6_nodeinfo *);
 static const char *dnsdecode(const u_char *, const u_char *, const u_char *,
     char *, size_t);
 static void	 pr_pack(u_char *, int, struct msghdr *);
 static void	 pr_exthdrs(struct msghdr *);
 static void	 pr_ip6opt(void *, size_t);
 static void	 pr_rthdr(void *, size_t);
 static int	 pr_bitrange(u_int32_t, int, int);
 static void	 pr_retip(struct ip6_hdr *, u_char *);
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
 static int	 setpolicy(int, char *);
 #endif
 #endif
 static char	*nigroup(char *, int);
 
 int
 ping6(int argc, char *argv[])
 {
 	struct timespec last, intvl;
 	struct sockaddr_in6 from, *sin6;
 	struct addrinfo hints, *res;
 	struct sigaction si_sa;
 	int cc, i;
 	int almost_done, ch, hold, packlen, preload, optval, error;
 	int nig_oldmcprefix = -1;
 	u_char *datap;
 	char *e, *target, *ifname = NULL, *gateway = NULL;
 	int ip6optlen = 0;
 	struct cmsghdr *scmsgp = NULL;
 	/* For control (ancillary) data received from recvmsg() */
 	u_char cm[CONTROLLEN];
 #if defined(SO_SNDBUF) && defined(SO_RCVBUF)
 	u_long lsockbufsize;
 	int sockbufsize = 0;
 #endif
 	int usepktinfo = 0;
 	struct in6_pktinfo pktinfo;
 	char *cmsg_pktinfo = NULL;
 	struct ip6_rthdr *rthdr = NULL;
 #ifdef IPSEC_POLICY_IPSEC
 	char *policy_in = NULL;
 	char *policy_out = NULL;
 #endif
 	double t;
 	u_long alarmtimeout;
 	size_t rthlen;
 #ifdef IPV6_USE_MIN_MTU
 	int mflag = 0;
 #endif
 	cap_rights_t rights_srecv;
 	cap_rights_t rights_ssend;
 	cap_rights_t rights_stdin;
 
 	/* just to be sure */
 	memset(&smsghdr, 0, sizeof(smsghdr));
 	memset(&smsgiov, 0, sizeof(smsgiov));
 	memset(&pktinfo, 0, sizeof(pktinfo));
 
 	intvl.tv_sec = interval / 1000;
 	intvl.tv_nsec = interval % 1000 * 1000000;
 
 	alarmtimeout = preload = 0;
 	datap = &outpack[ICMP6ECHOLEN + ICMP6ECHOTMLEN];
 	capdns = capdns_setup();
 
 	while ((ch = getopt(argc, argv, PING6OPTS)) != -1) {
 		switch (ch) {
 		case '.':
 			options |= F_DOT;
 			if (optarg != NULL) {
 				DOT = optarg;
 				DOTlen = strlen(optarg);
 			}
 			break;
 		case '6':
 			/* This option is processed in main(). */
 			break;
 		case 'k':
 		{
 			char *cp;
 
 			options &= ~F_NOUSERDATA;
 			options |= F_NODEADDR;
 			for (cp = optarg; *cp != '\0'; cp++) {
 				switch (*cp) {
 				case 'a':
 					naflags |= NI_NODEADDR_FLAG_ALL;
 					break;
 				case 'c':
 				case 'C':
 					naflags |= NI_NODEADDR_FLAG_COMPAT;
 					break;
 				case 'l':
 				case 'L':
 					naflags |= NI_NODEADDR_FLAG_LINKLOCAL;
 					break;
 				case 's':
 				case 'S':
 					naflags |= NI_NODEADDR_FLAG_SITELOCAL;
 					break;
 				case 'g':
 				case 'G':
 					naflags |= NI_NODEADDR_FLAG_GLOBAL;
 					break;
 				case 'A': /* experimental. not in the spec */
 #ifdef NI_NODEADDR_FLAG_ANYCAST
 					naflags |= NI_NODEADDR_FLAG_ANYCAST;
 					break;
 #else
 					errx(1,
 "-a A is not supported on the platform");
 					/*NOTREACHED*/
 #endif
 				default:
 					usage();
 					/*NOTREACHED*/
 				}
 			}
 			break;
 		}
 		case 'b':
 #if defined(SO_SNDBUF) && defined(SO_RCVBUF)
 			errno = 0;
 			e = NULL;
 			lsockbufsize = strtoul(optarg, &e, 10);
 			sockbufsize = (int)lsockbufsize;
 			if (errno || !*optarg || *e ||
 			    lsockbufsize > INT_MAX)
 				errx(1, "invalid socket buffer size");
 #else
 			errx(1,
 "-b option ignored: SO_SNDBUF/SO_RCVBUF socket options not supported");
 #endif
 			break;
 		case 'C':		/* vlan priority code point */
 			pcp = strtol(optarg, &e, 10);
 			if (*optarg == '\0' || *e != '\0')
 				errx(1, "illegal vlan pcp %s", optarg);
 			if (7 < pcp || pcp < -1)
 				errx(1, "illegal vlan pcp -- %s", optarg);
 			break;
 		case 'c':
 			npackets = strtol(optarg, &e, 10);
 			if (npackets <= 0 || *optarg == '\0' || *e != '\0')
 				errx(1,
 				    "illegal number of packets -- %s", optarg);
 			break;
 		case 'D':
 			options |= F_DONTFRAG;
 			break;
 		case 'd':
 			options |= F_SO_DEBUG;
 			break;
 		case 'f':
 			if (getuid()) {
 				errno = EPERM;
 				errx(1, "Must be superuser to flood ping");
 			}
 			options |= F_FLOOD;
 			options |= F_DOT;
 			setbuf(stdout, (char *)NULL);
 			break;
 		case 'e':
 			gateway = optarg;
 			break;
 		case 'H':
 			options |= F_HOSTNAME;
 			break;
 		case 'm':		/* hoplimit */
 			hoplimit = strtol(optarg, &e, 10);
 			if (*optarg == '\0' || *e != '\0')
 				errx(1, "illegal hoplimit %s", optarg);
 			if (255 < hoplimit || hoplimit < -1)
 				errx(1,
 				    "illegal hoplimit -- %s", optarg);
 			break;
 		case 'I':
 			ifname = optarg;
 			options |= F_INTERFACE;
 #ifndef USE_SIN6_SCOPE_ID
 			usepktinfo++;
 #endif
 			break;
 		case 'i':		/* wait between sending packets */
 			t = strtod(optarg, &e);
 			if (*optarg == '\0' || *e != '\0')
 				errx(1, "illegal timing interval %s", optarg);
 			if (t < 1 && getuid()) {
 				errx(1, "%s: only root may use interval < 1s",
 				    strerror(EPERM));
 			}
 			intvl.tv_sec = (time_t)t;
 			intvl.tv_nsec =
 			    (long)((t - intvl.tv_sec) * 1000000000);
 			if (intvl.tv_sec < 0)
 				errx(1, "illegal timing interval %s", optarg);
 			/* less than 1/hz does not make sense */
 			if (intvl.tv_sec == 0 && intvl.tv_nsec < 1000) {
 				warnx("too small interval, raised to .000001");
 				intvl.tv_nsec = 1000;
 			}
 			options |= F_INTERVAL;
 			break;
 		case 'l':
 			if (getuid()) {
 				errno = EPERM;
 				errx(1, "Must be superuser to preload");
 			}
 			preload = strtol(optarg, &e, 10);
 			if (preload < 0 || *optarg == '\0' || *e != '\0')
 				errx(1, "illegal preload value -- %s", optarg);
 			break;
 		case 'u':
 #ifdef IPV6_USE_MIN_MTU
 			mflag++;
 			break;
 #else
 			errx(1, "-%c is not supported on this platform", ch);
 			/*NOTREACHED*/
 #endif
 		case 'n':
 			options &= ~F_HOSTNAME;
 			break;
 		case 'N':
 			options |= F_NIGROUP;
 			nig_oldmcprefix++;
 			break;
 		case 'o':
 			options |= F_ONCE;
 			break;
 		case 'p':		/* fill buffer with user pattern */
 			options |= F_PINGFILLED;
 			fill((char *)datap, optarg);
 				break;
 		case 'q':
 			options |= F_QUIET;
 			break;
 		case 'a':
 			options |= F_AUDIBLE;
 			break;
 		case 'A':
 			options |= F_MISSED;
 			break;
 		case 'S':
 			memset(&hints, 0, sizeof(struct addrinfo));
 			hints.ai_flags = AI_NUMERICHOST; /* allow hostname? */
 			hints.ai_family = AF_INET6;
 			hints.ai_socktype = SOCK_RAW;
 			hints.ai_protocol = IPPROTO_ICMPV6;
 
 			error = cap_getaddrinfo(capdns, optarg, NULL, &hints, &res);
 			if (error) {
 				errx(1, "invalid source address: %s",
 				     gai_strerror(error));
 			}
 			/*
 			 * res->ai_family must be AF_INET6 and res->ai_addrlen
 			 * must be sizeof(src).
 			 */
 			memcpy(&src, res->ai_addr, res->ai_addrlen);
 			srclen = res->ai_addrlen;
 			freeaddrinfo(res);
 			options |= F_SRCADDR;
 			break;
 		case 's':		/* size of packet to send */
 			datalen = strtol(optarg, &e, 10);
 			if (datalen <= 0 || *optarg == '\0' || *e != '\0')
 				errx(1, "illegal datalen value -- %s", optarg);
 			if (datalen > MAXDATALEN) {
 				errx(1,
 				    "datalen value too large, maximum is %d",
 				    MAXDATALEN);
 			}
 			break;
 		case 'O':
 			options &= ~F_NOUSERDATA;
 			options |= F_SUPTYPES;
 			break;
 		case 'v':
 			options |= F_VERBOSE;
 			break;
 		case 'y':
 			options &= ~F_NOUSERDATA;
 			options |= F_FQDN;
 			break;
 		case 'Y':
 			options &= ~F_NOUSERDATA;
 			options |= F_FQDNOLD;
 			break;
 		case 'W':
 			t = strtod(optarg, &e);
 			if (*e || e == optarg || t > (double)INT_MAX)
 				errx(EX_USAGE, "invalid timing interval: `%s'",
 				    optarg);
 			options |= F_WAITTIME;
 			waittime = (int)t;
 			break;
 		case 't':
 			alarmtimeout = strtoul(optarg, &e, 0);
 			if ((alarmtimeout < 1) || (alarmtimeout == ULONG_MAX))
 				errx(EX_USAGE, "invalid timeout: `%s'",
 				    optarg);
 			if (alarmtimeout > MAXALARM)
 				errx(EX_USAGE, "invalid timeout: `%s' > %d",
 				    optarg, MAXALARM);
 			{
 				struct itimerval itv;
 
 				timerclear(&itv.it_interval);
 				timerclear(&itv.it_value);
 				itv.it_value.tv_sec = (time_t)alarmtimeout;
 				if (setitimer(ITIMER_REAL, &itv, NULL) != 0)
 					err(1, "setitimer");
 			}
 			break;
 		case 'z':		/* traffic class */
 			tclass = strtol(optarg, &e, 10);
 			if (*optarg == '\0' || *e != '\0')
 				errx(1, "illegal traffic class %s", optarg);
 			if (255 < tclass || tclass < -1)
 				errx(1,
 				    "illegal traffic class -- %s", optarg);
 			break;
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
 		case 'P':
 			options |= F_POLICY;
 			if (!strncmp("in", optarg, 2)) {
 				if ((policy_in = strdup(optarg)) == NULL)
 					errx(1, "strdup");
 			} else if (!strncmp("out", optarg, 3)) {
 				if ((policy_out = strdup(optarg)) == NULL)
 					errx(1, "strdup");
 			} else
 				errx(1, "invalid security policy");
 			break;
 #else
 		case 'Z':
 			options |= F_AUTHHDR;
 			break;
 		case 'E':
 			options |= F_ENCRYPT;
 			break;
 #endif /*IPSEC_POLICY_IPSEC*/
 #endif /*IPSEC*/
 		default:
 			usage();
 			/*NOTREACHED*/
 		}
 	}
 
 	argc -= optind;
 	argv += optind;
 
 	if (argc < 1) {
 		usage();
 		/*NOTREACHED*/
 	}
 
 	if (argc > 1) {
 #ifdef IPV6_RECVRTHDR	/* 2292bis */
 		rthlen = CMSG_SPACE(inet6_rth_space(IPV6_RTHDR_TYPE_0,
 		    argc - 1));
 #else  /* RFC2292 */
 		rthlen = inet6_rthdr_space(IPV6_RTHDR_TYPE_0, argc - 1);
 #endif
 		if (rthlen == 0) {
 			errx(1, "too many intermediate hops");
 			/*NOTREACHED*/
 		}
 		ip6optlen += rthlen;
 	}
 
 	if (options & F_NIGROUP) {
 		target = nigroup(argv[argc - 1], nig_oldmcprefix);
 		if (target == NULL) {
 			usage();
 			/*NOTREACHED*/
 		}
 	} else
 		target = argv[argc - 1];
 
 	/* cap_getaddrinfo */
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_flags = AI_CANONNAME;
 	hints.ai_family = AF_INET6;
 	hints.ai_socktype = SOCK_RAW;
 	hints.ai_protocol = IPPROTO_ICMPV6;
 
 	error = cap_getaddrinfo(capdns, target, NULL, &hints, &res);
 	if (error)
-		errx(1, "%s", gai_strerror(error));
+		errx(EX_NOHOST, "cannot resolve %s: %s",
+		    target, gai_strerror(error));
 	if (res->ai_canonname)
 		hostname = strdup(res->ai_canonname);
 	else
 		hostname = target;
 
 	if (!res->ai_addr)
-		errx(1, "cap_getaddrinfo failed");
+		errx(EX_NOHOST, "cannot resolve %s", target);
 
 	(void)memcpy(&dst, res->ai_addr, res->ai_addrlen);
 
 	if ((ssend = socket(res->ai_family, res->ai_socktype,
 	    res->ai_protocol)) < 0)
 		err(1, "socket ssend");
 	if ((srecv = socket(res->ai_family, res->ai_socktype,
 	    res->ai_protocol)) < 0)
 		err(1, "socket srecv");
 	freeaddrinfo(res);
 
 	/* set the source address if specified. */
 	if ((options & F_SRCADDR) != 0) {
 		/* properly fill sin6_scope_id */
 		if (IN6_IS_ADDR_LINKLOCAL(&src.sin6_addr) && (
 		    IN6_IS_ADDR_LINKLOCAL(&dst.sin6_addr) ||
 		    IN6_IS_ADDR_MC_LINKLOCAL(&dst.sin6_addr) ||
 		    IN6_IS_ADDR_MC_NODELOCAL(&dst.sin6_addr))) {
 			if (src.sin6_scope_id == 0)
 				src.sin6_scope_id = dst.sin6_scope_id;
 			if (dst.sin6_scope_id == 0)
 				dst.sin6_scope_id = src.sin6_scope_id;
 		}
 		if (bind(ssend, (struct sockaddr *)&src, srclen) != 0)
 			err(1, "bind");
 	}
 	/* set the gateway (next hop) if specified */
 	if (gateway) {
 		memset(&hints, 0, sizeof(hints));
 		hints.ai_family = AF_INET6;
 		hints.ai_socktype = SOCK_RAW;
 		hints.ai_protocol = IPPROTO_ICMPV6;
 
 		error = cap_getaddrinfo(capdns, gateway, NULL, &hints, &res);
 		if (error) {
 			errx(1, "cap_getaddrinfo for the gateway %s: %s",
 			     gateway, gai_strerror(error));
 		}
 		if (res->ai_next && (options & F_VERBOSE))
 			warnx("gateway resolves to multiple addresses");
 
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_NEXTHOP,
 		    res->ai_addr, res->ai_addrlen)) {
 			err(1, "setsockopt(IPV6_NEXTHOP)");
 		}
 
 		freeaddrinfo(res);
 	}
 
 	/*
 	 * let the kerel pass extension headers of incoming packets,
 	 * for privileged socket options
 	 */
 	if ((options & F_VERBOSE) != 0) {
 		int opton = 1;
 
 #ifdef IPV6_RECVHOPOPTS
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RECVHOPOPTS, &opton,
 		    sizeof(opton)))
 			err(1, "setsockopt(IPV6_RECVHOPOPTS)");
 #else  /* old adv. API */
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_HOPOPTS, &opton,
 		    sizeof(opton)))
 			err(1, "setsockopt(IPV6_HOPOPTS)");
 #endif
 #ifdef IPV6_RECVDSTOPTS
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RECVDSTOPTS, &opton,
 		    sizeof(opton)))
 			err(1, "setsockopt(IPV6_RECVDSTOPTS)");
 #else  /* old adv. API */
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_DSTOPTS, &opton,
 		    sizeof(opton)))
 			err(1, "setsockopt(IPV6_DSTOPTS)");
 #endif
 #ifdef IPV6_RECVRTHDRDSTOPTS
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RECVRTHDRDSTOPTS, &opton,
 		    sizeof(opton)))
 			err(1, "setsockopt(IPV6_RECVRTHDRDSTOPTS)");
 #endif
 	}
 
 	/* revoke root privilege */
 	if (seteuid(getuid()) != 0)
 		err(1, "seteuid() failed");
 	if (setuid(getuid()) != 0)
 		err(1, "setuid() failed");
 
 	if ((options & F_FLOOD) && (options & F_INTERVAL))
 		errx(1, "-f and -i incompatible options");
 
 	if ((options & F_NOUSERDATA) == 0) {
 		if (datalen >= sizeof(struct tv32)) {
 			/* we can time transfer */
 			timing = 1;
 		} else
 			timing = 0;
 		/* in F_VERBOSE case, we may get non-echoreply packets*/
 		if (options & F_VERBOSE)
 			packlen = 2048 + IP6LEN + ICMP6ECHOLEN + EXTRA;
 		else
 			packlen = datalen + IP6LEN + ICMP6ECHOLEN + EXTRA;
 	} else {
 		/* suppress timing for node information query */
 		timing = 0;
 		datalen = 2048;
 		packlen = 2048 + IP6LEN + ICMP6ECHOLEN + EXTRA;
 	}
 
 	if (!(packet = (u_char *)malloc((u_int)packlen)))
 		err(1, "Unable to allocate packet");
 	if (!(options & F_PINGFILLED))
 		for (i = ICMP6ECHOLEN; i < packlen; ++i)
 			*datap++ = i;
 
 	ident = getpid() & 0xFFFF;
 	arc4random_buf(nonce, sizeof(nonce));
 	optval = 1;
 	if (options & F_DONTFRAG)
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_DONTFRAG,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "IPV6_DONTFRAG");
 	hold = 1;
 
 	if (options & F_SO_DEBUG) {
 		(void)setsockopt(ssend, SOL_SOCKET, SO_DEBUG, (char *)&hold,
 		    sizeof(hold));
 		(void)setsockopt(srecv, SOL_SOCKET, SO_DEBUG, (char *)&hold,
 		    sizeof(hold));
 	}
 	optval = IPV6_DEFHLIM;
 	if (IN6_IS_ADDR_MULTICAST(&dst.sin6_addr))
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "IPV6_MULTICAST_HOPS");
 #ifdef IPV6_USE_MIN_MTU
 	if (mflag != 1) {
 		optval = mflag > 1 ? 0 : 1;
 
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_USE_MIN_MTU,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "setsockopt(IPV6_USE_MIN_MTU)");
 	}
 #ifdef IPV6_RECVPATHMTU
 	else {
 		optval = 1;
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RECVPATHMTU,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "setsockopt(IPV6_RECVPATHMTU)");
 	}
 #endif /* IPV6_RECVPATHMTU */
 #endif /* IPV6_USE_MIN_MTU */
 
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
 	if (options & F_POLICY) {
 		if (setpolicy(srecv, policy_in) < 0)
 			errx(1, "%s", ipsec_strerror());
 		if (setpolicy(ssend, policy_out) < 0)
 			errx(1, "%s", ipsec_strerror());
 	}
 #else
 	if (options & F_AUTHHDR) {
 		optval = IPSEC_LEVEL_REQUIRE;
 #ifdef IPV6_AUTH_TRANS_LEVEL
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_AUTH_TRANS_LEVEL,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "setsockopt(IPV6_AUTH_TRANS_LEVEL)");
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_AUTH_TRANS_LEVEL,
 		     &optval, sizeof(optval)) == -1)
 			err(1, "setsockopt(IPV6_AUTH_TRANS_LEVEL)");
 #else /* old def */
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_AUTH_LEVEL,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "setsockopt(IPV6_AUTH_LEVEL)");
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_AUTH_LEVEL,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "setsockopt(IPV6_AUTH_LEVEL)");
 #endif
 	}
 	if (options & F_ENCRYPT) {
 		optval = IPSEC_LEVEL_REQUIRE;
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_ESP_TRANS_LEVEL,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "setsockopt(IPV6_ESP_TRANS_LEVEL)");
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_ESP_TRANS_LEVEL,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "setsockopt(IPV6_ESP_TRANS_LEVEL)");
 	}
 #endif /*IPSEC_POLICY_IPSEC*/
 #endif
 
 #ifdef ICMP6_FILTER
     {
 	struct icmp6_filter filt;
 	if (!(options & F_VERBOSE)) {
 		ICMP6_FILTER_SETBLOCKALL(&filt);
 		if ((options & F_FQDN) || (options & F_FQDNOLD) ||
 		    (options & F_NODEADDR) || (options & F_SUPTYPES))
 			ICMP6_FILTER_SETPASS(ICMP6_NI_REPLY, &filt);
 		else
 			ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filt);
 	} else {
 		ICMP6_FILTER_SETPASSALL(&filt);
 	}
 	if (setsockopt(srecv, IPPROTO_ICMPV6, ICMP6_FILTER, &filt,
 	    sizeof(filt)) < 0)
 		err(1, "setsockopt(ICMP6_FILTER)");
     }
 #endif /*ICMP6_FILTER*/
 
 	/* let the kerel pass extension headers of incoming packets */
 	if ((options & F_VERBOSE) != 0) {
 		int opton = 1;
 
 #ifdef IPV6_RECVRTHDR
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RECVRTHDR, &opton,
 		    sizeof(opton)))
 			err(1, "setsockopt(IPV6_RECVRTHDR)");
 #else  /* old adv. API */
 		if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RTHDR, &opton,
 		    sizeof(opton)))
 			err(1, "setsockopt(IPV6_RTHDR)");
 #endif
 	}
 
 /*
 	optval = 1;
 	if (IN6_IS_ADDR_MULTICAST(&dst.sin6_addr))
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
 		    &optval, sizeof(optval)) == -1)
 			err(1, "IPV6_MULTICAST_LOOP");
 */
 
 	/* Specify the outgoing interface and/or the source address */
 	if (usepktinfo)
 		ip6optlen += CMSG_SPACE(sizeof(struct in6_pktinfo));
 
 	if (hoplimit != -1)
 		ip6optlen += CMSG_SPACE(sizeof(int));
 
 	/* set IP6 packet options */
 	if (ip6optlen) {
 		if ((scmsg = (char *)malloc(ip6optlen)) == NULL)
 			errx(1, "can't allocate enough memory");
 		smsghdr.msg_control = (caddr_t)scmsg;
 		smsghdr.msg_controllen = ip6optlen;
 		scmsgp = CMSG_FIRSTHDR(&smsghdr);
 	}
 	if (usepktinfo) {
 		cmsg_pktinfo = CMSG_DATA(scmsgp);
 		scmsgp->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
 		scmsgp->cmsg_level = IPPROTO_IPV6;
 		scmsgp->cmsg_type = IPV6_PKTINFO;
 		scmsgp = CMSG_NXTHDR(&smsghdr, scmsgp);
 	}
 
 	/* set the outgoing interface */
 	if (ifname) {
 #ifndef USE_SIN6_SCOPE_ID
 		/* pktinfo must have already been allocated */
 		if ((pktinfo.ipi6_ifindex = if_nametoindex(ifname)) == 0)
 			errx(1, "%s: invalid interface name", ifname);
 #else
 		if ((dst.sin6_scope_id = if_nametoindex(ifname)) == 0)
 			errx(1, "%s: invalid interface name", ifname);
 #endif
 	}
 	if (hoplimit != -1) {
 		scmsgp->cmsg_len = CMSG_LEN(sizeof(int));
 		scmsgp->cmsg_level = IPPROTO_IPV6;
 		scmsgp->cmsg_type = IPV6_HOPLIMIT;
 		memcpy(CMSG_DATA(scmsgp), &hoplimit, sizeof(hoplimit));
 
 		scmsgp = CMSG_NXTHDR(&smsghdr, scmsgp);
 	}
 
 	if (tclass != -1) {
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_TCLASS,
 		    &tclass, sizeof(tclass)) == -1)
 			err(1, "setsockopt(IPV6_TCLASS)");
 	}
 
 	if (pcp != -2) {
 		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_VLAN_PCP,
 		    &pcp, sizeof(pcp)) == -1)
 			err(1, "setsockopt(IPV6_VLAN_PCP)");
 	}
 
 	if (argc > 1) {	/* some intermediate addrs are specified */
 		int hops;
 		int rthdrlen;
 
 		rthdrlen = inet6_rth_space(IPV6_RTHDR_TYPE_0, argc - 1);
 		scmsgp->cmsg_len = CMSG_LEN(rthdrlen);
 		scmsgp->cmsg_level = IPPROTO_IPV6;
 		scmsgp->cmsg_type = IPV6_RTHDR;
 		rthdr = (struct ip6_rthdr *)CMSG_DATA(scmsgp);
 		rthdr = inet6_rth_init((void *)rthdr, rthdrlen,
 		    IPV6_RTHDR_TYPE_0, argc - 1);
 		if (rthdr == NULL)
 			errx(1, "can't initialize rthdr");
 
 		for (hops = 0; hops < argc - 1; hops++) {
 			memset(&hints, 0, sizeof(hints));
 			hints.ai_family = AF_INET6;
 
 			if ((error = cap_getaddrinfo(capdns, argv[hops], NULL, &hints,
 			    &res)))
 				errx(1, "%s", gai_strerror(error));
 			if (res->ai_addr->sa_family != AF_INET6)
 				errx(1,
 				    "bad addr family of an intermediate addr");
 			sin6 = (struct sockaddr_in6 *)(void *)res->ai_addr;
 			if (inet6_rth_add(rthdr, &sin6->sin6_addr))
 				errx(1, "can't add an intermediate node");
 			freeaddrinfo(res);
 		}
 
 		scmsgp = CMSG_NXTHDR(&smsghdr, scmsgp);
 	}
 
 	/* From now on we will use only reverse DNS lookups. */
 #ifdef WITH_CASPER
 	if (capdns != NULL) {
 		const char *types[1];
 
 		types[0] = "ADDR2NAME";
 		if (cap_dns_type_limit(capdns, types, nitems(types)) < 0)
 			err(1, "unable to limit access to system.dns service");
 	}
 #endif
 	if (!(options & F_SRCADDR)) {
 		/*
 		 * get the source address. XXX since we revoked the root
 		 * privilege, we cannot use a raw socket for this.
 		 */
 		int dummy;
 		socklen_t len = sizeof(src);
 
 		if ((dummy = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
 			err(1, "UDP socket");
 
 		src.sin6_family = AF_INET6;
 		src.sin6_addr = dst.sin6_addr;
 		src.sin6_port = ntohs(DUMMY_PORT);
 		src.sin6_scope_id = dst.sin6_scope_id;
 
 		if (usepktinfo &&
 		    setsockopt(dummy, IPPROTO_IPV6, IPV6_PKTINFO,
 		    (void *)&pktinfo, sizeof(pktinfo)))
 			err(1, "UDP setsockopt(IPV6_PKTINFO)");
 
 		if (hoplimit != -1 &&
 		    setsockopt(dummy, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
 		    (void *)&hoplimit, sizeof(hoplimit)))
 			err(1, "UDP setsockopt(IPV6_UNICAST_HOPS)");
 
 		if (hoplimit != -1 &&
 		    setsockopt(dummy, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
 		    (void *)&hoplimit, sizeof(hoplimit)))
 			err(1, "UDP setsockopt(IPV6_MULTICAST_HOPS)");
 
 		if (rthdr &&
 		    setsockopt(dummy, IPPROTO_IPV6, IPV6_RTHDR,
 		    (void *)rthdr, (rthdr->ip6r_len + 1) << 3))
 			err(1, "UDP setsockopt(IPV6_RTHDR)");
 
 		if (connect(dummy, (struct sockaddr *)&src, len) < 0)
 			err(1, "UDP connect");
 
 		if (getsockname(dummy, (struct sockaddr *)&src, &len) < 0)
 			err(1, "getsockname");
 
 		close(dummy);
 	}
 
 	/* Save pktinfo in the ancillary data. */
 	if (usepktinfo)
 		memcpy(cmsg_pktinfo, &pktinfo, sizeof(pktinfo));
 
 	if (connect(ssend, (struct sockaddr *)&dst, sizeof(dst)) != 0)
 		err(1, "connect() ssend");
 
 	caph_cache_catpages();
 	if (caph_enter_casper() < 0)
 		err(1, "caph_enter_casper");
 
 	cap_rights_init(&rights_stdin);
 	if (caph_rights_limit(STDIN_FILENO, &rights_stdin) < 0)
 		err(1, "caph_rights_limit stdin");
 	if (caph_limit_stdout() < 0)
 		err(1, "caph_limit_stdout");
 	if (caph_limit_stderr() < 0)
 		err(1, "caph_limit_stderr");
 
 	cap_rights_init(&rights_srecv, CAP_RECV, CAP_EVENT, CAP_SETSOCKOPT);
 	if (caph_rights_limit(srecv, &rights_srecv) < 0)
 		err(1, "caph_rights_limit srecv");
 	cap_rights_init(&rights_ssend, CAP_SEND, CAP_SETSOCKOPT);
 	if (caph_rights_limit(ssend, &rights_ssend) < 0)
 		err(1, "caph_rights_limit ssend");
 
 #if defined(SO_SNDBUF) && defined(SO_RCVBUF)
 	if (sockbufsize) {
 		if (datalen > (size_t)sockbufsize)
 			warnx("you need -b to increase socket buffer size");
 		if (setsockopt(ssend, SOL_SOCKET, SO_SNDBUF, &sockbufsize,
 		    sizeof(sockbufsize)) < 0)
 			err(1, "setsockopt(SO_SNDBUF)");
 		if (setsockopt(srecv, SOL_SOCKET, SO_RCVBUF, &sockbufsize,
 		    sizeof(sockbufsize)) < 0)
 			err(1, "setsockopt(SO_RCVBUF)");
 	}
 	else {
 		if (datalen > 8 * 1024)	/*XXX*/
 			warnx("you need -b to increase socket buffer size");
 		/*
 		 * When pinging the broadcast address, you can get a lot of
 		 * answers. Doing something so evil is useful if you are trying
 		 * to stress the ethernet, or just want to fill the arp cache
 		 * to get some stuff for /etc/ethers.
 		 */
 		hold = 48 * 1024;
 		setsockopt(srecv, SOL_SOCKET, SO_RCVBUF, (char *)&hold,
 		    sizeof(hold));
 	}
 #endif
 
 	optval = 1;
 #ifndef USE_SIN6_SCOPE_ID
 #ifdef IPV6_RECVPKTINFO
 	if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RECVPKTINFO, &optval,
 	    sizeof(optval)) < 0)
 		warn("setsockopt(IPV6_RECVPKTINFO)"); /* XXX err? */
 #else  /* old adv. API */
 	if (setsockopt(srecv, IPPROTO_IPV6, IPV6_PKTINFO, &optval,
 	    sizeof(optval)) < 0)
 		warn("setsockopt(IPV6_PKTINFO)"); /* XXX err? */
 #endif
 #endif /* USE_SIN6_SCOPE_ID */
 #ifdef IPV6_RECVHOPLIMIT
 	if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &optval,
 	    sizeof(optval)) < 0)
 		warn("setsockopt(IPV6_RECVHOPLIMIT)"); /* XXX err? */
 #else  /* old adv. API */
 	if (setsockopt(srecv, IPPROTO_IPV6, IPV6_HOPLIMIT, &optval,
 	    sizeof(optval)) < 0)
 		warn("setsockopt(IPV6_HOPLIMIT)"); /* XXX err? */
 #endif
 
 	cap_rights_clear(&rights_srecv, CAP_SETSOCKOPT);
 	if (caph_rights_limit(srecv, &rights_srecv) < 0)
 		err(1, "caph_rights_limit srecv setsockopt");
 	cap_rights_clear(&rights_ssend, CAP_SETSOCKOPT);
 	if (caph_rights_limit(ssend, &rights_ssend) < 0)
 		err(1, "caph_rights_limit ssend setsockopt");
 
 	printf("PING(%lu=40+8+%lu bytes) ", (unsigned long)(40 + pingerlen()),
 	    (unsigned long)(pingerlen() - 8));
 	printf("%s --> ", pr_addr((struct sockaddr *)&src, sizeof(src)));
 	printf("%s\n", pr_addr((struct sockaddr *)&dst, sizeof(dst)));
 
 	if (preload == 0)
 		pinger();
 	else {
 		if (npackets != 0 && preload > npackets)
 			preload = npackets;
 		while (preload--)
 			pinger();
 	}
 	clock_gettime(CLOCK_MONOTONIC, &last);
 
 	sigemptyset(&si_sa.sa_mask);
 	si_sa.sa_flags = 0;
 	si_sa.sa_handler = onsignal;
 	if (sigaction(SIGINT, &si_sa, 0) == -1)
 		err(EX_OSERR, "sigaction SIGINT");
 	seenint = 0;
 	if (sigaction(SIGINFO, &si_sa, 0) == -1)
 		err(EX_OSERR, "sigaction SIGINFO");
 	seeninfo = 0;
 	if (alarmtimeout > 0) {
 		if (sigaction(SIGALRM, &si_sa, 0) == -1)
 			err(EX_OSERR, "sigaction SIGALRM");
 	}
 	if (options & F_FLOOD) {
 		intvl.tv_sec = 0;
 		intvl.tv_nsec = 10000000;
 	}
 
 	almost_done = 0;
 	while (seenint == 0) {
 		struct timespec now, timeout;
 		struct msghdr m;
 		struct iovec iov[2];
 		fd_set rfds;
 		int n;
 
 		/* signal handling */
 		if (seeninfo) {
 			pr_summary(stderr);
 			seeninfo = 0;
 			continue;
 		}
 		FD_ZERO(&rfds);
 		FD_SET(srecv, &rfds);
 		clock_gettime(CLOCK_MONOTONIC, &now);
 		timespecadd(&last, &intvl, &timeout);
 		timespecsub(&timeout, &now, &timeout);
 		if (timeout.tv_sec < 0)
 			timespecclear(&timeout);
 
 		n = pselect(srecv + 1, &rfds, NULL, NULL, &timeout, NULL);
 		if (n < 0)
 			continue;	/* EINTR */
 		if (n == 1) {
 			m.msg_name = (caddr_t)&from;
 			m.msg_namelen = sizeof(from);
 			memset(&iov, 0, sizeof(iov));
 			iov[0].iov_base = (caddr_t)packet;
 			iov[0].iov_len = packlen;
 			m.msg_iov = iov;
 			m.msg_iovlen = 1;
 			memset(cm, 0, CONTROLLEN);
 			m.msg_control = (void *)cm;
 			m.msg_controllen = CONTROLLEN;
 
 			cc = recvmsg(srecv, &m, 0);
 			if (cc < 0) {
 				if (errno != EINTR) {
 					warn("recvmsg");
 					sleep(1);
 				}
 				continue;
 			} else if (cc == 0) {
 				int mtu;
 
 				/*
 				 * receive control messages only. Process the
 				 * exceptions (currently the only possibility is
 				 * a path MTU notification.)
 				 */
 				if ((mtu = get_pathmtu(&m)) > 0) {
 					if ((options & F_VERBOSE) != 0) {
 						printf("new path MTU (%d) is "
 						    "notified\n", mtu);
 					}
 				}
 				continue;
 			} else {
 				/*
 				 * an ICMPv6 message (probably an echoreply)
 				 * arrived.
 				 */
 				pr_pack(packet, cc, &m);
 			}
 			if (((options & F_ONCE) != 0 && nreceived > 0) ||
 			    (npackets > 0 && nreceived >= npackets))
 				break;
 		}
 		if (n == 0 || (options & F_FLOOD)) {
 			if (npackets == 0 || ntransmitted < npackets)
 				pinger();
 			else {
 				if (almost_done)
 					break;
 				almost_done = 1;
 				/*
 				 * If we're not transmitting any more packets,
 				 * change the timer to wait two round-trip times
 				 * if we've received any packets or (waittime)
 				 * milliseconds if we haven't.
 				 */
 				intvl.tv_nsec = 0;
 				if (nreceived) {
 					intvl.tv_sec = 2 * tmax / 1000;
 					if (intvl.tv_sec == 0)
 						intvl.tv_sec = 1;
 				} else {
 					intvl.tv_sec = waittime / 1000;
 					intvl.tv_nsec =
 					    waittime % 1000 * 1000000;
 				}
 			}
 			clock_gettime(CLOCK_MONOTONIC, &last);
 			if (ntransmitted - nreceived - 1 > nmissedmax) {
 				nmissedmax = ntransmitted - nreceived - 1;
 				if (options & F_MISSED)
 					(void)write(STDOUT_FILENO, &BBELL, 1);
 			}
 		}
 	}
 	sigemptyset(&si_sa.sa_mask);
 	si_sa.sa_flags = 0;
 	si_sa.sa_handler = SIG_IGN;
 	sigaction(SIGINT, &si_sa, 0);
 	sigaction(SIGALRM, &si_sa, 0);
 	pr_summary(stdout);
 
         if(packet != NULL)
                 free(packet);
 
 	if (nreceived > 0)
 		exit(0);
 	else if (ntransmitted > ntransmitfailures)
 		exit(2);
 	else
 		exit(EX_OSERR);
 }
 
 /*
  * pinger --
  *	Compose and transmit an ICMP ECHO REQUEST packet.  The IP packet
  * will be added on by the kernel.  The ID field is our UNIX process ID,
  * and the sequence number is an ascending integer.  The first 8 bytes
  * of the data portion are used to hold a UNIX "timespec" struct in VAX
  * byte-order, to compute the round-trip time.
  */
 static size_t
 pingerlen(void)
 {
 	size_t l;
 
 	if (options & F_FQDN)
 		l = ICMP6_NIQLEN + sizeof(dst.sin6_addr);
 	else if (options & F_FQDNOLD)
 		l = ICMP6_NIQLEN;
 	else if (options & F_NODEADDR)
 		l = ICMP6_NIQLEN + sizeof(dst.sin6_addr);
 	else if (options & F_SUPTYPES)
 		l = ICMP6_NIQLEN;
 	else
 		l = ICMP6ECHOLEN + datalen;
 
 	return l;
 }
 
 static int
 pinger(void)
 {
 	struct icmp6_hdr *icp;
 	struct iovec iov[2];
 	int i, cc;
 	struct icmp6_nodeinfo *nip;
 	uint16_t seq;
 
 	if (npackets && ntransmitted >= npackets)
 		return(-1);	/* no more transmission */
 
 	icp = (struct icmp6_hdr *)outpack;
 	nip = (struct icmp6_nodeinfo *)outpack;
 	memset(icp, 0, sizeof(*icp));
 	icp->icmp6_cksum = 0;
 	seq = ntransmitted++;
 	CLR(seq % mx_dup_ck);
 
 	if (options & F_FQDN) {
 		uint16_t s;
 
 		icp->icmp6_type = ICMP6_NI_QUERY;
 		icp->icmp6_code = ICMP6_NI_SUBJ_IPV6;
 		nip->ni_qtype = htons(NI_QTYPE_FQDN);
 		nip->ni_flags = htons(0);
 
 		memcpy(nip->icmp6_ni_nonce, nonce,
 		    sizeof(nip->icmp6_ni_nonce));
 		s = htons(seq);
 		memcpy(nip->icmp6_ni_nonce, &s, sizeof(s));
 
 		memcpy(&outpack[ICMP6_NIQLEN], &dst.sin6_addr,
 		    sizeof(dst.sin6_addr));
 		cc = ICMP6_NIQLEN + sizeof(dst.sin6_addr);
 		datalen = 0;
 	} else if (options & F_FQDNOLD) {
 		uint16_t s;
 		/* packet format in 03 draft - no Subject data on queries */
 		icp->icmp6_type = ICMP6_NI_QUERY;
 		icp->icmp6_code = 0;	/* code field is always 0 */
 		nip->ni_qtype = htons(NI_QTYPE_FQDN);
 		nip->ni_flags = htons(0);
 
 		memcpy(nip->icmp6_ni_nonce, nonce,
 		    sizeof(nip->icmp6_ni_nonce));
 		s = htons(seq);
 		memcpy(nip->icmp6_ni_nonce, &s, sizeof(s));
 
 		cc = ICMP6_NIQLEN;
 		datalen = 0;
 	} else if (options & F_NODEADDR) {
 		uint16_t s;
 
 		icp->icmp6_type = ICMP6_NI_QUERY;
 		icp->icmp6_code = ICMP6_NI_SUBJ_IPV6;
 		nip->ni_qtype = htons(NI_QTYPE_NODEADDR);
 		nip->ni_flags = naflags;
 
 		memcpy(nip->icmp6_ni_nonce, nonce,
 		    sizeof(nip->icmp6_ni_nonce));
 		s = htons(seq);
 		memcpy(nip->icmp6_ni_nonce, &s, sizeof(s));
 
 		memcpy(&outpack[ICMP6_NIQLEN], &dst.sin6_addr,
 		    sizeof(dst.sin6_addr));
 		cc = ICMP6_NIQLEN + sizeof(dst.sin6_addr);
 		datalen = 0;
 	} else if (options & F_SUPTYPES) {
 		uint16_t s;
 
 		icp->icmp6_type = ICMP6_NI_QUERY;
 		icp->icmp6_code = ICMP6_NI_SUBJ_FQDN;	/*empty*/
 		nip->ni_qtype = htons(NI_QTYPE_SUPTYPES);
 		/* we support compressed bitmap */
 		nip->ni_flags = NI_SUPTYPE_FLAG_COMPRESS;
 
 		memcpy(nip->icmp6_ni_nonce, nonce,
 		    sizeof(nip->icmp6_ni_nonce));
 		s = htons(seq);
 		memcpy(nip->icmp6_ni_nonce, &s, sizeof(s));
 
 		cc = ICMP6_NIQLEN;
 		datalen = 0;
 	} else {
 		icp->icmp6_type = ICMP6_ECHO_REQUEST;
 		icp->icmp6_code = 0;
 		icp->icmp6_id = htons(ident);
 		icp->icmp6_seq = htons(seq);
 		if (timing) {
 			struct timespec tv;
 			struct tv32 tv32;
 			(void)clock_gettime(CLOCK_MONOTONIC, &tv);
 			/*
 			 * Truncate seconds down to 32 bits in order
 			 * to fit the timestamp within 8 bytes of the
 			 * packet. We're only concerned with
 			 * durations, not absolute times.
 			 */
 			tv32.tv32_sec = (uint32_t)htonl(tv.tv_sec);
 			tv32.tv32_nsec = (uint32_t)htonl(tv.tv_nsec);
 			memcpy(&outpack[ICMP6ECHOLEN], &tv32, sizeof(tv32));
 		}
 		cc = ICMP6ECHOLEN + datalen;
 	}
 
 #ifdef DIAGNOSTIC
 	if (pingerlen() != cc)
 		errx(1, "internal error; length mismatch");
 #endif
 
 	memset(&iov, 0, sizeof(iov));
 	iov[0].iov_base = (caddr_t)outpack;
 	iov[0].iov_len = cc;
 	smsghdr.msg_iov = iov;
 	smsghdr.msg_iovlen = 1;
 
 	i = sendmsg(ssend, &smsghdr, 0);
 
 	if (i < 0 || i != cc)  {
 		if (i < 0) {
 			ntransmitfailures++;
 			warn("sendmsg");
 		}
 		(void)printf("ping: wrote %s %d chars, ret=%d\n",
 		    hostname, cc, i);
 	}
 	if (!(options & F_QUIET) && options & F_DOT)
 		(void)write(STDOUT_FILENO, &DOT[DOTidx++ % DOTlen], 1);
 
 	return(0);
 }
 
 static int
 myechoreply(const struct icmp6_hdr *icp)
 {
 	if (ntohs(icp->icmp6_id) == ident)
 		return 1;
 	else
 		return 0;
 }
 
 static int
 mynireply(const struct icmp6_nodeinfo *nip)
 {
 	if (memcmp(nip->icmp6_ni_nonce + sizeof(u_int16_t),
 	    nonce + sizeof(u_int16_t),
 	    sizeof(nonce) - sizeof(u_int16_t)) == 0)
 		return 1;
 	else
 		return 0;
 }
 
 /*
  * Decode a name from a DNS message.
  *
  * Format of the message is described in RFC 1035 subsection 4.1.4.
  *
  * Arguments:
  *   sp     - Pointer to a DNS pointer octet or to the first octet of a label
  *            in the message.
  *   ep     - Pointer to the end of the message (one step past the last octet).
  *   base   - Pointer to the beginning of the message.
  *   buf    - Buffer into which the decoded name will be saved.
  *   bufsiz - Size of the buffer 'buf'.
  *
  * Return value:
  *   Pointer to an octet immediately following the ending zero octet
  *   of the decoded label, or NULL if an error occurred.
  */
 static const char *
 dnsdecode(const u_char *sp, const u_char *ep, const u_char *base, char *buf,
 	size_t bufsiz)
 {
 	int i;
 	const u_char *cp;
 	char cresult[MAXDNAME + 1];
 	const u_char *comp;
 	int l;
 
 	cp = sp;
 	*buf = '\0';
 
 	if (cp >= ep)
 		return NULL;
 	while (cp < ep) {
 		i = *cp;
 		if (i == 0 || cp != sp) {
 			if (strlcat((char *)buf, ".", bufsiz) >= bufsiz)
 				return NULL;	/*result overrun*/
 		}
 		if (i == 0)
 			break;
 		cp++;
 
 		if ((i & 0xc0) == 0xc0 && cp - base > (i & 0x3f)) {
 			/* DNS compression */
 			if (!base)
 				return NULL;
 
 			comp = base + (i & 0x3f);
 			if (dnsdecode(comp, cp, base, cresult,
 			    sizeof(cresult)) == NULL)
 				return NULL;
 			if (strlcat(buf, cresult, bufsiz) >= bufsiz)
 				return NULL;	/*result overrun*/
 			break;
 		} else if ((i & 0x3f) == i) {
 			if (i > ep - cp)
 				return NULL;	/*source overrun*/
 			while (i-- > 0 && cp < ep) {
 				l = snprintf(cresult, sizeof(cresult),
 				    isprint(*cp) ? "%c" : "\\%03o", *cp & 0xff);
 				if ((size_t)l >= sizeof(cresult) || l < 0)
 					return NULL;
 				if (strlcat(buf, cresult, bufsiz) >= bufsiz)
 					return NULL;	/*result overrun*/
 				cp++;
 			}
 		} else
 			return NULL;	/*invalid label*/
 	}
 	if (i != 0)
 		return NULL;	/*not terminated*/
 	cp++;
 	return cp;
 }
 
 /*
  * pr_pack --
  *	Print out the packet, if it came from us.  This logic is necessary
  * because ALL readers of the ICMP socket get a copy of ALL ICMP packets
  * which arrive ('tis only fair).  This permits multiple copies of this
  * program to be run without having intermingled output (or statistics!).
  */
 static void
 pr_pack(u_char *buf, int cc, struct msghdr *mhdr)
 {
 #define safeputc(c)	printf((isprint((c)) ? "%c" : "\\%03o"), c)
 	struct icmp6_hdr *icp;
 	struct icmp6_nodeinfo *ni;
 	int i;
 	int hoplim;
 	struct sockaddr *from;
 	int fromlen;
 	const u_char *cp = NULL;
 	u_char *dp, *end = buf + cc;
 	struct in6_pktinfo *pktinfo = NULL;
 	struct timespec tv, tp;
 	struct tv32 tpp;
 	double triptime = 0;
 	int dupflag;
 	size_t off;
 	int oldfqdn;
 	u_int16_t seq;
 	char dnsname[MAXDNAME + 1];
 
 	(void)clock_gettime(CLOCK_MONOTONIC, &tv);
 
 	if (!mhdr || !mhdr->msg_name ||
 	    mhdr->msg_namelen != sizeof(struct sockaddr_in6) ||
 	    ((struct sockaddr *)mhdr->msg_name)->sa_family != AF_INET6) {
 		if (options & F_VERBOSE)
 			warnx("invalid peername");
 		return;
 	}
 	from = (struct sockaddr *)mhdr->msg_name;
 	fromlen = mhdr->msg_namelen;
 	if (cc < (int)sizeof(struct icmp6_hdr)) {
 		if (options & F_VERBOSE)
 			warnx("packet too short (%d bytes) from %s", cc,
 			    pr_addr(from, fromlen));
 		return;
 	}
 	if (((mhdr->msg_flags & MSG_CTRUNC) != 0) &&
 	    (options & F_VERBOSE) != 0)
 		warnx("some control data discarded, insufficient buffer size");
 	icp = (struct icmp6_hdr *)buf;
 	ni = (struct icmp6_nodeinfo *)buf;
 	off = 0;
 
 	if ((hoplim = get_hoplim(mhdr)) == -1) {
 		warnx("failed to get receiving hop limit");
 		return;
 	}
 	if ((pktinfo = get_rcvpktinfo(mhdr)) == NULL) {
 		warnx("failed to get receiving packet information");
 		return;
 	}
 
 	if (icp->icmp6_type == ICMP6_ECHO_REPLY && myechoreply(icp)) {
 		seq = ntohs(icp->icmp6_seq);
 		++nreceived;
 		if (timing) {
 			memcpy(&tpp, icp + 1, sizeof(tpp));
 			tp.tv_sec = ntohl(tpp.tv32_sec);
 			tp.tv_nsec = ntohl(tpp.tv32_nsec);
 			timespecsub(&tv, &tp, &tv);
 			triptime = ((double)tv.tv_sec) * 1000.0 +
 			    ((double)tv.tv_nsec) / 1000000.0;
 			tsum += triptime;
 			tsumsq += triptime * triptime;
 			if (triptime < tmin)
 				tmin = triptime;
 			if (triptime > tmax)
 				tmax = triptime;
 		}
 
 		if (TST(seq % mx_dup_ck)) {
 			++nrepeats;
 			--nreceived;
 			dupflag = 1;
 		} else {
 			SET(seq % mx_dup_ck);
 			dupflag = 0;
 		}
 
 		if (options & F_QUIET)
 			return;
 
 		if (options & F_WAITTIME && triptime > waittime) {
 			++nrcvtimeout;
 			return;
 		}
 
 		if (options & F_DOT)
 			(void)write(STDOUT_FILENO, &BSPACE, 1);
 		else {
 			if (options & F_AUDIBLE)
 				(void)write(STDOUT_FILENO, &BBELL, 1);
 			(void)printf("%d bytes from %s, icmp_seq=%u", cc,
 			    pr_addr(from, fromlen), seq);
 			(void)printf(" hlim=%d", hoplim);
 			if ((options & F_VERBOSE) != 0) {
 				struct sockaddr_in6 dstsa;
 
 				memset(&dstsa, 0, sizeof(dstsa));
 				dstsa.sin6_family = AF_INET6;
 				dstsa.sin6_len = sizeof(dstsa);
 				dstsa.sin6_scope_id = pktinfo->ipi6_ifindex;
 				dstsa.sin6_addr = pktinfo->ipi6_addr;
 				(void)printf(" dst=%s",
 				    pr_addr((struct sockaddr *)&dstsa,
 				    sizeof(dstsa)));
 			}
 			if (timing)
 				(void)printf(" time=%.3f ms", triptime);
 			if (dupflag)
 				(void)printf("(DUP!)");
 			/* check the data */
 			cp = buf + off + ICMP6ECHOLEN + ICMP6ECHOTMLEN;
 			dp = outpack + ICMP6ECHOLEN + ICMP6ECHOTMLEN;
 			for (i = 8; cp < end; ++i, ++cp, ++dp) {
 				if (*cp != *dp) {
 					(void)printf("\nwrong data byte #%d should be 0x%x but was 0x%x", i, *dp, *cp);
 					break;
 				}
 			}
 		}
 	} else if (icp->icmp6_type == ICMP6_NI_REPLY && mynireply(ni)) {
 		memcpy(&seq, ni->icmp6_ni_nonce, sizeof(seq));
 		seq = ntohs(seq);
 		++nreceived;
 		if (TST(seq % mx_dup_ck)) {
 			++nrepeats;
 			--nreceived;
 			dupflag = 1;
 		} else {
 			SET(seq % mx_dup_ck);
 			dupflag = 0;
 		}
 
 		if (options & F_QUIET)
 			return;
 
 		(void)printf("%d bytes from %s: ", cc, pr_addr(from, fromlen));
 
 		switch (ntohs(ni->ni_code)) {
 		case ICMP6_NI_SUCCESS:
 			break;
 		case ICMP6_NI_REFUSED:
 			printf("refused, type 0x%x", ntohs(ni->ni_type));
 			goto fqdnend;
 		case ICMP6_NI_UNKNOWN:
 			printf("unknown, type 0x%x", ntohs(ni->ni_type));
 			goto fqdnend;
 		default:
 			printf("unknown code 0x%x, type 0x%x",
 			    ntohs(ni->ni_code), ntohs(ni->ni_type));
 			goto fqdnend;
 		}
 
 		switch (ntohs(ni->ni_qtype)) {
 		case NI_QTYPE_NOOP:
 			printf("NodeInfo NOOP");
 			break;
 		case NI_QTYPE_SUPTYPES:
 			pr_suptypes(ni, end - (u_char *)ni);
 			break;
 		case NI_QTYPE_NODEADDR:
 			pr_nodeaddr(ni, end - (u_char *)ni);
 			break;
 		case NI_QTYPE_FQDN:
 		default:	/* XXX: for backward compatibility */
 			cp = (u_char *)ni + ICMP6_NIRLEN;
 			if (buf[off + ICMP6_NIRLEN] ==
 			    cc - off - ICMP6_NIRLEN - 1)
 				oldfqdn = 1;
 			else
 				oldfqdn = 0;
 			if (oldfqdn) {
 				cp++;	/* skip length */
 				while (cp < end) {
 					safeputc(*cp & 0xff);
 					cp++;
 				}
 			} else {
 				i = 0;
 				while (cp < end) {
 					cp = dnsdecode((const u_char *)cp, end,
 					    (const u_char *)(ni + 1), dnsname,
 					    sizeof(dnsname));
 					if (cp == NULL) {
 						printf("???");
 						break;
 					}
 					/*
 					 * name-lookup special handling for
 					 * truncated name
 					 */
 					if (cp + 1 <= end && !*cp &&
 					    strlen(dnsname) > 0) {
 						dnsname[strlen(dnsname) - 1] = '\0';
 						cp++;
 					}
 					printf("%s%s", i > 0 ? "," : "",
 					    dnsname);
 				}
 			}
 			if (options & F_VERBOSE) {
 				u_long t;
 				int32_t ttl;
 				int comma = 0;
 
 				(void)printf(" (");	/*)*/
 
 				switch (ni->ni_code) {
 				case ICMP6_NI_REFUSED:
 					(void)printf("refused");
 					comma++;
 					break;
 				case ICMP6_NI_UNKNOWN:
 					(void)printf("unknown qtype");
 					comma++;
 					break;
 				}
 
 				if ((end - (u_char *)ni) < ICMP6_NIRLEN) {
 					/* case of refusion, unknown */
 					/*(*/
 					putchar(')');
 					goto fqdnend;
 				}
 				memcpy(&t, &buf[off+ICMP6ECHOLEN+8], sizeof(t));
 				ttl = (int32_t)ntohl(t);
 				if (comma)
 					printf(",");
 				if (!(ni->ni_flags & NI_FQDN_FLAG_VALIDTTL)) {
 					(void)printf("TTL=%d:meaningless",
 					    (int)ttl);
 				} else {
 					if (ttl < 0) {
 						(void)printf("TTL=%d:invalid",
 						   ttl);
 					} else
 						(void)printf("TTL=%d", ttl);
 				}
 				comma++;
 
 				if (oldfqdn) {
 					if (comma)
 						printf(",");
 					printf("03 draft");
 					comma++;
 				} else {
 					cp = (u_char *)ni + ICMP6_NIRLEN;
 					if (cp == end) {
 						if (comma)
 							printf(",");
 						printf("no name");
 						comma++;
 					}
 				}
 
 				if (buf[off + ICMP6_NIRLEN] !=
 				    cc - off - ICMP6_NIRLEN - 1 && oldfqdn) {
 					if (comma)
 						printf(",");
 					(void)printf("invalid namelen:%d/%lu",
 					    buf[off + ICMP6_NIRLEN],
 					    (u_long)cc - off - ICMP6_NIRLEN - 1);
 					comma++;
 				}
 				/*(*/
 				putchar(')');
 			}
 		fqdnend:
 			;
 		}
 	} else {
 		/* We've got something other than an ECHOREPLY */
 		if (!(options & F_VERBOSE))
 			return;
 		(void)printf("%d bytes from %s: ", cc, pr_addr(from, fromlen));
 		pr_icmph(icp, end);
 	}
 
 	if (!(options & F_DOT)) {
 		(void)putchar('\n');
 		if (options & F_VERBOSE)
 			pr_exthdrs(mhdr);
 		(void)fflush(stdout);
 	}
 #undef safeputc
 }
 
 static void
 pr_exthdrs(struct msghdr *mhdr)
 {
 	ssize_t	bufsize;
 	void	*bufp;
 	struct cmsghdr *cm;
 
 	bufsize = 0;
 	bufp = mhdr->msg_control;
 	for (cm = (struct cmsghdr *)CMSG_FIRSTHDR(mhdr); cm;
 	     cm = (struct cmsghdr *)CMSG_NXTHDR(mhdr, cm)) {
 		if (cm->cmsg_level != IPPROTO_IPV6)
 			continue;
 
 		bufsize = CONTROLLEN - ((caddr_t)CMSG_DATA(cm) - (caddr_t)bufp);
 		if (bufsize <= 0)
 			continue;
 		switch (cm->cmsg_type) {
 		case IPV6_HOPOPTS:
 			printf("  HbH Options: ");
 			pr_ip6opt(CMSG_DATA(cm), (size_t)bufsize);
 			break;
 		case IPV6_DSTOPTS:
 #ifdef IPV6_RTHDRDSTOPTS
 		case IPV6_RTHDRDSTOPTS:
 #endif
 			printf("  Dst Options: ");
 			pr_ip6opt(CMSG_DATA(cm), (size_t)bufsize);
 			break;
 		case IPV6_RTHDR:
 			printf("  Routing: ");
 			pr_rthdr(CMSG_DATA(cm), (size_t)bufsize);
 			break;
 		}
 	}
 }
 
 static void
 pr_ip6opt(void *extbuf, size_t bufsize)
 {
 	struct ip6_hbh *ext;
 	int currentlen;
 	u_int8_t type;
 	socklen_t extlen, len;
 	void *databuf;
 	size_t offset;
 	u_int16_t value2;
 	u_int32_t value4;
 
 	ext = (struct ip6_hbh *)extbuf;
 	extlen = (ext->ip6h_len + 1) * 8;
 	printf("nxt %u, len %u (%lu bytes)\n", ext->ip6h_nxt,
 	    (unsigned int)ext->ip6h_len, (unsigned long)extlen);
 
 	/*
 	 * Bounds checking on the ancillary data buffer:
 	 *     subtract the size of a cmsg structure from the buffer size.
 	 */
 	if (bufsize < (extlen  + CMSG_SPACE(0))) {
 		extlen = bufsize - CMSG_SPACE(0);
 		warnx("options truncated, showing only %u (total=%u)",
 		    (unsigned int)(extlen / 8 - 1),
 		    (unsigned int)(ext->ip6h_len));
 	}
 
 	currentlen = 0;
 	while (1) {
 		currentlen = inet6_opt_next(extbuf, extlen, currentlen,
 		    &type, &len, &databuf);
 		if (currentlen == -1)
 			break;
 		switch (type) {
 		/*
 		 * Note that inet6_opt_next automatically skips any padding
 		 * optins.
 		 */
 		case IP6OPT_JUMBO:
 			offset = 0;
 			offset = inet6_opt_get_val(databuf, offset,
 			    &value4, sizeof(value4));
 			printf("    Jumbo Payload Opt: Length %u\n",
 			    (u_int32_t)ntohl(value4));
 			break;
 		case IP6OPT_ROUTER_ALERT:
 			offset = 0;
 			offset = inet6_opt_get_val(databuf, offset,
 						   &value2, sizeof(value2));
 			printf("    Router Alert Opt: Type %u\n",
 			    ntohs(value2));
 			break;
 		default:
 			printf("    Received Opt %u len %lu\n",
 			    type, (unsigned long)len);
 			break;
 		}
 	}
 	return;
 }
 
 static void
 pr_rthdr(void *extbuf, size_t bufsize)
 {
 	struct in6_addr *in6;
 	char ntopbuf[INET6_ADDRSTRLEN];
 	struct ip6_rthdr *rh = (struct ip6_rthdr *)extbuf;
 	int i, segments, origsegs, rthsize, size0, size1;
 
 	/* print fixed part of the header */
 	printf("nxt %u, len %u (%d bytes), type %u, ", rh->ip6r_nxt,
 	    rh->ip6r_len, (rh->ip6r_len + 1) << 3, rh->ip6r_type);
 	if ((segments = inet6_rth_segments(extbuf)) >= 0) {
 		printf("%d segments, ", segments);
 		printf("%d left\n", rh->ip6r_segleft);
 	} else {
 		printf("segments unknown, ");
 		printf("%d left\n", rh->ip6r_segleft);
 		return;
 	}
 
 	/*
 	 * Bounds checking on the ancillary data buffer. When calculating
 	 * the number of items to show keep in mind:
 	 *	- The size of the cmsg structure
 	 *	- The size of one segment (the size of a Type 0 routing header)
 	 *	- When dividing add a fudge factor of one in case the
 	 *	  dividend is not evenly divisible by the divisor
 	 */
 	rthsize = (rh->ip6r_len + 1) * 8;
 	if (bufsize < (rthsize + CMSG_SPACE(0))) {
 		origsegs = segments;
 		size0 = inet6_rth_space(IPV6_RTHDR_TYPE_0, 0);
 		size1 = inet6_rth_space(IPV6_RTHDR_TYPE_0, 1);
 		segments -= (rthsize - (bufsize - CMSG_SPACE(0))) /
 		    (size1 - size0) + 1;
 		warnx("segments truncated, showing only %d (total=%d)",
 		    segments, origsegs);
 	}
 
 	for (i = 0; i < segments; i++) {
 		in6 = inet6_rth_getaddr(extbuf, i);
 		if (in6 == NULL)
 			printf("   [%d]<NULL>\n", i);
 		else {
 			if (!inet_ntop(AF_INET6, in6, ntopbuf,
 			    sizeof(ntopbuf)))
 				strlcpy(ntopbuf, "?", sizeof(ntopbuf));
 			printf("   [%d]%s\n", i, ntopbuf);
 		}
 	}
 
 	return;
 
 }
 
 static int
 pr_bitrange(u_int32_t v, int soff, int ii)
 {
 	int off;
 	int i;
 
 	off = 0;
 	while (off < 32) {
 		/* shift till we have 0x01 */
 		if ((v & 0x01) == 0) {
 			if (ii > 1)
 				printf("-%u", soff + off - 1);
 			ii = 0;
 			switch (v & 0x0f) {
 			case 0x00:
 				v >>= 4;
 				off += 4;
 				continue;
 			case 0x08:
 				v >>= 3;
 				off += 3;
 				continue;
 			case 0x04: case 0x0c:
 				v >>= 2;
 				off += 2;
 				continue;
 			default:
 				v >>= 1;
 				off += 1;
 				continue;
 			}
 		}
 
 		/* we have 0x01 with us */
 		for (i = 0; i < 32 - off; i++) {
 			if ((v & (0x01 << i)) == 0)
 				break;
 		}
 		if (!ii)
 			printf(" %u", soff + off);
 		ii += i;
 		v >>= i; off += i;
 	}
 	return ii;
 }
 
 static void
 pr_suptypes(struct icmp6_nodeinfo *ni, size_t nilen)
 	/* ni->qtype must be SUPTYPES */
 {
 	size_t clen;
 	u_int32_t v;
 	const u_char *cp, *end;
 	u_int16_t cur;
 	struct cbit {
 		u_int16_t words;	/*32bit count*/
 		u_int16_t skip;
 	} cbit;
 #define MAXQTYPES	(1 << 16)
 	size_t off;
 	int b;
 
 	cp = (u_char *)(ni + 1);
 	end = ((u_char *)ni) + nilen;
 	cur = 0;
 	b = 0;
 
 	printf("NodeInfo Supported Qtypes");
 	if (options & F_VERBOSE) {
 		if (ni->ni_flags & NI_SUPTYPE_FLAG_COMPRESS)
 			printf(", compressed bitmap");
 		else
 			printf(", raw bitmap");
 	}
 
 	while (cp < end) {
 		clen = (size_t)(end - cp);
 		if ((ni->ni_flags & NI_SUPTYPE_FLAG_COMPRESS) == 0) {
 			if (clen == 0 || clen > MAXQTYPES / 8 ||
 			    clen % sizeof(v)) {
 				printf("???");
 				return;
 			}
 		} else {
 			if (clen < sizeof(cbit) || clen % sizeof(v))
 				return;
 			memcpy(&cbit, cp, sizeof(cbit));
 			if (sizeof(cbit) + ntohs(cbit.words) * sizeof(v) >
 			    clen)
 				return;
 			cp += sizeof(cbit);
 			clen = ntohs(cbit.words) * sizeof(v);
 			if (cur + clen * 8 + (u_long)ntohs(cbit.skip) * 32 >
 			    MAXQTYPES)
 				return;
 		}
 
 		for (off = 0; off < clen; off += sizeof(v)) {
 			memcpy(&v, cp + off, sizeof(v));
 			v = (u_int32_t)ntohl(v);
 			b = pr_bitrange(v, (int)(cur + off * 8), b);
 		}
 		/* flush the remaining bits */
 		b = pr_bitrange(0, (int)(cur + off * 8), b);
 
 		cp += clen;
 		cur += clen * 8;
 		if ((ni->ni_flags & NI_SUPTYPE_FLAG_COMPRESS) != 0)
 			cur += ntohs(cbit.skip) * 32;
 	}
 }
 
 static void
 pr_nodeaddr(struct icmp6_nodeinfo *ni, int nilen)
 	/* ni->qtype must be NODEADDR */
 {
 	u_char *cp = (u_char *)(ni + 1);
 	char ntop_buf[INET6_ADDRSTRLEN];
 	int withttl = 0;
 
 	nilen -= sizeof(struct icmp6_nodeinfo);
 
 	if (options & F_VERBOSE) {
 		switch (ni->ni_code) {
 		case ICMP6_NI_REFUSED:
 			(void)printf("refused");
 			break;
 		case ICMP6_NI_UNKNOWN:
 			(void)printf("unknown qtype");
 			break;
 		}
 		if (ni->ni_flags & NI_NODEADDR_FLAG_TRUNCATE)
 			(void)printf(" truncated");
 	}
 	putchar('\n');
 	if (nilen <= 0)
 		printf("  no address\n");
 
 	/*
 	 * In icmp-name-lookups 05 and later, TTL of each returned address
 	 * is contained in the resposne. We try to detect the version
 	 * by the length of the data, but note that the detection algorithm
 	 * is incomplete. We assume the latest draft by default.
 	 */
 	if (nilen % (sizeof(u_int32_t) + sizeof(struct in6_addr)) == 0)
 		withttl = 1;
 	while (nilen > 0) {
 		u_int32_t ttl = 0;
 
 		if (withttl) {
 			uint32_t t;
 
 			memcpy(&t, cp, sizeof(t));
 			ttl = (u_int32_t)ntohl(t);
 			cp += sizeof(u_int32_t);
 			nilen -= sizeof(u_int32_t);
 		}
 
 		if (inet_ntop(AF_INET6, cp, ntop_buf, sizeof(ntop_buf)) ==
 		    NULL)
 			strlcpy(ntop_buf, "?", sizeof(ntop_buf));
 		printf("  %s", ntop_buf);
 		if (withttl) {
 			if (ttl == 0xffffffff) {
 				/*
 				 * XXX: can this convention be applied to all
 				 * type of TTL (i.e. non-ND TTL)?
 				 */
 				printf("(TTL=infty)");
 			}
 			else
 				printf("(TTL=%u)", ttl);
 		}
 		putchar('\n');
 
 		nilen -= sizeof(struct in6_addr);
 		cp += sizeof(struct in6_addr);
 	}
 }
 
 static int
 get_hoplim(struct msghdr *mhdr)
 {
 	struct cmsghdr *cm;
 
 	for (cm = (struct cmsghdr *)CMSG_FIRSTHDR(mhdr); cm;
 	     cm = (struct cmsghdr *)CMSG_NXTHDR(mhdr, cm)) {
 		if (cm->cmsg_len == 0)
 			return(-1);
 
 		if (cm->cmsg_level == IPPROTO_IPV6 &&
 		    cm->cmsg_type == IPV6_HOPLIMIT &&
 		    cm->cmsg_len == CMSG_LEN(sizeof(int))) {
 			int r;
 
 			memcpy(&r, CMSG_DATA(cm), sizeof(r));
 			return(r);
 		}
 	}
 
 	return(-1);
 }
 
 static struct in6_pktinfo *
 get_rcvpktinfo(struct msghdr *mhdr)
 {
 	static struct in6_pktinfo pi;
 	struct cmsghdr *cm;
 
 	for (cm = (struct cmsghdr *)CMSG_FIRSTHDR(mhdr); cm;
 	     cm = (struct cmsghdr *)CMSG_NXTHDR(mhdr, cm)) {
 		if (cm->cmsg_len == 0)
 			return(NULL);
 
 		if (cm->cmsg_level == IPPROTO_IPV6 &&
 		    cm->cmsg_type == IPV6_PKTINFO &&
 		    cm->cmsg_len == CMSG_LEN(sizeof(struct in6_pktinfo))) {
 			memcpy(&pi, CMSG_DATA(cm), sizeof(pi));
 			return(&pi);
 		}
 	}
 
 	return(NULL);
 }
 
 static int
 get_pathmtu(struct msghdr *mhdr)
 {
 #ifdef IPV6_RECVPATHMTU
 	struct cmsghdr *cm;
 	struct ip6_mtuinfo mtuctl;
 
 	for (cm = (struct cmsghdr *)CMSG_FIRSTHDR(mhdr); cm;
 	     cm = (struct cmsghdr *)CMSG_NXTHDR(mhdr, cm)) {
 		if (cm->cmsg_len == 0)
 			return(0);
 
 		if (cm->cmsg_level == IPPROTO_IPV6 &&
 		    cm->cmsg_type == IPV6_PATHMTU &&
 		    cm->cmsg_len == CMSG_LEN(sizeof(struct ip6_mtuinfo))) {
 			memcpy(&mtuctl, CMSG_DATA(cm), sizeof(mtuctl));
 
 			/*
 			 * If the notified destination is different from
 			 * the one we are pinging, just ignore the info.
 			 * We check the scope ID only when both notified value
 			 * and our own value have non-0 values, because we may
 			 * have used the default scope zone ID for sending,
 			 * in which case the scope ID value is 0.
 			 */
 			if (!IN6_ARE_ADDR_EQUAL(&mtuctl.ip6m_addr.sin6_addr,
 						&dst.sin6_addr) ||
 			    (mtuctl.ip6m_addr.sin6_scope_id &&
 			     dst.sin6_scope_id &&
 			     mtuctl.ip6m_addr.sin6_scope_id !=
 			     dst.sin6_scope_id)) {
 				if ((options & F_VERBOSE) != 0) {
 					printf("path MTU for %s is notified. "
 					       "(ignored)\n",
 					   pr_addr((struct sockaddr *)&mtuctl.ip6m_addr,
 					   sizeof(mtuctl.ip6m_addr)));
 				}
 				return(0);
 			}
 
 			/*
 			 * Ignore an invalid MTU. XXX: can we just believe
 			 * the kernel check?
 			 */
 			if (mtuctl.ip6m_mtu < IPV6_MMTU)
 				return(0);
 
 			/* notification for our destination. return the MTU. */
 			return((int)mtuctl.ip6m_mtu);
 		}
 	}
 #endif
 	return(0);
 }
 
 /*subject type*/
 static const char *niqcode[] = {
 	"IPv6 address",
 	"DNS label",	/*or empty*/
 	"IPv4 address",
 };
 
 /*result code*/
 static const char *nircode[] = {
 	"Success", "Refused", "Unknown",
 };
 
 
 /*
  * pr_icmph --
  *	Print a descriptive string about an ICMP header.
  */
 static void
 pr_icmph(struct icmp6_hdr *icp, u_char *end)
 {
 	char ntop_buf[INET6_ADDRSTRLEN];
 	struct nd_redirect *red;
 	struct icmp6_nodeinfo *ni;
 	char dnsname[MAXDNAME + 1];
 	const u_char *cp;
 	size_t l;
 
 	switch (icp->icmp6_type) {
 	case ICMP6_DST_UNREACH:
 		switch (icp->icmp6_code) {
 		case ICMP6_DST_UNREACH_NOROUTE:
 			(void)printf("No Route to Destination\n");
 			break;
 		case ICMP6_DST_UNREACH_ADMIN:
 			(void)printf("Destination Administratively "
 			    "Unreachable\n");
 			break;
 		case ICMP6_DST_UNREACH_BEYONDSCOPE:
 			(void)printf("Destination Unreachable Beyond Scope\n");
 			break;
 		case ICMP6_DST_UNREACH_ADDR:
 			(void)printf("Destination Host Unreachable\n");
 			break;
 		case ICMP6_DST_UNREACH_NOPORT:
 			(void)printf("Destination Port Unreachable\n");
 			break;
 		default:
 			(void)printf("Destination Unreachable, Bad Code: %d\n",
 			    icp->icmp6_code);
 			break;
 		}
 		/* Print returned IP header information */
 		pr_retip((struct ip6_hdr *)(icp + 1), end);
 		break;
 	case ICMP6_PACKET_TOO_BIG:
 		(void)printf("Packet too big mtu = %d\n",
 		    (int)ntohl(icp->icmp6_mtu));
 		pr_retip((struct ip6_hdr *)(icp + 1), end);
 		break;
 	case ICMP6_TIME_EXCEEDED:
 		switch (icp->icmp6_code) {
 		case ICMP6_TIME_EXCEED_TRANSIT:
 			(void)printf("Time to live exceeded\n");
 			break;
 		case ICMP6_TIME_EXCEED_REASSEMBLY:
 			(void)printf("Frag reassembly time exceeded\n");
 			break;
 		default:
 			(void)printf("Time exceeded, Bad Code: %d\n",
 			    icp->icmp6_code);
 			break;
 		}
 		pr_retip((struct ip6_hdr *)(icp + 1), end);
 		break;
 	case ICMP6_PARAM_PROB:
 		(void)printf("Parameter problem: ");
 		switch (icp->icmp6_code) {
 		case ICMP6_PARAMPROB_HEADER:
 			(void)printf("Erroneous Header ");
 			break;
 		case ICMP6_PARAMPROB_NEXTHEADER:
 			(void)printf("Unknown Nextheader ");
 			break;
 		case ICMP6_PARAMPROB_OPTION:
 			(void)printf("Unrecognized Option ");
 			break;
 		default:
 			(void)printf("Bad code(%d) ", icp->icmp6_code);
 			break;
 		}
 		(void)printf("pointer = 0x%02x\n",
 		    (u_int32_t)ntohl(icp->icmp6_pptr));
 		pr_retip((struct ip6_hdr *)(icp + 1), end);
 		break;
 	case ICMP6_ECHO_REQUEST:
 		(void)printf("Echo Request");
 		/* XXX ID + Seq + Data */
 		break;
 	case ICMP6_ECHO_REPLY:
 		(void)printf("Echo Reply");
 		/* XXX ID + Seq + Data */
 		break;
 	case ICMP6_MEMBERSHIP_QUERY:
 		(void)printf("Listener Query");
 		break;
 	case ICMP6_MEMBERSHIP_REPORT:
 		(void)printf("Listener Report");
 		break;
 	case ICMP6_MEMBERSHIP_REDUCTION:
 		(void)printf("Listener Done");
 		break;
 	case ND_ROUTER_SOLICIT:
 		(void)printf("Router Solicitation");
 		break;
 	case ND_ROUTER_ADVERT:
 		(void)printf("Router Advertisement");
 		break;
 	case ND_NEIGHBOR_SOLICIT:
 		(void)printf("Neighbor Solicitation");
 		break;
 	case ND_NEIGHBOR_ADVERT:
 		(void)printf("Neighbor Advertisement");
 		break;
 	case ND_REDIRECT:
 		red = (struct nd_redirect *)icp;
 		(void)printf("Redirect\n");
 		if (!inet_ntop(AF_INET6, &red->nd_rd_dst, ntop_buf,
 		    sizeof(ntop_buf)))
 			strlcpy(ntop_buf, "?", sizeof(ntop_buf));
 		(void)printf("Destination: %s", ntop_buf);
 		if (!inet_ntop(AF_INET6, &red->nd_rd_target, ntop_buf,
 		    sizeof(ntop_buf)))
 			strlcpy(ntop_buf, "?", sizeof(ntop_buf));
 		(void)printf(" New Target: %s", ntop_buf);
 		break;
 	case ICMP6_NI_QUERY:
 		(void)printf("Node Information Query");
 		/* XXX ID + Seq + Data */
 		ni = (struct icmp6_nodeinfo *)icp;
 		l = end - (u_char *)(ni + 1);
 		printf(", ");
 		switch (ntohs(ni->ni_qtype)) {
 		case NI_QTYPE_NOOP:
 			(void)printf("NOOP");
 			break;
 		case NI_QTYPE_SUPTYPES:
 			(void)printf("Supported qtypes");
 			break;
 		case NI_QTYPE_FQDN:
 			(void)printf("DNS name");
 			break;
 		case NI_QTYPE_NODEADDR:
 			(void)printf("nodeaddr");
 			break;
 		case NI_QTYPE_IPV4ADDR:
 			(void)printf("IPv4 nodeaddr");
 			break;
 		default:
 			(void)printf("unknown qtype");
 			break;
 		}
 		if (options & F_VERBOSE) {
 			switch (ni->ni_code) {
 			case ICMP6_NI_SUBJ_IPV6:
 				if (l == sizeof(struct in6_addr) &&
 				    inet_ntop(AF_INET6, ni + 1, ntop_buf,
 				    sizeof(ntop_buf)) != NULL) {
 					(void)printf(", subject=%s(%s)",
 					    niqcode[ni->ni_code], ntop_buf);
 				} else {
 #if 1
 					/* backward compat to -W */
 					(void)printf(", oldfqdn");
 #else
 					(void)printf(", invalid");
 #endif
 				}
 				break;
 			case ICMP6_NI_SUBJ_FQDN:
 				if (end == (u_char *)(ni + 1)) {
 					(void)printf(", no subject");
 					break;
 				}
 				printf(", subject=%s", niqcode[ni->ni_code]);
 				cp = (const u_char *)(ni + 1);
 				cp = dnsdecode(cp, end, NULL, dnsname,
 				    sizeof(dnsname));
 				if (cp != NULL)
 					printf("(%s)", dnsname);
 				else
 					printf("(invalid)");
 				break;
 			case ICMP6_NI_SUBJ_IPV4:
 				if (l == sizeof(struct in_addr) &&
 				    inet_ntop(AF_INET, ni + 1, ntop_buf,
 				    sizeof(ntop_buf)) != NULL) {
 					(void)printf(", subject=%s(%s)",
 					    niqcode[ni->ni_code], ntop_buf);
 				} else
 					(void)printf(", invalid");
 				break;
 			default:
 				(void)printf(", invalid");
 				break;
 			}
 		}
 		break;
 	case ICMP6_NI_REPLY:
 		(void)printf("Node Information Reply");
 		/* XXX ID + Seq + Data */
 		ni = (struct icmp6_nodeinfo *)icp;
 		printf(", ");
 		switch (ntohs(ni->ni_qtype)) {
 		case NI_QTYPE_NOOP:
 			(void)printf("NOOP");
 			break;
 		case NI_QTYPE_SUPTYPES:
 			(void)printf("Supported qtypes");
 			break;
 		case NI_QTYPE_FQDN:
 			(void)printf("DNS name");
 			break;
 		case NI_QTYPE_NODEADDR:
 			(void)printf("nodeaddr");
 			break;
 		case NI_QTYPE_IPV4ADDR:
 			(void)printf("IPv4 nodeaddr");
 			break;
 		default:
 			(void)printf("unknown qtype");
 			break;
 		}
 		if (options & F_VERBOSE) {
 			if (ni->ni_code > nitems(nircode))
 				printf(", invalid");
 			else
 				printf(", %s", nircode[ni->ni_code]);
 		}
 		break;
 	default:
 		(void)printf("Bad ICMP type: %d", icp->icmp6_type);
 	}
 }
 
 /*
  * pr_iph --
  *	Print an IP6 header.
  */
 static void
 pr_iph(struct ip6_hdr *ip6)
 {
 	u_int32_t flow = ip6->ip6_flow & IPV6_FLOWLABEL_MASK;
 	u_int8_t tc;
 	char ntop_buf[INET6_ADDRSTRLEN];
 
 	tc = *(&ip6->ip6_vfc + 1); /* XXX */
 	tc = (tc >> 4) & 0x0f;
 	tc |= (ip6->ip6_vfc << 4);
 
 	printf("Vr TC  Flow Plen Nxt Hlim\n");
 	printf(" %1x %02x %05x %04x  %02x   %02x\n",
 	    (ip6->ip6_vfc & IPV6_VERSION_MASK) >> 4, tc, (u_int32_t)ntohl(flow),
 	    ntohs(ip6->ip6_plen), ip6->ip6_nxt, ip6->ip6_hlim);
 	if (!inet_ntop(AF_INET6, &ip6->ip6_src, ntop_buf, sizeof(ntop_buf)))
 		strlcpy(ntop_buf, "?", sizeof(ntop_buf));
 	printf("%s->", ntop_buf);
 	if (!inet_ntop(AF_INET6, &ip6->ip6_dst, ntop_buf, sizeof(ntop_buf)))
 		strlcpy(ntop_buf, "?", sizeof(ntop_buf));
 	printf("%s\n", ntop_buf);
 }
 
 /*
  * pr_addr --
  *	Return an ascii host address as a dotted quad and optionally with
  * a hostname.
  */
 static const char *
 pr_addr(struct sockaddr *addr, int addrlen)
 {
 	static char buf[NI_MAXHOST];
 	int flag = 0;
 
 	if (!(options & F_HOSTNAME))
 		flag |= NI_NUMERICHOST;
 
 	if (cap_getnameinfo(capdns, addr, addrlen, buf, sizeof(buf), NULL, 0,
 		flag) == 0)
 		return (buf);
 	else
 		return "?";
 }
 
 /*
  * pr_retip --
  *	Dump some info on a returned (via ICMPv6) IPv6 packet.
  */
 static void
 pr_retip(struct ip6_hdr *ip6, u_char *end)
 {
 	u_char *cp = (u_char *)ip6, nh;
 	int hlen;
 
 	if ((size_t)(end - (u_char *)ip6) < sizeof(*ip6)) {
 		printf("IP6");
 		goto trunc;
 	}
 	pr_iph(ip6);
 	hlen = sizeof(*ip6);
 
 	nh = ip6->ip6_nxt;
 	cp += hlen;
 	while (end - cp >= 8) {
 #ifdef IPSEC
 		struct ah ah;
 #endif
 
 		switch (nh) {
 		case IPPROTO_HOPOPTS:
 			printf("HBH ");
 			hlen = (((struct ip6_hbh *)cp)->ip6h_len+1) << 3;
 			nh = ((struct ip6_hbh *)cp)->ip6h_nxt;
 			break;
 		case IPPROTO_DSTOPTS:
 			printf("DSTOPT ");
 			hlen = (((struct ip6_dest *)cp)->ip6d_len+1) << 3;
 			nh = ((struct ip6_dest *)cp)->ip6d_nxt;
 			break;
 		case IPPROTO_FRAGMENT:
 			printf("FRAG ");
 			hlen = sizeof(struct ip6_frag);
 			nh = ((struct ip6_frag *)cp)->ip6f_nxt;
 			break;
 		case IPPROTO_ROUTING:
 			printf("RTHDR ");
 			hlen = (((struct ip6_rthdr *)cp)->ip6r_len+1) << 3;
 			nh = ((struct ip6_rthdr *)cp)->ip6r_nxt;
 			break;
 #ifdef IPSEC
 		case IPPROTO_AH:
 			printf("AH ");
 			memcpy(&ah, cp, sizeof(ah));
 			hlen = (ah.ah_len+2) << 2;
 			nh = ah.ah_nxt;
 			break;
 #endif
 		case IPPROTO_ICMPV6:
 			printf("ICMP6: type = %d, code = %d\n",
 			    *cp, *(cp + 1));
 			return;
 		case IPPROTO_ESP:
 			printf("ESP\n");
 			return;
 		case IPPROTO_TCP:
 			printf("TCP: from port %u, to port %u (decimal)\n",
 			    (*cp * 256 + *(cp + 1)),
 			    (*(cp + 2) * 256 + *(cp + 3)));
 			return;
 		case IPPROTO_UDP:
 			printf("UDP: from port %u, to port %u (decimal)\n",
 			    (*cp * 256 + *(cp + 1)),
 			    (*(cp + 2) * 256 + *(cp + 3)));
 			return;
 		default:
 			printf("Unknown Header(%d)\n", nh);
 			return;
 		}
 
 		if ((cp += hlen) >= end)
 			goto trunc;
 	}
 	if (end - cp < 8)
 		goto trunc;
 
 	putchar('\n');
 	return;
 
   trunc:
 	printf("...\n");
 	return;
 }
 
 static void
 fill(char *bp, char *patp)
 {
 	int ii, jj, kk;
 	int pat[16];
 	char *cp;
 
 	for (cp = patp; *cp; cp++)
 		if (!isxdigit(*cp))
 			errx(1, "patterns must be specified as hex digits");
 	ii = sscanf(patp,
 	    "%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x",
 	    &pat[0], &pat[1], &pat[2], &pat[3], &pat[4], &pat[5], &pat[6],
 	    &pat[7], &pat[8], &pat[9], &pat[10], &pat[11], &pat[12],
 	    &pat[13], &pat[14], &pat[15]);
 
 /* xxx */
 	if (ii > 0)
 		for (kk = 0;
 		    (size_t)kk <= MAXDATALEN - 8 + sizeof(struct tv32) + ii;
 		    kk += ii)
 			for (jj = 0; jj < ii; ++jj)
 				bp[jj + kk] = pat[jj];
 	if (!(options & F_QUIET)) {
 		(void)printf("PATTERN: 0x");
 		for (jj = 0; jj < ii; ++jj)
 			(void)printf("%02x", bp[jj] & 0xFF);
 		(void)printf("\n");
 	}
 }
 
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
 static int
 setpolicy(int so __unused, char *policy)
 {
 	char *buf;
 
 	if (policy == NULL)
 		return 0;	/* ignore */
 
 	buf = ipsec_set_policy(policy, strlen(policy));
 	if (buf == NULL)
 		errx(1, "%s", ipsec_strerror());
 	if (setsockopt(ssend, IPPROTO_IPV6, IPV6_IPSEC_POLICY, buf,
 	    ipsec_get_policylen(buf)) < 0)
 		warnx("Unable to set IPsec policy");
 	free(buf);
 
 	return 0;
 }
 #endif
 #endif
 
 static char *
 nigroup(char *name, int nig_oldmcprefix)
 {
 	char *p;
 	char *q;
 	MD5_CTX ctxt;
 	u_int8_t digest[16];
 	u_int8_t c;
 	size_t l;
 	char hbuf[NI_MAXHOST];
 	struct in6_addr in6;
 	int valid;
 
 	p = strchr(name, '.');
 	if (!p)
 		p = name + strlen(name);
 	l = p - name;
 	if (l > 63 || l > sizeof(hbuf) - 1)
 		return NULL;	/*label too long*/
 	strncpy(hbuf, name, l);
 	hbuf[(int)l] = '\0';
 
 	for (q = name; *q; q++) {
 		if (isupper(*(unsigned char *)q))
 			*q = tolower(*(unsigned char *)q);
 	}
 
 	/* generate 16 bytes of pseudo-random value. */
 	memset(&ctxt, 0, sizeof(ctxt));
 	MD5Init(&ctxt);
 	c = l & 0xff;
 	MD5Update(&ctxt, &c, sizeof(c));
 	MD5Update(&ctxt, (unsigned char *)name, l);
 	MD5Final(digest, &ctxt);
 
 	if (nig_oldmcprefix) {
 		/* draft-ietf-ipngwg-icmp-name-lookup */
 		valid = inet_pton(AF_INET6, "ff02::2:0000:0000", &in6);
 	} else {
 		/* RFC 4620 */
 		valid = inet_pton(AF_INET6, "ff02::2:ff00:0000", &in6);
 	}
 	if (valid != 1)
 		return NULL;	/*XXX*/
 
 	if (nig_oldmcprefix) {
 		/* draft-ietf-ipngwg-icmp-name-lookup */
 		bcopy(digest, &in6.s6_addr[12], 4);
 	} else {
 		/* RFC 4620 */
 		bcopy(digest, &in6.s6_addr[13], 3);
 	}
 
 	if (inet_ntop(AF_INET6, &in6, hbuf, sizeof(hbuf)) == NULL)
 		return NULL;
 
 	return strdup(hbuf);
 }
 
 static cap_channel_t *
 capdns_setup(void)
 {
 	cap_channel_t *capcas, *capdnsloc;
 #ifdef WITH_CASPER
 	const char *types[2];
 	int families[1];
 #endif
 	capcas = cap_init();
 	if (capcas == NULL)
 		err(1, "unable to create casper process");
 	capdnsloc = cap_service_open(capcas, "system.dns");
 	/* Casper capability no longer needed. */
 	cap_close(capcas);
 	if (capdnsloc == NULL)
 		err(1, "unable to open system.dns service");
 #ifdef WITH_CASPER
 	types[0] = "NAME2ADDR";
 	types[1] = "ADDR2NAME";
 	if (cap_dns_type_limit(capdnsloc, types, nitems(types)) < 0)
 		err(1, "unable to limit access to system.dns service");
 	families[0] = AF_INET6;
 	if (cap_dns_family_limit(capdnsloc, families, nitems(families)) < 0)
 		err(1, "unable to limit access to system.dns service");
 #endif
 	return (capdnsloc);
 }
diff --git a/sbin/ping/tests/ping_test.sh b/sbin/ping/tests/ping_test.sh
index 1dff25bd43a6..c30592aa7e2e 100644
--- a/sbin/ping/tests/ping_test.sh
+++ b/sbin/ping/tests/ping_test.sh
@@ -1,245 +1,281 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 #
 # Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
 # 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.
 #
 
 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 cannot be used simultaneously"
 }
 ping_46_body()
 {
 	require_ipv4
 	require_ipv6
 	atf_check -s exit:1 \
 	    -e match:"illegal option -- 6" \
 	    ping -4 -6 localhost
 }
 
 ping_64_head()
 {
 	atf_set "descr" "-4 and -6 cannot be used simultaneously"
 }
 ping_64_body()
 {
 	require_ipv4
 	require_ipv6
 	atf_check -s exit:1 \
 	    -e match:"illegal option -- 4" \
 	    ping -6 -4 localhost
 }
 
 ping6_4_head()
 {
 	atf_set "descr" "ping6 does not accept -4"
 }
 ping6_4_body()
 {
 	require_ipv4
 	require_ipv6
 	atf_check -s exit:1 \
 	    -e match:"illegal option -- 4" \
 	    ping6 -4 localhost
 }
 
+atf_test_case ping_nohost
+ping_nohost_head()
+{
+	atf_set "descr" "ping a nonexistent host"
+}
+ping_nohost_body()
+{
+	atf_check -s exit:68 -e match:"cannot resolve" \
+	    ping nonexistent.in-addr.arpa.
+}
+
+atf_test_case ping4_nohost
+ping4_nohost_head()
+{
+	atf_set "descr" "ping -4 a nonexistent host"
+}
+ping4_nohost_body()
+{
+	atf_check -s exit:68 -e match:"cannot resolve" \
+	    ping -4 nonexistent.in-addr.arpa.
+}
+
+atf_test_case ping6_nohost
+ping6_nohost_head()
+{
+	atf_set "descr" "ping -6 a nonexistent host"
+}
+ping6_nohost_body()
+{
+	atf_check -s exit:68 -e match:"cannot resolve" \
+	    ping -6 nonexistent.in-addr.arpa.
+}
+
 atf_test_case "inject_opts" "cleanup"
 inject_opts_head()
 {
 	atf_set "descr" "Inject an ECHO REPLY with IP options"
 	atf_set "require.user" "root"
 	atf_set "require.progs" "python3" "scapy"
 }
 inject_opts_body()
 {
 	atf_check -s exit:0 -o match:"wrong total length" -o match:"NOP" python3 $(atf_get_srcdir)/injection.py opts
 }
 inject_opts_cleanup()
 {
 	ifconfig `cat tun.txt` destroy
 }
 
 atf_test_case "inject_pip" "cleanup"
 inject_pip_head()
 {
 	atf_set "descr" "Inject an ICMP error with a quoted packet with IP options"
 	atf_set "require.user" "root"
 	atf_set "require.progs" "python3" "scapy"
 }
 inject_pip_body()
 {
 	atf_check -s exit:2 -o match:"Destination Host Unreachable" -o match:"(01){40}" python3 $(atf_get_srcdir)/injection.py pip
 }
 inject_pip_cleanup()
 {
 	ifconfig `cat tun.txt` destroy
 }
 
 # This is redundant with the ping_ tests, but it serves to ensure that scapy.py
 # is working correctly.
 atf_test_case "inject_reply" "cleanup"
 inject_reply_head()
 {
 	atf_set "descr" "Basic ping test with packet injection"
 	atf_set "require.user" "root"
 	atf_set "require.progs" "python3" "scapy"
 }
 inject_reply_body()
 {
 	atf_check -s exit:0 -o match:"1 packets transmitted, 1 packets received" python3 $(atf_get_srcdir)/injection.py reply
 }
 inject_reply_cleanup()
 {
 	ifconfig `cat tun.txt` destroy
 }
 
 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 ping_64
 	atf_add_test_case ping6_4
+	atf_add_test_case ping_nohost
+	atf_add_test_case ping4_nohost
+	atf_add_test_case ping6_nohost
 	atf_add_test_case inject_opts
 	atf_add_test_case inject_pip
 	atf_add_test_case inject_reply
 }
 
 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"
 }