sync code with last improvements from OpenBSD

This commit is contained in:
purplerain 2023-09-16 17:29:51 +00:00
parent 2990d002be
commit f0c5a45f3a
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
27 changed files with 84 additions and 66 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: icmp6.c,v 1.248 2023/04/05 21:51:47 bluhm Exp $ */
/* $OpenBSD: icmp6.c,v 1.249 2023/09/16 09:33:27 mpi Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@ -1870,7 +1870,8 @@ icmp6_sysctl_icmp6stat(void *oldp, size_t *oldlenp, void *newp)
CTASSERT(sizeof(*icmp6stat) == icp6s_ncounters * sizeof(uint64_t));
icmp6stat = malloc(sizeof(*icmp6stat), M_TEMP, M_WAITOK|M_ZERO);
counters_read(icmp6counters, (uint64_t *)icmp6stat, icp6s_ncounters);
counters_read(icmp6counters, (uint64_t *)icmp6stat, icp6s_ncounters,
NULL);
ret = sysctl_rdstruct(oldp, oldlenp, newp,
icmp6stat, sizeof(*icmp6stat));
free(icmp6stat, M_TEMP, sizeof(*icmp6stat));