@zigc/lib 0.17.0-dev.329 → 0.17.0-dev.340

package/libc/include/generic-openbsd/net80211/ieee80211.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211.h,v 1.64 2025/08/04 11:39:50 stsp Exp $	*/
+/*	$OpenBSD: ieee80211.h,v 1.66 2026/03/29 21:16:21 kirill Exp $	*/
 /*	$NetBSD: ieee80211.h,v 1.6 2004/04/30 23:51:53 dyoung Exp $	*/
 
 /*-
@@ -454,9 +454,16 @@ enum {
 	IEEE80211_ELEMID_QUIET_CHNL		= 198,	/* 11ac */
 	IEEE80211_ELEMID_OPMODE_NOTIF		= 199,	/* 11ac */
 	/* 200-220 reserved */
-	IEEE80211_ELEMID_VENDOR			= 221	/* vendor private */
-	/* 222-255 reserved */
+	IEEE80211_ELEMID_VENDOR			= 221,	/* vendor private */
+	/* 222-254 reserved */
+	IEEE80211_ELEMID_EXTENSION		= 255	/* Extension */
 };
+/*
+ * Extension element IDs
+ * Used with IEEE80211_ELEMID_EXTENSION (255)
+ */
+#define IEEE80211_ELEMID_EXT_HECAPS		35	/* 11ax HE Capabilities */
+#define IEEE80211_ELEMID_EXT_HEOP		36	/* 11ax HE Operation */
 
 /*
  * Action field category values (see 802.11-2012 8.4.1.11 Table 8-38).
@@ -518,6 +525,7 @@ enum {
 
 #define	IEEE80211_HT_NUM_MCS			77
 #define	IEEE80211_VHT_NUM_MCS			10
+#define	IEEE80211_HE_NUM_MCS			12
 
 /*
  * BlockAck/BlockAckReq Control field (see 802.11-2012 8.3.1.9 Figure 8-25).
@@ -712,7 +720,8 @@ enum {
 #define IEEE80211_HTOP1_NONGF_STA	0x0004
 /* Bit 3 is reserved. */
 #define IEEE80211_HTOP1_OBSS_NONHT_STA	0x0010
-/* Bits 5-15 are reserved. */
+#define IEEE80211_HTOP1_CCFS2_SHIFT	5
+#define IEEE80211_HTOP1_CCFS2_MASK	0x1fe0
 /* Bytes 4-5. */
 /* Bits 0-5 are reserved. */
 #define IEEE80211_HTOP2_DUALBEACON	0x0040
@@ -768,6 +777,8 @@ enum {
 #define IEEE80211_VHTCAP_LINK_ADAPT_MRQ_MFB	3
 #define IEEE80211_VHTCAP_RX_ANT_PATTERN		0x10000000
 #define IEEE80211_VHTCAP_TX_ANT_PATTERN		0x20000000
+#define IEEE80211_VHTCAP_EXT_NSS_BW_SHIFT	30
+#define IEEE80211_VHTCAP_EXT_NSS_BW_MASK	0xc0000000
 
 /*
  * VHT-MCS and NSS map (see 802.11ac-2013 8.4.2.160.3, Figure 8-401bs).
@@ -784,6 +795,7 @@ enum {
 
 #define IEEE80211_VHT_MAX_LGI_MBIT_S_MASK	0x1fff
 #define IEEE80211_VHT_MAX_LGI_MBIT_S_SHIFT	0
+#define IEEE80211_VHT_EXT_NSS_BW_CAPABLE	(1 << 13)
 
 /* The highest number of spatial streams supported by VHT. */
 #define IEEE80211_VHT_NUM_SS	8
@@ -801,6 +813,66 @@ enum {
 /* Byte 1 contains channel center frequency index 0 for 80, 80+80, 160 MHz. */
 /* Byte 2 contains channel center frequency index 1 for 80+80 MHz only. */
 
+
+/*
+ * 802.11ax (HE) definitions.
+ */
+
+/* HE Capabilities element fixed fields */
+#define IEEE80211_HE_MAC_CAPS_LEN		6
+#define IEEE80211_HE_PHY_CAPS_LEN		11
+#define IEEE80211_HE_CAPS_FIXED_LEN		(IEEE80211_HE_MAC_CAPS_LEN + \
+						    IEEE80211_HE_PHY_CAPS_LEN)
+
+/* HE Tx/Rx MCS NSS Support field size for 80 MHz */
+#define IEEE80211_HE_MCS_NSS_80_LEN		4
+
+/* Minimum length of the HE Capabilities element body (includes Ext ID) */
+#define IEEE80211_HE_CAPS_MINLEN		(1 + IEEE80211_HE_CAPS_FIXED_LEN + \
+						    IEEE80211_HE_MCS_NSS_80_LEN)
+
+/*
+ * Selected HE PHY capability bits (phy_cap_info[0])
+ * These are used to determine the presence of additional MCS/NSS maps.
+ */
+#define IEEE80211_HE_PHYCAP0_CHAN_WIDTH_40_IN_2G		0x02
+#define IEEE80211_HE_PHYCAP0_CHAN_WIDTH_40_80_IN_5G		0x04
+#define IEEE80211_HE_PHYCAP0_CHAN_WIDTH_160_IN_5G		0x08
+#define IEEE80211_HE_PHYCAP0_CHAN_WIDTH_8080_IN_5G		0x10
+
+/*
+ * Size of the HE Tx/Rx MCS NSS Support field, in bytes, for a given
+ * HE PHY capabilities byte 0.
+ */
+#define IEEE80211_HE_MCS_NSS_SIZE(_phycap0)	(IEEE80211_HE_MCS_NSS_80_LEN + \
+	((((_phycap0) & IEEE80211_HE_PHYCAP0_CHAN_WIDTH_160_IN_5G) ? 4 : 0)) + \
+	((((_phycap0) & IEEE80211_HE_PHYCAP0_CHAN_WIDTH_8080_IN_5G) ? 4 : 0)))
+
+/*
+ * HE MCS and NSS map (HE-MCS/NSS set)
+ *
+ * Set of HE MCS supported for a given number of spatial streams, `n'.
+ * Used by the HE capabilities IE and by the basic HE MCS set in
+ * the HE operation IE.
+ */
+#define IEEE80211_HE_MCS_FOR_SS_MASK(n)	(0x3 << (2 * ((n) - 1)))
+#define IEEE80211_HE_MCS_FOR_SS_SHIFT(n)	(2 * ((n) - 1))
+#define IEEE80211_HE_MCS_0_7			0
+#define IEEE80211_HE_MCS_0_9			1
+#define IEEE80211_HE_MCS_0_11			2
+#define IEEE80211_HE_MCS_SS_NOT_SUPP		3
+
+/* The highest number of spatial streams supported by HE */
+#define IEEE80211_HE_NUM_SS			8
+
+/*
+ * HE Operation element fixed fields (not including the Ext ID byte)
+ */
+#define IEEE80211_HEOP_PARAMS_LEN		4
+#define IEEE80211_HEOP_BASIC_MCS_LEN		2
+#define IEEE80211_HEOP_FIXED_LEN		(IEEE80211_HEOP_PARAMS_LEN + \
+					IEEE80211_HEOP_BASIC_MCS_LEN)
+
 /*
  * EDCA Access Categories.
  */

package/libc/include/generic-openbsd/net80211/ieee80211_ioctl.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_ioctl.h,v 1.44 2025/03/22 07:24:08 kevlo Exp $	*/
+/*	$OpenBSD: ieee80211_ioctl.h,v 1.45 2026/03/26 12:15:01 kirill Exp $	*/
 /*	$NetBSD: ieee80211_ioctl.h,v 1.7 2004/04/30 22:51:04 dyoung Exp $	*/
 
 /*-
@@ -385,9 +385,10 @@ struct ieee80211_nodereq {
 #define IEEE80211_NODEREQ_ASSOCFAIL_BSSID	0x20
 #define IEEE80211_NODEREQ_ASSOCFAIL_WPA_PROTO	0x40
 #define IEEE80211_NODEREQ_ASSOCFAIL_WPA_KEY	0x80
+#define IEEE80211_NODEREQ_ASSOCFAIL_CSA		0x100
 #define IEEE80211_NODEREQ_ASSOCFAIL_BITS	\
 	"\20\1!CHAN\2!IBSS\3!PRIVACY\4!BASICRATE\5!ESSID\6!BSSID\7!WPAPROTO" \
-	"\10!WPAKEY"
+	"\10!WPAKEY\11!CSA"
 
 /* get the entire node cache */
 struct ieee80211_nodereq_all {

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

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_node.h,v 1.97 2025/08/01 20:39:26 stsp Exp $	*/
+/*	$OpenBSD: ieee80211_node.h,v 1.101 2026/03/29 21:16:21 kirill Exp $	*/
 /*	$NetBSD: ieee80211_node.h,v 1.9 2004/04/30 22:57:32 dyoung Exp $	*/
 
 /*-
@@ -370,6 +370,20 @@ struct ieee80211_node {
 	uint8_t			ni_vht_chan_center_freq_idx1;
 	uint16_t		ni_vht_basic_mcs;
 
+	/* HE capabilities */
+	uint8_t			ni_he_mac_cap[IEEE80211_HE_MAC_CAPS_LEN];
+	uint8_t			ni_he_phy_cap[IEEE80211_HE_PHY_CAPS_LEN];
+	uint16_t		ni_he_rxmcs_80;
+	uint16_t		ni_he_txmcs_80;
+	uint16_t		ni_he_rxmcs_160;
+	uint16_t		ni_he_txmcs_160;
+	uint16_t		ni_he_rxmcs_80p80;
+	uint16_t		ni_he_txmcs_80p80;
+
+	/* HE operation */
+	uint8_t			ni_he_oper_params[IEEE80211_HEOP_PARAMS_LEN];
+	uint16_t		ni_he_basic_mcs;
+
 	/* Timeout handlers which trigger Tx Block Ack negotiation. */
 	struct timeout		ni_addba_req_to[IEEE80211_NUM_TID];
 	int			ni_addba_req_intval[IEEE80211_NUM_TID];
@@ -381,6 +395,7 @@ struct ieee80211_node {
 
 	int			ni_txmcs;	/* current MCS used for TX */
 	int			ni_vht_ss;	/* VHT # spatial streams */
+	int			ni_he_ss;	/* HE # spatial streams */
 
 	/* others */
 	u_int16_t		ni_associd;	/* assoc response */
@@ -398,6 +413,7 @@ struct ieee80211_node {
 #define IEEE80211_NODE_ASSOCFAIL_BSSID		0x20
 #define IEEE80211_NODE_ASSOCFAIL_WPA_PROTO	0x40
 #define IEEE80211_NODE_ASSOCFAIL_WPA_KEY	0x80
+#define IEEE80211_NODE_ASSOCFAIL_CSA		0x100
 
 	int			ni_inact;	/* inactivity mark count */
 	int			ni_txrate;	/* index to ni_rates[] */
@@ -427,6 +443,9 @@ struct ieee80211_node {
 #define IEEE80211_NODE_VHTCAP		0x40000	/* claims to support VHT */
 #define IEEE80211_NODE_VHT_SGI80	0x80000	/* SGI on 80 MHz negotiated */ 
 #define IEEE80211_NODE_VHT_SGI160	0x100000 /* SGI on 160 MHz negotiated */ 
+#define IEEE80211_NODE_HE		0x200000 /* HE negotiated */
+#define IEEE80211_NODE_HECAP		0x400000 /* claims to support HE */
+#define IEEE80211_NODE_CSA		0x800000 /* channel switch announced */
 
 	/* If not NULL, this function gets called when ni_refcnt hits zero. */
 	void			(*ni_unref_cb)(struct ieee80211com *,
@@ -590,7 +609,11 @@ ieee80211_node_supports_vht_chan160(struct ieee80211_node *ni)
 
 	cap_chan_width = (ni->ni_vhtcaps & IEEE80211_VHTCAP_CHAN_WIDTH_MASK) >>
 	    IEEE80211_VHTCAP_CHAN_WIDTH_SHIFT;
-	if (cap_chan_width != IEEE80211_VHTCAP_CHAN_WIDTH_160)
+	if (cap_chan_width != IEEE80211_VHTCAP_CHAN_WIDTH_160 &&
+	    cap_chan_width != IEEE80211_VHTCAP_CHAN_WIDTH_160_8080 &&
+	    ((ni->ni_vhtcaps & IEEE80211_VHTCAP_EXT_NSS_BW_MASK) == 0 ||
+	    (ni->ni_vht_tx_max_lgi_mbit_s &
+	    IEEE80211_VHT_EXT_NSS_BW_CAPABLE) == 0))
 		return 0;
 
 	op_chan_width = (ni->ni_vht_chan_width &
@@ -600,6 +623,23 @@ ieee80211_node_supports_vht_chan160(struct ieee80211_node *ni)
 	return (op_chan_width == IEEE80211_VHTOP0_CHAN_WIDTH_160);
 }
 
+/* 
+ * Check if the peer supports HE.
+ * Require a HE capabilities IE and support for HE MCS with a single
+ * spatial stream.
+ */
+static inline int
+ieee80211_node_supports_he(struct ieee80211_node *ni)
+{
+	uint16_t rx_mcs;
+
+	rx_mcs = (ni->ni_he_rxmcs_80 & IEEE80211_HE_MCS_FOR_SS_MASK(1)) >>
+	    IEEE80211_HE_MCS_FOR_SS_SHIFT(1);
+
+	return ((ni->ni_flags & IEEE80211_NODE_HECAP) &&
+	    rx_mcs != IEEE80211_HE_MCS_SS_NOT_SUPP);
+}
+
 struct ieee80211com;
 
 typedef void ieee80211_iter_func(void *, struct ieee80211_node *);
@@ -642,6 +682,11 @@ void ieee80211_setup_vhtcaps(struct ieee80211_node *, const uint8_t *,
 void ieee80211_clear_vhtcaps(struct ieee80211_node *);
 int ieee80211_setup_vhtop(struct ieee80211_node *, const uint8_t *,
     uint8_t, int);
+void ieee80211_setup_hecaps(struct ieee80211_node *, const uint8_t *,
+    uint8_t);
+void ieee80211_clear_hecaps(struct ieee80211_node *);
+int ieee80211_setup_heop(struct ieee80211_node *, const uint8_t *,
+    uint8_t, int);
 int ieee80211_setup_rates(struct ieee80211com *,
 	    struct ieee80211_node *, const u_int8_t *, const u_int8_t *, int);
 enum ieee80211_phymode ieee80211_node_abg_mode(struct ieee80211com *,
@@ -656,6 +701,7 @@ void ieee80211_node_join(struct ieee80211com *,
 void ieee80211_node_leave(struct ieee80211com *,
 		struct ieee80211_node *);
 int ieee80211_match_bss(struct ieee80211com *, struct ieee80211_node *, int);
+void ieee80211_node_switch_bss(struct ieee80211com *, struct ieee80211_node *);
 void ieee80211_node_tx_stopped(struct ieee80211com *, struct ieee80211_node *);
 struct ieee80211_node *ieee80211_node_choose_bss(struct ieee80211com *, int,
 		struct ieee80211_node **);

package/libc/include/generic-openbsd/net80211/ieee80211_proto.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_proto.h,v 1.50 2025/06/14 08:46:34 jsg Exp $	*/
+/*	$OpenBSD: ieee80211_proto.h,v 1.51 2026/03/19 16:50:32 chris Exp $	*/
 /*	$NetBSD: ieee80211_proto.h,v 1.3 2003/10/13 04:23:56 dyoung Exp $	*/
 
 /*-
@@ -137,6 +137,7 @@ extern	u_int8_t *ieee80211_add_xrates(u_int8_t *,
 extern	u_int8_t *ieee80211_add_htcaps(u_int8_t *, struct ieee80211com *);
 extern	u_int8_t *ieee80211_add_htop(u_int8_t *, struct ieee80211com *);
 extern	u_int8_t *ieee80211_add_vhtcaps(u_int8_t *, struct ieee80211com *);
+extern	u_int8_t *ieee80211_add_hecaps(u_int8_t *, struct ieee80211com *);
 extern	u_int8_t *ieee80211_add_tie(u_int8_t *, u_int8_t, u_int32_t);
 
 extern	int ieee80211_parse_rsn(struct ieee80211com *, const u_int8_t *,
@@ -169,6 +170,8 @@ extern	void ieee80211_ht_negotiate(struct ieee80211com *,
     struct ieee80211_node *);
 extern	void ieee80211_vht_negotiate(struct ieee80211com *,
     struct ieee80211_node *);
+extern	void ieee80211_he_negotiate(struct ieee80211com *,
+    struct ieee80211_node *);
 extern	void ieee80211_tx_ba_timeout(void *);
 extern	void ieee80211_rx_ba_timeout(void *);
 extern	int ieee80211_addba_request(struct ieee80211com *,

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

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_var.h,v 1.112 2025/08/01 20:39:26 stsp Exp $	*/
+/*	$OpenBSD: ieee80211_var.h,v 1.114 2026/03/19 16:50:32 chris Exp $	*/
 /*	$NetBSD: ieee80211_var.h,v 1.7 2004/05/06 03:07:10 dyoung Exp $	*/
 
 /*-
@@ -92,8 +92,9 @@ enum ieee80211_phymode {
 	IEEE80211_MODE_11G	= 3,	/* 2GHz, OFDM */
 	IEEE80211_MODE_11N	= 4,	/* 2GHz/5GHz, OFDM/HT */
 	IEEE80211_MODE_11AC	= 5,	/* 5GHz, OFDM/VHT */
+	IEEE80211_MODE_11AX	= 6,	/* 2GHz/5GHz, OFDM/HE */
 };
-#define	IEEE80211_MODE_MAX	(IEEE80211_MODE_11AC+1)
+#define	IEEE80211_MODE_MAX	(IEEE80211_MODE_11AX+1)
 
 enum ieee80211_opmode {
 	IEEE80211_M_STA		= 1,	/* infrastructure station */
@@ -142,6 +143,7 @@ struct ieee80211_channel {
  */
 #define IEEE80211_CHANX_80MHZ	0x00000001 /* use of 80 MHz is allowed */
 #define IEEE80211_CHANX_160MHZ	0x00000002 /* use of 160 MHz is allowed */
+#define IEEE80211_CHANX_HE	0x00000004 /* 11ax/HE channel */
 
 /*
  * Useful combinations of channel characteristics.
@@ -185,6 +187,8 @@ struct ieee80211_channel {
 	(((_c)->ic_xflags & IEEE80211_CHANX_80MHZ) != 0)
 #define	IEEE80211_CHAN_160MHZ_ALLOWED(_c) \
 	(((_c)->ic_xflags & IEEE80211_CHANX_160MHZ) != 0)
+#define	IEEE80211_CHAN_HE(_c) \
+	(((_c)->ic_xflags & IEEE80211_CHANX_HE) != 0)
 
 /*
  * EDCA AC parameters.
@@ -337,6 +341,8 @@ struct ieee80211com {
 							 */
 	struct ieee80211_edca_ac_params ic_edca_ac[EDCA_NUM_AC];
 	u_int			ic_edca_updtcount;
+	u_int			ic_edca_txop_count[EDCA_NUM_AC];
+	struct timeval		ic_edca_txop_time[EDCA_NUM_AC];
 	u_int16_t		ic_tid_noack;
 	u_int8_t		ic_globalcnt[EAPOL_KEY_NONCE_LEN];
 	u_int8_t		ic_nonce[EAPOL_KEY_NONCE_LEN];
@@ -383,6 +389,15 @@ struct ieee80211com {
 	uint16_t		ic_vht_txmcs;
 	uint16_t		ic_vht_tx_max_lgi_mbit_s;
 
+	u_int8_t		ic_he_mac_cap[IEEE80211_HE_MAC_CAPS_LEN];
+	u_int8_t		ic_he_phy_cap[IEEE80211_HE_PHY_CAPS_LEN];
+	uint16_t		ic_he_rxmcs_80;
+	uint16_t		ic_he_txmcs_80;
+	uint16_t		ic_he_rxmcs_160;
+	uint16_t		ic_he_txmcs_160;
+	uint16_t		ic_he_rxmcs_80p80;
+	uint16_t		ic_he_txmcs_80p80;
+
 	TAILQ_HEAD(, ieee80211_ess)	 ic_ess;
 };
 #define	ic_if		ic_ac.ac_if
@@ -440,6 +455,7 @@ struct ieee80211_ess {
 #define	IEEE80211_F_BGSCAN	0x08000000	/* STATUS: background scan */
 #define IEEE80211_F_AUTO_JOIN	0x10000000	/* CONF: auto-join active */
 #define	IEEE80211_F_VHTON	0x20000000	/* CONF: VHT enabled */
+#define	IEEE80211_F_HEON	0x40000000	/* CONF: HE enabled */
 
 /* ic_xflags */
 #define	IEEE80211_F_TX_MGMT_ONLY 0x00000001	/* leave data frames on ifq */

package/libc/include/generic-openbsd/netinet/if_ether.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.h,v 1.96 2025/07/07 00:55:15 jsg Exp $	*/
+/*	$OpenBSD: if_ether.h,v 1.99 2025/12/02 03:24:19 dlg Exp $	*/
 /*	$NetBSD: if_ether.h,v 1.22 1996/05/11 13:00:00 mycroft Exp $	*/
 
 /*
@@ -220,12 +220,12 @@ do {									\
 
 #include <net/if_var.h>	/* for "struct ifnet" */
 
-struct ether_brport {
-	struct mbuf	*(*eb_input)(struct ifnet *, struct mbuf *,
+struct ether_port {
+	struct mbuf	*(*ep_input)(struct ifnet *, struct mbuf *,
 			   uint64_t, void *, struct netstack *);
-	void		(*eb_port_take)(void *);
-	void		(*eb_port_rele)(void *);
-	void		  *eb_port;
+	void		*(*ep_port_take)(void *);
+	void		 (*ep_port_rele)(void *, void *);
+	void		  *ep_port;
 };
 
 /*
@@ -241,8 +241,8 @@ struct	arpcom {
 	int	 ac_multicnt;			/* length of ac_multiaddrs */
 	int	 ac_multirangecnt;		/* number of mcast ranges */
 
-	void	*ac_trunkport;
-	const struct ether_brport *ac_brport;
+	const struct ether_port *ac_trport;
+	const struct ether_port *ac_brport;
 };
 
 extern int arpt_keep;				/* arp resolved cache expire */
@@ -289,11 +289,11 @@ void	ether_rtrequest(struct ifnet *, int, struct rtentry *);
 char	*ether_sprintf(u_char *);
 
 int	ether_brport_isset(struct ifnet *);
-void	ether_brport_set(struct ifnet *, const struct ether_brport *);
+void	ether_brport_set(struct ifnet *, const struct ether_port *);
 void	ether_brport_clr(struct ifnet *);
-const struct ether_brport *
+const struct ether_port *
 	ether_brport_get(struct ifnet *);
-const struct ether_brport *
+const struct ether_port *
 	ether_brport_get_locked(struct ifnet *);
 
 uint64_t	ether_addr_to_e64(const struct ether_addr *);
@@ -313,6 +313,7 @@ struct ether_extracted {
 };
 
 void ether_extract_headers(struct mbuf *, struct ether_extracted *);
+struct mbuf *ether_offload_ifcap(struct ifnet *, struct mbuf *);
 
 /*
  * Ethernet multicast address structure.  There is one of these for each

package/libc/include/generic-openbsd/netinet/igmp_var.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: igmp_var.h,v 1.16 2025/03/02 21:28:32 bluhm Exp $	*/
+/*	$OpenBSD: igmp_var.h,v 1.17 2026/02/26 00:53:18 bluhm Exp $	*/
 /*	$NetBSD: igmp_var.h,v 1.9 1996/02/13 23:41:31 christos Exp $	*/
 
 /*
@@ -105,12 +105,26 @@ igmpstat_inc(enum igmpstat_counters c)
  */
 #define	IGMP_RANDOM_DELAY(X)	(arc4random_uniform(X) + 1)
 
+struct igmp_pktinfo {
+	STAILQ_ENTRY(igmp_pktinfo)	ipi_list;
+	struct in_addr			ipi_addr;
+	unsigned int			ipi_rdomain;
+	unsigned int			ipi_ifidx;
+	int				ipi_type;
+};
+STAILQ_HEAD(igmp_pktlist, igmp_pktinfo);
+
 void	igmp_init(void);
 int	igmp_input(struct mbuf **, int *, int, int, struct netstack *);
-void	igmp_joingroup(struct in_multi *, struct ifnet *);
-void	igmp_leavegroup(struct in_multi *, struct ifnet *);
+void	igmp_joingroup(struct in_multi *, struct ifnet *,
+	    struct igmp_pktinfo *);
+void	igmp_leavegroup(struct in_multi *, struct ifnet *,
+	    struct igmp_pktinfo *);
 void	igmp_fasttimo(void);
 void	igmp_slowtimo(void);
 int	igmp_sysctl(int *, u_int, void *, size_t *, void *, size_t);
+void	igmp_sendpkt(struct igmp_pktinfo *);
+
 #endif /* _KERNEL */
+
 #endif /* _NETINET_IGMP_VAR_H_ */

package/libc/include/generic-openbsd/netinet/in_pcb.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.h,v 1.171 2025/07/14 09:01:52 jsg Exp $	*/
+/*	$OpenBSD: in_pcb.h,v 1.174 2026/02/05 03:26:00 dlg Exp $	*/
 /*	$NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $	*/
 
 /*
@@ -357,6 +357,7 @@ void	 in_setpeeraddr(struct inpcb *, struct mbuf *);
 void	 in_setsockaddr(struct inpcb *, struct mbuf *);
 int	 in_sockaddr(struct socket *, struct mbuf *);
 int	 in_peeraddr(struct socket *, struct mbuf *);
+int	 in_flowid(struct socket *);
 int	 in_baddynamic(u_int16_t, u_int16_t);
 int	 in_rootonly(u_int16_t, u_int16_t);
 int	 in_pcbselsrc(struct in_addr *, const struct sockaddr_in *,

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

@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_var.h,v 1.41 2018/10/18 15:23:04 cheloha Exp $	*/
+/*	$OpenBSD: in_var.h,v 1.47 2026/03/22 23:14:00 bluhm Exp $	*/
 /*	$NetBSD: in_var.h,v 1.16 1996/02/13 23:42:15 christos Exp $	*/
 
 /*
@@ -35,6 +35,12 @@
 #ifndef _NETINET_IN_VAR_H_
 #define _NETINET_IN_VAR_H_
 
+/*
+ *  Locks used to protect struct members in this file:
+ *	I	immutable after creation
+ *	m	multicast if_maddrlock rwlock of parent interface
+ */
+
 #include <sys/queue.h>
 
 #ifdef _KERNEL
@@ -75,37 +81,9 @@ struct	in_aliasreq {
 	struct	sockaddr_in ifra_mask;
 };
 
-
-#ifdef	_KERNEL
-/*
- * Macro for finding the internet address structure (in_ifaddr) corresponding
- * to a given interface (ifnet structure).
- */
-#define IFP_TO_IA(ifp, ia)						\
-	/* struct ifnet *ifp; */					\
-	/* struct in_ifaddr *ia; */					\
-do {									\
-	struct ifaddr *ifa;						\
-	NET_ASSERT_LOCKED();						\
-	TAILQ_FOREACH(ifa, &(ifp)->if_addrlist, ifa_list) {		\
-		if (ifa->ifa_addr->sa_family == AF_INET)		\
-			break;						\
-	}								\
-	(ia) = ifatoia(ifa);						\
-} while (/* CONSTCOND */ 0)
-#endif
-
-/*
- * Per-interface router version information.
- */
-struct router_info {
-	unsigned int	rti_ifidx;
-	int		rti_type;	/* type of router on this interface */
-	int		rti_age;	/* time since last v1 query */
-	LIST_ENTRY(router_info)	rti_list;
-};
-
 #ifdef _KERNEL
+struct router_info;
+
 /*
  * Internet multicast address structure.  There is one of these for each IP
  * multicast group to which this host belongs on a given network interface.
@@ -115,11 +93,11 @@ struct in_multi {
 #define inm_refcnt		inm_ifma.ifma_refcnt
 #define inm_ifidx		inm_ifma.ifma_ifidx
 
-	struct sockaddr_in	inm_sin;   /* IPv4 multicast address */
+	struct sockaddr_in	inm_sin;   /* [I] IPv4 multicast address */
 #define inm_addr		inm_sin.sin_addr
 
-	u_int			inm_state; /* state of membership */
-	u_int			inm_timer; /* IGMP membership report timer */
+	u_int			inm_state; /* [m] state of membership */
+	u_int			inm_timer; /* [m] IGMP membership report */
 
 	struct router_info	*inm_rti;  /* router version info */
 };
@@ -130,37 +108,17 @@ ifmatoinm(struct ifmaddr *ifma)
        return ((struct in_multi *)(ifma));
 }
 
-/*
- * Macro for looking up the in_multi record for a given IP multicast
- * address on a given interface.  If no matching record is found, "inm"
- * returns NULL.
- */
-#define IN_LOOKUP_MULTI(addr, ifp, inm)					\
-	/* struct in_addr addr; */					\
-	/* struct ifnet *ifp; */					\
-	/* struct in_multi *inm; */					\
-do {									\
-	struct ifmaddr *ifma;						\
-									\
-	(inm) = NULL;							\
-	NET_ASSERT_LOCKED();						\
-	TAILQ_FOREACH(ifma, &(ifp)->if_maddrlist, ifma_list)		\
-		if (ifma->ifma_addr->sa_family == AF_INET &&		\
-		    ifmatoinm(ifma)->inm_addr.s_addr == (addr).s_addr) {\
-			(inm) = ifmatoinm(ifma);			\
-			break;						\
-		}							\
-} while (/* CONSTCOND */ 0)
-
+struct	in_ifaddr *in_ifp2ia(struct ifnet *);
 int	in_ifinit(struct ifnet *,
 	    struct in_ifaddr *, struct sockaddr_in *, int);
-struct	in_multi *in_addmulti(struct in_addr *, struct ifnet *);
+struct	in_multi *in_lookupmulti(const struct in_addr *, struct ifnet *);
+struct	in_multi *in_addmulti(const struct in_addr *, struct ifnet *);
 void	in_delmulti(struct in_multi *);
-int	in_hasmulti(struct in_addr *, struct ifnet *);
+int	in_hasmulti(const struct in_addr *, struct ifnet *);
 void	in_ifscrub(struct ifnet *, struct in_ifaddr *);
 int	in_control(struct socket *, u_long, caddr_t, struct ifnet *);
 int	in_ioctl(u_long, caddr_t, struct ifnet *, int);
 void	in_prefixlen2mask(struct in_addr *, int);
-#endif
+#endif /* _KERNEL */
 
 #endif /* _NETINET_IN_VAR_H_ */

package/libc/include/generic-openbsd/netinet/ip.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip.h,v 1.20 2021/12/14 23:47:36 dtucker Exp $	*/
+/*	$OpenBSD: ip.h,v 1.22 2025/12/19 13:58:53 tb Exp $	*/
 /*	$NetBSD: ip.h,v 1.9 1995/05/15 01:22:44 cgd Exp $	*/
 
 /*
@@ -95,7 +95,7 @@ struct ip {
 #define	IPTOS_PREC_ROUTINE		0x00
 
 /*
- * Definitions for DiffServ Codepoints as per RFCs 2474, 3246, 4594 & 8622.
+ * Definitions for DiffServ Codepoints as per RFCs 2474, 3246, 4594, 5865, 8622.
  * These are the 6 most significant bits as they appear on the wire, so the
  * two least significant bits must be zero.
  */
@@ -118,6 +118,7 @@ struct ip {
 #define	IPTOS_DSCP_AF42		0x90
 #define	IPTOS_DSCP_AF43		0x98
 #define	IPTOS_DSCP_CS5		0xa0
+#define	IPTOS_DSCP_VA		0xb0
 #define	IPTOS_DSCP_EF		0xb8
 #define	IPTOS_DSCP_CS6		0xc0
 #define	IPTOS_DSCP_CS7		0xe0

package/libc/include/generic-openbsd/netinet/tcp_timer.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_timer.h,v 1.27 2025/06/08 17:06:19 bluhm Exp $	*/
+/*	$OpenBSD: tcp_timer.h,v 1.28 2025/12/31 03:47:04 jsg Exp $	*/
 /*	$NetBSD: tcp_timer.h,v 1.6 1995/03/26 20:32:37 jtc Exp $	*/
 
 /*
@@ -162,7 +162,6 @@ extern int tcp_keepintvl;	/* [a] time between keepalive probes */
 extern int tcp_keepinit_sec;	/* [a] copy of above in seconds for sysctl */
 extern int tcp_keepidle_sec;	/* [a] copy of above in seconds for sysctl */
 extern int tcp_keepintvl_sec;	/* [a] copy of above in seconds for sysctl */
-extern int tcp_ttl;		/* time to live for TCP segs */
 extern const int tcp_backoff[];
 #endif /* _KERNEL */
 #endif /* _NETINET_TCP_TIMER_H_ */

package/libc/include/generic-openbsd/netinet6/in6_var.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_var.h,v 1.81 2025/05/20 05:51:43 bluhm Exp $	*/
+/*	$OpenBSD: in6_var.h,v 1.85 2026/03/22 23:14:00 bluhm Exp $	*/
 /*	$KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $	*/
 
 /*
@@ -64,6 +64,12 @@
 #ifndef _NETINET6_IN6_VAR_H_
 #define _NETINET6_IN6_VAR_H_
 
+/*
+ *  Locks used to protect struct members in this file:
+ *	I	immutable after creation
+ *	m	multicast if_maddrlock rwlock of parent interface
+ */
+
 /*
  * Interface address, Internet version.  One of these structures
  * is allocated for each interface with an Internet address.
@@ -316,11 +322,11 @@ struct in6_multi {
 #define in6m_refcnt		in6m_ifma.ifma_refcnt
 #define in6m_ifidx		in6m_ifma.ifma_ifidx
 
-	struct sockaddr_in6	in6m_sin;   /* IPv6 multicast address */
+	struct sockaddr_in6	in6m_sin;   /* [I] IPv6 multicast address */
 #define in6m_addr		in6m_sin.sin6_addr
 
-	u_int			in6m_state; /* state of membership */
-	u_int			in6m_timer; /* MLD6 membership report timer */
+	u_int			in6m_state; /* [m] state of membership */
+	u_int			in6m_timer; /* [m] MLD6 membership report */
 };
 
 static __inline struct in6_multi *
@@ -329,32 +335,12 @@ ifmatoin6m(struct ifmaddr *ifma)
        return ((struct in6_multi *)(ifma));
 }
 
-/*
- * Macros for looking up the in6_multi record for a given IP6 multicast
- * address on a given interface. If no matching record is found, "in6m"
- * returns NULL.
- */
-#define IN6_LOOKUP_MULTI(addr, ifp, in6m)				\
-	/* struct in6_addr addr; */					\
-	/* struct ifnet *ifp; */					\
-	/* struct in6_multi *in6m; */					\
-do {									\
-	struct ifmaddr *ifma;						\
-									\
-	(in6m) = NULL;							\
-	TAILQ_FOREACH(ifma, &(ifp)->if_maddrlist, ifma_list)		\
-		if (ifma->ifma_addr->sa_family == AF_INET6 &&		\
-		    IN6_ARE_ADDR_EQUAL(&ifmatoin6m(ifma)->in6m_addr,	\
-				       &(addr))) {			\
-			(in6m) = ifmatoin6m(ifma);			\
-			break;						\
-		}							\
-} while (/* CONSTCOND */ 0)
-
-struct	in6_multi *in6_addmulti(struct in6_addr *, struct ifnet *, int *);
+struct	in6_multi *in6_lookupmulti(const struct in6_addr *, struct ifnet *);
+struct	in6_multi *in6_addmulti(const struct in6_addr *, struct ifnet *, int *);
 void	in6_delmulti(struct in6_multi *);
-int	in6_hasmulti(struct in6_addr *, struct ifnet *);
-struct in6_multi_mship *in6_joingroup(struct ifnet *, struct in6_addr *, int *);
+int	in6_hasmulti(const struct in6_addr *, struct ifnet *);
+struct in6_multi_mship *in6_joingroup(struct ifnet *, const struct in6_addr *,
+	    int *);
 void	in6_leavegroup(struct in6_multi_mship *);
 int	in6_control(struct socket *, u_long, caddr_t, struct ifnet *);
 int	in6_ioctl(u_long, caddr_t, struct ifnet *, int);