@zigc/lib 0.17.0-dev.607 → 0.17.0-dev.633

package/libc/include/generic-netbsd/net/if_stats.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: if_stats.h,v 1.3 2021/06/29 21:19:58 riastradh Exp $	*/
+/*	$NetBSD: if_stats.h,v 1.6 2024/07/01 13:13:37 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -55,42 +55,52 @@ typedef enum {
 
 #ifdef _KERNEL
 
+#include <sys/sdt.h>
+
+SDT_PROBE_DECLARE(sdt, net, interface, stat);
+
 #define	IF_STAT_GETREF(ifp)	_NET_STAT_GETREF((ifp)->if_stats)
 #define	IF_STAT_PUTREF(ifp)	_NET_STAT_PUTREF((ifp)->if_stats)
 
 static inline void
 if_statinc(ifnet_t *ifp, if_stat_t x)
 {
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x, +1);
 	_NET_STATINC((ifp)->if_stats, x);
 }
 
 static inline void
-if_statinc_ref(net_stat_ref_t nsr, if_stat_t x)
+if_statinc_ref(ifnet_t *ifp, net_stat_ref_t nsr, if_stat_t x)
 {
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x, +1);
 	_NET_STATINC_REF(nsr, x);
 }
 
 static inline void
 if_statdec(ifnet_t *ifp, if_stat_t x)
 {
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x, -1);
 	_NET_STATDEC((ifp)->if_stats, x);
 }
 
 static inline void
-if_statdec_ref(net_stat_ref_t nsr, if_stat_t x)
+if_statdec_ref(ifnet_t *ifp, net_stat_ref_t nsr, if_stat_t x)
 {
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x, -1);
 	_NET_STATDEC_REF(nsr, x);
 }
 
 static inline void
 if_statadd(ifnet_t *ifp, if_stat_t x, uint64_t v)
 {
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x, v);
 	_NET_STATADD((ifp)->if_stats, x, v);
 }
 
 static inline void
-if_statadd_ref(net_stat_ref_t nsr, if_stat_t x, uint64_t v)
+if_statadd_ref(ifnet_t *ifp, net_stat_ref_t nsr, if_stat_t x, uint64_t v)
 {
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x, v);
 	_NET_STATADD_REF(nsr, x, v);
 }
 
@@ -98,6 +108,8 @@ static inline void
 if_statadd2(ifnet_t *ifp, if_stat_t x1, uint64_t v1, if_stat_t x2, uint64_t v2)
 {
 	net_stat_ref_t _nsr_ = IF_STAT_GETREF(ifp);
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x1, v1);
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x2, v2);
 	_NET_STATADD_REF(_nsr_, x1, v1);
 	_NET_STATADD_REF(_nsr_, x2, v2);
 	IF_STAT_PUTREF(ifp);
@@ -106,12 +118,14 @@ if_statadd2(ifnet_t *ifp, if_stat_t x1, uint64_t v1, if_stat_t x2, uint64_t v2)
 static inline void
 if_statsub(ifnet_t *ifp, if_stat_t x, uint64_t v)
 {
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x, -v);
 	_NET_STATSUB((ifp)->if_stats, x, v);
 }
 
 static inline void
-if_statsub_ref(net_stat_ref_t nsr, if_stat_t x, uint64_t v)
+if_statsub_ref(ifnet_t *ifp, net_stat_ref_t nsr, if_stat_t x, uint64_t v)
 {
+	SDT_PROBE3(sdt, net, interface, stat,  ifp, x, -v);
 	_NET_STATSUB_REF(nsr, x, v);
 }
 

package/libc/include/generic-netbsd/net/net_stats.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: net_stats.h,v 1.5 2020/01/29 03:04:55 thorpej Exp $	*/
+/*	$NetBSD: net_stats.h,v 1.6 2024/06/29 13:01:30 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -35,14 +35,21 @@
 #ifdef _KERNEL
 #include <sys/percpu.h>
 
-typedef void *net_stat_ref_t;
+typedef struct net_stat_ref {
+	/*
+	 * Flexible array member annoyingly requires some other
+	 * non-flexible array member.
+	 */
+	uint64_t	nsr_stat[1];
+	uint64_t	nsr_stats[];
+} *net_stat_ref_t;
 
 #define	_NET_STAT_GETREF(stat)	((net_stat_ref_t)percpu_getref((stat)))
 #define	_NET_STAT_PUTREF(stat)	percpu_putref((stat))
 
 #define	_NET_STATINC_REF(r, x)						\
 do {									\
-	uint64_t *_stat_ = (r);						\
+	uint64_t *_stat_ = (r)->nsr_stat;				\
 	_stat_[x]++;							\
 } while (/*CONSTCOND*/0)
 
@@ -55,7 +62,7 @@ do {									\
 
 #define	_NET_STATDEC_REF(r, x)						\
 do {									\
-	uint64_t *_stat_ = (r);						\
+	uint64_t *_stat_ = (r)->nsr_stat;				\
 	_stat_[x]--;							\
 } while (/*CONSTCOND*/0)
 
@@ -68,7 +75,7 @@ do {									\
 
 #define	_NET_STATADD_REF(r, x, v)					\
 do {									\
-	uint64_t *_stat_ = (r);						\
+	uint64_t *_stat_ = (r)->nsr_stat;				\
 	_stat_[x] += (v);						\
 } while (/*CONSTCOND*/0)
 
@@ -81,7 +88,7 @@ do {									\
 
 #define	_NET_STATSUB_REF(r, x, v)					\
 do {									\
-	uint64_t *_stat_ = (r);						\
+	uint64_t *_stat_ = (r)->nsr_stat;				\
 	_stat_[x] -= (v);						\
 } while (/*CONSTCOND*/0)
 

package/libc/include/generic-netbsd/net/npf.h

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009-2025 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This material is based upon work partially supported by The
@@ -45,6 +45,7 @@
 #include <sys/ioctl.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
+#include <net/if_ether.h>
 #endif
 
 struct npf;
@@ -59,6 +60,15 @@ typedef union {
 	uint32_t		word32[4];
 } npf_addr_t;
 
+/*
+ * use a single type for both user id and group id
+ */
+struct r_id {
+	uint32_t		id[2];
+	uint8_t		 op;
+};
+
+typedef struct r_id		rid_t;
 typedef uint8_t			npf_netmask_t;
 
 #define	NPF_MAX_NETMASK		(128)
@@ -142,6 +152,7 @@ int		nbuf_find_tag(nbuf_t *, uint32_t *);
 #define	NPC_ALG_EXEC	0x100	/* ALG execution. */
 
 #define	NPC_FMTERR	0x200	/* Format error. */
+#define	NPC_LAYER2	0x400	/* ether header */
 
 #define	NPC_IP46	(NPC_IP4|NPC_IP6)
 
@@ -153,6 +164,9 @@ typedef struct {
 	uint32_t		npc_info;
 	nbuf_t *		npc_nbuf;
 
+	struct ether_header	ether;
+	uint8_t			ether_type;
+
 	/*
 	 * Pointers to the IP source and destination addresses,
 	 * and the address length (4 for IPv4 or 16 for IPv6).
@@ -214,6 +228,8 @@ bool		npf_autounload_p(void);
 #define	NPF_RULE_RETICMP		0x00000020
 #define	NPF_RULE_DYNAMIC		0x00000040
 #define	NPF_RULE_GSTATEFUL		0x00000080
+#define	NPF_RULE_LAYER_3		0x00000100
+#define	NPF_RULE_LAYER_2		0x00000200
 
 #define	NPF_DYNAMIC_GROUP		(NPF_RULE_GROUP | NPF_RULE_DYNAMIC)
 
@@ -259,10 +275,6 @@ bool		npf_autounload_p(void);
 
 #define	NPF_TABLE_MAXNAMELEN		32
 
-/* Layers. */
-#define	NPF_LAYER_2			2
-#define	NPF_LAYER_3			3
-
 /*
  * Flags passed via nbuf tags.
  */
@@ -368,10 +380,26 @@ typedef enum {
 	/* nbuf non-contiguous cases. */
 	NPF_STAT_NBUF_NONCONTIG,
 	NPF_STAT_NBUF_CONTIG_FAIL,
+	/* layer 2 statistics */
+	NPF_ETHER_STAT_PASS,
+	NPF_ETHER_STAT_BLOCK,
 	/* Count (last). */
 	NPF_STATS_COUNT
 } npf_stats_t;
 
 #define	NPF_STATS_SIZE		(sizeof(uint64_t) * NPF_STATS_COUNT)
 
+/* unary and binary operators */
+enum {
+	NPF_OP_NONE,
+	NPF_OP_EQ,
+	NPF_OP_NE,
+	NPF_OP_LE,
+	NPF_OP_LT,
+	NPF_OP_GE,
+	NPF_OP_GT,
+	NPF_OP_XRG,
+	NPF_OP_IRG
+};
+
 #endif	/* _NPF_NET_H_ */

package/libc/include/generic-netbsd/net/pfkeyv2.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: pfkeyv2.h,v 1.34.2.1 2023/01/04 12:17:08 martin Exp $	*/
+/*	$NetBSD: pfkeyv2.h,v 1.35 2023/01/04 01:58:33 knakahara Exp $	*/
 /*	$KAME: pfkeyv2.h,v 1.36 2003/07/25 09:33:37 itojun Exp $	*/
 
 /*

package/libc/include/generic-netbsd/net/route.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: route.h,v 1.132 2022/09/20 02:23:37 knakahara Exp $	*/
+/*	$NetBSD: route.h,v 1.134 2023/06/16 02:48:07 rin Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -525,14 +525,14 @@ void	rtcache_unref(struct rtentry *, struct route *);
 percpu_t *
 	rtcache_percpu_alloc(void);
 
-static inline struct route *
+static __inline struct route *
 rtcache_percpu_getref(percpu_t *pc)
 {
 
 	return *(struct route **)percpu_getref(pc);
 }
 
-static inline void
+static __inline void
 rtcache_percpu_putref(percpu_t *pc)
 {
 
@@ -579,7 +579,7 @@ struct rtentry *
 	    int (*)(struct rtentry *, void *), void *);
 void	rtbl_init(void);
 
-void sysctl_net_route_setup(struct sysctllog **, int, const char *);
+void	sysctl_net_route_setup(struct sysctllog **, int, const char *);
 
 #endif /* _KERNEL */
 

package/libc/include/generic-netbsd/net80211/ieee80211_node.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_node.h,v 1.31 2022/02/16 22:00:56 andvar Exp $	*/
+/*	$NetBSD: ieee80211_node.h,v 1.32 2023/08/01 07:04:16 mrg Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -283,7 +283,8 @@ void	ieee80211_dump_node(struct ieee80211_node_table *,
 void	ieee80211_dump_nodes(struct ieee80211_node_table *);
 
 struct ieee80211_node *ieee80211_fakeup_adhoc_node(
-		struct ieee80211_node_table *, const u_int8_t macaddr[]);
+		struct ieee80211_node_table *,
+		const u_int8_t macaddr[IEEE80211_ADDR_LEN]);
 void	ieee80211_node_join(struct ieee80211com *, struct ieee80211_node *,int);
 void	ieee80211_node_leave(struct ieee80211com *, struct ieee80211_node *);
 u_int8_t ieee80211_getrssi(struct ieee80211com *ic);

package/libc/include/generic-netbsd/net80211/ieee80211_var.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_var.h,v 1.34 2020/03/15 23:04:51 thorpej Exp $	*/
+/*	$NetBSD: ieee80211_var.h,v 1.35 2023/06/24 05:12:03 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -363,7 +363,7 @@ ieee80211_anyhdrspace(struct ieee80211com *ic, const void *data)
 
 /* Flags set in ic_debug, used to print debug messages */
 #define	IEEE80211_MSG_DEBUG	0x40000000	/* IFF_DEBUG equivalent */
-#define	IEEE80211_MSG_DUMPPKTS	0x20000000	/* IFF_LINK2 equivalant */
+#define	IEEE80211_MSG_DUMPPKTS	0x20000000	/* IFF_LINK2 equivalent */
 #define	IEEE80211_MSG_CRYPTO	0x10000000	/* crypto work */
 #define	IEEE80211_MSG_INPUT	0x08000000	/* input handling */
 #define	IEEE80211_MSG_XRATE	0x04000000	/* rate set handling */

package/libc/include/generic-netbsd/netbt/hci.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: hci.h,v 1.46 2019/09/28 07:06:33 plunky Exp $	*/
+/*	$NetBSD: hci.h,v 1.46.34.1 2025/08/25 16:09:27 martin Exp $	*/
 
 /*-
  * Copyright (c) 2005 Iain Hibbert.
@@ -54,7 +54,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: hci.h,v 1.46 2019/09/28 07:06:33 plunky Exp $
+ * $Id: hci.h,v 1.46.34.1 2025/08/25 16:09:27 martin Exp $
  * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_hci.h,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
@@ -984,7 +984,7 @@ typedef struct {
 /* No return parameter(s) */
 
 #define HCI_OCF_SNIFF_SUBRATING				0x0011
-#define HCI_CMD_SNIFF_SUBRATING				0x0810
+#define HCI_CMD_SNIFF_SUBRATING				0x0811
 typedef struct {
 	uint16_t	con_handle;	/* connection handle */
 	uint16_t	max_latency;

package/libc/include/generic-netbsd/netdb.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: netdb.h,v 1.71 2021/08/09 20:49:08 andvar Exp $	*/
+/*	$NetBSD: netdb.h,v 1.72 2024/02/16 11:13:59 jkoshy Exp $	*/
 
 /*
  * ++Copyright++ 1980, 1983, 1988, 1993
@@ -296,7 +296,7 @@ struct addrinfo {
 #define	NI_NAMEREQD	0x00000004
 #define	NI_NUMERICSERV	0x00000008
 #define	NI_DGRAM	0x00000010
-#define	NI_WITHSCOPEID	0x00000020
+#define	NI_WITHSCOPEID	0x00000020	/* Obsolete. */
 #define	NI_NUMERICSCOPE	0x00000040
 
 /*%

package/libc/include/generic-netbsd/netinet/icmp6.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: icmp6.h,v 1.59 2022/08/29 09:14:02 knakahara Exp $	*/
+/*	$NetBSD: icmp6.h,v 1.61 2024/12/06 18:36:09 riastradh Exp $	*/
 /*	$KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun Exp $	*/
 
 
@@ -65,6 +65,10 @@
 #ifndef _NETINET_ICMP6_H_
 #define _NETINET_ICMP6_H_
 
+#include <sys/types.h>
+
+#include <netinet/in.h>
+
 #define ICMPV6_PLD_MAXLEN	1232	/* IPV6_MMTU - sizeof(struct ip6_hdr)
 					   - sizeof(struct icmp6_hdr) */
 
@@ -757,7 +761,7 @@ static const char * const icmp6_code_timxceed[] = {
 
 static const char * const icmp6_code_paramprob[] = {
 	"hdr_field", "nxthdr_type", "option", NULL
-};      
+};
 
 /* not all informational icmps that have codes have a names array */
 #endif

package/libc/include/generic-netbsd/netinet/in.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: in.h,v 1.114 2021/02/03 18:13:13 roy Exp $	*/
+/*	$NetBSD: in.h,v 1.115 2023/06/16 03:02:30 rin Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -107,7 +107,7 @@ typedef __sa_family_t	sa_family_t;
 #define	IPPROTO_CARP		112		/* Common Address Resolution Protocol */
 #define	IPPROTO_L2TP		115		/* L2TPv3 */
 #define	IPPROTO_SCTP		132		/* SCTP */
-#define IPPROTO_PFSYNC      240     /* PFSYNC */
+#define IPPROTO_PFSYNC		240		/* PFSYNC */
 #define	IPPROTO_RAW		255		/* raw IP packet */
 #define	IPPROTO_MAX		256
 
@@ -353,22 +353,22 @@ struct ip_mreq {
 #define	IPCTL_ALLOWSRCRT	7	/* allow/drop all source-routed pkts */
 #define	IPCTL_SUBNETSARELOCAL	8	/* treat subnets as local addresses */
 #define	IPCTL_MTUDISC		9	/* allow path MTU discovery */
-#define	IPCTL_ANONPORTMIN      10	/* minimum ephemeral port */
-#define	IPCTL_ANONPORTMAX      11	/* maximum ephemeral port */
-#define	IPCTL_MTUDISCTIMEOUT   12	/* allow path MTU discovery */
-#define	IPCTL_MAXFLOWS         13	/* maximum ip flows allowed */
-#define	IPCTL_HOSTZEROBROADCAST 14	/* is host zero a broadcast addr? */
-#define	IPCTL_GIF_TTL 	       15	/* default TTL for gif encap packet */
-#define	IPCTL_LOWPORTMIN       16	/* minimum reserved port */
-#define	IPCTL_LOWPORTMAX       17	/* maximum reserved port */
-#define	IPCTL_MAXFRAGPACKETS   18	/* max packets reassembly queue */
-#define	IPCTL_GRE_TTL          19	/* default TTL for gre encap packet */
-#define	IPCTL_CHECKINTERFACE   20	/* drop pkts in from 'wrong' iface */
-#define	IPCTL_IFQ	       21	/* IP packet input queue */
-#define	IPCTL_RANDOMID	       22	/* use random IP ids (if configured) */
-#define	IPCTL_LOOPBACKCKSUM    23	/* do IP checksum on loopback */
+#define	IPCTL_ANONPORTMIN	10	/* minimum ephemeral port */
+#define	IPCTL_ANONPORTMAX	11	/* maximum ephemeral port */
+#define	IPCTL_MTUDISCTIMEOUT	12	/* allow path MTU discovery */
+#define	IPCTL_MAXFLOWS		13	/* maximum ip flows allowed */
+#define	IPCTL_HOSTZEROBROADCAST	14	/* is host zero a broadcast addr? */
+#define	IPCTL_GIF_TTL		15	/* default TTL for gif encap packet */
+#define	IPCTL_LOWPORTMIN	16	/* minimum reserved port */
+#define	IPCTL_LOWPORTMAX	17	/* maximum reserved port */
+#define	IPCTL_MAXFRAGPACKETS	18	/* max packets reassembly queue */
+#define	IPCTL_GRE_TTL		19	/* default TTL for gre encap packet */
+#define	IPCTL_CHECKINTERFACE	20	/* drop pkts in from 'wrong' iface */
+#define	IPCTL_IFQ		21	/* IP packet input queue */
+#define	IPCTL_RANDOMID		22	/* use random IP ids (if configured) */
+#define	IPCTL_LOOPBACKCKSUM	23	/* do IP checksum on loopback */
 #define	IPCTL_STATS		24	/* IP statistics */
-#define	IPCTL_DAD_COUNT        25	/* DAD packets to send */
+#define	IPCTL_DAD_COUNT		25	/* DAD packets to send */
 
 #endif /* _NETBSD_SOURCE */
 

package/libc/include/generic-netbsd/netinet/in_var.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: in_var.h,v 1.103 2022/11/19 08:00:51 yamt Exp $	*/
+/*	$NetBSD: in_var.h,v 1.105 2025/06/11 02:44:13 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -327,11 +327,7 @@ in_get_ia_from_ifp(struct ifnet *ifp)
 {
 	struct ifaddr *ifa;
 
-	IFADDR_READER_FOREACH(ifa, ifp) {
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			break;
-	}
-
+	ifa = if_first_addr(ifp, AF_INET);
 	return ifatoia(ifa);
 }
 
@@ -467,7 +463,7 @@ ip_randomid(void)
  * => Return the first ID.
  */
 static __inline uint16_t
-ip_newid_range(const struct in_ifaddr *ia, u_int num)
+ip_newid_range(u_int num)
 {
 	uint16_t id;
 
@@ -486,10 +482,10 @@ ip_newid_range(const struct in_ifaddr *ia, u_int num)
 }
 
 static __inline uint16_t
-ip_newid(const struct in_ifaddr *ia)
+ip_newid(void)
 {
 
-	return ip_newid_range(ia, 1);
+	return ip_newid_range(1);
 }
 
 #ifdef SYSCTLFN_PROTO

package/libc/include/generic-netbsd/netinet/ip_mroute.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_mroute.h,v 1.35 2021/02/03 18:13:13 roy Exp $	*/
+/*	$NetBSD: ip_mroute.h,v 1.36 2025/07/28 21:25:00 kim Exp $	*/
 
 #ifndef _NETINET_IP_MROUTE_H_
 #define _NETINET_IP_MROUTE_H_
@@ -21,10 +21,6 @@
 #include <sys/queue.h>
 #include <sys/callout.h>
 
-#ifdef _KERNEL
-struct sockopt; /* from <sys/socketvar.h> */
-#endif
-
 /*
  * Multicast Routing set/getsockopt commands.
  */
@@ -42,7 +38,6 @@ struct sockopt; /* from <sys/socketvar.h> */
 #define MRT_ADD_BW_UPCALL	111	/* create bandwidth monitor */
 #define MRT_DEL_BW_UPCALL	112	/* delete bandwidth monitor */
 
-
 /*
  * Types and macros for handling bitmaps with one bit per virtual interface.
  */
@@ -101,6 +96,7 @@ struct mfcctl2 {
 	u_int8_t	mfcc_flags[MAXVIFS];	/* the MRT_MFC_FLAGS_* flags */
 	struct in_addr	mfcc_rp;		/* the RP address            */
 };
+
 /*
  * The advanced-API flags.
  *
@@ -196,7 +192,6 @@ struct sioc_vif_req {
 	u_long	obytes;			/* output byte count on vif */
 };
 
-
 /*
  * The kernel's multicast routing statistics.
  */
@@ -216,6 +211,26 @@ struct mrtstat {
 	u_long	mrts_upq_sockfull;	/* upcalls dropped - socket full */
 };
 
+/*
+ * Structure used to communicate from kernel to multicast router.
+ * (Note the convenient similarity to an IP packet.)
+ */
+struct igmpmsg {
+	u_int32_t unused1;
+	u_int32_t unused2;
+	u_int8_t  im_msgtype;		/* what type of message */
+#define IGMPMSG_NOCACHE		1	/* no MFC in the kernel		    */
+#define IGMPMSG_WRONGVIF	2	/* packet came from wrong interface */
+#define	IGMPMSG_WHOLEPKT	3	/* PIM pkt for user level encap.    */
+#define	IGMPMSG_BW_UPCALL	4	/* BW monitoring upcall		    */
+	u_int8_t  im_mbz;		/* must be zero */
+	u_int8_t  im_vif;		/* vif rec'd on */
+	u_int8_t  unused3;
+	struct	  in_addr im_src, im_dst;
+};
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct igmpmsg) == 20);
+#endif
 
 #ifdef _KERNEL
 
@@ -267,27 +282,6 @@ struct mfc {
 	struct	 bw_meter *mfc_bw_meter;	/* list of bandwidth meters  */
 };
 
-/*
- * Structure used to communicate from kernel to multicast router.
- * (Note the convenient similarity to an IP packet.)
- */
-struct igmpmsg {
-	u_int32_t unused1;
-	u_int32_t unused2;
-	u_int8_t  im_msgtype;		/* what type of message */
-#define IGMPMSG_NOCACHE		1	/* no MFC in the kernel		    */
-#define IGMPMSG_WRONGVIF	2	/* packet came from wrong interface */
-#define	IGMPMSG_WHOLEPKT	3	/* PIM pkt for user level encap.    */
-#define	IGMPMSG_BW_UPCALL	4	/* BW monitoring upcall		    */
-	u_int8_t  im_mbz;		/* must be zero */
-	u_int8_t  im_vif;		/* vif rec'd on */
-	u_int8_t  unused3;
-	struct	  in_addr im_src, im_dst;
-};
-#ifdef __CTASSERT
-__CTASSERT(sizeof(struct igmpmsg) == 20);
-#endif
-
 /*
  * Argument structure used for pkt info. while upcall is made.
  */
@@ -335,6 +329,8 @@ struct bw_meter {
 	struct timeval	bm_start_time;		/* abs. time		     */
 };
 
+struct sockopt; /* from <sys/socketvar.h> */
+
 int	ip_mrouter_set(struct socket *, struct sockopt *);
 int	ip_mrouter_get(struct socket *, struct sockopt *);
 int	mrt_ioctl(struct socket *, u_long, void *);

package/libc/include/generic-netbsd/netinet/ip_var.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_var.h,v 1.134 2022/04/10 09:50:46 andvar Exp $	*/
+/*	$NetBSD: ip_var.h,v 1.135 2025/06/27 21:36:23 andvar Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -130,7 +130,7 @@ struct ip_pktopts {
 #define	IP_STAT_FORWARD		9	/* packets forwarded */
 #define	IP_STAT_FASTFORWARD	10	/* packets fast forwarded */
 #define	IP_STAT_CANTFORWARD	11	/* packets rcvd for unreachable dest */
-#define	IP_STAT_REDIRECTSENT	12	/* packets forwareded on same net */
+#define	IP_STAT_REDIRECTSENT	12	/* packets forwarded on same net */
 #define	IP_STAT_NOPROTO		13	/* unknown or unsupported protocol */
 #define	IP_STAT_DELIVERED	14	/* datagrams delivered to upper level */
 #define	IP_STAT_LOCALOUT	15	/* total ip packets generated here */

package/libc/include/generic-netbsd/netinet/sctp.h

@@ -1,5 +1,5 @@
 /*	$KAME: sctp.h,v 1.18 2005/03/06 16:04:16 itojun Exp $	*/
-/*	$NetBSD: sctp.h,v 1.5 2021/10/24 20:00:12 andvar Exp $ */
+/*	$NetBSD: sctp.h,v 1.7 2025/02/28 09:07:12 andvar Exp $ */
 
 #ifndef _NETINET_SCTP_H_
 #define _NETINET_SCTP_H_
@@ -146,8 +146,8 @@ struct sctp_paramhdr {
 #define SCTP_PEER_PUBLIC_KEY            0x00000100 /* get the peers public key */
 #define SCTP_MY_PUBLIC_KEY              0x00000101 /* get/set my endpoints public key */
 #define SCTP_SET_AUTH_SECRET            0x00000102 /* get/set my shared secret */
-#define SCTP_SET_AUTH_CHUNKS            0x00000103/* specify what chunks you want
-						    * the system may have additional requirments
+#define SCTP_SET_AUTH_CHUNKS            0x00000103 /* specify what chunks you want
+						     * the system may have additional requirements
 						     * as well. I.e. probably ASCONF/ASCONF-ACK no matter
 						     * if you want it or not.
 						     */
@@ -285,7 +285,7 @@ struct sctp_error_unrecognized_chunk {
 
 #define SCTP_SAT_NETWORK_MIN	     400	/* min ms for RTT to set satellite time */
 #define SCTP_SAT_NETWORK_BURST_INCR  2		/* how many times to multiply maxburst in sat */
-/* Data Chuck Specific Flags */
+/* Data Chunk Specific Flags */
 #define SCTP_DATA_FRAG_MASK	0x03
 #define SCTP_DATA_MIDDLE_FRAG	0x00
 #define SCTP_DATA_LAST_FRAG	0x01

package/libc/include/generic-netbsd/netinet/tcp_var.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_var.h,v 1.198 2022/10/28 05:18:39 ozaki-r Exp $	*/
+/*	$NetBSD: tcp_var.h,v 1.199 2024/12/03 20:02:30 andvar Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -619,7 +619,7 @@ struct tcp_opt_info {
 					   shortage */
 #define	TCP_STAT_PMTUBLACKHOLE	17	/* PMTUD blackhole detected */
 #define	TCP_STAT_SNDTOTAL	18	/* total packets sent */
-#define	TCP_STAT_SNDPACK	19	/* data packlets sent */
+#define	TCP_STAT_SNDPACK	19	/* data packets sent */
 #define	TCP_STAT_SNDBYTE	20	/* data bytes sent */
 #define	TCP_STAT_SNDREXMITPACK	21	/* data packets retransmitted */
 #define	TCP_STAT_SNDREXMITBYTE	22	/* data bytes retransmitted */

package/libc/include/generic-netbsd/netinet/tcp_vtw.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_vtw.h,v 1.10 2022/12/11 08:09:20 mlelstv Exp $	*/
+/*	$NetBSD: tcp_vtw.h,v 1.11 2024/10/07 23:17:00 jakllsch Exp $	*/
 /*
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -151,7 +151,7 @@
  */
 struct fatp_mi;
 
-#if CACHE_LINE_SIZE == 128
+#if CACHE_LINE_SIZE >= 128
 typedef uint64_t fatp_word_t;
 #else
 typedef uint32_t fatp_word_t;