From nobody Fri Oct 31 19:12:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyrFf0lqCz6Dp7q; Fri, 31 Oct 2025 19:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyrFf068Dz4FdS; Fri, 31 Oct 2025 19:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8G7QJ4NGXUWLd3YXHS6/uXvh6Gdn6ROvIX83HkbgoI=; b=CNxHgFWqlwZnTKSYsEiyShK81d8eebT5qffk/Y2QmgAnP5yWdn7Oi5nGntgLvX0OsCNh3+ cvzSZWU2kvfkJCPJ5pygGaRiK8iB4nSVtLCki2cy5j1xN8hUP95AeZk+QFScWfk5vL71R4 +BiflIcf8+aonv5VIbr0YE8Xwe7ZNvHBvos7uDgnqQs7h9xnmzFZBHr/xUE3CEQmlxTj8o QjtvfM53zuSTwLExVAERPzQBzFSazApFNqolJ019QAqT7unSVykhNRJAhwGWaias4WXpci amFOpcD7Wn+hi0VUJkzVNU52dsD/LM1ZPCOjt61pR0YNbXhSh5uQJxgbkSScvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8G7QJ4NGXUWLd3YXHS6/uXvh6Gdn6ROvIX83HkbgoI=; b=MSUBD3TmfryERfNIms4rSc25k0B4/iDVEWO4mM7rVe9j9ev5QI7OZVKwzZ2uTRw6OGgnKb NhvjY+afxdHwj4x+cbRrLUucaEyhq1wuDP8vYNGZrHszhlngtOd3q6o7Awxky9GsmbL92N 1jObWRtHWuioOXQTuhpUeZlIhbgBujCcXDIbvWaHqdFwfvqpo6H1ZPatIJD+R0nSgIP/xD pE3qA+nnV2gA7jGxo1Loeb4uKlrL9jmCVgxuLcuxpea+RMqoPgoR+xOkeVk1eqANKliOqN X8uIkL4GBTZc//2QLLS4AA+a4Yf+CssKHDNg6gi5NaVvaOXLE50ZVAlnVMVMXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761937926; a=rsa-sha256; cv=none; b=OuFSsfgAHwJc4TTNkruqVvA09g/M5QZauujjhtr4oaomtH0yutNrlZ3brKnYp2AeA9a8J3 bZ6K07maC5IWzmcoA89EvWYrY68V+AIx56MxoY54XmHckKdXso3ERqUREII5OJt8rTxCHk sng6Jou1Q3spI98qF7zkwzH81c4CFbs+Tf0eE+ir5upfbttWwPSDiB6QJjBDTnq+vhLUvw cjnDqGSycigsmNeoPObEmqVRW7Q/EM6HWOpnCgIf+npX8aeZt1xl6Yrcppij5AI5sQ3F02 a9LM721Ilss6js5ABVcRpWC/DCq/4OdXzlF3BgwYREFwPGKRlCG4kCbrMngn6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyrFd6qlqz1Kbp; Fri, 31 Oct 2025 19:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59VJC5XA078438; Fri, 31 Oct 2025 19:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VJC5pL078435; Fri, 31 Oct 2025 19:12:05 GMT (envelope-from git) Date: Fri, 31 Oct 2025 19:12:05 GMT Message-Id: <202510311912.59VJC5pL078435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 3aa6981e658b - stable/14 - udp: honor IPV6_TCLASS socket option for UDP/IPv4 packets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3aa6981e658b84aa0fee879697ae69b70f8c8f9d Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3aa6981e658b84aa0fee879697ae69b70f8c8f9d commit 3aa6981e658b84aa0fee879697ae69b70f8c8f9d Author: Michael Tuexen AuthorDate: 2025-10-26 17:52:33 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 14:11:40 +0000 udp: honor IPV6_TCLASS socket option for UDP/IPv4 packets Honor the IPPROTO_IPV6-level socket option IPV6_TCLASS when sending an UDP/IPv4 packet on an AF_INET6 socket. Reviewed by: bz, glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53346 (cherry picked from commit 3535546a86846ddb0ca5fe4a0689ac635b504459) --- sys/netinet/udp_usrreq.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index ffffaa684f52..fdde19bc4475 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1146,7 +1146,19 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, else INP_RLOCK(inp); NET_EPOCH_ENTER(et); +#ifdef INET6 + if ((flags & PRUS_IPV6) != 0) { + if ((inp->in6p_outputopts != NULL) && + (inp->in6p_outputopts->ip6po_tclass != -1)) + tos = (u_char)inp->in6p_outputopts->ip6po_tclass; + else + tos = 0; + } else { + tos = inp->inp_ip_tos; + } +#else tos = inp->inp_ip_tos; +#endif if (control != NULL) { /* * XXX: Currently, we assume all the optional information is