@zigc/lib 0.17.0-dev.332 → 0.17.0-dev.356

package/libc/include/any-darwin-any/mach/mach_voucher_types.h

@@ -97,6 +97,8 @@ typedef mach_voucher_attr_key_t *mach_voucher_attr_key_array_t;
 #define MACH_VOUCHER_ATTR_KEY_PTHPRIORITY       ((mach_voucher_attr_key_t)4)
 #define MACH_VOUCHER_ATTR_KEY_USER_DATA         ((mach_voucher_attr_key_t)7)
 #define MACH_VOUCHER_ATTR_KEY_BITS              MACH_VOUCHER_ATTR_KEY_USER_DATA
+
+/* not used, for compatibility only */
 #define MACH_VOUCHER_ATTR_KEY_TEST              ((mach_voucher_attr_key_t)8)
 
 /* not used, for compatibility only */

package/libc/include/any-darwin-any/mach/vm_statistics.h

@@ -174,13 +174,44 @@ struct vm_statistics64 {
 	uint64_t        total_uncompressed_pages_in_compressor; /* # of pages (uncompressed) held within the compressor. */
 	/* added for rev2 */
 	uint64_t        swapped_count;          /* # of compressor-stored pages currently stored in swap */
+	/* Added in rev3 */
+	/* The total number of physical pages in the tag storage region */
+	uint64_t total_tag_storage_pages;
+	/*
+	 * The number of tag storage pages which hold non-tag data and are pageable
+	 */
+	uint64_t nontag_pageable_tag_storage_pages;
+	/* The number of tag storage pages which hold non-tag data and are wired */
+	uint64_t nontag_wired_tag_storage_pages;
+	/*
+	 * The number of tag storage pages which are being used for neither tags nor
+	 * regular memory
+	 */
+	uint64_t free_tag_storage_pages;
+	/* The number of tag storage pages which currently hold tags */
+	uint64_t tag_storing_tag_storage_pages;
+
+	/* The total number of virtual pages which are tagged */
+	uint64_t total_tagged_pages;
+	/* The number of resident, physical pages which are tagged */
+	uint64_t resident_tagged_pages;
+	/*
+	 * The outstanding number of virtual tagged pages whose contents reside in the
+	 * compressor
+	 */
+	uint64_t compressed_tagged_pages;
+
+	/* The number of tagged pages which have been compressed since boot */
+	uint64_t tagged_compressions;
+	/* The number of tagged pages which have been decompressed since boot */
+	uint64_t tagged_decompressions;
+	/* The current number of bytes consumed by compressed tag storage data */
+	uint64_t compressed_tag_storage_bytes;
 } __attribute__((aligned(8)));
 
 typedef struct vm_statistics64  *vm_statistics64_t;
 typedef struct vm_statistics64  vm_statistics64_data_t;
 
-kern_return_t vm_stats(void *info, unsigned int *count);
-
 /*
  * VM_STATISTICS_TRUNCATE_TO_32_BIT
  *

package/libc/include/any-darwin-any/spawn.h

@@ -160,7 +160,9 @@ int     posix_spawnattr_setexceptionports_np(posix_spawnattr_t * __restrict,
 int     posix_spawnattr_setspecialport_np(posix_spawnattr_t * __restrict,
     mach_port_t, int) __API_AVAILABLE(macos(10.5), ios(2.0)) __API_UNAVAILABLE(watchos, tvos);
 
-int     posix_spawnattr_setnosmt_np(const posix_spawnattr_t * __restrict attr) __API_AVAILABLE(macos(11.0));
+int     posix_spawnattr_setnosmt_np(const posix_spawnattr_t * __restrict) __API_AVAILABLE(macos(11.0));
+
+int     posix_spawnattr_set_4k_page_size_np(const posix_spawnattr_t * __restrict) __API_AVAILABLE(macos(26.0));
 
 /*
  * Set CPU Security Mitigation on the spawned process

package/libc/include/any-darwin-any/sys/_symbol_aliasing.h

@@ -587,6 +587,12 @@
 #define __DARWIN_ALIAS_STARTING_IPHONE___IPHONE_26_4(x)
 #endif
 
+#if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 260500
+#define __DARWIN_ALIAS_STARTING_IPHONE___IPHONE_26_5(x) x
+#else
+#define __DARWIN_ALIAS_STARTING_IPHONE___IPHONE_26_5(x)
+#endif
+
 #if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1000
 #define __DARWIN_ALIAS_STARTING_MAC___MAC_10_0(x) x
 #else
@@ -1049,3 +1055,9 @@
 #define __DARWIN_ALIAS_STARTING_MAC___MAC_26_4(x)
 #endif
 
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 260500
+#define __DARWIN_ALIAS_STARTING_MAC___MAC_26_5(x) x
+#else
+#define __DARWIN_ALIAS_STARTING_MAC___MAC_26_5(x)
+#endif
+

package/libc/include/generic-openbsd/db.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: db.h,v 1.12 2015/10/17 21:48:42 guenther Exp $	*/
+/*	$OpenBSD: db.h,v 1.14 2026/03/10 04:30:34 deraadt Exp $	*/
 /*	$NetBSD: db.h,v 1.13 1994/10/26 00:55:48 cgd Exp $	*/
 
 /*-
@@ -84,15 +84,9 @@ typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
  * is so that the access methods can skip copying the key/data pair when
  * the DB_LOCK flag isn't set.
  */
-#if UINT_MAX > 65535
 #define	DB_LOCK		0x20000000	/* Do locking. */
 #define	DB_SHMEM	0x40000000	/* Use shared memory. */
 #define	DB_TXN		0x80000000	/* Do transactions. */
-#else
-#define	DB_LOCK		    0x2000	/* Do locking. */
-#define	DB_SHMEM	    0x4000	/* Use shared memory. */
-#define	DB_TXN		    0x8000	/* Do transactions. */
-#endif
 
 /* Access method description structure. */
 typedef struct __db {

package/libc/include/generic-openbsd/ddb/db_interface.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.h,v 1.28 2024/09/05 08:52:27 bluhm Exp $	*/
+/*	$OpenBSD: db_interface.h,v 1.29 2026/02/02 15:20:51 claudio Exp $	*/
 /*	$NetBSD: db_interface.h,v 1.1 1996/02/05 01:57:03 christos Exp $	*/
 
 /*
@@ -41,6 +41,7 @@ vaddr_t db_disasm(vaddr_t, int);
 
 /* kern/kern_proc.c */
 void db_kill_cmd(db_expr_t, int, db_expr_t, char *);
+void db_stop_cmd(db_expr_t, int, db_expr_t, char *);
 void db_show_all_procs(db_expr_t, int, db_expr_t, char *);
 
 /* kern/kern_clockintr.c */

package/libc/include/generic-openbsd/fnmatch.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: fnmatch.h,v 1.8 2005/12/13 00:35:22 millert Exp $	*/
+/*	$OpenBSD: fnmatch.h,v 1.9 2026/03/29 14:08:46 daniel Exp $	*/
 /*	$NetBSD: fnmatch.h,v 1.5 1994/10/26 00:55:53 cgd Exp $	*/
 
 /*-
@@ -43,11 +43,15 @@
 #define	FNM_NOESCAPE	0x01	/* Disable backslash escaping. */
 #define	FNM_PATHNAME	0x02	/* Slash must be matched by slash. */
 #define	FNM_PERIOD	0x04	/* Period must be matched by period. */
+
 #if __BSD_VISIBLE
 #define	FNM_LEADING_DIR	0x08	/* Ignore /<tail> after Imatch. */
+#define	FNM_FILE_NAME	FNM_PATHNAME
+#endif
+
+#if __BSD_VISIBLE || __POSIX_VISIBLE >= 202405
 #define	FNM_CASEFOLD	0x10	/* Case insensitive search. */
 #define	FNM_IGNORECASE	FNM_CASEFOLD
-#define	FNM_FILE_NAME	FNM_PATHNAME
 #endif
 
 __BEGIN_DECLS

package/libc/include/generic-openbsd/login_cap.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_cap.h,v 1.19 2022/03/01 01:22:11 tedu Exp $	*/
+/*	$OpenBSD: login_cap.h,v 1.21 2025/11/24 12:37:15 jca Exp $	*/
 
 /*-
  * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -56,6 +56,8 @@
 #define	LOGIN_SETENV		0x0080	/* Set environment */
 #define	LOGIN_SETRTABLE		0x0100	/* Set rtable */
 #define	LOGIN_SETALL 		0x01ff	/* Set all. */
+/* The LOGIN defines below are not part of LOGIN_SETALL */
+#define	LOGIN_SETXDGENV		0x0200	/* Set XDG environment variables */
 
 #define	BI_AUTH		"authorize"		/* Accepted authentication */
 #define	BI_REJECT	"reject"		/* Rejected authentication */

package/libc/include/generic-openbsd/miscfs/fuse/fusefs_node.h

@@ -1,4 +1,4 @@
-/* $OpenBSD: fusefs_node.h,v 1.5 2024/10/31 13:55:21 claudio Exp $ */
+/* $OpenBSD: fusefs_node.h,v 1.6 2026/01/22 11:53:31 helg Exp $ */
 /*
  * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com>
  *
@@ -40,6 +40,7 @@ struct fusefs_node {
 	struct	fusefs_mnt	*i_ump;
 	dev_t			 i_dev;	 /* Device associated with the inode. */
 	ino_t			 i_number;	/* The identity of the inode. */
+	ino_t			 i_parent_cache;/* Parent inode (only dirs). */
 	struct	lockf_state	*i_lockf;	/* Byte-level lock state. */
 	struct	rrwlock		 i_lock;	/* Inode lock */
 

package/libc/include/generic-openbsd/net/bpf.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpf.h,v 1.74 2025/03/04 01:01:25 dlg Exp $	*/
+/*	$OpenBSD: bpf.h,v 1.75 2025/11/16 02:20:08 dlg Exp $	*/
 /*	$NetBSD: bpf.h,v 1.15 1996/12/13 07:57:33 mikel Exp $	*/
 
 /*
@@ -255,6 +255,8 @@ struct bpf_hdr {
 #define		BPF_LSH		0x60
 #define		BPF_RSH		0x70
 #define		BPF_NEG		0x80
+#define		BPF_MOD		0x90
+#define		BPF_XOR		0xa0
 #define		BPF_JA		0x00
 #define		BPF_JEQ		0x10
 #define		BPF_JGT		0x20

package/libc/include/generic-openbsd/net/hfsc.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: hfsc.h,v 1.14 2025/07/07 00:55:15 jsg Exp $	*/
+/*	$OpenBSD: hfsc.h,v 1.15 2026/03/19 14:59:05 sthen Exp $	*/
 
 /*
  * Copyright (c) 2012-2013 Henning Brauer <henning@openbsd.org>
@@ -45,9 +45,9 @@ struct hfsc_pktcntr {
 	do { (cntr)->packets++; (cntr)->bytes += len; } while (0)
 
 struct hfsc_sc {
-	u_int	m1;	/* slope of the first segment in bits/sec */
-	u_int	d;	/* the x-projection of the first segment in msec */
-	u_int	m2;	/* slope of the second segment in bits/sec */
+	u_int64_t	m1;	/* slope of the first segment in bits/sec */
+	u_int64_t	m2;	/* slope of the second segment in bits/sec */
+	u_int		d;	/* the x-projection of the first segment in msec */
 };
 
 /* special class handles */

package/libc/include/generic-openbsd/net/if.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.h,v 1.221 2025/09/09 09:16:18 bluhm Exp $	*/
+/*	$OpenBSD: if.h,v 1.223 2025/12/09 03:33:06 dlg Exp $	*/
 /*	$NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $	*/
 
 /*
@@ -526,6 +526,9 @@ struct if_sffpage {
 #include <net/if_arp.h>
 
 #ifdef _KERNEL
+
+#define IF_MAX_VECTORS		8
+
 struct socket;
 struct ifnet;
 struct ifq_ops;
@@ -555,6 +558,7 @@ void	if_group_routechange(const struct sockaddr *, const struct sockaddr *);
 struct	ifnet *if_unit(const char *);
 struct	ifnet *if_get(unsigned int);
 struct	ifnet *if_ref(struct ifnet *);
+struct	ifnet *if_get_smr(unsigned int);
 void	if_put(struct ifnet *);
 void	ifnewlladdr(struct ifnet *);
 void	if_congestion(void);

package/libc/include/generic-openbsd/net/if_bridge.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.h,v 1.73 2021/11/11 10:03:10 claudio Exp $	*/
+/*	$OpenBSD: if_bridge.h,v 1.77 2025/11/21 04:44:26 dlg Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -39,6 +39,12 @@
 #include <sys/timeout.h>
 #include <net/pfvar.h>
 
+#define IFBR_PVID_NULL		EVL_VLID_NULL
+#define IFBR_PVID_MIN		EVL_VLID_MIN
+#define IFBR_PVID_MAX		EVL_VLID_MAX
+#define IFBR_PVID_NONE		0xffff
+#define IFBR_PVID_DECLINE	0xfffe
+
 /*
  * Bridge control request: add/delete member interfaces.
  */
@@ -51,6 +57,7 @@ struct ifbreq {
 
 	u_int8_t	ifbr_state;		/* member stp state */
 	u_int8_t	ifbr_priority;		/* member stp priority */
+	u_int16_t	ifbr_pvid;		/* member port vlan id */
 	u_int32_t	ifbr_path_cost;		/* member stp path cost */
 	u_int32_t	ifbr_stpflags;          /* member stp flags */
 	u_int8_t	ifbr_proto;		/* member stp protocol */
@@ -74,6 +81,8 @@ struct ifbreq {
 #define IFBIF_BSTP_AUTOPTP	0x0080	/* member stp autoptp enabled */
 #define	IFBIF_SPAN		0x0100	/* ifs is a span port (ro) */
 #define	IFBIF_LOCAL		0x1000	/* local port in switch(4) */
+#define	IFBIF_LOCKED		0x2000	/* restrict rx src mac with fib */
+#define	IFBIF_PVLAN_PTAGS	0x4000	/* only use tags for primary pvlans */
 #define	IFBIF_RO_MASK		0x0f00	/* read only bits */
 
 /* SIOCBRDGFLUSH */
@@ -133,15 +142,19 @@ struct ifbareq {
 #define	IFBAF_DYNAMIC		0x00		/* dynamically learned */
 #define	IFBAF_STATIC		0x01		/* static address */
 
+struct ifbvareq;
+
 struct ifbaconf {
 	char			ifbac_name[IFNAMSIZ];	/* bridge ifs name */
 	u_int32_t		ifbac_len;		/* buffer size */
 	union {
 		caddr_t	ifbacu_buf;			/* buffer */
 		struct ifbareq *ifbacu_req;		/* request pointer */
+		struct ifbvareq *ifbacu_vreq;		/* request pointer */
 	} ifbac_ifbacu;
 #define	ifbac_buf	ifbac_ifbacu.ifbacu_buf
 #define	ifbac_req	ifbac_ifbacu.ifbacu_req
+#define	ifbac_vreq	ifbac_ifbacu.ifbacu_vreq
 };
 
 struct ifbrparam {
@@ -237,6 +250,40 @@ struct ifbrlconf {
 #define	ifbrl_req	ifbrl_ifbrlu.ifbrlu_req
 };
 
+struct ifbvareq {
+	char			ifbva_name[IFNAMSIZ];	/* bridge name */
+	char			ifbva_ifsname[IFNAMSIZ];	/* destination ifs */
+	time_t			ifbva_created;		/* monotime */
+	time_t			ifbva_used;		/* monotime */
+	unsigned int		ifbva_flags;		/* address flags */
+	uint16_t		ifbva_vid;		/* vlan */
+	struct ether_addr	ifbva_dst;		/* destination addr */
+	struct sockaddr_storage	ifbva_dstsa;		/* tunnel endpoint */
+};
+
+struct ifbrvidmap {
+	char			ifbrvm_name[IFNAMSIZ];
+	char			ifbrvm_ifsname[IFNAMSIZ];
+	unsigned int		ifbrvm_op;
+#define IFBRVM_OP_SET			0x0	/* kernel = ifbrvm_map */
+#define IFBRVM_OP_OR			0x1	/* kernel |= ifbrvm_map */
+#define IFBRVM_OP_ANDNOT		0x2	/* kernel &= ~ifbrvm_map */
+	unsigned int		ifbrvm_gen;
+	uint8_t			ifbrvm_map[512];
+};
+
+struct ifbrpvlan {
+	char			ifbrpv_name[IFNAMSIZ];
+	uint16_t		ifbrpv_primary;
+	uint16_t		ifbrpv_secondary;
+	unsigned int		ifbrpv_type;
+#define IFBRPV_T_PRIMARY		0
+#define IFBRPV_T_SECONDARY		1	/* for searching */
+#define IFBRPV_T_ISOLATED		2
+#define IFBRPV_T_COMMUNITY		3
+	unsigned int		ifbrpv_gen;
+};
+
 #ifdef _KERNEL
 
 #include <sys/mutex.h>

package/libc/include/generic-openbsd/net/if_etherbridge.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_etherbridge.h,v 1.5 2024/11/04 00:13:15 jsg Exp $ */
+/*	$OpenBSD: if_etherbridge.h,v 1.7 2025/11/21 04:44:26 dlg Exp $ */
 
 /*
  * Copyright (c) 2018, 2021 David Gwynne <dlg@openbsd.org>
@@ -44,16 +44,21 @@ struct eb_entry {
 
 	uint64_t			 ebe_addr;
 	void				*ebe_port;
+	uint16_t			 ebe_vs; /* secondary vid */
 	unsigned int			 ebe_type;
 #define EBE_DYNAMIC				0x0
 #define EBE_STATIC				0x1
 #define EBE_DEAD				0xdead
+	time_t				 ebe_created;
 	time_t				 ebe_age;
 
 	struct etherbridge		*ebe_etherbridge;
 	struct smr_entry		 ebe_smr_entry;
 };
 
+#define etherbridge_port(_ebe)	((_ebe)->ebe_port)
+#define etherbridge_vs(_ebe)	((_ebe)->ebe_vs)
+
 SMR_TAILQ_HEAD(eb_list, eb_entry);
 RBT_HEAD(eb_tree, eb_entry);
 TAILQ_HEAD(eb_queue, eb_entry);
@@ -80,13 +85,19 @@ int	 etherbridge_up(struct etherbridge *);
 int	 etherbridge_down(struct etherbridge *);
 void	 etherbridge_destroy(struct etherbridge *);
 
-void	 etherbridge_map(struct etherbridge *, void *, uint64_t);
+void	 etherbridge_map(struct etherbridge *, void *,
+	     uint16_t, uint16_t, uint64_t);
 void	 etherbridge_map_ea(struct etherbridge *, void *,
-	     const struct ether_addr *);
-void	*etherbridge_resolve(struct etherbridge *, uint64_t);
+	     uint16_t, uint16_t, const struct ether_addr *);
+struct eb_entry *
+	 etherbridge_resolve_entry(struct etherbridge *,
+	     uint16_t, uint64_t);
+void	*etherbridge_resolve(struct etherbridge *, uint16_t, uint64_t);
 void	*etherbridge_resolve_ea(struct etherbridge *,
-	     const struct ether_addr *);
+	     uint16_t, const struct ether_addr *);
 void	 etherbridge_detach_port(struct etherbridge *, void *);
+void	 etherbridge_filter(struct etherbridge *,
+	     int (*)(struct etherbridge *, struct eb_entry *, void *), void *);
 
 /* ioctl support */
 int	 etherbridge_set_max(struct etherbridge *, struct ifbrparam *);
@@ -94,9 +105,11 @@ int	 etherbridge_get_max(struct etherbridge *, struct ifbrparam *);
 int	 etherbridge_set_tmo(struct etherbridge *, struct ifbrparam *);
 int	 etherbridge_get_tmo(struct etherbridge *, struct ifbrparam *);
 int	 etherbridge_rtfind(struct etherbridge *, struct ifbaconf *);
+int	 etherbridge_vareq(struct etherbridge *, struct ifbaconf *);
 int	 etherbridge_add_addr(struct etherbridge *, void *,
-	     const struct ether_addr *, unsigned int);
-int	 etherbridge_del_addr(struct etherbridge *, const struct ether_addr *);
+	     uint16_t, uint16_t, const struct ether_addr *, unsigned int);
+int	 etherbridge_del_addr(struct etherbridge *,
+	     uint16_t, const struct ether_addr *);
 void	 etherbridge_flush(struct etherbridge *, uint32_t);
 
 #endif /* _NET_ETHERBRIDGE_H_ */

package/libc/include/generic-openbsd/net/if_media.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_media.h,v 1.46 2025/06/13 00:08:16 jsg Exp $	*/
+/*	$OpenBSD: if_media.h,v 1.47 2026/03/19 16:50:32 chris Exp $	*/
 /*	$NetBSD: if_media.h,v 1.22 2000/02/17 21:53:16 sommerfeld Exp $	*/
 
 /*-
@@ -327,6 +327,18 @@ uint64_t	ifmedia_baudrate(uint64_t);
 #define IFM_IEEE80211_VHT_MCS7	103	/* 11ac MCS 7 */
 #define IFM_IEEE80211_VHT_MCS8	104	/* 11ac MCS 8 */
 #define IFM_IEEE80211_VHT_MCS9	105	/* 11ac MCS 9 */
+#define IFM_IEEE80211_HE_MCS0	106	/* 11ax MCS 0 */
+#define IFM_IEEE80211_HE_MCS1	107	/* 11ax MCS 1 */
+#define IFM_IEEE80211_HE_MCS2	108	/* 11ax MCS 2 */
+#define IFM_IEEE80211_HE_MCS3	109	/* 11ax MCS 3 */
+#define IFM_IEEE80211_HE_MCS4	110	/* 11ax MCS 4 */
+#define IFM_IEEE80211_HE_MCS5	111	/* 11ax MCS 5 */
+#define IFM_IEEE80211_HE_MCS6	112	/* 11ax MCS 6 */
+#define IFM_IEEE80211_HE_MCS7	113	/* 11ax MCS 7 */
+#define IFM_IEEE80211_HE_MCS8	114	/* 11ax MCS 8 */
+#define IFM_IEEE80211_HE_MCS9	115	/* 11ax MCS 9 */
+#define IFM_IEEE80211_HE_MCS10	116	/* 11ax MCS 10 */
+#define IFM_IEEE80211_HE_MCS11	117	/* 11ax MCS 11 */
 
 #define	IFM_IEEE80211_ADHOC	0x0000000000010000ULL	/* Operate in Adhoc mode */
 #define	IFM_IEEE80211_HOSTAP	0x0000000000020000ULL	/* Operate in Host AP mode */
@@ -341,6 +353,7 @@ uint64_t	ifmedia_baudrate(uint64_t);
 #define IFM_IEEE80211_FH	0x0000000400000000ULL	/* 2GHz, GFSK mode */
 #define IFM_IEEE80211_11N	0x0000000800000000ULL	/* 11n/HT 2GHz/5GHz */
 #define IFM_IEEE80211_11AC	0x0000001000000000ULL	/* 11ac/VHT 5GHz */
+#define IFM_IEEE80211_11AX	0x0000002000000000ULL	/* 11ax/HE 2GHz/5GHz */
 
 /*
  * Digitally multiplexed "Carrier" Serial Interfaces
@@ -721,6 +734,18 @@ struct ifmedia_description {
 	{ IFM_IEEE80211|IFM_IEEE80211_VHT_MCS7,	"VHT-MCS7" },		\
 	{ IFM_IEEE80211|IFM_IEEE80211_VHT_MCS8,	"VHT-MCS8" },		\
 	{ IFM_IEEE80211|IFM_IEEE80211_VHT_MCS9,	"VHT-MCS9" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS0, "HE-MCS0" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS1, "HE-MCS1" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS2, "HE-MCS2" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS3, "HE-MCS3" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS4, "HE-MCS4" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS5, "HE-MCS5" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS6, "HE-MCS6" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS7, "HE-MCS7" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS8, "HE-MCS8" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS9, "HE-MCS9" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS10, "HE-MCS10" },		\
+	{ IFM_IEEE80211|IFM_IEEE80211_HE_MCS11, "HE-MCS11" },		\
 									\
 	{ IFM_TDM|IFM_TDM_T1,		"t1" },				\
 	{ IFM_TDM|IFM_TDM_T1_AMI,	"t1-ami" },			\

package/libc/include/generic-openbsd/net/if_pflow.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pflow.h,v 1.23 2023/12/16 22:16:02 mvs Exp $	*/
+/*	$OpenBSD: if_pflow.h,v 1.24 2025/11/13 17:12:30 chris Exp $	*/
 
 /*
  * Copyright (c) 2008 Henning Brauer <henning@openbsd.org>
@@ -33,22 +33,26 @@
 
 /* RFC 5102 Information Element Identifiers */
 
-#define PFIX_IE_octetDeltaCount			  1
-#define PFIX_IE_packetDeltaCount		  2
-#define PFIX_IE_protocolIdentifier		  4
-#define PFIX_IE_ipClassOfService		  5
-#define PFIX_IE_sourceTransportPort		  7
-#define PFIX_IE_sourceIPv4Address		  8
-#define PFIX_IE_ingressInterface		 10
-#define PFIX_IE_destinationTransportPort	 11
-#define PFIX_IE_destinationIPv4Address		 12
-#define PFIX_IE_egressInterface			 14
-#define PFIX_IE_flowEndSysUpTime		 21
-#define PFIX_IE_flowStartSysUpTime		 22
-#define PFIX_IE_sourceIPv6Address		 27
-#define PFIX_IE_destinationIPv6Address		 28
-#define PFIX_IE_flowStartMilliseconds		152
-#define PFIX_IE_flowEndMilliseconds		153
+#define PFIX_IE_octetDeltaCount				  1
+#define PFIX_IE_packetDeltaCount			  2
+#define PFIX_IE_protocolIdentifier			  4
+#define PFIX_IE_ipClassOfService			  5
+#define PFIX_IE_sourceTransportPort		 	  7
+#define PFIX_IE_sourceIPv4Address		 	  8
+#define PFIX_IE_ingressInterface		 	 10
+#define PFIX_IE_destinationTransportPort	 	 11
+#define PFIX_IE_destinationIPv4Address		 	 12
+#define PFIX_IE_egressInterface			 	 14
+#define PFIX_IE_flowEndSysUpTime		 	 21
+#define PFIX_IE_flowStartSysUpTime		 	 22
+#define PFIX_IE_sourceIPv6Address		 	 27
+#define PFIX_IE_destinationIPv6Address		 	 28
+#define PFIX_IE_flowStartMilliseconds			152
+#define PFIX_IE_flowEndMilliseconds			153
+#define PFIX_IE_postNATSourceIPv4Address		225
+#define PFIX_IE_postNATDestinationIPv4Address		226
+#define PFIX_IE_postNAPTSourceTransportPort		227
+#define PFIX_IE_postNAPTDestinationTransportPort	228
 
 struct pflow_flow {
 	u_int32_t	src_ip;
@@ -110,6 +114,28 @@ struct pflow_ipfix_tmpl_ipv4 {
 #define PFLOW_IPFIX_TMPL_IPV4_ID 256
 } __packed;
 
+struct pflow_ipfix_tmpl_nat_ipv4 {
+	struct pflow_tmpl_hdr	h;
+	struct pflow_tmpl_fspec src_ip;
+	struct pflow_tmpl_fspec dest_ip;
+	struct pflow_tmpl_fspec if_index_in;
+	struct pflow_tmpl_fspec if_index_out;
+	struct pflow_tmpl_fspec packets;
+	struct pflow_tmpl_fspec octets;
+	struct pflow_tmpl_fspec start;
+	struct pflow_tmpl_fspec finish;
+	struct pflow_tmpl_fspec post_src_ip;
+	struct pflow_tmpl_fspec post_dest_ip;
+	struct pflow_tmpl_fspec post_src_port;
+	struct pflow_tmpl_fspec post_dest_port;
+	struct pflow_tmpl_fspec src_port;
+	struct pflow_tmpl_fspec dest_port;
+	struct pflow_tmpl_fspec tos;
+	struct pflow_tmpl_fspec protocol;
+#define PFLOW_IPFIX_TMPL_NAT_IPV4_FIELD_COUNT 16
+#define PFLOW_IPFIX_TMPL_NAT_IPV4_ID 257
+} __packed;
+
 /* update pflow_clone_create() when changing pflow_ipfix_tmpl_v6 */
 struct pflow_ipfix_tmpl_ipv6 {
 	struct pflow_tmpl_hdr	h;
@@ -126,13 +152,14 @@ struct pflow_ipfix_tmpl_ipv6 {
 	struct pflow_tmpl_fspec	tos;
 	struct pflow_tmpl_fspec	protocol;
 #define PFLOW_IPFIX_TMPL_IPV6_FIELD_COUNT 12
-#define PFLOW_IPFIX_TMPL_IPV6_ID 257
+#define PFLOW_IPFIX_TMPL_IPV6_ID 258
 } __packed;
 
 struct pflow_ipfix_tmpl {
 	struct pflow_set_header	set_header;
-	struct pflow_ipfix_tmpl_ipv4	ipv4_tmpl;
-	struct pflow_ipfix_tmpl_ipv6	ipv6_tmpl;
+	struct pflow_ipfix_tmpl_ipv4		ipv4_tmpl;
+	struct pflow_ipfix_tmpl_nat_ipv4	ipv4_nat_tmpl;
+	struct pflow_ipfix_tmpl_ipv6		ipv6_tmpl;
 } __packed;
 
 struct pflow_ipfix_flow4 {
@@ -151,6 +178,26 @@ struct pflow_ipfix_flow4 {
 	/* XXX padding needed? */
 } __packed;
 
+struct pflow_ipfix_nat_flow4 {
+	u_int32_t	src_ip;		/* sourceIPv4Address*/
+	u_int32_t	dest_ip;	/* destinationIPv4Address */
+	u_int32_t	if_index_in;	/* ingressInterface */
+	u_int32_t	if_index_out;	/* egressInterface */
+	u_int64_t	flow_packets;	/* packetDeltaCount */
+	u_int64_t	flow_octets;	/* octetDeltaCount */
+	int64_t		flow_start;	/* flowStartMilliseconds */
+	int64_t		flow_finish;	/* flowEndMilliseconds */
+	u_int32_t	post_src_ip;	/* postNATSourceIPv4Address */
+	u_int32_t	post_dest_ip;	/* postNATDestinationIPv4Address */
+	u_int16_t	post_src_port;	/* postNAPTSourceTransportPort */
+	u_int16_t	post_dest_port;	/* postNAPTDestinationTransportPort */
+	u_int16_t	src_port;	/* sourceTransportPort */
+	u_int16_t	dest_port;	/* destinationTransportPort */
+	u_int8_t	tos;		/* ipClassOfService */
+	u_int8_t	protocol;	/* protocolIdentifier */
+	/* XXX padding needed? */
+} __packed;
+
 struct pflow_ipfix_flow6 {
 	struct in6_addr src_ip;		/* sourceIPv6Address */
 	struct in6_addr dest_ip;	/* destinationIPv6Address */
@@ -187,6 +234,7 @@ struct pflow_softc {
 
 	unsigned int		 sc_count;	/* [m] */
 	unsigned int		 sc_count4;	/* [m] */
+	unsigned int		 sc_count4_nat;	/* [m] */
 	unsigned int		 sc_count6;	/* [m] */
 	unsigned int		 sc_maxcount;	/* [m] */
 	unsigned int		 sc_maxcount4;	/* [m] */
@@ -196,6 +244,7 @@ struct pflow_softc {
 	struct timeout		 sc_tmo;
 	struct timeout		 sc_tmo6;
 	struct timeout		 sc_tmo_tmpl;
+	struct timeout		 sc_tmo_nat;
 	struct mbuf_queue	 sc_outputqueue;
 	struct task		 sc_outputtask;
 	struct socket		*so;		/* [p] */
@@ -208,6 +257,8 @@ struct pflow_softc {
 						    mbuf */
 	struct mbuf		*sc_mbuf6;	/* [m] current cumulative
 						    mbuf */
+	struct mbuf		*sc_mbuf_nat;	/* [m] current cumulative
+						    mbuf */
 	SMR_SLIST_ENTRY(pflow_softc) sc_next;
 };
 

package/libc/include/generic-openbsd/net/if_pfsync.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pfsync.h,v 1.65 2025/07/07 00:55:15 jsg Exp $	*/
+/*	$OpenBSD: if_pfsync.h,v 1.66 2026/04/12 03:16:04 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -112,7 +112,7 @@ struct pfsync_header {
 	u_int8_t			version;
 	u_int8_t			_pad;
 	u_int16_t			len; /* in bytes */
-	u_int8_t			pfcksum[PF_MD5_DIGEST_LENGTH];
+	u_int8_t			spare[16];
 } __packed;
 
 /*

package/libc/include/generic-openbsd/net/if_sppp.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sppp.h,v 1.31 2025/01/15 06:15:44 dlg Exp $	*/
+/*	$OpenBSD: if_sppp.h,v 1.32 2025/11/02 08:04:04 dlg Exp $	*/
 /*	$NetBSD: if_sppp.h,v 1.2.2.1 1999/04/04 06:57:39 explorer Exp $	*/
 
 /*
@@ -174,6 +174,7 @@ struct sppp {
 	time_t	pp_last_receive;	/* peer's last "sign of life" */
 	time_t	pp_last_activity;	/* second of last payload data s/r */
 	enum ppp_phase pp_phase;	/* phase we're currently in */
+	struct task pp_autodial;
 	int	state[IDX_COUNT];	/* state machine */
 	u_char  confid[IDX_COUNT];	/* id of last configuration request */
 	int	rst_counter[IDX_COUNT];	/* restart counter */

package/libc/include/generic-openbsd/net/if_trunk.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_trunk.h,v 1.32 2025/03/02 21:28:32 bluhm Exp $	*/
+/*	$OpenBSD: if_trunk.h,v 1.33 2025/11/24 23:40:00 dlg Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -159,6 +159,8 @@ struct trunk_softc;
 struct trunk_port {
 	struct ifnet			*tp_if;		/* physical interface */
 	struct trunk_softc		*tp_trunk;	/* parent trunk */
+	struct refcnt			tp_refs;
+	struct ether_port		tp_ether_port;
 	u_int8_t			tp_lladdr[ETHER_ADDR_LEN];
 	caddr_t				tp_psc;		/* protocol data */
 
@@ -172,7 +174,6 @@ struct trunk_port {
 	int	(*tp_ioctl)(struct ifnet *, u_long, caddr_t);
 	int	(*tp_output)(struct ifnet *, struct mbuf *, struct sockaddr *,
 		    struct rtentry *);
-	void	(*tp_input)(struct ifnet *, struct mbuf *, struct netstack *);
 
 	SLIST_ENTRY(trunk_port)		tp_entries;
 };