 @@ -1,14 +1,14 @@
-/*	$NetBSD: atalk.c,v 1.18 2020/04/23 00:23:31 joerg Exp $	*/
+/*	$NetBSD: atalk.c,v 1.19 2020/08/28 07:23:48 ozaki-r Exp $	*/
 /*
  * Copyright (c) 1983, 1988, 1993
  *	The Regents of the University of California.  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.
 @@ -24,27 +24,27 @@
  * 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>
 #ifndef lint
 #if 0
 static char sccsid[] = "from @(#)atalk.c	1.1 (Whistle) 6/6/96";
 #else
-__RCSID("$NetBSD: atalk.c,v 1.18 2020/04/23 00:23:31 joerg Exp $");
+__RCSID("$NetBSD: atalk.c,v 1.19 2020/08/28 07:23:48 ozaki-r Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/sysctl.h>
 #include <net/route.h>
 #include <net/if.h>
 @@ -281,27 +281,27 @@ atalkprotopr(u_long off, const char *nam
 /*
  * Dump DDP statistics structure.
  */
 void
 ddp_stats(u_long off, const char *name)
+{
 	uint64_t ddpstat[DDP_NSTATS];
 	if (use_sysctl) {
 		size_t size = sizeof(ddpstat);
 		if (prog_sysctlbyname("net.atalk.ddp.stats", ddpstat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 	ANY(ddpstat[DDP_STAT_SHORT], "packet", " with short headers ");
 	ANY(ddpstat[DDP_STAT_LONG], "packet", " with long headers ");
 	ANY(ddpstat[DDP_STAT_NOSUM], "packet", " with no checksum ");
 	ANY(ddpstat[DDP_STAT_TOOSHORT], "packet", " too short ");
 	ANY(ddpstat[DDP_STAT_BADSUM], "packet", " with bad checksum ");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: inet.c,v 1.112 2020/08/28 06:34:17 ozaki-r Exp $	*/
+/*	$NetBSD: inet.c,v 1.113 2020/08/28 07:23:48 ozaki-r Exp $	*/
 /*
  * Copyright (c) 1983, 1988, 1993
  *	The Regents of the University of California.  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.
 @@ -24,27 +24,27 @@
  * 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>
 #ifndef lint
 #if 0
 static char sccsid[] = "from: @(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-__RCSID("$NetBSD: inet.c,v 1.112 2020/08/28 06:34:17 ozaki-r Exp $");
+__RCSID("$NetBSD: inet.c,v 1.113 2020/08/28 07:23:48 ozaki-r Exp $");
 #endif
 #endif /* not lint */
 #define	_CALLOUT_PRIVATE	/* for defs in sys/callout.h */
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/sysctl.h>
 @@ -394,27 +394,27 @@ protopr(u_long off, const char *name)
 /*
  * Dump TCP statistics structure.
  */
 void
 tcp_stats(u_long off, const char *name)
+{
 	uint64_t tcpstat[TCP_NSTATS];
 	if (use_sysctl) {
 		size_t size = sizeof(tcpstat);
 		if (prog_sysctlbyname("net.inet.tcp.stats", tcpstat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf ("%s:\n", name);
 #define	ps(f, m) if (tcpstat[f] || sflag <= 1) \
     printf(m, tcpstat[f])
 #define	p(f, m) if (tcpstat[f] || sflag <= 1) \
     printf(m, tcpstat[f], plural(tcpstat[f]))
 #define	p2(f1, f2, m) if (tcpstat[f1] || tcpstat[f2] || sflag <= 1) \
 @@ -521,27 +521,27 @@ tcp_stats(u_long off, const char *name)
 /*
  * Dump UDP statistics structure.
  */
 void
 udp_stats(u_long off, const char *name)
+{
 	uint64_t udpstat[UDP_NSTATS];
 	u_quad_t delivered;
 	if (use_sysctl) {
 		size_t size = sizeof(udpstat);
 		if (prog_sysctlbyname("net.inet.udp.stats", udpstat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf ("%s:\n", name);
 #define	ps(f, m) if (udpstat[f] || sflag <= 1) \
     printf(m, udpstat[f])
 #define	p(f, m) if (udpstat[f] || sflag <= 1) \
     printf(m, udpstat[f], plural(udpstat[f]))
 #define	p3(f, m) if (udpstat[f] || sflag <= 1) \
 @@ -574,27 +574,27 @@ udp_stats(u_long off, const char *name)
 /*
  * Dump IP statistics structure.
  */
 void
 ip_stats(u_long off, const char *name)
+{
 	uint64_t ipstat[IP_NSTATS];
 	if (use_sysctl) {
 		size_t size = sizeof(ipstat);
 		if (prog_sysctlbyname("net.inet.ip.stats", ipstat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define	ps(f, m) if (ipstat[f] || sflag <= 1) \
     printf(m, ipstat[f])
 #define	p(f, m) if (ipstat[f] || sflag <= 1) \
     printf(m, ipstat[f], plural(ipstat[f]))
 @@ -647,27 +647,27 @@ ip_stats(u_long off, const char *name)
 /*
  * Dump ICMP statistics.
  */
 void
 icmp_stats(u_long off, const char *name)
+{
 	uint64_t icmpstat[ICMP_NSTATS];
 	int i, first;
 	if (use_sysctl) {
 		size_t size = sizeof(icmpstat);
 		if (prog_sysctlbyname("net.inet.icmp.stats", icmpstat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define	p(f, m) if (icmpstat[f] || sflag <= 1) \
     printf(m, icmpstat[f], plural(icmpstat[f]))
 	p(ICMP_STAT_ERROR, "\t%" PRIu64 " call%s to icmp_error\n");
 	p(ICMP_STAT_OLDICMP,
 @@ -703,27 +703,27 @@ icmp_stats(u_long off, const char *name)
 /*
  * Dump IGMP statistics structure.
  */
 void
 igmp_stats(u_long off, const char *name)
+{
 	uint64_t igmpstat[IGMP_NSTATS];
 	if (use_sysctl) {
 		size_t size = sizeof(igmpstat);
 		if (prog_sysctlbyname("net.inet.igmp.stats", igmpstat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define	p(f, m) if (igmpstat[f] || sflag <= 1) \
     printf(m, igmpstat[f], plural(igmpstat[f]))
 #define	py(f, m) if (igmpstat[f] || sflag <= 1) \
     printf(m, igmpstat[f], igmpstat[f] != 1 ? "ies" : "y")
 	p(IGMP_STAT_RCV_TOTAL, "\t%" PRIu64 " message%s received\n");
 @@ -741,27 +741,27 @@ igmp_stats(u_long off, const char *name)
 /*
  * Dump CARP statistics structure.
  */
 void
 carp_stats(u_long off, const char *name)
+{
 	uint64_t carpstat[CARP_NSTATS];
 	if (use_sysctl) {
 		size_t size = sizeof(carpstat);
 		if (prog_sysctlbyname("net.inet.carp.stats", carpstat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define p(f, m) if (carpstat[f] || sflag <= 1) \
 	printf(m, carpstat[f], plural(carpstat[f]))
 #define p2(f, m) if (carpstat[f] || sflag <= 1) \
 	printf(m, carpstat[f])
 @@ -827,27 +827,27 @@ pim_stats(u_long off, const char *name)
 /*
  * Dump the ARP statistics structure.
  */
 void
 arp_stats(u_long off, const char *name)
+{
 	uint64_t arpstat[ARP_NSTATS];
 	if (use_sysctl) {
 		size_t size = sizeof(arpstat);
 		if (prog_sysctlbyname("net.inet.arp.stats", arpstat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define	ps(f, m) if (arpstat[f] || sflag <= 1) \
     printf(m, arpstat[f])
 #define	p(f, m) if (arpstat[f] || sflag <= 1) \
     printf(m, arpstat[f], plural(arpstat[f]))

 @@ -1,14 +1,14 @@
-/*	$NetBSD: inet6.c,v 1.76 2020/08/28 06:34:17 ozaki-r Exp $	*/
+/*	$NetBSD: inet6.c,v 1.77 2020/08/28 07:23:48 ozaki-r Exp $	*/
 /*	BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp	*/
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 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
 @@ -54,27 +54,27 @@
  * 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>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-__RCSID("$NetBSD: inet6.c,v 1.76 2020/08/28 06:34:17 ozaki-r Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.77 2020/08/28 07:23:48 ozaki-r Exp $");
 #endif
 #endif /* not lint */
 #define _CALLOUT_PRIVATE
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/sysctl.h>
 @@ -407,27 +407,27 @@ ip6protopr(u_long off, const char *name)
 #ifdef TCP6
 /*
  * Dump TCP6 statistics structure.
  */
 void
 tcp6_stats(u_long off, const char *name)
+{
 	struct tcp6stat tcp6stat;
 	if (use_sysctl) {
 		size_t size = sizeof(tcp6stat);
 		if (prog_sysctlbyname("net.inet6.tcp6.stats", &tcp6stat, &size,
-		    NULL, 0) == -1)
+		    NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf ("%s:\n", name);
 #define	p(f, m) if (tcp6stat.f || sflag <= 1) \
     printf(m, tcp6stat.f, plural(tcp6stat.f))
 #define	p2(f1, f2, m) if (tcp6stat.f1 || tcp6stat.f2 || sflag <= 1) \
     printf(m, tcp6stat.f1, plural(tcp6stat.f1), tcp6stat.f2, plural(tcp6stat.f2))
 #define	p3(f, m) if (tcp6stat.f || sflag <= 1) \
 @@ -493,27 +493,27 @@ tcp6_stats(u_long off, const char *name)
 /*
  * Dump UDP6 statistics structure.
  */
 void
 udp6_stats(u_long off, const char *name)
+{
 	uint64_t udp6stat[UDP6_NSTATS];
 	u_quad_t delivered;
 	if (use_sysctl) {
 		size_t size = sizeof(udp6stat);
 		if (prog_sysctlbyname("net.inet6.udp6.stats", udp6stat, &size,
-		    NULL, 0) == -1)
+		    NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define	p(f, m) if (udp6stat[f] || sflag <= 1) \
     printf(m, (unsigned long long)udp6stat[f], plural(udp6stat[f]))
 #define	p1(f, m) if (udp6stat[f] || sflag <= 1) \
     printf(m, (unsigned long long)udp6stat[f])
 	p(UDP6_STAT_IPACKETS, "\t%llu datagram%s received\n");
 	p1(UDP6_STAT_HDROPS, "\t%llu with incomplete header\n");
 	p1(UDP6_STAT_BADLEN, "\t%llu with bad data length field\n");
 @@ -637,27 +637,27 @@ static	const char *ip6nh[] = {
  */
 void
 ip6_stats(u_long off, const char *name)
+{
 	uint64_t ip6stat[IP6_NSTATS];
 	int first, i;
 	struct protoent *ep;
 	const char *n;
 	if (use_sysctl) {
 		size_t size = sizeof(ip6stat);
 		if (prog_sysctlbyname("net.inet6.ip6.stats", ip6stat, &size,
-		    NULL, 0) == -1)
+		    NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define	p(f, m) if (ip6stat[f] || sflag <= 1) \
     printf(m, (unsigned long long)ip6stat[f], plural(ip6stat[f]))
 #define	p1(f, m) if (ip6stat[f] || sflag <= 1) \
     printf(m, (unsigned long long)ip6stat[f])
 	p(IP6_STAT_TOTAL, "\t%llu total packet%s received\n");
 @@ -1131,27 +1131,27 @@ static	const char *icmp6names[256] = {
 /*
  * Dump ICMPv6 statistics.
  */
 void
 icmp6_stats(u_long off, const char *name)
+{
 	uint64_t icmp6stat[ICMP6_NSTATS];
 	int i, first;
 	if (use_sysctl) {
 		size_t size = sizeof(icmp6stat);
 		if (prog_sysctlbyname("net.inet6.icmp6.stats", icmp6stat, &size,
-		    NULL, 0) == -1)
+		    NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define	p(f, m) if (icmp6stat[f] || sflag <= 1) \
     printf(m, (unsigned long long)icmp6stat[f], plural(icmp6stat[f]))
 #define p_oerr(f, m) if (icmp6stat[ICMP6_STAT_OUTERRHIST + f] || sflag <= 1) \
     printf(m, (unsigned long long)icmp6stat[ICMP6_STAT_OUTERRHIST + f])
 @@ -1279,27 +1279,27 @@ icmp6_ifstats(const char *ifname)
 /*
  * Dump PIM statistics structure.
  */
 void
 pim6_stats(u_long off, const char *name)
+{
 	uint64_t pim6stat[PIM6_NSTATS];
 	if (use_sysctl) {
 		size_t size = sizeof(pim6stat);
 		if (prog_sysctlbyname("net.inet6.pim6.stats", pim6stat, &size,
-		    NULL, 0) == -1)
+		    NULL, 0) == -1 && errno != ENOMEM)
 			return;
         } else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define	p(f, m) if (pim6stat[f] || sflag <= 1) \
     printf(m, (unsigned long long)pim6stat[f], plural(pim6stat[f]))
 	p(PIM6_STAT_RCV_TOTAL, "\t%llu message%s received\n");
 	p(PIM6_STAT_RCV_TOOSHORT, "\t%llu message%s received with too few bytes\n");
 	p(PIM6_STAT_RCV_BADSUM, "\t%llu message%s received with bad checksum\n");
 	p(PIM6_STAT_RCV_BADVERSION, "\t%llu message%s received with bad version\n");
 @@ -1312,27 +1312,27 @@ pim6_stats(u_long off, const char *name)
 /*
  * Dump raw ip6 statistics structure.
  */
 void
 rip6_stats(u_long off, const char *name)
+{
 	uint64_t rip6stat[RIP6_NSTATS];
 	u_quad_t delivered;
 	if (use_sysctl) {
 		size_t size = sizeof(rip6stat);
 		if (prog_sysctlbyname("net.inet6.raw6.stats", rip6stat, &size,
-		    NULL, 0) == -1)
+		    NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define	p(f, m) if (rip6stat[f] || sflag <= 1) \
     printf(m, (unsigned long long)rip6stat[f], plural(rip6stat[f]))
 	p(RIP6_STAT_IPACKETS, "\t%llu message%s received\n");
 	p(RIP6_STAT_ISUM, "\t%llu checksum calculation%s on inbound\n");
 	p(RIP6_STAT_BADSUM, "\t%llu message%s with bad checksum\n");
 	p(RIP6_STAT_NOSOCK, "\t%llu message%s dropped due to no socket\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pfkey.c,v 1.2 2019/08/18 04:14:40 kamil Exp $	*/
+/*	$NetBSD: pfkey.c,v 1.3 2020/08/28 07:23:48 ozaki-r Exp $	*/
 /*	$KAME: ipsec.c,v 1.33 2003/07/25 09:54:32 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 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
 @@ -55,41 +55,42 @@
  * 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>
 #ifndef lint
 #if 0
 static char sccsid[] = "from: @(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
 #ifdef __NetBSD__
-__RCSID("$NetBSD: pfkey.c,v 1.2 2019/08/18 04:14:40 kamil Exp $");
+__RCSID("$NetBSD: pfkey.c,v 1.3 2020/08/28 07:23:48 ozaki-r Exp $");
 #endif
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #ifdef IPSEC
 #include <netipsec/keysock.h>
 #endif
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include "netstat.h"
 #include "prog_ops.h"
 #ifdef IPSEC
 static const char *pfkey_msgtypenames[] = {
 	"reserved", "getspi", "update", "add", "delete",
 	"get", "acquire", "register", "expire", "flush",
 	"dump", "x_promisc", "x_pchange", "x_spdupdate", "x_spdadd",
 	"x_spddelete", "x_spdget", "x_spdacquire", "x_spddump", "x_spdflush",
 @@ -111,27 +112,27 @@ pfkey_msgtype_names(int x)
 	return buf;
+}
 void
 pfkey_stats(u_long off, const char *name)
+{
 	uint64_t pfkeystat[PFKEY_NSTATS];
 	int first, type;
 	if (use_sysctl) {
 		size_t size = sizeof(pfkeystat);
 		if (prog_sysctlbyname("net.key.stats", pfkeystat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf ("%s:\n", name);
 #define	p(f, m) if (pfkeystat[f] || sflag <= 1) \
     printf(m, (unsigned long long)pfkeystat[f], plural(pfkeystat[f]))
 	/* userland -> kernel */
 	p(PFKEY_STAT_OUT_TOTAL, "\t%llu request%s sent from userland\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pfsync.c,v 1.2 2019/08/18 04:14:40 kamil Exp $	*/
+/*	$NetBSD: pfsync.c,v 1.3 2020/08/28 07:23:48 ozaki-r Exp $	*/
 /*
  * Copyright (c) 1983, 1988, 1993
  *	The Regents of the University of California.  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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: pfsync.c,v 1.2 2019/08/18 04:14:40 kamil Exp $");
+__RCSID("$NetBSD: pfsync.c,v 1.3 2020/08/28 07:23:48 ozaki-r Exp $");
 #endif /* not lint */
 #define	_CALLOUT_PRIVATE	/* for defs in sys/callout.h */
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/sysctl.h>
 #include <net/if_arp.h>
 @@ -57,42 +57,43 @@ __RCSID("$NetBSD: pfsync.c,v 1.2 2019/08
 #endif
 #include <net/pfvar.h>
 #include <net/if_pfsync.h>
 #include <arpa/inet.h>
 #include <kvm.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <err.h>
 #include <errno.h>
 #include "netstat.h"
 #include "prog_ops.h"
 /*
  * Dump PFSYNC statistics structure.
  */
 void
 pfsync_stats(u_long off, const char *name)
+{
 	uint64_t pfsyncstat[PFSYNC_NSTATS];
 	if (use_sysctl) {
 		size_t size = sizeof(pfsyncstat);
 		if (prog_sysctlbyname("net.inet.pfsync.stats", pfsyncstat, &size,
-				 NULL, 0) == -1)
+				 NULL, 0) == -1 && errno != ENOMEM)
 			return;
 	} else {
 		warnx("%s stats not available via KVM.", name);
 		return;
+	}
 	printf("%s:\n", name);
 #define p(f, m) if (pfsyncstat[f] || sflag <= 1) \
 	printf(m, pfsyncstat[f], plural(pfsyncstat[f]))
 #define p2(f, m) if (pfsyncstat[f] || sflag <= 1) \
 	printf(m, pfsyncstat[f])

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bpf.c,v 1.14 2019/08/18 04:14:40 kamil Exp $	*/
+/*	$NetBSD: bpf.c,v 1.15 2020/08/28 07:23:48 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Rui Paulo.
+ *
  * 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.
 @@ -43,27 +43,28 @@
 #include <sys/sysctl.h>
 #include <net/bpfdesc.h>
 #include <net/bpf.h>
 #include "netstat.h"
 #include "prog_ops.h"
 void
 bpf_stats(void)
+{
 	struct bpf_stat bpf_s;
 	size_t len = sizeof(bpf_s);
 	if (use_sysctl) {
-		if (prog_sysctlbyname("net.bpf.stats", &bpf_s, &len, NULL, 0) == -1)
+		if (prog_sysctlbyname("net.bpf.stats", &bpf_s, &len, NULL, 0) == -1 &&
 		    errno != ENOMEM)
 			err(1, "net.bpf.stats");
 		printf("bpf:\n");
 		printf("\t%" PRIu64 " total packets received\n",
 		    bpf_s.bs_recv);
 		printf("\t%" PRIu64 " total packets captured\n",
 		    bpf_s.bs_capt);
 		printf("\t%" PRIu64 " total packets dropped\n",
 		    bpf_s.bs_drop);
 	} else {
 		warnx("BPF stats not available via KVM.");
+	}
+}